From fedora-cvs-commits at redhat.com Sun Jan 1 07:06:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 Jan 2006 02:06:06 -0500 Subject: rpms/kudzu/devel .cvsignore, 1.94, 1.95 kudzu.spec, 1.106, 1.107 sources, 1.103, 1.104 Message-ID: <200601010706.k01766IF021619@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21575 Modified Files: .cvsignore kudzu.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- .cvsignore 14 Dec 2005 17:37:01 -0000 1.94 +++ .cvsignore 1 Jan 2006 07:06:03 -0000 1.95 @@ -1 +1 @@ -kudzu-1.2.16.tar.gz +kudzu-1.2.17.tar.gz Index: kudzu.spec =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- kudzu.spec 14 Dec 2005 17:37:01 -0000 1.106 +++ kudzu.spec 1 Jan 2006 07:06:03 -0000 1.107 @@ -1,5 +1,5 @@ Name: kudzu -Version: 1.2.16 +Version: 1.2.17 Release: 1 License: GPL Summary: The Red Hat Linux hardware probing tool. @@ -79,6 +79,9 @@ %{_includedir}/kudzu %changelog +* Sun Jan 1 2006 Bill Nottingham - 1.2.17-1 +- handle pcilib string returns (#176490, #176724) + * Wed Dec 14 2005 Bill Nottingham - 1.2.16-1 - revert LRMI changes (#175677) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- sources 14 Dec 2005 17:37:01 -0000 1.103 +++ sources 1 Jan 2006 07:06:03 -0000 1.104 @@ -1 +1 @@ -5fc786dd558064fd9c9cb3e5be10e799 kudzu-1.2.16.tar.gz +9ab178467b9cf764d1d3812f9430d81c kudzu-1.2.17.tar.gz From fedora-cvs-commits at redhat.com Sun Jan 1 19:51:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 Jan 2006 14:51:09 -0500 Subject: rpms/iso-codes/devel .cvsignore, 1.3, 1.4 iso-codes.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200601011951.k01Jp9o8017827@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/iso-codes/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17799 Modified Files: .cvsignore iso-codes.spec sources Log Message: * Sun Jan 1 2006 Christopher Aillon 0.49-1 - Update to 0.49 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/iso-codes/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 26 Aug 2005 06:59:02 -0000 1.3 +++ .cvsignore 1 Jan 2006 19:51:06 -0000 1.4 @@ -1,2 +1,3 @@ iso-codes_0.46.orig.tar.gz iso-codes_0.47.orig.tar.gz +iso-codes_0.49.orig.tar.gz Index: iso-codes.spec =================================================================== RCS file: /cvs/dist/rpms/iso-codes/devel/iso-codes.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- iso-codes.spec 9 Dec 2005 22:41:03 -0000 1.4 +++ iso-codes.spec 1 Jan 2006 19:51:06 -0000 1.5 @@ -1,8 +1,8 @@ Name: iso-codes Summary: ISO code lists and translations -Version: 0.47 -Release: 1.1 +Version: 0.49 +Release: 1 License: LGPL Group: System Environment/Base URL: http://alioth.debian.org/projects/pkg-isocodes/ @@ -53,6 +53,9 @@ %{_datadir}/pkgconfig/iso-codes.pc %changelog +* Sun Jan 1 2006 Christopher Aillon 0.49-1 +- Update to 0.49 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/iso-codes/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 26 Aug 2005 06:59:02 -0000 1.3 +++ sources 1 Jan 2006 19:51:06 -0000 1.4 @@ -1 +1 @@ -c22e6ceb24808844cdced1dd4344e62e iso-codes_0.47.orig.tar.gz +62b7f9469e00b92558d5d043a4be3910 iso-codes_0.49.orig.tar.gz From fedora-cvs-commits at redhat.com Sun Jan 1 20:06:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 Jan 2006 15:06:12 -0500 Subject: rpms/iso-codes/devel iso-codes.spec,1.5,1.6 Message-ID: <200601012006.k01K6C3q022171@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/iso-codes/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22141 Modified Files: iso-codes.spec Log Message: hmm, upstream forgot to run autogen.sh Index: iso-codes.spec =================================================================== RCS file: /cvs/dist/rpms/iso-codes/devel/iso-codes.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- iso-codes.spec 1 Jan 2006 19:51:06 -0000 1.5 +++ iso-codes.spec 1 Jan 2006 20:06:01 -0000 1.6 @@ -10,6 +10,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch +# Blah, 0.49 didn't run autogen.sh before packaging. Boo. +BuildRequires: autoconf automake + %description This package provides the ISO-639 Language code list, the ISO-3166 Territory code list, and ISO-3166-2 sub-territory lists, and all their @@ -29,6 +32,10 @@ %setup -q %build +# Blah, 0.49 didn't run autogen.sh before packaging. Boo. +./autogen.sh +%{__mv} ./LGPL-2.1 ./COPYING + %configure make From fedora-cvs-commits at redhat.com Sun Jan 1 20:27:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 Jan 2006 15:27:13 -0500 Subject: rpms/kernel/devel patch-2.6.15-rc7-git6.bz2.sign, NONE, 1.1 .cvsignore, 1.309, 1.310 kernel-2.6.spec, 1.1806, 1.1807 sources, 1.251, 1.252 upstream, 1.236, 1.237 patch-2.6.15-rc7-git5.bz2.sign, 1.1, NONE Message-ID: <200601012027.k01KRDGq000912@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv898 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.15-rc7-git6.bz2.sign Removed Files: patch-2.6.15-rc7-git5.bz2.sign Log Message: * Sun Jan 01 2006 Dave Jones - 2.6.15-rc7-git6 --- NEW FILE patch-2.6.15-rc7-git6.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDt45dyGugalF9Dw4RAgCIAJ0eCmxDPbfdMiy+KaKyAu92g1ZrqgCgkKsj O1wzsL57aUjexUBX/Q8VCFc= =iggj -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.309 retrieving revision 1.310 diff -u -r1.309 -r1.310 --- .cvsignore 31 Dec 2005 19:53:55 -0000 1.309 +++ .cvsignore 1 Jan 2006 20:27:11 -0000 1.310 @@ -3,4 +3,4 @@ kernel-2.6.14 linux-2.6.14.tar.bz2 patch-2.6.15-rc7.bz2 -patch-2.6.15-rc7-git5.bz2 +patch-2.6.15-rc7-git6.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1806 retrieving revision 1.1807 diff -u -r1.1806 -r1.1807 --- kernel-2.6.spec 31 Dec 2005 19:53:55 -0000 1.1806 +++ kernel-2.6.spec 1 Jan 2006 20:27:11 -0000 1.1807 @@ -205,7 +205,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.15-rc7.bz2 -Patch2: patch-2.6.15-rc7-git5.bz2 +Patch2: patch-2.6.15-rc7-git6.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -1364,6 +1364,9 @@ %endif %changelog +* Sun Jan 01 2006 Dave Jones +- 2.6.15-rc7-git6 + * Sat Dec 31 2005 Dave Jones - 2.6.15-rc7-git5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.251 retrieving revision 1.252 diff -u -r1.251 -r1.252 --- sources 31 Dec 2005 19:53:55 -0000 1.251 +++ sources 1 Jan 2006 20:27:11 -0000 1.252 @@ -1,3 +1,3 @@ 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 c374e570ea046f4bfaad3d21d177d6cc patch-2.6.15-rc7.bz2 -c62c55c955ded89475ff450cb0f098c4 patch-2.6.15-rc7-git5.bz2 +e71c0f9d6f5f88c11c0c679149fcf220 patch-2.6.15-rc7-git6.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- upstream 31 Dec 2005 19:53:55 -0000 1.236 +++ upstream 1 Jan 2006 20:27:11 -0000 1.237 @@ -1,3 +1,3 @@ linux-2.6.14.tar.bz2 patch-2.6.15-rc7.bz2 -patch-2.6.15-rc7-git5.bz2 +patch-2.6.15-rc7-git6.bz2 --- patch-2.6.15-rc7-git5.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 2 02:02:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 Jan 2006 21:02:34 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1550,1.1551 Message-ID: <200601020202.k0222YwJ030673@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv30602 Modified Files: kernel-2.6.spec Log Message: off by one Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1550 retrieving revision 1.1551 diff -u -r1.1550 -r1.1551 --- kernel-2.6.spec 30 Dec 2005 00:28:21 -0000 1.1550 +++ kernel-2.6.spec 2 Jan 2006 02:02:17 -0000 1.1551 @@ -1274,7 +1274,10 @@ %endif %changelog -* Wed Dec 28 2005 Dave Jones [2.6.14-1.1655_FC4] +* Sun Jan 1 2006 Dave Jones [2.6.14-1.1655_FC4] +- Fix the ACPI whitelist date again. + +* Wed Dec 28 2005 Dave Jones - Tighten permissions on /proc/pid/smaps. (#176687) * Wed Dec 28 2005 Dave Jones [2.6.14-1.1654_FC4] From fedora-cvs-commits at redhat.com Mon Jan 2 02:02:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 1 Jan 2006 21:02:34 -0500 Subject: rpms/kernel/FC-4/configs config-x86-generic,1.15,1.16 Message-ID: <200601020202.k0222Y93030684@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv30602/configs Modified Files: config-x86-generic Log Message: off by one Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- config-x86-generic 28 Dec 2005 01:57:38 -0000 1.15 +++ config-x86-generic 2 Jan 2006 02:02:31 -0000 1.16 @@ -145,7 +145,7 @@ CONFIG_ACPI_PCI=y CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_NUMA=y -CONFIG_ACPI_BLACKLIST_YEAR=2000 +CONFIG_ACPI_BLACKLIST_YEAR=2001 CONFIG_ACPI_VIDEO=m CONFIG_ACPI_IBM=m CONFIG_PNPACPI=y From fedora-cvs-commits at redhat.com Mon Jan 2 10:00:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 05:00:57 -0500 Subject: rpms/net-tools/devel net-tools-1.60-interface_stack.patch, NONE, 1.1 net-tools-1.60-hostname_man.patch, 1.1, 1.2 net-tools.spec, 1.50, 1.51 Message-ID: <200601021000.k02A0vaQ021387@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21326 Modified Files: net-tools-1.60-hostname_man.patch net-tools.spec Added Files: net-tools-1.60-interface_stack.patch Log Message: - clear static buffers in interface.c by (#176714) net-tools-1.60-interface_stack.patch: interface.c | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 deletions(-) --- NEW FILE net-tools-1.60-interface_stack.patch --- Bugzilla Bug 176714 ??? *** stack smashing detected ***: /sbin/ifconfig terminated --- lib/interface.c-old 2005-12-30 11:08:15.000000000 -0800 +++ lib/interface.c 2005-12-30 11:17:02.000000000 -0800 @@ -201,10 +201,11 @@ return err; } -static char *get_name(char *name, char *p) +static char *get_name(char **namep, char *p) { while (isspace(*p)) p++; + char *name = *namep = p; while (*p) { if (isspace(*p)) break; @@ -305,9 +306,10 @@ { static int proc_read; FILE *fh; - char buf[512]; struct interface *ife; int err; + char *line = NULL; + size_t linelen = 0; if (proc_read) return 0; @@ -320,8 +322,11 @@ _PATH_PROCNET_DEV, strerror(errno)); return if_readconf(); } - fgets(buf, sizeof buf, fh); /* eat line */ - fgets(buf, sizeof buf, fh); + if (getline(&line, &linelen, fh) == -1 /* eat line */ + || getline(&line, &linelen, fh) == -1) { + err = -1; + goto out; + } #if 0 /* pretty, but can't cope with missing fields */ fmt = proc_gen_fmt(_PATH_PROCNET_DEV, 1, fh, @@ -346,13 +351,13 @@ if (!fmt) return -1; #else - procnetdev_vsn = procnetdev_version(buf); + procnetdev_vsn = procnetdev_version(line); #endif err = 0; - while (fgets(buf, sizeof buf, fh)) { - char *s, name[IFNAMSIZ]; - s = get_name(name, buf); + while (getline(&line, &linelen, fh) != -1) { + char *s, *name; + s = get_name(&name, line); ife = add_interface(name); get_dev_fields(s, ife); ife->statistics_valid = 1; @@ -368,6 +373,8 @@ #if 0 free(fmt); #endif + out: + free(line); fclose(fh); return err; } @@ -376,8 +383,9 @@ static int if_readlist_rep(char *target, struct interface *ife) { FILE *fh; - char buf[512]; int err; + char *line = NULL; + size_t linelen = 0; fh = fopen(_PATH_PROCNET_DEV, "r"); if (!fh) { @@ -385,15 +393,18 @@ _PATH_PROCNET_DEV, strerror(errno)); return if_readconf(); } - fgets(buf, sizeof buf, fh); /* eat line */ - fgets(buf, sizeof buf, fh); + if (getline(&line, &linelen, fh) == -1 /* eat line */ + || getline(&line, &linelen, fh) == -1) { + err = -1; + goto out; + } - procnetdev_vsn = procnetdev_version(buf); + procnetdev_vsn = procnetdev_version(line); err = 0; - while (fgets(buf, sizeof buf, fh)) { - char *s, name[IFNAMSIZ]; - s = get_name(name, buf); + while (getline(&line, &linelen, fh) != -1) { + char *s, *name; + s = get_name(&name, line); get_dev_fields(s, ife); if (target && !strcmp(target,name)) { @@ -406,6 +417,8 @@ err = -1; } + out: + free(line); fclose(fh); return err; } net-tools-1.60-hostname_man.patch: hostname.1 | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+) Index: net-tools-1.60-hostname_man.patch =================================================================== RCS file: /cvs/dist/rpms/net-tools/devel/net-tools-1.60-hostname_man.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- net-tools-1.60-hostname_man.patch 15 Oct 2005 09:53:21 -0000 1.1 +++ net-tools-1.60-hostname_man.patch 2 Jan 2006 10:00:42 -0000 1.2 @@ -10,13 +10,13 @@ +is used to get the hostname. Only when the +.BR "hostname \-s" +is called will -+.BR gethostbyname(2) ++.BR gethostbyname(3) +be called. The difference in +.BR gethostname(2) +and -+.BR gethostbyname(2) ++.BR gethostbyname(3) +is that -+.BR gethostbyname(2) ++.BR gethostbyname(3) +is network aware, so it consults +.IR /etc/nsswitch.conf +and Index: net-tools.spec =================================================================== RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- net-tools.spec 9 Dec 2005 22:42:19 -0000 1.50 +++ net-tools.spec 2 Jan 2006 10:00:42 -0000 1.51 @@ -3,7 +3,7 @@ Summary: Basic networking tools. Name: net-tools Version: 1.60 -Release: 57.1 +Release: 58 License: GPL Group: System Environment/Base Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 @@ -56,6 +56,7 @@ Patch42: net-tools-1.60-ifconfig.patch Patch43: net-tools-1.60-arp_overflow.patch Patch44: net-tools-1.60-hostname_man.patch +Patch45: net-tools-1.60-interface_stack.patch BuildRoot: %{_tmppath}/%{name}-root Requires(post,preun): chkconfig @@ -108,6 +109,7 @@ %patch42 -p1 -b .iface_drop %patch43 -p1 -b .overflow %patch44 -p1 -b .hostname_man +%patch45 -p0 -b .stack cp %SOURCE2 ./config.h cp %SOURCE3 ./config.make @@ -219,6 +221,9 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Mon Jan 02 2006 Radek Vokal 1.60-58 +- clear static buffers in interface.c by (#176714) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Mon Jan 2 11:03:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 06:03:01 -0500 Subject: rpms/bash/devel bash-arrays.patch, NONE, 1.1 bash-2.05a-interpreter.patch, 1.3, 1.4 bash-2.05b-xcc.patch, 1.1, 1.2 bash-sighandler.patch, 1.6, 1.7 bash-ulimit.patch, 1.4, 1.5 bash.spec, 1.96, 1.97 sources, 1.10, 1.11 bash-2.05-ia64.patch, 1.2, NONE bash-2.05b-utf8.patch, 1.1, NONE bash-afs.patch, 1.1, NONE bash-crash.patch, 1.1, NONE bash-jobs.patch, 1.2, NONE bash-manpage.patch, 1.1, NONE bash-multibyteifs.patch, 1.4, NONE bash-pwd.patch, 1.1, NONE bash-read-e-segfault.patch, 1.3, NONE bash-sigpipe.patch, 1.1, NONE bash-subshell.patch, 1.1, NONE bash-wrap.patch, 1.1, NONE bash30-001, 1.1, NONE bash30-002, 1.1, NONE bash30-003, 1.1, NONE bash30-004, 1.1, NONE bash30-005, 1.1, NONE bash30-006, 1.1, NONE bash30-007, 1.1, NONE bash30-008, 1.1, NONE bash30-009, 1.1, NONE bash30-010, 1.1, NONE bash30-011, 1.1, NONE bash30-012, 1.1, NONE bash30-013, 1.1, NONE bash30-014, 1.1, NONE bash30-015, 1.1, NONE bash30-016, 1.1, NONE Message-ID: <200601021103.k02B318J022989@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22969 Modified Files: bash-2.05a-interpreter.patch bash-2.05b-xcc.patch bash-sighandler.patch bash-ulimit.patch bash.spec sources Added Files: bash-arrays.patch Removed Files: bash-2.05-ia64.patch bash-2.05b-utf8.patch bash-afs.patch bash-crash.patch bash-jobs.patch bash-manpage.patch bash-multibyteifs.patch bash-pwd.patch bash-read-e-segfault.patch bash-sigpipe.patch bash-subshell.patch bash-wrap.patch bash30-001 bash30-002 bash30-003 bash30-004 bash30-005 bash30-006 bash30-007 bash30-008 bash30-009 bash30-010 bash30-011 bash30-012 bash30-013 bash30-014 bash30-015 bash30-016 Log Message: * Mon Jan 2 2006 Tim Waugh 3.1-1 - 3.1. - No longer need ia64, utf8, multibyteifs, jobs, sigpipe, read-e-segfault, manpage, crash, pwd, afs, subshell patches. - Remove wrap patch for now. - Use upstream patch to fix arrays. bash-arrays.patch: subst.c | 2 !! 1 files changed, 2 modifications(!) --- NEW FILE bash-arrays.patch --- Mike Frysinger wrote: > On Thu, Dec 22, 2005 at 09:24:06AM -0500, Chet Ramey wrote: >> Bash-Release: 3.1 >> Patch-ID: bash31-001 >> >> Bug-Description: >> >> There are parsing problems with compound assignments in several contexts, >> including as arguments to builtins like `local', `eval', and `let', and >> as multiple assignments in a single command. > > still seems to be a slight regression here with arrays ... Try this: *** ../bash-3.1/subst.c Mon Oct 24 09:51:13 2005 --- subst.c Fri Dec 23 15:21:09 2005 *************** *** 2188,2192 **** { v = find_variable (name); ! if (v == 0 || array_p (v) == 0) v = make_local_array_variable (name); v = assign_array_var_from_string (v, value, flags); --- 2188,2192 ---- { v = find_variable (name); ! if (v == 0 || array_p (v) == 0 || v->context != variable_context) v = make_local_array_variable (name); v = assign_array_var_from_string (v, value, flags); -- ``The lyf so short, the craft so long to lerne.'' - Chaucer ( ``Discere est Dolere'' -- chet ) Live Strong. Chet Ramey, ITS, CWRU chet at case.edu http://cnswww.cns.cwru.edu/~chet/ _______________________________________________ Bug-bash mailing list Bug-bash at gnu.org http://lists.gnu.org/mailman/listinfo/bug-bash bash-2.05a-interpreter.patch: config.h.in | 6 ++ configure.in | 4 - execute_cmd.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 151 insertions(+), 3 deletions(-) Index: bash-2.05a-interpreter.patch =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash-2.05a-interpreter.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bash-2.05a-interpreter.patch 9 Sep 2004 03:31:08 -0000 1.3 +++ bash-2.05a-interpreter.patch 2 Jan 2006 11:02:47 -0000 1.4 @@ -1,6 +1,6 @@ ---- bash-3.0/config.h.in.interpreter 2004-07-28 09:40:15.259722811 +0100 -+++ bash-3.0/config.h.in 2004-07-28 09:40:15.429690416 +0100 -@@ -601,6 +601,9 @@ +--- bash-3.1/config.h.in.interpreter 2005-12-23 15:53:21.000000000 +0000 ++++ bash-3.1/config.h.in 2005-12-23 15:53:21.000000000 +0000 +@@ -622,6 +622,9 @@ /* Define if you have the pathconf function. */ #undef HAVE_PATHCONF @@ -10,7 +10,7 @@ /* Define if you have the putenv function. */ #undef HAVE_PUTENV -@@ -756,6 +759,9 @@ +@@ -783,6 +786,9 @@ /* Define if you have the header file. */ #undef HAVE_DLFCN_H @@ -20,28 +20,28 @@ /* Define if you have the header file. */ #undef HAVE_GRP_H ---- bash-3.0/configure.in.interpreter 2004-07-21 21:06:54.000000000 +0100 -+++ bash-3.0/configure.in 2004-07-28 09:43:21.657196239 +0100 -@@ -573,7 +573,7 @@ +--- bash-3.1/configure.in.interpreter 2005-12-01 14:36:03.000000000 +0000 ++++ bash-3.1/configure.in 2005-12-23 15:55:10.000000000 +0000 +@@ -632,7 +632,7 @@ AC_CHECK_HEADERS(unistd.h stdlib.h stdarg.h varargs.h limits.h string.h \ memory.h locale.h termcap.h termio.h termios.h dlfcn.h \ -- stddef.h stdint.h netdb.h grp.h strings.h regex.h) -+ stddef.h stdint.h netdb.h grp.h strings.h regex.h elf.h) - AC_CHECK_HEADERS(sys/ptem.h sys/pte.h sys/stream.h sys/select.h sys/file.h \ +- stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h) ++ stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h elf.h) + AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h \ sys/resource.h sys/param.h sys/socket.h sys/stat.h \ sys/time.h sys/times.h sys/types.h sys/wait.h) -@@ -628,7 +628,7 @@ - AC_CHECK_FUNCS(dup2 select getdtablesize getgroups gethostname \ - setdtablesize getpagesize killpg lstat getpeername sbrk \ - getrlimit getrusage gettimeofday waitpid tcgetpgrp \ -- readlink) -+ readlink pread) +@@ -695,7 +695,7 @@ + AC_CHECK_FUNCS(dup2 fcntl getdtablesize getgroups gethostname getpagesize \ + getpeername getrlimit getrusage gettimeofday kill killpg \ + lstat readlink sbrk select setdtablesize tcgetpgrp uname \ +- ulimit waitpid) ++ ulimit waitpid pread) AC_REPLACE_FUNCS(rename) dnl checks for c library functions ---- bash-3.0/execute_cmd.c.interpreter 2004-07-28 09:40:15.386698610 +0100 -+++ bash-3.0/execute_cmd.c 2004-07-28 09:40:15.449686605 +0100 +--- bash-3.1/execute_cmd.c.interpreter 2005-12-23 15:53:21.000000000 +0000 ++++ bash-3.1/execute_cmd.c 2005-12-23 15:56:44.000000000 +0000 @@ -40,6 +40,10 @@ # include #endif @@ -53,7 +53,7 @@ #include "posixtime.h" #if defined (HAVE_SYS_RESOURCE_H) && !defined (RLIMTYPE) -@@ -3842,12 +3846,20 @@ +@@ -3872,13 +3876,21 @@ { /* The file has the execute bits set, but the kernel refuses to run it for some reason. See why. */ @@ -70,12 +70,13 @@ if (sample_len > 2 && sample[0] == '#' && sample[1] == '!') { char *interp; + int ilen; + close (fd); interp = getinterp (sample, sample_len, (int *)NULL); + ilen = strlen (interp); errno = i; - sys_error (_("%s: %s: bad interpreter"), command, interp ? interp : ""); -@@ -3855,6 +3867,136 @@ +@@ -3894,6 +3906,136 @@ return (EX_NOEXEC); } #endif bash-2.05b-xcc.patch: Makefile.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) Index: bash-2.05b-xcc.patch =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash-2.05b-xcc.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bash-2.05b-xcc.patch 9 Sep 2004 03:27:29 -0000 1.1 +++ bash-2.05b-xcc.patch 2 Jan 2006 11:02:47 -0000 1.2 @@ -1,29 +1,19 @@ ---- bash-2.05b/Makefile.in.sopwith 2002-12-05 14:03:50.000000000 -0500 -+++ bash-2.05b/Makefile.in 2002-12-05 14:04:13.000000000 -0500 -@@ -57,6 +57,7 @@ - AR = @AR@ +--- bash-3.1/Makefile.in.xcc 2005-10-25 19:37:52.000000000 +0100 ++++ bash-3.1/Makefile.in 2005-12-23 16:11:09.000000000 +0000 +@@ -68,6 +68,7 @@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ -+STRIP=strip + SIZE = @SIZE@ ++STRIP = strip INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -471,7 +472,6 @@ - $(RM) $@ - $(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS) - ls -l $(Program) -- size $(Program) - - .build: $(SOURCES) config.h Makefile version.h $(VERSPROG) - @echo -@@ -491,9 +491,8 @@ +@@ -535,7 +536,7 @@ @chmod a+rx bashbug strip: $(Program) .made - strip $(Program) + $(STRIP) $(Program) ls -l $(Program) -- size $(Program) + -$(SIZE) $(Program) - lint: - ${MAKE} ${MFLAGS} CFLAGS='${GCC_LINT_FLAGS}' .made bash-sighandler.patch: builtins/read.def | 1 + execute_cmd.c | 1 + input.c | 2 ++ jobs.c | 2 ++ lib/readline/input.c | 7 +++++++ lib/sh/zread.c | 7 +++++-- sig.c | 11 +++++++++-- sig.h | 11 +++++++++++ 8 files changed, 38 insertions(+), 4 deletions(-) Index: bash-sighandler.patch =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash-sighandler.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bash-sighandler.patch 15 Dec 2005 10:59:56 -0000 1.6 +++ bash-sighandler.patch 2 Jan 2006 11:02:47 -0000 1.7 @@ -1,6 +1,6 @@ ---- bash-3.0/builtins/read.def.sighandler 2004-01-24 18:16:36.000000000 +0000 -+++ bash-3.0/builtins/read.def 2005-12-15 10:46:35.000000000 +0000 -@@ -460,6 +460,7 @@ +--- bash-3.1/builtins/read.def.sighandler 2005-08-21 02:46:19.000000000 +0100 ++++ bash-3.1/builtins/read.def 2005-12-23 16:16:24.000000000 +0000 +@@ -471,6 +471,7 @@ #if 1 if (retval < 0) { @@ -8,8 +8,8 @@ builtin_error (_("read error: %d: %s"), fd, strerror (errno)); return (EXECUTION_FAILURE); } ---- bash-3.0/lib/readline/input.c.sighandler 2004-07-12 20:33:44.000000000 +0100 -+++ bash-3.0/lib/readline/input.c 2005-12-15 10:46:35.000000000 +0000 +--- bash-3.1/lib/readline/input.c.sighandler 2005-07-05 03:30:24.000000000 +0100 ++++ bash-3.1/lib/readline/input.c 2005-12-23 16:16:24.000000000 +0000 @@ -435,6 +435,10 @@ return (c); } @@ -21,7 +21,7 @@ int rl_getc (stream) FILE *stream; -@@ -454,6 +458,9 @@ +@@ -458,6 +462,9 @@ if (result == 0) return (EOF); @@ -31,8 +31,8 @@ #if defined (__BEOS__) if (errno == EINTR) continue; ---- bash-3.0/lib/sh/zread.c.sighandler 2002-04-04 19:33:33.000000000 +0100 -+++ bash-3.0/lib/sh/zread.c 2005-12-15 10:46:35.000000000 +0000 +--- bash-3.1/lib/sh/zread.c.sighandler 2005-03-10 03:17:05.000000000 +0000 ++++ bash-3.1/lib/sh/zread.c 2005-12-23 16:16:24.000000000 +0000 @@ -34,6 +34,9 @@ # define SEEK_CUR 1 #endif @@ -61,8 +61,8 @@ return -1; continue; } ---- bash-3.0/sig.c.sighandler 2003-12-19 21:11:35.000000000 +0000 -+++ bash-3.0/sig.c 2005-12-15 10:46:35.000000000 +0000 +--- bash-3.1/sig.c.sighandler 2005-10-22 22:04:03.000000000 +0100 ++++ bash-3.1/sig.c 2005-12-23 16:17:16.000000000 +0000 @@ -58,6 +58,8 @@ extern int loop_level, continuing, breaking; extern int parse_and_execute_level, shell_initialized; @@ -72,7 +72,7 @@ /* Non-zero after SIGINT. */ int interrupt_state; -@@ -408,6 +410,13 @@ +@@ -421,6 +423,13 @@ termination_unwind_protect (sig) int sig; { @@ -83,10 +83,10 @@ +void +do_termination_unwind_protect (int sig) +{ + /* I don't believe this condition ever tests true. */ if (sig == SIGINT && signal_is_trapped (SIGINT)) run_interrupt_trap (); - -@@ -429,8 +438,6 @@ +@@ -446,8 +455,6 @@ run_exit_trap (); set_signal_handler (sig, SIG_DFL); kill (getpid (), sig); @@ -95,11 +95,11 @@ } /* What we really do when SIGINT occurs. */ ---- bash-3.0/sig.h.sighandler 2005-12-15 10:46:35.000000000 +0000 -+++ bash-3.0/sig.h 2005-12-15 10:46:35.000000000 +0000 -@@ -109,8 +109,12 @@ - - #endif /* JOB_CONTROL */ +--- bash-3.1/sig.h.sighandler 2005-12-23 16:16:24.000000000 +0000 ++++ bash-3.1/sig.h 2005-12-23 16:16:24.000000000 +0000 +@@ -112,8 +112,12 @@ + /* Extern variables */ + extern volatile int sigwinch_received; +/* Global variables from sig.c */ +extern int need_termination_unwind_protect; @@ -110,7 +110,7 @@ extern sighandler sigint_sighandler __P((int)); extern void initialize_signals __P((int)); extern void initialize_terminating_signals __P((void)); -@@ -123,4 +127,11 @@ +@@ -130,4 +134,11 @@ extern SigHandler *trap_to_sighandler __P((int)); extern sighandler trap_handler __P((int)); @@ -122,8 +122,8 @@ + } while (0) + #endif /* _SIG_H_ */ ---- bash-3.0/input.c.sighandler 2003-12-19 05:09:03.000000000 +0000 -+++ bash-3.0/input.c 2005-12-15 10:46:35.000000000 +0000 +--- bash-3.1/input.c.sighandler 2005-07-14 13:29:08.000000000 +0100 ++++ bash-3.1/input.c 2005-12-23 16:16:24.000000000 +0000 @@ -41,6 +41,7 @@ #include "input.h" #include "error.h" @@ -140,17 +140,17 @@ local_bufused = read (fileno (stream), localbuf, sizeof(localbuf)); if (local_bufused > 0) break; ---- bash-3.0/jobs.c.sighandler 2005-12-15 10:46:35.000000000 +0000 -+++ bash-3.0/jobs.c 2005-12-15 10:46:35.000000000 +0000 -@@ -2513,6 +2513,7 @@ - retry: - if (wcontinued_not_supported) - waitpid_flags &= ~WCONTINUED; +--- bash-3.1/jobs.c.sighandler 2005-12-23 16:16:24.000000000 +0000 ++++ bash-3.1/jobs.c 2005-12-23 16:30:30.000000000 +0000 +@@ -2884,6 +2884,7 @@ + : 0; + if (sigchld || block == 0) + waitpid_flags |= WNOHANG; + CATCH_SIGNALS (); pid = WAITPID (-1, &status, waitpid_flags); - if (pid == -1 && errno == EINVAL) - { -@@ -2537,6 +2538,7 @@ + + /* WCONTINUED may be rejected by waitpid as invalid even when defined */ +@@ -2910,6 +2911,7 @@ /* If waitpid returns 0, there are running children. If it returns -1, the only other error POSIX says it can return is EINTR. */ @@ -158,9 +158,9 @@ if (pid <= 0) continue; /* jumps right to the test */ ---- bash-3.0/execute_cmd.c.sighandler 2005-12-15 10:46:35.000000000 +0000 -+++ bash-3.0/execute_cmd.c 2005-12-15 10:46:35.000000000 +0000 -@@ -360,6 +360,7 @@ +--- bash-3.1/execute_cmd.c.sighandler 2005-12-23 16:16:24.000000000 +0000 ++++ bash-3.1/execute_cmd.c 2005-12-23 16:16:24.000000000 +0000 +@@ -363,6 +363,7 @@ unlink_fifo_list (); #endif /* PROCESS_SUBSTITUTION */ bash-ulimit.patch: builtins/ulimit.def | 11 +++++++++++ doc/bash.1 | 17 ++++++++++++++++- doc/bashref.texi | 17 ++++++++++++++++- 3 files changed, 43 insertions(+), 2 deletions(-) Index: bash-ulimit.patch =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash-ulimit.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bash-ulimit.patch 8 Aug 2005 10:33:15 -0000 1.4 +++ bash-ulimit.patch 2 Jan 2006 11:02:47 -0000 1.5 @@ -1,27 +1,22 @@ ---- bash-3.0/builtins/ulimit.def.ulimit 2003-12-20 00:07:27.000000000 +0000 -+++ bash-3.0/builtins/ulimit.def 2005-06-23 10:13:46.000000000 +0100 -@@ -34,15 +34,20 @@ +--- bash-3.1/builtins/ulimit.def.ulimit 2005-08-04 13:39:04.000000000 +0100 ++++ bash-3.1/builtins/ulimit.def 2005-12-23 16:06:56.000000000 +0000 +@@ -34,6 +34,7 @@ -a all current limits are reported -c the maximum size of core files created -d the maximum size of a process's data segment + -e the maximum scheduling priority (`nice') -f the maximum size of files created by the shell -+ -i the maximum number of pending signals + -i the maximum number of pending signals -l the maximum size a process may lock into memory - -m the maximum resident set size +@@ -41,6 +42,7 @@ -n the maximum number of open file descriptors -p the pipe buffer size -+ -q the maximum number of bytes in POSIX message queues + -q the maximum number of bytes in POSIX message queues + -r the maximum rt priority -s the maximum stack size -t the maximum amount of cpu time in seconds -u the maximum number of user processes - -v the size of virtual memory -+ -x the maximum number of file locks - - If LIMIT is given, it is the new value of the specified resource; - the special LIMIT values `soft', `hard', and `unlimited' stand for -@@ -199,7 +204,13 @@ +@@ -202,6 +204,9 @@ #ifdef RLIMIT_DATA { 'd', RLIMIT_DATA, 1024, "data seg size", "kbytes" }, #endif @@ -29,28 +24,21 @@ + { 'e', RLIMIT_NICE, 1, "max nice", (char *)NULL}, +#endif /* RLIMIT_NICE */ { 'f', RLIMIT_FILESIZE, 1024, "file size", "blocks" }, -+#ifdef RLIMIT_SIGPENDING -+ { 'i', RLIMIT_SIGPENDING, 1, "pending signals", (char *)NULL}, -+#endif - #ifdef RLIMIT_MEMLOCK - { 'l', RLIMIT_MEMLOCK, 1024, "max locked memory", "kbytes" }, + #ifdef RLIMIT_SIGPENDING + { 'i', RLIMIT_SIGPENDING, 1, "pending signals", (char *)NULL }, +@@ -217,6 +222,9 @@ + #ifdef RLIMIT_MSGQUEUE + { 'q', RLIMIT_MSGQUEUE, 1, "POSIX message queues", "bytes" }, #endif -@@ -208,6 +219,12 @@ - #endif /* RLIMIT_RSS */ - { 'n', RLIMIT_OPENFILES, 1, "open files", (char *)NULL}, - { 'p', RLIMIT_PIPESIZE, 512, "pipe size", "512 bytes" }, -+#ifdef RLIMIT_MSGQUEUE -+ { 'q', RLIMIT_MSGQUEUE, 1, "POSIX message queues", "bytes" }, -+#endif +#ifdef RLIMIT_RTPRIO + { 'r', RLIMIT_RTPRIO, 1, "max rt priority", (char *)NULL}, +#endif /* RLIMIT_RTPRIO */ #ifdef RLIMIT_STACK { 's', RLIMIT_STACK, 1024, "stack size", "kbytes" }, #endif -@@ -221,6 +238,9 @@ - #ifdef RLIMIT_SWAP - { 'w', RLIMIT_SWAP, 1024, "swap size", "kbytes" }, +@@ -233,6 +241,9 @@ + #ifdef RLIMIT_LOCKS + { 'x', RLIMIT_LOCKS, 1, "file locks", (char *)NULL }, #endif +#ifdef RLIMIT_LOCKS + { 'x', RLIMIT_LOCKS, 1, "file locks", (char *)NULL}, @@ -58,33 +46,9 @@ { -1, -1, -1, (char *)NULL, (char *)NULL } }; #define NCMDS (sizeof(limits) / sizeof(limits[0])) -@@ -647,11 +667,11 @@ - - for (i = 0; limits[i].option > 0; i++) - { -- if (get_limit (i, &softlim, &hardlim) < 0) -+ if (get_limit (i, &softlim, &hardlim) == 0) -+ printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1); -+ else if (errno != EINVAL) - builtin_error ("%s: cannot get limit: %s", limits[i].description, - strerror (errno)); -- else -- printone (i, (mode & LIMIT_SOFT) ? softlim : hardlim, 1); - } - } - -@@ -670,7 +690,7 @@ - else - sprintf (unitstr, "(-%c) ", limits[limind].option); - -- printf ("%-18s %16s", limits[limind].description, unitstr); -+ printf ("%-20s %16s", limits[limind].description, unitstr); - } - if (curlim == RLIM_INFINITY) - puts ("unlimited"); ---- bash-3.0/doc/bashref.texi.ulimit 2005-06-23 10:14:54.000000000 +0100 -+++ bash-3.0/doc/bashref.texi 2005-06-23 11:13:31.000000000 +0100 -@@ -3793,7 +3793,7 @@ +--- bash-3.1/doc/bashref.texi.ulimit 2005-12-23 16:04:31.000000000 +0000 ++++ bash-3.1/doc/bashref.texi 2005-12-23 16:04:31.000000000 +0000 +@@ -3833,7 +3833,7 @@ @item ulimit @btindex ulimit @example @@ -93,7 +57,7 @@ @end example @code{ulimit} provides control over the resources available to processes started by the shell, on systems that allow such control. If an -@@ -3814,9 +3814,15 @@ +@@ -3854,9 +3854,15 @@ @item -d The maximum size of a process's data segment. @@ -109,7 +73,7 @@ @item -l The maximum size that may be locked into memory. -@@ -3829,6 +3835,12 @@ +@@ -3869,6 +3875,12 @@ @item -p The pipe buffer size. @@ -122,7 +86,7 @@ @item -s The maximum stack size. -@@ -3841,6 +3853,9 @@ +@@ -3881,6 +3893,9 @@ @item -v The maximum amount of virtual memory available to the process. @@ -132,9 +96,9 @@ @end table If @var{limit} is given, it is the new value of the specified resource; ---- bash-3.0/doc/bash.1.ulimit 2005-06-23 11:28:48.000000000 +0100 -+++ bash-3.0/doc/bash.1 2005-06-23 12:45:29.000000000 +0100 -@@ -8362,7 +8362,7 @@ +--- bash-3.1/doc/bash.1.ulimit 2005-12-23 16:04:31.000000000 +0000 ++++ bash-3.1/doc/bash.1 2005-12-23 16:04:31.000000000 +0000 +@@ -8490,7 +8490,7 @@ returns true if any of the arguments are found, false if none are found. .TP @@ -143,7 +107,7 @@ Provides control over the resources available to the shell and to processes started by it, on systems that allow such control. The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is -@@ -8398,9 +8398,15 @@ +@@ -8526,9 +8526,15 @@ .B \-d The maximum size of a process's data segment .TP @@ -159,7 +123,7 @@ .B \-l The maximum size that may be locked into memory .TP -@@ -8414,6 +8420,12 @@ +@@ -8542,6 +8548,12 @@ .B \-p The pipe size in 512-byte blocks (this may not be set) .TP @@ -172,7 +136,7 @@ .B \-s The maximum stack size .TP -@@ -8425,6 +8437,9 @@ +@@ -8553,6 +8565,9 @@ .TP .B \-v The maximum amount of virtual memory available to the shell Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- bash.spec 15 Dec 2005 10:59:56 -0000 1.96 +++ bash.spec 2 Jan 2006 11:02:47 -0000 1.97 @@ -1,7 +1,7 @@ -Version: 3.0 +Version: 3.1 Name: bash Summary: The GNU Bourne Again shell (bash) version %{version}. -Release: 41 +Release: 1 Group: System Environment/Shells License: GPL Url: http://www.gnu.org/software/bash @@ -11,52 +11,26 @@ Source4: dot-bash_profile Source5: dot-bash_logout # Official upstream patches -Patch1: bash30-001 -Patch2: bash30-002 -Patch3: bash30-003 -Patch4: bash30-004 -Patch5: bash30-005 -Patch6: bash30-006 -Patch7: bash30-007 -Patch8: bash30-008 -Patch9: bash30-009 -Patch10: bash30-010 -Patch11: bash30-011 -Patch12: bash30-012 -Patch13: bash30-013 -Patch14: bash30-014 -Patch15: bash30-015 -Patch16: bash30-016 +Patch1: bash31-001 +Patch2: bash-arrays.patch # Other patches Patch100: bash-2.03-paths.patch Patch101: bash-2.02-security.patch Patch102: bash-2.03-profile.patch Patch103: bash-2.05a-requires.patch Patch104: bash-2.05a-shellfunc.patch -Patch105: bash-2.05-ia64.patch Patch106: bash-2.05a-loadables.patch Patch107: bash-2.05a-interpreter.patch Patch108: bash-2.05b-readline-oom.patch -Patch109: bash-2.05b-utf8.patch Patch110: bash-2.05b-mbinc.patch -Patch111: bash-multibyteifs.patch Patch112: bash-ulimit.patch -Patch113: bash-jobs.patch Patch114: bash-2.05b-xcc.patch Patch115: bash-2.05b-pgrp_sync.patch Patch116: bash-2.05b-manso.patch Patch117: bash-2.05b-debuginfo.patch Patch118: bash-tty-tests.patch -Patch119: bash-sigpipe.patch -Patch120: bash-read-e-segfault.patch -Patch121: bash-manpage.patch -Patch122: bash-wrap.patch -Patch123: bash-crash.patch -Patch124: bash-pwd.patch -Patch125: bash-afs.patch Patch126: bash-setlocale.patch Patch127: bash-sighandler.patch -Patch128: bash-subshell.patch Patch129: bash-read-memleak.patch Prefix: %{_prefix} Requires: mktemp @@ -82,21 +56,7 @@ %setup -q -a 2 # Official upstream patches %patch1 -p0 -b .001 -%patch2 -p0 -b .002 -%patch3 -p0 -b .003 -%patch4 -p0 -b .004 -%patch5 -p0 -b .005 -%patch6 -p0 -b .006 -%patch7 -p0 -b .007 -%patch8 -p0 -b .008 -%patch9 -p0 -b .009 -%patch10 -p0 -b .010 -%patch11 -p0 -b .011 -%patch12 -p0 -b .012 -%patch13 -p0 -b .013 -%patch14 -p0 -b .014 -%patch15 -p0 -b .015 -%patch16 -p0 -b .016 +%patch2 -p0 -b .arrays # Other patches %patch100 -p1 -b .paths @@ -104,30 +64,18 @@ %patch102 -p1 -b .profile %patch103 -p1 -b .requires %patch104 -p1 -b .shellfunc -%patch105 -p1 -b .ia64 %patch106 -p1 -b .loadables %patch107 -p1 -b .interpreter %patch108 -p1 -b .readline-oom -%patch109 -p1 -b .utf8 %patch110 -p1 -b .mbinc -%patch111 -p1 -b .multibyteifs %patch112 -p1 -b .ulimit -%patch113 -p1 -b .jobs %patch114 -p1 -b .xcc %patch115 -p1 -b .pgrp_sync %patch116 -p1 -b .manso %patch117 -p1 -b .debuginfo %patch118 -p1 -b .tty-tests -%patch119 -p1 -b .sigpipe -%patch120 -p0 -b .read-e-segfault -%patch121 -p1 -b .manpage -%patch122 -p1 -b .wrap -%patch123 -p0 -b .crash -%patch124 -p1 -b .pwd -%patch125 -p1 -b .afs %patch126 -p1 -b .setlocale %patch127 -p1 -b .sighandler -%patch128 -p1 -b .subshell %patch129 -p1 -b .read-memleak echo %{version} > _distribution @@ -261,6 +209,13 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Mon Jan 2 2006 Tim Waugh 3.1-1 +- 3.1. +- No longer need ia64, utf8, multibyteifs, jobs, sigpipe, + read-e-segfault, manpage, crash, pwd, afs, subshell patches. +- Remove wrap patch for now. +- Use upstream patch to fix arrays. + * Thu Dec 15 2005 Tim Waugh 3.0-41 - Missed another loop for improved sighandler patch (bug #169231). Index: sources =================================================================== RCS file: /cvs/dist/rpms/bash/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 9 Sep 2004 03:32:28 -0000 1.10 +++ sources 2 Jan 2006 11:02:48 -0000 1.11 @@ -1,2 +1,3 @@ -26c4d642e29b3533d8d754995bc277b3 bash-3.0.tar.gz 1fd06916fb451a666a38e4689173b60b bash-doc-3.0.tar.gz +ef5304c4b22aaa5088972c792ed45d72 bash-3.1.tar.gz +a8c517c6a7b21b8b855190399c5935ae bash-doc-3.1.tar.gz --- bash-2.05-ia64.patch DELETED --- --- bash-2.05b-utf8.patch DELETED --- --- bash-afs.patch DELETED --- --- bash-crash.patch DELETED --- --- bash-jobs.patch DELETED --- --- bash-manpage.patch DELETED --- --- bash-multibyteifs.patch DELETED --- --- bash-pwd.patch DELETED --- --- bash-read-e-segfault.patch DELETED --- --- bash-sigpipe.patch DELETED --- --- bash-subshell.patch DELETED --- --- bash-wrap.patch DELETED --- --- bash30-001 DELETED --- --- bash30-002 DELETED --- --- bash30-003 DELETED --- --- bash30-004 DELETED --- --- bash30-005 DELETED --- --- bash30-006 DELETED --- --- bash30-007 DELETED --- --- bash30-008 DELETED --- --- bash30-009 DELETED --- --- bash30-010 DELETED --- --- bash30-011 DELETED --- --- bash30-012 DELETED --- --- bash30-013 DELETED --- --- bash30-014 DELETED --- --- bash30-015 DELETED --- --- bash30-016 DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 2 11:04:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 06:04:37 -0500 Subject: rpms/bash/devel sources,1.11,1.12 Message-ID: <200601021104.k02B4b5H023300@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23277 Modified Files: sources Log Message: New source tarball. Index: sources =================================================================== RCS file: /cvs/dist/rpms/bash/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 2 Jan 2006 11:02:48 -0000 1.11 +++ sources 2 Jan 2006 11:04:34 -0000 1.12 @@ -1,3 +1,2 @@ -1fd06916fb451a666a38e4689173b60b bash-doc-3.0.tar.gz ef5304c4b22aaa5088972c792ed45d72 bash-3.1.tar.gz a8c517c6a7b21b8b855190399c5935ae bash-doc-3.1.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 2 11:08:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 06:08:18 -0500 Subject: rpms/bash/devel bash31-001,NONE,1.1 Message-ID: <200601021108.k02B8IaD024289@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24257 Added Files: bash31-001 Log Message: New upstream patch --- NEW FILE bash31-001 --- BASH PATCH REPORT ================= Bash-Release: 3.1 Patch-ID: bash31-001 Bug-Reported-by: Mike Frysinger Bug-Reference-ID: <20051212015924.GA820 at toucan.gentoo.org> <20051214034438.GK1863 at toucan.gentoo.org> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00030.html http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00041.html Bug-Description: There are parsing problems with compound assignments in several contexts, including as arguments to builtins like `local', `eval', and `let', and as multiple assignments in a single command. Patch: *** ../bash-3.1/parse.y Fri Nov 11 23:14:18 2005 --- parse.y Fri Dec 16 20:43:07 2005 *************** *** 3696,3700 **** b = builtin_address_internal (token, 0); if (b && (b->flags & ASSIGNMENT_BUILTIN)) ! parser_state |= PST_ASSIGNOK; } --- 3696,3702 ---- b = builtin_address_internal (token, 0); if (b && (b->flags & ASSIGNMENT_BUILTIN)) ! parser_state |= PST_ASSIGNOK; ! else if (STREQ (token, "eval") || STREQ (token, "let")) ! parser_state |= PST_ASSIGNOK; } *************** *** 4687,4691 **** { WORD_LIST *wl, *rl; ! int tok, orig_line_number, orig_token_size; char *saved_token, *ret; --- 4689,4693 ---- { WORD_LIST *wl, *rl; ! int tok, orig_line_number, orig_token_size, orig_last_token, assignok; char *saved_token, *ret; *************** *** 4693,4696 **** --- 4695,4699 ---- orig_token_size = token_buffer_size; orig_line_number = line_number; + orig_last_token = last_read_token; last_read_token = WORD; /* WORD to allow reserved words here */ *************** *** 4699,4702 **** --- 4702,4707 ---- token_buffer_size = 0; + assignok = parser_state&PST_ASSIGNOK; /* XXX */ + wl = (WORD_LIST *)NULL; /* ( */ parser_state |= PST_COMPASSIGN; *************** *** 4741,4745 **** } ! last_read_token = WORD; if (wl) { --- 4746,4750 ---- } ! last_read_token = orig_last_token; /* XXX - was WORD? */ if (wl) { *************** *** 4753,4756 **** --- 4758,4765 ---- if (retlenp) *retlenp = (ret && *ret) ? strlen (ret) : 0; + + if (assignok) + parser_state |= PST_ASSIGNOK; + return ret; } *** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 --- patchlevel.h Wed Dec 7 13:48:42 2005 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 0 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 1 #endif /* _PATCHLEVEL_H_ */ From fedora-cvs-commits at redhat.com Mon Jan 2 11:34:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 06:34:52 -0500 Subject: rpms/glibc/devel .cvsignore, 1.126, 1.127 glibc-fedora.patch, 1.117, 1.118 glibc.spec, 1.197, 1.198 sources, 1.148, 1.149 Message-ID: <200601021134.k02BYqUq013575@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13531/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.3.90-24 on branch devel from glibc-2.3.90-24.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- .cvsignore 27 Dec 2005 16:48:46 -0000 1.126 +++ .cvsignore 2 Jan 2006 11:34:49 -0000 1.127 @@ -1,2 +1,2 @@ -glibc-20051227T1426.tar.bz2 -glibc-fedora-20051227T1426.tar.bz2 +glibc-20060102T1045.tar.bz2 +glibc-fedora-20060102T1045.tar.bz2 glibc-fedora.patch: ChangeLog | 58 ++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 +++ csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 38 ++ elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 ++- include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 + libio/stdio.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 ++ localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 +- malloc/mtrace.c | 20 + nptl/ChangeLog | 19 + nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 + nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - nscd/selinux.c | 2 posix/Makefile | 19 - posix/getconf.speclist.h | 15 + sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------------------- sysdeps/ia64/libgcc-compat.c | 84 ++++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 ++ sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/tcsetattr.c | 32 ++ 47 files changed, 769 insertions(+), 448 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- glibc-fedora.patch 27 Dec 2005 16:48:46 -0000 1.117 +++ glibc-fedora.patch 2 Jan 2006 11:34:49 -0000 1.118 @@ -1,35 +1,17 @@ ---- glibc-20051227T1426/ChangeLog 27 Dec 2005 01:04:06 -0000 1.9813 -+++ glibc-20051227T1426-fedora/ChangeLog 27 Dec 2005 16:21:06 -0000 1.8782.2.144 -@@ -1,3 +1,28 @@ +--- glibc-20060102T1045/ChangeLog 1 Jan 2006 19:18:49 -0000 1.9842 ++++ glibc-20060102T1045-fedora/ChangeLog 2 Jan 2006 10:52:48 -0000 1.8782.2.145 +@@ -266,6 +266,10 @@ + + * elf/order2mod2.c (init): Cast ignored value to void. + +2005-12-27 Jakub Jelinek + + * elf/ldconfig.c (search_dir): Skip prelink temporaries. + -+2005-12-27 Ulrich Drepper -+ -+ * sysdeps/unix/sysv/linux/sparc/bits/errno.h: Define EOWNERDEAD -+ and ENOTRECOVERABLE if not already defined. -+ * sysdeps/unix/sysv/linux/alpha/bits/errno.h: Likewise. -+ -+2005-12-27 Jakub Jelinek -+ -+ * sysdeps/unix/sysv/linux/alpha/Versions: Add new errlist-compat -+ entry for up to 138 errnos. -+ -+2005-12-27 Jakub Jelinek -+ -+ * iconv/gconv_trans.c (__gconv_transliterate): Demangle step __fct -+ before calling it. -+ -+2005-12-27 David S. Miller -+ -+ * sysdeps/unix/sysv/linux/sparc/Versions: Add new errlist-compat -+ entry for up to 134 errnos. -+ - 2005-12-26 Ulrich Drepper + 2005-12-27 Ulrich Drepper - * Versions.def: Add GLIBC_2.4 for libpthread. -@@ -254,6 +279,26 @@ + * elf/tst-tls13.c (do_test): Avoid using the library path when +@@ -549,6 +553,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -56,7 +38,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -3372,6 +3417,11 @@ +@@ -3667,6 +3691,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -68,7 +50,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -4366,6 +4416,12 @@ +@@ -4661,6 +4690,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -81,7 +63,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -4490,6 +4546,17 @@ +@@ -4785,6 +4820,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -99,7 +81,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -7550,6 +7617,18 @@ +@@ -7845,6 +7891,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -118,8 +100,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20051227T1426/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20051227T1426-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060102T1045/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060102T1045-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -169,8 +151,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20051227T1426/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20051227T1426-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060102T1045/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060102T1045-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -197,8 +179,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20051227T1426/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20051227T1426-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060102T1045/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060102T1045-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -279,8 +261,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20051227T1426/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20051227T1426-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060102T1045/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060102T1045-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -305,8 +287,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20051227T1426/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20051227T1426-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060102T1045/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060102T1045-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -335,8 +317,8 @@ # define O 0 #else # define O 1 ---- glibc-20051227T1426/elf/ldconfig.c 21 Dec 2005 22:16:20 -0000 1.51 -+++ glibc-20051227T1426-fedora/elf/ldconfig.c 27 Dec 2005 16:21:07 -0000 1.47.2.6 +--- glibc-20060102T1045/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 ++++ glibc-20060102T1045-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr #endif !is_hwcap_platform (direntry->d_name))) @@ -438,8 +420,8 @@ } search_dirs (); ---- glibc-20051227T1426/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20051227T1426-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060102T1045/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060102T1045-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -464,41 +446,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20051227T1426/iconv/gconv_trans.c 6 Jul 2001 04:54:47 -0000 1.16 -+++ glibc-20051227T1426-fedora/iconv/gconv_trans.c 27 Dec 2005 15:42:54 -0000 1.16.4.1 -@@ -54,6 +54,12 @@ __gconv_transliterate (struct __gconv_st - winbuf = (const uint32_t *) *inbufp; - winbufend = (const uint32_t *) inbufend; - -+ __gconv_fct fct = step->__fct; -+#ifdef PTR_DEMANGLE -+ if (step->__shlib_handle != NULL) -+ PTR_DEMANGLE (fct); -+#endif -+ - /* If there is no transliteration information in the locale don't do - anything and return the error. */ - size = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_TRANSLIT_TAB_SIZE); -@@ -119,7 +125,7 @@ __gconv_transliterate (struct __gconv_st - /* Try this input text. */ - toinptr = (const unsigned char *) &to_tbl[idx2]; - outptr = *outbufstart; -- res = DL_CALL_FCT (step->__fct, -+ res = DL_CALL_FCT (fct, - (step, step_data, &toinptr, - (const unsigned char *) &to_tbl[idx2 + len], - &outptr, NULL, 0, 0)); -@@ -204,7 +210,7 @@ __gconv_transliterate (struct __gconv_st - ? __GCONV_EMPTY_INPUT : __GCONV_INCOMPLETE_INPUT); - - outptr = *outbufstart; -- res = DL_CALL_FCT (step->__fct, -+ res = DL_CALL_FCT (fct, - (step, step_data, &toinptr, - (const unsigned char *) (default_missing + len), - &outptr, NULL, 0, 0)); ---- glibc-20051227T1426/iconv/iconvconfig.c 7 Dec 2005 05:47:27 -0000 1.24 -+++ glibc-20051227T1426-fedora/iconv/iconvconfig.c 19 Dec 2005 12:11:14 -0000 1.19.2.5 +--- glibc-20060102T1045/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060102T1045-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -575,8 +524,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20051227T1426/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 -+++ glibc-20051227T1426-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 +--- glibc-20060102T1045/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 ++++ glibc-20060102T1045-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 @@ -265,7 +265,13 @@ #endif @@ -592,8 +541,8 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20051227T1426/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20051227T1426-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060102T1045/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060102T1045-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -603,8 +552,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20051227T1426/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 -+++ glibc-20051227T1426-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 +--- glibc-20060102T1045/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 ++++ glibc-20060102T1045-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -618,8 +567,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20051227T1426/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20051227T1426-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060102T1045/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060102T1045-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -650,8 +599,8 @@ #endif ---- glibc-20051227T1426/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20051227T1426-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060102T1045/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060102T1045-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -743,8 +692,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20051227T1426/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20051227T1426-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060102T1045/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060102T1045-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -788,8 +737,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20051227T1426/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20051227T1426-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060102T1045/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060102T1045-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -798,8 +747,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20051227T1426/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20051227T1426-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060102T1045/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060102T1045-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -841,8 +790,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20051227T1426/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20051227T1426-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060102T1045/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060102T1045-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -857,8 +806,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20051227T1426/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20051227T1426-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060102T1045/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060102T1045-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -870,8 +819,8 @@ date_fmt "/ / " ---- glibc-20051227T1426/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051227T1426-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060102T1045/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T1045-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -942,8 +891,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20051227T1426/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20051227T1426-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060102T1045/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060102T1045-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -971,8 +920,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20051227T1426/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20051227T1426-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060102T1045/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060102T1045-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -1048,8 +997,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20051227T1426/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20051227T1426-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060102T1045/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060102T1045-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1105,33 +1054,9 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20051227T1426/nptl/ChangeLog 27 Dec 2005 01:01:35 -0000 1.824 -+++ glibc-20051227T1426-fedora/nptl/ChangeLog 27 Dec 2005 15:42:54 -0000 1.706.2.68 -@@ -1,3 +1,14 @@ -+2005-12-27 Jakub Jelinek -+ -+ * sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h: Add __next -+ and __prev field to pthread_mutex_t. -+ * sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h: Likewise. -+ * sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: Likewise. -+ * sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h: Likewise. -+ * sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h: Likewise. -+ * sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h: Add __next field -+ to pthread_mutex_t. -+ - 2005-12-26 Ulrich Drepper - - * pthreadP.h: Define PTHREAD_MUTEX_ROBUST_PRIVATE_NP, -@@ -56,7 +67,7 @@ - * pthread_mutex_trylock.c (__pthread_mutex_trylock): Add break - missing after last change. - -- * version.c: Update cpoyright year. -+ * version.c: Update copyright year. - - 2005-12-23 Ulrich Drepper - -@@ -278,6 +289,15 @@ +--- glibc-20060102T1045/nptl/ChangeLog 1 Jan 2006 19:14:15 -0000 1.831 ++++ glibc-20060102T1045-fedora/nptl/ChangeLog 2 Jan 2006 10:52:51 -0000 1.706.2.69 +@@ -329,6 +329,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1147,7 +1072,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1014,6 +1034,11 @@ +@@ -1065,6 +1074,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1159,7 +1084,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3088,6 +3113,11 @@ +@@ -3139,6 +3153,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1171,8 +1096,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20051227T1426/nptl/Makefile 27 Dec 2005 00:53:17 -0000 1.173 -+++ glibc-20051227T1426-fedora/nptl/Makefile 27 Dec 2005 14:48:09 -0000 1.157.2.14 +--- glibc-20060102T1045/nptl/Makefile 28 Dec 2005 20:48:24 -0000 1.174 ++++ glibc-20060102T1045-fedora/nptl/Makefile 2 Jan 2006 10:52:51 -0000 1.157.2.15 @@ -507,15 +507,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1195,8 +1120,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20051227T1426/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20051227T1426-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060102T1045/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060102T1045-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1221,8 +1146,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060102T1045/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T1045-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1230,206 +1155,9 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h 11 Jul 2005 15:48:29 -0000 1.9 -+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h 27 Dec 2005 15:42:54 -0000 1.7.2.3 -@@ -45,7 +45,7 @@ typedef union - - /* Data structures for mutex handling. The structure of the attribute - type is deliberately not exposed. */ --typedef union -+typedef union __pthread_mutex_u - { - struct - { -@@ -57,6 +57,9 @@ typedef union - binary compatibility. */ - int __kind; - int __spins; -+ union __pthread_mutex_u *__next; -+ union __pthread_mutex_u *__prev; -+#define __PTHREAD_MUTEX_HAVE_PREV 1 - } __data; - char __size[__SIZEOF_PTHREAD_MUTEX_T]; - long int __align; ---- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h 28 Sep 2004 10:30:22 -0000 1.14 -+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h 27 Dec 2005 15:42:54 -0000 1.13.2.2 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek , 2003. - -@@ -45,7 +45,7 @@ typedef union - - /* Data structures for mutex handling. The structure of the attribute - type is not exposed on purpose. */ --typedef union -+typedef union __pthread_mutex_u - { - struct - { -@@ -57,6 +57,9 @@ typedef union - binary compatibility. */ - int __kind; - int __spins; -+ union __pthread_mutex_u *__next; -+ union __pthread_mutex_u *__prev; -+#define __PTHREAD_MUTEX_HAVE_PREV 1 - } __data; - char __size[__SIZEOF_PTHREAD_MUTEX_T]; - long int __align; ---- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h 28 Sep 2004 10:31:14 -0000 1.15 -+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h 27 Dec 2005 15:42:54 -0000 1.14.2.2 -@@ -1,5 +1,5 @@ - /* Machine-specific pthread type layouts. PowerPC version. -- Copyright (C) 2003, 2004 Free Software Foundation, Inc. -+ Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Paul Mackerras , 2003. - -@@ -60,7 +60,7 @@ typedef union - - /* Data structures for mutex handling. The structure of the attribute - type is deliberately not exposed. */ --typedef union -+typedef union __pthread_mutex_u - { - struct - { -@@ -73,10 +73,19 @@ typedef union - /* KIND must stay at this position in the structure to maintain - binary compatibility. */ - int __kind; --#if __WORDSIZE != 64 -+#if __WORDSIZE == 64 -+ int __spins; -+ union __pthread_mutex_u *__next; -+ union __pthread_mutex_u *__prev; -+# define __PTHREAD_MUTEX_HAVE_PREV 1 -+#else - unsigned int __nusers; -+ union -+ { -+ int __spins; -+ union __pthread_mutex_u *__next; -+ }; - #endif -- int __spins; - } __data; - char __size[__SIZEOF_PTHREAD_MUTEX_T]; - long int __align; ---- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h 28 Sep 2004 10:32:01 -0000 1.14 -+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h 27 Dec 2005 15:42:54 -0000 1.13.2.2 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Martin Schwidefsky , 2003. - -@@ -59,7 +59,7 @@ typedef union - - /* Data structures for mutex handling. The structure of the attribute - type is not exposed on purpose. */ --typedef union -+typedef union __pthread_mutex_u - { - struct - { -@@ -72,10 +72,19 @@ typedef union - /* KIND must stay at this position in the structure to maintain - binary compatibility. */ - int __kind; --#if __WORDSIZE != 64 -+#if __WORDSIZE == 64 -+ int __spins; -+ union __pthread_mutex_u *__next; -+ union __pthread_mutex_u *__prev; -+# define __PTHREAD_MUTEX_HAVE_PREV 1 -+#else - unsigned int __nusers; -+ union -+ { -+ int __spins; -+ union __pthread_mutex_u *__next; -+ }; - #endif -- int __spins; - } __data; - char __size[__SIZEOF_PTHREAD_MUTEX_T]; - long int __align; ---- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h 28 Sep 2004 10:33:06 -0000 1.11 -+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h 27 Dec 2005 15:42:54 -0000 1.10.2.2 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. -+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 2002. - -@@ -46,7 +46,7 @@ typedef union - - /* Data structures for mutex handling. The structure of the attribute - type is not exposed on purpose. */ --typedef union -+typedef union __pthread_mutex_u - { - struct - { -@@ -57,7 +57,11 @@ typedef union - binary compatibility. */ - int __kind; - unsigned int __nusers; -- int __spins; -+ union -+ { -+ int __spins; -+ union __pthread_mutex_u *__next; -+ }; - } __data; - char __size[__SIZEOF_PTHREAD_MUTEX_T]; - long int __align; ---- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h 28 Sep 2004 10:33:54 -0000 1.8 -+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h 27 Dec 2005 15:42:54 -0000 1.7.2.2 -@@ -1,5 +1,5 @@ - /* Machine-specific pthread type layouts. SPARC version. -- Copyright (C) 2003, 2004 Free Software Foundation, Inc. -+ Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek , 2003. - -@@ -60,7 +60,7 @@ typedef union - - /* Data structures for mutex handling. The structure of the attribute - type is deliberately not exposed. */ --typedef union -+typedef union __pthread_mutex_u - { - struct - { -@@ -73,10 +73,19 @@ typedef union - /* KIND must stay at this position in the structure to maintain - binary compatibility. */ - int __kind; --#if __WORDSIZE != 64 -+#if __WORDSIZE == 64 -+ int __spins; -+ union __pthread_mutex_u *__next; -+ union __pthread_mutex_u *__prev; -+# define __PTHREAD_MUTEX_HAVE_PREV 1 -+#else - unsigned int __nusers; -+ union -+ { -+ int __spins; -+ union __pthread_mutex_u *__next; -+ }; - #endif -- int __spins; - } __data; - char __size[__SIZEOF_PTHREAD_MUTEX_T]; - long int __align; ---- glibc-20051227T1426/nscd/connections.c 7 Dec 2005 05:47:27 -0000 1.80 -+++ glibc-20051227T1426-fedora/nscd/connections.c 19 Dec 2005 12:11:23 -0000 1.55.2.17 -@@ -1899,3 +1899,18 @@ finish_drop_privileges (void) +--- glibc-20060102T1045/nscd/connections.c 30 Dec 2005 16:51:19 -0000 1.81 ++++ glibc-20060102T1045-fedora/nscd/connections.c 2 Jan 2006 10:52:53 -0000 1.55.2.18 +@@ -1880,3 +1880,18 @@ finish_drop_privileges (void) exit (4); } } @@ -1448,9 +1176,9 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20051227T1426/nscd/nscd.c 7 Dec 2005 05:47:27 -0000 1.49 -+++ glibc-20051227T1426-fedora/nscd/nscd.c 19 Dec 2005 12:11:23 -0000 1.38.2.10 -@@ -120,6 +120,9 @@ static struct argp argp = +--- glibc-20060102T1045/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060102T1045-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +@@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1460,7 +1188,7 @@ /* True if only statistics are requested. */ static bool get_stats; -@@ -264,6 +267,7 @@ main (int argc, char **argv) +@@ -263,6 +266,7 @@ main (int argc, char **argv) signal (SIGINT, termination_handler); signal (SIGQUIT, termination_handler); signal (SIGTERM, termination_handler); @@ -1468,8 +1196,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20051227T1426/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20051227T1426-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060102T1045/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060102T1045-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 @@ -32,8 +32,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1481,8 +1209,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20051227T1426/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20051227T1426-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060102T1045/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060102T1045-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1523,19 +1251,19 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20051227T1426/nscd/selinux.c 20 Jun 2005 15:44:41 -0000 1.5 -+++ glibc-20051227T1426-fedora/nscd/selinux.c 3 Oct 2005 20:54:46 -0000 1.1.2.5 -@@ -127,7 +127,7 @@ audit_init (void) - { - audit_fd = audit_open (); - if (audit_fd < 0) -- dbg_log (_("Failed opening connection to the audit subsystem")); +--- glibc-20060102T1045/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 ++++ glibc-20060102T1045-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 +@@ -147,7 +147,7 @@ audit_init (void) + if (audit_fd < 0 + /* If kernel doesn't support audit, bail out */ + && errno != EINVAL && errno != EPROTONOSUPPORT && errno != EAFNOSUPPORT) +- dbg_log (_("Failed opening connection to the audit subsystem")); + dbg_log (_("Failed opening connection to the audit subsystem: %m")); } #endif /* HAVE_LIBAUDIT */ ---- glibc-20051227T1426/posix/Makefile 26 Sep 2005 21:13:27 -0000 1.186 -+++ glibc-20051227T1426-fedora/posix/Makefile 3 Oct 2005 20:44:16 -0000 1.171.2.14 +--- glibc-20060102T1045/posix/Makefile 26 Sep 2005 21:13:27 -0000 1.186 ++++ glibc-20060102T1045-fedora/posix/Makefile 3 Oct 2005 20:44:16 -0000 1.171.2.14 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1569,8 +1297,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20051227T1426/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051227T1426-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060102T1045/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T1045-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1587,8 +1315,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20051227T1426/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20051227T1426-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060102T1045/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060102T1045-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1604,8 +1332,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20051227T1426/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20051227T1426-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060102T1045/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060102T1045-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1617,8 +1345,8 @@ endif endif ---- glibc-20051227T1426/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20051227T1426-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060102T1045/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060102T1045-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1970,8 +1698,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20051227T1426/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051227T1426-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060102T1045/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T1045-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -2057,8 +1785,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20051227T1426/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20051227T1426-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060102T1045/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060102T1045-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -2073,8 +1801,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 +--- glibc-20060102T1045/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 ++++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -2123,8 +1851,8 @@ + ret ^= stk; return ret; } ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060102T1045/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2134,8 +1862,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060102T1045/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -2181,43 +1909,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/alpha/Versions 7 May 2004 01:57:35 -0000 1.12 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/alpha/Versions 27 Dec 2005 15:42:55 -0000 1.12.2.1 -@@ -73,6 +73,10 @@ libc { - #errlist-compat 132 - _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; - } -+ GLIBC_2.4 { -+ #errlist-compat 138 -+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; -+ } - GLIBC_PRIVATE { - __libc_alpha_cache_shape; - } ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/alpha/bits/errno.h 28 Aug 2002 23:58:00 -0000 1.1 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/alpha/bits/errno.h 27 Dec 2005 15:42:55 -0000 1.1.2.1 -@@ -1,5 +1,5 @@ - /* Error constants. Linux/Alpha specific version. -- Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. -+ Copyright (C) 1996,1997,1998,1999,2002,2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -31,6 +31,12 @@ - # define ECANCELED 131 - # endif - -+/* Support for error codes to support robust mutexes was added later, too. */ -+# ifndef EOWNERDEAD -+# define EOWNERDEAD 136 -+# define ENOTRECOVERABLE 137 -+# endif -+ - # ifndef __ASSEMBLER__ - /* Function to get address of global `errno' variable. */ - extern int *__errno_location (void) __THROW __attribute__ ((__const__)); ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060102T1045/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -2278,8 +1971,8 @@ + } while (0) + +#include_next ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060102T1045/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2312,69 +2005,24 @@ + } while (0) + #include_next ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060102T1045/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060102T1045/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060102T1045/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/sparc/Versions 28 Aug 2002 23:56:02 -0000 1.1 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/sparc/Versions 27 Dec 2005 15:42:55 -0000 1.1.2.1 -@@ -1,8 +1,7 @@ - libc { - # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk. - # When you get an error from errlist-compat.awk, you need to add a new -- # version here. Don't do this blindly, since this means changing the ABI -- # for all GNU/Linux configurations. -+ # version here. - - GLIBC_2.0 { - #errlist-compat 127 -@@ -16,6 +15,10 @@ libc { - #errlist-compat 128 - _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; - } -+ GLIBC_2.4 { -+ #errlist-compat 134 -+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr; -+ } - } - librt { - GLIBC_2.3 { ---- glibc-20051227T1426/sysdeps/unix/sysv/linux/sparc/bits/errno.h 28 Aug 2002 23:59:23 -0000 1.1 -+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/sparc/bits/errno.h 27 Dec 2005 15:42:55 -0000 1.1.2.1 -@@ -1,5 +1,5 @@ - /* Error constants. Linux/Sparc specific version. -- Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. -+ Copyright (C) 1996,1997,1998,1999,2002,2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -31,6 +31,12 @@ - # define ECANCELED 127 - # endif - -+/* Support for error codes to support robust mutexes was added later, too. */ -+# ifndef EOWNERDEAD -+# define EOWNERDEAD 132 -+# define ENOTRECOVERABLE 133 -+# endif -+ - # ifndef __ASSEMBLER__ - /* Function to get address of global `errno' variable. */ - extern int *__errno_location (void) __THROW __attribute__ ((__const__)); Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- glibc.spec 27 Dec 2005 17:06:57 -0000 1.197 +++ glibc.spec 2 Jan 2006 11:34:49 -0000 1.198 @@ -1,9 +1,9 @@ -%define glibcdate 20051227T1426 +%define glibcdate 20060102T1045 %define glibcname glibc -%define glibcsrcdir glibc-20051227T1426 +%define glibcsrcdir glibc-20060102T1045 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 23 +%define glibcrelease 24 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -1120,6 +1120,11 @@ %endif %changelog +* Mon Jan 2 2006 Jakub Jelinek 2.3.90-24 +- update from CVS + - nscd audit changes (#174422) + - ppc{32,64} vDSO support and ppc32 hp-timing + * Tue Dec 27 2005 Jakub Jelinek 2.3.90-23 - update from CVS - robust mutexes Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- sources 27 Dec 2005 16:48:46 -0000 1.148 +++ sources 2 Jan 2006 11:34:49 -0000 1.149 @@ -1,2 +1,2 @@ -7bc7ce483f72c2dd8450ee6eb5e8b0f2 glibc-20051227T1426.tar.bz2 -f62b785504dfc263cdc0e3c1dc6bbd7b glibc-fedora-20051227T1426.tar.bz2 +d325caec1b616a7248414ca0777f835f glibc-20060102T1045.tar.bz2 +ff30af7539141c68570b535fa984d340 glibc-fedora-20060102T1045.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 2 11:58:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 06:58:27 -0500 Subject: rpms/glibc/devel glibc-s390-mangling.patch, NONE, 1.1 glibc.spec, 1.198, 1.199 Message-ID: <200601021158.k02BwRpt003047@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2980 Modified Files: glibc.spec Added Files: glibc-s390-mangling.patch Log Message: 2.3.90-24 glibc-s390-mangling.patch: s390/s390-32/__longjmp.c | 28 ++++++++++++++++++---------- s390/s390-32/setjmp.S | 7 ++++--- s390/s390-64/__longjmp.c | 27 ++++++++++++++++++--------- s390/s390-64/setjmp.S | 7 ++++--- unix/sysv/linux/s390/s390-32/sysdep.h | 2 ++ unix/sysv/linux/s390/s390-64/sysdep.h | 2 ++ 6 files changed, 48 insertions(+), 25 deletions(-) --- NEW FILE glibc-s390-mangling.patch --- 2006-01-02 Jakub Jelinek * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (PTR_MANGLE2): Define. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (PTR_MANGLE2): Likewise. * sysdeps/s390/s390-32/__longjmp.c (__longjmp): Demangle also %r15. * sysdeps/s390/s390-64/__longjmp.c (__longjmp): Likewise. * sysdeps/s390/s390-32/setjmp.S (__sigsetjmp): Mangle also %r15. * sysdeps/s390/s390-64/setjmp.S (__sigsetjmp): Likewise. --- libc/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h.jj 2005-12-30 09:04:17.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h 2005-12-30 12:28:59.000000000 +0100 @@ -275,6 +275,8 @@ # define PTR_MANGLE(reg, tmpreg) \ ear tmpreg,%a0; \ x reg,STACK_GUARD(tmpreg) +# define PTR_MANGLE2(reg, tmpreg) \ + x reg,STACK_GUARD(tmpreg) # define PTR_DEMANGLE(reg, tmpreg) PTR_MANGLE (reg, tmpreg) # else # define PTR_MANGLE(var) \ --- libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h.jj 2005-12-30 09:04:17.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h 2005-12-30 12:43:26.000000000 +0100 @@ -277,6 +277,8 @@ sllg tmpreg,tmpreg,32; \ ear tmpreg,%a1; \ xg reg,STACK_GUARD(tmpreg) +# define PTR_MANGLE2(reg, tmpreg) \ + xg reg,STACK_GUARD(tmpreg) # define PTR_DEMANGLE(reg, tmpreg) PTR_MANGLE (reg, tmpreg) # else # define PTR_MANGLE(var) \ --- libc/sysdeps/s390/s390-32/__longjmp.c.jj 2005-12-30 09:04:16.000000000 +0100 +++ libc/sysdeps/s390/s390-32/__longjmp.c 2005-12-30 12:27:24.000000000 +0100 @@ -29,24 +29,32 @@ void __longjmp (__jmp_buf env, int val) { + register int r2 __asm ("%r2") = val == 0 ? 1 : val; #ifdef PTR_DEMANGLE - register uintptr_t r5 __asm ("%r5") = THREAD_GET_POINTER_GUARD (); + register uintptr_t r3 __asm ("%r3") = THREAD_GET_POINTER_GUARD (); + register void *r1 __asm ("%r1") = (void *) __jmp_buf; #endif /* Restore registers and jump back. */ - asm volatile ("lr %%r2,%0\n\t" /* PUT val in grp 2. */ - "ld %%f6,48(%1)\n\t" + asm volatile ("ld %%f6,48(%1)\n\t" "ld %%f4,40(%1)\n\t" - "lm %%r6,%%r15,0(%1)\n\t" #ifdef PTR_DEMANGLE - "xr %%r14,%2\n\t" -#endif + "lm %%r6,%%r13,0(%1)\n\t" + "lm %%r4,%%r5,32(%1)\n\t" + "xr %%r4,%2\n\t" + "xr %%r5,%2\n\t" + "lr %%r15,%r5\n\t" + "br %%r4" +#else + "lm %%r6,%%r15,0(%1)\n\t" "br %%r14" - : : "r" (val == 0 ? 1 : val), - "a" (env) +#endif + : : "r" (r2), #ifdef PTR_DEMANGLE - , "r" (r5) + "r" (r1), "r" (r3) +#else + "a" (env) #endif - : "2" ); + ); /* Avoid `volatile function does return' warnings. */ for (;;); --- libc/sysdeps/s390/s390-32/setjmp.S.jj 2005-12-30 09:04:16.000000000 +0100 +++ libc/sysdeps/s390/s390-32/setjmp.S 2005-12-30 12:31:49.000000000 +0100 @@ -32,9 +32,10 @@ ENTRY(__sigsetjmp) #ifdef PTR_MANGLE stm %r6,%r13,0(%r2) /* store registers in jmp_buf */ lr %r4,%r14 - PTR_MANGLE (%r4, %r5) - st %r4,32(%r2) - st %r15,36(%r2) + lr %r5,%r15 + PTR_MANGLE (%r4, %r1) + PTR_MANGLE2 (%r5, %r1) + stm %r4,%r5,32(%r2) #else stm %r6,%r15,0(%r2) /* store registers in jmp_buf */ #endif --- libc/sysdeps/s390/s390-64/__longjmp.c.jj 2005-12-30 09:04:16.000000000 +0100 +++ libc/sysdeps/s390/s390-64/__longjmp.c 2005-12-30 12:38:10.000000000 +0100 @@ -29,26 +29,35 @@ void __longjmp (__jmp_buf env, int val) { + register long int r2 __asm ("%r2") = val == 0 ? 1 : val; #ifdef PTR_DEMANGLE - register uintptr_t r5 __asm ("%r5") = THREAD_GET_POINTER_GUARD (); + register uintptr_t r3 __asm ("%r3") = THREAD_GET_POINTER_GUARD (); + register void *r1 __asm ("%r1") = (void *) __jmp_buf; #endif /* Restore registers and jump back. */ - asm volatile ("lgr %%r2,%0\n\t" /* Put val in grp 2. */ - "ld %%f7,104(%1)\n\t" + asm volatile ("ld %%f7,104(%1)\n\t" "ld %%f5,96(%1)\n\t" "ld %%f3,88(%1)\n\t" "ld %%f1,80(%1)\n\t" - "lmg %%r6,%%r15,0(%1)\n\t" #ifdef PTR_DEMANGLE "xgr %%r14,%2\n\t" -#endif + "lmg %%r6,%%r13,0(%1)\n\t" + "lmg %%r4,%%r5,64(%1)\n\t" + "xgr %%r4,%2\n\t" + "xgr %%r5,%2\n\t" + "lgr %%r15,%r5\n\t" + "br %%r4" +#else + "lmg %%r6,%%r15,0(%1)\n\t" "br %%r14" - : : "r" (val == 0 ? 1 : val), - "a" (env) +#endif + : : "r" (r2), #ifdef PTR_DEMANGLE - , "r" (r5) + "r" (r1), "r" (r3) +#else + "a" (env) #endif - : "2" ); + ); /* Avoid `volatile function does return' warnings. */ for (;;); --- libc/sysdeps/s390/s390-64/setjmp.S.jj 2005-12-30 09:04:16.000000000 +0100 +++ libc/sysdeps/s390/s390-64/setjmp.S 2005-12-30 12:42:25.000000000 +0100 @@ -31,9 +31,10 @@ ENTRY(__sigsetjmp) #ifdef PTR_MANGLE stmg %r6,%r13,0(%r2) /* Store registers in jmp_buf. */ lgr %r4,%r14 - PTR_MANGLE (%r4, %r5) - stg %r4,64(%r2) - stg %r15,72(%r2) + lgr %r5,%r15 + PTR_MANGLE (%r4, %r1) + PTR_MANGLE2 (%r4, %r1) + stmg %r4,%r5,64(%r2) #else stmg %r6,%r15,0(%r2) /* Store registers in jmp_buf. */ #endif Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- glibc.spec 2 Jan 2006 11:34:49 -0000 1.198 +++ glibc.spec 2 Jan 2006 11:58:25 -0000 1.199 @@ -33,6 +33,7 @@ Patch0: %{glibcname}-fedora.patch Patch1: %{name}-ppc-assume.patch Patch2: %{name}-ia64-lib64.patch +Patch3: glibc-s390-mangling.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -240,6 +241,7 @@ %patch2 -p1 %endif %endif +%patch3 -p1 # Hack till glibc-kernheaders get updated, argh mkdir asm From fedora-cvs-commits at redhat.com Mon Jan 2 12:00:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 07:00:29 -0500 Subject: rpms/net-snmp/devel net-snmp.spec,1.60,1.61 Message-ID: <200601021200.k02C0T90003839@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3776 Modified Files: net-snmp.spec Log Message: - spec file cleanup Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- net-snmp.spec 30 Dec 2005 10:46:02 -0000 1.60 +++ net-snmp.spec 2 Jan 2006 12:00:12 -0000 1.61 @@ -14,10 +14,8 @@ Source4: net-snmpd.logrotate Source5: ucd5820stat Patch1: ucd-snmp-4.2.4.pre3-mnttab.patch -# Drop for 5.3 Patch2: net-snmp-5.0.6-syslog.patch Patch4: net-snmp-5.0.6-libtool.patch -# Drop for 5.3 Patch5: net-snmp-5.0.8-ipv6-sock-close.patch Patch6: net-snmp-5.0.8-readonly.patch Patch7: net-snmp-5.1-async-getnext.patch From fedora-cvs-commits at redhat.com Mon Jan 2 12:04:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 07:04:31 -0500 Subject: rpms/glibc/devel glibc-s390-mangling.patch,1.1,1.2 Message-ID: <200601021204.k02C4V6l004056@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4032 Modified Files: glibc-s390-mangling.patch Log Message: 2.3.90-24 glibc-s390-mangling.patch: s390/s390-32/__longjmp.c | 28 ++++++++++++++++++---------- s390/s390-32/setjmp.S | 7 ++++--- s390/s390-64/__longjmp.c | 27 ++++++++++++++++++--------- s390/s390-64/setjmp.S | 7 ++++--- unix/sysv/linux/s390/s390-32/sysdep.h | 2 ++ unix/sysv/linux/s390/s390-64/sysdep.h | 2 ++ 6 files changed, 48 insertions(+), 25 deletions(-) Index: glibc-s390-mangling.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-s390-mangling.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glibc-s390-mangling.patch 2 Jan 2006 11:58:25 -0000 1.1 +++ glibc-s390-mangling.patch 2 Jan 2006 12:04:27 -0000 1.2 @@ -41,7 +41,7 @@ #ifdef PTR_DEMANGLE - register uintptr_t r5 __asm ("%r5") = THREAD_GET_POINTER_GUARD (); + register uintptr_t r3 __asm ("%r3") = THREAD_GET_POINTER_GUARD (); -+ register void *r1 __asm ("%r1") = (void *) __jmp_buf; ++ register void *r1 __asm ("%r1") = (void *) env; #endif /* Restore registers and jump back. */ - asm volatile ("lr %%r2,%0\n\t" /* PUT val in grp 2. */ @@ -102,7 +102,7 @@ #ifdef PTR_DEMANGLE - register uintptr_t r5 __asm ("%r5") = THREAD_GET_POINTER_GUARD (); + register uintptr_t r3 __asm ("%r3") = THREAD_GET_POINTER_GUARD (); -+ register void *r1 __asm ("%r1") = (void *) __jmp_buf; ++ register void *r1 __asm ("%r1") = (void *) env; #endif /* Restore registers and jump back. */ - asm volatile ("lgr %%r2,%0\n\t" /* Put val in grp 2. */ From fedora-cvs-commits at redhat.com Mon Jan 2 12:12:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 07:12:55 -0500 Subject: rpms/vim/devel 6.4.005, NONE, 1.1 6.4.006, NONE, 1.1 README.patches, 1.38, 1.39 vim.spec, 1.93, 1.94 Message-ID: <200601021212.k02CCtep007442@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/vim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7405 Modified Files: README.patches vim.spec Added Files: 6.4.005 6.4.006 Log Message: patchlevel 6, fixes bz# 175048 --- NEW FILE 6.4.005 --- To: vim-dev at vim.org Subject: Patch 6.4.005 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.4.005 Problem: When truncating a message with multi-byte characters the '<' may be written before the buffer. (Pawel S. Veselov) Solution: Don't write the '<' when there is sufficient room. Files: src/message.c *** ../vim-6.4.004/src/message.c Sun Jun 13 12:15:03 2004 --- src/message.c Thu Dec 22 22:26:05 2005 *************** *** 718,723 **** --- 718,727 ---- { int size = vim_strsize(s); + /* There may be room anyway when there are multibyte chars. */ + if (size <= room) + return s; + for (n = 0; size >= room; ) { size -= (*mb_ptr2cells)(s + n); *** ../vim-6.4.004/src/version.c Thu Dec 1 16:08:05 2005 --- src/version.c Thu Dec 22 22:33:27 2005 *************** *** 643,644 **** --- 643,646 ---- { /* Add new patch number below this line */ + /**/ + 5, /**/ -- ARTHUR: Old woman! DENNIS: Man! ARTHUR: Man. I'm sorry. Old man, What knight live in that castle over there? DENNIS: I'm thirty-seven. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://www.ICCF.nl /// --- NEW FILE 6.4.006 --- To: vim-dev at vim.org Subject: Patch 6.4.006 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.4.006 Problem: ":argedit 1234.c" edits the file ".c". (Karsten Hopp) Solution: Don't accept a count for ":argedit", ":argadd" and ":argdelete". Files: src/ex_cmds.h *** ../vim-6.4.005/src/ex_cmds.h Mon Aug 30 14:58:51 2004 --- src/ex_cmds.h Thu Dec 22 22:29:14 2005 *************** *** 109,121 **** EX(CMD_args, "args", ex_args, BANG|FILES|EDITCMD|ARGOPT|TRLBAR), EX(CMD_argadd, "argadd", ex_argadd, ! BANG|NEEDARG|RANGE|NOTADR|ZEROR|COUNT|FILES|TRLBAR), EX(CMD_argdelete, "argdelete", ex_argdelete, ! BANG|RANGE|NOTADR|COUNT|FILES|TRLBAR), EX(CMD_argdo, "argdo", ex_listdo, BANG|NEEDARG|EXTRA|NOTRLCOM), EX(CMD_argedit, "argedit", ex_argedit, ! BANG|NEEDARG|RANGE|NOTADR|COUNT|FILE1|EDITCMD|TRLBAR), EX(CMD_argglobal, "argglobal", ex_args, BANG|FILES|EDITCMD|ARGOPT|TRLBAR), EX(CMD_arglocal, "arglocal", ex_args, --- 109,121 ---- EX(CMD_args, "args", ex_args, BANG|FILES|EDITCMD|ARGOPT|TRLBAR), EX(CMD_argadd, "argadd", ex_argadd, ! BANG|NEEDARG|RANGE|NOTADR|ZEROR|FILES|TRLBAR), EX(CMD_argdelete, "argdelete", ex_argdelete, ! BANG|RANGE|NOTADR|FILES|TRLBAR), EX(CMD_argdo, "argdo", ex_listdo, BANG|NEEDARG|EXTRA|NOTRLCOM), EX(CMD_argedit, "argedit", ex_argedit, ! BANG|NEEDARG|RANGE|NOTADR|FILE1|EDITCMD|TRLBAR), EX(CMD_argglobal, "argglobal", ex_args, BANG|FILES|EDITCMD|ARGOPT|TRLBAR), EX(CMD_arglocal, "arglocal", ex_args, *** ../vim-6.4.005/src/version.c Thu Dec 22 22:36:58 2005 --- src/version.c Thu Dec 22 22:38:08 2005 *************** *** 643,644 **** --- 643,646 ---- { /* Add new patch number below this line */ + /**/ + 6, /**/ -- "Lisp has all the visual appeal of oatmeal with nail clippings thrown in." -- Larry Wall /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://www.ICCF.nl /// Index: README.patches =================================================================== RCS file: /cvs/dist/rpms/vim/devel/README.patches,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- README.patches 8 Dec 2005 14:41:06 -0000 1.38 +++ README.patches 2 Jan 2006 12:12:52 -0000 1.39 @@ -29,3 +29,5 @@ 7802 6.4.002 Unix: may change owner of wrong file in rare cases 1463 6.4.003 (after 6.4.002) build problem on non-Unix system 1581 6.4.004 "go" doesn't work correctly when 'virtualedit' is set + 1577 6.4.005 truncating message may write before buffer + 2320 6.4.006 ":argedit", "argdel" and ":argadd" used count argument Index: vim.spec =================================================================== RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- vim.spec 20 Dec 2005 12:03:54 -0000 1.93 +++ vim.spec 2 Jan 2006 12:12:52 -0000 1.94 @@ -20,12 +20,12 @@ %define baseversion 6.4 %define vimdir vim64 -%define patchlevel 004 +%define patchlevel 006 Summary: The VIM editor. Name: vim Version: %{baseversion}.%{patchlevel} -Release: 2 +Release: 1 License: freeware Group: Applications/Editors Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2 @@ -56,6 +56,8 @@ Patch002: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.002 Patch003: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.003 Patch004: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.004 +Patch005: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.005 +Patch006: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.006 Patch3000: vim-6.1-syntax.patch Patch3001: vim-6.2-rh1.patch @@ -184,6 +186,8 @@ %patch002 -p0 %patch003 -p0 %patch004 -p0 +%patch005 -p0 +%patch006 -p0 %patch3000 -p1 @@ -484,6 +488,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Mon Jan 02 2006 Karsten Hopp 6.4.006-1 +- patchlevel 6, fixes bz# 175048 + * Tue Dec 20 2005 Karsten Hopp 6.4.004-2 - disable templates when editing new .c / .h files (#175878) From fedora-cvs-commits at redhat.com Mon Jan 2 12:14:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 07:14:40 -0500 Subject: rpms/glibc/devel glibc-s390-mangling.patch,1.2,1.3 Message-ID: <200601021214.k02CEeAl008324@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8258 Modified Files: glibc-s390-mangling.patch Log Message: 2.3.90-24 glibc-s390-mangling.patch: s390/s390-32/__longjmp.c | 28 ++++++++++++++++++---------- s390/s390-32/setjmp.S | 7 ++++--- s390/s390-64/__longjmp.c | 27 ++++++++++++++++++--------- s390/s390-64/setjmp.S | 7 ++++--- unix/sysv/linux/s390/s390-32/sysdep.h | 2 ++ unix/sysv/linux/s390/s390-64/sysdep.h | 2 ++ 6 files changed, 48 insertions(+), 25 deletions(-) Index: glibc-s390-mangling.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-s390-mangling.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- glibc-s390-mangling.patch 2 Jan 2006 12:04:27 -0000 1.2 +++ glibc-s390-mangling.patch 2 Jan 2006 12:14:38 -0000 1.3 @@ -56,7 +56,7 @@ + "lm %%r4,%%r5,32(%1)\n\t" + "xr %%r4,%2\n\t" + "xr %%r5,%2\n\t" -+ "lr %%r15,%r5\n\t" ++ "lr %%r15,%%r5\n\t" + "br %%r4" +#else + "lm %%r6,%%r15,0(%1)\n\t" @@ -119,7 +119,7 @@ + "lmg %%r4,%%r5,64(%1)\n\t" + "xgr %%r4,%2\n\t" + "xgr %%r5,%2\n\t" -+ "lgr %%r15,%r5\n\t" ++ "lgr %%r15,%%r5\n\t" + "br %%r4" +#else + "lmg %%r6,%%r15,0(%1)\n\t" From fedora-cvs-commits at redhat.com Mon Jan 2 12:16:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 07:16:20 -0500 Subject: rpms/php/devel php.spec,1.97,1.98 Message-ID: <200601021216.k02CGKqE015876@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15675 Modified Files: php.spec Log Message: * Mon Jan 2 2006 Joe Orton 5.1.1-7 - rebuild for new net-snmp Index: php.spec =================================================================== RCS file: /cvs/dist/rpms/php/devel/php.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- php.spec 12 Dec 2005 10:05:05 -0000 1.97 +++ php.spec 2 Jan 2006 12:16:17 -0000 1.98 @@ -3,7 +3,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php Version: 5.1.1 -Release: 6 +Release: 7 License: The PHP License Group: Development/Languages URL: http://www.php.net/ @@ -537,6 +537,9 @@ %files pdo -f files.pdo %changelog +* Mon Jan 2 2006 Joe Orton 5.1.1-7 +- rebuild for new net-snmp + * Mon Dec 12 2005 Joe Orton 5.1.1-6 - enable short_open_tag in default php.ini again (#175381) From fedora-cvs-commits at redhat.com Mon Jan 2 12:32:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 07:32:09 -0500 Subject: rpms/ethereal/devel ethereal-gtk-dialog.patch, NONE, 1.1 ethereal.spec, 1.62, 1.63 Message-ID: <200601021232.k02CW9PM015530@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/ethereal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15515 Modified Files: ethereal.spec Added Files: ethereal-gtk-dialog.patch Log Message: - rebuilt against new net-snmp-5.3 - gtk dialog bug (#156568) ethereal-gtk-dialog.patch: dcerpc_stat.c | 5 +++-- expert_comp_dlg.c | 2 +- file_dlg.c | 8 +++++--- filter_dlg.c | 17 +++++++++++++---- filter_dlg.h | 4 +++- find_dlg.c | 5 +++-- io_stat.c | 3 ++- main.c | 5 +++-- tap_dfilter_dlg.c | 3 ++- 9 files changed, 35 insertions(+), 17 deletions(-) --- NEW FILE ethereal-gtk-dialog.patch --- Bugzilla Bug 156568 ??? "Display Filter" dialog cannot receive input diff -rdu gtk/dcerpc_stat.c gtk.2/dcerpc_stat.c --- gtk/dcerpc_stat.c 2005-12-27 03:20:26.000000000 +0100 +++ gtk.2/dcerpc_stat.c 2006-01-02 02:12:46.000000000 +0100 @@ -1,7 +1,7 @@ /* dcerpc_stat.c * dcerpc_stat 2002 Ronnie Sahlberg * - * $Id: dcerpc_stat.c 15793 2005-09-14 08:59:41Z guy $ + * $Id: dcerpc_stat.c 16926 2005-12-31 17:09:27Z ulfl $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -550,7 +550,8 @@ static construct_args_t args = { "Service Response Time Statistics Filter", FALSE, - FALSE + FALSE, + FALSE }; /* if the window is already open, bring it to front and diff -rdu gtk/expert_comp_dlg.c gtk.2/expert_comp_dlg.c --- gtk/expert_comp_dlg.c 2005-12-27 18:17:10.000000000 +0100 +++ gtk.2/expert_comp_dlg.c 2006-01-02 02:12:42.000000000 +0100 @@ -1,7 +1,7 @@ /* expert_comp_dlg.c * expert_comp_dlg 2005 Greg Morris * - * $Id: expert_comp_dlg.c 16904 2005-12-27 17:17:03Z gerald $ + * $Id: expert_comp_dlg.c 16889 2005-12-23 10:55:05Z guy $ * * Ethereal - Network traffic analyzer * By Gerald Combs diff -rdu gtk/file_dlg.c gtk.2/file_dlg.c --- gtk/file_dlg.c 2005-12-27 03:20:25.000000000 +0100 +++ gtk.2/file_dlg.c 2006-01-02 02:12:38.000000000 +0100 @@ -1,7 +1,7 @@ /* file_dlg.c * Dialog boxes for handling files * - * $Id: file_dlg.c 16403 2005-11-06 22:43:25Z ulfl $ + * $Id: file_dlg.c 16926 2005-12-31 17:09:27Z ulfl $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -431,7 +431,8 @@ static construct_args_t args = { "Ethereal: Read Filter", FALSE, - FALSE + FALSE, + TRUE }; if (file_open_w != NULL) { @@ -760,7 +761,8 @@ static construct_args_t args = { "Ethereal: Read Filter", FALSE, - FALSE + FALSE, + TRUE }; if (file_merge_w != NULL) { diff -rdu gtk/filter_dlg.c gtk.2/filter_dlg.c --- gtk/filter_dlg.c 2005-12-27 03:20:26.000000000 +0100 +++ gtk.2/filter_dlg.c 2006-01-02 02:12:52.000000000 +0100 @@ -1,7 +1,7 @@ /* filter_dlg.c * Dialog boxes for (display and capture) filter editing * - * $Id: filter_dlg.c 15465 2005-08-20 12:09:48Z ulfl $ + * $Id: filter_dlg.c 16926 2005-12-31 17:09:27Z ulfl $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -105,7 +105,8 @@ static construct_args_t args = { "Ethereal: Capture Filter", FALSE, - FALSE + FALSE, + FALSE }; /* Has a filter dialog box already been opened for that button? */ @@ -194,7 +195,8 @@ static construct_args_t args = { "Ethereal: Capture Filter", FALSE, - FALSE + FALSE, + FALSE }; /* Has a filter dialog box already been opened for editing @@ -222,7 +224,8 @@ static construct_args_t args = { "Ethereal: Display Filter", TRUE, - TRUE + TRUE, + FALSE }; display_filter_construct_cb(OBJECT_GET_DATA(top_level, E_FILT_BT_PTR_KEY), &args); @@ -362,6 +365,12 @@ gtk_window_set_default_size(GTK_WINDOW(main_w), 400, 400); OBJECT_SET_DATA(main_w, E_FILT_CONSTRUCT_ARGS_KEY, construct_args); + if(construct_args->modal_and_transient) { + GdkWindow* parent = gtk_widget_get_parent_window(parent_filter_te); + gtk_window_set_transient_for(GTK_WINDOW(main_w), GTK_WINDOW(parent)); + gtk_window_set_modal(GTK_WINDOW(main_w), TRUE); + } + main_vb = gtk_vbox_new(FALSE, 0); gtk_container_border_width(GTK_CONTAINER(main_vb), 5); gtk_container_add(GTK_CONTAINER(main_w), main_vb); diff -rdu gtk/filter_dlg.h gtk.2/filter_dlg.h --- gtk/filter_dlg.h 2005-12-27 03:20:26.000000000 +0100 +++ gtk.2/filter_dlg.h 2006-01-02 02:12:52.000000000 +0100 @@ -1,7 +1,7 @@ /* filter_dlg.h * Definitions for dialog boxes for filter editing * - * $Id: filter_dlg.h 16403 2005-11-06 22:43:25Z ulfl $ + * $Id: filter_dlg.h 16926 2005-12-31 17:09:27Z ulfl $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -41,6 +41,8 @@ gboolean wants_apply_button; /**< dialog should have an Apply button */ gboolean activate_on_ok; /**< if parent text widget should be activated on "Ok" or "Apply" */ + gboolean modal_and_transient; /**< dialog is modal and transient to the + parent window (e.g. to gtk_file_chooser) */ } construct_args_t; /** Create a "Capture Filter" dialog box caused by a button click. diff -rdu gtk/find_dlg.c gtk.2/find_dlg.c --- gtk/find_dlg.c 2005-12-27 03:20:25.000000000 +0100 +++ gtk.2/find_dlg.c 2006-01-02 02:12:39.000000000 +0100 @@ -1,7 +1,7 @@ /* find_dlg.c * Routines for "find frame" window * - * $Id: find_dlg.c 15465 2005-08-20 12:09:48Z ulfl $ + * $Id: find_dlg.c 16926 2005-12-31 17:09:27Z ulfl $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -125,7 +125,8 @@ static construct_args_t args = { "Ethereal: Search Filter", FALSE, - TRUE + TRUE, + FALSE }; if (find_frame_w != NULL) { diff -rdu gtk/io_stat.c gtk.2/io_stat.c --- gtk/io_stat.c 2005-12-27 03:20:26.000000000 +0100 +++ gtk.2/io_stat.c 2006-01-02 02:12:50.000000000 +0100 @@ -1,7 +1,7 @@ /* io_stat.c * io_stat 2002 Ronnie Sahlberg * - * $Id: io_stat.c 16346 2005-10-27 19:42:24Z guy $ + * $Id: io_stat.c 16926 2005-12-31 17:09:27Z ulfl $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -1085,6 +1085,7 @@ io->graphs[i].args->title = NULL; io->graphs[i].args->wants_apply_button=TRUE; io->graphs[i].args->activate_on_ok=TRUE; + io->graphs[i].args->modal_and_transient=FALSE; io->graphs[i].filter_bt=NULL; } diff -rdu gtk/main.c gtk.2/main.c --- gtk/main.c 2005-12-27 03:20:26.000000000 +0100 +++ gtk.2/main.c 2006-01-02 02:12:45.000000000 +0100 @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c 16870 2005-12-21 08:59:52Z guy $ + * $Id: main.c 16926 2005-12-31 17:09:27Z ulfl $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -3273,7 +3273,8 @@ static construct_args_t args = { "Ethereal: Display Filter", TRUE, - TRUE + TRUE, + FALSE }; /* use user-defined title if preference is set */ diff -rdu gtk/tap_dfilter_dlg.c gtk.2/tap_dfilter_dlg.c --- gtk/tap_dfilter_dlg.c 2005-12-27 03:20:25.000000000 +0100 +++ gtk.2/tap_dfilter_dlg.c 2006-01-02 02:12:39.000000000 +0100 @@ -2,7 +2,7 @@ * Routines for display filter dialog used by gui taps * Copyright 2003 Lars Roland * - * $Id: tap_dfilter_dlg.c 15501 2005-08-21 19:24:11Z guy $ + * $Id: tap_dfilter_dlg.c 16926 2005-12-31 17:09:27Z ulfl $ * * Ethereal - Network traffic analyzer * By Gerald Combs @@ -160,6 +160,7 @@ end_dlg_list->args.title = g_strdup_printf("%s Filter", dlg_data->win_title); end_dlg_list->args.wants_apply_button = TRUE; end_dlg_list->args.activate_on_ok = FALSE; + end_dlg_list->args.modal_and_transient = FALSE; end_dlg_list->next = NULL; dlg_data->index = end_dlg_list->cont.index; current_dlg = end_dlg_list; Index: ethereal.spec =================================================================== RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- ethereal.spec 29 Dec 2005 11:10:40 -0000 1.62 +++ ethereal.spec 2 Jan 2006 12:32:06 -0000 1.63 @@ -4,7 +4,7 @@ Summary: Network traffic analyzer Name: ethereal Version: 0.10.14 -Release: 1 +Release: 2 License: GPL Group: Applications/Internet Source0: http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2 @@ -12,14 +12,15 @@ Source2: ethereal.console Source3: ethereal.desktop Source4: ethereal.png -Patch4: ethereal-0.10.13-pie.patch +Patch1: ethereal-0.10.13-pie.patch +Patch2: ethereal-gtk-dialog.patch Url: http://www.ethereal.com/ BuildRoot: %{_tmppath}/%{name}-root Requires: libpcap >= 0.6 -Requires: net-snmp >= 5.2.2 +Requires: net-snmp >= 5.3 BuildRequires: libpcap >= 0.6 -BuildRequires: net-snmp-devel >= 5.0 -BuildRequires: net-snmp-utils >= 5.0 +BuildRequires: net-snmp-devel >= 5.3 +BuildRequires: net-snmp-utils >= 5.3 BuildRequires: zlib-devel, bzip2-devel BuildRequires: openssl-devel BuildRequires: glib2-devel, gtk2-devel @@ -49,7 +50,8 @@ %prep %setup -q -n %{name}-%{version} -%patch4 -p1 -b .pie +%patch1 -p1 -b .pie +%patch2 -p0 -b .gtk %build %ifarch s390 s390x @@ -159,6 +161,10 @@ %changelog +* Mon Jan 02 2006 Radek Vokal 0.10.14-2 +- rebuilt against new net-snmp-5.3 +- gtk dialog bug (#156568) + * Thu Dec 29 2005 Radek Vokal 0.10.14-1 - update to 0.10.14 From fedora-cvs-commits at redhat.com Mon Jan 2 12:56:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 07:56:31 -0500 Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.5, 1.6 libsemanage.spec, 1.54, 1.55 Message-ID: <200601021256.k02CuVMN003442@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3352 Modified Files: libsemanage-rhat.patch libsemanage.spec Log Message: * Tue Dec 27 2005 Dan Walsh 1.5.3-3 - Add Ivans patch to turn on ports libsemanage-rhat.patch: include/semanage/semanage.h | 4 src/libsemanage.map | 2 src/policy_components.c | 4 src/port_record.c | 18 src/ports_policydb.c | 7 src/semanage.py | 290 +-- src/semanageswig.i | 28 src/semanageswig_wrap.c | 3944 ++++++++++++++++++++++++++------------------ 8 files changed, 2601 insertions(+), 1696 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 libsemanage-rhat.patch Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libsemanage-rhat.patch 7 Dec 2005 17:32:18 -0000 1.5 +++ libsemanage-rhat.patch 2 Jan 2006 12:56:28 -0000 1.6 @@ -1,11 +1,6616 @@ -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-1.3.64/src/semanage_store.c ---- nsalibsemanage/src/semanage_store.c 2005-11-16 08:44:47.000000000 -0500 -+++ libsemanage-1.3.64/src/semanage_store.c 2005-12-07 08:07:02.000000000 -0500 -@@ -917,6 +917,7 @@ - INFO(sh, "Non-fatal error: Could not copy %s to %s.", active_seusers, store_seusers); - /* Non-fatal; fall through */ - } -+ chmod(store_seusers, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); +diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/semanage.h libsemanage-1.5.3/include/semanage/semanage.h +--- nsalibsemanage/include/semanage/semanage.h 2005-11-04 15:37:49.000000000 -0500 ++++ libsemanage-1.5.3/include/semanage/semanage.h 2005-12-27 10:56:24.000000000 -0500 +@@ -32,9 +32,7 @@ + #include + #include + #include +-#if 0 + #include +-#endif + + /* Dbase */ + #include +@@ -42,10 +40,8 @@ + #include + #include + #include +-#if 0 + #include + #include +-#endif + #include + #include + +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-1.5.3/src/libsemanage.map +--- nsalibsemanage/src/libsemanage.map 2005-11-08 14:48:37.000000000 -0500 ++++ libsemanage-1.5.3/src/libsemanage.map 2005-12-27 10:56:26.000000000 -0500 +@@ -10,6 +10,6 @@ + semanage_module_get_version; semanage_select_store; + semanage_reload_policy; semanage_set_reload; + semanage_user_*; semanage_bool_*; semanage_seuser_*; +- semanage_iface_*; semanage_context_*; ++ semanage_iface_*; semanage_port_*; semanage_context_*; + local: *; + }; +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy_components.c libsemanage-1.5.3/src/policy_components.c +--- nsalibsemanage/src/policy_components.c 2005-12-13 11:18:11.000000000 -0500 ++++ libsemanage-1.5.3/src/policy_components.c 2005-12-27 10:56:28.000000000 -0500 +@@ -127,10 +127,10 @@ + + { semanage_user_dbase_local(handle), + semanage_user_dbase_policy(handle), MODE_MODIFY }, +-#if 0 ++ + { semanage_port_dbase_local(handle), + semanage_port_dbase_policy(handle), MODE_MODIFY }, +-#endif ++ + { semanage_iface_dbase_local(handle), + semanage_iface_dbase_policy(handle), MODE_MODIFY }, + +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/port_record.c libsemanage-1.5.3/src/port_record.c +--- nsalibsemanage/src/port_record.c 2005-12-14 14:16:47.000000000 -0500 ++++ libsemanage-1.5.3/src/port_record.c 2005-12-27 10:56:29.000000000 -0500 +@@ -17,24 +17,6 @@ + #include "handle.h" + #include "database.h" + +-/* FIXME: Remove when sepol port interface is stabilized and exported. */ +-#define sepol_port_compare(port, key) -1 +-#define sepol_port_key_create(handle, low, high, proto, key) -1 +-#define sepol_port_key_extract(handle, port, key) -1 +-#define sepol_port_key_free(key) +-#define sepol_port_get_proto(port) -1 +-#define sepol_port_set_proto(port, proto) +-#define sepol_port_get_proto_str(port) NULL +-#define sepol_port_get_low(port) -1 +-#define sepol_port_get_high(port) -1 +-#define sepol_port_set_port(port, num) +-#define sepol_port_set_range(port, low, high) +-#define sepol_port_get_con(port) NULL +-#define sepol_port_set_con(port, con) +-#define sepol_port_create(handle, port) -1 +-#define sepol_port_clone(handle, port1, port2) -1 +-#define sepol_port_free(port) +- + /* Key */ + int semanage_port_compare( + semanage_port_t* port, +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/ports_policydb.c libsemanage-1.5.3/src/ports_policydb.c +--- nsalibsemanage/src/ports_policydb.c 2005-12-14 14:16:47.000000000 -0500 ++++ libsemanage-1.5.3/src/ports_policydb.c 2005-12-27 10:56:31.000000000 -0500 +@@ -16,13 +16,6 @@ + #include "debug.h" + #include "database_policydb.h" + +-/* FIXME: Remove when sepol port interface is stabilized and exported. */ +-#define sepol_port_modify NULL +-#define sepol_port_query NULL +-#define sepol_port_count NULL +-#define sepol_port_exists NULL +-#define sepol_port_iterate NULL +- + /* PORT RECORD (SEPOL): POLICYDB extension : method table */ + record_policydb_table_t SEMANAGE_PORT_POLICYDB_RTABLE = { + .add = NULL, +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.py libsemanage-1.5.3/src/semanage.py +--- nsalibsemanage/src/semanage.py 2005-12-06 13:36:45.000000000 -0500 ++++ libsemanage-1.5.3/src/semanage.py 2005-12-27 10:59:08.000000000 -0500 +@@ -44,28 +44,6 @@ + semanage_port_by_idx = _semanage.semanage_port_by_idx + + char_by_idx = _semanage.char_by_idx +- +-semanage_bool_key_create = _semanage.semanage_bool_key_create +- +-semanage_bool_key_extract = _semanage.semanage_bool_key_extract +- +-semanage_bool_key_free = _semanage.semanage_bool_key_free +- +-semanage_bool_compare = _semanage.semanage_bool_compare +- +-semanage_bool_get_name = _semanage.semanage_bool_get_name +- +-semanage_bool_set_name = _semanage.semanage_bool_set_name +- +-semanage_bool_get_value = _semanage.semanage_bool_get_value +- +-semanage_bool_set_value = _semanage.semanage_bool_set_value +- +-semanage_bool_create = _semanage.semanage_bool_create +- +-semanage_bool_clone = _semanage.semanage_bool_clone +- +-semanage_bool_free = _semanage.semanage_bool_free + SEMANAGE_MSG_ERR = _semanage.SEMANAGE_MSG_ERR + SEMANAGE_MSG_WARN = _semanage.SEMANAGE_MSG_WARN + SEMANAGE_MSG_INFO = _semanage.SEMANAGE_MSG_INFO +@@ -78,34 +56,6 @@ + + semanage_msg_set_callback = _semanage.semanage_msg_set_callback + +-semanage_iface_query = _semanage.semanage_iface_query +- +-semanage_iface_exists = _semanage.semanage_iface_exists +- +-semanage_iface_count = _semanage.semanage_iface_count +- +-semanage_iface_iterate = _semanage.semanage_iface_iterate +- +-semanage_iface_list = _semanage.semanage_iface_list +- +-semanage_bool_add_local = _semanage.semanage_bool_add_local +- +-semanage_bool_modify_local = _semanage.semanage_bool_modify_local +- +-semanage_bool_set_local = _semanage.semanage_bool_set_local +- +-semanage_bool_del_local = _semanage.semanage_bool_del_local +- +-semanage_bool_query_local = _semanage.semanage_bool_query_local +- +-semanage_bool_exists_local = _semanage.semanage_bool_exists_local +- +-semanage_bool_count_local = _semanage.semanage_bool_count_local +- +-semanage_bool_iterate_local = _semanage.semanage_bool_iterate_local +- +-semanage_bool_list_local = _semanage.semanage_bool_list_local +- + semanage_handle_create = _semanage.semanage_handle_create + + semanage_handle_destroy = _semanage.semanage_handle_destroy +@@ -148,43 +98,53 @@ + + semanage_module_get_version = _semanage.semanage_module_get_version + +-semanage_user_key_create = _semanage.semanage_user_key_create ++semanage_context_get_user = _semanage.semanage_context_get_user + +-semanage_user_key_extract = _semanage.semanage_user_key_extract ++semanage_context_set_user = _semanage.semanage_context_set_user + +-semanage_user_key_free = _semanage.semanage_user_key_free ++semanage_context_get_role = _semanage.semanage_context_get_role + +-semanage_user_compare = _semanage.semanage_user_compare ++semanage_context_set_role = _semanage.semanage_context_set_role + +-semanage_user_get_name = _semanage.semanage_user_get_name ++semanage_context_get_type = _semanage.semanage_context_get_type + +-semanage_user_set_name = _semanage.semanage_user_set_name [...6235 lines suppressed...] ++ { (char *)"semanage_user_list", _wrap_semanage_user_list, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_compare", _wrap_semanage_port_compare, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_key_create", _wrap_semanage_port_key_create, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_key_extract", _wrap_semanage_port_key_extract, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_key_free", _wrap_semanage_port_key_free, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_get_proto", _wrap_semanage_port_get_proto, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_set_proto", _wrap_semanage_port_set_proto, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_get_proto_str", _wrap_semanage_port_get_proto_str, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_get_low", _wrap_semanage_port_get_low, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_get_high", _wrap_semanage_port_get_high, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_set_port", _wrap_semanage_port_set_port, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_set_range", _wrap_semanage_port_set_range, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_get_con", _wrap_semanage_port_get_con, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_set_con", _wrap_semanage_port_set_con, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_create", _wrap_semanage_port_create, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_clone", _wrap_semanage_port_clone, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_free", _wrap_semanage_port_free, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_add_local", _wrap_semanage_port_add_local, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_modify_local", _wrap_semanage_port_modify_local, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_set_local", _wrap_semanage_port_set_local, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_del_local", _wrap_semanage_port_del_local, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_query_local", _wrap_semanage_port_query_local, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_exists_local", _wrap_semanage_port_exists_local, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_count_local", _wrap_semanage_port_count_local, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_iterate_local", _wrap_semanage_port_iterate_local, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_list_local", _wrap_semanage_port_list_local, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_query", _wrap_semanage_port_query, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_exists", _wrap_semanage_port_exists, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_count", _wrap_semanage_port_count, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_iterate", _wrap_semanage_port_iterate, METH_VARARGS, NULL}, ++ { (char *)"semanage_port_list", _wrap_semanage_port_list, METH_VARARGS, NULL}, + { (char *)"semanage_seuser_key_create", _wrap_semanage_seuser_key_create, METH_VARARGS, NULL}, + { (char *)"semanage_seuser_key_extract", _wrap_semanage_seuser_key_extract, METH_VARARGS, NULL}, + { (char *)"semanage_seuser_key_free", _wrap_semanage_seuser_key_free, METH_VARARGS, NULL}, +@@ -5626,37 +6524,6 @@ + { (char *)"semanage_seuser_create", _wrap_semanage_seuser_create, METH_VARARGS, NULL}, + { (char *)"semanage_seuser_clone", _wrap_semanage_seuser_clone, METH_VARARGS, NULL}, + { (char *)"semanage_seuser_free", _wrap_semanage_seuser_free, METH_VARARGS, NULL}, +- { (char *)"semanage_user_add_local", _wrap_semanage_user_add_local, METH_VARARGS, NULL}, +- { (char *)"semanage_user_modify_local", _wrap_semanage_user_modify_local, METH_VARARGS, NULL}, +- { (char *)"semanage_user_set_local", _wrap_semanage_user_set_local, METH_VARARGS, NULL}, +- { (char *)"semanage_user_del_local", _wrap_semanage_user_del_local, METH_VARARGS, NULL}, +- { (char *)"semanage_user_query_local", _wrap_semanage_user_query_local, METH_VARARGS, NULL}, +- { (char *)"semanage_user_exists_local", _wrap_semanage_user_exists_local, METH_VARARGS, NULL}, +- { (char *)"semanage_user_count_local", _wrap_semanage_user_count_local, METH_VARARGS, NULL}, +- { (char *)"semanage_user_iterate_local", _wrap_semanage_user_iterate_local, METH_VARARGS, NULL}, +- { (char *)"semanage_user_list_local", _wrap_semanage_user_list_local, METH_VARARGS, NULL}, +- { (char *)"semanage_context_get_user", _wrap_semanage_context_get_user, METH_VARARGS, NULL}, +- { (char *)"semanage_context_set_user", _wrap_semanage_context_set_user, METH_VARARGS, NULL}, +- { (char *)"semanage_context_get_role", _wrap_semanage_context_get_role, METH_VARARGS, NULL}, +- { (char *)"semanage_context_set_role", _wrap_semanage_context_set_role, METH_VARARGS, NULL}, +- { (char *)"semanage_context_get_type", _wrap_semanage_context_get_type, METH_VARARGS, NULL}, +- { (char *)"semanage_context_set_type", _wrap_semanage_context_set_type, METH_VARARGS, NULL}, +- { (char *)"semanage_context_get_mls", _wrap_semanage_context_get_mls, METH_VARARGS, NULL}, +- { (char *)"semanage_context_set_mls", _wrap_semanage_context_set_mls, METH_VARARGS, NULL}, +- { (char *)"semanage_context_create", _wrap_semanage_context_create, METH_VARARGS, NULL}, +- { (char *)"semanage_context_clone", _wrap_semanage_context_clone, METH_VARARGS, NULL}, +- { (char *)"semanage_context_free", _wrap_semanage_context_free, METH_VARARGS, NULL}, +- { (char *)"semanage_context_from_string", _wrap_semanage_context_from_string, METH_VARARGS, NULL}, +- { (char *)"semanage_context_to_string", _wrap_semanage_context_to_string, METH_VARARGS, NULL}, +- { (char *)"semanage_iface_add_local", _wrap_semanage_iface_add_local, METH_VARARGS, NULL}, +- { (char *)"semanage_iface_modify_local", _wrap_semanage_iface_modify_local, METH_VARARGS, NULL}, +- { (char *)"semanage_iface_set_local", _wrap_semanage_iface_set_local, METH_VARARGS, NULL}, +- { (char *)"semanage_iface_del_local", _wrap_semanage_iface_del_local, METH_VARARGS, NULL}, +- { (char *)"semanage_iface_query_local", _wrap_semanage_iface_query_local, METH_VARARGS, NULL}, +- { (char *)"semanage_iface_exists_local", _wrap_semanage_iface_exists_local, METH_VARARGS, NULL}, +- { (char *)"semanage_iface_count_local", _wrap_semanage_iface_count_local, METH_VARARGS, NULL}, +- { (char *)"semanage_iface_iterate_local", _wrap_semanage_iface_iterate_local, METH_VARARGS, NULL}, +- { (char *)"semanage_iface_list_local", _wrap_semanage_iface_list_local, METH_VARARGS, NULL}, + { (char *)"semanage_seuser_add", _wrap_semanage_seuser_add, METH_VARARGS, NULL}, + { (char *)"semanage_seuser_modify", _wrap_semanage_seuser_modify, METH_VARARGS, NULL}, + { (char *)"semanage_seuser_set", _wrap_semanage_seuser_set, METH_VARARGS, NULL}, +@@ -5666,26 +6533,22 @@ + { (char *)"semanage_seuser_count", _wrap_semanage_seuser_count, METH_VARARGS, NULL}, + { (char *)"semanage_seuser_iterate", _wrap_semanage_seuser_iterate, METH_VARARGS, NULL}, + { (char *)"semanage_seuser_list", _wrap_semanage_seuser_list, METH_VARARGS, NULL}, +- { (char *)"semanage_user_query", _wrap_semanage_user_query, METH_VARARGS, NULL}, +- { (char *)"semanage_user_exists", _wrap_semanage_user_exists, METH_VARARGS, NULL}, +- { (char *)"semanage_user_count", _wrap_semanage_user_count, METH_VARARGS, NULL}, +- { (char *)"semanage_user_iterate", _wrap_semanage_user_iterate, METH_VARARGS, NULL}, +- { (char *)"semanage_user_list", _wrap_semanage_user_list, METH_VARARGS, NULL}, + { NULL, NULL, 0, NULL } + }; + + + /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ + +-static swig_type_info _swigt__p_f_p_struct_semanage_bool_p_void__int[] = {{"_p_f_p_struct_semanage_bool_p_void__int", 0, "int (*)(struct semanage_bool *,void *)|int (*)(semanage_bool_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_bool_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_f_p_struct_semanage_iface_p_void__int[] = {{"_p_f_p_struct_semanage_iface_p_void__int", 0, "int (*)(struct semanage_iface *,void *)|int (*)(semanage_iface_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_iface_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_f_p_struct_semanage_bool_p_void__int[] = {{"_p_f_p_struct_semanage_bool_p_void__int", 0, "int (*)(struct semanage_bool *,void *)|int (*)(semanage_bool_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_bool_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_p_char[] = {{"_p_p_p_char", 0, "char ***", 0, 0, 0, 0},{"_p_p_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_char[] = {{"_p_p_char", 0, "char **", 0, 0, 0, 0},{"_p_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_f_p_struct_semanage_user_p_void__int[] = {{"_p_f_p_struct_semanage_user_p_void__int", 0, "int (*)(struct semanage_user *,void *)|int (*)(semanage_user_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_user_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_semanage_port_key[] = {{"_p_semanage_port_key", 0, "struct semanage_port_key *|semanage_port_key_t *", 0, 0, 0, 0},{"_p_semanage_port_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_p_semanage_port_key[] = {{"_p_p_semanage_port_key", 0, "struct semanage_port_key **|semanage_port_key_t **", 0, 0, 0, 0},{"_p_p_semanage_port_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_f_p_struct_semanage_port_p_void__int[] = {{"_p_f_p_struct_semanage_port_p_void__int", 0, "int (*)(struct semanage_port *,void *)|int (*)(semanage_port_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_port_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_f_p_struct_semanage_seuser_p_void__int[] = {{"_p_f_p_struct_semanage_seuser_p_void__int", 0, "int (*)(struct semanage_seuser *,void *)|int (*)(semanage_seuser_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_seuser_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +-static swig_type_info _swigt__p_p_semanage_port_t[] = {{"_p_p_semanage_port_t", 0, "semanage_port_t **", 0, 0, 0, 0},{"_p_p_semanage_port_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +-static swig_type_info _swigt__p_semanage_port_t[] = {{"_p_semanage_port_t", 0, "semanage_port_t *", 0, 0, 0, 0},{"_p_semanage_port_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_semanage_seuser[] = {{"_p_p_semanage_seuser", 0, "struct semanage_seuser **|semanage_seuser_t **", 0, 0, 0, 0},{"_p_p_semanage_seuser", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_semanage_seuser[] = {{"_p_semanage_seuser", 0, "struct semanage_seuser *|semanage_seuser_t *", 0, 0, 0, 0},{"_p_semanage_seuser", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_p_semanage_seuser[] = {{"_p_p_p_semanage_seuser", 0, "struct semanage_seuser ***|semanage_seuser_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_seuser", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +@@ -5697,37 +6560,41 @@ + static swig_type_info _swigt__p_size_t[] = {{"_p_size_t", 0, "size_t *", 0, 0, 0, 0},{"_p_size_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__size_t[] = {{"_size_t", 0, "size_t", 0, 0, 0, 0},{"_size_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_p_semanage_user[] = {{"_p_p_p_semanage_user", 0, "struct semanage_user ***|semanage_user_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_user", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +-static swig_type_info _swigt__p_semanage_seuser_key[] = {{"_p_semanage_seuser_key", 0, "struct semanage_seuser_key *|semanage_seuser_key_t *", 0, 0, 0, 0},{"_p_semanage_seuser_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_semanage_user_key[] = {{"_p_p_semanage_user_key", 0, "struct semanage_user_key **|semanage_user_key_t **", 0, 0, 0, 0},{"_p_p_semanage_user_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_semanage_user_key[] = {{"_p_semanage_user_key", 0, "struct semanage_user_key *|semanage_user_key_t *", 0, 0, 0, 0},{"_p_semanage_user_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_semanage_seuser_key[] = {{"_p_semanage_seuser_key", 0, "struct semanage_seuser_key *|semanage_seuser_key_t *", 0, 0, 0, 0},{"_p_semanage_seuser_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_semanage_seuser_key[] = {{"_p_p_semanage_seuser_key", 0, "struct semanage_seuser_key **|semanage_seuser_key_t **", 0, 0, 0, 0},{"_p_p_semanage_seuser_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +-static swig_type_info _swigt__p_semanage_iface[] = {{"_p_semanage_iface", 0, "struct semanage_iface *|semanage_iface_t *", 0, 0, 0, 0},{"_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_p_semanage_iface[] = {{"_p_p_p_semanage_iface", 0, "struct semanage_iface ***|semanage_iface_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_semanage_iface[] = {{"_p_p_semanage_iface", 0, "struct semanage_iface **|semanage_iface_t **", 0, 0, 0, 0},{"_p_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +-static swig_type_info _swigt__p_semanage_bool_key[] = {{"_p_semanage_bool_key", 0, "struct semanage_bool_key *|semanage_bool_key_t *", 0, 0, 0, 0},{"_p_semanage_bool_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_semanage_iface[] = {{"_p_semanage_iface", 0, "struct semanage_iface *|semanage_iface_t *", 0, 0, 0, 0},{"_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_semanage_bool_key[] = {{"_p_p_semanage_bool_key", 0, "struct semanage_bool_key **|semanage_bool_key_t **", 0, 0, 0, 0},{"_p_p_semanage_bool_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_semanage_bool_key[] = {{"_p_semanage_bool_key", 0, "struct semanage_bool_key *|semanage_bool_key_t *", 0, 0, 0, 0},{"_p_semanage_bool_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_unsigned_int[] = {{"_p_unsigned_int", 0, "unsigned int *", 0, 0, 0, 0},{"_p_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +-static swig_type_info _swigt__p_semanage_context[] = {{"_p_semanage_context", 0, "struct semanage_context *|semanage_context_t *", 0, 0, 0, 0},{"_p_semanage_context", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_semanage_context[] = {{"_p_p_semanage_context", 0, "struct semanage_context **|semanage_context_t **", 0, 0, 0, 0},{"_p_p_semanage_context", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; +-static swig_type_info _swigt__p_p_semanage_module_info[] = {{"_p_p_semanage_module_info", 0, "struct semanage_module_info **|semanage_module_info_t **", 0, 0, 0, 0},{"_p_p_semanage_module_info", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_semanage_context[] = {{"_p_semanage_context", 0, "struct semanage_context *|semanage_context_t *", 0, 0, 0, 0},{"_p_semanage_context", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_semanage_module_info[] = {{"_p_semanage_module_info", 0, "struct semanage_module_info *|semanage_module_info_t *", 0, 0, 0, 0},{"_p_semanage_module_info", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_p_semanage_module_info[] = {{"_p_p_semanage_module_info", 0, "struct semanage_module_info **|semanage_module_info_t **", 0, 0, 0, 0},{"_p_p_semanage_module_info", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_p_semanage_iface_key[] = {{"_p_p_semanage_iface_key", 0, "struct semanage_iface_key **|semanage_iface_key_t **", 0, 0, 0, 0},{"_p_p_semanage_iface_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_semanage_iface_key[] = {{"_p_semanage_iface_key", 0, "struct semanage_iface_key *|semanage_iface_key_t *", 0, 0, 0, 0},{"_p_semanage_iface_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void[] = {{"_p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void", 0, "void (*)(void *,struct semanage_handle *,char const *,...)|void (*)(void *,semanage_handle_t *,char const *,...)", 0, 0, 0, 0},{"_p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0, 0, 0},{"_ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_p_semanage_port[] = {{"_p_p_semanage_port", 0, "struct semanage_port **|semanage_port_t **", 0, 0, 0, 0},{"_p_p_semanage_port", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_semanage_port[] = {{"_p_semanage_port", 0, "struct semanage_port *|semanage_port_t *", 0, 0, 0, 0},{"_p_semanage_port", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; ++static swig_type_info _swigt__p_p_p_semanage_port[] = {{"_p_p_p_semanage_port", 0, "struct semanage_port ***|semanage_port_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_port", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + static swig_type_info _swigt__p_semanage_handle[] = {{"_p_semanage_handle", 0, "struct semanage_handle *|semanage_handle_t *", 0, 0, 0, 0},{"_p_semanage_handle", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; + + static swig_type_info *swig_types_initial[] = { +-_swigt__p_f_p_struct_semanage_bool_p_void__int, + _swigt__p_f_p_struct_semanage_iface_p_void__int, ++_swigt__p_f_p_struct_semanage_bool_p_void__int, + _swigt__p_p_p_char, + _swigt__p_char, + _swigt__p_p_char, + _swigt__p_f_p_struct_semanage_user_p_void__int, ++_swigt__p_semanage_port_key, ++_swigt__p_p_semanage_port_key, ++_swigt__p_f_p_struct_semanage_port_p_void__int, + _swigt__p_f_p_struct_semanage_seuser_p_void__int, +-_swigt__p_p_semanage_port_t, +-_swigt__p_semanage_port_t, + _swigt__p_p_semanage_seuser, + _swigt__p_semanage_seuser, + _swigt__p_p_p_semanage_seuser, +@@ -5739,24 +6606,27 @@ + _swigt__p_size_t, + _swigt__size_t, + _swigt__p_p_p_semanage_user, +-_swigt__p_semanage_seuser_key, + _swigt__p_p_semanage_user_key, + _swigt__p_semanage_user_key, ++_swigt__p_semanage_seuser_key, + _swigt__p_p_semanage_seuser_key, +-_swigt__p_semanage_iface, + _swigt__p_p_p_semanage_iface, + _swigt__p_p_semanage_iface, +-_swigt__p_semanage_bool_key, ++_swigt__p_semanage_iface, + _swigt__p_p_semanage_bool_key, ++_swigt__p_semanage_bool_key, + _swigt__p_unsigned_int, +-_swigt__p_semanage_context, + _swigt__p_p_semanage_context, +-_swigt__p_p_semanage_module_info, ++_swigt__p_semanage_context, + _swigt__p_semanage_module_info, ++_swigt__p_p_semanage_module_info, + _swigt__p_p_semanage_iface_key, + _swigt__p_semanage_iface_key, + _swigt__p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void, + _swigt__ptrdiff_t, ++_swigt__p_p_semanage_port, ++_swigt__p_semanage_port, ++_swigt__p_p_p_semanage_port, + _swigt__p_int, + _swigt__p_semanage_handle, + 0 +@@ -6130,5 +7000,11 @@ + { + PyDict_SetItemString(d,"SEMANAGE_CON_POLSERV_REMOTE", SWIG_From_int((int)(SEMANAGE_CON_POLSERV_REMOTE))); + } ++ { ++ PyDict_SetItemString(d,"SEMANAGE_PROTO_UDP", SWIG_From_int((int)(0))); ++ } ++ { ++ PyDict_SetItemString(d,"SEMANAGE_PROTO_TCP", SWIG_From_int((int)(1))); ++ } + } - if (!sh->do_reload) - goto skip_reload; Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- libsemanage.spec 14 Dec 2005 21:32:33 -0000 1.54 +++ libsemanage.spec 2 Jan 2006 12:56:28 -0000 1.55 @@ -2,10 +2,12 @@ Summary: SELinux binary policy manipulation library Name: libsemanage Version: 1.5.3 -Release: 2 +Release: 3 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz +Patch: libsemanage-rhat.patch + BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} @@ -36,6 +38,7 @@ %prep %setup -q +%patch -p1 -b .rhat %build make clean @@ -71,6 +74,9 @@ %{_includedir}/semanage/*.h %changelog +* Tue Dec 27 2005 Dan Walsh 1.5.3-3 +- Add Ivans patch to turn on ports + * Wed Dec 14 2005 Dan Walsh 1.5.3-2 - Remove patch since upstream does the right thing From fedora-cvs-commits at redhat.com Mon Jan 2 13:08:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 08:08:06 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.138, 1.139 policycoreutils.spec, 1.205, 1.206 Message-ID: <200601021308.k02D86Xq006373@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6320 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue Dec 27 2005 Dan Walsh 1.29.2-9 - Fixes for semanage, patch from Ivan and added a test script policycoreutils-rhat.patch: scripts/chcat | 119 +++++++----- scripts/chcat.8 | 6 scripts/fixfiles | 4 scripts/genhomedircon | 238 +++++++++++++----------- scripts/selisteners | 37 +++ scripts/tests/chcat_test | 43 ++++ scripts/tests/setrans.conf | 23 ++ semanage/semanage | 414 +++++++++++++++++++++++++++++-------------- semanage/tests/semanage_test | 67 ++++++ 9 files changed, 671 insertions(+), 280 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- policycoreutils-rhat.patch 27 Dec 2005 15:08:31 -0000 1.138 +++ policycoreutils-rhat.patch 2 Jan 2006 13:08:02 -0000 1.139 @@ -226,6 +226,20 @@ .SH "SEE ALSO" .TP chcon(1), selinux(8) +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.29.2/scripts/fixfiles +--- nsapolicycoreutils/scripts/fixfiles 2005-10-13 13:51:22.000000000 -0400 ++++ policycoreutils-1.29.2/scripts/fixfiles 2005-12-30 08:17:05.000000000 -0500 +@@ -62,8 +62,8 @@ + TEMPFILE=`mktemp ${FC}.XXXXXXXXXX` + test -z "$TEMPFILE" && exit + PREFCTEMPFILE=`mktemp ${PREFC}.XXXXXXXXXX` +- sed -r -e 's,:s0, ,g' $PREFC > ${PREFCTEMPFILE} +- sed -r -e 's,:s0, ,g' $FC | \ ++ sed -r -e 's,:s0, ,g' $PREFC | sort -u > ${PREFCTEMPFILE} ++ sed -r -e 's,:s0, ,g' $FC | sort -u | \ + /usr/bin/diff -b ${PREFCTEMPFILE} - | \ + grep '^[<>]'|cut -c3-| grep ^/ | \ + egrep -v '(^/home|^/root|^/tmp|^/dev)' |\ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.2/scripts/genhomedircon --- nsapolicycoreutils/scripts/genhomedircon 2005-12-07 07:28:00.000000000 -0500 +++ policycoreutils-1.29.2/scripts/genhomedircon 2005-12-27 08:54:19.000000000 -0500 @@ -680,8 +694,8 @@ +s0:c3=NDA_Yoyodyne diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.2/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2005-11-29 10:55:01.000000000 -0500 -+++ policycoreutils-1.29.2/semanage/semanage 2005-12-27 10:04:46.000000000 -0500 -@@ -24,22 +24,27 @@ ++++ policycoreutils-1.29.2/semanage/semanage 2005-12-27 15:13:34.000000000 -0500 +@@ -24,22 +24,33 @@ from semanage import *; class loginRecords: def __init__(self): @@ -701,6 +715,9 @@ + sename = "user_u" + + (rc,k) = semanage_seuser_key_create(self.sh, name) ++ if rc != 0: ++ raise ValueError("Could not create a key for %s" % name) ++ + (rc,exists) = semanage_seuser_exists(self.sh, k) if exists: raise ValueError("SELinux User %s mapping already defined" % name) @@ -712,10 +729,13 @@ - (rc,u)= semanage_seuser_create(self.sh) + (rc,u) = semanage_seuser_create(self.sh) ++ if rc != 0: ++ raise ValueError("Could not create seuser for %s" % name) ++ semanage_seuser_set_name(self.sh, u, name) semanage_seuser_set_mlsrange(self.sh, u, serange) semanage_seuser_set_sename(self.sh, u, sename) -@@ -48,12 +53,13 @@ +@@ -48,13 +59,22 @@ if semanage_commit(self.sh) != 0: raise ValueError("Failed to add SELinux user mapping") @@ -723,18 +743,28 @@ - (rc,k)=semanage_seuser_key_create(self.sh, name) - (rc,u)= semanage_seuser_query(self.sh, k) - if rc !=0 : +- raise ValueError("SELinux user %s mapping is not defined." % name) +- if sename == "" and serange=="": + def modify(self, name, sename = "", serange = ""): + (rc,k) = semanage_seuser_key_create(self.sh, name) -+ (rc,exists) = semanage_seuser_exists(self.sh, k) -+ if not exists: - raise ValueError("SELinux user %s mapping is not defined." % name) -- if sename == "" and serange=="": -+ (rc,u) = semanage_seuser_query(self.sh, k) ++ if rc != 0: ++ raise ValueError("Could not create a key for %s" % name) ++ + if sename == "" and serange == "": raise ValueError("Requires, seuser or serange") ++ ++ (rc,exists) = semanage_seuser_exists(self.sh, k) ++ if exists: ++ (rc,u) = semanage_seuser_query(self.sh, k) ++ if rc != 0: ++ raise ValueError("Could not query seuser for %s" % name) ++ else: ++ raise ValueError("SELinux user %s mapping is not defined." % name) ++ if serange != "": semanage_seuser_set_mlsrange(self.sh, u, serange) -@@ -66,9 +72,9 @@ + if sename != "": +@@ -66,78 +86,107 @@ def delete(self, name): @@ -742,20 +772,29 @@ - (rc,exists)= semanage_seuser_exists(self.sh, k) - if rc !=0 : + (rc,k) = semanage_seuser_key_create(self.sh, name) ++ if rc != 0: ++ raise ValueError("Could not create a key for %s" % name) ++ + (rc,exists) = semanage_seuser_exists(self.sh, k) + if not exists: raise ValueError("SELinux user %s mapping is not defined." % name) semanage_begin_transaction(self.sh) semanage_seuser_del(self.sh, k) -@@ -79,25 +85,29 @@ - print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range") + if semanage_commit(self.sh) != 0: + raise ValueError("SELinux User %s mapping not defined" % name) + +- def list(self): +- print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range") ++ def list(self,heading=1): ++ if heading: ++ print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range") (status, self.ulist, self.usize) = semanage_seuser_list(self.sh) for idx in range(self.usize): - u=semanage_seuser_by_idx(self.ulist, idx) - name=semanage_seuser_get_name(u) +- + u = semanage_seuser_by_idx(self.ulist, idx) + name = semanage_seuser_get_name(u) - print "%-25s %-25s %-25s" % (name, semanage_seuser_get_sename(u), semanage_seuser_get_mlsrange(u)) class seluserRecords: @@ -772,20 +811,39 @@ def add(self, name, roles, selevel, serange): - (rc,k)=semanage_user_key_create(self.sh, name) - (rc,exists)= semanage_user_exists(self.sh, k) +- if exists: +- raise ValueError("Seuser %s already defined" % name) +- (rc,u)= semanage_user_create(self.sh) + if serange == "": + serange = "s0" + if selevel == "": + selevel = "s0" ++ + (rc,k) = semanage_user_key_create(self.sh, name) -+ (rc,exists) = semanage_user_exists(self.sh, k) - if exists: - raise ValueError("Seuser %s already defined" % name) -- (rc,u)= semanage_user_create(self.sh) ++ if rc != 0: ++ raise ValueError("Could not create a key for %s" % name) ++ ++ (rc,exists) = semanage_user_exists_local(self.sh, k) ++ if not exists: ++ (rc,exists) = semanage_user_exists(self.sh, k) ++ if not exists: ++ raise ValueError("SELinux user %s is already defined." % name) ++ + (rc,u) = semanage_user_create(self.sh) ++ if rc != 0: ++ raise ValueError("Could not create login mapping for %s" % name) ++ semanage_user_set_name(self.sh, u, name) for r in roles: semanage_user_add_role(self.sh, u, r) -@@ -109,17 +119,13 @@ + semanage_user_set_mlsrange(self.sh, u, serange) + semanage_user_set_mlslevel(self.sh, u, selevel) + (rc,key) = semanage_user_key_extract(self.sh,u) ++ if rc != 0: ++ raise ValueError("Could not extract key for %s" % name) ++ + semanage_begin_transaction(self.sh) + semanage_user_add_local(self.sh, k, u) if semanage_commit(self.sh) != 0: raise ValueError("Failed to add SELinux user") @@ -794,21 +852,35 @@ - def modify(self, name, roles=[], selevel="", serange=""): - (rc,k)=semanage_user_key_create(self.sh, name) - (rc,exists)= semanage_user_exists(self.sh, k) -+ def modify(self, name, roles = [], selevel = "", serange = ""): -+ (rc,k) = semanage_user_key_create(self.sh, name) -+ (rc,exists) = semanage_user_exists(self.sh, k) - if not exists: - raise ValueError("user %s is not defined" % name) +- if not exists: +- raise ValueError("user %s is not defined" % name) - (rc,u)= semanage_user_query(self.sh, k) - if rc !=0 : - raise ValueError("User %s is not defined." % name) - if len(roles) == 0 and serange=="" and selevel=="": -+ (rc,u) = semanage_user_query(self.sh, k) ++ def modify(self, name, roles = [], selevel = "", serange = ""): + if len(roles) == 0 and serange == "" and selevel == "": raise ValueError("Requires, roles, level or range") ++ ++ (rc,k) = semanage_user_key_create(self.sh, name) ++ if rc != 0: ++ raise ValueError("Could not create a key for %s" % name) ++ ++ (rc,exists) = semanage_user_exists_local(self.sh, k) ++ if exists: ++ (rc,u) = semanage_user_query_local(self.sh, k) ++ else: ++ (rc,exists) = semanage_user_exists(self.sh, k) ++ if exists: ++ (rc,u) = semanage_user_query(self.sh, k) ++ else: ++ raise ValueError("SELinux user %s mapping is not defined." % name) ++ if rc != 0: ++ raise ValueError("Could not query user for %s" % name) ++ if serange != "": semanage_user_set_mlsrange(self.sh, u, serange) -@@ -127,17 +133,15 @@ + if selevel != "": semanage_user_set_mlslevel(self.sh, u, selevel) if len(roles) != 0: for r in roles: @@ -824,12 +896,24 @@ - (rc,k)=semanage_user_key_create(self.sh, name) - (rc,exists)= semanage_user_exists(self.sh, k) + (rc,k) = semanage_user_key_create(self.sh, name) -+ (rc,exists) = semanage_user_exists(self.sh, k) ++ if rc != 0: ++ raise ValueError("Could not crpppeate a key for %s" % name) ++ ++ (rc,exists) = semanage_user_exists_local(self.sh, k) if not exists: raise ValueError("user %s is not defined" % name) semanage_begin_transaction(self.sh) -@@ -150,31 +154,30 @@ - print "%-15s %-10s %-15s %-20s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") +@@ -145,86 +194,183 @@ + if semanage_commit(self.sh) != 0: + raise ValueError("Login User %s not defined" % name) + +- def list(self): +- print "\n%-15s %-10s %-20s" % ("", "MLS/", "MLS/") +- print "%-15s %-10s %-15s %-20s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") ++ def list(self, heading=1): ++ if heading: ++ print "\n%-15s %-10s %-20s" % ("", "MLS/", "MLS/") ++ print "%-15s %-10s %-15s %-20s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") (status, self.ulist, self.usize) = semanage_user_list(self.sh) for idx in range(self.usize): - u=semanage_user_by_idx(self.ulist, idx) @@ -858,52 +942,175 @@ if self.semanaged: semanage_connect(self.sh) - def add(self, name, type): +- def add(self, name, type): - (rc,k)=semanage_port_key_create(self.sh, name) - (rc,exists)= semanage_port_exists(self.sh, k) -+ (rc,k) = semanage_port_key_create(self.sh, name) ++ def __genkey(self, port, proto): ++ if proto == "tcp": ++ proto_d=SEMANAGE_PROTO_TCP ++ else: ++ if proto == "udp": ++ proto_d=SEMANAGE_PROTO_UDP ++ else: ++ raise ValueError("Protocol udp or tcp is required") ++ if port == "": ++ raise ValueError("Port is required") ++ ++ ports=port.split("-") ++ if len(ports) == 1: ++ low=string.atoi(ports[0]) ++ high=string.atoi(ports[0]) ++ else: ++ low=string.atoi(ports[0]) ++ high=string.atoi(ports[1]) ++ ++ (rc,k) = semanage_port_key_create(self.sh, low, high, proto_d) ++ if rc != 0: ++ raise ValueError("Could not create a key for %s/%s" % (proto, port)) ++ return ( k, proto_d, low, high ) ++ ++ def add(self, port, proto, serange, type): ++ if serange == "": ++ serange="s0" ++ ++ if type == "": ++ raise ValueError("Type is required") ++ ++ ( k, proto_d, low, high ) = self.__genkey(port, proto) ++ + (rc,exists) = semanage_port_exists(self.sh, k) ++ if exists: ++ raise ValueError("Port %s/%s already defined" % (proto, port)) ++ ++ (rc,exists) = semanage_port_exists_local(self.sh, k) if exists: - raise ValueError("User %s already defined" % name) +- raise ValueError("User %s already defined" % name) - (rc,u)= semanage_port_create(self.sh) -+ (rc,u) = semanage_port_create(self.sh) - semanage_port_set_name(self.sh, u, name) - semanage_port_set_mlsrange(self.sh, u, serange) - semanage_port_set_sename(self.sh, u, sename) -@@ -184,11 +187,11 @@ +- semanage_port_set_name(self.sh, u, name) +- semanage_port_set_mlsrange(self.sh, u, serange) +- semanage_port_set_sename(self.sh, u, sename) ++ raise ValueError("Port %s/%s already defined locally" % (proto, port)) ++ ++ (rc,p) = semanage_port_create(self.sh) ++ if rc != 0: ++ raise ValueError("Could not create port for %s/%s" % (proto, port)) ++ ++ semanage_port_set_proto(p, proto_d) ++ semanage_port_set_range(p, low, high) ++ (rc, con) = semanage_context_create(self.sh) ++ if rc != 0: ++ raise ValueError("Could not create context for %s/%s" % (proto, port)) ++ ++ semanage_context_set_user(self.sh, con, "system_u") ++ semanage_context_set_role(self.sh, con, "object_r") ++ semanage_context_set_type(self.sh, con, type) ++ semanage_context_set_mls(self.sh, con, serange) ++ semanage_port_set_con(p, con) + semanage_begin_transaction(self.sh) +- semanage_port_add(self.sh, k, u) ++ semanage_port_add_local(self.sh, k, p) + if semanage_commit(self.sh) != 0: raise ValueError("Failed to add port") - def modify(self, name, type): +- def modify(self, name, type): - (rc,k)=semanage_port_key_create(self.sh, name) - (rc,u)= semanage_port_query(self.sh, k) - if rc !=0 : -+ (rc,k) = semanage_port_key_create(self.sh, name) -+ (rc,u) = semanage_port_query(self.sh, k) -+ if rc != 0 : - raise ValueError("User %s is not defined." % name) +- raise ValueError("User %s is not defined." % name) - if sename == "" and serange=="": -+ if sename == "" and serange == "": - raise ValueError("Requires, port or serange") +- raise ValueError("Requires, port or serange") ++ def modify(self, port, proto, serange, setype): ++ if serange == "" and setype == "": ++ raise ValueError("Requires, setype or serange") ++ ++ ( k, proto_d, low, high ) = self.__genkey(port, proto) ++ ++ (rc,exists) = semanage_port_exists_local(self.sh, k) ++ if exists: ++ (rc,p) = semanage_port_query_local(self.sh, k) ++ (rc,exists) = semanage_port_exists(self.sh, k) ++ if exists: ++ (rc,p) = semanage_port_query(self.sh, k) ++ else: ++ raise ValueError("port %s/%s is not defined." % (proto,port)) ++ ++ if rc != 0: ++ raise ValueError("Could not query port for %s/%s" % (proto, port)) ++ ++ con = semanage_port_get_con(p) ++ semanage_context_set_mls(self.sh, con, serange) if serange != "": - semanage_port_set_mlsrange(self.sh, u, serange) -@@ -200,7 +203,7 @@ +- semanage_port_set_mlsrange(self.sh, u, serange) +- if sename != "": +- semanage_port_set_sename(self.sh, u, sename) ++ semanage_context_set_mls(self.sh, con, serange) ++ if setype != "": ++ semanage_context_set_type(self.sh, con, setype) ++ semanage_port_set_con(p, con) + semanage_begin_transaction(self.sh) +- semanage_port_modify(self.sh, k, u) ++ semanage_port_modify_local(self.sh, k, p) + if semanage_commit(self.sh) != 0: raise ValueError("Failed to add port") - def delete(self, name): +- def delete(self, name): - (rc,k)=semanage_port_key_create(self.sh, name) -+ (rc,k) = semanage_port_key_create(self.sh, name) ++ def delete(self, port, proto): ++ ( k, proto_d, low, high ) = self.__genkey(port, proto) ++ (rc,exists) = semanage_port_exists_local(self.sh, k) ++ if not exists: ++ raise ValueError("port %s/%s is not defined localy." % (proto,port)) ++ semanage_begin_transaction(self.sh) - semanage_port_del(self.sh, k) +- semanage_port_del(self.sh, k) ++ semanage_port_del_local(self.sh, k) if semanage_commit(self.sh) != 0: -@@ -210,13 +213,13 @@ +- raise ValueError("Port %s not defined" % name) ++ raise ValueError("Port %s/%s not defined" % (proto,port)) + +- def list(self): ++ def list(self, heading=1): (status, self.plist, self.psize) = semanage_port_list(self.sh) - print "%-25s %s\n" % ("SELinux Port Name", "Port Number") +- print "%-25s %s\n" % ("SELinux Port Name", "Port Number") ++ if heading: ++ print "%-30s %-8s %s\n" % ("SELinux Port Name", "Proto", "Port Number") ++ dict={} ++ for idx in range(self.psize): ++ u = semanage_port_by_idx(self.plist, idx) ++ con = semanage_port_get_con(u) ++ name = semanage_context_get_type(con) ++ proto=semanage_port_get_proto_str(u) ++ low=semanage_port_get_low(u) ++ high = semanage_port_get_high(u) ++ if (name, proto) not in dict.keys(): ++ dict[(name,proto)]=[] ++ if low == high: ++ dict[(name,proto)].append("%d" % low) ++ else: ++ dict[(name,proto)].append("%d-%d" % (low, high)) ++ (status, self.plist, self.psize) = semanage_port_list_local(self.sh) for idx in range(self.psize): - u=semanage_port_by_idx(self.plist, idx) - name=semanage_port_get_name(u) +- print "%20s %d" % ( name, semanage_port_get_number(u)) + u = semanage_port_by_idx(self.plist, idx) -+ name = semanage_port_get_name(u) - print "%20s %d" % ( name, semanage_port_get_number(u)) ++ con = semanage_port_get_con(u) ++ name = semanage_context_get_type(con) ++ proto=semanage_port_get_proto_str(u) ++ low=semanage_port_get_low(u) ++ high = semanage_port_get_high(u) ++ if (name, proto) not in dict.keys(): ++ dict[(name,proto)]=[] ++ if low == high: ++ dict[(name,proto)].append("%d" % low) ++ else: ++ dict[(name,proto)].append("%d-%d" % (low, high)) ++ for i in dict.keys(): ++ rec = "%-30s %-8s " % i ++ rec += "%s" % dict[i][0] ++ for p in dict[i][1:]: ++ rec += ", %s" % p ++ print rec if __name__ == '__main__': @@ -912,7 +1119,17 @@ print '\ semanage user [-admsRrh] SELINUX_USER\n\ semanage login [-admsrh] LOGIN_NAME\n\ -@@ -245,26 +248,26 @@ +-semanage port [-admth] SELINUX_PORT_NAME\n\ ++semanage port [-admth] PORT | PORTRANGE\n\ + -a, --add Add a OBJECT record NAME\n\ + -d, --delete Delete a OBJECT record NAME\n\ + -h, --help display this message\n\ + -l, --list List the OBJECTS\n\ ++ -n, --noheading Do not print heading when listing OBJECTS\n\ + -m, --modify Modify a OBJECT record NAME\n\ + -r, --range MLS/MCS Security Range\n\ + -R, --roles SELinux Roles (Separate by spaces)\n\ +@@ -245,33 +391,40 @@ # # try: @@ -932,9 +1149,13 @@ + input = sys.stdin + output = sys.stdout + serange = "" ++ port = "" ++ proto = "" + selevel = "" ++ setype = "" + roles = "" + seuser = "" ++ heading=1 + + add = 0 + modify = 0 @@ -951,9 +1172,20 @@ - args=sys.argv[2:] + args = sys.argv[2:] gopts, cmds = getopt.getopt(args, - 'adlhms:R:r:t:v', +- 'adlhms:R:r:t:v', ++ 'adlhmnp:P:s:R:r:t:v', ['add', -@@ -282,46 +285,46 @@ + 'delete', + 'help', + 'list', + 'modify', ++ 'noheading', ++ 'port=', ++ 'proto=', + 'seuser=', + 'range=', + 'roles=', +@@ -282,88 +435,95 @@ if o == "-a" or o == "--add": if modify or delete: usage() @@ -968,6 +1200,9 @@ if o == "-h" or o == "--help": usage() ++ if o == "-n" or o == "--nohead": ++ heading=0 ++ if o == "-m"or o == "--modify": if delete or add: usage() @@ -977,6 +1212,9 @@ if o == "-r" or o == '--range': - serange=a + serange = a ++ ++ if o == "-P" or o == '--proto': ++ proto = a if o == "-R" or o == '--roles': - roles=a @@ -984,7 +1222,7 @@ if o == "-t" or o == "--type": - type=a -+ type = a ++ setype = a if o == "-l" or o == "--list": - list=1 @@ -1011,53 +1249,68 @@ + OBJECT = portRecords() if list: - OBJECT.list() -@@ -330,21 +333,22 @@ +- OBJECT.list() ++ OBJECT.list(heading) + sys.exit(0); + if len(cmds) != 1: usage() - name=cmds[0] -+ name = cmds[0] ++ target = cmds[0] if add: if object == "login": - OBJECT.add(name, seuser, serange) +- OBJECT.add(name, seuser, serange) ++ OBJECT.add(target, seuser, serange) if object == "user": - rlist=roles.split() - print rlist +- OBJECT.add(name, rlist, selevel, serange) + rlist = roles.split() + if len(rlist) == 0: + raise ValueError("You must specify a role") -+ - OBJECT.add(name, rlist, selevel, serange) ++ OBJECT.add(target, rlist, selevel, serange) if object == "port": - OBJECT.add(name, type) +- OBJECT.add(name, type) ++ OBJECT.add(target, proto, serange, setype) - OBJECT.list() sys.exit(0); if modify: -@@ -352,14 +356,12 @@ - OBJECT.modify(name, seuser, serange) + if object == "login": +- OBJECT.modify(name, seuser, serange) ++ OBJECT.modify(target, seuser, serange) if object == "user": - rlist=roles.split() - print rlist +- OBJECT.modify(name, rlist, selevel, serange) + rlist = roles.split() - OBJECT.modify(name, rlist, selevel, serange) ++ OBJECT.modify(target, rlist, selevel, serange) if object == "port": - OBJECT.modify(name, type) +- OBJECT.modify(name, type) ++ OBJECT.modify(target, proto, serange, setype) sys.exit(0); - OBJECT.list() sys.exit(0); if delete: +- OBJECT.delete(name) ++ if object == "port": ++ OBJECT.delete(target, proto) ++ else: ++ OBJECT.delete(target) + sys.exit(0); + usage() + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/tests/semanage_test policycoreutils-1.29.2/semanage/tests/semanage_test --- nsapolicycoreutils/semanage/tests/semanage_test 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.2/semanage/tests/semanage_test 2005-12-27 10:07:15.000000000 -0500 ++++ policycoreutils-1.29.2/semanage/tests/semanage_test 2005-12-27 14:40:02.000000000 -0500 @@ -0,0 +1,67 @@ +#!/bin/sh -x +# @@ -1123,6 +1376,6 @@ +# +#******************** semanage SELinux ports test ************************ +#" -+#semanage port -l -+#semanage port -a httpd_port_t -+#semanage port -d httpd_port_t ++semanage port -l ++semanage port -a -P tcp 123456 ++semanage port -d -P tcp 123456 Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- policycoreutils.spec 27 Dec 2005 15:08:31 -0000 1.205 +++ policycoreutils.spec 2 Jan 2006 13:08:02 -0000 1.206 @@ -1,5 +1,5 @@ -%define libsepolver 1.11.1-1 -%define libsemanagever 1.5.3-1 +%define libsepolver 1.11.1-2 +%define libsemanagever 1.5.3-3 %define libselinuxver 1.29.2-1 Summary: SELinux policy core utilities. Name: policycoreutils From fedora-cvs-commits at redhat.com Mon Jan 2 13:22:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 08:22:40 -0500 Subject: rpms/mc/devel mc-showfree.patch,1.2,1.3 Message-ID: <200601021322.k02DMeZ2024217@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/mc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24031 Modified Files: mc-showfree.patch Log Message: minor correction of showfree patch mc-showfree.patch: screen.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+) Index: mc-showfree.patch =================================================================== RCS file: /cvs/dist/rpms/mc/devel/mc-showfree.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mc-showfree.patch 29 Dec 2005 19:32:05 -0000 1.2 +++ mc-showfree.patch 2 Jan 2006 13:22:35 -0000 1.3 @@ -1,5 +1,5 @@ ---- mc-4.6.1a/src/screen.c.showfree 2005-12-28 16:49:52.000000000 +0100 -+++ mc-4.6.1a/src/screen.c 2005-12-28 17:14:45.000000000 +0100 +--- mc-4.6.1a/src/screen.c.showfree 2006-01-02 12:22:51.000000000 +0100 ++++ mc-4.6.1a/src/screen.c 2006-01-02 13:44:05.000000000 +0100 @@ -49,6 +49,7 @@ #define WANT_WIDGETS #include "main.h" /* the_menubar */ @@ -32,12 +32,12 @@ + struct stat st; + + /* Don't try to stat non-local fs */ -+ if (strlen(panel->cwd) >= 2 && panel->cwd[0] == '/' && panel->cwd[1] == '#') ++ if (!vfs_file_is_local(panel->cwd)) + return; + -+ if (old_cwd == NULL || strcmp(old_cwd, panel->cwd)) { ++ if (old_cwd == NULL || strcmp(old_cwd, panel->cwd) == 0) { + init_my_statfs(); -+ if (old_cwd != NULL) g_free(old_cwd); ++ g_free(old_cwd); + old_cwd = g_strdup(panel->cwd); + } + @@ -48,7 +48,7 @@ + char buffer1 [6], buffer2[6], *tmp; + size_trunc_len (buffer1, 5, myfs_stats.avail, 1); + size_trunc_len (buffer2, 5, myfs_stats.total, 1); -+ tmp = g_strdup_printf (_("%s (%d%%) of %s"), buffer1, myfs_stats.total ? ++ tmp = g_strdup_printf (_("%s (%d%%) of %s"), buffer1, myfs_stats.total > 0 ? + (int)(100 * (double)myfs_stats.avail / myfs_stats.total) : 0, + buffer2); + widget_move (&panel->widget, panel->widget.lines-3, panel->widget.cols-2-strlen(tmp)); From fedora-cvs-commits at redhat.com Mon Jan 2 13:26:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 08:26:18 -0500 Subject: rpms/selinux-policy/devel policy-20051208.patch, 1.31, 1.32 selinux-policy.spec, 1.67, 1.68 policy-20051114.patch, 1.25, NONE Message-ID: <200601021326.k02DQIPa025979@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25922 Modified Files: policy-20051208.patch selinux-policy.spec Removed Files: policy-20051114.patch Log Message: * Fri Dec 30 2005 Dan Walsh 2.1.6-20 - Add Logwatch policy policy-20051208.patch: Makefile | 2 Rules.modular | 10 config/appconfig-strict-mcs/default_type | 6 config/appconfig-strict-mls/default_type | 7 config/appconfig-strict-mls/initrc_context | 2 config/appconfig-targeted-mcs/default_type | 2 config/appconfig-targeted-mls/default_type | 2 config/appconfig-targeted-mls/initrc_context | 2 man/man8/ftpd_selinux.8 | 56 ++++ man/man8/httpd_selinux.8 | 123 ++++++++ man/man8/kerberos_selinux.8 | 31 ++ man/man8/named_selinux.8 | 29 ++ man/man8/nfs_selinux.8 | 30 ++ man/man8/nis_selinux.8 | 1 man/man8/rsync_selinux.8 | 41 ++ man/man8/samba_selinux.8 | 60 ++++ man/man8/ypbind_selinux.8 | 19 + policy/global_tunables | 3 policy/mcs | 321 ++++------------------- policy/mls | 371 +++++---------------------- policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 9 policy/modules/admin/logrotate.te | 4 policy/modules/admin/rpm.fc | 1 policy/modules/admin/rpm.te | 19 - policy/modules/admin/tmpreaper.te | 3 policy/modules/admin/usermanage.te | 15 - policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 + policy/modules/apps/java.te | 25 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.te | 6 policy/modules/kernel/corenetwork.te.in | 12 policy/modules/kernel/devices.fc | 9 policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.fc | 27 + policy/modules/kernel/files.if | 17 + policy/modules/kernel/kernel.if | 2 policy/modules/kernel/kernel.te | 30 +- policy/modules/kernel/mls.te | 9 policy/modules/kernel/selinux.te | 2 policy/modules/kernel/storage.fc | 46 +-- policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 9 policy/modules/services/bind.if | 19 + policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 3 policy/modules/services/cups.te | 7 policy/modules/services/cvs.fc | 2 policy/modules/services/cvs.te | 6 policy/modules/services/dbus.te | 1 policy/modules/services/hal.te | 4 policy/modules/services/ldap.te | 4 policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 103 +++++++ policy/modules/services/mta.te | 13 policy/modules/services/ppp.te | 4 policy/modules/services/prelink.fc | 7 policy/modules/services/prelink.if | 39 ++ policy/modules/services/prelink.te | 64 ++++ policy/modules/services/remotelogin.te | 1 policy/modules/services/samba.if | 1 policy/modules/services/sasl.te | 8 policy/modules/services/sendmail.te | 36 -- policy/modules/services/ssh.te | 10 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 12 policy/modules/system/authlogin.te | 1 policy/modules/system/getty.te | 3 policy/modules/system/hostname.if | 15 + policy/modules/system/hostname.te | 37 -- policy/modules/system/init.if | 14 + policy/modules/system/init.te | 22 + policy/modules/system/iptables.te | 2 policy/modules/system/libraries.fc | 8 policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 2 policy/modules/system/logging.fc | 7 policy/modules/system/logging.if | 21 + policy/modules/system/logging.te | 5 policy/modules/system/lvm.te | 2 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 10 policy/modules/system/udev.fc | 1 policy/modules/system/udev.te | 4 policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.te | 9 policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 27 + policy/modules/system/userdomain.te | 16 + policy/users | 8 97 files changed, 1324 insertions(+), 722 deletions(-) Index: policy-20051208.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20051208.patch,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- policy-20051208.patch 30 Dec 2005 16:08:00 -0000 1.31 +++ policy-20051208.patch 2 Jan 2006 13:26:14 -0000 1.32 @@ -2320,7 +2320,7 @@ +## Update database for mlogwatch diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/logwatch.te serefpolicy-2.1.6/policy/modules/services/logwatch.te --- nsaserefpolicy/policy/modules/services/logwatch.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.6/policy/modules/services/logwatch.te 2005-12-30 11:03:41.000000000 -0500 ++++ serefpolicy-2.1.6/policy/modules/services/logwatch.te 2005-12-30 11:14:15.000000000 -0500 @@ -0,0 +1,103 @@ +policy_module(logwatch,1.0.0) + @@ -2403,7 +2403,7 @@ + +mta_send_mail(logwatch_t) + -+optional_policy(`crond',` ++optional_policy(`cron',` + cron_system_entry(logwatch_t, logwatch_exec_t) +') + Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- selinux-policy.spec 30 Dec 2005 16:08:00 -0000 1.67 +++ selinux-policy.spec 2 Jan 2006 13:26:14 -0000 1.68 @@ -7,7 +7,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.1.6 -Release: 19 +Release: 20 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -258,7 +258,7 @@ %endif %changelog -* Fri Dec 30 2005 Dan Walsh 2.1.6-19 +* Fri Dec 30 2005 Dan Walsh 2.1.6-20 - Add Logwatch policy * Wed Dec 28 2005 Dan Walsh 2.1.6-18 --- policy-20051114.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 2 14:17:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 09:17:31 -0500 Subject: rpms/libsetrans/devel .cvsignore, 1.13, 1.14 libsetrans.spec, 1.21, 1.22 sources, 1.17, 1.18 Message-ID: <200601021417.k02EHVau030987@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsetrans/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30752 Modified Files: .cvsignore libsetrans.spec sources Log Message: * Mon Jan 2 2006 Dan Walsh 0.1.13-1 - Apply some of Uli fixes and Russell patch to improve performance Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 29 Dec 2005 19:11:39 -0000 1.13 +++ .cvsignore 2 Jan 2006 14:17:27 -0000 1.14 @@ -11,3 +11,4 @@ libsetrans-0.1.10.tgz libsetrans-0.1.11.tgz libsetrans-0.1.12.tgz +libsetrans-0.1.13.tgz Index: libsetrans.spec =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/libsetrans.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- libsetrans.spec 29 Dec 2005 19:11:39 -0000 1.21 +++ libsetrans.spec 2 Jan 2006 14:17:27 -0000 1.22 @@ -1,6 +1,6 @@ Summary: SELinux Translation library Name: libsetrans -Version: 0.1.12 +Version: 0.1.13 Release: 1 License: LGPL Group: System Environment/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man8/mcs.8.gz %changelog +* Mon Jan 2 2006 Dan Walsh 0.1.13-1 +- Apply some of Uli fixes and Russell patch to improve performance + * Thu Dec 29 2005 Dan Walsh 0.1.12-1 - Add handling of ranges s0:c1-s0:c255 - Add handling of contiguous categories s0:c1.c5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 29 Dec 2005 19:11:40 -0000 1.17 +++ sources 2 Jan 2006 14:17:27 -0000 1.18 @@ -1 +1 @@ -84e3ccb69e0ddfe567fb2d500e1b13cd libsetrans-0.1.12.tgz +733aafdcd48ad654373bd02e174eed93 libsetrans-0.1.13.tgz From fedora-cvs-commits at redhat.com Mon Jan 2 14:37:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 09:37:57 -0500 Subject: rpms/coreutils/devel coreutils.spec,1.102,1.103 su.pamd,1.7,1.8 Message-ID: <200601021437.k02EbvrS029879@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/coreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29866 Modified Files: coreutils.spec su.pamd Log Message: * Mon Jan 2 2005 Dan Walsh 5.93-6 - Remove pam_selinux.so from su.pamd, not needed for targeted and Strict/MLS will have to newrole before using. From fedora-cvs-commits at redhat.com Mon Jan 2 14:38:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 09:38:05 -0500 Subject: rpms/coreutils/devel coreutils.spec,1.103,1.104 Message-ID: <200601021438.k02Ec5MI029903@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/coreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29890 Modified Files: coreutils.spec Log Message: * Mon Jan 2 2006 Dan Walsh 5.93-6 - Remove pam_selinux.so from su.pamd, not needed for targeted and Strict/MLS will have to newrole before using. Index: coreutils.spec =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- coreutils.spec 2 Jan 2006 14:37:54 -0000 1.103 +++ coreutils.spec 2 Jan 2006 14:38:03 -0000 1.104 @@ -259,7 +259,7 @@ /sbin/runuser %changelog -* Mon Jan 2 2005 Dan Walsh 5.93-6 +* Mon Jan 2 2006 Dan Walsh 5.93-6 - Remove pam_selinux.so from su.pamd, not needed for targeted and Strict/MLS will have to newrole before using. From fedora-cvs-commits at redhat.com Mon Jan 2 14:43:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 09:43:51 -0500 Subject: rpms/dictd/devel dictd.spec,1.18,1.19 Message-ID: <200601021443.k02EhppX029975@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/dictd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29962 Modified Files: dictd.spec Log Message: - add BuildRequires libtool-ltdl-devel (#176505) Index: dictd.spec =================================================================== RCS file: /cvs/dist/rpms/dictd/devel/dictd.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- dictd.spec 20 Dec 2005 10:33:52 -0000 1.18 +++ dictd.spec 2 Jan 2006 14:43:49 -0000 1.19 @@ -1,7 +1,7 @@ Summary: DICT protocol (RFC 2229) command-line client Name: dictd Version: 1.9.15 -Release: 4 +Release: 5 License: GPL Group: Applications/Internet Source0: ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz @@ -10,7 +10,7 @@ URL: http://www.dict.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: chkconfig -BuildRequires: flex bison libtool libtool-libs +BuildRequires: flex bison libtool libtool-libs libtool-ltdl-devel %description Command-line client for the DICT protocol. The Dictionary Server @@ -59,6 +59,9 @@ %config(noreplace) %{_sysconfdir}/sysconfig/dictd %changelog +* Mon Jan 02 2006 Karsten Hopp 1.9.15-5 +- add BuildRequires libtool-ltdl-devel (#176505) + * Tue Dec 20 2005 Karsten Hopp 1.9.15-4 - consult dict.org if no server is specified on the commandline (#176038) From fedora-cvs-commits at redhat.com Mon Jan 2 14:52:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 09:52:37 -0500 Subject: rpms/hplip/devel hplip.spec,1.38,1.39 Message-ID: <200601021452.k02Eqb5q008849@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8836 Modified Files: hplip.spec Log Message: * Mon Jan 2 2006 Tim Waugh 0.9.7-6 - Rebuild. Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- hplip.spec 23 Dec 2005 10:04:50 -0000 1.38 +++ hplip.spec 2 Jan 2006 14:52:34 -0000 1.39 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 0.9.7 -Release: 5 +Release: 6 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -152,6 +152,9 @@ fi %changelog +* Mon Jan 2 2006 Tim Waugh 0.9.7-6 +- Rebuild. + * Fri Dec 23 2005 Tim Waugh 0.9.7-5 - Rebuild. From fedora-cvs-commits at redhat.com Mon Jan 2 16:07:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 11:07:01 -0500 Subject: rpms/libtermcap/devel libtermcap.spec,1.15,1.16 Message-ID: <200601021607.k02G71L4000366@cvs.devel.redhat.com> Author: praszyk Update of /cvs/dist/rpms/libtermcap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32582 Modified Files: libtermcap.spec Log Message: libtermcap does not 'free()' memory. See #74346 Index: libtermcap.spec =================================================================== RCS file: /cvs/dist/rpms/libtermcap/devel/libtermcap.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libtermcap.spec 9 Dec 2005 22:41:42 -0000 1.15 +++ libtermcap.spec 2 Jan 2006 16:06:58 -0000 1.16 @@ -1,7 +1,7 @@ Summary: A basic system library for accessing the termcap database. Name: libtermcap Version: 2.0.8 -Release: 42.1 +Release: 43 Source: ftp://metalab.unc.edu/pub/Linux/GCC/termcap-2.0.8.tar.bz2 Url: ftp://metalab.unc.edu/pub/Linux/GCC/ License: LGPL @@ -23,6 +23,7 @@ Patch13: termcap-116934.patch Patch14: termcap-2.0.8-shrink.patch Patch15: termcap-2.0.8-octal.patch +Patch16: termcap-2.0.8-nofree.patch Requires: /etc/termcap BuildPrereq: texinfo BuildRoot: /var/tmp/%{name}-root @@ -66,6 +67,7 @@ %patch13 -p1 -b .116934 %patch14 -p1 -b .shrink %patch15 -p1 -b .octal +%patch16 -p1 -b .nofree %build make AR=%{__ar} CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS -I." @@ -123,6 +125,10 @@ %{_infodir}/termcap.info* %changelog +* Mon Jan 2 2006 Petr Raszyk 2.0.8-43 +- libtermcap does not 'free()'memory. See #74346 + A patch termcap-2.0.8-nofree.patch + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Mon Jan 2 16:13:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 11:13:04 -0500 Subject: rpms/libtermcap/devel termcap-2.0.8-nofree.patch, NONE, 1.1 libtermcap.spec, 1.16, 1.17 Message-ID: <200601021613.k02GD4Y1003115@cvs.devel.redhat.com> Author: praszyk Update of /cvs/dist/rpms/libtermcap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3043 Modified Files: libtermcap.spec Added Files: termcap-2.0.8-nofree.patch Log Message: Rebuild. termcap-2.0.8-nofree.patch: termcap.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE termcap-2.0.8-nofree.patch --- --- termcap-2.0.8/termcap.c.rasold 2006-01-02 17:10:29.000000000 +0100 +++ termcap-2.0.8/termcap.c 2006-01-02 17:10:52.000000000 +0100 @@ -421,6 +421,7 @@ sp = get_one_entry(fp, term_list[index]); if (sp == NULL) break; build_list(&l, sp, term_list); + free (sp); } fclose(fp); Index: libtermcap.spec =================================================================== RCS file: /cvs/dist/rpms/libtermcap/devel/libtermcap.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- libtermcap.spec 2 Jan 2006 16:06:58 -0000 1.16 +++ libtermcap.spec 2 Jan 2006 16:13:02 -0000 1.17 @@ -1,7 +1,7 @@ Summary: A basic system library for accessing the termcap database. Name: libtermcap Version: 2.0.8 -Release: 43 +Release: 44 Source: ftp://metalab.unc.edu/pub/Linux/GCC/termcap-2.0.8.tar.bz2 Url: ftp://metalab.unc.edu/pub/Linux/GCC/ License: LGPL @@ -125,6 +125,9 @@ %{_infodir}/termcap.info* %changelog +* Mon Jan 2 2006 Petr Raszyk 2.0.8-44 +- Rebuild. + * Mon Jan 2 2006 Petr Raszyk 2.0.8-43 - libtermcap does not 'free()'memory. See #74346 A patch termcap-2.0.8-nofree.patch From fedora-cvs-commits at redhat.com Mon Jan 2 16:19:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 11:19:42 -0500 Subject: rpms/binutils/devel binutils-2.16.91.0.5-elfvsb-test.patch, NONE, 1.1 binutils-2.16.91.0.5-ia64-lib64.patch, NONE, 1.1 binutils-2.16.91.0.5-ltconfig-multilib.patch, NONE, 1.1 binutils-2.16.91.0.5-place-orphan.patch, NONE, 1.1 binutils-2.16.91.0.5-ppc64-pie.patch, NONE, 1.1 binutils-2.16.91.0.5-ppc64-toc1-discard.patch, NONE, 1.1 binutils-2.16.91.0.5-standards.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 binutils.spec, 1.70, 1.71 sources, 1.23, 1.24 binutils-2.16.91.0.3-cxx-relro.patch, 1.1, NONE binutils-2.16.91.0.3-elfvsb-test.patch, 1.1, NONE binutils-2.16.91.0.3-ia64-lib64.patch, 1.1, NONE binutils-2.16.91.0.3-ltconfig-multilib.patch, 1.1, NONE binutils-2.16.91.0.3-place-orphan.patch, 1.1, NONE binutils-2.16.91.0.3-ppc64-pie.patch, 1.1, NONE binutils-2.16.91.0.3-standards.patch, 1.1, NONE binutils-2.16.91.0.3-weakref.patch, 1.1, NONE Message-ID: <200601021619.k02GJgct017395@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/binutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17278 Modified Files: .cvsignore binutils.spec sources Added Files: binutils-2.16.91.0.5-elfvsb-test.patch binutils-2.16.91.0.5-ia64-lib64.patch binutils-2.16.91.0.5-ltconfig-multilib.patch binutils-2.16.91.0.5-place-orphan.patch binutils-2.16.91.0.5-ppc64-pie.patch binutils-2.16.91.0.5-ppc64-toc1-discard.patch binutils-2.16.91.0.5-standards.patch Removed Files: binutils-2.16.91.0.3-cxx-relro.patch binutils-2.16.91.0.3-elfvsb-test.patch binutils-2.16.91.0.3-ia64-lib64.patch binutils-2.16.91.0.3-ltconfig-multilib.patch binutils-2.16.91.0.3-place-orphan.patch binutils-2.16.91.0.3-ppc64-pie.patch binutils-2.16.91.0.3-standards.patch binutils-2.16.91.0.3-weakref.patch Log Message: 2.16.91.0.5-1 binutils-2.16.91.0.5-elfvsb-test.patch: elfvsb.exp | 8 ++++---- sh1.c | 6 ++++++ sh2.c | 10 ++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) --- NEW FILE binutils-2.16.91.0.5-elfvsb-test.patch --- 2004-08-03 Jakub Jelinek * ld-elfvsb/sh1.c (overriddenvar, shlib_overriddencall2): If !SHARED, move to... * ld-elfvsb/sh2.c: ... here. * ld-elfvsb/elfvsb.exp: Add -DSHARED to compiler options when building {sh[123],main}.c with $picflag. --- ld/testsuite/ld-elfvsb/sh1.c.jj 2003-05-05 17:46:50.000000000 -0400 +++ ld/testsuite/ld-elfvsb/sh1.c 2004-08-03 13:15:48.000000000 -0400 @@ -13,7 +13,11 @@ extern int mainvar; /* This variable is defined in the shared library, and overridden by the main program. */ #ifndef XCOFF_TEST +#ifdef SHARED int overriddenvar = -1; +#else +extern int overriddenvar; +#endif #endif /* This variable is defined in the shared library. */ @@ -76,12 +80,14 @@ shlib_shlibcall2 () return shlib_overriddencall2 (); } +#ifdef SHARED int shlib_overriddencall2 () { return 7; } #endif +#endif /* This function calls a function defined by the main program. */ --- ld/testsuite/ld-elfvsb/elfvsb.exp.jj 2004-05-27 14:26:05.000000000 -0400 +++ ld/testsuite/ld-elfvsb/elfvsb.exp 2004-08-03 13:13:40.000000000 -0400 @@ -315,8 +315,8 @@ proc visibility_run {visibility} { # Now compile the code using -fpic. - if { ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/sh1.c $tmpdir/sh1p.o] - || ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/sh2.c $tmpdir/sh2p.o] } { + if { ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/sh1.c $tmpdir/sh1p.o] + || ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/sh2.c $tmpdir/sh2p.o] } { unresolved "visibility ($visibility)" } else { if { [ string match $visibility "protected" ] @@ -337,7 +337,7 @@ proc visibility_run {visibility} { } # Now do the same tests again, but this time compile main.c PIC. - if ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/main.c $tmpdir/mainp.o] { + if ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/main.c $tmpdir/mainp.o] { unresolved "visibility ($visibility) (PIC main, non PIC so)" unresolved "visibility ($visibility) (PIC main)" } else { @@ -446,7 +446,7 @@ if { ![ld_compile "$CC -g $CFLAGS" $srcd if { ![ld_compile "$CC -g $CFLAGS" $srcdir/$subdir/test.c tmpdir/test.o] } { unresolved "weak hidden symbol" } else { - if { ![ld_compile "$CC -g $CFLAGS $picflag" $srcdir/$subdir/sh3.c tmpdir/sh3.o] } { + if { ![ld_compile "$CC -g $CFLAGS -DSHARED $picflag" $srcdir/$subdir/sh3.c tmpdir/sh3.o] } { unresolved "weak hidden symbol" } else { if ![ld_simple_link $ld tmpdir/sh3.so "-shared tmpdir/sh3.o"] { --- ld/testsuite/ld-elfvsb/sh2.c.jj 2003-05-05 17:46:50.000000000 -0400 +++ ld/testsuite/ld-elfvsb/sh2.c 2004-08-03 13:14:22.000000000 -0400 @@ -44,3 +44,13 @@ visibility_func_weak () return 2; } #endif + +#if !defined (XCOFF_TEST) && !defined (SHARED) +int overriddenvar = -1; + +int +shlib_overriddencall2 () +{ + return 7; +} +#endif binutils-2.16.91.0.5-ia64-lib64.patch: ld/emulparams/elf64_ia64.sh | 10 ++++++++++ ltconfig | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) --- NEW FILE binutils-2.16.91.0.5-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.16.91.0.5-ltconfig-multilib.patch: ltconfig | 17 +++++++++++++++++ 1 files changed, 17 insertions(+) --- NEW FILE binutils-2.16.91.0.5-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.16.91.0.5-place-orphan.patch: elf64ppc.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE binutils-2.16.91.0.5-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.16.91.0.5-ppc64-pie.patch: elf64-ppc.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE binutils-2.16.91.0.5-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.16.91.0.5-ppc64-toc1-discard.patch: elf64-ppc.c | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE binutils-2.16.91.0.5-ppc64-toc1-discard.patch --- 2006-01-01 Jakub Jelinek * elf64-ppc.c (ppc64_elf_action_discarded): Return 0 for .toc1 section. --- bfd/elf64-ppc.c 31 Dec 2005 12:55:10 -0000 1.229 +++ bfd/elf64-ppc.c 1 Jan 2006 00:06:24 -0000 1.230 @@ -9494,6 +9494,9 @@ ppc64_elf_action_discarded (asection *se if (strcmp (".toc", sec->name) == 0) return 0; + if (strcmp (".toc1", sec->name) == 0) + return 0; + return _bfd_elf_default_action_discarded (sec); } binutils-2.16.91.0.5-standards.patch: standards.texi | 493 +++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 322 insertions(+), 171 deletions(-) --- NEW FILE binutils-2.16.91.0.5-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 ifinfo - 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 ifinfo + at end direntry @c @setchapternewpage odd @setchapternewpage off @@ -32,9 +29,11 @@ END-INFO-DIR-ENTRY @set CHAPTER node @end ifinfo - at ifinfo -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 ifinfo + 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 ifinfo + at contents + + at ifnottex @node Top, Preface, (dir), (dir) @top Version -Last updated @value{lastupdate}. - at end ifinfo + 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: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 11 Nov 2005 13:52:39 -0000 1.22 +++ .cvsignore 2 Jan 2006 16:19:39 -0000 1.23 @@ -1 +1 @@ -binutils-2.16.91.0.3.tar.bz2 +binutils-2.16.91.0.5.tar.bz2 Index: binutils.spec =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/binutils.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- binutils.spec 14 Dec 2005 22:12:57 -0000 1.70 +++ binutils.spec 2 Jan 2006 16:19:39 -0000 1.71 @@ -1,19 +1,18 @@ Summary: A GNU collection of binary utilities. Name: binutils -Version: 2.16.91.0.3 -Release: 2 +Version: 2.16.91.0.5 +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.16.91.0.3-ltconfig-multilib.patch -Patch2: binutils-2.16.91.0.3-ppc64-pie.patch -Patch3: binutils-2.16.91.0.3-place-orphan.patch -Patch4: binutils-2.16.91.0.3-ia64-lib64.patch -Patch5: binutils-2.16.91.0.3-elfvsb-test.patch -Patch6: binutils-2.16.91.0.3-standards.patch -Patch7: binutils-2.16.91.0.3-weakref.patch -Patch8: binutils-2.16.91.0.3-cxx-relro.patch +Patch1: binutils-2.16.91.0.5-ltconfig-multilib.patch +Patch2: binutils-2.16.91.0.5-ppc64-pie.patch +Patch3: binutils-2.16.91.0.5-place-orphan.patch +Patch4: binutils-2.16.91.0.5-ia64-lib64.patch +Patch5: binutils-2.16.91.0.5-elfvsb-test.patch +Patch6: binutils-2.16.91.0.5-standards.patch +Patch7: binutils-2.16.91.0.5-ppc64-toc1-discard.patch Buildroot: %{_tmppath}/binutils-root BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison @@ -49,8 +48,7 @@ %endif %patch5 -p0 -b .elfvsb-test~ %patch6 -p0 -b .standards~ -%patch7 -p0 -b .weakref~ -%patch8 -p0 -b .cxx-relro~ +%patch7 -p0 -b .ppc64-toc1-discard~ # libtool sucks perl -pi -e 'm/LIBADD/ && s/(\.\.\/bfd\/libbfd.la)/-L\.\.\/bfd\/\.libs \1/' opcodes/Makefile.{am,in} # LTP sucks @@ -161,6 +159,11 @@ %{_infodir}/*info* %changelog +* Mon Jan 02 2006 Jakub Jelinek 2.16.91.0.5-1 +- update to 2.16.91.0.5 +- don't error about .toc1 references to discarded sectiosn on ppc64 + (#175944) + * Wed Dec 14 2005 Jakub Jelinek 2.16.91.0.3-2 - put .gnu.linkonce.d.rel.ro.* sections into relro region Index: sources =================================================================== RCS file: /cvs/dist/rpms/binutils/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 11 Nov 2005 13:52:40 -0000 1.23 +++ sources 2 Jan 2006 16:19:39 -0000 1.24 @@ -1 +1 @@ -c737a5787927f60758b4960f10e44f93 binutils-2.16.91.0.3.tar.bz2 +29fdde06e229672daaaacbf52362520a binutils-2.16.91.0.5.tar.bz2 --- binutils-2.16.91.0.3-cxx-relro.patch DELETED --- --- binutils-2.16.91.0.3-elfvsb-test.patch DELETED --- --- binutils-2.16.91.0.3-ia64-lib64.patch DELETED --- --- binutils-2.16.91.0.3-ltconfig-multilib.patch DELETED --- --- binutils-2.16.91.0.3-place-orphan.patch DELETED --- --- binutils-2.16.91.0.3-ppc64-pie.patch DELETED --- --- binutils-2.16.91.0.3-standards.patch DELETED --- --- binutils-2.16.91.0.3-weakref.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 2 17:02:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 12:02:32 -0500 Subject: rpms/util-linux/FC-4 util-linux-2.12p-cal-wide.patch, NONE, 1.1 util-linux-2.12p-col-EILSEQ.patch, NONE, 1.1 util-linux.spec, 1.87, 1.88 Message-ID: <200601021702.k02H2WwR001257@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv1209 Modified Files: util-linux.spec Added Files: util-linux-2.12p-cal-wide.patch util-linux-2.12p-col-EILSEQ.patch Log Message: fix col and cal util-linux-2.12p-cal-wide.patch: cal.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) --- NEW FILE util-linux-2.12p-cal-wide.patch --- --- util-linux-2.12p/misc-utils/cal.c.wide 2004-12-05 20:20:36.000000000 +0100 +++ util-linux-2.12p/misc-utils/cal.c 2006-01-02 15:13:50.000000000 +0100 @@ -368,7 +368,7 @@ int i, wd; #ifdef ENABLE_WIDECHAR wchar_t day_headings_wc[22],j_day_headings_wc[29]; - wchar_t wd_wc[10]; + char *cur_dh = day_headings, *cur_j_dh = j_day_headings; #endif strcpy(day_headings,""); @@ -385,30 +385,25 @@ #endif for(i = 0 ; i < 7 ; i++ ) { + ssize_t space_left; wd = (i + week1stday) % 7; #ifdef ENABLE_WIDECHAR - mbstowcs(wd_wc,weekday(wd),10); - if (wcswidth(wd_wc,10) < 3) - wcscat(j_day_headings_wc,L" "); - if (wcswidth(wd_wc,10) < 2) { - wcscat(day_headings_wc, L" "); - wcscat(j_day_headings_wc, L" "); - } - wcsncat(day_headings_wc,wd_wc,2); - wcsncat(j_day_headings_wc,wd_wc,3); - wcscat(day_headings_wc, L" "); - wcscat(j_day_headings_wc, L" "); + swprintf(day_headings_wc, sizeof(day_headings_wc)/sizeof(day_headings_wc[0]), + L"%1.2s ", weekday(wd)); + swprintf(j_day_headings_wc, sizeof(j_day_headings_wc)/sizeof(j_day_headings_wc[0]), + L"%3.3s ", weekday(wd)); + space_left = sizeof(day_headings)-(cur_dh-day_headings); + if(space_left <= 0) break; + cur_dh += wcstombs(cur_dh,day_headings_wc, space_left); + space_left = sizeof(j_day_headings)-(cur_j_dh-j_day_headings); + if(space_left <= 0) break; + cur_j_dh += wcstombs(cur_j_dh,j_day_headings_wc, space_left); #else sprintf(eos(day_headings), "%2.2s ", weekday(wd)); sprintf(eos(j_day_headings), "%3.3s ", weekday(wd)); #endif } -#ifdef ENABLE_WIDECHAR - wcstombs(day_headings,day_headings_wc,sizeof(day_headings)); - wcstombs(j_day_headings,j_day_headings_wc,sizeof(j_day_headings)); -#endif - trim_trailing_spaces(day_headings); trim_trailing_spaces(j_day_headings); #undef weekday util-linux-2.12p-col-EILSEQ.patch: col.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) --- NEW FILE util-linux-2.12p-col-EILSEQ.patch --- --- util-linux-2.12p/text-utils/col.c.EILSEQ 2002-03-09 00:05:12.000000000 +0100 +++ util-linux-2.12p/text-utils/col.c 2006-01-02 18:00:06.000000000 +0100 @@ -128,6 +128,7 @@ int this_line; /* line l points to */ int nflushd_lines; /* number of lines that were flushed */ int adjust, opt, warned; + int ret = 0; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); @@ -175,8 +176,15 @@ cur_line = max_line = nflushd_lines = this_line = 0; cur_set = last_set = CS_NORMAL; lines = l = alloc_line(); - - while ((ch = getwchar()) != WEOF) { + + while (feof(stdin)==0) { + errno = 0; + if ((ch = getwchar()) == WEOF) { + if (errno==EILSEQ) + perror("col"); + ret = 1; + break; + } if (!iswgraph(ch)) { switch (ch) { case BS: /* can't go back further */ @@ -332,7 +340,7 @@ flush_blanks(); if (ferror(stdout) || fclose(stdout)) return 1; - return 0; + return ret; } void flush_lines(int nflush) Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-4/util-linux.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- util-linux.spec 30 Sep 2005 14:08:50 -0000 1.87 +++ util-linux.spec 2 Jan 2006 17:02:14 -0000 1.88 @@ -150,6 +150,11 @@ # 155559 - /usr/bin/floppy doesn't work with generic device Patch208: util-linux-2.12p-floppy-generic.patch +# better wide chars usage in the cal command (based on old 'moremisc' patch) +Patch209: util-linux-2.12p-cal-wide.patch +# 176441: col truncates data +Patch210: util-linux-2.12p-col-EILSEQ.patch + # When adding patches, please make sure that it is easy to find out what bug # the # patch fixes. ########### END upstreamable @@ -285,6 +290,8 @@ %patch206 -p1 %patch207 -p1 %patch208 -p1 -b .generic +%patch209 -p1 +%patch210 -p1 -b .EILSEQ %build unset LINGUAS || : From fedora-cvs-commits at redhat.com Mon Jan 2 17:36:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 12:36:55 -0500 Subject: rpms/epiphany/devel .cvsignore, 1.31, 1.32 epiphany.spec, 1.76, 1.77 sources, 1.31, 1.32 Message-ID: <200601021736.k02HatZB024823@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/epiphany/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24792 Modified Files: .cvsignore epiphany.spec sources Log Message: * Mon Jan 2 2006 Christopher Aillon 1.9.4-1 - Update to 1.9.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 15 Dec 2005 18:23:45 -0000 1.31 +++ .cvsignore 2 Jan 2006 17:36:52 -0000 1.32 @@ -18,3 +18,4 @@ epiphany-1.8.0.tar.bz2 epiphany-1.9.2.tar.bz2 epiphany-1.9.3.1.tar.bz2 +epiphany-1.9.4.tar.bz2 Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- epiphany.spec 15 Dec 2005 18:23:45 -0000 1.76 +++ epiphany.spec 2 Jan 2006 17:36:52 -0000 1.77 @@ -9,7 +9,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany -Version: 1.9.3.1 +Version: 1.9.4 Release: 1 License: GPL Group: Applications/Internet @@ -124,6 +124,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Mon Jan 2 2006 Christopher Aillon 1.9.4-1 +- Update to 1.9.4 + * Thu Dec 15 2005 Matthias Clasen 1.9.3.1-1 - Update to 1.9.3.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 15 Dec 2005 18:23:45 -0000 1.31 +++ sources 2 Jan 2006 17:36:52 -0000 1.32 @@ -1 +1 @@ -d84c974d1df5cfbc93270c730f245e13 epiphany-1.9.3.1.tar.bz2 +186d211a155a7706abe13514eb84c311 epiphany-1.9.4.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 2 19:05:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 14:05:49 -0500 Subject: rpms/selinux-policy-targeted/FC-4 policy-20050916.patch, 1.20, 1.21 selinux-policy-targeted.spec, 1.353, 1.354 Message-ID: <200601021905.k02J5nab015457@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv15390 Modified Files: policy-20050916.patch selinux-policy-targeted.spec Log Message: * Mon Jan 2 2006 Dan Walsh 1.27.1-2.18 - Allow pam_module to work with apache policy-20050916.patch: Makefile | 26 +- attrib.te | 100 +++++++++- domains/admin.te | 2 domains/misc/kernel.te | 2 domains/program/crond.te | 2 domains/program/fsadm.te | 9 domains/program/getty.te | 2 domains/program/hostname.te | 2 domains/program/ifconfig.te | 10 - domains/program/init.te | 2 domains/program/initrc.te | 26 ++ domains/program/ldconfig.te | 3 domains/program/load_policy.te | 11 - domains/program/login.te | 23 +- domains/program/logrotate.te | 2 domains/program/modutil.te | 27 +- domains/program/mount.te | 6 domains/program/netutils.te | 3 domains/program/newrole.te | 4 domains/program/passwd.te | 2 domains/program/restorecon.te | 6 domains/program/setfiles.te | 4 domains/program/ssh.te | 6 domains/program/su.te | 12 + domains/program/syslogd.te | 7 domains/program/tmpreaper.te | 2 domains/program/unused/NetworkManager.te | 13 + domains/program/unused/alsa.te | 2 domains/program/unused/amanda.te | 74 +------ domains/program/unused/anaconda.te | 5 domains/program/unused/apache.te | 25 +- domains/program/unused/apmd.te | 25 ++ domains/program/unused/auditd.te | 9 domains/program/unused/automount.te | 4 domains/program/unused/avahi.te | 31 +++ domains/program/unused/bluetooth.te | 72 +++++++ domains/program/unused/cups.te | 24 +- domains/program/unused/cvs.te | 2 domains/program/unused/cyrus.te | 10 - domains/program/unused/dbusd.te | 4 domains/program/unused/dcc.te | 5 domains/program/unused/dhcpc.te | 6 domains/program/unused/dhcpd.te | 4 domains/program/unused/dovecot.te | 6 domains/program/unused/exim.te | 309 +++++++++++++++++++++++++++++++ domains/program/unused/ftpd.te | 6 domains/program/unused/hald.te | 5 domains/program/unused/hotplug.te | 10 - domains/program/unused/hwclock.te | 1 domains/program/unused/ipsec.te | 2 domains/program/unused/kudzu.te | 5 domains/program/unused/mta.te | 7 domains/program/unused/mysqld.te | 10 - domains/program/unused/named.te | 27 ++ domains/program/unused/nscd.te | 1 domains/program/unused/ntpd.te | 10 - domains/program/unused/openct.te | 16 + domains/program/unused/pamconsole.te | 4 domains/program/unused/pegasus.te | 36 +++ domains/program/unused/ping.te | 2 domains/program/unused/postfix.te | 63 ++++-- domains/program/unused/postgresql.te | 11 - domains/program/unused/pppd.te | 23 +- domains/program/unused/privoxy.te | 2 domains/program/unused/procmail.te | 16 + domains/program/unused/radius.te | 3 domains/program/unused/readahead.te | 21 ++ domains/program/unused/rlogind.te | 4 domains/program/unused/roundup.te | 29 ++ domains/program/unused/rpcd.te | 18 + domains/program/unused/rpm.te | 4 domains/program/unused/rsync.te | 3 domains/program/unused/samba.te | 15 + domains/program/unused/saslauthd.te | 1 domains/program/unused/sendmail.te | 3 domains/program/unused/slapd.te | 28 ++ domains/program/unused/snmpd.te | 6 domains/program/unused/spamd.te | 28 -- domains/program/unused/squid.te | 4 domains/program/unused/udev.te | 10 - domains/program/unused/utempter.te | 2 domains/program/unused/webalizer.te | 3 domains/program/unused/winbind.te | 1 domains/program/unused/xdm.te | 3 domains/program/unused/yppasswdd.te | 40 ++++ domains/program/unused/ypserv.te | 9 domains/program/unused/zebra.te | 2 domains/program/useradd.te | 5 file_contexts/distros.fc | 2 file_contexts/program/apache.fc | 3 file_contexts/program/bluetooth.fc | 3 file_contexts/program/compat.fc | 4 file_contexts/program/dhcpc.fc | 2 file_contexts/program/dhcpd.fc | 5 file_contexts/program/ftpd.fc | 5 file_contexts/program/games.fc | 11 - file_contexts/program/innd.fc | 15 - file_contexts/program/ipsec.fc | 1 file_contexts/program/openct.fc | 2 file_contexts/program/pegasus.fc | 9 file_contexts/program/pppd.fc | 2 file_contexts/program/privoxy.fc | 1 file_contexts/program/readahead.fc | 1 file_contexts/program/roundup.fc | 2 file_contexts/program/rpm.fc | 4 file_contexts/program/rshd.fc | 1 file_contexts/program/rsync.fc | 2 file_contexts/program/slapd.fc | 12 + file_contexts/program/squid.fc | 3 file_contexts/program/xdm.fc | 2 file_contexts/program/yppasswdd.fc | 2 file_contexts/program/ypserv.fc | 1 file_contexts/types.fc | 6 genfs_contexts | 3 macros/base_user_macros.te | 7 macros/core_macros.te | 9 macros/global_macros.te | 33 ++- macros/home_macros.te | 9 macros/network_macros.te | 17 + macros/program/apache_macros.te | 13 + macros/program/bonobo_macros.te | 2 macros/program/cdrecord_macros.te | 6 macros/program/chkpwd_macros.te | 8 macros/program/crontab_macros.te | 2 macros/program/dbusd_macros.te | 7 macros/program/gconf_macros.te | 2 macros/program/gift_macros.te | 2 macros/program/gpg_macros.te | 2 macros/program/i18n_input_macros.te | 21 ++ macros/program/lpr_macros.te | 2 macros/program/mta_macros.te | 4 macros/program/newrole_macros.te | 2 macros/program/pyzor_macros.te | 2 macros/program/razor_macros.te | 2 macros/program/su_macros.te | 4 macros/program/uml_macros.te | 2 macros/program/xdm_macros.te | 2 macros/program/ypbind_macros.te | 1 macros/user_macros.te | 7 man/man8/ftpd_selinux.8 | 19 + man/man8/httpd_selinux.8 | 9 man/man8/rsync_selinux.8 | 12 - man/man8/samba_selinux.8 | 9 mcs | 210 ++++++++------------- mls | 270 ++++++++++----------------- net_contexts | 13 + targeted/appconfig/root_default_contexts | 4 targeted/assert.te | 2 targeted/domains/program/compat.te | 1 targeted/domains/program/sendmail.te | 1 targeted/domains/program/ssh.te | 3 targeted/domains/program/xdm.te | 4 targeted/domains/unconfined.te | 15 + tunables/distro.tun | 2 tunables/tunable.tun | 4 types/device.te | 4 types/devpts.te | 4 types/file.te | 48 +--- types/network.te | 13 - types/nfs.te | 1 types/security.te | 6 161 files changed, 1668 insertions(+), 688 deletions(-) Index: policy-20050916.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/policy-20050916.patch,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- policy-20050916.patch 20 Dec 2005 22:47:56 -0000 1.20 +++ policy-20050916.patch 2 Jan 2006 19:05:01 -0000 1.21 @@ -945,7 +945,16 @@ diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apache.te policy-1.27.1/domains/program/unused/apache.te --- nsapolicy/domains/program/unused/apache.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/domains/program/unused/apache.te 2005-11-30 16:42:28.000000000 -0500 ++++ policy-1.27.1/domains/program/unused/apache.te 2006-01-02 14:02:37.000000000 -0500 +@@ -66,7 +66,7 @@ + + # httpd_exec_t is the type give to the httpd executable. + # +-daemon_domain(httpd, `, privmail, nscd_client_domain') ++daemon_domain(httpd, `, privmail, auth_chkpwd, nscd_client_domain') + + append_logdir_domain(httpd) + #can read /etc/httpd/logs @@ -113,9 +113,12 @@ can_network_server(httpd_t) can_kerberos(httpd_t) @@ -2774,7 +2783,7 @@ tmp_domain(sendmail) diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/slapd.te policy-1.27.1/domains/program/unused/slapd.te --- nsapolicy/domains/program/unused/slapd.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/domains/program/unused/slapd.te 2005-12-20 15:06:18.000000000 -0500 ++++ policy-1.27.1/domains/program/unused/slapd.te 2005-12-20 15:45:56.000000000 -0500 @@ -22,10 +22,12 @@ # Use the network. @@ -2790,17 +2799,16 @@ allow slapd_t self:unix_dgram_socket create_socket_perms; # allow any domain to connect to the LDAP server can_tcp_connect(domain, slapd_t) -@@ -45,7 +47,8 @@ +@@ -45,7 +47,7 @@ create_dir_file(slapd_t, slapd_replog_t) # read config files -allow slapd_t etc_t:{ file lnk_file } { getattr read }; -+allow slapd_t etc_t:lnk_file { getattr read }; -+allow slapd_t etc_t:file { getattr read lock }; ++allow slapd_t etc_t:{ file lnk_file } r_file_perms; allow slapd_t etc_runtime_t:file { getattr read }; # for startup script -@@ -55,7 +58,23 @@ +@@ -55,7 +57,23 @@ read_sysctl(slapd_t) Index: selinux-policy-targeted.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v retrieving revision 1.353 retrieving revision 1.354 diff -u -r1.353 -r1.354 --- selinux-policy-targeted.spec 20 Dec 2005 22:47:56 -0000 1.353 +++ selinux-policy-targeted.spec 2 Jan 2006 19:05:12 -0000 1.354 @@ -9,7 +9,7 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} Version: 1.27.1 -Release: 2.17 +Release: 2.18 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz @@ -234,6 +234,9 @@ exit 0 %changelog +* Mon Jan 2 2006 Dan Walsh 1.27.1-2.18 +- Allow pam_module to work with apache + * Thu Dec 1 2005 Dan Walsh 1.27.1-2.17 - Allow slapd to user kerberos From fedora-cvs-commits at redhat.com Mon Jan 2 19:35:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 14:35:56 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.139, 1.140 policycoreutils.spec, 1.206, 1.207 Message-ID: <200601021935.k02JZuvR005760@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5716 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Mon Jan 2 2006 Dan Walsh 1.29.2-10 - Fix restorecon to not say it is changing user section when -vv is specified policycoreutils-rhat.patch: restorecon/restorecon.8 | 2 restorecon/restorecon.c | 42 +--- scripts/chcat | 119 +++++++----- scripts/chcat.8 | 6 scripts/fixfiles | 4 scripts/genhomedircon | 238 +++++++++++++----------- scripts/selisteners | 37 +++ scripts/tests/chcat_test | 43 ++++ scripts/tests/setrans.conf | 23 ++ semanage/semanage | 414 +++++++++++++++++++++++++++++-------------- semanage/tests/semanage_test | 67 ++++++ 11 files changed, 690 insertions(+), 305 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- policycoreutils-rhat.patch 2 Jan 2006 13:08:02 -0000 1.139 +++ policycoreutils-rhat.patch 2 Jan 2006 19:35:53 -0000 1.140 @@ -1,6 +1,95 @@ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.8 policycoreutils-1.29.2/restorecon/restorecon.8 +--- nsapolicycoreutils/restorecon/restorecon.8 2005-12-08 12:59:25.000000000 -0500 ++++ policycoreutils-1.29.2/restorecon/restorecon.8 2006-01-02 14:35:46.000000000 -0500 +@@ -45,7 +45,7 @@ + show changes in file labels, if type, role, or user are changing. + .TP + .B \-F +-Force reset of context to match file_context for customizable files ++Force reset of context to match file_context for customizable files, or the user section, if it has changed. + .TP + .SH "ARGUMENTS" + .B pathname... +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.29.2/restorecon/restorecon.c +--- nsapolicycoreutils/restorecon/restorecon.c 2005-12-08 12:59:25.000000000 -0500 ++++ policycoreutils-1.29.2/restorecon/restorecon.c 2006-01-02 14:33:52.000000000 -0500 +@@ -112,18 +112,16 @@ + void usage(const char * const name) + { + fprintf(stderr, +- "usage: %s [-rRnv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n", name); ++ "usage: %s [-FnrRv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n", name); + exit(1); + } + int restore(char *filename) { + int retcontext=0; +- int retval=0; + security_context_t scontext=NULL; + security_context_t prev_context=NULL; + int len=strlen(filename); + struct stat st; + char path[PATH_MAX+1]; +- int user_only_changed=0; + /* + Eliminate trailing / + */ +@@ -175,8 +173,7 @@ + if (excludeCtr > 0 && exclude(filename)) { + return 0; + } +- retval = matchpathcon(filename, st.st_mode, &scontext); +- if (retval < 0) { ++ if (matchpathcon(filename, st.st_mode, &scontext) < 0) { + if (errno == ENOENT) + return 0; + fprintf(stderr,"matchpathcon(%s) failed %s\n", filename,strerror(errno)); +@@ -194,27 +191,24 @@ + if (retcontext < 0 || force || + (strcmp(prev_context,scontext) != 0 && + !(customizable=is_context_customizable(prev_context) > 0))) { +- if (outfile) { +- fprintf(outfile, "%s\n", filename); +- } +- user_only_changed = only_changed_user(scontext, prev_context); +- if (change && !user_only_changed) { +- retval=lsetfilecon(filename,scontext); +- } +- if (retval<0) { +- fprintf(stderr,"%s set context %s->%s failed:'%s'\n", +- progname, filename, scontext, strerror(errno)); +- if (retcontext >= 0) +- freecon(prev_context); +- freecon(scontext); +- return 1; +- } else +- if (verbose && +- (verbose > 1 || !user_only_changed)) ++ if (only_changed_user(scontext, prev_context) == 0) { ++ if (outfile) fprintf(outfile, "%s\n", filename); ++ if (change) { ++ if (lsetfilecon(filename,scontext) < 0) { ++ fprintf(stderr,"%s set context %s->%s failed:'%s'\n", ++ progname, filename, scontext, strerror(errno)); ++ if (retcontext >= 0) ++ freecon(prev_context); ++ freecon(scontext); ++ return 1; ++ } ++ } ++ if (verbose) + printf("%s reset %s context %s->%s\n", +- progname, filename, (retcontext >= 0 ? prev_context : ""), scontext); ++ progname, filename, (retcontext >= 0 ? prev_context : ""), scontext); ++ } + } +- if (verbose > 1 && customizable>0) { ++ if (verbose > 1 && ! force && customizable>0) { + printf("%s: %s not reset customized by admin to %s\n", + progname, filename, prev_context); + } diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.2/scripts/chcat --- nsapolicycoreutils/scripts/chcat 2005-12-14 14:16:50.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/chcat 2005-12-22 16:29:28.000000000 -0500 ++++ policycoreutils-1.29.2/scripts/chcat 2006-01-02 14:33:44.000000000 -0500 @@ -39,11 +39,11 @@ print("Can not modify sensitivity levels using '+' on %s" % f) @@ -205,7 +294,7 @@ usage() diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat.8 policycoreutils-1.29.2/scripts/chcat.8 --- nsapolicycoreutils/scripts/chcat.8 2005-12-08 12:52:47.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/chcat.8 2005-12-22 16:29:28.000000000 -0500 ++++ policycoreutils-1.29.2/scripts/chcat.8 2006-01-02 14:33:44.000000000 -0500 @@ -11,6 +11,9 @@ .B chcat [\fI-d\fR] \fIFILE\fR... @@ -228,7 +317,7 @@ chcon(1), selinux(8) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.29.2/scripts/fixfiles --- nsapolicycoreutils/scripts/fixfiles 2005-10-13 13:51:22.000000000 -0400 -+++ policycoreutils-1.29.2/scripts/fixfiles 2005-12-30 08:17:05.000000000 -0500 ++++ policycoreutils-1.29.2/scripts/fixfiles 2006-01-02 14:33:44.000000000 -0500 @@ -62,8 +62,8 @@ TEMPFILE=`mktemp ${FC}.XXXXXXXXXX` test -z "$TEMPFILE" && exit @@ -242,7 +331,7 @@ egrep -v '(^/home|^/root|^/tmp|^/dev)' |\ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.2/scripts/genhomedircon --- nsapolicycoreutils/scripts/genhomedircon 2005-12-07 07:28:00.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/genhomedircon 2005-12-27 08:54:19.000000000 -0500 ++++ policycoreutils-1.29.2/scripts/genhomedircon 2006-01-02 14:33:44.000000000 -0500 @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python @@ -579,7 +668,7 @@ - errorExit("IndexError") diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/selisteners policycoreutils-1.29.2/scripts/selisteners --- nsapolicycoreutils/scripts/selisteners 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/selisteners 2005-12-22 16:29:28.000000000 -0500 ++++ policycoreutils-1.29.2/scripts/selisteners 2006-01-02 14:33:44.000000000 -0500 @@ -0,0 +1,37 @@ +#! /usr/bin/env python +# Copyright (C) 2005 Red Hat @@ -620,7 +709,7 @@ + print "%s %-40s %-10s\t%-20s\t%s" % (x[0], x[3], pid,y[1],selinux.getpidcon(pid)[1]) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/tests/chcat_test policycoreutils-1.29.2/scripts/tests/chcat_test --- nsapolicycoreutils/scripts/tests/chcat_test 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/tests/chcat_test 2005-12-22 16:29:28.000000000 -0500 ++++ policycoreutils-1.29.2/scripts/tests/chcat_test 2006-01-02 14:33:44.000000000 -0500 @@ -0,0 +1,43 @@ +#!/bin/sh -x +# @@ -667,7 +756,7 @@ +ls -lZ /tmp/chcat_test diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/tests/setrans.conf policycoreutils-1.29.2/scripts/tests/setrans.conf --- nsapolicycoreutils/scripts/tests/setrans.conf 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/tests/setrans.conf 2005-12-22 16:29:28.000000000 -0500 ++++ policycoreutils-1.29.2/scripts/tests/setrans.conf 2006-01-02 14:33:44.000000000 -0500 @@ -0,0 +1,23 @@ +# +# Multi-Category Security translation table for SELinux @@ -694,7 +783,7 @@ +s0:c3=NDA_Yoyodyne diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.2/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2005-11-29 10:55:01.000000000 -0500 -+++ policycoreutils-1.29.2/semanage/semanage 2005-12-27 15:13:34.000000000 -0500 ++++ policycoreutils-1.29.2/semanage/semanage 2006-01-02 14:33:44.000000000 -0500 @@ -24,22 +24,33 @@ from semanage import *; class loginRecords: @@ -1310,7 +1399,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/tests/semanage_test policycoreutils-1.29.2/semanage/tests/semanage_test --- nsapolicycoreutils/semanage/tests/semanage_test 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.2/semanage/tests/semanage_test 2005-12-27 14:40:02.000000000 -0500 ++++ policycoreutils-1.29.2/semanage/tests/semanage_test 2006-01-02 14:33:44.000000000 -0500 @@ -0,0 +1,67 @@ +#!/bin/sh -x +# Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- policycoreutils.spec 2 Jan 2006 13:08:02 -0000 1.206 +++ policycoreutils.spec 2 Jan 2006 19:35:53 -0000 1.207 @@ -4,7 +4,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.2 -Release: 9 +Release: 10 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -96,6 +96,9 @@ %config(noreplace) %{_sysconfdir}/sestatus.conf %changelog +* Mon Jan 2 2006 Dan Walsh 1.29.2-10 +- Fix restorecon to not say it is changing user section when -vv is specified + * Tue Dec 27 2005 Dan Walsh 1.29.2-9 - Fixes for semanage, patch from Ivan and added a test script From fedora-cvs-commits at redhat.com Mon Jan 2 19:38:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 14:38:26 -0500 Subject: rpms/selinux-policy/devel policy-20051208.patch, 1.32, 1.33 selinux-policy.spec, 1.68, 1.69 Message-ID: <200601021938.k02JcQ7U006949@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6893 Modified Files: policy-20051208.patch selinux-policy.spec Log Message: * Mon Jan 2 2006 Dan Walsh 2.1.6-21 - Allow restorecon to read unlabeled_t directories in order to fix labeling. policy-20051208.patch: Makefile | 2 Rules.modular | 10 config/appconfig-strict-mcs/default_type | 6 config/appconfig-strict-mls/default_type | 7 config/appconfig-strict-mls/initrc_context | 2 config/appconfig-targeted-mcs/default_type | 2 config/appconfig-targeted-mls/default_type | 2 config/appconfig-targeted-mls/initrc_context | 2 man/man8/ftpd_selinux.8 | 56 ++++ man/man8/httpd_selinux.8 | 123 ++++++++ man/man8/kerberos_selinux.8 | 31 ++ man/man8/named_selinux.8 | 29 ++ man/man8/nfs_selinux.8 | 30 ++ man/man8/nis_selinux.8 | 1 man/man8/rsync_selinux.8 | 41 ++ man/man8/samba_selinux.8 | 60 ++++ man/man8/ypbind_selinux.8 | 19 + policy/global_tunables | 3 policy/mcs | 321 ++++------------------- policy/mls | 371 +++++---------------------- policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 9 policy/modules/admin/logrotate.te | 4 policy/modules/admin/rpm.fc | 1 policy/modules/admin/rpm.te | 19 - policy/modules/admin/tmpreaper.te | 3 policy/modules/admin/usermanage.te | 15 - policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 + policy/modules/apps/java.te | 25 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.te | 6 policy/modules/kernel/corenetwork.te.in | 12 policy/modules/kernel/devices.fc | 9 policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.fc | 27 + policy/modules/kernel/files.if | 17 + policy/modules/kernel/kernel.if | 3 policy/modules/kernel/kernel.te | 30 +- policy/modules/kernel/mls.te | 9 policy/modules/kernel/selinux.te | 2 policy/modules/kernel/storage.fc | 46 +-- policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 9 policy/modules/services/bind.if | 19 + policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 3 policy/modules/services/cups.te | 7 policy/modules/services/cvs.fc | 2 policy/modules/services/cvs.te | 6 policy/modules/services/dbus.te | 1 policy/modules/services/hal.te | 4 policy/modules/services/ldap.te | 4 policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 103 +++++++ policy/modules/services/mta.te | 13 policy/modules/services/ppp.te | 4 policy/modules/services/prelink.fc | 7 policy/modules/services/prelink.if | 39 ++ policy/modules/services/prelink.te | 64 ++++ policy/modules/services/remotelogin.te | 1 policy/modules/services/samba.if | 1 policy/modules/services/sasl.te | 8 policy/modules/services/sendmail.te | 36 -- policy/modules/services/ssh.te | 10 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 12 policy/modules/system/authlogin.te | 1 policy/modules/system/getty.te | 3 policy/modules/system/hostname.if | 15 + policy/modules/system/hostname.te | 37 -- policy/modules/system/init.if | 14 + policy/modules/system/init.te | 22 + policy/modules/system/iptables.te | 2 policy/modules/system/libraries.fc | 8 policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 2 policy/modules/system/logging.fc | 7 policy/modules/system/logging.if | 21 + policy/modules/system/logging.te | 5 policy/modules/system/lvm.te | 2 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 10 policy/modules/system/udev.fc | 1 policy/modules/system/udev.te | 4 policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.te | 9 policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 27 + policy/modules/system/userdomain.te | 16 + policy/users | 8 97 files changed, 1325 insertions(+), 722 deletions(-) Index: policy-20051208.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20051208.patch,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- policy-20051208.patch 2 Jan 2006 13:26:14 -0000 1.32 +++ policy-20051208.patch 2 Jan 2006 19:38:23 -0000 1.33 @@ -1779,7 +1779,7 @@ \ No newline at end of file diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.1.6/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2005-12-06 19:49:49.000000000 -0500 -+++ serefpolicy-2.1.6/policy/modules/kernel/kernel.if 2005-12-22 15:17:06.000000000 -0500 ++++ serefpolicy-2.1.6/policy/modules/kernel/kernel.if 2006-01-02 12:26:20.000000000 -0500 @@ -436,7 +436,7 @@ type debugfs_t; ') @@ -1789,6 +1789,14 @@ allow $1 debugfs_t:file r_file_perms; allow $1 debugfs_t:lnk_file { getattr read }; ') +@@ -1680,6 +1680,7 @@ + gen_require_set({ getattr relabelfrom },dir_file_class_set) + ') + ++ kernel_list_unlabeled($1) + allow $1 unlabeled_t:dir_file_class_set { getattr relabelfrom }; + ') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.1.6/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2005-12-09 23:35:04.000000000 -0500 +++ serefpolicy-2.1.6/policy/modules/kernel/kernel.te 2005-12-22 15:17:06.000000000 -0500 @@ -3171,7 +3179,7 @@ # /root diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.6/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.6/policy/modules/system/selinuxutil.te 2005-12-22 15:17:06.000000000 -0500 ++++ serefpolicy-2.1.6/policy/modules/system/selinuxutil.te 2006-01-02 12:24:12.000000000 -0500 @@ -198,7 +198,6 @@ # cjp: temporary hack to cover # up stray file descriptors. Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- selinux-policy.spec 2 Jan 2006 13:26:14 -0000 1.68 +++ selinux-policy.spec 2 Jan 2006 19:38:23 -0000 1.69 @@ -7,7 +7,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.1.6 -Release: 20 +Release: 21 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -258,6 +258,9 @@ %endif %changelog +* Mon Jan 2 2006 Dan Walsh 2.1.6-21 +- Allow restorecon to read unlabeled_t directories in order to fix labeling. + * Fri Dec 30 2005 Dan Walsh 2.1.6-20 - Add Logwatch policy From fedora-cvs-commits at redhat.com Mon Jan 2 19:56:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 14:56:20 -0500 Subject: rpms/selinux-policy/devel policy-20051208.patch, 1.33, 1.34 selinux-policy.spec, 1.69, 1.70 Message-ID: <200601021956.k02JuKZF026303@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26249 Modified Files: policy-20051208.patch selinux-policy.spec Log Message: * Mon Jan 2 2006 Dan Walsh 2.1.6-22 - Fix dovecot to allow dovecot_auth to look at /tmp policy-20051208.patch: Makefile | 2 Rules.modular | 10 config/appconfig-strict-mcs/default_type | 6 config/appconfig-strict-mls/default_type | 7 config/appconfig-strict-mls/initrc_context | 2 config/appconfig-targeted-mcs/default_type | 2 config/appconfig-targeted-mls/default_type | 2 config/appconfig-targeted-mls/initrc_context | 2 man/man8/ftpd_selinux.8 | 56 ++++ man/man8/httpd_selinux.8 | 123 ++++++++ man/man8/kerberos_selinux.8 | 31 ++ man/man8/named_selinux.8 | 29 ++ man/man8/nfs_selinux.8 | 30 ++ man/man8/nis_selinux.8 | 1 man/man8/rsync_selinux.8 | 41 ++ man/man8/samba_selinux.8 | 60 ++++ man/man8/ypbind_selinux.8 | 19 + policy/global_tunables | 3 policy/mcs | 321 ++++------------------- policy/mls | 371 +++++---------------------- policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 9 policy/modules/admin/logrotate.te | 4 policy/modules/admin/rpm.fc | 1 policy/modules/admin/rpm.te | 19 - policy/modules/admin/tmpreaper.te | 3 policy/modules/admin/usermanage.te | 15 - policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 + policy/modules/apps/java.te | 25 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.te | 6 policy/modules/kernel/corenetwork.te.in | 12 policy/modules/kernel/devices.fc | 9 policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.fc | 27 + policy/modules/kernel/files.if | 17 + policy/modules/kernel/kernel.if | 3 policy/modules/kernel/kernel.te | 30 +- policy/modules/kernel/mls.te | 9 policy/modules/kernel/selinux.te | 2 policy/modules/kernel/storage.fc | 46 +-- policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 9 policy/modules/services/bind.if | 19 + policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 3 policy/modules/services/cups.te | 7 policy/modules/services/cvs.fc | 2 policy/modules/services/cvs.te | 6 policy/modules/services/dbus.te | 1 policy/modules/services/dovecot.te | 2 policy/modules/services/hal.te | 4 policy/modules/services/ldap.te | 4 policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 103 +++++++ policy/modules/services/mta.te | 13 policy/modules/services/ppp.te | 4 policy/modules/services/prelink.fc | 7 policy/modules/services/prelink.if | 39 ++ policy/modules/services/prelink.te | 64 ++++ policy/modules/services/remotelogin.te | 1 policy/modules/services/samba.if | 1 policy/modules/services/sasl.te | 8 policy/modules/services/sendmail.te | 36 -- policy/modules/services/ssh.te | 10 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 12 policy/modules/system/authlogin.te | 1 policy/modules/system/getty.te | 3 policy/modules/system/hostname.if | 15 + policy/modules/system/hostname.te | 37 -- policy/modules/system/init.if | 14 + policy/modules/system/init.te | 22 + policy/modules/system/iptables.te | 2 policy/modules/system/libraries.fc | 8 policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 2 policy/modules/system/logging.fc | 7 policy/modules/system/logging.if | 21 + policy/modules/system/logging.te | 5 policy/modules/system/lvm.te | 2 policy/modules/system/mount.te | 2 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 10 policy/modules/system/udev.fc | 1 policy/modules/system/udev.te | 4 policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.te | 9 policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 27 + policy/modules/system/userdomain.te | 16 + policy/users | 8 99 files changed, 1328 insertions(+), 723 deletions(-) Index: policy-20051208.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20051208.patch,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- policy-20051208.patch 2 Jan 2006 19:38:23 -0000 1.33 +++ policy-20051208.patch 2 Jan 2006 19:56:17 -0000 1.34 @@ -2205,6 +2205,18 @@ allow system_dbusd_t system_dbusd_tmp_t:dir create_dir_perms; allow system_dbusd_t system_dbusd_tmp_t:file create_file_perms; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.6/policy/modules/services/dovecot.te +--- nsaserefpolicy/policy/modules/services/dovecot.te 2005-12-13 15:51:50.000000000 -0500 ++++ serefpolicy-2.1.6/policy/modules/services/dovecot.te 2006-01-02 14:49:03.000000000 -0500 +@@ -95,6 +95,8 @@ + files_read_etc_files(dovecot_t) + files_search_spool(dovecot_t) + files_search_tmp(dovecot_t) ++files_search_tmp(dovecot_auth_t) ++files_dontaudit_list_default(dovecot_t) + + init_use_fd(dovecot_t) + init_use_script_pty(dovecot_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.6/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2005-12-14 10:38:50.000000000 -0500 +++ serefpolicy-2.1.6/policy/modules/services/hal.te 2005-12-22 15:17:06.000000000 -0500 @@ -3161,6 +3173,18 @@ # Write to /etc/lvm, /etc/lvmtab, /etc/lvmtab.d allow lvm_t lvm_etc_t:dir rw_dir_perms; allow lvm_t lvm_metadata_t:file create_file_perms; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.1.6/policy/modules/system/mount.te +--- nsaserefpolicy/policy/modules/system/mount.te 2005-12-12 23:05:35.000000000 -0500 ++++ serefpolicy-2.1.6/policy/modules/system/mount.te 2006-01-02 13:37:19.000000000 -0500 +@@ -46,7 +46,7 @@ + fs_search_auto_mountpoints(mount_t) + fs_use_tmpfs_chr_dev(mount_t) + +-term_use_console(mount_t) ++term_use_all_terms(mount_t) + + # required for mount.smbfs + corecmd_exec_sbin(mount_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.1.6/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2005-11-14 18:24:05.000000000 -0500 +++ serefpolicy-2.1.6/policy/modules/system/selinuxutil.fc 2005-12-22 15:17:06.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- selinux-policy.spec 2 Jan 2006 19:38:23 -0000 1.69 +++ selinux-policy.spec 2 Jan 2006 19:56:17 -0000 1.70 @@ -7,7 +7,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.1.6 -Release: 21 +Release: 22 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -258,6 +258,9 @@ %endif %changelog +* Mon Jan 2 2006 Dan Walsh 2.1.6-22 +- Fix dovecot to allow dovecot_auth to look at /tmp + * Mon Jan 2 2006 Dan Walsh 2.1.6-21 - Allow restorecon to read unlabeled_t directories in order to fix labeling. From fedora-cvs-commits at redhat.com Mon Jan 2 21:54:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 16:54:35 -0500 Subject: rpms/glibc/devel .cvsignore, 1.127, 1.128 glibc-fedora.patch, 1.118, 1.119 glibc.spec, 1.199, 1.200 sources, 1.149, 1.150 glibc-s390-mangling.patch, 1.3, NONE Message-ID: <200601022154.k02LsZjO007216@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7178/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Removed Files: glibc-s390-mangling.patch Log Message: auto-import glibc-2.3.90-25 on branch devel from glibc-2.3.90-25.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- .cvsignore 2 Jan 2006 11:34:49 -0000 1.127 +++ .cvsignore 2 Jan 2006 21:54:32 -0000 1.128 @@ -1,2 +1,2 @@ -glibc-20060102T1045.tar.bz2 -glibc-fedora-20060102T1045.tar.bz2 +glibc-20060102T2114.tar.bz2 +glibc-fedora-20060102T2114.tar.bz2 glibc-fedora.patch: ChangeLog | 58 ++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 +++ csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 38 ++ elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 ++- include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 + libio/stdio.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 ++ localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 +- malloc/mtrace.c | 20 + nptl/ChangeLog | 19 + nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 + nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - nscd/selinux.c | 2 posix/Makefile | 19 - posix/getconf.speclist.h | 15 + sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------------------- sysdeps/ia64/libgcc-compat.c | 84 ++++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 ++ sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/tcsetattr.c | 32 ++ 47 files changed, 769 insertions(+), 448 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- glibc-fedora.patch 2 Jan 2006 11:34:49 -0000 1.118 +++ glibc-fedora.patch 2 Jan 2006 21:54:32 -0000 1.119 @@ -1,6 +1,6 @@ ---- glibc-20060102T1045/ChangeLog 1 Jan 2006 19:18:49 -0000 1.9842 -+++ glibc-20060102T1045-fedora/ChangeLog 2 Jan 2006 10:52:48 -0000 1.8782.2.145 -@@ -266,6 +266,10 @@ +--- glibc-20060102T2114/ChangeLog 2 Jan 2006 20:52:28 -0000 1.9843 ++++ glibc-20060102T2114-fedora/ChangeLog 2 Jan 2006 21:28:06 -0000 1.8782.2.146 +@@ -300,6 +300,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -11,7 +11,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -549,6 +553,26 @@ +@@ -583,6 +587,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -38,7 +38,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -3667,6 +3691,11 @@ +@@ -3701,6 +3725,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -50,7 +50,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -4661,6 +4690,12 @@ +@@ -4695,6 +4724,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -63,7 +63,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -4785,6 +4820,17 @@ +@@ -4819,6 +4854,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -81,7 +81,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -7845,6 +7891,18 @@ +@@ -7879,6 +7925,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -100,8 +100,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060102T1045/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060102T1045-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060102T2114/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060102T2114-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -151,8 +151,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20060102T1045/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060102T1045-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060102T2114/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060102T2114-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -179,8 +179,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060102T1045/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060102T1045-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060102T2114/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060102T2114-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -261,8 +261,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060102T1045/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060102T1045-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060102T2114/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060102T2114-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -287,8 +287,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060102T1045/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060102T1045-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060102T2114/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060102T2114-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -317,8 +317,8 @@ # define O 0 #else # define O 1 ---- glibc-20060102T1045/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 -+++ glibc-20060102T1045-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 +--- glibc-20060102T2114/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 ++++ glibc-20060102T2114-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr #endif !is_hwcap_platform (direntry->d_name))) @@ -420,8 +420,8 @@ } search_dirs (); ---- glibc-20060102T1045/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060102T1045-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060102T2114/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060102T2114-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -446,8 +446,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060102T1045/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060102T1045-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060102T2114/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060102T2114-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -524,8 +524,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060102T1045/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 -+++ glibc-20060102T1045-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 +--- glibc-20060102T2114/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 ++++ glibc-20060102T2114-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 @@ -265,7 +265,13 @@ #endif @@ -541,8 +541,8 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060102T1045/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060102T1045-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060102T2114/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060102T2114-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -552,8 +552,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060102T1045/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 -+++ glibc-20060102T1045-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 +--- glibc-20060102T2114/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 ++++ glibc-20060102T2114-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -567,8 +567,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060102T1045/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060102T1045-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060102T2114/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060102T2114-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -599,8 +599,8 @@ #endif ---- glibc-20060102T1045/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20060102T1045-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060102T2114/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060102T2114-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -692,8 +692,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060102T1045/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060102T1045-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060102T2114/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060102T2114-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -737,8 +737,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060102T1045/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20060102T1045-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060102T2114/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060102T2114-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -747,8 +747,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060102T1045/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20060102T1045-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060102T2114/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060102T2114-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -790,8 +790,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060102T1045/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060102T1045-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060102T2114/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060102T2114-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -806,8 +806,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060102T1045/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060102T1045-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060102T2114/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060102T2114-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -819,8 +819,8 @@ date_fmt "/ / " ---- glibc-20060102T1045/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060102T2114/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -891,8 +891,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060102T1045/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060102T1045-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060102T2114/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060102T2114-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -920,8 +920,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060102T1045/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060102T1045-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060102T2114/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060102T2114-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -997,8 +997,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060102T1045/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060102T1045-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060102T2114/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060102T2114-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1054,9 +1054,9 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060102T1045/nptl/ChangeLog 1 Jan 2006 19:14:15 -0000 1.831 -+++ glibc-20060102T1045-fedora/nptl/ChangeLog 2 Jan 2006 10:52:51 -0000 1.706.2.69 -@@ -329,6 +329,15 @@ +--- glibc-20060102T2114/nptl/ChangeLog 2 Jan 2006 20:57:43 -0000 1.832 ++++ glibc-20060102T2114-fedora/nptl/ChangeLog 2 Jan 2006 21:28:09 -0000 1.706.2.70 +@@ -337,6 +337,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1072,7 +1072,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1065,6 +1074,11 @@ +@@ -1073,6 +1082,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1084,7 +1084,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3139,6 +3153,11 @@ +@@ -3147,6 +3161,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1096,8 +1096,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060102T1045/nptl/Makefile 28 Dec 2005 20:48:24 -0000 1.174 -+++ glibc-20060102T1045-fedora/nptl/Makefile 2 Jan 2006 10:52:51 -0000 1.157.2.15 +--- glibc-20060102T2114/nptl/Makefile 28 Dec 2005 20:48:24 -0000 1.174 ++++ glibc-20060102T2114-fedora/nptl/Makefile 2 Jan 2006 10:52:51 -0000 1.157.2.15 @@ -507,15 +507,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1120,8 +1120,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060102T1045/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060102T1045-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060102T2114/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060102T2114-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1146,8 +1146,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060102T1045/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060102T2114/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1155,8 +1155,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060102T1045/nscd/connections.c 30 Dec 2005 16:51:19 -0000 1.81 -+++ glibc-20060102T1045-fedora/nscd/connections.c 2 Jan 2006 10:52:53 -0000 1.55.2.18 +--- glibc-20060102T2114/nscd/connections.c 30 Dec 2005 16:51:19 -0000 1.81 ++++ glibc-20060102T2114-fedora/nscd/connections.c 2 Jan 2006 10:52:53 -0000 1.55.2.18 @@ -1880,3 +1880,18 @@ finish_drop_privileges (void) exit (4); } @@ -1176,8 +1176,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060102T1045/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 -+++ glibc-20060102T1045-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +--- glibc-20060102T2114/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060102T2114-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1196,8 +1196,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060102T1045/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20060102T1045-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060102T2114/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060102T2114-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 @@ -32,8 +32,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1209,8 +1209,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060102T1045/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060102T1045-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060102T2114/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060102T2114-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1251,8 +1251,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060102T1045/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 -+++ glibc-20060102T1045-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 +--- glibc-20060102T2114/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 ++++ glibc-20060102T2114-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 @@ -147,7 +147,7 @@ audit_init (void) if (audit_fd < 0 /* If kernel doesn't support audit, bail out */ @@ -1262,8 +1262,8 @@ } #endif /* HAVE_LIBAUDIT */ ---- glibc-20060102T1045/posix/Makefile 26 Sep 2005 21:13:27 -0000 1.186 -+++ glibc-20060102T1045-fedora/posix/Makefile 3 Oct 2005 20:44:16 -0000 1.171.2.14 +--- glibc-20060102T2114/posix/Makefile 2 Jan 2006 20:39:39 -0000 1.187 ++++ glibc-20060102T2114-fedora/posix/Makefile 2 Jan 2006 21:28:09 -0000 1.171.2.15 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1297,8 +1297,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060102T1045/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060102T2114/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1315,8 +1315,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060102T1045/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060102T1045-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060102T2114/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060102T2114-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1332,8 +1332,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20060102T1045/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060102T1045-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060102T2114/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060102T2114-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1345,8 +1345,8 @@ endif endif ---- glibc-20060102T1045/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060102T1045-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060102T2114/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060102T2114-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1698,8 +1698,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20060102T1045/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060102T2114/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1785,8 +1785,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060102T1045/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060102T1045-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060102T2114/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060102T2114-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -1801,8 +1801,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 ++++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -1851,8 +1851,8 @@ + ret ^= stk; return ret; } ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -1862,8 +1862,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -1909,8 +1909,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -1971,8 +1971,8 @@ + } while (0) + +#include_next ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2005,24 +2005,24 @@ + } while (0) + #include_next ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- glibc.spec 2 Jan 2006 11:58:25 -0000 1.199 +++ glibc.spec 2 Jan 2006 21:54:32 -0000 1.200 @@ -1,9 +1,9 @@ -%define glibcdate 20060102T1045 +%define glibcdate 20060102T2114 %define glibcname glibc -%define glibcsrcdir glibc-20060102T1045 +%define glibcsrcdir glibc-20060102T2114 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 24 +%define glibcrelease 25 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -33,7 +33,6 @@ Patch0: %{glibcname}-fedora.patch Patch1: %{name}-ppc-assume.patch Patch2: %{name}-ia64-lib64.patch -Patch3: glibc-s390-mangling.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -241,7 +240,6 @@ %patch2 -p1 %endif %endif -%patch3 -p1 # Hack till glibc-kernheaders get updated, argh mkdir asm @@ -610,6 +608,8 @@ # NPTL is not usable outside of glibc, so include # the generic one (#162634) cp -a bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h +# And needs sanitizing as well. +cp -a redhat/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then mkdir -p $RPM_BUILD_ROOT%{_infodir} @@ -1122,6 +1122,11 @@ %endif %changelog +* Mon Jan 2 2006 Jakub Jelinek 2.3.90-25 +- update from CVS + - s390{,x} and sparc{,64} pointer mangling fixes + - install a sanitized LinuxThreads + * Mon Jan 2 2006 Jakub Jelinek 2.3.90-24 - update from CVS - nscd audit changes (#174422) Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- sources 2 Jan 2006 11:34:49 -0000 1.149 +++ sources 2 Jan 2006 21:54:32 -0000 1.150 @@ -1,2 +1,2 @@ -d325caec1b616a7248414ca0777f835f glibc-20060102T1045.tar.bz2 -ff30af7539141c68570b535fa984d340 glibc-fedora-20060102T1045.tar.bz2 +85ebdefc3ca2c467c2bc510ba2493e99 glibc-20060102T2114.tar.bz2 +56fe24b10957d19c55ae53c2bc21676a glibc-fedora-20060102T2114.tar.bz2 --- glibc-s390-mangling.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 2 21:57:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 16:57:01 -0500 Subject: rpms/kernel/devel/configs config-generic,1.120,1.121 Message-ID: <200601022157.k02Lv1tC008410@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv8346/configs Modified Files: config-generic Log Message: Add broadcom driver Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- config-generic 30 Dec 2005 21:10:22 -0000 1.120 +++ config-generic 2 Jan 2006 21:56:59 -0000 1.121 @@ -1034,10 +1034,11 @@ # Wireless 802.11b ISA/PCI cards support # CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m # CONFIG_IPW2100 is not set # CONFIG_IPW_DEBUG is not set # CONFIG_IPW2200 is not set @@ -1050,6 +1051,7 @@ CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m CONFIG_PRISM54=m +CONFIG_BCM43XX=m # # Wireless 802.11b Pcmcia/Cardbus cards support From fedora-cvs-commits at redhat.com Mon Jan 2 21:57:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 16:57:01 -0500 Subject: rpms/kernel/devel linux-2.6-bcm43xx-promisc.patch, NONE, 1.1 linux-2.6-bcm43xx-txfix.patch, NONE, 1.1 linux-2.6-bcm43xx-version.patch, NONE, 1.1 linux-2.6-bcm43xx.patch, NONE, 1.1 linux-2.6.14-ieee80211-hw-wep.patch, NONE, 1.1 kernel-2.6.spec, 1.1807, 1.1808 Message-ID: <200601022157.k02Lv1VX008396@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8346 Modified Files: kernel-2.6.spec Added Files: linux-2.6-bcm43xx-promisc.patch linux-2.6-bcm43xx-txfix.patch linux-2.6-bcm43xx-version.patch linux-2.6-bcm43xx.patch linux-2.6.14-ieee80211-hw-wep.patch Log Message: Add broadcom driver linux-2.6-bcm43xx-promisc.patch: bcm43xx_main.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) --- NEW FILE linux-2.6-bcm43xx-promisc.patch --- Index: bcm43xx_main.c =================================================================== --- linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c (revision 1002) +++ linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c (working copy) @@ -2665,9 +2665,9 @@ status = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); /* Reset status to infrastructured mode */ status &= ~(BCM43xx_SBF_MODE_AP | - BCM43xx_SBF_MODE_MONITOR | - BCM43xx_SBF_MODE_PROMISC); + BCM43xx_SBF_MODE_MONITOR); status |= BCM43xx_SBF_MODE_NOTADHOC; + status |= BCM43xx_SBF_MODE_PROMISC; switch (iw_mode) { case IW_MODE_MONITOR: @@ -2767,7 +2767,7 @@ value32 |= BCM43xx_SBF_MODE_NOTADHOC; bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value32); - if ((iw_mode == IW_MODE_MASTER) && (bcm->net_dev->flags & IFF_PROMISC)) { + if (1 || (iw_mode == IW_MODE_MASTER) || (bcm->net_dev->flags & IFF_PROMISC)) { value32 = bcm43xx_read32(bcm, BCM43xx_MMIO_STATUS_BITFIELD); value32 |= BCM43xx_SBF_MODE_PROMISC; bcm43xx_write32(bcm, BCM43xx_MMIO_STATUS_BITFIELD, value32); @@ -4113,15 +4113,18 @@ if (memcmp(wlhdr->addr1, bcm->net_dev->dev_addr, ETH_ALEN) == 0 || memcmp(wlhdr->addr3, bcm->ieee->bssid, ETH_ALEN) == 0 || is_broadcast_ether_addr(wlhdr->addr1) || - is_multicast_ether_addr(wlhdr->addr1)) + is_multicast_ether_addr(wlhdr->addr1) || + bcm->net_dev->flags & IFF_PROMISC) is_packet_for_us = 1; break; case IW_MODE_INFRA: default: if (memcmp(wlhdr->addr3, bcm->ieee->bssid, ETH_ALEN) == 0 || memcmp(wlhdr->addr1, bcm->net_dev->dev_addr, ETH_ALEN) == 0 || - is_broadcast_ether_addr(wlhdr->addr1) || - is_multicast_ether_addr(wlhdr->addr1)) + (memcmp(wlhdr->addr3, bcm->net_dev->dev_addr, ETH_ALEN) && + (is_broadcast_ether_addr(wlhdr->addr1) || + is_multicast_ether_addr(wlhdr->addr1) || + bcm->net_dev->flags & IFF_PROMISC))) is_packet_for_us = 1; break; } linux-2.6-bcm43xx-txfix.patch: bcm43xx.h | 5 -- bcm43xx_dma.c | 26 ++++++++--- bcm43xx_main.c | 133 +++++++++++++-------------------------------------------- bcm43xx_main.h | 12 +---- bcm43xx_pio.c | 3 + 5 files changed, 60 insertions(+), 119 deletions(-) --- NEW FILE linux-2.6-bcm43xx-txfix.patch --- ------------------------------------------------------------------------ r998 | tuxbuesch | 2006-01-02 10:13:10 +0000 (Mon, 02 Jan 2006) | 2 lines fix stupid endianess bug for xmitstatus flags. ------------------------------------------------------------------------ r995 | tuxbuesch | 2006-01-02 08:39:30 +0000 (Mon, 02 Jan 2006) | 2 lines fix xmitstatus for wlcore revs < 5 and optimize for revs >= 5. Index: bcm43xx_pio.c =================================================================== --- linux/drivers/net/wireless/bcm43xx/bcm43xx_pio.c (revision 994) +++ linux/drivers/net/wireless/bcm43xx/bcm43xx_pio.c (revision 998) @@ -561,11 +561,14 @@ } return; } +//FIXME +#if 0 if (queue->mmio_base == BCM43xx_MMIO_PIO4_BASE) { bcm43xx_rx_transmitstatus(queue->bcm, (const struct bcm43xx_hwxmitstatus *)(preamble + 1)); return; } +#endif skb = dev_alloc_skb(len); if (unlikely(!skb)) { pio_rx_error(queue, "out of memory"); Index: bcm43xx_main.h =================================================================== --- linux/drivers/net/wireless/bcm43xx/bcm43xx_main.h (revision 994) +++ linux/drivers/net/wireless/bcm43xx/bcm43xx_main.h (revision 998) @@ -131,15 +131,14 @@ /* Transmit Status as received from the hardware. */ struct bcm43xx_hwxmitstatus { - PAD_BYTES(2); - PAD_BYTES(2); - u16 cookie; + PAD_BYTES(4); + __le16 cookie; u8 flags; u8 cnt1:4, cnt2:4; PAD_BYTES(2); - u16 seq; //FIXME - u16 unknown; //FIXME + __le16 seq; + __le16 unknown; //FIXME } __attribute__((__packed__)); /* Transmit Status in CPU byteorder. */ @@ -226,9 +225,6 @@ void bcm43xx_tsf_read(struct bcm43xx_private *bcm, u64 *tsf); void bcm43xx_tsf_write(struct bcm43xx_private *bcm, u64 tsf); -int FASTCALL(bcm43xx_rx_transmitstatus(struct bcm43xx_private *bcm, - const struct bcm43xx_hwxmitstatus *status)); - int FASTCALL(bcm43xx_rx(struct bcm43xx_private *bcm, struct sk_buff *skb, struct bcm43xx_rxhdr *rxhdr)); Index: bcm43xx_dma.c =================================================================== --- linux/drivers/net/wireless/bcm43xx/bcm43xx_dma.c (revision 994) +++ linux/drivers/net/wireless/bcm43xx/bcm43xx_dma.c (revision 998) @@ -889,6 +889,26 @@ sync_descbuffer_for_cpu(ring, meta->dmaaddr, ring->rx_buffersize); skb = meta->skb; + + if (ring->mmio_base == BCM43xx_MMIO_DMA4_BASE) { + /* We received an xmit status. */ + struct bcm43xx_hwxmitstatus *hw = (struct bcm43xx_hwxmitstatus *)skb->data; + struct bcm43xx_xmitstatus stat; + + stat.cookie = le16_to_cpu(hw->cookie); + stat.flags = hw->flags; + stat.cnt1 = hw->cnt1; + stat.cnt2 = hw->cnt2; + stat.seq = le16_to_cpu(hw->seq); + stat.unknown = le16_to_cpu(hw->unknown); + + bcm43xx_debugfs_log_txstat(ring->bcm, &stat); + bcm43xx_dma_handle_xmitstatus(ring->bcm, &stat); + /* recycle the descriptor buffer. */ + sync_descbuffer_for_device(ring, meta->dmaaddr, ring->rx_buffersize); + + return; + } rxhdr = (struct bcm43xx_rxhdr *)skb->data; len = le16_to_cpu(rxhdr->frame_length); if (len == 0) { @@ -932,12 +952,6 @@ skb_put(skb, len + ring->frameoffset); skb_pull(skb, ring->frameoffset); - if (ring->mmio_base == BCM43xx_MMIO_DMA4_BASE) { - bcm43xx_rx_transmitstatus(ring->bcm, - (const struct bcm43xx_hwxmitstatus *)skb->data); - dev_kfree_skb_irq(skb); - return; - } err = bcm43xx_rx(ring->bcm, skb, rxhdr); if (err) { dev_kfree_skb_irq(skb); Index: bcm43xx_main.c =================================================================== --- linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c (revision 994) +++ linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c (revision 998) @@ -1753,91 +1753,42 @@ return err; } -/* Read the Transmit Status from MMIO and build the Transmit Status array. */ -static inline int build_transmit_status(struct bcm43xx_private *bcm, - struct bcm43xx_hwxmitstatus *status) -{ - u32 v170; - u32 v174; - u8 tmp[2]; - - v170 = bcm43xx_read32(bcm, 0x170); - if (v170 == 0x00000000) - return -1; - v174 = bcm43xx_read32(bcm, 0x174); - - /* Internal Sending ID. */ - status->cookie = cpu_to_le16( (v170 >> 16) & 0x0000FFFF ); - /* 2 counters (both 4 bits) in the upper byte and flags in the lower byte. */ - *((u16 *)tmp) = cpu_to_le16( (u16)((v170 & 0xfff0) | ((v170 & 0xf) >> 1)) ); - status->flags = tmp[0]; - status->cnt1 = (tmp[1] & 0x0f); - status->cnt2 = (tmp[1] & 0xf0) >> 4; - /* 802.11 sequence number? */ - status->seq = cpu_to_le16( (u16)(v174 & 0xffff) ); - /* Unknown value. */ - status->unknown = cpu_to_le16( (u16)((v174 >> 16) & 0xff) ); - - return 0; -} - -static inline void interpret_transmit_status(struct bcm43xx_private *bcm, - struct bcm43xx_hwxmitstatus *hwstatus) -{ - struct bcm43xx_xmitstatus status; - - status.cookie = le16_to_cpu(hwstatus->cookie); - status.flags = hwstatus->flags; - status.cnt1 = hwstatus->cnt1; - status.cnt2 = hwstatus->cnt2; - status.seq = le16_to_cpu(hwstatus->seq); - status.unknown = le16_to_cpu(hwstatus->unknown); - - bcm43xx_debugfs_log_txstat(bcm, &status); - - if (status.flags & BCM43xx_TXSTAT_FLAG_IGNORE) - return; - if (!(status.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 (bcm->pio_mode) - bcm43xx_pio_handle_xmitstatus(bcm, &status); - else - bcm43xx_dma_handle_xmitstatus(bcm, &status); -} - static inline void handle_irq_transmit_status(struct bcm43xx_private *bcm) { + u32 v0, v1; + u16 tmp; + struct bcm43xx_xmitstatus stat; + assert(bcm->current_core->id == BCM43xx_COREID_80211); + assert(bcm->current_core->rev >= 5); - //TODO: In AP mode, this also causes sending of powersave responses. + while (1) { + v0 = bcm43xx_read32(bcm, BCM43xx_MMIO_XMITSTAT_0); + if (!v0) + break; + v1 = bcm43xx_read32(bcm, BCM43xx_MMIO_XMITSTAT_1); - if (bcm->current_core->rev < 5) { - struct bcm43xx_xmitstatus_queue *q, *tmp; + stat.cookie = (v0 >> 16) & 0x0000FFFF; + tmp = (u16)((v0 & 0xFFF0) | ((v0 & 0xF) >> 1)); + stat.flags = tmp & 0xFF; + stat.cnt1 = (tmp & 0x0F00) >> 8; + stat.cnt2 = (tmp & 0xF000) >> 12; + stat.seq = (u16)(v1 & 0xFFFF); + stat.unknown = (u16)((v1 >> 16) & 0xFF); - /* If we received an xmit status, it is already saved - * in the xmit status queue. - */ - list_for_each_entry_safe(q, tmp, &bcm->xmitstatus_queue, list) { - interpret_transmit_status(bcm, &q->status); - list_del(&q->list); - bcm->nr_xmitstatus_queued--; - kfree(q); - } - assert(bcm->nr_xmitstatus_queued == 0); - assert(list_empty(&bcm->xmitstatus_queue)); - } else { - int res; - struct bcm43xx_hwxmitstatus transmit_status; + bcm43xx_debugfs_log_txstat(bcm, &stat); - while (1) { - res = build_transmit_status(bcm, &transmit_status); - if (res) - break; - interpret_transmit_status(bcm, &transmit_status); + if (stat.flags & BCM43xx_TXSTAT_FLAG_IGNORE) + 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 (bcm->pio_mode) + bcm43xx_pio_handle_xmitstatus(bcm, &stat); + else + bcm43xx_dma_handle_xmitstatus(bcm, &stat); } } @@ -2148,7 +2099,9 @@ bcmirq_handled(BCM43xx_IRQ_RX); if (reason & BCM43xx_IRQ_XMIT_STATUS) { - handle_irq_transmit_status(bcm); + if (bcm->current_core->rev >= 5) + handle_irq_transmit_status(bcm); + //TODO: In AP mode, this also causes sending of powersave responses. bcmirq_handled(BCM43xx_IRQ_XMIT_STATUS); } @@ -4014,29 +3967,6 @@ goto out; } -int fastcall bcm43xx_rx_transmitstatus(struct bcm43xx_private *bcm, - const struct bcm43xx_hwxmitstatus *status) -{ - struct bcm43xx_xmitstatus_queue *q; - - /*XXX: This code is untested, as we currently do not have a rev < 5 card. */ -dprintkl("processing received xmitstatus...\n"); - - if (unlikely(bcm->nr_xmitstatus_queued >= 50)) { - dprintkl(KERN_ERR PFX "Transmit Status Queue full!\n"); - return -ENOSPC; - } - q = kmalloc(sizeof(*q), GFP_ATOMIC); - if (unlikely(!q)) - return -ENOMEM; - INIT_LIST_HEAD(&q->list); - memcpy(&q->status, status, sizeof(*status)); - list_add_tail(&q->list, &bcm->xmitstatus_queue); - bcm->nr_xmitstatus_queued++; - - return 0; -} - static inline s8 bcm43xx_rssi_postprocess(struct bcm43xx_private *bcm, u8 in_rssi, int ofdm, int adjust_2053, int adjust_2050) @@ -4448,7 +4378,6 @@ if (modparam_bad_frames_preempt) bcm->bad_frames_preempt = 1; spin_lock_init(&bcm->lock); - INIT_LIST_HEAD(&bcm->xmitstatus_queue); tasklet_init(&bcm->isr_tasklet, (void (*)(unsigned long))bcm43xx_interrupt_tasklet, (unsigned long)bcm); Index: bcm43xx.h =================================================================== --- linux/drivers/net/wireless/bcm43xx/bcm43xx.h (revision 994) +++ linux/drivers/net/wireless/bcm43xx/bcm43xx.h (revision 998) @@ -51,6 +51,8 @@ #define BCM43xx_MMIO_SHM_CONTROL 0x160 #define BCM43xx_MMIO_SHM_DATA 0x164 #define BCM43xx_MMIO_SHM_DATA_UNALIGNED 0x166 +#define BCM43xx_MMIO_XMITSTAT_0 0x170 +#define BCM43xx_MMIO_XMITSTAT_1 0x174 #define BCM43xx_MMIO_REV3PLUS_TSF_LOW 0x180 /* core rev >= 3 only */ #define BCM43xx_MMIO_REV3PLUS_TSF_HIGH 0x184 /* core rev >= 3 only */ #define BCM43xx_MMIO_DMA1_BASE 0x200 @@ -693,9 +695,6 @@ u32 dma_reason[4]; /* saved irq enable/disable state bitfield. */ u32 irq_savedstate; - /* List of received transmitstatus blobs. (only on core.rev < 5) */ - struct list_head xmitstatus_queue; - int nr_xmitstatus_queued; /* Link Quality calculation context. */ struct bcm43xx_noise_calculation noisecalc; linux-2.6-bcm43xx-version.patch: bcm43xx.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-bcm43xx-version.patch --- --- linux-2.6.14/drivers/net/wireless/bcm43xx/bcm43xx.h~ 2005-12-31 00:46:32.000000000 +0000 +++ linux-2.6.14/drivers/net/wireless/bcm43xx/bcm43xx.h 2005-12-31 00:46:35.000000000 +0000 @@ -934,7 +934,7 @@ int bcm43xx_pci_write_config32(struct bc * Compatibility stuff follows */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 14) # error "The bcm43xx driver does not support kernels < 2.6.15" # error "The driver will _NOT_ compile on your kernel. Please upgrade to the latest 2.6 kernel." # error "DO NOT COMPLAIN ABOUT BUGS. UPDATE FIRST AND TRY AGAIN." linux-2.6-bcm43xx.patch: drivers/net/wireless/Kconfig | 8 ++++++++ drivers/net/wireless/Makefile | 1 + net/ieee80211/Kconfig | 7 +++++++ net/ieee80211/Makefile | 1 + 4 files changed, 17 insertions(+) --- NEW FILE linux-2.6-bcm43xx.patch --- --- linux-2.6.14/drivers/net/wireless/Kconfig~ 2005-12-30 23:41:54.000000000 +0000 +++ linux-2.6.14/drivers/net/wireless/Kconfig 2005-12-30 23:53:24.000000000 +0000 @@ -477,6 +477,14 @@ config PRISM54 source "drivers/net/wireless/hostap/Kconfig" +config BCM43XX + tristate "Broadcom BCM43xx wireless support" + depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL + select FW_LOADER + ---help--- + This is an experimental driver for the Broadcom 43xx wireless chip, + found in the Apple Airport Extreme and various other devices. + # yes, this works even when no drivers are selected config NET_WIRELESS bool --- linux-2.6.14/drivers/net/wireless/Makefile~ 2005-10-28 01:02:08.000000000 +0100 +++ linux-2.6.14/drivers/net/wireless/Makefile 2005-12-30 23:53:43.000000000 +0000 @@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL) += atmel obj-$(CONFIG_PRISM54) += prism54/ obj-$(CONFIG_HOSTAP) += hostap/ +obj-$(CONFIG_BCM43XX) += bcm43xx/ # 16-bit wireless PCMCIA client drivers obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o --- linux-2.6.14/net/ieee80211/Kconfig~ 2005-12-30 23:42:06.000000000 +0000 +++ linux-2.6.14/net/ieee80211/Kconfig 2005-12-30 23:51:55.000000000 +0000 @@ -66,3 +66,10 @@ config IEEE80211_CRYPT_TKIP This can be compiled as a modules and it will be called "ieee80211_crypt_tkip". +config IEEE80211_SOFTMAC + tristate "IEEE 802.11 softmac" + depends on IEEE80211 && EXPERIMENTAL + ---help--- + The softmac layer handles IEEE 802.11 protocol management functions + such as scanning, association and similar tasks, which recent hardware + often leaves to software rather than implementing it all in hardware. --- linux-2.6.14/net/ieee80211/Makefile~ 2005-12-30 23:42:06.000000000 +0000 +++ linux-2.6.14/net/ieee80211/Makefile 2005-12-30 23:52:26.000000000 +0000 @@ -3,6 +3,7 @@ obj-$(CONFIG_IEEE80211) += ieee80211_cry obj-$(CONFIG_IEEE80211_CRYPT_WEP) += ieee80211_crypt_wep.o obj-$(CONFIG_IEEE80211_CRYPT_CCMP) += ieee80211_crypt_ccmp.o obj-$(CONFIG_IEEE80211_CRYPT_TKIP) += ieee80211_crypt_tkip.o +obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/ ieee80211-objs := \ ieee80211_module.o \ ieee80211_tx.o \ linux-2.6.14-ieee80211-hw-wep.patch: ieee80211_crypt_wep.c | 61 +++++++++++++++++++++++++++++++++++--------------- ieee80211_tx.c | 2 - ieee80211_wx.c | 2 - 3 files changed, 45 insertions(+), 20 deletions(-) --- NEW FILE linux-2.6.14-ieee80211-hw-wep.patch --- --- linux-2.6.15-rc7-rc15.ieee80211-orig/net/ieee80211/ieee80211_crypt_wep.c 2005-12-26 11:59:53.051895000 +0100 +++ linux-2.6.15-rc7-rc15/net/ieee80211/ieee80211_crypt_wep.c 2005-12-30 04:11:30.512572000 +0100 @@ -75,22 +75,14 @@ kfree(priv); } -/* Perform WEP encryption on given skb that has at least 4 bytes of headroom - * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted, - * so the payload length increases with 8 bytes. - * - * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data)) - */ -static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) +/* Add WEP IV/key info to a frame that has at least 4 bytes of headroom */ +static int prism2_wep_build_iv(struct sk_buff *skb, int hdr_len, void *priv) { struct prism2_wep_data *wep = priv; - u32 crc, klen, len; - u8 key[WEP_KEY_LEN + 3]; - u8 *pos, *icv; - struct scatterlist sg; - - if (skb_headroom(skb) < 4 || skb_tailroom(skb) < 4 || - skb->len < hdr_len) + u32 klen, len; + u8 *pos; + + if (skb_headroom(skb) < 4 || skb->len < hdr_len) return -1; len = skb->len - hdr_len; @@ -112,15 +104,47 @@ } /* Prepend 24-bit IV to RC4 key and TX frame */ - *pos++ = key[0] = (wep->iv >> 16) & 0xff; - *pos++ = key[1] = (wep->iv >> 8) & 0xff; - *pos++ = key[2] = wep->iv & 0xff; + *pos++ = (wep->iv >> 16) & 0xff; + *pos++ = (wep->iv >> 8) & 0xff; + *pos++ = wep->iv & 0xff; *pos++ = wep->key_idx << 6; + return 0; +} + +/* Perform WEP encryption on given skb that has at least 4 bytes of headroom + * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted, + * so the payload length increases with 8 bytes. + * + * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data)) + */ +static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) +{ + struct prism2_wep_data *wep = priv; + u32 crc, klen, len; + u8 *pos, *icv; + struct scatterlist sg; + u8 key[WEP_KEY_LEN + 3]; + + /* other checks are in prism2_wep_build_iv */ + if (skb_tailroom(skb) < 4) + return -1; + + /* add the IV to the frame */ + if (prism2_wep_build_iv(skb, hdr_len, priv)) + return -1; + + /* Copy the IV into the first 3 bytes of the key */ + memcpy(key, skb->data + hdr_len, 3); + /* Copy rest of the WEP key (the secret part) */ memcpy(key + 3, wep->key, wep->key_len); + + len = skb->len - hdr_len - 4; + pos = skb->data + hdr_len + 4; + klen = 3 + wep->key_len; - /* Append little-endian CRC32 and encrypt it to produce ICV */ + /* Append little-endian CRC32 over only the data and encrypt it to produce ICV */ crc = ~crc32_le(~0, pos, len); icv = skb_put(skb, 4); icv[0] = crc; @@ -231,6 +255,7 @@ .name = "WEP", .init = prism2_wep_init, .deinit = prism2_wep_deinit, + .build_iv = prism2_wep_build_iv, .encrypt_mpdu = prism2_wep_encrypt, .decrypt_mpdu = prism2_wep_decrypt, .encrypt_msdu = NULL, --- linux-2.6.15-rc7-rc15.ieee80211-orig/net/ieee80211/ieee80211_tx.c 2005-12-26 11:59:53.131895000 +0100 +++ linux-2.6.15-rc7-rc15/net/ieee80211/ieee80211_tx.c 2005-12-29 23:29:16.143304000 +0100 @@ -288,7 +288,7 @@ /* Determine total amount of storage required for TXB packets */ bytes = skb->len + SNAP_SIZE + sizeof(u16); - if (host_encrypt) + if (host_encrypt || host_build_iv) fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA | IEEE80211_FCTL_PROTECTED; else --- linux-2.6.15-rc7-rc15.ieee80211-orig/net/ieee80211/ieee80211_wx.c 2005-12-26 11:59:53.131895000 +0100 +++ linux-2.6.15-rc7-rc15/net/ieee80211/ieee80211_wx.c 2005-12-30 04:02:02.382572000 +0100 @@ -284,7 +284,7 @@ }; int i, key, key_provided, len; struct ieee80211_crypt_data **crypt; - int host_crypto = ieee->host_encrypt || ieee->host_decrypt; + int host_crypto = ieee->host_encrypt || ieee->host_decrypt || ieee->host_build_iv; IEEE80211_DEBUG_WX("SET_ENCODE\n"); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1807 retrieving revision 1.1808 diff -u -r1.1807 -r1.1808 --- kernel-2.6.spec 1 Jan 2006 20:27:11 -0000 1.1807 +++ kernel-2.6.spec 2 Jan 2006 21:56:59 -0000 1.1808 @@ -183,6 +183,10 @@ Source10: COPYING.modules Source11: genkey +%define BCMVER 20060102 +Source12: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/softmac/ieee80211softmac-%{BCMVER}.tar.bz2 +Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2 + Source20: kernel-%{kversion}-i586.config Source21: kernel-%{kversion}-i686.config Source22: kernel-%{kversion}-i686-smp.config @@ -374,6 +378,13 @@ Patch2000: linux-2.6-vm-oomkiller-debugging.patch Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch +# Broadcom wireless driver +Patch5000: linux-2.6-bcm43xx.patch +Patch5001: linux-2.6-bcm43xx-version.patch +Patch5002: linux-2.6-bcm43xx-promisc.patch +Patch5003: linux-2.6-bcm43xx-txfix.patch +Patch5004: linux-2.6.14-ieee80211-hw-wep.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. @@ -873,6 +884,26 @@ # be merged upstream # +# Broadcom BCM43xx wireless driver. + +# Extract snapshot tarballs and move them into place. +tar xvfj %{SOURCE12} +mv ieee80211softmac-%{BCMVER}/net/*.h include/net +mv ieee80211softmac-%{BCMVER} net/ieee80211/softmac +tar xvfj %{SOURCE13} +mv bcm43xx-%{BCMVER} drivers/net/wireless/bcm43xx + +# Patch Kconfig and Makefiles to merge it 'properly' +%patch5000 -p1 +# Make it accept kernel version 2.6.14, since we're actually 2.6.15-rc +%patch5001 -p1 +# Fix tx status with core rev < 5 (will be fixed in 20060603 snapshot) +%patch5002 -p1 +# Operate in promiscuous mode, to make multicast and broadcast RX work +%patch5003 -p1 +# Handle host_build_iv properly +%patch5004 -p1 + # # final stuff @@ -1364,6 +1395,9 @@ %endif %changelog +* Mon Jan 02 2006 David Woodhouse +- Merge experimental Broadcom wireless driver + * Sun Jan 01 2006 Dave Jones - 2.6.15-rc7-git6 From fedora-cvs-commits at redhat.com Mon Jan 2 22:02:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 17:02:21 -0500 Subject: rpms/kernel/devel sources,1.252,1.253 .cvsignore,1.310,1.311 Message-ID: <200601022202.k02M2LTv009956@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9878 Modified Files: sources .cvsignore Log Message: new files Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- sources 1 Jan 2006 20:27:11 -0000 1.252 +++ sources 2 Jan 2006 22:01:27 -0000 1.253 @@ -1,3 +1,5 @@ 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 c374e570ea046f4bfaad3d21d177d6cc patch-2.6.15-rc7.bz2 e71c0f9d6f5f88c11c0c679149fcf220 patch-2.6.15-rc7-git6.bz2 +7608b855b53933b07aeab428b876eff0 ieee80211softmac-20060102.tar.bz2 +9245e708ac8ccca2f68b793bb8f240ac bcm43xx-20060102.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.310 retrieving revision 1.311 diff -u -r1.310 -r1.311 --- .cvsignore 1 Jan 2006 20:27:11 -0000 1.310 +++ .cvsignore 2 Jan 2006 22:01:43 -0000 1.311 @@ -4,3 +4,5 @@ linux-2.6.14.tar.bz2 patch-2.6.15-rc7.bz2 patch-2.6.15-rc7-git6.bz2 +ieee80211softmac-20060102.tar.bz2 +bcm43xx-20060102.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 2 22:13:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 17:13:00 -0500 Subject: rpms/glibc/devel glibc.spec,1.200,1.201 Message-ID: <200601022213.k02MD0Tt012565@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12502 Modified Files: glibc.spec Log Message: 2.3.90-25 Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- glibc.spec 2 Jan 2006 21:54:32 -0000 1.200 +++ glibc.spec 2 Jan 2006 22:12:57 -0000 1.201 @@ -609,7 +609,7 @@ # the generic one (#162634) cp -a bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h # And needs sanitizing as well. -cp -a redhat/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h +cp -a fedora/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then mkdir -p $RPM_BUILD_ROOT%{_infodir} @@ -1125,7 +1125,7 @@ * Mon Jan 2 2006 Jakub Jelinek 2.3.90-25 - update from CVS - s390{,x} and sparc{,64} pointer mangling fixes - - install a sanitized LinuxThreads +- install a sanitized LinuxThreads * Mon Jan 2 2006 Jakub Jelinek 2.3.90-24 - update from CVS From fedora-cvs-commits at redhat.com Tue Jan 3 01:38:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 20:38:44 -0500 Subject: rpms/m2crypto/devel m2crypto.spec,1.17,1.18 Message-ID: <200601030138.k031ciIA016916@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/m2crypto/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16844 Modified Files: m2crypto.spec Log Message: * Tue Jan 3 2006 Miloslav Trmac - 0.15-3 - Add BuildRequires: swig Index: m2crypto.spec =================================================================== RCS file: /cvs/dist/rpms/m2crypto/devel/m2crypto.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- m2crypto.spec 9 Dec 2005 22:41:51 -0000 1.17 +++ m2crypto.spec 3 Jan 2006 01:38:41 -0000 1.18 @@ -3,7 +3,7 @@ Summary: Support for using OpenSSL in python scripts. Name: m2crypto Version: 0.15 -Release: 2.1 +Release: 3 # http://svn.osafoundation.org/m2crypto/tags/0.15 Source0: m2crypto-%{version}.tar.bz2 Patch0: m2crypto-0.13-SSLServer.patch @@ -12,7 +12,7 @@ URL: http://sandbox.rulemaker.net/ngps/m2 BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: openssl-devel, python-devel >= %{pythonver} -BuildRequires: perl, pkgconfig, unzip +BuildRequires: perl, pkgconfig, swig, unzip Requires: python Obsoletes: openssl-python @@ -52,6 +52,9 @@ %{_libdir}/python%{pythonver}/site-packages/M2Crypto %changelog +* Tue Jan 3 2006 Miloslav Trmac - 0.15-3 +- Add BuildRequires: swig + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 03:42:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 22:42:02 -0500 Subject: rpms/selinux-policy-strict/FC-4 policy-20050916.patch, 1.16, 1.17 selinux-policy-strict.spec, 1.334, 1.335 Message-ID: <200601030342.k033g245032342@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-strict/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv32261 Modified Files: policy-20050916.patch selinux-policy-strict.spec Log Message: * Mon Jan 2 2006 Dan Walsh 1.27.1-2.18 - Allow pam_module to work with apache policy-20050916.patch: Makefile | 26 +- attrib.te | 100 +++++++++- domains/admin.te | 2 domains/misc/kernel.te | 2 domains/program/crond.te | 2 domains/program/fsadm.te | 9 domains/program/getty.te | 2 domains/program/hostname.te | 2 domains/program/ifconfig.te | 10 - domains/program/init.te | 2 domains/program/initrc.te | 26 ++ domains/program/ldconfig.te | 3 domains/program/load_policy.te | 11 - domains/program/login.te | 23 +- domains/program/logrotate.te | 2 domains/program/modutil.te | 27 +- domains/program/mount.te | 6 domains/program/netutils.te | 3 domains/program/newrole.te | 4 domains/program/passwd.te | 2 domains/program/restorecon.te | 6 domains/program/setfiles.te | 4 domains/program/ssh.te | 6 domains/program/su.te | 12 + domains/program/syslogd.te | 7 domains/program/tmpreaper.te | 2 domains/program/unused/NetworkManager.te | 13 + domains/program/unused/alsa.te | 2 domains/program/unused/amanda.te | 74 +------ domains/program/unused/anaconda.te | 5 domains/program/unused/apache.te | 25 +- domains/program/unused/apmd.te | 25 ++ domains/program/unused/auditd.te | 9 domains/program/unused/automount.te | 4 domains/program/unused/avahi.te | 31 +++ domains/program/unused/bluetooth.te | 72 +++++++ domains/program/unused/cups.te | 24 +- domains/program/unused/cvs.te | 2 domains/program/unused/cyrus.te | 10 - domains/program/unused/dbusd.te | 4 domains/program/unused/dcc.te | 5 domains/program/unused/dhcpc.te | 6 domains/program/unused/dhcpd.te | 4 domains/program/unused/dovecot.te | 6 domains/program/unused/exim.te | 309 +++++++++++++++++++++++++++++++ domains/program/unused/ftpd.te | 6 domains/program/unused/hald.te | 5 domains/program/unused/hotplug.te | 10 - domains/program/unused/hwclock.te | 1 domains/program/unused/ipsec.te | 2 domains/program/unused/kudzu.te | 5 domains/program/unused/mta.te | 7 domains/program/unused/mysqld.te | 10 - domains/program/unused/named.te | 27 ++ domains/program/unused/nscd.te | 1 domains/program/unused/ntpd.te | 10 - domains/program/unused/openct.te | 16 + domains/program/unused/pamconsole.te | 4 domains/program/unused/pegasus.te | 36 +++ domains/program/unused/ping.te | 2 domains/program/unused/postfix.te | 63 ++++-- domains/program/unused/postgresql.te | 11 - domains/program/unused/pppd.te | 23 +- domains/program/unused/privoxy.te | 2 domains/program/unused/procmail.te | 16 + domains/program/unused/radius.te | 3 domains/program/unused/readahead.te | 21 ++ domains/program/unused/rlogind.te | 4 domains/program/unused/roundup.te | 29 ++ domains/program/unused/rpcd.te | 18 + domains/program/unused/rpm.te | 4 domains/program/unused/rsync.te | 3 domains/program/unused/samba.te | 15 + domains/program/unused/saslauthd.te | 1 domains/program/unused/sendmail.te | 3 domains/program/unused/slapd.te | 28 ++ domains/program/unused/snmpd.te | 6 domains/program/unused/spamd.te | 28 -- domains/program/unused/squid.te | 4 domains/program/unused/udev.te | 10 - domains/program/unused/utempter.te | 2 domains/program/unused/webalizer.te | 3 domains/program/unused/winbind.te | 1 domains/program/unused/xdm.te | 3 domains/program/unused/yppasswdd.te | 40 ++++ domains/program/unused/ypserv.te | 9 domains/program/unused/zebra.te | 2 domains/program/useradd.te | 5 file_contexts/distros.fc | 2 file_contexts/program/apache.fc | 3 file_contexts/program/bluetooth.fc | 3 file_contexts/program/compat.fc | 4 file_contexts/program/dhcpc.fc | 2 file_contexts/program/dhcpd.fc | 5 file_contexts/program/ftpd.fc | 5 file_contexts/program/games.fc | 11 - file_contexts/program/innd.fc | 15 - file_contexts/program/ipsec.fc | 1 file_contexts/program/openct.fc | 2 file_contexts/program/pegasus.fc | 9 file_contexts/program/pppd.fc | 2 file_contexts/program/privoxy.fc | 1 file_contexts/program/readahead.fc | 1 file_contexts/program/roundup.fc | 2 file_contexts/program/rpm.fc | 4 file_contexts/program/rshd.fc | 1 file_contexts/program/rsync.fc | 2 file_contexts/program/slapd.fc | 12 + file_contexts/program/squid.fc | 3 file_contexts/program/xdm.fc | 2 file_contexts/program/yppasswdd.fc | 2 file_contexts/program/ypserv.fc | 1 file_contexts/types.fc | 6 genfs_contexts | 3 macros/base_user_macros.te | 7 macros/core_macros.te | 9 macros/global_macros.te | 33 ++- macros/home_macros.te | 9 macros/network_macros.te | 17 + macros/program/apache_macros.te | 13 + macros/program/bonobo_macros.te | 2 macros/program/cdrecord_macros.te | 6 macros/program/chkpwd_macros.te | 8 macros/program/crontab_macros.te | 2 macros/program/dbusd_macros.te | 7 macros/program/gconf_macros.te | 2 macros/program/gift_macros.te | 2 macros/program/gpg_macros.te | 2 macros/program/i18n_input_macros.te | 21 ++ macros/program/lpr_macros.te | 2 macros/program/mta_macros.te | 4 macros/program/newrole_macros.te | 2 macros/program/pyzor_macros.te | 2 macros/program/razor_macros.te | 2 macros/program/su_macros.te | 4 macros/program/uml_macros.te | 2 macros/program/xdm_macros.te | 2 macros/program/ypbind_macros.te | 1 macros/user_macros.te | 7 man/man8/ftpd_selinux.8 | 19 + man/man8/httpd_selinux.8 | 9 man/man8/rsync_selinux.8 | 12 - man/man8/samba_selinux.8 | 9 mcs | 210 ++++++++------------- mls | 270 ++++++++++----------------- net_contexts | 13 + targeted/appconfig/root_default_contexts | 4 targeted/assert.te | 2 targeted/domains/program/compat.te | 1 targeted/domains/program/sendmail.te | 1 targeted/domains/program/ssh.te | 3 targeted/domains/program/xdm.te | 4 targeted/domains/unconfined.te | 15 + tunables/distro.tun | 2 tunables/tunable.tun | 4 types/device.te | 4 types/devpts.te | 4 types/file.te | 48 +--- types/network.te | 13 - types/nfs.te | 1 types/security.te | 6 161 files changed, 1668 insertions(+), 688 deletions(-) Index: policy-20050916.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/policy-20050916.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- policy-20050916.patch 30 Nov 2005 22:07:48 -0000 1.16 +++ policy-20050916.patch 3 Jan 2006 03:41:57 -0000 1.17 @@ -945,7 +945,16 @@ diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/apache.te policy-1.27.1/domains/program/unused/apache.te --- nsapolicy/domains/program/unused/apache.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/domains/program/unused/apache.te 2005-11-30 16:42:28.000000000 -0500 ++++ policy-1.27.1/domains/program/unused/apache.te 2006-01-02 14:02:37.000000000 -0500 +@@ -66,7 +66,7 @@ + + # httpd_exec_t is the type give to the httpd executable. + # +-daemon_domain(httpd, `, privmail, nscd_client_domain') ++daemon_domain(httpd, `, privmail, auth_chkpwd, nscd_client_domain') + + append_logdir_domain(httpd) + #can read /etc/httpd/logs @@ -113,9 +113,12 @@ can_network_server(httpd_t) can_kerberos(httpd_t) @@ -2774,9 +2783,12 @@ tmp_domain(sendmail) diff --exclude-from=exclude -N -u -r nsapolicy/domains/program/unused/slapd.te policy-1.27.1/domains/program/unused/slapd.te --- nsapolicy/domains/program/unused/slapd.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/domains/program/unused/slapd.te 2005-11-30 16:42:28.000000000 -0500 -@@ -24,8 +24,9 @@ ++++ policy-1.27.1/domains/program/unused/slapd.te 2005-12-20 15:45:56.000000000 -0500 +@@ -22,10 +22,12 @@ + + # Use the network. can_network(slapd_t) ++can_kerberos(slapd_t) allow slapd_t port_type:tcp_socket name_connect; can_ypbind(slapd_t) -allow slapd_t self:fifo_file { read write }; @@ -2787,7 +2799,16 @@ allow slapd_t self:unix_dgram_socket create_socket_perms; # allow any domain to connect to the LDAP server can_tcp_connect(domain, slapd_t) -@@ -55,7 +56,23 @@ +@@ -45,7 +47,7 @@ + create_dir_file(slapd_t, slapd_replog_t) + + # read config files +-allow slapd_t etc_t:{ file lnk_file } { getattr read }; ++allow slapd_t etc_t:{ file lnk_file } r_file_perms; + allow slapd_t etc_runtime_t:file { getattr read }; + + # for startup script +@@ -55,7 +57,23 @@ read_sysctl(slapd_t) @@ -4111,7 +4132,7 @@ -ifeq ($(MCS),y) -TYPE=mcs -endif -+TYPE=strict ++TYPE=targeted INSTALLDIR = $(TOPDIR)/$(TYPE) POLICYPATH = $(INSTALLDIR)/policy @@ -5079,7 +5100,7 @@ +') diff --exclude-from=exclude -N -u -r nsapolicy/types/file.te policy-1.27.1/types/file.te --- nsapolicy/types/file.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/types/file.te 2005-11-30 16:42:28.000000000 -0500 ++++ policy-1.27.1/types/file.te 2005-12-02 18:26:35.000000000 -0500 @@ -84,6 +84,9 @@ # type etc_t, file_type, sysadmfile; @@ -5098,16 +5119,18 @@ # for /var/{spool,lib}/texmf index files type tetex_data_t, file_type, sysadmfile, tmpfile; type var_spool_t, file_type, sysadmfile, tmpfile; -@@ -273,9 +277,6 @@ +@@ -271,10 +275,7 @@ + # Allow each file type to be associated with + # the default file system type. # - allow { file_type device_type ttyfile } fs_t:filesystem associate; - +-allow { file_type device_type ttyfile } fs_t:filesystem associate; +- -# Allow the pty to be associated with the file system. -allow devpts_t self:filesystem associate; -- ++allow { file_type device_type ttyfile fs_type } fs_t:filesystem associate; + type tmpfs_t, file_type, mount_point, sysadmfile, fs_type; allow { logfile tmpfs_t tmpfile home_type } tmpfs_t:filesystem associate; - allow { logfile tmpfile home_type } tmp_t:filesystem associate; @@ -284,31 +285,14 @@ ') Index: selinux-policy-strict.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/selinux-policy-strict.spec,v retrieving revision 1.334 retrieving revision 1.335 diff -u -r1.334 -r1.335 --- selinux-policy-strict.spec 1 Dec 2005 18:25:13 -0000 1.334 +++ selinux-policy-strict.spec 3 Jan 2006 03:41:57 -0000 1.335 @@ -11,7 +11,7 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} Version: 1.27.1 -Release: 2.16 +Release: 2.18 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz @@ -229,6 +229,12 @@ exit 0 %changelog +* Mon Jan 2 2006 Dan Walsh 1.27.1-2.18 +- Allow pam_module to work with apache + +* Thu Dec 1 2005 Dan Walsh 1.27.1-2.17 +- Allow slapd to user kerberos + * Thu Dec 1 2005 Dan Walsh 1.27.1-2.16 - Load the correct policy From fedora-cvs-commits at redhat.com Tue Jan 3 03:51:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 22:51:36 -0500 Subject: rpms/selinux-policy-strict/FC-4 policy-20050916.patch,1.17,1.18 Message-ID: <200601030351.k033pa2K015460@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-strict/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv15393 Modified Files: policy-20050916.patch Log Message: * Mon Jan 2 2006 Dan Walsh 1.27.1-2.18 - Allow pam_module to work with apache policy-20050916.patch: Makefile | 24 +- attrib.te | 100 +++++++++- domains/admin.te | 2 domains/misc/kernel.te | 2 domains/program/crond.te | 2 domains/program/fsadm.te | 9 domains/program/getty.te | 2 domains/program/hostname.te | 2 domains/program/ifconfig.te | 10 - domains/program/init.te | 2 domains/program/initrc.te | 26 ++ domains/program/ldconfig.te | 3 domains/program/load_policy.te | 11 - domains/program/login.te | 23 +- domains/program/logrotate.te | 2 domains/program/modutil.te | 27 +- domains/program/mount.te | 6 domains/program/netutils.te | 3 domains/program/newrole.te | 4 domains/program/passwd.te | 2 domains/program/restorecon.te | 6 domains/program/setfiles.te | 4 domains/program/ssh.te | 6 domains/program/su.te | 12 + domains/program/syslogd.te | 7 domains/program/tmpreaper.te | 2 domains/program/unused/NetworkManager.te | 13 + domains/program/unused/alsa.te | 2 domains/program/unused/amanda.te | 74 +------ domains/program/unused/anaconda.te | 5 domains/program/unused/apache.te | 25 +- domains/program/unused/apmd.te | 25 ++ domains/program/unused/auditd.te | 9 domains/program/unused/automount.te | 4 domains/program/unused/avahi.te | 31 +++ domains/program/unused/bluetooth.te | 72 +++++++ domains/program/unused/cups.te | 24 +- domains/program/unused/cvs.te | 2 domains/program/unused/cyrus.te | 10 - domains/program/unused/dbusd.te | 4 domains/program/unused/dcc.te | 5 domains/program/unused/dhcpc.te | 6 domains/program/unused/dhcpd.te | 4 domains/program/unused/dovecot.te | 6 domains/program/unused/exim.te | 309 +++++++++++++++++++++++++++++++ domains/program/unused/ftpd.te | 6 domains/program/unused/hald.te | 5 domains/program/unused/hotplug.te | 10 - domains/program/unused/hwclock.te | 1 domains/program/unused/ipsec.te | 2 domains/program/unused/kudzu.te | 5 domains/program/unused/mta.te | 7 domains/program/unused/mysqld.te | 10 - domains/program/unused/named.te | 27 ++ domains/program/unused/nscd.te | 1 domains/program/unused/ntpd.te | 10 - domains/program/unused/openct.te | 16 + domains/program/unused/pamconsole.te | 4 domains/program/unused/pegasus.te | 36 +++ domains/program/unused/ping.te | 2 domains/program/unused/postfix.te | 63 ++++-- domains/program/unused/postgresql.te | 11 - domains/program/unused/pppd.te | 23 +- domains/program/unused/privoxy.te | 2 domains/program/unused/procmail.te | 16 + domains/program/unused/radius.te | 3 domains/program/unused/readahead.te | 21 ++ domains/program/unused/rlogind.te | 4 domains/program/unused/roundup.te | 29 ++ domains/program/unused/rpcd.te | 18 + domains/program/unused/rpm.te | 4 domains/program/unused/rsync.te | 3 domains/program/unused/samba.te | 15 + domains/program/unused/saslauthd.te | 1 domains/program/unused/sendmail.te | 3 domains/program/unused/slapd.te | 28 ++ domains/program/unused/snmpd.te | 6 domains/program/unused/spamd.te | 28 -- domains/program/unused/squid.te | 4 domains/program/unused/udev.te | 10 - domains/program/unused/utempter.te | 2 domains/program/unused/webalizer.te | 3 domains/program/unused/winbind.te | 1 domains/program/unused/xdm.te | 3 domains/program/unused/yppasswdd.te | 40 ++++ domains/program/unused/ypserv.te | 9 domains/program/unused/zebra.te | 2 domains/program/useradd.te | 5 file_contexts/distros.fc | 2 file_contexts/program/apache.fc | 3 file_contexts/program/bluetooth.fc | 3 file_contexts/program/compat.fc | 4 file_contexts/program/dhcpc.fc | 2 file_contexts/program/dhcpd.fc | 5 file_contexts/program/ftpd.fc | 5 file_contexts/program/games.fc | 11 - file_contexts/program/innd.fc | 15 - file_contexts/program/ipsec.fc | 1 file_contexts/program/openct.fc | 2 file_contexts/program/pegasus.fc | 9 file_contexts/program/pppd.fc | 2 file_contexts/program/privoxy.fc | 1 file_contexts/program/readahead.fc | 1 file_contexts/program/roundup.fc | 2 file_contexts/program/rpm.fc | 4 file_contexts/program/rshd.fc | 1 file_contexts/program/rsync.fc | 2 file_contexts/program/slapd.fc | 12 + file_contexts/program/squid.fc | 3 file_contexts/program/xdm.fc | 2 file_contexts/program/yppasswdd.fc | 2 file_contexts/program/ypserv.fc | 1 file_contexts/types.fc | 6 genfs_contexts | 3 macros/base_user_macros.te | 7 macros/core_macros.te | 9 macros/global_macros.te | 33 ++- macros/home_macros.te | 9 macros/network_macros.te | 17 + macros/program/apache_macros.te | 13 + macros/program/bonobo_macros.te | 2 macros/program/cdrecord_macros.te | 6 macros/program/chkpwd_macros.te | 8 macros/program/crontab_macros.te | 2 macros/program/dbusd_macros.te | 7 macros/program/gconf_macros.te | 2 macros/program/gift_macros.te | 2 macros/program/gpg_macros.te | 2 macros/program/i18n_input_macros.te | 21 ++ macros/program/lpr_macros.te | 2 macros/program/mta_macros.te | 4 macros/program/newrole_macros.te | 2 macros/program/pyzor_macros.te | 2 macros/program/razor_macros.te | 2 macros/program/su_macros.te | 4 macros/program/uml_macros.te | 2 macros/program/xdm_macros.te | 2 macros/program/ypbind_macros.te | 1 macros/user_macros.te | 7 man/man8/ftpd_selinux.8 | 19 + man/man8/httpd_selinux.8 | 9 man/man8/rsync_selinux.8 | 12 - man/man8/samba_selinux.8 | 9 mcs | 210 ++++++++------------- mls | 270 ++++++++++----------------- net_contexts | 13 + targeted/appconfig/root_default_contexts | 4 targeted/assert.te | 2 targeted/domains/program/compat.te | 1 targeted/domains/program/sendmail.te | 1 targeted/domains/program/ssh.te | 3 targeted/domains/program/xdm.te | 4 targeted/domains/unconfined.te | 15 + tunables/distro.tun | 2 tunables/tunable.tun | 4 types/device.te | 4 types/devpts.te | 4 types/file.te | 48 +--- types/network.te | 13 - types/nfs.te | 1 types/security.te | 6 161 files changed, 1667 insertions(+), 687 deletions(-) Index: policy-20050916.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/policy-20050916.patch,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- policy-20050916.patch 3 Jan 2006 03:41:57 -0000 1.17 +++ policy-20050916.patch 3 Jan 2006 03:51:32 -0000 1.18 @@ -4125,14 +4125,13 @@ +MLSENABLED := $(shell cat /selinux/mls) POLICYVER := policy.$(VERS) TOPDIR = $(DESTDIR)/etc/selinux --TYPE=strict + TYPE=strict -ifeq ($(MLS),y) -TYPE=mls -endif -ifeq ($(MCS),y) -TYPE=mcs -endif -+TYPE=targeted INSTALLDIR = $(TOPDIR)/$(TYPE) POLICYPATH = $(INSTALLDIR)/policy From fedora-cvs-commits at redhat.com Tue Jan 3 04:57:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 23:57:04 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1808,1.1809 Message-ID: <200601030457.k034v4Y1019116@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19045 Modified Files: kernel-2.6.spec Log Message: remove pointless checks Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1808 retrieving revision 1.1809 diff -u -r1.1808 -r1.1809 --- kernel-2.6.spec 2 Jan 2006 21:56:59 -0000 1.1808 +++ kernel-2.6.spec 3 Jan 2006 04:57:01 -0000 1.1809 @@ -1214,7 +1214,7 @@ %post [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release} -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL} +/sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL} %post devel if [ -x /usr/sbin/hardlink ] ; then @@ -1225,7 +1225,7 @@ %post smp [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}smp -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp +/sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp %post smp-devel if [ -x /usr/sbin/hardlink ] ; then @@ -1236,7 +1236,7 @@ %post xen0 [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-xen0 -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen0 --mkinitrd --depmod --install --multiboot %{KVERREL}xen0 +/sbin/new-kernel-pkg --package kernel-xen0 --mkinitrd --depmod --install --multiboot %{KVERREL}xen0 [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X %post xen0-devel @@ -1259,7 +1259,7 @@ %post kdump [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-kdump -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump +/sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump %post kdump-devel if [ -x /usr/sbin/hardlink ] ; then @@ -1270,19 +1270,19 @@ %preun /sbin/modprobe loop 2> /dev/null > /dev/null || : -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL} +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL} %preun smp /sbin/modprobe loop 2> /dev/null > /dev/null || : -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp %preun xen0 /sbin/modprobe loop 2> /dev/null > /dev/null || : -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0 +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0 %preun xenU /sbin/modprobe loop 2> /dev/null > /dev/null || : -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU +/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU ### From fedora-cvs-commits at redhat.com Tue Jan 3 04:59:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 2 Jan 2006 23:59:46 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1809,1.1810 Message-ID: <200601030459.k034xkfa020307@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20227 Modified Files: kernel-2.6.spec Log Message: include file shuffling Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1809 retrieving revision 1.1810 diff -u -r1.1809 -r1.1810 --- kernel-2.6.spec 3 Jan 2006 04:57:01 -0000 1.1809 +++ kernel-2.6.spec 3 Jan 2006 04:59:42 -0000 1.1810 @@ -1058,6 +1058,8 @@ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cp -a drivers/media/dvb/frontends/*.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/dvb/frontends cp -a drivers/media/dvb/dvb-core/*.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/dvb/dvb-core + cp -a drivers/media/video/bttv.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/video + cp -a drivers/usb/serial/usb-serial.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/usb/serial cd include cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include %if %{buildxen} From fedora-cvs-commits at redhat.com Tue Jan 3 05:02:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 00:02:36 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1810,1.1811 Message-ID: <200601030502.k0352ad4020748@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20705 Modified Files: kernel-2.6.spec Log Message: on 2nd thoughts.. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1810 retrieving revision 1.1811 diff -u -r1.1810 -r1.1811 --- kernel-2.6.spec 3 Jan 2006 04:59:42 -0000 1.1810 +++ kernel-2.6.spec 3 Jan 2006 05:02:21 -0000 1.1811 @@ -1034,9 +1034,9 @@ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/source mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build (cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source) - # dirs for additional modules per module-init-tools, kbuild/modules.txt - mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra - mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates + # dirs for additional modules per module-init-tools, kbuild/modules.txt + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates # first copy everything cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build @@ -1056,10 +1056,6 @@ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include - cp -a drivers/media/dvb/frontends/*.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/dvb/frontends - cp -a drivers/media/dvb/dvb-core/*.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/dvb/dvb-core - cp -a drivers/media/video/bttv.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/video - cp -a drivers/usb/serial/usb-serial.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/usb/serial cd include cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include %if %{buildxen} From fedora-cvs-commits at redhat.com Tue Jan 3 05:47:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 00:47:17 -0500 Subject: rpms/kernel/devel linux-2.6.15.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.311, 1.312 kernel-2.6.spec, 1.1811, 1.1812 sources, 1.253, 1.254 upstream, 1.237, 1.238 linux-2.6.14.tar.bz2.sign, 1.1, NONE patch-2.6.15-rc7-git6.bz2.sign, 1.1, NONE patch-2.6.15-rc7.bz2.sign, 1.1, NONE Message-ID: <200601030547.k035lHmf022732@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22695 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: linux-2.6.15.tar.bz2.sign Removed Files: linux-2.6.14.tar.bz2.sign patch-2.6.15-rc7-git6.bz2.sign patch-2.6.15-rc7.bz2.sign Log Message: * Tue Jan 3 2006 Dave Jones - Update to 2.6.15 final. --- NEW FILE linux-2.6.15.tar.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDuglHyGugalF9Dw4RAiIPAKCT5NvV2+aomkNCE3v8M2P10V7xdQCgjyeh aDrnyZ0H/GvnVRLmUrUUbV8= =lIis -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.311 retrieving revision 1.312 diff -u -r1.311 -r1.312 --- .cvsignore 2 Jan 2006 22:01:43 -0000 1.311 +++ .cvsignore 3 Jan 2006 05:47:14 -0000 1.312 @@ -1,8 +1,6 @@ kernel-2.6.*.config temp-* -kernel-2.6.14 -linux-2.6.14.tar.bz2 -patch-2.6.15-rc7.bz2 -patch-2.6.15-rc7-git6.bz2 +kernel-2.6.15 +linux-2.6.15.tar.bz2 ieee80211softmac-20060102.tar.bz2 bcm43xx-20060102.tar.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1811 retrieving revision 1.1812 diff -u -r1.1811 -r1.1812 --- kernel-2.6.spec 3 Jan 2006 05:02:21 -0000 1.1811 +++ kernel-2.6.spec 3 Jan 2006 05:47:14 -0000 1.1812 @@ -17,7 +17,7 @@ # that the kernel isn't the stock distribution kernel, for example by # adding some text to the end of the version number. # -%define sublevel 14 +%define sublevel 15 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} %define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) @@ -208,8 +208,8 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-rc7.bz2 -Patch2: patch-2.6.15-rc7-git6.bz2 +#Patch1: patch-2.6.16-git1.bz2 +#Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -595,8 +595,8 @@ cd linux-%{kversion} # Update to latest upstream. -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 +#%patch2 -p1 # # Patches 10 through 100 are meant for core subsystem upgrades @@ -1393,6 +1393,9 @@ %endif %changelog +* Tue Jan 3 2006 Dave Jones +- Update to 2.6.15 final. + * Mon Jan 02 2006 David Woodhouse - Merge experimental Broadcom wireless driver Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.253 retrieving revision 1.254 diff -u -r1.253 -r1.254 --- sources 2 Jan 2006 22:01:27 -0000 1.253 +++ sources 3 Jan 2006 05:47:14 -0000 1.254 @@ -1,5 +1,3 @@ -66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 -c374e570ea046f4bfaad3d21d177d6cc patch-2.6.15-rc7.bz2 -e71c0f9d6f5f88c11c0c679149fcf220 patch-2.6.15-rc7-git6.bz2 +cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 7608b855b53933b07aeab428b876eff0 ieee80211softmac-20060102.tar.bz2 9245e708ac8ccca2f68b793bb8f240ac bcm43xx-20060102.tar.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- upstream 1 Jan 2006 20:27:11 -0000 1.237 +++ upstream 3 Jan 2006 05:47:14 -0000 1.238 @@ -1,3 +1 @@ -linux-2.6.14.tar.bz2 -patch-2.6.15-rc7.bz2 -patch-2.6.15-rc7-git6.bz2 +linux-2.6.15.tar.bz2 --- linux-2.6.14.tar.bz2.sign DELETED --- --- patch-2.6.15-rc7-git6.bz2.sign DELETED --- --- patch-2.6.15-rc7.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 3 05:50:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 00:50:03 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1812,1.1813 Message-ID: <200601030550.k035o37x024016@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23962 Modified Files: kernel-2.6.spec Log Message: woo, s390 came back Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1812 retrieving revision 1.1813 diff -u -r1.1812 -r1.1813 --- kernel-2.6.spec 3 Jan 2006 05:47:14 -0000 1.1812 +++ kernel-2.6.spec 3 Jan 2006 05:50:00 -0000 1.1813 @@ -155,8 +155,7 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 From fedora-cvs-commits at redhat.com Tue Jan 3 08:47:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 03:47:23 -0500 Subject: rpms/nut/devel nut.spec,1.28,1.29 Message-ID: <200601030847.k038lNFP007682@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/nut/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7669 Modified Files: nut.spec Log Message: - rebuilt against new libnetsnmp Index: nut.spec =================================================================== RCS file: /cvs/dist/rpms/nut/devel/nut.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- nut.spec 9 Dec 2005 22:42:32 -0000 1.28 +++ nut.spec 3 Jan 2006 08:47:20 -0000 1.29 @@ -11,7 +11,7 @@ Summary: Network UPS Tools Name: nut Version: 2.0.2 -Release: 5.1 +Release: 6 Group: Applications/System License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -270,6 +270,9 @@ %{_mandir}/man8/upsset.cgi.8.gz %changelog +* Tue Jan 03 2006 Radek Vokal 2.0.2-6 +- rebuilt against new libnetsnmp + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 08:52:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 03:52:03 -0500 Subject: rpms/ethereal/FC-3 .cvsignore, 1.23, 1.24 ethereal.spec, 1.26, 1.27 sources, 1.25, 1.26 ethereal-0.10.0a-ia64-segfault.patch, 1.1, NONE Message-ID: <200601030852.k038q3U0007801@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/ethereal/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv7786 Modified Files: .cvsignore ethereal.spec sources Removed Files: ethereal-0.10.0a-ia64-segfault.patch Log Message: - upgrade to 0.10.14 - fix CVE-2005-3313 Ethereal IRC dissector DoS (#172298) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ethereal/FC-3/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 20 Oct 2005 07:50:00 -0000 1.23 +++ .cvsignore 3 Jan 2006 08:52:01 -0000 1.24 @@ -1 +1 @@ -ethereal-0.10.13.tar.gz +ethereal-0.10.14.tar.bz2 Index: ethereal.spec =================================================================== RCS file: /cvs/dist/rpms/ethereal/FC-3/ethereal.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- ethereal.spec 20 Oct 2005 07:50:00 -0000 1.26 +++ ethereal.spec 3 Jan 2006 08:52:01 -0000 1.27 @@ -2,16 +2,15 @@ Summary: Network traffic analyzer Name: ethereal -Version: 0.10.13 +Version: 0.10.14 Release: 1.FC3.1 License: GPL Group: Applications/Internet -Source0: http://www.ethereal.com/distribution/%{name}-%{version}.tar.gz +Source0: http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2 Source1: ethereal.pam Source2: ethereal.console Source3: ethereal.desktop Source4: ethereal.png -Patch1: ethereal-0.10.0a-ia64-segfault.patch Patch4: ethereal-0.10.12-pie.patch Url: http://www.ethereal.com/ BuildRoot: %{_tmppath}/%{name}-root @@ -48,7 +47,6 @@ %prep %setup -q -%patch1 -p1 -b .ia64 %patch4 -p1 -b .pie %build @@ -151,6 +149,10 @@ %changelog +* Tue Jan 03 2006 Radek Vokal 0.10.14-1.FC4.1 +- upgrade to 0.10.14 +- fix CVE-2005-3313 Ethereal IRC dissector DoS (#172298) + * Thu Oct 20 2005 Radek Vokal 0.10.13-1.FC3.1 - upgrade to 0.10.13 - CAN-2005-3241 Multiple ethereal issues fixed (#171063) Index: sources =================================================================== RCS file: /cvs/dist/rpms/ethereal/FC-3/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 20 Oct 2005 07:50:00 -0000 1.25 +++ sources 3 Jan 2006 08:52:01 -0000 1.26 @@ -1 +1 @@ -cae316aea6bb7113382adb3526fab899 ethereal-0.10.13.tar.gz +297f678c037f88429250830e924b8fa0 ethereal-0.10.14.tar.bz2 --- ethereal-0.10.0a-ia64-segfault.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 3 08:58:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 03:58:04 -0500 Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.20,1.21 Message-ID: <200601030858.k038w4wb017709@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/OpenIPMI/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17674 Modified Files: OpenIPMI.spec Log Message: - Rebuilt against new libnetsnmp Index: OpenIPMI.spec =================================================================== RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- OpenIPMI.spec 9 Dec 2005 22:39:30 -0000 1.20 +++ OpenIPMI.spec 3 Jan 2006 08:58:00 -0000 1.21 @@ -2,7 +2,7 @@ Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 1.4.14 -Release: 14.1 +Release: 15 License: GPL Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -128,6 +128,9 @@ %{_libdir}/*.a %changelog +* Tue Jan 03 2006 Radek Vokal 1.4.14-15 +- Rebuilt against new libnetsnmp + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 10:30:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 05:30:27 -0500 Subject: rpms/icu/devel icu.spec,1.8,1.9 Message-ID: <200601031030.k03AURRF011936@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/icu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11918 Modified Files: icu.spec Log Message: name Index: icu.spec =================================================================== RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- icu.spec 23 Dec 2005 00:53:22 -0000 1.8 +++ icu.spec 3 Jan 2006 10:30:23 -0000 1.9 @@ -121,7 +121,7 @@ %changelog -* Thu Dec 22 2005 Jesse Keating +* Thu Dec 22 2005 Jesse Keating - 3.4-6 - rebuilt * Tue Oct 11 2005 Caolan McNamara - 3.4-5 From fedora-cvs-commits at redhat.com Tue Jan 3 10:32:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 05:32:41 -0500 Subject: rpms/psacct/devel psacct.spec,1.17,1.18 Message-ID: <200601031032.k03AWfLa012018@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/psacct/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11995 Modified Files: psacct.spec Log Message: - fix typo bug 176811 Index: psacct.spec =================================================================== RCS file: /cvs/dist/rpms/psacct/devel/psacct.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- psacct.spec 9 Dec 2005 22:42:48 -0000 1.17 +++ psacct.spec 3 Jan 2006 10:32:39 -0000 1.18 @@ -12,7 +12,7 @@ Summary: Utilities for monitoring process activities. Name: psacct Version: 6.3.2 -Release: 37.1 +Release: 38 License: GPL Group: Applications/System Source: ftp://ftp.gnu.org/pub/gnu/acct-6.3.2.tar.gz @@ -43,7 +43,7 @@ lastcomm command displays information about previous executed commands. The accton command turns process accounting on or off. The sa command summarizes information about previously executed -commmands. +commands. %prep %setup -q -n acct-%{version} @@ -161,6 +161,9 @@ %{_infodir}/accounting.info.gz %changelog +* Tue Jan 3 2006 Ivana Varekova 6.3.2-38 +- fix typo bug 176811 + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 10:54:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 05:54:39 -0500 Subject: rpms/icu/devel icu-gcc41.patch,NONE,1.1 icu.spec,1.9,1.10 Message-ID: <200601031054.k03AsdYl031952@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/icu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31919 Modified Files: icu.spec Added Files: icu-gcc41.patch Log Message: try this icu-gcc41.patch: putilimp.h | 23 +---------------------- 1 files changed, 1 insertion(+), 22 deletions(-) --- NEW FILE icu-gcc41.patch --- --- icu/source/common/putilimp.h.orig 2005-06-30 18:21:58.000000000 -0400 +++ icu/source/common/putilimp.h 2006-01-03 05:51:01.000000000 -0500 @@ -254,26 +254,5 @@ * @internal */ #ifndef U_MAX_PTR -# if defined(OS390) && !defined(_LP64) - /* We have 31-bit pointers. */ -# define U_MAX_PTR(base) ((void *)0x7fffffff) -# elif defined(OS400) -/* - * With the provided macro we should never be out of range of a given segment - * (a traditional/typical segment that is). Our segments have 5 bytes for the id - * and 3 bytes for the offset. The key is that the casting takes care of only - * retrieving the offset portion minus x1000. Hence, the smallest offset seen in - * a program is x001000 and when casted to an int would be 0. That's why we can - * only add 0xffefff. Otherwise, we would exceed the segment. - * - * Currently, 16MB is the current addressing limitation on as/400. This macro - * may eventually be changed to use 2GB addressability for the newer version of - * as/400 machines. - */ -# define U_MAX_PTR(base) ((void *)(((char *)base)-((int32_t)(base))+((int32_t)0xffefff))) -# else -# define U_MAX_PTR(base) ((void *)(((char *)(base)+0x7fffffffu) > (char *)(base) ? ((char *)(base)+0x7fffffffu) : (char *)-1)) -# endif -#endif - +#define U_MAX_PTR(base) ((void *)(((uintptr_t)(base)+0x7fffffff) > (uintptr_t)(base) ? ((uintptr_t)(base)+0x7fffffff) : (uintptr_t)-1)) #endif Index: icu.spec =================================================================== RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- icu.spec 3 Jan 2006 10:30:23 -0000 1.9 +++ icu.spec 3 Jan 2006 10:54:36 -0000 1.10 @@ -11,6 +11,7 @@ BuildRequires: doxygen Patch0: icu-3.4-gnustack.patch +Patch1: icu-gcc41.patch %description The International Components for Unicode (ICU) libraries provide @@ -50,6 +51,7 @@ %prep %setup -q -n %{name} %patch0 -p1 -b .gnustack +%patch1 -p1 -b .gcc41 %build cd source @@ -121,8 +123,8 @@ %changelog -* Thu Dec 22 2005 Jesse Keating - 3.4-6 -- rebuilt +* Tue Jan 03 2005 Caolan McNamara - 3.4-6 +- add icu-gcc41.patch * Tue Oct 11 2005 Caolan McNamara - 3.4-5 - clear execstack requirement for libicudata From fedora-cvs-commits at redhat.com Tue Jan 3 10:55:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 05:55:17 -0500 Subject: rpms/icu/devel icu.spec,1.10,1.11 Message-ID: <200601031055.k03AtHTi032308@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/icu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32278 Modified Files: icu.spec Log Message: wrong year Index: icu.spec =================================================================== RCS file: /cvs/dist/rpms/icu/devel/icu.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- icu.spec 3 Jan 2006 10:54:36 -0000 1.10 +++ icu.spec 3 Jan 2006 10:55:14 -0000 1.11 @@ -123,7 +123,7 @@ %changelog -* Tue Jan 03 2005 Caolan McNamara - 3.4-6 +* Tue Jan 03 2006 Caolan McNamara - 3.4-6 - add icu-gcc41.patch * Tue Oct 11 2005 Caolan McNamara - 3.4-5 From fedora-cvs-commits at redhat.com Tue Jan 3 10:57:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 05:57:15 -0500 Subject: rpms/kernel/devel linux-2.6-bcm43xx-device-table.patch, NONE, 1.1 .cvsignore, 1.312, 1.313 kernel-2.6.spec, 1.1813, 1.1814 sources, 1.254, 1.255 linux-2.6-bcm43xx-txfix.patch, 1.1, NONE linux-2.6-bcm43xx-version.patch, 1.1, NONE Message-ID: <200601031057.k03AvFcb000867@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv823 Modified Files: .cvsignore kernel-2.6.spec sources Added Files: linux-2.6-bcm43xx-device-table.patch Removed Files: linux-2.6-bcm43xx-txfix.patch linux-2.6-bcm43xx-version.patch Log Message: Update Broadcom wireless driver linux-2.6-bcm43xx-device-table.patch: bcm43xx_main.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6-bcm43xx-device-table.patch --- --- linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c~ 2006-01-03 04:35:26.000000000 +0000 +++ linux/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-01-03 04:35:29.000000000 +0000 @@ -139,6 +139,7 @@ static struct pci_device_id bcm43xx_pci_ /* required last entry */ { 0, }, }; +MODULE_DEVICE_TABLE(pci, bcm43xx_pci_tbl); static void bcm43xx_recover_from_fatal(struct bcm43xx_private *bcm, const char *error); static void bcm43xx_free_board(struct bcm43xx_private *bcm); Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.312 retrieving revision 1.313 diff -u -r1.312 -r1.313 --- .cvsignore 3 Jan 2006 05:47:14 -0000 1.312 +++ .cvsignore 3 Jan 2006 10:57:13 -0000 1.313 @@ -2,5 +2,5 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 -ieee80211softmac-20060102.tar.bz2 -bcm43xx-20060102.tar.bz2 +bcm43xx-20060103.tar.bz2 +ieee80211softmac-20060103.tar.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1813 retrieving revision 1.1814 diff -u -r1.1813 -r1.1814 --- kernel-2.6.spec 3 Jan 2006 05:50:00 -0000 1.1813 +++ kernel-2.6.spec 3 Jan 2006 10:57:13 -0000 1.1814 @@ -182,7 +182,7 @@ Source10: COPYING.modules Source11: genkey -%define BCMVER 20060102 +%define BCMVER 20060103 Source12: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/softmac/ieee80211softmac-%{BCMVER}.tar.bz2 Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2 @@ -379,10 +379,9 @@ # Broadcom wireless driver Patch5000: linux-2.6-bcm43xx.patch -Patch5001: linux-2.6-bcm43xx-version.patch Patch5002: linux-2.6-bcm43xx-promisc.patch -Patch5003: linux-2.6-bcm43xx-txfix.patch -Patch5004: linux-2.6.14-ieee80211-hw-wep.patch +Patch5003: linux-2.6.14-ieee80211-hw-wep.patch +Patch5004: linux-2.6-bcm43xx-device-table.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -894,16 +893,13 @@ # Patch Kconfig and Makefiles to merge it 'properly' %patch5000 -p1 -# Make it accept kernel version 2.6.14, since we're actually 2.6.15-rc -%patch5001 -p1 -# Fix tx status with core rev < 5 (will be fixed in 20060603 snapshot) -%patch5002 -p1 # Operate in promiscuous mode, to make multicast and broadcast RX work -%patch5003 -p1 +%patch5002 -p1 # Handle host_build_iv properly +%patch5003 -p1 +# Include pci device table so it gets autoloaded %patch5004 -p1 - # # final stuff # Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.254 retrieving revision 1.255 diff -u -r1.254 -r1.255 --- sources 3 Jan 2006 05:47:14 -0000 1.254 +++ sources 3 Jan 2006 10:57:13 -0000 1.255 @@ -1,3 +1,3 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -7608b855b53933b07aeab428b876eff0 ieee80211softmac-20060102.tar.bz2 -9245e708ac8ccca2f68b793bb8f240ac bcm43xx-20060102.tar.bz2 +96083b51cd30e60b86127113abed37a3 bcm43xx-20060103.tar.bz2 +1eb2bb778090c59fbeba6278d63a9309 ieee80211softmac-20060103.tar.bz2 --- linux-2.6-bcm43xx-txfix.patch DELETED --- --- linux-2.6-bcm43xx-version.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 3 10:59:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 05:59:41 -0500 Subject: rpms/icu/devel icu-gcc41.patch,1.1,1.2 Message-ID: <200601031059.k03AxfPp002018@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/icu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1984 Modified Files: icu-gcc41.patch Log Message: bit more icu-gcc41.patch: putilimp.h | 24 ++---------------------- 1 files changed, 2 insertions(+), 22 deletions(-) Index: icu-gcc41.patch =================================================================== RCS file: /cvs/dist/rpms/icu/devel/icu-gcc41.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- icu-gcc41.patch 3 Jan 2006 10:54:36 -0000 1.1 +++ icu-gcc41.patch 3 Jan 2006 10:59:37 -0000 1.2 @@ -1,6 +1,6 @@ --- icu/source/common/putilimp.h.orig 2005-06-30 18:21:58.000000000 -0400 +++ icu/source/common/putilimp.h 2006-01-03 05:51:01.000000000 -0500 -@@ -254,26 +254,5 @@ +@@ -254,26 +254,6 @@ * @internal */ #ifndef U_MAX_PTR @@ -27,4 +27,5 @@ -#endif - +#define U_MAX_PTR(base) ((void *)(((uintptr_t)(base)+0x7fffffff) > (uintptr_t)(base) ? ((uintptr_t)(base)+0x7fffffff) : (uintptr_t)-1)) ++#endif #endif From fedora-cvs-commits at redhat.com Tue Jan 3 11:47:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 06:47:30 -0500 Subject: rpms/ethereal/devel ethereal-0.10.14-nfsv4-opts.patch, NONE, 1.1 ethereal.spec, 1.63, 1.64 Message-ID: <200601031147.k03BlUwF009695@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/ethereal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9616 Modified Files: ethereal.spec Added Files: ethereal-0.10.14-nfsv4-opts.patch Log Message: Added code to better show NFS V4 opts ethereal-0.10.14-nfsv4-opts.patch: packet-nfs.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletion(-) --- NEW FILE ethereal-0.10.14-nfsv4-opts.patch --- --- ethereal-0.10.14/epan/dissectors/packet-nfs.c.orig 2005-12-26 21:21:11.000000000 -0500 +++ ethereal-0.10.14/epan/dissectors/packet-nfs.c 2006-01-02 13:57:05.000000000 -0500 @@ -7040,6 +7040,8 @@ dissect_nfs_argop4(tvbuff_t *tvb, int of if (ftree == NULL) return offset; + proto_item_append_text(tree, ", Ops(%d):", ops); + for (ops_counter=0; ops_countercinfo, COL_INFO)) { + col_append_fstr(pinfo->cinfo, COL_INFO, " %s", + names_nfsv4_operation[opcode - 3].strptr); + } + } + proto_item_append_text(tree, " %s", + names_nfsv4_operation[opcode - 3].strptr); + switch(opcode) { case NFS4_OP_ACCESS: @@ -7391,6 +7402,8 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of if (ftree == NULL) return offset; /* error adding new subtree */ + proto_item_append_text(tree, ", Ops(%d):", ops); + for (ops_counter = 0; ops_counter < ops; ops_counter++) { opcode = tvb_get_ntohl(tvb, offset); @@ -7418,6 +7431,17 @@ dissect_nfs_resop4(tvbuff_t *tvb, int of offset = dissect_nfs_nfsstat4(tvb, offset, newftree, &status); + if (check_col(pinfo->cinfo, COL_INFO)) { + if (status != NFS4_OK) { + col_append_fstr(pinfo->cinfo, COL_INFO, " %s(%d)", + names_nfsv4_operation[opcode - 3].strptr, status); + } else if (opcode != NFS4_OP_PUTFH) { + col_append_fstr(pinfo->cinfo, COL_INFO, " %s", + names_nfsv4_operation[opcode - 3].strptr); + } + } + proto_item_append_text(tree, " %s(%d)", + names_nfsv4_operation[opcode - 3].strptr, status); /* * With the exception of NFS4_OP_LOCK, NFS4_OP_LOCKT, and * NFS4_OP_SETATTR, all other ops do *not* return data with the @@ -7662,7 +7686,7 @@ static const value_string nfsv3_proc_val static const vsff nfs4_proc[] = { { 0, "NULL", dissect_nfs3_null_call, dissect_nfs3_null_reply }, - { 1, "COMPOUND", + { 1, "COMP", dissect_nfs4_compound_call, dissect_nfs4_compound_reply }, { 0, NULL, NULL, NULL } }; Index: ethereal.spec =================================================================== RCS file: /cvs/dist/rpms/ethereal/devel/ethereal.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- ethereal.spec 2 Jan 2006 12:32:06 -0000 1.63 +++ ethereal.spec 3 Jan 2006 11:47:27 -0000 1.64 @@ -4,7 +4,7 @@ Summary: Network traffic analyzer Name: ethereal Version: 0.10.14 -Release: 2 +Release: 3 License: GPL Group: Applications/Internet Source0: http://www.ethereal.com/distribution/%{name}-%{version}.tar.bz2 @@ -14,6 +14,7 @@ Source4: ethereal.png Patch1: ethereal-0.10.13-pie.patch Patch2: ethereal-gtk-dialog.patch +Patch3: ethereal-0.10.14-nfsv4-opts.patch Url: http://www.ethereal.com/ BuildRoot: %{_tmppath}/%{name}-root Requires: libpcap >= 0.6 @@ -52,6 +53,7 @@ %setup -q -n %{name}-%{version} %patch1 -p1 -b .pie %patch2 -p0 -b .gtk +%patch3 -p1 %build %ifarch s390 s390x @@ -161,6 +163,9 @@ %changelog +* Mon Jan 2 2006 Steve Dickson 0.10.14-3 +- Added code to better show NFS V4 opts + * Mon Jan 02 2006 Radek Vokal 0.10.14-2 - rebuilt against new net-snmp-5.3 - gtk dialog bug (#156568) From fedora-cvs-commits at redhat.com Tue Jan 3 13:02:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 08:02:09 -0500 Subject: rpms/libwmf/devel libwmf-0.2.8.4-fallbackfont.patch, NONE, 1.1 libwmf.spec, 1.13, 1.14 Message-ID: <200601031302.k03D29f8016480@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/libwmf/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16436 Modified Files: libwmf.spec Added Files: libwmf-0.2.8.4-fallbackfont.patch Log Message: add a fallback font for rh#176620# libwmf-0.2.8.4-fallbackfont.patch: font.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) --- NEW FILE libwmf-0.2.8.4-fallbackfont.patch --- diff -ru libwmf-0.2.8.4.orig/src/font.c libwmf-0.2.8.4/src/font.c --- libwmf-0.2.8.4.orig/src/font.c 2005-07-27 21:35:06.000000000 +0100 +++ libwmf-0.2.8.4/src/font.c 2006-01-03 12:53:38.000000000 +0000 @@ -1429,11 +1429,9 @@ if (GS->len == 0) return (0); name = font->lfFaceName; - if (name == 0) - { WMF_DEBUG (API,"No font name?"); - API->err = wmf_E_Glitch; - return (0); - } + + if (name == 0 || name[0] == 0) + name = "Times"; /* Find first white-space character or eol */ Index: libwmf.spec =================================================================== RCS file: /cvs/dist/rpms/libwmf/devel/libwmf.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libwmf.spec 23 Dec 2005 01:11:41 -0000 1.13 +++ libwmf.spec 3 Jan 2006 13:02:03 -0000 1.14 @@ -1,13 +1,14 @@ Summary: Windows Metafile Library Name: libwmf Version: 0.2.8.4 -Release: 2.1 +Release: 3 Group: System Environment/Libraries License: LGPL Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root Patch0: libwmf-0.2.8.3-nodocs.patch Patch1: libwmf-0.2.8.3-relocatablefonts.patch +Patch2: libwmf-0.2.8.4-fallbackfont.patch Requires: gtk2 >= 2.4.1-2 Requires: libxml2 >= 2.6.8 Requires: gd >= 2.0.21 @@ -40,6 +41,7 @@ %setup -q %patch0 -p1 -b .nodocs %patch1 -p1 -b .relocatablefonts +%patch2 -p1 -b .fallbackfont %build rm configure.ac @@ -96,6 +98,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Tue Jan 03 2005 Caolan McNamara 0.2.8.4-3 +- add libwmf-0.2.8.4-fallbackfont.patch for rh#176620# + * Fri Dec 09 2005 Jesse Keating 0.2.8.4-2.1 - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 13:04:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 08:04:56 -0500 Subject: rpms/libwmf/devel libwmf.spec,1.14,1.15 Message-ID: <200601031304.k03D4uEZ016626@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/libwmf/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16602 Modified Files: libwmf.spec Log Message: wrong year again Index: libwmf.spec =================================================================== RCS file: /cvs/dist/rpms/libwmf/devel/libwmf.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libwmf.spec 3 Jan 2006 13:02:03 -0000 1.14 +++ libwmf.spec 3 Jan 2006 13:04:35 -0000 1.15 @@ -98,7 +98,7 @@ rm -r $RPM_BUILD_ROOT %changelog -* Tue Jan 03 2005 Caolan McNamara 0.2.8.4-3 +* Tue Jan 03 2006 Caolan McNamara 0.2.8.4-3 - add libwmf-0.2.8.4-fallbackfont.patch for rh#176620# * Fri Dec 09 2005 Jesse Keating 0.2.8.4-2.1 From fedora-cvs-commits at redhat.com Tue Jan 3 13:08:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 08:08:42 -0500 Subject: rpms/foomatic/devel .cvsignore, 1.35, 1.36 foomatic.spec, 1.123, 1.124 sources, 1.35, 1.36 Message-ID: <200601031308.k03D8gtZ017784@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17745 Modified Files: .cvsignore foomatic.spec sources Log Message: * Tue Jan 3 2006 Tim Waugh 3.0.2-30 - Updated db to 3.0-20060103. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 9 Dec 2005 15:21:47 -0000 1.35 +++ .cvsignore 3 Jan 2006 13:08:39 -0000 1.36 @@ -25,3 +25,4 @@ foomatic-filters-3.0-20051209.tar.gz foomatic-db-hpijs-1.5-20051209.tar.gz foomatic-db-engine-3.0-20051209.tar.gz +foomatic-db-3.0-20060103.tar.gz Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- foomatic.spec 9 Dec 2005 22:40:28 -0000 1.123 +++ foomatic.spec 3 Jan 2006 13:08:39 -0000 1.124 @@ -1,4 +1,4 @@ -%define dbver 20051209 +%define dbver 20060103 %define enginever 3.0-20051209 %define filtersver 20051209 %define hpijsver 1.5-20051209 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 29.1 +Release: 30 License: GPL Group: System Environment/Libraries @@ -265,6 +265,9 @@ %{_var}/cache/foomatic %changelog +* Tue Jan 3 2006 Tim Waugh 3.0.2-30 +- Updated db to 3.0-20060103. + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 9 Dec 2005 15:21:47 -0000 1.35 +++ sources 3 Jan 2006 13:08:39 -0000 1.36 @@ -1,6 +1,6 @@ e5cac8f30f0c39b576c1a25008a06198 gimp-print-foomatic-db-4.2.7.tar.bz2 dcfbfbe16d76d0b6e44cb261fccd138f Omni-printers-0.9.2.tar.bz2 -3cdf7623698918e54a58792646bdac54 foomatic-db-3.0-20051209.tar.gz 5876178c3aefd36102bc5eef575d3f9c foomatic-filters-3.0-20051209.tar.gz 8c217af8a570124d9ad7f8a4b1270ebe foomatic-db-hpijs-1.5-20051209.tar.gz c0375c9e1d78685639e39abe24ffbdff foomatic-db-engine-3.0-20051209.tar.gz +abe054a3f80b180b670d96f46f6ec556 foomatic-db-3.0-20060103.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 3 13:13:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 08:13:43 -0500 Subject: rpms/vnc/devel vnc.spec,1.123,1.124 vncserver.init,1.9,1.10 Message-ID: <200601031313.k03DDh8B020111@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/vnc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20072 Modified Files: vnc.spec vncserver.init Log Message: * Tue Jan 3 2006 Tim Waugh - Prevent restorecon error message when not present (bug #176654). Index: vnc.spec =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- vnc.spec 23 Dec 2005 10:24:04 -0000 1.123 +++ vnc.spec 3 Jan 2006 13:13:40 -0000 1.124 @@ -256,6 +256,9 @@ %{_libdir}/xorg/modules/extensions/libvnc.so %changelog +* Tue Jan 3 2006 Tim Waugh +- Prevent restorecon error message when not present (bug #176654). + * Fri Dec 23 2005 Tim Waugh 4.1.1-32 - Use system libtool to fix libvnc.so build (bug #176435). Index: vncserver.init =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vncserver.init,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- vncserver.init 5 Jan 2005 15:19:08 -0000 1.9 +++ vncserver.init 3 Jan 2006 13:13:40 -0000 1.10 @@ -26,7 +26,7 @@ if [ ! -d /tmp/.X11-unix ] then mkdir -m 1777 /tmp/.X11-unix || : - restorecon /tmp/.X11-unix || : + restorecon /tmp/.X11-unix 2>/dev/null || : fi for display in ${VNCSERVERS} do From fedora-cvs-commits at redhat.com Tue Jan 3 13:47:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 08:47:34 -0500 Subject: rpms/docbook-style-xsl/devel docbook-xsl-pagesetup.patch, NONE, 1.1 docbook-style-xsl.spec, 1.20, 1.21 Message-ID: <200601031347.k03DlYn4023572@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/docbook-style-xsl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23527 Modified Files: docbook-style-xsl.spec Added Files: docbook-xsl-pagesetup.patch Log Message: * Tue Jan 3 2006 Tim Waugh - Avoid proportional-column-width for passivetex (bug #176766). docbook-xsl-pagesetup.patch: pagesetup.xsl | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) --- NEW FILE docbook-xsl-pagesetup.patch --- --- docbook-xsl-1.69.1/fo/pagesetup.xsl.orig 2005-12-10 14:08:28.000000000 -0600 +++ docbook-xsl-1.69.1/fo/pagesetup.xsl 2006-01-01 19:49:28.000000000 -0600 @@ -1491,32 +1491,29 @@ - proportional-column-width( header - ) + % - proportional-column-width( header - ) + % - proportional-column-width( header - ) + % @@ -1812,32 +1809,29 @@ - proportional-column-width( footer - ) + % - proportional-column-width( footer - ) + % - proportional-column-width( footer - ) + % Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- docbook-style-xsl.spec 9 Dec 2005 22:40:14 -0000 1.20 +++ docbook-style-xsl.spec 3 Jan 2006 13:47:31 -0000 1.21 @@ -22,6 +22,7 @@ Source1: %{name}.Makefile Source2: http://prdownloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar.bz2 +Patch1: docbook-xsl-pagesetup.patch Patch2: docbook-xsl-marginleft.patch @@ -35,6 +36,7 @@ pushd .. tar jxf %{SOURCE2} popd +%patch1 -p1 -b .pagesetup %patch2 -p1 -b .marginleft cp %{SOURCE1} Makefile for f in $(find -name "*'*") @@ -94,6 +96,9 @@ %changelog +* Tue Jan 3 2006 Tim Waugh +- Avoid proportional-column-width for passivetex (bug #176766). + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 13:50:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 08:50:57 -0500 Subject: rpms/docbook-style-xsl/devel docbook-xsl-lists.patch, NONE, 1.1 docbook-style-xsl.spec, 1.21, 1.22 Message-ID: <200601031350.k03Dov2d025163@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/docbook-style-xsl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25129 Modified Files: docbook-style-xsl.spec Added Files: docbook-xsl-lists.patch Log Message: * Tue Jan 3 2006 Tim Waugh - Patches from W. Michael Petullo: - Fix lists blocking (bug #161371). docbook-xsl-lists.patch: lists.xsl | 30 ++++++++++++++++++++++++------ 1 files changed, 24 insertions(+), 6 deletions(-) --- NEW FILE docbook-xsl-lists.patch --- --- docbook-xsl-1.69.1/fo/lists.xsl.orig 2006-01-01 20:00:44.000000000 -0600 +++ docbook-xsl-1.69.1/fo/lists.xsl 2006-01-01 20:01:54.000000000 -0600 @@ -125,9 +125,18 @@ - - - + + + + + + + + + + @@ -288,9 +297,18 @@ - - - + + + + + + + + + + Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- docbook-style-xsl.spec 3 Jan 2006 13:47:31 -0000 1.21 +++ docbook-style-xsl.spec 3 Jan 2006 13:50:54 -0000 1.22 @@ -24,6 +24,7 @@ Patch1: docbook-xsl-pagesetup.patch Patch2: docbook-xsl-marginleft.patch +Patch3: docbook-xsl-lists.patch %description @@ -38,6 +39,7 @@ popd %patch1 -p1 -b .pagesetup %patch2 -p1 -b .marginleft +%patch3 -p1 -b .lists cp %{SOURCE1} Makefile for f in $(find -name "*'*") do @@ -97,7 +99,9 @@ %changelog * Tue Jan 3 2006 Tim Waugh -- Avoid proportional-column-width for passivetex (bug #176766). +- Patches from W. Michael Petullo: + - Fix lists blocking (bug #161371). + - Avoid proportional-column-width for passivetex (bug #176766). * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 13:51:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 08:51:35 -0500 Subject: rpms/docbook-style-xsl/devel docbook-style-xsl.spec,1.22,1.23 Message-ID: <200601031351.k03DpZov025450@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/docbook-style-xsl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25416 Modified Files: docbook-style-xsl.spec Log Message: 1.69.1-2 Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- docbook-style-xsl.spec 3 Jan 2006 13:50:54 -0000 1.22 +++ docbook-style-xsl.spec 3 Jan 2006 13:51:32 -0000 1.23 @@ -1,6 +1,6 @@ Name: docbook-style-xsl Version: 1.69.1 -Release: 1.1 +Release: 2 Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML. @@ -98,7 +98,7 @@ %changelog -* Tue Jan 3 2006 Tim Waugh +* Tue Jan 3 2006 Tim Waugh 1.69.1-2 - Patches from W. Michael Petullo: - Fix lists blocking (bug #161371). - Avoid proportional-column-width for passivetex (bug #176766). From fedora-cvs-commits at redhat.com Tue Jan 3 13:59:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 08:59:14 -0500 Subject: rpms/kernel/FC-4 linux-2.6-vm-debug.patch, NONE, 1.1 kernel-2.6.spec, 1.1551, 1.1552 Message-ID: <200601031359.k03DxEpm028923@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv28849 Modified Files: kernel-2.6.spec Added Files: linux-2.6-vm-debug.patch Log Message: debug foo. linux-2.6-vm-debug.patch: rmap.c | 7 +++++++ 1 files changed, 7 insertions(+) --- NEW FILE linux-2.6-vm-debug.patch --- --- linux-2.6.14/mm/rmap.c~ 2006-01-03 08:53:32.000000000 -0500 +++ linux-2.6.14/mm/rmap.c 2006-01-03 08:58:19.000000000 -0500 @@ -484,6 +484,13 @@ void page_remove_rmap(struct page *page) BUG_ON(PageReserved(page)); if (atomic_add_negative(-1, &page->_mapcount)) { + if (page_mapcount(page) < 0) { + printk (KERN_EMERG "Eeek! page_mapcount(page) went negative! (%d)\n", page->_mapcount); + printk (KERN_EMERG " page->flags = %x\n" page->flags); + printk (KERN_EMERG " page->count = %x\n" page->_count); + printk (KERN_EMERG " page->mapping = %p\n" page->mapping); + } + BUG_ON(page_mapcount(page) < 0); /* * It would be tidy to reset the PageAnon mapping here, Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1551 retrieving revision 1.1552 diff -u -r1.1551 -r1.1552 --- kernel-2.6.spec 2 Jan 2006 02:02:17 -0000 1.1551 +++ kernel-2.6.spec 3 Jan 2006 13:59:11 -0000 1.1552 @@ -368,6 +368,7 @@ Patch2000: linux-2.6-vm-oomkiller-debugging.patch Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch Patch2003: linux-2.6-vm-clear-unreclaimable.patch +Patch2004: linux-2.6-vm-debug.patch # @@ -830,6 +831,8 @@ %patch2001 -p1 # prevent OOM kills and page allocation failures under load. %patch2003 -p1 +# debug-fu +%patch2004 -p1 # # Patches 5000 to 6000 are reserved for new drivers that are about to From fedora-cvs-commits at redhat.com Tue Jan 3 14:22:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 09:22:04 -0500 Subject: rpms/kernel/FC-4 linux-2.6-vm-debug.patch,1.1,1.2 Message-ID: <200601031422.k03EM4cQ014232@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv14188 Modified Files: linux-2.6-vm-debug.patch Log Message: doh linux-2.6-vm-debug.patch: rmap.c | 7 +++++++ 1 files changed, 7 insertions(+) Index: linux-2.6-vm-debug.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-vm-debug.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-vm-debug.patch 3 Jan 2006 13:59:11 -0000 1.1 +++ linux-2.6-vm-debug.patch 3 Jan 2006 14:22:00 -0000 1.2 @@ -6,9 +6,9 @@ if (atomic_add_negative(-1, &page->_mapcount)) { + if (page_mapcount(page) < 0) { + printk (KERN_EMERG "Eeek! page_mapcount(page) went negative! (%d)\n", page->_mapcount); -+ printk (KERN_EMERG " page->flags = %x\n" page->flags); -+ printk (KERN_EMERG " page->count = %x\n" page->_count); -+ printk (KERN_EMERG " page->mapping = %p\n" page->mapping); ++ printk (KERN_EMERG " page->flags = %x\n", page->flags); ++ printk (KERN_EMERG " page->count = %x\n", page->_count); ++ printk (KERN_EMERG " page->mapping = %p\n", page->mapping); + } + BUG_ON(page_mapcount(page) < 0); From fedora-cvs-commits at redhat.com Tue Jan 3 14:25:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 09:25:59 -0500 Subject: rpms/usermode/devel .cvsignore, 1.41, 1.42 sources, 1.44, 1.45 usermode.spec, 1.53, 1.54 Message-ID: <200601031425.k03EPxGX008962@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/usermode/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8947 Modified Files: .cvsignore sources usermode.spec Log Message: * Tue Jan 3 2005 Jindrich Novy 1.85-1 - fix userpasswd - don't crash if pam produces multi-line output (#175735) Thanks to toddp at bestweb.net - added Serbian translation (#176152) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/usermode/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 1 Dec 2005 14:50:31 -0000 1.41 +++ .cvsignore 3 Jan 2006 14:25:57 -0000 1.42 @@ -1 +1,2 @@ usermode-1.84.tar.bz2 +usermode-1.85.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/usermode/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 1 Dec 2005 14:50:31 -0000 1.44 +++ sources 3 Jan 2006 14:25:57 -0000 1.45 @@ -1 +1 @@ -f7ceb8bcfedd3b6f0825b22143a06ad4 usermode-1.84.tar.bz2 +63570836f5e3bcb9c7f746048887a589 usermode-1.85.tar.bz2 Index: usermode.spec =================================================================== RCS file: /cvs/dist/rpms/usermode/devel/usermode.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- usermode.spec 9 Dec 2005 22:43:43 -0000 1.53 +++ usermode.spec 3 Jan 2006 14:25:57 -0000 1.54 @@ -5,8 +5,8 @@ %define build6x 0 Summary: Tools for certain user account management tasks. Name: usermode -Version: 1.84 -Release: 1.1 +Version: 1.85 +Release: 1 License: GPL Group: Applications/System Source: usermode-%{version}.tar.bz2 @@ -120,6 +120,11 @@ %{_datadir}/applications/* %changelog +* Tue Jan 3 2005 Jindrich Novy 1.85-1 +- fix userpasswd - don't crash if pam produces multi-line output (#175735) + Thanks to toddp at bestweb.net +- added Serbian translation (#176152) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 14:26:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 09:26:45 -0500 Subject: rpms/usermode/devel usermode.spec,1.54,1.55 Message-ID: <200601031426.k03EQjl4009007@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/usermode/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8994 Modified Files: usermode.spec Log Message: fix date in changelog Index: usermode.spec =================================================================== RCS file: /cvs/dist/rpms/usermode/devel/usermode.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- usermode.spec 3 Jan 2006 14:25:57 -0000 1.54 +++ usermode.spec 3 Jan 2006 14:26:43 -0000 1.55 @@ -120,7 +120,7 @@ %{_datadir}/applications/* %changelog -* Tue Jan 3 2005 Jindrich Novy 1.85-1 +* Tue Jan 3 2006 Jindrich Novy 1.85-1 - fix userpasswd - don't crash if pam produces multi-line output (#175735) Thanks to toddp at bestweb.net - added Serbian translation (#176152) From fedora-cvs-commits at redhat.com Tue Jan 3 14:39:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 09:39:48 -0500 Subject: rpms/redhat-menus/devel .cvsignore, 1.31, 1.32 redhat-menus.spec, 1.50, 1.51 sources, 1.32, 1.33 Message-ID: <200601031439.k03EdmFQ009185@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/redhat-menus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9170 Modified Files: .cvsignore redhat-menus.spec sources Log Message: 5.0.8 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 22 Nov 2005 06:49:30 -0000 1.31 +++ .cvsignore 3 Jan 2006 14:39:46 -0000 1.32 @@ -8,3 +8,4 @@ redhat-menus-5.0.5.tar.gz redhat-menus-5.0.6.tar.gz redhat-menus-5.0.7.tar.gz +redhat-menus-5.0.8.tar.gz Index: redhat-menus.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- redhat-menus.spec 9 Dec 2005 22:42:59 -0000 1.50 +++ redhat-menus.spec 3 Jan 2006 14:39:46 -0000 1.51 @@ -3,8 +3,8 @@ Summary: Configuration and data files for the desktop menus Name: redhat-menus -Version: 5.0.7 -Release: 3.1 +Version: 5.0.8 +Release: 1 URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz Patch0: redhat-menus-no-package-install.patch @@ -67,6 +67,9 @@ %{_datadir}/desktop-directories/*.directory %changelog +* Tue Jan 3 2006 Matthias Clasen - 5.0.8-1 +- Make "Other" disappear again + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 22 Nov 2005 06:49:30 -0000 1.32 +++ sources 3 Jan 2006 14:39:46 -0000 1.33 @@ -1 +1 @@ -01a0a8656937c5f0efa704ec5419dd8d redhat-menus-5.0.7.tar.gz +d29cd89dec332466dec8bce0ee71c82e redhat-menus-5.0.8.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 3 14:45:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 09:45:51 -0500 Subject: rpms/gtk2-engines/devel .cvsignore, 1.15, 1.16 gtk2-engines.spec, 1.29, 1.30 sources, 1.16, 1.17 Message-ID: <200601031445.k03Ejpd8014034@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2-engines/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12942 Modified Files: .cvsignore gtk2-engines.spec sources Log Message: 2.7.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 14 Dec 2005 21:35:44 -0000 1.15 +++ .cvsignore 3 Jan 2006 14:45:49 -0000 1.16 @@ -11,3 +11,4 @@ gtk-engines-2.7.0.tar.bz2 gtk-engines-2.7.0.cvs20051211.tar.gz gtk-engines-2.7.1.tar.bz2 +gtk-engines-2.7.2.tar.bz2 Index: gtk2-engines.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gtk2-engines.spec 14 Dec 2005 21:35:44 -0000 1.29 +++ gtk2-engines.spec 3 Jan 2006 14:45:49 -0000 1.30 @@ -1,6 +1,6 @@ Summary: Theme engines for GTK+ 2.0 Name: gtk2-engines -Version: 2.7.1 +Version: 2.7.2 Release: 1 License: GPL Group: System Environment/Libraries @@ -60,6 +60,9 @@ %{_datadir}/themes %changelog +* Tue Jan 03 2006 Matthias Clasen 2.7.2-1 +- Update to 2.7.2 + * Wed Dec 14 2005 Matthias Clasen 2.7.1-1 - Update to 2.7.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 14 Dec 2005 21:35:44 -0000 1.16 +++ sources 3 Jan 2006 14:45:49 -0000 1.17 @@ -1 +1 @@ -a228e3d3d3808716e5700943c386e6a0 gtk-engines-2.7.1.tar.bz2 +5840bcaa86092d133258905630f4212c gtk-engines-2.7.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 15:19:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 10:19:25 -0500 Subject: rpms/file-roller/devel .cvsignore, 1.28, 1.29 file-roller.spec, 1.40, 1.41 sources, 1.29, 1.30 Message-ID: <200601031519.k03FJP1r016260@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/file-roller/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16200 Modified Files: .cvsignore file-roller.spec sources Log Message: 2.13.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 14 Dec 2005 20:52:21 -0000 1.28 +++ .cvsignore 3 Jan 2006 15:19:23 -0000 1.29 @@ -14,3 +14,4 @@ file-roller-2.12.1.tar.bz2 file-roller-2.13.1.tar.bz2 file-roller-2.13.2.tar.bz2 +file-roller-2.13.3.tar.bz2 Index: file-roller.spec =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- file-roller.spec 14 Dec 2005 21:06:04 -0000 1.40 +++ file-roller.spec 3 Jan 2006 15:19:23 -0000 1.41 @@ -9,7 +9,7 @@ Summary: File Roller is a tool for viewing and creating archives. Name: file-roller -Version: 2.13.2 +Version: 2.13.3 Release: 1 License: GPL @@ -107,6 +107,9 @@ %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so %changelog +* Thu Jan 03 2005 Matthias Clasen 2.13.3-1 +- Update to 2.13.3 + * Thu Dec 14 2005 Matthias Clasen 2.13.2-1 - Update to 2.13.2 - Remove upstreamed patches Index: sources =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 14 Dec 2005 20:52:21 -0000 1.29 +++ sources 3 Jan 2006 15:19:23 -0000 1.30 @@ -1 +1 @@ -83c2e6b395144c74b36a366b46609f36 file-roller-2.13.2.tar.bz2 +b301ce7a7fcb005ee03d848db7aeb2df file-roller-2.13.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 15:20:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 10:20:09 -0500 Subject: rpms/file-roller/devel file-roller.spec,1.41,1.42 Message-ID: <200601031520.k03FK9sc016651@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/file-roller/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16572 Modified Files: file-roller.spec Log Message: Fix changelog Index: file-roller.spec =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- file-roller.spec 3 Jan 2006 15:19:23 -0000 1.41 +++ file-roller.spec 3 Jan 2006 15:20:07 -0000 1.42 @@ -107,7 +107,7 @@ %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so %changelog -* Thu Jan 03 2005 Matthias Clasen 2.13.3-1 +* Thu Jan 03 2006 Matthias Clasen 2.13.3-1 - Update to 2.13.3 * Thu Dec 14 2005 Matthias Clasen 2.13.2-1 From fedora-cvs-commits at redhat.com Tue Jan 3 15:30:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 10:30:03 -0500 Subject: rpms/kernel/devel linux-2.6-debug-latency-tracing.patch,1.8,1.9 Message-ID: <200601031530.k03FU3M2021153@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21103 Modified Files: linux-2.6-debug-latency-tracing.patch Log Message: update linux-2.6-debug-latency-tracing.patch: kernel/latency.c | 4 linux-2.6.14/include/asm-x86_64/unistd.h | 1 linux-2.6.14/kernel/latency.c | 2 linux-latency-tracing.q/Makefile | 10 linux-latency-tracing.q/arch/arm/boot/compressed/head.S | 13 linux-latency-tracing.q/arch/arm/kernel/calls.S | 6 linux-latency-tracing.q/arch/arm/kernel/entry-common.S | 111 linux-latency-tracing.q/arch/arm/kernel/fiq.c | 4 linux-latency-tracing.q/arch/arm/kernel/irq.c | 4 linux-latency-tracing.q/arch/arm/kernel/traps.c | 2 linux-latency-tracing.q/arch/arm/mm/copypage-v4mc.c | 4 linux-latency-tracing.q/arch/arm/mm/copypage-xscale.c | 4 linux-latency-tracing.q/arch/arm/mm/fault.c | 14 linux-latency-tracing.q/arch/i386/Kconfig | 2 linux-latency-tracing.q/arch/i386/boot/compressed/misc.c | 8 linux-latency-tracing.q/arch/i386/kernel/Makefile | 1 linux-latency-tracing.q/arch/i386/kernel/entry.S | 41 linux-latency-tracing.q/arch/i386/kernel/irq.c | 8 linux-latency-tracing.q/arch/i386/kernel/mcount-wrapper.S | 27 linux-latency-tracing.q/arch/ppc/boot/Makefile | 9 linux-latency-tracing.q/arch/ppc/kernel/entry.S | 82 linux-latency-tracing.q/arch/x86_64/kernel/entry.S | 48 linux-latency-tracing.q/arch/x86_64/kernel/vsyscall.c | 2 linux-latency-tracing.q/fs/proc/proc_misc.c | 17 linux-latency-tracing.q/include/asm-arm/pgalloc.h | 4 linux-latency-tracing.q/include/asm-arm/timex.h | 10 linux-latency-tracing.q/include/asm-arm/unistd.h | 3 linux-latency-tracing.q/include/asm-i386/system.h | 8 linux-latency-tracing.q/include/linux/interrupt.h | 10 linux-latency-tracing.q/include/linux/latency_hist.h | 32 linux-latency-tracing.q/include/linux/linkage.h | 2 linux-latency-tracing.q/include/linux/preempt.h | 20 linux-latency-tracing.q/include/linux/sched.h | 86 linux-latency-tracing.q/init/main.c | 9 linux-latency-tracing.q/kernel/Makefile | 3 linux-latency-tracing.q/kernel/latency.c | 2390 ++++++++++++++ linux-latency-tracing.q/kernel/latency_hist.c | 267 + linux-latency-tracing.q/kernel/sched.c | 103 linux-latency-tracing.q/kernel/sysctl.c | 77 linux-latency-tracing.q/kernel/time.c | 19 linux-latency-tracing.q/lib/Kconfig.debug | 149 linux/arch/arm/boot/compressed/misc.c | 1 linux/arch/arm26/boot/compressed/misc.c | 1 linux/arch/i386/boot/compressed/misc.c | 1 linux/arch/ppc/boot/lib/Makefile | 48 linux/arch/x86_64/boot/compressed/misc.c | 1 linux/lib/inflate.c | 44 linux/lib/zlib_inflate/inftrees.c | 45 48 files changed, 3655 insertions(+), 102 deletions(-) Index: linux-2.6-debug-latency-tracing.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-latency-tracing.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-debug-latency-tracing.patch 30 Dec 2005 05:26:52 -0000 1.8 +++ linux-2.6-debug-latency-tracing.patch 3 Jan 2006 15:29:58 -0000 1.9 @@ -4749,6 +4749,24 @@ /* Do the rest non-__init'ed, we're now alive */ rest_init(); } + kernel/latency.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +Index: linux-latency-tracing.q/kernel/latency.c +=================================================================== +--- linux-latency-tracing.q.orig/kernel/latency.c ++++ linux-latency-tracing.q/kernel/latency.c +@@ -316,8 +316,8 @@ static void notrace printk_name(unsigned + static unsigned long *worst_stack_bp; + #endif + static DEFINE_RAW_SPINLOCK(worst_stack_lock); +-unsigned long worst_stack_left = THREAD_SIZE; +-static unsigned long worst_stack_printed = THREAD_SIZE; ++unsigned long worst_stack_left = THREAD_SIZE/2; ++static unsigned long worst_stack_printed = THREAD_SIZE/2; + static char worst_stack_comm[TASK_COMM_LEN+1]; + static int worst_stack_pid; + static unsigned long worst_stack_sp; --- linux-2.6.14/kernel/latency.c~ 2005-12-29 21:03:11.000000000 -0500 +++ linux-2.6.14/kernel/latency.c 2005-12-29 21:03:51.000000000 -0500 @@ -24,6 +24,8 @@ From fedora-cvs-commits at redhat.com Tue Jan 3 15:38:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 10:38:48 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1814,1.1815 Message-ID: <200601031538.k03Fcmok022838@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22722 Modified Files: kernel-2.6.spec Log Message: dept of dirty hacks: chop some more time off of 'make prep' Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1814 retrieving revision 1.1815 diff -u -r1.1814 -r1.1815 --- kernel-2.6.spec 3 Jan 2006 10:57:13 -0000 1.1814 +++ kernel-2.6.spec 3 Jan 2006 15:38:44 -0000 1.1815 @@ -587,7 +587,8 @@ else # We already have a vanilla dir. cd kernel-%{kversion} - rm -rf linux-%{kversion} + mv linux-%{kversion} deleteme + rm -rf deleteme & fi cp -rl vanilla linux-%{kversion} cd linux-%{kversion} From fedora-cvs-commits at redhat.com Tue Jan 3 15:41:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 10:41:27 -0500 Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.112,1.113 Message-ID: <200601031541.k03FfRp9023891@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/redhat-artwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23804 Modified Files: redhat-artwork.spec Log Message: - it's 2006, duh Index: redhat-artwork.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- redhat-artwork.spec 3 Jan 2006 15:33:23 -0000 1.112 +++ redhat-artwork.spec 3 Jan 2006 15:41:25 -0000 1.113 @@ -141,7 +141,7 @@ %config /root/.gtkrc %changelog -* Tue Jan 03 2005 John (J5) Palmieri 0.131-2 +* Tue Jan 03 2006 John (J5) Palmieri 0.131-2 - rebuild again to fix problem with cursors not showing up * Fri Dec 09 2005 Jesse Keating From fedora-cvs-commits at redhat.com Tue Jan 3 15:50:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 10:50:35 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1815,1.1816 Message-ID: <200601031550.k03FoZDI006647@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6572 Modified Files: kernel-2.6.spec Log Message: another silly microspeedup Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1815 retrieving revision 1.1816 diff -u -r1.1815 -r1.1816 --- kernel-2.6.spec 3 Jan 2006 15:38:44 -0000 1.1815 +++ kernel-2.6.spec 3 Jan 2006 15:50:32 -0000 1.1816 @@ -946,8 +946,7 @@ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -prep/" Makefile # get rid of unwanted files resulting from patch fuzz -find . -name "*.orig" -exec rm -fv {} \; >/dev/null -find . -name "*~" -exec rm -fv {} \; >/dev/null +find . -name "*.orig" -o -name "*~" -exec rm -fv {} \; >/dev/null & ### ### build From fedora-cvs-commits at redhat.com Tue Jan 3 16:23:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 11:23:13 -0500 Subject: rpms/pam/devel .cvsignore, 1.31, 1.32 pam.spec, 1.100, 1.101 sources, 1.33, 1.34 pam-0.80-console-doc-fix.patch, 1.1, NONE pam-0.99.2.1-loginuid-req-audit.patch, 1.1, NONE Message-ID: <200601031623.k03GNDsb029864@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/pam/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29815 Modified Files: .cvsignore pam.spec sources Removed Files: pam-0.80-console-doc-fix.patch pam-0.99.2.1-loginuid-req-audit.patch Log Message: * Tue Jan 3 2006 Tomas Mraz 0.99.2.1-3 - remove 'initscripts' dependency (#176508) - update pam-redhat modules, merged patches Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pam/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 15 Dec 2005 23:47:42 -0000 1.31 +++ .cvsignore 3 Jan 2006 16:23:10 -0000 1.32 @@ -1,3 +1,3 @@ db-4.3.27.tar.gz Linux-PAM-0.99.2.1.tar.bz2 -pam-redhat-0.99.1-1.tar.bz2 +pam-redhat-0.99.2-1.tar.bz2 Index: pam.spec =================================================================== RCS file: /cvs/dist/rpms/pam/devel/pam.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- pam.spec 16 Dec 2005 15:20:02 -0000 1.100 +++ pam.spec 3 Jan 2006 16:23:10 -0000 1.101 @@ -6,12 +6,12 @@ %define pwdb_version 0.62 %define db_version 4.3.27 %define db_conflicting_version 4.4.0 -%define pam_redhat_version 0.99.1-1 +%define pam_redhat_version 0.99.2-1 Summary: A security tool which provides authentication for applications. Name: pam Version: 0.99.2.1 -Release: 2 +Release: 3 License: GPL or BSD Group: System Environment/Base Source0: ftp.us.kernel.org:/pub/linux/libs/pam/pre/library/Linux-PAM-%{version}.tar.bz2 @@ -27,20 +27,18 @@ Patch28: pam-0.75-sgml2latex.patch Patch34: pam-0.99.2.1-dbpam.patch Patch65: pam-0.99.2.1-audit.patch -Patch66: pam-0.99.2.1-loginuid-req-audit.patch Patch70: pam-0.99.2.1-selinux-nofail.patch Patch72: pam-0.99.2.1-pie.patch -Patch77: pam-0.80-console-doc-fix.patch Patch80: pam-0.99.2.1-selinux-drop-multiple.patch Patch83: pam-0.77-succif-netgroup.patch Patch84: pam-0.99.2.1-lastlog-fixes.patch BuildRoot: %{_tmppath}/%{name}-root -Requires: cracklib, cracklib-dicts >= 2.8, initscripts >= 3.94 +Requires: cracklib, cracklib-dicts >= 2.8 Obsoletes: pamconfig Prereq: grep, mktemp, sed, coreutils, /sbin/ldconfig -BuildPrereq: autoconf, bison, flex, glib2-devel, sed, cracklib, -BuildPrereq: cracklib-dicts >= 2.8 +BuildPrereq: autoconf, bison, flex, glib2-devel, sed +BuildPrereq: cracklib, cracklib-dicts >= 2.8 BuildPrereq: perl, pkgconfig %if %{WITH_AUDIT} BuildPrereq: audit-libs-devel >= 1.0.8 @@ -88,11 +86,9 @@ %patch34 -p1 -b .dbpam %if %{WITH_AUDIT} %patch65 -p1 -b .audit -%patch66 -p1 -b .req-audit %endif %patch70 -p1 -b .nofail %patch72 -p1 -b .pie -%patch77 -p1 -b .console-doc %patch80 -p1 -b .drop-multiple %patch83 -p1 -b .succif-netgroup %patch84 -p0 -b .lastlog-fixes @@ -361,6 +357,10 @@ %{_libdir}/libpam_misc.so %changelog +* Tue Jan 3 2006 Tomas Mraz 0.99.2.1-3 +- remove 'initscripts' dependency (#176508) +- update pam-redhat modules, merged patches + * Fri Dec 16 2005 Tomas Mraz 0.99.2.1-2 - fix dangling symlinks in -devel (#175929) - link libaudit only where necessary Index: sources =================================================================== RCS file: /cvs/dist/rpms/pam/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 15 Dec 2005 23:47:42 -0000 1.33 +++ sources 3 Jan 2006 16:23:10 -0000 1.34 @@ -1,3 +1,3 @@ fcc481d52c3b80e20a328f8c0cb042bd db-4.3.27.tar.gz 9e564161c3a5f36bf0678ef227b2a897 Linux-PAM-0.99.2.1.tar.bz2 -3b7514ae5dd2b8ca5f7543a07d1970c0 pam-redhat-0.99.1-1.tar.bz2 +6feaf6d9f735ced6372c892db71e27a1 pam-redhat-0.99.2-1.tar.bz2 --- pam-0.80-console-doc-fix.patch DELETED --- --- pam-0.99.2.1-loginuid-req-audit.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 3 16:41:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 11:41:30 -0500 Subject: rpms/firefox/devel firefox.spec,1.95,1.96 Message-ID: <200601031641.k03GfU21024529@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24516 Modified Files: firefox.spec Log Message: * Tue Jan 3 2006 Christopher Aillon - 1.5-4 - Looks like we can build ppc64 again. Happy New Year! Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- firefox.spec 16 Dec 2005 16:46:31 -0000 1.95 +++ firefox.spec 3 Jan 2006 16:41:28 -0000 1.96 @@ -1,6 +1,3 @@ -# ppc64 still broken, see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175944 -ExcludeArch: ppc64 - %define indexhtml file:///usr/share/doc/HTML/index.html %define desktop_file_utils_version 0.9 %define nspr_version 4.6 @@ -12,7 +9,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.5 -Release: 3 +Release: 4 URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet @@ -259,6 +256,9 @@ #--------------------------------------------------------------------- %changelog +* Tue Jan 3 2006 Christopher Aillon - 1.5-4 +- Looks like we can build ppc64 again. Happy New Year! + * Fri Dec 16 2005 Christopher Aillon - 1.5-3 - Once again, disable ppc64 because of a new issue. See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175944 From fedora-cvs-commits at redhat.com Tue Jan 3 16:45:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 11:45:47 -0500 Subject: rpms/libsetrans/devel .cvsignore, 1.14, 1.15 libsetrans.spec, 1.22, 1.23 sources, 1.18, 1.19 Message-ID: <200601031645.k03GjlY6028229@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsetrans/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27761 Modified Files: .cvsignore libsetrans.spec sources Log Message: * Mon Jan 3 2006 Dan Walsh 0.1.14-1 - Fix untranslate of ""->s0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 2 Jan 2006 14:17:27 -0000 1.14 +++ .cvsignore 3 Jan 2006 16:45:45 -0000 1.15 @@ -12,3 +12,4 @@ libsetrans-0.1.11.tgz libsetrans-0.1.12.tgz libsetrans-0.1.13.tgz +libsetrans-0.1.14.tgz Index: libsetrans.spec =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/libsetrans.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- libsetrans.spec 2 Jan 2006 14:17:27 -0000 1.22 +++ libsetrans.spec 3 Jan 2006 16:45:45 -0000 1.23 @@ -1,6 +1,6 @@ Summary: SELinux Translation library Name: libsetrans -Version: 0.1.13 +Version: 0.1.14 Release: 1 License: LGPL Group: System Environment/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man8/mcs.8.gz %changelog +* Mon Jan 3 2006 Dan Walsh 0.1.14-1 +- Fix untranslate of ""->s0 + * Mon Jan 2 2006 Dan Walsh 0.1.13-1 - Apply some of Uli fixes and Russell patch to improve performance Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 2 Jan 2006 14:17:27 -0000 1.18 +++ sources 3 Jan 2006 16:45:45 -0000 1.19 @@ -1 +1 @@ -733aafdcd48ad654373bd02e174eed93 libsetrans-0.1.13.tgz +8b5437ee1240be4d0727d630aff1e15b libsetrans-0.1.14.tgz From fedora-cvs-commits at redhat.com Tue Jan 3 16:46:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 11:46:15 -0500 Subject: rpms/thunderbird/devel thunderbird.spec,1.57,1.58 Message-ID: <200601031646.k03GkF68000615@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32680 Modified Files: thunderbird.spec Log Message: * Tue Jan 3 2006 Christopher Aillon - 1.5-0.5.5.rc1 - Looks like we can build on ppc64 again. Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- thunderbird.spec 17 Dec 2005 05:17:48 -0000 1.57 +++ thunderbird.spec 3 Jan 2006 16:46:12 -0000 1.58 @@ -1,6 +1,3 @@ -# ppc64 still broken, see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=175944 -ExcludeArch: ppc64 - %define desktop_file_utils_version 0.9 %define nspr_version 4.6 %define nss_version 3.10 @@ -11,7 +8,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 1.5 -Release: 0.5.4.rc1 +Release: 0.5.5.rc1 Epoch: 0 URL: http://www.mozilla.org/projects/thunderbird/ License: MPL @@ -188,6 +185,9 @@ #=============================================================================== %changelog +* Tue Jan 3 2006 Christopher Aillon - 1.5-0.5.5.rc1 +- Looks like we can build on ppc64 again. + * Fri Dec 16 2005 Christopher Aillon - 1.5-0.5.4.rc1 - Rebuild From fedora-cvs-commits at redhat.com Tue Jan 3 16:51:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 11:51:27 -0500 Subject: rpms/vnc/devel vnc-modular-xorg.patch,1.7,1.8 vnc.spec,1.124,1.125 Message-ID: <200601031651.k03GpRA7003674@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/vnc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3659 Modified Files: vnc-modular-xorg.patch vnc.spec Log Message: * Tue Jan 3 2006 Tim Waugh 4.1.1-33 - Use VNC-provided Xregion (bug #176435). vnc-modular-xorg.patch: vncinstall | 6 +- xc/programs/Xserver/vnc/Xvnc/xvnc.cc | 9 --- xorg-server-1.0.0/configure.ac | 1 xorg-server-1.0.0/hw/Makefile.am | 3 + xorg-server-1.0.0/hw/vnc/Makefile.am | 87 +++++++++++++++++++++++++++++++++++ xorg-server-1.0.0/mi/miinitext.c | 6 ++ 6 files changed, 102 insertions(+), 10 deletions(-) Index: vnc-modular-xorg.patch =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc-modular-xorg.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- vnc-modular-xorg.patch 21 Dec 2005 17:21:01 -0000 1.7 +++ vnc-modular-xorg.patch 3 Jan 2006 16:51:25 -0000 1.8 @@ -47,7 +47,8 @@ + libvnccommon.la \ + ../../../../common/rfb/librfb.a \ + ../../../../common/rdr/librdr.a \ -+ ../../../../common/network/libnetwork.a ++ ../../../../common/network/libnetwork.a \ ++ ../../../../common/Xregion/libXregion.a + +Xvnc_CFLAGS = -DHAVE_DIX_CONFIG_H \ + -DNO_HW_ONLY_EXTS \ @@ -72,7 +73,8 @@ + libvnccommon.la \ + ../../../../common/rfb/librfb.a \ + ../../../../common/rdr/librdr.a \ -+ ../../../../common/network/libnetwork.a ++ ../../../../common/network/libnetwork.a \ ++ ../../../../common/Xregion/libXregion.a +libvnc_la_CXXFLAGS = \ + -I../../../../common \ + -I$(top_srcdir)/hw/xfree86/common \ Index: vnc.spec =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- vnc.spec 3 Jan 2006 13:13:40 -0000 1.124 +++ vnc.spec 3 Jan 2006 16:51:25 -0000 1.125 @@ -5,7 +5,7 @@ Summary: A remote display system. Name: vnc Version: 4.1.1 -Release: 32 +Release: 33 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 @@ -256,7 +256,8 @@ %{_libdir}/xorg/modules/extensions/libvnc.so %changelog -* Tue Jan 3 2006 Tim Waugh +* Tue Jan 3 2006 Tim Waugh 4.1.1-33 +- Use VNC-provided Xregion (bug #176435). - Prevent restorecon error message when not present (bug #176654). * Fri Dec 23 2005 Tim Waugh 4.1.1-32 From fedora-cvs-commits at redhat.com Tue Jan 3 16:53:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 11:53:03 -0500 Subject: rpms/gedit/devel .cvsignore, 1.29, 1.30 gedit.spec, 1.52, 1.53 sources, 1.31, 1.32 Message-ID: <200601031653.k03Gr3Fo003770@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3753 Modified Files: .cvsignore gedit.spec sources Log Message: 2.13.1-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 14 Dec 2005 21:15:54 -0000 1.29 +++ .cvsignore 3 Jan 2006 16:53:01 -0000 1.30 @@ -4,3 +4,4 @@ gedit-2.12.0.tar.bz2 gedit-2.12.1.tar.bz2 gedit-2.13.0.tar.bz2 +gedit-2.13.1.tar.bz2 Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- gedit.spec 21 Dec 2005 16:18:33 -0000 1.52 +++ gedit.spec 3 Jan 2006 16:53:01 -0000 1.53 @@ -14,8 +14,8 @@ Summary: gEdit is a small but powerful text editor for GNOME. Name: gedit -Version: 2.13.0 -Release: 3 +Version: 2.13.1 +Release: 1 Epoch: 1 License: GPL Group: Applications/Editors @@ -64,7 +64,7 @@ Summary: The files needed for developing plug-ins for the gEdit editor. Group: Development/Libraries # pkgconfig -Requires: %{name} = %{epoch}:%{version} +Requires: %{name} = %{epoch}:%{version}-%{release} Requires: gtksourceview-devel Requires: libgnomeprintui22-devel Requires: pygtk2-devel >= %{pygtk_version} @@ -150,6 +150,9 @@ %{_libdir}/pkgconfig/gedit-2.10.pc %changelog +* Tue Jan 3 2005 Matthias Clasen - 1:2.13.1-1 +- Update to 2.13.1 + * Wed Dec 21 2005 Jeremy Katz - 1:2.13.0-3 - fix gedit-devel requirement to include epoch Index: sources =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 14 Dec 2005 21:15:54 -0000 1.31 +++ sources 3 Jan 2006 16:53:01 -0000 1.32 @@ -1 +1 @@ -9882f39c5ee0bec5e545a9459acf9c58 gedit-2.13.0.tar.bz2 +9606f4af2c751a9c1ccca11a17b12a38 gedit-2.13.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 16:53:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 11:53:28 -0500 Subject: rpms/util-linux/FC-4 util-linux-2.12p-ipcs-shmax.patch, NONE, 1.1 util-linux-2.12p-login-hang.patch, NONE, 1.1 util-linux-2.12p-mount-twiceloop.patch, NONE, 1.1 util-linux.spec, 1.88, 1.89 Message-ID: <200601031653.k03GrSUN003807@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv3786 Modified Files: util-linux.spec Added Files: util-linux-2.12p-ipcs-shmax.patch util-linux-2.12p-login-hang.patch util-linux-2.12p-mount-twiceloop.patch Log Message: backport devel patches and fix the mount util-linux-2.12p-ipcs-shmax.patch: ipcs.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) --- NEW FILE util-linux-2.12p-ipcs-shmax.patch --- --- util-linux-2.12p/sys-utils/ipcs.c.shmax 2006-01-03 17:44:06.000000000 +0100 +++ util-linux-2.12p/sys-utils/ipcs.c 2006-01-03 17:44:24.000000000 +0100 @@ -280,8 +280,14 @@ (unsigned long) shminfo.shmmni); printf (_("max seg size (kbytes) = %lu\n"), (unsigned long) (shminfo.shmmax >> 10)); + + /* max shmem = pagesize * shminfo.shmall / 1024 + * + * note: that "shminfo.shmall * getpagesize()" is greater than ULONG_MAX (32bit) + * it means that better is "/" before "*" or use "long long" + */ printf (_("max total shared memory (kbytes) = %lu\n"), - (getpagesize()*((unsigned long) shminfo.shmall))/1024UL); + getpagesize()/1024 * (unsigned long) shminfo.shmall); printf (_("min seg size (bytes) = %lu\n"), (unsigned long) shminfo.shmmin); return; util-linux-2.12p-login-hang.patch: login.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE util-linux-2.12p-login-hang.patch --- --- util-linux-2.12p/login-utils/login.c.hang 2006-01-03 17:40:09.000000000 +0100 +++ util-linux-2.12p/login-utils/login.c 2006-01-03 17:41:03.000000000 +0100 @@ -281,7 +281,8 @@ if (lstat(ttyn, &statbuf) || !S_ISCHR(statbuf.st_mode) - || (statbuf.st_nlink > 1 && strncmp(ttyn, "/dev/", 5))) { + || (statbuf.st_nlink > 1 && strncmp(ttyn, "/dev/", 5)) + || (access(ttyn, R_OK | W_OK) != 0)) { syslog(LOG_ERR, _("FATAL: bad tty")); sleep(1); exit(1); @@ -392,6 +393,7 @@ pid = getpid(); signal(SIGALRM, timedout); + siginterrupt(SIGALRM,1); /* we have to interrupt syscalls like ioclt() */ alarm((unsigned int)timeout); signal(SIGQUIT, SIG_IGN); signal(SIGINT, SIG_IGN); util-linux-2.12p-mount-twiceloop.patch: fstab.c | 21 +++++++++++++++++++++ mount.c | 9 +++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) --- NEW FILE util-linux-2.12p-mount-twiceloop.patch --- --- util-linux-2.12p/mount/fstab.c.twiceloop 2006-01-03 13:02:26.000000000 +0100 +++ util-linux-2.12p/mount/fstab.c 2006-01-03 16:52:42.000000000 +0100 @@ -257,6 +257,27 @@ return (ct == 1); } +/* + * Given the loop file LOOPFILE, and the mount point DIR, check that + * same file is already mounted on same directory + * + * Don't forget there's + * /path/loopfile /path/dir loop=/dev/loop0 + * in mtab for loop devices. + */ +int +is_mounted_same_loopfile(const char *loopfile, const char *dir) { + struct mntentchn *mc, *mc0; + int ct = 0; + + mc0 = mtab_head(); + for (mc = mc0->prev; mc && mc != mc0; mc = mc->prev) + if (streq(mc->m.mnt_fsname, loopfile) && + streq(mc->m.mnt_dir, dir)) + ct++; + return (ct == 1); +} + /* Given the name FILE, try to find the option "loop=FILE" in mtab. */ struct mntentchn * getmntoptfile (const char *file) { --- util-linux-2.12p/mount/mount.c.twiceloop 2006-01-03 16:39:42.000000000 +0100 +++ util-linux-2.12p/mount/mount.c 2006-01-03 17:01:38.000000000 +0100 @@ -671,7 +671,7 @@ static int loop_check(const char **spec, const char **type, int *flags, - int *loop, const char **loopdev, const char **loopfile) { + int *loop, const char **loopdev, const char **loopfile, const char *dir) { int looptype; unsigned long long offset; @@ -709,6 +709,11 @@ } else { int loopro = (*flags & MS_RDONLY); + if (is_mounted_same_loopfile(*loopfile, dir)) { + error(_("mount: %s already mounted on %s"), *loopfile, dir); + return EX_FAIL; + } + if (!*loopdev || !**loopdev) *loopdev = find_unused_loop_device(); if (!*loopdev) @@ -856,7 +861,7 @@ * stale assignments of files to loop devices. Nasty when used for * encryption. */ - res = loop_check(&spec, &types, &flags, &loop, &loopdev, &loopfile); + res = loop_check(&spec, &types, &flags, &loop, &loopdev, &loopfile, node); if (res) goto out; } Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/FC-4/util-linux.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- util-linux.spec 2 Jan 2006 17:02:14 -0000 1.88 +++ util-linux.spec 3 Jan 2006 16:53:25 -0000 1.89 @@ -27,7 +27,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.12p -Release: 9.12 +Release: 9.13 License: distributable Group: System Environment/Base @@ -149,11 +149,17 @@ Patch207: util-linux-2.12p-umount-remount.patch # 155559 - /usr/bin/floppy doesn't work with generic device Patch208: util-linux-2.12p-floppy-generic.patch - # better wide chars usage in the cal command (based on old 'moremisc' patch) Patch209: util-linux-2.12p-cal-wide.patch # 176441: col truncates data Patch210: util-linux-2.12p-col-EILSEQ.patch +# 174111 - mount allows loopback devices to be mounted more than once to the same mount point +Patch211: util-linux-2.12p-mount-twiceloop.patch +# 168436 - login will attempt to run if it has no read/write access to its terminal +# 168434 - login's timeout can fail - needs to call siginterrupt(SIGALRM,1) +Patch212: util-linux-2.12p-login-hang.patch +# 170171 - ipcs -lm always report "max total shared memory (kbytes) = 0" +Patch213: util-linux-2.12p-ipcs-shmax.patch # When adding patches, please make sure that it is easy to find out what bug # the # patch fixes. @@ -251,8 +257,8 @@ %patch151 -p1 %patch153 -p1 -%patch157 -p1 -b .pamstart -%patch159 -p1 -b .console +%patch157 -p1 +%patch159 -p1 %if %{include_raw} %patch160 -p1 @@ -264,15 +270,15 @@ #%patch168 -p1 %patch169 -p1 -%patch170 -p1 -b .nfsv4 +%patch170 -p1 %patch171 -p1 %patch172 -p1 %patch173 -p1 %patch174 -p1 -%patch180 -p1 -b .lastlog +%patch180 -p1 %patch181 -p1 -%patch182 -p1 -b .typo +%patch182 -p1 %patch183 -p1 %patch184 -p1 @@ -283,15 +289,18 @@ %patch189 -p1 %patch200 -p1 %patch201 -p1 -%patch202 -p1 -b .audit -%patch203 -p1 -b .gpt +%patch202 -p1 +%patch203 -p1 %patch204 -p1 %patch205 -p1 %patch206 -p1 %patch207 -p1 -%patch208 -p1 -b .generic +%patch208 -p1 %patch209 -p1 -%patch210 -p1 -b .EILSEQ +%patch210 -p1 +%patch211 -p1 +%patch212 -p1 +%patch213 -p1 %build unset LINGUAS || : @@ -683,6 +692,14 @@ /sbin/losetup %changelog +* Tue Jan 3 2006 Karel Zak 2.12p-9.13 +- fix #174111 - mount allows loopback devices to be mounted more than once to the same mount point +- fix #176441: col truncates data +- fix #168436 - login will attempt to run if it has no read/write access to its terminal +- fix #168434 - login's timeout can fail - needs to call siginterrupt(SIGALRM,1) +- fix #170171 - ipcs -lm always report "max total shared memory (kbytes) = 0" +- better wide chars usage in the cal command (based on old 'moremisc' patch) + * Fri Sep 30 2005 Karel Zak 2.12p-9.12 - fix #155559 - /usr/bin/floppy doesn't work with generic device From fedora-cvs-commits at redhat.com Tue Jan 3 16:53:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 11:53:37 -0500 Subject: rpms/gedit/devel gedit.spec,1.53,1.54 Message-ID: <200601031653.k03GrbhS003845@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3821 Modified Files: gedit.spec Log Message: Fix changelog Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- gedit.spec 3 Jan 2006 16:53:01 -0000 1.53 +++ gedit.spec 3 Jan 2006 16:53:35 -0000 1.54 @@ -150,7 +150,7 @@ %{_libdir}/pkgconfig/gedit-2.10.pc %changelog -* Tue Jan 3 2005 Matthias Clasen - 1:2.13.1-1 +* Tue Jan 3 2006 Matthias Clasen - 1:2.13.1-1 - Update to 2.13.1 * Wed Dec 21 2005 Jeremy Katz - 1:2.13.0-3 From fedora-cvs-commits at redhat.com Tue Jan 3 16:56:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 11:56:56 -0500 Subject: rpms/gnome-desktop/devel .cvsignore, 1.22, 1.23 gnome-desktop.spec, 1.42, 1.43 sources, 1.22, 1.23 Message-ID: <200601031656.k03Guu7c013227@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13170 Modified Files: .cvsignore gnome-desktop.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 15 Dec 2005 04:57:59 -0000 1.22 +++ .cvsignore 3 Jan 2006 16:56:53 -0000 1.23 @@ -10,3 +10,4 @@ gnome-desktop-2.12.1.tar.bz2 gnome-desktop-2.13.2.tar.bz2 gnome-desktop-2.13.3.tar.bz2 +gnome-desktop-2.13.4.tar.bz2 Index: gnome-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- gnome-desktop.spec 15 Dec 2005 04:57:59 -0000 1.42 +++ gnome-desktop.spec 3 Jan 2006 16:56:53 -0000 1.43 @@ -10,7 +10,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc. Name: gnome-desktop -Version: 2.13.3 +Version: 2.13.4 Release: 1 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2 @@ -132,6 +132,9 @@ #%{_datadir}/gtk-doc %changelog +* Tue Jan 03 2005 Matthias Clasen - 2.13.4-1 +- Update to 2.13.4 + * Wed Dec 14 2005 Matthias Clasen - 2.13.3-1 - Update to 2.13.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 15 Dec 2005 04:57:59 -0000 1.22 +++ sources 3 Jan 2006 16:56:53 -0000 1.23 @@ -1 +1 @@ -c09b1e51816e0742021138de5862257b gnome-desktop-2.13.3.tar.bz2 +993beb1396a7a8a1629343cc26a2f1a9 gnome-desktop-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 16:57:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 11:57:26 -0500 Subject: rpms/gnome-desktop/devel gnome-desktop.spec,1.43,1.44 Message-ID: <200601031657.k03GvQXD013495@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13437 Modified Files: gnome-desktop.spec Log Message: 2.13.4 Index: gnome-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- gnome-desktop.spec 3 Jan 2006 16:56:53 -0000 1.43 +++ gnome-desktop.spec 3 Jan 2006 16:57:24 -0000 1.44 @@ -132,7 +132,7 @@ #%{_datadir}/gtk-doc %changelog -* Tue Jan 03 2005 Matthias Clasen - 2.13.4-1 +* Tue Jan 03 2006 Matthias Clasen - 2.13.4-1 - Update to 2.13.4 * Wed Dec 14 2005 Matthias Clasen - 2.13.3-1 From fedora-cvs-commits at redhat.com Tue Jan 3 17:04:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 12:04:48 -0500 Subject: rpms/libgnomecanvas/devel .cvsignore, 1.19, 1.20 libgnomecanvas.spec, 1.24, 1.25 sources, 1.19, 1.20 Message-ID: <200601031704.k03H4mCP015038@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnomecanvas/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15006 Modified Files: .cvsignore libgnomecanvas.spec sources Log Message: 2.13.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnomecanvas/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 7 Sep 2005 17:28:12 -0000 1.19 +++ .cvsignore 3 Jan 2006 17:04:26 -0000 1.20 @@ -5,3 +5,4 @@ libgnomecanvas-2.10.0.tar.bz2 libgnomecanvas-2.11.1.tar.bz2 libgnomecanvas-2.12.0.tar.bz2 +libgnomecanvas-2.13.0.tar.bz2 Index: libgnomecanvas.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomecanvas/devel/libgnomecanvas.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- libgnomecanvas.spec 13 Dec 2005 21:30:10 -0000 1.24 +++ libgnomecanvas.spec 3 Jan 2006 17:04:36 -0000 1.25 @@ -7,8 +7,8 @@ Summary: GnomeCanvas widget Name: libgnomecanvas -Version: 2.12.0 -Release: 1.2 +Version: 2.13.0 +Release: 1 URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -93,6 +93,9 @@ %{_datadir}/gtk-doc %changelog +* Tue Jan 03 2006 Matthias Clasen - 2.13.0-1 +- Update to 2.13.0 + * Tue Dec 13 2005 Jeremy Katz - 2.12.0-1.2 - rebuild with -O1 to workaround (#175669) Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnomecanvas/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 7 Sep 2005 17:28:12 -0000 1.19 +++ sources 3 Jan 2006 17:04:36 -0000 1.20 @@ -1 +1 @@ -62c0edd3d27803d341662fd9088b2d9b libgnomecanvas-2.12.0.tar.bz2 +3c0201810e916b97ba3533b13f3fc4e8 libgnomecanvas-2.13.0.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 17:08:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 12:08:51 -0500 Subject: rpms/gedit/devel gedit.spec,1.54,1.55 Message-ID: <200601031708.k03H8oaL016122@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16042 Modified Files: gedit.spec Log Message: Disable scrollkeeper Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- gedit.spec 3 Jan 2006 16:53:35 -0000 1.54 +++ gedit.spec 3 Jan 2006 17:08:48 -0000 1.55 @@ -82,7 +82,7 @@ #%patch6 -p1 -b .opensize %build -%configure +%configure --disable-scrollkeeper make %install @@ -152,6 +152,7 @@ %changelog * Tue Jan 3 2006 Matthias Clasen - 1:2.13.1-1 - Update to 2.13.1 +- Disable scrollkeeper * Wed Dec 21 2005 Jeremy Katz - 1:2.13.0-3 - fix gedit-devel requirement to include epoch From fedora-cvs-commits at redhat.com Tue Jan 3 17:11:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 12:11:51 -0500 Subject: rpms/libwnck/devel .cvsignore, 1.25, 1.26 libwnck.spec, 1.36, 1.37 sources, 1.25, 1.26 Message-ID: <200601031711.k03HBpYe017536@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libwnck/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17489 Modified Files: .cvsignore libwnck.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 14 Dec 2005 21:28:58 -0000 1.25 +++ .cvsignore 3 Jan 2006 17:11:48 -0000 1.26 @@ -3,3 +3,4 @@ libwnck-2.12.1.tar.bz2 libwnck-2.13.2.tar.bz2 libwnck-2.13.3.tar.bz2 +libwnck-2.13.4.tar.bz2 Index: libwnck.spec =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- libwnck.spec 14 Dec 2005 21:28:58 -0000 1.36 +++ libwnck.spec 3 Jan 2006 17:11:48 -0000 1.37 @@ -5,7 +5,7 @@ Summary: Window Navigator Construction Kit Name: libwnck -Version: 2.13.3 +Version: 2.13.4 Release: 1 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/ Source0: %{name}-%{version}.tar.bz2 @@ -87,6 +87,9 @@ %{_datadir}/gtk-doc/html/libwnck %changelog +* Tue Jan 03 2006 Matthias Clasen - 2.13.4-1 +- Update to 2.13.4 + * Wed Dec 14 2005 Matthias Clasen - 2.13.3-1 - Update to 2.13.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 14 Dec 2005 21:28:58 -0000 1.25 +++ sources 3 Jan 2006 17:11:48 -0000 1.26 @@ -1 +1 @@ -b51ba3719b1b86a61700cd69e6dc1b88 libwnck-2.13.3.tar.bz2 +d8f1ade2b3b39eaebf834f74c3784705 libwnck-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 17:19:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 12:19:03 -0500 Subject: rpms/gtksourceview/devel .cvsignore, 1.15, 1.16 gtksourceview.spec, 1.21, 1.22 sources, 1.14, 1.15 Message-ID: <200601031719.k03HJ3LD032048@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtksourceview/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31998 Modified Files: .cvsignore gtksourceview.spec sources Log Message: 1.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 14 Dec 2005 21:38:35 -0000 1.15 +++ .cvsignore 3 Jan 2006 17:19:01 -0000 1.16 @@ -3,3 +3,4 @@ gtksourceview-1.4.2.tar.bz2 gtksourceview-1.5.1.tar.bz2 gtksourceview-1.5.2.tar.bz2 +gtksourceview-1.5.3.tar.bz2 Index: gtksourceview.spec =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gtksourceview.spec 15 Dec 2005 17:40:45 -0000 1.21 +++ gtksourceview.spec 3 Jan 2006 17:19:01 -0000 1.22 @@ -3,7 +3,7 @@ Summary: A library for viewing source files Name: gtksourceview -Version: 1.5.2 +Version: 1.5.3 Release: 1 License: LGPL Group: System Environment/Libraries @@ -71,6 +71,9 @@ %{_libdir}/*.so %changelog +* Tue Jan 03 2006 Matthias Clasen +- Update to 1.5.3 + * Wed Dec 14 2005 Matthias Clsaen - Update to 1.5.2 - Remove upstreamed patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 14 Dec 2005 21:38:35 -0000 1.14 +++ sources 3 Jan 2006 17:19:01 -0000 1.15 @@ -1 +1 @@ -ac9d8de1d25f6c4a945a128829b73165 gtksourceview-1.5.2.tar.bz2 +4298c443517e006fa349af7f9e06d4f3 gtksourceview-1.5.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 17:21:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 12:21:13 -0500 Subject: rpms/selinux-policy/devel policy-20051208.patch, 1.34, 1.35 selinux-policy.spec, 1.70, 1.71 Message-ID: <200601031721.k03HLDPR000651@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv620 Modified Files: policy-20051208.patch selinux-policy.spec Log Message: * Tue Jan 3 2006 Dan Walsh 2.1.6-23 - Allow load_policy to read /etc/mtab policy-20051208.patch: Makefile | 2 Rules.modular | 10 config/appconfig-strict-mcs/default_type | 6 config/appconfig-strict-mls/default_type | 7 config/appconfig-strict-mls/initrc_context | 2 config/appconfig-targeted-mcs/default_type | 2 config/appconfig-targeted-mls/default_type | 2 config/appconfig-targeted-mls/initrc_context | 2 man/man8/ftpd_selinux.8 | 56 ++++ man/man8/httpd_selinux.8 | 123 ++++++++ man/man8/kerberos_selinux.8 | 31 ++ man/man8/named_selinux.8 | 29 ++ man/man8/nfs_selinux.8 | 30 ++ man/man8/nis_selinux.8 | 1 man/man8/rsync_selinux.8 | 41 ++ man/man8/samba_selinux.8 | 60 ++++ man/man8/ypbind_selinux.8 | 19 + policy/global_tunables | 3 policy/mcs | 321 ++++------------------- policy/mls | 371 +++++---------------------- policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 9 policy/modules/admin/logrotate.te | 4 policy/modules/admin/rpm.fc | 1 policy/modules/admin/rpm.te | 19 - policy/modules/admin/tmpreaper.te | 3 policy/modules/admin/usermanage.te | 15 - policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 + policy/modules/apps/java.te | 25 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.te | 6 policy/modules/kernel/corenetwork.te.in | 12 policy/modules/kernel/devices.fc | 9 policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.fc | 27 + policy/modules/kernel/files.if | 17 + policy/modules/kernel/kernel.if | 3 policy/modules/kernel/kernel.te | 30 +- policy/modules/kernel/mls.te | 9 policy/modules/kernel/selinux.te | 2 policy/modules/kernel/storage.fc | 46 +-- policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 9 policy/modules/services/bind.if | 19 + policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 3 policy/modules/services/cups.te | 7 policy/modules/services/cvs.fc | 2 policy/modules/services/cvs.te | 6 policy/modules/services/dbus.te | 1 policy/modules/services/dovecot.te | 2 policy/modules/services/hal.te | 4 policy/modules/services/ldap.te | 4 policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 103 +++++++ policy/modules/services/mta.te | 13 policy/modules/services/ppp.te | 4 policy/modules/services/prelink.fc | 7 policy/modules/services/prelink.if | 39 ++ policy/modules/services/prelink.te | 64 ++++ policy/modules/services/remotelogin.te | 1 policy/modules/services/samba.if | 1 policy/modules/services/sasl.te | 8 policy/modules/services/sendmail.te | 36 -- policy/modules/services/ssh.te | 10 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 12 policy/modules/system/authlogin.te | 1 policy/modules/system/getty.te | 3 policy/modules/system/hostname.if | 15 + policy/modules/system/hostname.te | 37 -- policy/modules/system/init.if | 14 + policy/modules/system/init.te | 22 + policy/modules/system/iptables.te | 2 policy/modules/system/libraries.fc | 8 policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 2 policy/modules/system/logging.fc | 7 policy/modules/system/logging.if | 21 + policy/modules/system/logging.te | 5 policy/modules/system/lvm.te | 2 policy/modules/system/mount.te | 2 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 11 policy/modules/system/udev.fc | 1 policy/modules/system/udev.te | 4 policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.te | 9 policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 27 + policy/modules/system/userdomain.te | 16 + policy/users | 8 99 files changed, 1329 insertions(+), 723 deletions(-) Index: policy-20051208.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20051208.patch,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- policy-20051208.patch 2 Jan 2006 19:56:17 -0000 1.34 +++ policy-20051208.patch 3 Jan 2006 17:21:11 -0000 1.35 @@ -3203,8 +3203,16 @@ # /root diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.6/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.6/policy/modules/system/selinuxutil.te 2006-01-02 12:24:12.000000000 -0500 -@@ -198,7 +198,6 @@ ++++ serefpolicy-2.1.6/policy/modules/system/selinuxutil.te 2006-01-03 12:20:18.000000000 -0500 +@@ -182,6 +182,7 @@ + + # for mcs.conf + files_read_etc_files(load_policy_t) ++files_read_etc_runtime_files(load_policy_t) + + libs_use_ld_so(load_policy_t) + libs_use_shared_libs(load_policy_t) +@@ -198,7 +199,6 @@ # cjp: temporary hack to cover # up stray file descriptors. dontaudit load_policy_t selinux_config_t:file write; @@ -3212,7 +3220,7 @@ ######################################## # -@@ -217,7 +216,8 @@ +@@ -217,7 +217,8 @@ allow newrole_t self:msg { send receive }; allow newrole_t self:unix_dgram_socket sendto; allow newrole_t self:unix_stream_socket { create_stream_socket_perms connectto }; @@ -3222,7 +3230,7 @@ allow newrole_t { selinux_config_t default_context_t }:dir r_dir_perms; allow newrole_t { selinux_config_t default_context_t }:file r_file_perms; -@@ -377,6 +377,10 @@ +@@ -377,6 +378,10 @@ udev_dontaudit_rw_unix_dgram_socket(restorecon_t) ') @@ -3233,7 +3241,7 @@ optional_policy(`hotplug',` hotplug_use_fd(restorecon_t) ') -@@ -407,8 +411,10 @@ +@@ -407,8 +412,10 @@ ifdef(`targeted_policy',`',` allow run_init_t self:process setexec; allow run_init_t self:capability setuid; Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- selinux-policy.spec 2 Jan 2006 19:56:17 -0000 1.70 +++ selinux-policy.spec 3 Jan 2006 17:21:11 -0000 1.71 @@ -7,7 +7,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.1.6 -Release: 22 +Release: 23 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -258,6 +258,9 @@ %endif %changelog +* Tue Jan 3 2006 Dan Walsh 2.1.6-23 +- Allow load_policy to read /etc/mtab + * Mon Jan 2 2006 Dan Walsh 2.1.6-22 - Fix dovecot to allow dovecot_auth to look at /tmp From fedora-cvs-commits at redhat.com Tue Jan 3 17:23:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 12:23:56 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch, NONE, 1.1 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.3, 1.4 openoffice.org.spec, 1.600, 1.601 Message-ID: <200601031723.k03HNuRF001982@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1951 Modified Files: openoffice.org-1.9.129.ooo54603.fontconfig.patch openoffice.org.spec Added Files: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch Log Message: rh#176779# / ooo#59997# default writer bullets changed, but one not in opensymbol openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch: source/core/doc/number.cxx | 0 sw/source/core/doc/number.cxx | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch --- Index: source/core/doc/number.cxx =================================================================== RCS file: /cvs/sw/sw/source/core/doc/number.cxx,v retrieving revision 1.32 diff -u -p -u -r1.32 number.cxx --- openoffice.org.orig/sw/source/core/doc/number.cxx 8 Nov 2005 17:17:38 -0000 1.32 +++ openoffice.org/sw/source/core/doc/number.cxx 3 Jan 2006 17:19:09 -0000 @@ -986,8 +986,8 @@ void SwNumRule::Indent(short nAmount, in sal_Unicode GetBulletChar(BYTE nLevel) { static sal_Unicode nLevelChars[MAXLEVEL] = - { 0x25cf, 0x25cb, 0x25a0, 0x25cf, 0x25cb, - 0x25a0, 0x25cf, 0x25cb, 0x25a0, 0x25cf }; + { 0x25cf, 0xe572, 0x25a0, 0x25cf, 0xe572, + 0x25a0, 0x25cf, 0xe572, 0x25a0, 0x25cf }; if (nLevel > MAXLEVEL) nLevel = MAXLEVEL; openoffice.org-1.9.129.ooo54603.fontconfig.patch: fontmanager/fontcache.cxx | 2 fontmanager/fontmanager.cxx | 9 inc/psprint/fontmanager.hxx | 0 psprint/fontmanager.hxx | 13 - psprint/source/fontmanager/fontconfig.cxx | 269 ++++++++++++++++++----- source/fontmanager/fontcache.cxx | 0 source/fontmanager/fontconfig.cxx | 0 source/fontmanager/fontmanager.cxx | 0 vcl/inc/outdev.h | 3 vcl/inc/outfont.hxx | 15 + vcl/source/gdi/outdev3.cxx | 338 +++++++++++++++++++++--------- vcl/source/window/window.cxx | 5 vcl/util/makefile.mk | 2 13 files changed, 487 insertions(+), 169 deletions(-) Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openoffice.org-1.9.129.ooo54603.fontconfig.patch 9 Nov 2005 09:58:21 -0000 1.3 +++ openoffice.org-1.9.129.ooo54603.fontconfig.patch 3 Jan 2006 17:23:53 -0000 1.4 @@ -365,7 +365,7 @@ - fprintf( stderr, "GlyphFallbackFont[%d] (quality=%05d): \"%s\"\n", - i, pFont->GetMinQuality(), aFontName.GetBuffer() ); + ByteString l( aSelData.maSearchName, RTL_TEXTENCODING_UTF8 ); -+ fprintf (stderr, "--- Couldn't get FontFamily for '%s'\n", l.GetBuffer()); ++ //fprintf (stderr, "--- Couldn't get FontFamily for '%s'\n", l.GetBuffer()); } -#endif - Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.600 retrieving revision 1.601 diff -u -r1.600 -r1.601 --- openoffice.org.spec 23 Dec 2005 10:47:35 -0000 1.600 +++ openoffice.org.spec 3 Jan 2006 17:23:53 -0000 1.601 @@ -1,6 +1,6 @@ %define oootag OOA680 %define ooomilestone 1 -%define rh_rpm_release 3 +%define rh_rpm_release 4 %define build_fc5 1 %define build_fc4 0 @@ -214,6 +214,7 @@ Patch48: openoffice.org-2.0.1.ooo59537.config_office.nss.patch Patch49: openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch Patch50: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch +Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -880,6 +881,7 @@ %patch48 -p1 -b .ooo59537.config_office.nss.patch %patch49 -p1 -b .ooo59666.vcl.animatedtheme.patch %patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch +%patch51 -p1 -b .ooo59997.sw.defaultbullets.patch %if %{includingexternals} #start ludicrous workaround @@ -3338,6 +3340,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Thu Dec 22 2005 Caolan McNamara - 1:2.0.1.1-4 +- add openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch for rh#176779# + * Thu Dec 22 2005 Caolan McNamara - 1:2.0.1.1-3 - gcc#25426# fixed + reenabled workspace.jaxpapi.patch From fedora-cvs-commits at redhat.com Tue Jan 3 17:50:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 12:50:24 -0500 Subject: rpms/util-linux/devel util-linux-2.12p-cal-wide.patch, NONE, 1.1 util-linux-2.12p-col-EILSEQ.patch, NONE, 1.1 util-linux-2.13-mount-twiceloop.patch, NONE, 1.1 util-linux-2.13-audit-hwclock.patch, 1.3, 1.4 util-linux.spec, 1.101, 1.102 Message-ID: <200601031750.k03HoO6a023283@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/util-linux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23220 Modified Files: util-linux-2.13-audit-hwclock.patch util-linux.spec Added Files: util-linux-2.12p-cal-wide.patch util-linux-2.12p-col-EILSEQ.patch util-linux-2.13-mount-twiceloop.patch Log Message: col and cal wide chars fix, 'mount -o loop' fix util-linux-2.12p-cal-wide.patch: cal.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) --- NEW FILE util-linux-2.12p-cal-wide.patch --- --- util-linux-2.12p/misc-utils/cal.c.wide 2004-12-05 20:20:36.000000000 +0100 +++ util-linux-2.12p/misc-utils/cal.c 2006-01-02 15:13:50.000000000 +0100 @@ -368,7 +368,7 @@ int i, wd; #ifdef ENABLE_WIDECHAR wchar_t day_headings_wc[22],j_day_headings_wc[29]; - wchar_t wd_wc[10]; + char *cur_dh = day_headings, *cur_j_dh = j_day_headings; #endif strcpy(day_headings,""); @@ -385,30 +385,25 @@ #endif for(i = 0 ; i < 7 ; i++ ) { + ssize_t space_left; wd = (i + week1stday) % 7; #ifdef ENABLE_WIDECHAR - mbstowcs(wd_wc,weekday(wd),10); - if (wcswidth(wd_wc,10) < 3) - wcscat(j_day_headings_wc,L" "); - if (wcswidth(wd_wc,10) < 2) { - wcscat(day_headings_wc, L" "); - wcscat(j_day_headings_wc, L" "); - } - wcsncat(day_headings_wc,wd_wc,2); - wcsncat(j_day_headings_wc,wd_wc,3); - wcscat(day_headings_wc, L" "); - wcscat(j_day_headings_wc, L" "); + swprintf(day_headings_wc, sizeof(day_headings_wc)/sizeof(day_headings_wc[0]), + L"%1.2s ", weekday(wd)); + swprintf(j_day_headings_wc, sizeof(j_day_headings_wc)/sizeof(j_day_headings_wc[0]), + L"%3.3s ", weekday(wd)); + space_left = sizeof(day_headings)-(cur_dh-day_headings); + if(space_left <= 0) break; + cur_dh += wcstombs(cur_dh,day_headings_wc, space_left); + space_left = sizeof(j_day_headings)-(cur_j_dh-j_day_headings); + if(space_left <= 0) break; + cur_j_dh += wcstombs(cur_j_dh,j_day_headings_wc, space_left); #else sprintf(eos(day_headings), "%2.2s ", weekday(wd)); sprintf(eos(j_day_headings), "%3.3s ", weekday(wd)); #endif } -#ifdef ENABLE_WIDECHAR - wcstombs(day_headings,day_headings_wc,sizeof(day_headings)); - wcstombs(j_day_headings,j_day_headings_wc,sizeof(j_day_headings)); -#endif - trim_trailing_spaces(day_headings); trim_trailing_spaces(j_day_headings); #undef weekday util-linux-2.12p-col-EILSEQ.patch: col.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) --- NEW FILE util-linux-2.12p-col-EILSEQ.patch --- --- util-linux-2.12p/text-utils/col.c.EILSEQ 2002-03-09 00:05:12.000000000 +0100 +++ util-linux-2.12p/text-utils/col.c 2006-01-02 18:00:06.000000000 +0100 @@ -128,6 +128,7 @@ int this_line; /* line l points to */ int nflushd_lines; /* number of lines that were flushed */ int adjust, opt, warned; + int ret = 0; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); @@ -175,8 +176,15 @@ cur_line = max_line = nflushd_lines = this_line = 0; cur_set = last_set = CS_NORMAL; lines = l = alloc_line(); - - while ((ch = getwchar()) != WEOF) { + + while (feof(stdin)==0) { + errno = 0; + if ((ch = getwchar()) == WEOF) { + if (errno==EILSEQ) + perror("col"); + ret = 1; + break; + } if (!iswgraph(ch)) { switch (ch) { case BS: /* can't go back further */ @@ -332,7 +340,7 @@ flush_blanks(); if (ferror(stdout) || fclose(stdout)) return 1; - return 0; + return ret; } void flush_lines(int nflush) util-linux-2.13-mount-twiceloop.patch: fstab.c | 21 +++++++++++++++++++++ mount.c | 9 +++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) --- NEW FILE util-linux-2.13-mount-twiceloop.patch --- --- util-linux-2.13-pre6/mount/fstab.c.twiceloop 2006-01-03 18:35:05.000000000 +0100 +++ util-linux-2.13-pre6/mount/fstab.c 2006-01-03 18:37:44.000000000 +0100 @@ -254,6 +254,27 @@ return (ct == 1); } +/* + * Given the loop file LOOPFILE, and the mount point DIR, check that + * same file is already mounted on same directory + * + * Don't forget there's + * /path/loopfile /path/dir loop=/dev/loop0 + * in mtab for loop devices. + */ +int +is_mounted_same_loopfile(const char *loopfile, const char *dir) { + struct mntentchn *mc, *mc0; + int ct = 0; + + mc0 = mtab_head(); + for (mc = mc0->prev; mc && mc != mc0; mc = mc->prev) + if (streq(mc->m.mnt_fsname, loopfile) && + streq(mc->m.mnt_dir, dir)) + ct++; + return (ct == 1); +} + /* Given the name FILE, try to find the option "loop=FILE" in mtab. */ struct mntentchn * getmntoptfile (const char *file) { --- util-linux-2.13-pre6/mount/mount.c.twiceloop 2006-01-03 18:35:06.000000000 +0100 +++ util-linux-2.13-pre6/mount/mount.c 2006-01-03 18:37:44.000000000 +0100 @@ -671,7 +671,7 @@ static int loop_check(const char **spec, const char **type, int *flags, - int *loop, const char **loopdev, const char **loopfile) { + int *loop, const char **loopdev, const char **loopfile, const char *dir) { int looptype; unsigned long long offset; @@ -709,6 +709,11 @@ } else { int loopro = (*flags & MS_RDONLY); + if (is_mounted_same_loopfile(*loopfile, dir)) { + error(_("mount: %s already mounted on %s"), *loopfile, dir); + return EX_FAIL; + } + if (!*loopdev || !**loopdev) *loopdev = find_unused_loop_device(); if (!*loopdev) @@ -856,7 +861,7 @@ * stale assignments of files to loop devices. Nasty when used for * encryption. */ - res = loop_check(&spec, &types, &flags, &loop, &loopdev, &loopfile); + res = loop_check(&spec, &types, &flags, &loop, &loopdev, &loopfile, node); if (res) goto out; } util-linux-2.13-audit-hwclock.patch: Makefile.am | 3 ++- audit.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ audit.h | 34 ++++++++++++++++++++++++++++++++++ clock.h | 7 ++++++- hwclock.c | 40 ++++++++++++++++++++++++++++++---------- kd.c | 5 +++-- rtc.c | 7 ++++--- 7 files changed, 129 insertions(+), 17 deletions(-) Index: util-linux-2.13-audit-hwclock.patch =================================================================== RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.13-audit-hwclock.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- util-linux-2.13-audit-hwclock.patch 25 Oct 2005 22:07:29 -0000 1.3 +++ util-linux-2.13-audit-hwclock.patch 3 Jan 2006 17:50:20 -0000 1.4 @@ -46,7 +46,7 @@ +{ + if (audit_this) { + audit_log_user_message(audit_fd, AUDIT_USYS_CONFIG, -+ "changing system time", NULL, NULL, NULL, status); ++ "changing system time", NULL, NULL, NULL, status ? 0 : 1); + close(audit_fd); + } + exit(status); Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- util-linux.spec 12 Dec 2005 16:28:43 -0000 1.101 +++ util-linux.spec 3 Jan 2006 17:50:20 -0000 1.102 @@ -25,7 +25,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.13 -Release: 0.12 +Release: 0.13 License: distributable Group: System Environment/Base @@ -161,7 +161,12 @@ Patch218: util-linux-2.13-cramfs-zerofiles.patch # 172203 - mount man page in RHEL4 lacks any info on cifs mount options Patch219: util-linux-2.12a-mount-man-cifs.patch - +# better wide chars usage in the cal command (based on the old 'moremisc' patch) +Patch220: util-linux-2.12p-cal-wide.patch +# 176441: col truncates data +Patch221: util-linux-2.12p-col-EILSEQ.patch +# 174111 - mount allows loopback devices to be mounted more than once to the same mount point +Patch222: util-linux-2.13-mount-twiceloop.patch # When adding patches, please make sure that it is easy to find out what bug # the # patch fixes. @@ -233,6 +238,9 @@ %patch217 -p1 %patch218 -p1 %patch219 -p1 +%patch220 -p1 +%patch221 -p1 +%patch222 -p1 %build unset LINGUAS || : @@ -616,6 +624,12 @@ /sbin/losetup %changelog +* Tue Jan 3 2006 Karel Zak 2.13-0.13 +- fix #174676 - hwclock audit return code mismatch +- fix #176441: col truncates data +- fix #174111 - mount allows loopback devices to be mounted more than once to the same mount point +- better wide chars usage in the cal command (based on the old 'moremisc' patch) + * Mon Dec 12 2005 Karel Zak 2.13-0.12 - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 18:23:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 13:23:19 -0500 Subject: rpms/selinux-policy/devel selinux-policy.spec,1.71,1.72 Message-ID: <200601031823.k03INJSj014274@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14253 Modified Files: selinux-policy.spec Log Message: * Tue Jan 3 2006 Dan Walsh 2.1.6-24 - Fix "libsemanage.parse_module_headers: Data did not represent a module." problem Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- selinux-policy.spec 3 Jan 2006 17:21:11 -0000 1.71 +++ selinux-policy.spec 3 Jan 2006 18:23:17 -0000 1.72 @@ -7,7 +7,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.1.6 -Release: 23 +Release: 24 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -114,7 +114,7 @@ %define rebuildpolicy() \ semodule -b /usr/share/selinux/%1/base.pp -s %1 \ -for file in $(ls /usr/share/selinux/%1 | grep -v base.pp) \ +for file in $(ls /usr/share/selinux/%1 | grep -v -e base.pp -e enableaudit.pp ) \ do \ semodule -i /usr/share/selinux/%1/$file -s %1;\ done; \ @@ -258,6 +258,9 @@ %endif %changelog +* Tue Jan 3 2006 Dan Walsh 2.1.6-24 +- Fix "libsemanage.parse_module_headers: Data did not represent a module." problem + * Tue Jan 3 2006 Dan Walsh 2.1.6-23 - Allow load_policy to read /etc/mtab From fedora-cvs-commits at redhat.com Tue Jan 3 18:33:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 13:33:17 -0500 Subject: rpms/libgtop2/devel .cvsignore, 1.20, 1.21 libgtop2.spec, 1.26, 1.27 sources, 1.20, 1.21 Message-ID: <200601031833.k03IXHFp008369@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgtop2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8355 Modified Files: .cvsignore libgtop2.spec sources Log Message: 2.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 15 Dec 2005 19:13:09 -0000 1.20 +++ .cvsignore 3 Jan 2006 18:33:14 -0000 1.21 @@ -12,3 +12,4 @@ libgtop-2.12.2.tar.bz2 libgtop-2.13.0.tar.bz2 libgtop-2.13.1.tar.bz2 +libgtop-2.13.2.tar.bz2 Index: libgtop2.spec =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libgtop2.spec 15 Dec 2005 19:13:09 -0000 1.26 +++ libgtop2.spec 3 Jan 2006 18:33:14 -0000 1.27 @@ -6,7 +6,7 @@ Name: libgtop2 Summary: libgtop library (version 2) -Version: 2.13.1 +Version: 2.13.2 Release: 1 License: GPL URL: ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.0 @@ -83,6 +83,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jan 03 2006 Matthias Clasen +- Update to 2.13.2 + * Thu Dec 15 2005 Matthias Clasen - Update to 2.13.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 15 Dec 2005 19:13:09 -0000 1.20 +++ sources 3 Jan 2006 18:33:14 -0000 1.21 @@ -1 +1 @@ -a4113c05ff5f3ac32c2e02fefc30f949 libgtop-2.13.1.tar.bz2 +a6f10cb2ac8d377bc8cf84dae5d89e8b libgtop-2.13.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 18:36:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 13:36:26 -0500 Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.21, 1.22 gnome-system-monitor.spec, 1.37, 1.38 sources, 1.21, 1.22 Message-ID: <200601031836.k03IaQgS008488@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-system-monitor/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8473 Modified Files: .cvsignore gnome-system-monitor.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 15 Dec 2005 05:48:12 -0000 1.21 +++ .cvsignore 3 Jan 2006 18:36:24 -0000 1.22 @@ -3,3 +3,4 @@ gnome-system-monitor-2.12.1.tar.bz2 gnome-system-monitor-2.13.2.tar.bz2 gnome-system-monitor-2.13.3.tar.bz2 +gnome-system-monitor-2.13.4.tar.bz2 Index: gnome-system-monitor.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- gnome-system-monitor.spec 16 Dec 2005 16:09:16 -0000 1.37 +++ gnome-system-monitor.spec 3 Jan 2006 18:36:24 -0000 1.38 @@ -10,8 +10,8 @@ Summary: Simple process monitor Name: gnome-system-monitor -Version: 2.13.3 -Release: 2 +Version: 2.13.4 +Release: 1 License: GPL Group: Applications/System Source: http://download.gnome.org/GNOME/pre-gnome2/sources/gnome-system-monitor/gnome-system-monitor-%{version}.tar.bz2 @@ -80,6 +80,9 @@ %{_datadir}/omf %changelog +* Tue Jan 03 2006 Matthias Clasen 2.13.4-1 +- Update to 2.13.4 + * Fri Dec 16 2005 Matthias Clasen 2.13.3-2 - Rebuild against the new libgtop Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 15 Dec 2005 05:48:12 -0000 1.21 +++ sources 3 Jan 2006 18:36:24 -0000 1.22 @@ -1 +1 @@ -5c8f35d9d1207c8282018040d97f9664 gnome-system-monitor-2.13.3.tar.bz2 +ddfdf81aed7593ba5d2bc5d0a273af22 gnome-system-monitor-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 18:48:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 13:48:22 -0500 Subject: rpms/metacity/devel .cvsignore, 1.25, 1.26 metacity.spec, 1.45, 1.46 sources, 1.25, 1.26 Message-ID: <200601031848.k03ImMbZ019958@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/metacity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19943 Modified Files: .cvsignore metacity.spec sources Log Message: 2.13.8 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 15 Dec 2005 06:05:44 -0000 1.25 +++ .cvsignore 3 Jan 2006 18:48:20 -0000 1.26 @@ -4,3 +4,4 @@ metacity-2.13.2.tar.bz2 metacity-2.13.3.tar.bz2 metacity-2.13.5.tar.bz2 +metacity-2.13.8.tar.bz2 Index: metacity.spec =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- metacity.spec 15 Dec 2005 06:05:54 -0000 1.45 +++ metacity.spec 3 Jan 2006 18:48:20 -0000 1.46 @@ -2,7 +2,7 @@ Summary: Metacity window manager Name: metacity -Version: 2.13.5 +Version: 2.13.8 Release: 1 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/ Source0: %{name}-%{version}.tar.bz2 @@ -106,6 +106,9 @@ %{_mandir}/man1/* %changelog +* Tue Jan 03 2006 Matthias Clasen 2.13.8-1 +- Update to 2.13.8 + * Thu Dec 15 2005 Matthias Clasen 2.13.5-1 - Update to 2.13.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 15 Dec 2005 06:05:54 -0000 1.25 +++ sources 3 Jan 2006 18:48:20 -0000 1.26 @@ -1 +1 @@ -7f5e01d096cdd2bcbae89384561a1e51 metacity-2.13.5.tar.bz2 +b1db1e02891fcb4515e6824b0f069a57 metacity-2.13.8.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 18:59:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 13:59:28 -0500 Subject: rpms/gnome-games/devel .cvsignore, 1.28, 1.29 gnome-games.spec, 1.56, 1.57 sources, 1.31, 1.32 Message-ID: <200601031859.k03IxSSk030453@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-games/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30390 Modified Files: .cvsignore gnome-games.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 15 Dec 2005 05:08:41 -0000 1.28 +++ .cvsignore 3 Jan 2006 18:59:25 -0000 1.29 @@ -21,3 +21,4 @@ gnome-games-2.13.2.tar.bz2 gnome-games-extra-data-2.12.0.tar.bz2 gnome-games-2.13.3.tar.bz2 +gnome-games-2.13.4.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- gnome-games.spec 15 Dec 2005 05:08:41 -0000 1.56 +++ gnome-games.spec 3 Jan 2006 18:59:25 -0000 1.57 @@ -10,7 +10,7 @@ Summary: GNOME games. Name: gnome-games -Version: 2.13.3 +Version: 2.13.4 Release: 1 Epoch: 1 License: LGPL @@ -176,6 +176,9 @@ %changelog +* Tue Jan 03 2006 Matthias Clasen 1:2.13.4-1 +- Update to 2.13.4 + * Thu Dec 15 2005 Matthias Clasen 1:2.13.3-1 - Update to 2.13.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 15 Dec 2005 05:08:41 -0000 1.31 +++ sources 3 Jan 2006 18:59:25 -0000 1.32 @@ -1,2 +1,2 @@ 51b2b54c41b6d9cb1a228143723b43a1 gnome-games-extra-data-2.12.0.tar.bz2 -85594d2c3a7dbc01b95663fa59e5f36c gnome-games-2.13.3.tar.bz2 +dc83b2ed649c5866b70ad165eb71ad0d gnome-games-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 19:08:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:08:50 -0500 Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.19, 1.20 gnome-icon-theme.spec, 1.27, 1.28 sources, 1.19, 1.20 Message-ID: <200601031908.k03J8oPU032087@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-icon-theme/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32030 Modified Files: .cvsignore gnome-icon-theme.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 2 Dec 2005 14:59:13 -0000 1.19 +++ .cvsignore 3 Jan 2006 19:08:47 -0000 1.20 @@ -10,3 +10,4 @@ gnome-icon-theme-2.12.0.tar.bz2 gnome-icon-theme-2.12.1.tar.bz2 gnome-icon-theme-2.13.2.tar.bz2 +gnome-icon-theme-2.13.4.tar.bz2 Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gnome-icon-theme.spec 9 Dec 2005 22:40:39 -0000 1.27 +++ gnome-icon-theme.spec 3 Jan 2006 19:08:47 -0000 1.28 @@ -1,7 +1,7 @@ Summary: Base gnome icons Name: gnome-icon-theme -Version: 2.13.2 -Release: 1.1 +Version: 2.13.4 +Release: 1 Source0: %{name}-%{version}.tar.bz2 Source1: external-icons-2.10.1-2.tar.gz License: GPL @@ -87,6 +87,9 @@ %{_datadir}/pkgconfig/gnome-icon-theme.pc %changelog +* Tue Jan 03 2006 Matthias Clasen 2.13.4-1 +- Update to 2.13.4 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 2 Dec 2005 14:59:13 -0000 1.19 +++ sources 3 Jan 2006 19:08:47 -0000 1.20 @@ -1,2 +1,2 @@ e6c3328995f2ce73ee91d1a654198f3f external-icons-2.10.1-2.tar.gz -bd2854b35bbd5714dc137ca9acfe79f4 gnome-icon-theme-2.13.2.tar.bz2 +e47c9440f6a4de261834bbee0a5d051e gnome-icon-theme-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 19:09:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:09:23 -0500 Subject: rpms/hsqldb/devel hsqldb.spec,1.11,1.12 Message-ID: <200601031909.k03J9NDY032379@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/hsqldb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32345 Modified Files: hsqldb.spec Log Message: another bump for gcj Index: hsqldb.spec =================================================================== RCS file: /cvs/dist/rpms/hsqldb/devel/hsqldb.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- hsqldb.spec 9 Dec 2005 20:42:21 -0000 1.11 +++ hsqldb.spec 3 Jan 2006 19:09:21 -0000 1.12 @@ -3,11 +3,11 @@ %define name hsqldb %define version 1.80.1 %define cvs_version 1_8_0_1 -%define release 1jpp_4fc.1 +%define release 1jpp_5fc Name: %{name} Version: %{version} -Release: %{release}.1 +Release: %{release} Epoch: 0 Summary: Hsqldb Database Engine License: BSD Style @@ -208,6 +208,9 @@ %{_datadir}/%{name} %changelog +* Tue Jan 03 2006 Jesse Keating 0:1.80.1-1jpp_5fc +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 19:14:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:14:47 -0500 Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.23, 1.24 nautilus-cd-burner.spec, 1.41, 1.42 sources, 1.23, 1.24 Message-ID: <200601031914.k03JEl5A002509@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/nautilus-cd-burner/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2460 Modified Files: .cvsignore nautilus-cd-burner.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 15 Dec 2005 14:18:30 -0000 1.23 +++ .cvsignore 3 Jan 2006 19:14:44 -0000 1.24 @@ -14,3 +14,4 @@ nautilus-cd-burner-2.12.1.tar.bz2 nautilus-cd-burner-2.13.2.tar.bz2 nautilus-cd-burner-2.13.3.tar.bz2 +nautilus-cd-burner-2.13.4.tar.bz2 Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- nautilus-cd-burner.spec 15 Dec 2005 18:21:37 -0000 1.41 +++ nautilus-cd-burner.spec 3 Jan 2006 19:14:44 -0000 1.42 @@ -1,6 +1,6 @@ Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner -Version: 2.13.3 +Version: 2.13.4 Release: 1 Source0: %{name}-%{version}.tar.bz2 License: LGPL/GPL @@ -99,6 +99,9 @@ %changelog +* Tue Jan 03 2006 Matthias Clasen 2.13.4-1 +- Update to 2.13.4 + * Thu Dec 15 2005 Matthias Clasen 2.13.3-1 - Update to 2.13.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 15 Dec 2005 14:18:30 -0000 1.23 +++ sources 3 Jan 2006 19:14:44 -0000 1.24 @@ -1 +1 @@ -dbce506ef01ca9ed1b79ec1a4bd8e57f nautilus-cd-burner-2.13.3.tar.bz2 +c22bcff40fc463c83de71983169c7ff5 nautilus-cd-burner-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 19:15:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:15:36 -0500 Subject: rpms/rhythmbox/devel rhythmbox.spec,1.35,1.36 Message-ID: <200601031915.k03JFavX002904@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2864 Modified Files: rhythmbox.spec Log Message: bump for gcc again Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- rhythmbox.spec 10 Dec 2005 09:20:54 -0000 1.35 +++ rhythmbox.spec 3 Jan 2006 19:15:34 -0000 1.36 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.2 -Release: 3.1 +Release: 4 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2 @@ -91,6 +91,9 @@ %{_libdir}/pkgconfig/rhythmbox.pc %changelog +* Tue Jan 03 2006 Jesse Keating 0.9.2-4 +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 19:19:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:19:13 -0500 Subject: rpms/openmotif/devel openmotif.spec,1.39,1.40 Message-ID: <200601031919.k03JJDop015765@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/openmotif/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15735 Modified Files: openmotif.spec Log Message: bump for gcc again Index: openmotif.spec =================================================================== RCS file: /cvs/dist/rpms/openmotif/devel/openmotif.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- openmotif.spec 9 Dec 2005 14:10:57 -0000 1.39 +++ openmotif.spec 3 Jan 2006 19:19:10 -0000 1.40 @@ -4,7 +4,7 @@ Summary: Open Motif runtime libraries and executables. Name: openmotif Version: 2.3.0 -Release: 0.1.1 +Release: 0.1.2 License: Open Group Public License Group: System Environment/Libraries #Source: %{intern_name}-%{version}.tar.gz @@ -148,6 +148,9 @@ %{_datadir}/man/man5/* %changelog +* Tue Jan 3 2006 Jesse Keating 2.3.0-0.1.2 +- Rebuilt on new gcc + * Fri Dec 9 2005 Thomas Woerner 2.3.0-0.1.1 - moved mwmrc to /etc/X11/mwm - moved bindings to /usr/share/X11 From fedora-cvs-commits at redhat.com Tue Jan 3 19:22:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:22:18 -0500 Subject: rpms/librsvg2/devel librsvg2.spec,1.32,1.33 Message-ID: <200601031922.k03JMIPe017256@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/librsvg2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17225 Modified Files: librsvg2.spec Log Message: bump for gcc again Index: librsvg2.spec =================================================================== RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- librsvg2.spec 9 Dec 2005 12:21:53 -0000 1.32 +++ librsvg2.spec 3 Jan 2006 19:22:16 -0000 1.33 @@ -12,7 +12,7 @@ Name: librsvg2 Summary: An SVG library based on cairo. Version: 2.13.3 -Release: 3 +Release: 4 License: LGPL Group: System Environment/Libraries @@ -112,6 +112,9 @@ ##%doc %{_datadir}/gtk-doc/html/rsvg %changelog +* Tue Jan 3 2006 Jesse Keating 2.13.3-4 +- Rebuilt on new gcc + * Fri Dec 9 2005 Alexander Larsson 2.13.3-3 - Update dependencies (now cairo only, not libart) From fedora-cvs-commits at redhat.com Tue Jan 3 19:27:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:27:25 -0500 Subject: rpms/java_cup/devel java_cup.spec,1.10,1.11 Message-ID: <200601031927.k03JRPJj019601@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/java_cup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19574 Modified Files: java_cup.spec Log Message: bump for gcj again Index: java_cup.spec =================================================================== RCS file: /cvs/dist/rpms/java_cup/devel/java_cup.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- java_cup.spec 9 Dec 2005 20:43:37 -0000 1.10 +++ java_cup.spec 3 Jan 2006 19:27:22 -0000 1.11 @@ -1,12 +1,12 @@ %define name java_cup %define version 0.10 %define pkg_version v10k -%define release 0.k.1jpp_5fc.1 +%define release 0.k.1jpp_6fc %define section free Name: %{name} Version: %{version} -Release: %{release}.1 +Release: %{release} Epoch: 1 Summary: Java source interpreter License: BSD-style @@ -101,6 +101,9 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Tue Jan 3 2006 Jesse Keating 1:0.10-0.k.1jpp_6fc +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 19:30:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:30:41 -0500 Subject: rpms/jfsutils/devel jfsutils.spec,1.11,1.12 Message-ID: <200601031930.k03JUfWr020813@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/jfsutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20797 Modified Files: jfsutils.spec Log Message: bump for gcc again Index: jfsutils.spec =================================================================== RCS file: /cvs/dist/rpms/jfsutils/devel/jfsutils.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jfsutils.spec 9 Dec 2005 23:51:40 -0000 1.11 +++ jfsutils.spec 3 Jan 2006 19:30:24 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Utilities for managing the JFS filesystem. Name: jfsutils Version: 1.1.10 -Release: 2 +Release: 3 Source0: jfsutils-%{version}.tar.gz URL: http://oss.software.ibm.com/jfs Group: System Environment/Base @@ -43,6 +43,9 @@ %doc AUTHORS COPYING INSTALL NEWS README ChangeLog %changelog +* Tue Jan 3 2006 Jesse Keating +- rebuilt again + * Fri Dec 9 2005 Dave Jones - Update to newer upstream 1.1.10 release. From fedora-cvs-commits at redhat.com Tue Jan 3 19:38:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:38:59 -0500 Subject: rpms/jakarta-taglibs-standard/devel jakarta-taglibs-standard.spec, 1.11, 1.12 Message-ID: <200601031938.k03JcxGB022915@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/jakarta-taglibs-standard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22886 Modified Files: jakarta-taglibs-standard.spec Log Message: bump for gcj again Index: jakarta-taglibs-standard.spec =================================================================== RCS file: /cvs/dist/rpms/jakarta-taglibs-standard/devel/jakarta-taglibs-standard.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jakarta-taglibs-standard.spec 9 Dec 2005 20:42:36 -0000 1.11 +++ jakarta-taglibs-standard.spec 3 Jan 2006 19:38:56 -0000 1.12 @@ -4,11 +4,11 @@ %define section free %define jversion 1.1.1 %define version 1.1.1 -%define release 4jpp_1fc.1 +%define release 4jpp_2fc Name: %{name} Version: %{version} -Release: %{release}.1 +Release: %{release} Epoch: 0 Summary: An open-source implementation of the JSP Standard Tag Library License: Apache Software License @@ -97,6 +97,9 @@ %changelog +* Tue Jan 3 2006 Jesse Keating - 0:1.1.1-4jpp_2fc +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 19:39:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:39:26 -0500 Subject: rpms/gnome-utils/devel .cvsignore, 1.32, 1.33 gnome-utils.spec, 1.74, 1.75 sources, 1.33, 1.34 Message-ID: <200601031939.k03JdQpg023166@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23098 Modified Files: .cvsignore gnome-utils.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 15 Dec 2005 14:48:08 -0000 1.32 +++ .cvsignore 3 Jan 2006 19:39:22 -0000 1.33 @@ -9,3 +9,5 @@ zenity-2.13.3.tar.bz2 gcalctool-5.7.15.tar.bz2 gucharmap-1.5.0.tar.bz2 +gnome-utils-2.13.4.tar.bz2 +gcalctool-5.7.18.tar.bz2 Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- gnome-utils.spec 15 Dec 2005 15:24:30 -0000 1.74 +++ gnome-utils.spec 3 Jan 2006 19:39:22 -0000 1.75 @@ -11,7 +11,7 @@ %define po_package gnome-utils-2.0 -%define gcalctool_version 5.7.15 +%define gcalctool_version 5.7.18 %define gucharmap_version 1.5.0 %define zenity_version 2.13.3 @@ -19,7 +19,7 @@ Summary: GNOME utility programs. Name: gnome-utils -Version: 2.13.3 +Version: 2.13.4 Release: 1 Epoch: 1 License: GPL @@ -207,6 +207,10 @@ %{_sysconfdir}/pam.d/gnome-system-log %changelog +* Tue Jan 03 2006 Matthias Clasen 2.13.4 +- Update to gnome-utils 2.13.4 +- Update to gcalctool 5.7.18 + * Thu Dec 15 2005 Matthias Clasen 2.13.3 - Update to gnome-utils 2.13.3 - Update to zenity 2.13.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 15 Dec 2005 14:48:08 -0000 1.33 +++ sources 3 Jan 2006 19:39:22 -0000 1.34 @@ -1,4 +1,4 @@ -590ae4d577920793b8144ba864ae9515 gnome-utils-2.13.3.tar.bz2 b644bff4213d31be3e7ac1eb416cc282 zenity-2.13.3.tar.bz2 -aebd911eb62b83b3868695c8f364e723 gcalctool-5.7.15.tar.bz2 e7f8e1201b2b81cd283d7a4db512141a gucharmap-1.5.0.tar.bz2 +3fd0e69055bacffd81b3397a5b6ced3b gnome-utils-2.13.4.tar.bz2 +89bed90db2f6f2d324df5726ddd6fe6c gcalctool-5.7.18.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 19:44:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:44:50 -0500 Subject: rpms/howl-logger/devel howl-logger.spec,1.6,1.7 Message-ID: <200601031944.k03JioEv025622@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/howl-logger/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25589 Modified Files: howl-logger.spec Log Message: bump for gcj again Index: howl-logger.spec =================================================================== RCS file: /cvs/dist/rpms/howl-logger/devel/howl-logger.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- howl-logger.spec 9 Dec 2005 20:42:16 -0000 1.6 +++ howl-logger.spec 3 Jan 2006 19:44:47 -0000 1.7 @@ -1,6 +1,6 @@ %define name howl-logger %define version 0.1.8 -%define release 1jpp_3fc.1 +%define release 1jpp_4fc %define section free @@ -8,7 +8,7 @@ Summary: High speed ObjectWeb logger Url: http://howl.objectweb.org/ Version: %{version} -Release: %{release}.1 +Release: %{release} Epoch: 0 License: Apache Software License 2 Group: Development/Libraries/Java @@ -84,6 +84,9 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Tue Jan 3 2006 Jesse Keating 0:0.1.8-1jpp_4fc +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 19:47:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:47:02 -0500 Subject: rpms/gnutls/devel gnutls.spec,1.15,1.16 Message-ID: <200601031947.k03Jl2Kn005355@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/gnutls/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5326 Modified Files: gnutls.spec Log Message: bump for gcc again Index: gnutls.spec =================================================================== RCS file: /cvs/dist/rpms/gnutls/devel/gnutls.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnutls.spec 9 Dec 2005 14:40:37 -0000 1.15 +++ gnutls.spec 3 Jan 2006 19:46:58 -0000 1.16 @@ -1,7 +1,7 @@ Summary: A TLS protocol implementation. Name: gnutls Version: 1.2.9 -Release: 2 +Release: 3 License: LGPL Group: System Environment/Libraries BuildPrereq: libgcrypt-devel >= 1.2.2 @@ -114,6 +114,9 @@ %{_mandir}/man1/* %changelog +* Tue Jan 3 2006 Jesse Keating 1.2.9-3 +- rebuilt + * Fri Dec 9 2005 Tomas Mraz 1.2.9-2 - replaced *-config scripts with calls to pkg-config to solve multilib conflicts From fedora-cvs-commits at redhat.com Tue Jan 3 19:49:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:49:52 -0500 Subject: rpms/gnome-utils/devel gnome-utils.spec,1.75,1.76 Message-ID: <200601031949.k03Jnqdn006623@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6565 Modified Files: gnome-utils.spec Log Message: Update file lists Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- gnome-utils.spec 3 Jan 2006 19:39:22 -0000 1.75 +++ gnome-utils.spec 3 Jan 2006 19:49:48 -0000 1.76 @@ -194,13 +194,15 @@ %{_datadir}/zenity %{_datadir}/gnome-screenshot %{_datadir}/gnome-2.0 +%{_datadir}/gdict-1.0 +%{_datadir}/gnome-dictionary +%{_datadir}/gtk-doc/html/gdict %{_libdir}/pkgconfig/* %{_bindir}/* %{_libexecdir}/* %{_libdir}/*.so* %{_libdir}/bonobo %{_sysconfdir}/gconf -%{_sysconfdir}/pam.d %{_includedir}/* %{_sbindir}/gnome-system-log %{_sysconfdir}/security/console.apps/gnome-system-log From fedora-cvs-commits at redhat.com Tue Jan 3 19:50:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:50:25 -0500 Subject: rpms/glib/devel glib.spec,1.15,1.16 Message-ID: <200601031950.k03JoPDZ006887@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/glib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6863 Modified Files: glib.spec Log Message: bump for gcc again Index: glib.spec =================================================================== RCS file: /cvs/dist/rpms/glib/devel/glib.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- glib.spec 9 Dec 2005 20:42:10 -0000 1.15 +++ glib.spec 3 Jan 2006 19:50:22 -0000 1.16 @@ -1,7 +1,7 @@ Summary: A library of handy utility functions. Name: glib Version: 1.2.10 -Release: 18.1 +Release: 18.2 Epoch: 1 License: LGPL Group: System Environment/Libraries @@ -84,6 +84,9 @@ %{_bindir}/* %changelog +* Tue Jan 3 2006 Jesse Keating 1:1.2.10-18.2 +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 19:51:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:51:42 -0500 Subject: rpms/joram/devel joram.spec,1.12,1.13 Message-ID: <200601031951.k03Jpg9c007520@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/joram/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7489 Modified Files: joram.spec Log Message: bump for gcj again Index: joram.spec =================================================================== RCS file: /cvs/dist/rpms/joram/devel/joram.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- joram.spec 9 Dec 2005 20:44:02 -0000 1.12 +++ joram.spec 3 Jan 2006 19:51:39 -0000 1.13 @@ -1,6 +1,6 @@ %define name joram %define version 4.1.5 -%define release 1jpp_6fc.1 +%define release 1jpp_7fc %define section free @@ -8,7 +8,7 @@ Summary: JORAM: Java (TM) Open Reliable Asynchronous Messaging Url: http://joram.objectweb.org/ Version: %{version} -Release: %{release}.1 +Release: %{release} Epoch: 0 License: LGPL Group: Development/Libraries/Java @@ -180,6 +180,9 @@ %ghost %doc %{_javadocdir}/%{name} %changelog +* Tue Jan 3 2006 Jesse Keating 0:4.1.5-1jpp_7fc +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 19:56:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:56:08 -0500 Subject: rpms/gettext/devel gettext.spec,1.47,1.48 Message-ID: <200601031956.k03Ju8gb009657@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/gettext/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9628 Modified Files: gettext.spec Log Message: bump for gcc again Index: gettext.spec =================================================================== RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gettext.spec 9 Dec 2005 20:42:01 -0000 1.47 +++ gettext.spec 3 Jan 2006 19:56:05 -0000 1.48 @@ -5,7 +5,7 @@ Summary: GNU libraries and utilities for producing multi-lingual messages. Name: gettext Version: 0.14.5 -Release: 2.1 +Release: 2.2 License: GPL/LGPL Group: Development/Tools Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz @@ -218,6 +218,9 @@ %{_libdir}/%{name}/gnu.gettext.* %changelog +* Tue Jan 3 2006 Jesse Keating 0.14.5-2.2 +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 19:59:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 14:59:21 -0500 Subject: rpms/cairo/devel cairo.spec,1.28,1.29 Message-ID: <200601031959.k03JxLDW011186@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/cairo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11161 Modified Files: cairo.spec Log Message: bump for gcc again Index: cairo.spec =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- cairo.spec 9 Dec 2005 20:41:35 -0000 1.28 +++ cairo.spec 3 Jan 2006 19:59:18 -0000 1.29 @@ -4,7 +4,7 @@ Summary: A vector graphics library Name: cairo Version: 1.0.2 -Release: 3.1 +Release: 3.2 URL: http://cairographics.org Source0: %{name}-%{version}.tar.gz License: LGPL/MPL @@ -81,6 +81,9 @@ %{_datadir}/gtk-doc/* %changelog +* Tue Jan 3 2006 Jesse Keating 1.0.2-3.2 +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 20:02:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 15:02:29 -0500 Subject: rpms/apr/devel apr.spec,1.41,1.42 Message-ID: <200601032002.k03K2TDN011680@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/apr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11640 Modified Files: apr.spec Log Message: bump for gcc again Index: apr.spec =================================================================== RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- apr.spec 9 Dec 2005 20:41:25 -0000 1.41 +++ apr.spec 3 Jan 2006 20:02:06 -0000 1.42 @@ -3,7 +3,7 @@ Summary: Apache Portable Runtime library Name: apr Version: 1.2.2 -Release: 5.1 +Release: 5.2 License: Apache Software License Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -120,6 +120,9 @@ %{_includedir}/apr-%{aprver}/*.h %changelog +* Tue Jan 3 2006 Jesse Keating 1.2.2-5.2 +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 20:05:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 15:05:30 -0500 Subject: rpms/gtkhtml3/devel .cvsignore, 1.27, 1.28 gtkhtml3.spec, 1.44, 1.45 sources, 1.27, 1.28 Message-ID: <200601032005.k03K5Uar011834@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11811 Modified Files: .cvsignore gtkhtml3.spec sources Log Message: 3.9.43.9.43.9.43.9.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 19 Dec 2005 20:18:31 -0000 1.27 +++ .cvsignore 3 Jan 2006 20:05:24 -0000 1.28 @@ -1 +1 @@ -gtkhtml-3.9.3.tar.bz2 +gtkhtml-3.9.4.tar.bz2 Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- gtkhtml3.spec 19 Dec 2005 20:18:31 -0000 1.44 +++ gtkhtml3.spec 3 Jan 2006 20:05:25 -0000 1.45 @@ -4,7 +4,7 @@ Summary: gtkhtml library Name: gtkhtml3 -Version: 3.9.3 +Version: 3.9.4 Release: 1 License: LGPL/GPL Group: System Environment/Libraries @@ -92,6 +92,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jan 3 2006 David Malcolm - 3.9.4-1 +- 3.9.4 + * Mon Dec 19 2005 David Malcolm - 3.9.3-1 - 3.9.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 19 Dec 2005 20:18:31 -0000 1.27 +++ sources 3 Jan 2006 20:05:25 -0000 1.28 @@ -1 +1 @@ -61ed97710830fe822d4a769f835f9211 gtkhtml-3.9.3.tar.bz2 +25096e3b8b9ad961e27f955f9db73fa3 gtkhtml-3.9.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 20:14:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 15:14:17 -0500 Subject: rpms/apr-util/devel apr-util.spec,1.19,1.20 Message-ID: <200601032014.k03KEHWC015205@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/apr-util/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15177 Modified Files: apr-util.spec Log Message: bump for gcc again Index: apr-util.spec =================================================================== RCS file: /cvs/dist/rpms/apr-util/devel/apr-util.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- apr-util.spec 9 Dec 2005 20:41:30 -0000 1.19 +++ apr-util.spec 3 Jan 2006 20:14:15 -0000 1.20 @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.2.2 -Release: 2.1 +Release: 2.2 License: Apache Software License 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -98,6 +98,9 @@ %doc --parents html %changelog +* Tue Jan 3 2006 Jesse Keating 1.2.2-2.2 +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 3 20:16:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 15:16:04 -0500 Subject: rpms/amtu/devel amtu.spec,1.10,1.11 Message-ID: <200601032016.k03KG4KE020510@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/amtu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20180 Modified Files: amtu.spec Log Message: bump for gcc again Index: amtu.spec =================================================================== RCS file: /cvs/dist/rpms/amtu/devel/amtu.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- amtu.spec 9 Dec 2005 21:40:48 -0000 1.10 +++ amtu.spec 3 Jan 2006 20:16:01 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Abstract Machine Test Utility (AMTU) Name: amtu Version: 1.0.4 -Release: 1 +Release: 2 License: Common Public License Group: System Environment/Base Source0: %{name}-%{version}.tar.gz @@ -60,6 +60,9 @@ %attr(0644,root,root) %{_mandir}/man8/* %changelog +* Tue Jan 3 2006 Jesse Keating 1.0.4-2 +- rebuilt + * Fri Dec 9 2005 Steve Grubb 1.0.4-1 - New upstream version updated for new audit messages * Mon Dec 5 2005 Steve Grubb 1.0.2-2 From fedora-cvs-commits at redhat.com Tue Jan 3 20:20:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 15:20:17 -0500 Subject: rpms/alsa-lib/devel alsa-lib.spec,1.37,1.38 Message-ID: <200601032020.k03KKHxR029050@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/alsa-lib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29021 Modified Files: alsa-lib.spec Log Message: bump for gcc again Index: alsa-lib.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- alsa-lib.spec 9 Dec 2005 10:23:14 -0000 1.37 +++ alsa-lib.spec 3 Jan 2006 20:20:15 -0000 1.38 @@ -5,7 +5,7 @@ Summary: The Advanced Linux Sound Architecture (ALSA) library. Name: alsa-lib Version: %{version_main}%{?version_app} -Release: 3 +Release: 4 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2 @@ -143,6 +143,9 @@ %{_datadir}/aclocal/alsa.m4 %changelog +* Tue Jan 3 2006 Jesse Keating 1.0.10rf-4 +- rebuilt + * Fri Dec 9 2005 Martin Stransky 1.0.10rf-3 - rights for shared memory have been moved to config files From fedora-cvs-commits at redhat.com Tue Jan 3 20:56:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 15:56:31 -0500 Subject: rpms/evolution-data-server/devel .cvsignore, 1.35, 1.36 evolution-data-server.spec, 1.75, 1.76 sources, 1.35, 1.36 Message-ID: <200601032056.k03KuVjr013739@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13653 Modified Files: .cvsignore evolution-data-server.spec sources Log Message: 1.5.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 19 Dec 2005 21:03:17 -0000 1.35 +++ .cvsignore 3 Jan 2006 20:56:28 -0000 1.36 @@ -1 +1 @@ -evolution-data-server-1.5.3.tar.bz2 +evolution-data-server-1.5.4.tar.bz2 Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- evolution-data-server.spec 19 Dec 2005 22:50:23 -0000 1.75 +++ evolution-data-server.spec 3 Jan 2006 20:56:28 -0000 1.76 @@ -19,8 +19,8 @@ Summary: Backend data server for evolution Name: evolution-data-server -Version: 1.5.3 -Release: 2 +Version: 1.5.4 +Release: 1 License: LGPL Group: System Environment/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 @@ -228,6 +228,9 @@ %changelog +* Tue Jan 3 2006 David Malcolm - 1.5.4-1 +- 1.5.4 + * Mon Dec 19 2005 David Malcolm - 1.5.3-2 - Update specfile and patch 5 (evolution-data-server-1.3.5-nspr_fix.patch) to use nss rather than mozilla-nss throughout Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 19 Dec 2005 21:03:17 -0000 1.35 +++ sources 3 Jan 2006 20:56:28 -0000 1.36 @@ -1 +1 @@ -e18d4237b9df2f82e19d3cd1b146a4e5 evolution-data-server-1.5.3.tar.bz2 +d12bd29d433fcbaa7b18caf920e48015 evolution-data-server-1.5.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 21:14:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 16:14:44 -0500 Subject: rpms/tomcat5/devel tomcat5-5.0.init,1.6,1.7 tomcat5.spec,1.54,1.55 Message-ID: <200601032114.k03LEi95019427@cvs.devel.redhat.com> Author: rafaels Update of /cvs/dist/rpms/tomcat5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19397 Modified Files: tomcat5-5.0.init tomcat5.spec Log Message: Fixed typos in init script. Index: tomcat5-5.0.init =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5-5.0.init,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tomcat5-5.0.init 24 Aug 2005 13:24:25 -0000 1.6 +++ tomcat5-5.0.init 3 Jan 2006 21:14:42 -0000 1.7 @@ -28,7 +28,7 @@ # version 1.15 - ensure we're looking for TOMCAT_USER running catalina # version 1.16 - Add support for CATALINA_PID env var # version 1.17 - Remove run files only tomcat started correctl -# in start area, check that tomcat is not allready running +# in start area, check that tomcat is not already running # version 1.18 - Fix kill typo (thanks Kaj J. Niemi) # version 1.19 - Add jar relinking # version 1.20 - Check there is no stalling tomcat4.pid @@ -76,7 +76,7 @@ if [ -f /var/run/tomcat5.pid ]; then read kpid < /var/run/tomcat5.pid if checkpid $kpid 2>&1; then - echo "process allready running" + echo "process already running" return -1 else echo "lock file found but no process running for pid $kpid, continuing" Index: tomcat5.spec =================================================================== RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- tomcat5.spec 22 Dec 2005 09:15:17 -0000 1.54 +++ tomcat5.spec 3 Jan 2006 21:14:42 -0000 1.55 @@ -2,7 +2,7 @@ %define full_name jakarta-%{name} %define version 5.0.30 %define majversion 5.0 -%define release 8jpp_7fc +%define release 8jpp_8fc %define section free %define summary Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API @@ -845,6 +845,9 @@ %attr(-,root,root) %{_libdir}/gcj/%{name}/catalina-manager.jar.* %changelog +* Tue Jan 3 2006 Rafael Schloming - 0:5.0.30-8jpp_7fc +- Fixed typos in the init script. + * Wed Dec 21 2005 Jesse Keating 0:5.0.30-8jpp_7fc - rebuilt again From fedora-cvs-commits at redhat.com Tue Jan 3 21:16:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 16:16:36 -0500 Subject: rpms/mkinitrd/devel .cvsignore, 1.84, 1.85 mkinitrd.spec, 1.92, 1.93 sources, 1.89, 1.90 Message-ID: <200601032116.k03LGa16030109@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29017 Modified Files: .cvsignore mkinitrd.spec sources Log Message: update to .16 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- .cvsignore 19 Dec 2005 19:35:56 -0000 1.84 +++ .cvsignore 3 Jan 2006 21:16:33 -0000 1.85 @@ -1 +1 @@ -mkinitrd-5.0.15.tar.bz2 +mkinitrd-5.0.16.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- mkinitrd.spec 19 Dec 2005 19:35:56 -0000 1.92 +++ mkinitrd.spec 3 Jan 2006 21:16:33 -0000 1.93 @@ -1,6 +1,6 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 5.0.15 +Version: 5.0.16 Release: 1 License: GPL Group: System Environment/Base @@ -62,6 +62,9 @@ %attr(644,root,root) %{_mandir}/man8/grubby.8* %changelog +* Tue Jan 3 2006 Peter Jones - 5.0.16-1 +- Hopefully fix raid autorun with a patch from Paul Flinders. + * Mon Dec 19 2005 Peter Jones - 5.0.15-1 - Don't open init's console with close-on-exec Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- sources 19 Dec 2005 19:35:56 -0000 1.89 +++ sources 3 Jan 2006 21:16:33 -0000 1.90 @@ -1 +1 @@ -7e777d7e1313619181316d046a522727 mkinitrd-5.0.15.tar.bz2 +2b5f8061651fd8c88e64c1ffc9ccf525 mkinitrd-5.0.16.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 3 21:33:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 16:33:08 -0500 Subject: rpms/kernel/devel linux-2.6-ia64-spinlock-size.patch, NONE, 1.1 kernel-2.6.spec, 1.1816, 1.1817 Message-ID: <200601032133.k03LX8fe005374@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5309 Modified Files: kernel-2.6.spec Added Files: linux-2.6-ia64-spinlock-size.patch Log Message: Altix: Fix sn_flush_device_kernel & spinlock initialization. (#176827) linux-2.6-ia64-spinlock-size.patch: arch/ia64/sn/include/xtalk/hubdev.h | 16 ++++- arch/ia64/sn/kernel/io_init.c | 92 ++++++++++++++++++-------------- arch/ia64/sn/pci/pcibr/pcibr_dma.c | 34 ++++++----- arch/ia64/sn/pci/pcibr/pcibr_provider.c | 20 +++--- include/asm-ia64/sn/sn_sal.h | 3 - 5 files changed, 94 insertions(+), 71 deletions(-) --- NEW FILE linux-2.6-ia64-spinlock-size.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176827 Upstream status: Prarit submitted post 2.6.15 Patch to fix sn_flush_device_kernel & spinlock initialization This patch separates the sn_flush_device_list struct into kernel and common (both kernel and PROM accessible) structures. As it was, if the size of a spinlock_t changed (due to additional CONFIG options, etc.) the sal call which populated the sn_flush_device_list structs would erroneously write data (and cause memory corruption and/or a panic). This patch does the following: 1. Removes sn_flush_device_list and adds sn_flush_device_common and sn_flush_device_kernel. 2. Adds a new SAL call to populate a sn_flush_device_common struct per device, not per widget as previously done. 3. Correctly initializes each device's sn_flush_device_kernel spinlock_t struct (before it was only doing each widget's first device). diff -urNp fedora-orig/arch/ia64/sn/include/xtalk/hubdev.h fedora-work/arch/ia64/sn/include/xtalk/hubdev.h --- fedora-orig/arch/ia64/sn/include/xtalk/hubdev.h 2006-01-03 10:36:41.000000000 -0500 +++ fedora-work/arch/ia64/sn/include/xtalk/hubdev.h 2006-01-03 10:37:21.000000000 -0500 @@ -26,11 +26,14 @@ #define IIO_NUM_ITTES 7 #define HUB_NUM_BIG_WINDOW (IIO_NUM_ITTES - 1) -struct sn_flush_device_list { +/* This struct is shared between the PROM and the kernel. + * Changes to this struct will require corresponding changes to the kernel. + */ +struct sn_flush_device_common { int sfdl_bus; int sfdl_slot; int sfdl_pin; - struct bar_list { + struct common_bar_list { unsigned long start; unsigned long end; } sfdl_bar_list[6]; @@ -40,14 +43,19 @@ struct sn_flush_device_list { uint32_t sfdl_persistent_busnum; uint32_t sfdl_persistent_segment; struct pcibus_info *sfdl_pcibus_info; +}; + +/* This struct is kernel only and is not used by the PROM */ +struct sn_flush_device_kernel { spinlock_t sfdl_flush_lock; + struct sn_flush_device_common *common; }; /* - * **widget_p - Used as an array[wid_num][device] of sn_flush_device_list. + * **widget_p - Used as an array[wid_num][device] of sn_flush_device_kernel. */ struct sn_flush_nasid_entry { - struct sn_flush_device_list **widget_p; /* Used as a array of wid_num */ + struct sn_flush_device_kernel **widget_p; // Used as an array of wid_num uint64_t iio_itte[8]; }; diff -urNp fedora-orig/arch/ia64/sn/kernel/io_init.c fedora-work/arch/ia64/sn/kernel/io_init.c --- fedora-orig/arch/ia64/sn/kernel/io_init.c 2006-01-03 10:36:41.000000000 -0500 +++ fedora-work/arch/ia64/sn/kernel/io_init.c 2006-01-03 10:37:21.000000000 -0500 @@ -76,11 +76,12 @@ static struct sn_pcibus_provider sn_pci_ }; /* - * Retrieve the DMA Flush List given nasid. This list is needed - * to implement the WAR - Flush DMA data on PIO Reads. + * Retrieve the DMA Flush List given nasid, widget, and device. + * This list is needed to implement the WAR - Flush DMA data on PIO Reads. */ -static inline uint64_t -sal_get_widget_dmaflush_list(u64 nasid, u64 widget_num, u64 address) +static inline u64 +sal_get_device_dmaflush_list(u64 nasid, u64 widget_num, u64 device_num, + u64 address) { struct ia64_sal_retval ret_stuff; @@ -88,17 +89,17 @@ sal_get_widget_dmaflush_list(u64 nasid, ret_stuff.v0 = 0; SAL_CALL_NOLOCK(ret_stuff, - (u64) SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST, - (u64) nasid, (u64) widget_num, (u64) address, 0, 0, 0, - 0); - return ret_stuff.v0; + (u64) SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST, + (u64) nasid, (u64) widget_num, + (u64) device_num, (u64) address, 0, 0, 0); + return ret_stuff.status; } /* * Retrieve the hub device info structure for the given nasid. */ -static inline uint64_t sal_get_hubdev_info(u64 handle, u64 address) +static inline u64 sal_get_hubdev_info(u64 handle, u64 address) { struct ia64_sal_retval ret_stuff; @@ -114,7 +115,7 @@ static inline uint64_t sal_get_hubdev_in /* * Retrieve the pci bus information given the bus number. */ -static inline uint64_t sal_get_pcibus_info(u64 segment, u64 busnum, u64 address) +static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64 address) { struct ia64_sal_retval ret_stuff; @@ -130,7 +131,7 @@ static inline uint64_t sal_get_pcibus_in /* * Retrieve the pci device information given the bus and device|function number. */ -static inline uint64_t +static inline u64 sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev, u64 sn_irq_info) { @@ -170,12 +171,12 @@ sn_pcidev_info_get(struct pci_dev *dev) */ static void sn_fixup_ionodes(void) { - - struct sn_flush_device_list *sn_flush_device_list; + struct sn_flush_device_kernel *sn_flush_device_kernel; + struct sn_flush_device_kernel *dev_entry; struct hubdev_info *hubdev; - uint64_t status; - uint64_t nasid; - int i, widget; + u64 status; + u64 nasid; + int i, widget, device; /* * Get SGI Specific HUB chipset information. @@ -186,7 +187,7 @@ static void sn_fixup_ionodes(void) nasid = cnodeid_to_nasid(i); hubdev->max_segment_number = 0xffffffff; hubdev->max_pcibus_number = 0xff; - status = sal_get_hubdev_info(nasid, (uint64_t) __pa(hubdev)); + status = sal_get_hubdev_info(nasid, (u64) __pa(hubdev)); if (status) continue; @@ -213,38 +214,49 @@ static void sn_fixup_ionodes(void) hubdev->hdi_flush_nasid_list.widget_p = kmalloc((HUB_WIDGET_ID_MAX + 1) * - sizeof(struct sn_flush_device_list *), GFP_KERNEL); - + sizeof(struct sn_flush_device_kernel *), + GFP_KERNEL); memset(hubdev->hdi_flush_nasid_list.widget_p, 0x0, (HUB_WIDGET_ID_MAX + 1) * - sizeof(struct sn_flush_device_list *)); + sizeof(struct sn_flush_device_kernel *)); for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) { - sn_flush_device_list = kmalloc(DEV_PER_WIDGET * - sizeof(struct - sn_flush_device_list), - GFP_KERNEL); - memset(sn_flush_device_list, 0x0, + sn_flush_device_kernel = kmalloc(DEV_PER_WIDGET * + sizeof(struct + sn_flush_device_kernel), + GFP_KERNEL); + if (!sn_flush_device_kernel) + BUG(); + memset(sn_flush_device_kernel, 0x0, DEV_PER_WIDGET * - sizeof(struct sn_flush_device_list)); + sizeof(struct sn_flush_device_kernel)); - status = - sal_get_widget_dmaflush_list(nasid, widget, - (uint64_t) - __pa - (sn_flush_device_list)); - if (status) { - kfree(sn_flush_device_list); - continue; - } + dev_entry = sn_flush_device_kernel; + for (device = 0; device < DEV_PER_WIDGET; + device++,dev_entry++) { + dev_entry->common = kmalloc(sizeof(struct + sn_flush_device_common), + GFP_KERNEL); + if (!dev_entry->common) + BUG(); + memset(dev_entry->common, 0x0, sizeof(struct + sn_flush_device_common)); + + status = sal_get_device_dmaflush_list(nasid, + widget, + device, + (u64)(dev_entry->common)); + if (status) + BUG(); - spin_lock_init(&sn_flush_device_list->sfdl_flush_lock); - hubdev->hdi_flush_nasid_list.widget_p[widget] = - sn_flush_device_list; - } + spin_lock_init(&dev_entry->sfdl_flush_lock); + } + if (sn_flush_device_kernel) + hubdev->hdi_flush_nasid_list.widget_p[widget] = + sn_flush_device_kernel; + } } - } /* diff -urNp fedora-orig/arch/ia64/sn/pci/pcibr/pcibr_dma.c fedora-work/arch/ia64/sn/pci/pcibr/pcibr_dma.c --- fedora-orig/arch/ia64/sn/pci/pcibr/pcibr_dma.c 2006-01-03 10:36:41.000000000 -0500 +++ fedora-work/arch/ia64/sn/pci/pcibr/pcibr_dma.c 2006-01-03 10:37:21.000000000 -0500 @@ -218,7 +218,9 @@ void sn_dma_flush(uint64_t addr) uint64_t flags; uint64_t itte; struct hubdev_info *hubinfo; - volatile struct sn_flush_device_list *p; + volatile struct sn_flush_device_kernel *p; + volatile struct sn_flush_device_common *common; + struct sn_flush_nasid_entry *flush_nasid_list; if (!sn_ioif_inited) @@ -268,17 +270,17 @@ void sn_dma_flush(uint64_t addr) p = &flush_nasid_list->widget_p[wid_num][0]; /* find a matching BAR */ - for (i = 0; i < DEV_PER_WIDGET; i++) { + for (i = 0; i < DEV_PER_WIDGET; i++,p++) { + common = p->common; for (j = 0; j < PCI_ROM_RESOURCE; j++) { - if (p->sfdl_bar_list[j].start == 0) + if (common->sfdl_bar_list[j].start == 0) break; - if (addr >= p->sfdl_bar_list[j].start - && addr <= p->sfdl_bar_list[j].end) + if (addr >= common->sfdl_bar_list[j].start + && addr <= common->sfdl_bar_list[j].end) break; } - if (j < PCI_ROM_RESOURCE && p->sfdl_bar_list[j].start != 0) + if (j < PCI_ROM_RESOURCE && common->sfdl_bar_list[j].start != 0) break; - p++; } /* if no matching BAR, return without doing anything. */ @@ -304,24 +306,24 @@ void sn_dma_flush(uint64_t addr) if ((1 << XWIDGET_PART_REV_NUM_REV(revnum)) & PV907516) { return; } else { - pcireg_wrb_flush_get(p->sfdl_pcibus_info, - (p->sfdl_slot - 1)); + pcireg_wrb_flush_get(common->sfdl_pcibus_info, + (common->sfdl_slot - 1)); } } else { - spin_lock_irqsave(&((struct sn_flush_device_list *)p)-> - sfdl_flush_lock, flags); - - *p->sfdl_flush_addr = 0; + spin_lock_irqsave((spinlock_t *)&p->sfdl_flush_lock, + flags); + *common->sfdl_flush_addr = 0; /* force an interrupt. */ - *(volatile uint32_t *)(p->sfdl_force_int_addr) = 1; + *(volatile uint32_t *)(common->sfdl_force_int_addr) = 1; /* wait for the interrupt to come back. */ - while (*(p->sfdl_flush_addr) != 0x10f) + while (*(common->sfdl_flush_addr) != 0x10f) cpu_relax(); /* okay, everything is synched up. */ - spin_unlock_irqrestore((spinlock_t *)&p->sfdl_flush_lock, flags); + spin_unlock_irqrestore((spinlock_t *)&p->sfdl_flush_lock, + flags); } return; } diff -urNp fedora-orig/arch/ia64/sn/pci/pcibr/pcibr_provider.c fedora-work/arch/ia64/sn/pci/pcibr/pcibr_provider.c --- fedora-orig/arch/ia64/sn/pci/pcibr/pcibr_provider.c 2006-01-03 10:36:41.000000000 -0500 +++ fedora-work/arch/ia64/sn/pci/pcibr/pcibr_provider.c 2006-01-03 10:37:21.000000000 -0500 @@ -92,7 +92,8 @@ pcibr_bus_fixup(struct pcibus_bussoft *p cnodeid_t near_cnode; struct hubdev_info *hubdev_info; struct pcibus_info *soft; - struct sn_flush_device_list *sn_flush_device_list; + struct sn_flush_device_kernel *sn_flush_device_kernel; + struct sn_flush_device_common *common; if (! IS_PCI_BRIDGE_ASIC(prom_bussoft->bs_asic_type)) { return NULL; @@ -137,20 +138,19 @@ pcibr_bus_fixup(struct pcibus_bussoft *p hubdev_info = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo); if (hubdev_info->hdi_flush_nasid_list.widget_p) { - sn_flush_device_list = hubdev_info->hdi_flush_nasid_list. + sn_flush_device_kernel = hubdev_info->hdi_flush_nasid_list. widget_p[(int)soft->pbi_buscommon.bs_xid]; - if (sn_flush_device_list) { + if (sn_flush_device_kernel) { for (j = 0; j < DEV_PER_WIDGET; - j++, sn_flush_device_list++) { - if (sn_flush_device_list->sfdl_slot == -1) + j++, sn_flush_device_kernel++) { + common = sn_flush_device_kernel->common; + if (common->sfdl_slot == -1) continue; - if ((sn_flush_device_list-> - sfdl_persistent_segment == + if ((common->sfdl_persistent_segment == soft->pbi_buscommon.bs_persist_segment) && - (sn_flush_device_list-> - sfdl_persistent_busnum == + (common->sfdl_persistent_busnum == soft->pbi_buscommon.bs_persist_busnum)) - sn_flush_device_list->sfdl_pcibus_info = + common->sfdl_pcibus_info = soft; } } diff -urNp fedora-orig/include/asm-ia64/sn/sn_sal.h fedora-work/include/asm-ia64/sn/sn_sal.h --- fedora-orig/include/asm-ia64/sn/sn_sal.h 2006-01-03 10:36:41.000000000 -0500 +++ fedora-work/include/asm-ia64/sn/sn_sal.h 2006-01-03 10:37:21.000000000 -0500 @@ -75,7 +75,8 @@ #define SN_SAL_IOIF_GET_HUBDEV_INFO 0x02000055 #define SN_SAL_IOIF_GET_PCIBUS_INFO 0x02000056 #define SN_SAL_IOIF_GET_PCIDEV_INFO 0x02000057 -#define SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST 0x02000058 +#define SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST 0x02000058 // deprecated +#define SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST 0x0200005a #define SN_SAL_HUB_ERROR_INTERRUPT 0x02000060 #define SN_SAL_BTE_RECOVER 0x02000061 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1816 retrieving revision 1.1817 diff -u -r1.1816 -r1.1817 --- kernel-2.6.spec 3 Jan 2006 15:50:32 -0000 1.1816 +++ kernel-2.6.spec 3 Jan 2006 21:32:51 -0000 1.1817 @@ -241,6 +241,8 @@ Patch316: linux-2.6-cell-iommu.patch # 400 - 499 ia64 +Patch400: linux-2.6-ia64-spinlock-size.patch + # 500 - 599 s390(x) # 600 - 699 sparc(64) @@ -666,6 +668,10 @@ # Handle new Cell boards with >512MiB RAM %patch316 -p1 +# IA64 +# Altix: Fix sn_flush_device_kernel & spinlock initialization +%patch400 -p1 + # # Xen # @@ -1390,6 +1396,7 @@ %changelog * Tue Jan 3 2006 Dave Jones - Update to 2.6.15 final. +- Altix: Fix sn_flush_device_kernel & spinlock initialization. (#176827) * Mon Jan 02 2006 David Woodhouse - Merge experimental Broadcom wireless driver From fedora-cvs-commits at redhat.com Tue Jan 3 21:54:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 16:54:33 -0500 Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.7,1.8 Message-ID: <200601032154.k03LsXBT025451@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/compat-gcc-296/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25326 Modified Files: compat-gcc-296.spec Log Message: 2.96-134 Index: compat-gcc-296.spec =================================================================== RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- compat-gcc-296.spec 17 Dec 2005 11:03:51 -0000 1.7 +++ compat-gcc-296.spec 3 Jan 2006 21:54:31 -0000 1.8 @@ -1,6 +1,6 @@ %define DATE 20000731 %define gcc_version 2.96 -%define gcc_release 133 +%define gcc_release 134 Summary: 2.96-RH compatibility libraries Name: compat-gcc-296 Version: %{gcc_version} @@ -1088,6 +1088,10 @@ %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o %changelog +* Tue Jan 3 2006 Jakub Jelinek 2.96-134 +- rebuilt against glibc-2.3.90-25 to pick up a sanitized + (#176745) + * Sat Dec 17 2005 Jakub Jelinek 2.96-133 - rebuilt with new gcc, massage $RPM_OPT_FLAGS, as GCC 2.96-RH doesn't grok -fstack-protector etc. From fedora-cvs-commits at redhat.com Tue Jan 3 23:05:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 18:05:08 -0500 Subject: rpms/kernel/devel linux-2.6-bcm43xx-quiet.patch, NONE, 1.1 linux-2.6-bcm43xx-resume.patch, NONE, 1.1 kernel-2.6.spec, 1.1817, 1.1818 Message-ID: <200601032305.k03N58Yn002727@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2684 Modified Files: kernel-2.6.spec Added Files: linux-2.6-bcm43xx-quiet.patch linux-2.6-bcm43xx-resume.patch Log Message: bcm43xx update linux-2.6-bcm43xx-quiet.patch: bcm43xx_main.c | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE linux-2.6-bcm43xx-quiet.patch --- --- linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c~ 2006-01-03 22:56:55.000000000 +0000 +++ linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-01-03 22:57:24.000000000 +0000 @@ -4176,8 +4176,6 @@ int fastcall bcm43xx_rx(struct bcm43xx_p case IEEE80211_FTYPE_DATA: if (is_packet_for_us) err = bcm43xx_rx_packet(bcm, skb, &stats); - else - dprintkl(KERN_ERR PFX "RX packet dropped (not for us)\n"); break; case IEEE80211_FTYPE_CTL: break; linux-2.6-bcm43xx-resume.patch: bcm43xx_main.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6-bcm43xx-resume.patch --- --- linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c~ 2006-01-03 22:56:55.000000000 +0000 +++ linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-01-03 23:00:15.000000000 +0000 @@ -4543,6 +4541,7 @@ static int bcm43xx_resume(struct pci_dev } netif_device_attach(net_dev); + queue_work(bcm->softmac->workqueue,&bcm->softmac->associnfo.work); dprintk(KERN_INFO PFX "Device resumed.\n"); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1817 retrieving revision 1.1818 diff -u -r1.1817 -r1.1818 --- kernel-2.6.spec 3 Jan 2006 21:32:51 -0000 1.1817 +++ kernel-2.6.spec 3 Jan 2006 23:04:52 -0000 1.1818 @@ -381,9 +381,11 @@ # Broadcom wireless driver Patch5000: linux-2.6-bcm43xx.patch +Patch5001: linux-2.6-bcm43xx-quiet.patch Patch5002: linux-2.6-bcm43xx-promisc.patch Patch5003: linux-2.6.14-ieee80211-hw-wep.patch Patch5004: linux-2.6-bcm43xx-device-table.patch +Patch5005: linux-2.6-bcm43xx-resume.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -900,12 +902,16 @@ # Patch Kconfig and Makefiles to merge it 'properly' %patch5000 -p1 +# Make it shut up about dropping packets it didn't want +%patch5001 -p1 # Operate in promiscuous mode, to make multicast and broadcast RX work %patch5002 -p1 # Handle host_build_iv properly %patch5003 -p1 # Include pci device table so it gets autoloaded %patch5004 -p1 +# Reassociate on resume +%patch5005 -p1 # # final stuff @@ -1394,6 +1400,10 @@ %endif %changelog +* Tue Jan 3 2006 David Woodhouse +- Make bcm43xx quieter when dropping packets, and make it reassociate on + resume + * Tue Jan 3 2006 Dave Jones - Update to 2.6.15 final. - Altix: Fix sn_flush_device_kernel & spinlock initialization. (#176827) From fedora-cvs-commits at redhat.com Wed Jan 4 00:48:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 19:48:52 -0500 Subject: rpms/mkinitrd/devel .cvsignore, 1.85, 1.86 mkinitrd.spec, 1.93, 1.94 sources, 1.90, 1.91 Message-ID: <200601040048.k040mqF4006497@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6482 Modified Files: .cvsignore mkinitrd.spec sources Log Message: update to .17 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- .cvsignore 3 Jan 2006 21:16:33 -0000 1.85 +++ .cvsignore 4 Jan 2006 00:48:50 -0000 1.86 @@ -1 +1 @@ -mkinitrd-5.0.16.tar.bz2 +mkinitrd-5.0.17.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- mkinitrd.spec 3 Jan 2006 21:16:33 -0000 1.93 +++ mkinitrd.spec 4 Jan 2006 00:48:50 -0000 1.94 @@ -1,6 +1,6 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 5.0.16 +Version: 5.0.17 Release: 1 License: GPL Group: System Environment/Base @@ -62,6 +62,9 @@ %attr(644,root,root) %{_mandir}/man8/grubby.8* %changelog +* Tue Jan 3 2006 Peter Jones - 5.0.17-1 +- fix dm operations to create/remove device nodes during each change. + * Tue Jan 3 2006 Peter Jones - 5.0.16-1 - Hopefully fix raid autorun with a patch from Paul Flinders. Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- sources 3 Jan 2006 21:16:33 -0000 1.90 +++ sources 4 Jan 2006 00:48:50 -0000 1.91 @@ -1 +1 @@ -2b5f8061651fd8c88e64c1ffc9ccf525 mkinitrd-5.0.16.tar.bz2 +c8fd06a436bd45c7294bc11ea02c9227 mkinitrd-5.0.17.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 4 02:13:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 21:13:44 -0500 Subject: rpms/kernel/devel linux-2.6-gcc41.patch,1.4,1.5 Message-ID: <200601040213.k042Dig3000739@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv649 Modified Files: linux-2.6-gcc41.patch Log Message: more build noise silencing. linux-2.6-gcc41.patch: linux-2.6.14/include/asm-x86_64/apic.h | 2 linux-2.6.14/include/asm-x86_64/mpspec.h | 2 linux-2.6/drivers/isdn/act2000/capi.h | 88 +++++++++--------- linux-2.6/drivers/isdn/hisax/hisax.h | 20 ++-- linux-2.6/drivers/isdn/hisax/hisax_fcpcipnp.h | 18 +-- linux-2.6/drivers/net/3c527.h | 50 +++++----- linux-2.6/drivers/net/irda/vlsi_ir.h | 4 linux-2.6/drivers/net/wan/sdla.c | 6 - linux-2.6/fs/afs/volume.h | 4 linux-2.6/include/asm-i386/mpspec_def.h | 4 linux-2.6/include/linux/atalk.h | 18 +-- linux-2.6/include/linux/cycx_x25.h | 66 ++++++------- linux-2.6/include/linux/if_frad.h | 12 +- linux-2.6/include/linux/isdnif.h | 70 +++++++------- linux-2.6/include/linux/ncp.h | 126 +++++++++++++------------- linux-2.6/include/linux/sdla.h | 64 ++++++------- linux-2.6/include/linux/wavefront.h | 34 +++---- linux-2.6/include/net/dn_dev.h | 80 ++++++++-------- linux-2.6/include/net/dn_nsp.h | 74 +++++++-------- linux-2.6/include/sound/wavefront.h | 34 +++---- 20 files changed, 387 insertions(+), 389 deletions(-) Index: linux-2.6-gcc41.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gcc41.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-gcc41.patch 30 Dec 2005 20:19:22 -0000 1.4 +++ linux-2.6-gcc41.patch 4 Jan 2006 02:13:39 -0000 1.5 @@ -12,18 +12,6 @@ }; /* List of Bus Type string values, Intel MP Spec. */ ---- linux-2.6.14/include/asm-i386/mpspec_def.h~ 2005-12-06 23:06:23.000000000 -0500 -+++ linux-2.6.14/include/asm-i386/mpspec_def.h 2005-12-06 23:06:29.000000000 -0500 -@@ -75,7 +75,7 @@ struct mpc_config_bus - { - unsigned char mpc_type; - unsigned char mpc_busid; -- unsigned char mpc_bustype[6] __attribute((packed)); -+ unsigned char mpc_bustype[6]; - }; - - /* List of Bus Type string values, Intel MP Spec. */ - Prevent a zillion 'value computed is not used' warnings. @@ -39,3 +27,1293 @@ } static __inline unsigned int apic_read(unsigned long reg) + + +Since version 4.1 the gcc is warning about ignored attributes. This patch is +using the equivalent attribute on the struct instead of on each of the +structure or union members. + +GCC Manual: + "Specifying Attributes of Types + + packed + This attribute, attached to struct or union type definition, specifies + that + each member of the structure or union is placed to minimize the memory + required. When attached to an enum definition, it indicates that the + smallest integral type should be used. + + Specifying this attribute for struct and union types is equivalent to + specifying the packed attribute on each of the structure or union + members." + +Signed-off-by: Jan Blunck + +--8JPrznbw0YAQ/KXy +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename="eliminate-packed-warnings-2.diff" + + drivers/isdn/hisax/hisax.h | 20 ++--- + drivers/isdn/hisax/hisax_fcpcipnp.h | 18 ++--- + drivers/net/3c527.h | 50 +++++++------- + drivers/net/irda/vlsi_ir.h | 4 - + drivers/net/wan/sdla.c | 6 - + include/asm-i386/mpspec_def.h | 4 - + include/linux/atalk.h | 18 ++--- + include/linux/cycx_x25.h | 66 +++++++++--------- + include/linux/if_frad.h | 12 +-- + include/linux/isdnif.h | 70 ++++++++++---------- + include/linux/ncp.h | 126 ++++++++++++++++++------------------ + include/linux/sdla.h | 64 +++++++++--------- + include/linux/wavefront.h | 34 ++++----- + include/net/dn_dev.h | 80 +++++++++++----------- + include/net/dn_nsp.h | 74 ++++++++++----------- + include/sound/wavefront.h | 34 ++++----- + 16 files changed, 340 insertions(+), 340 deletions(-) + +Index: linux-2.6/include/asm-i386/mpspec_def.h +=================================================================== +--- linux-2.6.orig/include/asm-i386/mpspec_def.h ++++ linux-2.6/include/asm-i386/mpspec_def.h +@@ -75,8 +75,8 @@ struct mpc_config_bus + { + unsigned char mpc_type; + unsigned char mpc_busid; +- unsigned char mpc_bustype[6] __attribute((packed)); +-}; ++ unsigned char mpc_bustype[6]; ++} __attribute((packed)); + + /* List of Bus Type string values, Intel MP Spec. */ + #define BUSTYPE_EISA "EISA" +Index: linux-2.6/include/linux/if_frad.h +=================================================================== +--- linux-2.6.orig/include/linux/if_frad.h ++++ linux-2.6/include/linux/if_frad.h +@@ -131,17 +131,17 @@ struct frad_conf + /* these are the fields of an RFC 1490 header */ + struct frhdr + { +- unsigned char control __attribute__((packed)); ++ unsigned char control; + + /* for IP packets, this can be the NLPID */ +- unsigned char pad __attribute__((packed)); ++ unsigned char pad; + +- unsigned char NLPID __attribute__((packed)); +- unsigned char OUI[3] __attribute__((packed)); +- unsigned short PID __attribute__((packed)); ++ unsigned char NLPID; ++ unsigned char OUI[3]; ++ unsigned short PID; + + #define IP_NLPID pad +-}; ++} __attribute__((packed)); + + /* see RFC 1490 for the definition of the following */ + #define FRAD_I_UI 0x03 +Index: linux-2.6/include/linux/isdnif.h +=================================================================== +--- linux-2.6.orig/include/linux/isdnif.h ++++ linux-2.6/include/linux/isdnif.h +@@ -282,43 +282,43 @@ typedef struct setup_parm { + + typedef struct T30_s { + /* session parameters */ +- __u8 resolution __attribute__ ((packed)); +- __u8 rate __attribute__ ((packed)); +- __u8 width __attribute__ ((packed)); +- __u8 length __attribute__ ((packed)); +- __u8 compression __attribute__ ((packed)); +- __u8 ecm __attribute__ ((packed)); +- __u8 binary __attribute__ ((packed)); +- __u8 scantime __attribute__ ((packed)); +- __u8 id[FAXIDLEN] __attribute__ ((packed)); ++ __u8 resolution; ++ __u8 rate ; ++ __u8 width ; ++ __u8 length ; ++ __u8 compression ; ++ __u8 ecm ; ++ __u8 binary ; ++ __u8 scantime ; ++ __u8 id[FAXIDLEN] ; + /* additional parameters */ +- __u8 phase __attribute__ ((packed)); +- __u8 direction __attribute__ ((packed)); +- __u8 code __attribute__ ((packed)); +- __u8 badlin __attribute__ ((packed)); +- __u8 badmul __attribute__ ((packed)); +- __u8 bor __attribute__ ((packed)); +- __u8 fet __attribute__ ((packed)); +- __u8 pollid[FAXIDLEN] __attribute__ ((packed)); +- __u8 cq __attribute__ ((packed)); +- __u8 cr __attribute__ ((packed)); +- __u8 ctcrty __attribute__ ((packed)); +- __u8 minsp __attribute__ ((packed)); +- __u8 phcto __attribute__ ((packed)); +- __u8 rel __attribute__ ((packed)); +- __u8 nbc __attribute__ ((packed)); ++ __u8 phase; ++ __u8 direction; ++ __u8 code; ++ __u8 badlin; ++ __u8 badmul; ++ __u8 bor; ++ __u8 fet; ++ __u8 pollid[FAXIDLEN]; ++ __u8 cq; ++ __u8 cr; ++ __u8 ctcrty; ++ __u8 minsp; ++ __u8 phcto; ++ __u8 rel; ++ __u8 nbc; + /* remote station parameters */ +- __u8 r_resolution __attribute__ ((packed)); +- __u8 r_rate __attribute__ ((packed)); +- __u8 r_width __attribute__ ((packed)); +- __u8 r_length __attribute__ ((packed)); +- __u8 r_compression __attribute__ ((packed)); +- __u8 r_ecm __attribute__ ((packed)); +- __u8 r_binary __attribute__ ((packed)); +- __u8 r_scantime __attribute__ ((packed)); +- __u8 r_id[FAXIDLEN] __attribute__ ((packed)); +- __u8 r_code __attribute__ ((packed)); +-} T30_s; ++ __u8 r_resolution; ++ __u8 r_rate; ++ __u8 r_width; ++ __u8 r_length; ++ __u8 r_compression; ++ __u8 r_ecm; ++ __u8 r_binary; ++ __u8 r_scantime; ++ __u8 r_id[FAXIDLEN]; ++ __u8 r_code; ++} __attribute__((packed)) T30_s; + + #define ISDN_TTY_FAX_CONN_IN 0 + #define ISDN_TTY_FAX_CONN_OUT 1 +Index: linux-2.6/include/linux/ncp.h +=================================================================== +--- linux-2.6.orig/include/linux/ncp.h ++++ linux-2.6/include/linux/ncp.h +@@ -20,29 +20,29 @@ + #define NCP_DEALLOC_SLOT_REQUEST (0x5555) + + struct ncp_request_header { +- __u16 type __attribute__((packed)); +- __u8 sequence __attribute__((packed)); +- __u8 conn_low __attribute__((packed)); +- __u8 task __attribute__((packed)); +- __u8 conn_high __attribute__((packed)); +- __u8 function __attribute__((packed)); +- __u8 data[0] __attribute__((packed)); +-}; ++ __u16 type; ++ __u8 sequence; ++ __u8 conn_low; ++ __u8 task; ++ __u8 conn_high; ++ __u8 function; ++ __u8 data[0]; ++} __attribute__((packed)); + + #define NCP_REPLY (0x3333) + #define NCP_WATCHDOG (0x3E3E) + #define NCP_POSITIVE_ACK (0x9999) + + struct ncp_reply_header { +- __u16 type __attribute__((packed)); +- __u8 sequence __attribute__((packed)); +- __u8 conn_low __attribute__((packed)); +- __u8 task __attribute__((packed)); +- __u8 conn_high __attribute__((packed)); +- __u8 completion_code __attribute__((packed)); +- __u8 connection_state __attribute__((packed)); +- __u8 data[0] __attribute__((packed)); +-}; ++ __u16 type; ++ __u8 sequence; ++ __u8 conn_low; ++ __u8 task; ++ __u8 conn_high; ++ __u8 completion_code; ++ __u8 connection_state; ++ __u8 data[0]; ++} __attribute__((packed)); + + #define NCP_VOLNAME_LEN (16) + #define NCP_NUMBER_OF_VOLUMES (256) +@@ -128,37 +128,37 @@ struct nw_nfs_info { + }; + + struct nw_info_struct { +- __u32 spaceAlloc __attribute__((packed)); +- __le32 attributes __attribute__((packed)); +- __u16 flags __attribute__((packed)); +- __le32 dataStreamSize __attribute__((packed)); +- __le32 totalStreamSize __attribute__((packed)); +- __u16 numberOfStreams __attribute__((packed)); +- __le16 creationTime __attribute__((packed)); +- __le16 creationDate __attribute__((packed)); +- __u32 creatorID __attribute__((packed)); +- __le16 modifyTime __attribute__((packed)); +- __le16 modifyDate __attribute__((packed)); +- __u32 modifierID __attribute__((packed)); +- __le16 lastAccessDate __attribute__((packed)); +- __u16 archiveTime __attribute__((packed)); +- __u16 archiveDate __attribute__((packed)); +- __u32 archiverID __attribute__((packed)); +- __u16 inheritedRightsMask __attribute__((packed)); +- __le32 dirEntNum __attribute__((packed)); +- __le32 DosDirNum __attribute__((packed)); +- __u32 volNumber __attribute__((packed)); +- __u32 EADataSize __attribute__((packed)); +- __u32 EAKeyCount __attribute__((packed)); +- __u32 EAKeySize __attribute__((packed)); +- __u32 NSCreator __attribute__((packed)); +- __u8 nameLen __attribute__((packed)); +- __u8 entryName[256] __attribute__((packed)); ++ __u32 spaceAlloc; ++ __le32 attributes; ++ __u16 flags; ++ __le32 dataStreamSize; ++ __le32 totalStreamSize; ++ __u16 numberOfStreams; ++ __le16 creationTime; ++ __le16 creationDate; ++ __u32 creatorID; ++ __le16 modifyTime; ++ __le16 modifyDate; ++ __u32 modifierID; ++ __le16 lastAccessDate; ++ __u16 archiveTime; ++ __u16 archiveDate; ++ __u32 archiverID; ++ __u16 inheritedRightsMask; ++ __le32 dirEntNum; ++ __le32 DosDirNum; ++ __u32 volNumber; ++ __u32 EADataSize; ++ __u32 EAKeyCount; ++ __u32 EAKeySize; ++ __u32 NSCreator; ++ __u8 nameLen; ++ __u8 entryName[256]; + /* libncp may depend on there being nothing after entryName */ + #ifdef __KERNEL__ + struct nw_nfs_info nfs; + #endif +-}; ++} __attribute__((packed)); + + /* modify mask - use with MODIFY_DOS_INFO structure */ + #define DM_ATTRIBUTES (cpu_to_le32(0x02)) +@@ -176,26 +176,26 @@ struct nw_info_struct { + #define DM_MAXIMUM_SPACE (cpu_to_le32(0x2000)) + + struct nw_modify_dos_info { +- __le32 attributes __attribute__((packed)); +- __le16 creationDate __attribute__((packed)); +- __le16 creationTime __attribute__((packed)); +- __u32 creatorID __attribute__((packed)); +- __le16 modifyDate __attribute__((packed)); +- __le16 modifyTime __attribute__((packed)); +- __u32 modifierID __attribute__((packed)); +- __u16 archiveDate __attribute__((packed)); +- __u16 archiveTime __attribute__((packed)); +- __u32 archiverID __attribute__((packed)); +- __le16 lastAccessDate __attribute__((packed)); +- __u16 inheritanceGrantMask __attribute__((packed)); +- __u16 inheritanceRevokeMask __attribute__((packed)); +- __u32 maximumSpace __attribute__((packed)); +-}; ++ __le32 attributes; ++ __le16 creationDate; ++ __le16 creationTime; ++ __u32 creatorID; ++ __le16 modifyDate; ++ __le16 modifyTime; ++ __u32 modifierID; ++ __u16 archiveDate; ++ __u16 archiveTime; ++ __u32 archiverID; ++ __le16 lastAccessDate; ++ __u16 inheritanceGrantMask; ++ __u16 inheritanceRevokeMask; ++ __u32 maximumSpace; ++} __attribute__((packed)); + + struct nw_search_sequence { +- __u8 volNumber __attribute__((packed)); +- __u32 dirBase __attribute__((packed)); +- __u32 sequence __attribute__((packed)); +-}; ++ __u8 volNumber; ++ __u32 dirBase; ++ __u32 sequence; ++} __attribute__((packed)); + + #endif /* _LINUX_NCP_H */ +Index: linux-2.6/drivers/isdn/hisax/hisax.h +=================================================================== +--- linux-2.6.orig/drivers/isdn/hisax/hisax.h ++++ linux-2.6/drivers/isdn/hisax/hisax.h +@@ -396,17 +396,17 @@ struct isar_hw { + + struct hdlc_stat_reg { + #ifdef __BIG_ENDIAN +- u_char fill __attribute__((packed)); +- u_char mode __attribute__((packed)); +- u_char xml __attribute__((packed)); +- u_char cmd __attribute__((packed)); +-#else +- u_char cmd __attribute__((packed)); +- u_char xml __attribute__((packed)); +- u_char mode __attribute__((packed)); +- u_char fill __attribute__((packed)); ++ u_char fill; ++ u_char mode; ++ u_char xml; ++ u_char cmd; ++#else ++ u_char cmd; ++ u_char xml; ++ u_char mode; ++ u_char fill; + #endif +-}; ++} __attribute__((packed)); + + struct hdlc_hw { + union { +Index: linux-2.6/drivers/isdn/hisax/hisax_fcpcipnp.h +=================================================================== +--- linux-2.6.orig/drivers/isdn/hisax/hisax_fcpcipnp.h ++++ linux-2.6/drivers/isdn/hisax/hisax_fcpcipnp.h +@@ -12,17 +12,17 @@ enum { + + struct hdlc_stat_reg { + #ifdef __BIG_ENDIAN +- u_char fill __attribute__((packed)); +- u_char mode __attribute__((packed)); +- u_char xml __attribute__((packed)); +- u_char cmd __attribute__((packed)); ++ u_char fill; ++ u_char mode; ++ u_char xml; ++ u_char cmd; + #else +- u_char cmd __attribute__((packed)); +- u_char xml __attribute__((packed)); +- u_char mode __attribute__((packed)); +- u_char fill __attribute__((packed)); ++ u_char cmd; ++ u_char xml; ++ u_char mode; ++ u_char fill; + #endif +-}; ++} __attribute__((packed)); + + struct fritz_bcs { + struct hisax_b_if b_if; +Index: linux-2.6/drivers/net/3c527.h +=================================================================== +--- linux-2.6.orig/drivers/net/3c527.h ++++ linux-2.6/drivers/net/3c527.h +@@ -32,43 +32,43 @@ + + struct mc32_mailbox + { +- u16 mbox __attribute((packed)); +- u16 data[1] __attribute((packed)); +-}; ++ u16 mbox; ++ u16 data[1]; ++} __attribute((packed)); + + struct skb_header + { +- u8 status __attribute((packed)); +- u8 control __attribute((packed)); +- u16 next __attribute((packed)); /* Do not change! */ +- u16 length __attribute((packed)); +- u32 data __attribute((packed)); +-}; ++ u8 status; ++ u8 control; ++ u16 next; /* Do not change! */ ++ u16 length; ++ u32 data; ++} __attribute((packed)); + + struct mc32_stats + { + /* RX Errors */ +- u32 rx_crc_errors __attribute((packed)); +- u32 rx_alignment_errors __attribute((packed)); +- u32 rx_overrun_errors __attribute((packed)); +- u32 rx_tooshort_errors __attribute((packed)); +- u32 rx_toolong_errors __attribute((packed)); +- u32 rx_outofresource_errors __attribute((packed)); ++ u32 rx_crc_errors; ++ u32 rx_alignment_errors; ++ u32 rx_overrun_errors; ++ u32 rx_tooshort_errors; ++ u32 rx_toolong_errors; ++ u32 rx_outofresource_errors; + +- u32 rx_discarded __attribute((packed)); /* via card pattern match filter */ ++ u32 rx_discarded; /* via card pattern match filter */ + + /* TX Errors */ +- u32 tx_max_collisions __attribute((packed)); +- u32 tx_carrier_errors __attribute((packed)); +- u32 tx_underrun_errors __attribute((packed)); +- u32 tx_cts_errors __attribute((packed)); +- u32 tx_timeout_errors __attribute((packed)) ; ++ u32 tx_max_collisions; ++ u32 tx_carrier_errors; ++ u32 tx_underrun_errors; ++ u32 tx_cts_errors; ++ u32 tx_timeout_errors; + + /* various cruft */ +- u32 dataA[6] __attribute((packed)); +- u16 dataB[5] __attribute((packed)); +- u32 dataC[14] __attribute((packed)); +-}; ++ u32 dataA[6]; ++ u16 dataB[5]; ++ u32 dataC[14]; ++} __attribute((packed)); + + #define STATUS_MASK 0x0F + #define COMPLETED (1<<7) +Index: linux-2.6/drivers/net/irda/vlsi_ir.h +=================================================================== +--- linux-2.6.orig/drivers/net/irda/vlsi_ir.h ++++ linux-2.6/drivers/net/irda/vlsi_ir.h +@@ -577,8 +577,8 @@ struct ring_descr_hw { + struct { + u8 addr_res[3]; + volatile u8 status; /* descriptor status */ +- } rd_s __attribute__((packed)); +- } rd_u __attribute((packed)); ++ } __attribute__((packed)) rd_s; ++ } __attribute((packed)) rd_u; + } __attribute__ ((packed)); + + #define rd_addr rd_u.addr +Index: linux-2.6/include/linux/atalk.h +=================================================================== +--- linux-2.6.orig/include/linux/atalk.h ++++ linux-2.6/include/linux/atalk.h +@@ -155,15 +155,15 @@ struct elapaarp { + #define AARP_REQUEST 1 + #define AARP_REPLY 2 + #define AARP_PROBE 3 +- __u8 hw_src[ETH_ALEN] __attribute__ ((packed)); +- __u8 pa_src_zero __attribute__ ((packed)); +- __be16 pa_src_net __attribute__ ((packed)); +- __u8 pa_src_node __attribute__ ((packed)); +- __u8 hw_dst[ETH_ALEN] __attribute__ ((packed)); +- __u8 pa_dst_zero __attribute__ ((packed)); +- __be16 pa_dst_net __attribute__ ((packed)); +- __u8 pa_dst_node __attribute__ ((packed)); +-}; ++ __u8 hw_src[ETH_ALEN]; ++ __u8 pa_src_zero; ++ __be16 pa_src_net; ++ __u8 pa_src_node; ++ __u8 hw_dst[ETH_ALEN]; ++ __u8 pa_dst_zero; ++ __be16 pa_dst_net; ++ __u8 pa_dst_node; ++} __attribute__ ((packed)); + + static __inline__ struct elapaarp *aarp_hdr(struct sk_buff *skb) + { +Index: linux-2.6/include/linux/cycx_x25.h +=================================================================== +--- linux-2.6.orig/include/linux/cycx_x25.h ++++ linux-2.6/include/linux/cycx_x25.h +@@ -38,11 +38,11 @@ extern unsigned int cycx_debug; + /* Data Structures */ + /* X.25 Command Block. */ + struct cycx_x25_cmd { +- u16 command PACKED; +- u16 link PACKED; /* values: 0 or 1 */ +- u16 len PACKED; /* values: 0 thru 0x205 (517) */ +- u32 buf PACKED; +-}; ++ u16 command; ++ u16 link; /* values: 0 or 1 */ ++ u16 len; /* values: 0 thru 0x205 (517) */ ++ u32 buf; ++} PACKED; + + /* Defines for the 'command' field. */ + #define X25_CONNECT_REQUEST 0x4401 +@@ -92,34 +92,34 @@ struct cycx_x25_cmd { + * @flags - see dosx25.doc, in portuguese, for details + */ + struct cycx_x25_config { +- u8 link PACKED; +- u8 speed PACKED; +- u8 clock PACKED; +- u8 n2 PACKED; +- u8 n2win PACKED; +- u8 n3win PACKED; +- u8 nvc PACKED; +- u8 pktlen PACKED; +- u8 locaddr PACKED; +- u8 remaddr PACKED; +- u16 t1 PACKED; +- u16 t2 PACKED; +- u8 t21 PACKED; +- u8 npvc PACKED; +- u8 t23 PACKED; +- u8 flags PACKED; +-}; ++ u8 link; ++ u8 speed; ++ u8 clock; ++ u8 n2; ++ u8 n2win; ++ u8 n3win; ++ u8 nvc; ++ u8 pktlen; ++ u8 locaddr; ++ u8 remaddr; ++ u16 t1; ++ u16 t2; ++ u8 t21; ++ u8 npvc; ++ u8 t23; ++ u8 flags; ++} PACKED; + + struct cycx_x25_stats { +- u16 rx_crc_errors PACKED; +- u16 rx_over_errors PACKED; +- u16 n2_tx_frames PACKED; +- u16 n2_rx_frames PACKED; +- u16 tx_timeouts PACKED; +- u16 rx_timeouts PACKED; +- u16 n3_tx_packets PACKED; +- u16 n3_rx_packets PACKED; +- u16 tx_aborts PACKED; +- u16 rx_aborts PACKED; +-}; ++ u16 rx_crc_errors; ++ u16 rx_over_errors; ++ u16 n2_tx_frames; ++ u16 n2_rx_frames; ++ u16 tx_timeouts; ++ u16 rx_timeouts; ++ u16 n3_tx_packets; ++ u16 n3_rx_packets; ++ u16 tx_aborts; ++ u16 rx_aborts; ++} PACKED; + #endif /* _CYCX_X25_H */ +Index: linux-2.6/include/linux/sdla.h +=================================================================== +--- linux-2.6.orig/include/linux/sdla.h ++++ linux-2.6/include/linux/sdla.h +@@ -293,46 +293,46 @@ void sdla(void *cfg_info, char *dev, str + #define SDLA_S508_INTEN 0x10 + + struct sdla_cmd { +- char opp_flag __attribute__((packed)); +- char cmd __attribute__((packed)); +- short length __attribute__((packed)); +- char retval __attribute__((packed)); +- short dlci __attribute__((packed)); +- char flags __attribute__((packed)); +- short rxlost_int __attribute__((packed)); +- long rxlost_app __attribute__((packed)); +- char reserve[2] __attribute__((packed)); +- char data[SDLA_MAX_DATA] __attribute__((packed)); /* transfer data buffer */ +-}; ++ char opp_flag; ++ char cmd; ++ short length; ++ char retval; ++ short dlci; ++ char flags; ++ short rxlost_int; ++ long rxlost_app; ++ char reserve[2]; ++ char data[SDLA_MAX_DATA]; /* transfer data buffer */ ++} __attribute__((packed)); + + struct intr_info { +- char flags __attribute__((packed)); +- short txlen __attribute__((packed)); +- char irq __attribute__((packed)); +- char flags2 __attribute__((packed)); +- short timeout __attribute__((packed)); +-}; ++ char flags; ++ short txlen; ++ char irq; ++ char flags2; ++ short timeout; ++} __attribute__((packed)); + + /* found in the 508's control window at RXBUF_INFO */ + struct buf_info { +- unsigned short rse_num __attribute__((packed)); +- unsigned long rse_base __attribute__((packed)); +- unsigned long rse_next __attribute__((packed)); +- unsigned long buf_base __attribute__((packed)); +- unsigned short reserved __attribute__((packed)); +- unsigned long buf_top __attribute__((packed)); +-}; ++ unsigned short rse_num; ++ unsigned long rse_base; ++ unsigned long rse_next; ++ unsigned long buf_base; ++ unsigned short reserved; ++ unsigned long buf_top; ++} __attribute__((packed)); + + /* structure pointed to by rse_base in RXBUF_INFO struct */ + struct buf_entry { +- char opp_flag __attribute__((packed)); +- short length __attribute__((packed)); +- short dlci __attribute__((packed)); +- char flags __attribute__((packed)); +- short timestamp __attribute__((packed)); +- short reserved[2] __attribute__((packed)); +- long buf_addr __attribute__((packed)); +-}; ++ char opp_flag; ++ short length; ++ short dlci; ++ char flags; ++ short timestamp; ++ short reserved[2]; ++ long buf_addr; ++} __attribute__((packed)); + + #endif + +Index: linux-2.6/include/linux/wavefront.h +=================================================================== +--- linux-2.6.orig/include/linux/wavefront.h ++++ linux-2.6/include/linux/wavefront.h +@@ -434,22 +434,22 @@ typedef struct wf_multisample { + } wavefront_multisample; + + typedef struct wf_alias { +- INT16 OriginalSample __attribute__ ((packed)); ++ INT16 OriginalSample; + +- struct wf_sample_offset sampleStartOffset __attribute__ ((packed)); +- struct wf_sample_offset loopStartOffset __attribute__ ((packed)); +- struct wf_sample_offset sampleEndOffset __attribute__ ((packed)); +- struct wf_sample_offset loopEndOffset __attribute__ ((packed)); +- +- INT16 FrequencyBias __attribute__ ((packed)); +- +- UCHAR8 SampleResolution:2 __attribute__ ((packed)); +- UCHAR8 Unused1:1 __attribute__ ((packed)); +- UCHAR8 Loop:1 __attribute__ ((packed)); +- UCHAR8 Bidirectional:1 __attribute__ ((packed)); +- UCHAR8 Unused2:1 __attribute__ ((packed)); +- UCHAR8 Reverse:1 __attribute__ ((packed)); +- UCHAR8 Unused3:1 __attribute__ ((packed)); ++ struct wf_sample_offset sampleStartOffset; ++ struct wf_sample_offset loopStartOffset; ++ struct wf_sample_offset sampleEndOffset; ++ struct wf_sample_offset loopEndOffset; ++ ++ INT16 FrequencyBias; ++ ++ UCHAR8 SampleResolution:2; ++ UCHAR8 Unused1:1; ++ UCHAR8 Loop:1; ++ UCHAR8 Bidirectional:1; ++ UCHAR8 Unused2:1; ++ UCHAR8 Reverse:1; ++ UCHAR8 Unused3:1; + + /* This structure is meant to be padded only to 16 bits on their + original. Of course, whoever wrote their documentation didn't +@@ -460,8 +460,8 @@ typedef struct wf_alias { + standard 16->32 bit issues. + */ + +- UCHAR8 sixteen_bit_padding __attribute__ ((packed)); +-} wavefront_alias; ++ UCHAR8 sixteen_bit_padding; ++} __attribute__((packed)) wavefront_alias; + + typedef struct wf_drum { + UCHAR8 PatchNumber; +Index: linux-2.6/include/net/dn_dev.h +=================================================================== +--- linux-2.6.orig/include/net/dn_dev.h ++++ linux-2.6/include/net/dn_dev.h +@@ -99,57 +99,57 @@ struct dn_dev { + + struct dn_short_packet + { +- unsigned char msgflg __attribute__((packed)); +- unsigned short dstnode __attribute__((packed)); +- unsigned short srcnode __attribute__((packed)); +- unsigned char forward __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned short dstnode; ++ unsigned short srcnode; ++ unsigned char forward; ++} __attribute__((packed)); + + struct dn_long_packet + { +- unsigned char msgflg __attribute__((packed)); +- unsigned char d_area __attribute__((packed)); +- unsigned char d_subarea __attribute__((packed)); +- unsigned char d_id[6] __attribute__((packed)); +- unsigned char s_area __attribute__((packed)); +- unsigned char s_subarea __attribute__((packed)); +- unsigned char s_id[6] __attribute__((packed)); +- unsigned char nl2 __attribute__((packed)); +- unsigned char visit_ct __attribute__((packed)); +- unsigned char s_class __attribute__((packed)); +- unsigned char pt __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned char d_area; ++ unsigned char d_subarea; ++ unsigned char d_id[6]; ++ unsigned char s_area; ++ unsigned char s_subarea; ++ unsigned char s_id[6]; ++ unsigned char nl2; ++ unsigned char visit_ct; ++ unsigned char s_class; ++ unsigned char pt; ++} __attribute__((packed)); + + /*------------------------- DRP - Routing messages ---------------------*/ + + struct endnode_hello_message + { +- unsigned char msgflg __attribute__((packed)); +- unsigned char tiver[3] __attribute__((packed)); +- unsigned char id[6] __attribute__((packed)); +- unsigned char iinfo __attribute__((packed)); +- unsigned short blksize __attribute__((packed)); +- unsigned char area __attribute__((packed)); +- unsigned char seed[8] __attribute__((packed)); +- unsigned char neighbor[6] __attribute__((packed)); +- unsigned short timer __attribute__((packed)); +- unsigned char mpd __attribute__((packed)); +- unsigned char datalen __attribute__((packed)); +- unsigned char data[2] __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned char tiver[3]; ++ unsigned char id[6]; ++ unsigned char iinfo; ++ unsigned short blksize; ++ unsigned char area; ++ unsigned char seed[8]; ++ unsigned char neighbor[6]; ++ unsigned short timer; ++ unsigned char mpd; ++ unsigned char datalen; ++ unsigned char data[2]; ++} __attribute__((packed)); + + struct rtnode_hello_message + { +- unsigned char msgflg __attribute__((packed)); +- unsigned char tiver[3] __attribute__((packed)); +- unsigned char id[6] __attribute__((packed)); +- unsigned char iinfo __attribute__((packed)); +- unsigned short blksize __attribute__((packed)); +- unsigned char priority __attribute__((packed)); +- unsigned char area __attribute__((packed)); +- unsigned short timer __attribute__((packed)); +- unsigned char mpd __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned char tiver[3]; ++ unsigned char id[6]; ++ unsigned char iinfo; ++ unsigned short blksize; ++ unsigned char priority; ++ unsigned char area; ++ unsigned short timer; ++ unsigned char mpd; ++} __attribute__((packed)); + + + extern void dn_dev_init(void); +Index: linux-2.6/drivers/net/wan/sdla.c +=================================================================== +--- linux-2.6.orig/drivers/net/wan/sdla.c ++++ linux-2.6/drivers/net/wan/sdla.c +@@ -329,9 +329,9 @@ static int sdla_cpuspeed(struct net_devi + + struct _dlci_stat + { +- short dlci __attribute__((packed)); +- char flags __attribute__((packed)); +-}; ++ short dlci; ++ char flags; ++} __attribute__((packed)); + + struct _frad_stat + { +Index: linux-2.6/include/net/dn_nsp.h +=================================================================== +--- linux-2.6.orig/include/net/dn_nsp.h ++++ linux-2.6/include/net/dn_nsp.h +@@ -72,78 +72,78 @@ extern struct sk_buff *dn_alloc_send_skb + + struct nsp_data_seg_msg + { +- unsigned char msgflg __attribute__((packed)); +- unsigned short dstaddr __attribute__((packed)); +- unsigned short srcaddr __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned short dstaddr; ++ unsigned short srcaddr; ++} __attribute__((packed)); + + struct nsp_data_opt_msg + { +- unsigned short acknum __attribute__((packed)); +- unsigned short segnum __attribute__((packed)); +- unsigned short lsflgs __attribute__((packed)); +-}; ++ unsigned short acknum; ++ unsigned short segnum; ++ unsigned short lsflgs; ++} __attribute__((packed)); + + struct nsp_data_opt_msg1 + { +- unsigned short acknum __attribute__((packed)); +- unsigned short segnum __attribute__((packed)); +-}; ++ unsigned short acknum; ++ unsigned short segnum; ++} __attribute__((packed)); + + + /* Acknowledgment Message (data/other data) */ + struct nsp_data_ack_msg + { +- unsigned char msgflg __attribute__((packed)); +- unsigned short dstaddr __attribute__((packed)); +- unsigned short srcaddr __attribute__((packed)); +- unsigned short acknum __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned short dstaddr; ++ unsigned short srcaddr; ++ unsigned short acknum; ++} __attribute__((packed)); + + /* Connect Acknowledgment Message */ + struct nsp_conn_ack_msg + { +- unsigned char msgflg __attribute__((packed)); +- unsigned short dstaddr __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned short dstaddr; ++} __attribute__((packed)); + + + /* Connect Initiate/Retransmit Initiate/Connect Confirm */ + struct nsp_conn_init_msg + { +- unsigned char msgflg __attribute__((packed)); ++ unsigned char msgflg; + #define NSP_CI 0x18 /* Connect Initiate */ + #define NSP_RCI 0x68 /* Retrans. Conn Init */ +- unsigned short dstaddr __attribute__((packed)); +- unsigned short srcaddr __attribute__((packed)); +- unsigned char services __attribute__((packed)); ++ unsigned short dstaddr; ++ unsigned short srcaddr; ++ unsigned char services; + #define NSP_FC_NONE 0x00 /* Flow Control None */ + #define NSP_FC_SRC 0x04 /* Seg Req. Count */ + #define NSP_FC_SCMC 0x08 /* Sess. Control Mess */ + #define NSP_FC_MASK 0x0c /* FC type mask */ +- unsigned char info __attribute__((packed)); +- unsigned short segsize __attribute__((packed)); +-}; ++ unsigned char info; ++ unsigned short segsize; ++} __attribute__((packed)); + + /* Disconnect Initiate/Disconnect Confirm */ + struct nsp_disconn_init_msg + { +- unsigned char msgflg __attribute__((packed)); +- unsigned short dstaddr __attribute__((packed)); +- unsigned short srcaddr __attribute__((packed)); +- unsigned short reason __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned short dstaddr; ++ unsigned short srcaddr; ++ unsigned short reason; ++} __attribute__((packed)); + + + + struct srcobj_fmt + { +- char format __attribute__((packed)); +- unsigned char task __attribute__((packed)); +- unsigned short grpcode __attribute__((packed)); +- unsigned short usrcode __attribute__((packed)); +- char dlen __attribute__((packed)); +-}; ++ char format; ++ unsigned char task; ++ unsigned short grpcode; ++ unsigned short usrcode; ++ char dlen; ++} __attribute__((packed)); + + /* + * A collection of functions for manipulating the sequence +Index: linux-2.6/include/sound/wavefront.h +=================================================================== +--- linux-2.6.orig/include/sound/wavefront.h ++++ linux-2.6/include/sound/wavefront.h +@@ -454,22 +454,22 @@ typedef struct wf_multisample { + } wavefront_multisample; + + typedef struct wf_alias { +- s16 OriginalSample __attribute__ ((packed)); ++ s16 OriginalSample; + +- struct wf_sample_offset sampleStartOffset __attribute__ ((packed)); +- struct wf_sample_offset loopStartOffset __attribute__ ((packed)); +- struct wf_sample_offset sampleEndOffset __attribute__ ((packed)); +- struct wf_sample_offset loopEndOffset __attribute__ ((packed)); +- +- s16 FrequencyBias __attribute__ ((packed)); +- +- u8 SampleResolution:2 __attribute__ ((packed)); +- u8 Unused1:1 __attribute__ ((packed)); +- u8 Loop:1 __attribute__ ((packed)); +- u8 Bidirectional:1 __attribute__ ((packed)); +- u8 Unused2:1 __attribute__ ((packed)); +- u8 Reverse:1 __attribute__ ((packed)); +- u8 Unused3:1 __attribute__ ((packed)); ++ struct wf_sample_offset sampleStartOffset; ++ struct wf_sample_offset loopStartOffset; ++ struct wf_sample_offset sampleEndOffset; ++ struct wf_sample_offset loopEndOffset; ++ ++ s16 FrequencyBias; ++ ++ u8 SampleResolution:2; ++ u8 Unused1:1; ++ u8 Loop:1; ++ u8 Bidirectional:1; ++ u8 Unused2:1; ++ u8 Reverse:1; ++ u8 Unused3:1; + + /* This structure is meant to be padded only to 16 bits on their + original. Of course, whoever wrote their documentation didn't +@@ -480,8 +480,8 @@ typedef struct wf_alias { + standard 16->32 bit issues. + */ + +- u8 sixteen_bit_padding __attribute__ ((packed)); +-} wavefront_alias; ++ u8 sixteen_bit_padding; ++} __attribute__((packed)) wavefront_alias; + + typedef struct wf_drum { + u8 PatchNumber; + + +Remove the unnecessary __attribute__ ((packed)) since the enum itself is +packed and not the location of it in the structure. + +Signed-off-by: Jan Blunck + + fs/afs/volume.h | 4 +--- + 1 files changed, 1 insertion(+), 3 deletions(-) + +Index: linux-2.6/fs/afs/volume.h +=================================================================== +--- linux-2.6.orig/fs/afs/volume.h ++++ linux-2.6/fs/afs/volume.h +@@ -18,8 +18,6 @@ + #include "kafsasyncd.h" + #include "cache.h" + +-#define __packed __attribute__((packed)) +- + typedef enum { + AFS_VLUPD_SLEEP, /* sleeping waiting for update timer to fire */ + AFS_VLUPD_PENDING, /* on pending queue */ +@@ -115,7 +113,7 @@ struct afs_volume + struct cachefs_cookie *cache; /* caching cookie */ + #endif + afs_volid_t vid; /* volume ID */ +- afs_voltype_t __packed type; /* type of volume */ ++ afs_voltype_t type; /* type of volume */ + char type_force; /* force volume type (suppress R/O -> R/W) */ + unsigned short nservers; /* number of server slots filled */ + unsigned short rjservers; /* number of servers discarded due to -ENOMEDIUM */ + + +The CAPI message structs itself should be packed and not the location of +single fields in the structure. + +Signed-off-by: Jan Blunck + + drivers/isdn/act2000/capi.h | 88 ++++++++++++++++++++++---------------------- + 1 files changed, 44 insertions(+), 44 deletions(-) + +Index: linux-2.6/drivers/isdn/act2000/capi.h +=================================================================== +--- linux-2.6.orig/drivers/isdn/act2000/capi.h ++++ linux-2.6/drivers/isdn/act2000/capi.h +@@ -78,29 +78,29 @@ typedef union actcapi_infoel { + typedef struct actcapi_msn { + __u8 eaz; + __u8 len; /* Length of MSN */ +- __u8 msn[15] __attribute__ ((packed)); +-} actcapi_msn; ++ __u8 msn[15]; ++} __attribute__((packed)) actcapi_msn; + + typedef struct actcapi_dlpd { + __u8 len; /* Length of structure */ +- __u16 dlen __attribute__ ((packed)); /* Data Length */ +- __u8 laa __attribute__ ((packed)); /* Link Address A */ ++ __u16 dlen; /* Data Length */ ++ __u8 laa; /* Link Address A */ + __u8 lab; /* Link Address B */ + __u8 modulo; /* Modulo Mode */ + __u8 win; /* Window size */ + __u8 xid[100]; /* XID Information */ +-} actcapi_dlpd; ++} __attribute__((packed)) actcapi_dlpd; + + typedef struct actcapi_ncpd { + __u8 len; /* Length of structure */ +- __u16 lic __attribute__ ((packed)); +- __u16 hic __attribute__ ((packed)); +- __u16 ltc __attribute__ ((packed)); +- __u16 htc __attribute__ ((packed)); +- __u16 loc __attribute__ ((packed)); +- __u16 hoc __attribute__ ((packed)); +- __u8 modulo __attribute__ ((packed)); +-} actcapi_ncpd; ++ __u16 lic; ++ __u16 hic; ++ __u16 ltc; ++ __u16 htc; ++ __u16 loc; ++ __u16 hoc; ++ __u8 modulo; ++} __attribute__((packed)) actcapi_ncpd; + #define actcapi_ncpi actcapi_ncpd + + /* +@@ -168,19 +168,19 @@ typedef struct actcapi_msg { + __u16 manuf_msg; + __u16 controller; + actcapi_msn msnmap; +- } manufacturer_req_msn; ++ } __attribute ((packed)) manufacturer_req_msn; + /* TODO: TraceInit-req/conf/ind/resp and + * TraceDump-req/conf/ind/resp + */ + struct connect_req { + __u8 controller; + __u8 bchan; +- __u32 infomask __attribute__ ((packed)); ++ __u32 infomask; + __u8 si1; + __u8 si2; + __u8 eaz; + actcapi_addr addr; +- } connect_req; ++ } __attribute__ ((packed)) connect_req; + struct connect_conf { + __u16 plci; + __u16 info; +@@ -192,7 +192,7 @@ typedef struct actcapi_msg { + __u8 si2; + __u8 eaz; + actcapi_addr addr; +- } connect_ind; ++ } __attribute__ ((packed)) connect_ind; + struct connect_resp { + __u16 plci; + __u8 rejectcause; +@@ -200,14 +200,14 @@ typedef struct actcapi_msg { + struct connect_active_ind { + __u16 plci; + actcapi_addr addr; +- } connect_active_ind; ++ } __attribute__ ((packed)) connect_active_ind; + struct connect_active_resp { + __u16 plci; + } connect_active_resp; + struct connect_b3_req { + __u16 plci; + actcapi_ncpi ncpi; +- } connect_b3_req; ++ } __attribute__ ((packed)) connect_b3_req; + struct connect_b3_conf { + __u16 plci; + __u16 ncci; +@@ -217,12 +217,12 @@ typedef struct actcapi_msg { + __u16 ncci; + __u16 plci; + actcapi_ncpi ncpi; +- } connect_b3_ind; ++ } __attribute__ ((packed)) connect_b3_ind; + struct connect_b3_resp { + __u16 ncci; + __u8 rejectcause; +- actcapi_ncpi ncpi __attribute__ ((packed)); +- } connect_b3_resp; ++ actcapi_ncpi ncpi; ++ } __attribute__ ((packed)) connect_b3_resp; + struct disconnect_req { + __u16 plci; + __u8 cause; +@@ -241,14 +241,14 @@ typedef struct actcapi_msg { + struct connect_b3_active_ind { + __u16 ncci; + actcapi_ncpi ncpi; +- } connect_b3_active_ind; ++ } __attribute__ ((packed)) connect_b3_active_ind; + struct connect_b3_active_resp { + __u16 ncci; + } connect_b3_active_resp; + struct disconnect_b3_req { + __u16 ncci; + actcapi_ncpi ncpi; +- } disconnect_b3_req; ++ } __attribute__ ((packed)) disconnect_b3_req; + struct disconnect_b3_conf { + __u16 ncci; + __u16 info; +@@ -257,7 +257,7 @@ typedef struct actcapi_msg { + __u16 ncci; + __u16 info; + actcapi_ncpi ncpi; +- } disconnect_b3_ind; ++ } __attribute__ ((packed)) disconnect_b3_ind; + struct disconnect_b3_resp { + __u16 ncci; + } disconnect_b3_resp; +@@ -265,7 +265,7 @@ typedef struct actcapi_msg { + __u16 plci; + actcapi_infonr nr; + actcapi_infoel el; +- } info_ind; ++ } __attribute__ ((packed)) info_ind; + struct info_resp { + __u16 plci; + } info_resp; +@@ -279,8 +279,8 @@ typedef struct actcapi_msg { + struct select_b2_protocol_req { + __u16 plci; + __u8 protocol; +- actcapi_dlpd dlpd __attribute__ ((packed)); +- } select_b2_protocol_req; ++ actcapi_dlpd dlpd; ++ } __attribute__ ((packed)) select_b2_protocol_req; + struct select_b2_protocol_conf { + __u16 plci; + __u16 info; +@@ -288,47 +288,47 @@ typedef struct actcapi_msg { + struct select_b3_protocol_req { + __u16 plci; + __u8 protocol; +- actcapi_ncpd ncpd __attribute__ ((packed)); +- } select_b3_protocol_req; ++ actcapi_ncpd ncpd; ++ } __attribute__ ((packed)) select_b3_protocol_req; + struct select_b3_protocol_conf { + __u16 plci; + __u16 info; + } select_b3_protocol_conf; + struct listen_req { + __u8 controller; +- __u32 infomask __attribute__ ((packed)); +- __u16 eazmask __attribute__ ((packed)); +- __u16 simask __attribute__ ((packed)); +- } listen_req; ++ __u32 infomask; ++ __u16 eazmask; ++ __u16 simask; ++ } __attribute__ ((packed)) listen_req; + struct listen_conf { + __u8 controller; +- __u16 info __attribute__ ((packed)); +- } listen_conf; ++ __u16 info; ++ } __attribute__ ((packed)) listen_conf; + struct data_b3_req { + __u16 fakencci; + __u16 datalen; + __u32 unused; + __u8 blocknr; +- __u16 flags __attribute__ ((packed)); +- } data_b3_req; ++ __u16 flags; ++ } __attribute ((packed)) data_b3_req; + struct data_b3_ind { + __u16 fakencci; + __u16 datalen; + __u32 unused; + __u8 blocknr; +- __u16 flags __attribute__ ((packed)); +- } data_b3_ind; ++ __u16 flags; ++ } __attribute__ ((packed)) data_b3_ind; + struct data_b3_resp { + __u16 ncci; + __u8 blocknr; +- } data_b3_resp; ++ } __attribute__ ((packed)) data_b3_resp; + struct data_b3_conf { + __u16 ncci; + __u8 blocknr; +- __u16 info __attribute__ ((packed)); +- } data_b3_conf; ++ __u16 info; ++ } __attribute__ ((packed)) data_b3_conf; + } msg; +-} actcapi_msg; ++} __attribute__ ((packed)) actcapi_msg; + + extern __inline__ unsigned short + actcapi_nextsmsg(act2000_card *card) + + From fedora-cvs-commits at redhat.com Wed Jan 4 02:41:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 21:41:14 -0500 Subject: rpms/kernel/FC-4 linux-2.6.15-various-fixes.patch, NONE, 1.1 kernel-2.6.spec, 1.1552, 1.1553 Message-ID: <200601040241.k042fERN010137@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv10122 Modified Files: kernel-2.6.spec Added Files: linux-2.6.15-various-fixes.patch Log Message: - Small fixes from 2.6.15 sysctl: don't overflow the user-supplied buffer with '0' sysctl: make sure to terminate strings with a NUL Insanity avoidance in /proc linux-2.6.15-various-fixes.patch: b/fs/proc/generic.c | 47 +++++++++++++++++++++++------------------------ b/kernel/sysctl.c | 4 +--- kernel/sysctl.c | 25 +++++++++++++++---------- 3 files changed, 39 insertions(+), 37 deletions(-) --- NEW FILE linux-2.6.15-various-fixes.patch --- tree 2e1aaa5e4e68057a4e96a606e2ad0bcccedcd6df parent 8b90db0df7187a01fb7177f1f812123138f562cf author Linus Torvalds Sat, 31 Dec 2005 09:18:53 -0800 committer Linus Torvalds Sat, 31 Dec 2005 09:18:53 -0800 sysctl: don't overflow the user-supplied buffer with '0' If the string was too long to fit in the user-supplied buffer, the sysctl layer would zero-terminate it by writing past the end of the buffer. Don't do that. Noticed by Yi Yang Signed-off-by: Linus Torvalds kernel/sysctl.c | 4 +--- 1 files changed, 1 insertion(+), 3 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 9990e10..ad0425a 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2201,14 +2201,12 @@ int sysctl_string(ctl_table *table, int if (get_user(len, oldlenp)) return -EFAULT; if (len) { - l = strlen(table->data); + l = strlen(table->data)+1; if (len > l) len = l; if (len >= table->maxlen) len = table->maxlen; if(copy_to_user(oldval, table->data, len)) return -EFAULT; - if(put_user(0, ((char __user *) oldval) + len)) - return -EFAULT; if(put_user(len, oldlenp)) return -EFAULT; } tree ef7805d1e03e8648fbaca3713d1a749c27770339 parent 35f349ee082de0be45eb23926d9fc7569f5011f0 author Linus Torvalds Sun, 01 Jan 2006 09:00:29 -0800 committer Linus Torvalds Sun, 01 Jan 2006 09:00:29 -0800 sysctl: make sure to terminate strings with a NUL This is a slightly more complete fix for the previous minimal sysctl string fix. It always terminates the returned string with a NUL, even if the full result wouldn't fit in the user-supplied buffer. The returned length is the full untruncated length, so that you can tell when truncation has occurred. Signed-off-by: Linus Torvalds kernel/sysctl.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/kernel/sysctl.c b/kernel/sysctl.c index e5102ea..b53115b 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -2192,27 +2192,32 @@ int sysctl_string(ctl_table *table, int void __user *oldval, size_t __user *oldlenp, void __user *newval, size_t newlen, void **context) { - size_t l, len; - if (!table->data || !table->maxlen) return -ENOTDIR; if (oldval && oldlenp) { - if (get_user(len, oldlenp)) + size_t bufsize; + if (get_user(bufsize, oldlenp)) return -EFAULT; - if (len) { - l = strlen(table->data)+1; - if (len > l) len = l; - if (len >= table->maxlen) + if (bufsize) { + size_t len = strlen(table->data), copied; + + /* This shouldn't trigger for a well-formed sysctl */ + if (len > table->maxlen) len = table->maxlen; - if(copy_to_user(oldval, table->data, len)) + + /* Copy up to a max of bufsize-1 bytes of the string */ + copied = (len >= bufsize) ? bufsize - 1 : len; + + if (copy_to_user(oldval, table->data, copied) || + put_user(0, (char __user *)(oldval + copied))) return -EFAULT; - if(put_user(len, oldlenp)) + if (put_user(len, oldlenp)) return -EFAULT; } } if (newval && newlen) { - len = newlen; + size_t len = newlen; if (len > table->maxlen) len = table->maxlen; if(copy_from_user(table->data, newval, len)) tree 8d7029403cc50d822bc22085202bfdbf6110203b parent 40c37213a081990b1d3778f57630f97df75a7ec1 author Linus Torvalds Sat, 31 Dec 2005 00:39:10 -0800 committer Linus Torvalds Sat, 31 Dec 2005 00:39:10 -0800 Insanity avoidance in /proc The old /proc interfaces were never updated to use loff_t, and are just generally broken. Now, we should be using the seq_file interface for all of the proc files, but converting the legacy functions is more work than most people care for and has little upside.. But at least we can make the non-LFS rules explicit, rather than just insanely wrapping the offset or something. Signed-off-by: Linus Torvalds fs/proc/generic.c | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/fs/proc/generic.c b/fs/proc/generic.c index b638fb5..72b431d 100644 --- a/fs/proc/generic.c +++ b/fs/proc/generic.c @@ -54,6 +54,18 @@ proc_file_read(struct file *file, char _ ssize_t n, count; char *start; struct proc_dir_entry * dp; + unsigned long long pos; + + /* + * Gaah, please just use "seq_file" instead. The legacy /proc + * interfaces cut loff_t down to off_t for reads, and ignore + * the offset entirely for writes.. + */ + pos = *ppos; + if (pos > MAX_NON_LFS) + return 0; + if (nbytes > MAX_NON_LFS - pos) + nbytes = MAX_NON_LFS - pos; dp = PDE(inode); if (!(page = (char*) __get_free_page(GFP_KERNEL))) @@ -202,30 +214,17 @@ proc_file_write(struct file *file, const static loff_t proc_file_lseek(struct file *file, loff_t offset, int orig) { - lock_kernel(); - - switch (orig) { - case 0: - if (offset < 0) - goto out; - file->f_pos = offset; - unlock_kernel(); - return(file->f_pos); - case 1: - if (offset + file->f_pos < 0) - goto out; - file->f_pos += offset; - unlock_kernel(); - return(file->f_pos); - case 2: - goto out; - default: - goto out; - } - -out: - unlock_kernel(); - return -EINVAL; + loff_t retval = -EINVAL; + switch (orig) { + case 1: + offset += file->f_pos; + /* fallthrough */ + case 0: + if (offset < 0 || offset > MAX_NON_LFS) + break; + file->f_pos = retval = offset; + } + return retval; } static int proc_notify_change(struct dentry *dentry, struct iattr *iattr) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1552 retrieving revision 1.1553 diff -u -r1.1552 -r1.1553 --- kernel-2.6.spec 3 Jan 2006 13:59:11 -0000 1.1552 +++ kernel-2.6.spec 4 Jan 2006 02:41:11 -0000 1.1553 @@ -203,6 +203,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.14.5.bz2 +Patch2: linux-2.6.15-various-fixes.patch # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -544,6 +545,7 @@ cd linux-%{kversion} %patch1 -p1 +%patch2 -p1 # # Patches 10 through 100 are meant for core subsystem upgrades @@ -1277,7 +1279,13 @@ %endif %changelog -* Sun Jan 1 2006 Dave Jones [2.6.14-1.1655_FC4] +* Tue Jan 3 2006 Dave Jones [2.6.14-1.1655_FC4] +- Small fixes from 2.6.15 + sysctl: don't overflow the user-supplied buffer with '0' + sysctl: make sure to terminate strings with a NUL + Insanity avoidance in /proc + +* Sun Jan 1 2006 Dave Jones - Fix the ACPI whitelist date again. * Wed Dec 28 2005 Dave Jones From fedora-cvs-commits at redhat.com Wed Jan 4 03:09:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 22:09:19 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1818,1.1819 Message-ID: <200601040309.k0439Jfm001092@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1021 Modified Files: kernel-2.6.spec Log Message: bump Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1818 retrieving revision 1.1819 diff -u -r1.1818 -r1.1819 --- kernel-2.6.spec 3 Jan 2006 23:04:52 -0000 1.1818 +++ kernel-2.6.spec 4 Jan 2006 03:09:16 -0000 1.1819 @@ -1400,6 +1400,9 @@ %endif %changelog +* Tue Jan 3 2006 Dave Jones +- Silence some gcc4.1 warnings. + * Tue Jan 3 2006 David Woodhouse - Make bcm43xx quieter when dropping packets, and make it reassociate on resume From fedora-cvs-commits at redhat.com Wed Jan 4 03:31:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 3 Jan 2006 22:31:25 -0500 Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-dm.patch, NONE, 1.1 e2fsprogs.spec, 1.40, 1.41 Message-ID: <200601040331.k043VP8L021777@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/e2fsprogs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21737 Modified Files: e2fsprogs.spec Added Files: e2fsprogs-1.38-dm.patch Log Message: add device mapper support e2fsprogs-1.38-dm.patch: e2fsck/Makefile.in | 2 lib/blkid/Makefile.in | 2 lib/blkid/devname.c | 143 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 145 insertions(+), 2 deletions(-) --- NEW FILE e2fsprogs-1.38-dm.patch --- --- e2fsprogs-1.38/e2fsck/Makefile.in.dm 2005-06-29 13:42:20.000000000 -0400 +++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-01-03 22:00:06.000000000 -0500 @@ -20,7 +20,7 @@ DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID) STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \ - $(STATIC_LIBUUID) $(LIBINTL) + $(STATIC_LIBUUID) $(LIBINTL) -ldevmapper -lselinux -lsepol STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \ $(DEPSTATIC_LIBUUID) --- e2fsprogs-1.38/lib/blkid/devname.c.dm 2005-05-07 15:26:03.000000000 -0400 +++ e2fsprogs-1.38/lib/blkid/devname.c 2006-01-03 22:00:06.000000000 -0500 @@ -11,6 +11,8 @@ * %End-Header% */ +#define _GNU_SOURCE 1 + #include #include #if HAVE_UNISTD_H @@ -137,6 +139,146 @@ return; } +#include + +static int dm_device_has_dep(const dev_t dev, const char *name) +{ + struct dm_task *task; + struct dm_deps *deps; + struct dm_info info; + int i; + + task = dm_task_create(DM_DEVICE_DEPS); + if (!task) + return 0; + + dm_task_set_name(task, name); + dm_task_run(task); + dm_task_get_info(task, &info); + + if (!info.exists) { + dm_task_destroy(task); + return 0; + } + + deps = dm_task_get_deps(task); + if (!deps || deps->count == 0) { + dm_task_destroy(task); + return 0; + } + + for (i = 0; i < deps->count; i++) { + dev_t dep_dev = deps->device[i]; + + if (dev == dep_dev) { + dm_task_destroy(task); + return 1; + } + } + + dm_task_destroy(task); + return 0; +} + +static int dm_device_is_leaf(const dev_t dev) +{ + struct dm_task *task; + struct dm_names *names; + unsigned int next = 0; + int n, ret = 1; + + task = dm_task_create(DM_DEVICE_LIST); + if (!task) + return 1; + + dm_task_run(task); + names = dm_task_get_names(task); + if (!names || !names->dev) + return 1; + + n = 0; + do { + names = (void *)names + next; + + if (dm_device_has_dep(dev, names->name)) + ret = 0; + + next = names->next; + } while (next); + + dm_task_destroy(task); + + return ret; +} + +static dev_t dm_get_devno(const char *name) +{ + struct dm_task *task; + struct dm_info info; + dev_t ret = 0; + + task = dm_task_create(DM_DEVICE_INFO); + if (!task) + return ret; + + dm_task_set_name(task, name); + dm_task_run(task); + dm_task_get_info(task, &info); + + if (!info.exists) + return ret; + + ret = makedev(info.major, info.minor); + + dm_task_destroy(task); + + return ret; +} + +static void dm_probe_all(blkid_cache cache, int only_if_new) +{ + struct dm_task *task; + struct dm_names *names; + unsigned int next = 0; + int n; + + task = dm_task_create(DM_DEVICE_LIST); + if (!task) + return; + + dm_task_run(task); + names = dm_task_get_names(task); + if (!names || !names->dev) + return; + + n = 0; + do { + int rc; + char *device = NULL; + dev_t dev = 0; + + names = (void *)names + next; + + rc = asprintf(&device, "/dev/mapper/%s", names->name); + if (rc < 0) + continue; + + dev = dm_get_devno(names->name); + if (dev == 0) + continue; + + if (!dm_device_is_leaf(dev)) + continue; + + + probe_one(cache, device, dev, BLKID_PRI_LVM, only_if_new); + + next = names->next; + } while (next); + + dm_task_destroy(task); +} + #define PROC_PARTITIONS "/proc/partitions" #define VG_DIR "/proc/lvm/VGs" @@ -290,6 +432,7 @@ return 0; blkid_read_cache(cache); + dm_probe_all(cache, only_if_new); evms_probe_all(cache, only_if_new); #ifdef VG_DIR lvm_probe_all(cache, only_if_new); --- e2fsprogs-1.38/lib/blkid/Makefile.in.dm 2006-01-03 22:03:00.000000000 -0500 +++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-01-03 22:02:40.000000000 -0500 @@ -37,7 +37,7 @@ ELF_IMAGE = libblkid ELF_MYDIR = blkid ELF_INSTALL_DIR = $(root_libdir) -ELF_OTHER_LIBS = -L../.. -luuid +ELF_OTHER_LIBS = -L../.. -luuid -ldevmapper -lselinux -lsepol BSDLIB_VERSION = 2.0 BSDLIB_IMAGE = libblkid Index: e2fsprogs.spec =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- e2fsprogs.spec 9 Dec 2005 22:40:17 -0000 1.40 +++ e2fsprogs.spec 4 Jan 2006 03:30:33 -0000 1.41 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.38 -Release: 2.1.1 +Release: 3 License: GPL Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz @@ -26,10 +26,11 @@ Patch31: e2fsprogs-1.38-man_no_ext2resize.patch Patch32: e2fsprogs-1.38-no_pottcdate.patch Patch33: e2fsprogs-1.38-lost+found.patch +Patch34: e2fsprogs-1.38-dm.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-root -Requires: e2fsprogs-libs = %{version}-%{release} -BuildRequires: gettext, texinfo, autoconf, automake +Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper +BuildRequires: gettext, texinfo, autoconf, automake, device-mapper, libselinux-devel, libsepol-devel %define ext2resize_basever 1.1.17 %define ext2resize_name ext2resize-%{ext2resize_basever} @@ -114,6 +115,9 @@ # fixed buffer overflow in mklost+found %patch33 -p1 -b .lost+found +# look at device mapper devices +%patch34 -p1 -b .dm + %build %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper # --enable-dynamic-e2fsck @@ -289,6 +293,9 @@ %{_mandir}/man3/uuid_unparse.3* %changelog +* Tue Jan 03 2006 Peter Jones 1.38-3 +- added support for device-mapper devices + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 4 06:07:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 01:07:55 -0500 Subject: rpms/evolution/devel evolution-2.5.4-fix-missing-declarations.patch, NONE, 1.1 evolution-2.5.4-move-autosave-file.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 evolution.spec, 1.107, 1.108 sources, 1.40, 1.41 evolution-2.2.2-move-autosave-file.patch, 1.2, NONE Message-ID: <200601040607.k0467ta1023316@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23103 Modified Files: .cvsignore evolution.spec sources Added Files: evolution-2.5.4-fix-missing-declarations.patch evolution-2.5.4-move-autosave-file.patch Removed Files: evolution-2.2.2-move-autosave-file.patch Log Message: * Tue Jan 3 2006 David Malcolm - 2.5.4-1 - 2.5.4 - update patch 107 to track underlying code changes; rename from evolution-2.2.2-move-autosave-file.patch to evolution-2.5.4-move-autosave-file.patch - added patch to fix more missing declarations (patch 805) - added files for publish-calendar plugin evolution-2.5.4-fix-missing-declarations.patch: calendar/gui/e-meeting-list-view.c | 1 + mail/mail-tools.c | 2 +- plugins/publish-calendar/publish-format-fb.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE evolution-2.5.4-fix-missing-declarations.patch --- --- evolution-2.5.4/calendar/gui/e-meeting-list-view.c.include_itip_utils 2006-01-04 00:15:42.000000000 -0500 +++ evolution-2.5.4/calendar/gui/e-meeting-list-view.c 2006-01-04 00:15:56.000000000 -0500 @@ -45,6 +45,7 @@ #include #include #include "e-select-names-renderer.h" +#include "itip-utils.h" struct _EMeetingListViewPrivate { EMeetingStore *store; --- evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c.include_itip_utils 2006-01-04 00:33:09.000000000 -0500 +++ evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c 2006-01-04 00:33:24.000000000 -0500 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include "publish-format-fb.h" --- evolution-2.5.4/mail/mail-tools.c.include_itip_utils 2006-01-04 00:23:48.000000000 -0500 +++ evolution-2.5.4/mail/mail-tools.c 2006-01-04 00:25:21.000000000 -0500 @@ -100,7 +100,7 @@ return trash; } -#if 0 +#if 1 /* Not used */ static char * evolution-2.5.4-move-autosave-file.patch: e-msg-composer.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) --- NEW FILE evolution-2.5.4-move-autosave-file.patch --- --- evolution-2.5.4/composer/e-msg-composer.c.move-autosave-file 2006-01-02 06:38:57.000000000 -0500 +++ evolution-2.5.4/composer/e-msg-composer.c 2006-01-03 23:15:32.000000000 -0500 @@ -1483,7 +1483,8 @@ gint len = strlen (AUTOSAVE_SEED); gint load = FALSE; - dir = g_dir_open (g_get_home_dir(), 0, NULL); + char *dirname = g_strdup_printf ("%s/.evolution", g_get_home_dir()); + dir = g_dir_open (dirname, 0, NULL); if (!dir) { return; } @@ -1492,7 +1493,7 @@ if ((!strncmp (dname, AUTOSAVE_SEED, len - 6)) && (strlen (dname) == len) && (!autosave_is_owned (am, dname))) { - char *filename = g_strdup_printf ("%s/%s", g_get_home_dir(), dname); + char *filename = g_strdup_printf ("%s/%s", dirname, dname); struct stat st; /* @@ -1509,6 +1510,7 @@ } g_dir_close (dir); + g_free (dirname); if (match != NULL) load = e_error_run(parent, "mail-composer:recover-autosave", NULL) == GTK_RESPONSE_YES; @@ -1558,7 +1560,7 @@ { EMsgComposerPrivate *p = composer->priv; if (p->autosave_file == NULL) { - p->autosave_file = g_strdup_printf ("%s/%s", g_get_home_dir(), AUTOSAVE_SEED); + p->autosave_file = g_strdup_printf ("%s/.evolution/%s", g_get_home_dir(), AUTOSAVE_SEED); p->autosave_fd = g_mkstemp (p->autosave_file); return TRUE; } Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 19 Dec 2005 21:09:00 -0000 1.40 +++ .cvsignore 4 Jan 2006 06:07:52 -0000 1.41 @@ -1 +1 @@ -evolution-2.5.3.tar.bz2 +evolution-2.5.4.tar.bz2 Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- evolution.spec 19 Dec 2005 21:59:47 -0000 1.107 +++ evolution.spec 4 Jan 2006 06:07:52 -0000 1.108 @@ -30,7 +30,7 @@ %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins Name: evolution -Version: 2.5.3 +Version: 2.5.4 Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -57,7 +57,7 @@ Patch106: evolution-2.2.2-commit-enter-on-calendar.patch # Move autosave file -Patch107: evolution-2.2.2-move-autosave-file.patch +Patch107: evolution-2.5.4-move-autosave-file.patch # Fix for RH bug 150458: Patch108: evolution-2.3.5.1-fix-150458.patch @@ -89,6 +89,7 @@ Patch803: evolution-2.5.2-no-gnome-common.patch Patch804: evolution-2.4.1-fix-missing-declarations.patch +Patch805: evolution-2.5.4-fix-missing-declarations.patch Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -216,6 +217,7 @@ %patch802 -p1 -b .fix-conduit-dir %patch803 -p1 -b .no-gnome-common %patch804 -p1 -b .fix-missing-declarations +%patch805 -p1 -b .fix-missing-declarations-2-5-4 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -479,6 +481,12 @@ %{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug %{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so +%{evo_plugin_dir}/org-gnome-publish-calendar.eplug +%{evo_plugin_dir}/liborg-gnome-publish-calendar.so +%{evo_plugin_dir}/org-gnome-publish-calendar.xml +%{evo_plugin_dir}/publish-calendar.glade + + %files devel %defattr(-, root, root) %{_includedir}/evolution-%{evo_major} @@ -486,6 +494,14 @@ %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Tue Jan 3 2006 David Malcolm - 2.5.4-1 +- 2.5.4 +- update patch 107 to track underlying code changes; rename from + evolution-2.2.2-move-autosave-file.patch to + evolution-2.5.4-move-autosave-file.patch +- added patch to fix more missing declarations (patch 805) +- added files for publish-calendar plugin + * Mon Dec 19 2005 David Malcolm - 2.5.3-1 - 2.5.3 - Updated patch 106 (evolution-2.2.2-commit-enter-on-calendar.patch) so that it Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 19 Dec 2005 21:09:00 -0000 1.40 +++ sources 4 Jan 2006 06:07:52 -0000 1.41 @@ -1 +1 @@ -1fac50a893b29a94e610db4c12e87373 evolution-2.5.3.tar.bz2 +1ffd40da2b98f727e18b4c3a22318ed1 evolution-2.5.4.tar.bz2 --- evolution-2.2.2-move-autosave-file.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 4 08:23:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 03:23:02 -0500 Subject: rpms/glibc/devel .cvsignore, 1.128, 1.129 glibc-fedora.patch, 1.119, 1.120 glibc.spec, 1.201, 1.202 sources, 1.150, 1.151 Message-ID: <200601040823.k048N2NG019802@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19776/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.3.90-26 on branch devel from glibc-2.3.90-26.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- .cvsignore 2 Jan 2006 21:54:32 -0000 1.128 +++ .cvsignore 4 Jan 2006 08:23:00 -0000 1.129 @@ -1,2 +1,2 @@ -glibc-20060102T2114.tar.bz2 -glibc-fedora-20060102T2114.tar.bz2 +glibc-20060104T0754.tar.bz2 +glibc-fedora-20060104T0754.tar.bz2 glibc-fedora.patch: ChangeLog | 58 ++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 +++ csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 38 ++ elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 ++- include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 + libio/stdio.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 ++ localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 +- malloc/mtrace.c | 20 + nptl/ChangeLog | 19 + nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 + nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - nscd/selinux.c | 2 posix/Makefile | 19 - posix/getconf.speclist.h | 15 + sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------------------- sysdeps/ia64/libgcc-compat.c | 84 ++++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 ++ sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/tcsetattr.c | 32 ++ 47 files changed, 769 insertions(+), 448 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- glibc-fedora.patch 2 Jan 2006 21:54:32 -0000 1.119 +++ glibc-fedora.patch 4 Jan 2006 08:23:00 -0000 1.120 @@ -1,6 +1,6 @@ ---- glibc-20060102T2114/ChangeLog 2 Jan 2006 20:52:28 -0000 1.9843 -+++ glibc-20060102T2114-fedora/ChangeLog 2 Jan 2006 21:28:06 -0000 1.8782.2.146 -@@ -300,6 +300,10 @@ +--- glibc-20060104T0754/ChangeLog 4 Jan 2006 07:36:31 -0000 1.9851 ++++ glibc-20060104T0754-fedora/ChangeLog 4 Jan 2006 07:58:20 -0000 1.8782.2.147 +@@ -371,6 +371,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -11,7 +11,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -583,6 +587,26 @@ +@@ -654,6 +658,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -38,7 +38,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -3701,6 +3725,11 @@ +@@ -3772,6 +3796,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -50,7 +50,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -4695,6 +4724,12 @@ +@@ -4766,6 +4795,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -63,7 +63,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -4819,6 +4854,17 @@ +@@ -4890,6 +4925,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -81,7 +81,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -7879,6 +7925,18 @@ +@@ -7950,6 +7996,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -100,8 +100,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060102T2114/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060102T2114-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060104T0754/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060104T0754-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -151,8 +151,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20060102T2114/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060102T2114-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060104T0754/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060104T0754-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -179,8 +179,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060102T2114/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060102T2114-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060104T0754/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060104T0754-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -261,8 +261,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060102T2114/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060102T2114-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060104T0754/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060104T0754-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -287,8 +287,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060102T2114/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060102T2114-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060104T0754/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060104T0754-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -317,8 +317,8 @@ # define O 0 #else # define O 1 ---- glibc-20060102T2114/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 -+++ glibc-20060102T2114-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 +--- glibc-20060104T0754/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 ++++ glibc-20060104T0754-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr #endif !is_hwcap_platform (direntry->d_name))) @@ -420,8 +420,8 @@ } search_dirs (); ---- glibc-20060102T2114/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060102T2114-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060104T0754/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060104T0754-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -446,8 +446,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060102T2114/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060102T2114-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060104T0754/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060104T0754-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -524,8 +524,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060102T2114/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 -+++ glibc-20060102T2114-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 +--- glibc-20060104T0754/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 ++++ glibc-20060104T0754-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 @@ -265,7 +265,13 @@ #endif @@ -541,8 +541,8 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060102T2114/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060102T2114-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060104T0754/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060104T0754-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -552,8 +552,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060102T2114/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 -+++ glibc-20060102T2114-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 +--- glibc-20060104T0754/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 ++++ glibc-20060104T0754-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -567,8 +567,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060102T2114/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060102T2114-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060104T0754/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060104T0754-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -599,8 +599,8 @@ #endif ---- glibc-20060102T2114/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20060102T2114-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060104T0754/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060104T0754-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -692,8 +692,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060102T2114/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060102T2114-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060104T0754/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060104T0754-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -737,8 +737,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060102T2114/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20060102T2114-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060104T0754/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060104T0754-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -747,8 +747,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060102T2114/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20060102T2114-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060104T0754/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060104T0754-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -790,8 +790,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060102T2114/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060102T2114-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060104T0754/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060104T0754-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -806,8 +806,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060102T2114/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060102T2114-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060104T0754/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060104T0754-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -819,8 +819,8 @@ date_fmt "/ / " ---- glibc-20060102T2114/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T2114-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060104T0754/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060104T0754-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -891,8 +891,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060102T2114/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060102T2114-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060104T0754/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060104T0754-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -920,8 +920,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060102T2114/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060102T2114-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060104T0754/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060104T0754-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -997,8 +997,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060102T2114/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060102T2114-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060104T0754/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060104T0754-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1054,9 +1054,9 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060102T2114/nptl/ChangeLog 2 Jan 2006 20:57:43 -0000 1.832 -+++ glibc-20060102T2114-fedora/nptl/ChangeLog 2 Jan 2006 21:28:09 -0000 1.706.2.70 -@@ -337,6 +337,15 @@ +--- glibc-20060104T0754/nptl/ChangeLog 4 Jan 2006 00:20:45 -0000 1.834 ++++ glibc-20060104T0754-fedora/nptl/ChangeLog 4 Jan 2006 07:58:21 -0000 1.706.2.71 +@@ -375,6 +375,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1072,7 +1072,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1073,6 +1082,11 @@ +@@ -1111,6 +1120,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1084,7 +1084,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3147,6 +3161,11 @@ +@@ -3185,6 +3199,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1096,8 +1096,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060102T2114/nptl/Makefile 28 Dec 2005 20:48:24 -0000 1.174 -+++ glibc-20060102T2114-fedora/nptl/Makefile 2 Jan 2006 10:52:51 -0000 1.157.2.15 +--- glibc-20060104T0754/nptl/Makefile 28 Dec 2005 20:48:24 -0000 1.174 ++++ glibc-20060104T0754-fedora/nptl/Makefile 2 Jan 2006 10:52:51 -0000 1.157.2.15 @@ -507,15 +507,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1120,8 +1120,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060102T2114/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060102T2114-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060104T0754/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060104T0754-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1146,8 +1146,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060102T2114/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T2114-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060104T0754/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060104T0754-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1155,9 +1155,9 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060102T2114/nscd/connections.c 30 Dec 2005 16:51:19 -0000 1.81 -+++ glibc-20060102T2114-fedora/nscd/connections.c 2 Jan 2006 10:52:53 -0000 1.55.2.18 -@@ -1880,3 +1880,18 @@ finish_drop_privileges (void) +--- glibc-20060104T0754/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 ++++ glibc-20060104T0754-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 +@@ -1873,3 +1873,18 @@ finish_drop_privileges (void) exit (4); } } @@ -1176,8 +1176,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060102T2114/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 -+++ glibc-20060102T2114-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +--- glibc-20060104T0754/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060104T0754-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1196,8 +1196,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060102T2114/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20060102T2114-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060104T0754/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060104T0754-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 @@ -32,8 +32,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1209,8 +1209,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060102T2114/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060102T2114-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060104T0754/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060104T0754-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1251,8 +1251,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060102T2114/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 -+++ glibc-20060102T2114-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 +--- glibc-20060104T0754/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 ++++ glibc-20060104T0754-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 @@ -147,7 +147,7 @@ audit_init (void) if (audit_fd < 0 /* If kernel doesn't support audit, bail out */ @@ -1262,8 +1262,8 @@ } #endif /* HAVE_LIBAUDIT */ ---- glibc-20060102T2114/posix/Makefile 2 Jan 2006 20:39:39 -0000 1.187 -+++ glibc-20060102T2114-fedora/posix/Makefile 2 Jan 2006 21:28:09 -0000 1.171.2.15 +--- glibc-20060104T0754/posix/Makefile 2 Jan 2006 20:39:39 -0000 1.187 ++++ glibc-20060104T0754-fedora/posix/Makefile 2 Jan 2006 21:28:09 -0000 1.171.2.15 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1297,8 +1297,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060102T2114/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T2114-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060104T0754/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060104T0754-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1315,8 +1315,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060102T2114/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060102T2114-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060104T0754/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060104T0754-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1332,8 +1332,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20060102T2114/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060102T2114-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060104T0754/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060104T0754-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1345,8 +1345,8 @@ endif endif ---- glibc-20060102T2114/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060102T2114-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060104T0754/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060104T0754-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1698,8 +1698,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20060102T2114/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T2114-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060104T0754/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060104T0754-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1785,8 +1785,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060102T2114/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060102T2114-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060104T0754/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060104T0754-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -1801,8 +1801,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060102T2114/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 -+++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 +--- glibc-20060104T0754/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 ++++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -1851,8 +1851,8 @@ + ret ^= stk; return ret; } ---- glibc-20060102T2114/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060104T0754/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -1862,8 +1862,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060102T2114/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060104T0754/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -1909,8 +1909,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060102T2114/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060104T0754/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -1971,8 +1971,8 @@ + } while (0) + +#include_next ---- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060104T0754/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2005,24 +2005,24 @@ + } while (0) + #include_next ---- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060104T0754/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060104T0754/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060102T2114-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060104T0754/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- glibc.spec 2 Jan 2006 22:12:57 -0000 1.201 +++ glibc.spec 4 Jan 2006 08:23:00 -0000 1.202 @@ -1,9 +1,9 @@ -%define glibcdate 20060102T2114 +%define glibcdate 20060104T0754 %define glibcname glibc -%define glibcsrcdir glibc-20060102T2114 +%define glibcsrcdir glibc-20060104T0754 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 25 +%define glibcrelease 26 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -61,8 +61,8 @@ # /etc/default Conflicts: shadow-utils < 2:4.0.3-20 Conflicts: nscd < 2.3.3-52 -Conflicts: kernel < 2.4.20 -%define enablekernel 2.4.20 +Conflicts: kernel < 2.6.9 +%define enablekernel 2.6.9 %ifarch i386 %define nptl_target_cpu i486 %else @@ -482,6 +482,7 @@ %build GCC=gcc +GXX=g++ %ifarch %{ix86} BuildFlags="-march=%{_target_cpu}" %endif @@ -494,18 +495,22 @@ %ifarch sparc BuildFlags="-fcall-used-g6" GCC="gcc -m32" +GXX="g++ -m32" %endif %ifarch sparcv9 BuildFlags="-mcpu=ultrasparc -fcall-used-g6" GCC="gcc -m32" +GXX="g++ -m32" %endif %ifarch sparc64 BuildFlags="-mcpu=ultrasparc -mvis -fcall-used-g6" GCC="gcc -m64" +GXX="g++ -m64" %endif %ifarch ppc64 BuildFlags="-mno-minimal-toc" GCC="gcc -m64" +GXX="g++ -m64" %endif BuildFlags="$BuildFlags -DNDEBUG=1" @@ -528,7 +533,7 @@ rm -rf $builddir mkdir $builddir ; cd $builddir build_CFLAGS="$BuildFlags -g -O3 $*" -CC="$GCC" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \ +CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \ --enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \ --with-headers=%{_prefix}/include --enable-bind-now \ --with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \ @@ -1122,6 +1127,16 @@ %endif %changelog +* Wed Jan 4 2006 Jakub Jelinek 2.3.90-26 +- update from CVS + - for newly linked lio_listio* callers, send per request + notifications (#170116) + - fixup nscd -S option removal changes (#176860) + - remove nonnull attribute from ctermid (#176753) + - fix PTHREAD_*_INITIALIZER{,_NP} on 64-bit arches + - SPARC NPTL support for pre-v9 CPUs +- drop support for 2.4.xx and < 2.6.9 kernels + * Mon Jan 2 2006 Jakub Jelinek 2.3.90-25 - update from CVS - s390{,x} and sparc{,64} pointer mangling fixes Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- sources 2 Jan 2006 21:54:32 -0000 1.150 +++ sources 4 Jan 2006 08:23:00 -0000 1.151 @@ -1,2 +1,2 @@ -85ebdefc3ca2c467c2bc510ba2493e99 glibc-20060102T2114.tar.bz2 -56fe24b10957d19c55ae53c2bc21676a glibc-fedora-20060102T2114.tar.bz2 +f70b1d2963a725c661a26a79b389a2b4 glibc-20060104T0754.tar.bz2 +3f73e8750831648a4d1d96051eaa0d0f glibc-fedora-20060104T0754.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 4 08:30:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 03:30:50 -0500 Subject: rpms/glibc/devel glibc.spec,1.202,1.203 Message-ID: <200601040830.k048UoOq019906@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19887 Modified Files: glibc.spec Log Message: 2.3.90-26 Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- glibc.spec 4 Jan 2006 08:23:00 -0000 1.202 +++ glibc.spec 4 Jan 2006 08:30:46 -0000 1.203 @@ -242,6 +242,12 @@ %endif # Hack till glibc-kernheaders get updated, argh +mkdir linux +cat > linux/version.h < asm/unistd.h < Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31260 Modified Files: glibc.spec Log Message: 2.3.90-26 Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- glibc.spec 4 Jan 2006 08:30:46 -0000 1.203 +++ glibc.spec 4 Jan 2006 08:49:45 -0000 1.204 @@ -242,14 +242,14 @@ %endif # Hack till glibc-kernheaders get updated, argh -mkdir linux -cat > linux/version.h < override_headers/linux/version.h < asm/unistd.h < override_headers/asm/unistd.h < %ifarch alpha @@ -429,7 +429,7 @@ %endif #endif EOF -cat > asm/errno.h < override_headers/asm/errno.h < %ifarch alpha @@ -541,7 +541,7 @@ build_CFLAGS="$BuildFlags -g -O3 $*" CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \ --enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \ - --with-headers=%{_prefix}/include --enable-bind-now \ + --with-headers=`cd ..; pwd`/override_headers:%{_prefix}/include --enable-bind-now \ --with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \ --host %{nptl_target_cpu}-redhat-linux \ --disable-profile From fedora-cvs-commits at redhat.com Wed Jan 4 09:13:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 04:13:08 -0500 Subject: rpms/ruby/FC-4 ruby-tcltk-multilib.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 ruby-1.8.2-deadcode.patch, 1.2, 1.3 ruby.spec, 1.35, 1.36 sources, 1.11, 1.12 ruby-1.8.2-strscan-memset.patch, 1.1, NONE ruby-1.8.2-tcltk-multilib.patch, 1.1, NONE Message-ID: <200601040913.k049D8dF013304@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/ruby/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv13260 Modified Files: .cvsignore ruby-1.8.2-deadcode.patch ruby.spec sources Added Files: ruby-tcltk-multilib.patch Removed Files: ruby-1.8.2-strscan-memset.patch ruby-1.8.2-tcltk-multilib.patch Log Message: * Wed Jan 4 2006 Akira TAGOH - 1.8.4-1.fc4 - New upstream release (#176670) - Kernel module ri documents are available. (#174923) - ruby-1.8.2-strscan-memset.patch: removed. - moved the documents from ruby-libs to ruby-docs, which contains the arch specific thing and to be multilib support. ruby-tcltk-multilib.patch: extconf.rb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE ruby-tcltk-multilib.patch --- diff -ruN ruby-1.8.4.orig/ext/tk/extconf.rb ruby-1.8.4/ext/tk/extconf.rb --- ruby-1.8.4.orig/ext/tk/extconf.rb 2005-11-02 20:28:40.000000000 +0900 +++ ruby-1.8.4/ext/tk/extconf.rb 2005-12-16 19:44:57.000000000 +0900 @@ -48,7 +48,7 @@ stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs") def find_tcl(tcllib, stubs) - paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] + paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"] if stubs func = "Tcl_InitStubs" lib = "tclstub" @@ -71,7 +71,7 @@ end def find_tk(tklib, stubs) - paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] + paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"] if stubs func = "Tk_InitStubs" lib = "tkstub" @@ -274,7 +274,7 @@ if tcltk_framework || (have_header("tcl.h") && have_header("tk.h") && (is_win32 || find_library("X11", "XOpenDisplay", - "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib")) && + "/usr/X11/lib64", "/usr/X11/lib", "/usr/lib64/X11", "/usr/lib/X11", "/usr/X11R6/lib64", "/usr/X11R6/lib", "/usr/openwin/lib64", "/usr/openwin/lib")) && find_tcl(tcllib, stubs) && find_tk(tklib, stubs)) $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ruby/FC-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Sep 2005 11:02:36 -0000 1.12 +++ .cvsignore 4 Jan 2006 09:13:04 -0000 1.13 @@ -6,3 +6,4 @@ *.rpm ruby-1.8.2.tar.gz ruby-1.8.3.tar.gz +ruby-1.8.4.tar.gz ruby-1.8.2-deadcode.patch: ext/bigdecimal/bigdecimal.c | 2 ++ ext/pty/pty.c | 2 ++ parse.y | 4 ++++ regex.c | 4 ++++ 4 files changed, 12 insertions(+) Index: ruby-1.8.2-deadcode.patch =================================================================== RCS file: /cvs/dist/rpms/ruby/FC-4/ruby-1.8.2-deadcode.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ruby-1.8.2-deadcode.patch 26 Sep 2005 11:02:56 -0000 1.2 +++ ruby-1.8.2-deadcode.patch 4 Jan 2006 09:13:04 -0000 1.3 @@ -34,75 +34,6 @@ /* ruby function: getpty */ static VALUE -diff -ruN ruby-1.8.2.orig/ext/tcltklib/tcltklib.c ruby-1.8.2/ext/tcltklib/tcltklib.c ---- ruby-1.8.2.orig/ext/tcltklib/tcltklib.c 2004-12-23 13:16:42.000000000 +0900 -+++ ruby-1.8.2/ext/tcltklib/tcltklib.c 2005-04-07 02:46:48.000000000 +0900 -@@ -247,6 +247,7 @@ - } - - /* call original 'exit' command */ -+#if 0 - static void - call_original_exit(ptr, state) - struct tcltkip *ptr; -@@ -318,6 +319,7 @@ - - rb_thread_critical = thr_crit_bup; - } -+#endif - - /* Tk_ThreadTimer */ - static Tcl_TimerToken timer_token = (Tcl_TimerToken)NULL; -@@ -5147,6 +5153,7 @@ - return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_TAIL); - } - -+#if 0 - static VALUE - ip_invoke_immediate(argc, argv, obj) - int argc; -@@ -5155,6 +5162,7 @@ - { - return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_HEAD); - } -+#endif - - /* access Tcl variables */ - static VALUE -diff -ruN ruby-1.8.2.orig/ext/tk/tkutil.c ruby-1.8.2/ext/tk/tkutil.c ---- ruby-1.8.2.orig/ext/tk/tkutil.c 2004-12-23 13:16:43.000000000 +0900 -+++ ruby-1.8.2/ext/tk/tkutil.c 2005-04-07 02:45:13.000000000 +0900 -@@ -188,6 +188,7 @@ - return tk_toUTF8(1, argv, self); - } - -+#if 0 - static VALUE - fromUTF8_toDefaultEnc(str, self) - VALUE str; -@@ -198,6 +199,7 @@ - argv[0] = str; - return tk_fromUTF8(1, argv, self); - } -+#endif - - - static void -@@ -835,12 +837,14 @@ - } - } - -+#if 0 - static VALUE - tkstr_to_dec(value) - VALUE value; - { - return rb_cstr_to_inum(RSTRING(value)->ptr, 10, 1); - } -+#endif - - static VALUE - tkstr_to_int(value) diff -ruN ruby-1.8.2.orig/parse.y ruby-1.8.2/parse.y --- ruby-1.8.2.orig/parse.y 2004-11-29 15:13:51.000000000 +0900 +++ ruby-1.8.2/parse.y 2005-04-07 02:42:52.000000000 +0900 Index: ruby.spec =================================================================== RCS file: /cvs/dist/rpms/ruby/FC-4/ruby.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- ruby.spec 3 Oct 2005 06:39:36 -0000 1.35 +++ ruby.spec 4 Jan 2006 09:13:05 -0000 1.36 @@ -3,8 +3,8 @@ %define sitedir %{_libdir}/site_ruby Name: ruby -Version: 1.8.3 -Release: 2.fc4 +Version: 1.8.4 +Release: 1.fc4 License: Distributable URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -22,9 +22,8 @@ Source10: ruby-mode-init.el Patch1: ruby-multilib.patch -Patch2: ruby-1.8.2-strscan-memset.patch Patch3: ruby-1.8.2-deadcode.patch -Patch4: ruby-1.8.2-tcltk-multilib.patch +Patch4: ruby-tcltk-multilib.patch Summary: An interpreter of object-oriented scripting language Group: Development/Languages @@ -128,7 +127,6 @@ %ifarch ppc64 s390x sparc64 x86_64 %patch1 -p1 %endif -%patch2 -p1 %patch3 -p1 %ifarch ppc64 s390x sparc64 x86_64 %patch4 -p1 @@ -374,7 +372,6 @@ %doc %{name}-%{version}/COPYING* %doc %{name}-%{version}/ChangeLog %doc %{name}-%{version}/LEGAL -%doc tmp-ruby-docs/ruby-libs/* %dir %{_libdir}/ruby %dir %{_libdir}/ruby/%{rubyxver} %dir %{_libdir}/ruby/%{rubyxver}/cgi @@ -407,6 +404,7 @@ %files docs %defattr(-, root, root) %doc tmp-ruby-docs/ruby-docs/* +%doc tmp-ruby-docs/ruby-libs/* %files mode -f ruby-mode.files %defattr(-, root, root) @@ -414,6 +412,13 @@ %dir %{_datadir}/emacs/site-lisp/ruby-mode %changelog +* Wed Jan 4 2006 Akira TAGOH - 1.8.4-1.fc4 +- New upstream release (#176670) + - Kernel module ri documents are available. (#174923) +- ruby-1.8.2-strscan-memset.patch: removed. +- moved the documents from ruby-libs to ruby-docs, which contains the arch + specific thing and to be multilib support. + * Mon Oct 3 2005 Akira TAGOH - 1.8.3-2.fc4 - fixed the wrong file list. the external libraries for tcl/tk was included in ruby-libs unexpectedly. (#169619) Index: sources =================================================================== RCS file: /cvs/dist/rpms/ruby/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Sep 2005 11:02:57 -0000 1.11 +++ sources 4 Jan 2006 09:13:05 -0000 1.12 @@ -2,4 +2,4 @@ d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz 7f3e181c0be9a1579e43a5a8b26372d6 rubyfaq-990927.tar.bz2 8aa2e2da327dc43ff6e46e634eb657b6 rubyfaq-jp-990927.tar.bz2 -63d6c2bddd6af86664e338b31f3189a6 ruby-1.8.3.tar.gz +bd8c2e593e1fa4b01fd98eaf016329bb ruby-1.8.4.tar.gz --- ruby-1.8.2-strscan-memset.patch DELETED --- --- ruby-1.8.2-tcltk-multilib.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 4 09:18:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 04:18:55 -0500 Subject: rpms/ruby/devel ruby-tcltk-multilib.patch, 1.1, 1.2 ruby.spec, 1.51, 1.52 Message-ID: <200601040918.k049IsrF026931@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/ruby/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26883 Modified Files: ruby-tcltk-multilib.patch ruby.spec Log Message: * Wed Jan 4 2006 Akira TAGOH - 1.8.4-2 - ruby-tcltk-multilib.patch: fixed a typo. ruby-tcltk-multilib.patch: extconf.rb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Index: ruby-tcltk-multilib.patch =================================================================== RCS file: /cvs/dist/rpms/ruby/devel/ruby-tcltk-multilib.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ruby-tcltk-multilib.patch 16 Dec 2005 10:46:41 -0000 1.1 +++ ruby-tcltk-multilib.patch 4 Jan 2006 09:18:52 -0000 1.2 @@ -6,7 +6,7 @@ def find_tcl(tcllib, stubs) - paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] -+ paths = ["/usr/local/lib64", "/usr/local/lib" "/usr/pkg/lib64", "/usr/pkg/lib" "/usr/lib64" "/usr/lib"] ++ paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"] if stubs func = "Tcl_InitStubs" lib = "tclstub" @@ -15,7 +15,7 @@ def find_tk(tklib, stubs) - paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] -+ paths = ["/usr/local/lib64" "/usr/local/lib", "/usr/pkg/lib64" "/usr/pkg/lib", "/usr/lib64" "/usr/lib"] ++ paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"] if stubs func = "Tk_InitStubs" lib = "tkstub" @@ -24,7 +24,7 @@ (have_header("tcl.h") && have_header("tk.h") && (is_win32 || find_library("X11", "XOpenDisplay", - "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib")) && -+ "/usr/X11/lib64" "/usr/X11/lib", "/usr/lib64/X11" "/usr/lib/X11", "/usr/X11R6/lib64" "/usr/X11R6/lib", "/usr/openwin/lib64" "/usr/openwin/lib")) && ++ "/usr/X11/lib64", "/usr/X11/lib", "/usr/lib64/X11", "/usr/lib/X11", "/usr/X11R6/lib64", "/usr/X11R6/lib", "/usr/openwin/lib64", "/usr/openwin/lib")) && find_tcl(tcllib, stubs) && find_tk(tklib, stubs)) $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs Index: ruby.spec =================================================================== RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ruby.spec 27 Dec 2005 03:53:40 -0000 1.51 +++ ruby.spec 4 Jan 2006 09:18:52 -0000 1.52 @@ -4,7 +4,7 @@ Name: ruby Version: 1.8.4 -Release: 1 +Release: 2 License: Distributable URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -418,6 +418,9 @@ %dir %{_datadir}/emacs/site-lisp/ruby-mode %changelog +* Wed Jan 4 2006 Akira TAGOH - 1.8.4-2 +- ruby-tcltk-multilib.patch: fixed a typo. + * Tue Dec 27 2005 Akira TAGOH - 1.8.4-1 - New upstream release. - fixed a missing return statement. (#140833) From fedora-cvs-commits at redhat.com Wed Jan 4 09:38:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 04:38:34 -0500 Subject: rpms/glibc/devel glibc.spec,1.204,1.205 Message-ID: <200601040938.k049cYn5001358@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1301 Modified Files: glibc.spec Log Message: 2.3.90-26 Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- glibc.spec 4 Jan 2006 08:49:45 -0000 1.204 +++ glibc.spec 4 Jan 2006 09:38:31 -0000 1.205 @@ -33,6 +33,7 @@ Patch0: %{glibcname}-fedora.patch Patch1: %{name}-ppc-assume.patch Patch2: %{name}-ia64-lib64.patch +Patch3: glibc-s390-waitid.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -240,6 +241,7 @@ %patch2 -p1 %endif %endif +%patch3 -p1 # Hack till glibc-kernheaders get updated, argh mkdir -p override_headers/linux From fedora-cvs-commits at redhat.com Wed Jan 4 09:41:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 04:41:32 -0500 Subject: rpms/glibc/devel glibc-s390-waitid.patch,NONE,1.1 Message-ID: <200601040941.k049fWNZ002737@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2684 Added Files: glibc-s390-waitid.patch Log Message: 2.3.90-26 glibc-s390-waitid.patch: kernel-features.h | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) --- NEW FILE glibc-s390-waitid.patch --- 2006-01-04 Jakub Jelinek * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_WAITID_SYSCALL): Only define for 2.6.12+ on s390{,x}. --- libc/sysdeps/unix/sysv/linux/kernel-features.h.jj 2005-12-13 16:42:22.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/kernel-features.h 2006-01-04 10:36:38.000000000 +0100 @@ -1,6 +1,6 @@ /* Set flags signalling availability of kernel features based on given kernel version number. - Copyright (C) 1999-2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1999-2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -435,9 +435,11 @@ #endif /* Starting with version 2.6.9, the waitid system call is available. - Except for powerpc and powerpc64, where it is available in 2.6.12. */ -#if (__LINUX_KERNEL_VERSION >= 0x020609 && !defined __powerpc__) \ - || (__LINUX_KERNEL_VERSION >= 0x02060c && defined __powerpc__) + Except for powerpc{,64} and s390{,x}, where it is available in 2.6.12. */ +#if (__LINUX_KERNEL_VERSION >= 0x020609 \ + && !defined __powerpc__ && !defined __s390__) \ + || (__LINUX_KERNEL_VERSION >= 0x02060c \ + && (defined __powerpc__ || defined __s390__)) # define __ASSUME_WAITID_SYSCALL 1 #endif From fedora-cvs-commits at redhat.com Wed Jan 4 09:46:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 04:46:31 -0500 Subject: rpms/openhpi/devel openhpi.spec,1.25,1.26 Message-ID: <200601040946.k049kV2h015297@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/openhpi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14709 Modified Files: openhpi.spec Log Message: - Rebuilt against new libnetsnmp Index: openhpi.spec =================================================================== RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- openhpi.spec 9 Dec 2005 22:42:33 -0000 1.25 +++ openhpi.spec 4 Jan 2006 09:46:29 -0000 1.26 @@ -1,7 +1,7 @@ Summary: openhpi Hardware Platform Interface (HPI) library and tools Name: openhpi Version: 2.2.1 -Release: 1.1 +Release: 2 License: BSD Group: System Environment/Base Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz @@ -90,6 +90,9 @@ %changelog +* Wed Jan 04 2006 Radek Vokal 2.2.1-2 +- Rebuilt against new libnetsnmp + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 4 09:46:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 04:46:42 -0500 Subject: rpms/ruby/FC-3 ruby-tcltk-multilib.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 ruby-1.8.2-deadcode.patch, 1.2, 1.3 ruby.spec, 1.29, 1.30 sources, 1.11, 1.12 ruby-1.8.2-strscan-memset.patch, 1.1, NONE ruby-1.8.2-tcltk-multilib.patch, 1.1, NONE Message-ID: <200601040946.k049kfe0016278@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/ruby/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv16231 Modified Files: .cvsignore ruby-1.8.2-deadcode.patch ruby.spec sources Added Files: ruby-tcltk-multilib.patch Removed Files: ruby-1.8.2-strscan-memset.patch ruby-1.8.2-tcltk-multilib.patch Log Message: * Wed Jan 4 2006 Akira TAGOH - 1.8.4-1 - New upstream release. - Kernel module ri documents are available. - ruby-1.8.2-strscan-memset.patch: removed. - moved the documents from ruby-libs to ruby-docs, which contains the arch specific thing and to be multilib support. ruby-tcltk-multilib.patch: extconf.rb | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE ruby-tcltk-multilib.patch --- diff -ruN ruby-1.8.4.orig/ext/tk/extconf.rb ruby-1.8.4/ext/tk/extconf.rb --- ruby-1.8.4.orig/ext/tk/extconf.rb 2005-11-02 20:28:40.000000000 +0900 +++ ruby-1.8.4/ext/tk/extconf.rb 2005-12-16 19:44:57.000000000 +0900 @@ -48,7 +48,7 @@ stubs = enable_config("tcltk_stubs") || with_config("tcltk_stubs") def find_tcl(tcllib, stubs) - paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] + paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"] if stubs func = "Tcl_InitStubs" lib = "tclstub" @@ -71,7 +71,7 @@ end def find_tk(tklib, stubs) - paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"] + paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"] if stubs func = "Tk_InitStubs" lib = "tkstub" @@ -274,7 +274,7 @@ if tcltk_framework || (have_header("tcl.h") && have_header("tk.h") && (is_win32 || find_library("X11", "XOpenDisplay", - "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib")) && + "/usr/X11/lib64", "/usr/X11/lib", "/usr/lib64/X11", "/usr/lib/X11", "/usr/X11R6/lib64", "/usr/X11R6/lib", "/usr/openwin/lib64", "/usr/openwin/lib")) && find_tcl(tcllib, stubs) && find_tk(tklib, stubs)) $CPPFLAGS += ' -DUSE_TCL_STUBS -DUSE_TK_STUBS' if stubs Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ruby/FC-3/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 26 Sep 2005 11:51:53 -0000 1.12 +++ .cvsignore 4 Jan 2006 09:46:38 -0000 1.13 @@ -6,3 +6,4 @@ *.rpm ruby-1.8.2.tar.gz ruby-1.8.3.tar.gz +ruby-1.8.4.tar.gz ruby-1.8.2-deadcode.patch: ext/bigdecimal/bigdecimal.c | 2 ++ ext/pty/pty.c | 2 ++ parse.y | 4 ++++ regex.c | 4 ++++ 4 files changed, 12 insertions(+) Index: ruby-1.8.2-deadcode.patch =================================================================== RCS file: /cvs/dist/rpms/ruby/FC-3/ruby-1.8.2-deadcode.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ruby-1.8.2-deadcode.patch 26 Sep 2005 11:51:53 -0000 1.2 +++ ruby-1.8.2-deadcode.patch 4 Jan 2006 09:46:38 -0000 1.3 @@ -34,75 +34,6 @@ /* ruby function: getpty */ static VALUE -diff -ruN ruby-1.8.2.orig/ext/tcltklib/tcltklib.c ruby-1.8.2/ext/tcltklib/tcltklib.c ---- ruby-1.8.2.orig/ext/tcltklib/tcltklib.c 2004-12-23 13:16:42.000000000 +0900 -+++ ruby-1.8.2/ext/tcltklib/tcltklib.c 2005-04-07 02:46:48.000000000 +0900 -@@ -247,6 +247,7 @@ - } - - /* call original 'exit' command */ -+#if 0 - static void - call_original_exit(ptr, state) - struct tcltkip *ptr; -@@ -318,6 +319,7 @@ - - rb_thread_critical = thr_crit_bup; - } -+#endif - - /* Tk_ThreadTimer */ - static Tcl_TimerToken timer_token = (Tcl_TimerToken)NULL; -@@ -5147,6 +5153,7 @@ - return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_TAIL); - } - -+#if 0 - static VALUE - ip_invoke_immediate(argc, argv, obj) - int argc; -@@ -5155,6 +5162,7 @@ - { - return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_HEAD); - } -+#endif - - /* access Tcl variables */ - static VALUE -diff -ruN ruby-1.8.2.orig/ext/tk/tkutil.c ruby-1.8.2/ext/tk/tkutil.c ---- ruby-1.8.2.orig/ext/tk/tkutil.c 2004-12-23 13:16:43.000000000 +0900 -+++ ruby-1.8.2/ext/tk/tkutil.c 2005-04-07 02:45:13.000000000 +0900 -@@ -188,6 +188,7 @@ - return tk_toUTF8(1, argv, self); - } - -+#if 0 - static VALUE - fromUTF8_toDefaultEnc(str, self) - VALUE str; -@@ -198,6 +199,7 @@ - argv[0] = str; - return tk_fromUTF8(1, argv, self); - } -+#endif - - - static void -@@ -835,12 +837,14 @@ - } - } - -+#if 0 - static VALUE - tkstr_to_dec(value) - VALUE value; - { - return rb_cstr_to_inum(RSTRING(value)->ptr, 10, 1); - } -+#endif - - static VALUE - tkstr_to_int(value) diff -ruN ruby-1.8.2.orig/parse.y ruby-1.8.2/parse.y --- ruby-1.8.2.orig/parse.y 2004-11-29 15:13:51.000000000 +0900 +++ ruby-1.8.2/parse.y 2005-04-07 02:42:52.000000000 +0900 Index: ruby.spec =================================================================== RCS file: /cvs/dist/rpms/ruby/FC-3/ruby.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ruby.spec 3 Oct 2005 07:41:58 -0000 1.29 +++ ruby.spec 4 Jan 2006 09:46:38 -0000 1.30 @@ -3,8 +3,8 @@ %define sitedir %{_libdir}/site_ruby Name: ruby -Version: 1.8.3 -Release: 2.fc3 +Version: 1.8.4 +Release: 1.fc3 License: Distributable URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -22,9 +22,8 @@ Source10: ruby-mode-init.el Patch1: ruby-multilib.patch -Patch2: ruby-1.8.2-strscan-memset.patch Patch3: ruby-1.8.2-deadcode.patch -Patch4: ruby-1.8.2-tcltk-multilib.patch +Patch4: ruby-tcltk-multilib.patch Summary: An interpreter of object-oriented scripting language Group: Development/Languages @@ -128,7 +127,6 @@ %ifarch ppc64 s390x sparc64 x86_64 %patch1 -p1 %endif -%patch2 -p1 %patch3 -p1 %ifarch ppc64 s390x sparc64 x86_64 %patch4 -p1 @@ -374,7 +372,6 @@ %doc %{name}-%{version}/COPYING* %doc %{name}-%{version}/ChangeLog %doc %{name}-%{version}/LEGAL -%doc tmp-ruby-docs/ruby-libs/* %dir %{_libdir}/ruby %dir %{_libdir}/ruby/%{rubyxver} %dir %{_libdir}/ruby/%{rubyxver}/cgi @@ -407,6 +404,7 @@ %files docs %defattr(-, root, root) %doc tmp-ruby-docs/ruby-docs/* +%doc tmp-ruby-docs/ruby-libs/* %files mode -f ruby-mode.files %defattr(-, root, root) @@ -414,6 +412,13 @@ %dir %{_datadir}/emacs/site-lisp/ruby-mode %changelog +* Wed Jan 4 2006 Akira TAGOH - 1.8.4-1 +- New upstream release. + - Kernel module ri documents are available. +- ruby-1.8.2-strscan-memset.patch: removed. +- moved the documents from ruby-libs to ruby-docs, which contains the arch + specific thing and to be multilib support. + * Mon Oct 3 2005 Akira TAGOH - 1.8.3-2.fc3 - fixed the wrong file list. the external libraries for tcl/tk was included in ruby-libs unexpectedly. Index: sources =================================================================== RCS file: /cvs/dist/rpms/ruby/FC-3/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Sep 2005 11:51:53 -0000 1.11 +++ sources 4 Jan 2006 09:46:38 -0000 1.12 @@ -2,4 +2,4 @@ d65e3a216d6d345a2a6f1aa8758c2f75 ruby-refm-rdp-1.8.1-ja-html.tar.gz 7f3e181c0be9a1579e43a5a8b26372d6 rubyfaq-990927.tar.bz2 8aa2e2da327dc43ff6e46e634eb657b6 rubyfaq-jp-990927.tar.bz2 -63d6c2bddd6af86664e338b31f3189a6 ruby-1.8.3.tar.gz +bd8c2e593e1fa4b01fd98eaf016329bb ruby-1.8.4.tar.gz --- ruby-1.8.2-strscan-memset.patch DELETED --- --- ruby-1.8.2-tcltk-multilib.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 4 09:48:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 04:48:45 -0500 Subject: rpms/openoffice.org/FC-4 openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch, NONE, 1.1 openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch, NONE, 1.1 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.5, 1.6 openoffice.org.spec, 1.233, 1.234 Message-ID: <200601040948.k049mjpX017315@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv17283 Modified Files: openoffice.org-1.9.129.ooo54603.fontconfig.patch openoffice.org.spec Added Files: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch Log Message: use a different set of default bullets for writer openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch: desktop/menus/writer.desktop | 0 sysui/desktop/menus/writer.desktop | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch --- Index: desktop/menus/writer.desktop =================================================================== RCS file: /cvs/gsl/sysui/desktop/menus/writer.desktop,v retrieving revision 1.9 diff -u -r1.9 writer.desktop --- openoffice.org.orig/sysui/desktop/menus/writer.desktop 20 Apr 2005 11:35:35 -0000 1.9 +++ openoffice.org/sysui/desktop/menus/writer.desktop 22 Dec 2005 13:22:19 -0000 @@ -7,6 +7,6 @@ InitialPreference=2 Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office; Exec=openoffice -writer %U -MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/vnd.wordperfect;application/wordperfect +MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect Name=Word Processor Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch: source/core/doc/number.cxx | 0 sw/source/core/doc/number.cxx | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch --- Index: source/core/doc/number.cxx =================================================================== RCS file: /cvs/sw/sw/source/core/doc/number.cxx,v retrieving revision 1.32 diff -u -p -u -r1.32 number.cxx --- openoffice.org.orig/sw/source/core/doc/number.cxx 8 Nov 2005 17:17:38 -0000 1.32 +++ openoffice.org/sw/source/core/doc/number.cxx 3 Jan 2006 17:19:09 -0000 @@ -986,8 +986,8 @@ void SwNumRule::Indent(short nAmount, in sal_Unicode GetBulletChar(BYTE nLevel) { static sal_Unicode nLevelChars[MAXLEVEL] = - { 0x25cf, 0x25cb, 0x25a0, 0x25cf, 0x25cb, - 0x25a0, 0x25cf, 0x25cb, 0x25a0, 0x25cf }; + { 0x25cf, 0xe572, 0x25a0, 0x25cf, 0xe572, + 0x25a0, 0x25cf, 0xe572, 0x25a0, 0x25cf }; if (nLevel > MAXLEVEL) nLevel = MAXLEVEL; openoffice.org-1.9.129.ooo54603.fontconfig.patch: fontmanager/fontcache.cxx | 2 fontmanager/fontmanager.cxx | 9 inc/psprint/fontmanager.hxx | 0 psprint/fontmanager.hxx | 13 - psprint/source/fontmanager/fontconfig.cxx | 269 ++++++++++++++++++----- source/fontmanager/fontcache.cxx | 0 source/fontmanager/fontconfig.cxx | 0 source/fontmanager/fontmanager.cxx | 0 vcl/inc/outdev.h | 3 vcl/inc/outfont.hxx | 15 + vcl/source/gdi/outdev3.cxx | 338 +++++++++++++++++++++--------- vcl/source/window/window.cxx | 5 vcl/util/makefile.mk | 2 13 files changed, 487 insertions(+), 169 deletions(-) Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- openoffice.org-1.9.129.ooo54603.fontconfig.patch 21 Dec 2005 19:44:23 -0000 1.5 +++ openoffice.org-1.9.129.ooo54603.fontconfig.patch 4 Jan 2006 09:48:41 -0000 1.6 @@ -365,7 +365,7 @@ - fprintf( stderr, "GlyphFallbackFont[%d] (quality=%05d): \"%s\"\n", - i, pFont->GetMinQuality(), aFontName.GetBuffer() ); + ByteString l( aSelData.maSearchName, RTL_TEXTENCODING_UTF8 ); -+ fprintf (stderr, "--- Couldn't get FontFamily for '%s'\n", l.GetBuffer()); ++ //fprintf (stderr, "--- Couldn't get FontFamily for '%s'\n", l.GetBuffer()); } -#endif - Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v retrieving revision 1.233 retrieving revision 1.234 diff -u -r1.233 -r1.234 --- openoffice.org.spec 21 Dec 2005 17:26:30 -0000 1.233 +++ openoffice.org.spec 4 Jan 2006 09:48:41 -0000 1.234 @@ -1,6 +1,6 @@ %define oootag OOA680 %define ooomilestone 1 -%define rh_rpm_release 2 +%define rh_rpm_release 4 %define build_fc5 0 %define build_fc4 1 @@ -213,6 +213,8 @@ Patch47: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch Patch48: openoffice.org-2.0.1.oooXXXXX.config_office.nss.patch Patch49: openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch +Patch50: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch +Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -880,6 +882,8 @@ %patch48 -p1 -b .oooXXXXX.config_office.nss.patch %endif %patch49 -p1 -b .oooXXXXX.vcl.animatedtheme.patch +%patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch +%patch51 -p1 -b .ooo59997.sw.defaultbullets.patch %if %{includingexternals} #start ludicrous workaround @@ -3338,6 +3342,10 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Thu Dec 22 2005 Caolan McNamara - 1:2.0.1.1-4 +- add openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch for rh#176779# +- add openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch for rh#176259# + * Wed Dec 21 2005 Caolan McNamara - 1:2.0.1.1-2 - 2.0.1 - add openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch for animated From fedora-cvs-commits at redhat.com Wed Jan 4 09:57:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 04:57:16 -0500 Subject: rpms/openoffice.org/FC-4 openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch, 1.1, 1.2 Message-ID: <200601040957.k049vGlx021249@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv21217 Modified Files: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch Log Message: crippled vs noncrippled openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch: desktop/menus/writer.desktop | 0 sysui/desktop/menus/writer.desktop | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) Index: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch 4 Jan 2006 09:48:41 -0000 1.1 +++ openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch 4 Jan 2006 09:57:12 -0000 1.2 @@ -11,5 +11,5 @@ Exec=openoffice -writer %U -MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/vnd.wordperfect;application/wordperfect +MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect - Name=Word Processor + Name=%PRODUCTNAME Writer Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. From fedora-cvs-commits at redhat.com Wed Jan 4 10:13:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 05:13:58 -0500 Subject: rpms/gcc/devel gcc41.spec,1.13,1.14 Message-ID: <200601041013.k04ADwC2026168@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26105 Modified Files: gcc41.spec Log Message: - buildrequire libXtst-devel (#176898) Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gcc41.spec 23 Dec 2005 09:48:52 -0000 1.13 +++ gcc41.spec 4 Jan 2006 10:13:55 -0000 1.14 @@ -289,6 +289,7 @@ Requires: libart_lgpl >= 2.1.0 BuildRequires: libart_lgpl-devel >= 2.1.0 BuildRequires: alsa-lib-devel +BuildRequires: libXtst-devel Obsoletes: gcc-libgcj Obsoletes: libgcj3 Obsoletes: libgcj34 @@ -1541,6 +1542,8 @@ %endif %changelog +- buildrequire libXtst-devel (#176898) + * Fri Dec 22 2005 Jakub Jelinek 4.1.0-0.12 - make sure GCJFLAGS are propagated down to libjava's configure - build crt{begin,end}*.o with -fno-asynchronous-unwind-tables From fedora-cvs-commits at redhat.com Wed Jan 4 11:28:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 06:28:28 -0500 Subject: rpms/apr/devel apr-1.2.2-pthreadprio.patch, NONE, 1.1 apr.spec, 1.42, 1.43 Message-ID: <200601041128.k04BSSgK013765@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/apr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13724 Modified Files: apr.spec Added Files: apr-1.2.2-pthreadprio.patch Log Message: * Wed Jan 4 2006 Joe Orton 1.2.2-6 - fix build with recent glibc (#176911) apr-1.2.2-pthreadprio.patch: proc_mutex.c | 3 +++ 1 files changed, 3 insertions(+) --- NEW FILE apr-1.2.2-pthreadprio.patch --- Fix build with recent glibc. --- apr-1.2.2/locks/unix/proc_mutex.c.pthreadprio +++ apr-1.2.2/locks/unix/proc_mutex.c @@ -335,6 +335,8 @@ pthread_mutexattr_destroy(&mattr); return rv; } + +#ifdef PTHREAD_PRIO_INHERIT if ((rv = pthread_mutexattr_setprotocol(&mattr, PTHREAD_PRIO_INHERIT))) { #ifdef PTHREAD_SETS_ERRNO rv = errno; @@ -344,6 +346,7 @@ return rv; } #endif +#endif if ((rv = pthread_mutex_init(new_mutex->pthread_interproc, &mattr))) { #ifdef PTHREAD_SETS_ERRNO Index: apr.spec =================================================================== RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- apr.spec 3 Jan 2006 20:02:06 -0000 1.42 +++ apr.spec 4 Jan 2006 11:28:25 -0000 1.43 @@ -3,7 +3,7 @@ Summary: Apache Portable Runtime library Name: apr Version: 1.2.2 -Release: 5.2 +Release: 6 License: Apache Software License Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -16,6 +16,7 @@ Patch6: apr-1.2.2-locktimeout.patch Patch7: apr-1.2.2-libdir.patch Patch8: apr-1.2.2-seekflush.patch +Patch9: apr-1.2.2-pthreadprio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildPrereq: autoconf, libtool, doxygen Conflicts: subversion < 0.20.1-2 @@ -49,6 +50,7 @@ %patch6 -p1 -b .locktimeout %patch7 -p1 -b .libdir %patch8 -p1 -b .seekflush +%patch9 -p1 -b .pthreadprio %build # regenerate configure script etc. @@ -120,6 +122,9 @@ %{_includedir}/apr-%{aprver}/*.h %changelog +* Wed Jan 4 2006 Joe Orton 1.2.2-6 +- fix build with recent glibc (#176911) + * Tue Jan 3 2006 Jesse Keating 1.2.2-5.2 - rebuilt again From fedora-cvs-commits at redhat.com Wed Jan 4 12:19:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 07:19:40 -0500 Subject: rpms/netpbm/FC-4 netpbm-10.28-legal.patch, NONE, 1.1 netpbm-10.29-pnmtopng.patch, NONE, 1.1 netpbm-10.30-rgbtxt.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 netpbm-10.23-security.patch, 1.9, 1.10 netpbm-10.27-bmptopnm.patch, 1.1, 1.2 netpbm-10.28-CAN-2005-2471.patch, 1.1, 1.2 netpbm-10.28-gcc4.patch, 1.1, 1.2 netpbm.spec, 1.40, 1.41 sources, 1.17, 1.18 netpbm-10.18-manpath.patch, 1.1, NONE Message-ID: <200601041219.k04CJeqb022583@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/netpbm/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22467 Modified Files: .cvsignore netpbm-10.23-security.patch netpbm-10.27-bmptopnm.patch netpbm-10.28-CAN-2005-2471.patch netpbm-10.28-gcc4.patch netpbm.spec sources Added Files: netpbm-10.28-legal.patch netpbm-10.29-pnmtopng.patch netpbm-10.30-rgbtxt.patch Removed Files: netpbm-10.18-manpath.patch Log Message: * Wed Jan 04 2006 Jindrich Novy 10.31-1.FC4 - update to 10.31 - update security patch - regenerate man pages - drop manpath patch - add .legal, .pnmtopng, .rgbtxt patches - update .security, .security2, .bmptopnm, .CAN-2005-2471, .gcc4 patches - new version fixes error in pnmnorm #176845 netpbm-10.28-legal.patch: other/Makefile | 2 +- ppm/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE netpbm-10.28-legal.patch --- --- netpbm-10.28/converter/other/Makefile.legal 2005-04-12 05:55:29.000000000 +0200 +++ netpbm-10.28/converter/other/Makefile 2005-06-10 10:54:01.685885728 +0200 @@ -7,7 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR) include $(BUILDDIR)/Makefile.config -SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam +SUBDIRS = pnmtopalm jpeg2000 cameratopam ifneq ($(BUILD_FIASCO), N) SUBDIRS += fiasco endif --- netpbm-10.28/converter/ppm/Makefile.legal 2004-10-16 20:55:28.000000000 +0200 +++ netpbm-10.28/converter/ppm/Makefile 2005-06-10 10:56:04.616197480 +0200 @@ -7,7 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR) include $(BUILDDIR)/Makefile.config -SUBDIRS = hpcdtoppm ppmtompeg +SUBDIRS = ppmtompeg PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \ leaftoppm mtvtoppm neotoppm \ netpbm-10.29-pnmtopng.patch: pnmtopng.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE netpbm-10.29-pnmtopng.patch --- --- netpbm-10.29/converter/other/pnmtopng.c.segfault 2005-08-06 19:26:55.000000000 +0200 +++ netpbm-10.29/converter/other/pnmtopng.c 2005-10-05 14:33:03.000000000 +0200 @@ -1618,7 +1618,7 @@ makePngLine(png_byte * const l *pp++ = PNM_GET1(p_png) & 0xff; } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { unsigned int paletteIndex; - if (alpha) + if (alpha && alpha_mask) paletteIndex = lookupColorAlpha(caht, &p, &alpha_mask[col]); else paletteIndex = ppm_lookupcolor(cht, &p); @@ -1637,7 +1637,7 @@ makePngLine(png_byte * const l } else pm_error("INTERNAL ERROR: undefined color_type"); - if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) { + if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA && alpha_mask) { int const png_alphaval = (int) alpha_mask[col] * (float) png_maxval / maxval + 0.5; if (depth == 16) netpbm-10.30-rgbtxt.patch: pm_config.in.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE netpbm-10.30-rgbtxt.patch --- --- netpbm-10.30/pm_config.in.h.rgbtxt 2005-04-25 04:21:43.000000000 +0200 +++ netpbm-10.30/pm_config.in.h 2005-11-29 16:52:10.000000000 +0100 @@ -106,8 +106,8 @@ #define RGB_DB2 "PBMplus_Dir:RGB.TXT" #define RGB_DB3 "PBMplus_Dir:RGB.TXT" #else -#define RGB_DB1 "/usr/lib/X11/rgb.txt" -#define RGB_DB2 "/usr/openwin/lib/rgb.txt" +#define RGB_DB1 "/usr/share/X11/rgb.txt" +#define RGB_DB2 "/usr/lib/X11/rgb.txt" #define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" #endif Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-4/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 29 Mar 2005 14:08:28 -0000 1.15 +++ .cvsignore 4 Jan 2006 12:19:35 -0000 1.16 @@ -8,3 +8,5 @@ netpbmdoc-10.26.4.tar.bz2 netpbm-10.27.tar.bz2 netpbmdoc-10.27.tar.bz2 +netpbm-10.31.tar.bz2 +netpbmdoc-10.31.tar.bz2 netpbm-10.23-security.patch: OPENLICENSE | 163 +++++++++++++++++++++++++++++++++++++ analyzer/pgmhist.c | 1 analyzer/pgmtexture.c | 9 ++ converter/other/gemtopnm.c | 1 converter/other/jpegtopnm.c | 1 converter/other/pbmtopgm.c | 1 converter/other/pngtopnm.c | 19 ++-- converter/other/pnmtoddif.c | 2 converter/other/pnmtojpeg.c | 9 +- converter/other/pnmtops.c | 11 +- converter/other/pnmtorle.c | 2 converter/other/pnmtosgi.c | 19 ++++ converter/other/rletopnm.c | 2 converter/other/sgitopnm.c | 6 + converter/other/sirtopnm.c | 1 converter/other/tifftopnm.c | 3 converter/other/xwdtopnm.c | 8 + converter/pbm/icontopbm.c | 6 + converter/pbm/mdatopbm.c | 5 - converter/pbm/mgrtopbm.c | 2 converter/pbm/pbmto10x.c | 2 converter/pbm/pbmto4425.c | 3 converter/pbm/pbmtoascii.c | 2 converter/pbm/pbmtocmuwm.c | 1 converter/pbm/pbmtogem.c | 1 converter/pbm/pbmtogo.c | 1 converter/pbm/pbmtoicon.c | 1 converter/pbm/pbmtolj.c | 4 converter/pbm/pbmtomacp.c | 3 converter/pbm/pbmtomda.c | 1 converter/pbm/pbmtomgr.c | 1 converter/pbm/pbmtoppa/pbm.c | 4 converter/pbm/pbmtoppa/pbmtoppa.c | 1 converter/pbm/pbmtox10bm.c | 1 converter/pbm/pbmtoxbm.c | 1 converter/pbm/pbmtoybm.c | 1 converter/pbm/pbmtozinc.c | 1 converter/pbm/pktopbm.c | 1 converter/pbm/thinkjettopbm.l | 4 converter/pbm/ybmtopbm.c | 1 converter/pgm/lispmtopgm.c | 5 - converter/pgm/psidtopgm.c | 1 converter/ppm/Makefile | 2 converter/ppm/ilbmtoppm.c | 28 ++++++ converter/ppm/imgtoppm.c | 2 converter/ppm/pcxtoppm.c | 3 converter/ppm/picttoppm.c | 2 converter/ppm/pjtoppm.c | 21 ++-- converter/ppm/ppmtoeyuv.c | 1 converter/ppm/ppmtoicr.c | 2 converter/ppm/ppmtoilbm.c | 9 +- converter/ppm/ppmtolj.c | 3 converter/ppm/ppmtomitsu.c | 2 converter/ppm/ppmtompeg/frame.c | 73 ++++++++-------- converter/ppm/ppmtompeg/iframe.c | 20 ++-- converter/ppm/ppmtompeg/parallel.c | 4 converter/ppm/ppmtompeg/psearch.c | 18 +++- converter/ppm/ppmtompeg/rgbtoycc.c | 2 converter/ppm/ppmtopcx.c | 2 converter/ppm/ppmtopict.c | 2 converter/ppm/ppmtopj.c | 1 converter/ppm/ppmtopjxl.c | 8 + converter/ppm/ppmtowinicon.c | 8 + converter/ppm/ppmtoxpm.c | 2 converter/ppm/qrttoppm.c | 2 converter/ppm/sldtoppm.c | 4 converter/ppm/ximtoppm.c | 4 converter/ppm/xpmtoppm.c | 1 converter/ppm/yuvtoppm.c | 1 doc/COPYRIGHT.PATENT | 5 + editor/pamcut.c | 2 editor/pamoil.c | 1 editor/pbmclean.c | 2 editor/pbmlife.c | 2 editor/pbmpscale.c | 1 editor/pbmreduce.c | 1 editor/pnmcut.c | 1 editor/pnmgamma.c | 1 editor/pnmhisteq.c | 1 editor/pnmindex.csh | 3 editor/pnmpad.c | 2 editor/pnmpaste.c | 5 + editor/pnmremap.c | 2 editor/pnmrotate.c | 8 + editor/pnmscalefixed.c | 7 + editor/pnmshear.c | 6 + editor/ppmdither.c | 6 + generator/pbmpage.c | 3 generator/pbmtext.c | 15 +++ generator/pgmcrater.c | 2 generator/pgmkernel.c | 2 generator/ppmrainbow | 2 lib/libpam.c | 3 lib/libpammap.c | 2 lib/libpbm1.c | 1 lib/libpbmvms.c | 2 lib/libpm.c | 54 +++++++++++- lib/pm.h | 6 + other/pnmcolormap.c | 1 urt/README | 5 + urt/Runput.c | 10 +- urt/rle.h | 13 ++ urt/rle_addhist.c | 15 ++- urt/rle_getrow.c | 3 urt/rle_hdr.c | 19 +++- urt/rle_open_f.c | 8 + urt/rle_putcom.c | 6 + urt/scanargs.c | 6 - 108 files changed, 672 insertions(+), 101 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.9 -r 1.10 netpbm-10.23-security.patch Index: netpbm-10.23-security.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm-10.23-security.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- netpbm-10.23-security.patch 29 Jul 2005 08:14:30 -0000 1.9 +++ netpbm-10.23-security.patch 4 Jan 2006 12:19:35 -0000 1.10 @@ -1,28 +1,171 @@ ---- netpbm-10.28/generator/ppmrainbow.security 2003-01-04 01:40:56.000000000 +0100 -+++ netpbm-10.28/generator/ppmrainbow 2005-06-10 09:44:00.275597176 +0200 -@@ -11,7 +11,7 @@ my ($Twid, $Thgt, $tmpdir, $norepeat, $v - # set defaults - $Twid = 600; - $Thgt = 8; --$tmpdir = $ENV{"TMPDIR"} || "/tmp"; -+$tmpdir = $ENV{"TMPDIR"} || ".tmp"; - $norepeat = $FALSE; - $verbose = $FALSE; - ---- netpbm-10.28/generator/pbmpage.c.security 2005-05-22 20:43:13.000000000 +0200 -+++ netpbm-10.28/generator/pbmpage.c 2005-06-10 09:44:00.276597024 +0200 -@@ -163,6 +163,9 @@ output_pbm(FILE *file, const int Width, - /* We round the allocated row space up to a multiple of 8 so the ugly - fast code below can work. - */ -+ -+ overflow_add(Width, 7); -+ - pbmrow = pbm_allocrow(((Width+7)/8)*8); - - bitmap_cursor = 0; ---- netpbm-10.28/generator/pbmtext.c.security 2005-04-14 19:03:43.000000000 +0200 -+++ netpbm-10.28/generator/pbmtext.c 2005-06-10 09:44:00.278596720 +0200 +--- /dev/null 2005-12-28 07:55:55.980549750 +0100 ++++ netpbm-10.31/OPENLICENSE 2005-12-30 10:44:51.000000000 +0100 +@@ -0,0 +1,163 @@ ++ The Open Software License ++ v. 1.1 ++ ++This Open Software License (the "License") applies to any original work of ++authorship (the "Original Work") whose owner (the "Licensor") has placed the ++following notice immediately following the copyright notice for the Original ++Work: ++ ++Licensed under the Open Software License version 1.1 ++ ++1) Grant of Copyright License. Licensor hereby grants You a world-wide, ++royalty-free, non-exclusive, perpetual, non-sublicenseable license to do the ++following: ++ ++a) to reproduce the Original Work in copies; ++ ++b) to prepare derivative works ("Derivative Works") based upon the Original ++Work; ++ ++c) to distribute copies of the Original Work and Derivative Works to the ++public, with the proviso that copies of Original Work or Derivative Works that ++You distribute shall be licensed under the Open Software License; ++ ++d) to perform the Original Work publicly; and ++ ++e) to display the Original Work publicly. ++ ++2) Grant of Patent License. Licensor hereby grants You a world-wide, ++royalty-free, non-exclusive, perpetual, non-sublicenseable license, under ++patent claims owned or controlled by the Licensor that are embodied in the ++Original Work as furnished by the Licensor ("Licensed Claims") to make, use, ++sell and offer for sale the Original Work. Licensor hereby grants You a ++world-wide, royalty-free, non-exclusive, perpetual, non-sublicenseable license ++under the Licensed Claims to make, use, sell and offer for sale Derivative Works. ++ ++3) Grant of Source Code License. The term "Source Code" means the preferred ++form of the Original Work for making modifications to it and all available ++documentation describing how to modify the Original Work. Licensor hereby ++agrees to provide a machine-readable copy of the Source Code of the Original ++Work along with each copy of the Original Work that Licensor distributes. ++Licensor reserves the right to satisfy this obligation by placing a ++machine-readable copy of the Source Code in an information repository reasonably ++calculated to permit inexpensive and convenient access by You for as long as ++ Licensor continues to distribute the Original Work, and by publishing the ++address of that information repository in a notice immediately following the ++copyright notice that applies to the Original Work. ++ ++ ++4) Exclusions From License Grant. Nothing in this License shall be deemed to ++grant any rights to trademarks, copyrights, patents, trade secrets or any ++other intellectual property of Licensor except as expressly stated herein. No ++patent license is granted to make, use, sell or offer to sell embodiments of ++any patent claims other than the Licensed Claims defined in Section 2. No ++right is granted to the trademarks of Licensor even if such marks are included ++in the Original Work. Nothing in this License shall be interpreted to prohibit ++Licensor from licensing under different terms from this License any Original ++Work that Licensor otherwise would have a right to license. ++ ++5) External Deployment. The term "External Deployment" means the use or ++distribution of the Original Work or Derivative Works in any way such that the ++Original Work or Derivative Works may be used by anyone other than You, ++whether the Original Work or Derivative Works are distributed to those persons ++or made available as an application intended for use over a computer network. ++As an express condition for the grants of license hereunder, You agree that ++any External Deployment by You of a Derivative Work shall be deemed a ++distribution and shall be licensed to all under the terms of this License, as ++prescribed in section 1(c) herein. ++ ++6) Attribution Rights. You must retain, in the Source Code of any Derivative ++Works that You create, all copyright, patent or trademark notices from the ++Source Code of the Original Work, as well as any notices of licensing and any ++descriptive text identified therein as an "Attribution Notice." You must cause ++the Source Code for any Derivative Works that You create to carry a prominent ++Attribution Notice reasonably calculated to inform recipients that You have ++modified the Original Work. ++ ++7) Warranty and Disclaimer of Warranty. Licensor warrants that the copyright ++in and to the Original Work is owned by the Licensor or that the Original Work ++is distributed by Licensor under a valid current license from the copyright ++owner. Except as expressly stated in the immediately proceeding sentence, the ++Original Work is provided under this License on an "AS IS" BASIS and WITHOUT ++WARRANTY, either express or implied, including, without limitation, the ++warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR ++PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. ++This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No ++license to Original Work is granted hereunder except under this disclaimer. ++ ++8) Limitation of Liability. Under no circumstances and under no legal theory, ++whether in tort (including negligence), contract, or otherwise, shall the ++Licensor be liable to any person for any direct, indirect, special, incidental, ++or consequential damages of any character arising as a result of this License ++or the use of the Original Work including, without limitation, damages for ++loss of goodwill, work stoppage, computer failure or malfunction, or any and ++all other commercial damages or losses. This limitation of liability shall not ++apply to liability for death or personal injury resulting from Licensor's ++negligence to the extent applicable law prohibits such limitation. Some ++jurisdictions do not allow the exclusion or limitation of incidental or ++consequential damages, so this exclusion and limitation may not apply to You. ++ ++ ++9) Acceptance and Termination. If You distribute copies of the Original Work ++or a Derivative Work, You must make a reasonable effort under the circumstances ++to obtain the express and volitional assent of recipients to the terms of this ++License. Nothing else but this License (or another written agreement between ++Licensor and You) grants You permission to create Derivative Works based upon ++the Original Work or to exercise any of the rights granted in Sections 1 herein, ++and any attempt to do so except under the terms of this License (or another ++written agreement between Licensor and You) is expressly prohibited by U.S. ++copyright law, the equivalent laws of other countries, and by international ++treaty. Therefore, by exercising any of the rights granted to You in Sections ++1 herein, You indicate Your acceptance of this License and all of its terms and ++conditions. This License shall terminate immediately and you may no longer ++exercise any of the rights granted to You by this License upon Your failure to ++honor the proviso in Section 1(c) herein. ++ ++10) Mutual Termination for Patent Action. This License shall terminate ++automatically and You may no longer exercise any of the rights granted to You ++by this License if You file a lawsuit in any court alleging that any OSI ++Certified open source software that is licensed under any license containing ++this "Mutual Termination for Patent Action" clause infringes any patent claims ++that are essential to use that software. ++ ++11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this ++License may be brought only in the courts of a jurisdiction wherein the Licensor ++resides or in which Licensor conducts its primary business, and under the laws ++of that jurisdiction excluding its conflict-of-law provisions. The application ++of the United Nations Convention on Contracts for the International Sale of ++Goods is expressly excluded. Any use of the Original Work outside the scope of ++this License or after its termination shall be subject to the requirements and ++penalties of the U.S. Copyright Act, 17 U.S.C. ?? 101 et seq., the equivalent ++laws of other countries, and international treaty. This section shall survive ++the termination of this License. ++ ++12) Attorneys Fees. In any action to enforce the terms of this License or ++seeking damages relating thereto, the prevailing party shall be entitled to ++recover its costs and expenses, including, without limitation, reasonable ++attorneys' fees and costs incurred in connection with such action, including ++any appeal of such action. This section shall survive the termination of this ++License. ++ ++13) Miscellaneous. This License represents the complete agreement concerning ++the subject matter hereof. If any provision of this License is held to be ++unenforceable, such provision shall be reformed only to the extent necessary ++to make it enforceable. ++ ++14) Definition of "You" in This License. "You" throughout this License, ++whether in upper or lower case, means an individual or a legal entity exercising ++rights under, and complying with all of the terms of, this License. For legal ++entities, "You" includes any entity that controls, is controlled by, or is under ++common control with you. For purposes of this definition, "control" means (i) ++the power, direct or indirect, to cause the direction or management of such ++entity, whether by contract or otherwise, or (ii) ownership of fifty percent ++(50%) or more of the outstanding shares, or (iii) beneficial ownership of such ++entity. ++ ++15) Right to Use. You may use the Original Work in all ways not otherwise ++restricted or conditioned by this License or by law, and Licensor promises not ++to interfere with or be responsible for such uses by You. ++ ++This license is Copyright (C) 2002 Lawrence E. Rosen. All rights reserved. ++Permission is hereby granted to copy and distribute this license without ++modification. This license may not be modified without the express written ++permission of its copyright owner. [...3792 lines suppressed...] + length += strlen(old); /* add length if there. */ ++ } + ++ overflow_add(length, 1); + ++length; /*Cater for the null. */ + + MALLOCARRAY(newc, length); +--- netpbm-10.31/urt/rle_hdr.c.security 2005-10-17 00:16:33.000000000 +0200 ++++ netpbm-10.31/urt/rle_hdr.c 2005-12-30 10:44:51.000000000 +0100 @@ -14,6 +14,8 @@ * If you modify this software, you should include a notice giving the * name of the person performing the modification, the date of modification, @@ -2452,7 +2296,7 @@ */ /* * rle_hdr.c - Functions to manipulate rle_hdr structures. -@@ -77,7 +79,10 @@ int img_num; +@@ -79,7 +81,10 @@ int img_num; /* Fill in with copies of the strings. */ if ( the_hdr->cmd != pgmname ) { @@ -2464,7 +2308,7 @@ RLE_CHECK_ALLOC( pgmname, tmp, 0 ); strcpy( tmp, pgmname ); the_hdr->cmd = tmp; -@@ -85,7 +90,9 @@ int img_num; +@@ -87,7 +92,9 @@ int img_num; if ( the_hdr->file_name != fname ) { @@ -2475,7 +2319,7 @@ RLE_CHECK_ALLOC( pgmname, tmp, 0 ); strcpy( tmp, fname ); the_hdr->file_name = tmp; -@@ -150,6 +157,7 @@ rle_hdr *from_hdr, *to_hdr; +@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr; if ( to_hdr->bg_color ) { int size = to_hdr->ncolors * sizeof(int); @@ -2483,7 +2327,7 @@ to_hdr->bg_color = (int *)malloc( size ); RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" ); memcpy( to_hdr->bg_color, from_hdr->bg_color, size ); -@@ -158,7 +166,7 @@ rle_hdr *from_hdr, *to_hdr; +@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr; if ( to_hdr->cmap ) { int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map); @@ -2492,7 +2336,7 @@ RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" ); memcpy( to_hdr->cmap, from_hdr->cmap, size ); } -@@ -171,11 +179,16 @@ rle_hdr *from_hdr, *to_hdr; +@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr; int size = 0; CONST_DECL char **cp; for ( cp=to_hdr->comments; *cp; cp++ ) @@ -2509,52 +2353,94 @@ size *= sizeof(char *); to_hdr->comments = (CONST_DECL char **)malloc( size ); RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" ); ---- netpbm-10.28/analyzer/pgmhist.c.security 2003-07-06 21:23:19.000000000 +0200 -+++ netpbm-10.28/analyzer/pgmhist.c 2005-06-10 09:44:00.413576200 +0200 -@@ -45,6 +45,7 @@ main( argc, argv ) - grayrow = pgm_allocrow( cols ); - - /* Build histogram. */ -+ overflow_add(maxval, 1); - MALLOCARRAY(hist, maxval + 1); - MALLOCARRAY(rcount, maxval + 1); - if ( hist == NULL || rcount == NULL ) ---- netpbm-10.28/analyzer/pgmtexture.c.security 2003-08-07 18:18:16.000000000 +0200 -+++ netpbm-10.28/analyzer/pgmtexture.c 2005-06-10 09:44:00.414576048 +0200 -@@ -75,7 +75,10 @@ vector (int nl, int nh) - { - float *v; +--- netpbm-10.31/urt/README.security 2000-06-02 22:53:04.000000000 +0200 ++++ netpbm-10.31/urt/README 2005-12-30 10:44:51.000000000 +0100 +@@ -18,3 +18,8 @@ in its initializer in the original. But + defines stdout as a variable, so that wouldn't compile. So I changed + it to NULL and added a line to rle_hdr_init to set that field to + 'stdout' dynamically. 2000.06.02 BJH. ++ ++Redid the code to check for maths overflows and other crawly horrors. ++Removed pipe through and compress support (unsafe) ++ ++Alan Cox +--- netpbm-10.31/urt/Runput.c.security 2005-10-16 23:36:29.000000000 +0200 ++++ netpbm-10.31/urt/Runput.c 2005-12-30 10:44:51.000000000 +0100 +@@ -17,6 +17,8 @@ + * + * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire + * to have all "void" functions so declared. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * Runput.c - General purpose Run Length Encoding. +@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr) + if ( the_hdr->background != 0 ) + { + register int i; +- register rle_pixel *background = +- (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); ++ register rle_pixel *background; + register int *bg_color; ++ ++ overflow_add(the_hdr->ncolors,1); ++ background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); + /* + * If even number of bg color bytes, put out one more to get to + * 16 bit boundary. +@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr) + /* Big-endian machines are harder */ + register int i, nmap = (1 << the_hdr->cmaplen) * + the_hdr->ncmap; +- register char *h_cmap = (char *)malloc( nmap * 2 ); ++ register char *h_cmap = (char *)malloc2( nmap, 2 ); + if ( h_cmap == NULL ) + { + fprintf( stderr, +--- netpbm-10.31/urt/rle_getrow.c.security 2005-10-16 23:47:53.000000000 +0200 ++++ netpbm-10.31/urt/rle_getrow.c 2005-12-30 10:44:51.000000000 +0100 +@@ -17,6 +17,8 @@ + * + * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire + * to have all "void" functions so declared. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * rle_getrow.c - Read an RLE file in. +@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) { + register char * cp; -- MALLOCARRAY(v, (unsigned) (nh - nl + 1)); -+ overflow_add(nh, 1); -+ if(nh < nl) -+ pm_error("assert: h < l"); -+ v = (float *) malloc2 ((nh - nl + 1), sizeof (float)); - if (v == NULL) - pm_error("Unable to allocate memory for a vector."); - return v - nl; -@@ -91,16 +94,22 @@ matrix (int nrl, int nrh, int ncl, int n - float **m; - - /* allocate pointers to rows */ -- MALLOCARRAY(m, (unsigned) (nrh - nrl + 1)); -+ overflow_add(nrh, 1); -+ if(nrh < nrl) -+ pm_error("assert: nrh < nrl"); -+ m = (float **) malloc2(nrh - nrl + 1, sizeof (float *)); - if (m == NULL) - pm_error("Unable to allocate memory for a matrix."); - - m -= ncl; - -+ if(nch < ncl) -+ pm_error("assert: nch < ncl"); -+ overflow_add(nch, 1); - /* allocate rows and set pointers to them */ - for (i = nrl; i <= nrh; i++) - { -- MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1)); -+ m[i] = (float *) malloc2(nch - ncl + 1, sizeof (float)); - if (m[i] == NULL) - pm_error("Unable to allocate memory for a matrix row."); - m[i] -= ncl; + VAXSHORT( comlen, infile ); /* get comment length */ ++ overflow_add(comlen, 1); + evenlen = (comlen + 1) & ~1; /* make it even */ + if ( evenlen ) + { +--- netpbm-10.31/urt/rle_putcom.c.security 2005-10-07 18:01:42.000000000 +0200 ++++ netpbm-10.31/urt/rle_putcom.c 2005-12-30 10:44:51.000000000 +0100 +@@ -14,6 +14,8 @@ + * If you modify this software, you should include a notice giving the + * name of the person performing the modification, the date of modification, + * and the reason for such modification. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * rle_putcom.c - Add a picture comment to the header struct. +@@ -98,12 +100,14 @@ rle_putcom(const char * const value, + const char * v; + const char ** old_comments; + int i; +- for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) ++ for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) { ++ overflow_add(i, 1); + if (match(value, *cp) != NULL) { + v = *cp; + *cp = value; + return v; + } ++ } + /* Not found */ + /* Can't realloc because somebody else might be pointing to this + * comments block. Of course, if this were true, then the netpbm-10.27-bmptopnm.patch: bmptopnm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: netpbm-10.27-bmptopnm.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm-10.27-bmptopnm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netpbm-10.27-bmptopnm.patch 9 May 2005 10:18:31 -0000 1.1 +++ netpbm-10.27-bmptopnm.patch 4 Jan 2006 12:19:36 -0000 1.2 @@ -9,15 +9,6 @@ unsigned int pos; /* The following are all information from the BMP headers */ -@@ -1081,7 +1081,7 @@ main(int argc, char ** argv) { - parse_command_line(argc, argv, &cmdline); - - ifP = pm_openr(cmdline.input_filespec); -- if (strcmp(cmdline.input_filespec, "-")) -+ if (!strcmp(cmdline.input_filespec, "-")) - ifname = "Standard Input"; - else - ifname = cmdline.input_filespec; @@ -1106,7 +1106,7 @@ main(int argc, char ** argv) { writeRaster(BMPraster, cols, rows, outputType, cBitCount, pixelformat, colormap); netpbm-10.28-CAN-2005-2471.patch: pstopnm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: netpbm-10.28-CAN-2005-2471.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm-10.28-CAN-2005-2471.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netpbm-10.28-CAN-2005-2471.patch 9 Aug 2005 11:27:25 -0000 1.1 +++ netpbm-10.28-CAN-2005-2471.patch 4 Jan 2006 12:19:36 -0000 1.2 @@ -1,18 +1,15 @@ ---- netpbm-10.28/converter/other/pstopnm.c.CAN-2005-2471 2004-06-23 04:22:33.000000000 +0200 -+++ netpbm-10.28/converter/other/pstopnm.c 2005-08-09 08:41:42.000000000 +0200 -@@ -702,13 +702,13 @@ - - if (verbose) { - pm_message("execing '%s' with args '%s' (arg 0), " -- "'%s', '%s', '%s', '%s', '%s', '%s', '%s'", -+ "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'", +--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200 ++++ netpbm-10.29/converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200 +@@ -711,11 +711,11 @@ + "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'", ghostscriptProg, arg0, -- deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-"); -+ deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-dPARANOIDSAFER", "-"); + deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", +- "-dSAFER", "-"); ++ "-dPARANOIDSAFER", "-"); } execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q", -- "-dNOPAUSE", "-", NULL); +- "-dNOPAUSE", "-dSAFER", "-", NULL); + "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL); pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)", netpbm-10.28-gcc4.patch: lib/pm.h | 1 + urt/rle.h | 1 + 2 files changed, 2 insertions(+) Index: netpbm-10.28-gcc4.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm-10.28-gcc4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netpbm-10.28-gcc4.patch 29 Jul 2005 08:18:20 -0000 1.1 +++ netpbm-10.28-gcc4.patch 4 Jan 2006 12:19:36 -0000 1.2 @@ -1,26 +1,5 @@ ---- netpbm-10.28/converter/ppm/ppmtowinicon.c.gcc4 2005-06-10 10:34:45.341676768 +0200 -+++ netpbm-10.28/converter/ppm/ppmtowinicon.c 2005-06-10 10:34:51.749702600 +0200 -@@ -745,7 +745,7 @@ addEntryToIcon(MS_Ico const MSIcon - * Perhaps I should use something that allocs a decent amount at start... - */ - MSIconData->entries = -- realloc2 (MSIconData->entries, MSIconData->count * sizeof(IC_Entry *)); -+ (IC_Entry*)realloc2 (MSIconData->entries, MSIconData->count * sizeof(IC_Entry *)); - MSIconData->entries[MSIconData->count-1] = entry; - } - ---- netpbm-10.28/buildtools/typegen.c.gcc4 2005-04-27 18:24:29.000000000 +0200 -+++ netpbm-10.28/buildtools/typegen.c 2005-06-10 10:34:51.749702600 +0200 -@@ -28,6 +28,7 @@ - We also include the multiple inclusion guard ifdef. - -----------------------------------------------------------------------------*/ - #include -+#include - #include - - ---- netpbm-10.28/lib/pm.h.gcc4 2005-06-10 10:34:45.399667952 +0200 -+++ netpbm-10.28/lib/pm.h 2005-06-10 10:34:51.750702448 +0200 +--- netpbm-10.30/lib/pm.h.gcc4 2005-10-21 12:19:56.000000000 +0200 ++++ netpbm-10.30/lib/pm.h 2005-10-21 12:20:03.000000000 +0200 @@ -18,6 +18,7 @@ #include #include @@ -29,37 +8,13 @@ #include #include #include ---- netpbm-10.28/urt/rle_getrow.c.gcc4 2005-06-10 10:34:45.401667648 +0200 -+++ netpbm-10.28/urt/rle_getrow.c 2005-06-10 10:34:51.751702296 +0200 -@@ -32,7 +32,8 @@ - * $Id$ - */ - --#include "stdio.h" -+#include -+#include - #include "rle.h" - #include "rle_code.h" - #include "vaxshort.h" ---- netpbm-10.28/urt/rle.h.gcc4 2005-06-10 10:34:45.402667496 +0200 -+++ netpbm-10.28/urt/rle.h 2005-06-10 10:34:51.752702144 +0200 +--- netpbm-10.30/urt/rle.h.gcc4 2005-10-21 12:19:56.000000000 +0200 ++++ netpbm-10.30/urt/rle.h 2005-10-21 12:21:31.000000000 +0200 @@ -36,6 +36,7 @@ - #include "rle_config.h" /* Configuration parameters. */ + #include "rle_config.h" /* Configuration parameters. */ - #include /* Declare FILE. */ + #include /* Declare FILE. */ +#include #ifdef c_plusplus #define USE_PROTOTYPES ---- netpbm-10.28/urt/Runput.c.gcc4 2005-06-10 10:34:45.400667800 +0200 -+++ netpbm-10.28/urt/Runput.c 2005-06-10 10:34:51.753701992 +0200 -@@ -92,7 +92,8 @@ - * follow the last byte in the run. - */ - --#include "stdio.h" -+#include -+#include - #include "rle_put.h" - #include "rle.h" - #include "rle_code.h" Index: netpbm.spec =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-4/netpbm.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- netpbm.spec 9 Aug 2005 11:27:25 -0000 1.40 +++ netpbm.spec 4 Jan 2006 12:19:36 -0000 1.41 @@ -1,25 +1,25 @@ Summary: A library for handling different graphics file formats. Name: netpbm -Version: 10.28 -Release: 1.FC4.2 +Version: 10.31 +Release: 1.FC4 License: freeware Group: System Environment/Libraries URL: http://netpbm.sourceforge.net/ Source0: netpbm-%{version}.tar.bz2 Source1: netpbmdoc-%{version}.tar.bz2 +Patch0: netpbm-10.28-legal.patch Patch1: netpbm-10.17-time.patch Patch2: netpbm-9.24-strip.patch -Patch3: netpbm-10.18-manpath.patch -Patch4: netpbm-10.19-message.patch -Patch5: netpbm-10.22-security2.patch -Patch6: netpbm-10.22-cmapsize.patch -Patch7: netpbm-10.23-security.patch -Patch9: netpbm-10.24-nodoc.patch -Patch10: netpbm-10.28-gcc4.patch -Patch12: netpbm-10.27-bmptopnm.patch -Patch13: netpbm-10.27-libpm.patch -Patch14: netpbm-10.27-pnmtojpeg.patch -Patch15: netpbm-10.28-CAN-2005-2471.patch +Patch3: netpbm-10.19-message.patch +Patch4: netpbm-10.22-security2.patch +Patch5: netpbm-10.22-cmapsize.patch +Patch6: netpbm-10.23-security.patch +Patch7: netpbm-10.24-nodoc.patch +Patch8: netpbm-10.28-gcc4.patch +Patch9: netpbm-10.27-bmptopnm.patch +Patch10: netpbm-10.28-CAN-2005-2471.patch +Patch11: netpbm-10.29-pnmtopng.patch +Patch12: netpbm-10.30-rgbtxt.patch Buildroot: %{_tmppath}/%{name}-root BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl Obsoletes: libgr @@ -63,19 +63,19 @@ %prep %setup -q +%patch0 -p1 -b .legal %patch1 -p1 -b .time %patch2 -p1 -b .strip -%patch3 -p1 -b .manpath -%patch4 -p1 -b .message -%patch5 -p1 -b .security2 -%patch6 -p1 -b .cmapsize -%patch7 -p1 -b .security -%patch9 -p1 -b .nodoc -%patch10 -p1 -b .gcc4 -%patch12 -p1 -b .bmptopnm -%patch13 -p1 -b .libpm -%patch14 -p1 -b .pnmtojpeg -%patch15 -p1 -b .CAN-2005-2471 +%patch3 -p1 -b .message +%patch4 -p1 -b .security2 +%patch5 -p1 -b .cmapsize +%patch6 -p1 -b .security +%patch7 -p1 -b .nodoc +%patch8 -p1 -b .gcc4 +%patch9 -p1 -b .bmptopnm +%patch10 -p1 -b .CAN-2005-2471 +%patch11 -p1 -b .pnmtopng +%patch12 -p1 -b .rgbtxt ##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile @@ -173,6 +173,15 @@ %{_mandir}/man5/* %changelog +* Wed Jan 04 2006 Jindrich Novy 10.31-1.FC4 +- update to 10.31 +- update security patch +- regenerate man pages +- drop manpath patch +- add .legal, .pnmtopng, .rgbtxt patches +- update .security, .security2, .bmptopnm, .CAN-2005-2471, .gcc4 patches +- new version fixes error in pnmnorm #176845 + * Tue Aug 09 2005 Jindrich Novy 10.28-1.FC4.2 - fix CAN-2005-2471, unsafe gs calls from pstopnm (#165355) Index: sources =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-4/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 29 Jul 2005 08:14:30 -0000 1.17 +++ sources 4 Jan 2006 12:19:36 -0000 1.18 @@ -1,2 +1,2 @@ -f1b766be9e0ba2470f762ee0717b834f netpbm-10.28.tar.bz2 -41f281d183afded0118f2fde2b8b79f1 netpbmdoc-10.28.tar.bz2 +34910af6b21f0de0142876455f27ad88 netpbm-10.31.tar.bz2 +0399e7b78da0291369004f9c19761075 netpbmdoc-10.31.tar.bz2 --- netpbm-10.18-manpath.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 4 12:45:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 07:45:15 -0500 Subject: rpms/apr/devel apr.spec, 1.43, 1.44 apr-1.2.2-pthreadprio.patch, 1.1, NONE Message-ID: <200601041245.k04CjFbr016712@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/apr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16693 Modified Files: apr.spec Removed Files: apr-1.2.2-pthreadprio.patch Log Message: - just forcibly prevent detection of pthread_mutexattr_setrobust_np since it doesn't seem to work. Index: apr.spec =================================================================== RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- apr.spec 4 Jan 2006 11:28:25 -0000 1.43 +++ apr.spec 4 Jan 2006 12:45:13 -0000 1.44 @@ -16,7 +16,6 @@ Patch6: apr-1.2.2-locktimeout.patch Patch7: apr-1.2.2-libdir.patch Patch8: apr-1.2.2-seekflush.patch -Patch9: apr-1.2.2-pthreadprio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildPrereq: autoconf, libtool, doxygen Conflicts: subversion < 0.20.1-2 @@ -50,7 +49,6 @@ %patch6 -p1 -b .locktimeout %patch7 -p1 -b .libdir %patch8 -p1 -b .seekflush -%patch9 -p1 -b .pthreadprio %build # regenerate configure script etc. @@ -60,6 +58,11 @@ # does not use -lrt). export ac_cv_search_shm_open=no +# Forcibly prevent detection of pthread_mutexattr_setrobust_np, +# which doesn't seem to work. +export ac_cv_pthread_mutexattr_setrobust_np=no +export apr_cv_setrobust_with_prio_inherit=no + %configure \ --includedir=%{_includedir}/apr-%{aprver} \ --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \ --- apr-1.2.2-pthreadprio.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 4 12:50:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 07:50:02 -0500 Subject: rpms/apr/devel apr.spec,1.44,1.45 Message-ID: <200601041250.k04Co2fw028016@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/apr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28000 Modified Files: apr.spec Log Message: - fix cache variable name Index: apr.spec =================================================================== RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- apr.spec 4 Jan 2006 12:45:13 -0000 1.44 +++ apr.spec 4 Jan 2006 12:50:00 -0000 1.45 @@ -60,7 +60,7 @@ # Forcibly prevent detection of pthread_mutexattr_setrobust_np, # which doesn't seem to work. -export ac_cv_pthread_mutexattr_setrobust_np=no +export ac_cv_func_pthread_mutexattr_setrobust_np=no export apr_cv_setrobust_with_prio_inherit=no %configure \ From fedora-cvs-commits at redhat.com Wed Jan 4 13:07:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 08:07:05 -0500 Subject: rpms/subversion/devel subversion-1.3.0.tar.gz.asc, NONE, 1.1 .cvsignore, 1.17, 1.18 mirrors, 1.3, 1.4 psvn.el, 1.4, 1.5 sources, 1.19, 1.20 subversion-1.0.3-pie.patch, 1.7, 1.8 subversion.spec, 1.62, 1.63 upstream, 1.9, 1.10 upstream-key.gpg, 1.3, 1.4 subversion-0.24.2-swig.patch, 1.2, NONE Message-ID: <200601041307.k04D75rb006919@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/subversion/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6886 Modified Files: .cvsignore mirrors psvn.el sources subversion-1.0.3-pie.patch subversion.spec upstream upstream-key.gpg Added Files: subversion-1.3.0.tar.gz.asc Removed Files: subversion-0.24.2-swig.patch Log Message: * Wed Jan 4 2006 Joe Orton 1.3.0-2 - update to 1.3.0 (#176833) - update to psvn.el r17921 Stefan Reichoer --- NEW FILE subversion-1.3.0.tar.gz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQBDtUqWCbw14+5QZGERAju6AJ9vfO9KwUsdhWcXUXBdmppkGhMEZgCeIKJd D2q5FAJ5Io/VOkREIQRGkgw= =2B4W -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQBDtY15yR242pvPzi8RAv6jAKCpi8Q1buSx+tfZNFr2YZWcLznJ5gCfYjEz OSduBH8s54ktWLTf8ZbyCxk= =vGhn -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) iD8DBQBDt/me7FmgR1HlB6wRApRDAJ96EWpBCaetqAvDzwpzVuCXwxRJVwCfXT8a 3tHyQHIZVPTQGQgARtKX6y8= =qk8E -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQBDuBZ/1sYklxbYtBwRAr4KAKC0g1G9mr6TDhVD+/6x0ucI6LsmZwCgqfCt ycDz4cEldg64NemLHGFJJ7c= =eIS1 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 22 Jul 2005 14:34:27 -0000 1.17 +++ .cvsignore 4 Jan 2006 13:07:01 -0000 1.18 @@ -1,2 +1,2 @@ -subversion-1.2.1.tar.gz -subversion-1.2.1 +subversion-1.3.0.tar.gz +subversion-1.2.3-3.src.rpm subversion-1.2.3-5.src.rpm Index: mirrors =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/mirrors,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mirrors 8 Sep 2005 15:49:25 -0000 1.3 +++ mirrors 4 Jan 2006 13:07:01 -0000 1.4 @@ -1 +1 @@ -http://subversion.tigris.org/tarballs +http://subversion.tigris.org/downloads Index: psvn.el =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/psvn.el,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- psvn.el 2 Dec 2005 11:20:27 -0000 1.4 +++ psvn.el 4 Jan 2006 13:07:01 -0000 1.5 @@ -48,9 +48,10 @@ ;; A - svn-status-add-file-recursively run 'svn add' ;; + - svn-status-make-directory run 'svn mkdir' ;; R - svn-status-mv run 'svn mv' -;; C-d - svn-status-rm run 'svn rm' +;; D - svn-status-rm run 'svn rm' ;; M-c - svn-status-cleanup run 'svn cleanup' ;; b - svn-status-blame run 'svn blame' +;; X e - svn-status-export run 'svn export' ;; RET - svn-status-find-file-or-examine-directory ;; ^ - svn-status-examine-parent ;; ~ - svn-status-get-specific-revision @@ -115,16 +116,6 @@ ;; Or you can check it out from the subversion repository: ;; svn co http://svn.collab.net/repos/svn/trunk/contrib/client-side/psvn psvn -;; "svn-" is the package prefix used in psvn.el. There are also longer -;; prefixes which clarify the code and help symbol completion, but they -;; are not intended to prevent name clashes with other packages. All -;; interactive commands meant to be used only in a specific mode should -;; have names beginning with the name of that mode: for example, -;; "svn-status-add-file" in "svn-status-mode". "psvn" should be used -;; only in names of files, customization groups, and features. If SVK -;; support is ever added, it should use "svn-svk-" when no existing -;; prefix is applicable. - ;; TODO: ;; * shortcut for svn propset svn:keywords "Date" psvn.el ;; * docstrings for the functions @@ -133,6 +124,10 @@ ;; * finish svn-status-property-set ;; * Add repository browser ;; * Improve support for svn blame +;; * Get rid of all byte-compiler warnings +;; * SVK working copy support +;; * multiple independent buffers in svn-status-mode +;; There are "TODO" comments in other parts of this file as well. ;; Overview over the implemented/not (yet) implemented svn sub-commands: ;; * add implemented @@ -144,7 +139,7 @@ ;; * copy (cp) ;; * delete (del, remove, rm) implemented ;; * diff (di) implemented -;; * export +;; * export implemented ;; * help (?, h) ;; * import ;; * info implemented @@ -170,9 +165,27 @@ ;; Comments / suggestions and bug reports are welcome! +;; Development notes +;; ----------------- + +;; "svn-" is the package prefix used in psvn.el. There are also longer +;; prefixes which clarify the code and help symbol completion, but they +;; are not intended to prevent name clashes with other packages. All +;; interactive commands meant to be used only in a specific mode should +;; have names beginning with the name of that mode: for example, +;; "svn-status-add-file" in "svn-status-mode". "psvn" should be used +;; only in names of files, customization groups, and features. If SVK +;; support is ever added, it should use "svn-svk-" when no existing +;; prefix is applicable. + +;; Many of the variables marked as `risky-local-variable' are probably +;; impossible to abuse, as the commands that read them are used only in +;; buffers that are not visiting any files. Better safe than sorry. + ;;; Code: (require 'easymenu) +(require 'diff-mode nil t) ;;; user setable variables (defcustom svn-status-verbose t @@ -185,6 +198,7 @@ of the *svn-log-edit* buffer." :type 'file :group 'psvn) +(put 'svn-log-edit-file-name 'risky-local-variable t) (defcustom svn-log-edit-insert-files-to-commit t "*Insert the filelist to commit in the *svn-log* buffer" :type 'boolean @@ -220,6 +234,11 @@ (const revert)) :group 'psvn) +(defcustom svn-status-preserve-window-configuration nil + "*Try to preserve the window configuration." + :type 'boolean + :group 'psvn) + (defcustom svn-status-negate-meaning-of-arg-commands '() "*List of operations that should use a negated meaning of the prefix argument. The supported functions are `svn-status' and `svn-status-set-user-mark'." @@ -233,17 +252,22 @@ ;; Don't use (file :must-match t). It doesn't know about `exec-path'. :type 'file :group 'psvn) +(put 'svn-status-svn-executable 'risky-local-variable t) + +(defcustom svn-status-default-export-directory "~/" "*The default directory that is suggested svn export." + :type 'file + :group 'psvn) -;; TODO: bind `process-environment' instead of running env? -;; That would probably work more reliably in Windows. (defcustom svn-status-svn-environment-var-list '() "*A list of environment variables that should be set for that svn process. -If you set that variable, svn is called with that environment variables set. -That is done via the env program. +Each element is either a string \"VARIABLE=VALUE\" which will be added to +the environment when svn is run, or just \"VARIABLE\" which causes that +variable to be entirely removed from the environment. -You could set it for example to '(\"LANG=C\")" - :type '(repeat (string :valid-regexp "=" :value "LANG=C")) +You could set this for example to '(\"LANG=C\")" + :type '(repeat string) :group 'psvn) +(put 'svn-status-svn-environment-var-list 'risky-local-variable t) (defcustom svn-browse-url-function nil ;; If the user hasn't changed `svn-browse-url-function', then changing @@ -272,6 +296,8 @@ :value (("." . browse-url-default-browser)))) :link '(emacs-commentary-link "browse-url") :group 'psvn) +;; (put 'svn-browse-url-function 'risky-local-variable t) +;; already implied by "-function" suffix (defcustom svn-status-window-alist '((diff "*svn-diff*") (log "*svn-log*") (info t) (blame t) (proplist t) (update t)) @@ -335,6 +361,7 @@ \(used in `svn-status-show-svn-log'; override these by giving prefixes\)." :type '(repeat string) :group 'psvn) +(put 'svn-status-default-log-arguments 'risky-local-variable t) (defcustom svn-status-default-commit-arguments '() "*List of arguments to pass to svn commit. @@ -345,6 +372,7 @@ equivalent to \".\", so you would commit more than you intended." :type '(repeat string) :group 'psvn) +(put 'svn-status-default-commit-arguments 'risky-local-variable t) (defcustom svn-status-default-diff-arguments '() "*A list of arguments that is passed to the svn diff command. @@ -352,6 +380,7 @@ '(\"--diff-cmd\" \"diff\" \"-x\" \"-wbBu\")" :type '(repeat string) :group 'psvn) +(put 'svn-status-default-diff-arguments 'risky-local-variable t) (defvar svn-trac-project-root nil "Path for an eventual existing trac issue tracker. @@ -366,6 +395,9 @@ ;;; hooks (defvar svn-log-edit-mode-hook nil "Hook run when entering `svn-log-edit-mode'.") (defvar svn-log-edit-done-hook nil "Hook run after commiting files via svn.") +;; (put 'svn-log-edit-mode-hook 'risky-local-variable t) +;; (put 'svn-log-edit-done-hook 'risky-local-variable t) +;; already implied by "-hook" suffix (defvar svn-status-coding-system nil "A special coding system is needed for the output of svn. @@ -441,6 +473,9 @@ (defvar svn-status-recursive-commit nil "Non-nil if the next commit should be recursive. This is always set together with `svn-status-files-to-commit'.") +(defvar svn-log-edit-update-log-entry nil + "Revision number whose log entry is being edited. +This is nil if the log entry is for a new commit.") (defvar svn-status-pre-commit-window-configuration nil) (defvar svn-status-pre-propedit-window-configuration nil) (defvar svn-status-head-revision nil) @@ -457,16 +492,49 @@ (expand-file-name (or (when (boundp 'temporary-file-directory) temporary-file-directory) ;emacs - (when (fboundp 'temp-directory) (temp-directory)) ;xemacs + ;; XEmacs 21.4.17 can return "/tmp/kalle" from (temp-directory). + ;; `file-name-as-directory' adds a slash so we can append a file name. + (when (fboundp 'temp-directory) (file-name-as-directory (temp-directory))) "/tmp/")) "The directory that is used to store temporary files for psvn.") +;; Because `temporary-file-directory' is not a risky local variable in +;; GNU Emacs 22.0.51, we don't mark `svn-status-temp-dir' as such either. (defvar svn-temp-suffix (make-temp-name ".")) +(put 'svn-temp-suffix 'risky-local-variable t) (defvar svn-status-temp-file-to-remove nil) +(put 'svn-status-temp-file-to-remove 'risky-local-variable t) (defvar svn-status-temp-arg-file (concat svn-status-temp-dir "svn.arg" svn-temp-suffix)) +(put 'svn-status-temp-arg-file 'risky-local-variable t) (defvar svn-status-options nil) +(defvar svn-status-remote) (defvar svn-status-commit-rev-number nil) (defvar svn-status-operated-on-dot nil) (defvar svn-status-elided-list nil) (defvar svn-status-custom-hide-function nil) +;; (put 'svn-status-custom-hide-function 'risky-local-variable t) +;; already implied by "-function" suffix +(defvar svn-status-get-specific-revision-file-info) +(defvar svn-status-last-output-buffer-name) +(defvar svn-transient-buffers) +(defvar svn-ediff-windows) +(defvar svn-ediff-result) + +;; Emacs 21 defines these in ediff-init.el but it seems more robust +;; to just declare the variables here than try to load that file. +;; It is Ediff's job to declare these as risky-local-variable if needed. +(defvar ediff-buffer-A) +(defvar ediff-buffer-B) +(defvar ediff-buffer-C) +(defvar ediff-quit-hook) + +;; Ditto for log-edit.el. +(defvar log-edit-initial-files) +(defvar log-edit-callback) +(defvar log-edit-listfun) + +;; Ediff does not use this variable in GNU Emacs 20.7, GNU Emacs 21.4, +;; nor XEmacs 21.4.17. However, pcl-cvs (a.k.a. pcvs) does. +;; TODO: Check if this should be moved into the "svn-" namespace. +(defvar ediff-after-quit-destination-buffer) ;; That is an example for the svn-status-custom-hide-function: ;; (setq svn-status-custom-hide-function 'svn-status-hide-pyc-files) @@ -587,7 +655,7 @@ (if (fboundp 'point-at-eol) 'point-at-eol 'line-end-position)) (defalias 'svn-point-at-bol (if (fboundp 'point-at-bol) 'point-at-bol 'line-beginning-position)) -(defalias 'svn-read-directory-name +(defalias 'svn-read-directory-name (if (fboundp 'read-directory-name) 'read-directory-name 'read-file-name)) (eval-when-compile @@ -643,6 +711,7 @@ (defvar svn-global-keymap nil "Global keymap for psvn.el. To bind this to a different key, customize `svn-status-prefix-key'.") +(put 'svn-global-keymap 'risky-local-variable t) (when (not svn-global-keymap) (setq svn-global-keymap (make-sparse-keymap)) (define-key svn-global-keymap (kbd "s") 'svn-status-this-directory) @@ -651,8 +720,18 @@ (define-key svn-global-keymap (kbd "=") 'svn-status-show-svn-diff) (define-key svn-global-keymap (kbd "c") 'svn-status-commit)) +(defvar svn-status-diff-mode-map () + "Keymap used in `svn-status-diff-mode' for additional commands that are not defined in diff-mode.") +(put 'svn-status-diff-mode-map 'risky-local-variable t) ;for Emacs 20.7 + +(when (not svn-status-diff-mode-map) + (setq svn-status-diff-mode-map (copy-keymap diff-mode-shared-map)) + (define-key svn-status-diff-mode-map [?w] 'svn-status-diff-save-current-defun-as-kill)) + + (defvar svn-global-trac-map () "Subkeymap used in `svn-global-keymap' for trac issue tracker commands.") +(put 'svn-global-trac-map 'risky-local-variable t) ;for Emacs 20.7 (when (not svn-global-trac-map) (setq svn-global-trac-map (make-sparse-keymap)) (define-key svn-global-trac-map (kbd "t") 'svn-trac-browse-timeline) @@ -752,6 +831,25 @@ (svn-status dir) (error "%s is not a directory" dir)))) +(defun svn-process-environment () + "Construct the environment for the svn process. +It is a combination of `svn-status-svn-environment-var-list' and +the usual `process-environment'." + ;; If there are duplicate elements in `process-environment', then GNU + ;; Emacs 21.4 guarantees that the first one wins; but GNU Emacs 20.7 + ;; and XEmacs 21.4.17 don't document what happens. We'll just remove + ;; any duplicates ourselves, then. This also gives us an opportunity + ;; to handle the "VARIABLE" syntax that none of them supports. + (loop with found = '() + for elt in (append svn-status-svn-environment-var-list + process-environment) + for has-value = (string-match "=" elt) + for name = (substring elt 0 has-value) + unless (member name found) + do (push name found) + and when has-value + collect elt)) + (defun svn-run-svn (run-asynchron clear-process-buffer cmdtype &rest arglist) "Run svn with arguments ARGLIST. @@ -799,20 +897,29 @@ (setq svn-status-mode-line-process-status (format " running %s" cmdtype)) (svn-status-update-mode-line) (sit-for 0.1) - (when svn-status-svn-environment-var-list - (setq arglist (append svn-status-svn-environment-var-list - (list svn-status-svn-executable) - arglist)) - (setq svn-exe "env")) (if run-asynchron (progn ;;(message "running asynchron: %s %S" svn-exe arglist) - (setq svn-proc (apply 'start-process "svn" proc-buf svn-exe arglist)) + (let ((process-environment (svn-process-environment)) + (process-connection-type nil)) + ;; Communicate with the subprocess via pipes rather + ;; than via a pseudoterminal, so that if the svn+ssh + ;; scheme is being used, SSH will not ask for a + ;; passphrase via stdio; psvn.el is currently unable + ;; to answer such prompts. Instead, SSH will run + ;; x11-ssh-askpass if possible. If Emacs is being + ;; run on a TTY without $DISPLAY, this will fail; in + ;; such cases, the user should start ssh-agent and + ;; then run ssh-add explicitly. + (setq svn-proc (apply 'start-process "svn" proc-buf svn-exe arglist))) (set-process-sentinel svn-proc 'svn-process-sentinel) (when svn-status-track-user-input (set-process-filter svn-proc 'svn-process-filter))) ;;(message "running synchron: %s %S" svn-exe arglist) - (apply 'call-process svn-exe nil proc-buf nil arglist) + (let ((process-environment (svn-process-environment))) + ;; `call-process' ignores `process-connection-type' and + ;; never opens a pseudoterminal. + (apply 'call-process svn-exe nil proc-buf nil arglist)) (setq svn-status-mode-line-process-status "") (svn-status-update-mode-line))))) (error "You can only run one svn process at once!"))) @@ -1125,14 +1232,22 @@ (error (message "psvn: could not install menu"))) (defvar svn-status-mode-map () "Keymap used in `svn-status-mode' buffers.") +(put 'svn-status-mode-map 'risky-local-variable t) ;for Emacs 20.7 +(defvar svn-status-mode-mark-map () + "Subkeymap used in `svn-status-mode' for mark commands.") +(put 'svn-status-mode-mark-map 'risky-local-variable t) ;for Emacs 20.7 (defvar svn-status-mode-property-map () "Subkeymap used in `svn-status-mode' for property commands.") +(put 'svn-status-mode-property-map 'risky-local-variable t) ;for Emacs 20.7 (defvar svn-status-mode-options-map () "Subkeymap used in `svn-status-mode' for option commands.") +(put 'svn-status-mode-options-map 'risky-local-variable t) ;for Emacs 20.7 (defvar svn-status-mode-trac-map () "Subkeymap used in `svn-status-mode' for trac issue tracker commands.") +(put 'svn-status-mode-trac-map 'risky-local-variable t) ;for Emacs 20.7 (defvar svn-status-mode-extension-map () "Subkeymap used in `svn-status-mode' for some seldom used commands.") +(put 'svn-status-mode-extension-map 'risky-local-variable t) ;for Emacs 20.7 (when (not svn-status-mode-map) (setq svn-status-mode-map (make-sparse-keymap)) @@ -1203,6 +1318,8 @@ (define-key svn-status-mode-map (kbd "C-n") 'svn-status-next-line) (define-key svn-status-mode-map (kbd "C-p") 'svn-status-previous-line) + (define-key svn-status-mode-map (kbd "n") 'svn-status-next-line) + (define-key svn-status-mode-map (kbd "p") 'svn-status-previous-line) (define-key svn-status-mode-map (kbd "") 'svn-status-next-line) (define-key svn-status-mode-map (kbd "") 'svn-status-previous-line) (define-key svn-status-mode-map (kbd "C-x C-j") 'svn-status-dired-jump) @@ -1240,6 +1357,7 @@ (setq svn-status-mode-extension-map (make-sparse-keymap)) (define-key svn-status-mode-extension-map (kbd "v") 'svn-status-resolved) (define-key svn-status-mode-extension-map (kbd "X") 'svn-status-resolve-conflicts) + (define-key svn-status-mode-extension-map (kbd "e") 'svn-status-export) (define-key svn-status-mode-map (kbd "X") svn-status-mode-extension-map)) (when (not svn-status-mode-options-map) (setq svn-status-mode-options-map (make-sparse-keymap)) @@ -1276,6 +1394,7 @@ ["svn mkdir..." svn-status-make-directory t] ["svn mv..." svn-status-mv t] ["svn rm..." svn-status-rm t] + ["svn export..." svn-status-export t] ["Up Directory" svn-status-examine-parent t] ["Elide Directory" svn-status-toggle-elide t] ["svn revert" svn-status-revert t] @@ -2374,8 +2493,9 @@ (when svn-status-last-output-buffer-name (if window-mode (progn - (when (string= (buffer-name) svn-status-buffer-name) - (delete-other-windows)) + (unless svn-status-preserve-window-configuration + (when (string= (buffer-name) svn-status-buffer-name) + (delete-other-windows))) (pop-to-buffer "*svn-process*") (switch-to-buffer (get-buffer-create svn-status-last-output-buffer-name)) (let ((buffer-read-only nil)) @@ -2456,7 +2576,9 @@ (when (eq revision :ask) (setq revision (svn-status-read-revision-string "Diff with files for version: " "PREV"))) - (let ((clear-buf t)) + + (let ((clear-buf t) + (beginning nil)) (dolist (line-info line-infos) (svn-run-svn nil clear-buf 'diff "diff" svn-status-default-diff-arguments "-r" (if (eq revision :auto) @@ -2465,19 +2587,59 @@ revision) (unless recursive "--non-recursive") (svn-status-line-info->filename line-info)) - (setq clear-buf nil))) - (svn-status-diff-mode)) + (setq clear-buf nil) + + ;; "svn diff --non-recursive" skips only subdirectories, not files. + ;; But a non-recursive diff via psvn should skip files too, because + ;; the user would have marked them if he wanted them to be compared. + ;; So we'll look for the "Index: foo" line that marks the first file + ;; in the diff output, and delete it and everything that follows. + ;; This is made more complicated by the fact that `svn-status-activate-diff-mode' + ;; expects the output to be left in the *svn-process* buffer. + (unless recursive + ;; Check `directory-p' relative to the `default-directory' of the + ;; "*svn-status*" buffer, not that of the "*svn-process*" buffer. + (let ((directory-p (svn-status-line-info->directory-p line-info))) + (with-current-buffer "*svn-process*" + (when directory-p + (goto-char (or beginning (point-min))) + (when (re-search-forward "^Index: " nil t) + (delete-region (match-beginning 0) (point-max)))) + (goto-char (setq beginning (point-max)))))))) + (svn-status-activate-diff-mode)) + +(defun svn-status-diff-save-current-defun-as-kill () + "Copy the function name for the change at point to the kill-ring. +That function uses `add-log-current-defun'" + (interactive) + (let ((func-name (add-log-current-defun))) + (if func-name + (progn + (kill-new func-name) + (message "Copied %S" func-name)) + (message "No current defun detected.")))) + -(defun svn-status-diff-mode () +(defun svn-status-activate-diff-mode () "Show the *svn-process* buffer, using the diff-mode." (svn-status-show-process-output 'diff t) (save-excursion (set-buffer svn-status-last-output-buffer-name) - (when (fboundp 'diff-mode) ;not in GNU Emacs 20.7 - (diff-mode) - (font-lock-fontify-buffer)) + (svn-status-diff-mode) (setq buffer-read-only t))) + +(define-derived-mode svn-status-diff-mode fundamental-mode "svn-diff" + "Major mode to display svn diffs. Derives from `diff-mode'. + +Commands: +\\{svn-status-diff-mode-map} +" + (let ((diff-mode-shared-map (copy-keymap svn-status-diff-mode-map)) + major-mode mode-name) + (diff-mode))) + + (defun svn-status-show-process-buffer () "Show the content of the *svn-process* buffer" (interactive) @@ -2662,9 +2824,20 @@ (setq default-directory dir) (unless use-existing-buffer (when (and svn-log-edit-file-name (file-readable-p svn-log-edit-file-name)) - (insert-file svn-log-edit-file-name))) + (insert-file-contents svn-log-edit-file-name))) (svn-log-edit-mode))) +(defun svn-status-export () + "Run `svn export' for the current working copy. +Ask the user for the destination path. +`svn-status-default-export-directory' is suggested as export directory." + (interactive) + (let* ((src default-directory) + (dir1-name (nth 1 (nreverse (split-string src "/")))) + (dest (read-file-name (format "Export %s to " src) (concat svn-status-default-export-directory dir1-name)))) + (svn-run-svn t t 'export "export" (expand-file-name src) (expand-file-name dest)) + (message "svn-status-export %s %s" src dest))) + (defun svn-status-cleanup (arg) "Run `svn cleanup' on all selected files. See `svn-status-marked-files' for what counts as selected. @@ -3161,6 +3334,7 @@ ;; -------------------------------------------------------------------------------- (defvar svn-prop-edit-mode-map () "Keymap used in `svn-prop-edit-mode' buffers.") +(put 'svn-prop-edit-mode-map 'risky-local-variable t) ;for Emacs 20.7 (when (not svn-prop-edit-mode-map) (setq svn-prop-edit-mode-map (make-sparse-keymap)) @@ -3244,6 +3418,9 @@ ;; -------------------------------------------------------------------------------- (defvar svn-log-edit-mode-map () "Keymap used in `svn-log-edit-mode' buffers.") +(put 'svn-log-edit-mode-map 'risky-local-variable t) ;for Emacs 20.7 + +(defvar svn-log-edit-mode-menu) ;really defined with `easy-menu-define' below. (if svn-log-edit-use-log-edit-mode (define-derived-mode svn-log-edit-mode log-edit-mode "svn-log-edit" @@ -3293,6 +3470,7 @@ ["Show files to commit" svn-log-edit-show-files-to-commit t] ["Erase buffer" svn-log-edit-erase-edit-buffer] ["Abort" svn-log-edit-abort t])) +(put 'svn-log-edit-mode-menu 'risky-local-variable t) (defun svn-log-edit-abort () (interactive) @@ -3403,6 +3581,7 @@ ;; -------------------------------------------------------------------------------- (defvar svn-log-view-mode-map () "Keymap used in `svn-log-view-mode' buffers.") +(put 'svn-log-view-mode-map 'risky-local-variable t) ;for Emacs 20.7 (when (not svn-log-view-mode-map) (setq svn-log-view-mode-map (make-sparse-keymap)) @@ -3422,6 +3601,7 @@ (defvar svn-log-view-font-lock-keywords '(("^r.+" . font-lock-keyword-face) "Keywords in svn-log-view-mode.")) +(put 'svn-log-view-font-lock-keywords 'risky-local-variable t) ;for Emacs 20.7 (define-derived-mode svn-log-view-mode fundamental-mode "svn-log-view" @@ -3458,7 +3638,7 @@ (when arg (setq rev-arg (read-string "Revision for changeset: " rev-arg))) (svn-run-svn nil t 'diff "diff" (concat "-r" rev-arg)) - (svn-status-diff-mode))) + (svn-status-activate-diff-mode))) (defun svn-log-edit-log-entry () "Edit the given log entry." @@ -3612,7 +3792,7 @@ (save-excursion (set-buffer your-buffer) (erase-buffer) - (insert-buffer result-buffer) + (insert-buffer-substring result-buffer) (goto-char (point-min)) (while (re-search-forward "^<<<<<<< .mine\n" nil t) (setq found t) @@ -3631,7 +3811,7 @@ (error "No conflict markers found"))) (set-buffer other-buffer) (erase-buffer) - (insert-buffer result-buffer) + (insert-buffer-substring result-buffer) (goto-char (point-min)) (while (re-search-forward "^<<<<<<< .mine\n" nil t) (let ((start (match-beginning 0))) @@ -3666,7 +3846,7 @@ (ediff-cleanup-mess) (set-buffer result) (erase-buffer) - (insert-buffer buffer-C) + (insert-buffer-substring buffer-C) (kill-buffer buffer-A) (kill-buffer buffer-B) (kill-buffer buffer-C) Index: sources =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 8 Sep 2005 15:49:25 -0000 1.19 +++ sources 4 Jan 2006 13:07:01 -0000 1.20 @@ -1 +1 @@ -95f9b43801b4d9bc071564bca2116763 subversion-1.2.3.tar.gz +0d91a7fe152d0373044c47c54deb2c9a subversion-1.3.0.tar.gz subversion-1.0.3-pie.patch: Makefile.in | 12 ++++++++---- build.conf | 2 +- build/generator/gen_base.py | 10 ++++++++-- 3 files changed, 17 insertions(+), 7 deletions(-) Index: subversion-1.0.3-pie.patch =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/subversion-1.0.3-pie.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- subversion-1.0.3-pie.patch 24 May 2005 15:50:39 -0000 1.7 +++ subversion-1.0.3-pie.patch 4 Jan 2006 13:07:01 -0000 1.8 @@ -4,9 +4,9 @@ -pie, since that doesn't work when main() is not itself an object built with -pie. ---- subversion-1.2.0/build/generator/gen_base.py.pie -+++ subversion-1.2.0/build/generator/gen_base.py -@@ -375,6 +375,9 @@ +--- subversion-1.3.0/build/generator/gen_base.py.pie ++++ subversion-1.3.0/build/generator/gen_base.py +@@ -399,6 +399,9 @@ self.manpages = options.get('manpages', '') self.testing = options.get('testing') @@ -16,7 +16,7 @@ def add_dependencies(self): TargetLinked.add_dependencies(self) -@@ -417,8 +420,11 @@ +@@ -441,8 +444,11 @@ self.msvc_fake = options.get('msvc-fake') == 'yes' # has fake target self.msvc_export = string.split(options.get('msvc-export', '')) @@ -30,9 +30,9 @@ class TargetApacheMod(TargetLib): ---- subversion-1.2.0/Makefile.in.pie -+++ subversion-1.2.0/Makefile.in -@@ -145,9 +145,10 @@ +--- subversion-1.3.0/Makefile.in.pie ++++ subversion-1.3.0/Makefile.in +@@ -143,9 +143,10 @@ CPPFLAGS = @CPPFLAGS@ $(EXTRA_CPPFLAGS) LDFLAGS = @LDFLAGS@ $(EXTRA_LDFLAGS) @@ -45,7 +45,7 @@ # special compilation for files destined for mod_dav_svn COMPILE_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) $(APACHE_INCLUDES) $(INCLUDES) -o $@ -c -@@ -162,8 +163,11 @@ +@@ -160,8 +161,11 @@ COMPILE_JAVAHL_JAVAC = $(JAVAC) $(JAVAC_FLAGS) COMPILE_JAVAHL_JAVAH = $(JAVAH) @@ -59,14 +59,14 @@ # special link rule for mod_dav_svn LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module ---- subversion-1.2.0/build.conf.pie -+++ subversion-1.2.0/build.conf -@@ -346,7 +346,7 @@ - sources = swigutil_py.c - libs = libsvn_subr libsvn_delta aprutil apriconv apr - # need SWIG_LDFLAGS to be able to link swig_runtime --link-cmd = $(LINK) $(SWIG_LDFLAGS) $(SWIG_PY_LIBS) -+link-cmd = $(LINK_LIB) $(SWIG_LDFLAGS) $(SWIG_PY_LIBS) +--- subversion-1.3.0/build.conf.pie ++++ subversion-1.3.0/build.conf +@@ -356,7 +356,7 @@ + lang = python + path = subversion/bindings/swig/python/libsvn_swig_py + libs = libsvn_subr libsvn_delta libsvn_wc aprutil apriconv apr +-link-cmd = $(LINK) $(SWIG_PY_LIBS) ++link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS) install = swig-py-lib # need special build rule to include -DSWIGPYTHON compile-cmd = $(COMPILE_SWIG_PY) Index: subversion.spec =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- subversion.spec 12 Dec 2005 21:25:53 -0000 1.62 +++ subversion.spec 4 Jan 2006 13:07:01 -0000 1.63 @@ -10,8 +10,8 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion -Version: 1.2.3 -Release: 6 +Version: 1.3.0 +Release: 2 License: BSD Group: Development/Tools URL: http://subversion.tigris.org/ @@ -19,7 +19,6 @@ Source1: subversion.conf Source3: filter-requires.sh Source4: http://www.xsteve.at/prg/emacs/psvn.el -Patch1: subversion-0.24.2-swig.patch Patch2: subversion-0.20.1-deplibs.patch Patch3: subversion-0.31.0-rpath.patch Patch6: subversion-1.0.3-pie.patch @@ -97,7 +96,6 @@ %prep %setup -q -%patch1 -p1 -b .swig %patch2 -p1 -b .deplibs %patch3 -p1 -b .rpath %patch6 -p1 -b .pie @@ -246,6 +244,10 @@ %endif %changelog +* Wed Jan 4 2006 Joe Orton 1.3.0-2 +- update to 1.3.0 (#176833) +- update to psvn.el r17921 Stefan Reichoer + * Mon Dec 12 2005 Joe Orton 1.2.3-6 - fix ownership of libsvnjavahl.* (#175289) - try building javahl on ia64/ppc64 again Index: upstream =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/upstream,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- upstream 8 Sep 2005 15:49:25 -0000 1.9 +++ upstream 4 Jan 2006 13:07:01 -0000 1.10 @@ -1 +1 @@ -subversion-1.2.3.tar.gz +subversion-1.3.0.tar.gz Index: upstream-key.gpg =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/upstream-key.gpg,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- upstream-key.gpg 24 May 2005 15:50:39 -0000 1.3 +++ upstream-key.gpg 4 Jan 2006 13:07:01 -0000 1.4 @@ -1,161 +1,231 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.2.6 (GNU/Linux) +Version: GnuPG v1.4.1 (GNU/Linux) -mQGiBDrWAD8RBACXdt0iOXjU5USi8byd7wGH3yO+6LkO6IbhMaReDwEKVFXVlZol -itEePUE1KwzWAevbXtzPIKAWbYIa5+ZjQqmeuPEQjiCVzROUjYgX2BjXK+4Shx9n -eN1+tTFQr+XCfbyORoIjk2D7pxdvNVaBSXO+Ll8aCwJ5669RPYoji2Cu8wCg4f1D -Axqes9J8E97iuVoFGHur6E8D/2GlPZONrBLn1+le7wYiKZA9gycnfPd/KoYsz6Ob -nysykNQGgAn/3YueMQNr358C1+iQ7JKlCINIROpwcxuqm/Q93dcU1r93srFUof2W -0grTCAufs7rrytZGZrL0h6cxzv6yg63l9lHLh8nDnxmw83kGsnghSh561agsGfiu -6elRA/9B3CT7Fx1wpeh3BUp3ht7g90JU9Q8Q2bdSzYpdC+cRPwrD7CG2lS9d2FLq -PNU/7yAcSLT2bF5WBPvYRFgOYuwJNUwpwMhFEELQkh0WfGrU6Hz0EIoEX9AycpeR -9/FPj+/JBcZz3TSbJmDpUTHM0oxZ/aWbBz7esSXzZXQ5O/exwbQZQmVuIFJlc2Vy -IDxiZW5AcmVzZXIub3JnPohGBBARAgAGBQI8slaCAAoJECBD0OX+byr9TT8AoNWK -4Iy1QWj7DYfX+YYH+3oecM1OAKDMmys4lvLJFVUiMiCeAX5uInh4wYhGBBMRAgAG -BQI9AE+OAAoJEKvGOGtdByM2VgYAmwTUkNCEfJgTrvtpTaYwiAEFhN7hAJ913Rbo -ePyrrkg1cWPBOPL2JrTCYIhXBBMRAgAXBQI61gA/BQsHCgMEAxUDAgMWAgECF4AA -CgkQckGFa2QeNYupeQCg2Re4zgwmKab8X6HPPscwQVr+xo4AoJUxgFi2GCD9GeX/ -Lhq787HkNNkyiFoEExECABoFCwcKAwQDFQMCAxYCAQIXgAIZAQUCOtYAQAAKCRBy -QYVrZB41iwpwAKCDkwMUfZVfHIdmr9+b0/RfU2wYtgCfWuaxpl54qu9O/WbWploR -tgN6kXGIRgQTEQIABgUCQM3rkgAKCRBTSBpo7GtRVigzAJsEKVUn90Pj6nVzvqjI -K71F87S9BACgupS6d4WOz27GRP+xAR36TsP5JJOIRgQTEQIABgUCQM3sZwAKCRCi -QQapFwb9blp6AJ9JeEf+rmpxiY4CBYgmF8SBjhxRYQCgigU+WS6sXqjHy0z4gUMR -qgLTLb2IRgQTEQIABgUCQM/C/gAKCRD8D4WJ+JS+Ev5MAJ9gXV8F9WASEUsM83jS -1F1oZ8PXDQCfd6mnjkoOWzDKvP4vLKLkLxXu13KIRgQTEQIABgUCQOSScAAKCRBj -NwBBwBxSdg1bAKCwRZ3BVvPzorFrZ2O3y0IaZKNd5ACdGElHGxfqmp7hnfv2F6Ir -dcjuO/2IRgQQEQIABgUCQpDAUwAKCRCL2C5vMLlLXDV1AJsHNktqYv7qnTjAnI3h -i76TmKb1VACeISK/Oc6kkHXf17chivbehTYmpMq0HEJlbiBSZXNlciA8YnJlc2Vy -QHNpYWVyLm5ldD6IRgQTEQIABgUCPQBPnAAKCRCrxjhrXQcjNtPBAJ49EAhug+jk -j9UcGlpNMgqNGSXDNwCdH+TAb451ZNzMc5kEIrIcCzdRPDqIVwQTEQIAFwUCPLJc -qQULBwoDBAMVAwIDFgIBAheAAAoJEHJBhWtkHjWL6f8AoJbR52Abm3AdKi9DQqtl -Jm3nTHrQAKDEDsLfoX/wgJSUVNg3k72R56Vw34hGBBMRAgAGBQJAzeuVAAoJEFNI -Gmjsa1FWvAkAn3c4Jd6rxr45NfTdvoTKJwZssJ4pAJoDJTzrIGt1aDaSm7rSTsUg -XcgOjohGBBMRAgAGBQJAzexuAAoJEKJBBqkXBv1uhJwAniAiQ8T1KgOJyOsa1wGV -nOMMh/GQAJ4xyVqfzkS9JOWb40m/QDRjozubfohGBBMRAgAGBQJAz8MUAAoJEPwP -hYn4lL4S1v0An3vhEueM4+D3o5z4qiuC5kPUZ8xfAJ4nrY4cNryLd1G2N+WnTKbd -fWJLtIhGBBMRAgAGBQJA5JJ1AAoJEGM3AEHAHFJ2mR0AoJ3eHd5vkSgUcDitFqQr -5yqDnNL6AJwKcdtdSbZyd0l02NLxO0xAA65tWYhGBBARAgAGBQJCkMBWAAoJEIvY -Lm8wuUtcmMYAoIennww5i+mPkm+GeFpmX7RuKzQ2AJ0YiR3XPvz+sNSa8Gga0PwA -aLWZabQdQmVuIFJlc2VyIDxicmVzZXJAdmVjZGV2LmNvbT6IRgQTEQIABgUCPQBP -nAAKCRCrxjhrXQcjNgcLAKC4oAb0Kvs/Pa9Ub5Um4f7x8NSm8wCfYCbEVQveNN0E -VKsyKdQ6IELhs5aIVwQTEQIAFwUCPLJcwAULBwoDBAMVAwIDFgIBAheAAAoJEHJB -hWtkHjWLCCUAoMu9kh0Q/m4CFIIe1bF9DLnLrsS8AKDFAxca7g0E6vkJZn8vg/AD -rolDVIhGBBMRAgAGBQJAzeuVAAoJEFNIGmjsa1FWKN8AoLkG2JZllhYX9Sg1cu7E -mp2CJrwmAJ4i8vopTjwtuVwovkBkCd84H9Xgn4hGBBMRAgAGBQJAzexuAAoJEKJB -BqkXBv1utMYAn3kFBuOGYrdX2AYGbE6QlIX11AcWAJ91gD2CyZ+mknrmt/PZKN0U -r5eNwYhGBBMRAgAGBQJAz8MUAAoJEPwPhYn4lL4SOfEAnjpL/ySEH8oX3aGCHAp5 -f3ywwYkcAJ91FwVo35xzJZzj3w3YS5SJLKm7ZYhGBBMRAgAGBQJA5JJ1AAoJEGM3 -AEHAHFJ2sP0AoPaMDlsKSL8z2aGQPSUHZzGZkha+AJ9XF19ytGSYXM7cNEhL0cHL -m0W5G4hGBBARAgAGBQJCkMBWAAoJEIvYLm8wuUtcGXUAnA+l8koMxTnQtW8sGD2q -Xa7qEXZmAJ9M98hCmTWW5DFeuboedu3va/jAA7kCDQQ61gBWEAgAqoG6ErYXscVy -ITYFg4hS8rZhIRH2KMWkKANoN7Iwd57lzPO+IhFHpDfU8Gaoe1TpB9Uw3LOHjLnk -r6fvAHf78+avkoirAmc66EiWu9t6eqhDkpDxY0xNOvqq2ca8qoXi4P6YS+JkLhGZ -SzM9CbPBsB1UaQKV01lUAYgpi+fpGxVl8XwxpRTYwX/JAkZoVQxOLj3f6qbd+vo9 -LGvUkseKETYTHBT7MJuJtKec92GHdDsc6Jt7tq/hMNiSMee/O42u72B/CoNAICWd -DgADtPbx8qSpJgShhZCBsLs5hMxeaMqMLzRHynD/zRmTDVsfK+H8aDz7dG9Pp+u/ -Qg8MT15wowADBgf8Cxlg9pvVwK40/NgysW1HmMKsmTeuAnMTpW/WfHILzM+YyjlD -Oe7AMIssEPBIveyMe2wpa+58V8gz3MSYKyMIu9sCvd5EYVyz/24jmBoSt+o9Cq75 -iOcOVma9o/HwxEZvu1kdNMF3guKRXfq6OYejOb000fJBo9At5UhadjoirgawbWck -4vmh/MCPy5ulrHgHix1OIl5CiRiu6r7WxsDYtf6XUBRo90Zr90ekPjOf9RoqrWKO -5BqOv/LpSG1JIjKiIXysq8KuN9qDvzq+Cm5CsBcTGDeFS+d2Q0Hiiv0W9fG1IJci -+61foko4kRKzev+IWLvqgPxTUv4B9wX2+zU0dYhGBBgRAgAGBQI61gBWAAoJEHJB -hWtkHjWLHisAoLz+nafMA/7vyxwnpBuYCJhQ/j60AJ9icg7tvYRYrWaJrgdxFk8B -ekKZPZkBogQ2R1i7EQQArcyJyhRbEuEYEVODU8bw11nK2rH/AYpac9vgWKk5fk2y -kBE5HNfNT2Lt7AKbiLl8JcmuF+WwnHqPsk4XTPHTfuJ5LQy5d4uhNvrV3wLCEejB -EFs7CB3iqneHJMuvhCwOVFQQN/UTyY6ibu344MKqKrGhw3XI2umb/MronEotEjcA -oNbZ8VC3aZpQH6JBnuH/jGKhOFxBA/9IyN4+MGpOPVNXRbrUR9rThZkTw754FLG1 -VgULKM9jVFIC+V32+MnKeDHzJIxHMrPL/8NKiqvwTTG75vjivqkQwKO1ZRafw0kT -rsHVr87/DzyJe/DvXCdqyhNQKw8N/4FU1dgZlBycy4bQ9SzBpuKy/+juyW88qfRi -xCfE2H/a0AQAjvG+KmUQb8EhYzsZEs3lLzhPK7lcT3H+5aO3zGzsoqrcnPfxkGGT -lGiRIsoLMET7sXA81nYlLRFY2q5c+uUxeG9AVAgMALNkU5DwWYwB9hLopVC+2aqN -cNa3BqFSaWR3RXargvHEPcMEtslnkihRgChQ6tyeREo9G4F5smCD1gW0KEJlbiBD -b2xsaW5zLVN1c3NtYW4gPHN1c3NtYW5AY29sbGFiLm5ldD6IRgQTEQIABgUCQM/C -uwAKCRD8D4WJ+JS+EvbuAJ9PyW0o6hLtlsrUR/6JgobJoQ23wgCfX6eZhWJ+/ES2 -TVwpFtjE2Dclp6qIXAQTEQIAHAUCQM3ZxAIbAwQLBwMCAxUCAwMWAgECHgECF4AA -CgkQU0gaaOxrUVbR1ACgkKPnD3BaC6k+NQ4HPLNgZRbLMHUAn24jm4R3miZYznFM -VIcpJsOUh3ntiEoEEBECAAoFAkJwTpcDBQJ4AAoJEFHxPu07guhws6gAoIuB2rcW -EHuZk28CfJXXrbQeSd6OAKC8WGK3JFEjHd59Ug6I5dd8vxmPurQqQmVuIENvbGxp -bnMtU3Vzc21hbiA8c3Vzc21hbkByZWQtYmVhbi5jb20+iEYEEBECAAYFAjfY2AYA -CgkQ/A+FifiUvhJpYwCdFF1/RzVjy6eMTcaBjZ0QuhjAsJQAn1NAqwVVobfU47K2 -vshv5+wozrXniEYEEBECAAYFAj1cDtEACgkQXUFK4eAFyctzzQCePq7iRIoTkq6F -o8nGB2+fdBD7negAnRKJiEnvuJDNgd8PwJxD8fAwq9ruiEYEEBECAAYFAj11FSQA -CgkQX7lOgmP7i6/7TgCg+9Ga68WeO94TbimdIHrOARXrQ7EAoLZippfr6E+gQ0EE -7XA50J+5eLBFiEYEEBECAAYFAj17dBcACgkQCSISlvGJBIuVHwCg0lyjzDL0jG6E -oIdxjATXX+EM8uQAoOyCb3q38pdqhEBnHlOhNOuDq0DWiEYEEhECAAYFAj3YLKIA -CgkQFqlkleIiZ5XqKwCeLyAVjeSHA54TSr+YewE7uQBIRP4AoODvQyebKM5Be0bc -OR7dJb4GCoWbiEYEExECAAYFAj3YKz0ACgkQZjW2wN6IXdPeQQCgiTbztKhBHCfS -IssnjlzkWWLYzeYAoKuGBpmve1yDOYT13mfOMu6CN8XyiEYEExECAAYFAkDN1v8A -CgkQokEGqRcG/W4RbwCgpiafjNA1yxRbecL2Zb0nUFfujJQAn2DoJZaqBUUAj4hA -foLAbS2x8RbriEYEExECAAYFAkDOEqYACgkQckGFa2QeNYsFwACbBe79OqPy/Qi5 -/u0c4YM2b0j+RvoAnjKZ5Hf9XNmErpXBhkWvYfsKSfBtiFcEExECABcFAjZHWLsD -CwQDBRUDAgYBAxYCAQIXgAAKCRBTSBpo7GtRVsTwAKDN3gvSZRcYhdyQUIydvYLG -Ztr68gCff6rctu48NOcGopupQ/7GEx0/moKIXwQTEQIAFwUCNkdYuwMLBAMFFQMC -BgEDFgIBAheAABIJEFNIGmjsa1FWB2VHUEcAAQHE8ACgzd4L0mUXGIXckFCMnb2C -xmba+vIAn3+q3LbuPDTnBqKbqUP+xhMdP5qCiEoEEBECAAoFAkJwTpwDBQJ4AAoJ -EFHxPu07guhwomEAnAgnm26T90vL7P2W9NHfEtVymwuRAJ48jUb/koc1RGM5ArXF -TtOZ0eQ6qrkBDQQ2R1jKEAQA2YIOsJ9xDiNLtsEmxPK/3hQj74DWEK5J4eiH8ATW -JjdcT3MpRtuxImM0M1Z1r7PoMBJGsVuhRPnbkhHvfZ9dzDv9vUjn//UH8V4Z3KFE -oOH6g0RVtNV9yDXxm1KkVZRK6q+C14Mlw+h/omXJDZ6NKSIj0HLTHtrnMBLjfJRV -/Q8AAwUEAJ3jRTcETA0m0jstkSmafcR47WGr2I2aG0WoUET4MjmDJdqge8Dm3uAX -K1O9bAekovjgfPlqOTWoMc7cFr00n0VBkpB/AAGUJzdV0/jm2MT+lr5g3C33kQpK -fg1tpyDbTe9T+hp8qVRW3ZHTFkt5To72Z4fLouAau+JrXP7DigeciE4EGBECAAYF -AjZHWMoAEgkQU0gaaOxrUVYHZUdQRwABAfI1AJkBxRCXMJ9XpESQv0rKFynD4QPR -cwCeNBX3yXk/gQhMk+oM7Pxc6pYymi+ZAaIENkddbBEEAI69+BiHDFgsz7rXwkPC -xKEIxzoop94Ac0GenBV869JaFjBQu1TU6NJ1NTz4ToCB5B+G4J8FzZcN/7edAc23 -xnioohLRclTyrGaWNGVFAtVkOlx3LOLFDxSWlScuEdjE0AGFfF8kBabygfE5tqQt -qm7EMi5WBFvHLpvUHf1Q+JoTAKDqnn3wd2iRglkbQpVermCRiIZm+QP8DHPL8I+p -mMj5YIg2r6T6mWqrGD8H986GLltJmuDm4kMvsLbBboNCL4e9XYBl2sn60LrYgf73 -oYcfydTE2NrSRs3fe00Mio3M3DAWAXY+iUM2SRZWoCBQ1ReUtw7QfO8hhNavnRCr -VlpqcRlnnFinnv4Z1yRBhkHTWS9Gtqr0o5oD/2SqXNWIBk13ty80EbLk4X+c+5tF -igO7EIgxAt1ZHl//eVtwfpJKVW7j69fNccSMxpnEgXMgho/k+EjSJOHfLcaHP8iR -Ha4WEKZNRi7Z7gl3DtvOjl41dVmSQFBVFlozaj0lEbr/h2k23ejeVE4gA/YVltmj -z9BN6nakrlqplhzYtEhLYXJsIEZyYW56IEZvZ2VsIChodHRwOi8vd3d3LnJlZC1i -ZWFuLmNvbS9+a2ZvZ2VsKSA8a2ZvZ2VsQHJlZC1iZWFuLmNvbT6IVwQTEQIAFwUC -NkddbAMLBAMFFQMCBgEDFgIBAheAAAoJELyduxPbAKJIAhgAn3VosGQeJg6y3mlz -UqWwkzZO+KFzAJ9QjfqwmUXm+rMBz3++ORjyRHD6PohGBBMRAgAGBQJAzgGpAAoJ -EKJBBqkXBv1uk6gAoKrFAXqjV9WYrsnifFFF0oS4YHCAAKC29H/6nr+THA5MA5EC -aCk45yXI64hGBBMRAgAGBQJAzhIDAAoJEHJBhWtkHjWLamgAniwnyD2QztyMpTcy -ahtb+tWU3j9NAKCFDUbXBXROAOTedZePWsbWnsMIc4hGBBMRAgAGBQJAz8J9AAoJ -EPwPhYn4lL4SIYQAn2tBtBoK+YAi/h7dotbPfNID8OfKAJ9YbGCR2brM/mBufK4T -/FJN5BScGrkCDQQ2R2BXEAgA7C9N74S1f349PE23pZ8deXsox5/B8idD1bO+EANw -E4GjdMURsNoDVzBt66DI3FaFBXZWLrae8kuJGSmWzSJ+fNhWoHHGtzP9h+zhyRTK -L2MhBWwPGd6TqGZcCRDHximd5wvupKAlMgS0EPH2X+PFL0p7Oy71MCP+VSsFhJdi -vKri9axOV2kFGmrJcTMvmctRiCQRtbsiedc9LqyYVeWLYmBHldsnwt0do6aWAWgW -fYisui/kusJ1SDFuBu6hPsRq3ITzd6Z9KqyclcVbtKht5tKzCTosBinmrDa+4f8W -cIQ7c7Ngy0UBiGg3hVLi6P4GJM31WWyAj3wTHme1jOnTcwADBQgAlt5LrV/GAgXQ -OE9mQsv3uu30YBYLkZtOIqKW4vA3rV1kVv72+O69hz4QTRwABx1bB+YdcmPIbOjp -v5dRZz+jIaSkGfC4dy5Crv0lWrRVb2yMXhY86+YaKJ2lgFZ/oIdYeOGQrZgDCk+M -F9fj+7bm0xHksAKNaBTijGm86L4av7MaBtv5tU9S1E7trkrSTvr1/SNyEKi5M+Ni -EiiTnwjTbRc6/swIa/4/rHkoQqzvLq+wKOd19+xfE70NyxsY2YcOOXAfmnnTR4o3 -6rMSIdZJMXYZyq8wzzbd/o1KgcSbwDeLoiqvaUqy9e8GpDjGA5mHax4kh2OXgwpA -89DXIfUfvYhGBBgRAgAGBQI2R2BXAAoJELyduxPbAKJIsGcAoJGLtLicEsgFHSdq -ExWawVqjZxlIAJ9/6bXCxgUM13ahpH0JS4k40bWJVpkBogRCgFY7EQQAv5cQj7OX -v9VZZj2cuo0Z88Nf4OR8Ws+nilNCzJPiGluU1/DbiZhIGqNaPOm6j+5F9Vjz9V0i -HAhr8Juh2ezndBuboH3VPF06hw8F5YYVFSlkE/tn41oY6WX7ZY2uQW4HZ5G6eD4V -qoerD7DdZdcvicDxSH6jZPCCirxRvawZw28AoN0OAfthkNgmMqwRYUNrraZmYFEf -BAC+hHz7RirxnqChhhFAzY7u74G6wmgsAov8fRSouG6/wrVCAhR8AJxqjqRvG21N -fIREC6yI824leD3tgFGyaJtpTBt6W8ZyRs6zhsZ8SpwcmqXVAvooMCwISz8Ep/zd -8bD2ufhOVfyVMnj7t5zgSdNYnczEXrgbfRYNavcxXyH1pgQAmGLf8cnDdpRh7u11 -XylwLXCBD/+yI6l1/Db7rMoXkrG4z0ylxdMooPw1g18gBonwd4vqRQSqYOSp/CF+ -D6zurK5v4qOFYzqOaEqev5TFOBW1TentyGXcCD59eYGWBREl1tgpjj6zqGX1bNSw -XCkGkwpiSIlho1DwgOHwh3Fl1p20IEphbmkgQXZlcmJhY2ggKFNWTikgPGphYUBp -a2kuZmk+iGQEExECACQFAkKAVjsCGwMFCQWjmoAGCwkIBwMCAxUCAwMWAgECHgEC -F4AACgkQ1sYklxbYtBwU3ACeOFkdB8bEz3JHNjeHWi1iE21xFyMAoJPZIPFGJ3QL -jf9b9N7uneZKTAn5tCRKYW5pIEF2ZXJiYWNoIChTVk4pIDxqYWFAamFhLmlraS5m -aT6IZAQTEQIAJAUCQoBWfwIbAwUJBaOagAYLCQgHAwIDFQIDAxYCAQIeAQIXgAAK -CRDWxiSXFti0HFOPAKDUp1YjlpOBShGdxd638kaZfJT/yACgyNXleewHjRfm4p5C -Qy9Ypb8hgDa5Ag0EQoBWPxAIAJ5WSb5I0TgxAFJM3rhU6KKS5p/6EtDaoomW4GcK -215a8uciLyXaJlPMHvqxIbY/1JRzwPQM2gDEWF2tosaiaNn+SMT5A89xj+wZOAuz -7Jmby0E6ussUAri4ypBvlI1rOFJgnj7MjRtyBM9UKWZFF2LV34sCnZWyaVK3Dphx -35SXjOl6nqIX2ylUur3zrlAihra6aohGEiNWSqPzaOtjOLE3WisN44puR4TitPSQ -REHWc09ihkJ1TiGtrmxAAJKq242FEb4mmGwaTX2/MiYIf7VFFd91YTpXwV5kBA8v -UdB26/zGY5+4QzqNtCWlAzYjHerX9fV9BVed1O0wGSd/a4MAAwUH/R890lbOWuij -jvmR5ilTsPSFwkrpXPNvEKPMQ/8LjZIKf65aArYrlpysJ9NVEUH59ofRrzM/BPz6 -gfpRh558guopQ5qVODjg0EefCNp5FsETlP3dqMWvmVxi7kAcQwkxjFLzSkUfb65b -Zo25jo9IIyNsmaFS8JJ49dCQ3zpqR/bnPxhmOnWdkj0CFma3upkXnnuHraY3ub7t -SetuSnQhPzQwcGJv/93HYq8Rykee6V2YavsnFkZ1sqRyldN+ebYtfR52wXfXZuB1 -AemMN0h01T/FTpB/OvmZHxffyAPYUTfk8ceH/skIxgQtIrvLYTmSbadn1ukIyIpL -iZ6ewIueqJGITwQYEQIADwUCQoBWPwIbDAUJBaOagAAKCRDWxiSXFti0HL1YAJ4y -E/dZgd9fKt29/Goqh7CQIoIDsACgthVdSs4dDIS97sc+dOn1sU1jQZ4= -=V64X +mQGiBDZHWLsRBACtzInKFFsS4RgRU4NTxvDXWcrasf8Bilpz2+BYqTl+TbKQETkc +181PYu3sApuIuXwlya4X5bCceo+yThdM8dN+4nktDLl3i6E2+tXfAsIR6MEQWzsI +HeKqd4cky6+ELA5UVBA39RPJjqJu7fjgwqoqsaHDdcja6Zv8yuicSi0SNwCg1tnx +ULdpmlAfokGe4f+MYqE4XEED/0jI3j4wak49U1dFutRH2tOFmRPDvngUsbVWBQso +z2NUUgL5Xfb4ycp4MfMkjEcys8v/w0qKq/BNMbvm+OK+qRDAo7VlFp/DSROuwdWv +zv8PPIl78O9cJ2rKE1ArDw3/gVTV2BmUHJzLhtD1LMGm4rL/6O7Jbzyp9GLEJ8TY +f9rQBACO8b4qZRBvwSFjOxkSzeUvOE8ruVxPcf7lo7fMbOyiqtyc9/GQYZOUaJEi +ygswRPuxcDzWdiUtEVjarlz65TF4b0BUCAwAs2RTkPBZjAH2EuilUL7Zqo1w1rcG +oVJpZHdFdquC8cQ9wwS2yWeSKFGAKFDq3J5ESj0bgXmyYIPWBbQoQmVuIENvbGxp +bnMtU3Vzc21hbiA8c3Vzc21hbkBjb2xsYWIubmV0PohGBBMRAgAGBQJAz8K7AAoJ +EPwPhYn4lL4S9u4An0/JbSjqEu2WytRH/omChsmhDbfCAJ9fp5mFYn78RLZNXCkW +2MTYNyWnqohcBBMRAgAcBQJAzdnEAhsDBAsHAwIDFQIDAxYCAQIeAQIXgAAKCRBT +SBpo7GtRVtHUAKCQo+cPcFoLqT41Dgc8s2BlFsswdQCfbiObhHeaJljOcUxUhykm +w5SHee2ISgQQEQIACgUCQnBOlwMFAngACgkQUfE+7TuC6HCzqACgi4HatxYQe5mT +bwJ8ldettB5J3o4AoLxYYrckUSMd3n1SDojl13y/GY+6tCpCZW4gQ29sbGlucy1T +dXNzbWFuIDxzdXNzbWFuQHJlZC1iZWFuLmNvbT6IRgQQEQIABgUCN9jYBgAKCRD8 +D4WJ+JS+EmljAJ0UXX9HNWPLp4xNxoGNnRC6GMCwlACfU0CrBVWht9Tjsra+yG/n +7CjOteeIRgQQEQIABgUCPVwO0QAKCRBdQUrh4AXJy3PNAJ4+ruJEihOSroWjycYH +b590EPud6ACdEomISe+4kM2B3w/AnEPx8DCr2u6IRgQQEQIABgUCPXUVJAAKCRBf +uU6CY/uLr/tOAKD70ZrrxZ473hNuKZ0ges4BFetDsQCgtmKml+voT6BDQQTtcDnQ +n7l4sEWIRgQQEQIABgUCPXt0FwAKCRAJIhKW8YkEi5UfAKDSXKPMMvSMboSgh3GM +BNdf4Qzy5ACg7IJverfyl2qEQGceU6E064OrQNaIRgQSEQIABgUCPdgsogAKCRAW +qWSV4iJnleorAJ4vIBWN5IcDnhNKv5h7ATu5AEhE/gCg4O9DJ5sozkF7Rtw5Ht0l +vgYKhZuIRgQTEQIABgUCPdgrPQAKCRBmNbbA3ohd095BAKCJNvO0qEEcJ9IiyyeO +XORZYtjN5gCgq4YGma97XIM5hPXeZ84y7oI3xfKIRgQTEQIABgUCQM3W/wAKCRCi +QQapFwb9bhFvAKCmJp+M0DXLFFt5wvZlvSdQV+6MlACfYOgllqoFRQCPiEB+gsBt +LbHxFuuIRgQTEQIABgUCQM4SpgAKCRByQYVrZB41iwXAAJsF7v06o/L9CLn+7Rzh +gzZvSP5G+gCeMpnkd/1c2YSulcGGRa9h+wpJ8G2IVwQTEQIAFwUCNkdYuwMLBAMF +FQMCBgEDFgIBAheAAAoJEFNIGmjsa1FWxPAAoM3eC9JlFxiF3JBQjJ29gsZm2vry +AJ9/qty27jw05waim6lD/sYTHT+agohfBBMRAgAXBQI2R1i7AwsEAwUVAwIGAQMW +AgECF4AAEgkQU0gaaOxrUVYHZUdQRwABAcTwAKDN3gvSZRcYhdyQUIydvYLGZtr6 +8gCff6rctu48NOcGopupQ/7GEx0/moKISgQQEQIACgUCQnBOnAMFAngACgkQUfE+ +7TuC6HCiYQCcCCebbpP3S8vs/Zb00d8S1XKbC5EAnjyNRv+ShzVEYzkCtcVO05nR +5DqqiEYEEBECAAYFAjZHYpAACgkQvJ27E9sAokgN+ACferV+Ey177pBwXdcG61PE ++LMFvPIAn3EzmLmJYEwkMc3QCPGOvGHFcVqgiFoEExECABoDCwQDBRUDAgYBAxYC +AQIXgAUCQ4KabwIZAQAKCRBTSBpo7GtRViSYAJ4hZ5cjBznqL4kSIaatzj3rEcBs +uwCgt+AJvIQbaYmiKL5+u2566eSglhy0KEJlbiBDb2xsaW5zLVN1c3NtYW4gPHN1 +c3NtYW5AZ29vZ2xlLmNvbT6IXgQTEQIAHgUCQ4KZzAIbAwYLCQgHAwIDFQIDAxYC +AQIeAQIXgAAKCRBTSBpo7GtRVhqpAKCUatym23BiiLOHI73IYWvAXEGD1ACff9l4 +NOTwI9liO8q67c84fFmB37K5AQ0ENkdYyhAEANmCDrCfcQ4jS7bBJsTyv94UI++A +1hCuSeHoh/AE1iY3XE9zKUbbsSJjNDNWda+z6DASRrFboUT525IR732fXcw7/b1I +5//1B/FeGdyhRKDh+oNEVbTVfcg18ZtSpFWUSuqvgteDJcPof6JlyQ2ejSkiI9By +0x7a5zAS43yUVf0PAAMFBACd40U3BEwNJtI7LZEpmn3EeO1hq9iNmhtFqFBE+DI5 +gyXaoHvA5t7gFytTvWwHpKL44Hz5ajk1qDHO3Ba9NJ9FQZKQfwABlCc3VdP45tjE +/pa+YNwt95EKSn4Nbacg203vU/oafKlUVt2R0xZLeU6O9meHy6LgGrvia1z+w4oH +nIhOBBgRAgAGBQI2R1jKABIJEFNIGmjsa1FWB2VHUEcAAQHyNQCZAcUQlzCfV6RE +kL9Kyhcpw+ED0XMAnjQV98l5P4EITJPqDOz8XOqWMpovmQGiBEKAVjsRBAC/lxCP +s5e/1VlmPZy6jRnzw1/g5Hxaz6eKU0LMk+IaW5TX8NuJmEgao1o86bqP7kX1WPP1 +XSIcCGvwm6HZ7Od0G5ugfdU8XTqHDwXlhhUVKWQT+2fjWhjpZftlja5Bbgdnkbp4 +PhWqh6sPsN1l1y+JwPFIfqNk8IKKvFG9rBnDbwCg3Q4B+2GQ2CYyrBFhQ2utpmZg +UR8EAL6EfPtGKvGeoKGGEUDNju7vgbrCaCwCi/x9FKi4br/CtUICFHwAnGqOpG8b +bU18hEQLrIjzbiV4Pe2AUbJom2lMG3pbxnJGzrOGxnxKnByapdUC+igwLAhLPwSn +/N3xsPa5+E5V/JUyePu3nOBJ01idzMReuBt9Fg1q9zFfIfWmBACYYt/xycN2lGHu +7XVfKXAtcIEP/7IjqXX8NvusyheSsbjPTKXF0yig/DWDXyAGifB3i+pFBKpg5Kn8 +IX4PrO6srm/io4VjOo5oSp6/lMU4FbVN6e3IZdwIPn15gZYFESXW2CmOPrOoZfVs +1LBcKQaTCmJIiWGjUPCA4fCHcWXWnbQgSmFuaSBBdmVyYmFjaCAoU1ZOKSA8amFh +QGlraS5maT6IZAQTEQIAJAUCQoBWOwIbAwUJBaOagAYLCQgHAwIDFQIDAxYCAQIe +AQIXgAAKCRDWxiSXFti0HBTcAJ44WR0HxsTPckc2N4daLWITbXEXIwCgk9kg8UYn +dAuN/1v03u6d5kpMCfm0JEphbmkgQXZlcmJhY2ggKFNWTikgPGphYUBqYWEuaWtp +LmZpPohkBBMRAgAkBQJCgFZ/AhsDBQkFo5qABgsJCAcDAgMVAgMDFgIBAh4BAheA +AAoJENbGJJcW2LQcU48AoNSnViOWk4FKEZ3F3rfyRpl8lP/IAKDI1eV57AeNF+bi +nkJDL1ilvyGANrkCDQRCgFY/EAgAnlZJvkjRODEAUkzeuFToopLmn/oS0NqiiZbg +ZwrbXlry5yIvJdomU8we+rEhtj/UlHPA9AzaAMRYXa2ixqJo2f5IxPkDz3GP7Bk4 +C7PsmZvLQTq6yxQCuLjKkG+UjWs4UmCePsyNG3IEz1QpZkUXYtXfiwKdlbJpUrcO +mHHflJeM6XqeohfbKVS6vfOuUCKGtrpqiEYSI1ZKo/No62M4sTdaKw3jim5HhOK0 +9JBEQdZzT2KGQnVOIa2ubEAAkqrbjYURviaYbBpNfb8yJgh/tUUV33VhOlfBXmQE +Dy9R0Hbr/MZjn7hDOo20JaUDNiMd6tf19X0FV53U7TAZJ39rgwADBQf9Hz3SVs5a +6KOO+ZHmKVOw9IXCSulc828Qo8xD/wuNkgp/rloCtiuWnKwn01URQfn2h9GvMz8E +/PqB+lGHnnyC6ilDmpU4OODQR58I2nkWwROU/d2oxa+ZXGLuQBxDCTGMUvNKRR9v +rltmjbmOj0gjI2yZoVLwknj10JDfOmpH9uc/GGY6dZ2SPQIWZre6mReee4etpje5 +vu1J625KdCE/NDBwYm//3cdirxHKR57pXZhq+ycWRnWypHKV0355ti19HnbBd9dm +4HUB6Yw3SHTVP8VOkH86+ZkfF9/IA9hRN+Txx4f+yQjGBC0iu8thOZJtp2fW6QjI +ikuJnp7Ai56okYhPBBgRAgAPBQJCgFY/AhsMBQkFo5qAAAoJENbGJJcW2LQcvVgA +njIT91mB318q3b38aiqHsJAiggOwAKC2FV1Kzh0MhL3uxz506fWxTWNBnpkBogRB +hYM1EQQA8Ihatd36X4nRRhOLcCHR9Y/x137Wo0erCiC2CqMn392Ib+fcmK09bkDJ +mFTHn+1+aO/MTZhdqogXdIqhExq1GSwix1LeeWPe0lfytYSeYRPO7vp+GyHxYFMN +IBHn2kd6MMc4ugy1/SYhrbWHktYOk1MFFs+/0cj/zEcP7Fk6kdcAoO6cLFz0YJDi +4stVoCy80V5du1BnA/44Dg38WhQWUdCsLzuYqLvN+YdCsGhgdwVXYhkfNeqFzM2S +FYS6X8WQtYNU1eZC4TQc1Udn4pwkAelMfjjXfZOZfDDOGYtTG7iQdDu/37tbO5mU +avwv0ILKbYMpIi73tiRKgoFn4f7uz2f5m6gO/sQkwLgogvwbyXMiF0TbJqu+KQQA +iYeesuqEORNFKkQsp5LweOTuMqda9GNImGwy0tFPWl7O55j5+jlzrB+SCUmXDJ5s +3/RsUhSyiaUbaIn7WPu64cf6b8pu2jp4K6+AfLmd5/1dlsqpe/K2vCwHuh4KElNc +HUCtx0GzXqR7BPmZ0zdRdx5WSe1vR8xytFEIeDmGX5C0P0RhdmlkIEFuZGVyc29u +IChBZHJlc3NlIHVuaXZlcnNpdGFpcmUpIDxkYXZpZC5hbmRlcnNvbkB1dGJtLmZy +PohkBBMRAgAkBQJBhYV6AhsDBQkB4TOABgsJCAcDAgMVAgMDFgIBAh4BAheAAAoJ +EAm8NePuUGRhao4AnjD0X4Xn6FQJLMvcJOzF0n6t/QJuAJwKh5Ib1XTbsLk4wys7 +QwS8ZitYW4hkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJDcMwUBQkD +zHxWAAoJEAm8NePuUGRh5zMAnRyhloAGziY9Ioojd1jJkNtZWHsBAJ0d1Jkp/ykh +yKvxH4ELYJdEujib9ohkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheABQJD +gmAoBQkHoHdwAAoJEAm8NePuUGRhetYAn2UHN6+sFgrRFQopgFWtNDJ4SY+MAJ9q +vUlDTNt1UF/vntmvf/2dlzYUj4hGBBARAgAGBQJDgmJWAAoJEOyrDnuD5q4NzT4A +n2FWZoHV8FcAc1a45lxjnQP8dUPcAKCR8oiEOOE7Usp4oE+Otjb4EK8JCLQxRGF2 +aWQgQW5kZXJzb24gKERhdmUpIDxkYXZpZC5hbmRlcnNvbkBjYWxpeG8ubmV0Pohn +BBMRAgAnAhsDBQkB4TOABgsJCAcDAgMVAgMDFgIBAh4BAheABQJBhYWpAhkBAAoJ +EAm8NePuUGRhO/wAoM3wW6JiZKh2VNs7JHHfLVCxpD/RAJ9AEDmmzmGRGD8xS00h +guGX75vNRIhnBBMRAgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheAAhkBBQJDcMwL +BQkDzHxWAAoJEAm8NePuUGRhyKAAn3s3+lKtAdj+YmGUIW/iGY9oz58gAKDKVAFm +Y6MswnjIwnDidYvvV0Mc2IhnBBMRAgAnAhsDBgsJCAcDAgMVAgMDFgIBAh4BAheA +AhkBBQJDgmAlBQkHoHdwAAoJEAm8NePuUGRh9AoAoJClXCbuxBj4KPnVpVm7nVmv +RxEYAJ9vJlUx3XPc1n7DSvGIlXG0Lr+rUIhGBBARAgAGBQJDgmJUAAoJEOyrDnuD +5q4N+AIAnRCbALiCGh8WzjJa8+xfNUoB45NCAKCI6i0EIL+XM2hwWRrdYK3Ndck6 +mbQ1RGF2aWQgQW5kZXJzb24gKEFkcmVzc2Ugc2Vjb25kYWlyZSkgPGRhdmVhQG5l +cmltLm5ldD6IZAQTEQIAJAUCQYWFSAIbAwUJAeEzgAYLCQgHAwIDFQIDAxYCAQIe +AQIXgAAKCRAJvDXj7lBkYekPAKCf65I3amTBfsAX59ocgFgZ2fKGYwCdHNtn/G9s +b71Bryxkmz1eTxiUiLCIZAQTEQIAJAIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAUC +Q3DMFAUJA8x8VgAKCRAJvDXj7lBkYRNjAKDS+B9h3miafZxXTR46wgdfhyicLwCf +fpAqIIQneVXd2zxLeKGMoEiY5/KIZAQTEQIAJAIbAwYLCQgHAwIDFQIDAxYCAQIe +AQIXgAUCQ4JgKAUJB6B3cAAKCRAJvDXj7lBkYWvQAKC5eftT6gE29ceRNnad99pJ +z9qd8wCbByDbM/r/2hAz/gnDD+BFeuwzgC2IRgQQEQIABgUCQ4JiVgAKCRDsqw57 +g+auDeAmAJ9GkCnfAIzmslzH+kQf8tt6/HPuEwCgyIG5lzjpOWxjGa5mHbTJhGxe +xwm5Ag0EQYWDPBAIAIibRsMb2zRV4wBoZEjlNza19qN68lmOsW3ekZrMzjelWzBI +JtEHOzDR1fPQjppTPuaMiLD6k5vV9xf2nFwwK5002wmifQKAnQZK2vpIO7JnNY92 +wAD0qlSl2bMCc878SPzmvhCKR5E2lKC1GAGcqPlOInsezNNofgDNyI+RSxZFmP+i +zwrx1EFhAPplIrxJEykhqLW5kvopdnmfic69rfKkCGHbIue8JI8vuiVdu/C4oN1n +3j9bn9iIMYvCnVVHZYEvzxYEYFOlI2m9gk70L2ZvkHRUI7KcYNuttZTmRwa94OYn +60bZp3LfGG6tyafY3d1FJmAKJ/rwAjIshWg1jH8ABAsH/RSwLtorJuXy4j1ogHyX +MDGNXB+rnejAgDtCYdzJmIBzorxksPFJ2YljOUa3yg4v/Ocw6ZEguMN7bzXOL0LE +8tPsPcxbb0+4+bL2YVwFm5dXCNPKeHYFuO1xhTYp5EpjHGTK4Xq4+OdafsZoTSj5 +2d9xIXpn99dlCh5rTsTWpR52gRfSrXVZdN5ugzYgnEo1rxQRe1CELLf90kL0Mrw/ +l9JLUwwaTwwdlk2hrpxU/O5g0c4Gg3naJzGZfav7DZwN4TYcLQhTcX4JXni/iNxA +eeLFg5k1KIDjX6lORgJ4aZX5/VwUhMWXINDpJYpV37uuaybHKaj2glxoz7cxCvvU +NzOITwQYEQIADwIbDAUCQ4JgNQUJB6B3eQAKCRAJvDXj7lBkYVLoAKC3tFHCEzfs +oc02WxtKGM1RHeYbSwCgsgoaJONU+ID7PSBEZshH7Eu1IoqZAQsEQoOfuAEIAJou +IzS+PvTMDI3PbAKhlv9ecTBaTm1ZgCaZIHTaKPcNHYWilBr5OXSV/2SZVngNnSpd +rLUZOJfaCjbG5NvSDfThpfGz0fudZt7H12BJiV2VWNmuOrbTWmOiO5Vhb0m1D9JR +1InlQ5/BiAMbXOWRuq+cX7KlZ9qR4vW9AYBpmUPINiUgoJOOtPk/48JanHP+h+vZ +Cknl9ClZc5Y0mmF2/HccX3zxf31FRirCG5euywwZXL+iWi6kcwJ9RxSm3kF1Glue +MLESn9mNmd+i5WyDcLEzA2QZB19tKjn6O+nTWojWphgH7g0fnZquuBw/ispiA2gX +9BMKRIm2XWDF/ujJ9dEABim0O01hcmsgUGhpcHBhcmQgKFNvZnRMYW5kaW5nIFN5 +c3RlbXMpIDxtYXJrcEBzb2Z0bGFuZGluZy5jb20+iQE1BBMBAgAfBQJCg5+4AhsP +BwsJCAcDAgEDFQIDAxYCAQIeAQIXgAAKCRAVnjeBfdZnZ6hNB/4ydPO7divBn2TX +Q9mWDGHW+BLhYBYdjnTPww+yRw6Mli2MPraiephH9wqTZxxqWEgqYiTfGZczVs13 +pFSoBw5rSJRY2IpnroGL1FbnqFLs+x0n68HA9S1wwqE7Ij4S3cjkMFHFXKygd9yf +ZwPeRkWJEYhpiegL8gyKXOaonB0/w72EqbtZzS6P1rBwCNWn4mWzvP6ZU/lAdK51 +6f/UA0WOH5kMo50USK/K0uUTQaqWhVTS5PtqbZ8wCo+sI+eIKwKxF2u/Zgh+4xEu +8fejoIJ0eBhHbJr6FDsly2CWLFAGF+VdeBrK4dwnOH+PfvbP7t69LVBN5p0IWc8g +6aX7j/e7mQGiBDx6SmIRBACARE4kEq8R0I6ozUI6HK4qeA771hZtV3IEvCojpdPR +LscFV8Pa2kje0nPsPQWXxKIWD1wp0U0cMxPz5YxQTvUGnRkylm8oNlL+GiM0WPXt +A27qmopjkW7bMdLBT3b3Uxwo45U6VZkqKFYPgE/XJPIimmerkV9SC6zs2E6gDcA6 +XwCgwml5/wNkTc36w6pkb71SfgS+nvcD/jZIf2F1jMR4BevvqagwBQtdF2bZ/hmk +CFnepU/GRsZnF+8Zl9F7FRQ/+8PqLPizKhZMUqbxDNLikcUCtQ94oRYjhbSUMTiM +7I/r69jdkZtl8JPKouHp5rKzluFVcPDrQ7QHTeBD890hHHIX+2bmVztDVjkqnEg4 +tJ98f0oGXsnwA/9TwSPuYoFDVhQmJVLRQ+2sNT+Ugt6QWcbNVbyK7TQtSuBeLZiP +XM1DQ72OkK8s1RgDkoXcbQmtEvmixHuMklTyeIPayZmFhBq+80sDIyQBYAuM8f9M +RhNblsQo6mH1Co7utcV98vZO2vdFsj0j/qf0mx/TsMGEw62u4Ftllixws7QiRGFu +aWVsIEouIEJlcmxpbiA8ZGFuQGRiZXJsaW4ub3JnPohXBBMRAgAXBQsHCgMEAxUD +AgMWAgECF4AFAj9BsMAACgkQ7FmgR1HlB6zT3gCfVOU90yKacrB38ufI2D+MLUm8 +ayIAni++5k82Cz/UGN+7Eu04MgErOCD8iF0EExECAB0FAjx6SmIFCQDtTgAFCwcK +AwQDFQMCAxYCAQIXgAAKCRDsWaBHUeUHrFoJAJ4zqNiL1LjFaJsfq2jNWFvIO7RK +dgCdGc4x7xdrblO+OB0Pcj7ZG62NiZiIRgQTEQIABgUCQr15gQAKCRBxc32m+MTR +T1PSAKDFFZ7gGVoc+//9f6J2qyPudzYYPACcDrcliNan9AXHv61iwZ27m2qgJGO0 +JkRhbmllbCBKLiBCZXJsaW4gPGRiZXJsaW5AZGJlcmxpbi5vcmc+iF4EExECAB4C +GwMGCwkIBwMCAxUCAwMWAgECHgECF4AFAj9BsMIACgkQ7FmgR1HlB6wa7wCghmXN +4ntxrIUFA25f01K8JnVyyKYAoJFbJX7xvK2/cK6RvKlLMyHm4BdoiGQEExECACQF +Aj9Br10CGwMFCQDtTgAGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ7FmgR1HlB6yQ +FgCfT813+x3yiS5t/aKBv0149lmIXPoAoLhOEjemx8F+Iml1SNB5/XmMnIHbiEYE +ExECAAYFAkK9eXYACgkQcXN9pvjE0U/B7gCfarHlXQPxiGj1N0+R8WGuabPRZYwA +oJRZS4DGjVz8LEqtvoiSXEHOtWo/uQENBDx6Sm0QBADibADROabTTQDu+qMVtVcA +xq6yS8F3LERDHNJUgX+GShdm5cBcY2aLQ4FjvkVn9rfIG1ItufxU/fAecyqRo+EO +E/3Ibhye3srm8c0E8QvUBVBpEMJul3gPfEzKBZAO6UogZPEg7HDPZWwqj7mKoSTB +uTjZMDC5cZHw3zfFrvq8wwADBQP8Dmh9CLccMsT7C//6af73s8pYCKqj1qrdhS97 +dvZAek8VvZ8OP6S2jd1lFwSTSnxTL49KcPr3yVDt5CohNLCPAjSbcyRIpR2P7R/w +Q9X3K6MIiqiajRHO7P/XuxAk0CozHz++RyIJExaymA1eLCy4AWUWLEXrGZxPPb57 +bH0QJQ6ITAQYEQIADAUCPHpKbQUJAO1OAAAKCRDsWaBHUeUHrKYhAKCn7EvU1BTT +UALeG/XajV2tAFSlPACfR22/zNoVU9kqJdK0oKOSnYWn31q5AQ0EQHb2XBAEAKvn +E0b70EzT/KxqZOOPT185ieUOp8GpNiUQ4HrHqP1xOt53vCIBe1TIGwqUPPdSamul +PrQJYJYGvPHrnrBr4FkCM5X2sD5of2+sQ3Zrkwz5zdRNKK3kajvFfkB4InTsHOSD +qfnT/tD7AEFrwRXcaO924nVpNzI5Q8niwJ3NwJcHAAMFBACOmSpQd22DipeuT1ON +GgCmgylk68tbbvtLh8tzsBP3rpU1Om2yBEWhA5/LVOoyBC1xjb7wynZyiiTG/eYG +gE3R6cCmIDxKtBDrhqb7/kS02HTDY8eWQcuxpnKA2pMrXtl8JMT67WVgY+rWN/Kq +I1Wnu62xOYknKyx1sZVndmt5gYhJBBgRAgAJBQJAdvZcAhsMAAoJEOxZoEdR5Qes +6yYAniK9gwFA3bk8tzGIE+JHCa9qeDhLAJ4p9MK9X+FGCKz0nG8MmInSN92AqpkB +ogRDg4rXEQQA8PFuB8Z6Di8jbB7JcZf365IlxhD0gRbbh/JrQQnOupua78ISAg7c +SPvuUgoPkq/XuciAgsGtZ1IYCjXcK6ySycxcbwB8KWB9CcolpChbxZ7axUvKHljv +NoUg63RB3eHv8pNd78DvZyDRQbjgYCP5MxnBOnTCTAb/FH/g4eEc77MAoPYnfc56 +JoDoPz+xKID+i0C0xjsLA/wJQPIEk/WAVznj+DKWWIJPYNGPNclzu90YhmPufiM0 +RhV4ahJhnMiPAx4TbpqvVS33shq3Ea7j376c0Q5kIt42fCVzecLMeYeopAJ/iN0x +2To57gtpdTxpe4kAv7cdObQ9IQ/a8ftPZhNK7JLxq59KxJEEwhAre5i9dGGC6oRD +MQP+KUVHIeZK17gHuvqNav7DcIRvtA/kmY/cPWJoPW+Opta1+1YN0IETLbl3iPW8 +wa9QIzUU9g/ABEwhYJz7hmvdFZfIlCbIwbcchLhKHoPnQrnFk6jP0WWfBcOLvYUn +zpWQrXnNEC44XAr+I0ReEbWRD5zXb+91BWcy6pR4X3ldOYW0LUdhcnJldHQgUm9v +bmV5IDxyb29uZWdAZWxlY3RyaWNqZWxseWZpc2gubmV0PohgBBMRAgAgBQJDg4rX +AhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQyR242pvPzi/dAACg8AeMW9qE +T74SdX8mMNJ/5DM/r9wAn0vNI46aYq8WMfgMJyf0iRtrSDlGiEYEEBECAAYFAkOU +eRQACgkQZ9mySWdPBeAjFQCeMrK+TXtjJ8lph7c5cIPCLeW5QcYAn1k58UEXdtNv +E0IOvWHUIuQuW4aAtCJHYXJyZXR0IFJvb25leSA8cm9vbmVnQGFwYWNoZS5vcmc+ +iF4EExECAB4FAkOPuMYCGwMGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQyR242pvP +zi+ugwCfTQA9AjfmwMYuwpNu18QSXbryYUMAn3G64OWK0BlcWRNMqW1Zy9DoOj0Z +iEYEEBECAAYFAkOUeRMACgkQZ9mySWdPBeDIeQCfdBcrDsa3AfNkt+KElbl81bAh +IJcAoJw1vuM/oYtSoGztVXnA9MufpoCAuQINBEODiuIQCAD5sN9bqMtNSINKBJ1S +jVByyUUWeCrLuBwsCl8Ak2RYvA4e+PFkmoGcla9/3DRdlMz8u8tmWWcU1J7PqP21 +hRa0hb7mVT2MTLIjHmBhu8gARQyF++rMnYxeu+5DZa1GvmuHkQ09KWDwlD8OEGU9 +RwZXUHymK2tl+tBQ6W1wmxMevIF2Uq0rJGzAGqPsDnXpbZlAQVxMvdyg1vfVMcaz +tNsmP38MSVIAxLJLpt3Y8PDuSkcH3SaCoxBqWp8eogBJUMrfDKfKOJCW9aQbfh5L +787isCr/Xi4YQYl1CJHS/7AVqnSwbXeBUn2CNBcNRdh8e2AZXUHVAqDzQLppXWzY +8tP7AAMFCADx/IuPBFnrhJX59MhHNWI1syjSsfX/l9Sw/zmJb1zEooqttIC+dLJl +iGaGIcTxiULJjBC/hf8D87v67wd75BzGwtzpA2PZf6BvXao9nKb9HqjBHPOtpVvo +/6HDRqKClPlvZs//jHPqFxnOy4HZC9dsyde8iQdSlsVbdahC379uepJHLis2kunw +M1u+yuTgbr1ToQMyM5ZSe8etCkQ7UMjAH6uvaBnIHn0I9zNs5G4drJ1hGce8L6AH +e+SIhpshYGvIgOd21ad+6TrRAgL4k6rczsGqJxxZp3Aae385PMVPIqnF2ggSMI9D +Eb5IO5c72FA/JFoy3JLQS899VORRDZuGiEkEGBECAAkFAkODiuICGwwACgkQyR24 +2pvPzi8cLgCeJ19REJxW4gdWafNHNoFbtMfic2cAniZM6mFSuSPkBcpjKOUU5P3q +i+n8mQGiBEBMrdURBAC/xT1huk8n0wa5dN0gcF9x5i2laSvD/ioY4vyhcNBPCwW9 +os45TYZbDOhaZqm3uMlTT3veOhYHaeduQjSd4gNIh4GPWy9TMD9W7jUHa/k51dO5 +gZ8q528MWH6sykKK9FmkmAT9gceTqt9aY6Z7NJuAqc/0YOQFu1WC/byiRwt+IwCg +grkJBa0sU/Da2CyfMftKpgsKOdcD/1izXnJXjXsl7tiSsQxCXZs4WtJtikjcij/t +D1aRtHz0327kKeYTU3j7oCiBZdplx9OQtYwwZFd6iqx0OWn8Z0KBsTrVwQCQmf+J +tWiuk+TDStqw69LfgzIoMVZ/w8ghVzijXQYZqUPPSEzlIwgAUtS0HfwwcBIezbA4 +gW4KGl2ZA/0eumt3QwVgYuAVPVQHMaleF6BHUnSi8C4NNWNu3ddl+yxvd/LevdpI +MZPxS0QFNAR7Y89UiysbK5Drz0GG1+zK2GFaBbkYAtIVCOdMxdTA9UdLme1cS45t ++LpS+nFQ2HMZ8WFeDhbnp1C5qfiyHxmSlCF4yfircptuRVFVyxo0w7QkRXJpayBI +dWVsc21hbm4gPGUuaHVlbHNtYW5uQGdteC5uZXQ+iF8EExECAB8FAkBMrdUFCQHa +nAAECwcDAgMVAgMDFgIBAh4BAheAAAoJEIuTtBKWs/U5k0wAmwbmjkRPwaLVHlus +apRqU6Tu8TO2AJ4rPMnUqR/tYry8lB2/C+U3VphjkohGBBARAgAGBQJAia2cAAoJ +EPbQZreyjt2CtGQAmgN1fy34CnS1D1zOucstvyKedtPFAJ9UbMfjo98zU7Oly08Y +LYXvZxA2WYhGBBARAgAGBQJAkVCEAAoJEGY1tsDeiF3TrDYAoJnnIKNqiIwan3Wf +JM3haFSrcUOAAJ96uDhl4dJFsdhx+ixGi3JQtdEcFIhGBBMRAgAGBQJDgiboAAoJ +ELyduxPbAKJIKBMAoLcKUoNzd5p23bKiRAOv8ukMPCOqAJ9tN5UcQFLpGdmo3lic +CFuIb9T0sLkBDQRATK3WEAQAvEEc8qQgg+ly44jZ/VMK38R2SNjlO0noor8YtBPi +X0qaJUlywfxAy9nGLCQlDVcyupjETXAvCQDwrkO+GdZ1W96fG2AhiL2oAaYVSt7v +VZy1peVla/DLO9jpPXdCJP0KLCN7CH7p0IrkCQcK2OdzJRWCZHs7Ua+oM4HQjkl2 +FMcABAsD/AgpXwdJI1nQnFx5+etP/2BEuqIWmAnyW3/qaAfKeMqmBLkNdTa6yqvW +vd+MzWbIse7ClEMMwRdF0x/wQwNc6izRBI1djJ0fS4moMsNbtMLf48FdunpMF+uu +7GlNQ/PTmu9ud+bRbzGgNnkJ5RGRmMK5bi9goA26va/BKgcgQ7MhiEwEGBECAAwF +AkBMrdYFCQHanAAACgkQi5O0Epaz9TlcHwCeM90tM1VaPqS7QHW31Tq+GlPsrEIA +n3XvPxBbvJUFwy3Y7bEr4YW/Cy9f +=4sB1 -----END PGP PUBLIC KEY BLOCK----- --- subversion-0.24.2-swig.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 4 13:11:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 08:11:09 -0500 Subject: rpms/compat-gcc-32/devel compat-gcc-32.spec,1.16,1.17 Message-ID: <200601041311.k04DB9A0008850@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/compat-gcc-32/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8775 Modified Files: compat-gcc-32.spec Log Message: 3.2.3-54.fc5 Index: compat-gcc-32.spec =================================================================== RCS file: /cvs/dist/rpms/compat-gcc-32/devel/compat-gcc-32.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- compat-gcc-32.spec 17 Dec 2005 17:43:13 -0000 1.16 +++ compat-gcc-32.spec 4 Jan 2006 13:11:06 -0000 1.17 @@ -35,7 +35,7 @@ # Need -pie support # Need --as-needed/--no-as-needed support # Need .weakref support -BuildRequires: binutils >= 2.16.91.0.3-1 +BuildRequires: binutils >= 2.16.91.0.5-1 BuildRequires: zlib-devel, gettext, dejagnu, bison, flex, texinfo # Make sure pthread.h doesn't contain __thread tokens BuildRequires: glibc-devel >= 2.2.90-12 @@ -43,7 +43,7 @@ # Need proper visibility support # Need -pie support # Need .weakref support -Requires: binutils >= 2.16.91.0.3-1 +Requires: binutils >= 2.16.91.0.5-1 # Make sure gdb will understand DW_FORM_strp Conflicts: gdb < 5.1-2 Requires: glibc-devel >= 2.2.90-12 @@ -634,7 +634,7 @@ %{_prefix}/%{_lib}/libg2c.so.0* %changelog -* Sat Dec 17 2005 Jakub Jelinek 3.2.3-54.fc5 +* Wed Jan 4 2006 Jakub Jelinek 3.2.3-54.fc5 - rebuilt with new gcc, massage $RPM_OPT_FLAGS, as GCC 3.2.3-RH doesn't grok -fstack-protector etc. - make sure glibc and glibc-devel for all multilib arches is installed From fedora-cvs-commits at redhat.com Wed Jan 4 13:15:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 08:15:17 -0500 Subject: rpms/compat-gcc-296/devel compat-gcc-296.spec,1.8,1.9 Message-ID: <200601041315.k04DFHQ7010842@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/compat-gcc-296/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10785 Modified Files: compat-gcc-296.spec Log Message: 2.96-134 Index: compat-gcc-296.spec =================================================================== RCS file: /cvs/dist/rpms/compat-gcc-296/devel/compat-gcc-296.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- compat-gcc-296.spec 3 Jan 2006 21:54:31 -0000 1.8 +++ compat-gcc-296.spec 4 Jan 2006 13:15:15 -0000 1.9 @@ -1088,8 +1088,8 @@ %{_prefix}/lib/gcc-lib/%{_target_platform}/%{gcc_version}/crtendS.o %changelog -* Tue Jan 3 2006 Jakub Jelinek 2.96-134 -- rebuilt against glibc-2.3.90-25 to pick up a sanitized +* Wed Jan 4 2006 Jakub Jelinek 2.96-134 +- rebuilt against glibc-2.3.90-26 to pick up a sanitized (#176745) * Sat Dec 17 2005 Jakub Jelinek 2.96-133 From fedora-cvs-commits at redhat.com Wed Jan 4 13:17:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 08:17:23 -0500 Subject: rpms/netpbm/FC-3 netpbm-10.28-legal.patch, NONE, 1.1 netpbm-10.29-pnmtopng.patch, NONE, 1.1 netpbm-10.30-rgbtxt.patch, NONE, 1.1 netpbm-10.23-security.patch, 1.5, 1.6 netpbm-10.27-bmptopnm.patch, 1.1, 1.2 netpbm-10.28-CAN-2005-2471.patch, 1.1, 1.2 netpbm-10.28-gcc4.patch, 1.1, 1.2 netpbm.spec, 1.30, 1.31 sources, 1.14, 1.15 netpbm-10.18-manpath.patch, 1.1, NONE Message-ID: <200601041317.k04DHN1T022936@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/netpbm/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv22758 Modified Files: netpbm-10.23-security.patch netpbm-10.27-bmptopnm.patch netpbm-10.28-CAN-2005-2471.patch netpbm-10.28-gcc4.patch netpbm.spec sources Added Files: netpbm-10.28-legal.patch netpbm-10.29-pnmtopng.patch netpbm-10.30-rgbtxt.patch Removed Files: netpbm-10.18-manpath.patch Log Message: * Wed Jan 04 2006 Jindrich Novy 10.31-1.FC3 - update to 10.31 - update security patch - regenerate man pages - drop manpath patch - add .legal, .pnmtopng, .rgbtxt patches - update .security, .security2, .bmptopnm, .CAN-2005-2471, .gcc4 patches - new version fixes error in pnmnorm #176845 netpbm-10.28-legal.patch: other/Makefile | 2 +- ppm/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE netpbm-10.28-legal.patch --- --- netpbm-10.28/converter/other/Makefile.legal 2005-04-12 05:55:29.000000000 +0200 +++ netpbm-10.28/converter/other/Makefile 2005-06-10 10:54:01.685885728 +0200 @@ -7,7 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR) include $(BUILDDIR)/Makefile.config -SUBDIRS = jbig pnmtopalm jpeg2000 cameratopam +SUBDIRS = pnmtopalm jpeg2000 cameratopam ifneq ($(BUILD_FIASCO), N) SUBDIRS += fiasco endif --- netpbm-10.28/converter/ppm/Makefile.legal 2004-10-16 20:55:28.000000000 +0200 +++ netpbm-10.28/converter/ppm/Makefile 2005-06-10 10:56:04.616197480 +0200 @@ -7,7 +7,7 @@ VPATH=.:$(SRCDIR)/$(SUBDIR) include $(BUILDDIR)/Makefile.config -SUBDIRS = hpcdtoppm ppmtompeg +SUBDIRS = ppmtompeg PORTBINARIES = 411toppm eyuvtoppm gouldtoppm ilbmtoppm imgtoppm \ leaftoppm mtvtoppm neotoppm \ netpbm-10.29-pnmtopng.patch: pnmtopng.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE netpbm-10.29-pnmtopng.patch --- --- netpbm-10.29/converter/other/pnmtopng.c.segfault 2005-08-06 19:26:55.000000000 +0200 +++ netpbm-10.29/converter/other/pnmtopng.c 2005-10-05 14:33:03.000000000 +0200 @@ -1618,7 +1618,7 @@ makePngLine(png_byte * const l *pp++ = PNM_GET1(p_png) & 0xff; } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { unsigned int paletteIndex; - if (alpha) + if (alpha && alpha_mask) paletteIndex = lookupColorAlpha(caht, &p, &alpha_mask[col]); else paletteIndex = ppm_lookupcolor(cht, &p); @@ -1637,7 +1637,7 @@ makePngLine(png_byte * const l } else pm_error("INTERNAL ERROR: undefined color_type"); - if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) { + if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA && alpha_mask) { int const png_alphaval = (int) alpha_mask[col] * (float) png_maxval / maxval + 0.5; if (depth == 16) netpbm-10.30-rgbtxt.patch: pm_config.in.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE netpbm-10.30-rgbtxt.patch --- --- netpbm-10.30/pm_config.in.h.rgbtxt 2005-04-25 04:21:43.000000000 +0200 +++ netpbm-10.30/pm_config.in.h 2005-11-29 16:52:10.000000000 +0100 @@ -106,8 +106,8 @@ #define RGB_DB2 "PBMplus_Dir:RGB.TXT" #define RGB_DB3 "PBMplus_Dir:RGB.TXT" #else -#define RGB_DB1 "/usr/lib/X11/rgb.txt" -#define RGB_DB2 "/usr/openwin/lib/rgb.txt" +#define RGB_DB1 "/usr/share/X11/rgb.txt" +#define RGB_DB2 "/usr/lib/X11/rgb.txt" #define RGB_DB3 "/usr/X11R6/lib/X11/rgb.txt" #endif netpbm-10.23-security.patch: OPENLICENSE | 163 +++++++++++++++++++++++++++++++++++++ analyzer/pgmhist.c | 1 analyzer/pgmtexture.c | 9 ++ converter/other/gemtopnm.c | 1 converter/other/jpegtopnm.c | 1 converter/other/pbmtopgm.c | 1 converter/other/pngtopnm.c | 19 ++-- converter/other/pnmtoddif.c | 2 converter/other/pnmtojpeg.c | 9 +- converter/other/pnmtops.c | 11 +- converter/other/pnmtorle.c | 2 converter/other/pnmtosgi.c | 19 ++++ converter/other/rletopnm.c | 2 converter/other/sgitopnm.c | 6 + converter/other/sirtopnm.c | 1 converter/other/tifftopnm.c | 3 converter/other/xwdtopnm.c | 8 + converter/pbm/icontopbm.c | 6 + converter/pbm/mdatopbm.c | 5 - converter/pbm/mgrtopbm.c | 2 converter/pbm/pbmto10x.c | 2 converter/pbm/pbmto4425.c | 3 converter/pbm/pbmtoascii.c | 2 converter/pbm/pbmtocmuwm.c | 1 converter/pbm/pbmtogem.c | 1 converter/pbm/pbmtogo.c | 1 converter/pbm/pbmtoicon.c | 1 converter/pbm/pbmtolj.c | 4 converter/pbm/pbmtomacp.c | 3 converter/pbm/pbmtomda.c | 1 converter/pbm/pbmtomgr.c | 1 converter/pbm/pbmtoppa/pbm.c | 4 converter/pbm/pbmtoppa/pbmtoppa.c | 1 converter/pbm/pbmtox10bm.c | 1 converter/pbm/pbmtoxbm.c | 1 converter/pbm/pbmtoybm.c | 1 converter/pbm/pbmtozinc.c | 1 converter/pbm/pktopbm.c | 1 converter/pbm/thinkjettopbm.l | 4 converter/pbm/ybmtopbm.c | 1 converter/pgm/lispmtopgm.c | 5 - converter/pgm/psidtopgm.c | 1 converter/ppm/Makefile | 2 converter/ppm/ilbmtoppm.c | 28 ++++++ converter/ppm/imgtoppm.c | 2 converter/ppm/pcxtoppm.c | 3 converter/ppm/picttoppm.c | 2 converter/ppm/pjtoppm.c | 21 ++-- converter/ppm/ppmtoeyuv.c | 1 converter/ppm/ppmtoicr.c | 2 converter/ppm/ppmtoilbm.c | 9 +- converter/ppm/ppmtolj.c | 3 converter/ppm/ppmtomitsu.c | 2 converter/ppm/ppmtompeg/frame.c | 73 ++++++++-------- converter/ppm/ppmtompeg/iframe.c | 20 ++-- converter/ppm/ppmtompeg/parallel.c | 4 converter/ppm/ppmtompeg/psearch.c | 18 +++- converter/ppm/ppmtompeg/rgbtoycc.c | 2 converter/ppm/ppmtopcx.c | 2 converter/ppm/ppmtopict.c | 2 converter/ppm/ppmtopj.c | 1 converter/ppm/ppmtopjxl.c | 8 + converter/ppm/ppmtowinicon.c | 8 + converter/ppm/ppmtoxpm.c | 2 converter/ppm/qrttoppm.c | 2 converter/ppm/sldtoppm.c | 4 converter/ppm/ximtoppm.c | 4 converter/ppm/xpmtoppm.c | 1 converter/ppm/yuvtoppm.c | 1 doc/COPYRIGHT.PATENT | 5 + editor/pamcut.c | 2 editor/pamoil.c | 1 editor/pbmclean.c | 2 editor/pbmlife.c | 2 editor/pbmpscale.c | 1 editor/pbmreduce.c | 1 editor/pnmcut.c | 1 editor/pnmgamma.c | 1 editor/pnmhisteq.c | 1 editor/pnmindex.csh | 3 editor/pnmpad.c | 2 editor/pnmpaste.c | 5 + editor/pnmremap.c | 2 editor/pnmrotate.c | 8 + editor/pnmscalefixed.c | 7 + editor/pnmshear.c | 6 + editor/ppmdither.c | 6 + generator/pbmpage.c | 3 generator/pbmtext.c | 15 +++ generator/pgmcrater.c | 2 generator/pgmkernel.c | 2 generator/ppmrainbow | 2 lib/libpam.c | 3 lib/libpammap.c | 2 lib/libpbm1.c | 1 lib/libpbmvms.c | 2 lib/libpm.c | 54 +++++++++++- lib/pm.h | 6 + other/pnmcolormap.c | 1 urt/README | 5 + urt/Runput.c | 10 +- urt/rle.h | 13 ++ urt/rle_addhist.c | 15 ++- urt/rle_getrow.c | 3 urt/rle_hdr.c | 19 +++- urt/rle_open_f.c | 8 + urt/rle_putcom.c | 6 + urt/scanargs.c | 6 - 108 files changed, 672 insertions(+), 101 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 netpbm-10.23-security.patch Index: netpbm-10.23-security.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-3/netpbm-10.23-security.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- netpbm-10.23-security.patch 29 Jul 2005 08:46:27 -0000 1.5 +++ netpbm-10.23-security.patch 4 Jan 2006 13:17:19 -0000 1.6 @@ -1,28 +1,171 @@ ---- netpbm-10.28/generator/ppmrainbow.security 2003-01-04 01:40:56.000000000 +0100 -+++ netpbm-10.28/generator/ppmrainbow 2005-06-10 09:44:00.275597176 +0200 -@@ -11,7 +11,7 @@ my ($Twid, $Thgt, $tmpdir, $norepeat, $v - # set defaults - $Twid = 600; - $Thgt = 8; --$tmpdir = $ENV{"TMPDIR"} || "/tmp"; -+$tmpdir = $ENV{"TMPDIR"} || ".tmp"; - $norepeat = $FALSE; - $verbose = $FALSE; - ---- netpbm-10.28/generator/pbmpage.c.security 2005-05-22 20:43:13.000000000 +0200 -+++ netpbm-10.28/generator/pbmpage.c 2005-06-10 09:44:00.276597024 +0200 -@@ -163,6 +163,9 @@ output_pbm(FILE *file, const int Width, - /* We round the allocated row space up to a multiple of 8 so the ugly - fast code below can work. - */ -+ -+ overflow_add(Width, 7); -+ - pbmrow = pbm_allocrow(((Width+7)/8)*8); - - bitmap_cursor = 0; ---- netpbm-10.28/generator/pbmtext.c.security 2005-04-14 19:03:43.000000000 +0200 -+++ netpbm-10.28/generator/pbmtext.c 2005-06-10 09:44:00.278596720 +0200 +--- /dev/null 2005-12-28 07:55:55.980549750 +0100 ++++ netpbm-10.31/OPENLICENSE 2005-12-30 10:44:51.000000000 +0100 +@@ -0,0 +1,163 @@ ++ The Open Software License ++ v. 1.1 ++ ++This Open Software License (the "License") applies to any original work of ++authorship (the "Original Work") whose owner (the "Licensor") has placed the ++following notice immediately following the copyright notice for the Original ++Work: ++ ++Licensed under the Open Software License version 1.1 ++ ++1) Grant of Copyright License. Licensor hereby grants You a world-wide, ++royalty-free, non-exclusive, perpetual, non-sublicenseable license to do the ++following: ++ ++a) to reproduce the Original Work in copies; ++ ++b) to prepare derivative works ("Derivative Works") based upon the Original ++Work; ++ ++c) to distribute copies of the Original Work and Derivative Works to the ++public, with the proviso that copies of Original Work or Derivative Works that ++You distribute shall be licensed under the Open Software License; ++ ++d) to perform the Original Work publicly; and ++ ++e) to display the Original Work publicly. ++ ++2) Grant of Patent License. Licensor hereby grants You a world-wide, ++royalty-free, non-exclusive, perpetual, non-sublicenseable license, under ++patent claims owned or controlled by the Licensor that are embodied in the ++Original Work as furnished by the Licensor ("Licensed Claims") to make, use, ++sell and offer for sale the Original Work. Licensor hereby grants You a ++world-wide, royalty-free, non-exclusive, perpetual, non-sublicenseable license ++under the Licensed Claims to make, use, sell and offer for sale Derivative Works. ++ ++3) Grant of Source Code License. The term "Source Code" means the preferred ++form of the Original Work for making modifications to it and all available ++documentation describing how to modify the Original Work. Licensor hereby ++agrees to provide a machine-readable copy of the Source Code of the Original ++Work along with each copy of the Original Work that Licensor distributes. ++Licensor reserves the right to satisfy this obligation by placing a ++machine-readable copy of the Source Code in an information repository reasonably ++calculated to permit inexpensive and convenient access by You for as long as ++ Licensor continues to distribute the Original Work, and by publishing the ++address of that information repository in a notice immediately following the ++copyright notice that applies to the Original Work. ++ ++ ++4) Exclusions From License Grant. Nothing in this License shall be deemed to ++grant any rights to trademarks, copyrights, patents, trade secrets or any ++other intellectual property of Licensor except as expressly stated herein. No ++patent license is granted to make, use, sell or offer to sell embodiments of ++any patent claims other than the Licensed Claims defined in Section 2. No ++right is granted to the trademarks of Licensor even if such marks are included ++in the Original Work. Nothing in this License shall be interpreted to prohibit ++Licensor from licensing under different terms from this License any Original ++Work that Licensor otherwise would have a right to license. ++ ++5) External Deployment. The term "External Deployment" means the use or ++distribution of the Original Work or Derivative Works in any way such that the ++Original Work or Derivative Works may be used by anyone other than You, ++whether the Original Work or Derivative Works are distributed to those persons ++or made available as an application intended for use over a computer network. ++As an express condition for the grants of license hereunder, You agree that ++any External Deployment by You of a Derivative Work shall be deemed a ++distribution and shall be licensed to all under the terms of this License, as ++prescribed in section 1(c) herein. ++ ++6) Attribution Rights. You must retain, in the Source Code of any Derivative ++Works that You create, all copyright, patent or trademark notices from the ++Source Code of the Original Work, as well as any notices of licensing and any ++descriptive text identified therein as an "Attribution Notice." You must cause ++the Source Code for any Derivative Works that You create to carry a prominent ++Attribution Notice reasonably calculated to inform recipients that You have ++modified the Original Work. ++ ++7) Warranty and Disclaimer of Warranty. Licensor warrants that the copyright ++in and to the Original Work is owned by the Licensor or that the Original Work ++is distributed by Licensor under a valid current license from the copyright ++owner. Except as expressly stated in the immediately proceeding sentence, the ++Original Work is provided under this License on an "AS IS" BASIS and WITHOUT ++WARRANTY, either express or implied, including, without limitation, the ++warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR ++PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. ++This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No ++license to Original Work is granted hereunder except under this disclaimer. ++ ++8) Limitation of Liability. Under no circumstances and under no legal theory, ++whether in tort (including negligence), contract, or otherwise, shall the ++Licensor be liable to any person for any direct, indirect, special, incidental, ++or consequential damages of any character arising as a result of this License ++or the use of the Original Work including, without limitation, damages for ++loss of goodwill, work stoppage, computer failure or malfunction, or any and ++all other commercial damages or losses. This limitation of liability shall not ++apply to liability for death or personal injury resulting from Licensor's ++negligence to the extent applicable law prohibits such limitation. Some ++jurisdictions do not allow the exclusion or limitation of incidental or ++consequential damages, so this exclusion and limitation may not apply to You. ++ ++ ++9) Acceptance and Termination. If You distribute copies of the Original Work ++or a Derivative Work, You must make a reasonable effort under the circumstances ++to obtain the express and volitional assent of recipients to the terms of this ++License. Nothing else but this License (or another written agreement between ++Licensor and You) grants You permission to create Derivative Works based upon ++the Original Work or to exercise any of the rights granted in Sections 1 herein, ++and any attempt to do so except under the terms of this License (or another ++written agreement between Licensor and You) is expressly prohibited by U.S. ++copyright law, the equivalent laws of other countries, and by international ++treaty. Therefore, by exercising any of the rights granted to You in Sections ++1 herein, You indicate Your acceptance of this License and all of its terms and ++conditions. This License shall terminate immediately and you may no longer ++exercise any of the rights granted to You by this License upon Your failure to ++honor the proviso in Section 1(c) herein. ++ ++10) Mutual Termination for Patent Action. This License shall terminate ++automatically and You may no longer exercise any of the rights granted to You ++by this License if You file a lawsuit in any court alleging that any OSI ++Certified open source software that is licensed under any license containing ++this "Mutual Termination for Patent Action" clause infringes any patent claims ++that are essential to use that software. ++ ++11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this ++License may be brought only in the courts of a jurisdiction wherein the Licensor ++resides or in which Licensor conducts its primary business, and under the laws ++of that jurisdiction excluding its conflict-of-law provisions. The application ++of the United Nations Convention on Contracts for the International Sale of ++Goods is expressly excluded. Any use of the Original Work outside the scope of ++this License or after its termination shall be subject to the requirements and ++penalties of the U.S. Copyright Act, 17 U.S.C. ?? 101 et seq., the equivalent ++laws of other countries, and international treaty. This section shall survive ++the termination of this License. ++ ++12) Attorneys Fees. In any action to enforce the terms of this License or ++seeking damages relating thereto, the prevailing party shall be entitled to ++recover its costs and expenses, including, without limitation, reasonable ++attorneys' fees and costs incurred in connection with such action, including ++any appeal of such action. This section shall survive the termination of this ++License. ++ ++13) Miscellaneous. This License represents the complete agreement concerning ++the subject matter hereof. If any provision of this License is held to be ++unenforceable, such provision shall be reformed only to the extent necessary ++to make it enforceable. ++ ++14) Definition of "You" in This License. "You" throughout this License, ++whether in upper or lower case, means an individual or a legal entity exercising ++rights under, and complying with all of the terms of, this License. For legal ++entities, "You" includes any entity that controls, is controlled by, or is under ++common control with you. For purposes of this definition, "control" means (i) ++the power, direct or indirect, to cause the direction or management of such ++entity, whether by contract or otherwise, or (ii) ownership of fifty percent ++(50%) or more of the outstanding shares, or (iii) beneficial ownership of such ++entity. ++ ++15) Right to Use. You may use the Original Work in all ways not otherwise ++restricted or conditioned by this License or by law, and Licensor promises not ++to interfere with or be responsible for such uses by You. ++ ++This license is Copyright (C) 2002 Lawrence E. Rosen. All rights reserved. ++Permission is hereby granted to copy and distribute this license without ++modification. This license may not be modified without the express written ++permission of its copyright owner. [...3792 lines suppressed...] + length += strlen(old); /* add length if there. */ ++ } + ++ overflow_add(length, 1); + ++length; /*Cater for the null. */ + + MALLOCARRAY(newc, length); +--- netpbm-10.31/urt/rle_hdr.c.security 2005-10-17 00:16:33.000000000 +0200 ++++ netpbm-10.31/urt/rle_hdr.c 2005-12-30 10:44:51.000000000 +0100 @@ -14,6 +14,8 @@ * If you modify this software, you should include a notice giving the * name of the person performing the modification, the date of modification, @@ -2452,7 +2296,7 @@ */ /* * rle_hdr.c - Functions to manipulate rle_hdr structures. -@@ -77,7 +79,10 @@ int img_num; +@@ -79,7 +81,10 @@ int img_num; /* Fill in with copies of the strings. */ if ( the_hdr->cmd != pgmname ) { @@ -2464,7 +2308,7 @@ RLE_CHECK_ALLOC( pgmname, tmp, 0 ); strcpy( tmp, pgmname ); the_hdr->cmd = tmp; -@@ -85,7 +90,9 @@ int img_num; +@@ -87,7 +92,9 @@ int img_num; if ( the_hdr->file_name != fname ) { @@ -2475,7 +2319,7 @@ RLE_CHECK_ALLOC( pgmname, tmp, 0 ); strcpy( tmp, fname ); the_hdr->file_name = tmp; -@@ -150,6 +157,7 @@ rle_hdr *from_hdr, *to_hdr; +@@ -152,6 +159,7 @@ rle_hdr *from_hdr, *to_hdr; if ( to_hdr->bg_color ) { int size = to_hdr->ncolors * sizeof(int); @@ -2483,7 +2327,7 @@ to_hdr->bg_color = (int *)malloc( size ); RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" ); memcpy( to_hdr->bg_color, from_hdr->bg_color, size ); -@@ -158,7 +166,7 @@ rle_hdr *from_hdr, *to_hdr; +@@ -160,7 +168,7 @@ rle_hdr *from_hdr, *to_hdr; if ( to_hdr->cmap ) { int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map); @@ -2492,7 +2336,7 @@ RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" ); memcpy( to_hdr->cmap, from_hdr->cmap, size ); } -@@ -171,11 +179,16 @@ rle_hdr *from_hdr, *to_hdr; +@@ -173,11 +181,16 @@ rle_hdr *from_hdr, *to_hdr; int size = 0; CONST_DECL char **cp; for ( cp=to_hdr->comments; *cp; cp++ ) @@ -2509,52 +2353,94 @@ size *= sizeof(char *); to_hdr->comments = (CONST_DECL char **)malloc( size ); RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" ); ---- netpbm-10.28/analyzer/pgmhist.c.security 2003-07-06 21:23:19.000000000 +0200 -+++ netpbm-10.28/analyzer/pgmhist.c 2005-06-10 09:44:00.413576200 +0200 -@@ -45,6 +45,7 @@ main( argc, argv ) - grayrow = pgm_allocrow( cols ); - - /* Build histogram. */ -+ overflow_add(maxval, 1); - MALLOCARRAY(hist, maxval + 1); - MALLOCARRAY(rcount, maxval + 1); - if ( hist == NULL || rcount == NULL ) ---- netpbm-10.28/analyzer/pgmtexture.c.security 2003-08-07 18:18:16.000000000 +0200 -+++ netpbm-10.28/analyzer/pgmtexture.c 2005-06-10 09:44:00.414576048 +0200 -@@ -75,7 +75,10 @@ vector (int nl, int nh) - { - float *v; +--- netpbm-10.31/urt/README.security 2000-06-02 22:53:04.000000000 +0200 ++++ netpbm-10.31/urt/README 2005-12-30 10:44:51.000000000 +0100 +@@ -18,3 +18,8 @@ in its initializer in the original. But + defines stdout as a variable, so that wouldn't compile. So I changed + it to NULL and added a line to rle_hdr_init to set that field to + 'stdout' dynamically. 2000.06.02 BJH. ++ ++Redid the code to check for maths overflows and other crawly horrors. ++Removed pipe through and compress support (unsafe) ++ ++Alan Cox +--- netpbm-10.31/urt/Runput.c.security 2005-10-16 23:36:29.000000000 +0200 ++++ netpbm-10.31/urt/Runput.c 2005-12-30 10:44:51.000000000 +0100 +@@ -17,6 +17,8 @@ + * + * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire + * to have all "void" functions so declared. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * Runput.c - General purpose Run Length Encoding. +@@ -202,9 +204,11 @@ RunSetup(rle_hdr * the_hdr) + if ( the_hdr->background != 0 ) + { + register int i; +- register rle_pixel *background = +- (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); ++ register rle_pixel *background; + register int *bg_color; ++ ++ overflow_add(the_hdr->ncolors,1); ++ background = (rle_pixel *)malloc( (unsigned)(the_hdr->ncolors + 1) ); + /* + * If even number of bg color bytes, put out one more to get to + * 16 bit boundary. +@@ -224,7 +228,7 @@ RunSetup(rle_hdr * the_hdr) + /* Big-endian machines are harder */ + register int i, nmap = (1 << the_hdr->cmaplen) * + the_hdr->ncmap; +- register char *h_cmap = (char *)malloc( nmap * 2 ); ++ register char *h_cmap = (char *)malloc2( nmap, 2 ); + if ( h_cmap == NULL ) + { + fprintf( stderr, +--- netpbm-10.31/urt/rle_getrow.c.security 2005-10-16 23:47:53.000000000 +0200 ++++ netpbm-10.31/urt/rle_getrow.c 2005-12-30 10:44:51.000000000 +0100 +@@ -17,6 +17,8 @@ + * + * Modified at BRL 16-May-88 by Mike Muuss to avoid Alliant STDC desire + * to have all "void" functions so declared. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * rle_getrow.c - Read an RLE file in. +@@ -168,6 +170,7 @@ rle_get_setup(rle_hdr * const the_hdr) { + register char * cp; -- MALLOCARRAY(v, (unsigned) (nh - nl + 1)); -+ overflow_add(nh, 1); -+ if(nh < nl) -+ pm_error("assert: h < l"); -+ v = (float *) malloc2 ((nh - nl + 1), sizeof (float)); - if (v == NULL) - pm_error("Unable to allocate memory for a vector."); - return v - nl; -@@ -91,16 +94,22 @@ matrix (int nrl, int nrh, int ncl, int n - float **m; - - /* allocate pointers to rows */ -- MALLOCARRAY(m, (unsigned) (nrh - nrl + 1)); -+ overflow_add(nrh, 1); -+ if(nrh < nrl) -+ pm_error("assert: nrh < nrl"); -+ m = (float **) malloc2(nrh - nrl + 1, sizeof (float *)); - if (m == NULL) - pm_error("Unable to allocate memory for a matrix."); - - m -= ncl; - -+ if(nch < ncl) -+ pm_error("assert: nch < ncl"); -+ overflow_add(nch, 1); - /* allocate rows and set pointers to them */ - for (i = nrl; i <= nrh; i++) - { -- MALLOCARRAY(m[i], (unsigned) (nch - ncl + 1)); -+ m[i] = (float *) malloc2(nch - ncl + 1, sizeof (float)); - if (m[i] == NULL) - pm_error("Unable to allocate memory for a matrix row."); - m[i] -= ncl; + VAXSHORT( comlen, infile ); /* get comment length */ ++ overflow_add(comlen, 1); + evenlen = (comlen + 1) & ~1; /* make it even */ + if ( evenlen ) + { +--- netpbm-10.31/urt/rle_putcom.c.security 2005-10-07 18:01:42.000000000 +0200 ++++ netpbm-10.31/urt/rle_putcom.c 2005-12-30 10:44:51.000000000 +0100 +@@ -14,6 +14,8 @@ + * If you modify this software, you should include a notice giving the + * name of the person performing the modification, the date of modification, + * and the reason for such modification. ++ * ++ * 2002-12-19: Fix maths wrapping bugs. Alan Cox + */ + /* + * rle_putcom.c - Add a picture comment to the header struct. +@@ -98,12 +100,14 @@ rle_putcom(const char * const value, + const char * v; + const char ** old_comments; + int i; +- for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) ++ for (i = 2, cp = the_hdr->comments; *cp != NULL; ++i, ++cp) { ++ overflow_add(i, 1); + if (match(value, *cp) != NULL) { + v = *cp; + *cp = value; + return v; + } ++ } + /* Not found */ + /* Can't realloc because somebody else might be pointing to this + * comments block. Of course, if this were true, then the netpbm-10.27-bmptopnm.patch: bmptopnm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: netpbm-10.27-bmptopnm.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-3/netpbm-10.27-bmptopnm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netpbm-10.27-bmptopnm.patch 23 May 2005 11:15:50 -0000 1.1 +++ netpbm-10.27-bmptopnm.patch 4 Jan 2006 13:17:19 -0000 1.2 @@ -9,15 +9,6 @@ unsigned int pos; /* The following are all information from the BMP headers */ -@@ -1081,7 +1081,7 @@ main(int argc, char ** argv) { - parse_command_line(argc, argv, &cmdline); - - ifP = pm_openr(cmdline.input_filespec); -- if (strcmp(cmdline.input_filespec, "-")) -+ if (!strcmp(cmdline.input_filespec, "-")) - ifname = "Standard Input"; - else - ifname = cmdline.input_filespec; @@ -1106,7 +1106,7 @@ main(int argc, char ** argv) { writeRaster(BMPraster, cols, rows, outputType, cBitCount, pixelformat, colormap); netpbm-10.28-CAN-2005-2471.patch: pstopnm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: netpbm-10.28-CAN-2005-2471.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-3/netpbm-10.28-CAN-2005-2471.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netpbm-10.28-CAN-2005-2471.patch 9 Aug 2005 11:34:21 -0000 1.1 +++ netpbm-10.28-CAN-2005-2471.patch 4 Jan 2006 13:17:19 -0000 1.2 @@ -1,18 +1,15 @@ ---- netpbm-10.28/converter/other/pstopnm.c.CAN-2005-2471 2004-06-23 04:22:33.000000000 +0200 -+++ netpbm-10.28/converter/other/pstopnm.c 2005-08-09 08:41:42.000000000 +0200 -@@ -702,13 +702,13 @@ - - if (verbose) { - pm_message("execing '%s' with args '%s' (arg 0), " -- "'%s', '%s', '%s', '%s', '%s', '%s', '%s'", -+ "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'", +--- netpbm-10.29/converter/other/pstopnm.c.CAN-2005-2471 2005-08-15 02:39:46.000000000 +0200 ++++ netpbm-10.29/converter/other/pstopnm.c 2005-08-16 15:38:15.000000000 +0200 +@@ -711,11 +711,11 @@ + "'%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s'", ghostscriptProg, arg0, -- deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-"); -+ deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", "-dPARANOIDSAFER", "-"); + deviceopt, outfileopt, gopt, ropt, "-q", "-dNOPAUSE", +- "-dSAFER", "-"); ++ "-dPARANOIDSAFER", "-"); } execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, "-q", -- "-dNOPAUSE", "-", NULL); +- "-dNOPAUSE", "-dSAFER", "-", NULL); + "-dNOPAUSE", "-dPARANOIDSAFER", "-", NULL); pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)", netpbm-10.28-gcc4.patch: lib/pm.h | 1 + urt/rle.h | 1 + 2 files changed, 2 insertions(+) Index: netpbm-10.28-gcc4.patch =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-3/netpbm-10.28-gcc4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- netpbm-10.28-gcc4.patch 29 Jul 2005 08:46:27 -0000 1.1 +++ netpbm-10.28-gcc4.patch 4 Jan 2006 13:17:19 -0000 1.2 @@ -1,26 +1,5 @@ ---- netpbm-10.28/converter/ppm/ppmtowinicon.c.gcc4 2005-06-10 10:34:45.341676768 +0200 -+++ netpbm-10.28/converter/ppm/ppmtowinicon.c 2005-06-10 10:34:51.749702600 +0200 -@@ -745,7 +745,7 @@ addEntryToIcon(MS_Ico const MSIcon - * Perhaps I should use something that allocs a decent amount at start... - */ - MSIconData->entries = -- realloc2 (MSIconData->entries, MSIconData->count * sizeof(IC_Entry *)); -+ (IC_Entry*)realloc2 (MSIconData->entries, MSIconData->count * sizeof(IC_Entry *)); - MSIconData->entries[MSIconData->count-1] = entry; - } - ---- netpbm-10.28/buildtools/typegen.c.gcc4 2005-04-27 18:24:29.000000000 +0200 -+++ netpbm-10.28/buildtools/typegen.c 2005-06-10 10:34:51.749702600 +0200 -@@ -28,6 +28,7 @@ - We also include the multiple inclusion guard ifdef. - -----------------------------------------------------------------------------*/ - #include -+#include - #include - - ---- netpbm-10.28/lib/pm.h.gcc4 2005-06-10 10:34:45.399667952 +0200 -+++ netpbm-10.28/lib/pm.h 2005-06-10 10:34:51.750702448 +0200 +--- netpbm-10.30/lib/pm.h.gcc4 2005-10-21 12:19:56.000000000 +0200 ++++ netpbm-10.30/lib/pm.h 2005-10-21 12:20:03.000000000 +0200 @@ -18,6 +18,7 @@ #include #include @@ -29,37 +8,13 @@ #include #include #include ---- netpbm-10.28/urt/rle_getrow.c.gcc4 2005-06-10 10:34:45.401667648 +0200 -+++ netpbm-10.28/urt/rle_getrow.c 2005-06-10 10:34:51.751702296 +0200 -@@ -32,7 +32,8 @@ - * $Id$ - */ - --#include "stdio.h" -+#include -+#include - #include "rle.h" - #include "rle_code.h" - #include "vaxshort.h" ---- netpbm-10.28/urt/rle.h.gcc4 2005-06-10 10:34:45.402667496 +0200 -+++ netpbm-10.28/urt/rle.h 2005-06-10 10:34:51.752702144 +0200 +--- netpbm-10.30/urt/rle.h.gcc4 2005-10-21 12:19:56.000000000 +0200 ++++ netpbm-10.30/urt/rle.h 2005-10-21 12:21:31.000000000 +0200 @@ -36,6 +36,7 @@ - #include "rle_config.h" /* Configuration parameters. */ + #include "rle_config.h" /* Configuration parameters. */ - #include /* Declare FILE. */ + #include /* Declare FILE. */ +#include #ifdef c_plusplus #define USE_PROTOTYPES ---- netpbm-10.28/urt/Runput.c.gcc4 2005-06-10 10:34:45.400667800 +0200 -+++ netpbm-10.28/urt/Runput.c 2005-06-10 10:34:51.753701992 +0200 -@@ -92,7 +92,8 @@ - * follow the last byte in the run. - */ - --#include "stdio.h" -+#include -+#include - #include "rle_put.h" - #include "rle.h" - #include "rle_code.h" Index: netpbm.spec =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-3/netpbm.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- netpbm.spec 9 Aug 2005 11:34:21 -0000 1.30 +++ netpbm.spec 4 Jan 2006 13:17:19 -0000 1.31 @@ -1,26 +1,25 @@ Summary: A library for handling different graphics file formats. Name: netpbm -Version: 10.28 -Release: 1.FC3.2 +Version: 10.31 +Release: 1.FC3 License: freeware Group: System Environment/Libraries URL: http://netpbm.sourceforge.net/ Source0: netpbm-%{version}.tar.bz2 Source1: netpbmdoc-%{version}.tar.bz2 +Patch0: netpbm-10.28-legal.patch Patch1: netpbm-10.17-time.patch Patch2: netpbm-9.24-strip.patch -Patch3: netpbm-10.18-manpath.patch -Patch4: netpbm-10.19-message.patch -Patch5: netpbm-10.22-security2.patch -Patch6: netpbm-10.22-cmapsize.patch -Patch7: netpbm-10.23-security.patch -Patch9: netpbm-10.24-nodoc.patch -Patch10: netpbm-10.28-gcc4.patch -Patch12: netpbm-10.27-bmptopnm.patch -Patch13: netpbm-10.27-libpm.patch -Patch14: netpbm-10.27-pnmtojpeg.patch -Patch15: netpbm-10.28-pbmtolj.patch -Patch16: netpbm-10.28-CAN-2005-2471.patch +Patch3: netpbm-10.19-message.patch +Patch4: netpbm-10.22-security2.patch +Patch5: netpbm-10.22-cmapsize.patch +Patch6: netpbm-10.23-security.patch +Patch7: netpbm-10.24-nodoc.patch +Patch8: netpbm-10.28-gcc4.patch +Patch9: netpbm-10.27-bmptopnm.patch +Patch10: netpbm-10.28-CAN-2005-2471.patch +Patch11: netpbm-10.29-pnmtopng.patch +Patch12: netpbm-10.30-rgbtxt.patch Buildroot: %{_tmppath}/%{name}-root BuildPrereq: libjpeg-devel, libpng-devel, libtiff-devel, perl Obsoletes: libgr @@ -64,20 +63,19 @@ %prep %setup -q +%patch0 -p1 -b .legal %patch1 -p1 -b .time %patch2 -p1 -b .strip -%patch3 -p1 -b .manpath -%patch4 -p1 -b .message -%patch5 -p1 -b .security2 -%patch6 -p1 -b .cmapsize -%patch7 -p1 -b .security -%patch9 -p1 -b .nodoc -%patch10 -p1 -b .gcc4 -%patch12 -p1 -b .bmptopnm -%patch13 -p1 -b .libpm -%patch14 -p1 -b .pnmtojpeg -%patch15 -p1 -b .pbmtolj -%patch16 -p1 -b .CAN-2005-2471 +%patch3 -p1 -b .message +%patch4 -p1 -b .security2 +%patch5 -p1 -b .cmapsize +%patch6 -p1 -b .security +%patch7 -p1 -b .nodoc +%patch8 -p1 -b .gcc4 +%patch9 -p1 -b .bmptopnm +%patch10 -p1 -b .CAN-2005-2471 +%patch11 -p1 -b .pnmtopng +%patch12 -p1 -b .rgbtxt ##mv shhopt/shhopt.h shhopt/pbmshhopt.h ##perl -pi -e 's|shhopt.h|pbmshhopt.h|g' `find -name "*.c" -o -name "*.h"` ./GNUmakefile @@ -175,6 +173,15 @@ %{_mandir}/man5/* %changelog +* Wed Jan 04 2006 Jindrich Novy 10.31-1.FC3 +- update to 10.31 +- update security patch +- regenerate man pages +- drop manpath patch +- add .legal, .pnmtopng, .rgbtxt patches +- update .security, .security2, .bmptopnm, .CAN-2005-2471, .gcc4 patches +- new version fixes error in pnmnorm #176845 + * Tue Aug 09 2005 Jindrich Novy 10.28-1.FC3.2 - fix CAN-2005-2471, unsafe gs calls from pstopnm (#165355) Index: sources =================================================================== RCS file: /cvs/dist/rpms/netpbm/FC-3/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 29 Jul 2005 08:46:27 -0000 1.14 +++ sources 4 Jan 2006 13:17:19 -0000 1.15 @@ -1,2 +1,2 @@ -f1b766be9e0ba2470f762ee0717b834f netpbm-10.28.tar.bz2 -41f281d183afded0118f2fde2b8b79f1 netpbmdoc-10.28.tar.bz2 +34910af6b21f0de0142876455f27ad88 netpbm-10.31.tar.bz2 +0399e7b78da0291369004f9c19761075 netpbmdoc-10.31.tar.bz2 --- netpbm-10.18-manpath.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 4 13:49:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 08:49:29 -0500 Subject: rpms/subversion/devel subversion.spec,1.63,1.64 Message-ID: <200601041349.k04DnTjY014585@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/subversion/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14502 Modified Files: subversion.spec Log Message: - work around 1.3.0 fubar Index: subversion.spec =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- subversion.spec 4 Jan 2006 13:07:01 -0000 1.63 +++ subversion.spec 4 Jan 2006 13:49:27 -0000 1.64 @@ -119,6 +119,8 @@ --with-swig --with-neon=%{_prefix} \ --with-apxs=%{_sbindir}/apxs --disable-mod-activation \ --disable-static +# 1.3.0 tarball ships with generated swig sources +make extraclean-swig-headers swig-headers make %{?_smp_mflags} all make swig-pl swig-py %{swigdirs} %if %{with_java} From fedora-cvs-commits at redhat.com Wed Jan 4 14:07:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 09:07:31 -0500 Subject: rpms/subversion/devel subversion.spec,1.64,1.65 Message-ID: <200601041407.k04E7VYi020080@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/subversion/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19971 Modified Files: subversion.spec Log Message: - turn off java on s390 Index: subversion.spec =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- subversion.spec 4 Jan 2006 13:49:27 -0000 1.64 +++ subversion.spec 4 Jan 2006 14:07:28 -0000 1.65 @@ -1,7 +1,12 @@ # set to zero to avoid running test suite %define make_check 1 -# Java is supported on all platforms now + +%ifarch s390 +# weird gjnih error on s390 +%define with_java 0 +%else %define with_java 1 +%endif # set JDK path to build javahl; default for JPackage %define jdk_path /usr/lib/jvm/java-1.4.2-gcj From fedora-cvs-commits at redhat.com Wed Jan 4 14:35:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 09:35:41 -0500 Subject: rpms/pam_ccreds/devel pam_ccreds-3-chkpwd.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pam_ccreds.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <200601041435.k04EZf1C031556@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/pam_ccreds/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31544 Modified Files: .cvsignore pam_ccreds.spec sources Added Files: pam_ccreds-3-chkpwd.patch Log Message: * Wed Jan 4 2006 Tomas Mraz - 3-1 - new upstream version - added patch (slightly modified) by W. Michael Petullo to support operation from non-root accounts (#151914) pam_ccreds-3-chkpwd.patch: Makefile.am | 5 + README | 13 +- cc.h | 4 cc_lib.c | 79 +++++++++++++++++ cc_pam.c | 121 +++++++++++++++----------- cc_validate.c | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 433 insertions(+), 57 deletions(-) --- NEW FILE pam_ccreds-3-chkpwd.patch --- --- /dev/null 2006-01-04 08:54:02.552773000 +0100 +++ pam_ccreds-3/cc_validate.c 2006-01-04 15:22:31.000000000 +0100 @@ -0,0 +1,268 @@ +/* + * This program is designed to run setuid(root) or with sufficient + * privilege to read the cached password database. It is designed + * to provide a mechanism for the current user (defined by this + * process' uid) to verify their own password. + * + * The password is read from the standard input. The exit status of + * this program indicates whether the user is authenticated or not. + * + * Copyright information is located at the end of the file. + * + */ + +#ifdef MEMORY_DEBUG +# undef exit +# undef strdup +# undef free +#endif /* MEMORY_DEBUG */ + +#include +#include +#include +#include +#include + +#include "cc_private.h" + +#define MAXPASS 200 /* the maximum length of a password */ + +#define CCREDS_PASSED 0 +#define CCREDS_FAILED 1 + +/* syslogging function for errors and other information */ + +static void _log_err(int err, const char *format,...) +{ + va_list args; + + va_start(args, format); + openlog("ccreds_validate", LOG_CONS | LOG_PID, LOG_AUTH); + vsyslog(err, format, args); + va_end(args); + closelog(); +} + +static void su_sighandler(int sig) +{ +#ifndef SA_RESETHAND + /* emulate the behaviour of the SA_RESETHAND flag */ + if ( sig == SIGILL || sig == SIGTRAP || sig == SIGBUS || sig = SIGSERV ) + signal(sig, SIG_DFL); +#endif + if (sig > 0) { + _log_err(LOG_NOTICE, "caught signal %d.", sig); + exit(sig); + } +} + +static void setup_signals(void) +{ + struct sigaction action; /* posix signal structure */ + + /* + * Setup signal handlers + */ + (void) memset((void *) &action, 0, sizeof(action)); + action.sa_handler = su_sighandler; +#ifdef SA_RESETHAND + action.sa_flags = SA_RESETHAND; +#endif + (void) sigaction(SIGILL, &action, NULL); + (void) sigaction(SIGTRAP, &action, NULL); + (void) sigaction(SIGBUS, &action, NULL); + (void) sigaction(SIGSEGV, &action, NULL); + action.sa_handler = SIG_IGN; + action.sa_flags = 0; + (void) sigaction(SIGTERM, &action, NULL); + (void) sigaction(SIGHUP, &action, NULL); + (void) sigaction(SIGINT, &action, NULL); + (void) sigaction(SIGQUIT, &action, NULL); +} + +static int _ccreds_verify_password(const char *service, const char *name, + const char *p) +{ + int rc, retval = CCREDS_FAILED; + pam_cc_handle_t *pamcch; + + rc = pam_cc_start(service, name, NULL, CC_FLAGS_READ_ONLY, + &pamcch); + if (rc != PAM_SUCCESS) { + _log_err(LOG_DEBUG, "error initializing"); + retval = CCREDS_FAILED; + goto _return; + } + + rc = pam_cc_validate_credentials(pamcch, PAM_CC_TYPE_DEFAULT, p, + strlen(p)); + if (rc != PAM_SUCCESS) { + _log_err(LOG_DEBUG, "error reading cached credentials"); + retval = CCREDS_FAILED; + goto _return; + } + + retval = CCREDS_PASSED; + + pam_cc_end(&pamcch); + +_return: + return retval; +} + +static char *getuidname(uid_t uid) +{ + struct passwd *pw; + static char username[32]; + + pw = getpwuid(uid); + if (pw == NULL) + return NULL; + + strncpy(username, pw->pw_name, sizeof(username)); + username[sizeof(username) - 1] = '\0'; + + return username; +} + +int main(int argc, char *argv[]) +{ + char pass[MAXPASS + 1]; + int npass; + int force_failure = 0; + int retval = CCREDS_FAILED; + char *user; + char *user_arg; + char *service = NULL; + + /* + * Catch or ignore as many signal as possible. + */ + setup_signals(); + + /* + * we establish that this program is running with non-tty stdin. + * this is to discourage casual use. It does *NOT* prevent an + * intruder from repeatadly running this program to determine the + * password of the current user (brute force attack, but one for + * which the attacker must already have gained access to the user's + * account). + */ + + if (isatty(STDIN_FILENO)) { + + _log_err(LOG_NOTICE + ,"inappropriate use of ccreds helper binary [UID=%d,tty]" + ,getuid()); + fprintf(stderr + ,"This binary is not designed for running in this way\n" + "-- the system administrator has been informed\n"); + sleep(10); /* this should discourage/annoy the user */ + return CCREDS_FAILED; + } + + /* + * determine the current user's name is + */ + user = getuidname(getuid()); + + if (argc == 2) { + user_arg = argv[1]; + service = NULL; + } else if (argc == 3) { + user_arg = argv[1]; + service = argv[2]; + } else { + _log_err(LOG_NOTICE + ,"inappropriate use of ccreds helper binary [UID=%d,bad argv]" + ,getuid()); + fprintf(stderr + ,"This binary is not designed for running in this way\n" + "-- the system administrator has been informed\n"); + sleep(10); /* this should discourage/annoy the user */ + return CCREDS_FAILED; + } + + /* if the caller specifies the username, verify that user matches it */ + if (strcmp(user, user_arg)) { + force_failure = 1; + } + + /* read the password from stdin (a pipe from the pam_ccreds module) */ + + npass = read(STDIN_FILENO, pass, MAXPASS); + + + if (npass < 0) { /* is it a valid password? */ + + _log_err(LOG_DEBUG, "no password supplied"); + + } else if (npass >= MAXPASS) { + + _log_err(LOG_DEBUG, "password too long"); + + } else { + if (npass == 0) { + /* the password is blank */ + + retval = _ccreds_verify_password(service, user, ""); + } else { + /* does pass agree with the official one? */ + + pass[npass] = '\0'; /* NUL terminate */ + retval = _ccreds_verify_password(service, user, pass); + } + } + + memset(pass, '\0', MAXPASS); /* clear memory of the password */ + + /* return pass or fail */ + + if ((retval != CCREDS_PASSED) || force_failure) { + return CCREDS_FAILED; + } else { + return CCREDS_PASSED; + } +} + +/* + * This program is based on unix_chkpwd by Andrew G. Morgan. + * + * The modifications are Copyright (c) W. Michael Petullo, 2005. + * All rights reserved. + * + * See below for the original unix_chkpwd copyright notice. + * + * Copyright (c) Andrew G. Morgan, 1996. All rights reserved + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, and the entire permission notice in its entirety, + * including the disclaimer of warranties. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * ALTERNATIVELY, this product may be distributed under the terms of + * the GNU Public License, in which case the provisions of the GPL are + * required INSTEAD OF the above restrictions. (This clause is + * necessary due to a potential bad interaction between the GPL and + * the restrictions contained in a BSD-style copyright.) + * + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ --- pam_ccreds-3/Makefile.am.chkpwd 2005-10-29 03:21:50.000000000 +0200 +++ pam_ccreds-3/Makefile.am 2006-01-04 15:22:31.000000000 +0100 @@ -1,8 +1,10 @@ noinst_PROGRAMS = pam_ccreds.so cc_test cc_dump +sbin_PROGRAMS = ccreds_validate EXTRA_DIST = COPYING.LIB CVSVersionInfo.txt ChangeLog README \ ldap.conf pam.conf pam_ccreds.spec AM_CFLAGS = -fno-strict-aliasing +INCLUDES = -DCCREDS_VALIDATE="\"/sbin/ccreds_validate\"" pam_ccreds_so_SOURCES = cc_db.c cc_lib.c cc_pam.c cc.h pam_ccreds_so_LDFLAGS = @pam_ccreds_so_LDFLAGS@ @@ -13,6 +15,9 @@ cc_dump_SOURCES = cc_dump.c cc_dump_LDFLAGS = -Wl,-rpath -Wl,$(libdir)/security pam_ccreds.so -lpam -lpam_misc +ccreds_validate_SOURCES = cc_validate.c +ccreds_validate_LDFLAGS = -Wl,-rpath -Wl,$(libdir)/security pam_ccreds.so -lpam -lpam_misc + DEFS = @DEFS@ if USE_NATIVE_LINKER --- pam_ccreds-3/cc_pam.c.chkpwd 2005-10-29 03:21:50.000000000 +0200 +++ pam_ccreds-3/cc_pam.c 2006-01-04 15:22:31.000000000 +0100 @@ -131,10 +131,12 @@ const char *authtok; pam_cc_handle_t *pamcch; - rc = pam_cc_start_ex(pamh, ((sm_flags & SM_FLAGS_SERVICE_SPECIFIC) != 0), + if (! geteuid()) { + rc = pam_cc_start_ex(pamh, ((sm_flags & SM_FLAGS_SERVICE_SPECIFIC) != 0), ccredsfile, CC_FLAGS_READ_ONLY, &pamcch); - if (rc != PAM_SUCCESS) { - return rc; + if (rc != PAM_SUCCESS) { + return rc; + } } authtok = NULL; @@ -146,24 +148,18 @@ if (rc == PAM_SUCCESS) { if (authtok == NULL) authtok = ""; - - rc = pam_cc_validate_credentials(pamcch, PAM_CC_TYPE_DEFAULT, - authtok, strlen(authtok)); } if ((sm_flags & SM_FLAGS_USE_FIRST_PASS) || (rc == PAM_SUCCESS)) break; case 0: rc = _pam_sm_interact(pamh, flags, &authtok); if (rc != PAM_SUCCESS) { - pam_cc_end(&pamcch); - return rc; + break; } if (authtok == NULL) authtok = ""; - rc = pam_cc_validate_credentials(pamcch, PAM_CC_TYPE_DEFAULT, - authtok, strlen(authtok)); break; default: syslog(LOG_ERR, "pam_ccreds: internal error."); @@ -171,47 +167,63 @@ } if (rc == PAM_SUCCESS) { + if (! geteuid()) + rc = pam_cc_validate_credentials(pamcch, PAM_CC_TYPE_DEFAULT, + authtok, strlen(authtok)); + else + rc = pam_cc_run_helper_binary(pamh, CCREDS_VALIDATE, authtok, ((sm_flags & SM_FLAGS_SERVICE_SPECIFIC) != 0)); + } + + if (rc == PAM_SUCCESS) { _pam_sm_display_message(pamh, "You have been logged on using cached credentials.", PAM_TEXT_INFO, flags); } - pam_cc_end(&pamcch); + if (! geteuid()) + pam_cc_end(&pamcch); return rc; } static int _pam_sm_store_cached_credentials(pam_handle_t *pamh, - int flags, unsigned int sm_flags, - const char *ccredsfile) + int flags, unsigned int sm_flags, + const char *ccredsfile) { - int rc; - const char *authtok; - pam_cc_handle_t *pamcch; - - rc = pam_cc_start_ex(pamh, ((sm_flags & SM_FLAGS_SERVICE_SPECIFIC) != 0), - ccredsfile, 0, &pamcch); - if (rc != PAM_SUCCESS) { - return rc; - } - - authtok = NULL; - - rc = pam_get_item(pamh, PAM_AUTHTOK, (const void **)&authtok); - if (rc != PAM_SUCCESS) { - pam_cc_end(&pamcch); - return rc; + int rc; + const char *authtok; + pam_cc_handle_t *pamcch; + + if (! geteuid()) { + rc = pam_cc_start_ex(pamh, ((sm_flags & SM_FLAGS_SERVICE_SPECIFIC) != 0), + ccredsfile, 0, &pamcch); + if (rc != PAM_SUCCESS) { + return rc; + } } - if (authtok == NULL) - authtok = ""; + authtok = NULL; - rc = pam_cc_store_credentials(pamcch, PAM_CC_TYPE_DEFAULT, - authtok, strlen(authtok)); + rc = pam_get_item(pamh, PAM_AUTHTOK, (const void **)&authtok); + if (rc != PAM_SUCCESS) { + pam_cc_end(&pamcch); + return rc; + } + + if (authtok == NULL) + authtok = ""; + + if (! geteuid()) + rc = pam_cc_store_credentials(pamcch, PAM_CC_TYPE_DEFAULT, + authtok, strlen(authtok)); + else + /* Unable to perform when not root; just return success. */ + rc = PAM_SUCCESS; - pam_cc_end(&pamcch); + if (! geteuid()) + pam_cc_end(&pamcch); - return rc; + return rc; } static int _pam_sm_update_cached_credentials(pam_handle_t *pamh, @@ -222,27 +234,36 @@ const char *authtok; pam_cc_handle_t *pamcch; - rc = pam_cc_start_ex(pamh, ((sm_flags & SM_FLAGS_SERVICE_SPECIFIC) != 0), - ccredsfile, 0, &pamcch); - if (rc != PAM_SUCCESS) { - return rc; - } - authtok = NULL; + /* FIXME: the logic of this function is a little difficult. + * It may be wiser to provide an alternate implementation of the + * pam_cc_db_* interface. + */ + if (! geteuid()) { + rc = pam_cc_start_ex(pamh, ((sm_flags & SM_FLAGS_SERVICE_SPECIFIC) != 0), + ccredsfile, CC_FLAGS_READ_ONLY, &pamcch); + if (rc != PAM_SUCCESS) { + return rc; + } + } + rc = pam_get_item(pamh, PAM_AUTHTOK, (const void **)&authtok); - if (rc != PAM_SUCCESS) { - pam_cc_end(&pamcch); - return rc; - } + if (rc == PAM_SUCCESS) { - if (authtok == NULL) - authtok = ""; + if (authtok == NULL) + authtok = ""; - rc = pam_cc_delete_credentials(pamcch, PAM_CC_TYPE_DEFAULT, - authtok, strlen(authtok)); + if (! geteuid()) + rc = pam_cc_delete_credentials(pamcch, PAM_CC_TYPE_DEFAULT, + authtok, strlen(authtok)); + else + /* Unable to perform when not root; just return success. */ + rc = PAM_SUCCESS; + } - pam_cc_end(&pamcch); + if (! geteuid()) + pam_cc_end(&pamcch); return rc; } --- pam_ccreds-3/README.chkpwd 2005-10-29 03:21:50.000000000 +0200 +++ pam_ccreds-3/README 2006-01-04 15:27:51.000000000 +0100 @@ -35,14 +35,13 @@ These are configured by the "action=" module option. The following module options are also recognized: - use_first_pass do not prompt for the password if - the existing PAM authentication - token does not validate - - try_first_pass prompt for the password if the - existing PAM authentication token - does not validate + use_first_pass use an existing PAM authentication + token if there is any, fail otherwise + try_first_pass use an existing PAM authentication + token if there is any, prompt for + the password otherwise + service_specific only check cached credentials for this specific service --- pam_ccreds-3/cc_lib.c.chkpwd 2005-10-29 03:21:50.000000000 +0200 +++ pam_ccreds-3/cc_lib.c 2006-01-04 15:22:31.000000000 +0100 @@ -15,6 +15,10 @@ #include #include #include +#include +#include +#include +#include #include @@ -597,3 +601,78 @@ return rc; } +int pam_cc_run_helper_binary(pam_handle_t *pamh, const char *helper, + const char *passwd, int service_specific) +{ + int retval, child, fds[2], rc; + void (*sighandler)(int) = NULL; + const void *service, *user; + + rc = pam_get_item(pamh, PAM_USER, &user); + if (rc != PAM_SUCCESS) { + syslog(LOG_WARNING, "pam_ccreds: failed to lookup user"); + return PAM_AUTH_ERR; + } + + if (service_specific) { + rc = pam_get_item(pamh, PAM_SERVICE, &service); + if (rc != PAM_SUCCESS) { + syslog(LOG_WARNING, "pam_ccreds: failed to lookup service"); + return PAM_AUTH_ERR; + } + } else + service = NULL; + + /* create a pipe for the password */ + if (pipe(fds) != 0) { + syslog(LOG_WARNING, "pam_ccreds: failed to create pipe"); + return PAM_AUTH_ERR; + } + + sighandler = signal(SIGCHLD, SIG_DFL); + + /* fork */ + child = fork(); + if (child == 0) { + static char *envp[] = { NULL }; + char *args[] = { NULL, NULL, NULL, NULL }; + + /* XXX - should really tidy up PAM here too */ + + /* reopen stdin as pipe */ + close(fds[1]); + dup2(fds[0], STDIN_FILENO); + + /* exec binary helper */ + args[0] = x_strdup(helper); + args[1] = x_strdup(user); + if (service) + args[2] = x_strdup(service); + + execve(helper, args, envp); + + /* should not get here: exit with error */ + syslog(LOG_WARNING, "pam_ccreds: helper binary is not available"); + exit(PAM_AUTHINFO_UNAVAIL); + } else if (child > 0) { + if (passwd != NULL) { /* send the password to the child */ + write(fds[1], passwd, strlen(passwd)+1); + passwd = NULL; + } else { + write(fds[1], "", 1); /* blank password */ + } + close(fds[0]); /* close here to avoid possible SIGPIPE above */ + close(fds[1]); + (void) waitpid(child, &retval, 0); /* wait for helper to complete */ + retval = (retval == 0) ? PAM_SUCCESS:PAM_AUTH_ERR; + } else { + syslog(LOG_WARNING, "pam_ccreds: fork failed"); + retval = PAM_AUTH_ERR; + } + + if (sighandler != NULL) { + (void) signal(SIGCHLD, sighandler); /* restore old signal handler */ + } + + return retval; +} --- pam_ccreds-3/cc.h.chkpwd 2005-10-29 03:21:50.000000000 +0200 +++ pam_ccreds-3/cc.h 2006-01-04 15:22:31.000000000 +0100 @@ -89,5 +89,9 @@ /* Dump contents - for debugging only */ int pam_cc_dump(pam_cc_handle_t *pamcch, FILE *fp); +/* Execute ccreds_* */ +int pam_cc_run_helper_binary(pam_handle_t *pamh, const char *helper, + const char *passwd, int service_specific); + #endif /* _PAM_CC_H_ */ Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pam_ccreds/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Sep 2004 09:46:13 -0000 1.2 +++ .cvsignore 4 Jan 2006 14:35:38 -0000 1.3 @@ -1 +1 @@ -pam_ccreds-1.tgz +pam_ccreds-3.tar.gz Index: pam_ccreds.spec =================================================================== RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pam_ccreds.spec 9 Dec 2005 22:42:37 -0000 1.9 +++ pam_ccreds.spec 4 Jan 2006 14:35:38 -0000 1.10 @@ -1,18 +1,16 @@ Summary: Pam module to cache login credentials Name: pam_ccreds -Version: 1 -Release: 8.1 +Version: 3 +Release: 1 License: GPL Group: System Environment/Base -Source0: %{name}-%{version}.tgz -# automake16 is needed because the tarball is broken (too old `missing' -# and aclocal.m4 older than configure.in) -BuildPrereq: automake16 db4-devel openssl-devel pam-devel +Source0: %{name}-%{version}.tar.gz +Patch1: pam_ccreds-3-chkpwd.patch + +BuildPrereq: automake db4-devel openssl-devel pam-devel Requires: db4 pam BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -%define docdir /usr/share/doc/%{name}-%{version}-%{release} - %description The pam_ccreds module provides a mechanism for caching credentials when authenticating against a network @@ -24,6 +22,8 @@ %prep %setup -q +%patch1 -p1 -b .chkpwd +autoreconf %build %configure --libdir=/%{_lib} @@ -40,8 +40,14 @@ %defattr(-,root,root,-) %doc AUTHORS README /%{_lib}/security/pam_ccreds.so +%attr(4755,root,root) %{_sbindir}/ccreds_validate %changelog +* Wed Jan 4 2006 Tomas Mraz - 3-1 +- new upstream version +- added patch (slightly modified) by W. Michael Petullo to support + operation from non-root accounts (#151914) + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/pam_ccreds/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Sep 2004 09:46:13 -0000 1.2 +++ sources 4 Jan 2006 14:35:38 -0000 1.3 @@ -1 +1 @@ -b076ff354f92e4a9d2d0fd549a2fcef7 pam_ccreds-1.tgz +0b05fb24c2b4897d6f0431b99ebecd04 pam_ccreds-3.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 4 14:36:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 09:36:25 -0500 Subject: rpms/gnome-applets/devel gnome-applets.spec,1.97,1.98 Message-ID: <200601041436.k04EaPOE031631@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31616 Modified Files: gnome-applets.spec Log Message: Rebuild Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- gnome-applets.spec 16 Dec 2005 15:46:48 -0000 1.97 +++ gnome-applets.spec 4 Jan 2006 14:36:23 -0000 1.98 @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.13.1 -Release: 2 +Release: 3 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -169,6 +169,9 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Wed Jan 04 2006 Matthias Clasen 2.13.1-3 +- Rebuild against new libgtop + * Fri Dec 16 2005 Matthias Clasen 2.13.1-2 - Rebuild against new libgtop From fedora-cvs-commits at redhat.com Wed Jan 4 14:45:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 09:45:03 -0500 Subject: rpms/libsetrans/devel .cvsignore, 1.15, 1.16 libsetrans.spec, 1.23, 1.24 sources, 1.19, 1.20 Message-ID: <200601041445.k04Ej3Mm031785@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsetrans/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31770 Modified Files: .cvsignore libsetrans.spec sources Log Message: * Wed Jan 4 2006 Dan Walsh 0.1.15-1 - Eliminate a couple of checks after strdupa, fix return on all paths Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 3 Jan 2006 16:45:45 -0000 1.15 +++ .cvsignore 4 Jan 2006 14:45:01 -0000 1.16 @@ -13,3 +13,4 @@ libsetrans-0.1.12.tgz libsetrans-0.1.13.tgz libsetrans-0.1.14.tgz +libsetrans-0.1.15.tgz Index: libsetrans.spec =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/libsetrans.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- libsetrans.spec 3 Jan 2006 16:45:45 -0000 1.23 +++ libsetrans.spec 4 Jan 2006 14:45:01 -0000 1.24 @@ -1,6 +1,6 @@ Summary: SELinux Translation library Name: libsetrans -Version: 0.1.14 +Version: 0.1.15 Release: 1 License: LGPL Group: System Environment/Libraries @@ -51,7 +51,10 @@ %{_mandir}/man8/mcs.8.gz %changelog -* Mon Jan 3 2006 Dan Walsh 0.1.14-1 +* Wed Jan 4 2006 Dan Walsh 0.1.15-1 +- Eliminate a couple of checks after strdupa, fix return on all paths + +* Tue Jan 3 2006 Dan Walsh 0.1.14-1 - Fix untranslate of ""->s0 * Mon Jan 2 2006 Dan Walsh 0.1.13-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 3 Jan 2006 16:45:45 -0000 1.19 +++ sources 4 Jan 2006 14:45:01 -0000 1.20 @@ -1 +1 @@ -8b5437ee1240be4d0727d630aff1e15b libsetrans-0.1.14.tgz +1a02900ecc31a4c8d1ecb0b34fa5897a libsetrans-0.1.15.tgz From fedora-cvs-commits at redhat.com Wed Jan 4 14:54:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 09:54:48 -0500 Subject: rpms/cups/devel cups-CVE-2005-3625, 6, 7.patch, NONE, 1.1 cups.spec, 1.126, 1.127 Message-ID: <200601041454.k04EsmkQ018907@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18869 Modified Files: cups.spec Added Files: cups-CVE-2005-3625,6,7.patch Log Message: * Wed Jan 4 2006 Tim Waugh - Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627 (bug #176868). ***** Not enough context to create diffstat for file: cups-CVE-2005-3625,6,7.patch,NONE,1.1 ***** Not enough context to create diff for file: cups-CVE-2005-3625,6,7.patch,NONE,1.1 Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- cups.spec 19 Dec 2005 17:31:48 -0000 1.126 +++ cups.spec 4 Jan 2006 14:54:45 -0000 1.127 @@ -56,7 +56,8 @@ Patch39: cups-str1301.patch Patch40: cups-link.patch Patch41: cups-relro.patch -Patch42: cups-dbus.patch +Patch42: cups-CVE-2005-3625,6,7.patch +Patch43: cups-dbus.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -161,8 +162,9 @@ %patch39 -p1 -b .str1301 %patch40 -p1 -b .link %patch41 -p1 -b .relro +%patch42 -p1 -b .CVE-2005-3625,6,7 %if %use_dbus -%patch42 -p1 -b .dbus +%patch43 -p1 -b .dbus %endif perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in aclocal -I config-scripts @@ -427,6 +429,10 @@ %{_libdir}/cups/daemon/cups-lpd %changelog +* Wed Jan 4 2006 Tim Waugh +- Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627 + (bug #176868). + * Mon Dec 19 2005 Tim Waugh 1:1.1.23-27 - Link pdftops with -z relro. From fedora-cvs-commits at redhat.com Wed Jan 4 14:55:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 09:55:21 -0500 Subject: rpms/cups/devel cups.spec,1.127,1.128 Message-ID: <200601041455.k04EtLjT019183@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19148 Modified Files: cups.spec Log Message: 1:1.1.23-28 Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- cups.spec 4 Jan 2006 14:54:45 -0000 1.127 +++ cups.spec 4 Jan 2006 14:55:18 -0000 1.128 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.23 -Release: 27 +Release: 28 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2 @@ -429,7 +429,7 @@ %{_libdir}/cups/daemon/cups-lpd %changelog -* Wed Jan 4 2006 Tim Waugh +* Wed Jan 4 2006 Tim Waugh 1:1.1.23-28 - Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627 (bug #176868). From fedora-cvs-commits at redhat.com Wed Jan 4 15:05:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 10:05:37 -0500 Subject: rpms/subversion/devel subversion.spec,1.65,1.66 Message-ID: <200601041505.k04F5bYL021905@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/subversion/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21848 Modified Files: subversion.spec Log Message: - book no longer bundled Index: subversion.spec =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- subversion.spec 4 Jan 2006 14:07:28 -0000 1.65 +++ subversion.spec 4 Jan 2006 15:05:24 -0000 1.66 @@ -29,7 +29,7 @@ Patch6: subversion-1.0.3-pie.patch Patch7: subversion-1.1.3-java.patch BuildRequires: autoconf, libtool, python, python-devel, texinfo, which -BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24, docbook-style-xsl +BuildRequires: db4-devel >= 4.1.25, swig >= 1.3.24 BuildRequires: apr-devel >= 0.9.6-1, apr-util-devel >= 0.9.5-1 BuildRequires: neon-devel >= 0:0.24.7-1 BuildRoot: %{_tmppath}/%{name}-root @@ -202,7 +202,6 @@ %defattr(-,root,root) %doc BUGS COMMITTERS COPYING HACKING INSTALL README CHANGES %doc tools subversion/LICENSE mod_authz_svn-INSTALL -%doc doc/book/svn-book.html %doc contrib/client-side/svn_load_dirs{.pl,_*,.README} %{_bindir}/* %{_libdir}/libsvn_*.so.* From fedora-cvs-commits at redhat.com Wed Jan 4 15:28:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 10:28:46 -0500 Subject: rpms/pam_ccreds/devel pam_ccreds-3-chkpwd.patch, 1.1, 1.2 pam_ccreds.spec, 1.10, 1.11 Message-ID: <200601041528.k04FSk4w010903@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/pam_ccreds/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10864 Modified Files: pam_ccreds-3-chkpwd.patch pam_ccreds.spec Log Message: * Wed Jan 4 2006 Tomas Mraz - 3-2 - the path to ccreds_validate helper was wrong pam_ccreds-3-chkpwd.patch: Makefile.am | 5 + README | 13 +- cc.h | 4 cc_lib.c | 79 +++++++++++++++++ cc_pam.c | 121 +++++++++++++++----------- cc_validate.c | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 433 insertions(+), 57 deletions(-) Index: pam_ccreds-3-chkpwd.patch =================================================================== RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds-3-chkpwd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pam_ccreds-3-chkpwd.patch 4 Jan 2006 14:35:38 -0000 1.1 +++ pam_ccreds-3-chkpwd.patch 4 Jan 2006 15:28:43 -0000 1.2 @@ -278,7 +278,7 @@ ldap.conf pam.conf pam_ccreds.spec AM_CFLAGS = -fno-strict-aliasing -+INCLUDES = -DCCREDS_VALIDATE="\"/sbin/ccreds_validate\"" ++INCLUDES = -DCCREDS_VALIDATE="\"$(sbindir)/ccreds_validate\"" pam_ccreds_so_SOURCES = cc_db.c cc_lib.c cc_pam.c cc.h pam_ccreds_so_LDFLAGS = @pam_ccreds_so_LDFLAGS@ Index: pam_ccreds.spec =================================================================== RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- pam_ccreds.spec 4 Jan 2006 14:35:38 -0000 1.10 +++ pam_ccreds.spec 4 Jan 2006 15:28:43 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Pam module to cache login credentials Name: pam_ccreds Version: 3 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source0: %{name}-%{version}.tar.gz @@ -43,6 +43,9 @@ %attr(4755,root,root) %{_sbindir}/ccreds_validate %changelog +* Wed Jan 4 2006 Tomas Mraz - 3-2 +- the path to ccreds_validate helper was wrong + * Wed Jan 4 2006 Tomas Mraz - 3-1 - new upstream version - added patch (slightly modified) by W. Michael Petullo to support From fedora-cvs-commits at redhat.com Wed Jan 4 15:41:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 10:41:02 -0500 Subject: rpms/libselinux/devel .cvsignore, 1.96, 1.97 libselinux.spec, 1.171, 1.172 sources, 1.98, 1.99 Message-ID: <200601041541.k04Ff2nI014707@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14667 Modified Files: .cvsignore libselinux.spec sources Log Message: * Wed Jan 4 2006 Dan Walsh 1.29.3-1 - Upgrade to latest from NSA * Merged several fixes and improvements from Ulrich Drepper (Red Hat), including: - corrected use of getline - further calls to __fsetlocking for local files - use of strdupa and asprintf - proper handling of dirent in booleans code - use of -z relro - several other optimizations * Merged getpidcon python wrapper from Dan Walsh (Red Hat). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- .cvsignore 14 Dec 2005 19:19:29 -0000 1.96 +++ .cvsignore 4 Jan 2006 15:40:59 -0000 1.97 @@ -70,3 +70,4 @@ libselinux-1.28.tgz libselinux-1.29.1.tgz libselinux-1.29.2.tgz +libselinux-1.29.3.tgz Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- libselinux.spec 24 Dec 2005 13:03:59 -0000 1.171 +++ libselinux.spec 4 Jan 2006 15:40:59 -0000 1.172 @@ -2,12 +2,12 @@ %define libsetransver 0.1.11-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 1.29.2 -Release: 4 +Version: 1.29.3 +Release: 1 License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz -Patch: libselinux-rhat.patch +#Patch: libselinux-rhat.patch BuildRequires: libsepol-devel >= %{libsepolver} Requires: libsepol >= %{libsepolver} @@ -50,7 +50,7 @@ %prep %setup -q -%patch -p1 -b .rhat +#%patch -p1 -b .rhat %build make clean @@ -110,6 +110,18 @@ %{_libdir}/python2.4/site-packages/selinux.py* %changelog +* Wed Jan 4 2006 Dan Walsh 1.29.3-1 +- Upgrade to latest from NSA + * Merged several fixes and improvements from Ulrich Drepper + (Red Hat), including: + - corrected use of getline + - further calls to __fsetlocking for local files + - use of strdupa and asprintf + - proper handling of dirent in booleans code + - use of -z relro + - several other optimizations + * Merged getpidcon python wrapper from Dan Walsh (Red Hat). + * Sat Dec 24 2005 Dan Walsh 1.29.2-4 - Add build requires line for libsepol-devel Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/sources,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- sources 14 Dec 2005 19:19:29 -0000 1.98 +++ sources 4 Jan 2006 15:40:59 -0000 1.99 @@ -1 +1 @@ -51e725936d4887965207ffa48d137271 libselinux-1.29.2.tgz +f65f31e4fd2edb0cf4070f44b1afe633 libselinux-1.29.3.tgz From fedora-cvs-commits at redhat.com Wed Jan 4 16:14:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 11:14:17 -0500 Subject: rpms/libaio/devel .cvsignore, 1.12, 1.13 libaio.spec, 1.17, 1.18 sources, 1.12, 1.13 Message-ID: <200601041614.k04GEHNg005990@cvs.devel.redhat.com> Author: jmoyer Update of /cvs/dist/rpms/libaio/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5928 Modified Files: .cvsignore libaio.spec sources Log Message: - Update to the latest sources, which contain the following change: Add a .proc directive for the ia64_aio_raw_syscall macro. This sounds a lot like the previous entry, but that one fixed the __ia64_raw_syscall macro, located in syscall-ia64.h. This macro is in raw_syscall.c, which pretty much only exists for ia64. This bug prevented the package from building with newer version of gcc. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libaio/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 1 Apr 2005 22:40:05 -0000 1.12 +++ .cvsignore 4 Jan 2006 16:14:14 -0000 1.13 @@ -1 +1 @@ -libaio-0.3.104.tar.gz +libaio-0.3.106.tar.gz Index: libaio.spec =================================================================== RCS file: /cvs/dist/rpms/libaio/devel/libaio.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libaio.spec 9 Dec 2005 22:41:29 -0000 1.17 +++ libaio.spec 4 Jan 2006 16:14:14 -0000 1.18 @@ -1,6 +1,6 @@ Name: libaio -Version: 0.3.104 -Release: 2.1 +Version: 0.3.106 +Release: 2 Summary: Linux-native asynchronous I/O access library License: LGPL Group: System Environment/Libraries @@ -70,6 +70,14 @@ %attr(0644,root,root) %{_libdir}/libaio.a %changelog +* Wed Jan 04 2006 Jeff Moyer - 0.3.106-2 +- Update to the latest sources, which contain the following change: + Add a .proc directive for the ia64_aio_raw_syscall macro. This sounds a lot + like the previous entry, but that one fixed the __ia64_raw_syscall macro, + located in syscall-ia64.h. This macro is in raw_syscall.c, which pretty much + only exists for ia64. This bug prevented the package from building with + newer version of gcc. + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/libaio/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 1 Apr 2005 22:40:05 -0000 1.12 +++ sources 4 Jan 2006 16:14:14 -0000 1.13 @@ -1 +1 @@ -2a4a17ed8f95d08b52cc72a41a6f5c60 libaio-0.3.104.tar.gz +9480e31cce6506091080d59211089bd4 libaio-0.3.106.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 4 16:50:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 11:50:45 -0500 Subject: rpms/apr/devel apr-1.2.2-random.patch,NONE,1.1 apr.spec,1.45,1.46 Message-ID: <200601041650.k04Goj5s026233@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/apr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26218 Modified Files: apr.spec Added Files: apr-1.2.2-random.patch Log Message: * Wed Jan 4 2006 Joe Orton 1.2.2-7 - fix namespace pollution (r354824, r355464) apr-1.2.2-random.patch: sha2.c | 92 ++++++++++++++++++++++++++++++------------------------------ sha2.h | 30 +++++++++---------- sha2_glue.c | 6 +-- 3 files changed, 64 insertions(+), 64 deletions(-) --- NEW FILE apr-1.2.2-random.patch --- --- apr-1.2.2/random/unix/sha2.h.random +++ apr-1.2.2/random/unix/sha2.h @@ -57,25 +57,25 @@ /*** SHA-256/384/512 Function Prototypes ******************************/ -void SHA256_Init(SHA256_CTX *); -void SHA256_Update(SHA256_CTX *, const apr_byte_t *, size_t); -void SHA256_Final(apr_byte_t [SHA256_DIGEST_LENGTH], SHA256_CTX *); -char* SHA256_End(SHA256_CTX *, char [SHA256_DIGEST_STRING_LENGTH]); -char* SHA256_Data(const apr_byte_t *, size_t, +void apr__SHA256_Init(SHA256_CTX *); +void apr__SHA256_Update(SHA256_CTX *, const apr_byte_t *, size_t); +void apr__SHA256_Final(apr_byte_t [SHA256_DIGEST_LENGTH], SHA256_CTX *); +char* apr__SHA256_End(SHA256_CTX *, char [SHA256_DIGEST_STRING_LENGTH]); +char* apr__SHA256_Data(const apr_byte_t *, size_t, char [SHA256_DIGEST_STRING_LENGTH]); -void SHA384_Init(SHA384_CTX *); -void SHA384_Update(SHA384_CTX *, const apr_byte_t *, size_t); -void SHA384_Final(apr_byte_t [SHA384_DIGEST_LENGTH], SHA384_CTX *); -char* SHA384_End(SHA384_CTX *, char [SHA384_DIGEST_STRING_LENGTH]); -char* SHA384_Data(const apr_byte_t *, size_t, +void apr__SHA384_Init(SHA384_CTX *); +void apr__SHA384_Update(SHA384_CTX *, const apr_byte_t *, size_t); +void apr__SHA384_Final(apr_byte_t [SHA384_DIGEST_LENGTH], SHA384_CTX *); +char* apr__SHA384_End(SHA384_CTX *, char [SHA384_DIGEST_STRING_LENGTH]); +char* apr__SHA384_Data(const apr_byte_t *, size_t, char [SHA384_DIGEST_STRING_LENGTH]); -void SHA512_Init(SHA512_CTX *); -void SHA512_Update(SHA512_CTX *, const apr_byte_t *, size_t); -void SHA512_Final(apr_byte_t [SHA512_DIGEST_LENGTH], SHA512_CTX *); -char* SHA512_End(SHA512_CTX *, char [SHA512_DIGEST_STRING_LENGTH]); -char* SHA512_Data(const apr_byte_t *, size_t, +void apr__SHA512_Init(SHA512_CTX *); +void apr__SHA512_Update(SHA512_CTX *, const apr_byte_t *, size_t); +void apr__SHA512_Final(apr_byte_t [SHA512_DIGEST_LENGTH], SHA512_CTX *); +char* apr__SHA512_End(SHA512_CTX *, char [SHA512_DIGEST_STRING_LENGTH]); +char* apr__SHA512_Data(const apr_byte_t *, size_t, char [SHA512_DIGEST_STRING_LENGTH]); #ifdef __cplusplus --- apr-1.2.2/random/unix/sha2_glue.c.random +++ apr-1.2.2/random/unix/sha2_glue.c @@ -5,18 +5,18 @@ static void sha256_init(apr_crypto_hash_t *h) { - SHA256_Init(h->data); + apr__SHA256_Init(h->data); } static void sha256_add(apr_crypto_hash_t *h,const void *data, apr_size_t bytes) { - SHA256_Update(h->data,data,bytes); + apr__SHA256_Update(h->data,data,bytes); } static void sha256_finish(apr_crypto_hash_t *h,unsigned char *result) { - SHA256_Final(result,h->data); + apr__SHA256_Final(result,h->data); } APR_DECLARE(apr_crypto_hash_t *) apr_crypto_sha256_new(apr_pool_t *p) --- apr-1.2.2/random/unix/sha2.c.random +++ apr-1.2.2/random/unix/sha2.c @@ -150,9 +150,9 @@ * library -- they are intended for private internal visibility/use * only. */ -void SHA512_Last(SHA512_CTX*); -void SHA256_Transform(SHA256_CTX*, const sha2_word32*); -void SHA512_Transform(SHA512_CTX*, const sha2_word64*); +void apr__SHA512_Last(SHA512_CTX*); +void apr__SHA256_Transform(SHA256_CTX*, const sha2_word32*); +void apr__SHA512_Transform(SHA512_CTX*, const sha2_word64*); /*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/ @@ -264,7 +264,7 @@ /*** SHA-256: *********************************************************/ -void SHA256_Init(SHA256_CTX* context) { +void apr__SHA256_Init(SHA256_CTX* context) { if (context == (SHA256_CTX*)0) { return; } @@ -310,7 +310,7 @@ (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \ j++ -void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { +void apr__SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { sha2_word32 a, b, c, d, e, f, g, h, s0, s1; sha2_word32 T1, *W256; int j; @@ -368,7 +368,7 @@ #else /* SHA2_UNROLL_TRANSFORM */ -void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { +void apr__SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { sha2_word32 a, b, c, d, e, f, g, h, s0, s1; sha2_word32 T1, T2, *W256; int j; @@ -448,7 +448,7 @@ #endif /* SHA2_UNROLL_TRANSFORM */ -void SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) { +void apr__SHA256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) { unsigned int freespace, usedspace; if (len == 0) { @@ -471,7 +471,7 @@ context->bitcount += freespace << 3; len -= freespace; data += freespace; - SHA256_Transform(context, (sha2_word32*)context->buffer); + apr__SHA256_Transform(context, (sha2_word32*)context->buffer); } else { /* The buffer is not yet full */ MEMCPY_BCOPY(&context->buffer[usedspace], data, len); @@ -483,7 +483,7 @@ } while (len >= SHA256_BLOCK_LENGTH) { /* Process as many complete blocks as we can */ - SHA256_Transform(context, (sha2_word32*)data); + apr__SHA256_Transform(context, (sha2_word32*)data); context->bitcount += SHA256_BLOCK_LENGTH << 3; len -= SHA256_BLOCK_LENGTH; data += SHA256_BLOCK_LENGTH; @@ -497,7 +497,7 @@ usedspace = freespace = 0; } -void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { +void apr__SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { sha2_word32 *d = (sha2_word32*)digest; unsigned int usedspace; @@ -524,7 +524,7 @@ MEMSET_BZERO(&context->buffer[usedspace], SHA256_BLOCK_LENGTH - usedspace); } /* Do second-to-last transform: */ - SHA256_Transform(context, (sha2_word32*)context->buffer); + apr__SHA256_Transform(context, (sha2_word32*)context->buffer); /* And set-up for the last transform: */ MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH); @@ -540,7 +540,7 @@ *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount; /* Final transform: */ - SHA256_Transform(context, (sha2_word32*)context->buffer); + apr__SHA256_Transform(context, (sha2_word32*)context->buffer); #if !APR_IS_BIGENDIAN { @@ -561,7 +561,7 @@ usedspace = 0; } -char *SHA256_End(SHA256_CTX* context, char buffer[]) { +char *apr__SHA256_End(SHA256_CTX* context, char buffer[]) { sha2_byte digest[SHA256_DIGEST_LENGTH], *d = digest; int i; @@ -569,7 +569,7 @@ assert(context != (SHA256_CTX*)0); if (buffer != (char*)0) { - SHA256_Final(digest, context); + apr__SHA256_Final(digest, context); for (i = 0; i < SHA256_DIGEST_LENGTH; i++) { *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4]; @@ -584,17 +584,17 @@ return buffer; } -char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) { +char* apr__SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) { SHA256_CTX context; - SHA256_Init(&context); - SHA256_Update(&context, data, len); - return SHA256_End(&context, digest); + apr__SHA256_Init(&context); + apr__SHA256_Update(&context, data, len); + return apr__SHA256_End(&context, digest); } /*** SHA-512: *********************************************************/ -void SHA512_Init(SHA512_CTX* context) { +void apr__SHA512_Init(SHA512_CTX* context) { if (context == (SHA512_CTX*)0) { return; } @@ -639,7 +639,7 @@ (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \ j++ -void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { +void apr__SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { sha2_word64 a, b, c, d, e, f, g, h, s0, s1; sha2_word64 T1, *W512 = (sha2_word64*)context->buffer; int j; @@ -694,7 +694,7 @@ #else /* SHA2_UNROLL_TRANSFORM */ -void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { +void apr__SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { sha2_word64 a, b, c, d, e, f, g, h, s0, s1; sha2_word64 T1, T2, *W512 = (sha2_word64*)context->buffer; int j; @@ -772,7 +772,7 @@ #endif /* SHA2_UNROLL_TRANSFORM */ -void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) { +void apr__SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) { unsigned int freespace, usedspace; if (len == 0) { @@ -795,7 +795,7 @@ ADDINC128(context->bitcount, freespace << 3); len -= freespace; data += freespace; - SHA512_Transform(context, (sha2_word64*)context->buffer); + apr__SHA512_Transform(context, (sha2_word64*)context->buffer); } else { /* The buffer is not yet full */ MEMCPY_BCOPY(&context->buffer[usedspace], data, len); @@ -807,7 +807,7 @@ } while (len >= SHA512_BLOCK_LENGTH) { /* Process as many complete blocks as we can */ - SHA512_Transform(context, (sha2_word64*)data); + apr__SHA512_Transform(context, (sha2_word64*)data); ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3); len -= SHA512_BLOCK_LENGTH; data += SHA512_BLOCK_LENGTH; @@ -821,7 +821,7 @@ usedspace = freespace = 0; } -void SHA512_Last(SHA512_CTX* context) { +void apr__SHA512_Last(SHA512_CTX* context) { unsigned int usedspace; usedspace = (unsigned int)((context->bitcount[0] >> 3) @@ -843,7 +843,7 @@ MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace); } /* Do second-to-last transform: */ - SHA512_Transform(context, (sha2_word64*)context->buffer); + apr__SHA512_Transform(context, (sha2_word64*)context->buffer); /* And set-up for the last transform: */ MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2); @@ -860,10 +860,10 @@ *(sha2_word64*)&context->buffer[SHA512_SHORT_BLOCK_LENGTH+8] = context->bitcount[0]; /* Final transform: */ - SHA512_Transform(context, (sha2_word64*)context->buffer); + apr__SHA512_Transform(context, (sha2_word64*)context->buffer); } -void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { +void apr__SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { sha2_word64 *d = (sha2_word64*)digest; /* Sanity check: */ @@ -871,7 +871,7 @@ /* If no digest buffer is passed, we don't bother doing this: */ if (digest != (sha2_byte*)0) { - SHA512_Last(context); + apr__SHA512_Last(context); /* Save the hash data for output: */ #if !APR_IS_BIGENDIAN @@ -892,7 +892,7 @@ MEMSET_BZERO(context, sizeof(context)); } -char *SHA512_End(SHA512_CTX* context, char buffer[]) { +char *apr__SHA512_End(SHA512_CTX* context, char buffer[]) { sha2_byte digest[SHA512_DIGEST_LENGTH], *d = digest; int i; @@ -900,7 +900,7 @@ assert(context != (SHA512_CTX*)0); if (buffer != (char*)0) { - SHA512_Final(digest, context); + apr__SHA512_Final(digest, context); for (i = 0; i < SHA512_DIGEST_LENGTH; i++) { *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4]; @@ -915,17 +915,17 @@ return buffer; } -char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) { +char* apr__SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) { SHA512_CTX context; - SHA512_Init(&context); - SHA512_Update(&context, data, len); - return SHA512_End(&context, digest); + apr__SHA512_Init(&context); + apr__SHA512_Update(&context, data, len); + return apr__SHA512_End(&context, digest); } /*** SHA-384: *********************************************************/ -void SHA384_Init(SHA384_CTX* context) { +void apr__SHA384_Init(SHA384_CTX* context) { if (context == (SHA384_CTX*)0) { return; } @@ -934,11 +934,11 @@ context->bitcount[0] = context->bitcount[1] = 0; } -void SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) { - SHA512_Update((SHA512_CTX*)context, data, len); +void apr__SHA384_Update(SHA384_CTX* context, const sha2_byte* data, size_t len) { + apr__SHA512_Update((SHA512_CTX*)context, data, len); } -void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { +void apr__SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { sha2_word64 *d = (sha2_word64*)digest; /* Sanity check: */ @@ -946,7 +946,7 @@ /* If no digest buffer is passed, we don't bother doing this: */ if (digest != (sha2_byte*)0) { - SHA512_Last((SHA512_CTX*)context); + apr__SHA512_Last((SHA512_CTX*)context); /* Save the hash data for output: */ #if !APR_IS_BIGENDIAN @@ -967,7 +967,7 @@ MEMSET_BZERO(context, sizeof(context)); } -char *SHA384_End(SHA384_CTX* context, char buffer[]) { +char *apr__SHA384_End(SHA384_CTX* context, char buffer[]) { sha2_byte digest[SHA384_DIGEST_LENGTH], *d = digest; int i; @@ -975,7 +975,7 @@ assert(context != (SHA384_CTX*)0); if (buffer != (char*)0) { - SHA384_Final(digest, context); + apr__SHA384_Final(digest, context); for (i = 0; i < SHA384_DIGEST_LENGTH; i++) { *buffer++ = sha2_hex_digits[(*d & 0xf0) >> 4]; @@ -990,11 +990,11 @@ return buffer; } -char* SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) { +char* apr__SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) { SHA384_CTX context; - SHA384_Init(&context); - SHA384_Update(&context, data, len); - return SHA384_End(&context, digest); + apr__SHA384_Init(&context); + apr__SHA384_Update(&context, data, len); + return apr__SHA384_End(&context, digest); } Index: apr.spec =================================================================== RCS file: /cvs/dist/rpms/apr/devel/apr.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- apr.spec 4 Jan 2006 12:50:00 -0000 1.45 +++ apr.spec 4 Jan 2006 16:50:43 -0000 1.46 @@ -3,7 +3,7 @@ Summary: Apache Portable Runtime library Name: apr Version: 1.2.2 -Release: 6 +Release: 7 License: Apache Software License Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -16,6 +16,7 @@ Patch6: apr-1.2.2-locktimeout.patch Patch7: apr-1.2.2-libdir.patch Patch8: apr-1.2.2-seekflush.patch +Patch9: apr-1.2.2-random.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildPrereq: autoconf, libtool, doxygen Conflicts: subversion < 0.20.1-2 @@ -49,6 +50,7 @@ %patch6 -p1 -b .locktimeout %patch7 -p1 -b .libdir %patch8 -p1 -b .seekflush +%patch9 -p1 -b .random %build # regenerate configure script etc. @@ -125,6 +127,9 @@ %{_includedir}/apr-%{aprver}/*.h %changelog +* Wed Jan 4 2006 Joe Orton 1.2.2-7 +- fix namespace pollution (r354824, r355464) + * Wed Jan 4 2006 Joe Orton 1.2.2-6 - fix build with recent glibc (#176911) From fedora-cvs-commits at redhat.com Wed Jan 4 16:57:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 11:57:20 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch, 1.1, 1.2 Message-ID: <200601041657.k04GvK0f003270@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3230 Modified Files: openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch Log Message: spinbutton also needs to be editable openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch: unx/gtk/gdi/salnativewidgets-gtk.cxx | 0 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 11 +++++++++++ 2 files changed, 11 insertions(+) Index: openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch 9 Dec 2005 13:03:58 -0000 1.1 +++ openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch 4 Jan 2006 16:57:16 -0000 1.2 @@ -2,10 +2,22 @@ =================================================================== RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v retrieving revision 1.18 -diff -u -p -u -r1.18 salnativewidgets-gtk.cxx +diff -u -r1.18 salnativewidgets-gtk.cxx --- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 1 Nov 2005 10:35:31 -0000 1.18 -+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 9 Dec 2005 13:15:13 -0000 -@@ -3262,6 +3267,12 @@ static void NWEnsureGTKCombo( void ) ++++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 4 Jan 2006 17:21:19 -0000 +@@ -3229,6 +3229,11 @@ + { + GtkAdjustment *adj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 2, 1, 1, 1) ); + gSpinButtonWidget = gtk_spin_button_new( adj, 1, 2 ); ++ ++ //Setting non-editable means it doesn't blink, so there's no timeouts ++ //running around to nobble us ++ gtk_editable_set_editable(GTK_EDITABLE(gSpinButtonWidget), false); ++ + NWAddWidgetToCacheWindow( gSpinButtonWidget ); + } + } +@@ -3262,6 +3267,12 @@ if ( !gComboWidget ) { gComboWidget = gtk_combo_new(); From fedora-cvs-commits at redhat.com Wed Jan 4 16:58:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 11:58:59 -0500 Subject: rpms/system-config-date/devel .cvsignore, 1.32, 1.33 sources, 1.35, 1.36 system-config-date.spec, 1.40, 1.41 Message-ID: <200601041658.k04GwxEq004014@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-date/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3960 Modified Files: .cvsignore sources system-config-date.spec Log Message: show actually chosen region, not just something that's in the vicinity Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 15 Dec 2005 16:13:22 -0000 1.32 +++ .cvsignore 4 Jan 2006 16:58:56 -0000 1.33 @@ -1 +1 @@ -system-config-date-1.7.99.11.tar.bz2 +system-config-date-1.7.99.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 15 Dec 2005 16:13:22 -0000 1.35 +++ sources 4 Jan 2006 16:58:56 -0000 1.36 @@ -1 +1 @@ -f9f1fe6e28b158e396283aaf25bf7d9c system-config-date-1.7.99.11.tar.bz2 +471ccd1c7f036b69edf9864c3ddee806 system-config-date-1.7.99.12.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- system-config-date.spec 15 Dec 2005 16:13:22 -0000 1.40 +++ system-config-date.spec 4 Jan 2006 16:58:56 -0000 1.41 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.7.99.11 +Version: 1.7.99.12 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -93,6 +93,14 @@ %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template %changelog +* Wed Jan 04 2006 Nils Philippsen 1.7.99.12 +- show actually chosen region, not just something that's in the vicinity + +* Fri Dec 30 2005 Nils Philippsen +- fix highlighted regions when leaving and entering the timeone map canvas +- make timezone list a treeview +- update timezone po source file + * Thu Dec 15 2005 Jeremy Katz - 1.7.99.11-1 - fix timezone map to not be painfully slow From fedora-cvs-commits at redhat.com Wed Jan 4 17:06:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 12:06:18 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.601,1.602 Message-ID: <200601041706.k04H6IOT004854@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4821 Modified Files: openoffice.org.spec Log Message: spinbutton needs to be uneditable Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.601 retrieving revision 1.602 diff -u -r1.601 -r1.602 --- openoffice.org.spec 3 Jan 2006 17:23:53 -0000 1.601 +++ openoffice.org.spec 4 Jan 2006 17:05:44 -0000 1.602 @@ -1,6 +1,6 @@ %define oootag OOA680 %define ooomilestone 1 -%define rh_rpm_release 4 +%define rh_rpm_release 5 %define build_fc5 1 %define build_fc4 0 @@ -3340,6 +3340,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Wed Jan 04 2006 Caolan McNamara - 1:2.0.1.1-5 +- spinbutton factory needs to be uneditable as well as combobox + * Thu Dec 22 2005 Caolan McNamara - 1:2.0.1.1-4 - add openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch for rh#176779# From fedora-cvs-commits at redhat.com Wed Jan 4 18:07:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:07:38 -0500 Subject: rpms/evolution-connector/devel .cvsignore, 1.23, 1.24 evolution-connector.spec, 1.45, 1.46 sources, 1.23, 1.24 Message-ID: <200601041807.k04I7cLO018527@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-connector/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18465 Modified Files: .cvsignore evolution-connector.spec sources Log Message: 2.5.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 20 Dec 2005 04:43:54 -0000 1.23 +++ .cvsignore 4 Jan 2006 18:07:35 -0000 1.24 @@ -1 +1 @@ -evolution-exchange-2.5.3.tar.bz2 +evolution-exchange-2.5.4.tar.bz2 Index: evolution-connector.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- evolution-connector.spec 20 Dec 2005 04:43:55 -0000 1.45 +++ evolution-connector.spec 4 Jan 2006 18:07:35 -0000 1.46 @@ -6,7 +6,7 @@ %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null) Name: evolution-connector -Version: 2.5.3 +Version: 2.5.4 Release: 1 License: GPL Group: Applications/Productivity @@ -94,6 +94,9 @@ %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml %changelog +* Wed Jan 4 2006 David Malcolm - 2.5.4-1 +- 2.5.4 + * Mon Dec 19 2005 David Malcolm - 2.5.3-1 - 2.5.3 - regenerate patch 200 Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 20 Dec 2005 04:43:55 -0000 1.23 +++ sources 4 Jan 2006 18:07:35 -0000 1.24 @@ -1 +1 @@ -15e4343cb0df540dc33151b49d9f8261 evolution-exchange-2.5.3.tar.bz2 +e96018d6edbab97a45a97578a6d210ef evolution-exchange-2.5.4.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 4 18:10:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:10:17 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.75, 1.76 libsepol.spec, 1.98, 1.99 sources, 1.76, 1.77 Message-ID: <200601041810.k04IAHFC019858@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19826 Modified Files: .cvsignore libsepol.spec sources Log Message: * Wed Jan 4 2006 Dan Walsh 1.11.2-1 - Upgrade to latest from NSA * Merged patch series from Ivan Gyurdiev. This includes patches to: - support ordering of records in compare function - enable port interfaces - add interfaces for context validity and range checks - add include guards Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- .cvsignore 16 Dec 2005 14:15:10 -0000 1.75 +++ .cvsignore 4 Jan 2006 18:10:14 -0000 1.76 @@ -72,3 +72,4 @@ libsepol-1.9.42.tgz libsepol-1.10.tgz libsepol-1.11.1.tgz +libsepol-1.11.2.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- libsepol.spec 27 Dec 2005 20:14:51 -0000 1.98 +++ libsepol.spec 4 Jan 2006 18:10:14 -0000 1.99 @@ -1,11 +1,10 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.11.1 +Version: 1.11.2 Release: 2 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz -Patch: libsepol-rhat.patch Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-buildroot @@ -38,7 +37,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make clean @@ -82,6 +80,15 @@ %{_includedir}/sepol/policydb/*.h %changelog +* Wed Jan 4 2006 Dan Walsh 1.11.2-1 +- Upgrade to latest from NSA + * Merged patch series from Ivan Gyurdiev. + This includes patches to: + - support ordering of records in compare function + - enable port interfaces + - add interfaces for context validity and range checks + - add include guards + * Tue Dec 27 2005 Dan Walsh 1.11.1-2 - Add Ivans patch to make ports work Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- sources 16 Dec 2005 14:15:10 -0000 1.76 +++ sources 4 Jan 2006 18:10:14 -0000 1.77 @@ -1 +1 @@ -c2b1cae607ad77d9b801ddc27427aeb3 libsepol-1.11.1.tgz +4ff22d134a5cf9715505feb18a35e6c3 libsepol-1.11.2.tgz From fedora-cvs-commits at redhat.com Wed Jan 4 18:13:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:13:12 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.40, 1.41 libsemanage.spec, 1.55, 1.56 sources, 1.42, 1.43 Message-ID: <200601041813.k04IDCxF021201@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21167 Modified Files: .cvsignore libsemanage.spec sources Log Message: * Wed Jan 5 2006 Dan Walsh 1.5.4-1 - Upgrade to latest from NSA * Merged patch series from Ivan Gyurdiev. This includes patches to: - separate file rw code from linked list - annotate objects - fold together internal headers - support ordering of records in compare function - add active dbase backend, active booleans - return commit numbers for ro database calls - use modified flags to skip rebuild whenever possible - enable port interfaces - update swig interfaces and typemaps - add an API for file_contexts.local and file_contexts - flip the traversal order in iterate/list - reorganize sandbox_expand - add seusers MLS validation - improve dbase spec/documentation - clone record on set/add/modify Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 14 Dec 2005 19:51:34 -0000 1.40 +++ .cvsignore 4 Jan 2006 18:13:08 -0000 1.41 @@ -42,3 +42,4 @@ libsemanage-1.5.1.tgz libsemanage-1.5.2.tgz libsemanage-1.5.3.tgz +libsemanage-1.5.4.tgz Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- libsemanage.spec 2 Jan 2006 12:56:28 -0000 1.55 +++ libsemanage.spec 4 Jan 2006 18:13:08 -0000 1.56 @@ -1,12 +1,11 @@ -%define libselinuxver 1.29.2-1 +%define libselinuxver 1.29.3-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.5.3 -Release: 3 +Version: 1.5.4 +Release: 1 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz -Patch: libsemanage-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} @@ -38,7 +37,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make clean @@ -74,6 +72,26 @@ %{_includedir}/semanage/*.h %changelog +* Wed Jan 5 2006 Dan Walsh 1.5.4-1 +- Upgrade to latest from NSA + * Merged patch series from Ivan Gyurdiev. + This includes patches to: + - separate file rw code from linked list + - annotate objects + - fold together internal headers + - support ordering of records in compare function + - add active dbase backend, active booleans + - return commit numbers for ro database calls + - use modified flags to skip rebuild whenever possible + - enable port interfaces + - update swig interfaces and typemaps + - add an API for file_contexts.local and file_contexts + - flip the traversal order in iterate/list + - reorganize sandbox_expand + - add seusers MLS validation + - improve dbase spec/documentation + - clone record on set/add/modify + * Tue Dec 27 2005 Dan Walsh 1.5.3-3 - Add Ivans patch to turn on ports Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 14 Dec 2005 19:51:34 -0000 1.42 +++ sources 4 Jan 2006 18:13:08 -0000 1.43 @@ -1 +1 @@ -ba43055bdde21f650b419aefbc0927b5 libsemanage-1.5.3.tgz +13530deff7aae519ffa9cf2f6c2ac466 libsemanage-1.5.4.tgz From fedora-cvs-commits at redhat.com Wed Jan 4 18:16:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:16:43 -0500 Subject: rpms/ypserv/devel ypserv.spec,1.23,1.24 Message-ID: <200601041816.k04IGhil001578@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/ypserv/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1557 Modified Files: ypserv.spec Log Message: bump for gcc again Index: ypserv.spec =================================================================== RCS file: /cvs/dist/rpms/ypserv/devel/ypserv.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ypserv.spec 16 Dec 2005 23:25:29 -0000 1.23 +++ ypserv.spec 4 Jan 2006 18:16:41 -0000 1.24 @@ -4,7 +4,7 @@ Url: http://www.linux-nis.org/nis/ypserv/index.html Name: ypserv Version: 2.13 -Release: 6.1 +Release: 6.2 License: GPL Group: System Environment/Daemons Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2 @@ -136,8 +136,8 @@ %{_includedir}/*/* %changelog -* Fri Dec 16 2005 Jesse Keating -- rebuilt for new gcj +* Wed Jan 4 2006 Jesse Keating - 2.13-6.2 +- rebuilt for new gcc * Thu Oct 14 2004 Miloslav Trmac - 2.13-5 - Fix crash with -p (#134910, #129676) From fedora-cvs-commits at redhat.com Wed Jan 4 18:32:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:32:12 -0500 Subject: rpms/zsh/devel zsh.spec,1.22,1.23 Message-ID: <200601041832.k04IWCDQ030305@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/zsh/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30291 Modified Files: zsh.spec Log Message: bump for gcc again Index: zsh.spec =================================================================== RCS file: /cvs/dist/rpms/zsh/devel/zsh.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- zsh.spec 9 Dec 2005 22:43:58 -0000 1.22 +++ zsh.spec 4 Jan 2006 18:32:09 -0000 1.23 @@ -3,7 +3,7 @@ Summary: A powerful interactive shell Name: zsh Version: 4.2.5 -Release: 1.1 +Release: 1.2 License: BSD URL: http://zsh.sunsite.dk/ Group: System Environment/Shells @@ -140,6 +140,9 @@ %doc Doc/zsh/*.html %changelog +* Wed Jan 4 2006 Jesse Keating 0 4.2.5-1.2 +- rebuilt again + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 4 18:34:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:34:59 -0500 Subject: rpms/libselinux/devel libselinux.spec,1.172,1.173 Message-ID: <200601041834.k04IYxM2030424@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30410 Modified Files: libselinux.spec Log Message: * Wed Jan 4 2006 Dan Walsh 1.29.4-1 - Build with new libsepol Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- libselinux.spec 4 Jan 2006 15:40:59 -0000 1.172 +++ libselinux.spec 4 Jan 2006 18:34:57 -0000 1.173 @@ -1,9 +1,9 @@ -%define libsepolver 1.11.1-1 -%define libsetransver 0.1.11-1 +%define libsepolver 1.11.2-2 +%define libsetransver 0.1.15-1 Summary: SELinux library and simple utilities Name: libselinux Version: 1.29.3 -Release: 1 +Release: 2 License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -110,6 +110,9 @@ %{_libdir}/python2.4/site-packages/selinux.py* %changelog +* Wed Jan 4 2006 Dan Walsh 1.29.4-1 +- Build with new libsepol + * Wed Jan 4 2006 Dan Walsh 1.29.3-1 - Upgrade to latest from NSA * Merged several fixes and improvements from Ulrich Drepper From fedora-cvs-commits at redhat.com Wed Jan 4 18:36:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:36:23 -0500 Subject: rpms/cups/FC-4 cups-CVE-2005-3625, 6, 7.patch, NONE, 1.1 cups.spec, 1.104, 1.105 Message-ID: <200601041836.k04IaN5U030503@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv30490 Modified Files: cups.spec Added Files: cups-CVE-2005-3625,6,7.patch Log Message: * Wed Jan 4 2006 Tim Waugh 1:1.1.23-15.3 - Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627 (bug #176868). ***** Not enough context to create diffstat for file: cups-CVE-2005-3625,6,7.patch,NONE,1.1 ***** Not enough context to create diff for file: cups-CVE-2005-3625,6,7.patch,NONE,1.1 Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-4/cups.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- cups.spec 14 Dec 2005 17:33:53 -0000 1.104 +++ cups.spec 4 Jan 2006 18:36:21 -0000 1.105 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.23 -Release: 15.2 +Release: 15.3 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2 @@ -49,7 +49,8 @@ Patch33: cups-CAN-2004-0888.patch Patch34: cups-CAN-2005-2097.patch Patch35: cups-CVE-2005-3191_2_3.patch -Patch36: cups-dbus.patch +Patch36: cups-CVE-2005-3625,6,7.patch +Patch37: cups-dbus.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -143,8 +144,9 @@ %patch33 -p1 -b .CAN-2004-0888 %patch34 -p1 -b .CAN-2005-2097 %patch35 -p1 -b .CVE-2005-3191_2_3 +%patch36 -p1 -b .CVE-2005-3625,6,7 %if %use_dbus -%patch36 -p1 -b .dbus +%patch37 -p1 -b .dbus %endif perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in aclocal -I config-scripts @@ -409,6 +411,10 @@ %{_libdir}/cups/daemon/cups-lpd %changelog +* Wed Jan 4 2006 Tim Waugh 1:1.1.23-15.3 +- Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627 + (bug #176868). + * Wed Dec 14 2005 Tim Waugh 1:1.1.23-15.2 - Applied patch to fix CVE-2005-3191/2/3 (bug #175646). From fedora-cvs-commits at redhat.com Wed Jan 4 18:39:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:39:08 -0500 Subject: rpms/libsemanage/devel libsemanage.spec,1.56,1.57 Message-ID: <200601041839.k04Id8V3030606@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30593 Modified Files: libsemanage.spec Log Message: * Wed Jan 5 2006 Dan Walsh 1.5.4-1 - Upgrade to latest from NSA * Merged patch series from Ivan Gyurdiev. This includes patches to: - separate file rw code from linked list - annotate objects - fold together internal headers - support ordering of records in compare function - add active dbase backend, active booleans - return commit numbers for ro database calls - use modified flags to skip rebuild whenever possible - enable port interfaces - update swig interfaces and typemaps - add an API for file_contexts.local and file_contexts - flip the traversal order in iterate/list - reorganize sandbox_expand - add seusers MLS validation - improve dbase spec/documentation - clone record on set/add/modify Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- libsemanage.spec 4 Jan 2006 18:13:08 -0000 1.56 +++ libsemanage.spec 4 Jan 2006 18:39:06 -0000 1.57 @@ -1,3 +1,4 @@ +%define libsepolver 1.11.2-2 %define libselinuxver 1.29.3-1 Summary: SELinux binary policy manipulation library Name: libsemanage @@ -9,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} +BuildRequires: libsepol >= %{libsepolver} %description Security-enhanced Linux is a feature of the Linux?? kernel and a number From fedora-cvs-commits at redhat.com Wed Jan 4 18:53:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:53:20 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.91, 1.92 policycoreutils-rhat.patch, 1.140, 1.141 policycoreutils.spec, 1.207, 1.208 sources, 1.95, 1.96 Message-ID: <200601041853.k04IrKaO009769@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9753 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Wed Jan 4 2006 Dan Walsh 1.29.3-1 - Update to match NSA * Merged semanage getpwnam bug fix from Serge Hallyn (IBM). * Merged patch series from Ivan Gyurdiev. This includes patches to: - cleanup setsebool - update setsebool to apply active booleans through libsemanage - update semodule to use the new semanage_set_rebuild() interface - fix various bugs in semanage * Merged patch from Dan Walsh (Red Hat). This includes fixes for restorecon, chcat, fixfiles, genhomedircon, and semanage. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- .cvsignore 14 Dec 2005 20:34:32 -0000 1.91 +++ .cvsignore 4 Jan 2006 18:53:16 -0000 1.92 @@ -76,3 +76,4 @@ policycoreutils-1.28.tgz policycoreutils-1.29.1.tgz policycoreutils-1.29.2.tgz +policycoreutils-1.29.3.tgz policycoreutils-rhat.patch: scripts/genhomedircon | 3 ++- semanage/semanage | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 27 insertions(+), 26 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- policycoreutils-rhat.patch 2 Jan 2006 19:35:53 -0000 1.140 +++ policycoreutils-rhat.patch 4 Jan 2006 18:53:16 -0000 1.141 @@ -1,1470 +1,225 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.8 policycoreutils-1.29.2/restorecon/restorecon.8 ---- nsapolicycoreutils/restorecon/restorecon.8 2005-12-08 12:59:25.000000000 -0500 -+++ policycoreutils-1.29.2/restorecon/restorecon.8 2006-01-02 14:35:46.000000000 -0500 -@@ -45,7 +45,7 @@ - show changes in file labels, if type, role, or user are changing. - .TP - .B \-F --Force reset of context to match file_context for customizable files -+Force reset of context to match file_context for customizable files, or the user section, if it has changed. - .TP - .SH "ARGUMENTS" - .B pathname... -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.29.2/restorecon/restorecon.c ---- nsapolicycoreutils/restorecon/restorecon.c 2005-12-08 12:59:25.000000000 -0500 -+++ policycoreutils-1.29.2/restorecon/restorecon.c 2006-01-02 14:33:52.000000000 -0500 -@@ -112,18 +112,16 @@ - void usage(const char * const name) - { - fprintf(stderr, -- "usage: %s [-rRnv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n", name); -+ "usage: %s [-FnrRv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n", name); - exit(1); - } - int restore(char *filename) { - int retcontext=0; -- int retval=0; - security_context_t scontext=NULL; - security_context_t prev_context=NULL; - int len=strlen(filename); - struct stat st; - char path[PATH_MAX+1]; -- int user_only_changed=0; - /* - Eliminate trailing / - */ -@@ -175,8 +173,7 @@ - if (excludeCtr > 0 && exclude(filename)) { - return 0; - } -- retval = matchpathcon(filename, st.st_mode, &scontext); -- if (retval < 0) { -+ if (matchpathcon(filename, st.st_mode, &scontext) < 0) { - if (errno == ENOENT) - return 0; - fprintf(stderr,"matchpathcon(%s) failed %s\n", filename,strerror(errno)); -@@ -194,27 +191,24 @@ - if (retcontext < 0 || force || - (strcmp(prev_context,scontext) != 0 && - !(customizable=is_context_customizable(prev_context) > 0))) { -- if (outfile) { -- fprintf(outfile, "%s\n", filename); -- } -- user_only_changed = only_changed_user(scontext, prev_context); -- if (change && !user_only_changed) { -- retval=lsetfilecon(filename,scontext); -- } -- if (retval<0) { -- fprintf(stderr,"%s set context %s->%s failed:'%s'\n", -- progname, filename, scontext, strerror(errno)); -- if (retcontext >= 0) -- freecon(prev_context); -- freecon(scontext); -- return 1; -- } else -- if (verbose && -- (verbose > 1 || !user_only_changed)) -+ if (only_changed_user(scontext, prev_context) == 0) { -+ if (outfile) fprintf(outfile, "%s\n", filename); -+ if (change) { -+ if (lsetfilecon(filename,scontext) < 0) { -+ fprintf(stderr,"%s set context %s->%s failed:'%s'\n", -+ progname, filename, scontext, strerror(errno)); -+ if (retcontext >= 0) -+ freecon(prev_context); -+ freecon(scontext); -+ return 1; -+ } -+ } -+ if (verbose) - printf("%s reset %s context %s->%s\n", -- progname, filename, (retcontext >= 0 ? prev_context : ""), scontext); -+ progname, filename, (retcontext >= 0 ? prev_context : ""), scontext); -+ } - } -- if (verbose > 1 && customizable>0) { -+ if (verbose > 1 && ! force && customizable>0) { - printf("%s: %s not reset customized by admin to %s\n", - progname, filename, prev_context); - } -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.2/scripts/chcat ---- nsapolicycoreutils/scripts/chcat 2005-12-14 14:16:50.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/chcat 2006-01-02 14:33:44.000000000 -0500 -@@ -39,11 +39,11 @@ - print("Can not modify sensitivity levels using '+' on %s" % f) - - if len(clist) > 1: -- cats=clist[1].split(",") -- if cat in cats: -+ if cat in clist[1:]: - print "%s is already in %s" % (f, orig) - continue -- cats.append(cat) -+ clist.append(cat) -+ cats=clist[1:] - cats.sort() - cat_string=cats[0] - for c in cats[1:]: -@@ -73,14 +73,13 @@ - continue - - if len(clist) > 1: -- cats=clist[1].split(",") -- if cat not in cats: -+ if cat not in clist[1:]: - print "%s is not in %s" % (f, orig) - continue -- cats.remove(cat) -- if len(cats) > 0: -- cat=cats[0] -- for c in cats[1:]: -+ clist.remove(cat) -+ if len(clist) > 1: -+ cat=clist[1] -+ for c in clist[2:]: - cat="%s,%s" % (cat, c) - else: - cat="" -@@ -91,7 +90,7 @@ - if len(cat) == 0: - cmd='chcon -l %s %s' % (sensitivity, f) - else: -- cmd='chcon -l %s:%s %s' % (sensitivity, cat, f) -+ cmd='chcon -l %s:%s %s' % (sensitivity,cat, f) - rc=commands.getstatusoutput(cmd) - if rc[0] != 0: - print rc[1] -@@ -101,18 +100,17 @@ - def chcat_replace(orig, newcat, files): - errors=0 - if len(newcat) == 1: -- if newcat[0][0] == "s" and newcat[0][1:].isdigit() and int(newcat[0][1:]) in range(0,16): -- sensitivity=newcat[0] -- cmd='chcon -l %s ' % newcat[0] -- else: -- cmd='chcon -l s0:%s ' % newcat[0] -+ sensitivity=newcat[0] -+ cmd='chcon -l %s ' % newcat[0] - else: - sensitivity=newcat[0] -- cat=newcat[1] -- cmd='chcon -l %s:%s ' % (sensitivity, cat) -+ cmd='chcon -l %s:%s' % (sensitivity, newcat[1]) -+ for cat in newcat[2:]: -+ cmd='%s,%s' % (cmd, cat) - - for f in files: - cmd = "%s %s" % (cmd, f) -+ - rc=commands.getstatusoutput(cmd) - if rc[0] != 0: - print rc[1] -@@ -134,44 +132,73 @@ - raise ValueError("Can not combine +/- with other types of categories") - return replace_ind - -+def isSensitivity(sensitivity): -+ if sensitivity[0] == "s" and sensitivity[1:].isdigit() and int(sensitivity[1:]) in range(0,16): -+ return 1 -+ else: -+ return 0 -+ -+def expandCats(cats): -+ newcats=[] -+ for c in cats: -+ if c.find(".") != -1: -+ c=c.split(".") -+ for i in range(int(c[0][1:]), int(c[1][1:])+1): -+ x=("c%d" % i) -+ if x not in newcats: -+ newcats.append("c%d" % i) -+ else: -+ for i in c.split(","): -+ if i not in newcats: -+ newcats.append(i) -+ return newcats -+ - def translate(cats): - newcat=[] -+ if len(cats) == 0: -+ newcat.append("s0") -+ return newcat - for c in cats: - (rc, raw) = selinux.selinux_trans_to_raw_context("a:b:c:%s" % c) - rlist=raw.split(":")[3:] -- if len(rlist) > 1: -- if len(newcat) == 0: -- newcat.append(rlist[0]) -- else: -- if newcat[0] != rlist[0]: -- raise ValueError("Can not have multiple sensitivities") -- newcat.append(rlist[1]) -- else: -- if rlist[0][0] == "s" and rlist[0][1:].isdigit() and int(rlist[0][1:]) in range(0,16): -- -- if len(newcat) == 0: -- newcat.append(rlist[0]) -- else: -- if newcat[0] != rlist[0]: -- raise ValueError("Can not have multiple sensitivities") -- else: -- if len(newcat) == 0: -- newcat.append("s0") -- else: -- if newcat[0] != "s0": -- raise ValueError("Can not have multiple sensitivities") -- newcat.append(rlist[0]) -- -+ tlist=[] -+ if isSensitivity(rlist[0])==0: -+ tlist.append("s0") -+ for i in expandCats(rlist): -+ tlist.append(i) -+ else: -+ tlist.append(rlist[0]) -+ for i in expandCats(rlist[1:]): -+ tlist.append(i) -+ if len(newcat) == 0: -+ newcat.append(tlist[0]) -+ else: -+ if newcat[0] != tlist[0]: -+ raise ValueError("Can not have multiple sensitivities") -+ for i in tlist[1:]: -+ newcat.append(i) - return newcat - - def usage(): - print "Usage %s CATEGORY File ..." % sys.argv[0] - print "Usage %s [[+|-]CATEGORY],...]q File ..." % sys.argv[0] - print "Usage %s -d File ..." % sys.argv[0] -+ print "Usage %s -l" % sys.argv[0] - print "Use -- to end option list. For example" - print "chcat -- -CompanyConfidential /docs/businessplan.odt." - sys.exit(1) - -+def listcats(): -+ fd = open(selinux.selinux_translations_path()) -+ for l in fd.read().split("\n"): -+ if l.startswith("#"): -+ continue -+ if l.find("=")!=-1: -+ rec=l.split("=") -+ print "%-30s %s" % tuple(rec) -+ fd.close() -+ return 0 -+ - def error(msg): - print "%s: %s" % (sys.argv[0], msg) - sys.exit(1) -@@ -184,10 +211,12 @@ - error("Requires an SELinux enabled system") - - delete_ind=0 -+ list_ind=0 - try: - gopts, cmds = getopt.getopt(sys.argv[1:], -- 'dh', -- ['help', -+ 'dhl', -+ ['list', -+ 'help', - 'delete']) - - for o,a in gopts: -@@ -195,8 +224,10 @@ - usage() - if o == "-d" or o == "--delete": - delete_ind=1 -+ if o == "-l" or o == "--list": -+ list_ind=1 - -- if len(cmds) < 1: -+ if list_ind==0 and len(cmds) < 1: - usage() - except: - usage() -@@ -204,6 +235,8 @@ - if delete_ind: - sys.exit(chcat_replace(["s0"], ["s0"], cmds)) - -+ if list_ind: -+ sys.exit(listcats()) - - if len(cmds) < 2: - usage() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat.8 policycoreutils-1.29.2/scripts/chcat.8 ---- nsapolicycoreutils/scripts/chcat.8 2005-12-08 12:52:47.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/chcat.8 2006-01-02 14:33:44.000000000 -0500 -@@ -11,6 +11,9 @@ - .B chcat - [\fI-d\fR] \fIFILE\fR... - .br -+.B chcat -+[\fI-l\fR] -+.br - .PP - Change/Remove the security CATEGORY for each FILE. - .PP -@@ -18,6 +21,9 @@ - .TP - \fB\-d\fR - delete the category from each file. -+.TP -+\fB\-l\fR -+list available categories. - .SH "SEE ALSO" - .TP - chcon(1), selinux(8) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.29.2/scripts/fixfiles ---- nsapolicycoreutils/scripts/fixfiles 2005-10-13 13:51:22.000000000 -0400 -+++ policycoreutils-1.29.2/scripts/fixfiles 2006-01-02 14:33:44.000000000 -0500 -@@ -62,8 +62,8 @@ - TEMPFILE=`mktemp ${FC}.XXXXXXXXXX` - test -z "$TEMPFILE" && exit - PREFCTEMPFILE=`mktemp ${PREFC}.XXXXXXXXXX` -- sed -r -e 's,:s0, ,g' $PREFC > ${PREFCTEMPFILE} -- sed -r -e 's,:s0, ,g' $FC | \ -+ sed -r -e 's,:s0, ,g' $PREFC | sort -u > ${PREFCTEMPFILE} -+ sed -r -e 's,:s0, ,g' $FC | sort -u | \ - /usr/bin/diff -b ${PREFCTEMPFILE} - | \ - grep '^[<>]'|cut -c3-| grep ^/ | \ - egrep -v '(^/home|^/root|^/tmp|^/dev)' |\ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.2/scripts/genhomedircon ---- nsapolicycoreutils/scripts/genhomedircon 2005-12-07 07:28:00.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/genhomedircon 2006-01-02 14:33:44.000000000 -0500 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/python - # Copyright (C) 2004 Tresys Technology, LLC - # see file 'COPYING' for use and warranty information - # -@@ -26,64 +26,73 @@ - # - # - --import commands, sys, os, pwd, string, getopt, re -+import sys, os, pwd, string, getopt, re - from semanage import *; - --fd=open("/etc/shells", 'r') --VALID_SHELLS=fd.read().split('\n') --fd.close() --if "/sbin/nologin" in VALID_SHELLS: -- VALID_SHELLS.remove("/sbin/nologin") -+try: -+ fd=open("/etc/shells", 'r') -+ VALID_SHELLS=fd.read().split('\n') -+ fd.close() -+ if "/sbin/nologin" in VALID_SHELLS: -+ VALID_SHELLS.remove("/sbin/nologin") -+except: -+ VALID_SHELLS = ['/bin/sh', '/bin/bash', '/bin/ash', '/bin/bsh', '/bin/ksh', '/usr/bin/ksh', '/usr/bin/pdksh', '/bin/tcsh', '/bin/csh', '/bin/zsh'] -+ -+def findval(file, var, delim=""): -+ val="" -+ try: -+ fd=open(file, 'r') -+ for i in fd.read().split('\n'): -+ if i.startswith(var) == 1: -+ if delim == "": -+ val = i.split()[1] -+ else: -+ val = i.split(delim)[1] -+ val = val.split("#")[0] -+ val = val.strip() -+ fd.close() -+ except: -+ val="" -+ return val - - def getStartingUID(): - starting_uid = sys.maxint -- rc=commands.getstatusoutput("grep -h '^UID_MIN' /etc/login.defs") -- if rc[0] == 0: -- uid_min = re.sub("^UID_MIN[^0-9]*", "", rc[1]) -- #stip any comment from the end of the line -+ uid_min= findval("/etc/login.defs", "UID_MIN") -+ if uid_min != "": - uid_min = uid_min.split("#")[0] - uid_min = uid_min.strip() - if int(uid_min) < starting_uid: - starting_uid = int(uid_min) -- rc=commands.getstatusoutput("grep -h '^LU_UIDNUMBER' /etc/libuser.conf") -- if rc[0] == 0: -- lu_uidnumber = re.sub("^LU_UIDNUMBER[^0-9]*", "", rc[1]) -- #stip any comment from the end of the line -- lu_uidnumber = re.sub("[ \t].*", "", lu_uidnumber) -- lu_uidnumber = lu_uidnumber.split("#")[0] -- lu_uidnumber = lu_uidnumber.strip() -- if int(lu_uidnumber) < starting_uid: -- starting_uid = int(lu_uidnumber) -+ -+ uid_min= findval("/etc/libuser.conf", "LU_UIDNUMBER", "=") -+ if uid_min != "": -+ uid_min = uid_min.split("#")[0] -+ uid_min = uid_min.strip() -+ if int(uid_min) < starting_uid: -+ starting_uid = int(uid_min) -+ - if starting_uid == sys.maxint: - starting_uid = 500 - return starting_uid - - def getDefaultHomeDir(): - ret = [] -- rc=commands.getstatusoutput("grep -h '^HOME' /etc/default/useradd") -- if rc[0] == 0: -- homedir = rc[1].split("=")[1] -- homedir = homedir.split("#")[0] -- homedir = homedir.strip() -- if not homedir in ret: -- ret.append(homedir) -- -- rc=commands.getstatusoutput("grep -h '^LU_HOMEDIRECTORY' /etc/libuser.conf") -- if rc[0] == 0: -- homedir = rc[1].split("=")[1] -- homedir = homedir.split("#")[0] -- homedir = homedir.strip() -- if not homedir in ret: -- ret.append(homedir) -- -+ homedir=findval("/etc/default/useradd", "HOME", "=") -+ if homedir != "" and not homedir in ret: -+ ret.append(homedir) -+ -+ homedir=findval("/etc/libuser.conf", "LU_HOMEDIRECTORY", "=") -+ if homedir != "" and not homedir in ret: -+ ret.append(homedir) -+ - if ret == []: - ret.append("/home") - return ret - - def getSELinuxType(directory): -- rc=commands.getstatusoutput("grep ^SELINUXTYPE= %s/config" % directory) -- if rc[0]==0: -- return rc[1].split("=")[-1].strip() -+ val=findval(directory+"/config", "SELINUXTYPE", "=") -+ if val != "": -+ return val - return "targeted" - - def usage(error = ""): -@@ -129,11 +138,17 @@ - return self.getFileContextDir()+"/homedir_template" - - def getHomeRootContext(self, homedir): -- rc=commands.getstatusoutput("grep HOME_ROOT %s | sed -e \"s|^HOME_ROOT|%s|\"" % ( self.getHomeDirTemplate(), homedir)) -- if rc[0] == 0: -- return rc[1]+"\n" -- else: -- errorExit("sed error %s" % rc[1]) -+ ret="" -+ fd=open(self.getHomeDirTemplate(), 'r') -+ -+ for i in fd.read().split('\n'): -+ if i.find("HOME_ROOT") == 0: -+ i=i.replace("HOME_ROOT", homedir) -+ ret = i+"\n" -+ fd.close() -+ if ret=="": -+ errorExit("No Home Root Context Found") -+ return ret - - def heading(self): - ret = "\n#\n#\n# User-specific file contexts, generated via %s\n" % sys.argv[0] -@@ -152,32 +167,40 @@ - return "user_r" - return name - def getOldRole(self, role): -- rc = commands.getstatusoutput('grep "^user %s" %s' % (role, self.selinuxdir+self.type+"/users/system.users")) -- if rc[0] != 0: -- rc = commands.getstatusoutput('grep "^user %s" %s' % (role, self.selinuxdir+self.type+"/users/local.users")) -- if rc[0] == 0: -- user=rc[1].split() -+ rc=findval(self.selinuxdir+self.type+"/users/system.users", 'grep "^user %s"' % role, "=") -+ if rc == "": -+ rc=findval(self.selinuxdir+self.type+"/users/local.users", 'grep "^user %s"' % role, "=") -+ if rc != "": -+ user=rc.split() - role = user[3] - if role == "{": - role = user[4] - return role - - def adduser(self, udict, user, seuser, role): -+ if seuser == "user_u" or user == "__default__": -+ return -+ # !!! chooses first role in the list to use in the file context !!! -+ if role[-2:] == "_r" or role[-2:] == "_u": -+ role = role[:-2] - try: -- if seuser == "user_u" or user == "__default__": -- return -- # !!! chooses first role in the list to use in the file context !!! -- if role[-2:] == "_r" or role[-2:] == "_u": -- role = role[:-2] - home = pwd.getpwnam(user)[5] - if home == "/": -- return -- prefs = {} -- prefs["role"] = role -- prefs["home"] = home -- udict[seuser] = prefs -+ # Probably install so hard code to /root -+ if user == "root": -+ home="/root" -+ else: -+ return - except KeyError: -- sys.stderr.write("The user \"%s\" is not present in the passwd file, skipping...\n" % user) -+ if user == "root": -+ home = "/root" -+ else: -+ sys.stderr.write("The user \"%s\" is not present in the passwd file, skipping...\n" % user) -+ return -+ prefs = {} -+ prefs["role"] = role -+ prefs["home"] = home -+ udict[seuser] = prefs - - def getUsers(self): - udict = {} -@@ -190,30 +213,50 @@ - self.adduser(udict, semanage_seuser_get_name(seuser), seusername, self.defaultrole(seusername)) - - else: -- rc = commands.getstatusoutput("grep -v '^ *#' %s" % self.selinuxdir+self.type+"/seusers") -- if rc[0] == 0 and rc[1] != "": -- ulist = rc[1].split("\n") -- for u in ulist: -- if len(u)==0: -+ try: -+ fd =open(self.selinuxdir+self.type+"/seusers") -+ for u in fd.read().split('\n'): -+ u=u.strip() -+ if len(u)==0 or u[0]=="#": +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.3/scripts/genhomedircon +--- nsapolicycoreutils/scripts/genhomedircon 2006-01-04 13:07:46.000000000 -0500 ++++ policycoreutils-1.29.3/scripts/genhomedircon 2006-01-04 13:17:35.000000000 -0500 +@@ -220,8 +220,9 @@ + if len(u)==0 or u[0]=="#": continue user = u.split(":") - if len(user) < 3: +- if len(user) < 3: ++ if len(user) < 2: continue ++ role=self.getOldRole(user[1]) self.adduser(udict, user[0], user[1], role) -+ fd.close() -+ except IOError, error: -+ # Must be install so force add of root -+ self.adduser(udict, "root", "root", "root") -+ - return udict - - def getHomeDirContext(self, user, home, role): - ret="\n\n#\n# Home Context for user %s\n#\n\n" % user -- rc=commands.getstatusoutput("grep '^HOME_DIR' %s | sed -e 's|HOME_DIR|%s|' -e 's/ROLE/%s/' -e 's/system_u/%s/'" % (self.getHomeDirTemplate(), home, role, user)) -- return ret + rc[1] + "\n" -+ fd=open(self.getHomeDirTemplate(), 'r') -+ for i in fd.read().split('\n'): -+ if i.startswith("HOME_DIR") == 1: -+ i=i.replace("HOME_DIR", home) -+ i=i.replace("ROLE", role) -+ i=i.replace("system_u", user) -+ ret = ret+i+"\n" -+ fd.close() -+ return ret - - def getUserContext(self, user, sel_user, role): -- rc=commands.getstatusoutput("grep 'USER' %s | sed -e 's/USER/%s/' -e 's/ROLE/%s/' -e 's/system_u/%s/'" % (self.getHomeDirTemplate(), user, role, sel_user)) -- return rc[1] + "\n" -+ ret="" -+ fd=open(self.getHomeDirTemplate(), 'r') -+ for i in fd.read().split('\n'): -+ if i.find("USER") == 1: -+ i=i.replace("USER", user) -+ i=i.replace("ROLE", role) -+ i=i.replace("system_u", sel_user) -+ ret=ret+i+"\n" -+ fd.close() -+ return ret - - def genHomeDirContext(self): -- if commands.getstatusoutput("grep -q 'ROLE' %s" % self.getHomeDirTemplate())[0] == 0 and self.semanaged: -+ if self.semanaged and findval(self.getHomeDirTemplate(), "ROLE", "=") != "": - warning("genhomedircon: Warning! No support yet for expanding ROLE macros in the %s file when using libsemanage." % self.getHomeDirTemplate()); - warning("genhomedircon: You must manually update file_contexts.homedirs for any non-user_r users (including root)."); - users = self.getUsers() -@@ -225,40 +268,23 @@ - return ret+"\n" - - def checkExists(self, home): -- if commands.getstatusoutput("grep -E '^%s[^[:alnum:]_-]' %s" % (home, self.getFileContextFile()))[0] == 0: -- return 0 -- #this works by grepping the file_contexts for -- # 1. ^/ makes sure this is not a comment -- # 2. prints only the regex in the first column first cut on \t then on space -- rc=commands.getstatusoutput("grep \"^/\" %s | cut -f 1 | cut -f 1 -d \" \" " % self.getFileContextFile() ) -- if rc[0] == 0: -- prefix_regex = rc[1].split("\n") -- else: -- warning("%s\nYou do not have access to read %s\n" % (rc[1], self.getFileContextFile())) -- -- exists=1 -- for regex in prefix_regex: -- #match a trailing (/*)? which is actually a bug in rpc_pipefs -- regex = re.sub("\(/\*\)\?$", "", regex) -- #match a trailing .+ -- regex = re.sub("\.+$", "", regex) -- #match a trailing .* -- regex = re.sub("\.\*$", "", regex) -- #strip a (/.*)? which matches anything trailing to a /*$ which matches trailing /'s -- regex = re.sub("\(\/\.\*\)\?", "", regex) -- regex = regex + "/*$" -- if re.search(regex, home, 0): -- exists = 0 -- break -- if exists == 1: -- return 1 -- else: -- return 0 -- -+ fd=open(self.getFileContextFile()) -+ for i in fd.read().split('\n'): -+ if len(i)==0: -+ return -+ regex=i.split()[0] -+ #match a trailing .+ -+ regex = re.sub("\.+$", "", regex) -+ regex = re.sub("\.\*$", "", regex) -+ #strip a (/.*)? which matches anything trailing to a /*$ which matches trailing /'s -+ regex = re.sub("\(\/\.\*\)\?", "", regex) -+ regex = regex + "/*$" -+ if re.search(home, regex, 0): -+ return 1 -+ return 0 - - def getHomeDirs(self): -- homedirs = [] -- homedirs = homedirs + getDefaultHomeDir() -+ homedirs = getDefaultHomeDir() - starting_uid=getStartingUID() - if self.usepwd==0: - return homedirs -@@ -270,8 +296,8 @@ - string.count(u[5], "/") > 1: - homedir = u[5][:string.rfind(u[5], "/")] - if not homedir in homedirs: -- if self.checkExists(homedir)==0: -- warning("%s homedir %s or its parent directoy conflicts with a\ndefined context in %s,\n%s will not create a new context." % (u[0], u[5], self.getFileContextFile(), sys.argv[0])) -+ if self.checkExists(homedir)==1: -+ warning("%s homedir %s or its parent directory conflicts with a\ndefined context in %s,\n%s will not create a new context." % (u[0], u[5], self.getFileContextFile(), sys.argv[0])) - else: - homedirs.append(homedir) - -@@ -333,7 +359,3 @@ - - except getopt.error, error: - errorExit("Options Error %s " % error) --except ValueError, error: -- errorExit("ValueError %s" % error) --except IndexError, error: -- errorExit("IndexError") -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/selisteners policycoreutils-1.29.2/scripts/selisteners ---- nsapolicycoreutils/scripts/selisteners 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/selisteners 2006-01-02 14:33:44.000000000 -0500 -@@ -0,0 +1,37 @@ -+#! /usr/bin/env python -+# Copyright (C) 2005 Red Hat -+# see file 'COPYING' for use and warranty information -+# -+# listeners - this script finds all processes listening on a TCP or UDP Port -+# configuration entries for user home directories based on their -+# default roles and is run when building the policy. Specifically, we -+# replace HOME_ROOT, HOME_DIR, and ROLE macros in .fc files with -+# generic and user-specific values. -+# -+# Based off original script by Dan Walsh, -+# -+# ASSUMPTIONS: -+# -+# The file CONTEXTDIR/files/homedir_template exists. This file is used to -+# set up the home directory context for each real user. -+# -+# If a user has more than one role, genhomedircon uses the first role in the list. -+# -+# If a user is not listed in CONTEXTDIR/seusers, he will default to user_u, role user -+# -+# "Real" users (as opposed to system users) are those whose UID is greater than -+# or equal STARTING_UID (usually 500) and whose login is not a member of -+# EXCLUDE_LOGINS. Users who are explicitly defined in CONTEXTDIR/seusers -+# are always "real" (including root, in the default configuration). -+# -+# -+import commands, string -+import selinux -+rc=commands.getstatusoutput("netstat -aptul") -+out=rc[1].split("\n") -+for i in out: -+ x=i.split() -+ y=x[-1].split("/") -+ if len(y)==2: -+ pid=string.atoi(y[0]) -+ print "%s %-40s %-10s\t%-20s\t%s" % (x[0], x[3], pid,y[1],selinux.getpidcon(pid)[1]) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/tests/chcat_test policycoreutils-1.29.2/scripts/tests/chcat_test ---- nsapolicycoreutils/scripts/tests/chcat_test 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/tests/chcat_test 2006-01-02 14:33:44.000000000 -0500 -@@ -0,0 +1,43 @@ -+#!/bin/sh -x -+# -+# You must copy the setrans.conf file in place before testing -+# -+chcat -l -+rm -f /tmp/chcat_test -+touch /tmp/chcat_test -+chcat -d /tmp/chcat_test -+chcat -d /tmp/chcat_test -+chcat -- -Payroll /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- +Payroll /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- -Payroll /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat Payroll,Marketing /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- +Payroll /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- Payroll /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- -Payroll,+Marketing /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- +Payroll,-Marketing /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- -Payroll,+Marketing,+NDA_Yoyodyne /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- -Marketing,-NDA_Yoyodyne /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- -s0 /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- s0 /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- s0:c1 /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- s0:c1,c2 /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- s0:c1.c3 /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- -s0:c3 /tmp/chcat_test -+ls -lZ /tmp/chcat_test -+chcat -- -s0:c2,+c3 /tmp/chcat_test -+ls -lZ /tmp/chcat_test -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/tests/setrans.conf policycoreutils-1.29.2/scripts/tests/setrans.conf ---- nsapolicycoreutils/scripts/tests/setrans.conf 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.2/scripts/tests/setrans.conf 2006-01-02 14:33:44.000000000 -0500 -@@ -0,0 +1,23 @@ -+# -+# Multi-Category Security translation table for SELinux -+# -+# Uncomment the following to disable translation libary -+# disable=1 -+# -+# Objects can be categorized with 0-256 categories defined by the admin. -+# Objects can be in more than one category at a time. -+# Categories are stored in the system as c0-c255. Users can use this -+# table to translate the categories into a more meaningful output. -+# Examples: -+# s0:c0=CompanyConfidential -+# s0:c1=PatientRecord -+# s0:c2=Unclassified -+# s0:c3=TopSecret -+# s0:c1,c3=CompanyConfidentialRedHat -+s0= -+s0-s0:c0.c255=SystemLow-SystemHigh -+s0:c0.c255=SystemHigh -+s0:c0=Company_Confidential -+s0:c1=Marketing -+s0:c2=Payroll -+s0:c3=NDA_Yoyodyne -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.2/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2005-11-29 10:55:01.000000000 -0500 -+++ policycoreutils-1.29.2/semanage/semanage 2006-01-02 14:33:44.000000000 -0500 -@@ -24,22 +24,33 @@ - from semanage import *; - class loginRecords: - def __init__(self): -- self.sh=semanage_handle_create() -- self.semanaged=semanage_is_managed(self.sh) -+ self.sh = semanage_handle_create() -+ self.semanaged = semanage_is_managed(self.sh) - if self.semanaged: - semanage_connect(self.sh) - - def add(self, name, sename, serange): -- (rc,k)=semanage_seuser_key_create(self.sh, name) -- (rc,exists)= semanage_seuser_exists(self.sh, k) -+ if serange == "": -+ serange = "s0" -+ if sename == "": -+ sename = "user_u" -+ -+ (rc,k) = semanage_seuser_key_create(self.sh, name) -+ if rc != 0: -+ raise ValueError("Could not create a key for %s" % name) -+ -+ (rc,exists) = semanage_seuser_exists(self.sh, k) - if exists: - raise ValueError("SELinux User %s mapping already defined" % name) - try: -- pwd.getpwname(name) -+ pwd.getpwnam(name) - except: + fd.close() +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.3/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2006-01-04 13:07:46.000000000 -0500 ++++ policycoreutils-1.29.3/semanage/semanage 2006-01-04 13:17:35.000000000 -0500 +@@ -36,7 +36,7 @@ + sename = "user_u" + + (rc,k) = semanage_seuser_key_create(self.sh, name) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not create a key for %s" % name) + + (rc,exists) = semanage_seuser_exists(self.sh, k) +@@ -48,7 +48,7 @@ raise ValueError("Linux User %s does not exist" % name) -- (rc,u)= semanage_seuser_create(self.sh) -+ (rc,u) = semanage_seuser_create(self.sh) -+ if rc != 0: -+ raise ValueError("Could not create seuser for %s" % name) -+ + (rc,u) = semanage_seuser_create(self.sh) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not create seuser for %s" % name) + semanage_seuser_set_name(self.sh, u, name) - semanage_seuser_set_mlsrange(self.sh, u, serange) +@@ -56,12 +56,12 @@ semanage_seuser_set_sename(self.sh, u, sename) -@@ -48,13 +59,22 @@ - if semanage_commit(self.sh) != 0: + semanage_begin_transaction(self.sh) + semanage_seuser_add(self.sh, k, u) +- if semanage_commit(self.sh) != 0: ++ if semanage_commit(self.sh) < 0: raise ValueError("Failed to add SELinux user mapping") -- def modify(self, name, sename="", serange=""): -- (rc,k)=semanage_seuser_key_create(self.sh, name) -- (rc,u)= semanage_seuser_query(self.sh, k) -- if rc !=0 : -- raise ValueError("SELinux user %s mapping is not defined." % name) -- if sename == "" and serange=="": -+ def modify(self, name, sename = "", serange = ""): -+ (rc,k) = semanage_seuser_key_create(self.sh, name) -+ if rc != 0: -+ raise ValueError("Could not create a key for %s" % name) -+ -+ if sename == "" and serange == "": - raise ValueError("Requires, seuser or serange") -+ -+ (rc,exists) = semanage_seuser_exists(self.sh, k) -+ if exists: -+ (rc,u) = semanage_seuser_query(self.sh, k) -+ if rc != 0: -+ raise ValueError("Could not query seuser for %s" % name) -+ else: -+ raise ValueError("SELinux user %s mapping is not defined." % name) -+ - if serange != "": - semanage_seuser_set_mlsrange(self.sh, u, serange) - if sename != "": -@@ -66,78 +86,107 @@ + def modify(self, name, sename = "", serange = ""): + (rc,k) = semanage_seuser_key_create(self.sh, name) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not create a key for %s" % name) + + if sename == "" and serange == "": +@@ -70,7 +70,7 @@ + (rc,exists) = semanage_seuser_exists(self.sh, k) + if exists: + (rc,u) = semanage_seuser_query(self.sh, k) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not query seuser for %s" % name) + else: + raise ValueError("SELinux user %s mapping is not defined." % name) +@@ -81,13 +81,13 @@ + semanage_seuser_set_sename(self.sh, u, sename) + semanage_begin_transaction(self.sh) + semanage_seuser_modify(self.sh, k, u) +- if semanage_commit(self.sh) != 0: ++ if semanage_commit(self.sh) < 0: + raise ValueError("Failed to modify SELinux user mapping") def delete(self, name): -- (rc,k)=semanage_seuser_key_create(self.sh, name) -- (rc,exists)= semanage_seuser_exists(self.sh, k) -- if rc !=0 : -+ (rc,k) = semanage_seuser_key_create(self.sh, name) -+ if rc != 0: -+ raise ValueError("Could not create a key for %s" % name) -+ -+ (rc,exists) = semanage_seuser_exists(self.sh, k) -+ if not exists: + (rc,k) = semanage_seuser_key_create(self.sh, name) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not create a key for %s" % name) + + (rc,exists) = semanage_seuser_exists(self.sh, k) +@@ -95,7 +95,7 @@ raise ValueError("SELinux user %s mapping is not defined." % name) semanage_begin_transaction(self.sh) semanage_seuser_del(self.sh, k) - if semanage_commit(self.sh) != 0: +- if semanage_commit(self.sh) != 0: ++ if semanage_commit(self.sh) < 0: raise ValueError("SELinux User %s mapping not defined" % name) -- def list(self): -- print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range") -+ def list(self,heading=1): -+ if heading: -+ print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range") - (status, self.ulist, self.usize) = semanage_seuser_list(self.sh) - for idx in range(self.usize): -- u=semanage_seuser_by_idx(self.ulist, idx) -- name=semanage_seuser_get_name(u) -- -+ u = semanage_seuser_by_idx(self.ulist, idx) -+ name = semanage_seuser_get_name(u) - print "%-25s %-25s %-25s" % (name, semanage_seuser_get_sename(u), semanage_seuser_get_mlsrange(u)) - - class seluserRecords: - def __init__(self): -- roles=[] -- self.sh=semanage_handle_create() -- self.semanaged=semanage_is_managed(self.sh) -+ roles = [] -+ self.sh = semanage_handle_create() -+ self.semanaged = semanage_is_managed(self.sh) - if self.semanaged: - semanage_connect(self.sh) - - def add(self, name, roles, selevel, serange): -- (rc,k)=semanage_user_key_create(self.sh, name) -- (rc,exists)= semanage_user_exists(self.sh, k) -- if exists: -- raise ValueError("Seuser %s already defined" % name) -- (rc,u)= semanage_user_create(self.sh) -+ if serange == "": -+ serange = "s0" -+ if selevel == "": -+ selevel = "s0" -+ -+ (rc,k) = semanage_user_key_create(self.sh, name) -+ if rc != 0: -+ raise ValueError("Could not create a key for %s" % name) -+ -+ (rc,exists) = semanage_user_exists_local(self.sh, k) -+ if not exists: -+ (rc,exists) = semanage_user_exists(self.sh, k) -+ if not exists: -+ raise ValueError("SELinux user %s is already defined." % name) -+ -+ (rc,u) = semanage_user_create(self.sh) -+ if rc != 0: -+ raise ValueError("Could not create login mapping for %s" % name) -+ + def list(self,heading=1): +@@ -122,7 +122,7 @@ + selevel = "s0" + + (rc,k) = semanage_user_key_create(self.sh, name) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not create a key for %s" % name) + + (rc,exists) = semanage_user_exists_local(self.sh, k) +@@ -132,7 +132,7 @@ + raise ValueError("SELinux user %s is already defined." % name) + + (rc,u) = semanage_user_create(self.sh) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not create login mapping for %s" % name) + semanage_user_set_name(self.sh, u, name) - for r in roles: - semanage_user_add_role(self.sh, u, r) +@@ -141,12 +141,12 @@ semanage_user_set_mlsrange(self.sh, u, serange) semanage_user_set_mlslevel(self.sh, u, selevel) (rc,key) = semanage_user_key_extract(self.sh,u) -+ if rc != 0: -+ raise ValueError("Could not extract key for %s" % name) -+ +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not extract key for %s" % name) + semanage_begin_transaction(self.sh) semanage_user_add_local(self.sh, k, u) - if semanage_commit(self.sh) != 0: +- if semanage_commit(self.sh) != 0: ++ if semanage_commit(self.sh) < 0: raise ValueError("Failed to add SELinux user") -- self.dict[name]=seluser(name, roles, selevel, serange) -- -- def modify(self, name, roles=[], selevel="", serange=""): -- (rc,k)=semanage_user_key_create(self.sh, name) -- (rc,exists)= semanage_user_exists(self.sh, k) -- if not exists: -- raise ValueError("user %s is not defined" % name) -- (rc,u)= semanage_user_query(self.sh, k) -- if rc !=0 : -- raise ValueError("User %s is not defined." % name) -- if len(roles) == 0 and serange=="" and selevel=="": -+ def modify(self, name, roles = [], selevel = "", serange = ""): -+ if len(roles) == 0 and serange == "" and selevel == "": + def modify(self, name, roles = [], selevel = "", serange = ""): +@@ -154,7 +154,7 @@ raise ValueError("Requires, roles, level or range") -+ -+ (rc,k) = semanage_user_key_create(self.sh, name) -+ if rc != 0: -+ raise ValueError("Could not create a key for %s" % name) -+ -+ (rc,exists) = semanage_user_exists_local(self.sh, k) -+ if exists: -+ (rc,u) = semanage_user_query_local(self.sh, k) -+ else: -+ (rc,exists) = semanage_user_exists(self.sh, k) -+ if exists: -+ (rc,u) = semanage_user_query(self.sh, k) -+ else: -+ raise ValueError("SELinux user %s mapping is not defined." % name) -+ if rc != 0: -+ raise ValueError("Could not query user for %s" % name) -+ + + (rc,k) = semanage_user_key_create(self.sh, name) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not create a key for %s" % name) + + (rc,exists) = semanage_user_exists_local(self.sh, k) +@@ -166,24 +166,24 @@ + (rc,u) = semanage_user_query(self.sh, k) + else: + raise ValueError("SELinux user %s mapping is not defined." % name) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not query user for %s" % name) + if serange != "": semanage_user_set_mlsrange(self.sh, u, serange) if selevel != "": semanage_user_set_mlslevel(self.sh, u, selevel) - if len(roles) != 0: +- if len(roles) != 0: ++ if len(roles) < 0: for r in roles: -- print r semanage_user_add_role(self.sh, u, r) semanage_begin_transaction(self.sh) semanage_user_modify_local(self.sh, k, u) - if semanage_commit(self.sh) != 0: +- if semanage_commit(self.sh) != 0: ++ if semanage_commit(self.sh) < 0: raise ValueError("Failed to modify SELinux user") -- def delete(self, name): -- (rc,k)=semanage_user_key_create(self.sh, name) -- (rc,exists)= semanage_user_exists(self.sh, k) -+ (rc,k) = semanage_user_key_create(self.sh, name) -+ if rc != 0: -+ raise ValueError("Could not crpppeate a key for %s" % name) -+ -+ (rc,exists) = semanage_user_exists_local(self.sh, k) - if not exists: + (rc,k) = semanage_user_key_create(self.sh, name) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not crpppeate a key for %s" % name) + + (rc,exists) = semanage_user_exists_local(self.sh, k) +@@ -191,7 +191,7 @@ raise ValueError("user %s is not defined" % name) semanage_begin_transaction(self.sh) -@@ -145,86 +194,183 @@ - if semanage_commit(self.sh) != 0: + semanage_user_del_local(self.sh, k) +- if semanage_commit(self.sh) != 0: ++ if semanage_commit(self.sh) < 0: raise ValueError("Login User %s not defined" % name) -- def list(self): -- print "\n%-15s %-10s %-20s" % ("", "MLS/", "MLS/") -- print "%-15s %-10s %-15s %-20s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") -+ def list(self, heading=1): -+ if heading: -+ print "\n%-15s %-10s %-20s" % ("", "MLS/", "MLS/") -+ print "%-15s %-10s %-15s %-20s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") - (status, self.ulist, self.usize) = semanage_user_list(self.sh) - for idx in range(self.usize): -- u=semanage_user_by_idx(self.ulist, idx) -- name=semanage_user_get_name(u) -+ u = semanage_user_by_idx(self.ulist, idx) -+ name = semanage_user_get_name(u) - (status, rlist, rlist_size) = semanage_user_get_roles(self.sh, u) -- roles="" -+ roles = "" - - if rlist_size: -- roles+=char_by_idx(rlist, 0) -+ roles += char_by_idx(rlist, 0) - for ridx in range (1,rlist_size): -- roles+=" " + char_by_idx(rlist, ridx) -+ roles += " " + char_by_idx(rlist, ridx) - print "%-15s %-10s %-15s %s" % (semanage_user_get_name(u), semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) - - class portRecords: - def __init__(self): -- self.dict={} -- self.sh=semanage_handle_create() -- self.semanaged=semanage_is_managed(self.sh) -+ self.sh = semanage_handle_create() -+ self.semanaged = semanage_is_managed(self.sh) - if self.semanaged: - semanage_connect(self.sh) - -- def add(self, name, type): -- (rc,k)=semanage_port_key_create(self.sh, name) -- (rc,exists)= semanage_port_exists(self.sh, k) -+ def __genkey(self, port, proto): -+ if proto == "tcp": -+ proto_d=SEMANAGE_PROTO_TCP -+ else: -+ if proto == "udp": -+ proto_d=SEMANAGE_PROTO_UDP -+ else: -+ raise ValueError("Protocol udp or tcp is required") -+ if port == "": -+ raise ValueError("Port is required") -+ -+ ports=port.split("-") -+ if len(ports) == 1: -+ low=string.atoi(ports[0]) -+ high=string.atoi(ports[0]) -+ else: -+ low=string.atoi(ports[0]) -+ high=string.atoi(ports[1]) -+ -+ (rc,k) = semanage_port_key_create(self.sh, low, high, proto_d) -+ if rc != 0: -+ raise ValueError("Could not create a key for %s/%s" % (proto, port)) -+ return ( k, proto_d, low, high ) -+ -+ def add(self, port, proto, serange, type): -+ if serange == "": -+ serange="s0" -+ -+ if type == "": -+ raise ValueError("Type is required") -+ -+ ( k, proto_d, low, high ) = self.__genkey(port, proto) -+ -+ (rc,exists) = semanage_port_exists(self.sh, k) -+ if exists: -+ raise ValueError("Port %s/%s already defined" % (proto, port)) -+ -+ (rc,exists) = semanage_port_exists_local(self.sh, k) - if exists: -- raise ValueError("User %s already defined" % name) -- (rc,u)= semanage_port_create(self.sh) -- semanage_port_set_name(self.sh, u, name) -- semanage_port_set_mlsrange(self.sh, u, serange) -- semanage_port_set_sename(self.sh, u, sename) -+ raise ValueError("Port %s/%s already defined locally" % (proto, port)) -+ -+ (rc,p) = semanage_port_create(self.sh) -+ if rc != 0: -+ raise ValueError("Could not create port for %s/%s" % (proto, port)) -+ -+ semanage_port_set_proto(p, proto_d) -+ semanage_port_set_range(p, low, high) -+ (rc, con) = semanage_context_create(self.sh) -+ if rc != 0: -+ raise ValueError("Could not create context for %s/%s" % (proto, port)) -+ -+ semanage_context_set_user(self.sh, con, "system_u") -+ semanage_context_set_role(self.sh, con, "object_r") -+ semanage_context_set_type(self.sh, con, type) -+ semanage_context_set_mls(self.sh, con, serange) -+ semanage_port_set_con(p, con) - semanage_begin_transaction(self.sh) -- semanage_port_add(self.sh, k, u) -+ semanage_port_add_local(self.sh, k, p) - if semanage_commit(self.sh) != 0: + def list(self, heading=1): +@@ -238,7 +238,7 @@ + high=string.atoi(ports[1]) + + (rc,k) = semanage_port_key_create(self.sh, low, high, proto_d) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not create a key for %s/%s" % (proto, port)) + return ( k, proto_d, low, high ) + +@@ -260,13 +260,13 @@ + raise ValueError("Port %s/%s already defined locally" % (proto, port)) + + (rc,p) = semanage_port_create(self.sh) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not create port for %s/%s" % (proto, port)) + + semanage_port_set_proto(p, proto_d) + semanage_port_set_range(p, low, high) + (rc, con) = semanage_context_create(self.sh) +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not create context for %s/%s" % (proto, port)) + + semanage_context_set_user(self.sh, con, "system_u") +@@ -276,7 +276,7 @@ + semanage_port_set_con(p, con) + semanage_begin_transaction(self.sh) + semanage_port_add_local(self.sh, k, p) +- if semanage_commit(self.sh) != 0: ++ if semanage_commit(self.sh) < 0: raise ValueError("Failed to add port") -- def modify(self, name, type): -- (rc,k)=semanage_port_key_create(self.sh, name) -- (rc,u)= semanage_port_query(self.sh, k) -- if rc !=0 : -- raise ValueError("User %s is not defined." % name) -- if sename == "" and serange=="": -- raise ValueError("Requires, port or serange") -+ def modify(self, port, proto, serange, setype): -+ if serange == "" and setype == "": -+ raise ValueError("Requires, setype or serange") -+ -+ ( k, proto_d, low, high ) = self.__genkey(port, proto) -+ -+ (rc,exists) = semanage_port_exists_local(self.sh, k) -+ if exists: -+ (rc,p) = semanage_port_query_local(self.sh, k) -+ (rc,exists) = semanage_port_exists(self.sh, k) -+ if exists: -+ (rc,p) = semanage_port_query(self.sh, k) -+ else: -+ raise ValueError("port %s/%s is not defined." % (proto,port)) -+ -+ if rc != 0: -+ raise ValueError("Could not query port for %s/%s" % (proto, port)) -+ -+ con = semanage_port_get_con(p) -+ semanage_context_set_mls(self.sh, con, serange) - if serange != "": -- semanage_port_set_mlsrange(self.sh, u, serange) -- if sename != "": -- semanage_port_set_sename(self.sh, u, sename) -+ semanage_context_set_mls(self.sh, con, serange) -+ if setype != "": -+ semanage_context_set_type(self.sh, con, setype) -+ semanage_port_set_con(p, con) - semanage_begin_transaction(self.sh) -- semanage_port_modify(self.sh, k, u) -+ semanage_port_modify_local(self.sh, k, p) - if semanage_commit(self.sh) != 0: + def modify(self, port, proto, serange, setype): +@@ -294,7 +294,7 @@ + else: + raise ValueError("port %s/%s is not defined." % (proto,port)) + +- if rc != 0: ++ if rc < 0: + raise ValueError("Could not query port for %s/%s" % (proto, port)) + + con = semanage_port_get_con(p) +@@ -306,7 +306,7 @@ + semanage_port_set_con(p, con) + semanage_begin_transaction(self.sh) + semanage_port_modify_local(self.sh, k, p) +- if semanage_commit(self.sh) != 0: ++ if semanage_commit(self.sh) < 0: raise ValueError("Failed to add port") -- def delete(self, name): -- (rc,k)=semanage_port_key_create(self.sh, name) -+ def delete(self, port, proto): -+ ( k, proto_d, low, high ) = self.__genkey(port, proto) -+ (rc,exists) = semanage_port_exists_local(self.sh, k) -+ if not exists: -+ raise ValueError("port %s/%s is not defined localy." % (proto,port)) -+ - semanage_begin_transaction(self.sh) -- semanage_port_del(self.sh, k) -+ semanage_port_del_local(self.sh, k) - if semanage_commit(self.sh) != 0: -- raise ValueError("Port %s not defined" % name) -+ raise ValueError("Port %s/%s not defined" % (proto,port)) - -- def list(self): -+ def list(self, heading=1): - (status, self.plist, self.psize) = semanage_port_list(self.sh) -- print "%-25s %s\n" % ("SELinux Port Name", "Port Number") -+ if heading: -+ print "%-30s %-8s %s\n" % ("SELinux Port Name", "Proto", "Port Number") -+ dict={} -+ for idx in range(self.psize): -+ u = semanage_port_by_idx(self.plist, idx) -+ con = semanage_port_get_con(u) -+ name = semanage_context_get_type(con) -+ proto=semanage_port_get_proto_str(u) -+ low=semanage_port_get_low(u) -+ high = semanage_port_get_high(u) -+ if (name, proto) not in dict.keys(): -+ dict[(name,proto)]=[] -+ if low == high: -+ dict[(name,proto)].append("%d" % low) -+ else: -+ dict[(name,proto)].append("%d-%d" % (low, high)) -+ (status, self.plist, self.psize) = semanage_port_list_local(self.sh) - for idx in range(self.psize): -- u=semanage_port_by_idx(self.plist, idx) -- name=semanage_port_get_name(u) -- print "%20s %d" % ( name, semanage_port_get_number(u)) -+ u = semanage_port_by_idx(self.plist, idx) -+ con = semanage_port_get_con(u) -+ name = semanage_context_get_type(con) -+ proto=semanage_port_get_proto_str(u) -+ low=semanage_port_get_low(u) -+ high = semanage_port_get_high(u) -+ if (name, proto) not in dict.keys(): -+ dict[(name,proto)]=[] -+ if low == high: -+ dict[(name,proto)].append("%d" % low) -+ else: -+ dict[(name,proto)].append("%d-%d" % (low, high)) -+ for i in dict.keys(): -+ rec = "%-30s %-8s " % i -+ rec += "%s" % dict[i][0] -+ for p in dict[i][1:]: -+ rec += ", %s" % p -+ print rec - - if __name__ == '__main__': + def delete(self, port, proto): +@@ -317,7 +317,7 @@ -- def usage(message=""): -+ def usage(message = ""): - print '\ - semanage user [-admsRrh] SELINUX_USER\n\ - semanage login [-admsrh] LOGIN_NAME\n\ --semanage port [-admth] SELINUX_PORT_NAME\n\ -+semanage port [-admth] PORT | PORTRANGE\n\ - -a, --add Add a OBJECT record NAME\n\ - -d, --delete Delete a OBJECT record NAME\n\ - -h, --help display this message\n\ - -l, --list List the OBJECTS\n\ -+ -n, --noheading Do not print heading when listing OBJECTS\n\ - -m, --modify Modify a OBJECT record NAME\n\ - -r, --range MLS/MCS Security Range\n\ - -R, --roles SELinux Roles (Separate by spaces)\n\ -@@ -245,33 +391,40 @@ - # - # - try: -- objectlist=("login", "user", "port") -- input=sys.stdin -- output=sys.stdout -- serange="s0" -- selevel="s0" -- roles="" -- seuser="" -- type="" -- add=0 -- modify=0 -- delete=0 -- list=0 -+ objectlist = ("login", "user", "port") -+ input = sys.stdin -+ output = sys.stdout -+ serange = "" -+ port = "" -+ proto = "" -+ selevel = "" -+ setype = "" -+ roles = "" -+ seuser = "" -+ heading=1 -+ -+ add = 0 -+ modify = 0 -+ delete = 0 -+ list = 0 - if len(sys.argv) < 3: - usage("Requires 2 or more arguments") - -- object=sys.argv[1] -+ object = sys.argv[1] - if object not in objectlist: - usage("%s not defined" % object) - -- args=sys.argv[2:] -+ args = sys.argv[2:] - gopts, cmds = getopt.getopt(args, -- 'adlhms:R:r:t:v', -+ 'adlhmnp:P:s:R:r:t:v', - ['add', - 'delete', - 'help', - 'list', - 'modify', -+ 'noheading', -+ 'port=', -+ 'proto=', - 'seuser=', - 'range=', - 'roles=', -@@ -282,88 +435,95 @@ - if o == "-a" or o == "--add": - if modify or delete: - usage() -- add=1 -+ add = 1 - - if o == "-d" or o == "--delese": - if modify or add: - usage() -- delete=1 -+ delete = 1 - if o == "-h" or o == "--help": - usage() - -+ if o == "-n" or o == "--nohead": -+ heading=0 -+ - if o == "-m"or o == "--modify": - if delete or add: - usage() -- modify=1 -+ modify = 1 - - if o == "-r" or o == '--range': -- serange=a -+ serange = a -+ -+ if o == "-P" or o == '--proto': -+ proto = a - - if o == "-R" or o == '--roles': -- roles=a -+ roles = a - - if o == "-t" or o == "--type": -- type=a -+ setype = a - - if o == "-l" or o == "--list": -- list=1 -+ list = 1 - - if o == "-s" or o == "--seuser": -- seuser=a -+ seuser = a - - if o == "-v" or o == "--verbose": -- verbose=1 -+ verbose = 1 - - if object == "login": -- OBJECT=loginRecords() -+ OBJECT = loginRecords() - - if object == "user": -- OBJECT=seluserRecords() -+ OBJECT = seluserRecords() - - if object == "port": -- OBJECT=portRecords() -+ OBJECT = portRecords() + semanage_begin_transaction(self.sh) + semanage_port_del_local(self.sh, k) +- if semanage_commit(self.sh) != 0: ++ if semanage_commit(self.sh) < 0: + raise ValueError("Port %s/%s not defined" % (proto,port)) - if list: -- OBJECT.list() -+ OBJECT.list(heading) - sys.exit(0); - - if len(cmds) != 1: - usage() - -- name=cmds[0] -+ target = cmds[0] - - if add: - if object == "login": -- OBJECT.add(name, seuser, serange) -+ OBJECT.add(target, seuser, serange) - - if object == "user": -- rlist=roles.split() -- print rlist -- OBJECT.add(name, rlist, selevel, serange) -+ rlist = roles.split() -+ if len(rlist) == 0: -+ raise ValueError("You must specify a role") -+ OBJECT.add(target, rlist, selevel, serange) - - if object == "port": -- OBJECT.add(name, type) -+ OBJECT.add(target, proto, serange, setype) - -- OBJECT.list() - sys.exit(0); - - if modify: - if object == "login": -- OBJECT.modify(name, seuser, serange) -+ OBJECT.modify(target, seuser, serange) - - if object == "user": -- rlist=roles.split() -- print rlist -- OBJECT.modify(name, rlist, selevel, serange) -+ rlist = roles.split() -+ OBJECT.modify(target, rlist, selevel, serange) - - if object == "port": -- OBJECT.modify(name, type) -+ OBJECT.modify(target, proto, serange, setype) - sys.exit(0); -- OBJECT.list() - sys.exit(0); - - if delete: -- OBJECT.delete(name) -+ if object == "port": -+ OBJECT.delete(target, proto) -+ else: -+ OBJECT.delete(target) - sys.exit(0); - usage() - -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/tests/semanage_test policycoreutils-1.29.2/semanage/tests/semanage_test ---- nsapolicycoreutils/semanage/tests/semanage_test 1969-12-31 19:00:00.000000000 -0500 -+++ policycoreutils-1.29.2/semanage/tests/semanage_test 2006-01-02 14:33:44.000000000 -0500 -@@ -0,0 +1,67 @@ -+#!/bin/sh -x -+# -+# This is a test script for the semanage command -+# -+echo " -+ -+******************** semanage List Failue test ************************ -+" -+semanage -l -+echo " -+ -+******************** semanage Mapping test ************************ -+" -+echo " * Mapping List test" -+semanage login -l -+echo " * Add mapping exist test" -+semanage login -a root -+echo " * Add new test" -+echo " * Add selinux login to selinux user mapping, username wrong" -+semanage login -a semanage_test1 -+userdel -r semanage_test1 2> /dev/null -+useradd semanage_test1 -+echo " * Add selinux login to selinux user mapping, Bad SELinux User" -+semanage login -a -s BadUser semanage_test1 -+echo " * Add selinux login to selinux user mapping, username correct" -+semanage login -a semanage_test1 -+semanage login -l -+userdel -r semanage_test1 -+echo " * remove selinux login to selinux user mapping, username wrong" -+semanage login -d semanage_test2 -+echo " * remove selinux login to selinux user mapping, username correct" -+semanage login -d semanage_test1 -+semanage login -l -+ -+echo " -+ -+******************** semanage SELinux User test ************************ -+" -+echo " * SELinux User List test" -+semanage user -l -+echo " * Add SELinux User exist test: Fail because root exist" -+semanage user -a -R user_r root -+echo " * Add SELinux User exist test: Fail because no role specified" -+semanage user -a -r s0 semanage_test1 -+echo " * Add selinux user semanage_test1: Success" -+semanage user -a -R user_r -r s0 semanage_test1 -+semanage user -l -+echo " * Modify selinux user semanage_test1 Failue bad range" -+semanage user -m -r BadRange semanage_test1 -+echo " * Modify selinux user semanage_test1 Failue bad role" -+semanage user -m -R BadRole semanage_test1 -+echo " * Modify selinux user semanage_test1" -+semanage user -m -r s0:c1,c5 semanage_test1 -+semanage user -l -+echo " * Delete selinux user semanage_test2: Fail does not exist" -+semanage user -d semanage_test2 -+echo " * Delete selinux user semanage_test1" -+semanage user -d semanage_test1 -+semanage user -l -+ -+#echo " -+# -+#******************** semanage SELinux ports test ************************ -+#" -+semanage port -l -+semanage port -a -P tcp 123456 -+semanage port -d -P tcp 123456 + def list(self, heading=1): Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- policycoreutils.spec 2 Jan 2006 19:35:53 -0000 1.207 +++ policycoreutils.spec 4 Jan 2006 18:53:17 -0000 1.208 @@ -1,10 +1,10 @@ -%define libsepolver 1.11.1-2 -%define libsemanagever 1.5.3-3 -%define libselinuxver 1.29.2-1 +%define libsepolver 1.11.2-2 +%define libsemanagever 1.5.4-3 +%define libselinuxver 1.29.3-2 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.29.2 -Release: 10 +Version: 1.29.3 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -96,6 +96,19 @@ %config(noreplace) %{_sysconfdir}/sestatus.conf %changelog +* Wed Jan 4 2006 Dan Walsh 1.29.3-1 +- Update to match NSA + * Merged semanage getpwnam bug fix from Serge Hallyn (IBM). + * Merged patch series from Ivan Gyurdiev. + This includes patches to: + - cleanup setsebool + - update setsebool to apply active booleans through libsemanage + - update semodule to use the new semanage_set_rebuild() interface + - fix various bugs in semanage + * Merged patch from Dan Walsh (Red Hat). + This includes fixes for restorecon, chcat, fixfiles, genhomedircon, + and semanage. + * Mon Jan 2 2006 Dan Walsh 1.29.2-10 - Fix restorecon to not say it is changing user section when -vv is specified Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- sources 14 Dec 2005 20:34:32 -0000 1.95 +++ sources 4 Jan 2006 18:53:17 -0000 1.96 @@ -1 +1 @@ -db981cfd14f597746ed87ada3a815d0e policycoreutils-1.29.2.tgz +cc6c24f4661760764c33ec8786f3efee policycoreutils-1.29.3.tgz From fedora-cvs-commits at redhat.com Wed Jan 4 18:55:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:55:28 -0500 Subject: rpms/checkpolicy/devel checkpolicy.spec,1.83,1.84 Message-ID: <200601041855.k04ItSiS018440@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/checkpolicy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18414 Modified Files: checkpolicy.spec Log Message: * Wed Jan 4 2006 Dan Walsh 1.28-3 - Rebuild to get latest libsepol Index: checkpolicy.spec =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- checkpolicy.spec 16 Dec 2005 14:18:43 -0000 1.83 +++ checkpolicy.spec 4 Jan 2006 18:55:25 -0000 1.84 @@ -1,8 +1,8 @@ -%define libsepolver 1.11.1-1 +%define libsepolver 1.11.2-2 Summary: SELinux policy compiler Name: checkpolicy Version: 1.28 -Release: 2 +Release: 3 License: GPL Group: Development/System Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -47,6 +47,9 @@ %{_mandir}/man8/checkmodule.8.gz %changelog +* Wed Jan 4 2006 Dan Walsh 1.28-3 +- Rebuild to get latest libsepol + * Fri Dec 16 2005 Dan Walsh 1.28-2 - Rebuild to get latest libsepol From fedora-cvs-commits at redhat.com Wed Jan 4 18:55:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:55:44 -0500 Subject: rpms/cups/FC-3 cups-CVE-2005-3625, 6, 7.patch, NONE, 1.1 cups.spec, 1.67, 1.68 Message-ID: <200601041855.k04Iti7N018581@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv18550 Modified Files: cups.spec Added Files: cups-CVE-2005-3625,6,7.patch Log Message: * Wed Jan 4 2006 Tim Waugh 1:1.1.22-0.rc1.8.9 - Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627 (bug #176870). ***** Not enough context to create diffstat for file: cups-CVE-2005-3625,6,7.patch,NONE,1.1 ***** Not enough context to create diff for file: cups-CVE-2005-3625,6,7.patch,NONE,1.1 Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-3/cups.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- cups.spec 14 Dec 2005 17:36:31 -0000 1.67 +++ cups.spec 4 Jan 2006 18:55:42 -0000 1.68 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.22 -Release: 0.rc1.8.8 +Release: 0.rc1.8.9 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}rc1-source.tar.bz2 @@ -50,7 +50,8 @@ Patch35: cups-CAN-2005-0064.patch Patch36: cups-CAN-2005-2097.patch Patch37: cups-CVE-2005-3191_2_3.patch -Patch38: cups-dbus.patch +Patch38: cups-CVE-2005-3625,6,7.patch +Patch39: cups-dbus.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -136,8 +137,9 @@ %patch35 -p1 -b .CAN-2005-0064 %patch36 -p1 -b .CAN-2005-2097 %patch37 -p1 -b .CVE-2005-3191_2_3 +%patch38 -p1 -b .CVE-2005-3625,6,7 %if %use_dbus -%patch38 -p1 -b .dbus +%patch39 -p1 -b .dbus %endif perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in aclocal -I config-scripts @@ -361,6 +363,10 @@ %{_includedir}/cups %changelog +* Wed Jan 4 2006 Tim Waugh 1:1.1.22-0.rc1.8.9 +- Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627 + (bug #176870). + * Wed Dec 14 2005 Tim Waugh 1:1.1.22-0.rc1.8.8 - Applied patch to fix CVE-2005-3191/2/3 (bug #175646). From fedora-cvs-commits at redhat.com Wed Jan 4 18:57:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 13:57:32 -0500 Subject: rpms/policycoreutils/devel policycoreutils.spec,1.208,1.209 Message-ID: <200601041857.k04IvWux019291@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19253 Modified Files: policycoreutils.spec Log Message: * Wed Jan 4 2006 Dan Walsh 1.29.3-1 - Update to match NSA * Merged semanage getpwnam bug fix from Serge Hallyn (IBM). * Merged patch series from Ivan Gyurdiev. This includes patches to: - cleanup setsebool - update setsebool to apply active booleans through libsemanage - update semodule to use the new semanage_set_rebuild() interface - fix various bugs in semanage * Merged patch from Dan Walsh (Red Hat). This includes fixes for restorecon, chcat, fixfiles, genhomedircon, and semanage. Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- policycoreutils.spec 4 Jan 2006 18:53:17 -0000 1.208 +++ policycoreutils.spec 4 Jan 2006 18:57:29 -0000 1.209 @@ -1,5 +1,5 @@ %define libsepolver 1.11.2-2 -%define libsemanagever 1.5.4-3 +%define libsemanagever 1.5.4-1 %define libselinuxver 1.29.3-2 Summary: SELinux policy core utilities. Name: policycoreutils From fedora-cvs-commits at redhat.com Wed Jan 4 19:02:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 14:02:19 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.19, 1.20 policy-20051208.patch, 1.35, 1.36 selinux-policy.spec, 1.72, 1.73 sources, 1.20, 1.21 Message-ID: <200601041902.k04J2JLn020567@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20547 Modified Files: .cvsignore policy-20051208.patch selinux-policy.spec sources Log Message: * Wed Jan 4 2006 Dan Walsh 2.1.7-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 14 Dec 2005 22:06:38 -0000 1.19 +++ .cvsignore 4 Jan 2006 19:02:16 -0000 1.20 @@ -20,3 +20,4 @@ serefpolicy-2.1.4.tgz serefpolicy-2.1.5.tgz serefpolicy-2.1.6.tgz +serefpolicy-2.1.7.tgz policy-20051208.patch: Makefile | 2 Rules.modular | 10 config/appconfig-strict-mcs/default_type | 6 config/appconfig-strict-mls/default_type | 7 config/appconfig-strict-mls/initrc_context | 2 config/appconfig-targeted-mcs/default_type | 2 config/appconfig-targeted-mls/default_type | 2 config/appconfig-targeted-mls/initrc_context | 2 man/man8/ftpd_selinux.8 | 56 ++++ man/man8/httpd_selinux.8 | 123 ++++++++ man/man8/kerberos_selinux.8 | 31 ++ man/man8/named_selinux.8 | 29 ++ man/man8/nfs_selinux.8 | 30 ++ man/man8/nis_selinux.8 | 1 man/man8/rsync_selinux.8 | 41 ++ man/man8/samba_selinux.8 | 60 ++++ man/man8/ypbind_selinux.8 | 19 + policy/global_tunables | 3 policy/mcs | 321 ++++------------------- policy/mls | 371 +++++---------------------- policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 9 policy/modules/admin/logrotate.te | 4 policy/modules/admin/rpm.fc | 1 policy/modules/admin/rpm.te | 19 - policy/modules/admin/tmpreaper.te | 3 policy/modules/admin/usermanage.te | 15 - policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 + policy/modules/apps/java.te | 25 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.te | 6 policy/modules/kernel/corenetwork.te.in | 12 policy/modules/kernel/devices.fc | 9 policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.fc | 27 + policy/modules/kernel/files.if | 17 + policy/modules/kernel/kernel.if | 3 policy/modules/kernel/kernel.te | 30 +- policy/modules/kernel/mls.te | 9 policy/modules/kernel/selinux.te | 2 policy/modules/kernel/storage.fc | 46 +-- policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 9 policy/modules/services/bind.if | 19 + policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 3 policy/modules/services/cups.te | 7 policy/modules/services/cvs.fc | 2 policy/modules/services/cvs.te | 6 policy/modules/services/dbus.te | 1 policy/modules/services/dovecot.te | 2 policy/modules/services/hal.te | 4 policy/modules/services/ldap.te | 4 policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 103 +++++++ policy/modules/services/mta.te | 13 policy/modules/services/ppp.te | 4 policy/modules/services/prelink.fc | 7 policy/modules/services/prelink.if | 39 ++ policy/modules/services/prelink.te | 64 ++++ policy/modules/services/remotelogin.te | 1 policy/modules/services/samba.if | 1 policy/modules/services/sasl.te | 8 policy/modules/services/sendmail.te | 36 -- policy/modules/services/ssh.te | 10 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 12 policy/modules/system/authlogin.te | 1 policy/modules/system/getty.te | 3 policy/modules/system/hostname.if | 15 + policy/modules/system/hostname.te | 37 -- policy/modules/system/init.if | 14 + policy/modules/system/init.te | 22 + policy/modules/system/iptables.te | 2 policy/modules/system/libraries.fc | 8 policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 2 policy/modules/system/logging.fc | 7 policy/modules/system/logging.if | 21 + policy/modules/system/logging.te | 5 policy/modules/system/lvm.te | 2 policy/modules/system/mount.te | 2 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 11 policy/modules/system/udev.fc | 1 policy/modules/system/udev.te | 4 policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.te | 9 policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 35 ++ policy/modules/system/userdomain.te | 16 + policy/users | 8 99 files changed, 1337 insertions(+), 723 deletions(-) Index: policy-20051208.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20051208.patch,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- policy-20051208.patch 3 Jan 2006 17:21:11 -0000 1.35 +++ policy-20051208.patch 4 Jan 2006 19:02:16 -0000 1.36 @@ -3343,8 +3343,23 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.6/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2005-12-06 19:49:51.000000000 -0500 -+++ serefpolicy-2.1.6/policy/modules/system/userdomain.if 2005-12-24 07:50:10.000000000 -0500 -@@ -568,6 +568,7 @@ ++++ serefpolicy-2.1.6/policy/modules/system/userdomain.if 2006-01-03 15:44:08.000000000 -0500 +@@ -420,6 +420,14 @@ + files_search_var_lib($1_t) + ') + ++ optional_policy(`su',` ++ su_per_userdomain_template($1,$1_t,$1_r) ++ ') ++ ++ optional_policy(`sudo',` ++ sudo_per_userdomain_template($1,$1_t,$1_r) ++ ') ++ + optional_policy(`samba',` + samba_connect_winbind($1_t) + ') +@@ -568,6 +576,7 @@ corenet_dontaudit_tcp_bind_all_reserved_ports($1_t) files_read_etc_files($1_t) @@ -3352,7 +3367,7 @@ files_list_home($1_t) files_read_usr_files($1_t) files_exec_usr_files($1_t) -@@ -1880,9 +1881,14 @@ +@@ -1880,9 +1889,14 @@ type sysadm_home_dir_t; ') @@ -3367,7 +3382,7 @@ ######################################## ## ## Search the sysadm users home directory. -@@ -1913,8 +1919,12 @@ +@@ -1913,8 +1927,12 @@ type sysadm_home_dir_t; ') @@ -3380,7 +3395,7 @@ ######################################## ## -@@ -2644,6 +2654,23 @@ +@@ -2644,6 +2662,23 @@ ######################################## ## Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- selinux-policy.spec 3 Jan 2006 18:23:17 -0000 1.72 +++ selinux-policy.spec 4 Jan 2006 19:02:16 -0000 1.73 @@ -2,16 +2,16 @@ %define direct_initrc y %define monolithic n %define POLICYVER 20 -%define POLICYCOREUTILSVER 1.29.1-1 -%define CHECKPOLICYVER 1.28-2 +%define POLICYCOREUTILSVER 1.29.3-1 +%define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.1.6 -Release: 24 +Version: 2.1.7 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz -patch: policy-20051208.patch +patch: policy-20060104.patch Source1: modules-targeted.conf Source2: booleans-targeted.conf Source3: seusers-targeted @@ -41,7 +41,7 @@ Obsoletes: selinux-policy-targeted-sources Prereq: policycoreutils >= %{POLICYCOREUTILSVER} Prereq: coreutils -Requires: selinux-policy +Prereq: selinux-policy = %{version}-%{release} %description targeted SELinux Reference policy targeted base module. @@ -211,7 +211,7 @@ Obsoletes: selinux-policy-mls-sources Prereq: policycoreutils >= %{POLICYCOREUTILSVER} Prereq: coreutils -Requires: selinux-policy +Prereq: selinux-policy = %{version}-%{release} %description mls SELinux Reference policy mls base module. @@ -237,7 +237,7 @@ Obsoletes: selinux-policy-strict-sources Prereq: policycoreutils >= %{POLICYCOREUTILSVER} Prereq: coreutils -Requires: selinux-policy +Prereq: selinux-policy = %{version}-%{release} %description strict SELinux Reference policy strict base module. @@ -258,6 +258,9 @@ %endif %changelog +* Wed Jan 4 2006 Dan Walsh 2.1.7-1 +- Update to upstream + * Tue Jan 3 2006 Dan Walsh 2.1.6-24 - Fix "libsemanage.parse_module_headers: Data did not represent a module." problem Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 14 Dec 2005 22:06:38 -0000 1.20 +++ sources 4 Jan 2006 19:02:16 -0000 1.21 @@ -1 +1 @@ -46ab1ddb6f3fe5dc46873b5560ddea11 serefpolicy-2.1.6.tgz +324533d57b4d149d1b6f4fdfda93567f serefpolicy-2.1.7.tgz From fedora-cvs-commits at redhat.com Wed Jan 4 19:20:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 14:20:39 -0500 Subject: rpms/selinux-policy/devel selinux-policy.spec,1.73,1.74 Message-ID: <200601041920.k04JKdYJ006011@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5981 Modified Files: selinux-policy.spec Log Message: * Wed Jan 4 2006 Dan Walsh 2.1.7-1 - Update to upstream Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- selinux-policy.spec 4 Jan 2006 19:02:16 -0000 1.73 +++ selinux-policy.spec 4 Jan 2006 19:20:36 -0000 1.74 @@ -6,7 +6,7 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.1.7 +Version: 1.1.7 Release: 1 License: GPL Group: System Environment/Base From fedora-cvs-commits at redhat.com Wed Jan 4 19:21:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 14:21:39 -0500 Subject: rpms/selinux-policy/devel selinux-policy.spec,1.74,1.75 Message-ID: <200601041921.k04JLd9J006489@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6461 Modified Files: selinux-policy.spec Log Message: * Wed Jan 4 2006 Dan Walsh 2.1.7-1 - Update to upstream Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- selinux-policy.spec 4 Jan 2006 19:20:36 -0000 1.74 +++ selinux-policy.spec 4 Jan 2006 19:21:36 -0000 1.75 @@ -6,7 +6,7 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 1.1.7 +Version: 2.1.7 Release: 1 License: GPL Group: System Environment/Base From fedora-cvs-commits at redhat.com Wed Jan 4 19:24:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 14:24:27 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch,NONE,1.1 Message-ID: <200601041924.k04JOR5G007854@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7823 Added Files: policy-20060104.patch Log Message: * Wed Jan 4 2006 Dan Walsh 2.1.7-1 - Update to upstream policy-20060104.patch: Makefile | 2 Rules.modular | 10 config/appconfig-strict-mcs/default_type | 6 config/appconfig-strict-mls/default_type | 7 config/appconfig-strict-mls/initrc_context | 2 config/appconfig-targeted-mcs/default_type | 2 config/appconfig-targeted-mls/default_type | 2 config/appconfig-targeted-mls/initrc_context | 2 man/man8/ftpd_selinux.8 | 56 ++++ man/man8/httpd_selinux.8 | 123 ++++++++ man/man8/kerberos_selinux.8 | 31 ++ man/man8/named_selinux.8 | 29 ++ man/man8/nfs_selinux.8 | 30 ++ man/man8/nis_selinux.8 | 1 man/man8/rsync_selinux.8 | 41 ++ man/man8/samba_selinux.8 | 60 ++++ man/man8/ypbind_selinux.8 | 19 + policy/global_tunables | 3 policy/mcs | 321 ++++------------------- policy/mls | 371 +++++---------------------- policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 9 policy/modules/admin/logrotate.te | 4 policy/modules/admin/rpm.fc | 1 policy/modules/admin/rpm.te | 19 - policy/modules/admin/tmpreaper.te | 3 policy/modules/admin/usermanage.te | 15 - policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 + policy/modules/apps/java.te | 25 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.te | 6 policy/modules/kernel/corenetwork.te.in | 12 policy/modules/kernel/devices.fc | 9 policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.fc | 27 + policy/modules/kernel/files.if | 17 + policy/modules/kernel/kernel.if | 3 policy/modules/kernel/kernel.te | 30 +- policy/modules/kernel/mls.te | 9 policy/modules/kernel/selinux.te | 2 policy/modules/kernel/storage.fc | 46 +-- policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 9 policy/modules/services/bind.if | 19 + policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 3 policy/modules/services/cups.te | 7 policy/modules/services/cvs.fc | 2 policy/modules/services/cvs.te | 6 policy/modules/services/dbus.te | 1 policy/modules/services/dovecot.te | 2 policy/modules/services/hal.te | 4 policy/modules/services/ldap.te | 4 policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 103 +++++++ policy/modules/services/mta.te | 13 policy/modules/services/nscd.te | 1 policy/modules/services/ntp.te | 2 policy/modules/services/ppp.te | 4 policy/modules/services/prelink.fc | 7 policy/modules/services/prelink.if | 39 ++ policy/modules/services/prelink.te | 64 ++++ policy/modules/services/remotelogin.te | 1 policy/modules/services/samba.if | 3 policy/modules/services/sasl.te | 8 policy/modules/services/sendmail.te | 36 -- policy/modules/services/ssh.te | 10 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 12 policy/modules/system/authlogin.te | 1 policy/modules/system/getty.te | 3 policy/modules/system/hostname.if | 15 + policy/modules/system/hostname.te | 37 -- policy/modules/system/init.if | 14 + policy/modules/system/init.te | 22 + policy/modules/system/iptables.te | 2 policy/modules/system/libraries.fc | 126 ++++----- policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 2 policy/modules/system/logging.fc | 7 policy/modules/system/logging.if | 21 + policy/modules/system/logging.te | 5 policy/modules/system/lvm.te | 2 policy/modules/system/mount.te | 2 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 11 policy/modules/system/udev.fc | 1 policy/modules/system/udev.te | 4 policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.te | 13 policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 27 + policy/modules/system/userdomain.te | 17 + policy/users | 8 101 files changed, 1391 insertions(+), 789 deletions(-) --- NEW FILE policy-20060104.patch --- diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/default_type serefpolicy-2.1.7/config/appconfig-strict-mcs/default_type --- nsaserefpolicy/config/appconfig-strict-mcs/default_type 2005-11-14 18:24:05.000000000 -0500 +++ serefpolicy-2.1.7/config/appconfig-strict-mcs/default_type 2006-01-04 10:50:14.000000000 -0500 @@ -1,3 +1,3 @@ -sysadm_r:sysadm_t:s0 -staff_r:staff_t:s0 -user_r:user_t:s0 +sysadm_r:sysadm_t +staff_r:staff_t +user_r:user_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.1.7/config/appconfig-strict-mls/default_type --- nsaserefpolicy/config/appconfig-strict-mls/default_type 2005-11-14 18:24:05.000000000 -0500 +++ serefpolicy-2.1.7/config/appconfig-strict-mls/default_type 2006-01-04 10:50:14.000000000 -0500 @@ -1,3 +1,4 @@ -sysadm_r:sysadm_t:s0 -staff_r:staff_t:s0 -user_r:user_t:s0 +sysadm_r:sysadm_t +secadm_r:secadm_t +staff_r:staff_t +user_r:user_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/initrc_context serefpolicy-2.1.7/config/appconfig-strict-mls/initrc_context --- nsaserefpolicy/config/appconfig-strict-mls/initrc_context 2005-11-14 18:24:05.000000000 -0500 +++ serefpolicy-2.1.7/config/appconfig-strict-mls/initrc_context 2006-01-04 10:50:14.000000000 -0500 @@ -1 +1 @@ -system_u:system_r:initrc_t:s0 +system_u:system_r:initrc_t:s0-s15:c0.c255 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/default_type serefpolicy-2.1.7/config/appconfig-targeted-mcs/default_type --- nsaserefpolicy/config/appconfig-targeted-mcs/default_type 2005-11-14 18:24:05.000000000 -0500 +++ serefpolicy-2.1.7/config/appconfig-targeted-mcs/default_type 2006-01-04 10:50:14.000000000 -0500 @@ -1 +1 @@ -system_r:unconfined_t:s0 +system_r:unconfined_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mls/default_type serefpolicy-2.1.7/config/appconfig-targeted-mls/default_type --- nsaserefpolicy/config/appconfig-targeted-mls/default_type 2005-11-14 18:24:05.000000000 -0500 +++ serefpolicy-2.1.7/config/appconfig-targeted-mls/default_type 2006-01-04 10:50:14.000000000 -0500 @@ -1 +1 @@ -system_r:unconfined_t:s0 +system_r:unconfined_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mls/initrc_context serefpolicy-2.1.7/config/appconfig-targeted-mls/initrc_context --- nsaserefpolicy/config/appconfig-targeted-mls/initrc_context 2005-11-14 18:24:05.000000000 -0500 +++ serefpolicy-2.1.7/config/appconfig-targeted-mls/initrc_context 2006-01-04 10:50:14.000000000 -0500 @@ -1 +1 @@ -user_u:system_r:unconfined_t:s0 +user_u:system_r:unconfined_t:s0-s15:c0.c255 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.7/Makefile --- nsaserefpolicy/Makefile 2005-12-09 23:35:04.000000000 -0500 +++ serefpolicy-2.1.7/Makefile 2006-01-04 10:50:14.000000000 -0500 @@ -92,7 +92,7 @@ # enable MLS if requested. ifneq ($(findstring -mls,$(TYPE)),) - override M4PARAM += -D enable_mls + override M4PARAM += -D enable_mls -D separate_secadm override CHECKPOLICY += -M override CHECKMODULE += -M endif diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-2.1.7/man/man8/ftpd_selinux.8 --- nsaserefpolicy/man/man8/ftpd_selinux.8 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-2.1.7/man/man8/ftpd_selinux.8 2006-01-04 10:50:14.000000000 -0500 @@ -0,0 +1,56 @@ +.TH "ftpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "ftpd Selinux Policy documentation" +.SH "NAME" +ftpd_selinux \- Security Enhanced Linux Policy for the ftp daemon +.SH "DESCRIPTION" + +Security-Enhanced Linux secures the ftpd server via flexible mandatory access +control. +.SH FILE_CONTEXTS +SELinux requires files to have an extended attribute to define the file type. +Policy governs the access daemons have to these files. +If you want to share files anonymously, you must label the files and directories public_content_t. So if you created a special directory /var/ftp, you would need to label the directory with the chcon tool. +.TP +chcon -R -t public_content_t /var/ftp +.TP +If you want to setup a directory where you can upload files to you must label the files and directories ftpd_anon_rw_t. So if you created a special directory /var/ftp/incoming, you would need to label the directory with the chcon tool. +.TP +chcon -t public_content_rw_t /var/ftp/incoming +.TP +You must also turn on the boolean allow_ftp_anon_write. +.TP +setsebool -P allow_ftp_anon_write=1 +.TP +If you want to make this permanant, i.e. survive a relabel, you must add an entry to the file_contexts.local file. +.TP +/etc/selinux/POLICYTYPE/contexts/files/file_contexts.local +.br +/var/ftp(/.*)? system_u:object_r:public_content_t +/var/ftp/incoming(/.*)? system_u:object_r:public_content_rw_t + +.SH BOOLEANS +SELinux ftp daemon policy is customizable based on least access required. So by +default SElinux does not allow users to login and read their home directories. +.br +If you are setting up this machine as a ftpd server and wish to allow users to access their home +directorories, you need to set the ftp_home_dir boolean. +.TP +setsebool -P ftp_home_dir 1 +.TP +ftpd can run either as a standalone daemon or as part of the xinetd domain. If you want to run ftpd as a daemon you must set the ftpd_is_daemon boolean. +.TP +setsebool -P ftpd_is_daemon 1 +.TP +You can disable SELinux protection for the ftpd daemon by executing: +.TP +setsebool -P ftpd_disable_trans 1 +.br +service vsftpd restart +.TP +system-config-securitylevel is a GUI tool available to customize SELinux policy settings. +.SH AUTHOR +This manual page was written by Dan Walsh . + +.SH "SEE ALSO" +selinux(8), ftpd(8), chcon(1), setsebool(8) + + diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-2.1.7/man/man8/httpd_selinux.8 --- nsaserefpolicy/man/man8/httpd_selinux.8 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-2.1.7/man/man8/httpd_selinux.8 2006-01-04 10:50:14.000000000 -0500 @@ -0,0 +1,123 @@ +.TH "httpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "httpd Selinux Policy documentation" +.SH "NAME" +httpd_selinux \- Security Enhanced Linux Policy for the httpd daemon +.SH "DESCRIPTION" + +Security-Enhanced Linux secures the httpd server via flexible mandatory access +control. +.SH FILE_CONTEXTS +SELinux requires files to have an extended attribute to define the file type. +Policy governs the access daemons have to these files. +SELinux httpd policy is very flexible allowing users to setup their web services in as secure a method as possible. +.TP +The following file contexts types are defined for httpd: +.br + +httpd_sys_content_t +.br +- Set files with httpd_sys_content_t for content which is available from all httpd scripts and the daemon. +.br + +httpd_sys_script_exec_t +.br +- Set cgi scripts with httpd_sys_script_exec_t to allow them to run with access to all sys types. +.br + +httpd_sys_script_ro_t +.br +- Set files with httpd_sys_script_ro_t if you want httpd_sys_script_exec_t scripts to read the data, and disallow other sys scripts from access. +.br + +httpd_sys_script_rw_t +.br +- Set files with httpd_sys_script_rw_t if you want httpd_sys_script_exec_t scripts to read/write the data, and disallow other non sys scripts from access. +.br + +httpd_sys_script_ra_t +.br +- Set files with httpd_sys_script_ra_t if you want httpd_sys_script_exec_t scripts to read/append to the file, and disallow other non sys scripts from access. + +httpd_unconfined_script_exec_t +.br +- Set cgi scripts with httpd_unconfined_script_exec_t to allow them to run without any SELinux protection. This should only be used for a very complex httpd scripts, after exhausting all other options. It is better to use this script rather than turning off SELinux protection for httpd. +.br + +.SH NOTE +With certain policies you can define addional file contexts based on roles like user or staff. httpd_user_script_exec_t can be defined where it would only have access to "user" contexts. + +.SH SHARING FILES +If you want to share files with multiple domains (Apache, FTP, rsync, Samba), you can set a file context of public_content_t and public_content_rw_t. These context allow any of the above domains to read the content. If you want a particular domain to write to the public_content_rw_t domain, you must set the appropriate boolean. allow_DOMAIN_anon_write. So for httpd you would execute: + +setsebool -P allow_httpd_anon_write=1 + +or + +setsebool -P allow_httpd_sys_script_anon_write=1 + +.SH BOOLEANS +SELinux policy is customizable based on least access required. So by +default SElinux prevents certain http scripts from working. httpd policy is extremely flexible and has several booleans that allow you to manipulate the policy and run httpd with the tightest access possible. +.TP +httpd can be setup to allow cgi scripts to be executed, set httpd_enable_cgi to allow this +.br + +setsebool -P httpd_enable_cgi 1 + +.TP +httpd by default is not allowed to access users home directories. If you want to allow access to users home directories you need to set the httpd_enable_homedirs boolean and change the context of the files that you want people to access off the home dir. +.br + +setsebool -P httpd_enable_homedirs 1 +.br +chcon -R -t httpd_sys_content_t ~user/public_html + +.TP +httpd by default is not allowed access to the controling terminal. In most cases this is prefered, because an intruder might be able to use the access to the terminal to gain privileges. But in certain situations httpd needs to prompt for a password to open a certificate file, in these cases, terminal access is required. Set the httpd_tty_comm boolean to allow terminal access. +.br + +setsebool -P httpd_tty_comm 1 [...3314 lines suppressed...] + optional_policy(`sendmail',` + sendmail_domtrans(unconfined_t) + ') + ifdef(`TODO',` ifdef(`use_mcs',` rw_dir_create_file(sysadm_su_t, home_dir_type) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-2.1.7/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2005-11-15 09:13:40.000000000 -0500 +++ serefpolicy-2.1.7/policy/modules/system/userdomain.fc 2006-01-04 10:50:14.000000000 -0500 @@ -4,6 +4,6 @@ HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0) HOME_DIR/.+ gen_context(system_u:object_r:user_home_t,s0) ',` -HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0) +HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0-s15:c0.c255) HOME_DIR/.+ gen_context(system_u:object_r:ROLE_home_t,s0) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.7/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2005-12-06 19:49:51.000000000 -0500 +++ serefpolicy-2.1.7/policy/modules/system/userdomain.if 2006-01-04 11:35:09.000000000 -0500 @@ -568,6 +568,7 @@ corenet_dontaudit_tcp_bind_all_reserved_ports($1_t) files_read_etc_files($1_t) + files_read_etc_runtime_files($1_t) files_list_home($1_t) files_read_usr_files($1_t) files_exec_usr_files($1_t) @@ -1880,9 +1881,14 @@ type sysadm_home_dir_t; ') +ifdef(`targeted_policy', ` + dontaudit $1 user_home_dir_t:dir getattr; +', ` dontaudit $1 sysadm_home_dir_t:dir getattr; ') +') + ######################################## ## ## Search the sysadm users home directory. @@ -1913,8 +1919,12 @@ type sysadm_home_dir_t; ') +ifdef(`targeted_policy', ` + dontaudit $1 user_home_dir_t:dir search_dir_perms; +', ` dontaudit $1 sysadm_home_dir_t:dir search_dir_perms; ') +') ######################################## ## @@ -2644,6 +2654,23 @@ ######################################## ## +## Send a chld signal to local login processes. +## +## +## Domain allowed access. +## +# +interface(`userdom_all_users_sigchld',` + gen_require(` + attribute userdomain; + class process sigchld; + ') + + allow userdomain $1:process sigchld; +') + +######################################## +## ## Send general signals to all user domains. ## ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.1.7/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2005-12-09 23:35:10.000000000 -0500 +++ serefpolicy-2.1.7/policy/modules/system/userdomain.te 2006-01-04 11:28:50.000000000 -0500 @@ -2,7 +2,7 @@ policy_module(userdomain,1.1.0) gen_require(` - role sysadm_r, staff_r, user_r; + role sysadm_r, staff_r, user_r, secadm_r; ') ######################################## @@ -82,10 +82,14 @@ # dont need to use the full role_change() allow sysadm_r system_r; allow sysadm_r user_r; + allow secadm_r system_r; + allow secadm_r user_r; allow user_r system_r; allow user_r sysadm_r; allow system_r sysadm_r; allow system_r sysadm_r; + allow user_r secadm_r; + allow staff_r secadm_r; allow privhome user_home_t:dir manage_dir_perms; allow privhome user_home_t:file create_file_perms; @@ -99,8 +103,10 @@ optional_policy(`samba',` samba_per_userdomain_template(user) ') + ',` admin_user_template(sysadm) + admin_user_template(secadm) unpriv_user_template(staff) unpriv_user_template(user) @@ -111,6 +117,7 @@ # only staff_r can change to sysadm_r role_change(staff, sysadm) + role_change(staff, secadm) # this should be tunable_policy, but # currently type_change and RBAC allow @@ -143,6 +150,12 @@ domain_ptrace_all_domains(sysadm_t) ') + mls_process_read_up(sysadm_t) + + optional_policy(`logging',` + logging_read_auditd_log(sysadm_t) + ') + optional_policy(`amanda',` amanda_run_recover(sysadm_t,sysadm_r,admin_terminal) ') @@ -188,6 +201,7 @@ optional_policy(`hostname',` hostname_run(sysadm_t,sysadm_r,admin_terminal) + hostname_exec(userdomain) ') optional_policy(`ipsec',` @@ -311,4 +325,5 @@ optional_policy(`webalizer',` webalizer_run(sysadm_t,sysadm_r,admin_terminal) ') + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.7/policy/users --- nsaserefpolicy/policy/users 2005-12-05 22:35:02.000000000 -0500 +++ serefpolicy-2.1.7/policy/users 2006-01-04 10:50:14.000000000 -0500 @@ -26,7 +26,9 @@ ifdef(`targeted_policy',` gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) ',` -gen_user(user_u, user_r, s0, s0 - s15:c0.c255, c0.c255) +gen_user(user_u, user_r, s0, s0 - s0, c0) +gen_user(staff_u, staff_r secadm_r sysadm_r, s0, s0 - s15:c0.c255, c0.c255) +gen_user(sysadm_u, sysadm_r, s0, s0 - s15:c0.c255, c0.c255) ') # @@ -40,8 +42,8 @@ gen_user(root, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) ',` ifdef(`direct_sysadm_daemon',` - gen_user(root, sysadm_r staff_r system_r, s0, s0 - s15:c0.c255, c0.c255) + gen_user(root, sysadm_r staff_r secadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) ',` - gen_user(root, sysadm_r staff_r, s0, s0 - s15:c0.c255, c0.c255) + gen_user(root, sysadm_r staff_r secadm_r , s0, s0 - s15:c0.c255, c0.c255) ') ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.1.7/Rules.modular --- nsaserefpolicy/Rules.modular 2005-12-09 23:35:04.000000000 -0500 +++ serefpolicy-2.1.7/Rules.modular 2006-01-04 10:50:14.000000000 -0500 @@ -170,6 +170,16 @@ ######################################## # +# Remove the dontaudit rules from the base.conf +# +enableaudit: base.conf + @test -d tmp || mkdir -p tmp + @echo "Removing dontaudit rules from base.conf" + $(QUIET) grep -v dontaudit base.conf > tmp/base.audit + $(QUIET) mv tmp/base.audit base.conf + +######################################## +# # Appconfig files # $(APPDIR)/customizable_types: base.conf From fedora-cvs-commits at redhat.com Wed Jan 4 19:34:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 14:34:15 -0500 Subject: rpms/crash/devel .cvsignore, 1.4, 1.5 crash.patch, 1.6, 1.7 crash.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200601041934.k04JYFRa010720@cvs.devel.redhat.com> Author: anderson Update of /cvs/dist/rpms/crash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10684 Modified Files: .cvsignore crash.patch crash.spec sources Log Message: Updated source package to crash-4.0.tar.gz, and crash.patch to bring it up to 4.0-2.18. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/crash/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Feb 2005 18:39:42 -0000 1.4 +++ .cvsignore 4 Jan 2006 19:34:09 -0000 1.5 @@ -1,2 +1,3 @@ crash-3.8.tar.gz crash-3.10.tar.gz +crash-4.0.tar.gz crash.patch: Makefile | 47 + README | 36 - alpha.c | 2 cmdline.c | 13 defs.h | 172 ++++ dev.c | 4 diskdump.c | 447 +++++++++++- diskdump.h | 58 + extensions.c | 7 extensions/Makefile | 41 + extensions/dminfo.c | 1531 +++++++++++++++++++++++++++++++++++++++++++ extensions/echo.c | 105 ++ filesys.c | 90 +- gdb-6.1.patch | 9 gdb-6.1/gdb/ppc-linux-tdep.c | 1116 +++++++++++++++++++++++++++++++ help.c | 102 +- ia64.c | 10 kernel.c | 98 ++ lkcd_common.c | 81 ++ lkcd_v7.c | 6 lkcd_v8.c | 14 lkcd_x86_trace.c | 122 +++ main.c | 63 + memory.c | 427 ++++++++++- net.c | 159 +++- netdump.c | 528 ++++++++++++-- netdump.h | 11 ppc.c | 2 ppc64.c | 238 ++++++ s390.c | 2 s390x.c | 2 symbols.c | 25 task.c | 220 ++++-- tools.c | 6 unwind.c | 19 x86.c | 49 - x86_64.c | 399 ++++++++++- 37 files changed, 5749 insertions(+), 512 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 crash.patch Index: crash.patch =================================================================== RCS file: /cvs/dist/rpms/crash/devel/crash.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- crash.patch 3 Mar 2005 16:53:39 -0000 1.6 +++ crash.patch 4 Jan 2006 19:34:09 -0000 1.7 @@ -1,1504 +1,6114 @@ ---- crash/gdb-6.0/gdb/symtab.c.orig 2005-03-03 11:36:20.000000000 -0500 -+++ crash/gdb-6.0/gdb/symtab.c 2005-03-02 16:19:09.000000000 -0500 -@@ -889,7 +889,9 @@ - doesn't affect these calls since they are looking for a known - variable and thus can probably assume it will never hit the C++ - code). */ -- -+#ifdef CRASH_MERGE -+static void gdb_bait_and_switch(char *, struct symbol *); -+#endif - struct symbol * - lookup_symbol (const char *name, const struct block *block, - const domain_enum domain, int *is_a_field_of_this, -@@ -936,7 +938,6 @@ - - #ifdef CRASH_MERGE - if (returnval && (domain == VAR_DOMAIN)) { -- static void gdb_bait_and_switch(char *, struct symbol *); - gdb_bait_and_switch((char *)modified_name, returnval); - } - #endif ---- crash/gdb-6.0/include/obstack.h.orig 2005-03-03 11:36:20.000000000 -0500 -+++ crash/gdb-6.0/include/obstack.h 2005-03-02 16:39:05.000000000 -0500 -@@ -0,0 +1,611 @@ -+/* obstack.h - object stack macros -+ Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, -+ 1999, 2000 -+ Free Software Foundation, Inc. -+ -+ -+ NOTE: The canonical source of this file is maintained with the GNU C Library. -+ Bugs can be reported to bug-glibc at gnu.org. -+ -+ This program is free software; you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published by the -+ Free Software Foundation; either version 2, or (at your option) any -+ later version. +--- crash/extensions/Makefile.orig 2006-01-04 14:18:28.000000000 -0500 ++++ crash/extensions/Makefile 2005-11-08 11:38:21.000000000 -0500 +@@ -0,0 +1,41 @@ ++# ++# Makefile for building crash shared object extensions ++# ++# Copyright (C) 2005 David Anderson ++# Copyright (C) 2005 Red Hat, Inc. All rights reserved. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# To build the extension shared objects in this directory, run ++# "make extensions" from the top-level directory. ++# ++# To add a new extension object: ++# ++# - add the new source file to the EXTENSION_SOURCE_FILES list ++# in the top-level Makefile ++# - add the object file name to the EXTENSION_OBJECT_FILES list ++# in the top-level Makefile ++# - create a compile stanza below, typically using "echo.so" as ++# a base template. ++# + -+ 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. ++all: link_defs $(OBJECTS) ++ ++link_defs: ++ @if [ ! -f defs.h ]; then \ ++ ln -s ../defs.h; fi + -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ USA. */ ++echo.so: ../defs.h echo.c ++ gcc -nostartfiles -shared -rdynamic -o echo.so echo.c -fPIC -D$(TARGET) + -+/* Summary: ++dminfo.so: ../defs.h dminfo.c ++ gcc -nostartfiles -shared -rdynamic -o dminfo.so dminfo.c -fPIC -D$(TARGET) ++ +--- crash/extensions/echo.c.orig 2006-01-04 14:18:28.000000000 -0500 ++++ crash/extensions/echo.c 2005-11-10 16:12:50.000000000 -0500 +@@ -0,0 +1,105 @@ ++/* echo.c - simple example of a crash extension ++ * ++ * Copyright (C) 2001, 2002 Mission Critical Linux, Inc. ++ * Copyright (C) 2002, 2003, 2004, 2005 David Anderson ++ * Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc. All rights reserved. ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ */ + -+All the apparent functions defined here are macros. The idea -+is that you would use these pre-tested macros to solve a -+very specific set of problems, and they would run fast. -+Caution: no side-effects in arguments please!! They may be -+evaluated MANY times!! -+ -+These macros operate a stack of objects. Each object starts life -+small, and may grow to maturity. (Consider building a word syllable -+by syllable.) An object can move while it is growing. Once it has -+been "finished" it never changes address again. So the "top of the -+stack" is typically an immature growing object, while the rest of the -+stack is of mature, fixed size and fixed address objects. -+ -+These routines grab large chunks of memory, using a function you -+supply, called `obstack_chunk_alloc'. On occasion, they free chunks, -+by calling `obstack_chunk_free'. You must define them and declare -+them before using any obstack macros. -+ -+Each independent stack is represented by a `struct obstack'. -+Each of the obstack macros expects a pointer to such a structure -+as the first argument. -+ -+One motivation for this package is the problem of growing char strings -+in symbol tables. Unless you are "fascist pig with a read-only mind" -+--Gosper's immortal quote from HAKMEM item 154, out of context--you -+would not like to put any arbitrary upper limit on the length of your -+symbols. -+ -+In practice this often means you will build many short symbols and a -+few long symbols. At the time you are reading a symbol you don't know -+how long it is. One traditional method is to read a symbol into a -+buffer, realloc()ating the buffer every time you try to read a symbol -+that is longer than the buffer. This is beaut, but you still will -+want to copy the symbol from the buffer to a more permanent -+symbol-table entry say about half the time. -+ -+With obstacks, you can work differently. Use one obstack for all symbol -+names. As you read a symbol, grow the name in the obstack gradually. -+When the name is complete, finalize it. Then, if the symbol exists already, -+free the newly read name. -+ -+The way we do this is to take a large chunk, allocating memory from -+low addresses. When you want to build a symbol in the chunk you just -+add chars above the current "high water mark" in the chunk. When you -+have finished adding chars, because you got to the end of the symbol, -+you know how long the chars are, and you can create a new object. -+Mostly the chars will not burst over the highest address of the chunk, -+because you would typically expect a chunk to be (say) 100 times as -+long as an average object. -+ -+In case that isn't clear, when we have enough chars to make up -+the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed) -+so we just point to it where it lies. No moving of chars is -+needed and this is the second win: potentially long strings need -+never be explicitly shuffled. Once an object is formed, it does not -+change its address during its lifetime. -+ -+When the chars burst over a chunk boundary, we allocate a larger -+chunk, and then copy the partly formed object from the end of the old -+chunk to the beginning of the new larger chunk. We then carry on -+accreting characters to the end of the object as we normally would. -+ -+A special macro is provided to add a single char at a time to a -+growing object. This allows the use of register variables, which -+break the ordinary 'growth' macro. -+ -+Summary: -+ We allocate large chunks. -+ We carve out one object at a time from the current chunk. -+ Once carved, an object never moves. -+ We are free to append data of any size to the currently -+ growing object. -+ Exactly one object is growing in an obstack at any one time. -+ You can run one obstack per control block. -+ You may have as many control blocks as you dare. -+ Because of the way we do it, you can `unwind' an obstack -+ back to a previous state. (You may remove objects much -+ as you would with a stack.) -+*/ ++#include "defs.h" /* From the crash source top-level directory */ + [...10814 lines suppressed...] -- ${GDB}/gdb/ui-file.o ${GDB}/gdb/utils.o -+ ${GDB}/gdb/ui-file.o ${GDB}/gdb/utils.o ${GDB}/gdb/dwarf2read.o +- ${GDB}/gdb/ui-file.o ${GDB}/gdb/utils.o ${GDB}/gdb/dwarf2read.o ++ ${GDB}/gdb/ui-file.o ${GDB}/gdb/utils.o ${GDB}/gdb/dwarf2read.o \ ++ ${GDB}/gdb/ppc-linux-tdep.o # # GDB_FLAGS is passed up from the gdb Makefile. ---- crash/crash.8.orig 2005-03-03 11:36:20.000000000 -0500 -+++ crash/crash.8 2005-01-31 10:55:43.000000000 -0500 -@@ -104,9 +104,8 @@ - .TP - .BI \-d \ num - .B Crash --sets its internal debug level --.I num --. The higher the number, the more debugging data will be printed while -+sets its internal debug level. -+The higher the number, the more debugging data will be printed while - .B crash - runs. - .TP +@@ -175,7 +187,8 @@ + + CFLAGS=-g -D${TARGET} ${TARGET_CFLAGS} + +-TAR_FILES=${SOURCE_FILES} Makefile COPYING README .rh_rpm_package crash.8 ++TAR_FILES=${SOURCE_FILES} Makefile COPYING README .rh_rpm_package crash.8 \ ++ ${EXTENSION_SOURCE_FILES} + CSCOPE_FILES=${SOURCE_FILES} + + READLINE_DIRECTORY=./${GDB}/readline +@@ -184,9 +197,13 @@ + + REDHATFLAGS=-DREDHAT + ++# To build the extensions library by default, uncomment the third command ++# line below. Otherwise they can be built by entering "make extensions". ++ + all: make_configure + @./configure -p "RPMPKG=${RPMPKG}" -b + @make --no-print-directory gdb_merge ++# @make --no-print-directory extensions + + gdb_merge: force + @if [ ! -f ${GDB}/README ]; then \ +@@ -206,6 +223,11 @@ + @for FILE in ${GDB_FILES}; do\ + echo $$FILE >> gdb.files; done + @tar --exclude-from gdb.files -xvzmf ${GDB}.tar.gz ++ @make --no-print-directory gdb_patch ++ ++gdb_patch: ++ if [ -f ${GDB}.patch ] && [ -s ${GDB}.patch ]; then \ ++ patch -p0 < ${GDB}.patch; fi + + library: make_build_data ${OBJECT_FILES} + ar -rs ${PROGRAM}lib.a ${OBJECT_FILES} +@@ -393,13 +415,13 @@ + + gdb_files: make_configure + @./configure -q -b +- @echo ${GDB_FILES} ++ @echo ${GDB_FILES} ${GDB_PATCH_FILES} + + show_files: + @if [ -f ${PROGRAM} ]; then \ + ./${PROGRAM} --no_crashrc -h README > README; fi +- @echo ${SOURCE_FILES} Makefile ${GDB_FILES} COPYING README \ +- .rh_rpm_package crash.8 ++ @echo ${SOURCE_FILES} Makefile ${GDB_FILES} ${GDB_PATCH_FILES} COPYING README \ ++ .rh_rpm_package crash.8 ${EXTENSION_SOURCE_FILES} + + ctags: + ctags ${SOURCE_FILES} +@@ -411,7 +433,7 @@ + do_tar: + @if [ -f ${PROGRAM} ]; then \ + ./${PROGRAM} --no_crashrc -h README > README; fi +- tar cvzf ${PROGRAM}.tar.gz ${TAR_FILES} ${GDB_FILES} ++ tar cvzf ${PROGRAM}.tar.gz ${TAR_FILES} ${GDB_FILES} ${GDB_PATCH_FILES} + @echo; ls -l ${PROGRAM}.tar.gz + + # To create a base tar file for Red Hat RPM packaging, pass the base RPM +@@ -446,8 +468,8 @@ + @rm -f ${PROGRAM}-${RELEASE}.tar.gz + @rm -f ${PROGRAM}-${RELEASE}.src.rpm + @chown root ./RELDIR/${PROGRAM}-${RELEASE} +- @tar cf - ${SOURCE_FILES} Makefile ${GDB_FILES} COPYING \ +- .rh_rpm_package crash.8 | (cd ./RELDIR/${PROGRAM}-${RELEASE}; tar xf -) ++ @tar cf - ${SOURCE_FILES} Makefile ${GDB_FILES} ${GDB_PATCH_FILES} COPYING \ ++ .rh_rpm_package crash.8 ${EXTENSION_SOURCE_FILES} | (cd ./RELDIR/${PROGRAM}-${RELEASE}; tar xf -) + @cp ${GDB}.tar.gz ./RELDIR/${PROGRAM}-${RELEASE} + @./${PROGRAM} --no_crashrc -h README > ./RELDIR/${PROGRAM}-${RELEASE}/README + @(cd ./RELDIR; find . -exec chown root {} ";") +@@ -488,3 +510,10 @@ + + dis: + objdump --disassemble --line-numbers ${PROGRAM} > ${PROGRAM}.dis ++ ++extensions: make_configure ++ @./configure -q -b ++ @make --no-print-directory do_extensions ++ ++do_extensions: ++ @(cd extensions; make -i OBJECTS="$(EXTENSION_OBJECT_FILES)" TARGET=$(TARGET)) +--- crash/gdb-6.1.patch.orig 2006-01-04 14:18:28.000000000 -0500 ++++ crash/gdb-6.1.patch 2006-01-03 13:36:25.000000000 -0500 +@@ -0,0 +1,11 @@ ++--- gdb-6.1/bfd/coff-alpha.c.orig +++++ gdb-6.1/bfd/coff-alpha.c ++@@ -1455,7 +1455,7 @@ alpha_relocate_section (output_bfd, info ++ amt = sizeof (struct ecoff_section_tdata); ++ lita_sec_data = ((struct ecoff_section_tdata *) ++ bfd_zalloc (input_bfd, amt)); ++- ecoff_section_data (input_bfd, lita_sec) = lita_sec_data; +++ lita_sec->used_by_bfd = lita_sec_data; ++ } ++ ++ if (lita_sec_data->gp != 0) +--- crash/README.orig 2006-01-04 14:18:28.000000000 -0500 ++++ crash/README 2006-01-04 14:18:26.000000000 -0500 +@@ -69,7 +69,7 @@ + After the kernel is re-compiled, the uncompressed "vmlinux" kernel + that is created in the top-level kernel build directory must be saved. + +- To build this utility, simply uncompress the tar file, enter the crash-4.0 ++ To build this utility, simply uncompress the tar file, enter the crash-4.0-2.18 + subdirectory, and type "make". The initial build will take several minutes + because the gdb module must be configured and and built. Alternatively, the + crash source RPM file may be installed and built, and the resultant crash +@@ -89,10 +89,12 @@ + + $ crash + +- crash 4.0 +- Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc. +- Copyright (C) 2004, 2005 IBM Corporation +- Copyright (C) 1999-2005 Hewlett-Packard Co ++ crash 4.0-2.18 ++ Copyright (C) 2002, 2003, 2004, 2005, 2006 Red Hat, Inc. ++ Copyright (C) 2004, 2005, 2006 IBM Corporation ++ Copyright (C) 1999-2006 Hewlett-Packard Co ++ Copyright (C) 2005 Fujitsu Limited ++ Copyright (C) 2005 NEC Corporation + Copyright (C) 1999, 2002 Silicon Graphics, Inc. + Copyright (C) 1999, 2000, 2001, 2002 Mission Critical Linux, Inc. + This program is free software, covered by the GNU General Public License, +@@ -111,7 +113,7 @@ + KERNEL: /boot/vmlinux + DUMPFILE: /dev/mem + CPUS: 1 +- DATE: Wed Jul 13 13:26:00 2005 ++ DATE: Wed Jan 4 14:18:26 2006 + UPTIME: 10 days, 22:55:18 + LOAD AVERAGE: 0.08, 0.03, 0.01 + TASKS: 42 +@@ -139,7 +141,7 @@ + exit log rd task + extend mach repeat timer + +- crash version: 4.0 gdb version: 6.1 ++ crash version: 4.0-2.18 gdb version: 6.1 + For help on any command above, enter "help ". + For help on input options, enter "help input". + For help on output options, enter "help output". +@@ -152,10 +154,12 @@ + + $ crash vmlinux vmcore + +- crash 4.0 +- Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc. +- Copyright (C) 2004, 2005 IBM Corporation +- Copyright (C) 1999-2005 Hewlett-Packard Co ++ crash 4.0-2.18 ++ Copyright (C) 2002, 2003, 2004, 2005, 2006 Red Hat, Inc. ++ Copyright (C) 2004, 2005, 2006 IBM Corporation ++ Copyright (C) 1999-2006 Hewlett-Packard Co ++ Copyright (C) 2005 Fujitsu Limited ++ Copyright (C) 2005 NEC Corporation + Copyright (C) 1999, 2002 Silicon Graphics, Inc. + Copyright (C) 1999, 2000, 2001, 2002 Mission Critical Linux, Inc. + This program is free software, covered by the GNU General Public License, +@@ -196,10 +200,12 @@ + + $ crash vmlinux.17 lcore.cr.17 + +- crash 4.0 +- Copyright (C) 2002, 2003, 2004, 2005 Red Hat, Inc. +- Copyright (C) 2004, 2005 IBM Corporation +- Copyright (C) 1999-2005 Hewlett-Packard Co ++ crash 4.0-2.18 ++ Copyright (C) 2002, 2003, 2004, 2005, 2006 Red Hat, Inc. ++ Copyright (C) 2004, 2005, 2006 IBM Corporation ++ Copyright (C) 1999-2006 Hewlett-Packard Co ++ Copyright (C) 2005 Fujitsu Limited ++ Copyright (C) 2005 NEC Corporation + Copyright (C) 1999, 2002 Silicon Graphics, Inc. + Copyright (C) 1999, 2000, 2001, 2002 Mission Critical Linux, Inc. + This program is free software, covered by the GNU General Public License, Index: crash.spec =================================================================== RCS file: /cvs/dist/rpms/crash/devel/crash.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- crash.spec 9 Dec 2005 22:40:06 -0000 1.8 +++ crash.spec 4 Jan 2006 19:34:12 -0000 1.9 @@ -3,8 +3,8 @@ # Summary: crash utility for live systems; netdump, diskdump, LKCD or mcore dumpfiles Name: crash -Version: 3.10 -Release: 13.1 +Version: 4.0 +Release: 2.18 License: GPL Group: Development/Debuggers Source: %{name}-%{version}.tar.gz @@ -35,6 +35,9 @@ mkdir -p %{buildroot}%{_mandir}/man8 cp crash.8 %{buildroot}%{_mandir}/man8/crash.8 +%clean +rm -rf %{buildroot} + %files %defattr(-,root,root) /usr/bin/crash @@ -42,6 +45,10 @@ %doc README %changelog +* Wed Jan 04 2006 Dave Anderson 4.0-2.18 +- Updated source package to crash-4.0.tar.gz, and crash.patch + to bring it up to 4.0-2.18. + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/crash/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Feb 2005 18:39:42 -0000 1.4 +++ sources 4 Jan 2006 19:34:13 -0000 1.5 @@ -1 +1 @@ -a009fb3ee88997292d1d392897861b9e crash-3.10.tar.gz +9b5de0153fc2701a8ea93e02aebf0f23 crash-4.0.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 4 19:49:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 14:49:32 -0500 Subject: rpms/evolution/devel evolution-2.5.4-fix-missing-declarations.patch, 1.1, 1.2 evolution.spec, 1.108, 1.109 Message-ID: <200601041949.k04JnWaC028393@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28258 Modified Files: evolution-2.5.4-fix-missing-declarations.patch evolution.spec Log Message: * Wed Jan 4 2006 David Malcolm - 2.5.4-2 - added optional build-time requirement on NetworkManager-glib-devel - update patch 805 to cover a missing declaration in Network Manager support evolution-2.5.4-fix-missing-declarations.patch: calendar/gui/e-meeting-list-view.c | 1 + mail/mail-tools.c | 2 +- plugins/publish-calendar/publish-format-fb.c | 1 + shell/e-shell.h | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) Index: evolution-2.5.4-fix-missing-declarations.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.4-fix-missing-declarations.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-2.5.4-fix-missing-declarations.patch 4 Jan 2006 06:07:52 -0000 1.1 +++ evolution-2.5.4-fix-missing-declarations.patch 4 Jan 2006 19:49:28 -0000 1.2 @@ -1,5 +1,5 @@ ---- evolution-2.5.4/calendar/gui/e-meeting-list-view.c.include_itip_utils 2006-01-04 00:15:42.000000000 -0500 -+++ evolution-2.5.4/calendar/gui/e-meeting-list-view.c 2006-01-04 00:15:56.000000000 -0500 +--- evolution-2.5.4/calendar/gui/e-meeting-list-view.c.fix-missing-declarations-2-5-4 2006-01-02 06:38:57.000000000 -0500 ++++ evolution-2.5.4/calendar/gui/e-meeting-list-view.c 2006-01-04 14:40:40.000000000 -0500 @@ -45,6 +45,7 @@ #include #include @@ -8,8 +8,8 @@ struct _EMeetingListViewPrivate { EMeetingStore *store; ---- evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c.include_itip_utils 2006-01-04 00:33:09.000000000 -0500 -+++ evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c 2006-01-04 00:33:24.000000000 -0500 +--- evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c.fix-missing-declarations-2-5-4 2005-12-19 05:08:10.000000000 -0500 ++++ evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c 2006-01-04 14:40:40.000000000 -0500 @@ -27,6 +27,7 @@ #include #include @@ -18,8 +18,18 @@ #include #include "publish-format-fb.h" ---- evolution-2.5.4/mail/mail-tools.c.include_itip_utils 2006-01-04 00:23:48.000000000 -0500 -+++ evolution-2.5.4/mail/mail-tools.c 2006-01-04 00:25:21.000000000 -0500 +--- evolution-2.5.4/shell/e-shell.h.fix-missing-declarations-2-5-4 2006-01-04 14:44:06.000000000 -0500 ++++ evolution-2.5.4/shell/e-shell.h 2006-01-04 14:47:59.000000000 -0500 +@@ -133,6 +133,7 @@ + + const char *e_shell_construct_result_to_string (EShellConstructResult result); + ++int e_shell_nm_glib_initialise (EShellWindow *window); + + #ifdef __cplusplus + } +--- evolution-2.5.4/mail/mail-tools.c.fix-missing-declarations-2-5-4 2006-01-02 06:38:59.000000000 -0500 ++++ evolution-2.5.4/mail/mail-tools.c 2006-01-04 14:40:40.000000000 -0500 @@ -100,7 +100,7 @@ return trash; } Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- evolution.spec 4 Jan 2006 06:07:52 -0000 1.108 +++ evolution.spec 4 Jan 2006 19:49:28 -0000 1.109 @@ -24,6 +24,7 @@ # note that nntp is non-functional in evo 1.3.x %define nntp_support 1 %define exchange_support 1 +%define nm_support 1 %define redhat_menus_version 5.0.4 @@ -31,7 +32,7 @@ Name: evolution Version: 2.5.4 -Release: 1 +Release: 2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -164,6 +165,10 @@ #define krb5dir `pwd`/krb5-fakeprefix %endif +%if %{nm_support} +BuildRequires: NetworkManager-glib-devel +%endif + %description Evolution is the GNOME mailer, calendar, contact manager and communications tool. The tools which make up Evolution will @@ -494,6 +499,10 @@ %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Wed Jan 4 2006 David Malcolm - 2.5.4-2 +- added optional build-time requirement on NetworkManager-glib-devel +- update patch 805 to cover a missing declaration in Network Manager support + * Tue Jan 3 2006 David Malcolm - 2.5.4-1 - 2.5.4 - update patch 107 to track underlying code changes; rename from From fedora-cvs-commits at redhat.com Wed Jan 4 19:52:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 14:52:37 -0500 Subject: rpms/rhythmbox/devel rhythmbox.spec,1.36,1.37 Message-ID: <200601041952.k04Jqb3k029916@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29832 Modified Files: rhythmbox.spec Log Message: - rebuild with ipod support Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- rhythmbox.spec 3 Jan 2006 19:15:34 -0000 1.36 +++ rhythmbox.spec 4 Jan 2006 19:52:34 -0000 1.37 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.2 -Release: 4 +Release: 5 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2 @@ -13,6 +13,8 @@ Requires: gtk2 >= 2.4.0 Requires: libgnomeui >= 2.6.0 Requires: eel2 >= 2.0.0 +Requires: libgpod +BuildRequires: libgpod-devel BuildRequires: libgnomeui-devel >= 2.6.0 BuildRequires: nautilus-cd-burner-devel BuildRequires: gstreamer-plugins-devel >= 0.8.1 @@ -38,7 +40,7 @@ %build -%configure --with-bonobo --with-dbus --with-mdns=avahi +%configure --with-bonobo --with-ipod --with-dbus --with-mdns=avahi %{__make} %{?_smp_mflags} %install @@ -91,6 +93,9 @@ %{_libdir}/pkgconfig/rhythmbox.pc %changelog +* Wed Jan 04 2006 John (J5) Palmieri 0.9.2-5 +- rebuild with ipod support + * Tue Jan 03 2006 Jesse Keating 0.9.2-4 - rebuilt again From fedora-cvs-commits at redhat.com Wed Jan 4 20:08:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 15:08:58 -0500 Subject: rpms/gstreamer/devel .cvsignore, 1.15, 1.16 gstreamer.spec, 1.39, 1.40 sources, 1.16, 1.17 gstreamer-0.7.5-nops.patch, 1.1, NONE gstreamer-0.8.11-gmodule-no-export.patch, 1.2, NONE gstreamer-0.8.7-escapeuri.patch, 1.1, NONE gstreamer-0.8.8-lib64.patch, 1.1, NONE gstreamer-0.8.9-cast-fix.patch, 1.1, NONE Message-ID: <200601042008.k04K8wQQ002779@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/gstreamer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2738/devel Modified Files: .cvsignore gstreamer.spec sources Removed Files: gstreamer-0.7.5-nops.patch gstreamer-0.8.11-gmodule-no-export.patch gstreamer-0.8.7-escapeuri.patch gstreamer-0.8.8-lib64.patch gstreamer-0.8.9-cast-fix.patch Log Message: auto-import gstreamer-0.10.0-1 on branch devel from gstreamer-0.10.0-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 9 Sep 2005 19:57:26 -0000 1.15 +++ .cvsignore 4 Jan 2006 20:08:55 -0000 1.16 @@ -1,7 +1 @@ -gstreamer-0.8.5.tar.bz2 -gstreamer-0.8.6.tar.bz2 -gstreamer-0.8.7.tar.bz2 -gstreamer-0.8.8.tar.bz2 -gstreamer-0.8.9.tar.bz2 -gstreamer-0.8.10.tar.bz2 -gstreamer-0.8.11.tar.bz2 +gstreamer-0.10.0.tar.bz2 Index: gstreamer.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- gstreamer.spec 10 Dec 2005 16:39:15 -0000 1.39 +++ gstreamer.spec 4 Jan 2006 20:08:55 -0000 1.40 @@ -1,58 +1,51 @@ -%define _glib2 2.3.0 -%define _libxml2 2.4.9 -%define DOCBOOK_DTD_PATH `xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.2//EN" | sed -e "s#file://##g"` - -Name: gstreamer -Version: 0.8.11 -# keep in sync with the VERSION. gstreamer can append a .0.1 to CVS snapshots. -%define majmin 0.8 -%define po_package %{name}-%{majmin} - -Release: 2.1 -Summary: GStreamer streaming media framework runtime. -Group: Applications/Multimedia -License: LGPL -URL: http://gstreamer.net/ -Source: http://gstreamer.net/releases/%{version}/src/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-root -# There was problems generating pdf and postscript: -Patch0: gstreamer-0.8.8-lib64.patch -Patch1: gstreamer-0.7.5-nops.patch -Patch2: gstreamer-0.8.9-cast-fix.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=318031 -Patch3: gstreamer-0.8.11-gmodule-no-export.patch - -Requires: glib2 >= %_glib2 -Requires: libxml2 >= %_libxml2 -Requires: popt > 1.6 - -BuildRequires: glib2-devel >= %_glib2 -BuildRequires: libxml2-devel >= %_libxml2 -BuildRequires: bison flex -BuildRequires: gtk-doc >= 1.1 -BuildRequires: zlib-devel -BuildRequires: popt > 1.6 -BuildRequires: gettext-devel -# for autopoint, should be depended on by gettext-devel -BuildRequires: cvs -BuildRequires: flex -BuildRequires: ghostscript -BuildRequires: sed -Prereq: /sbin/ldconfig +%define gstreamer gstreamer +%define majorminor 0.10 +%define _glib2 2.8.3 +%define _libxml2 2.4.0 + +Name: %{gstreamer} +Version: 0.10.0 +Release: 1 +Summary: GStreamer streaming media framework runtime + +Group: Applications/Multimedia +License: LGPL +URL: http://gstreamer.freedesktop.org/ +Source: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Requires: gstreamer-tools >= %{version} + +BuildRequires: glib2-devel >= %{_glib2} +BuildRequires: libxml2-devel >= %{_libxml2} +BuildRequires: bison +BuildRequires: flex +BuildRequires: m4 +BuildRequires: check-devel +BuildRequires: gtk-doc >= 1.3 +BuildRequires: gettext + +# because AM_PROG_LIBTOOL was used in configure.ac +BuildRequires: gcc-c++ ### documentation requirements -BuildRequires: openjade -BuildRequires: python2 -BuildRequires: docbook-style-dsssl -BuildRequires: docbook-style-xsl -BuildRequires: docbook-dtds -BuildRequires: docbook-utils -BuildRequires: transfig xfig -BuildRequires: netpbm-progs +BuildRequires: python2 +BuildRequires: openjade +BuildRequires: jadetex +BuildRequires: libxslt +BuildRequires: docbook-style-dsssl +BuildRequires: docbook-style-xsl +BuildRequires: docbook-utils +BuildRequires: transfig +BuildRequires: xfig +BuildRequires: netpbm-progs +BuildRequires: tetex-dvips +BuildRequires: ghostscript +BuildRequires: PyXML %description -GStreamer is a streaming-media framework, based on graphs of filters which +GStreamer is a streaming media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. Its plugin-based architecture means that new data @@ -60,14 +53,15 @@ plugins. %package devel -Summary: Libraries/include files for GStreamer streaming media framework. -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: glib2-devel >= %_glib2 -Requires: libxml2-devel >= %_libxml2 +Summary: Libraries/include files for GStreamer streaming media framework +Group: Development/Libraries + +Requires: %{name} = %{version}-%{release} +Requires: glib2-devel >= %{_glib2} +Requires: libxml2-devel >= %{_libxml2} %description devel -GStreamer is a streaming-media framework, based on graphs of filters which +GStreamer is a streaming media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. Its plugin-based architecture means that new data @@ -75,325 +69,310 @@ plugins. This package contains the libraries and includes files necessary to develop -applications and plugins for GStreamer. +applications and plugins for GStreamer, as well as general and API +documentation. -%package tools -Summary: tools for GStreamer streaming media framework. -Group: Applications/Multimedia +%package -n gstreamer-tools +Summary: common tools and files for GStreamer streaming media framework +Group: Applications/Multimedia -%description tools -GStreamer is a streaming-media framework, based on graphs of filters which +%description -n gstreamer-tools +GStreamer is a streaming media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. Its plugin-based architecture means that new data -types or processing capabilities can be added simply by installing new +types or processing capabilities can be added simply by installing new plugins. -This package contains the basic command-line tools used for GStreamer, like -gst-register and gst-launch. It is split off to allow parallel-installability -in the future. +This package contains wrapper scripts for the command-line tools that work +with different major/minor versions of GStreamer. %prep -%setup -q -#%patch0 -p1 -b .lib64 -%patch1 -p1 -b .nops -%patch2 -p1 -b .cast-fix -%patch3 -p1 -b .gmodule-no-export - -# openjade doesn't support xml catalogs, so we have to patch in the right dtd reference -find -name "*.xml" | xargs grep -l "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" | xargs perl -pi -e "s#http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd#%{DOCBOOK_DTD_PATH}#g" - -# The nopdf patch touches automake makefile sources -# The gmodule-no-export patch touches configure.ac -./autogen.sh +%setup -q -n gstreamer-%{version} %build - -## FIXME should re-enable the docs build when it works -%configure --disable-plugin-builddir --disable-tests --disable-examples \ - --with-cachedir=%{_localstatedir}/cache/gstreamer-%{majmin} \ - --enable-docs-build --with-html-dir=$RPM_BUILD_ROOT%{_datadir}/gtk-doc/html \ - --enable-debug - -make %{?_smp_mflags} +# 0.10.0: manuals do not build due to an openjade error; disable for now +%configure \ + --with-package-name='Fedora Core gstreamer package' \ + --with-package-origin='http://download.fedora.redhat.com/fedora' \ + --enable-debug \ + --enable-gtk-doc --disable-docbook \ + --disable-tests --disable-examples + +#make %{?_smp_mflags} +# FIXME: docs building doesn't work with smp yet +make %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT - -%makeinstall - -mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majmin} +rm -rf $RPM_BUILD_ROOT -/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majmin}/*.a -/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majmin}/*.la -/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -/bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0 +# Install doc temporarily in order to be included later by rpm +%makeinstall docdir="`pwd`/installed-doc" -%find_lang %{po_package} +%find_lang gstreamer-%{majorminor} +# Clean out files that should not be part of the rpm. +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majorminor} +rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +# Create empty cache directory +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majorminor} %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%post -/sbin/ldconfig -env DISPLAY= %{_bindir}/gst-register-%{majmin} 1>/dev/null 2>&1 -exit 0 +%post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -f %{po_package}.lang -%defattr(-, root, root) -%doc AUTHORS COPYING README TODO ABOUT-NLS REQUIREMENTS DOCBUILDING -%dir %{_libdir}/gstreamer-%{majmin} -%dir %{_localstatedir}/cache/gstreamer-%{majmin} -%{_libdir}/gstreamer-%{majmin}/*.so* -%{_libdir}/*.so.* -%{_bindir}/*-%{majmin} -%{_mandir}/man1/*-%{majmin}.1.gz +%files -f gstreamer-%{majorminor}.lang +%defattr(-, root, root, -) +%doc AUTHORS COPYING NEWS README RELEASE TODO +%{_libdir}/libgstreamer-%{majorminor}.so.* +%{_libdir}/libgstbase-%{majorminor}.so.* +%{_libdir}/libgstcontroller-%{majorminor}.so.* +%{_libdir}/libgstdataprotocol-%{majorminor}.so.* +%{_libdir}/libgstnet-%{majorminor}.so.* + +%dir %{_libdir}/gstreamer-%{majorminor} +%{_libdir}/gstreamer-%{majorminor}/libgstcoreelements.so +%{_libdir}/gstreamer-%{majorminor}/libgstcoreindexers.so + +%{_bindir}/gst-feedback-%{majorminor} +%{_bindir}/gst-inspect-%{majorminor} +%{_bindir}/gst-launch-%{majorminor} +%{_bindir}/gst-md5sum-%{majorminor} +%{_bindir}/gst-typefind-%{majorminor} +%{_bindir}/gst-xmlinspect-%{majorminor} +%{_bindir}/gst-xmllaunch-%{majorminor} +%{_mandir}/man1/gst-feedback-%{majorminor}.* +%{_mandir}/man1/gst-inspect-%{majorminor}.* +%{_mandir}/man1/gst-launch-%{majorminor}.* +%{_mandir}/man1/gst-md5sum-%{majorminor}.* +%{_mandir}/man1/gst-typefind-%{majorminor}.* +%{_mandir}/man1/gst-xmlinspect-%{majorminor}.* +%{_mandir}/man1/gst-xmllaunch-%{majorminor}.* + +%files -n gstreamer-tools +%defattr(-, root, root, -) +%{_bindir}/gst-feedback +%{_bindir}/gst-inspect +%{_bindir}/gst-launch +%{_bindir}/gst-md5sum +%{_bindir}/gst-typefind +%{_bindir}/gst-xmlinspect +%{_bindir}/gst-xmllaunch %files devel -%defattr(-, root, root) -%dir %{_includedir}/%{name}-%{majmin} -%{_includedir}/%{name}-%{majmin}/* -%{_libdir}/libgstreamer-%{majmin}.so -%{_libdir}/libgstcontrol-%{majmin}.so -%{_libdir}/pkgconfig/gstreamer*.pc -%{_datadir}/aclocal/* -%{_datadir}/gtk-doc/html/* - -%files tools -%defattr(-, root, root) -%{_bindir}/* -%exclude %{_bindir}/*-%{majmin} -%{_mandir}/man1/* -%exclude %{_mandir}/man1/*-%{majmin}.1.gz +%defattr(-, root, root, -) +# %doc installed-doc/* +%dir %{_includedir}/gstreamer-%{majorminor} +%dir %{_includedir}/gstreamer-%{majorminor}/gst +%{_includedir}/gstreamer-%{majorminor}/gst/*.h + +%{_includedir}/gstreamer-%{majorminor}/gst/base +%{_includedir}/gstreamer-%{majorminor}/gst/check +%{_includedir}/gstreamer-%{majorminor}/gst/controller +%{_includedir}/gstreamer-%{majorminor}/gst/dataprotocol +%{_includedir}/gstreamer-%{majorminor}/gst/net + +%{_libdir}/libgstreamer-%{majorminor}.so +%{_libdir}/libgstdataprotocol-%{majorminor}.so +%{_libdir}/libgstbase-%{majorminor}.so +%{_libdir}/libgstcheck-%{majorminor}.so* +%{_libdir}/libgstcontroller-%{majorminor}.so +%{_libdir}/libgstnet-%{majorminor}.so + +%{_datadir}/aclocal/gst-element-check-%{majorminor}.m4 +%{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc +%{_libdir}/pkgconfig/gstreamer-base-%{majorminor}.pc +%{_libdir}/pkgconfig/gstreamer-controller-%{majorminor}.pc +%{_libdir}/pkgconfig/gstreamer-check-%{majorminor}.pc +%{_libdir}/pkgconfig/gstreamer-dataprotocol-%{majorminor}.pc +%{_libdir}/pkgconfig/gstreamer-net-%{majorminor}.pc + +%doc %{_datadir}/gtk-doc/html/gstreamer-%{majorminor}/* +%doc %{_datadir}/gtk-doc/html/gstreamer-libs-%{majorminor}/* +%doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/* %changelog -* Fri Dec 09 2005 Jesse Keating 0.8.11-2.1 -- rebuilt - -* Tue Nov 15 2005 Florian La Roche 0.8.11-2 -- silence post script - -* Fri Sep 09 2005 John (J5) Palmieri 0.8.11-1 -- Update to upstream 0.8.11 -- We still need the docbook hack - make it a bit more flexible - by asking the catalog where we should get the dtd -- Nothing is installed to _libexecdir anymore so removed those entries - -* Tue May 03 2005 John (J5) Palmieri 0.8.10-1 -- Update to upstream 0.8.10 - -* Thu Mar 17 2005 Colin Walters 0.8.9-4 -- Rebuild to make it through beehive - -* Wed Mar 03 2005 John (J5) Palmieri 0.8.9-3 -- add gstreamer-0.8.9-cast-fix.patch which casts the variable - before sending it into the macro -- update openjade hack to refrence xml-dtd-4.2-1.0-26 - -* Wed Mar 03 2005 John (J5) Palmieri 0.8.9-2 -- rebuild with gcc 4.0 - -* Wed Feb 9 2005 Matthias Clasen 0.8.9-1 -- Update to 0.8.9 - -* Mon Jan 10 2005 Colin Walters 0.8.8-2 -- Updated gstreamer-0.8.8-lib64.patch which does not rename - tools such as gst-launch to e.g. gst-launch-i686. - -* Mon Jan 03 2005 Colin Walters 0.8.8-1 -- Update to 0.8.8 -- Remove upstreamed escape-uris patch -- Readd redirection of register output to /dev/null - -* Tue Nov 09 2004 Colin Walters 0.8.7-6 -- Add initial lib64 patch. - -* Tue Oct 26 2004 Colin Walters 0.8.7-5 -- Do not override docdir (126860) -- Remove datadir/gstreamer-%{majmin}/doc from files list - -* Wed Oct 20 2004 Colin Walters 0.8.7-4 -- Add URI escaping patch from Ronald (136507) - -* Wed Oct 13 2004 Colin Walters 0.8.7-3 -- Quote %%configure in changelog (135412) - -* Thu Oct 07 2004 Colin Walters 0.8.7-2 -- BuildRequire gettext-devel - -* Wed Oct 6 2004 Alexander Larsson - 0.8.7-1 -- update to 0.8.7 - -* Tue Oct 5 2004 Alexander Larsson - 0.8.6-1 -- update to 0.8.6 -- Put the real lib .so symlinks in the -devel package -- Do not put .so plugins in the -devel package -- Correct docbook dtd version reference - -* Tue Sep 28 2004 Colin Walters 0.8.5-2 -- Move .so symlinks to -devel package - -* Tue Aug 16 2004 Colin Walters 0.8.5-1 -- Update to 0.8.5 - -* Tue Jul 26 2004 Colin Walters 0.8.4-1 -- Update to 0.8.4 - -* Tue Jul 20 2004 Colin Walters 0.8.3.3-1 -- Update - -* Tue Jul 05 2004 Colin Walters 0.8.3-3 -- Another rebuild to placate beehive! - -* Tue Jul 05 2004 Colin Walters 0.8.3-2 -- Rebuild to placate beehive - -* Wed Jun 23 2004 Colin Walters 0.8.3-1 -- Update to 0.8.3, now that I am convinced it is safe. -- Remove backported cpufix patch. -- "cvs remove" a bunch of obsoleted patches. - -* Mon Jun 21 2004 Colin Walters 0.8.1-5 -- BuildRequire gettext-devel - -* Mon Jun 21 2004 Colin Walters 0.8.1-4 -- BuildRequire ghostscript - -* Mon Jun 21 2004 Colin Walters 0.8.1-3 -- Apply register-clobbering patch from upstream CVS. - -* Tue Jun 15 2004 Elliot Lee 0.8.1-2 -- rebuilt - -* Mon Apr 15 2004 Colin Walters 0.8.1-1 -- Update to 0.8.1 -- Delete registry patches which have been upstreamed -- COPYING.LIB is gone - -* Mon Apr 05 2004 Colin Walters 0.8.0-4 -- I have discovered that it is helpful, when adding patches - to a package, to actually add the "%patchN" lines. - -* Mon Mar 22 2004 Colin Walters 0.8.0-3 -- Add BuildRequires on flex -- Add patch to avoid calling opendir() on files - -* Mon Mar 22 2004 Colin Walters 0.8.0-2 -- Add patch to avoid setting mtime on registry - -* Tue Mar 16 2004 Alex Larsson 0.8.0-1 -- update to 0.8.0 - -* Wed Mar 10 2004 Alexander Larsson 0.7.6-1 -- update to 0.7.6 - -* Thu Mar 4 2004 Jeremy Katz - 0.7.5-2 -- fix plugin dir with respect to %%_lib - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Tue Feb 24 2004 Alexander Larsson 0.7.5-1 -- update to 0.7.5 -- clean up specfile some -- enable docs - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Wed Feb 4 2004 Bill Nottingham 0.7.3-4 -- fix %%post - -* Wed Jan 28 2004 Alexander Larsson 0.7.3-3 -- add s390 patch - -* Tue Jan 27 2004 Jonathan Blandford 0.7.3-1 -- new version - -* Thu Sep 11 2003 Alexander Larsson 0.6.3-1 -- Update to 0.6.3 (gnome 2.4 final) - -* Tue Aug 19 2003 Alexander Larsson 0.6.2-6 -- 0.6.2 - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Mon Feb 17 2003 Elliot Lee 0.6.0-5 -- ppc64 patch - -* Wed Feb 12 2003 Bill Nottingham 0.6.0-4 -- fix group - -* Tue Feb 11 2003 Bill Nottingham 0.6.0-3 -- prereq, not require, gstreamer-tools - -* Tue Feb 11 2003 Jonathan Blandford 0.6.0-2 -- unset the DISPLAY when running gst-register - -* Mon Feb 3 2003 Jonathan Blandford 0.6.0-1 -- yes it is needed. Readding - -* Sat Feb 01 2003 Florian La Roche -- remove "tools" sub-rpm, this is not needed at all - -* Thu Jan 30 2003 Jonathan Blandford 0.5.2-7 -- stopped using %%configure so we need to pass in all the args - -* Mon Jan 27 2003 Jonathan Blandford -- remove -Werror explicitly as the configure macro isn't working. - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Thu Dec 19 2002 Elliot Lee 0.5.0-10 -- Add patch1 to fix C++ plugins on ia64 - -* Wed Dec 18 2002 Jonathan Blandford -- %post -p was wrong - -* Tue Dec 17 2002 Jonathan Blandford 0.5.0-7 -- explicitly add %{_libdir}/libgstreamer-{majmin}.so -- explicitly add %{_libdir}/libgstcontrol-{majmin}.so - -* Mon Dec 16 2002 Jonathan Blandford -- bump release - -* Fri Dec 13 2002 Jonathan Blandford -- move .so files out of -devel - -* Tue Dec 10 2002 Jonathan Blandford -- new version 0.5.0 -- require docbook-style-xsl -- add gstreamer-tools package too -- New patch to use the right docbook prefix. - -* Tue Dec 10 2002 Jonathan Blandford -- downgrade to a release candidate. Should work better on other arches -- build without Werror - -* Mon Dec 9 2002 Jonathan Blandford -- update to new version. Remove ExcludeArch - -* Tue Dec 3 2002 Havoc Pennington -- excludearch some arches - -* Mon Dec 2 2002 Havoc Pennington -- import into CVS and build "officially" -- use smp_mflags -- temporarily disable docs build, doesn't seem to work - -* Thu Nov 7 2002 Jeremy Katz -- 0.4.2 - -* Mon Sep 23 2002 Jeremy Katz -- 0.4.1 - -* Sun Sep 22 2002 Jeremy Katz -- minor cleanups +* Fri Dec 16 2005 Thomas Vander Stichele +- 0.10.0-1 +- rebuilt for Fedora Core Development + +* Wed Dec 14 2005 Thomas Vander Stichele +- 0.10.0-0.gst.2 +- rebuilt against newer GLib and friends + +* Mon Dec 05 2005 Thomas Vander Stichele +- 0.10.0-0.gst.1 +- new release + +* Thu Dec 01 2005 Thomas Vander Stichele +- 0.9.7-0.gst.1 +- new release, with 0.10 majorminor +- removed compprep and complete +- added plugins docs +- renamed libgstcorelements, libgstcoreindexers +- added libgstnet + +* Sat Nov 12 2005 Thomas Vander Stichele +- 0.9.5-0.gst.1 +- new release + +* Mon Oct 24 2005 Thomas Vander Stichele +- 0.9.4-0.gst.1 +- new release + +* Mon Oct 03 2005 Thomas Vander Stichele +- 0.9.3-0.gst.1 +- new release + +* Thu Sep 08 2005 Thomas Vander Stichele +- 0.9.2-0.gst.1 +- added libgstcheck +- new release + +* Thu Jun 09 2005 Thomas Vander Stichele +- 0.9.1-0.gst.1 +- first development series release + +* Tue May 03 2005 Thomas Vander Stichele +- 0.8.10-0.gst.1 +- new release +- up glib2 to 2.4 because disting on 2.4 builds marshalling code needing 2.4 + +* Mon May 02 2005 Thomas Vander Stichele +- 0.8.9.2-0.gst.1 +- new prerelease + +* Tue Feb 08 2005 Thomas Vander Stichele +- 0.8.9-0.gst.1 +- new release +- switch back to the gst tag since fedora.us is gone + +* Thu Feb 03 2005 Thomas Vander Stichele +- 0.8.8.2-0.fdr.1 +- new prerelease + +* Thu Dec 23 2004 Thomas Vander Stichele +- 0.8.8-0.fdr.1 +- new upstream release + +* Fri Dec 17 2004 Thomas Vander Stichele +- 0.8.7.2-0.fdr.1 +- new prerelease +- added fair gthread scheduler + +* Wed Oct 06 2004 Thomas Vander Stichele +- 0.8.7-0.fdr.1 +- update for new GStreamer release + +* Tue Oct 05 2004 Thomas Vander Stichele +- 0.8.6-0.fdr.1 +- update for new GStreamer release + +* Sun Sep 26 2004 Thomas Vander Stichele +- 0.8.5.3-0.fdr.1 +- update for new GStreamer prerelease + +* Sun Sep 12 2004 Thomas Vander Stichele +- 0.8.5.2-0.fdr.1 +- update for new GStreamer prerelease + +* Mon Aug 16 2004 Thomas Vander Stichele +- 0.8.5-0.fdr.1 +- update for new GStreamer release + +* Thu Aug 12 2004 Thomas Vander Stichele +- 0.8.4.2-0.fdr.1 +- update for new GStreamer prerelease +- set package name and origin + +* Tue Jul 20 2004 Thomas Vander Stichele +- 0.8.4-0.fdr.1 +- update for new GStreamer release +- unbreak the postun script by not removing the cache dir + +* Tue Jul 20 2004 Thomas Vander Stichele +- 0.8.3.3-0.fdr.1: update for new GStreamer prerelease + +* Fri Jul 16 2004 Thomas Vander Stichele +- 0.8.3.2-0.fdr.1: update for new GStreamer prerelease + +* Sat Jun 05 2004 Thomas Vander Stichele +- 0.8.3-0.fdr.1: update for new GStreamer release + +* Fri Jun 04 2004 Thomas Vander Stichele +- 0.8.2-0.fdr.1: update for new GStreamer release + +* Thu Apr 15 2004 Thomas Vander Stichele +- 0.8.1-0.fdr.1: update for new GStreamer release + +* Thu Apr 15 2004 Thomas Vander Stichele +- add entry schedulers, clean up scheduler file section + +* Tue Mar 16 2004 Thomas Vander Stichele +- 0.8.0-0.fdr.1: update for new GStreamer release, renamed base to gstreamer + +* Tue Mar 09 2004 Thomas Vander Stichele +- 0.7.6-0.fdr.1: updated for new GStreamer release, with maj/min set to 0.8 + +* Mon Mar 08 2004 Thomas Vander Stichele +- 0.7.5-0.fdr.3: fix postun script + +* Fri Mar 05 2004 Thomas Vander Stichele +- 0.7.5-0.fdr.2: new release + +* Wed Feb 11 2004 Thomas Vander Stichele +- 0.7.4-0.fdr.1: synchronize with Matthias's package + +* Sat Feb 07 2004 Thomas Vander Stichele +- make the package name gstreamer07 since this is an unstable release + +* Wed Feb 04 2004 Thomas Vander Stichele +- put versioned tools inside base package, and put unversioned tools in tools + +* Mon Dec 01 2003 Thomas Vander Stichele +- changed documentation buildrequires + +* Sun Nov 09 2003 Christian Schaller +- Fix spec to handle new bytestream library + +* Sun Aug 17 2003 Christian Schaller +- Remove docs build from RPM as the build is broken +- Fix stuff since more files are versioned now +- Remove wingo schedulers +- Remove putbits stuff + +* Sun May 18 2003 Thomas Vander Stichele +- devhelp files are now generated by gtk-doc, changed accordingly + +* Sun Mar 16 2003 Christian F.K. Schaller +- Add gthread scheduler + +* Sat Dec 07 2002 Thomas Vander Stichele +- define majorminor and use it everywhere +- full parallel installability + +* Tue Nov 05 2002 Christian Schaller +- Add optwingo scheduler +* Sat Oct 12 2002 Christian Schaller +- Updated to work better with default RH8 rpm +- Added missing unspeced files +- Removed .a and .la files from buildroot + +* Sat Sep 21 2002 Thomas Vander Stichele +- added gst-md5sum + +* Tue Sep 17 2002 Thomas Vander Stichele +- adding flex to buildrequires + +* Fri Sep 13 2002 Christian F.K. Schaller +- Fixed the schedulers after the renaming +* Sun Sep 08 2002 Thomas Vander Stichele +- added transfig to the BuildRequires: * Sat Jun 22 2002 Thomas Vander Stichele - moved header location Index: sources =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 9 Sep 2005 19:57:26 -0000 1.16 +++ sources 4 Jan 2006 20:08:55 -0000 1.17 @@ -1 +1 @@ -3a251cf05b794ebac04e18f71e5b26eb gstreamer-0.8.11.tar.bz2 +479b3308da0b75d973f11df65e6aef02 gstreamer-0.10.0.tar.bz2 --- gstreamer-0.7.5-nops.patch DELETED --- --- gstreamer-0.8.11-gmodule-no-export.patch DELETED --- --- gstreamer-0.8.7-escapeuri.patch DELETED --- --- gstreamer-0.8.8-lib64.patch DELETED --- --- gstreamer-0.8.9-cast-fix.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 4 20:11:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 15:11:33 -0500 Subject: rpms/system-config-kickstart/devel .cvsignore, 1.20, 1.21 sources, 1.26, 1.27 system-config-kickstart.spec, 1.30, 1.31 Message-ID: <200601042011.k04KBXH6004330@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/system-config-kickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4265 Modified Files: .cvsignore sources system-config-kickstart.spec Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-kickstart/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 12 Dec 2005 21:27:42 -0000 1.20 +++ .cvsignore 4 Jan 2006 20:11:30 -0000 1.21 @@ -13,3 +13,4 @@ system-config-kickstart-2.6.0.tar.bz2 system-config-kickstart-2.6.1.tar.bz2 system-config-kickstart-2.6.2.tar.bz2 +system-config-kickstart-2.6.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-kickstart/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 12 Dec 2005 21:27:42 -0000 1.26 +++ sources 4 Jan 2006 20:11:30 -0000 1.27 @@ -1 +1 @@ -f0d2e5baacee9437eb1c6306242901c8 system-config-kickstart-2.6.2.tar.bz2 +29a56e984b47b9016f4026cc4aa54834 system-config-kickstart-2.6.3.tar.bz2 Index: system-config-kickstart.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-kickstart/devel/system-config-kickstart.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- system-config-kickstart.spec 12 Dec 2005 21:27:42 -0000 1.30 +++ system-config-kickstart.spec 4 Jan 2006 20:11:30 -0000 1.31 @@ -1,6 +1,6 @@ Summary: A graphical interface for making kickstart files. Name: system-config-kickstart -Version: 2.6.2 +Version: 2.6.3 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -74,6 +74,9 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-kickstart.png %changelog +* Wed Jan 04 2006 Chris Lumens 2.6.3-1 +- Remove references to monitor in xconfig (#176537). + * Mon Dec 12 2005 Chris Lumens 2.6.2-1 - Use monitor keyword instead of deprecated xconfig options. From fedora-cvs-commits at redhat.com Wed Jan 4 21:30:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 16:30:51 -0500 Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-dm.patch, 1.1, 1.2 e2fsprogs.spec, 1.41, 1.42 Message-ID: <200601042130.k04LUphb025891@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/e2fsprogs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25824 Modified Files: e2fsprogs-1.38-dm.patch e2fsprogs.spec Log Message: - fix some dm errors - update to 1.38-4 e2fsprogs-1.38-dm.patch: e2fsck/Makefile.in | 2 lib/blkid/Makefile.in | 22 +++---- lib/blkid/blkidP.h | 1 lib/blkid/devname.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 160 insertions(+), 12 deletions(-) Index: e2fsprogs-1.38-dm.patch =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs-1.38-dm.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- e2fsprogs-1.38-dm.patch 4 Jan 2006 03:30:33 -0000 1.1 +++ e2fsprogs-1.38-dm.patch 4 Jan 2006 21:30:35 -0000 1.2 @@ -1,5 +1,5 @@ --- e2fsprogs-1.38/e2fsck/Makefile.in.dm 2005-06-29 13:42:20.000000000 -0400 -+++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-01-03 22:00:06.000000000 -0500 ++++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-01-04 15:51:47.000000000 -0500 @@ -20,7 +20,7 @@ DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID) @@ -9,8 +9,18 @@ STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \ $(DEPSTATIC_LIBUUID) +--- e2fsprogs-1.38/lib/blkid/blkidP.h.dm 2005-05-07 14:16:09.000000000 -0400 ++++ e2fsprogs-1.38/lib/blkid/blkidP.h 2006-01-04 15:51:47.000000000 -0500 +@@ -118,6 +118,7 @@ + /* + * Priority settings for different types of devices + */ ++#define BLKID_PRI_DM 40 + #define BLKID_PRI_EVMS 30 + #define BLKID_PRI_LVM 20 + #define BLKID_PRI_MD 10 --- e2fsprogs-1.38/lib/blkid/devname.c.dm 2005-05-07 15:26:03.000000000 -0400 -+++ e2fsprogs-1.38/lib/blkid/devname.c 2006-01-03 22:00:06.000000000 -0500 ++++ e2fsprogs-1.38/lib/blkid/devname.c 2006-01-04 16:15:01.000000000 -0500 @@ -11,6 +11,8 @@ * %End-Header% */ @@ -20,7 +30,25 @@ #include #include #if HAVE_UNISTD_H -@@ -137,6 +139,146 @@ +@@ -75,6 +77,8 @@ + return dev; + } + ++static int dm_device_is_leaf(const dev_t dev); ++ + /* + * Probe a single block device to add to the device cache. + */ +@@ -90,6 +94,8 @@ + list_for_each(p, &cache->bic_devs) { + blkid_dev tmp = list_entry(p, struct blkid_struct_dev, + bid_devs); ++ if (!dm_device_is_leaf(devno)) ++ continue; + if (tmp->bid_devno == devno) { + if (only_if_new) + return; +@@ -137,6 +143,146 @@ return; } @@ -146,18 +174,18 @@ + + rc = asprintf(&device, "/dev/mapper/%s", names->name); + if (rc < 0) -+ continue; ++ goto try_next; + + dev = dm_get_devno(names->name); + if (dev == 0) -+ continue; ++ goto try_next; + -+ if (!dm_device_is_leaf(dev)) -+ continue; ++ if (!dm_device_is_leaf(dev)) ++ goto try_next; + ++ probe_one(cache, device, dev, BLKID_PRI_DM, only_if_new); + -+ probe_one(cache, device, dev, BLKID_PRI_LVM, only_if_new); -+ ++try_next: + next = names->next; + } while (next); + @@ -167,16 +195,16 @@ #define PROC_PARTITIONS "/proc/partitions" #define VG_DIR "/proc/lvm/VGs" -@@ -290,6 +432,7 @@ +@@ -290,6 +436,7 @@ return 0; blkid_read_cache(cache); -+ dm_probe_all(cache, only_if_new); ++ dm_probe_all(cache, only_if_new); evms_probe_all(cache, only_if_new); #ifdef VG_DIR lvm_probe_all(cache, only_if_new); ---- e2fsprogs-1.38/lib/blkid/Makefile.in.dm 2006-01-03 22:03:00.000000000 -0500 -+++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-01-03 22:02:40.000000000 -0500 +--- e2fsprogs-1.38/lib/blkid/Makefile.in.dm 2005-06-29 13:39:54.000000000 -0400 ++++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-01-04 16:18:38.000000000 -0500 @@ -37,7 +37,7 @@ ELF_IMAGE = libblkid ELF_MYDIR = blkid @@ -186,3 +214,57 @@ BSDLIB_VERSION = 2.0 BSDLIB_IMAGE = libblkid +@@ -74,43 +74,43 @@ + + tst_cache: $(srcdir)/cache.c $(DEPLIBS_BLKID) + @echo " LD $@" +- @$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ @$(CC) -o tst_cache -DTEST_PROGRAM $(srcdir)/cache.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol + + tst_dev: $(srcdir)/dev.c $(DEPLIBS_BLKID) + @echo " LD $@" +- @$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ @$(CC) -o tst_dev -DTEST_PROGRAM $(srcdir)/dev.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol + + tst_devname: $(srcdir)/devname.c $(DEPLIBS_BLKID) + @echo " LD $@" +- @$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ @$(CC) -o tst_devname -DTEST_PROGRAM $(srcdir)/devname.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol + + tst_devno: $(srcdir)/devno.c $(DEPLIBS_BLKID) + @echo " LD $@" +- @$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ @$(CC) -o tst_devno -DTEST_PROGRAM $(srcdir)/devno.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol + + tst_getsize: $(srcdir)/getsize.c $(DEPLIBS_BLKID) + @echo " LD $@" +- @$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ @$(CC) -o tst_getsize -DTEST_PROGRAM $(srcdir)/getsize.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol + + tst_probe: $(srcdir)/probe.c $(DEPLIBS_BLKID) + @echo " LD $@" +- @$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ @$(CC) -o tst_probe -DTEST_PROGRAM $(srcdir)/probe.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol + + tst_read: $(srcdir)/read.c $(DEPLIBS_BLKID) + @echo " LD $@" +- @$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ @$(CC) -o tst_read -DTEST_PROGRAM $(srcdir)/read.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol + + tst_resolve: $(srcdir)/resolve.c $(DEPLIBS_BLKID) + @echo " LD $@" +- @$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ @$(CC) -o tst_resolve -DTEST_PROGRAM $(srcdir)/resolve.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol + + tst_save: $(srcdir)/save.c $(DEPLIBS_BLKID) + @echo " LD $@" +- @$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ @$(CC) -o tst_save -DTEST_PROGRAM $(srcdir)/save.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol + + tst_tag: $(srcdir)/tag.c $(DEPLIBS_BLKID) + @echo " LD $@" +- @$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS) ++ @$(CC) -o tst_tag -DTEST_PROGRAM $(srcdir)/tag.c $(LIBS_BLKID) $(ALL_CFLAGS) -ldevmapper -lselinux -lsepol + + ../../misc/blkid.o: $(top_srcdir)/misc/blkid.c blkid.h + @echo " CC $@" Index: e2fsprogs.spec =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- e2fsprogs.spec 4 Jan 2006 03:30:33 -0000 1.41 +++ e2fsprogs.spec 4 Jan 2006 21:30:35 -0000 1.42 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.38 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz @@ -293,10 +293,14 @@ %{_mandir}/man3/uuid_unparse.3* %changelog -* Tue Jan 03 2006 Peter Jones 1.38-3 +* Wed Jan 4 2006 Peter Jones 1.38-4 +- fix a logic error in dm probing +- add priority group for dm devices, so they'll be preferred + +* Tue Jan 3 2006 Peter Jones 1.38-3 - added support for device-mapper devices -* Fri Dec 09 2005 Jesse Keating +* Fri Dec 9 2005 Jesse Keating - rebuilt * Thu Nov 10 2005 Thomas Woerner 1.38-2.1 From fedora-cvs-commits at redhat.com Wed Jan 4 21:42:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 16:42:42 -0500 Subject: rpms/nspr/devel nspr-4.6.1-gcc-visibility.patch, NONE, 1.1 nspr.spec, 1.9, 1.10 Message-ID: <200601042142.k04LggkA029623@cvs.devel.redhat.com> Author: kengert Update of /cvs/dist/rpms/nspr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29262 Modified Files: nspr.spec Added Files: nspr-4.6.1-gcc-visibility.patch Log Message: Stop shipping static libraries. Add an upstream patch to fix gcc visibility issues. nspr-4.6.1-gcc-visibility.patch: prtypes.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE nspr-4.6.1-gcc-visibility.patch --- Index: mozilla/nsprpub/pr/include/prtypes.h diff -u mozilla/nsprpub/pr/include/prtypes.h:3.30 mozilla/nsprpub/pr/include/prtypes.h:3.30.2.1 --- mozilla/nsprpub/pr/include/prtypes.h:3.30 Fri Apr 29 21:02:54 2005 +++ mozilla/nsprpub/pr/include/prtypes.h Tue Jan 3 17:43:35 2006 @@ -178,7 +178,9 @@ #else /* Unix */ -#ifdef HAVE_VISIBILITY_PRAGMA +/* GCC 3.3 and later support the visibility attribute. */ +#if (__GNUC__ >= 4) || \ + (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) #define PR_VISIBILITY_DEFAULT __attribute__((visibility("default"))) #else #define PR_VISIBILITY_DEFAULT Index: nspr.spec =================================================================== RCS file: /cvs/dist/rpms/nspr/devel/nspr.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nspr.spec 16 Dec 2005 06:40:40 -0000 1.9 +++ nspr.spec 4 Jan 2006 21:42:39 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Netscape Portable Runtime Name: nspr Version: 4.6.1 -Release: 1 +Release: 2 License: MPL/GPL/LGPL URL: http://www.mozilla.org/projects/nspr/ Group: System Environment/Libraries @@ -9,6 +9,8 @@ Source0: %{name}-%{version}.tar.gz Source1: nspr.pc.in +Patch1: nspr-4.6.1-gcc-visibility.patch + Provides: mozilla-nspr Obsoletes: mozilla-nspr @@ -33,6 +35,7 @@ %setup -q # patches +%patch1 -p0 %build @@ -76,6 +79,9 @@ %{__rm} -rf \ $RPM_BUILD_ROOT/%{_bindir}/compile-et.pl \ $RPM_BUILD_ROOT/%{_bindir}/prerr.properties \ + $RPM_BUILD_ROOT/%{_libdir}/libnspr4.a \ + $RPM_BUILD_ROOT/%{_libdir}/libplc4.a \ + $RPM_BUILD_ROOT/%{_libdir}/libplds4.a \ $RPM_BUILD_ROOT/%{_datadir}/aclocal/nspr.m4 \ $RPM_BUILD_ROOT/%{_includedir}/nspr4/md @@ -100,14 +106,14 @@ %{_libdir}/pkgconfig/nspr.pc %{_bindir}/nspr-config -# Static libs are temporarily shipped since nss currently needs -# them to build (and all things depending on nss, e.g. firefox) -# They will not be included in a future revision. -%{_libdir}/libnspr4.a -%{_libdir}/libplc4.a -%{_libdir}/libplds4.a - %changelog +* Wed Jan 4 2006 Kai Engert +- Add an upstream patch to fix gcc visibility issues. + +* Tue Jan 3 2006 Christopher Aillon +- Stop shipping static libraries; NSS and dependencies no longer + require static libraries to build. + * Thu Dec 15 2005 Christopher Aillon 4.6.1-1 - Update to 4.6.1 From fedora-cvs-commits at redhat.com Wed Jan 4 21:51:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 16:51:37 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch, NONE, 1.1 openoffice.org.spec, 1.602, 1.603 Message-ID: <200601042151.k04LpbbA012650@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12602 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch Log Message: jrb special openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch: framework/source/helper/statusindicatorfactory.cxx | 2 ++ framework/source/loadenv/loadenv.cxx | 3 ++- framework/source/services/frame.cxx | 2 ++ source/helper/statusindicatorfactory.cxx | 0 source/loadenv/loadenv.cxx | 0 source/services/frame.cxx | 0 6 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch --- Index: source/helper/statusindicatorfactory.cxx =================================================================== RCS file: /cvs/framework/framework/source/helper/statusindicatorfactory.cxx,v retrieving revision 1.21 diff -u -p -u -r1.21 statusindicatorfactory.cxx --- openoffice.org.orig/framework/source/helper/statusindicatorfactory.cxx 23 Sep 2005 15:41:23 -0000 1.21 +++ openoffice.org/framework/source/helper/statusindicatorfactory.cxx 4 Jan 2006 21:41:06 -0000 @@ -496,9 +496,11 @@ void StatusIndicatorFactory::implts_make if (xParentWindow.is()) xParentWindow->setVisible(sal_True); +#if 0 css::uno::Reference< css::awt::XTopWindow > xParentWindowTop(xParentWindow, css::uno::UNO_QUERY); if (xParentWindowTop.is()) xParentWindowTop->toFront(); +#endif } //----------------------------------------------- Index: source/loadenv/loadenv.cxx =================================================================== RCS file: /cvs/framework/framework/source/loadenv/loadenv.cxx,v retrieving revision 1.21 diff -u -p -u -r1.21 loadenv.cxx --- openoffice.org.orig/framework/source/loadenv/loadenv.cxx 11 Nov 2005 12:06:12 -0000 1.21 +++ openoffice.org/framework/source/loadenv/loadenv.cxx 4 Jan 2006 21:41:08 -0000 @@ -1774,9 +1774,10 @@ void LoadEnv::impl_makeFrameWindowVisibl if (xWindow.is()) xWindow->setVisible(sal_True); - +#if 0 if (xTopWindow.is()) xTopWindow->toFront(); +#endif /* #i19976# We tried to prevent a toFront() call in case the user putted the Index: source/services/frame.cxx =================================================================== RCS file: /cvs/framework/framework/source/services/frame.cxx,v retrieving revision 1.88 diff -u -p -u -r1.88 frame.cxx --- openoffice.org.orig/framework/source/services/frame.cxx 11 Nov 2005 12:06:59 -0000 1.88 +++ openoffice.org/framework/source/services/frame.cxx 4 Jan 2006 21:41:09 -0000 @@ -1563,6 +1563,7 @@ sal_Bool SAL_CALL Frame::setComponent( if (bIsConnected && !bWasConnected) implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_ATTACHED ); +#if 0 //_____________________________________________________________________________________________________ // A new component window doesn't know anything about current active/focus states. // Set this information on it! @@ -1573,6 +1574,7 @@ sal_Bool SAL_CALL Frame::setComponent( { xComponentWindow->setFocus(); } +#endif // If it was a new component window - we must resize it to fill out // our container window. Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.602 retrieving revision 1.603 diff -u -r1.602 -r1.603 --- openoffice.org.spec 4 Jan 2006 17:05:44 -0000 1.602 +++ openoffice.org.spec 4 Jan 2006 21:51:32 -0000 1.603 @@ -215,6 +215,7 @@ Patch49: openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch Patch50: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch +Patch52: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -882,6 +883,7 @@ %patch49 -p1 -b .ooo59666.vcl.animatedtheme.patch %patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch %patch51 -p1 -b .ooo59997.sw.defaultbullets.patch +%patch52 -p1 -b .ooo19976.framework.nofocussteal.patch %if %{includingexternals} #start ludicrous workaround @@ -3342,6 +3344,7 @@ %changelog * Wed Jan 04 2006 Caolan McNamara - 1:2.0.1.1-5 - spinbutton factory needs to be uneditable as well as combobox +- add openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch for jrb * Thu Dec 22 2005 Caolan McNamara - 1:2.0.1.1-4 - add openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch for rh#176779# From fedora-cvs-commits at redhat.com Wed Jan 4 22:20:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 17:20:11 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.222,1.223 Message-ID: <200601042220.k04MKBHq001637@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1601 Modified Files: eclipse.spec Log Message: Use natively-compiled ecj during build. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.222 retrieving revision 1.223 diff -u -r1.222 -r1.223 --- eclipse.spec 24 Dec 2005 00:25:20 -0000 1.222 +++ eclipse.spec 4 Jan 2006 22:20:08 -0000 1.223 @@ -132,7 +132,7 @@ BuildRequires: mozilla = 37:1.7.12 BuildRequires: mozilla-devel = 37:1.7.12 BuildRequires: nspr-devel -BuildRequires: libXtst-devel +BuildRequires: xorg-x11-devel BuildRequires: cairo >= 1.0 %if %{gcj_support} BuildRequires: gcc-java >= 4.0.2 @@ -557,35 +557,32 @@ # Delete our modified ecj and restore the backup rm -rf ecj-bootstrap-tmp - ## 1b. Natively-compile it - #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ - # -o ecj-bootstrap.jar.so ecj-bootstrap.jar - # - #gcj-dbtool -n ecj-bootstrap.db 30000 - #gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so} + # 1b. Natively-compile it + gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ + -o ecj-bootstrap.jar.so ecj-bootstrap.jar + + gcj-dbtool -n ecj-bootstrap.db 30000 + gcj-dbtool -a ecj-bootstrap.db ecj-bootstrap.jar{,.so} - ## 2a. Build ecj + # 2a. Build ecj export CLASSPATH=ecj-bootstrap.jar:$ORIGCLASSPATH - #export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db" - #export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db" + export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj-bootstrap.db" %endif ant -buildfile jdtcoresrc/compilejdtcorewithjavac.xml %if %{gcj_support} - ## 2b. Natively-compile ecj - #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ - # -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar - # - # gcj-dbtool -n jdtcoresrc/ecj.db 30000 - # gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so} - # export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db" - # - # # Remove our gcj-built ecj - # rm ecj-bootstrap.db ecj-bootstrap.jar{,.so} - rm ecj-bootstrap.jar + # 2b. Natively-compile ecj + gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ + -o jdtcoresrc/ecj.jar.so jdtcoresrc/ecj.jar + + gcj-dbtool -n jdtcoresrc/ecj.db 30000 + gcj-dbtool -a jdtcoresrc/ecj.db jdtcoresrc/ecj.jar{,.so} + + # Remove our gcj-built ecj + rm ecj-bootstrap.db ecj-bootstrap.jar{,.so} + # To enSURE we're not using any pre-compiled ecj on the build system, set this - #export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db" - export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=blah" + export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/jdtcoresrc/ecj.db" %endif # 3. Use this ecj to rebuild itself @@ -593,16 +590,15 @@ ant -buildfile jdtcoresrc/compilejdtcore.xml %if %{gcj_support} - ## Natively-compile it - #gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ - # -o ecj.jar.so ecj.jar - #gcj-dbtool -n ecj.db 30000 - #gcj-dbtool -a ecj.db ecj.jar{,.so} - #export GCJ_PROPERTIES="gnu.gcj.precompiled.db.path=`pwd`/ecj.db" - #export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj.db" + # Natively-compile it + gcj -fPIC -fjni -findirect-dispatch -shared -Wl,-Bsymbolic \ + -o ecj.jar.so ecj.jar + gcj-dbtool -n ecj.db 30000 + gcj-dbtool -a ecj.db ecj.jar{,.so} + export ANT_OPTS="-Dgnu.gcj.precompiled.db.path=`pwd`/ecj.db" # Remove old native bits - #rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so + rm jdtcoresrc/ecj.db jdtcoresrc/ecj.jar.so %endif # Build the rest of Eclipse @@ -1268,6 +1264,10 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1 %changelog +* Wed Jan 04 2005 Andrew Overholt 3.1.1-1jpp_14fc +- Update s390{,x} patches. +- Use natively-compiled ecj during build. + * Fri Dec 23 2005 Andrew Overholt 3.1.1-1jpp_14fc - Rebuild again. From fedora-cvs-commits at redhat.com Wed Jan 4 22:23:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 17:23:23 -0500 Subject: rpms/eclipse/devel eclipse-s390ands390x.patch, 1.5, 1.6 eclipse.spec, 1.223, 1.224 Message-ID: <200601042223.k04MNNT5003185@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3083 Modified Files: eclipse-s390ands390x.patch eclipse.spec Log Message: * Wed Jan 04 2006 Andrew Overholt 3.1.1-1jpp_14fc - Update s390{,x} patches. - Use natively-compiled ecj during build. eclipse-s390ands390x.patch: assemble.org.eclipse.sdk.all.xml | 6 assemble.org.eclipse.sdk.linux.gtk.s390.xml | 619 ++++++++++ assemble.org.eclipse.sdk.linux.gtk.s390x.xml | 619 ++++++++++ build | 4 build.xml | 12 features/org.eclipse.jdt.source/build.xml | 4 features/org.eclipse.jdt/build.xml | 12 features/org.eclipse.pde.source/build.xml | 4 features/org.eclipse.pde/build.xml | 4 features/org.eclipse.platform.launchers/build.xml | 4 features/org.eclipse.platform.launchers/feature.xml | 2 features/org.eclipse.platform.launchers/library/gtk/build.sh | 8 features/org.eclipse.platform.launchers/target.build.properties | 4 features/org.eclipse.platform.source/build.xml | 16 features/org.eclipse.platform.source/feature.xml | 2 features/org.eclipse.platform/build.properties | 2 features/org.eclipse.platform/build.xml | 20 features/org.eclipse.sdk/build.xml | 12 plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties | 3 plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml | 9 plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties | 3 plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml | 9 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases | 1 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java | 16 plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties | 3 plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml | 9 plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties | 3 plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml | 9 plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.platform.source.linux.gtk.s390/about.html | 27 plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties | 3 plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml | 109 + plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml | 9 plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html | 27 plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties | 3 plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml | 109 + plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml | 9 42 files changed, 1731 insertions(+), 26 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 eclipse-s390ands390x.patch Index: eclipse-s390ands390x.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-s390ands390x.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- eclipse-s390ands390x.patch 23 May 2005 17:01:40 -0000 1.5 +++ eclipse-s390ands390x.patch 4 Jan 2006 22:23:19 -0000 1.6 @@ -1,9 +1,9 @@ -diff -ruN eclipse-3.1.0_fc/assemble.org.eclipse.sdk.all.xml eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.all.xml ---- eclipse-3.1.0_fc/assemble.org.eclipse.sdk.all.xml 2005-04-01 16:54:41.000000000 -0500 -+++ eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.all.xml 2005-04-14 15:56:36.000000000 -0400 +diff -uNr orig/assemble.org.eclipse.sdk.all.xml patched/assemble.org.eclipse.sdk.all.xml +--- orig/assemble.org.eclipse.sdk.all.xml 2006-01-03 17:40:22.000000000 -0500 ++++ patched/assemble.org.eclipse.sdk.all.xml 2006-01-03 17:14:52.000000000 -0500 @@ -19,6 +19,12 @@ - - + + + + @@ -14,13 +14,13 @@ -diff -ruN eclipse-3.1.0_fc/assemble.org.eclipse.sdk.linux.gtk.s390.xml eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.linux.gtk.s390.xml ---- eclipse-3.1.0_fc/assemble.org.eclipse.sdk.linux.gtk.s390.xml 1969-12-31 19:00:00.000000000 -0500 -+++ eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.linux.gtk.s390.xml 2005-04-14 15:56:36.000000000 -0400 -@@ -0,0 +1,336 @@ +diff -uNr orig/assemble.org.eclipse.sdk.linux.gtk.s390.xml patched/assemble.org.eclipse.sdk.linux.gtk.s390.xml +--- orig/assemble.org.eclipse.sdk.linux.gtk.s390.xml 1969-12-31 19:00:00.000000000 -0500 ++++ patched/assemble.org.eclipse.sdk.linux.gtk.s390.xml 2006-01-03 17:14:52.000000000 -0500 +@@ -0,0 +1,619 @@ + + -+ ++ + + + @@ -29,6 +29,7 @@ + + + ++ + + + @@ -38,10 +39,15 @@ + + + -+ ++ + + + ++ ++ ++ ++ ++ + + + @@ -53,314 +59,591 @@ + + + -+ + + + + -+ ++ + + -+ ++ + + + + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + -+ ++ + + + + + -+ ++ + + -+ ++ [...2103 lines suppressed...] + + + + -diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties ---- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 1969-12-31 19:00:00.000000000 -0500 -+++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 2005-04-14 15:56:36.792485341 -0400 +diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF patched/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF +--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 ++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500 +@@ -0,0 +1,7 @@ ++Manifest-Version: 1.0 ++Bundle-Name: %pluginName ++Bundle-SymbolicName: org.eclipse.platform.source.linux.gtk.s390; singleton=true ++Bundle-Version: 3.1.1 ++Fragment-Host: org.eclipse.platform.source;bundle-version="3.1.1" ++Bundle-Localization: plugin ++Bundle-Vendor: %providerName +diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html +--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html 1969-12-31 19:00:00.000000000 -0500 ++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html 2006-01-03 17:14:53.000000000 -0500 +@@ -0,0 +1,27 @@ ++ ++ ++ ++About ++ ++ ++ ++

About This Content

++ ++

February 24, 2005

++

License

++ ++

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the ++Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. ++For purposes of the EPL, "Program" will mean the Content.

++ ++

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may ++apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise ++indicated below, the terms and conditions of the EPL still apply to any source code in the Content.

++ ++

Source Code

++

This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license ++agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the ++src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.

++ ++ ++ +\ No newline at end of file +diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties +--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 1969-12-31 19:00:00.000000000 -0500 ++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,3 @@ +#Sat Feb 19 15:09:09 EST 2005 -+bin.includes=fragment.xml,src/** ++bin.includes=fragment.xml,src/**,META-INF/MANIFEST.MF +sourcePlugin=true -diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml ---- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 1969-12-31 19:00:00.000000000 -0500 -+++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 2005-04-14 15:56:36.793485149 -0400 -@@ -0,0 +1,105 @@ +diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml +--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 1969-12-31 19:00:00.000000000 -0500 ++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 2006-01-03 17:14:53.000000000 -0500 +@@ -0,0 +1,109 @@ + + + -+ + + + + ++ ++ + + + + + + ++ ++ ++ ++ ++ ++ + + + @@ -1318,6 +1971,7 @@ + + + ++ + + + @@ -1327,30 +1981,26 @@ + + + -+ ++ + + + -+ -+ ++ ++ + + + + + + -+ -+ -+ -+ + + + + + + -+ -+ ++ ++ + + + @@ -1364,13 +2014,13 @@ + + + -+ -+ ++ ++ + + + + -+ ++ + + + @@ -1388,30 +2038,32 @@ + + + -+ ++ + + + + -diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml ---- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 1969-12-31 19:00:00.000000000 -0500 -+++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 2005-04-14 15:56:36.794484957 -0400 -@@ -0,0 +1,18 @@ +diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml +--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 1969-12-31 19:00:00.000000000 -0500 ++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 2006-01-03 17:14:53.000000000 -0500 +@@ -0,0 +1,9 @@ + + -+ -+ -+ -+ ++ + + + + + + +diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF +--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 ++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500 +@@ -0,0 +1,7 @@ ++Manifest-Version: 1.0 ++Bundle-Name: %pluginName ++Bundle-SymbolicName: org.eclipse.platform.source.linux.gtk.s390x; singleton=true ++Bundle-Version: 3.1.1 ++Fragment-Host: org.eclipse.platform.source;bundle-version="3.1.1" ++Bundle-Localization: plugin ++Bundle-Vendor: %providerName Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.223 retrieving revision 1.224 diff -u -r1.223 -r1.224 --- eclipse.spec 4 Jan 2006 22:20:08 -0000 1.223 +++ eclipse.spec 4 Jan 2006 22:23:19 -0000 1.224 @@ -59,9 +59,9 @@ # We can't really commit to doing builds for these arches upstream, but we # need at least eclipse-ecj to run on them as it's our bytecode compiler for # Fedora. -#Patch13: %{name}-s390ands390x.patch +Patch13: %{name}-s390ands390x.patch # Stupid spaces in directories ... -#Patch14: %{name}-s390ands390x2.patch +Patch14: %{name}-s390ands390x2.patch # Make find work. See # https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=111736 #Patch16: %{name}-find.patch @@ -327,14 +327,14 @@ %patch0 -p0 %patch11 -p0 %if %{gcj_support} -#%patch14 -p0 +%patch14 -p0 %endif popd %patch2 -p0 %patch4 -p0 %patch5 -p0 %if %{gcj_support} -#%patch13 -p1 +%patch13 -p1 %endif %if %{gcj_support} #%patch16 -p0 @@ -1264,7 +1264,7 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1 %changelog -* Wed Jan 04 2005 Andrew Overholt 3.1.1-1jpp_14fc +* Wed Jan 04 2006 Andrew Overholt 3.1.1-1jpp_14fc - Update s390{,x} patches. - Use natively-compiled ecj during build. From fedora-cvs-commits at redhat.com Wed Jan 4 22:25:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 17:25:23 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.224,1.225 Message-ID: <200601042225.k04MPNKM014225@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11179 Modified Files: eclipse.spec Log Message: - Attempt build on ia64, s390, and s390x. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.224 retrieving revision 1.225 diff -u -r1.224 -r1.225 --- eclipse.spec 4 Jan 2006 22:23:19 -0000 1.224 +++ eclipse.spec 4 Jan 2006 22:25:20 -0000 1.225 @@ -23,7 +23,7 @@ Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 1jpp_14fc +Release: 1jpp_15fc License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -115,9 +115,9 @@ Patch48: %{name}-javadoclinks.patch %if %{gcj_support} -ExcludeArch: s390 s390x ia64 ppc64 +ExcludeArch: ppc64 %else -ExclusiveArch: %{ix86} x86_64 ppc ia64 +ExclusiveArch: %{ix86} x86_64 ppc ia64 s390 s390x %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ant @@ -1264,9 +1264,10 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1 %changelog -* Wed Jan 04 2006 Andrew Overholt 3.1.1-1jpp_14fc +* Wed Jan 04 2006 Andrew Overholt 3.1.1-1jpp_15fc - Update s390{,x} patches. - Use natively-compiled ecj during build. +- Attempt build on ia64, s390, and s390x. * Fri Dec 23 2005 Andrew Overholt 3.1.1-1jpp_14fc - Rebuild again. From fedora-cvs-commits at redhat.com Wed Jan 4 22:29:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 17:29:20 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.225,1.226 Message-ID: <200601042229.k04MTK3c030464@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30450 Modified Files: eclipse.spec Log Message: xorg-x11-devel -> libXtst-devel Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- eclipse.spec 4 Jan 2006 22:25:20 -0000 1.225 +++ eclipse.spec 4 Jan 2006 22:29:18 -0000 1.226 @@ -132,7 +132,7 @@ BuildRequires: mozilla = 37:1.7.12 BuildRequires: mozilla-devel = 37:1.7.12 BuildRequires: nspr-devel -BuildRequires: xorg-x11-devel +BuildRequires: libXtest-devel BuildRequires: cairo >= 1.0 %if %{gcj_support} BuildRequires: gcc-java >= 4.0.2 From fedora-cvs-commits at redhat.com Wed Jan 4 22:32:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 17:32:41 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.40, 1.41 java-1.4.2-gcj-compat.spec, 1.114, 1.115 sources, 1.44, 1.45 Message-ID: <200601042232.k04MWfrS030580@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30544 Modified Files: .cvsignore java-1.4.2-gcj-compat.spec sources Log Message: * Wed Jan 4 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_58rh - Import java-gcj-compat 1.0.46. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 16 Nov 2005 01:54:01 -0000 1.40 +++ .cvsignore 4 Jan 2006 22:32:27 -0000 1.41 @@ -1,3 +1,3 @@ -java-gcj-compat-1.0.45.tar.gz +java-gcj-compat-1.0.46.tar.gz bcprov-jdk14-127.tar.gz eclipse-ecj-3.1.0_fc-12.jar Index: java-1.4.2-gcj-compat.spec =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- java-1.4.2-gcj-compat.spec 21 Dec 2005 19:30:35 -0000 1.114 +++ java-1.4.2-gcj-compat.spec 4 Jan 2006 22:32:27 -0000 1.115 @@ -17,11 +17,11 @@ %define buildver 0 # the version-release string for the gcj rpms we require %define gccver 4.0.0-0.42 -%define jgcver 1.0.45 +%define jgcver 1.0.46 %define name java-%{javaver}-%{origin}-compat %define version %{javaver}.%{buildver} -%define release 40jpp_57rh +%define release 40jpp_58rh %define cname java-%{javaver}-%{origin} #%define bcarchivever 127 @@ -542,6 +542,9 @@ %defattr(-,root,root) %changelog +* Wed Jan 4 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_58rh +- Import java-gcj-compat 1.0.46. + * Wed Dec 21 2005 Jesse Keating - 0:1.4.2.0-40jpp_57rh - rebuilt again w/ another new gcc Index: sources =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 16 Nov 2005 01:54:01 -0000 1.44 +++ sources 4 Jan 2006 22:32:27 -0000 1.45 @@ -1,3 +1,3 @@ -18240f2114a95ec82bf64af999902962 java-gcj-compat-1.0.45.tar.gz +325843af607fab873b369fe0b03610b5 java-gcj-compat-1.0.46.tar.gz d17b7fa532fc87fdf14d42c2d293ec3f bcprov-jdk14-127.tar.gz 95766e40c6ab6b641341f3a44dcf0b9e eclipse-ecj-3.1.0_fc-12.jar From fedora-cvs-commits at redhat.com Wed Jan 4 22:32:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 17:32:56 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.226,1.227 Message-ID: <200601042232.k04MWupq030594@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30570 Modified Files: eclipse.spec Log Message: libXtst typo Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- eclipse.spec 4 Jan 2006 22:29:18 -0000 1.226 +++ eclipse.spec 4 Jan 2006 22:32:40 -0000 1.227 @@ -132,7 +132,7 @@ BuildRequires: mozilla = 37:1.7.12 BuildRequires: mozilla-devel = 37:1.7.12 BuildRequires: nspr-devel -BuildRequires: libXtest-devel +BuildRequires: libXtst-devel BuildRequires: cairo >= 1.0 %if %{gcj_support} BuildRequires: gcc-java >= 4.0.2 From fedora-cvs-commits at redhat.com Wed Jan 4 22:46:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 17:46:24 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.41, 1.42 java-1.4.2-gcj-compat.spec, 1.115, 1.116 sources, 1.45, 1.46 Message-ID: <200601042246.k04MkOK7009701@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8360 Modified Files: .cvsignore java-1.4.2-gcj-compat.spec sources Log Message: * Wed Jan 4 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_59rh - Import java-gcj-compat 1.0.47. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 4 Jan 2006 22:32:27 -0000 1.41 +++ .cvsignore 4 Jan 2006 22:46:22 -0000 1.42 @@ -1,3 +1,3 @@ -java-gcj-compat-1.0.46.tar.gz +java-gcj-compat-1.0.47.tar.gz bcprov-jdk14-127.tar.gz eclipse-ecj-3.1.0_fc-12.jar Index: java-1.4.2-gcj-compat.spec =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- java-1.4.2-gcj-compat.spec 4 Jan 2006 22:32:27 -0000 1.115 +++ java-1.4.2-gcj-compat.spec 4 Jan 2006 22:46:22 -0000 1.116 @@ -17,11 +17,11 @@ %define buildver 0 # the version-release string for the gcj rpms we require %define gccver 4.0.0-0.42 -%define jgcver 1.0.46 +%define jgcver 1.0.47 %define name java-%{javaver}-%{origin}-compat %define version %{javaver}.%{buildver} -%define release 40jpp_58rh +%define release 40jpp_59rh %define cname java-%{javaver}-%{origin} #%define bcarchivever 127 @@ -542,6 +542,9 @@ %defattr(-,root,root) %changelog +* Wed Jan 4 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_59rh +- Import java-gcj-compat 1.0.47. + * Wed Jan 4 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_58rh - Import java-gcj-compat 1.0.46. Index: sources =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 4 Jan 2006 22:32:27 -0000 1.45 +++ sources 4 Jan 2006 22:46:22 -0000 1.46 @@ -1,3 +1,3 @@ -325843af607fab873b369fe0b03610b5 java-gcj-compat-1.0.46.tar.gz +26d8f072fe4e98fa73cfb0261adfc0b5 java-gcj-compat-1.0.47.tar.gz d17b7fa532fc87fdf14d42c2d293ec3f bcprov-jdk14-127.tar.gz 95766e40c6ab6b641341f3a44dcf0b9e eclipse-ecj-3.1.0_fc-12.jar From fedora-cvs-commits at redhat.com Wed Jan 4 23:04:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 18:04:33 -0500 Subject: rpms/python-pyblock/devel .cvsignore, 1.7, 1.8 python-pyblock.spec, 1.12, 1.13 sources, 1.10, 1.11 Message-ID: <200601042304.k04N4X7N020758@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/python-pyblock/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20732 Modified Files: .cvsignore python-pyblock.spec sources Log Message: update to 0.10 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Dec 2005 21:26:25 -0000 1.7 +++ .cvsignore 4 Jan 2006 23:04:21 -0000 1.8 @@ -1 +1 @@ -pyblock-0.9.tar.bz2 +pyblock-0.10.tar.bz2 Index: python-pyblock.spec =================================================================== RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- python-pyblock.spec 19 Dec 2005 21:26:25 -0000 1.12 +++ python-pyblock.spec 4 Jan 2006 23:04:21 -0000 1.13 @@ -4,7 +4,7 @@ Summary: Python modules for dealing with block devices Name: python-%{realname} -Version: 0.9 +Version: 0.10 Release: 1 Source0: %{realname}-%{version}.tar.bz2 License: GPL @@ -38,6 +38,9 @@ /%{python_sitelib}/block/* %changelog +* Wed Jan 4 2006 Peter Jones - 0.10-1 +- fix checking for "degraded" raids + * Mon Dec 19 2005 Peter Jones - 0.9-1 - fix some backwards isinstance() calls that cause RaidSet.get_valid() to fail Index: sources =================================================================== RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 19 Dec 2005 21:26:25 -0000 1.10 +++ sources 4 Jan 2006 23:04:21 -0000 1.11 @@ -1 +1 @@ -207df7ede441285a6d3078a663b80be6 pyblock-0.9.tar.bz2 +8ea33e3f04028dc4447a6400871c9101 pyblock-0.10.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 4 23:08:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 18:08:33 -0500 Subject: rpms/booty/devel booty.spec,1.35,1.36 Message-ID: <200601042308.k04N8XDr022051@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21976 Modified Files: booty.spec Log Message: version+changelog Index: booty.spec =================================================================== RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- booty.spec 9 Dec 2005 22:39:49 -0000 1.35 +++ booty.spec 4 Jan 2006 23:08:31 -0000 1.36 @@ -1,7 +1,7 @@ Summary: simple python bootloader config lib Name: booty -Version: 0.61 -Release: 1.1 +Version: 0.62 +Release: 1 License: LGPL Source0: %{name}-%{version}.tar.bz2 Group: System Environment/Libraries @@ -34,13 +34,16 @@ %changelog -* Fri Dec 09 2005 Jesse Keating +* Wed Jan 4 2006 Peter Jones - 0.62-1 +- fix degraded raid detection for dmraid + +* Fri Dec 9 2005 Jesse Keating - 0.61-1.1 - rebuilt -* Wed Nov 30 2005 Peter Jones 0.61-1 +* Wed Nov 30 2005 Peter Jones - 0.61-1 - add support for dmraid boot devices -* Fri Nov 18 2005 Peter Jones 0.60-3 +* Fri Nov 18 2005 Peter Jones - 0.60-3 - fix raid on ppc - fix partition numbering on pegasos From fedora-cvs-commits at redhat.com Wed Jan 4 23:08:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 18:08:44 -0500 Subject: rpms/booty/devel .cvsignore,1.32,1.33 sources,1.34,1.35 Message-ID: <200601042308.k04N8ieB022146@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22107 Modified Files: .cvsignore sources Log Message: 0.62 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 30 Nov 2005 22:55:01 -0000 1.32 +++ .cvsignore 4 Jan 2006 23:08:41 -0000 1.33 @@ -1 +1 @@ -booty-0.61.tar.bz2 +booty-0.62.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/booty/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 30 Nov 2005 22:55:01 -0000 1.34 +++ sources 4 Jan 2006 23:08:41 -0000 1.35 @@ -1 +1 @@ -3579927701caa814ce247217dd5e78c9 booty-0.61.tar.bz2 +ae6f7c2eac7d11814729d9dca3139b35 booty-0.62.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 4 23:14:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 18:14:29 -0500 Subject: rpms/boost/devel .cvsignore, 1.7, 1.8 boost.spec, 1.20, 1.21 sources, 1.9, 1.10 Message-ID: <200601042314.k04NETdJ024857@cvs.devel.redhat.com> Author: bkoz Update of /cvs/dist/rpms/boost/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24461 Modified Files: .cvsignore boost.spec sources Log Message: * Wed Jan 04 2006 Benjamin Kosnik 1.33.1-3 - Update to boost-1.33.1. - (#176485: Missing BuildRequires) - (#169271: /usr/lib/libboost*.so.? links missing in package) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/boost/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 15 Nov 2005 20:43:12 -0000 1.7 +++ .cvsignore 4 Jan 2006 23:14:27 -0000 1.8 @@ -1,2 +1,3 @@ boost_1_33_0.tar.bz2 boost-1.33.1.20051114.tar.bz2 +boost_1_33_1.tar.bz2 Index: boost.spec =================================================================== RCS file: /cvs/dist/rpms/boost/devel/boost.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- boost.spec 22 Dec 2005 23:57:54 -0000 1.20 +++ boost.spec 4 Jan 2006 23:14:27 -0000 1.21 @@ -1,9 +1,9 @@ -%define tarball_name boost-1.33.1.20051114 +%define tarball_name boost_1_33_1 Name: boost Summary: The Boost C++ Libraries Version: 1.33.1 -Release: 2 +Release: 3 License: Boost Software License URL: http://www.boost.org/ Group: System Environment/Libraries @@ -11,6 +11,7 @@ BuildRoot: %{_tmppath}/boost-%{version}-root Prereq: /sbin/ldconfig BuildRequires: libstdc++-devel python +BuildRequires: bzip2-libs BuildRequires: bzip2-devel BuildRequires: zlib-devel Obsoletes: boost-doc <= 1.30.2 @@ -103,13 +104,14 @@ NAME=`basename $i`; install -m 755 $i $RPM_BUILD_ROOT%{_libdir}/$NAME; done; -for i in `find stage -type f -name \*.so.*`; do +for i in `find stage -type l -name \*.so`; do NAME=`basename $i`; - install -m 755 $i $RPM_BUILD_ROOT%{_libdir}/$NAME; + cp $i $RPM_BUILD_ROOT%{_libdir}/$NAME; + mv $i $RPM_BUILD_ROOT%{_libdir}/$NAME.2; done; -for i in `find stage -type l -name \*.so`; do +for i in `find stage -type f -name \*.so.*`; do NAME=`basename $i`; - mv $i $RPM_BUILD_ROOT%{_libdir}/$NAME; + install -m 755 $i $RPM_BUILD_ROOT%{_libdir}/$NAME; done; # install include files @@ -142,6 +144,7 @@ %files %defattr(-, root, root) %{_libdir}/*.so.%{version} +%{_libdir}/*.so.2 %files devel %defattr(-, root, root) @@ -154,6 +157,11 @@ %{_docdir}/boost-%{version} %changelog +* Wed Jan 04 2006 Benjamin Kosnik 1.33.1-3 +- Update to boost-1.33.1. +- (#176485: Missing BuildRequires) +- (#169271: /usr/lib/libboost*.so.? links missing in package) + * Thu Dec 22 2005 Jesse Keating 1.33.1-2 - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/boost/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 15 Nov 2005 20:43:12 -0000 1.9 +++ sources 4 Jan 2006 23:14:27 -0000 1.10 @@ -1,2 +1,3 @@ 56fafc275dc0e195ec2f27e8769482cc boost_1_33_0.tar.bz2 74785688e823771402cfa5753fe95b8a boost-1.33.1.20051114.tar.bz2 +2b999b2fb7798e1737d1fff8fac602ef boost_1_33_1.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 5 01:58:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 20:58:51 -0500 Subject: rpms/gnome-volume-manager/devel gnome-volume-manager-1.5.7-array-pointer-fix.patch, NONE, 1.1 gnome-volume-manager.spec, 1.26, 1.27 Message-ID: <200601050158.k051wpcb015057@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-volume-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14930 Modified Files: gnome-volume-manager.spec Added Files: gnome-volume-manager-1.5.7-array-pointer-fix.patch Log Message: - Added a patch to fix an array being passed to dbus gnome-volume-manager-1.5.7-array-pointer-fix.patch: manager.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) --- NEW FILE gnome-volume-manager-1.5.7-array-pointer-fix.patch --- --- gnome-volume-manager-1.5.7/src/manager.c.array-pointer-fix 2006-01-04 20:38:50.000000000 -0500 +++ gnome-volume-manager-1.5.7/src/manager.c 2006-01-04 20:40:05.000000000 -0500 @@ -1243,7 +1243,8 @@ dbus_uint64_t size; int noptions = 0; DBusError error; - + char **poptions; + dbg ("mounting %s...\n", udi); if (!(dmesg = dbus_message_new_method_call ("org.freedesktop.Hal", udi, @@ -1261,9 +1262,10 @@ if (size <= (256 * 1024 * 1024)) options[noptions++] = "sync"; options[noptions] = NULL; - + + poptions = options; if (!dbus_message_append_args (dmesg, DBUS_TYPE_STRING, &mount_point, DBUS_TYPE_STRING, &fstype, - DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &options, noptions, + DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &poptions, noptions, DBUS_TYPE_INVALID)) { dbg ("mount failed for %s: could not append args to dbus message\n", udi); dbus_message_unref (dmesg); Index: gnome-volume-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- gnome-volume-manager.spec 21 Dec 2005 03:51:55 -0000 1.26 +++ gnome-volume-manager.spec 5 Jan 2006 01:58:47 -0000 1.27 @@ -1,7 +1,7 @@ Summary: The GNOME Volume Manager Name: gnome-volume-manager Version: 1.5.7 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source0: gnome-volume-manager-%{version}.tar.bz2 @@ -14,6 +14,7 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=320997 Patch2: gnome-volume-manager-1.5.3-spew.patch #send upstream +Patch3: gnome-volume-manager-1.5.7-array-pointer-fix.patch BuildRoot: /var/tmp/%{name}-root BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.60 BuildPrereq: hal-devel >= 0.5.0 @@ -43,7 +44,7 @@ %patch0 -p1 -b .add-to-base %patch1 -p1 -b .rh-defaults %patch2 -p1 -b .spew - +%patch3 -p1 -b .array-pointer-fix %build %configure make @@ -80,6 +81,9 @@ %{_libexecdir}/gnome-cdda-handler %changelog +* Wed Jan 04 2006 John (J5) Palmieri - 1.5.7-2 +- Added a patch to fix an array being passed to dbus + * Thu Dec 20 2005 Matthias Clasen - 1.5.7-1 - Update to 1.5.7 From fedora-cvs-commits at redhat.com Thu Jan 5 02:17:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 21:17:27 -0500 Subject: rpms/eclipse/devel eclipse-s390ands390x.patch,1.6,1.7 Message-ID: <200601050217.k052HRZC027714@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27439 Modified Files: eclipse-s390ands390x.patch Log Message: Patch munging. eclipse-s390ands390x.patch: assemble.org.eclipse.sdk.all.xml | 6 assemble.org.eclipse.sdk.linux.gtk.s390.xml | 619 ++++++++++ assemble.org.eclipse.sdk.linux.gtk.s390x.xml | 619 ++++++++++ build | 4 build.xml | 12 features/org.eclipse.jdt.source/build.xml | 4 features/org.eclipse.jdt/build.xml | 12 features/org.eclipse.pde.source/build.xml | 4 features/org.eclipse.pde/build.xml | 4 features/org.eclipse.platform.launchers/build.xml | 4 features/org.eclipse.platform.launchers/feature.xml | 2 features/org.eclipse.platform.launchers/library/gtk/build.sh | 8 features/org.eclipse.platform.launchers/target.build.properties | 4 features/org.eclipse.platform.source/build.xml | 16 features/org.eclipse.platform.source/feature.xml | 2 features/org.eclipse.platform/build.properties | 2 features/org.eclipse.platform/build.xml | 20 features/org.eclipse.sdk/build.xml | 12 plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties | 3 plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml | 9 plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties | 3 plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml | 9 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases | 1 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java | 16 plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties | 3 plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml | 9 plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties | 3 plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml | 9 plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.platform.source.linux.gtk.s390/about.html | 27 plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties | 3 plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml | 109 + plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml | 9 plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html | 27 plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties | 3 plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml | 109 + plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml | 9 42 files changed, 1745 insertions(+), 12 deletions(-) Index: eclipse-s390ands390x.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-s390ands390x.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- eclipse-s390ands390x.patch 4 Jan 2006 22:23:19 -0000 1.6 +++ eclipse-s390ands390x.patch 5 Jan 2006 02:17:23 -0000 1.7 @@ -1,6 +1,6 @@ -diff -uNr orig/assemble.org.eclipse.sdk.all.xml patched/assemble.org.eclipse.sdk.all.xml ---- orig/assemble.org.eclipse.sdk.all.xml 2006-01-03 17:40:22.000000000 -0500 -+++ patched/assemble.org.eclipse.sdk.all.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr assemble.org.eclipse.sdk.all.xml assemble.org.eclipse.sdk.all.xml +--- assemble.org.eclipse.sdk.all.xml 2006-01-03 17:40:22.000000000 -0500 ++++ assemble.org.eclipse.sdk.all.xml 2006-01-03 17:14:52.000000000 -0500 @@ -19,6 +19,12 @@ @@ -14,9 +14,9 @@ -diff -uNr orig/assemble.org.eclipse.sdk.linux.gtk.s390.xml patched/assemble.org.eclipse.sdk.linux.gtk.s390.xml ---- orig/assemble.org.eclipse.sdk.linux.gtk.s390.xml 1969-12-31 19:00:00.000000000 -0500 -+++ patched/assemble.org.eclipse.sdk.linux.gtk.s390.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr assemble.org.eclipse.sdk.linux.gtk.s390.xml assemble.org.eclipse.sdk.linux.gtk.s390.xml +--- assemble.org.eclipse.sdk.linux.gtk.s390.xml 1969-12-31 19:00:00.000000000 -0500 ++++ assemble.org.eclipse.sdk.linux.gtk.s390.xml 2006-01-03 17:14:52.000000000 -0500 @@ -0,0 +1,619 @@ + + @@ -637,9 +637,9 @@ + + + -diff -uNr orig/assemble.org.eclipse.sdk.linux.gtk.s390x.xml patched/assemble.org.eclipse.sdk.linux.gtk.s390x.xml ---- orig/assemble.org.eclipse.sdk.linux.gtk.s390x.xml 1969-12-31 19:00:00.000000000 -0500 -+++ patched/assemble.org.eclipse.sdk.linux.gtk.s390x.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr assemble.org.eclipse.sdk.linux.gtk.s390x.xml assemble.org.eclipse.sdk.linux.gtk.s390x.xml +--- assemble.org.eclipse.sdk.linux.gtk.s390x.xml 1969-12-31 19:00:00.000000000 -0500 ++++ assemble.org.eclipse.sdk.linux.gtk.s390x.xml 2006-01-03 17:14:52.000000000 -0500 @@ -0,0 +1,619 @@ + + @@ -1260,9 +1260,9 @@ + + + -diff -uNr orig/build patched/build ---- orig/build 2006-01-03 17:40:22.000000000 -0500 -+++ patched/build 2006-01-03 17:14:52.000000000 -0500 +diff -uNr build build +--- build 2006-01-03 17:40:22.000000000 -0500 ++++ build 2006-01-03 17:14:52.000000000 -0500 @@ -52,7 +52,7 @@ exit 1 fi @@ -1279,9 +1279,9 @@ - fi \ No newline at end of file + fi -diff -uNr orig/build.xml patched/build.xml ---- orig/build.xml 2006-01-03 17:40:22.000000000 -0500 -+++ patched/build.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr build.xml build.xml +--- build.xml 2006-01-03 17:40:22.000000000 -0500 ++++ build.xml 2006-01-03 17:14:52.000000000 -0500 @@ -130,19 +130,19 @@ pde.convertSchemaToHTML and help.buildHelpIndex tasks which are used when generating extension-point and help indeces.--> @@ -1316,9 +1316,9 @@ -diff -uNr orig/features/org.eclipse.jdt/build.xml patched/features/org.eclipse.jdt/build.xml ---- orig/features/org.eclipse.jdt/build.xml 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.jdt/build.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr features/org.eclipse.jdt/build.xml features/org.eclipse.jdt/build.xml +--- features/org.eclipse.jdt/build.xml 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.jdt/build.xml 2006-01-03 17:14:52.000000000 -0500 @@ -164,6 +164,18 @@ @@ -1338,9 +1338,9 @@ -diff -uNr orig/features/org.eclipse.jdt.source/build.xml patched/features/org.eclipse.jdt.source/build.xml ---- orig/features/org.eclipse.jdt.source/build.xml 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.jdt.source/build.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr features/org.eclipse.jdt.source/build.xml features/org.eclipse.jdt.source/build.xml +--- features/org.eclipse.jdt.source/build.xml 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.jdt.source/build.xml 2006-01-03 17:14:52.000000000 -0500 @@ -95,6 +95,10 @@ @@ -1352,9 +1352,9 @@ -diff -uNr orig/features/org.eclipse.pde/build.xml patched/features/org.eclipse.pde/build.xml ---- orig/features/org.eclipse.pde/build.xml 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.pde/build.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr features/org.eclipse.pde/build.xml features/org.eclipse.pde/build.xml +--- features/org.eclipse.pde/build.xml 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.pde/build.xml 2006-01-03 17:14:52.000000000 -0500 @@ -115,6 +115,10 @@ @@ -1366,9 +1366,9 @@ -diff -uNr orig/features/org.eclipse.pde.source/build.xml patched/features/org.eclipse.pde.source/build.xml ---- orig/features/org.eclipse.pde.source/build.xml 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.pde.source/build.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr features/org.eclipse.pde.source/build.xml features/org.eclipse.pde.source/build.xml +--- features/org.eclipse.pde.source/build.xml 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.pde.source/build.xml 2006-01-03 17:14:52.000000000 -0500 @@ -85,6 +85,10 @@ @@ -1380,18 +1380,18 @@ -diff -uNr orig/features/org.eclipse.platform/build.properties patched/features/org.eclipse.platform/build.properties ---- orig/features/org.eclipse.platform/build.properties 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.platform/build.properties 2006-01-03 17:14:52.000000000 -0500 +diff -uNr features/org.eclipse.platform/build.properties features/org.eclipse.platform/build.properties +--- features/org.eclipse.platform/build.properties 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.platform/build.properties 2006-01-03 17:14:52.000000000 -0500 @@ -48,3 +48,5 @@ #expected location of eclipse executable when compiled as part of build root.linux.gtk.ppc64=../../launchertmp,gtk root.hpux.motif.ia64=../../launchertmp,motif +root.linux.gtk.s390=../../launchertmp,gtk +root.linux.gtk.s390x=../../launchertmp,gtk -diff -uNr orig/features/org.eclipse.platform/build.xml patched/features/org.eclipse.platform/build.xml ---- orig/features/org.eclipse.platform/build.xml 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.platform/build.xml 2006-01-03 17:25:57.000000000 -0500 +diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml +--- features/org.eclipse.platform/build.xml 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.platform/build.xml 2006-01-03 17:25:57.000000000 -0500 @@ -432,6 +432,26 @@ @@ -1419,9 +1419,9 @@ -diff -uNr orig/features/org.eclipse.platform.launchers/build.xml patched/features/org.eclipse.platform.launchers/build.xml ---- orig/features/org.eclipse.platform.launchers/build.xml 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.platform.launchers/build.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr features/org.eclipse.platform.launchers/build.xml features/org.eclipse.platform.launchers/build.xml +--- features/org.eclipse.platform.launchers/build.xml 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.platform.launchers/build.xml 2006-01-03 17:14:52.000000000 -0500 @@ -55,7 +55,7 @@ @@ -1440,9 +1440,9 @@ -diff -uNr orig/features/org.eclipse.platform.launchers/feature.xml patched/features/org.eclipse.platform.launchers/feature.xml ---- orig/features/org.eclipse.platform.launchers/feature.xml 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.platform.launchers/feature.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr features/org.eclipse.platform.launchers/feature.xml features/org.eclipse.platform.launchers/feature.xml +--- features/org.eclipse.platform.launchers/feature.xml 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.platform.launchers/feature.xml 2006-01-03 17:14:52.000000000 -0500 @@ -5,7 +5,7 @@ version="3.1.0" os="aix,hpux,linux,macosx,qnx,solaris,win32" @@ -1452,9 +1452,9 @@ %description -diff -uNr orig/features/org.eclipse.platform.launchers/library/gtk/build.sh patched/features/org.eclipse.platform.launchers/library/gtk/build.sh ---- orig/features/org.eclipse.platform.launchers/library/gtk/build.sh 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.platform.launchers/library/gtk/build.sh 2006-01-03 17:14:52.000000000 -0500 +diff -uNr features/org.eclipse.platform.launchers/library/gtk/build.sh features/org.eclipse.platform.launchers/library/gtk/build.sh +--- features/org.eclipse.platform.launchers/library/gtk/build.sh 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.platform.launchers/library/gtk/build.sh 2006-01-03 17:14:52.000000000 -0500 @@ -62,6 +62,14 @@ defaultOSArch="ia64" OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch" @@ -1470,9 +1470,9 @@ *) echo "*** Unknown MODEL <${MODEL}>" ;; -diff -uNr orig/features/org.eclipse.platform.launchers/target.build.properties patched/features/org.eclipse.platform.launchers/target.build.properties ---- orig/features/org.eclipse.platform.launchers/target.build.properties 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.platform.launchers/target.build.properties 2006-01-03 17:14:52.000000000 -0500 +diff -uNr features/org.eclipse.platform.launchers/target.build.properties features/org.eclipse.platform.launchers/target.build.properties +--- features/org.eclipse.platform.launchers/target.build.properties 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.platform.launchers/target.build.properties 2006-01-03 17:14:52.000000000 -0500 @@ -40,4 +40,6 @@ root.linux.gtk.ppc64=../../launchertmp #root.linux.gtk.ia64=../../launchertmp @@ -1482,49 +1482,49 @@ +root.hpux.motif.ia64_32=../../launchertmp +root.linux.gtk.s390=../../launchertmp +root.linux.gtk.s390x=../../launchertmp -diff -uNr orig/features/org.eclipse.platform.source/build.xml patched/features/org.eclipse.platform.source/build.xml ---- orig/features/org.eclipse.platform.source/build.xml 2006-01-03 17:50:03.000000000 -0500 -+++ patched/features/org.eclipse.platform.source/build.xml 2006-01-03 17:37:03.000000000 -0500 -@@ -27,16 +27,6 @@ +diff -uNr features/org.eclipse.platform.source/build.xml features/org.eclipse.platform.source/build.xml +--- features/org.eclipse.platform.source/build.xml 2006-01-03 17:50:03.000000000 -0500 ++++ features/org.eclipse.platform.source/build.xml 2006-01-03 17:37:03.000000000 -0500 +@@ -27,6 +27,16 @@ -- -- -- -- -- -- -- -- -- -- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ -@@ -146,7 +136,7 @@ +@@ -146,7 +156,7 @@ -- -+ +- ++ -@@ -161,10 +151,6 @@ +@@ -161,6 +171,10 @@ -- -- -- -- ++ ++ ++ ++ -diff -uNr orig/features/org.eclipse.platform.source/feature.xml patched/features/org.eclipse.platform.source/feature.xml ---- orig/features/org.eclipse.platform.source/feature.xml 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.platform.source/feature.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr features/org.eclipse.platform.source/feature.xml features/org.eclipse.platform.source/feature.xml +--- features/org.eclipse.platform.source/feature.xml 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.platform.source/feature.xml 2006-01-03 17:14:52.000000000 -0500 @@ -23,6 +23,8 @@ @@ -1534,9 +1534,9 @@ -diff -uNr orig/features/org.eclipse.sdk/build.xml patched/features/org.eclipse.sdk/build.xml ---- orig/features/org.eclipse.sdk/build.xml 2006-01-03 17:40:22.000000000 -0500 -+++ patched/features/org.eclipse.sdk/build.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr features/org.eclipse.sdk/build.xml features/org.eclipse.sdk/build.xml +--- features/org.eclipse.sdk/build.xml 2006-01-03 17:40:22.000000000 -0500 ++++ features/org.eclipse.sdk/build.xml 2006-01-03 17:14:52.000000000 -0500 @@ -111,6 +111,18 @@ @@ -1556,16 +1556,16 @@ -diff -uNr orig/plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties patched/plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties ---- orig/plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties 2006-01-03 17:14:52.000000000 -0500 +diff -uNr plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties +--- plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties 2006-01-03 17:14:52.000000000 -0500 @@ -0,0 +1,3 @@ +#Sat Feb 19 15:09:11 EST 2005 +bin.includes=fragment.xml,src/**,META-INF/MANIFEST.MF +sourcePlugin=true -diff -uNr orig/plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml patched/plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml ---- orig/plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml +--- plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml 2006-01-03 17:14:52.000000000 -0500 @@ -0,0 +1,9 @@ + + @@ -1576,9 +1576,9 @@ + + + -diff -uNr orig/plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF patched/plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF ---- orig/plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF 2006-01-03 17:14:52.000000000 -0500 +diff -uNr plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF +--- plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF 2006-01-03 17:14:52.000000000 -0500 @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-Name: %pluginName @@ -1587,16 +1587,16 @@ +Fragment-Host: org.eclipse.jdt.source;bundle-version="3.1.1" +Bundle-Localization: plugin +Bundle-Vendor: %providerName -diff -uNr orig/plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties patched/plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties ---- orig/plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties 2006-01-03 17:14:52.000000000 -0500 +diff -uNr plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties +--- plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties 2006-01-03 17:14:52.000000000 -0500 @@ -0,0 +1,3 @@ +#Sat Feb 19 15:09:11 EST 2005 +bin.includes=fragment.xml,src/**,META-INF/MANIFEST.MF +sourcePlugin=true -diff -uNr orig/plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml patched/plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml ---- orig/plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml 2006-01-03 17:14:52.000000000 -0500 +diff -uNr plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml +--- plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml 2006-01-03 17:14:52.000000000 -0500 @@ -0,0 +1,9 @@ + + @@ -1607,9 +1607,9 @@ + + + -diff -uNr orig/plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF patched/plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF ---- orig/plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF 2006-01-03 17:14:52.000000000 -0500 +diff -uNr plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF +--- plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF 2006-01-03 17:14:52.000000000 -0500 @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-Name: %pluginName @@ -1618,18 +1618,18 @@ +Fragment-Host: org.eclipse.jdt.source;bundle-version="3.1.1" +Bundle-Localization: plugin +Bundle-Vendor: %providerName -diff -uNr orig/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases patched/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases ---- orig/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases 2006-01-03 17:40:22.000000000 -0500 -+++ patched/plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases +--- plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases 2006-01-03 17:40:22.000000000 -0500 ++++ plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases 2006-01-03 17:14:53.000000000 -0500 @@ -21,4 +21,5 @@ Sparc # SUN x86 pentium i386 i486 i586 i686 # Intel s390 # IBM System 390 +s390x # IBM System 390 (64-bit) -diff -uNr orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java patched/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java ---- orig/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 2006-01-03 17:40:22.000000000 -0500 -+++ patched/plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java +--- plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 2006-01-03 17:40:22.000000000 -0500 ++++ plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java 2006-01-03 17:14:53.000000000 -0500 @@ -120,6 +120,22 @@ public static final String ARCH_IA64_32 = "ia64_32";//$NON-NLS-1$ @@ -1653,16 +1653,16 @@ * Constant string (value "win32") indicating the platform is running on a * machine using the Windows windowing system. */ -diff -uNr orig/plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties patched/plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties ---- orig/plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties +--- plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,3 @@ +#Sat Feb 19 15:09:12 EST 2005 +bin.includes=fragment.xml,src/**,META-INF/MANIFEST.MF +sourcePlugin=true -diff -uNr orig/plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml patched/plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml ---- orig/plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml +--- plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,9 @@ + + @@ -1673,9 +1673,9 @@ + + + -diff -uNr orig/plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF patched/plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF ---- orig/plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF +--- plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-Name: %pluginName @@ -1684,16 +1684,16 @@ +Fragment-Host: org.eclipse.pde.source;bundle-version="3.1.1" +Bundle-Localization: plugin +Bundle-Vendor: %providerName -diff -uNr orig/plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties patched/plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties ---- orig/plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties +--- plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,3 @@ +#Sat Feb 19 15:09:12 EST 2005 +bin.includes=fragment.xml,src/**,META-INF/MANIFEST.MF +sourcePlugin=true -diff -uNr orig/plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml patched/plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml ---- orig/plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml +--- plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,9 @@ + + @@ -1704,9 +1704,9 @@ + + + -diff -uNr orig/plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF patched/plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF ---- orig/plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF +--- plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-Name: %pluginName @@ -1715,9 +1715,9 @@ +Fragment-Host: org.eclipse.pde.source;bundle-version="3.1.1" +Bundle-Localization: plugin +Bundle-Vendor: %providerName -diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390/about.html patched/plugins/org.eclipse.platform.source.linux.gtk.s390/about.html ---- orig/plugins/org.eclipse.platform.source.linux.gtk.s390/about.html 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390/about.html 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.platform.source.linux.gtk.s390/about.html plugins/org.eclipse.platform.source.linux.gtk.s390/about.html +--- plugins/org.eclipse.platform.source.linux.gtk.s390/about.html 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.platform.source.linux.gtk.s390/about.html 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,27 @@ + + @@ -1747,16 +1747,16 @@ + + \ No newline at end of file -diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties patched/plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties ---- orig/plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties +--- plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,3 @@ +#Sat Feb 19 15:09:09 EST 2005 +bin.includes=fragment.xml,src/**,META-INF/MANIFEST.MF +sourcePlugin=true -diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml patched/plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml ---- orig/plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml +--- plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,109 @@ + + @@ -1867,9 +1867,9 @@ + + + -diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml patched/plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml ---- orig/plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml +--- plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,9 @@ + + @@ -1880,9 +1880,9 @@ + + + -diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF patched/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF ---- orig/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF +--- plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-Name: %pluginName @@ -1891,9 +1891,9 @@ +Fragment-Host: org.eclipse.platform.source;bundle-version="3.1.1" +Bundle-Localization: plugin +Bundle-Vendor: %providerName -diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html ---- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html +--- plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,27 @@ + + @@ -1923,16 +1923,16 @@ + + \ No newline at end of file -diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties ---- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties +--- plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,3 @@ +#Sat Feb 19 15:09:09 EST 2005 +bin.includes=fragment.xml,src/**,META-INF/MANIFEST.MF +sourcePlugin=true -diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml ---- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml +--- plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,109 @@ + + @@ -2043,9 +2043,9 @@ + + + -diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml ---- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml +--- plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,9 @@ + + @@ -2056,9 +2056,9 @@ + + + -diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF ---- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 -+++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500 +diff -uNr plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF +--- plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500 ++++ plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500 @@ -0,0 +1,7 @@ +Manifest-Version: 1.0 +Bundle-Name: %pluginName From fedora-cvs-commits at redhat.com Thu Jan 5 02:26:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 21:26:46 -0500 Subject: rpms/eclipse/devel eclipse-s390ands390x.patch, 1.7, 1.8 eclipse.spec, 1.227, 1.228 Message-ID: <200601050226.k052Qk9e027973@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27959 Modified Files: eclipse-s390ands390x.patch eclipse.spec Log Message: Fix the s390 patch (again). eclipse-s390ands390x.patch: assemble.org.eclipse.sdk.all.xml | 6 assemble.org.eclipse.sdk.linux.gtk.s390.xml | 619 ++++++++++ assemble.org.eclipse.sdk.linux.gtk.s390x.xml | 619 ++++++++++ build | 4 build.xml | 2 features/org.eclipse.jdt.source/build.xml | 4 features/org.eclipse.jdt/build.xml | 12 features/org.eclipse.pde.source/build.xml | 4 features/org.eclipse.pde/build.xml | 4 features/org.eclipse.platform.launchers/build.xml | 4 features/org.eclipse.platform.launchers/feature.xml | 2 features/org.eclipse.platform.launchers/library/gtk/build.sh | 8 features/org.eclipse.platform.launchers/target.build.properties | 4 features/org.eclipse.platform.source/build.xml | 16 features/org.eclipse.platform.source/feature.xml | 2 features/org.eclipse.platform/build.properties | 2 features/org.eclipse.platform/build.xml | 20 features/org.eclipse.sdk/build.xml | 12 plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties | 3 plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml | 9 plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties | 3 plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml | 9 plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases | 1 plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java | 16 plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties | 3 plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml | 9 plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties | 3 plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml | 9 plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.platform.source.linux.gtk.s390/about.html | 27 plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties | 3 plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml | 109 + plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml | 9 plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7 plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html | 27 plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties | 3 plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml | 109 + plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml | 9 42 files changed, 1740 insertions(+), 7 deletions(-) Index: eclipse-s390ands390x.patch =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-s390ands390x.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- eclipse-s390ands390x.patch 5 Jan 2006 02:17:23 -0000 1.7 +++ eclipse-s390ands390x.patch 5 Jan 2006 02:26:42 -0000 1.8 @@ -1282,31 +1282,6 @@ diff -uNr build.xml build.xml --- build.xml 2006-01-03 17:40:22.000000000 -0500 +++ build.xml 2006-01-03 17:14:52.000000000 -0500 -@@ -130,19 +130,19 @@ - pde.convertSchemaToHTML and help.buildHelpIndex tasks which are used when generating extension-point and help indeces.--> - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - -- -+ - - - @@ -272,6 +272,8 @@ Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- eclipse.spec 4 Jan 2006 22:32:40 -0000 1.227 +++ eclipse.spec 5 Jan 2006 02:26:42 -0000 1.228 @@ -334,7 +334,7 @@ %patch4 -p0 %patch5 -p0 %if %{gcj_support} -%patch13 -p1 +%patch13 -p0 %endif %if %{gcj_support} #%patch16 -p0 @@ -344,10 +344,10 @@ popd pushd plugins/org.eclipse.jdt.core %patch19 -p0 -#%patch20 -p0 +%patch20 -p0 popd pushd plugins/org.eclipse.jdt.ui -#%patch21 -p0 +%patch21 -p0 popd pushd plugins/org.eclipse.update.core %patch22 -p0 From fedora-cvs-commits at redhat.com Thu Jan 5 02:39:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 21:39:49 -0500 Subject: rpms/pup/devel .cvsignore, 1.13, 1.14 pup.spec, 1.15, 1.16 sources, 1.15, 1.16 Message-ID: <200601050239.k052dnUB028144@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/pup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28120/devel Modified Files: .cvsignore pup.spec sources Log Message: auto-import pup-0.9.0-1 on branch devel from pup-0.9.0-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pup/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 11 Dec 2005 00:12:04 -0000 1.13 +++ .cvsignore 5 Jan 2006 02:39:46 -0000 1.14 @@ -1 +1 @@ -pup-0.1.9.tar.bz2 +pup-0.9.0.tar.bz2 Index: pup.spec =================================================================== RCS file: /cvs/dist/rpms/pup/devel/pup.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- pup.spec 11 Dec 2005 00:12:04 -0000 1.15 +++ pup.spec 5 Jan 2006 02:39:46 -0000 1.16 @@ -1,6 +1,6 @@ Summary: Graphical package updater Name: pup -Version: 0.1.9 +Version: 0.9.0 Release: 1 License: GPL Group: System Environment/Base @@ -11,7 +11,7 @@ BuildRequires: python BuildRequires: gettext Requires: python, rpm-python, rpm >= 0:4.1.1 -Requires: yum >= 2.4.0 +Requires: yum >= 2.5.0, pygtk2-libglade %description pup provides a graphical interface for installing updates. @@ -42,6 +42,17 @@ %attr(0644,root,root) %config /etc/pam.d/pup %changelog +* Wed Jan 4 2006 Jeremy Katz - 0.9.0-1 +- Require pygtk2-libglade (#176292) +- Moved some generic bits down into yum +- Set the title on dialog boxes +- Handle errors running transactions (#174500) +- Wait for confirmation on the reboot +- Log to the yum logfile (#163785, #175808) +- Make progress bar not jump (#176407) +- Use rhpl exception handler +- Move to System Tools menu + * Sat Dec 10 2005 Jeremy Katz - 0.1.9-1 - prompt for a reboot on packages which should do so - give info on dependencies that are pulled in Index: sources =================================================================== RCS file: /cvs/dist/rpms/pup/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 11 Dec 2005 00:12:04 -0000 1.15 +++ sources 5 Jan 2006 02:39:46 -0000 1.16 @@ -1 +1 @@ -4b677108aa01af386406bab10e7a029e pup-0.1.9.tar.bz2 +82d9a684cbccc583927f01465477b82d pup-0.9.0.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 5 03:39:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 22:39:49 -0500 Subject: rpms/mysql/devel .cvsignore, 1.24, 1.25 mysql.spec, 1.68, 1.69 sources, 1.24, 1.25 Message-ID: <200601050339.k053dnoR010184@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/mysql/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10152 Modified Files: .cvsignore mysql.spec sources Log Message: Update to MySQL 5.0.18 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mysql/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 10 Dec 2005 05:13:43 -0000 1.24 +++ .cvsignore 5 Jan 2006 03:39:46 -0000 1.25 @@ -1 +1 @@ -mysql-5.0.16.tar.gz +mysql-5.0.18.tar.gz Index: mysql.spec =================================================================== RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- mysql.spec 15 Dec 2005 17:04:25 -0000 1.68 +++ mysql.spec 5 Jan 2006 03:39:46 -0000 1.69 @@ -1,6 +1,6 @@ Name: mysql -Version: 5.0.16 -Release: 4 +Version: 5.0.18 +Release: 1 Summary: MySQL client programs and shared libraries. License: GPL Group: Applications/Databases @@ -378,6 +378,9 @@ %{_datadir}/sql-bench %changelog +* Wed Jan 4 2006 Tom Lane 5.0.18-1 +- Update to MySQL 5.0.18 + * Thu Dec 15 2005 Tom Lane 5.0.16-4 - fix my_config.h for ppc platforms Index: sources =================================================================== RCS file: /cvs/dist/rpms/mysql/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 10 Dec 2005 05:13:43 -0000 1.24 +++ sources 5 Jan 2006 03:39:46 -0000 1.25 @@ -1 +1 @@ -ecf2ae1d782a8d129af940c15a44f477 mysql-5.0.16.tar.gz +f18153b0239aaa03fc5a751f2d82cb71 mysql-5.0.18.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 5 04:33:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 23:33:40 -0500 Subject: rpms/gthumb/devel .cvsignore, 1.17, 1.18 gthumb.spec, 1.28, 1.29 sources, 1.17, 1.18 Message-ID: <200601050433.k054XeJg010070@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gthumb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10055 Modified Files: .cvsignore gthumb.spec sources Log Message: 2.7.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gthumb/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 14 Nov 2005 03:26:37 -0000 1.17 +++ .cvsignore 5 Jan 2006 04:33:37 -0000 1.18 @@ -8,3 +8,4 @@ gthumb-2.6.7.tar.bz2 gthumb-2.6.8.tar.bz2 gthumb-2.7.1.tar.bz2 +gthumb-2.7.2.tar.bz2 Index: gthumb.spec =================================================================== RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gthumb.spec 10 Dec 2005 16:39:05 -0000 1.28 +++ gthumb.spec 5 Jan 2006 04:33:37 -0000 1.29 @@ -9,11 +9,10 @@ Summary: Image viewer, editor, organizer Name: gthumb -Version: 2.7.1 -Release: 1.1 +Version: 2.7.2 +Release: 1 URL: http://gthumb.sourceforge.net Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2 -Patch0: gthumb-2.7.1-stock.patch License: GPL Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-root @@ -43,7 +42,6 @@ %prep %setup -q -%patch0 -p1 -b .stock %build @@ -96,6 +94,10 @@ %{_datadir}/pixmaps %changelog +* Wed Jan 4 2006 Matthias Clasen - 2.7.2-1 +- Update to 2.7.2 +- Drop upstreamed patches + * Fri Dec 09 2005 Jesse Keating - 2.7.1-1.1 - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/gthumb/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 14 Nov 2005 03:26:37 -0000 1.17 +++ sources 5 Jan 2006 04:33:37 -0000 1.18 @@ -1 +1 @@ -05b9bbfe9d0d1d9f3198a529177db381 gthumb-2.7.1.tar.bz2 +4a9db0c1087f71dfa7fdd80f0307c4a5 gthumb-2.7.2.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 5 04:46:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 4 Jan 2006 23:46:10 -0500 Subject: rpms/kernel/devel linux-2.6-debug-oops-pause.patch,1.3,1.4 Message-ID: <200601050446.k054kA4Y018011@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17183 Modified Files: linux-2.6-debug-oops-pause.patch Log Message: rediff linux-2.6-debug-oops-pause.patch: traps.c | 9 +++++++++ 1 files changed, 9 insertions(+) Index: linux-2.6-debug-oops-pause.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-oops-pause.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-debug-oops-pause.patch 23 Dec 2005 22:37:40 -0000 1.3 +++ linux-2.6-debug-oops-pause.patch 5 Jan 2006 04:46:06 -0000 1.4 @@ -6,9 +6,9 @@ (Wow, I'm really getting desperate for better debug data). ---- linux-2.6.14/arch/i386/kernel/traps.c~ 2005-12-16 03:00:16.000000000 -0500 -+++ linux-2.6.14/arch/i386/kernel/traps.c 2005-12-16 03:07:12.000000000 -0500 -@@ -271,6 +271,15 @@ void show_registers(struct pt_regs *regs +--- vanilla/arch/i386/kernel/traps.c 2006-01-02 22:21:10.000000000 -0500 ++++ linux-2.6.15/arch/i386/kernel/traps.c 2006-01-04 23:42:46.000000000 -0500 +@@ -256,6 +271,15 @@ void show_registers(struct pt_regs *regs } } printk("\n"); From fedora-cvs-commits at redhat.com Thu Jan 5 05:16:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 00:16:13 -0500 Subject: rpms/pup/devel .cvsignore, 1.14, 1.15 pup.spec, 1.16, 1.17 sources, 1.16, 1.17 Message-ID: <200601050516.k055GDFE001953@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/pup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1905/devel Modified Files: .cvsignore pup.spec sources Log Message: auto-import pup-0.9.1-1 on branch devel from pup-0.9.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pup/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 5 Jan 2006 02:39:46 -0000 1.14 +++ .cvsignore 5 Jan 2006 05:16:03 -0000 1.15 @@ -1 +1 @@ -pup-0.9.0.tar.bz2 +pup-0.9.1.tar.bz2 Index: pup.spec =================================================================== RCS file: /cvs/dist/rpms/pup/devel/pup.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- pup.spec 5 Jan 2006 02:39:46 -0000 1.16 +++ pup.spec 5 Jan 2006 05:16:03 -0000 1.17 @@ -1,6 +1,6 @@ Summary: Graphical package updater Name: pup -Version: 0.9.0 +Version: 0.9.1 Release: 1 License: GPL Group: System Environment/Base @@ -42,6 +42,9 @@ %attr(0644,root,root) %config /etc/pam.d/pup %changelog +* Wed Jan 4 2006 Jeremy Katz - 0.9.1-1 +- fix a silly traceback + * Wed Jan 4 2006 Jeremy Katz - 0.9.0-1 - Require pygtk2-libglade (#176292) - Moved some generic bits down into yum Index: sources =================================================================== RCS file: /cvs/dist/rpms/pup/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 5 Jan 2006 02:39:46 -0000 1.16 +++ sources 5 Jan 2006 05:16:03 -0000 1.17 @@ -1 +1 @@ -82d9a684cbccc583927f01465477b82d pup-0.9.0.tar.bz2 +6cae8ff23c49eeae116aa0056fee797e pup-0.9.1.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 5 06:15:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 01:15:35 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1819, 1.1820 linux-2.6-acpi-acpica-20051202.patch, 1.1, NONE Message-ID: <200601050615.k056FZ63013191@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12480 Modified Files: kernel-2.6.spec Removed Files: linux-2.6-acpi-acpica-20051202.patch Log Message: throw out some crap Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1819 retrieving revision 1.1820 diff -u -r1.1819 -r1.1820 --- kernel-2.6.spec 4 Jan 2006 03:09:16 -0000 1.1819 +++ kernel-2.6.spec 5 Jan 2006 06:15:32 -0000 1.1820 @@ -366,7 +366,6 @@ # ACPI patches. Patch1800: linux-2.6-acpi-thinkpad-c2c3.patch -Patch1801: linux-2.6-acpi-acpica-20051202.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -869,8 +868,6 @@ # ACPI patches. # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. %patch1800 -p1 -# ACPICA update -#%patch1801 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 --- linux-2.6-acpi-acpica-20051202.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 5 06:24:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 01:24:37 -0500 Subject: rpms/control-center/devel control-center-2.13.4-fedora-apps.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 control-center.spec, 1.106, 1.107 sources, 1.33, 1.34 Message-ID: <200601050624.k056Obe3027795@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27745 Modified Files: .cvsignore control-center.spec sources Added Files: control-center-2.13.4-fedora-apps.patch Log Message: 2.13.4 control-center-2.13.4-fedora-apps.patch: gnome-default-applications-properties-structs.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) --- NEW FILE control-center-2.13.4-fedora-apps.patch --- --- control-center-2.13.4/capplets/default-applications/gnome-default-applications-properties-structs.c.fedora-apps 2006-01-05 00:34:32.000000000 -0500 +++ control-center-2.13.4/capplets/default-applications/gnome-default-applications-properties-structs.c 2006-01-05 00:38:17.000000000 -0500 @@ -9,12 +9,9 @@ { N_("Debian Sensible Browser"), "sensible-browser", "sensible-browser %s", FALSE, FALSE }, { N_("Epiphany"), "epiphany", "epiphany %s", FALSE, FALSE }, { N_("Galeon"), "galeon", "galeon %s", FALSE, FALSE }, - { N_("Encompass"), "encompass", "encompass %s", FALSE, FALSE }, - { N_("Firebird"), "mozilla-firebird", "mozilla-firebird %s", FALSE, FALSE }, { N_("Firefox"), "firefox", "firefox %s", FALSE, FALSE }, - { N_("Mozilla"), "mozilla-1.6", "mozilla-1.6 %s", FALSE, FALSE }, { N_("Mozilla"), "mozilla", "mozilla %s", FALSE, FALSE }, - { N_("Netscape Communicator"), "netscape", "netscape %s", FALSE, FALSE }, + { N_("Netscape"), "netscape", "netscape %s", FALSE, FALSE }, { N_("Konqueror"), "konqueror", "konqueror %s", FALSE, FALSE }, { N_("Opera"), "opera", "opera %s", FALSE, FALSE }, { N_("Opera (open in new tab)"), "opera", "opera -newpage %s", FALSE, FALSE }, @@ -35,18 +32,13 @@ * there is only one (the first entry in this list) Evolution entry * in the list shown to the user */ - { N_("Evolution Mail Reader"), "evolution-2.4", "evolution-2.4 %s", FALSE, FALSE, }, - { N_("Evolution Mail Reader"), "evolution-2.2", "evolution-2.2 %s", FALSE, FALSE, }, - { N_("Evolution Mail Reader"), "evolution-2.0", "evolution-2.0 %s", FALSE, FALSE, }, - { N_("Evolution Mail Reader"), "evolution-1.6", "evolution-1.6 %s", FALSE, FALSE, }, - { N_("Evolution Mail Reader"), "evolution-1.5", "evolution-1.5 %s", FALSE, FALSE, }, - { N_("Evolution Mail Reader"), "evolution-1.4", "evolution-1.4 %s", FALSE, FALSE, }, { N_("Evolution Mail Reader"), "evolution", "evolution %s", FALSE, FALSE, }, { N_("Balsa"), "balsa", "balsa -m %s", FALSE, FALSE }, { N_("KMail"), "kmail", "kmail %s", FALSE, FALSE }, - { N_("Thunderbird"), "thunderbird", "thunderbird -mail %s", FALSE, FALSE}, - { N_("Thunderbird"), "mozilla-thunderbird", "mozilla-thunderbird -mail %s", FALSE, FALSE}, + { N_("Thunderbird Mail"), "thunderbird", "thunderbird -mail %s", FALSE, FALSE}, + { N_("Sylpheed"), "sylpheed", "sylpheed --compose %s", FALSE, FALSE }, { N_("Mozilla Mail"), "mozilla", "mozilla -mail %s", FALSE, FALSE}, + { N_("Opera Mail"), "opera", "opera", FALSE, FALSE }, { N_("Mutt") , "mutt", "mutt %s", TRUE, FALSE }, { N_("Sylpheed-Claws") , "sylpheed-claws", "sylpheed-claws --compose %s", FALSE, FALSE } }; @@ -60,7 +52,9 @@ static TerminalDescription possible_terminals[] = { { N_("Debian Terminal Emulator"), "x-terminal-emulator", "-e", FALSE }, { N_("GNOME Terminal"), "gnome-terminal", "-x", FALSE }, + { N_("KDE Konsole"), "konsole", "-e", FALSE }, { N_("Standard XTerminal"), "xterm", "-e", FALSE }, + { N_("KTerm"), "kterm", "-e", FALSE }, { N_("NXterm"), "nxterm", "-e", FALSE }, { N_("RXVT"), "rxvt", "-e", FALSE }, { N_("aterm"), "aterm", "-e", FALSE }, Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 14 Dec 2005 20:27:41 -0000 1.30 +++ .cvsignore 5 Jan 2006 06:24:34 -0000 1.31 @@ -3,3 +3,4 @@ control-center-2.12.1.tar.bz2 control-center-2.13.2.tar.bz2 control-center-2.13.3.tar.bz2 +control-center-2.13.4.tar.bz2 Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- control-center.spec 20 Dec 2005 15:37:27 -0000 1.106 +++ control-center.spec 5 Jan 2006 06:24:34 -0000 1.107 @@ -20,14 +20,14 @@ Summary: GNOME Control Center. Name: control-center -Version: 2.13.3 -Release: 2 +Version: 2.13.4 +Release: 1 Epoch: 1 License: GPL/LGPL Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center-%{version}.tar.bz2 -Patch1: control-center-2.12.1-fedora-apps.patch +Patch1: control-center-2.13.4-fedora-apps.patch Patch2: control-center-2.9.4-filesel.patch Patch3: control-center-2.10.1-mark-tool-buttons-important.patch Patch5: control-center-2.12.0-run-power-manager.patch @@ -215,6 +215,9 @@ # (also its headers) %changelog +* Wed Jan 4 2006 Matthias Clasen - 1:2.13.4-1 +- Update to 2.13.4 + * Tue Dec 20 2005 Ray Strode - 1:2.13.3-2 - rebuild Index: sources =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 14 Dec 2005 20:27:41 -0000 1.33 +++ sources 5 Jan 2006 06:24:34 -0000 1.34 @@ -1 +1 @@ -972f2e962a871c7bacdf6acf5e3a4999 control-center-2.13.3.tar.bz2 +4bd5ee29d4ae59439d7ba31dd77fbcaa control-center-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 5 06:27:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 01:27:47 -0500 Subject: rpms/gtksourceview/devel .cvsignore, 1.16, 1.17 gtksourceview.spec, 1.22, 1.23 sources, 1.15, 1.16 Message-ID: <200601050627.k056Rlnj029383@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtksourceview/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29325 Modified Files: .cvsignore gtksourceview.spec sources Log Message: 1.5.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 3 Jan 2006 17:19:01 -0000 1.16 +++ .cvsignore 5 Jan 2006 06:27:44 -0000 1.17 @@ -4,3 +4,4 @@ gtksourceview-1.5.1.tar.bz2 gtksourceview-1.5.2.tar.bz2 gtksourceview-1.5.3.tar.bz2 +gtksourceview-1.5.4.tar.bz2 Index: gtksourceview.spec =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gtksourceview.spec 3 Jan 2006 17:19:01 -0000 1.22 +++ gtksourceview.spec 5 Jan 2006 06:27:44 -0000 1.23 @@ -3,7 +3,7 @@ Summary: A library for viewing source files Name: gtksourceview -Version: 1.5.3 +Version: 1.5.4 Release: 1 License: LGPL Group: System Environment/Libraries @@ -71,6 +71,9 @@ %{_libdir}/*.so %changelog +* Tue Jan 05 2006 Matthias Clasen +- Update to 1.5.4 + * Tue Jan 03 2006 Matthias Clasen - Update to 1.5.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 3 Jan 2006 17:19:01 -0000 1.15 +++ sources 5 Jan 2006 06:27:44 -0000 1.16 @@ -1 +1 @@ -4298c443517e006fa349af7f9e06d4f3 gtksourceview-1.5.3.tar.bz2 +c1984fea0fa6b080351b5a7364b9c4e6 gtksourceview-1.5.4.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 5 07:09:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 02:09:09 -0500 Subject: rpms/mysql/devel mysql-rpl-test.patch, NONE, 1.1 mysql.spec, 1.69, 1.70 Message-ID: <200601050709.k05799gb015620@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/mysql/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15591 Modified Files: mysql.spec Added Files: mysql-rpl-test.patch Log Message: Hack to get mysql regression tests to pass more reliably. mysql-rpl-test.patch: r/rpl000001.result | 1 + t/rpl000001.test | 1 + 2 files changed, 2 insertions(+) --- NEW FILE mysql-rpl-test.patch --- This patch improves the stability of the mysql regression tests on Red Hat's build servers. I really have no idea why ... it is probably masking a bug in mysqld, but without a better handle on how to reproduce the problem, it's tough to make a bug report. Worth noting is that rpl000001 passes fine when run by itself, or with the immediately preceding tests; but fails when the complete test series is run. diff -Naur mysql-5.0.18.orig/mysql-test/r/rpl000001.result mysql-5.0.18/mysql-test/r/rpl000001.result --- mysql-5.0.18.orig/mysql-test/r/rpl000001.result 2005-12-21 14:50:25.000000000 -0500 +++ mysql-5.0.18/mysql-test/r/rpl000001.result 2006-01-05 01:57:17.000000000 -0500 @@ -1,3 +1,4 @@ +flush privileges; stop slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; reset master; diff -Naur mysql-5.0.18.orig/mysql-test/t/rpl000001.test mysql-5.0.18/mysql-test/t/rpl000001.test --- mysql-5.0.18.orig/mysql-test/t/rpl000001.test 2005-12-21 14:50:25.000000000 -0500 +++ mysql-5.0.18/mysql-test/t/rpl000001.test 2006-01-05 01:57:15.000000000 -0500 @@ -1,3 +1,4 @@ +flush privileges; source include/master-slave.inc; create table t1 (word char(20) not null); Index: mysql.spec =================================================================== RCS file: /cvs/dist/rpms/mysql/devel/mysql.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- mysql.spec 5 Jan 2006 03:39:46 -0000 1.69 +++ mysql.spec 5 Jan 2006 07:09:06 -0000 1.70 @@ -23,6 +23,7 @@ Patch4: mysql-testing.patch Patch5: mysql-no-atomic.patch Patch6: mysql-rpl_ddl.patch +Patch7: mysql-rpl-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/ldconfig, /sbin/install-info, grep, fileutils, chkconfig @@ -98,6 +99,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 libtoolize --force aclocal @@ -378,7 +380,7 @@ %{_datadir}/sql-bench %changelog -* Wed Jan 4 2006 Tom Lane 5.0.18-1 +* Thu Jan 5 2006 Tom Lane 5.0.18-1 - Update to MySQL 5.0.18 * Thu Dec 15 2005 Tom Lane 5.0.16-4 From fedora-cvs-commits at redhat.com Thu Jan 5 08:05:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 03:05:17 -0500 Subject: rpms/php/devel php.spec,1.98,1.99 Message-ID: <200601050805.k0585GFp027188@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27177 Modified Files: php.spec Log Message: * Thu Jan 5 2006 Joe Orton 5.1.1-8 - rebuild again Index: php.spec =================================================================== RCS file: /cvs/dist/rpms/php/devel/php.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- php.spec 2 Jan 2006 12:16:17 -0000 1.98 +++ php.spec 5 Jan 2006 08:05:12 -0000 1.99 @@ -3,7 +3,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php Version: 5.1.1 -Release: 7 +Release: 8 License: The PHP License Group: Development/Languages URL: http://www.php.net/ @@ -537,6 +537,9 @@ %files pdo -f files.pdo %changelog +* Thu Jan 5 2006 Joe Orton 5.1.1-8 +- rebuild again + * Mon Jan 2 2006 Joe Orton 5.1.1-7 - rebuild for new net-snmp From fedora-cvs-commits at redhat.com Thu Jan 5 09:30:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 04:30:19 -0500 Subject: rpms/kdeutils/devel kdeutils.spec,1.49,1.50 Message-ID: <200601050930.k059UJb1017895@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/kdeutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17880 Modified Files: kdeutils.spec Log Message: - rebuilt against new libnetsnmp Index: kdeutils.spec =================================================================== RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- kdeutils.spec 20 Dec 2005 12:45:39 -0000 1.49 +++ kdeutils.spec 5 Jan 2006 09:30:16 -0000 1.50 @@ -9,7 +9,7 @@ %define disable_gcc_check_and_hidden_visibility 1 Version: 3.5.0 -Release: 2 +Release: 3 Name: kdeutils Prefix: /usr Summary: K Desktop Environment - Utilities @@ -320,6 +320,9 @@ %{_includedir}/kde/* %changelog +* Thu Jan 05 2006 Radek Vokal 6:3.5.0-3 +- rebuilt against new libnetsnmp + * Tue Dec 20 2005 Than Ngo 6:3.5.0-2 - fix file conflict with superkaramba #176044 From fedora-cvs-commits at redhat.com Thu Jan 5 10:57:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 05:57:30 -0500 Subject: rpms/gcc/devel gcc41-pr25324.patch, NONE, 1.1 gcc41-rh176562.patch, NONE, 1.1 .cvsignore, 1.123, 1.124 gcc41.spec, 1.14, 1.15 sources, 1.125, 1.126 gcc41-pr25005.patch, 1.1, NONE gcc41-pr25307.patch, 1.1, NONE gcc41-pr25328-test.patch, 1.1, NONE gcc41-pr25364.patch, 1.1, NONE gcc41-pr25369.patch, 1.1, NONE gcc41-pr25432.patch, 1.2, NONE Message-ID: <200601051057.k05AvUHa009493@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9395 Modified Files: .cvsignore gcc41.spec sources Added Files: gcc41-pr25324.patch gcc41-rh176562.patch Removed Files: gcc41-pr25005.patch gcc41-pr25307.patch gcc41-pr25328-test.patch gcc41-pr25364.patch gcc41-pr25369.patch gcc41-pr25432.patch Log Message: 4.1.0-0.13 gcc41-pr25324.patch: Make-lang.in | 1 gfortran.h | 2 lang-specs.h | 6 +- lang.opt | 4 + options.c | 34 ++++++++++-- scanner.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 6 files changed, 198 insertions(+), 14 deletions(-) --- NEW FILE gcc41-pr25324.patch --- 2005-12-31 Jakub Jelinek PR fortran/25324 * Make-lang.in (fortran/scanner.o): Depend on toplev.h. * lang.opt (fpreprocessed): New option. * scanner.c: Include toplev.h. (gfc_src_file, gfc_src_preprocessor_lines): New variables. (preprocessor_line): Unescape filename if there were any backslashes. (load_file): If initial and gfc_src_file is not NULL, use it rather than opening the file. If gfc_src_preprocessor_lines has non-NULL elements, pass it to preprocessor_line. (unescape_filename, gfc_read_orig_filename): New functions. * gfortran.h (gfc_option_t): Add flag_preprocessed. (gfc_read_orig_filename): New prototype. * options.c (gfc_init_options): Clear flag_preprocessed. (gfc_post_options): If flag_preprocessed, call gfc_read_orig_filename. (gfc_handle_option): Handle OPT_fpreprocessed. * lang-specs.h: Pass -fpreprocessed to f951 if preprocessing sources. --- gcc/fortran/Make-lang.in.jj 2005-12-13 08:47:45.000000000 +0100 +++ gcc/fortran/Make-lang.in 2005-12-31 01:01:57.000000000 +0100 @@ -269,6 +269,7 @@ GFORTRAN_TRANS_DEPS = fortran/gfortran.h fortran/f95-lang.o: $(GFORTRAN_TRANS_DEPS) fortran/mathbuiltins.def \ gt-fortran-f95-lang.h gtype-fortran.h cgraph.h $(TARGET_H) +fortran/scanner.o: toplev.h fortran/convert.o: $(GFORTRAN_TRANS_DEPS) fortran/trans.o: $(GFORTRAN_TRANS_DEPS) fortran/trans-decl.o: $(GFORTRAN_TRANS_DEPS) gt-fortran-trans-decl.h \ --- gcc/fortran/lang.opt.jj 2005-12-12 11:57:24.000000000 +0100 +++ gcc/fortran/lang.opt 2005-12-29 16:23:28.000000000 +0100 @@ -173,6 +173,10 @@ frepack-arrays Fortran Copy array sections into a contiguous block on procedure entry +fpreprocessed +Fortran +Treat the input file as preprocessed + qkind= Fortran RejectNegative Joined UInteger -qkind= Set the kind for a real with the 'q' exponent to 'n' --- gcc/fortran/scanner.c.jj 2005-12-02 23:46:26.000000000 +0100 +++ gcc/fortran/scanner.c 2005-12-31 01:12:17.000000000 +0100 @@ -45,6 +45,7 @@ Software Foundation, 51 Franklin Street, #include "config.h" #include "system.h" #include "gfortran.h" +#include "toplev.h" /* Structure for holding module and include file search path. */ typedef struct gfc_directorylist @@ -66,7 +67,9 @@ static gfc_linebuf *line_head, *line_tai locus gfc_current_locus; const char *gfc_source_file; - +static FILE *gfc_src_file; +static char *gfc_src_preprocessor_lines[2]; + /* Main scanner initialization. */ @@ -859,7 +862,7 @@ preprocessor_line (char *c) int i, line; char *filename; gfc_file *f; - int escaped; + int escaped, unescape; c++; while (*c == ' ' || *c == '\t') @@ -890,13 +893,17 @@ preprocessor_line (char *c) filename = c; /* Make filename end at quote. */ + unescape = 0; escaped = false; while (*c && ! (! escaped && *c == '"')) { if (escaped) escaped = false; - else - escaped = *c == '\\'; + else if (*c == '\\') + { + escaped = true; + unescape++; + } ++c; } @@ -906,7 +913,23 @@ preprocessor_line (char *c) *c++ = '\0'; + /* Undo effects of cpp_quote_string. */ + if (unescape) + { + char *s = filename; + char *d = gfc_getmem (c - filename - unescape); + filename = d; + while (*s) + { + if (*s == '\\') + *d++ = *++s; + else + *d++ = *s; + s++; + } + *d = '\0'; + } /* Get flags. */ @@ -942,6 +965,8 @@ preprocessor_line (char *c) gfc_warning_now ("%s:%d: file %s left but not entered", current_file->filename, current_file->line, filename); + if (unescape) + gfc_free (filename); return; } current_file = current_file->up; @@ -959,6 +984,8 @@ preprocessor_line (char *c) /* Set new line number. */ current_file->line = line; + if (unescape) + gfc_free (filename); return; bad_cpp_line: @@ -1043,7 +1070,13 @@ load_file (const char *filename, bool in if (initial) { - input = gfc_open_file (filename); + if (gfc_src_file) + { + input = gfc_src_file; + gfc_src_file = NULL; + } + else + input = gfc_open_file (filename); if (input == NULL) { gfc_error_now ("Can't open file '%s'", filename); @@ -1069,6 +1102,19 @@ load_file (const char *filename, bool in line = NULL; line_len = 0; + if (initial && gfc_src_preprocessor_lines[0]) + { + preprocessor_line (gfc_src_preprocessor_lines[0]); + gfc_free (gfc_src_preprocessor_lines[0]); + gfc_src_preprocessor_lines[0] = NULL; + if (gfc_src_preprocessor_lines[1]) + { + preprocessor_line (gfc_src_preprocessor_lines[1]); + gfc_free (gfc_src_preprocessor_lines[1]); + gfc_src_preprocessor_lines[1] = NULL; + } + } + for (;;) { int trunc = load_line (input, &line, &line_len); @@ -1157,3 +1203,112 @@ gfc_new_file (void) return result; } + +static char * +unescape_filename (const char *ptr) +{ + const char *p = ptr, *s; + char *d, *ret; + int escaped, unescape = 0; + + /* Make filename end at quote. */ + escaped = false; + while (*p && ! (! escaped && *p == '"')) + { + if (escaped) + escaped = false; + else if (*p == '\\') + { + escaped = true; + unescape++; + } + ++p; + } + + if (! *p || p[1]) + return NULL; + + /* Undo effects of cpp_quote_string. */ + s = ptr; + d = gfc_getmem (p + 1 - ptr - unescape); + ret = d; + + while (s != p) + { + if (*s == '\\') + *d++ = *++s; + else + *d++ = *s; + s++; + } + *d = '\0'; + return ret; +} + +/* For preprocessed files, if the first tokens are of the form # NUM. + handle the directives so we know the original file name. */ + +const char * +gfc_read_orig_filename (const char *filename, const char **canon_source_file) +{ + int c, len; + char *dirname; + + gfc_src_file = gfc_open_file (filename); + if (gfc_src_file == NULL) + return NULL; + + c = fgetc (gfc_src_file); + ungetc (c, gfc_src_file); + + if (c != '#') + return NULL; + + len = 0; + load_line (gfc_src_file, &gfc_src_preprocessor_lines[0], &len); + + if (strncmp (gfc_src_preprocessor_lines[0], "# 1 \"", 5) != 0) + return NULL; + + filename = unescape_filename (gfc_src_preprocessor_lines[0] + 5); + if (filename == NULL) + return NULL; + + c = fgetc (gfc_src_file); + ungetc (c, gfc_src_file); + + if (c != '#') + return filename; + + len = 0; + load_line (gfc_src_file, &gfc_src_preprocessor_lines[1], &len); + + if (strncmp (gfc_src_preprocessor_lines[1], "# 1 \"", 5) != 0) + return filename; + + dirname = unescape_filename (gfc_src_preprocessor_lines[1] + 5); + if (dirname == NULL) + return filename; + + len = strlen (dirname); + if (len < 3 || dirname[len - 1] != '/' || dirname[len - 2] != '/') + { + gfc_free (dirname); + return filename; + } + dirname[len - 2] = '\0'; + set_src_pwd (dirname); + + if (! IS_ABSOLUTE_PATH (filename)) + { + char *p = gfc_getmem (len + strlen (filename)); + + memcpy (p, dirname, len - 2); + p[len - 2] = '/'; + strcpy (p + len - 1, filename); + *canon_source_file = p; + } + + gfc_free (dirname); + return filename; +} --- gcc/fortran/gfortran.h.jj 2005-12-23 00:03:12.000000000 +0100 +++ gcc/fortran/gfortran.h 2005-12-31 01:05:01.000000000 +0100 @@ -1515,6 +1515,7 @@ typedef struct int flag_no_backend; int flag_pack_derived; int flag_repack_arrays; + int flag_preprocessed; int flag_f2c; int flag_automatic; int flag_backslash; @@ -1595,6 +1596,7 @@ int gfc_peek_char (void); void gfc_error_recovery (void); void gfc_gobble_whitespace (void); try gfc_new_file (void); +const char * gfc_read_orig_filename (const char *, const char **); extern gfc_source_form gfc_current_form; extern const char *gfc_source_file; --- gcc/fortran/options.c.jj 2005-12-02 23:46:26.000000000 +0100 +++ gcc/fortran/options.c 2005-12-31 01:03:52.000000000 +0100 @@ -72,6 +72,7 @@ gfc_init_options (unsigned int argc ATTR gfc_option.flag_no_backend = 0; gfc_option.flag_pack_derived = 0; gfc_option.flag_repack_arrays = 0; + gfc_option.flag_preprocessed = 0; gfc_option.flag_automatic = 1; gfc_option.flag_backslash = 1; gfc_option.flag_cray_pointer = 0; @@ -172,7 +173,7 @@ form_from_filename (const char *filename bool gfc_post_options (const char **pfilename) { - const char *filename = *pfilename; + const char *filename = *pfilename, *canon_source_file = NULL; char *source_path; int i; @@ -182,23 +183,40 @@ gfc_post_options (const char **pfilename filename = ""; } - gfc_source_file = filename; + if (gfc_option.flag_preprocessed) + { + /* For preprocessed files, if the first tokens are of the form # NUM. + handle the directives so we know the original file name. */ + gfc_source_file = gfc_read_orig_filename (filename, &canon_source_file); + if (gfc_source_file == NULL) + gfc_source_file = filename; + else + *pfilename = gfc_source_file; + } + else + gfc_source_file = filename; + + if (canon_source_file == NULL) + canon_source_file = gfc_source_file; /* Adds the path where the source file is to the list of include files. */ - i = strlen(gfc_source_file); - while (i > 0 && !IS_DIR_SEPARATOR(gfc_source_file[i])) + i = strlen (canon_source_file); + while (i > 0 && !IS_DIR_SEPARATOR (canon_source_file[i])) i--; if (i != 0) { source_path = alloca (i + 1); - memcpy (source_path, gfc_source_file, i); + memcpy (source_path, canon_source_file, i); source_path[i] = 0; gfc_add_include_path (source_path); } else gfc_add_include_path ("."); + if (canon_source_file != gfc_source_file) + gfc_free ((void *) canon_source_file); + /* Decide which form the file will be read in as. */ if (gfc_option.source_form != FORM_UNKNOWN) @@ -211,7 +229,7 @@ gfc_post_options (const char **pfilename { gfc_current_form = FORM_FREE; gfc_warning_now ("Reading file '%s' as free form.", - (filename[0] == '\0') ? "" : filename); + (filename[0] == '\0') ? "" : filename); } } @@ -478,6 +496,10 @@ gfc_handle_option (size_t scode, const c gfc_option.flag_repack_arrays = value; break; + case OPT_fpreprocessed: + gfc_option.flag_preprocessed = value; + break; + case OPT_fmax_identifier_length_: if (value > GFC_MAX_SYMBOL_LEN) gfc_fatal_error ("Maximum supported idenitifier length is %d", --- gcc/fortran/lang-specs.h.jj 2005-11-04 09:40:59.000000000 +0100 +++ gcc/fortran/lang-specs.h 2005-12-29 16:30:48.000000000 +0100 @@ -1,6 +1,6 @@ /* Contribution to the specs for the GNU Compiler Collection from GNU Fortran 95 compiler. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is licensed under the GPL. */ @@ -15,7 +15,7 @@ This file is licensed under the GPL. */ %{E|M|MM:%(cpp_debug_options)}\ %{!M:%{!MM:%{!E: -o %|.f |\n\ f951 %|.f %{!ffree-form:-ffixed-form} %(cc1_options) %{J*} %{I*}\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, + -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, {".F90", "@f95-cpp-input", 0, 0, 0}, {".F95", "@f95-cpp-input", 0, 0, 0}, {"@f95-cpp-input", @@ -23,7 +23,7 @@ This file is licensed under the GPL. */ %{E|M|MM:%(cpp_debug_options)}\ %{!M:%{!MM:%{!E: -o %|.f95 |\n\ f951 %|.f95 %(cc1_options) %{J*} %{I*}\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, + -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, {".f90", "@f95", 0, 0, 0}, {".f95", "@f95", 0, 0, 0}, {"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\ gcc41-rh176562.patch: Makefile.am | 2 -- Makefile.in | 2 +- configure | 11 ++++++++++- configure.ac | 8 ++++++++ 4 files changed, 19 insertions(+), 4 deletions(-) --- NEW FILE gcc41-rh176562.patch --- 2006-01-05 Jakub Jelinek * configure.ac (dbexecdir): New substituted var. * configure: Rebuilt. * Makefile.am (dbexecdir): Remove. * Makefile.in: Rebuilt. --- libjava/configure.ac.jj 2005-10-28 23:13:27.000000000 +0200 +++ libjava/configure.ac 2006-01-05 11:18:48.000000000 +0100 @@ -1269,6 +1269,14 @@ AC_SUBST(toolexecdir) AC_SUBST(toolexecmainlibdir) AC_SUBST(toolexeclibdir) +# Determine where the standard .db file is found. +multi_os_directory=`$CC -print-multi-os-directory` +case $multi_os_directory in + .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /. + *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;; +esac +AC_SUBST(dbexecdir) + # Determine gcj version number. gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'` GCJVERSION=$gcjversion --- libjava/configure.jj 2005-10-28 23:13:27.000000000 +0200 +++ libjava/configure 2006-01-05 11:20:14.000000000 +0100 @@ -310,7 +310,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRU! E am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING! _BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS TH! READINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES here LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRU! E am__fastdepCXX_FALSE AS ac_ct_AS AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING! _BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS TH! READINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES here LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -14848,6 +14848,14 @@ esac +# Determine where the standard .db file is found. +multi_os_directory=`$CC -print-multi-os-directory` +case $multi_os_directory in + .) dbexecdir='$(libdir)/gcj-$(gcc_version)' ;; # Avoid /. + *) dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)' ;; +esac + + # Determine gcj version number. gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'` GCJVERSION=$gcjversion @@ -17895,6 +17903,7 @@ s, at GCC_UNWIND_INCLUDE@,$GCC_UNWIND_INCLU s, at toolexecdir@,$toolexecdir,;t t s, at toolexecmainlibdir@,$toolexecmainlibdir,;t t s, at toolexeclibdir@,$toolexeclibdir,;t t +s, at dbexecdir@,$dbexecdir,;t t s, at GCJVERSION@,$GCJVERSION,;t t s, at gxx_include_dir@,$gxx_include_dir,;t t s, at libstdcxx_incdir@,$libstdcxx_incdir,;t t --- libjava/Makefile.am.jj 2005-12-16 13:15:12.000000000 +0100 +++ libjava/Makefile.am 2006-01-05 11:14:18.000000000 +0100 @@ -64,8 +64,6 @@ secdir = $(libdir)/security ## Where to install default logging property file. propdir = $(libdir) -## Where the standard .db file is found. -dbexecdir = $(libdir)/gcj-$(gcc_version) ## Name of the default .db. db_name = classmap.db ## Compiler specific component of the .db file --- libjava/Makefile.in.jj 2006-01-05 09:30:11.000000000 +0100 +++ libjava/Makefile.in 2006-01-05 11:25:10.000000000 +0100 @@ -626,6 +626,7 @@ target_vendor = @target_vendor@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ toolexecmainlibdir = @toolexecmainlibdir@ +dbexecdir = @dbexecdir@ AUTOMAKE_OPTIONS = foreign subdir-objects ACLOCAL_AMFLAGS = -I . -I .. -I ../config @@ -654,7 +655,6 @@ jar_DATA = libgcj-$(gcc_version).jar @JAVA_HOME_SET_TRUE at BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar secdir = $(libdir)/security propdir = $(libdir) -dbexecdir = $(libdir)/gcj-$(gcc_version) db_name = classmap.db db_pathtail = gcj-$(gcc_version)/$(db_name) @NATIVE_TRUE at dbexec_DATA = $(db_name) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- .cvsignore 22 Dec 2005 20:24:04 -0000 1.123 +++ .cvsignore 5 Jan 2006 10:57:27 -0000 1.124 @@ -1 +1 @@ -gcc-4.1.0-20051222.tar.bz2 +gcc-4.1.0-20060105.tar.bz2 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gcc41.spec 4 Jan 2006 10:13:55 -0000 1.14 +++ gcc41.spec 5 Jan 2006 10:57:27 -0000 1.15 @@ -1,6 +1,6 @@ -%define DATE 20051222 +%define DATE 20060105 %define gcc_version 4.1.0 -%define gcc_release 0.12 +%define gcc_release 0.13 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 @@ -96,13 +96,9 @@ Patch15: gcc41-ppc32-retaddr.patch Patch16: gcc41-s390-atomic1.patch Patch17: gcc41-gomp-lastprivate-static.patch -Patch18: gcc41-pr25432.patch -Patch19: gcc41-pr25005.patch -Patch20: gcc41-pr25328-test.patch -Patch21: gcc41-pr25535.patch -Patch22: gcc41-pr25364.patch -Patch23: gcc41-pr25307.patch -Patch24: gcc41-pr25369.patch +Patch18: gcc41-pr25535.patch +Patch19: gcc41-pr25324.patch +Patch20: gcc41-rh176562.patch %define _gnu %{nil} %ifarch sparc @@ -450,13 +446,9 @@ %patch15 -p0 -b .ppc32-retaddr~ %patch16 -p0 -b .s390-atomic1~ %patch17 -p0 -b .gomp-lastprivate-static~ -%patch18 -p0 -b .pr25432~ -%patch19 -p0 -b .pr25005~ -%patch20 -p0 -b .pr25328-test~ -%patch21 -p0 -b .pr25535~ -%patch22 -p0 -b .pr25364~ -%patch23 -p0 -b .pr25307~ -%patch24 -p0 -b .pr25369~ +%patch18 -p0 -b .pr25535~ +%patch19 -p0 -b .pr25324~ +%patch20 -p0 -b .rh176562~ sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1542,7 +1534,29 @@ %endif %changelog +* Thu Jan 5 2006 Jakub Jelinek 4.1.0-0.13 +- update from gcc-4_1-branch (-r108957:109369) + - PRs c++/23171, c++/23172, c++/24671, c++/24782, c++/25294, c++/25417, + c++/25439, c++/25492, c++/25625, c++/25632, c++/25633, c++/25634, + c++/25635, c++/25637, c++/25638, c/25183, c/25559, debug/25562, + fortran/18990, fortran/19362, fortran/20244, fortran/20862, + fortran/20864, fortran/20889, fortran/22607, fortran/23152, + fortran/25018, fortran/25053, fortran/25055, fortran/25063, + fortran/25064, fortran/25066, fortran/25067, fortran/25068, + fortran/25069, fortran/25106, fortran/25391, fortran/25532, + fortran/25586, fortran/25587, libgcj/9715, libgcj/19132, + libgfortran/25139, libgfortran/25419, libgfortran/25510, + libgfortran/25550, libgfortran/25594, middle-end/24827, objc/25328, + rtl-optimization/21041, rtl-optimization/25130, target/24342, + target/25554, target/25572, testsuite/25214, testsuite/25441, + testsuite/25442, testsuite/25444, tree-opt/25513 + - create java Package for compiled classes which are linked in but + loaded by the system class loader (#176956) + - fix posix_memalign prototype in (#176461) +- update from gomp-20050608-branch (up to -r109349) - buildrequire libXtst-devel (#176898) +- fix built in path to classmap.db on x86_64, s390x and ppc64 (#176562) +- fix debug info for preprocessed Fortran code (#175071, PR fortran/25324) * Fri Dec 22 2005 Jakub Jelinek 4.1.0-0.12 - make sure GCJFLAGS are propagated down to libjava's configure Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- sources 22 Dec 2005 20:24:04 -0000 1.125 +++ sources 5 Jan 2006 10:57:27 -0000 1.126 @@ -1 +1 @@ -72aa5134005cfcd70e1f3f3df267f24b gcc-4.1.0-20051222.tar.bz2 +f27bdcb7a666c31dc20c41eced50decd gcc-4.1.0-20060105.tar.bz2 --- gcc41-pr25005.patch DELETED --- --- gcc41-pr25307.patch DELETED --- --- gcc41-pr25328-test.patch DELETED --- --- gcc41-pr25364.patch DELETED --- --- gcc41-pr25369.patch DELETED --- --- gcc41-pr25432.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 5 11:02:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 06:02:11 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1820, 1.1821 linux-2.6.14-kauditd-suspend.patch, 1.2, NONE Message-ID: <200601051102.k05B2BsO010885@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10861 Modified Files: kernel-2.6.spec Removed Files: linux-2.6.14-kauditd-suspend.patch Log Message: dead patch Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1820 retrieving revision 1.1821 diff -u -r1.1820 -r1.1821 --- kernel-2.6.spec 5 Jan 2006 06:15:32 -0000 1.1820 +++ kernel-2.6.spec 5 Jan 2006 11:02:08 -0000 1.1821 @@ -266,9 +266,6 @@ Patch813: linux-2.6-xen-vdso-note.patch Patch814: linux-2.6-write-protect-rodata.patch -# kauditd thread prevents sleep -Patch820: linux-2.6.14-kauditd-suspend.patch - # Module signing infrastructure. Patch900: linux-2.6-modsign-core.patch Patch901: linux-2.6-modsign-crypto.patch @@ -716,9 +713,6 @@ # Write protect rodata %patch814 -p1 -# kauditd thread prevents sleep -%patch820 -p1 - # # GPG signed kernel modules # --- linux-2.6.14-kauditd-suspend.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 5 11:07:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 06:07:26 -0500 Subject: rpms/gcc/devel gcc41-pr25324.patch,1.1,1.2 Message-ID: <200601051107.k05B7Qua011667@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11589 Modified Files: gcc41-pr25324.patch Log Message: 4.1.0-0.13 gcc41-pr25324.patch: Make-lang.in | 1 gfortran.h | 2 lang-specs.h | 6 +- lang.opt | 4 + options.c | 34 ++++++++++-- scanner.c | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 6 files changed, 198 insertions(+), 14 deletions(-) Index: gcc41-pr25324.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr25324.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-pr25324.patch 5 Jan 2006 10:57:27 -0000 1.1 +++ gcc41-pr25324.patch 5 Jan 2006 11:07:21 -0000 1.2 @@ -1,4 +1,4 @@ -2005-12-31 Jakub Jelinek +2006-01-05 Jakub Jelinek PR fortran/25324 * Make-lang.in (fortran/scanner.o): Depend on toplev.h. @@ -22,10 +22,10 @@ --- gcc/fortran/Make-lang.in.jj 2005-12-13 08:47:45.000000000 +0100 +++ gcc/fortran/Make-lang.in 2005-12-31 01:01:57.000000000 +0100 -@@ -269,6 +269,7 @@ GFORTRAN_TRANS_DEPS = fortran/gfortran.h - +@@ -280,6 +280,7 @@ GFORTRAN_TRANS_DEPS = fortran/gfortran.h fortran/f95-lang.o: $(GFORTRAN_TRANS_DEPS) fortran/mathbuiltins.def \ - gt-fortran-f95-lang.h gtype-fortran.h cgraph.h $(TARGET_H) + gt-fortran-f95-lang.h gtype-fortran.h cgraph.h $(TARGET_H) \ + $(BUILTINS_DEF) fortran/types.def +fortran/scanner.o: toplev.h fortran/convert.o: $(GFORTRAN_TRANS_DEPS) fortran/trans.o: $(GFORTRAN_TRANS_DEPS) @@ -391,7 +391,7 @@ /* Contribution to the specs for the GNU Compiler Collection from GNU Fortran 95 compiler. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. -+ Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. ++ Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. This file is licensed under the GPL. */ @@ -399,8 +399,8 @@ %{E|M|MM:%(cpp_debug_options)}\ %{!M:%{!MM:%{!E: -o %|.f |\n\ f951 %|.f %{!ffree-form:-ffixed-form} %(cc1_options) %{J*} %{I*}\ -- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, -+ -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, +- %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ++ -fpreprocessed %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, {".F90", "@f95-cpp-input", 0, 0, 0}, {".F95", "@f95-cpp-input", 0, 0, 0}, {"@f95-cpp-input", @@ -408,8 +408,8 @@ %{E|M|MM:%(cpp_debug_options)}\ %{!M:%{!MM:%{!E: -o %|.f95 |\n\ f951 %|.f95 %(cc1_options) %{J*} %{I*}\ -- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, -+ -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, +- %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ++ -fpreprocessed %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, {".f90", "@f95", 0, 0, 0}, {".f95", "@f95", 0, 0, 0}, {"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\ From fedora-cvs-commits at redhat.com Thu Jan 5 11:18:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 06:18:03 -0500 Subject: rpms/hplip/devel hplip-initscript.patch, NONE, 1.1 hplip.spec, 1.39, 1.40 Message-ID: <200601051118.k05BI3st027644@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27596 Modified Files: hplip.spec Added Files: hplip-initscript.patch Log Message: * Thu Jan 5 2006 Tim Waugh 0.9.7-7 - Fix initscript (bug #176966). hplip-initscript.patch: hplip.sh | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletion(-) --- NEW FILE hplip-initscript.patch --- --- hplip-0.9.7/hplip.sh.initscript 2005-09-22 19:33:13.000000000 +0100 +++ hplip-0.9.7/hplip.sh 2006-01-05 11:16:42.000000000 +0000 @@ -106,7 +106,12 @@ echo [ $RETVAL = 0 ] && [ -d /var/lock/subsys ] && touch /var/lock/subsys/hpssd.py # killall -HUP cupsd - return $RETVAL + if [ -f /var/lock/subsys/hpiod -a -f /var/lock/subsys/hpssd.py ]; then + touch /var/lock/subsys/hplip + return 0 + else + return 1 + fi } stop() { @@ -128,6 +133,10 @@ rm $pidfile esac done + if [ ! -f /var/lock/subsys/hpiod -o \ + ! -f /var/lock/subsys/hpssd.py ]; then + rm -f /var/lock/subsys/hplip + fi return $RETVAL } Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- hplip.spec 2 Jan 2006 14:52:34 -0000 1.39 +++ hplip.spec 5 Jan 2006 11:18:01 -0000 1.40 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 0.9.7 -Release: 6 +Release: 7 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -12,6 +12,7 @@ Patch2: hplip-desktop.patch Patch3: hplip-config.patch Patch4: hplip-0.9.7-2.patch +Patch5: hplip-initscript.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Requires: desktop-file-utils >= 0.2.92 @@ -67,6 +68,9 @@ # Apply patch 0.9.7-2 %patch4 -p1 -b .0.9.7-2 +# Fix initscript (bug #176966). +%patch5 -p1 -b .initscript + %build %configure make @@ -152,6 +156,9 @@ fi %changelog +* Thu Jan 5 2006 Tim Waugh 0.9.7-7 +- Fix initscript (bug #176966). + * Mon Jan 2 2006 Tim Waugh 0.9.7-6 - Rebuild. From fedora-cvs-commits at redhat.com Thu Jan 5 11:49:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 06:49:45 -0500 Subject: rpms/httpd/devel httpd-2.2.0-ajpcookie.patch, NONE, 1.1 httpd.spec, 1.82, 1.83 Message-ID: <200601051149.k05BnjvK019313@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/httpd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19276 Modified Files: httpd.spec Added Files: httpd-2.2.0-ajpcookie.patch Log Message: * Thu Jan 5 2006 Joe Orton 2.2.0-4 - mod_proxy_ajp: fix Cookie handling (Mladen Turk, r358769) httpd-2.2.0-ajpcookie.patch: ajp_header.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE httpd-2.2.0-ajpcookie.patch --- Author: mturk Date: Fri Dec 23 00:36:18 2005 New Revision: 358769 URL: http://svn.apache.org/viewcvs?rev=358769&view=rev Log: Fix Cookie2 header problems that originates back from mod_jk. Cookie2 was always sent as Cookie. --- httpd-2.2.0/modules/proxy/ajp_header.c.ajpcookie +++ httpd-2.2.0/modules/proxy/ajp_header.c @@ -87,7 +87,9 @@ return UNKNOWN_METHOD; break; case 'C': - if (memcmp(p, "OOKIE", 5) == 0) + if(memcmp(p, "OOKIE2", 6) == 0) + return SC_COOKIE2; + else if (memcmp(p, "OOKIE", 5) == 0) return SC_COOKIE; else if(memcmp(p, "ONNECTION", 9) == 0) return SC_CONNECTION; @@ -95,8 +97,6 @@ return SC_CONTENT_TYPE; else if(memcmp(p, "ONTENT-LENGTH", 13) == 0) return SC_CONTENT_LENGTH; - else if(memcmp(p, "OOKIE2", 6) == 0) - return SC_COOKIE2; else return UNKNOWN_METHOD; break; Index: httpd.spec =================================================================== RCS file: /cvs/dist/rpms/httpd/devel/httpd.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- httpd.spec 9 Dec 2005 22:40:56 -0000 1.82 +++ httpd.spec 5 Jan 2006 11:49:42 -0000 1.83 @@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.2.0 -Release: 3.1 +Release: 4 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -41,6 +41,7 @@ # Bug fixes Patch50: httpd-2.0.45-encode.patch Patch51: httpd-2.2.0-headclength.patch +patch52: httpd-2.2.0-ajpcookie.patch License: Apache Software License Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-root @@ -119,6 +120,7 @@ # no -b to prevent droplets in install root %patch50 -p1 %patch51 -p1 -b .headclength +%patch52 -p1 -b .ajpcookie # Patch in vendor/release string sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 @@ -457,7 +459,7 @@ %files manual %defattr(-,root,root) %{contentdir}/manual -%config(noreplace) %{_sysconfdir}/httpd/conf.d/manual.conf +%config %{_sysconfdir}/httpd/conf.d/manual.conf %files -n mod_ssl %defattr(-,root,root) @@ -479,6 +481,9 @@ %{_libdir}/httpd/build/*.sh %changelog +* Thu Jan 5 2006 Joe Orton 2.2.0-4 +- mod_proxy_ajp: fix Cookie handling (Mladen Turk, r358769) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 5 13:25:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 08:25:57 -0500 Subject: rpms/system-config-printer/devel .cvsignore, 1.52, 1.53 printconf.spec, 1.55, 1.56 sources, 1.54, 1.55 Message-ID: <200601051325.k05DPvCs012921@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/system-config-printer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12886 Modified Files: .cvsignore printconf.spec sources Log Message: * Thu Jan 5 2006 Tim Waugh 0.6.147-1 - 0.6.147: - Don't alter page margins (bug #176906). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 20 Dec 2005 16:32:34 -0000 1.52 +++ .cvsignore 5 Jan 2006 13:25:53 -0000 1.53 @@ -32,3 +32,4 @@ printconf-0.6.144.tar.bz2 printconf-0.6.145.tar.bz2 printconf-0.6.146.tar.bz2 +printconf-0.6.147.tar.bz2 Index: printconf.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/printconf.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- printconf.spec 20 Dec 2005 16:32:34 -0000 1.55 +++ printconf.spec 5 Jan 2006 13:25:53 -0000 1.56 @@ -1,6 +1,6 @@ Summary: A printer configuration backend/frontend combination. Name: system-config-printer -Version: 0.6.146 +Version: 0.6.147 Release: 1 License: GPL Group: System Environment/Daemons @@ -176,6 +176,10 @@ %changelog +* Thu Jan 5 2006 Tim Waugh 0.6.147-1 +- 0.6.147: + - Don't alter page margins (bug #176906). + * Tue Dec 20 2005 Tim Waugh 0.6.146-1 - 0.6.146: - Sync languages (bug #176136). Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- sources 20 Dec 2005 16:32:34 -0000 1.54 +++ sources 5 Jan 2006 13:25:54 -0000 1.55 @@ -1 +1 @@ -95cc3fe36a2cd4b280c7b9ff3026dfd6 printconf-0.6.146.tar.bz2 +e3060f9affbd0c3eacb8975d32605010 printconf-0.6.147.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 5 13:29:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 08:29:07 -0500 Subject: rpms/opensp/devel .cvsignore, 1.2, 1.3 opensp.spec, 1.4, 1.5 sources, 1.2, 1.3 opensp-1.5-gcc34.patch, 1.1, NONE opensp-crash.patch, 1.1, NONE opensp-gcc41.patch, 1.1, NONE Message-ID: <200601051329.k05DT7nC014458@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/opensp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14417 Modified Files: .cvsignore opensp.spec sources Removed Files: opensp-1.5-gcc34.patch opensp-crash.patch opensp-gcc41.patch Log Message: * Thu Jan 5 2006 Tim Waugh 1.5.2-1 - 1.5.2. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/opensp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Dec 2005 19:14:36 -0000 1.2 +++ .cvsignore 5 Jan 2006 13:29:04 -0000 1.3 @@ -1 +1,2 @@ OpenSP-1.5.1.tar.gz +OpenSP-1.5.2.tar.gz Index: opensp.spec =================================================================== RCS file: /cvs/dist/rpms/opensp/devel/opensp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- opensp.spec 14 Dec 2005 13:10:10 -0000 1.4 +++ opensp.spec 5 Jan 2006 13:29:04 -0000 1.5 @@ -1,13 +1,10 @@ Summary: SGML and XML parser Name: opensp -Version: 1.5.1 -Release: 2 +Version: 1.5.2 +Release: 1 Requires: sgml-common >= 0.5 URL: http://openjade.sourceforge.net/ Source: http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz -Patch0: opensp-1.5-gcc34.patch -Patch1: opensp-gcc41.patch -Patch2: opensp-crash.patch License: Distributable Group: Applications/Text BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -31,9 +28,6 @@ %prep %setup -q -n OpenSP-%{version} -%patch0 -p1 -b .gcc34 -%patch1 -p1 -b .gcc41 -%patch2 -p1 -b .crash %build %configure --disable-dependency-tracking --disable-static --enable-http \ @@ -67,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/OpenSP rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSP -%find_lang sp4 +%find_lang sp5 %check @@ -83,10 +77,10 @@ %postun -p /sbin/ldconfig -%files -f sp4.lang +%files -f sp5.lang %defattr(-,root,root) %doc doc/*.htm -%doc releasenotes.html +%doc docsrc/releasenotes.html %doc AUTHORS BUGS COPYING ChangeLog NEWS README %doc pubtext/opensp-implied.dcl %{_bindir}/* @@ -101,6 +95,9 @@ %changelog +* Thu Jan 5 2006 Tim Waugh 1.5.2-1 +- 1.5.2. + * Tue Dec 14 2005 Tim Waugh 1.5.1-2 - Backported patch from 1.5.2pre1 to fix ArcEngine crash. Index: sources =================================================================== RCS file: /cvs/dist/rpms/opensp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Dec 2005 19:14:36 -0000 1.2 +++ sources 5 Jan 2006 13:29:04 -0000 1.3 @@ -1 +1 @@ -f46fe0a04b76a4454ec27b7fcc84ec54 OpenSP-1.5.1.tar.gz +670b223c5d12cee40c9137be86b6c39b OpenSP-1.5.2.tar.gz --- opensp-1.5-gcc34.patch DELETED --- --- opensp-crash.patch DELETED --- --- opensp-gcc41.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 5 14:21:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 09:21:36 -0500 Subject: rpms/gphoto2/devel gphoto2-2.1.99-dbus.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 gphoto2-gcc4.patch, 1.2, 1.3 gphoto2.spec, 1.45, 1.46 sources, 1.9, 1.10 Message-ID: <200601051421.k05ELaVS023235@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23195 Modified Files: .cvsignore gphoto2-gcc4.patch gphoto2.spec sources Added Files: gphoto2-2.1.99-dbus.patch Log Message: - upgrade to 2.1.99 + dbus patch gphoto2-2.1.99-dbus.patch: disk.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) --- NEW FILE gphoto2-2.1.99-dbus.patch --- --- gphoto2-2.1.99/libgphoto2-2.1.99/libgphoto2_port/disk/disk.c.old 2005-08-14 16:01:38.000000000 +0200 +++ gphoto2-2.1.99/libgphoto2-2.1.99/libgphoto2_port/disk/disk.c 2006-01-03 15:07:56.000000000 +0100 @@ -171,10 +171,9 @@ } - libhal_free_string_array (volumes); - libhal_ctx_free(ctx); - - dbus_connection_unref(dbus_connection); + libhal_ctx_free (ctx); + dbus_connection_disconnect (dbus_connection); + dbus_connection_unref (dbus_connection); #else FILE *mnt; struct mntent *mntent; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 23 Jun 2005 11:20:50 -0000 1.9 +++ .cvsignore 5 Jan 2006 14:21:31 -0000 1.10 @@ -4,3 +4,5 @@ gphoto2-2.1.5.tar.gz libgphoto2-2.1.6.tar.gz gphoto2-2.1.6.tar.gz +libgphoto2-2.1.99.tar.bz2 +gphoto2-2.1.99.tar.bz2 gphoto2-gcc4.patch: camlibs/digita/commands.c | 8 ++++---- libgphoto2_port/libgphoto2_port/gphoto2-port.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) Index: gphoto2-gcc4.patch =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2-gcc4.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gphoto2-gcc4.patch 23 Jun 2005 11:20:50 -0000 1.2 +++ gphoto2-gcc4.patch 5 Jan 2006 14:21:31 -0000 1.3 @@ -1,5 +1,5 @@ ---- gphoto2-2.1.6/libgphoto2-2.1.6/libgphoto2_port/libgphoto2_port/gphoto2-port.c.gcc4 2005-02-22 06:33:42.000000000 +0000 -+++ gphoto2-2.1.6/libgphoto2-2.1.6/libgphoto2_port/libgphoto2_port/gphoto2-port.c 2005-06-23 12:07:51.000000000 +0100 +--- gphoto2-2.1.99/libgphoto2-2.1.99/libgphoto2_port/libgphoto2_port/gphoto2-port.c.gcc4 2005-02-22 06:33:42.000000000 +0000 ++++ gphoto2-2.1.99/libgphoto2-2.1.99/libgphoto2_port/libgphoto2_port/gphoto2-port.c 2005-06-23 12:07:51.000000000 +0100 @@ -408,7 +408,7 @@ /* Check if we read as many bytes as expected */ @@ -9,8 +9,8 @@ CHECK_RESULT (retval); if (retval != size) gp_log (GP_LOG_DEBUG, "gphoto2-port", _("Could only read %i " ---- gphoto2-2.1.6/libgphoto2-2.1.6/camlibs/digita/commands.c.gcc4 2005-03-21 12:26:46.000000000 +0000 -+++ gphoto2-2.1.6/libgphoto2-2.1.6/camlibs/digita/commands.c 2005-06-23 11:51:43.000000000 +0100 +--- gphoto2-2.1.99/libgphoto2-2.1.99/camlibs/digita/commands.c.gcc4 2005-03-21 12:26:46.000000000 +0000 ++++ gphoto2-2.1.99/libgphoto2-2.1.99/camlibs/digita/commands.c 2005-06-23 11:51:43.000000000 +0100 @@ -73,7 +73,7 @@ return -1; } Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gphoto2.spec 10 Dec 2005 16:39:20 -0000 1.45 +++ gphoto2.spec 5 Jan 2006 14:21:31 -0000 1.46 @@ -1,20 +1,21 @@ Summary: Software for accessing digital cameras Name: gphoto2 %define pkg gphoto2 -%define pkgver 2.1.6 +%define pkgver 2.1.99 %define libpkg libgphoto2 -%define libver 2.1.6 +%define libver 2.1.99 Version: %{pkgver} -Release: 7.1 +Release: 1 License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-root -Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.gz -Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.gz +Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.bz2 +Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2 Source2: gen-libgphoto-hal-fdi Source3: 90-gphoto-camera-policy.fdi Source4: gphoto-set-procperm Patch2: gphoto2-gcc4.patch +Patch3: gphoto2-2.1.99-dbus.patch Url: http://www.gphoto.org/ ExcludeArch: s390 s390x PreReq: /sbin/ldconfig, grep, fileutils @@ -71,11 +72,12 @@ %prep %setup -q -a 1 %patch2 -p1 -b .gcc4 +%patch3 -p1 -b .dbus #################################### %build pushd %{libpkg}-%{libver} -%configure --disable-rpath --enable-docs \ +%configure --disable-rpath --enable-docs--enable-docs \ --with-doc-dir=%{buildroot}%{_docdir}/%{name} export tagname=CC make @@ -91,6 +93,7 @@ -e "s,^Cflags:.*$,Cflags: -I\${includedir}/$gp_path -I\${includedir}," \ > libgphoto2.pc export PKG_CONFIG_PATH=. +export DESTDIR=%{buildroot}%{_docdir}/%{name} %configure --enable-docs --with-doc-dir=%{buildroot}%{_docdir}/%{name} export tagname=CC make @@ -122,8 +125,8 @@ cp -a %{buildroot}%{_docdir}/%{name} installed-doc find installed-doc -name '*.sgml' | xargs -r rm rm -rf %{buildroot}%{_docdir}/%{name} -rm -rf %{buildroot}%{_libdir}/gphoto2/*/*a -rm -rf %{buildroot}%{_libdir}/gphoto2_port/*/*a +rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a +rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a rm -rf %{buildroot}%{_libdir}/*.a eval `grep ^LIBGPHOTO2_CURRENT %{libpkg}-%{libver}/configure.in` @@ -134,9 +137,11 @@ cat libgphoto2*.lang >> %{name}.lang + #################################### %clean rm -rf "${RPM_BUILD_ROOT}" +#echo ${RPM_BUILD_ROOT} ######################################################################## # file list and installation for main package @@ -148,17 +153,16 @@ %doc AUTHORS README COPYING %{_bindir}/gphoto2 %{_datadir}/libgphoto2 -%dir %{_libdir}/gphoto2_port -%dir %{_libdir}/gphoto2_port/* -%{_libdir}/gphoto2_port/*/*.so -%dir %{_libdir}/gphoto2 -%dir %{_libdir}/gphoto2/* -%{_libdir}/gphoto2/*/*.so +%dir %{_libdir}/libgphoto2_port +%dir %{_libdir}/libgphoto2_port/* +%{_libdir}/libgphoto2_port/*/*.so +%dir %{_libdir}/libgphoto2 +%dir %{_libdir}/libgphoto2/* +%{_libdir}/libgphoto2/*/*.so %{_libdir}/*.so.* -%{_libdir}/libgphoto2 %{_mandir}/man1/gphoto2.1* -/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi -/usr/share/hal/fdi/policy/20thirdparty/90-gphoto-camera-policy.fdi +%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi +%{_datadir}/hal/fdi/policy/20thirdparty/90-gphoto-camera-policy.fdi %{_libexecdir}/gphoto-set-procperm #################################### @@ -191,6 +195,9 @@ # ChangeLog ######################################################################## %changelog +* Thu Jan 05 2006 Radek Vokal 2.1.99-1 +- upgrade to 2.1.99 + dbus patch + * Fri Dec 09 2005 Jesse Keating 2.1.6-7.1 - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 23 Jun 2005 11:20:50 -0000 1.9 +++ sources 5 Jan 2006 14:21:31 -0000 1.10 @@ -1,2 +1,2 @@ -1938cbd9718595fd419907bf2f7c3195 libgphoto2-2.1.6.tar.gz -2de2bcc62599b8a7337b54b0a067c50b gphoto2-2.1.6.tar.gz +3c6d9cb65661915e07491a6f9215d5a9 libgphoto2-2.1.99.tar.bz2 +549a9dfae6910ab6456b194ea86b55a2 gphoto2-2.1.99.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 5 14:49:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 09:49:19 -0500 Subject: rpms/groff/devel groff-1.18.1-8bit.patch, 1.2, 1.3 groff-1.18.1-fix15.patch, 1.2, 1.3 groff-1.18.1.1-grn.patch, 1.2, 1.3 groff-1.16-safer.patch, 1.3, 1.4 groff-1.18-gzip.patch, 1.2, 1.3 groff-1.18-nohtml.patch, 1.2, 1.3 groff-1.18-pfbtops_cpp.patch, 1.2, 1.3 groff-1.18.1-devutf8.patch, 1.3, 1.4 groff-1.18.1-fixminus.patch, 1.2, 1.3 groff-1.18.1-gzext.patch, 1.2, 1.3 groff-1.18.1-korean.patch, 1.2, 1.3 groff-xlibs.patch, 1.2, 1.3 groff.spec, 1.27, 1.28 sources, 1.10, 1.11 Message-ID: <200601051449.k05EnJMU029423@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29409 Modified Files: groff-1.16-safer.patch groff-1.18-gzip.patch groff-1.18-nohtml.patch groff-1.18-pfbtops_cpp.patch groff-1.18.1-devutf8.patch groff-1.18.1-fixminus.patch groff-1.18.1-gzext.patch groff-1.18.1-korean.patch groff-xlibs.patch groff.spec sources Added Files: groff-1.18.1-8bit.patch groff-1.18.1-fix15.patch groff-1.18.1.1-grn.patch Log Message: * Thu Jan 05 2006 Jindrich Novy - 1.18.1.1-6 - add BuildRequires imake and update dependencies for modular X - spec cleanup groff-1.18.1-8bit.patch: env.cc | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: groff-1.18.1-8bit.patch =================================================================== RCS file: groff-1.18.1-8bit.patch diff -N groff-1.18.1-8bit.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ groff-1.18.1-8bit.patch 5 Jan 2006 14:49:14 -0000 1.3 @@ -0,0 +1,17 @@ +2002-10-11 Ruslan Ermilov + + * src/roff/troff/env.cc (hyphen_trie::read_patterns_file): Add + cast to `unsigned char' to properly read patterns with 8bit + characters. + +--- groff-1.18.1/src/roff/troff/env.cc ++++ groff-1.18.1/src/roff/troff/env.cc +@@ -3924,7 +3924,7 @@ + if (i > 0) { + if (have_patterns || final_pattern || traditional) { + for (int j = 0; j < i; j++) +- buf[j] = hpf_code_table[buf[j]]; ++ buf[j] = hpf_code_table[(unsigned char)buf[j]]; + insert_pattern(buf, i, num); + final_pattern = 0; + } groff-1.18.1-fix15.patch: encoding.cc | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) Index: groff-1.18.1-fix15.patch =================================================================== RCS file: groff-1.18.1-fix15.patch diff -N groff-1.18.1-fix15.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ groff-1.18.1-fix15.patch 5 Jan 2006 14:49:14 -0000 1.3 @@ -0,0 +1,27 @@ +--- groff-1.18.1/src/libs/libgroff/encoding.cc.fix15 2004-03-08 16:13:15.825000416 +0100 ++++ groff-1.18.1/src/libs/libgroff/encoding.cc 2004-03-08 16:14:41.451983136 +0100 +@@ -384,21 +384,10 @@ + } + /* otherwise */ + #if HAVE_LANGINFO_CODESET +- charset = nl_langinfo(CODESET); +-#else +- charset = strchr(locale, '.'); +- if (charset) +- ++charset; +- else +- charset = ""; ++ locale = nl_langinfo(CODESET); + #endif +- if (strncmp(locale, "ja", 2) == 0) { +- select_input_encoding_handler(charset); +- select_output_encoding_handler(charset); +- } else if ((!device || strcmp(device, "ascii8") == 0)) { +- select_input_encoding_handler(NULL); +- select_output_encoding_handler(NULL); +- } ++ select_input_encoding_handler(locale); ++ select_output_encoding_handler(locale); + #endif + return; + } groff-1.18.1.1-grn.patch: hdb.cc | 1 - 1 files changed, 1 deletion(-) Index: groff-1.18.1.1-grn.patch =================================================================== RCS file: groff-1.18.1.1-grn.patch diff -N groff-1.18.1.1-grn.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ groff-1.18.1.1-grn.patch 5 Jan 2006 14:49:14 -0000 1.3 @@ -0,0 +1,10 @@ +--- groff-1.18.1.1/src/preproc/grn/hdb.cc.grn 2002-10-07 06:42:55.000000000 +0200 ++++ groff-1.18.1.1/src/preproc/grn/hdb.cc 2004-09-16 10:23:42.394486378 +0200 +@@ -115,7 +115,6 @@ + type = DBGetType(string); /* interpret element type */ + if (type < 0) { /* no more data */ + done = TRUE; +- (void) fclose(file); + } else { + #ifdef UW_FASTSCAN + (void) xscanf(file, &x, &y); /* always one point */ groff-1.16-safer.patch: input.cc | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) Index: groff-1.16-safer.patch =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff-1.16-safer.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- groff-1.16-safer.patch 12 Jan 2005 14:08:37 -0000 1.3 +++ groff-1.16-safer.patch 5 Jan 2006 14:49:14 -0000 1.4 @@ -1,21 +1,18 @@ ---- groff-1.19.1/src/roff/troff/input.cpp.safer 2004-05-05 18:41:58.000000000 +0200 -+++ groff-1.19.1/src/roff/troff/input.cpp 2005-01-12 13:27:33.947740912 +0100 -@@ -5444,20 +5444,35 @@ void source() - if (nm.is_null()) - skip_line(); +--- groff-1.16/src/roff/troff/input.cc.safer Wed Jun 7 21:47:48 2000 ++++ groff-1.16/src/roff/troff/input.cc Wed Jun 7 21:50:37 2000 +@@ -4404,12 +4406,28 @@ else { -+ char cbuf[PATH_MAX], * cwd; -+ char pbuf[PATH_MAX], * path; -+ struct stat st; -+ while (!tok.newline() && !tok.eof()) tok.next(); - errno = 0; -- FILE *fp = include_search_path.open_file_cautious(nm.contents()); +- FILE *fp = fopen(nm.contents(), "r"); - if (fp) - input_stack::push(new file_iterator(fp, nm.contents())); - else - error("can't open `%1': %2", nm.contents(), strerror(errno)); ++ char cbuf[PATH_MAX], * cwd; ++ char pbuf[PATH_MAX], * path; ++ struct stat st; + + if ((cwd = realpath(".", cbuf)) == NULL) + error("realpath on `%1' failed: %2", ".", strerror(errno)); @@ -38,9 +35,3 @@ tok.next(); } } - --// like .so but use popen() -- - void pipe_source() - { - if (safer_flag) { groff-1.18-gzip.patch: Makefile.sub | 2 input.cc | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 172 insertions(+), 25 deletions(-) Index: groff-1.18-gzip.patch =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff-1.18-gzip.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18-gzip.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18-gzip.patch 5 Jan 2006 14:49:14 -0000 1.3 @@ -1,5 +1,5 @@ ---- groff-1.19.1/src/roff/troff/Makefile.sub.gzip 2004-01-06 23:49:05.000000000 +0100 -+++ groff-1.19.1/src/roff/troff/Makefile.sub 2005-01-12 13:49:11.542476528 +0100 +--- groff-1.18/src/roff/troff/Makefile.sub.hugo 2002-05-03 00:33:21.000000000 +0200 ++++ groff-1.18/src/roff/troff/Makefile.sub 2002-11-04 21:30:09.000000000 +0100 @@ -1,6 +1,6 @@ PROG=troff$(EXEEXT) MAN1=troff.n @@ -7,10 +7,10 @@ +XLIBS=-lz $(LIBGROFF) MLIB=$(LIBM) OBJS=\ - dictionary.$(OBJEXT) \ ---- groff-1.19.1/src/roff/troff/input.cpp.gzip 2005-01-12 13:49:11.516480480 +0100 -+++ groff-1.19.1/src/roff/troff/input.cpp 2005-01-12 13:57:40.615085728 +0100 -@@ -41,6 +41,8 @@ Foundation, 59 Temple Place - Suite 330, + env.o \ +--- groff-1.18/src/roff/troff/input.cc.hugo 2002-11-04 21:30:09.000000000 +0100 ++++ groff-1.18/src/roff/troff/input.cc 2002-11-04 21:36:13.000000000 +0100 +@@ -42,6 +42,8 @@ #include "nonposix.h" @@ -19,7 +19,7 @@ #ifdef NEED_DECLARATION_PUTENV extern "C" { int putenv(const char *); -@@ -190,6 +192,130 @@ void restore_escape_char() +@@ -217,6 +219,130 @@ skip_line(); } @@ -150,7 +150,7 @@ class input_iterator { public: input_iterator(); -@@ -209,7 +335,7 @@ private: +@@ -236,7 +362,7 @@ virtual int get_location(int, const char **, int *) { return 0; } virtual void backtrace() {} virtual int set_location(const char *, int) { return 0; } @@ -159,7 +159,7 @@ virtual void shift(int) {} virtual int is_boundary() {return 0; } virtual int internal_level() { return 0; } -@@ -250,7 +376,7 @@ public: +@@ -277,7 +403,7 @@ }; class file_iterator : public input_iterator { @@ -168,7 +168,7 @@ int lineno; const char *filename; int popened; -@@ -259,7 +385,9 @@ class file_iterator : public input_itera +@@ -286,7 +412,9 @@ enum { BUF_SIZE = 512 }; unsigned char buf[BUF_SIZE]; void close(); @@ -178,7 +178,7 @@ file_iterator(FILE *, const char *, int = 0); ~file_iterator(); int fill(node **); -@@ -267,18 +395,30 @@ public: +@@ -294,18 +422,30 @@ int get_location(int, const char **, int *); void backtrace(); int set_location(const char *, int); @@ -213,7 +213,7 @@ } } -@@ -289,6 +429,8 @@ file_iterator::~file_iterator() +@@ -316,6 +456,8 @@ void file_iterator::close() { @@ -222,7 +222,7 @@ if (fp == stdin) clearerr(stdin); #ifndef POPEN_MISSING -@@ -297,6 +439,7 @@ void file_iterator::close() +@@ -324,6 +466,7 @@ #endif /* not POPEN_MISSING */ else fclose(fp); @@ -230,7 +230,7 @@ } int file_iterator::is_file() -@@ -304,7 +447,7 @@ int file_iterator::is_file() +@@ -331,7 +474,7 @@ return 1; } @@ -239,7 +239,7 @@ { close(); filename = s; -@@ -327,7 +470,7 @@ int file_iterator::fill(node **) +@@ -354,7 +497,7 @@ ptr = p; unsigned char *e = p + BUF_SIZE; while (p < e) { @@ -248,7 +248,7 @@ if (c == EOF) break; if (invalid_input_char(c)) -@@ -354,13 +497,13 @@ int file_iterator::fill(node **) +@@ -381,13 +524,13 @@ int file_iterator::peek() { @@ -265,7 +265,7 @@ return c; } -@@ -406,7 +549,7 @@ public: +@@ -433,7 +576,7 @@ static int set_location(const char *, int); static void backtrace(); static void backtrace_all(); @@ -274,7 +274,7 @@ static void end_file(); static void shift(int n); static void add_boundary(); -@@ -583,7 +726,7 @@ int input_stack::set_location(const char +@@ -605,7 +748,7 @@ return 0; } @@ -283,22 +283,22 @@ { input_iterator **pp; for (pp = ⊤ *pp != &nil_iterator; pp = &(*pp)->next) -@@ -669,10 +812,11 @@ void next_file() +@@ -691,10 +834,11 @@ input_stack::end_file(); else { errno = 0; -- FILE *fp = include_search_path.open_file_cautious(nm.contents()); +- FILE *fp = fopen(nm.contents(), "r"); - if (!fp) + opaque_fp *fp = new opaque_fp(nm.contents(), "r"); + if (!fp->active()) { -+ delete fp; ++ delete fp; error("can't open `%1': %2", nm.contents(), strerror(errno)); - else + } else input_stack::next_file(fp, nm.contents()); } tok.next(); -@@ -5463,11 +5607,12 @@ void source() +@@ -5372,11 +5516,12 @@ error("won't source non-file `%1' without -U flag", path); else { errno = 0; @@ -315,7 +315,7 @@ } tok.next(); } -@@ -6856,16 +7001,18 @@ void macro_source() +@@ -6822,16 +6967,18 @@ static void process_input_file(const char *name) { @@ -328,11 +328,11 @@ } else { errno = 0; -- fp = include_search_path.open_file_cautious(name); +- fp = fopen(name, "r"); - if (!fp) + fp = new opaque_fp(name, "r", OPQ_FP_GUESS); + if (!fp->active()) { -+ delete fp; ++ delete fp; fatal("can't open `%1': %2", name, strerror(errno)); + } } groff-1.18-nohtml.patch: Makefile.sub | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) Index: groff-1.18-nohtml.patch =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff-1.18-nohtml.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18-nohtml.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18-nohtml.patch 5 Jan 2006 14:49:14 -0000 1.3 @@ -1,6 +1,6 @@ ---- groff-1.19.1/doc/Makefile.sub.nohtml 2004-03-05 10:52:57.000000000 +0100 -+++ groff-1.19.1/doc/Makefile.sub 2005-01-12 13:39:54.345183392 +0100 -@@ -59,14 +59,11 @@ +--- groff-1.18/doc/Makefile.sub.nohtml 2002-06-14 17:18:34.000000000 +0200 ++++ groff-1.18/doc/Makefile.sub 2002-08-06 13:46:19.000000000 +0200 +@@ -54,11 +54,9 @@ meintro.ps \ pic.ps @@ -8,18 +8,14 @@ - pic.html +HTMLDOCFILES= --HTMLDOCFILESALL=\ -- pic*.html -+HTMLDOCFILESALL= - -HTMLDOCIMAGEFILES=\ - pic* +HTMLDOCIMAGEFILES= EXAMPLEFILES=\ webpage.ms \ -@@ -77,11 +74,9 @@ - webpage.ps \ +@@ -71,11 +69,9 @@ + gnu.png \ grnexmpl.ps -HTMLEXAMPLEFILES=\ @@ -32,7 +28,7 @@ imagedir=img htmldocimagedir=$(htmldocdir)/$(imagedir) -@@ -120,7 +115,7 @@ +@@ -109,7 +105,7 @@ all: groff $(PROCESSEDDOCFILES) prepare_examples \ @@ -41,9 +37,9 @@ html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES) -@@ -148,7 +143,7 @@ +@@ -131,7 +127,7 @@ - distfiles: groff gnu.eps gnu.png + distfiles: groff -install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \ +install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) \ groff-1.18-pfbtops_cpp.patch: Makefile.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Index: groff-1.18-pfbtops_cpp.patch =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff-1.18-pfbtops_cpp.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18-pfbtops_cpp.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18-pfbtops_cpp.patch 5 Jan 2006 14:49:14 -0000 1.3 @@ -1,6 +1,6 @@ ---- groff-1.19.1/Makefile.in.pfbtops_cpp 2004-04-07 17:33:39.000000000 +0200 -+++ groff-1.19.1/Makefile.in 2005-01-12 13:46:40.242477624 +0100 -@@ -464,8 +464,9 @@ +--- groff-1.18/Makefile.in.sopwith 2002-10-04 17:10:56.000000000 -0400 ++++ groff-1.18/Makefile.in 2002-10-04 17:11:09.000000000 -0400 +@@ -422,8 +422,9 @@ src/utils/lookbib \ src/utils/indxbib \ src/utils/lkbib \ @@ -9,6 +9,6 @@ + src/utils/addftinfo \ + src/utils/pfbtops +CPROGDIRS= - PROGDEPDIRS=arch/misc - PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) + PROGDIRS=$(CCPROGDIRS) $(CPROGDIRS) DEVDIRS=\ + font/devps \ groff-1.18.1-devutf8.patch: DESC.proto | 7 ++----- M.proto | 6 +++--- Makefile.sub | 6 +----- 3 files changed, 6 insertions(+), 13 deletions(-) Index: groff-1.18.1-devutf8.patch =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff-1.18.1-devutf8.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- groff-1.18.1-devutf8.patch 12 Jan 2005 14:08:37 -0000 1.3 +++ groff-1.18.1-devutf8.patch 5 Jan 2006 14:49:14 -0000 1.4 @@ -1,3 +1,15 @@ +--- groff-1.18.1/font/devutf8/M.proto.devutf8 2004-03-08 16:25:52.000000000 +0100 ++++ groff-1.18.1/font/devutf8/M.proto 2004-03-08 17:02:40.265336984 +0100 +@@ -1,6 +1,6 @@ + name M + internalname 4 +-spacewidth 48 ++spacewidth 24 + charset +-u2E00..u9FFF 48 0 +-uFF00..uFFEF 48 0 ++u0100..u07FF 24 0 ++u0800..uFFFF 48 0 --- groff-1.18.1/font/devutf8/DESC.proto.devutf8 2004-03-08 16:25:52.000000000 +0100 +++ groff-1.18.1/font/devutf8/DESC.proto 2004-03-08 16:25:53.000000000 +0100 @@ -3,10 +3,7 @@ groff-1.18.1-fixminus.patch: R.proto | 1 + 1 files changed, 1 insertion(+) Index: groff-1.18.1-fixminus.patch =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff-1.18.1-fixminus.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18.1-fixminus.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18.1-fixminus.patch 5 Jan 2006 14:49:14 -0000 1.3 @@ -1,9 +1,9 @@ ---- groff-1.19.1/font/devutf8/R.proto.fixminus 2003-12-28 09:42:31.000000000 +0100 -+++ groff-1.19.1/font/devutf8/R.proto 2005-01-12 14:00:15.628520104 +0100 -@@ -405,7 +405,7 @@ - *f 24 0 0x03D5 +--- groff-1.18.1/font/devutf8/R.proto.fixminus 2003-02-03 14:19:47.000000000 +0100 ++++ groff-1.18.1/font/devutf8/R.proto 2003-02-03 14:20:06.000000000 +0100 +@@ -285,7 +285,7 @@ + +h 24 0 0x03D1 + +f 24 0 0x03D5 +p 24 0 0x03D6 - +e 24 0 0x03F5 -- 24 0 0x2010 +- 24 0 0x002D hy " groff-1.18.1-gzext.patch: input.cc | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) Index: groff-1.18.1-gzext.patch =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff-1.18.1-gzext.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18.1-gzext.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18.1-gzext.patch 5 Jan 2006 14:49:14 -0000 1.3 @@ -1,16 +1,11 @@ ---- groff-1.19.1/src/roff/troff/input.cpp.gzext 2005-01-12 14:17:15.469480712 +0100 -+++ groff-1.19.1/src/roff/troff/input.cpp 2005-01-12 14:22:57.666458864 +0100 -@@ -5590,16 +5590,20 @@ void source() - else { +--- groff-1.18.1/src/roff/troff/input.cc.gzext 2003-02-10 18:32:00.000000000 +0100 ++++ groff-1.18.1/src/roff/troff/input.cc 2003-02-10 18:33:18.000000000 +0100 +@@ -5487,12 +5487,16 @@ char cbuf[PATH_MAX], * cwd; char pbuf[PATH_MAX], * path; -+ char tmp[PATH_MAX]; struct stat st; - ++ char tmp[PATH_MAX]; + snprintf(tmp, PATH_MAX, "%s.gz", nm.contents()); -+ - while (!tok.newline() && !tok.eof()) - tok.next(); if ((cwd = realpath(".", cbuf)) == NULL) error("realpath on `%1' failed: %2", ".", strerror(errno)); @@ -18,8 +13,9 @@ - error("realpath on `%1' failed: %2", nm.contents(), strerror(errno)); - else if (safer_flag && strncmp(cwd, path, strlen(cwd))) + else if ((path = realpath(nm.contents(), pbuf)) == NULL && -+ (path = realpath(tmp, pbuf)) == NULL) { -+ error("realpath on `%1' failed: %3", nm.contents(), strerror(errno)); ++ (path = realpath(tmp, pbuf)) == NULL) ++ { ++ error("realpath on `%1' failed: %3", nm.contents(), strerror(errno)); + } else if (safer_flag && strncmp(cwd, path, strlen(cwd))) error("won't source `%1' outside of `%2' without -U flag", path, cwd); else if (stat(path, &st) < 0) groff-1.18.1-korean.patch: nroff.sh | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) Index: groff-1.18.1-korean.patch =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff-1.18.1-korean.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18.1-korean.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18.1-korean.patch 5 Jan 2006 14:49:14 -0000 1.3 @@ -1,44 +1,38 @@ ---- groff-1.19.1/src/roff/nroff/nroff.sh.korean 2004-04-06 16:10:32.000000000 +0200 -+++ groff-1.19.1/src/roff/nroff/nroff.sh 2005-01-12 14:15:39.714037752 +0100 -@@ -12,6 +12,10 @@ - T=-Tlatin1 ;; - IBM-1047) +--- groff-1.18.1/src/roff/nroff/nroff.sh.orig 2003-02-06 19:37:17.000000000 +0900 ++++ groff-1.18.1/src/roff/nroff/nroff.sh 2003-02-06 19:38:34.000000000 +0900 +@@ -14,6 +14,8 @@ T=-Tcp1047 ;; -+ EUC-JP) -+ T=-Tnippon ;; + EUC-JP) + T=-Tnippon ;; + EUC-KR) + T=-Tkorean ;; *) case "${LC_ALL-${LC_CTYPE-${LANG}}}" in *.UTF-8) -@@ -20,6 +24,10 @@ - T=-Tlatin1 ;; - *.IBM-1047) +@@ -24,6 +26,8 @@ T=-Tcp1047 ;; -+ ja_JP.ujis | ja_JP.eucJP) -+ T=-Tnippon ;; + ja_JP.ujis | ja_JP.eucJP) + T=-Tnippon ;; + ko_KR.eucKR) + T=-Tkorean ;; *) case "$LESSCHARSET" in utf-8) -@@ -28,6 +36,10 @@ - T=-Tlatin1 ;; - cp1047) +@@ -34,6 +38,8 @@ T=-Tcp1047 ;; -+ japanese) -+ T=-Tnippon ;; -+ ko) -+ T=-Tkorean ;; + japanese) + T=-Tnippon ;; ++ ko) ++ T=-Tkorean ;; *) - T=-Tascii ;; + T=-Tascii8 ;; esac ;; -@@ -52,7 +64,7 @@ +@@ -58,7 +64,7 @@ exit 1 ;; - -[iptSUC] | -[dmrno]*) + -[iptSUC] | -[mrno]*) opts="$opts $1" ;; -- -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047) -+ -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tnippon | -Tkorean) +- -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tascii8 | -Tnippon) ++ -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tascii8 | -Tnippon | -Tkorean) T=$1 ;; -T*) # ignore other devices groff-xlibs.patch: Makefile.ccpg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: groff-xlibs.patch =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff-xlibs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-xlibs.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-xlibs.patch 5 Jan 2006 14:49:14 -0000 1.3 @@ -1,12 +1,12 @@ ---- groff-1.19.1/Makefile.ccpg.xlibs 2003-04-12 16:07:05.000000000 +0200 -+++ groff-1.19.1/Makefile.ccpg 2005-01-12 14:24:58.349112312 +0100 +--- groff-1.18.1/Makefile.ccpg.sopwith Mon Feb 10 08:33:21 2003 ++++ groff-1.18.1/Makefile.ccpg Mon Feb 10 08:54:00 2003 @@ -8,7 +8,7 @@ all: $(PROG) $(MANPAGES) -$(PROG): $(OBJS) $(XLIBS) +$(PROG): $(OBJS) - $(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) + $(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) install_bin: install_prog @@ -28,6 +28,6 @@ @@ -16,4 +16,4 @@ -$(PROG).pure: $(OBJS) $(XLIBS) +$(PROG).pure: $(OBJS) $(PURIFY) $(PURIFYCCFLAGS) \ - $(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) + $(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- groff.spec 12 Jan 2005 14:08:37 -0000 1.27 +++ groff.spec 5 Jan 2006 14:49:14 -0000 1.28 @@ -2,27 +2,32 @@ Summary: A document formatting system. Name: groff -Version: 1.19.1 -Release: 1 +Version: 1.18.1.1 +Release: 6 License: GPL Group: Applications/Publishing -Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.bz2 +Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz Source3: mandocj.tar.gz Source4: man-pages-ja-GNU_groff-20000115.tar.gz Source6: hyphen.cs Source7: nroff Patch1: groff-1.16-safer.patch -Patch2: groff-1.18-info.patch -Patch3: groff-1.18-nohtml.patch -Patch4: groff-1.18-pfbtops_cpp.patch -Patch5: groff-1.18-gzip.patch -Patch6: groff-1.18.1-fixminus.patch -Patch7: groff-1.18.1-korean.patch -Patch8: groff-1.18.1-gzext.patch -Patch9: groff-xlibs.patch -Patch10: groff-1.18.1.1-revision.patch -Patch11: groff-1.18.1.1-do_char.patch -Patch12: groff-1.18.1.1-tempfile.patch +Patch3: groff_1.18.1-15.diff +Patch4: groff-1.18-info.patch +Patch5: groff-1.18-nohtml.patch +Patch6: groff-1.18-pfbtops_cpp.patch +Patch7: groff-1.18-gzip.patch +Patch9: groff-1.18.1-fixminus.patch +Patch11: groff-1.18.1-8bit.patch +Patch12: groff-1.18.1-korean.patch +Patch13: groff-1.18.1-gzext.patch +Patch14: groff-xlibs.patch +Patch15: groff-1.18.1-fix15.patch +Patch16: groff-1.18.1-devutf8.patch +Patch17: groff-1.18.1.1-revision.patch +Patch18: groff-1.18.1.1-do_char.patch +Patch19: groff-1.18.1.1-grn.patch +Patch20: groff-1.18.1.1-tempfile.patch URL: ftp://ftp.gnu.org/gnu/groff/ Requires: mktemp @@ -30,10 +35,12 @@ Buildroot: %{_tmppath}/%{name}-root Obsoletes: groff-tools Provides: nroff-i18n -BuildRequires: netpbm-progs zlib-devel texinfo +BuildRequires: netpbm-progs zlib-devel texinfo imake +BuildRequires: xorg-x11-proto-devel libX11-devel libXaw-devel +BuildRequires: libXt-devel libXpm-devel libXp-devel libXext-devel BuildPrereq: byacc %if %{with_x} -BuildRequires: xorg-x11-devel +#BuildRequires: xorg-x11-devel %endif %description @@ -71,18 +78,23 @@ %prep %setup -q -a 4 -%patch1 -p1 -b .safer -%patch2 -p1 -b .infopatch -%patch3 -p1 -b .nohtml -%patch4 -p1 -b .pfbtops_cpp -%patch5 -p1 -b .gzip -%patch6 -p1 -b .fixminus -%patch7 -p1 -b .korean -%patch8 -p1 -b .gzext -%patch9 -p1 -b .xlibs -%patch10 -p1 -b .revision -%patch11 -p1 -b .do_char -%patch12 -p1 -b .tempfile +%patch1 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch9 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 -b .gzext +%patch14 -p1 +%patch15 -p1 -b .fix9 +%patch16 -p1 -b .devutf8 +%patch17 -p1 -b .revision +%patch18 -p1 -b .do_char +%patch19 -p1 -b .grn +%patch20 -p1 -b .tempfile for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \ src/devices/grolbp/grolbp.man; do @@ -91,7 +103,8 @@ done %build -PATH=$PATH:%{_prefix}/X11R6/bin +#PATH=$PATH:%{_prefix}/X11R6/bin +#autoconf %configure --enable-japanese --enable-multibyte make (cd doc && makeinfo groff.texinfo) @@ -102,7 +115,7 @@ %install rm -rf ${RPM_BUILD_ROOT} -PATH=$PATH:%{_prefix}/X11R6/bin +#PATH=$PATH:%{_prefix}/X11R6/bin mkdir -p ${RPM_BUILD_ROOT}%{_prefix} ${RPM_BUILD_ROOT}%{_infodir} %makeinstall manroot=${RPM_BUILD_ROOT}/%{_mandir} #install -m 644 doc/groff.info* ${RPM_BUILD_ROOT}/%{_infodir} @@ -112,20 +125,20 @@ cd ../.. %endif #mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_prefix}/share -ln -s s.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gs.tmac -ln -s mse.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gmse.tmac -ln -s m.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gm.tmac -ln -s troff ${RPM_BUILD_ROOT}%{_prefix}/bin/gtroff -ln -s tbl ${RPM_BUILD_ROOT}%{_prefix}/bin/gtbl -ln -s pic ${RPM_BUILD_ROOT}%{_prefix}/bin/gpic -ln -s eqn ${RPM_BUILD_ROOT}%{_prefix}/bin/geqn -ln -s neqn ${RPM_BUILD_ROOT}%{_prefix}/bin/gneqn -ln -s refer ${RPM_BUILD_ROOT}%{_prefix}/bin/grefer -ln -s lookbib ${RPM_BUILD_ROOT}%{_prefix}/bin/glookbib -ln -s indxbib ${RPM_BUILD_ROOT}%{_prefix}/bin/gindxbib -ln -s soelim ${RPM_BUILD_ROOT}%{_prefix}/bin/gsoelim -ln -s soelim ${RPM_BUILD_ROOT}%{_prefix}/bin/zsoelim -ln -s nroff ${RPM_BUILD_ROOT}%{_prefix}/bin/gnroff +ln -s s.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gs.tmac +ln -s mse.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gmse.tmac +ln -s m.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gm.tmac +ln -s troff ${RPM_BUILD_ROOT}%{_bindir}/gtroff +ln -s tbl ${RPM_BUILD_ROOT}%{_bindir}/gtbl +ln -s pic ${RPM_BUILD_ROOT}%{_bindir}/gpic +ln -s eqn ${RPM_BUILD_ROOT}%{_bindir}/geqn +ln -s neqn ${RPM_BUILD_ROOT}%{_bindir}/gneqn +ln -s refer ${RPM_BUILD_ROOT}%{_bindir}/grefer +ln -s lookbib ${RPM_BUILD_ROOT}%{_bindir}/glookbib +ln -s indxbib ${RPM_BUILD_ROOT}%{_bindir}/gindxbib +ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/gsoelim +ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/zsoelim +ln -s nroff ${RPM_BUILD_ROOT}%{_bindir}/gnroff # Build system is compressing man-pages ln -s eqn.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/geqn.1.gz @@ -139,23 +152,23 @@ ln -s tbl.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gtbl.1.gz ln -s troff.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gtroff.1.gz -ln -s devnippon ${RPM_BUILD_ROOT}/usr/share/groff/%{version}/font/devkorean +ln -s devnippon ${RPM_BUILD_ROOT}%{_datadir}/groff/%{version}/font/devkorean -cat debian/mandoc.local >> ${RPM_BUILD_ROOT}/usr/share/groff/site-tmac/mdoc.local -cat debian/mandoc.local >> ${RPM_BUILD_ROOT}/usr/share/groff/site-tmac/man.local +cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/mdoc.local +cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/man.local -find ${RPM_BUILD_ROOT}%{_prefix}/bin ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l | \ +find ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l | \ grep -v afmtodit | grep -v grog | grep -v mdoc.samples |\ grep -v mmroff |\ sed "s|${RPM_BUILD_ROOT}||g" | sed "s|\.[0-9]|\.*|g" > groff-files -install -m 644 %SOURCE6 $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/hyphen.cs +install -m 644 %SOURCE6 $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/hyphen.cs -install -m 755 %SOURCE7 $RPM_BUILD_ROOT/usr/bin/nroff +install -m 755 %SOURCE7 $RPM_BUILD_ROOT%{_bindir}/nroff -ln -sf doc.tmac $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/docj.tmac +ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac # installed, but not packaged in rpm -rm -fr $RPM_BUILD_ROOT/usr/share/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir +rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults %clean rm -rf ${RPM_BUILD_ROOT} @@ -173,14 +186,14 @@ %defattr(-,root,root) %doc BUG-REPORT NEWS PROBLEMS README TODO VERSION %doc doc/meintro.me doc/meref.me doc/pic.ms -%{_prefix}/share/groff +%{_datadir}/groff %{_infodir}/groff* %files perl %defattr(-,root,root) -%{_prefix}/bin/grog -%{_prefix}/bin/mmroff -%{_prefix}/bin/afmtodit +%{_bindir}/grog +%{_bindir}/mmroff +%{_bindir}/afmtodit %{_mandir}/man1/afmtodit.* %{_mandir}/man1/grog.* %{_mandir}/man1/mmroff* @@ -188,15 +201,13 @@ %if %{with_x} %files gxditview %defattr(-,root,root) -%{_prefix}/X11R6/bin/gxditview -%{_prefix}/X11R6/lib/X11/app-defaults/GXditview +%{_bindir}/gxditview +%{_datadir}/X11/app-defaults/GXditview %endif %changelog -* Wed Jan 12 2005 Jindrich Novy 1.19.1-1 -- update to groff 1.19.1 -- drop 8bit, fix15, devutf8, grn patches -- sync the rest of patches with current release +* Thu Jan 05 2006 Jindrich Novy - 1.18.1.1-6 +- add BuildRequires imake and update dependencies for modular X - spec cleanup * Wed Nov 24 2004 Miloslav Trmac - 1.18.1.1-5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/groff/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 12 Jan 2005 14:08:37 -0000 1.10 +++ sources 5 Jan 2006 14:49:14 -0000 1.11 @@ -1,4 +1,3 @@ 511dbd64b67548c99805f1521f82cc5e groff-1.18.1.1.tar.gz 9bbf9b74fd587d248e17543bda4ce5de man-pages-ja-GNU_groff-20000115.tar.gz e5d7f3273b4d53033723fcd2654d980c mandocj.tar.gz -88239a9aa668235ac82c34bcdfc4e83a groff-1.19.1.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 5 15:04:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 10:04:00 -0500 Subject: rpms/groff/devel groff.spec,1.28,1.29 Message-ID: <200601051504.k05F40fd008017@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7989 Modified Files: groff.spec Log Message: fix compilation with gcc-4.1.0 Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- groff.spec 5 Jan 2006 14:49:14 -0000 1.28 +++ groff.spec 5 Jan 2006 15:03:45 -0000 1.29 @@ -28,6 +28,7 @@ Patch18: groff-1.18.1.1-do_char.patch Patch19: groff-1.18.1.1-grn.patch Patch20: groff-1.18.1.1-tempfile.patch +Patch21: groff-1.18.1.1-gcc41.patch URL: ftp://ftp.gnu.org/gnu/groff/ Requires: mktemp @@ -95,6 +96,7 @@ %patch18 -p1 -b .do_char %patch19 -p1 -b .grn %patch20 -p1 -b .tempfile +%patch21 -p1 -b .gcc41 for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \ src/devices/grolbp/grolbp.man; do @@ -209,6 +211,7 @@ * Thu Jan 05 2006 Jindrich Novy - 1.18.1.1-6 - add BuildRequires imake and update dependencies for modular X - spec cleanup +- fix compilation with gcc-4.1.0 * Wed Nov 24 2004 Miloslav Trmac - 1.18.1.1-5 - Convert also mmroff.1 to UTF-8 From fedora-cvs-commits at redhat.com Thu Jan 5 15:05:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 10:05:42 -0500 Subject: rpms/groff/devel groff-1.18.1.1-gcc41.patch,NONE,1.1 Message-ID: <200601051505.k05F5g30008224@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8154 Added Files: groff-1.18.1.1-gcc41.patch Log Message: add patch to fix gcc-4.1.0 build groff-1.18.1.1-gcc41.patch: post-html.cc | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE groff-1.18.1.1-gcc41.patch --- --- groff-1.18.1.1/src/devices/grohtml/post-html.cc.gcc41 2006-01-05 16:01:16.000000000 +0100 +++ groff-1.18.1.1/src/devices/grohtml/post-html.cc 2006-01-05 16:02:14.000000000 +0100 @@ -261,7 +261,7 @@ struct char_block { char_block *next; char_block(); - char_block::char_block(int length); + char_block(int length); }; char_block::char_block() From fedora-cvs-commits at redhat.com Thu Jan 5 15:15:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 10:15:08 -0500 Subject: rpms/groff/devel groff.spec,1.29,1.30 Message-ID: <200601051515.k05FF8IO012039@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11906 Modified Files: groff.spec Log Message: fix library path Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- groff.spec 5 Jan 2006 15:03:45 -0000 1.29 +++ groff.spec 5 Jan 2006 15:15:06 -0000 1.30 @@ -170,7 +170,7 @@ ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac # installed, but not packaged in rpm -rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults +rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/usr/lib/X11/app-defaults %clean rm -rf ${RPM_BUILD_ROOT} From fedora-cvs-commits at redhat.com Thu Jan 5 15:22:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 10:22:41 -0500 Subject: rpms/libc-client/devel .cvsignore, 1.2, 1.3 imap-2000c-redhat-flock.patch, 1.1, 1.2 libc-client.spec, 1.13, 1.14 sources, 1.2, 1.3 Message-ID: <200601051522.k05FMfsK026568@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/libc-client/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26530 Modified Files: .cvsignore imap-2000c-redhat-flock.patch libc-client.spec sources Log Message: * Thu Jan 5 2006 Jonathan Kamens 2004g-1 - Upstream version 2004g (#176974) - Remove obsolete doc file "WARNING" - Remove security patch included in new upstream version - Custom flock code no longer necessary; included in upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libc-client/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Sep 2004 07:20:42 -0000 1.2 +++ .cvsignore 5 Jan 2006 15:22:39 -0000 1.3 @@ -1 +1,2 @@ imap-2002e.tar.Z +imap-2004g.tar.Z imap-2000c-redhat-flock.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: imap-2000c-redhat-flock.patch =================================================================== RCS file: /cvs/dist/rpms/libc-client/devel/imap-2000c-redhat-flock.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- imap-2000c-redhat-flock.patch 9 Sep 2004 07:20:42 -0000 1.1 +++ imap-2000c-redhat-flock.patch 5 Jan 2006 15:22:39 -0000 1.2 @@ -1,11 +1,11 @@ ---- imap-2000c/src/osdep/unix/Makefile.redhat-flock Fri May 18 01:25:48 2001 -+++ imap-2000c/src/osdep/unix/Makefile Fri May 18 01:29:49 2001 -@@ -90,7 +90,7 @@ - BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o utf8.o siglocal.o \ +--- imap-2004g/src/osdep/unix/Makefile.redhat-flock 2006-01-05 15:08:57.000000000 +0000 ++++ imap-2004g/src/osdep/unix/Makefile 2006-01-05 15:09:17.000000000 +0000 +@@ -128,7 +128,7 @@ + BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o siglocal.o \ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ -- unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o -+ unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o flock.o +- unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o ++ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o flock.o CFLAGS=-g CAT=cat Index: libc-client.spec =================================================================== RCS file: /cvs/dist/rpms/libc-client/devel/libc-client.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libc-client.spec 9 Dec 2005 22:41:31 -0000 1.13 +++ libc-client.spec 5 Jan 2006 15:22:39 -0000 1.14 @@ -4,27 +4,24 @@ Summary: C-client mail access routines for IMAP and POP protocols Name: libc-client -Version: 2002e -Release: 18.1 +Version: 2004g +Release: 1 License: University of Washington Free-Fork License Group: System Environment/Daemons URL: http://www.washington.edu/imap/ -Source0: imap-%{version}.tar.Z -Source1: flock.c +Source0: ftp://ftp.cac.washington.edu/imap/imap-%{version}.tar.Z Patch0: imap-2002e-redhat-ssl.patch -Patch1: imap-2000-linux.patch +Patch1: imap-2004g-linux.patch Patch2: imap-2001a-mbox-disable.patch Patch3: imap-2002b-krbpath.patch -Patch4: imap-2000c-redhat-flock.patch Patch5: imap-2001a-overflow.patch -Patch6: imap-2002e-redhat-version.patch +Patch6: imap-2004g-redhat-version.patch Patch7: imap-2002d-ssltype.patch Patch8: imap-2002e-cclient-only.patch Patch9: imap-2002e-shared.patch Patch10: imap-2002e-authmd5.patch -Patch11: imap-2002d-cve2005-2933.patch Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -58,7 +55,6 @@ %patch3 -p1 -b .gssapi-patch -%patch4 -p1 -b .redhat-flock %patch5 -p1 -b .overflow %patch6 -p1 -b .redhat-version @@ -66,15 +62,13 @@ %patch8 -p1 -b .cclient-only %patch9 -p1 -b .shared %patch10 -p1 -b .authmd5 -%patch11 -p1 -b .cve2005-2933 - -cp %{SOURCE1} src/osdep/unix/ %build # Set EXTRACFLAGS here instead of in imap-2000-redhat.patch (#20760) EXTRACFLAGS="$EXTRACFLAGS -DDISABLE_POP_PROXY=1 -DIGNORE_LOCK_EACCES_ERRORS=1" EXTRACFLAGS="$EXTRACFLAGS -I/usr/include/openssl" -EXTRACFLAGS="$EXTRACFLAGS -fPIC" +EXTRACFLAGS="$EXTRACFLAGS -fPIC -fno-strict-aliasing" +EXTRACFLAGS="$EXTRACFLAGS -Wall -Wno-pointer-sign -Wno-parentheses" make lnp \ EXTRACFLAGS="$EXTRACFLAGS" \ @@ -115,7 +109,7 @@ %files %defattr(-,root,root) -%doc CPYRIGHT README WARNING docs/RELNOTES docs/*.txt +%doc CPYRIGHT README docs/RELNOTES docs/*.txt %doc docs/CONFIG docs/SSLBUILD %{_libdir}/lib%{soname}.so.* @@ -128,6 +122,12 @@ %{_libdir}/lib%{soname}.so %changelog +* Thu Jan 5 2006 Jonathan Kamens 2004g-1 +- Upstream version 2004g (#176974) +- Remove obsolete doc file "WARNING" +- Remove security patch included in new upstream version +- Custom flock code no longer necessary; included in upstream + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/libc-client/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Sep 2004 07:20:42 -0000 1.2 +++ sources 5 Jan 2006 15:22:39 -0000 1.3 @@ -1 +1 @@ -0d246d868f20d8c441d235b77c940676 imap-2002e.tar.Z +5749cc4d1fa8e7a72853729906c0ae9e imap-2004g.tar.Z From fedora-cvs-commits at redhat.com Thu Jan 5 15:23:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 10:23:06 -0500 Subject: rpms/libc-client/devel flock.c, 1.1, NONE imap-2000c-redhat-flock.patch, 1.2, NONE Message-ID: <200601051523.k05FN6O0026787@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/libc-client/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26709 Removed Files: flock.c imap-2000c-redhat-flock.patch Log Message: - remove now-unused files --- flock.c DELETED --- --- imap-2000c-redhat-flock.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 5 15:28:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 10:28:34 -0500 Subject: rpms/libc-client/devel imap-2004g-linux.patch, NONE, 1.1 imap-2004g-redhat-version.patch, NONE, 1.1 mirrors, NONE, 1.1 upstream, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 imap-2000-linux.patch, 1.1, NONE imap-2002d-cve2005-2933.patch, 1.1, NONE imap-2002e-redhat-version.patch, 1.1, NONE Message-ID: <200601051528.k05FSYl8029255@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/libc-client/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29112 Modified Files: .cvsignore sources Added Files: imap-2004g-linux.patch imap-2004g-redhat-version.patch mirrors upstream Removed Files: imap-2000-linux.patch imap-2002d-cve2005-2933.patch imap-2002e-redhat-version.patch Log Message: - update to Jonathan's patches; remove old imap-2004g-linux.patch: Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE imap-2004g-linux.patch --- --- imap-2004g/src/osdep/unix/Makefile.linux-patch 2006-01-05 09:21:19.000000000 -0500 +++ imap-2004g/src/osdep/unix/Makefile 2006-01-05 09:22:06.000000000 -0500 @@ -83,12 +83,12 @@ LOGINPW=std SIGTYPE=bsd CRXTYPE=std -ACTIVEFILE=/usr/lib/news/active -SPOOLDIR=/usr/spool +ACTIVEFILE=/var/lib/news/active +SPOOLDIR=/var/spool MAILSPOOL=$(SPOOLDIR)/mail NEWSSPOOL=$(SPOOLDIR)/news -RSHPATH=/usr/ucb/rsh -LOCKPGM=/etc/mlock +RSHPATH=/usr/bin/rsh +#LOCKPGM=/etc/mlock # Default formats for creating new mailboxes and for empty mailboxes in the @@ -455,7 +455,7 @@ SPOOLDIR=/var/spool \ ACTIVEFILE=/var/lib/news/active \ RSHPATH=/usr/bin/rsh \ - BASECFLAGS="-g -fno-omit-frame-pointer $(GCCOPTLEVEL)" \ + BASECFLAGS="-g ${RPM_OPT_FLAGS}" \ BASELDFLAGS="$(PAMLDFLAGS)" lnx: # Linux non-shadow passwords imap-2004g-redhat-version.patch: imapd.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE imap-2004g-redhat-version.patch --- --- imap-2004g/src/imapd/imapd.c.redhat-version 2005-01-20 20:20:11.000000000 -0500 +++ imap-2004g/src/imapd/imapd.c 2006-01-05 09:24:17.000000000 -0500 @@ -186,7 +186,7 @@ /* Global storage */ -char *version = "2004.357"; /* version number of this server */ +char *version = "2004.357rh"; /* version number of this server */ time_t alerttime = 0; /* time of last alert */ time_t sysalerttime = 0; /* time of last system alert */ time_t useralerttime = 0; /* time of last user alert */ --- NEW FILE mirrors --- ftp://ftp.cac.washington.edu/imap/ --- NEW FILE upstream --- imap-2004g.tar.Z Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libc-client/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jan 2006 15:22:39 -0000 1.3 +++ .cvsignore 5 Jan 2006 15:28:31 -0000 1.4 @@ -1,2 +1,4 @@ imap-2002e.tar.Z imap-2004g.tar.Z +i386 +*.src.rpm Index: sources =================================================================== RCS file: /cvs/dist/rpms/libc-client/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 15:22:39 -0000 1.3 +++ sources 5 Jan 2006 15:28:31 -0000 1.4 @@ -1 +1 @@ -5749cc4d1fa8e7a72853729906c0ae9e imap-2004g.tar.Z +9a80f58d8d6a0979c13714ae69050020 imap-2004g.tar.Z --- imap-2000-linux.patch DELETED --- --- imap-2002d-cve2005-2933.patch DELETED --- --- imap-2002e-redhat-version.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 5 15:32:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 10:32:57 -0500 Subject: rpms/coreutils/devel coreutils.spec,1.104,1.105 Message-ID: <200601051532.k05FWv55030178@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/coreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30120 Modified Files: coreutils.spec Log Message: * Thu Jan 5 2006 Tim Waugh 5.93-7 - Don't suppress chown/chgrp errors in install(1) (bug #176708). Index: coreutils.spec =================================================================== RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- coreutils.spec 2 Jan 2006 14:38:03 -0000 1.104 +++ coreutils.spec 5 Jan 2006 15:32:52 -0000 1.105 @@ -1,7 +1,7 @@ Summary: The GNU core utilities: a set of tools commonly used in shell scripts Name: coreutils Version: 5.93 -Release: 6 +Release: 7 License: GPL Group: System Environment/Base Url: http://www.gnu.org/software/coreutils/ @@ -40,6 +40,7 @@ Patch907: coreutils-5.2.1-runuser.patch Patch908: coreutils-getgrouplist.patch Patch912: coreutils-overflow.patch +Patch913: coreutils-afs.patch #SELINUX Patch Patch950: coreutils-selinux.patch @@ -91,6 +92,7 @@ %patch907 -p1 -b .runuser %patch908 -p1 -b .getgrouplist %patch912 -p1 -b .overflow +%patch913 -p1 -b .afs #SELinux %patch950 -p1 -b .selinux @@ -259,9 +261,12 @@ /sbin/runuser %changelog -* Mon Jan 2 2006 Dan Walsh 5.93-6 +* Thu Jan 5 2006 Tim Waugh 5.93-7 +- Don't suppress chown/chgrp errors in install(1) (bug #176708). + +* Mon Jan 2 2006 Dan Walsh 5.93-6 - Remove pam_selinux.so from su.pamd, not needed for targeted and Strict/MLS -will have to newrole before using. + will have to newrole before using. * Fri Dec 23 2005 Tim Waugh 5.93-5 - Fix "sort -n" (bug #176468). From fedora-cvs-commits at redhat.com Thu Jan 5 15:39:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 10:39:51 -0500 Subject: rpms/coreutils/devel coreutils-afs.patch,NONE,1.1 Message-ID: <200601051539.k05FdpUa000444@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/coreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv410 Added Files: coreutils-afs.patch Log Message: Add the patch. coreutils-afs.patch: install.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) --- NEW FILE coreutils-afs.patch --- --- coreutils-5.93/src/install.c.afs 2006-01-05 15:26:23.000000000 +0000 +++ coreutils-5.93/src/install.c 2006-01-05 15:26:25.000000000 +0000 @@ -595,14 +595,9 @@ the install command is that the file is supposed to end up with precisely the attributes that the user specified (or defaulted). If the file doesn't end up with the group they asked for, they'll - want to know. But AFS returns EPERM when you try to change a - file's group; thus the kludge. */ + want to know. */ - if (chown (name, owner_id, group_id) != 0 -#ifdef AFS - && errno != EPERM -#endif - ) + if (chown (name, owner_id, group_id) != 0) { error (0, errno, _("cannot change ownership of %s"), quote (name)); ok = false; From fedora-cvs-commits at redhat.com Thu Jan 5 15:50:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 10:50:05 -0500 Subject: rpms/libxml2/devel .cvsignore, 1.30, 1.31 libxml2.spec, 1.31, 1.32 sources, 1.32, 1.33 Message-ID: <200601051550.k05Fo5ZY016277@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/libxml2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16131 Modified Files: .cvsignore libxml2.spec sources Log Message: Upstream release of 2.6.23, Daniel Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libxml2/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 12 Sep 2005 22:03:48 -0000 1.30 +++ .cvsignore 5 Jan 2006 15:50:02 -0000 1.31 @@ -8,3 +8,4 @@ libxml2-2.6.20.tar.gz libxml2-2.6.21.tar.gz libxml2-2.6.22.tar.gz +libxml2-2.6.23.tar.gz Index: libxml2.spec =================================================================== RCS file: /cvs/dist/rpms/libxml2/devel/libxml2.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- libxml2.spec 9 Dec 2005 22:41:46 -0000 1.31 +++ libxml2.spec 5 Jan 2006 15:50:02 -0000 1.32 @@ -1,7 +1,7 @@ Summary: Library providing XML and HTML support Name: libxml2 -Version: 2.6.22 -Release: 1.1 +Version: 2.6.23 +Release: 1 License: MIT Group: Development/Libraries Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz @@ -60,36 +60,6 @@ %setup -q %build -# -# try to use compiler profiling, based on Arjan van de Ven -# initial test spec. This really doesn't work okay for most tests done. -# -# Well except it's just broken most of the time. -#GCC_VERSION=`gcc --version | grep "^gcc" | awk '{ print $3 }' | sed 's+\([0-9]\)\.\([0-9]\)\..*+\1\2+'` -#if [ $GCC_VERSION -ge 34 ] -#then -# PROF_GEN='-fprofile-generate' -# PROF_USE='-fprofile-use' -#fi -# -#if [ "$PROF_GEN" != "" ] -#then -# # First generate a profiling version -# CFLAGS="${RPM_OPT_FLAGS} ${PROF_GEN}" %configure -# make -# # Run a few sampling -# make dba100000.xml -# ./xmllint --noout dba100000.xml -# ./xmllint --stream dba100000.xml -# ./xmllint --noout --valid test/valid/REC-xml-19980210.xml -# ./xmllint --stream --valid test/valid/REC-xml-19980210.xml -# # Then generate code based on profile -# CFLAGS="${RPM_OPT_FLAGS} ${PROF_USE}" %configure -# make -#else -# %configure -# make -#fi %configure make gzip -9 ChangeLog @@ -157,11 +127,8 @@ %doc doc/python.html %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Mon Sep 12 2005 Daniel Veillard -- upstream release 2.6.22 see http://xmlsoft.org/news.html +* Thu Jan 5 2006 Daniel Veillard +- upstream release 2.6.23 see http://xmlsoft.org/news.html * Thu Jan 2 2003 Daniel Veillard - integrated drv_libxml2 xml.sax driver from St?phane Bidoul Index: sources =================================================================== RCS file: /cvs/dist/rpms/libxml2/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 12 Sep 2005 22:03:48 -0000 1.32 +++ sources 5 Jan 2006 15:50:02 -0000 1.33 @@ -1,2 +1 @@ -131f2d98ed75ec1dc118783a21104107 libxml2-2.6.21.tar.gz -1db8d06b4f49a665a8f47dc6d94450e6 libxml2-2.6.22.tar.gz +0f37385e3ad73cc94db43d6873f4fc3b libxml2-2.6.23.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 5 16:01:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 11:01:34 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.76, 1.77 libsepol.spec, 1.99, 1.100 sources, 1.77, 1.78 Message-ID: <200601051601.k05G1Y7W020890@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20834 Modified Files: .cvsignore libsepol.spec sources Log Message: * Thu Jan 5 2006 Dan Walsh 1.11.4-1 - Upgrade to latest from NSA * Merged bugfix for sepol_port_modify from Russell Coker. * Fixed bug in sepol_iface_modify error path noted by Ivan Gyurdiev. * Merged port ordering patch from Ivan Gyurdiev. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- .cvsignore 4 Jan 2006 18:10:14 -0000 1.76 +++ .cvsignore 5 Jan 2006 16:01:15 -0000 1.77 @@ -73,3 +73,4 @@ libsepol-1.10.tgz libsepol-1.11.1.tgz libsepol-1.11.2.tgz +libsepol-1.11.4.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- libsepol.spec 4 Jan 2006 18:10:14 -0000 1.99 +++ libsepol.spec 5 Jan 2006 16:01:15 -0000 1.100 @@ -1,7 +1,7 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.11.2 -Release: 2 +Version: 1.11.4 +Release: 1 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsepol-%{version}.tgz @@ -80,7 +80,13 @@ %{_includedir}/sepol/policydb/*.h %changelog -* Wed Jan 4 2006 Dan Walsh 1.11.2-1 +* Thu Jan 5 2006 Dan Walsh 1.11.4-1 +- Upgrade to latest from NSA + * Merged bugfix for sepol_port_modify from Russell Coker. + * Fixed bug in sepol_iface_modify error path noted by Ivan Gyurdiev. + * Merged port ordering patch from Ivan Gyurdiev. + +* Wed Jan 4 2006 Dan Walsh 1.11.2-2 - Upgrade to latest from NSA * Merged patch series from Ivan Gyurdiev. This includes patches to: Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- sources 4 Jan 2006 18:10:14 -0000 1.77 +++ sources 5 Jan 2006 16:01:15 -0000 1.78 @@ -1 +1 @@ -4ff22d134a5cf9715505feb18a35e6c3 libsepol-1.11.2.tgz +2c330bf93f6561decc7f2de511f3a38c libsepol-1.11.4.tgz From fedora-cvs-commits at redhat.com Thu Jan 5 19:45:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 14:45:26 -0500 Subject: rpms/hal/devel .cvsignore, 1.33, 1.34 hal.spec, 1.69, 1.70 sources, 1.34, 1.35 Message-ID: <200601051945.k05JjQCL032548@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32365 Modified Files: .cvsignore hal.spec sources Log Message: - Add CVS snapshot of HAL to get new mount support Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 16 Nov 2005 21:29:11 -0000 1.33 +++ .cvsignore 5 Jan 2006 19:45:23 -0000 1.34 @@ -21,3 +21,4 @@ hal-0.5.4.tar.gz hal-0.5.4.cvs20051111.tar.gz hal-0.5.5.1.tar.gz +hal-0.5.5.1.cvs20060105.tar.gz Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- hal.spec 10 Dec 2005 16:39:00 -0000 1.69 +++ hal.spec 5 Jan 2006 19:45:23 -0000 1.70 @@ -17,8 +17,8 @@ Summary: Hardware Abstraction Layer Name: hal -Version: 0.5.5.1 -Release: 2.1 +Version: 0.5.5.1.cvs20060105 +Release: 1 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz Patch0: hal-0.5.4-match-on-capabilities.patch @@ -176,6 +176,9 @@ %{_bindir}/hal-device-manager %changelog +* Thu Jan 05 2006 John (J5) Palmieri - 0.5.5.1.cvs20060105-1 +- Build CVS version of HAL which gives us the new mount support + * Fri Dec 09 2005 Jesse Keating - 0.5.5.1-2.1 - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 16 Nov 2005 21:29:11 -0000 1.34 +++ sources 5 Jan 2006 19:45:23 -0000 1.35 @@ -1 +1 @@ -2abd81ed3f5a37789f4fbda2f6a61270 hal-0.5.5.1.tar.gz +0e4564f540d6ecb9fd644b7c4c2c9b42 hal-0.5.5.1.cvs20060105.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 5 19:52:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 14:52:38 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.42, 1.43 libsemanage.spec, 1.60, 1.61 sources, 1.44, 1.45 Message-ID: <200601051952.k05JqcVT014675@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14640 Modified Files: .cvsignore libsemanage.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 5 Jan 2006 16:10:57 -0000 1.42 +++ .cvsignore 5 Jan 2006 19:52:36 -0000 1.43 @@ -44,3 +44,4 @@ libsemanage-1.5.3.tgz libsemanage-1.5.4.tgz libsemanage-1.5.6.tgz +libsemanage-1.5.8.tgz Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- libsemanage.spec 5 Jan 2006 16:21:25 -0000 1.60 +++ libsemanage.spec 5 Jan 2006 19:52:36 -0000 1.61 @@ -1,8 +1,8 @@ -%define libsepolver 1.11.4-1 +%define libsepolver 1.11.5-1 %define libselinuxver 1.29.3-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.5.6 +Version: 1.5.8 Release: 1 License: GPL Group: System Environment/Libraries @@ -75,6 +75,15 @@ %{_mandir}/man3/* %changelog + +* Thu Jan 6 2006 Dan Walsh 1.5.8-1 +- Upgrade to latest from NSA + * Re-applied string and file optimization patch from Russell Coker, + with bug fix. + * Reverted string and file optimization patch from Russell Coker. + * Clarified error messages from parse_module_headers and + parse_base_headers for base/module mismatches. + * Thu Jan 6 2006 Dan Walsh 1.5.6-1 - Upgrade to latest from NSA * Clarified error messages from parse_module_headers and Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 5 Jan 2006 16:10:57 -0000 1.44 +++ sources 5 Jan 2006 19:52:36 -0000 1.45 @@ -1 +1 @@ -9dfb2ab076c882882a5638020bd0140a libsemanage-1.5.6.tgz +af16e7c96d77e58b69edb9fb7ce09417 libsemanage-1.5.8.tgz From fedora-cvs-commits at redhat.com Thu Jan 5 19:43:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 14:43:53 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.77, 1.78 libsepol.spec, 1.100, 1.101 sources, 1.78, 1.79 Message-ID: <200601051943.k05JhrO7031812@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31770 Modified Files: .cvsignore libsepol.spec sources Log Message: * Thu Jan 5 2006 Dan Walsh 1.11.5-1 - Upgrade to latest from NSA * Merged further fixes from Russell Coker, specifically: - av_to_string overflow checking - sepol_context_to_string error handling - hierarchy checking memory leak fixes and optimizations - avrule_block_read variable initialization * Marked deprecated code in genbools and genusers. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- .cvsignore 5 Jan 2006 16:01:15 -0000 1.77 +++ .cvsignore 5 Jan 2006 19:43:51 -0000 1.78 @@ -74,3 +74,4 @@ libsepol-1.11.1.tgz libsepol-1.11.2.tgz libsepol-1.11.4.tgz +libsepol-1.11.5.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- libsepol.spec 5 Jan 2006 16:01:15 -0000 1.100 +++ libsepol.spec 5 Jan 2006 19:43:51 -0000 1.101 @@ -1,6 +1,6 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.11.4 +Version: 1.11.5 Release: 1 License: GPL Group: System Environment/Libraries @@ -80,6 +80,15 @@ %{_includedir}/sepol/policydb/*.h %changelog +* Thu Jan 5 2006 Dan Walsh 1.11.5-1 +- Upgrade to latest from NSA + * Merged further fixes from Russell Coker, specifically: + - av_to_string overflow checking + - sepol_context_to_string error handling + - hierarchy checking memory leak fixes and optimizations + - avrule_block_read variable initialization + * Marked deprecated code in genbools and genusers. + * Thu Jan 5 2006 Dan Walsh 1.11.4-1 - Upgrade to latest from NSA * Merged bugfix for sepol_port_modify from Russell Coker. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- sources 5 Jan 2006 16:01:15 -0000 1.78 +++ sources 5 Jan 2006 19:43:51 -0000 1.79 @@ -1 +1 @@ -2c330bf93f6561decc7f2de511f3a38c libsepol-1.11.4.tgz +a311b9d3efc1f5af209470a0ddfeb8dc libsepol-1.11.5.tgz From fedora-cvs-commits at redhat.com Thu Jan 5 19:43:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 14:43:16 -0500 Subject: rpms/gnome-terminal/devel gnome-terminal-2.13.0-revert-98715.patch, NONE, 1.1 gnome-terminal.spec, 1.23, 1.24 Message-ID: <200601051943.k05JhGWC031456@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31409 Modified Files: gnome-terminal.spec Added Files: gnome-terminal-2.13.0-revert-98715.patch Log Message: * Thu Jan 4 2006 Christopher Aillon 2.13.0-2 - Revert patch from gnome bug 98715 to fix 176029, 176642 gnome-terminal-2.13.0-revert-98715.patch: terminal-screen.c | 29 ++----------- terminal-screen.c.orig |only terminal-screen.h | 2 terminal-window.c | 4 - terminal-window.c.orig |only terminal.c | 109 +++++++------------------------------------------ terminal.h | 3 - 7 files changed, 24 insertions(+), 123 deletions(-) --- NEW FILE gnome-terminal-2.13.0-revert-98715.patch --- diff -r -u gnome-terminal-2.13.0/src/terminal.c gnome-terminal-2.13.0.new/src/terminal.c --- gnome-terminal-2.13.0/src/terminal.c 2005-11-30 23:53:55.000000000 +0200 +++ gnome-terminal-2.13.0.new/src/terminal.c 2005-12-28 14:10:33.000000000 +0200 @@ -44,6 +44,7 @@ #include #include + /* Settings storage works as follows: * /apps/gnome-terminal/global/ * /apps/gnome-terminal/profiles/Foo/ @@ -1381,8 +1382,7 @@ } static int -new_terminal_with_options_and_environ (OptionParsingResults *results, - char **env) +new_terminal_with_options (OptionParsingResults *results) { GList *tmp; @@ -1446,8 +1446,7 @@ it->zoom : 1.0, results->startup_id, results->display_name, - results->screen_number, - env); + results->screen_number); current_window = g_list_last (app->windows)->data; } @@ -1466,8 +1465,7 @@ NULL, it->zoom_set ? it->zoom : 1.0, - NULL, NULL, -1, - env); + NULL, NULL, -1); } if (it->active) @@ -1491,12 +1489,6 @@ return 0; } -static inline int -new_terminal_with_options (OptionParsingResults *results) -{ - return new_terminal_with_options_and_environ (results, NULL); -} - /* This assumes that argv already has room for the args, * and inserts them just after argv[0] */ @@ -1907,8 +1899,7 @@ double zoom, const char *startup_id, const char *display_name, - int screen_number, - char **env) + int screen_number) { gboolean window_created; gboolean screen_created; @@ -1967,9 +1958,6 @@ if (override_command) terminal_screen_set_override_command (screen, override_command); - - if (env) - terminal_screen_set_environ (screen, env); terminal_screen_set_font_scale (screen, zoom); @@ -3676,13 +3664,11 @@ { int argc; char **argv; - char **environ; } NewTerminalEvent; static void handle_new_terminal_event (int argc, - char **argv, - char **env) + char **argv) { int nextopt; poptContext ctx; @@ -3690,7 +3676,7 @@ OptionParsingResults *results; g_assert (initialization_complete); - + results = option_parsing_results_init (&argc, argv); /* Find and parse --display */ @@ -3723,7 +3709,7 @@ option_parsing_results_apply_directory_defaults (results); - new_terminal_with_options_and_environ (results, env); + new_terminal_with_options (results); option_parsing_results_free (results); } @@ -3736,18 +3722,15 @@ GSList *next = pending_new_terminal_events->next; NewTerminalEvent *event = pending_new_terminal_events->data; - handle_new_terminal_event (event->argc, event->argv, event->environ); + handle_new_terminal_event (event->argc, event->argv); g_strfreev (event->argv); - g_strfreev (event->environ); g_free (event); g_slist_free_1 (pending_new_terminal_events); pending_new_terminal_events = next; } } -#define END_ENVIRON "END-ENVIRON" - /* * Invoked remotely to instantiate a terminal with the * given arguments. @@ -3760,11 +3743,8 @@ gpointer user_data) { CORBA_sequence_CORBA_string *args; - char **tmp_strv; char **tmp_argv; - char **tmp_environ; int tmp_argc; - int tmp_lenviron; int i; NewTerminalEvent *event; @@ -3777,60 +3757,19 @@ args = any->_value; - /* the buffer contains [environ] END_ENVIRON [argv] */ - tmp_strv = g_new0 (char*, args->_length); + tmp_argv = g_new0 (char*, args->_length + 1); i = 0; - tmp_lenviron = 0; while (i < args->_length) { - tmp_strv[i] = g_strdup (((const char**)args->_buffer)[i]); - if (i == tmp_lenviron && strcmp (END_ENVIRON, tmp_strv[i])) - tmp_lenviron++; + tmp_argv[i] = g_strdup (((const char**)args->_buffer)[i]); ++i; } + tmp_argv[i] = NULL; + tmp_argc = i; - /* copy argv */ - tmp_argc = i - tmp_lenviron - 1; - tmp_argv = g_new0 (char*, tmp_argc + 1); -#if 0 - g_print ("Got %d argv entries\n", tmp_argc); -#endif - for (i = tmp_lenviron + 1; i < args->_length; i++) - { -#if 0 - g_print ("accessing argv[%d] and strv[%d] (= %s)\n", - i - tmp_lenviron - 1, i, tmp_strv[i]); -#endif - tmp_argv[i - tmp_lenviron - 1] = tmp_strv[i]; - } - tmp_argv[tmp_argc+1] = NULL; -#if 0 - g_print ("---- dumping argv ----\n"); - for (i = 0; i < tmp_argc; i++) - g_print ("%s\n", tmp_argv [i]); - g_print ("---- done ----\n"); -#endif - - /* copy environ */ - tmp_environ = g_new0 (char*, tmp_lenviron + 1); - for (i = 0; i < tmp_lenviron; i++) - { - tmp_environ[i] = tmp_strv[i]; - } -#if 0 - g_print ("---- dumping environ ----\n"); - for (i = 0; i < tmp_lenviron; i++) - g_print ("%s\n", tmp_environ [i]); - g_print ("---- done ----\n"); -#endif - - /* We don't free the strings, just the array */ - g_free (tmp_strv); - event = g_new0 (NewTerminalEvent, 1); event->argc = tmp_argc; event->argv = tmp_argv; - event->environ = tmp_environ; pending_new_terminal_events = g_slist_append (pending_new_terminal_events, event); @@ -3890,9 +3829,7 @@ if (listener != CORBA_OBJECT_NIL) { - extern char **environ; int i; - int lenviron; CORBA_any any; CORBA_sequence_CORBA_string args; CORBA_Environment ev; @@ -3902,26 +3839,12 @@ any._type = TC_CORBA_sequence_CORBA_string; any._value = &args; - lenviron = g_strv_length (environ); - /* we are packing [environ] END [argv] */ - args._length = lenviron + argc + 1; + args._length = argc; args._buffer = g_newa (CORBA_char *, args._length); - /* copy environ into the buffer */ - for (i = 0; i < lenviron; i++) - args._buffer[i] = environ[i]; - args._buffer [lenviron] = END_ENVIRON; - /* copy argv into the buffer */ - for (i = lenviron + 1; i < args._length; i++) - args._buffer [i] = argv [i - lenviron - 1]; - -#if 0 - g_print ("---- dumping array ----\n"); for (i = 0; i < args._length; i++) - g_print ("%s\n", args._buffer [i]); - g_print ("---- done ----\n"); -#endif - + args._buffer [i] = argv [i]; + Bonobo_Listener_event (listener, "new_terminal", &any, &ev); CORBA_Object_release (listener, &ev); if (!BONOBO_EX (&ev)) diff -r -u gnome-terminal-2.13.0/src/terminal.h gnome-terminal-2.13.0.new/src/terminal.h --- gnome-terminal-2.13.0/src/terminal.h 2005-11-30 23:53:55.000000000 +0200 +++ gnome-terminal-2.13.0.new/src/terminal.h 2005-12-28 14:10:33.000000000 +0200 @@ -54,8 +54,7 @@ double zoom, const char *startup_id, const char *display_name, - int screen_number, - char **env); + int screen_number); void terminal_app_manage_profiles (TerminalApp *app, GtkWindow *transient_parent); diff -r -u gnome-terminal-2.13.0/src/terminal-screen.c gnome-terminal-2.13.0.new/src/terminal-screen.c --- gnome-terminal-2.13.0/src/terminal-screen.c 2005-12-28 14:09:59.000000000 +0200 +++ gnome-terminal-2.13.0.new/src/terminal-screen.c 2005-12-28 14:10:33.000000000 +0200 @@ -69,7 +69,6 @@ guint gconf_connection_id; GtkWidget *hbox; GtkWidget *scrollbar; - char **environ; }; static GList* used_ids = NULL; @@ -266,7 +265,6 @@ if (screen->priv->working_dir == NULL) /* shouldn't ever happen */ screen->priv->working_dir = g_strdup (g_get_home_dir ()); screen->priv->child_pid = -1; - screen->priv->environ = NULL; screen->priv->recheck_working_dir_idle = 0; @@ -452,7 +450,6 @@ g_free (screen->priv->matched_string); g_strfreev (screen->priv->override_command); g_free (screen->priv->working_dir); - g_strfreev (screen->priv->environ); g_free (screen->priv); @@ -1103,24 +1100,18 @@ char **p; int i; char **retval; - char **env; #define EXTRA_ENV_VARS 7 profile = screen->priv->profile; - /* if screen->priv->environ is defined, we should use that instead */ - if (screen->priv->environ) - env = screen->priv->environ; - else - env = environ; /* count env vars that are set */ - for (p = env; *p; p++) + for (p = environ; *p; p++) ; - i = p - env; + i = p - environ; retval = g_new (char *, i + 1 + EXTRA_ENV_VARS); - for (i = 0, p = env; *p; p++) + for (i = 0, p = environ; *p; p++) { /* Strip all these out, we'll replace some of them */ if ((strncmp (*p, "COLUMNS=", 8) == 0) || @@ -1233,7 +1224,7 @@ NULL, FALSE, FALSE, FALSE, NULL, NULL, NULL, dir, NULL, 1.0, - NULL, name, -1, NULL); + NULL, name, -1); g_free (name); } @@ -1252,7 +1243,7 @@ NULL, FALSE, FALSE, FALSE, NULL, NULL, NULL, dir, NULL, 1.0, - NULL, NULL, -1, NULL); + NULL, NULL, -1); } static void @@ -1855,16 +1846,6 @@ screen->priv->working_dir = g_strdup (dirname); } -void -terminal_screen_set_environ (TerminalScreen *screen, - char **env) -{ - g_return_if_fail (TERMINAL_IS_SCREEN (screen)); - - g_free (screen->priv->environ); - screen->priv->environ = g_strdupv (env); -} - const char* terminal_screen_get_working_dir (TerminalScreen *screen) { Only in gnome-terminal-2.13.0.new/src: terminal-screen.c.orig diff -r -u gnome-terminal-2.13.0/src/terminal-screen.h gnome-terminal-2.13.0.new/src/terminal-screen.h --- gnome-terminal-2.13.0/src/terminal-screen.h 2005-11-30 23:53:55.000000000 +0200 +++ gnome-terminal-2.13.0.new/src/terminal-screen.h 2005-12-28 14:10:33.000000000 +0200 @@ -106,8 +106,6 @@ void terminal_screen_set_working_dir (TerminalScreen *screen, const char *dirname); -void terminal_screen_set_environ (TerminalScreen *screen, - char **env); const char *terminal_screen_get_working_dir (TerminalScreen *screen); void terminal_screen_set_font_scale (TerminalScreen *screen, diff -r -u gnome-terminal-2.13.0/src/terminal-window.c gnome-terminal-2.13.0.new/src/terminal-window.c --- gnome-terminal-2.13.0/src/terminal-window.c 2005-12-01 00:03:02.000000000 +0200 +++ gnome-terminal-2.13.0.new/src/terminal-window.c 2005-12-28 14:10:33.000000000 +0200 @@ -2215,7 +2215,7 @@ screen, FALSE, FALSE, FALSE, NULL, NULL, NULL, dir, NULL, 1.0, - NULL, name, -1, NULL); + NULL, name, -1); } static void @@ -2241,7 +2241,7 @@ NULL, FALSE, FALSE, FALSE, NULL, NULL, NULL, dir, NULL, 1.0, - NULL, NULL, -1, NULL); + NULL, NULL, -1); } } Only in gnome-terminal-2.13.0.new/src: terminal-window.c.orig Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gnome-terminal.spec 15 Dec 2005 14:39:10 -0000 1.23 +++ gnome-terminal.spec 5 Jan 2006 19:43:13 -0000 1.24 @@ -13,11 +13,12 @@ Summary: GNOME Terminal Name: gnome-terminal Version: 2.13.0 -Release: 1 +Release: 2 URL: http://www.gnome.org/ Source0: gnome-terminal-%{version}.tar.bz2 Source1: ne.po Patch0: gnome-terminal-2.12.0-inputmethod.patch +Patch1: gnome-terminal-2.13.0-revert-98715.patch License: GPL Group: User Interface/Desktops @@ -53,6 +54,7 @@ %setup -q cp ${RPM_SOURCE_DIR}/ne.po po %patch0 -p1 -b .inputmethod +%patch1 -p1 -b .revert-98715 %build @@ -102,6 +104,9 @@ %{_datadir}/application-registry/gnome-terminal.applications %changelog +* Thu Jan 4 2006 Christopher Aillon 2.13.0-2 +- Revert patch from gnome bug 98715 to fix 176029, 176642 + * Thu Dec 15 2005 Matthias Clasen 2.13.0-1 - Update to 2.13.0 From fedora-cvs-commits at redhat.com Thu Jan 5 19:48:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 14:48:21 -0500 Subject: rpms/gnome-panel/devel gnome-panel-2.12.1-rename-system-menu.patch, 1.1, 1.2 Message-ID: <200601051948.k05JmLRd012609@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12480 Modified Files: gnome-panel-2.12.1-rename-system-menu.patch Log Message: Keep the source-changing parts of this patch gnome-panel-2.12.1-rename-system-menu.patch: panel-menu-items.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: gnome-panel-2.12.1-rename-system-menu.patch =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.12.1-rename-system-menu.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-panel-2.12.1-rename-system-menu.patch 1 Nov 2005 17:25:03 -0000 1.1 +++ gnome-panel-2.12.1-rename-system-menu.patch 5 Jan 2006 19:48:17 -0000 1.2 @@ -1,851 +1,3 @@ ---- gnome-panel-2.12.1/po/sq.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/sq.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1678,7 +1678,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Hap??sir?? Pune" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/te.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/te.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1594,7 +1594,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/cy.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/cy.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1703,7 +1703,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Penbwrdd" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/hi.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/hi.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1659,7 +1659,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/bs.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/bs.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1692,7 +1692,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/id.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/id.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1664,7 +1664,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/fa.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/fa.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1661,7 +1661,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/ru.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/ru.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1678,7 +1678,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "?????????? GNOME" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/no.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/no.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1668,7 +1668,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Skrivebordsmilj??" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/ko.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/ko.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1651,7 +1651,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/yi.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/yi.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1593,7 +1593,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/eu.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/eu.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1677,7 +1677,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Mahaigaina" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/ca.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/ca.po 2005-11-01 12:07:05.000000000 -0500 -@@ -1693,8 +1693,8 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" --msgstr "Escriptori" -+msgid "System" -+msgstr "Sistema" - - #: ../gnome-panel/panel-menu-items.c:1003 - msgid "Cannot launch entry" -@@ -6320,9 +6320,6 @@ - #~ msgid "User" - #~ msgstr "Usuari" - --#~ msgid "System" --#~ msgstr "Sistema" -- - #~ msgid "Nice" - #~ msgstr "Prioritat" - ---- gnome-panel-2.12.1/po/pt.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/pt.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1679,7 +1679,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??rea de Trabalho" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/es.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/es.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1670,7 +1670,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Escritorio" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/wa.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/wa.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1681,7 +1681,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/ta.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/ta.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1854,7 +1854,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - # gsm/logout.c:240 ---- gnome-panel-2.12.1/po/sr.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/sr.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1684,7 +1684,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/vi.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/vi.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1668,7 +1668,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "M??n h??nh n???n" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/sr at ije.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/sr at ije.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1713,7 +1713,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/ar.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/ar.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1664,7 +1664,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/it.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/it.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1713,7 +1713,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - # credo stia per "menu entry", quindi... ---- gnome-panel-2.12.1/po/sk.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/sk.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1664,7 +1664,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Pracovn?? prostredie" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/lt.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/lt.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1661,7 +1661,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Aplinka" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/el.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/el.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1730,7 +1730,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "?????????????????? ????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/pl.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/pl.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1677,7 +1677,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??rodowisko" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/sl.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/sl.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1656,7 +1656,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Namizje" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/ro.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/ro.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1678,7 +1678,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/bg.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/bg.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1686,7 +1686,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "?????????????? ??????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/pt_BR.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/pt_BR.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1710,7 +1710,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/tr.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/tr.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1664,7 +1664,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Masa??st??" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/or.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/or.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1679,7 +1679,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/xh.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/xh.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1714,7 +1714,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:843 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: ../gnome-panel/panel-menu-items.c:984 ---- gnome-panel-2.12.1/po/mr.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/mr.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1661,7 +1661,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/da.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/da.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1683,7 +1683,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Skrivebord" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/be.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/be.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1647,7 +1647,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:811 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/zu.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/zu.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1703,7 +1703,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/fi.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/fi.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1924,7 +1924,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Ty??p??yt??" - - # gnome-panel/launcher.c:152 ---- gnome-panel-2.12.1/po/nn.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/nn.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1868,7 +1868,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - # gsm/logout.c:239 ---- gnome-panel-2.12.1/po/he.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/he.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1633,7 +1633,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:899 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "?????????? ??????????" - - #: ../gnome-panel/panel-menu-items.c:1040 ---- gnome-panel-2.12.1/po/hr.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/hr.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1701,7 +1701,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/gu.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/gu.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1641,7 +1641,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/li.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/li.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1768,7 +1768,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/ku.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/ku.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1543,7 +1543,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Pergal" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/hy.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/hy.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1613,7 +1613,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "???????????????????????? ???????????? ??????????????????????????????????????????? ??????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/sv.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/sv.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1706,7 +1706,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:809 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Skrivbord" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/pa.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/pa.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1635,7 +1635,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "???????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/af.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/af.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1727,7 +1727,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/mi.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/mi.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1553,7 +1553,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/th.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/th.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1626,7 +1626,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????????????" - - #: gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/ja.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/ja.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1680,7 +1680,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/ga.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/ga.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1608,7 +1608,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/sr at Latn.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/sr at Latn.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1684,7 +1684,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Okru??enje" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/az.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/az.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1687,7 +1687,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/am.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/am.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1618,7 +1618,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/bn.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/bn.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1691,7 +1691,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/nb.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/nb.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1668,7 +1668,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Skrivebordsmilj??" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/mn.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/mn.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1638,7 +1638,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/nl.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/nl.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1719,7 +1719,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Werkplek" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/mk.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/mk.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1680,7 +1680,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/en_GB.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/en_GB.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1490,7 +1490,7 @@ - #. Translators: Desktop is used here as in "Desktop Environment" (this - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:855 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - #: ../gnome-panel/panel-menu-items.c:996 ---- gnome-panel-2.12.1/po/uk.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/uk.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1656,7 +1656,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/en_CA.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/en_CA.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1656,7 +1656,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - #: gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/nso.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/nso.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1750,7 +1750,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/ms.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/ms.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1656,7 +1656,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/cs.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/cs.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1668,7 +1668,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Prost??ed??" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/gl.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/gl.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1688,7 +1688,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Escritorio" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/hu.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/hu.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1691,7 +1691,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "K??rnyezet" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/ml.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/ml.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1634,7 +1634,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/fr.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/fr.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1708,7 +1708,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Bureau" - - #: gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/lv.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/lv.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1753,7 +1753,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/de.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/de.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1727,7 +1727,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "System" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/zh_TW.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/zh_TW.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1629,7 +1629,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/eo.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/eo.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1747,7 +1747,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.12.1/po/et.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/et.po 2005-11-01 12:06:42.000000000 -0500 -@@ -1626,7 +1626,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "T????laud" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.12.1/po/zh_CN.po.rename-system-menu 2005-11-01 12:06:34.000000000 -0500 -+++ gnome-panel-2.12.1/po/zh_CN.po 2005-11-01 12:06:43.000000000 -0500 -@@ -1616,7 +1616,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??????" - - #: ../gnome-panel/panel-menu-items.c:1003 --- gnome-panel-2.12.1/gnome-panel/panel-menu-items.c.rename-system-menu 2005-11-01 12:05:53.000000000 -0500 +++ gnome-panel-2.12.1/gnome-panel/panel-menu-items.c 2005-11-01 12:06:26.000000000 -0500 @@ -928,7 +928,7 @@ From fedora-cvs-commits at redhat.com Thu Jan 5 19:51:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 14:51:58 -0500 Subject: rpms/gnome-panel/devel gnome-panel-2.13.2-rename-system-menu.patch, 1.1, 1.2 gnome-panel.spec, 1.101, 1.102 Message-ID: <200601051951.k05Jpw76014337@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14264 Modified Files: gnome-panel-2.13.2-rename-system-menu.patch gnome-panel.spec Log Message: 2.13.4 gnome-panel-2.13.2-rename-system-menu.patch: panel-menu-items.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: gnome-panel-2.13.2-rename-system-menu.patch =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel-2.13.2-rename-system-menu.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-panel-2.13.2-rename-system-menu.patch 2 Dec 2005 14:53:10 -0000 1.1 +++ gnome-panel-2.13.2-rename-system-menu.patch 5 Jan 2006 19:51:55 -0000 1.2 @@ -1,848 +1,11 @@ ---- gnome-panel-2.13.2/po/af.po.rename-system-menu 2005-12-02 09:46:12.000000000 -0500 -+++ gnome-panel-2.13.2/po/af.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1727,7 +1727,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" +--- gnome-panel-2.12.1/gnome-panel/panel-menu-items.c.rename-system-menu 2005-11-01 12:05:53.000000000 -0500 ++++ gnome-panel-2.12.1/gnome-panel/panel-menu-items.c 2005-11-01 12:06:26.000000000 -0500 +@@ -928,7 +928,7 @@ + /* Translators: Desktop is used here as in "Desktop Environment" (this + * is not the Desktop folder). Do not keep "Desktop Environment|" in + * the translation. */ +- accel_label = gtk_accel_label_new (Q_("Desktop Environment|Desktop")); ++ accel_label = gtk_accel_label_new (_("System")); + gtk_misc_set_alignment (GTK_MISC (accel_label), 0.0, 0.5); - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/am.po.rename-system-menu 2005-12-02 09:46:12.000000000 -0500 -+++ gnome-panel-2.13.2/po/am.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1618,7 +1618,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/ar.po.rename-system-menu 2005-12-02 09:46:12.000000000 -0500 -+++ gnome-panel-2.13.2/po/ar.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1664,7 +1664,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/az.po.rename-system-menu 2005-12-02 09:46:12.000000000 -0500 -+++ gnome-panel-2.13.2/po/az.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1687,7 +1687,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/be.po.rename-system-menu 2005-12-02 09:46:12.000000000 -0500 -+++ gnome-panel-2.13.2/po/be.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1647,7 +1647,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:811 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/bg.po.rename-system-menu 2005-12-02 09:46:12.000000000 -0500 -+++ gnome-panel-2.13.2/po/bg.po 2005-12-02 09:49:09.000000000 -0500 -@@ -1686,7 +1686,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:938 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "?????????????? ??????????" - - #: ../gnome-panel/panel-menu-items.c:1079 ---- gnome-panel-2.13.2/po/bn.po.rename-system-menu 2005-12-02 09:46:12.000000000 -0500 -+++ gnome-panel-2.13.2/po/bn.po 2005-12-02 09:49:31.000000000 -0500 -@@ -1667,7 +1667,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:938 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????????? ??????????????????|?????????????????????" - - #: ../gnome-panel/panel-menu-items.c:1079 ---- gnome-panel-2.13.2/po/bs.po.rename-system-menu 2005-12-02 09:46:12.000000000 -0500 -+++ gnome-panel-2.13.2/po/bs.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1692,7 +1692,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/ca.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/ca.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1693,8 +1693,8 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" --msgstr "Escriptori" -+msgid "System" -+msgstr "Sistema" - - #: ../gnome-panel/panel-menu-items.c:1003 - msgid "Cannot launch entry" -@@ -6320,9 +6320,6 @@ - #~ msgid "User" - #~ msgstr "Usuari" - --#~ msgid "System" --#~ msgstr "Sistema" -- - #~ msgid "Nice" - #~ msgstr "Prioritat" - ---- gnome-panel-2.13.2/po/cs.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/cs.po 2005-12-02 09:49:49.000000000 -0500 -@@ -1667,7 +1667,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:940 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Prost??ed??" - - #: ../gnome-panel/panel-menu-items.c:1081 ---- gnome-panel-2.13.2/po/cy.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/cy.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1703,7 +1703,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Penbwrdd" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/da.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/da.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1683,7 +1683,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Skrivebord" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/de.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/de.po 2005-12-02 09:47:56.000000000 -0500 -@@ -1727,7 +1727,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "System" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/el.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/el.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1730,7 +1730,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "?????????????????? ????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/en_CA.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/en_CA.po 2005-12-02 09:50:10.000000000 -0500 -@@ -1656,7 +1656,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-items.c:940 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - #: gnome-panel/panel-menu-items.c:1081 ---- gnome-panel-2.13.2/po/en_GB.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/en_GB.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1490,7 +1490,7 @@ - #. Translators: Desktop is used here as in "Desktop Environment" (this - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:855 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - #: ../gnome-panel/panel-menu-items.c:996 ---- gnome-panel-2.13.2/po/eo.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/eo.po 2005-12-02 09:47:56.000000000 -0500 -@@ -1747,7 +1747,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/es.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/es.po 2005-12-02 09:50:26.000000000 -0500 -@@ -1706,7 +1706,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:940 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Escritorio" - - #: ../gnome-panel/panel-menu-items.c:1081 ---- gnome-panel-2.13.2/po/et.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/et.po 2005-12-02 09:50:39.000000000 -0500 -@@ -1627,7 +1627,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:938 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "T????laud" - - #: ../gnome-panel/panel-menu-items.c:1079 ---- gnome-panel-2.13.2/po/eu.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/eu.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1677,7 +1677,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Mahaigaina" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/fa.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/fa.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1661,7 +1661,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/fi.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/fi.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1924,7 +1924,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Ty??p??yt??" - - # gnome-panel/launcher.c:152 ---- gnome-panel-2.13.2/po/fr.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/fr.po 2005-12-02 09:47:56.000000000 -0500 -@@ -1708,7 +1708,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Bureau" - - #: gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/ga.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/ga.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1608,7 +1608,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/gl.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/gl.po 2005-12-02 09:47:56.000000000 -0500 -@@ -1688,7 +1688,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Escritorio" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/gu.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/gu.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1641,7 +1641,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/he.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/he.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1633,7 +1633,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:899 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "?????????? ??????????" - - #: ../gnome-panel/panel-menu-items.c:1040 ---- gnome-panel-2.13.2/po/hi.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/hi.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1659,7 +1659,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/hr.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/hr.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1701,7 +1701,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/hu.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/hu.po 2005-12-02 09:47:56.000000000 -0500 -@@ -1691,7 +1691,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "K??rnyezet" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/hy.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/hy.po 2005-12-02 09:50:54.000000000 -0500 -@@ -1693,7 +1693,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:938 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??????????????????????" - - #: ../gnome-panel/panel-menu-items.c:1079 ---- gnome-panel-2.13.2/po/id.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/id.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1664,7 +1664,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/it.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/it.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1713,7 +1713,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - # credo stia per "menu entry", quindi... ---- gnome-panel-2.13.2/po/ja.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/ja.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1680,7 +1680,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/ko.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/ko.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1651,7 +1651,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/ku.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/ku.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1543,7 +1543,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Pergal" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/li.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/li.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1768,7 +1768,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/lt.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/lt.po 2005-12-02 09:51:07.000000000 -0500 -@@ -1662,7 +1662,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:940 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Aplinka" - - #: ../gnome-panel/panel-menu-items.c:1081 ---- gnome-panel-2.13.2/po/lv.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/lv.po 2005-12-02 09:47:56.000000000 -0500 -@@ -1753,7 +1753,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/mi.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/mi.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1553,7 +1553,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/mk.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/mk.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1680,7 +1680,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/ml.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/ml.po 2005-12-02 09:47:56.000000000 -0500 -@@ -1634,7 +1634,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/mn.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/mn.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1638,7 +1638,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/mr.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/mr.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1661,7 +1661,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/ms.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/ms.po 2005-12-02 09:47:56.000000000 -0500 -@@ -1656,7 +1656,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/nb.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/nb.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1668,7 +1668,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Skrivebordsmilj??" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/nl.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/nl.po 2005-12-02 09:51:18.000000000 -0500 -@@ -1719,7 +1719,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:938 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Werkplek" - - #: ../gnome-panel/panel-menu-items.c:1079 ---- gnome-panel-2.13.2/po/nn.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/nn.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1868,7 +1868,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - # gsm/logout.c:239 ---- gnome-panel-2.13.2/po/no.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/no.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1668,7 +1668,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Skrivebordsmilj??" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/nso.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/nso.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1750,7 +1750,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/or.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/or.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1679,7 +1679,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/pa.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/pa.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1635,7 +1635,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "???????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/pl.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/pl.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1677,7 +1677,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??rodowisko" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/pt_BR.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/pt_BR.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1710,7 +1710,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/pt.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/pt.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1679,7 +1679,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??rea de Trabalho" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/ro.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/ro.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1678,7 +1678,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Desktop" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/ru.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/ru.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1678,7 +1678,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "?????????? GNOME" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/sk.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/sk.po 2005-12-02 09:51:36.000000000 -0500 -@@ -1663,7 +1663,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:940 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Pracovn?? prostredie" - - #: ../gnome-panel/panel-menu-items.c:1081 ---- gnome-panel-2.13.2/po/sl.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/sl.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1656,7 +1656,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Namizje" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/sq.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/sq.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1678,7 +1678,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Hap??sir?? Pune" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/sr at ije.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/sr at ije.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1713,7 +1713,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/sr at Latn.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/sr at Latn.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1684,7 +1684,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Okru??enje" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/sr.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/sr.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1684,7 +1684,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/sv.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/sv.po 2005-12-02 09:51:49.000000000 -0500 -@@ -1706,7 +1706,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:937 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Skrivbord" - - #: ../gnome-panel/panel-menu-items.c:1078 ---- gnome-panel-2.13.2/po/ta.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/ta.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1854,7 +1854,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - # gsm/logout.c:240 ---- gnome-panel-2.13.2/po/te.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/te.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1594,7 +1594,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/th.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/th.po 2005-12-02 09:52:05.000000000 -0500 -@@ -1625,7 +1625,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-items.c:940 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????????????" - - #: gnome-panel/panel-menu-items.c:1081 ---- gnome-panel-2.13.2/po/tr.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/tr.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1664,7 +1664,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "Masa??st??" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/uk.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/uk.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1656,7 +1656,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "????????????????????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/vi.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/vi.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1668,7 +1668,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "M??n h??nh n???n" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/wa.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/wa.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1681,7 +1681,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/xh.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/xh.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1714,7 +1714,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:843 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: ../gnome-panel/panel-menu-items.c:984 ---- gnome-panel-2.13.2/po/yi.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/yi.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1593,7 +1593,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 ---- gnome-panel-2.13.2/po/zh_CN.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/zh_CN.po 2005-12-02 09:47:56.000000000 -0500 -@@ -1616,7 +1616,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/zh_TW.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/zh_TW.po 2005-12-02 09:47:56.000000000 -0500 -@@ -1629,7 +1629,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: ../gnome-panel/panel-menu-items.c:862 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "??????" - - #: ../gnome-panel/panel-menu-items.c:1003 ---- gnome-panel-2.13.2/po/zu.po.rename-system-menu 2005-12-02 09:46:13.000000000 -0500 -+++ gnome-panel-2.13.2/po/zu.po 2005-12-02 09:47:55.000000000 -0500 -@@ -1703,7 +1703,7 @@ - #. * is not the Desktop folder). Do not keep "Desktop Environment|" in - #. * the translation. - #: gnome-panel/panel-menu-bar.c:795 --msgid "Desktop Environment|Desktop" -+msgid "System" - msgstr "" - - #: gnome-panel/panel-object.schemas.in.h:1 + gtk_container_add (GTK_CONTAINER (menuitem), accel_label); Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- gnome-panel.spec 21 Dec 2005 21:16:54 -0000 1.101 +++ gnome-panel.spec 5 Jan 2006 19:51:55 -0000 1.102 @@ -15,8 +15,8 @@ Summary: GNOME panel Name: gnome-panel -Version: 2.13.3 -Release: 3 +Version: 2.13.4 +Release: 1 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2 Source1: redhat-panel-default-setup.entries @@ -59,6 +59,7 @@ Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch # http://bugzilla.gnome.org/show_bug.cgi?id=319077 Patch3: gnome-panel-2.12.1-close.patch +Patch4: gnome-panel-2.13.2-rename-system-menu.patch Patch5: gnome-panel-2.12.1-about-fedora.patch Patch6: gnome-panel-2.13.3-fix-crash.patch @@ -85,6 +86,7 @@ %patch1 -p1 -b .remove-screenshot-menuitem %patch2 -p1 -b .speak-to-us-ye-old-wise-fish %patch3 -p1 -b .close +%patch4 -p1 -b .rename-system-menu %patch5 -p1 -b .about-fedora %patch6 -p1 -b .fix-crash cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries @@ -197,6 +199,10 @@ %{_datadir}/gtk-doc %changelog +* Thu Jan 5 2006 Matthias Clasen 2.13.4-1 +- Update to 2.13.4 +- reinstate the desktop-menu-renaming + * Wed Dec 21 2005 Ray Strode 2.13.3-3 - add patch from cvs to fix crasher bug From fedora-cvs-commits at redhat.com Thu Jan 5 17:50:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 12:50:15 -0500 Subject: rpms/docbook-utils/devel docbook-utils.spec,1.17,1.18 Message-ID: <200601051750.k05HoFRC031808@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/docbook-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31774 Modified Files: docbook-utils.spec Log Message: * Thu Jan 5 2006 Tim Waugh 0.6.14-5 - Move dvi and ps tools into pdf sub-package (bug #174897). Index: docbook-utils.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-utils/devel/docbook-utils.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- docbook-utils.spec 9 Dec 2005 22:40:15 -0000 1.17 +++ docbook-utils.spec 5 Jan 2006 17:50:13 -0000 1.18 @@ -1,6 +1,6 @@ Name: docbook-utils Version: 0.6.14 -Release: 4.1 +Release: 5 Group: Applications/Text Summary: Shell scripts for managing DocBook documents. @@ -12,9 +12,7 @@ Requires: docbook-dtds Requires: perl-SGMLSpm >= 1.03ii Requires: which -Requires: tetex-dvips Requires: elinks -Requires: jadetex BuildRoot: %{_tmppath}/%{name}-%{version} BuildRequires: perl-SGMLSpm, openjade, docbook-style-dsssl @@ -37,6 +35,7 @@ %package pdf Requires: jadetex >= 2.5 Requires: docbook-utils = %{version} +Requires: tetex-dvips Group: Applications/Text Obsoletes: stylesheets-db2pdf Provides: stylesheets-db2pdf @@ -80,17 +79,13 @@ %defattr (-,root,root) %doc README COPYING TODO %{_bindir}/jw -%{_bindir}/docbook2dvi %{_bindir}/docbook2html %{_bindir}/docbook2man -%{_bindir}/docbook2ps %{_bindir}/docbook2rtf %{_bindir}/docbook2tex %{_bindir}/docbook2texi %{_bindir}/docbook2txt -%{_bindir}/db2dvi %{_bindir}/db2html -%{_bindir}/db2ps %{_bindir}/db2rtf %{_bindir}/sgmldiff /usr/share/sgml/docbook/utils-%{version} @@ -98,9 +93,7 @@ %{_mandir}/*/db2html.* %{_mandir}/*/db2ps.* %{_mandir}/*/db2rtf.* -%{_mandir}/*/docbook2dvi.* %{_mandir}/*/docbook2html.* -%{_mandir}/*/docbook2ps.* %{_mandir}/*/docbook2rtf.* %{_mandir}/*/docbook2man.* %{_mandir}/*/docbook2tex.* @@ -112,11 +105,20 @@ %files pdf %defattr (-,root,root) %{_bindir}/docbook2pdf +%{_bindir}/docbook2dvi +%{_bindir}/docbook2ps +%{_bindir}/db2dvi %{_bindir}/db2pdf +%{_bindir}/db2ps %{_mandir}/*/db2pdf.* %{_mandir}/*/docbook2pdf.* +%{_mandir}/*/docbook2dvi.* +%{_mandir}/*/docbook2ps.* %changelog +* Thu Jan 5 2006 Tim Waugh 0.6.14-5 +- Move dvi and ps tools into pdf sub-package (bug #174897). + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 5 16:26:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 11:26:36 -0500 Subject: rpms/eclipse/FC-4 eclipse.spec,1.169,1.170 Message-ID: <200601051626.k05GQahW000930@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv917 Modified Files: eclipse.spec Log Message: 2005 -> 2006 Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse.spec,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- eclipse.spec 5 Jan 2006 16:26:10 -0000 1.169 +++ eclipse.spec 5 Jan 2006 16:26:33 -0000 1.170 @@ -1267,7 +1267,7 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1 %changelog -* Thu Jan 05 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.12 +* Thu Jan 05 2006 Andrew Overholt 3.1.1-1jpp_1fc.FC4.12 - Rebuild with new gjdoc (rh#161147). * Mon Dec 19 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.11 From fedora-cvs-commits at redhat.com Thu Jan 5 16:26:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 11:26:12 -0500 Subject: rpms/eclipse/FC-4 eclipse.spec,1.168,1.169 Message-ID: <200601051626.k05GQCuV000888@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv875 Modified Files: eclipse.spec Log Message: * Thu Jan 05 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.12 - Rebuild with new gjdoc (rh#161147). Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/FC-4/eclipse.spec,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- eclipse.spec 19 Dec 2005 22:03:17 -0000 1.168 +++ eclipse.spec 5 Jan 2006 16:26:10 -0000 1.169 @@ -23,7 +23,7 @@ Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 1jpp_1fc.FC4.11 +Release: 1jpp_1fc.FC4.12 License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1267,6 +1267,9 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1 %changelog +* Thu Jan 05 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.12 +- Rebuild with new gjdoc (rh#161147). + * Mon Dec 19 2005 Andrew Overholt 3.1.1-1jpp_1fc.FC4.11 - Update patch for offline javadoc linking. - Rebuild with new gjdoc (rh#161147). From fedora-cvs-commits at redhat.com Thu Jan 5 16:21:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 11:21:28 -0500 Subject: rpms/libsemanage/devel libsemanage.spec,1.59,1.60 Message-ID: <200601051621.k05GLSSP002951@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31947 Modified Files: libsemanage.spec Log Message: * Thu Jan 6 2006 Dan Walsh 1.5.6-1 - Upgrade to latest from NSA * Clarified error messages from parse_module_headers and parse_base_headers for base/module mismatches. * Merged string and file optimization patch from Russell Coker. * Merged swig header reordering patch from Ivan Gyurdiev. * Merged toggle modify on add patch from Ivan Gyurdiev. * Merged ports parser bugfix patch from Ivan Gyurdiev. * Merged fcontext swig patch from Ivan Gyurdiev. * Merged remove add/modify/delete for active booleans patch from Ivan Gyurdiev. * Merged man pages for dbase functions patch from Ivan Gyurdiev. * Merged pywrap tests patch from Ivan Gyurdiev. Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- libsemanage.spec 5 Jan 2006 16:15:55 -0000 1.59 +++ libsemanage.spec 5 Jan 2006 16:21:25 -0000 1.60 @@ -72,6 +72,7 @@ %defattr(-,root,root) %{_libdir}/libsemanage.a %{_includedir}/semanage/*.h +%{_mandir}/man3/* %changelog * Thu Jan 6 2006 Dan Walsh 1.5.6-1 From fedora-cvs-commits at redhat.com Thu Jan 5 16:15:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 11:15:58 -0500 Subject: rpms/libsemanage/devel libsemanage.spec,1.58,1.59 Message-ID: <200601051615.k05GFwgK030292@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29938 Modified Files: libsemanage.spec Log Message: * Thu Jan 6 2006 Dan Walsh 1.5.6-1 - Upgrade to latest from NSA * Clarified error messages from parse_module_headers and parse_base_headers for base/module mismatches. * Merged string and file optimization patch from Russell Coker. * Merged swig header reordering patch from Ivan Gyurdiev. * Merged toggle modify on add patch from Ivan Gyurdiev. * Merged ports parser bugfix patch from Ivan Gyurdiev. * Merged fcontext swig patch from Ivan Gyurdiev. * Merged remove add/modify/delete for active booleans patch from Ivan Gyurdiev. * Merged man pages for dbase functions patch from Ivan Gyurdiev. * Merged pywrap tests patch from Ivan Gyurdiev. Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- libsemanage.spec 5 Jan 2006 16:10:57 -0000 1.58 +++ libsemanage.spec 5 Jan 2006 16:15:55 -0000 1.59 @@ -7,7 +7,6 @@ License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz -Patch: libsemanage-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} @@ -40,7 +39,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make clean From fedora-cvs-commits at redhat.com Thu Jan 5 16:11:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 11:11:00 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.41, 1.42 libsemanage-rhat.patch, 1.6, 1.7 libsemanage.spec, 1.57, 1.58 sources, 1.43, 1.44 Message-ID: <200601051611.k05GB0FJ023508@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23479 Modified Files: .cvsignore libsemanage-rhat.patch libsemanage.spec sources Log Message: * Thu Jan 6 2006 Dan Walsh 1.5.6-1 - Upgrade to latest from NSA * Clarified error messages from parse_module_headers and parse_base_headers for base/module mismatches. * Merged string and file optimization patch from Russell Coker. * Merged swig header reordering patch from Ivan Gyurdiev. * Merged toggle modify on add patch from Ivan Gyurdiev. * Merged ports parser bugfix patch from Ivan Gyurdiev. * Merged fcontext swig patch from Ivan Gyurdiev. * Merged remove add/modify/delete for active booleans patch from Ivan Gyurdiev. * Merged man pages for dbase functions patch from Ivan Gyurdiev. * Merged pywrap tests patch from Ivan Gyurdiev. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 4 Jan 2006 18:13:08 -0000 1.41 +++ .cvsignore 5 Jan 2006 16:10:57 -0000 1.42 @@ -43,3 +43,4 @@ libsemanage-1.5.2.tgz libsemanage-1.5.3.tgz libsemanage-1.5.4.tgz +libsemanage-1.5.6.tgz libsemanage-rhat.patch: database_llist.c | 1 + 1 files changed, 1 insertion(+) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 libsemanage-rhat.patch Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libsemanage-rhat.patch 2 Jan 2006 12:56:28 -0000 1.6 +++ libsemanage-rhat.patch 5 Jan 2006 16:10:57 -0000 1.7 @@ -1,6616 +1,11 @@ -diff --exclude-from=exclude -N -u -r nsalibsemanage/include/semanage/semanage.h libsemanage-1.5.3/include/semanage/semanage.h ---- nsalibsemanage/include/semanage/semanage.h 2005-11-04 15:37:49.000000000 -0500 -+++ libsemanage-1.5.3/include/semanage/semanage.h 2005-12-27 10:56:24.000000000 -0500 -@@ -32,9 +32,7 @@ - #include - #include - #include --#if 0 - #include --#endif +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/database_llist.c libsemanage-1.5.4/src/database_llist.c +--- nsalibsemanage/src/database_llist.c 2006-01-04 12:18:17.000000000 -0500 ++++ libsemanage-1.5.4/src/database_llist.c 2006-01-04 16:26:39.000000000 -0500 +@@ -136,6 +136,7 @@ + if (dbase_llist_cache_prepend(handle, dbase, data) < 0) + goto err; - /* Dbase */ - #include -@@ -42,10 +40,8 @@ - #include - #include - #include --#if 0 - #include - #include --#endif - #include - #include - -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libsemanage-1.5.3/src/libsemanage.map ---- nsalibsemanage/src/libsemanage.map 2005-11-08 14:48:37.000000000 -0500 -+++ libsemanage-1.5.3/src/libsemanage.map 2005-12-27 10:56:26.000000000 -0500 -@@ -10,6 +10,6 @@ - semanage_module_get_version; semanage_select_store; - semanage_reload_policy; semanage_set_reload; - semanage_user_*; semanage_bool_*; semanage_seuser_*; -- semanage_iface_*; semanage_context_*; -+ semanage_iface_*; semanage_port_*; semanage_context_*; - local: *; - }; -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/policy_components.c libsemanage-1.5.3/src/policy_components.c ---- nsalibsemanage/src/policy_components.c 2005-12-13 11:18:11.000000000 -0500 -+++ libsemanage-1.5.3/src/policy_components.c 2005-12-27 10:56:28.000000000 -0500 -@@ -127,10 +127,10 @@ - - { semanage_user_dbase_local(handle), - semanage_user_dbase_policy(handle), MODE_MODIFY }, --#if 0 -+ - { semanage_port_dbase_local(handle), - semanage_port_dbase_policy(handle), MODE_MODIFY }, --#endif -+ - { semanage_iface_dbase_local(handle), - semanage_iface_dbase_policy(handle), MODE_MODIFY }, - -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/port_record.c libsemanage-1.5.3/src/port_record.c ---- nsalibsemanage/src/port_record.c 2005-12-14 14:16:47.000000000 -0500 -+++ libsemanage-1.5.3/src/port_record.c 2005-12-27 10:56:29.000000000 -0500 -@@ -17,24 +17,6 @@ - #include "handle.h" - #include "database.h" - --/* FIXME: Remove when sepol port interface is stabilized and exported. */ --#define sepol_port_compare(port, key) -1 --#define sepol_port_key_create(handle, low, high, proto, key) -1 --#define sepol_port_key_extract(handle, port, key) -1 --#define sepol_port_key_free(key) --#define sepol_port_get_proto(port) -1 --#define sepol_port_set_proto(port, proto) --#define sepol_port_get_proto_str(port) NULL --#define sepol_port_get_low(port) -1 --#define sepol_port_get_high(port) -1 --#define sepol_port_set_port(port, num) --#define sepol_port_set_range(port, low, high) --#define sepol_port_get_con(port) NULL --#define sepol_port_set_con(port, con) --#define sepol_port_create(handle, port) -1 --#define sepol_port_clone(handle, port1, port2) -1 --#define sepol_port_free(port) -- - /* Key */ - int semanage_port_compare( - semanage_port_t* port, -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/ports_policydb.c libsemanage-1.5.3/src/ports_policydb.c ---- nsalibsemanage/src/ports_policydb.c 2005-12-14 14:16:47.000000000 -0500 -+++ libsemanage-1.5.3/src/ports_policydb.c 2005-12-27 10:56:31.000000000 -0500 -@@ -16,13 +16,6 @@ - #include "debug.h" - #include "database_policydb.h" - --/* FIXME: Remove when sepol port interface is stabilized and exported. */ --#define sepol_port_modify NULL --#define sepol_port_query NULL --#define sepol_port_count NULL --#define sepol_port_exists NULL --#define sepol_port_iterate NULL -- - /* PORT RECORD (SEPOL): POLICYDB extension : method table */ - record_policydb_table_t SEMANAGE_PORT_POLICYDB_RTABLE = { - .add = NULL, -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.py libsemanage-1.5.3/src/semanage.py ---- nsalibsemanage/src/semanage.py 2005-12-06 13:36:45.000000000 -0500 -+++ libsemanage-1.5.3/src/semanage.py 2005-12-27 10:59:08.000000000 -0500 -@@ -44,28 +44,6 @@ - semanage_port_by_idx = _semanage.semanage_port_by_idx - - char_by_idx = _semanage.char_by_idx -- --semanage_bool_key_create = _semanage.semanage_bool_key_create -- --semanage_bool_key_extract = _semanage.semanage_bool_key_extract -- --semanage_bool_key_free = _semanage.semanage_bool_key_free -- --semanage_bool_compare = _semanage.semanage_bool_compare -- --semanage_bool_get_name = _semanage.semanage_bool_get_name -- --semanage_bool_set_name = _semanage.semanage_bool_set_name -- --semanage_bool_get_value = _semanage.semanage_bool_get_value -- --semanage_bool_set_value = _semanage.semanage_bool_set_value -- --semanage_bool_create = _semanage.semanage_bool_create -- --semanage_bool_clone = _semanage.semanage_bool_clone -- --semanage_bool_free = _semanage.semanage_bool_free - SEMANAGE_MSG_ERR = _semanage.SEMANAGE_MSG_ERR - SEMANAGE_MSG_WARN = _semanage.SEMANAGE_MSG_WARN - SEMANAGE_MSG_INFO = _semanage.SEMANAGE_MSG_INFO -@@ -78,34 +56,6 @@ - - semanage_msg_set_callback = _semanage.semanage_msg_set_callback - --semanage_iface_query = _semanage.semanage_iface_query -- --semanage_iface_exists = _semanage.semanage_iface_exists -- --semanage_iface_count = _semanage.semanage_iface_count -- --semanage_iface_iterate = _semanage.semanage_iface_iterate -- --semanage_iface_list = _semanage.semanage_iface_list -- --semanage_bool_add_local = _semanage.semanage_bool_add_local -- --semanage_bool_modify_local = _semanage.semanage_bool_modify_local -- --semanage_bool_set_local = _semanage.semanage_bool_set_local -- --semanage_bool_del_local = _semanage.semanage_bool_del_local -- --semanage_bool_query_local = _semanage.semanage_bool_query_local -- --semanage_bool_exists_local = _semanage.semanage_bool_exists_local -- --semanage_bool_count_local = _semanage.semanage_bool_count_local -- --semanage_bool_iterate_local = _semanage.semanage_bool_iterate_local -- --semanage_bool_list_local = _semanage.semanage_bool_list_local -- - semanage_handle_create = _semanage.semanage_handle_create - - semanage_handle_destroy = _semanage.semanage_handle_destroy -@@ -148,43 +98,53 @@ - - semanage_module_get_version = _semanage.semanage_module_get_version - --semanage_user_key_create = _semanage.semanage_user_key_create -+semanage_context_get_user = _semanage.semanage_context_get_user - --semanage_user_key_extract = _semanage.semanage_user_key_extract -+semanage_context_set_user = _semanage.semanage_context_set_user - --semanage_user_key_free = _semanage.semanage_user_key_free -+semanage_context_get_role = _semanage.semanage_context_get_role - --semanage_user_compare = _semanage.semanage_user_compare -+semanage_context_set_role = _semanage.semanage_context_set_role - --semanage_user_get_name = _semanage.semanage_user_get_name -+semanage_context_get_type = _semanage.semanage_context_get_type - --semanage_user_set_name = _semanage.semanage_user_set_name -+semanage_context_set_type = _semanage.semanage_context_set_type - [...6234 lines suppressed...] -+ { (char *)"semanage_port_compare", _wrap_semanage_port_compare, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_key_create", _wrap_semanage_port_key_create, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_key_extract", _wrap_semanage_port_key_extract, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_key_free", _wrap_semanage_port_key_free, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_get_proto", _wrap_semanage_port_get_proto, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_set_proto", _wrap_semanage_port_set_proto, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_get_proto_str", _wrap_semanage_port_get_proto_str, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_get_low", _wrap_semanage_port_get_low, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_get_high", _wrap_semanage_port_get_high, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_set_port", _wrap_semanage_port_set_port, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_set_range", _wrap_semanage_port_set_range, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_get_con", _wrap_semanage_port_get_con, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_set_con", _wrap_semanage_port_set_con, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_create", _wrap_semanage_port_create, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_clone", _wrap_semanage_port_clone, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_free", _wrap_semanage_port_free, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_add_local", _wrap_semanage_port_add_local, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_modify_local", _wrap_semanage_port_modify_local, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_set_local", _wrap_semanage_port_set_local, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_del_local", _wrap_semanage_port_del_local, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_query_local", _wrap_semanage_port_query_local, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_exists_local", _wrap_semanage_port_exists_local, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_count_local", _wrap_semanage_port_count_local, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_iterate_local", _wrap_semanage_port_iterate_local, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_list_local", _wrap_semanage_port_list_local, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_query", _wrap_semanage_port_query, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_exists", _wrap_semanage_port_exists, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_count", _wrap_semanage_port_count, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_iterate", _wrap_semanage_port_iterate, METH_VARARGS, NULL}, -+ { (char *)"semanage_port_list", _wrap_semanage_port_list, METH_VARARGS, NULL}, - { (char *)"semanage_seuser_key_create", _wrap_semanage_seuser_key_create, METH_VARARGS, NULL}, - { (char *)"semanage_seuser_key_extract", _wrap_semanage_seuser_key_extract, METH_VARARGS, NULL}, - { (char *)"semanage_seuser_key_free", _wrap_semanage_seuser_key_free, METH_VARARGS, NULL}, -@@ -5626,37 +6524,6 @@ - { (char *)"semanage_seuser_create", _wrap_semanage_seuser_create, METH_VARARGS, NULL}, - { (char *)"semanage_seuser_clone", _wrap_semanage_seuser_clone, METH_VARARGS, NULL}, - { (char *)"semanage_seuser_free", _wrap_semanage_seuser_free, METH_VARARGS, NULL}, -- { (char *)"semanage_user_add_local", _wrap_semanage_user_add_local, METH_VARARGS, NULL}, -- { (char *)"semanage_user_modify_local", _wrap_semanage_user_modify_local, METH_VARARGS, NULL}, -- { (char *)"semanage_user_set_local", _wrap_semanage_user_set_local, METH_VARARGS, NULL}, -- { (char *)"semanage_user_del_local", _wrap_semanage_user_del_local, METH_VARARGS, NULL}, -- { (char *)"semanage_user_query_local", _wrap_semanage_user_query_local, METH_VARARGS, NULL}, -- { (char *)"semanage_user_exists_local", _wrap_semanage_user_exists_local, METH_VARARGS, NULL}, -- { (char *)"semanage_user_count_local", _wrap_semanage_user_count_local, METH_VARARGS, NULL}, -- { (char *)"semanage_user_iterate_local", _wrap_semanage_user_iterate_local, METH_VARARGS, NULL}, -- { (char *)"semanage_user_list_local", _wrap_semanage_user_list_local, METH_VARARGS, NULL}, -- { (char *)"semanage_context_get_user", _wrap_semanage_context_get_user, METH_VARARGS, NULL}, -- { (char *)"semanage_context_set_user", _wrap_semanage_context_set_user, METH_VARARGS, NULL}, -- { (char *)"semanage_context_get_role", _wrap_semanage_context_get_role, METH_VARARGS, NULL}, -- { (char *)"semanage_context_set_role", _wrap_semanage_context_set_role, METH_VARARGS, NULL}, -- { (char *)"semanage_context_get_type", _wrap_semanage_context_get_type, METH_VARARGS, NULL}, -- { (char *)"semanage_context_set_type", _wrap_semanage_context_set_type, METH_VARARGS, NULL}, -- { (char *)"semanage_context_get_mls", _wrap_semanage_context_get_mls, METH_VARARGS, NULL}, -- { (char *)"semanage_context_set_mls", _wrap_semanage_context_set_mls, METH_VARARGS, NULL}, -- { (char *)"semanage_context_create", _wrap_semanage_context_create, METH_VARARGS, NULL}, -- { (char *)"semanage_context_clone", _wrap_semanage_context_clone, METH_VARARGS, NULL}, -- { (char *)"semanage_context_free", _wrap_semanage_context_free, METH_VARARGS, NULL}, -- { (char *)"semanage_context_from_string", _wrap_semanage_context_from_string, METH_VARARGS, NULL}, -- { (char *)"semanage_context_to_string", _wrap_semanage_context_to_string, METH_VARARGS, NULL}, -- { (char *)"semanage_iface_add_local", _wrap_semanage_iface_add_local, METH_VARARGS, NULL}, -- { (char *)"semanage_iface_modify_local", _wrap_semanage_iface_modify_local, METH_VARARGS, NULL}, -- { (char *)"semanage_iface_set_local", _wrap_semanage_iface_set_local, METH_VARARGS, NULL}, -- { (char *)"semanage_iface_del_local", _wrap_semanage_iface_del_local, METH_VARARGS, NULL}, -- { (char *)"semanage_iface_query_local", _wrap_semanage_iface_query_local, METH_VARARGS, NULL}, -- { (char *)"semanage_iface_exists_local", _wrap_semanage_iface_exists_local, METH_VARARGS, NULL}, -- { (char *)"semanage_iface_count_local", _wrap_semanage_iface_count_local, METH_VARARGS, NULL}, -- { (char *)"semanage_iface_iterate_local", _wrap_semanage_iface_iterate_local, METH_VARARGS, NULL}, -- { (char *)"semanage_iface_list_local", _wrap_semanage_iface_list_local, METH_VARARGS, NULL}, - { (char *)"semanage_seuser_add", _wrap_semanage_seuser_add, METH_VARARGS, NULL}, - { (char *)"semanage_seuser_modify", _wrap_semanage_seuser_modify, METH_VARARGS, NULL}, - { (char *)"semanage_seuser_set", _wrap_semanage_seuser_set, METH_VARARGS, NULL}, -@@ -5666,26 +6533,22 @@ - { (char *)"semanage_seuser_count", _wrap_semanage_seuser_count, METH_VARARGS, NULL}, - { (char *)"semanage_seuser_iterate", _wrap_semanage_seuser_iterate, METH_VARARGS, NULL}, - { (char *)"semanage_seuser_list", _wrap_semanage_seuser_list, METH_VARARGS, NULL}, -- { (char *)"semanage_user_query", _wrap_semanage_user_query, METH_VARARGS, NULL}, -- { (char *)"semanage_user_exists", _wrap_semanage_user_exists, METH_VARARGS, NULL}, -- { (char *)"semanage_user_count", _wrap_semanage_user_count, METH_VARARGS, NULL}, -- { (char *)"semanage_user_iterate", _wrap_semanage_user_iterate, METH_VARARGS, NULL}, -- { (char *)"semanage_user_list", _wrap_semanage_user_list, METH_VARARGS, NULL}, - { NULL, NULL, 0, NULL } - }; - - - /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ - --static swig_type_info _swigt__p_f_p_struct_semanage_bool_p_void__int[] = {{"_p_f_p_struct_semanage_bool_p_void__int", 0, "int (*)(struct semanage_bool *,void *)|int (*)(semanage_bool_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_bool_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_f_p_struct_semanage_iface_p_void__int[] = {{"_p_f_p_struct_semanage_iface_p_void__int", 0, "int (*)(struct semanage_iface *,void *)|int (*)(semanage_iface_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_iface_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_f_p_struct_semanage_bool_p_void__int[] = {{"_p_f_p_struct_semanage_bool_p_void__int", 0, "int (*)(struct semanage_bool *,void *)|int (*)(semanage_bool_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_bool_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_p_char[] = {{"_p_p_p_char", 0, "char ***", 0, 0, 0, 0},{"_p_p_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_char[] = {{"_p_p_char", 0, "char **", 0, 0, 0, 0},{"_p_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_f_p_struct_semanage_user_p_void__int[] = {{"_p_f_p_struct_semanage_user_p_void__int", 0, "int (*)(struct semanage_user *,void *)|int (*)(semanage_user_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_user_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_semanage_port_key[] = {{"_p_semanage_port_key", 0, "struct semanage_port_key *|semanage_port_key_t *", 0, 0, 0, 0},{"_p_semanage_port_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_p_semanage_port_key[] = {{"_p_p_semanage_port_key", 0, "struct semanage_port_key **|semanage_port_key_t **", 0, 0, 0, 0},{"_p_p_semanage_port_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_f_p_struct_semanage_port_p_void__int[] = {{"_p_f_p_struct_semanage_port_p_void__int", 0, "int (*)(struct semanage_port *,void *)|int (*)(semanage_port_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_port_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_f_p_struct_semanage_seuser_p_void__int[] = {{"_p_f_p_struct_semanage_seuser_p_void__int", 0, "int (*)(struct semanage_seuser *,void *)|int (*)(semanage_seuser_t *,void *)", 0, 0, 0, 0},{"_p_f_p_struct_semanage_seuser_p_void__int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; --static swig_type_info _swigt__p_p_semanage_port_t[] = {{"_p_p_semanage_port_t", 0, "semanage_port_t **", 0, 0, 0, 0},{"_p_p_semanage_port_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; --static swig_type_info _swigt__p_semanage_port_t[] = {{"_p_semanage_port_t", 0, "semanage_port_t *", 0, 0, 0, 0},{"_p_semanage_port_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_semanage_seuser[] = {{"_p_p_semanage_seuser", 0, "struct semanage_seuser **|semanage_seuser_t **", 0, 0, 0, 0},{"_p_p_semanage_seuser", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_semanage_seuser[] = {{"_p_semanage_seuser", 0, "struct semanage_seuser *|semanage_seuser_t *", 0, 0, 0, 0},{"_p_semanage_seuser", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_p_semanage_seuser[] = {{"_p_p_p_semanage_seuser", 0, "struct semanage_seuser ***|semanage_seuser_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_seuser", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -@@ -5697,37 +6560,41 @@ - static swig_type_info _swigt__p_size_t[] = {{"_p_size_t", 0, "size_t *", 0, 0, 0, 0},{"_p_size_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__size_t[] = {{"_size_t", 0, "size_t", 0, 0, 0, 0},{"_size_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_p_semanage_user[] = {{"_p_p_p_semanage_user", 0, "struct semanage_user ***|semanage_user_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_user", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; --static swig_type_info _swigt__p_semanage_seuser_key[] = {{"_p_semanage_seuser_key", 0, "struct semanage_seuser_key *|semanage_seuser_key_t *", 0, 0, 0, 0},{"_p_semanage_seuser_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_semanage_user_key[] = {{"_p_p_semanage_user_key", 0, "struct semanage_user_key **|semanage_user_key_t **", 0, 0, 0, 0},{"_p_p_semanage_user_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_semanage_user_key[] = {{"_p_semanage_user_key", 0, "struct semanage_user_key *|semanage_user_key_t *", 0, 0, 0, 0},{"_p_semanage_user_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_semanage_seuser_key[] = {{"_p_semanage_seuser_key", 0, "struct semanage_seuser_key *|semanage_seuser_key_t *", 0, 0, 0, 0},{"_p_semanage_seuser_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_semanage_seuser_key[] = {{"_p_p_semanage_seuser_key", 0, "struct semanage_seuser_key **|semanage_seuser_key_t **", 0, 0, 0, 0},{"_p_p_semanage_seuser_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; --static swig_type_info _swigt__p_semanage_iface[] = {{"_p_semanage_iface", 0, "struct semanage_iface *|semanage_iface_t *", 0, 0, 0, 0},{"_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_p_semanage_iface[] = {{"_p_p_p_semanage_iface", 0, "struct semanage_iface ***|semanage_iface_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_semanage_iface[] = {{"_p_p_semanage_iface", 0, "struct semanage_iface **|semanage_iface_t **", 0, 0, 0, 0},{"_p_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; --static swig_type_info _swigt__p_semanage_bool_key[] = {{"_p_semanage_bool_key", 0, "struct semanage_bool_key *|semanage_bool_key_t *", 0, 0, 0, 0},{"_p_semanage_bool_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_semanage_iface[] = {{"_p_semanage_iface", 0, "struct semanage_iface *|semanage_iface_t *", 0, 0, 0, 0},{"_p_semanage_iface", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_semanage_bool_key[] = {{"_p_p_semanage_bool_key", 0, "struct semanage_bool_key **|semanage_bool_key_t **", 0, 0, 0, 0},{"_p_p_semanage_bool_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_semanage_bool_key[] = {{"_p_semanage_bool_key", 0, "struct semanage_bool_key *|semanage_bool_key_t *", 0, 0, 0, 0},{"_p_semanage_bool_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_unsigned_int[] = {{"_p_unsigned_int", 0, "unsigned int *", 0, 0, 0, 0},{"_p_unsigned_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; --static swig_type_info _swigt__p_semanage_context[] = {{"_p_semanage_context", 0, "struct semanage_context *|semanage_context_t *", 0, 0, 0, 0},{"_p_semanage_context", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_semanage_context[] = {{"_p_p_semanage_context", 0, "struct semanage_context **|semanage_context_t **", 0, 0, 0, 0},{"_p_p_semanage_context", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; --static swig_type_info _swigt__p_p_semanage_module_info[] = {{"_p_p_semanage_module_info", 0, "struct semanage_module_info **|semanage_module_info_t **", 0, 0, 0, 0},{"_p_p_semanage_module_info", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_semanage_context[] = {{"_p_semanage_context", 0, "struct semanage_context *|semanage_context_t *", 0, 0, 0, 0},{"_p_semanage_context", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_semanage_module_info[] = {{"_p_semanage_module_info", 0, "struct semanage_module_info *|semanage_module_info_t *", 0, 0, 0, 0},{"_p_semanage_module_info", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_p_semanage_module_info[] = {{"_p_p_semanage_module_info", 0, "struct semanage_module_info **|semanage_module_info_t **", 0, 0, 0, 0},{"_p_p_semanage_module_info", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_semanage_iface_key[] = {{"_p_p_semanage_iface_key", 0, "struct semanage_iface_key **|semanage_iface_key_t **", 0, 0, 0, 0},{"_p_p_semanage_iface_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_semanage_iface_key[] = {{"_p_semanage_iface_key", 0, "struct semanage_iface_key *|semanage_iface_key_t *", 0, 0, 0, 0},{"_p_semanage_iface_key", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void[] = {{"_p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void", 0, "void (*)(void *,struct semanage_handle *,char const *,...)|void (*)(void *,semanage_handle_t *,char const *,...)", 0, 0, 0, 0},{"_p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__ptrdiff_t[] = {{"_ptrdiff_t", 0, "ptrdiff_t", 0, 0, 0, 0},{"_ptrdiff_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_p_semanage_port[] = {{"_p_p_semanage_port", 0, "struct semanage_port **|semanage_port_t **", 0, 0, 0, 0},{"_p_p_semanage_port", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_semanage_port[] = {{"_p_semanage_port", 0, "struct semanage_port *|semanage_port_t *", 0, 0, 0, 0},{"_p_semanage_port", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -+static swig_type_info _swigt__p_p_p_semanage_port[] = {{"_p_p_p_semanage_port", 0, "struct semanage_port ***|semanage_port_t ***", 0, 0, 0, 0},{"_p_p_p_semanage_port", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_int[] = {{"_p_int", 0, "int *", 0, 0, 0, 0},{"_p_int", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_semanage_handle[] = {{"_p_semanage_handle", 0, "struct semanage_handle *|semanage_handle_t *", 0, 0, 0, 0},{"_p_semanage_handle", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - - static swig_type_info *swig_types_initial[] = { --_swigt__p_f_p_struct_semanage_bool_p_void__int, - _swigt__p_f_p_struct_semanage_iface_p_void__int, -+_swigt__p_f_p_struct_semanage_bool_p_void__int, - _swigt__p_p_p_char, - _swigt__p_char, - _swigt__p_p_char, - _swigt__p_f_p_struct_semanage_user_p_void__int, -+_swigt__p_semanage_port_key, -+_swigt__p_p_semanage_port_key, -+_swigt__p_f_p_struct_semanage_port_p_void__int, - _swigt__p_f_p_struct_semanage_seuser_p_void__int, --_swigt__p_p_semanage_port_t, --_swigt__p_semanage_port_t, - _swigt__p_p_semanage_seuser, - _swigt__p_semanage_seuser, - _swigt__p_p_p_semanage_seuser, -@@ -5739,24 +6606,27 @@ - _swigt__p_size_t, - _swigt__size_t, - _swigt__p_p_p_semanage_user, --_swigt__p_semanage_seuser_key, - _swigt__p_p_semanage_user_key, - _swigt__p_semanage_user_key, -+_swigt__p_semanage_seuser_key, - _swigt__p_p_semanage_seuser_key, --_swigt__p_semanage_iface, - _swigt__p_p_p_semanage_iface, - _swigt__p_p_semanage_iface, --_swigt__p_semanage_bool_key, -+_swigt__p_semanage_iface, - _swigt__p_p_semanage_bool_key, -+_swigt__p_semanage_bool_key, - _swigt__p_unsigned_int, --_swigt__p_semanage_context, - _swigt__p_p_semanage_context, --_swigt__p_p_semanage_module_info, -+_swigt__p_semanage_context, - _swigt__p_semanage_module_info, -+_swigt__p_p_semanage_module_info, - _swigt__p_p_semanage_iface_key, - _swigt__p_semanage_iface_key, - _swigt__p_f_p_void_p_struct_semanage_handle_p_q_const__char_v_______void, - _swigt__ptrdiff_t, -+_swigt__p_p_semanage_port, -+_swigt__p_semanage_port, -+_swigt__p_p_p_semanage_port, - _swigt__p_int, - _swigt__p_semanage_handle, - 0 -@@ -6130,5 +7000,11 @@ - { - PyDict_SetItemString(d,"SEMANAGE_CON_POLSERV_REMOTE", SWIG_From_int((int)(SEMANAGE_CON_POLSERV_REMOTE))); - } -+ { -+ PyDict_SetItemString(d,"SEMANAGE_PROTO_UDP", SWIG_From_int((int)(0))); -+ } -+ { -+ PyDict_SetItemString(d,"SEMANAGE_PROTO_TCP", SWIG_From_int((int)(1))); -+ } - } ++ dbase->modified = 1; + return STATUS_SUCCESS; + err: Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- libsemanage.spec 4 Jan 2006 18:39:06 -0000 1.57 +++ libsemanage.spec 5 Jan 2006 16:10:57 -0000 1.58 @@ -1,12 +1,13 @@ -%define libsepolver 1.11.2-2 +%define libsepolver 1.11.4-1 %define libselinuxver 1.29.3-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.5.4 +Version: 1.5.6 Release: 1 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz +Patch: libsemanage-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} @@ -39,6 +40,7 @@ %prep %setup -q +%patch -p1 -b .rhat %build make clean @@ -74,6 +76,22 @@ %{_includedir}/semanage/*.h %changelog +* Thu Jan 6 2006 Dan Walsh 1.5.6-1 +- Upgrade to latest from NSA + * Clarified error messages from parse_module_headers and + parse_base_headers for base/module mismatches. + * Merged string and file optimization patch from Russell Coker. + * Merged swig header reordering patch from Ivan Gyurdiev. + * Merged toggle modify on add patch from Ivan Gyurdiev. + * Merged ports parser bugfix patch from Ivan Gyurdiev. + * Merged fcontext swig patch from Ivan Gyurdiev. + * Merged remove add/modify/delete for active booleans patch from Ivan Gyurdiev. + * Merged man pages for dbase functions patch from Ivan Gyurdiev. + * Merged pywrap tests patch from Ivan Gyurdiev. + +* Wed Jan 5 2006 Dan Walsh 1.5.4-2 +- Patch to fix add + * Wed Jan 5 2006 Dan Walsh 1.5.4-1 - Upgrade to latest from NSA * Merged patch series from Ivan Gyurdiev. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 4 Jan 2006 18:13:08 -0000 1.43 +++ sources 5 Jan 2006 16:10:57 -0000 1.44 @@ -1 +1 @@ -13530deff7aae519ffa9cf2f6c2ac466 libsemanage-1.5.4.tgz +9dfb2ab076c882882a5638020bd0140a libsemanage-1.5.6.tgz From fedora-cvs-commits at redhat.com Thu Jan 5 20:12:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 15:12:38 -0500 Subject: rpms/gnome-panel/devel .cvsignore, 1.35, 1.36 gnome-panel.spec, 1.102, 1.103 sources, 1.35, 1.36 Message-ID: <200601052012.k05KCcdU021426@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21377 Modified Files: .cvsignore gnome-panel.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 15 Dec 2005 05:38:27 -0000 1.35 +++ .cvsignore 5 Jan 2006 20:12:35 -0000 1.36 @@ -5,3 +5,4 @@ gnome-panel-2.12.0.tar.bz2 gnome-panel-2.13.2.tar.bz2 gnome-panel-2.13.3.tar.bz2 +gnome-panel-2.13.4.tar.bz2 Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- gnome-panel.spec 5 Jan 2006 19:51:55 -0000 1.102 +++ gnome-panel.spec 5 Jan 2006 20:12:35 -0000 1.103 @@ -57,11 +57,8 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=311036 Patch1: gnome-panel-2.12.1-remove-screenshot-menuitem.patch Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=319077 -Patch3: gnome-panel-2.12.1-close.patch Patch4: gnome-panel-2.13.2-rename-system-menu.patch Patch5: gnome-panel-2.12.1-about-fedora.patch -Patch6: gnome-panel-2.13.3-fix-crash.patch %description The GNOME panel provides the window list, workspace switcher, menus, and other @@ -85,10 +82,8 @@ %patch0 -p1 -b .vendor %patch1 -p1 -b .remove-screenshot-menuitem %patch2 -p1 -b .speak-to-us-ye-old-wise-fish -%patch3 -p1 -b .close %patch4 -p1 -b .rename-system-menu %patch5 -p1 -b .about-fedora -%patch6 -p1 -b .fix-crash cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 15 Dec 2005 05:38:27 -0000 1.35 +++ sources 5 Jan 2006 20:12:35 -0000 1.36 @@ -1 +1 @@ -55d8339ee3414533ce5cef1166bc1318 gnome-panel-2.13.3.tar.bz2 +0470b5005716660966d39fb4a6299e24 gnome-panel-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 5 20:50:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 15:50:42 -0500 Subject: rpms/evolution-data-server/devel evolution-data-server-1.2.0-validatehelo.patch, NONE, 1.1 evolution-data-server.spec, 1.76, 1.77 Message-ID: <200601052050.k05Kogkd011382@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11367 Modified Files: evolution-data-server.spec Added Files: evolution-data-server-1.2.0-validatehelo.patch Log Message: * Thu Jan 5 2006 David Malcolm - 1.5.4-2 - added patch from David Woodhouse to validate reverse DNS domain before using in SMTP greeting (patch 103, #151121) evolution-data-server-1.2.0-validatehelo.patch: camel-smtp-transport.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 46 insertions(+), 2 deletions(-) --- NEW FILE evolution-data-server-1.2.0-validatehelo.patch --- --- evolution-data-server-1.2.0/camel/providers/smtp/camel-smtp-transport.c~ 2005-01-24 09:16:34.000000000 -0700 +++ evolution-data-server-1.2.0/camel/providers/smtp/camel-smtp-transport.c 2005-03-16 09:23:30.000000000 -0700 @@ -875,6 +875,39 @@ smtp_set_exception (CamelSmtpTransport * } } +static gboolean smtp_helo_is_valid(char *name) +{ + enum { ALNUM, DASH, DOT } state = DOT; + int dotseen = 0; + + while (*name) { + switch(state) { + case ALNUM: + if (*name == '-') { + state = DASH; + break; + } else if (*name == '.') { + dotseen = 1; + state = DOT; + break; + } /* else ... */ + case DOT: + case DASH: + if (!isalnum(*name)) + return FALSE; + state = ALNUM; + break; + } + name++; + } + + /* If it didn't end with an alphanumeric character, or there were no dots, it's invalid */ + if (state != ALNUM || !dotseen) + return FALSE; + else + return TRUE; +} + static gboolean smtp_helo (CamelSmtpTransport *transport, CamelException *ex) { @@ -896,8 +929,19 @@ smtp_helo (CamelSmtpTransport *transport camel_operation_start_transient (NULL, _("SMTP Greeting")); - /* force name resolution first, fallback to numerical, we need to know when it falls back */ - if (camel_getnameinfo(transport->localaddr, transport->localaddrlen, &name, NULL, NI_NAMEREQD, NULL) != 0) { + /* force name resolution first, but check the resulting name is valid according to RFC2821 */ + if (camel_getnameinfo(transport->localaddr, transport->localaddrlen, &name, NULL, NI_NAMEREQD, NULL) == 0 && + !smtp_helo_is_valid(name)) { + g_free(name); + name = NULL; + } + /* camel_getnameinfo() can return an empty string on failure, bizarrely */ + if (name && !*name) { + g_free(name); + name = NULL; + } + /* If the name lookup failed, or the name wasn't acceptable, then try to use a numeric HELO domain */ + if (!name) { if (camel_getnameinfo(transport->localaddr, transport->localaddrlen, &name, NULL, NI_NUMERICHOST, NULL) != 0) name = g_strdup("localhost.localdomain"); else { Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- evolution-data-server.spec 3 Jan 2006 20:56:28 -0000 1.76 +++ evolution-data-server.spec 5 Jan 2006 20:50:40 -0000 1.77 @@ -20,7 +20,7 @@ Summary: Backend data server for evolution Name: evolution-data-server Version: 1.5.4 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 @@ -36,6 +36,7 @@ Patch98: evolution-1.4.4-ldap-x86_64-hack.patch Patch101: evolution-data-server-1.2.2-fix_open_calendar_declaration.patch Patch102: evolution-data-server-1.3.8-fix-implicit-function-declarations +Patch103: evolution-data-server-1.2.0-validatehelo.patch # Leak fixes by Mark G. Adams Patch200: gb-309079-attach-48376.patch @@ -111,6 +112,7 @@ %patch98 -p1 -b .ldaphack %patch101 -p1 -b .fix_open_calendar_declaration %patch102 -p1 -b .fix-implicit-function-declarations +%patch103 -p1 -b .validatehelo %patch200 -p0 -b .fix-uid-leak %patch201 -p0 -b .fix-comp-ref-leak @@ -228,6 +230,10 @@ %changelog +* Thu Jan 5 2006 David Malcolm - 1.5.4-2 +- added patch from David Woodhouse to validate reverse DNS domain before using + in SMTP greeting (patch 103, #151121) + * Tue Jan 3 2006 David Malcolm - 1.5.4-1 - 1.5.4 From fedora-cvs-commits at redhat.com Fri Jan 6 01:04:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 20:04:25 -0500 Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.9, 1.10 policy-20060104.patch, 1.2, 1.3 selinux-policy.spec, 1.76, 1.77 Message-ID: <200601060104.k0614PdF021519@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21472 Modified Files: modules-targeted.conf policy-20060104.patch selinux-policy.spec Log Message: * Thu Jan 5 2006 Dan Walsh 2.1.7-3 - Handle new location of hal scripts Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- modules-targeted.conf 5 Jan 2006 21:54:11 -0000 1.9 +++ modules-targeted.conf 6 Jan 2006 01:03:59 -0000 1.10 @@ -114,6 +114,13 @@ rpm = base # Layer: admin +# Module: readahead +# +# Readahead, read files into page cache for improved performance +# +readahead = base + +# Layer: admin # Module: kudzu # # Hardware detection and configuration tools @@ -174,7 +181,14 @@ # # Rotate and archive system logs # -logrotate = off +logrotate = base + +# Layer: admin +# Module: ddcprobe +# +# ddcprobe retrieves monitor and graphics card information +# +ddcprobe = module # Layer: admin # Module: quota @@ -198,6 +212,13 @@ sudo = off # Layer: admin +# Module: vbetool +# +# run real-mode video BIOS code to alter hardware state +# +vbetool = module + +# Layer: admin # Module: firstboot # # Final system configuration run during the first boot @@ -304,6 +325,13 @@ canna = base # Layer: services +# Module: i18n_input +# +# IIIMF htt server +# +i18n_input = module + +# Layer: services # Module: uucp # # Unix to Unix Copy @@ -362,6 +390,13 @@ howl = base # Layer: services +# Module: timidity +# +# MIDI to WAV converter and player configured as a service +# +timidity = module + +# Layer: services # Module: postgresql # # PostgreSQL relational database @@ -369,6 +404,13 @@ postgresql = base # Layer: services +# Module: openct +# +# Service for handling smart card readers. +# +openct = module + +# Layer: services # Module: snmp # # Simple network management protocol services @@ -559,6 +601,13 @@ ppp = base # Layer: services +# Module: smartmon +# +# Smart disk monitoring daemon policy +# +smartmon = module + +# Layer: services # Module: ftp # # File transfer protocol service @@ -636,6 +685,13 @@ apache = base # Layer: services +# Module: slrnpull +# +# Service for downloading news feeds the slrn newsreader. +# +slrnpull = module + +# Layer: services # Module: rsync # # Fast incremental file transfer for synchronization policy-20060104.patch: Makefile | 2 Rules.modular | 10 config/appconfig-strict-mcs/default_type | 6 config/appconfig-strict-mls/default_type | 7 config/appconfig-strict-mls/initrc_context | 2 config/appconfig-targeted-mcs/default_type | 2 config/appconfig-targeted-mls/default_type | 2 config/appconfig-targeted-mls/initrc_context | 2 man/man8/ftpd_selinux.8 | 56 ++++ man/man8/httpd_selinux.8 | 123 ++++++++ man/man8/kerberos_selinux.8 | 31 ++ man/man8/named_selinux.8 | 29 ++ man/man8/nfs_selinux.8 | 30 ++ man/man8/nis_selinux.8 | 1 man/man8/rsync_selinux.8 | 41 ++ man/man8/samba_selinux.8 | 60 ++++ man/man8/ypbind_selinux.8 | 19 + policy/global_tunables | 3 policy/mcs | 321 ++++------------------- policy/mls | 371 +++++---------------------- policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 9 policy/modules/admin/logrotate.te | 4 policy/modules/admin/rpm.fc | 1 policy/modules/admin/rpm.te | 19 - policy/modules/admin/su.if | 2 policy/modules/admin/tmpreaper.te | 3 policy/modules/admin/usermanage.te | 15 - policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 + policy/modules/apps/java.te | 25 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.te | 6 policy/modules/kernel/corenetwork.te.in | 12 policy/modules/kernel/devices.fc | 9 policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.fc | 27 + policy/modules/kernel/files.if | 17 + policy/modules/kernel/kernel.if | 3 policy/modules/kernel/kernel.te | 30 +- policy/modules/kernel/mls.te | 9 policy/modules/kernel/selinux.te | 2 policy/modules/kernel/storage.fc | 46 +-- policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 9 policy/modules/services/bind.if | 19 + policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 3 policy/modules/services/cups.te | 7 policy/modules/services/cvs.fc | 2 policy/modules/services/cvs.te | 6 policy/modules/services/dbus.te | 1 policy/modules/services/dovecot.te | 2 policy/modules/services/hal.fc | 1 policy/modules/services/hal.te | 4 policy/modules/services/ldap.te | 4 policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 103 +++++++ policy/modules/services/mta.te | 13 policy/modules/services/nscd.te | 1 policy/modules/services/ntp.te | 2 policy/modules/services/ppp.te | 4 policy/modules/services/prelink.fc | 7 policy/modules/services/prelink.if | 39 ++ policy/modules/services/prelink.te | 64 ++++ policy/modules/services/remotelogin.te | 1 policy/modules/services/samba.if | 3 policy/modules/services/sasl.te | 8 policy/modules/services/sendmail.te | 36 -- policy/modules/services/ssh.te | 10 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 12 policy/modules/system/authlogin.te | 1 policy/modules/system/getty.te | 3 policy/modules/system/hostname.if | 15 + policy/modules/system/hostname.te | 37 -- policy/modules/system/init.if | 14 + policy/modules/system/init.te | 22 + policy/modules/system/iptables.te | 2 policy/modules/system/libraries.fc | 126 ++++----- policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 2 policy/modules/system/logging.fc | 7 policy/modules/system/logging.if | 21 + policy/modules/system/logging.te | 5 policy/modules/system/lvm.te | 2 policy/modules/system/mount.te | 2 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 11 policy/modules/system/udev.fc | 1 policy/modules/system/udev.te | 4 policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.te | 13 policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 43 +++ policy/modules/system/userdomain.te | 17 + policy/users | 8 103 files changed, 1410 insertions(+), 789 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- policy-20060104.patch 5 Jan 2006 21:54:11 -0000 1.2 +++ policy-20060104.patch 6 Jan 2006 01:04:01 -0000 1.3 @@ -2230,6 +2230,14 @@ init_use_fd(dovecot_t) init_use_script_pty(dovecot_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.1.7/policy/modules/services/hal.fc +--- nsaserefpolicy/policy/modules/services/hal.fc 2005-11-14 18:24:07.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/hal.fc 2006-01-05 19:44:40.000000000 -0500 +@@ -7,3 +7,4 @@ + /usr/sbin/hald -- gen_context(system_u:object_r:hald_exec_t,s0) + + /usr/share/hal/device-manager/hal-device-manager -- gen_context(system_u:object_r:bin_t,s0) ++/usr/share/hal/scripts(/.*)? gen_context(system_u:object_r:bin_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.7/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2005-12-14 10:38:50.000000000 -0500 +++ serefpolicy-2.1.7/policy/modules/services/hal.te 2006-01-05 11:12:20.000000000 -0500 @@ -3545,7 +3553,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.7/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-04 17:28:53.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/userdomain.if 2006-01-05 11:12:20.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/userdomain.if 2006-01-05 17:30:57.000000000 -0500 @@ -572,6 +572,7 @@ corenet_dontaudit_tcp_bind_all_reserved_ports($1_t) @@ -3554,35 +3562,53 @@ files_list_home($1_t) files_read_usr_files($1_t) files_exec_usr_files($1_t) -@@ -1884,9 +1885,14 @@ - type sysadm_home_dir_t; +@@ -1885,6 +1886,11 @@ ') -+ifdef(`targeted_policy', ` -+ dontaudit $1 user_home_dir_t:dir getattr; -+', ` dontaudit $1 sysadm_home_dir_t:dir getattr; - ') - ++ ++ifdef(`targeted_policy', ` ++ userdom_dontaudit_getattr_user_home_dirs($1) +') + + ') + ######################################## - ## - ## Search the sysadm users home directory. -@@ -1917,8 +1923,12 @@ - type sysadm_home_dir_t; +@@ -1918,6 +1924,10 @@ ') -+ifdef(`targeted_policy', ` -+ dontaudit $1 user_home_dir_t:dir search_dir_perms; -+', ` dontaudit $1 sysadm_home_dir_t:dir search_dir_perms; - ') ++ ++ifdef(`targeted_policy', ` ++ userdom_dontaudit_search_user_home_dirs($1) +') + ') + + ######################################## +@@ -2057,6 +2067,22 @@ ######################################## ## -@@ -2648,6 +2658,23 @@ ++## Do not audit attempts to getattr all users home directories. ++## ++## ++## Domain to not audit. ++## ++# ++interface(`userdom_dontaudit_getattr_user_home_dirs',` ++ gen_require(` ++ type user_home_dir_t; ++ ') ++ ++ dontaudit $1 user_home_dir_t:dir getattr; ++') ++ ++######################################## ++## + ## Read all files in all users home directories. + ## + ## +@@ -2648,6 +2674,23 @@ ######################################## ## Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- selinux-policy.spec 5 Jan 2006 21:55:48 -0000 1.76 +++ selinux-policy.spec 6 Jan 2006 01:04:12 -0000 1.77 @@ -7,7 +7,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.1.7 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -61,6 +61,10 @@ make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} enableaudit \ make NAME=%1 TYPE=%2 DISTRO=%{distro} DIRECT_INITRC=%3 MONOLITHIC=%{monolithic} base.pp \ install -m0644 base.pp ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/enableaudit.pp \ +for file in $(ls ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1 | grep -v -e base.pp -e enableaudit.pp ) \ +do \ + rm ${RPM_BUILD_ROOT}%{_usr}/share/selinux/%1/$file; \ +done; \ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/booleans \ touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/config \ touch $RPM_BUILD_ROOT%{_sysconfdir}/selinux/%1/seusers \ @@ -258,6 +262,9 @@ %endif %changelog +* Thu Jan 5 2006 Dan Walsh 2.1.7-3 +- Handle new location of hal scripts + * Thu Jan 5 2006 Dan Walsh 2.1.7-2 - Allow su to read /etc/mtab From fedora-cvs-commits at redhat.com Thu Jan 5 23:36:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 18:36:48 -0500 Subject: rpms/totem/devel totem.spec,1.37,1.38 Message-ID: <200601052336.k05NamPm028929@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28855 Modified Files: totem.spec Log Message: - fix some typos Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- totem.spec 5 Jan 2006 23:32:14 -0000 1.37 +++ totem.spec 5 Jan 2006 23:36:45 -0000 1.38 @@ -14,11 +14,11 @@ Requires(post): GConf2 Requires: gnome-desktop >= 2.6.0 Requires: gstreamer08 >= %gstreamer_version -Requires: gstreamer-plugins08 >= %gstreamer_plugins_version +Requires: gstreamer08-plugins >= %gstreamer_plugins_version Requires: iso-codes BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper -BuildRequires: gstreamer-devel08 >= %gstreamer_version -BuildRequires: gstreamer-plugins-devel08 >= %gstreamer_plugins_version +BuildRequires: gstreamer08-devel >= %gstreamer_version +BuildRequires: gstreamer08-plugins-devel >= %gstreamer_plugins_version BuildRequires: gnome-desktop-devel >= 2.6.0, gnome-vfs2-devel, libglade2-devel BuildRequires: perl-XML-Parser BuildRequires: iso-codes-devel From fedora-cvs-commits at redhat.com Thu Jan 5 23:18:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 18:18:25 -0500 Subject: rpms/gnome-python2-extras/devel gnome-python-extras.spec,1.36,1.37 Message-ID: <200601052318.k05NIPAE022251@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-python2-extras/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22109 Modified Files: gnome-python-extras.spec Log Message: - Last rebuild did not pick up the new libgtop Index: gnome-python-extras.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-python2-extras/devel/gnome-python-extras.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- gnome-python-extras.spec 20 Dec 2005 15:26:48 -0000 1.36 +++ gnome-python-extras.spec 5 Jan 2006 23:18:22 -0000 1.37 @@ -16,7 +16,7 @@ Summary: The sources for additional. PyGNOME Python extension modules. Name: gnome-python2-extras Version: 2.12.1 -Release: 8 +Release: 9 License: GPL/LGPL Group: Development/Languages Source0: ftp://ftp.gnome.org:/pub/gnome/sources/gnome-python-extras/2.12/gnome-python-extras-%{version}.tar.bz2 @@ -268,6 +268,9 @@ %changelog +* Thu Jan 05 2006 John (J5) Palmieri - 2.12.1-9 +- Last rebuild didn't get the new libgtop + * Tue Dec 20 2005 John (J5) Palmieri - 2.12.1-8 - rebuild for new libgtop soname change From fedora-cvs-commits at redhat.com Thu Jan 5 23:32:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 18:32:21 -0500 Subject: rpms/totem/devel totem.spec,1.36,1.37 Message-ID: <200601052332.k05NWLD3027927@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27908 Modified Files: totem.spec Log Message: - GStreamer has been split into gstreamer08 and gstreamer (0.10) packages we need gstreamer08 for now Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- totem.spec 21 Dec 2005 03:35:08 -0000 1.36 +++ totem.spec 5 Jan 2006 23:32:14 -0000 1.37 @@ -4,7 +4,7 @@ Summary: Movie player for GNOME 2 Name: totem Version: 1.3.0 -Release: 1 +Release: 2 License: GPL Group: Applications/Multimedia URL: http://www.hadess.net/totem.php3 @@ -13,12 +13,12 @@ Patch1: totem-0.99.19-feature-help-removal.patch Requires(post): GConf2 Requires: gnome-desktop >= 2.6.0 -Requires: gstreamer >= %gstreamer_version -Requires: gstreamer-plugins >= %gstreamer_plugins_version +Requires: gstreamer08 >= %gstreamer_version +Requires: gstreamer-plugins08 >= %gstreamer_plugins_version Requires: iso-codes BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper -BuildRequires: gstreamer-devel >= %gstreamer_version -BuildRequires: gstreamer-plugins-devel >= %gstreamer_plugins_version +BuildRequires: gstreamer-devel08 >= %gstreamer_version +BuildRequires: gstreamer-plugins-devel08 >= %gstreamer_plugins_version BuildRequires: gnome-desktop-devel >= 2.6.0, gnome-vfs2-devel, libglade2-devel BuildRequires: perl-XML-Parser BuildRequires: iso-codes-devel @@ -116,6 +116,10 @@ %{_libdir}/*so %changelog +* Thu Jan 05 2006 John (J5) Palmieri 1.3.0-2 +- GStreamer has been split into gstreamer08 and gstreamer (0.10) packages + we need gstreamer08 for now + * Thu Dec 20 2005 Matthias Clasen 1.3.0-1 - Update to 1.3.0 From fedora-cvs-commits at redhat.com Thu Jan 5 23:28:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 18:28:55 -0500 Subject: rpms/gnome-applets/devel gnome-applets.spec,1.98,1.99 Message-ID: <200601052328.k05NStOx027188@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27130 Modified Files: gnome-applets.spec Log Message: - GStreamer has been split into gstreamer08 and gstreamer (0.10) packages we need gstreamer08 for now Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- gnome-applets.spec 4 Jan 2006 14:36:23 -0000 1.98 +++ gnome-applets.spec 5 Jan 2006 23:28:52 -0000 1.99 @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.13.1 -Release: 3 +Release: 4 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -42,7 +42,7 @@ BuildRequires: pango-devel >= %{pango_version} BuildRequires: gail-devel >= %{gail_version} BuildRequires: libxklavier-devel >= %{libxklavier_version} -BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version} +BuildRequires: gstreamer08-plugins-devel >= %{gstreamer_plugins_version} BuildRequires: /usr/bin/automake BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libwnck-devel >= %{libwnck_version} @@ -52,7 +52,7 @@ Requires: gnome-panel >= %{gnome_panel_version} Requires: libxklavier >= %{libxklavier_version} -Requires: gstreamer-plugins >= %{gstreamer_plugins_version} +Requires: gstreamer08-plugins >= %{gstreamer_plugins_version} # For wireless-applet backwards compat Requires: gnome-netstatus >= 2.8.0-2 @@ -169,6 +169,10 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Fri Jan 05 2006 John (J5) Palmieri 2.13.1-4 +- GStreamer has been split into gstreamer08 and gstreamer (0.10) packages + we need gstreamer08 for now + * Wed Jan 04 2006 Matthias Clasen 2.13.1-3 - Rebuild against new libgtop From fedora-cvs-commits at redhat.com Thu Jan 5 23:24:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 18:24:03 -0500 Subject: rpms/sound-juicer/devel sound-juicer.spec,1.30,1.31 Message-ID: <200601052324.k05NO30B024879@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/sound-juicer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24774 Modified Files: sound-juicer.spec Log Message: - GStreamer has been split into gstreamer08 and gstreamer (0.10) packages we need gstreamer08 for now Index: sound-juicer.spec =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sound-juicer.spec 10 Dec 2005 09:20:50 -0000 1.30 +++ sound-juicer.spec 5 Jan 2006 23:24:00 -0000 1.31 @@ -13,7 +13,7 @@ Name: sound-juicer Summary: Clean and lean CD ripper Version: 2.13.1 -Release: 2.1 +Release: 3 License: GPL Group: Applications/Multimedia Source: %{name}-%{version}.tar.bz2 @@ -22,9 +22,9 @@ Requires: libgnomeui >= %{libgnomeui_version} Requires: glib2 >= %{glib_version} Requires: gtk2 >= %{gtk_version} -Requires: gstreamer >= %{gstreamer_version} +Requires: gstreamer08 >= %{gstreamer_version} Requires: GConf2 >= %{gconf_version} -Requires: gstreamer-plugins +Requires: gstreamer08-plugins Requires: cdparanoia Requires: nautilus-cd-burner >= %{nautilus_cd_burner_version} Requires: gnome-media >= %{gnome_media_version} @@ -33,7 +33,8 @@ BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: glib2-devel >= %{glib_version} BuildRequires: gtk2-devel >= %{gtk_version} -BuildRequires: gstreamer-devel >= %{gstreamer_version} +BuildRequires: gstreamer08-devel >= %{gstreamer_version} +BuildRequires: gstreamer08-plugins-devel BuildRequires: GConf2-devel >= %{gconf_version} BuildRequires: hal-devel >= %{hal_version} BuildRequires: gnome-vfs2-devel >= %{gnome_vfs_version} @@ -90,6 +91,10 @@ %{_datadir}/omf/sound-juicer %changelog +* Thu Jan 05 2006 John (J5) Palmieir 2.13.1-3 +- GStreamer has been split into gstreamer08 and gstreamer (0.10) packages + we need gstreamer08 for now + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 5 23:37:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 18:37:51 -0500 Subject: rpms/audit/devel audit-1.1.3-initscript-disabled.patch, NONE, 1.1 .cvsignore, 1.55, 1.56 audit.spec, 1.75, 1.76 sources, 1.62, 1.63 Message-ID: <200601052337.k05NbpL9029486@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/audit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29452 Modified Files: .cvsignore audit.spec sources Added Files: audit-1.1.3-initscript-disabled.patch Log Message: * Thu Jan 5 2006 Steve Grubb 1.1.3-1 - Add timestamp to daemon_config messages (#174865) - Add error checking of year for aureport & ausearh - Treat af_unix sockets as files for searching and reporting - Update capp & lspp rules to combine syscalls for higher performance - Adjusted the chkconfig line for auditd to start a little earlier - Added skeleton program to docs for people to write their own dispatcher with - Apply patch from Ulrich Drepper that optimizes resource utilization - Change ausearch and aureport to unlocked IO audit-1.1.3-initscript-disabled.patch: auditd.init | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE audit-1.1.3-initscript-disabled.patch --- diff -ur audit-1.0.3.orig/init.d/auditd.init audit-1.0.3/init.d/auditd.init --- audit-1.0.3.orig/init.d/auditd.init 2005-09-16 14:06:21.000000000 -0400 +++ audit-1.0.3/init.d/auditd.init 2005-09-16 14:06:43.000000000 -0400 @@ -2,7 +2,7 @@ # # auditd This starts and stops auditd # -# chkconfig: 2345 11 88 +# chkconfig: - 11 88 # description: This starts the Linux Auditing System Daemon # # processname: /sbin/auditd Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/audit/devel/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- .cvsignore 5 Dec 2005 23:10:00 -0000 1.55 +++ .cvsignore 5 Jan 2006 23:37:48 -0000 1.56 @@ -52,3 +52,4 @@ audit-1.1.tar.gz audit-1.1.1.tar.gz audit-1.1.2.tar.gz +audit-1.1.3.tar.gz Index: audit.spec =================================================================== RCS file: /cvs/dist/rpms/audit/devel/audit.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- audit.spec 9 Dec 2005 22:39:41 -0000 1.75 +++ audit.spec 5 Jan 2006 23:37:48 -0000 1.76 @@ -1,13 +1,14 @@ Summary: User space tools for 2.6 kernel auditing. Name: audit -Version: 1.1.2 -Release: 1.1 +Version: 1.1.3 +Release: 1 License: GPL Group: System Environment/Daemons URL: http://people.redhat.com/sgrubb/audit/ Source0: %{name}-%{version}.tar.gz +Patch1: audit-1.1.3-initscript-disabled.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: libtool +BuildRequires: libtool swig BuildRequires: glibc-kernheaders >= 2.4-9.1.95 BuildRequires: automake >= 1.9 BuildRequires: autoconf >= 2.59 @@ -53,6 +54,8 @@ %prep %setup -q +# When in production, uncomment this so the patch is applied +#%patch1 -p1 %build autoreconf -fv --install @@ -84,6 +87,8 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libaudit.la rm -f $RPM_BUILD_ROOT/%{_libdir}/python2.4/site-packages/_audit.a rm -f $RPM_BUILD_ROOT/%{_libdir}/python2.4/site-packages/_audit.la +# Temp remove this file +rm -f $RPM_BUILD_ROOT/sbin/audispd %clean rm -rf $RPM_BUILD_ROOT @@ -125,14 +130,14 @@ %files %defattr(-,root,root,-) -%doc README COPYING ChangeLog sample.rules contrib/capp.rules contrib/lspp.rules init.d/auditd.cron +%doc README COPYING ChangeLog sample.rules contrib/capp.rules contrib/lspp.rules contrib/skeleton.c init.d/auditd.cron %attr(0644,root,root) %{_mandir}/man8/* %attr(750,root,root) /sbin/auditctl %attr(750,root,root) /sbin/auditd %attr(750,root,root) /sbin/ausearch %attr(750,root,root) /sbin/aureport %attr(750,root,root) /sbin/autrace -%attr(750,root,root) /sbin/audispd +#%attr(750,root,root) /sbin/audispd %attr(755,root,root) /etc/rc.d/init.d/auditd %attr(750,root,root) %{_var}/log/audit %config(noreplace) %attr(640,root,root) /etc/auditd.conf @@ -141,8 +146,15 @@ %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Thu Jan 5 2006 Steve Grubb 1.1.3-1 +- Add timestamp to daemon_config messages (#174865) +- Add error checking of year for aureport & ausearh +- Treat af_unix sockets as files for searching and reporting +- Update capp & lspp rules to combine syscalls for higher performance +- Adjusted the chkconfig line for auditd to start a little earlier +- Added skeleton program to docs for people to write their own dispatcher with +- Apply patch from Ulrich Drepper that optimizes resource utilization +- Change ausearch and aureport to unlocked IO * Thu Dec 5 2005 Steve Grubb 1.1.2-1 - Add more message types Index: sources =================================================================== RCS file: /cvs/dist/rpms/audit/devel/sources,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- sources 5 Dec 2005 23:10:00 -0000 1.62 +++ sources 5 Jan 2006 23:37:48 -0000 1.63 @@ -1 +1 @@ -7537b147736ebf50cf7103a767d6725a audit-1.1.2.tar.gz +ff5be0c2fdc3a28ec4903f64a5587faf audit-1.1.3.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 5 23:38:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 18:38:44 -0500 Subject: rpms/nspr/devel nspr-4.6.1-disable-gcc-ansi.patch, NONE, 1.1 nspr.spec, 1.10, 1.11 Message-ID: <200601052338.k05NciXi029949@cvs.devel.redhat.com> Author: kengert Update of /cvs/dist/rpms/nspr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29825 Modified Files: nspr.spec Added Files: nspr-4.6.1-disable-gcc-ansi.patch Log Message: * Thu Jan 5 2006 Kai Engert 4.6.1-2 - Do not use -ansi when compiling, because of a compilation problem with latest glibc and anonymous unions. See also bugzilla.mozilla.org # 322427. nspr-4.6.1-disable-gcc-ansi.patch: configure | 299 ++++++++++++++++++++++++++++++-------------- configure.in | 9 - pr/src/linking/Makefile.in | 5 pr/src/pthreads/Makefile.in | 5 4 files changed, 207 insertions(+), 111 deletions(-) --- NEW FILE nspr-4.6.1-disable-gcc-ansi.patch --- ? mozilla/nsprpub/autom4te.cache ? mozilla/nsprpub/configure.in.bck ? mozilla/nsprpub/pr/src/linking/Makefile.in.bck ? mozilla/nsprpub/pr/src/pthreads/Makefile.in.bck Index: mozilla/nsprpub/configure =================================================================== RCS file: /cvsroot/mozilla/nsprpub/configure,v retrieving revision 1.197 diff -u -r1.197 configure --- mozilla/nsprpub/configure 2 Sep 2005 02:44:37 -0000 1.197 +++ mozilla/nsprpub/configure 5 Jan 2006 23:22:49 -0000 @@ -1611,12 +1611,63 @@ fi fi +for ac_declaration in \ + ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat > conftest.$ac_ext < +$ac_declaration +int main() { +exit (42); +; return 0; } +EOF +if { (eval echo configure:1633: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + continue +fi +rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + + for ac_prog in $RANLIB "${target_alias}-ranlib" "${target}-ranlib" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1620: checking for $ac_word" >&5 +echo "configure:1671: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1651,7 +1702,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1655: checking for $ac_word" >&5 +echo "configure:1706: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1686,7 +1737,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1690: checking for $ac_word" >&5 +echo "configure:1741: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1721,7 +1772,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1725: checking for $ac_word" >&5 +echo "configure:1776: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1756,7 +1807,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1760: checking for $ac_word" >&5 +echo "configure:1811: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1791,7 +1842,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1795: checking for $ac_word" >&5 +echo "configure:1846: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1828,7 +1879,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1832: checking for $ac_word" >&5 +echo "configure:1883: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1860,7 +1911,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1864: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1915: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1871,12 +1922,12 @@ cat > conftest.$ac_ext << EOF -#line 1875 "configure" +#line 1926 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1902,12 +1953,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1906: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1957: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1911: checking whether we are using GNU C++" >&5 +echo "configure:1962: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1916,7 +1967,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1935,7 +1986,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1939: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1990: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1966,13 +2017,64 @@ fi fi +for ac_declaration in \ + ''\ + '#include ' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat > conftest.$ac_ext < +$ac_declaration +int main() { +exit (42); +; return 0; } +EOF +if { (eval echo configure:2039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + continue +fi +rm -f conftest* + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h +fi + + if test "$CXX" = "cl" -a -z "$CC"; then CC=$CXX else # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1976: checking for $ac_word" >&5 +echo "configure:2078: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2002,7 +2104,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2006: checking for $ac_word" >&5 +echo "configure:2108: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2053,7 +2155,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2057: checking for $ac_word" >&5 +echo "configure:2159: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2085,7 +2187,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2089: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2191: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2096,12 +2198,12 @@ cat > conftest.$ac_ext << EOF -#line 2100 "configure" +#line 2202 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2127,12 +2229,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2131: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2233: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2136: checking whether we are using GNU C" >&5 +echo "configure:2238: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2141,7 +2243,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2160,7 +2262,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2164: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2266: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2193,7 +2295,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2197: checking how to run the C preprocessor" >&5 +echo "configure:2299: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2208,13 +2310,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2320: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2225,13 +2327,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2242,13 +2344,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2275,7 +2377,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2279: checking for $ac_word" >&5 +echo "configure:2381: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2307,7 +2409,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2311: checking for $ac_word" >&5 +echo "configure:2413: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2348,7 +2450,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2352: checking for $ac_word" >&5 +echo "configure:2454: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2389,7 +2491,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2393: checking for $ac_word" >&5 +echo "configure:2495: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2430,7 +2532,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2434: checking for $ac_word" >&5 +echo "configure:2536: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2471,7 +2573,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2475: checking for $ac_word" >&5 +echo "configure:2577: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2533,7 +2635,7 @@ fi echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 -echo "configure:2537: checking for gcc -pipe support" >&5 +echo "configure:2639: checking for gcc -pipe support" >&5 if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then echo '#include ' > dummy-hello.c echo 'int main() { printf("Hello World\n"); return 0; }' >> dummy-hello.c @@ -2548,14 +2650,14 @@ _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -pipe" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:2559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -2582,7 +2684,7 @@ if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 -echo "configure:2586: checking for visibility(hidden) attribute" >&5 +echo "configure:2688: checking for visibility(hidden) attribute" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2606,7 +2708,7 @@ EOF echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 -echo "configure:2610: checking for visibility pragma support" >&5 +echo "configure:2712: checking for visibility pragma support" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2659,7 +2761,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2663: checking for $ac_word" >&5 +echo "configure:2765: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2905,17 +3007,17 @@ DSO_LDOPTS='-brtl -bnortllib -bM:SRE -bnoentry -bexpall -blibpath:/usr/lib:/lib' ac_safe=`echo "sys/atomic_op.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/atomic_op.h""... $ac_c" 1>&6 -echo "configure:2909: checking for sys/atomic_op.h" >&5 +echo "configure:3011: checking for sys/atomic_op.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2919: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3072,7 +3174,7 @@ _DEBUG_FLAGS='-gdwarf-2 -O0' MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@' echo $ac_n "checking for gethostbyaddr in -lbind""... $ac_c" 1>&6 -echo "configure:3076: checking for gethostbyaddr in -lbind" >&5 +echo "configure:3178: checking for gethostbyaddr in -lbind" >&5 ac_lib_var=`echo bind'_'gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3080,7 +3182,7 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3774,19 +3876,7 @@ EOF cat >> confdefs.h <<\EOF -#define _POSIX_SOURCE 1 -EOF - - cat >> confdefs.h <<\EOF -#define _BSD_SOURCE 1 -EOF - - cat >> confdefs.h <<\EOF -#define _SVID_SOURCE 1 -EOF - - cat >> confdefs.h <<\EOF -#define _LARGEFILE64_SOURCE 1 +#define _GNU_SOURCE 1 EOF cat >> confdefs.h <<\EOF @@ -3797,8 +3887,8 @@ #define LINUX 1 EOF - CFLAGS="$CFLAGS -ansi -Wall" - CXXFLAGS="$CXXFLAGS -ansi -Wall" + CFLAGS="$CFLAGS -Wall" + CXXFLAGS="$CXXFLAGS -Wall" MDCPUCFG_H=_linux.cfg PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' @@ -4336,17 +4426,17 @@ _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000" ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6 -echo "configure:4340: checking for machine/builtins.h" >&5 +echo "configure:4430: checking for machine/builtins.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4440: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4908,7 +4998,7 @@ ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4912: checking for dlopen in -ldl" >&5 +echo "configure:5002: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4916,7 +5006,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4944,17 +5034,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:4948: checking for dlfcn.h" >&5 +echo "configure:5038: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4987,13 +5077,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4991: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:5081: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -5011,7 +5101,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -5035,12 +5125,12 @@ for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5039: checking for $ac_func" >&5 +echo "configure:5129: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5104,7 +5194,7 @@ if test -z "$GNU_CC"; then echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 -echo "configure:5108: checking for +Olit support" >&5 +echo "configure:5198: checking for +Olit support" >&5 if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5143,7 +5233,7 @@ *) echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:5147: checking for pthread_create in -lpthreads" >&5 +echo "configure:5237: checking for pthread_create in -lpthreads" >&5 echo " #include void *foo(void *v) { return v; } @@ -5165,7 +5255,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:5169: checking for pthread_create in -lpthread" >&5 +echo "configure:5259: checking for pthread_create in -lpthread" >&5 echo " #include void *foo(void *v) { return v; } @@ -5187,7 +5277,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:5191: checking for pthread_create in -lc_r" >&5 +echo "configure:5281: checking for pthread_create in -lc_r" >&5 echo " #include void *foo(void *v) { return v; } @@ -5209,7 +5299,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:5213: checking for pthread_create in -lc" >&5 +echo "configure:5303: checking for pthread_create in -lc" >&5 echo " #include void *foo(void *v) { return v; } @@ -5363,7 +5453,7 @@ rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:5367: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:5457: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -5386,7 +5476,7 @@ ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:5390: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:5480: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -5917,15 +6007,34 @@ # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' ' | tr '\015' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. Index: mozilla/nsprpub/configure.in =================================================================== RCS file: /cvsroot/mozilla/nsprpub/configure.in,v retrieving revision 1.199 diff -u -r1.199 configure.in --- mozilla/nsprpub/configure.in 2 Sep 2005 02:44:37 -0000 1.199 +++ mozilla/nsprpub/configure.in 5 Jan 2006 23:22:50 -0000 @@ -1292,14 +1292,11 @@ IMPL_STRATEGY=_PTH fi AC_DEFINE(XP_UNIX) - AC_DEFINE(_POSIX_SOURCE) - AC_DEFINE(_BSD_SOURCE) - AC_DEFINE(_SVID_SOURCE) - AC_DEFINE(_LARGEFILE64_SOURCE) + AC_DEFINE(_GNU_SOURCE) AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) AC_DEFINE(LINUX) - CFLAGS="$CFLAGS -ansi -Wall" - CXXFLAGS="$CXXFLAGS -ansi -Wall" + CFLAGS="$CFLAGS -Wall" + CXXFLAGS="$CXXFLAGS -Wall" MDCPUCFG_H=_linux.cfg PR_MD_CSRCS=linux.c MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@' Index: mozilla/nsprpub/pr/src/linking/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/nsprpub/pr/src/linking/Makefile.in,v retrieving revision 1.14 diff -u -r1.14 Makefile.in --- mozilla/nsprpub/pr/src/linking/Makefile.in 25 Apr 2004 15:00:58 -0000 1.14 +++ mozilla/nsprpub/pr/src/linking/Makefile.in 5 Jan 2006 23:22:51 -0000 @@ -62,11 +62,6 @@ INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private -# For Dl_info and dladdr. -ifeq ($(OS_TARGET),Linux) -DEFINES += -D_GNU_SOURCE -endif - # On Mac OS X use flat #includes. ifeq ($(OS_TARGET),MacOSX) INCLUDES += -I$(NEXT_ROOT)/Developer/Headers/FlatCarbon Index: mozilla/nsprpub/pr/src/pthreads/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/nsprpub/pr/src/pthreads/Makefile.in,v retrieving revision 1.13 diff -u -r1.13 Makefile.in --- mozilla/nsprpub/pr/src/pthreads/Makefile.in 25 Apr 2004 15:01:01 -0000 1.13 +++ mozilla/nsprpub/pr/src/pthreads/Makefile.in 5 Jan 2006 23:22:51 -0000 @@ -67,11 +67,6 @@ DEFINES += -D_NSPR_BUILD_ -ifeq ($(OS_ARCH),Linux) -# for pthread_mutexattr_settype -DEFINES += -D_XOPEN_SOURCE=500 -endif - include $(topsrcdir)/config/rules.mk export:: $(TARGETS) Index: nspr.spec =================================================================== RCS file: /cvs/dist/rpms/nspr/devel/nspr.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nspr.spec 4 Jan 2006 21:42:39 -0000 1.10 +++ nspr.spec 5 Jan 2006 23:38:41 -0000 1.11 @@ -10,6 +10,7 @@ Source1: nspr.pc.in Patch1: nspr-4.6.1-gcc-visibility.patch +Patch2: nspr-4.6.1-disable-gcc-ansi.patch Provides: mozilla-nspr Obsoletes: mozilla-nspr @@ -36,6 +37,7 @@ # patches %patch1 -p0 +%patch2 -p0 %build @@ -107,6 +109,11 @@ %{_bindir}/nspr-config %changelog +* Thu Jan 5 2006 Kai Engert 4.6.1-2 +- Do not use -ansi when compiling, because of a compilation + problem with latest glibc and anonymous unions. + See also bugzilla.mozilla.org # 322427. + * Wed Jan 4 2006 Kai Engert - Add an upstream patch to fix gcc visibility issues. From fedora-cvs-commits at redhat.com Thu Jan 5 22:58:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 17:58:46 -0500 Subject: rpms/python-pyblock/devel .cvsignore, 1.8, 1.9 python-pyblock.spec, 1.13, 1.14 sources, 1.11, 1.12 Message-ID: <200601052258.k05MwkuZ005321@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/python-pyblock/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5261 Modified Files: .cvsignore python-pyblock.spec sources Log Message: 0.11 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 4 Jan 2006 23:04:21 -0000 1.8 +++ .cvsignore 5 Jan 2006 22:58:43 -0000 1.9 @@ -1 +1 @@ -pyblock-0.10.tar.bz2 +pyblock-0.11.tar.bz2 Index: python-pyblock.spec =================================================================== RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- python-pyblock.spec 4 Jan 2006 23:04:21 -0000 1.13 +++ python-pyblock.spec 5 Jan 2006 22:58:43 -0000 1.14 @@ -4,7 +4,7 @@ Summary: Python modules for dealing with block devices Name: python-%{realname} -Version: 0.10 +Version: 0.11 Release: 1 Source0: %{realname}-%{version}.tar.bz2 License: GPL @@ -38,6 +38,11 @@ /%{python_sitelib}/block/* %changelog +* Thu Jan 5 2006 Peter Jones - 0.11-1 +- never trust dmraid on sync vs nosync; right now, always transform the + table to "default" (no argument), which is to sync only when necessary, + whatever that means. Seems to lock up less often. + * Wed Jan 4 2006 Peter Jones - 0.10-1 - fix checking for "degraded" raids Index: sources =================================================================== RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 4 Jan 2006 23:04:21 -0000 1.11 +++ sources 5 Jan 2006 22:58:43 -0000 1.12 @@ -1 +1 @@ -8ea33e3f04028dc4447a6400871c9101 pyblock-0.10.tar.bz2 +deea7ade2f2acc32f5940101685b62ad pyblock-0.11.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 5 22:03:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 17:03:08 -0500 Subject: rpms/checkpolicy/devel checkpolicy.spec,1.85,1.86 Message-ID: <200601052203.k05M38rv003025@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/checkpolicy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2992 Modified Files: checkpolicy.spec Log Message: * Thu Jan 5 2006 Dan Walsh 1.28-4 - Rebuild to get latest libsepol Index: checkpolicy.spec =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- checkpolicy.spec 5 Jan 2006 21:58:33 -0000 1.85 +++ checkpolicy.spec 5 Jan 2006 22:02:52 -0000 1.86 @@ -1,4 +1,4 @@ -%define libsepolver 1.11.5-2 +%define libsepolver 1.11.5-1 Summary: SELinux policy compiler Name: checkpolicy Version: 1.28 From fedora-cvs-commits at redhat.com Thu Jan 5 21:58:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 16:58:35 -0500 Subject: rpms/checkpolicy/devel checkpolicy.spec,1.84,1.85 Message-ID: <200601052158.k05LwZO0002114@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/checkpolicy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2085 Modified Files: checkpolicy.spec Log Message: * Thu Jan 5 2006 Dan Walsh 1.28-4 - Rebuild to get latest libsepol Index: checkpolicy.spec =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- checkpolicy.spec 4 Jan 2006 18:55:25 -0000 1.84 +++ checkpolicy.spec 5 Jan 2006 21:58:33 -0000 1.85 @@ -1,8 +1,8 @@ -%define libsepolver 1.11.2-2 +%define libsepolver 1.11.5-2 Summary: SELinux policy compiler Name: checkpolicy Version: 1.28 -Release: 3 +Release: 4 License: GPL Group: Development/System Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -47,6 +47,9 @@ %{_mandir}/man8/checkmodule.8.gz %changelog +* Thu Jan 5 2006 Dan Walsh 1.28-4 +- Rebuild to get latest libsepol + * Wed Jan 4 2006 Dan Walsh 1.28-3 - Rebuild to get latest libsepol From fedora-cvs-commits at redhat.com Thu Jan 5 21:55:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 16:55:50 -0500 Subject: rpms/selinux-policy/devel selinux-policy.spec,1.75,1.76 Message-ID: <200601052155.k05LtoX9000757@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv727 Modified Files: selinux-policy.spec Log Message: * Thu Jan 5 2006 Dan Walsh 2.1.7-2 - Allow su to read /etc/mtab Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- selinux-policy.spec 4 Jan 2006 19:21:36 -0000 1.75 +++ selinux-policy.spec 5 Jan 2006 21:55:48 -0000 1.76 @@ -2,12 +2,12 @@ %define direct_initrc y %define monolithic n %define POLICYVER 20 -%define POLICYCOREUTILSVER 1.29.3-1 +%define POLICYCOREUTILSVER 1.29.5-1 %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy Version: 2.1.7 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -258,6 +258,9 @@ %endif %changelog +* Thu Jan 5 2006 Dan Walsh 2.1.7-2 +- Allow su to read /etc/mtab + * Wed Jan 4 2006 Dan Walsh 2.1.7-1 - Update to upstream From fedora-cvs-commits at redhat.com Thu Jan 5 21:52:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 16:52:34 -0500 Subject: rpms/policycoreutils/devel policycoreutils.spec,1.210,1.211 Message-ID: <200601052152.k05LqYaZ031637@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31611 Modified Files: policycoreutils.spec Log Message: * Thu Jan 5 2006 Dan Walsh 1.29.5-1 - Update to match NSA * Added filename to semodule error reporting. Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- policycoreutils.spec 5 Jan 2006 21:39:11 -0000 1.210 +++ policycoreutils.spec 5 Jan 2006 21:52:31 -0000 1.211 @@ -3,7 +3,7 @@ %define libselinuxver 1.29.3-2 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.29.4 +Version: 1.29.5 Release: 1 License: GPL Group: System Environment/Base @@ -96,6 +96,10 @@ %config(noreplace) %{_sysconfdir}/sestatus.conf %changelog +* Thu Jan 5 2006 Dan Walsh 1.29.5-1 +- Update to match NSA + * Added filename to semodule error reporting. + * Thu Jan 5 2006 Dan Walsh 1.29.4-1 - Update to match NSA * Merged genhomedircon and semanage patch from Dan Walsh. From fedora-cvs-commits at redhat.com Thu Jan 5 21:45:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 16:45:36 -0500 Subject: rpms/hal/devel hal.spec,1.71,1.72 Message-ID: <200601052145.k05Lja2E017105@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17041 Modified Files: hal.spec Log Message: - readd hotplug script Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- hal.spec 5 Jan 2006 20:27:45 -0000 1.71 +++ hal.spec 5 Jan 2006 21:45:33 -0000 1.72 @@ -18,7 +18,7 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.5.1.cvs20060105 -Release: 1 +Release: 2 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz Patch0: hal-0.5.4-match-on-capabilities.patch @@ -90,7 +90,6 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT/etc/hotplug.d/default/20-hal.hotplug %clean rm -rf %{buildroot} @@ -127,6 +126,7 @@ %dir %{_sysconfdir}/hal %{_sysconfdir}/hal/* +/etc/hotplug.d/default/20-hal.hotplug %{_sbindir}/hald @@ -170,9 +170,13 @@ %changelog * Thu Jan 05 2006 John (J5) Palmieri - 0.5.5.1.cvs20060105-1 +- readd the hotplug script + +* Thu Jan 05 2006 John (J5) Palmieri - 0.5.5.1.cvs20060105-1 - Build CVS version of HAL which gives us the new mount support - disable fstab-sync - scripts have been moved from /usr/sbin to /usr/share/hal/scripts + * Fri Dec 09 2005 Jesse Keating - 0.5.5.1-2.1 - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 5 21:44:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 16:44:38 -0500 Subject: rpms/boost/devel boost.spec,1.21,1.22 Message-ID: <200601052144.k05LicFH016664@cvs.devel.redhat.com> Author: bkoz Update of /cvs/dist/rpms/boost/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16487 Modified Files: boost.spec Log Message: * Thu Jan 05 2006 Benjamin Kosnik 1.33.1-4 - Fix symbolic links. Index: boost.spec =================================================================== RCS file: /cvs/dist/rpms/boost/devel/boost.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- boost.spec 4 Jan 2006 23:14:27 -0000 1.21 +++ boost.spec 5 Jan 2006 21:44:36 -0000 1.22 @@ -3,7 +3,7 @@ Name: boost Summary: The Boost C++ Libraries Version: 1.33.1 -Release: 3 +Release: 4 License: Boost Software License URL: http://www.boost.org/ Group: System Environment/Libraries @@ -104,15 +104,17 @@ NAME=`basename $i`; install -m 755 $i $RPM_BUILD_ROOT%{_libdir}/$NAME; done; -for i in `find stage -type l -name \*.so`; do - NAME=`basename $i`; - cp $i $RPM_BUILD_ROOT%{_libdir}/$NAME; - mv $i $RPM_BUILD_ROOT%{_libdir}/$NAME.2; -done; for i in `find stage -type f -name \*.so.*`; do NAME=`basename $i`; install -m 755 $i $RPM_BUILD_ROOT%{_libdir}/$NAME; done; +for i in `find stage -type l -name \*.so`; do + NAME=`basename $i`; + SONAME=$NAME.2; + ln -s $NAME.* $SONAME; + mv $SONAME $RPM_BUILD_ROOT%{_libdir}/$SONAME; + mv $i $RPM_BUILD_ROOT%{_libdir}/$NAME; +done; # install include files for i in `find boost -type d`; do @@ -157,6 +159,9 @@ %{_docdir}/boost-%{version} %changelog +* Thu Jan 05 2006 Benjamin Kosnik 1.33.1-4 +- Fix symbolic links. + * Wed Jan 04 2006 Benjamin Kosnik 1.33.1-3 - Update to boost-1.33.1. - (#176485: Missing BuildRequires) From fedora-cvs-commits at redhat.com Thu Jan 5 21:39:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 16:39:13 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.92, 1.93 policycoreutils-rhat.patch, 1.141, 1.142 policycoreutils.spec, 1.209, 1.210 sources, 1.96, 1.97 Message-ID: <200601052139.k05LdDhT014113@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14075 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Thu Jan 5 2006 Dan Walsh 1.29.4-1 - Update to match NSA * Merged genhomedircon and semanage patch from Dan Walsh. * Changed semodule error reporting to include argv[0]. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- .cvsignore 4 Jan 2006 18:53:16 -0000 1.92 +++ .cvsignore 5 Jan 2006 21:39:11 -0000 1.93 @@ -77,3 +77,5 @@ policycoreutils-1.29.1.tgz policycoreutils-1.29.2.tgz policycoreutils-1.29.3.tgz +policycoreutils-1.29.4.tgz +policycoreutils-1.29.5.tgz policycoreutils-rhat.patch: semanage | 213 +++++++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 153 insertions(+), 60 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- policycoreutils-rhat.patch 4 Jan 2006 18:53:16 -0000 1.141 +++ policycoreutils-rhat.patch 5 Jan 2006 21:39:11 -0000 1.142 @@ -1,225 +1,375 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.3/scripts/genhomedircon ---- nsapolicycoreutils/scripts/genhomedircon 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.29.3/scripts/genhomedircon 2006-01-04 13:17:35.000000000 -0500 -@@ -220,8 +220,9 @@ - if len(u)==0 or u[0]=="#": - continue - user = u.split(":") -- if len(user) < 3: -+ if len(user) < 2: - continue -+ - role=self.getOldRole(user[1]) - self.adduser(udict, user[0], user[1], role) - fd.close() -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.3/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.29.3/semanage/semanage 2006-01-04 13:17:35.000000000 -0500 -@@ -36,7 +36,7 @@ - sename = "user_u" - - (rc,k) = semanage_seuser_key_create(self.sh, name) -- if rc != 0: -+ if rc < 0: - raise ValueError("Could not create a key for %s" % name) - - (rc,exists) = semanage_seuser_exists(self.sh, k) -@@ -48,7 +48,7 @@ - raise ValueError("Linux User %s does not exist" % name) - - (rc,u) = semanage_seuser_create(self.sh) -- if rc != 0: -+ if rc < 0: - raise ValueError("Could not create seuser for %s" % name) - - semanage_seuser_set_name(self.sh, u, name) -@@ -56,12 +56,12 @@ - semanage_seuser_set_sename(self.sh, u, sename) - semanage_begin_transaction(self.sh) - semanage_seuser_add(self.sh, k, u) -- if semanage_commit(self.sh) != 0: -+ if semanage_commit(self.sh) < 0: - raise ValueError("Failed to add SELinux user mapping") - - def modify(self, name, sename = "", serange = ""): - (rc,k) = semanage_seuser_key_create(self.sh, name) -- if rc != 0: -+ if rc < 0: - raise ValueError("Could not create a key for %s" % name) - - if sename == "" and serange == "": -@@ -70,7 +70,7 @@ - (rc,exists) = semanage_seuser_exists(self.sh, k) - if exists: - (rc,u) = semanage_seuser_query(self.sh, k) -- if rc != 0: -+ if rc < 0: - raise ValueError("Could not query seuser for %s" % name) - else: - raise ValueError("SELinux user %s mapping is not defined." % name) -@@ -81,13 +81,13 @@ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.4/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2006-01-05 10:35:49.000000000 -0500 ++++ policycoreutils-1.29.4/semanage/semanage 2006-01-05 16:27:42.000000000 -0500 +@@ -20,15 +20,20 @@ + # 02111-1307 USA + # + # ++ + import commands, sys, os, pwd, string, getopt, pwd + from semanage import *; +-class loginRecords: ++class semanageRecords: + def __init__(self): + self.sh = semanage_handle_create() + self.semanaged = semanage_is_managed(self.sh) + if self.semanaged: + semanage_connect(self.sh) + ++class loginRecords(semanageRecords): ++ def __init__(self): ++ semanageRecords.__init__(self) ++ + def add(self, name, sename, serange): + if serange == "": + serange = "s0" +@@ -80,7 +85,7 @@ + if sename != "": semanage_seuser_set_sename(self.sh, u, sename) semanage_begin_transaction(self.sh) - semanage_seuser_modify(self.sh, k, u) -- if semanage_commit(self.sh) != 0: -+ if semanage_commit(self.sh) < 0: +- semanage_seuser_modify(self.sh, k, u) ++ semanage_seuser_modify_local(self.sh, k, u) + if semanage_commit(self.sh) < 0: raise ValueError("Failed to modify SELinux user mapping") - - def delete(self, name): - (rc,k) = semanage_seuser_key_create(self.sh, name) -- if rc != 0: -+ if rc < 0: - raise ValueError("Could not create a key for %s" % name) - - (rc,exists) = semanage_seuser_exists(self.sh, k) -@@ -95,7 +95,7 @@ - raise ValueError("SELinux user %s mapping is not defined." % name) - semanage_begin_transaction(self.sh) - semanage_seuser_del(self.sh, k) -- if semanage_commit(self.sh) != 0: -+ if semanage_commit(self.sh) < 0: - raise ValueError("SELinux User %s mapping not defined" % name) - - def list(self,heading=1): -@@ -122,7 +122,7 @@ - selevel = "s0" - - (rc,k) = semanage_user_key_create(self.sh, name) -- if rc != 0: -+ if rc < 0: +@@ -107,13 +112,9 @@ + name = semanage_seuser_get_name(u) + print "%-25s %-25s %-25s" % (name, semanage_seuser_get_sename(u), semanage_seuser_get_mlsrange(u)) + +-class seluserRecords: ++class seluserRecords(semanageRecords): + def __init__(self): +- roles = [] +- self.sh = semanage_handle_create() +- self.semanaged = semanage_is_managed(self.sh) +- if self.semanaged: +- semanage_connect(self.sh) ++ semanageRecords.__init__(self) + + def add(self, name, roles, selevel, serange): + if serange == "": +@@ -125,11 +126,9 @@ + if rc < 0: raise ValueError("Could not create a key for %s" % name) - (rc,exists) = semanage_user_exists_local(self.sh, k) -@@ -132,7 +132,7 @@ - raise ValueError("SELinux user %s is already defined." % name) +- (rc,exists) = semanage_user_exists_local(self.sh, k) ++ (rc,exists) = semanage_user_exists(self.sh, k) + if not exists: +- (rc,exists) = semanage_user_exists(self.sh, k) +- if not exists: +- raise ValueError("SELinux user %s is already defined." % name) ++ raise ValueError("SELinux user %s is already defined." % name) (rc,u) = semanage_user_create(self.sh) -- if rc != 0: -+ if rc < 0: - raise ValueError("Could not create login mapping for %s" % name) - - semanage_user_set_name(self.sh, u, name) -@@ -141,12 +141,12 @@ - semanage_user_set_mlsrange(self.sh, u, serange) - semanage_user_set_mlslevel(self.sh, u, selevel) - (rc,key) = semanage_user_key_extract(self.sh,u) -- if rc != 0: -+ if rc < 0: - raise ValueError("Could not extract key for %s" % name) - - semanage_begin_transaction(self.sh) - semanage_user_add_local(self.sh, k, u) -- if semanage_commit(self.sh) != 0: -+ if semanage_commit(self.sh) < 0: - raise ValueError("Failed to add SELinux user") - - def modify(self, name, roles = [], selevel = "", serange = ""): -@@ -154,7 +154,7 @@ - raise ValueError("Requires, roles, level or range") - - (rc,k) = semanage_user_key_create(self.sh, name) -- if rc != 0: -+ if rc < 0: + if rc < 0: +@@ -157,15 +156,11 @@ + if rc < 0: raise ValueError("Could not create a key for %s" % name) - (rc,exists) = semanage_user_exists_local(self.sh, k) -@@ -166,24 +166,24 @@ - (rc,u) = semanage_user_query(self.sh, k) - else: - raise ValueError("SELinux user %s mapping is not defined." % name) -- if rc != 0: -+ if rc < 0: +- (rc,exists) = semanage_user_exists_local(self.sh, k) ++ (rc,exists) = semanage_user_exists(self.sh, k) + if exists: +- (rc,u) = semanage_user_query_local(self.sh, k) ++ (rc,u) = semanage_user_query(self.sh, k) + else: +- (rc,exists) = semanage_user_exists(self.sh, k) +- if exists: +- (rc,u) = semanage_user_query(self.sh, k) +- else: +- raise ValueError("SELinux user %s mapping is not defined." % name) ++ raise ValueError("SELinux user %s mapping is not defined locally." % name) + if rc < 0: raise ValueError("Could not query user for %s" % name) - if serange != "": - semanage_user_set_mlsrange(self.sh, u, serange) - if selevel != "": - semanage_user_set_mlslevel(self.sh, u, selevel) -- if len(roles) != 0: -+ if len(roles) < 0: - for r in roles: - semanage_user_add_role(self.sh, u, r) - semanage_begin_transaction(self.sh) - semanage_user_modify_local(self.sh, k, u) -- if semanage_commit(self.sh) != 0: -+ if semanage_commit(self.sh) < 0: - raise ValueError("Failed to modify SELinux user") - - def delete(self, name): +@@ -185,10 +180,14 @@ (rc,k) = semanage_user_key_create(self.sh, name) -- if rc != 0: -+ if rc < 0: + if rc < 0: raise ValueError("Could not crpppeate a key for %s" % name) - - (rc,exists) = semanage_user_exists_local(self.sh, k) -@@ -191,7 +191,7 @@ +- +- (rc,exists) = semanage_user_exists_local(self.sh, k) ++ (rc,exists) = semanage_user_exists(self.sh, k) + if not exists: raise ValueError("user %s is not defined" % name) ++ else: ++ (rc,exists) = semanage_user_exists_local(self.sh, k) ++ if not exists: ++ raise ValueError("user %s is not defined locally, can not delete " % name) ++ semanage_begin_transaction(self.sh) semanage_user_del_local(self.sh, k) -- if semanage_commit(self.sh) != 0: -+ if semanage_commit(self.sh) < 0: - raise ValueError("Login User %s not defined" % name) - - def list(self, heading=1): -@@ -238,7 +238,7 @@ + if semanage_commit(self.sh) < 0: +@@ -211,12 +210,9 @@ + roles += " " + char_by_idx(rlist, ridx) + print "%-15s %-10s %-15s %s" % (semanage_user_get_name(u), semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) + +-class portRecords: ++class portRecords(semanageRecords): + def __init__(self): +- self.sh = semanage_handle_create() +- self.semanaged = semanage_is_managed(self.sh) +- if self.semanaged: +- semanage_connect(self.sh) ++ semanageRecords.__init__(self) + + def __genkey(self, port, proto): + if proto == "tcp": +@@ -236,7 +232,7 @@ + else: + low=string.atoi(ports[0]) high=string.atoi(ports[1]) - +- ++ (rc,k) = semanage_port_key_create(self.sh, low, high, proto_d) -- if rc != 0: -+ if rc < 0: + if rc < 0: raise ValueError("Could not create a key for %s/%s" % (proto, port)) - return ( k, proto_d, low, high ) - -@@ -260,13 +260,13 @@ - raise ValueError("Port %s/%s already defined locally" % (proto, port)) +@@ -255,10 +251,6 @@ + if exists: + raise ValueError("Port %s/%s already defined" % (proto, port)) +- (rc,exists) = semanage_port_exists_local(self.sh, k) +- if exists: +- raise ValueError("Port %s/%s already defined locally" % (proto, port)) +- (rc,p) = semanage_port_create(self.sh) -- if rc != 0: -+ if rc < 0: + if rc < 0: raise ValueError("Could not create port for %s/%s" % (proto, port)) - - semanage_port_set_proto(p, proto_d) - semanage_port_set_range(p, low, high) - (rc, con) = semanage_context_create(self.sh) -- if rc != 0: -+ if rc < 0: - raise ValueError("Could not create context for %s/%s" % (proto, port)) - - semanage_context_set_user(self.sh, con, "system_u") -@@ -276,7 +276,7 @@ - semanage_port_set_con(p, con) +@@ -273,8 +265,8 @@ + semanage_context_set_role(self.sh, con, "object_r") + semanage_context_set_type(self.sh, con, type) + semanage_context_set_mls(self.sh, con, serange) +- semanage_port_set_con(p, con) semanage_begin_transaction(self.sh) ++ semanage_port_set_con(p, con) semanage_port_add_local(self.sh, k, p) -- if semanage_commit(self.sh) != 0: -+ if semanage_commit(self.sh) < 0: + if semanage_commit(self.sh) < 0: raise ValueError("Failed to add port") +@@ -285,25 +277,23 @@ - def modify(self, port, proto, serange, setype): -@@ -294,7 +294,7 @@ - else: - raise ValueError("port %s/%s is not defined." % (proto,port)) + ( k, proto_d, low, high ) = self.__genkey(port, proto) -- if rc != 0: -+ if rc < 0: +- (rc,exists) = semanage_port_exists_local(self.sh, k) ++ (rc,exists) = semanage_port_exists(self.sh, k) + if exists: +- (rc,p) = semanage_port_query_local(self.sh, k) +- (rc,exists) = semanage_port_exists(self.sh, k) +- if exists: +- (rc,p) = semanage_port_query(self.sh, k) +- else: +- raise ValueError("port %s/%s is not defined." % (proto,port)) ++ (rc,p) = semanage_port_query(self.sh, k) ++ else: ++ raise ValueError("port %s/%s is not defined." % (proto,port)) + + if rc < 0: raise ValueError("Could not query port for %s/%s" % (proto, port)) con = semanage_port_get_con(p) -@@ -306,7 +306,7 @@ - semanage_port_set_con(p, con) +- semanage_context_set_mls(self.sh, con, serange) ++ if rc < 0: ++ raise ValueError("Could not get port context for %s/%s" % (proto, port)) ++ + if serange != "": + semanage_context_set_mls(self.sh, con, serange) + if setype != "": + semanage_context_set_type(self.sh, con, setype) +- semanage_port_set_con(p, con) semanage_begin_transaction(self.sh) semanage_port_modify_local(self.sh, k, p) -- if semanage_commit(self.sh) != 0: -+ if semanage_commit(self.sh) < 0: - raise ValueError("Failed to add port") + if semanage_commit(self.sh) < 0: +@@ -311,9 +301,13 @@ def delete(self, port, proto): -@@ -317,7 +317,7 @@ + ( k, proto_d, low, high ) = self.__genkey(port, proto) +- (rc,exists) = semanage_port_exists_local(self.sh, k) ++ (rc,exists) = semanage_port_exists(self.sh, k) + if not exists: +- raise ValueError("port %s/%s is not defined localy." % (proto,port)) ++ raise ValueError("port %s/%s is not defined." % (proto,port)) ++ else: ++ (rc,exists) = semanage_port_exists_local(self.sh, k) ++ if not exists: ++ raise ValueError("port %s/%s is not defined localy, can not be deleted." % (proto,port)) semanage_begin_transaction(self.sh) semanage_port_del_local(self.sh, k) -- if semanage_commit(self.sh) != 0: +@@ -338,27 +332,116 @@ + dict[(name,proto)].append("%d" % low) + else: + dict[(name,proto)].append("%d-%d" % (low, high)) +- (status, self.plist, self.psize) = semanage_port_list_local(self.sh) +- for idx in range(self.psize): +- u = semanage_port_by_idx(self.plist, idx) +- con = semanage_port_get_con(u) +- name = semanage_context_get_type(con) +- proto=semanage_port_get_proto_str(u) +- low=semanage_port_get_low(u) +- high = semanage_port_get_high(u) +- if (name, proto) not in dict.keys(): +- dict[(name,proto)]=[] +- if low == high: +- dict[(name,proto)].append("%d" % low) +- else: +- dict[(name,proto)].append("%d-%d" % (low, high)) +- for i in dict.keys(): ++ keys=dict.keys() ++ keys.sort() ++ for i in keys: + rec = "%-30s %-8s " % i + rec += "%s" % dict[i][0] + for p in dict[i][1:]: + rec += ", %s" % p + print rec + ++class interfaceRecords(semanageRecords): ++ def __init__(self): ++ semanageRecords.__init__(self) ++ ++ def add(self, interface, serange, type): ++ if serange == "": ++ serange="s0" ++ ++ if type == "": ++ raise ValueError("Type is required") ++ ++ (rc,k) = semanage_iface_key_create(self.sh, interface) ++ if rc < 0: ++ raise ValueError("Can't create key for %s" % interface) ++ (rc,exists) = semanage_iface_exists(self.sh, k) ++ if exists: ++ raise ValueError("Interface %s already defined" % interface) ++ ++ (rc,iface) = semanage_iface_create(self.sh) ++ if rc < 0: ++ raise ValueError("Could not create interface for %s" % (interface)) ++ ++ rc = semanage_iface_set_name(self.sh, iface, interface) ++ (rc, con) = semanage_context_create(self.sh) ++ if rc < 0: ++ raise ValueError("Could not create context for %s" % interface) ++ ++ semanage_context_set_user(self.sh, con, "system_u") ++ semanage_context_set_role(self.sh, con, "object_r") ++ semanage_context_set_type(self.sh, con, type) ++ semanage_context_set_mls(self.sh, con, serange) ++ semanage_begin_transaction(self.sh) ++ semanage_iface_set_ifcon(iface, con) ++ semanage_iface_set_msgcon(iface, con) ++ semanage_iface_add_local(self.sh, k, iface) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Failed to add interface") ++ ++ def modify(self, interface, serange, setype): ++ if serange == "" and setype == "": ++ raise ValueError("Requires, setype or serange") ++ ++ (rc,k) = semanage_iface_key_create(self.sh, interface) ++ if rc < 0: ++ raise ValueError("Can't creater key for %s" % interface) ++ (rc,exists) = semanage_iface_exists(self.sh, k) ++ if exists: ++ (rc,p) = semanage_iface_query(self.sh, k) ++ else: ++ raise ValueError("interface %s is not defined." % interface) ++ ++ if rc < 0: ++ raise ValueError("Could not query interface for %s" % interface) ++ ++ con = semanage_iface_get_ifcon(p) ++ if rc < 0: ++ raise ValueError("Could not get interface context for %s" % interface) ++ ++ if serange != "": ++ semanage_context_set_mls(self.sh, con, serange) ++ if setype != "": ++ semanage_context_set_type(self.sh, con, setype) ++ ++ semanage_begin_transaction(self.sh) ++ semanage_iface_modify_local(self.sh, k, p) + if semanage_commit(self.sh) < 0: - raise ValueError("Port %s/%s not defined" % (proto,port)) ++ raise ValueError("Failed to add interface") ++ ++ def delete(self, interface): ++ (rc,k) = semanage_iface_key_create(self.sh, interface) ++ if rc < 0: ++ raise ValueError("Can't create key for %s" % interface) ++ (rc,exists) = semanage_iface_exists(self.sh, k) ++ if not exists: ++ raise ValueError("interface %s is not defined." % interface) ++ else: ++ (rc,exists) = semanage_iface_exists_local(self.sh, k) ++ if not exists: ++ raise ValueError("interface %s is not defined localy, can not be deleted." % interface) ++ ++ semanage_begin_transaction(self.sh) ++ semanage_iface_del_local(self.sh, k) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Interface %s not defined" % interface) ++ ++ def list(self, heading=1): ++ (status, self.plist, self.psize) = semanage_iface_list(self.sh) ++ if status < 0: ++ raise ValueError("Unable to list interfaces") ++ ++ if heading: ++ print "%-30s %s\n" % ("SELinux Interface", "Context") ++ dict={} ++ for idx in range(self.psize): ++ iface = semanage_iface_by_idx(self.plist, idx) ++ name = semanage_iface_get_name(iface) ++ con = semanage_iface_get_ifcon(iface) ++ ++ ++ print "%-30s %s:%s:%s:%s " % (name,semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con)) ++ + if __name__ == '__main__': + + def usage(message = ""): +@@ -366,6 +449,7 @@ + semanage user [-admsRrh] SELINUX_USER\n\ + semanage login [-admsrh] LOGIN_NAME\n\ + semanage port [-admth] PORT | PORTRANGE\n\ ++semanage interface [-admth] INTERFACE\n\ + -a, --add Add a OBJECT record NAME\n\ + -d, --delete Delete a OBJECT record NAME\n\ + -h, --help display this message\n\ +@@ -391,7 +475,7 @@ + # + # + try: +- objectlist = ("login", "user", "port") ++ objectlist = ("login", "user", "port", "interface") + input = sys.stdin + output = sys.stdout + serange = "" +@@ -482,6 +566,9 @@ + if object == "port": + OBJECT = portRecords() - def list(self, heading=1): ++ if object == "interface": ++ OBJECT = interfaceRecords() ++ + if list: + OBJECT.list(heading) + sys.exit(0); +@@ -504,6 +591,9 @@ + if object == "port": + OBJECT.add(target, proto, serange, setype) + ++ if object == "interface": ++ OBJECT.add(target, serange, setype) ++ + sys.exit(0); + + if modify: +@@ -516,7 +606,10 @@ + + if object == "port": + OBJECT.modify(target, proto, serange, setype) +- sys.exit(0); ++ ++ if object == "interface": ++ OBJECT.modify(target, serange, setype) ++ + sys.exit(0); + + if delete: Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- policycoreutils.spec 4 Jan 2006 18:57:29 -0000 1.209 +++ policycoreutils.spec 5 Jan 2006 21:39:11 -0000 1.210 @@ -1,9 +1,9 @@ -%define libsepolver 1.11.2-2 -%define libsemanagever 1.5.4-1 +%define libsepolver 1.11.5-1 +%define libsemanagever 1.5.8-1 %define libselinuxver 1.29.3-2 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.29.3 +Version: 1.29.4 Release: 1 License: GPL Group: System Environment/Base @@ -96,6 +96,11 @@ %config(noreplace) %{_sysconfdir}/sestatus.conf %changelog +* Thu Jan 5 2006 Dan Walsh 1.29.4-1 +- Update to match NSA + * Merged genhomedircon and semanage patch from Dan Walsh. + * Changed semodule error reporting to include argv[0]. + * Wed Jan 4 2006 Dan Walsh 1.29.3-1 - Update to match NSA * Merged semanage getpwnam bug fix from Serge Hallyn (IBM). Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- sources 4 Jan 2006 18:53:17 -0000 1.96 +++ sources 5 Jan 2006 21:39:11 -0000 1.97 @@ -1 +1 @@ -cc6c24f4661760764c33ec8786f3efee policycoreutils-1.29.3.tgz +da2c70fed32e21137b61f23da7a459f5 policycoreutils-1.29.5.tgz From fedora-cvs-commits at redhat.com Thu Jan 5 21:54:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 16:54:15 -0500 Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.8, 1.9 policy-20060104.patch, 1.1, 1.2 Message-ID: <200601052154.k05LsFag032433@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32404 Modified Files: modules-targeted.conf policy-20060104.patch Log Message: * Wed Jan 4 2006 Dan Walsh 2.1.7-1 - Update to upstream Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- modules-targeted.conf 30 Dec 2005 16:08:00 -0000 1.8 +++ modules-targeted.conf 5 Jan 2006 21:54:11 -0000 1.9 @@ -139,7 +139,7 @@ # # Virtual Private Networking client # -vpn = off +vpn = base # Layer: admin # Module: su policy-20060104.patch: Makefile | 2 Rules.modular | 10 config/appconfig-strict-mcs/default_type | 6 config/appconfig-strict-mls/default_type | 7 config/appconfig-strict-mls/initrc_context | 2 config/appconfig-targeted-mcs/default_type | 2 config/appconfig-targeted-mls/default_type | 2 config/appconfig-targeted-mls/initrc_context | 2 man/man8/ftpd_selinux.8 | 56 ++++ man/man8/httpd_selinux.8 | 123 ++++++++ man/man8/kerberos_selinux.8 | 31 ++ man/man8/named_selinux.8 | 29 ++ man/man8/nfs_selinux.8 | 30 ++ man/man8/nis_selinux.8 | 1 man/man8/rsync_selinux.8 | 41 ++ man/man8/samba_selinux.8 | 60 ++++ man/man8/ypbind_selinux.8 | 19 + policy/global_tunables | 3 policy/mcs | 321 ++++------------------- policy/mls | 371 +++++---------------------- policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 9 policy/modules/admin/logrotate.te | 4 policy/modules/admin/rpm.fc | 1 policy/modules/admin/rpm.te | 19 - policy/modules/admin/su.if | 2 policy/modules/admin/tmpreaper.te | 3 policy/modules/admin/usermanage.te | 15 - policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 + policy/modules/apps/java.te | 25 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.te | 6 policy/modules/kernel/corenetwork.te.in | 12 policy/modules/kernel/devices.fc | 9 policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.fc | 27 + policy/modules/kernel/files.if | 17 + policy/modules/kernel/kernel.if | 3 policy/modules/kernel/kernel.te | 30 +- policy/modules/kernel/mls.te | 9 policy/modules/kernel/selinux.te | 2 policy/modules/kernel/storage.fc | 46 +-- policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 9 policy/modules/services/bind.if | 19 + policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 3 policy/modules/services/cups.te | 7 policy/modules/services/cvs.fc | 2 policy/modules/services/cvs.te | 6 policy/modules/services/dbus.te | 1 policy/modules/services/dovecot.te | 2 policy/modules/services/hal.te | 4 policy/modules/services/ldap.te | 4 policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 103 +++++++ policy/modules/services/mta.te | 13 policy/modules/services/nscd.te | 1 policy/modules/services/ntp.te | 2 policy/modules/services/ppp.te | 4 policy/modules/services/prelink.fc | 7 policy/modules/services/prelink.if | 39 ++ policy/modules/services/prelink.te | 64 ++++ policy/modules/services/remotelogin.te | 1 policy/modules/services/samba.if | 3 policy/modules/services/sasl.te | 8 policy/modules/services/sendmail.te | 36 -- policy/modules/services/ssh.te | 10 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 12 policy/modules/system/authlogin.te | 1 policy/modules/system/getty.te | 3 policy/modules/system/hostname.if | 15 + policy/modules/system/hostname.te | 37 -- policy/modules/system/init.if | 14 + policy/modules/system/init.te | 22 + policy/modules/system/iptables.te | 2 policy/modules/system/libraries.fc | 126 ++++----- policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 2 policy/modules/system/logging.fc | 7 policy/modules/system/logging.if | 21 + policy/modules/system/logging.te | 5 policy/modules/system/lvm.te | 2 policy/modules/system/mount.te | 2 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 11 policy/modules/system/udev.fc | 1 policy/modules/system/udev.te | 4 policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.te | 13 policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 27 + policy/modules/system/userdomain.te | 17 + policy/users | 8 102 files changed, 1393 insertions(+), 789 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- policy-20060104.patch 4 Jan 2006 19:24:24 -0000 1.1 +++ policy-20060104.patch 5 Jan 2006 21:54:11 -0000 1.2 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/default_type serefpolicy-2.1.7/config/appconfig-strict-mcs/default_type --- nsaserefpolicy/config/appconfig-strict-mcs/default_type 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-strict-mcs/default_type 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/config/appconfig-strict-mcs/default_type 2006-01-05 11:12:20.000000000 -0500 @@ -1,3 +1,3 @@ -sysadm_r:sysadm_t:s0 -staff_r:staff_t:s0 @@ -10,7 +10,7 @@ +user_r:user_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.1.7/config/appconfig-strict-mls/default_type --- nsaserefpolicy/config/appconfig-strict-mls/default_type 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-strict-mls/default_type 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/config/appconfig-strict-mls/default_type 2006-01-05 11:12:20.000000000 -0500 @@ -1,3 +1,4 @@ -sysadm_r:sysadm_t:s0 -staff_r:staff_t:s0 @@ -21,31 +21,31 @@ +user_r:user_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/initrc_context serefpolicy-2.1.7/config/appconfig-strict-mls/initrc_context --- nsaserefpolicy/config/appconfig-strict-mls/initrc_context 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-strict-mls/initrc_context 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/config/appconfig-strict-mls/initrc_context 2006-01-05 11:12:20.000000000 -0500 @@ -1 +1 @@ -system_u:system_r:initrc_t:s0 +system_u:system_r:initrc_t:s0-s15:c0.c255 diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/default_type serefpolicy-2.1.7/config/appconfig-targeted-mcs/default_type --- nsaserefpolicy/config/appconfig-targeted-mcs/default_type 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-targeted-mcs/default_type 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/config/appconfig-targeted-mcs/default_type 2006-01-05 11:12:20.000000000 -0500 @@ -1 +1 @@ -system_r:unconfined_t:s0 +system_r:unconfined_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mls/default_type serefpolicy-2.1.7/config/appconfig-targeted-mls/default_type --- nsaserefpolicy/config/appconfig-targeted-mls/default_type 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-targeted-mls/default_type 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/config/appconfig-targeted-mls/default_type 2006-01-05 11:12:20.000000000 -0500 @@ -1 +1 @@ -system_r:unconfined_t:s0 +system_r:unconfined_t diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mls/initrc_context serefpolicy-2.1.7/config/appconfig-targeted-mls/initrc_context --- nsaserefpolicy/config/appconfig-targeted-mls/initrc_context 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-targeted-mls/initrc_context 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/config/appconfig-targeted-mls/initrc_context 2006-01-05 11:12:20.000000000 -0500 @@ -1 +1 @@ -user_u:system_r:unconfined_t:s0 +user_u:system_r:unconfined_t:s0-s15:c0.c255 diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.7/Makefile --- nsaserefpolicy/Makefile 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/Makefile 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/Makefile 2006-01-05 11:12:20.000000000 -0500 @@ -92,7 +92,7 @@ # enable MLS if requested. @@ -57,7 +57,7 @@ endif diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-2.1.7/man/man8/ftpd_selinux.8 --- nsaserefpolicy/man/man8/ftpd_selinux.8 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/man/man8/ftpd_selinux.8 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/man/man8/ftpd_selinux.8 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,56 @@ +.TH "ftpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "ftpd Selinux Policy documentation" +.SH "NAME" @@ -117,7 +117,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-2.1.7/man/man8/httpd_selinux.8 --- nsaserefpolicy/man/man8/httpd_selinux.8 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/man/man8/httpd_selinux.8 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/man/man8/httpd_selinux.8 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,123 @@ +.TH "httpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "httpd Selinux Policy documentation" +.SH "NAME" @@ -244,7 +244,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/kerberos_selinux.8 serefpolicy-2.1.7/man/man8/kerberos_selinux.8 --- nsaserefpolicy/man/man8/kerberos_selinux.8 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/man/man8/kerberos_selinux.8 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/man/man8/kerberos_selinux.8 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,31 @@ +.TH "kerberos_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "kerberos Selinux Policy documentation" +.SH "NAME" @@ -279,7 +279,7 @@ +selinux(8), kerberos(1), chcon(1), setsebool(8) diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/named_selinux.8 serefpolicy-2.1.7/man/man8/named_selinux.8 --- nsaserefpolicy/man/man8/named_selinux.8 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/man/man8/named_selinux.8 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/man/man8/named_selinux.8 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,29 @@ +.TH "named_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "named Selinux Policy documentation" +.SH "NAME" @@ -312,7 +312,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/nfs_selinux.8 serefpolicy-2.1.7/man/man8/nfs_selinux.8 --- nsaserefpolicy/man/man8/nfs_selinux.8 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/man/man8/nfs_selinux.8 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/man/man8/nfs_selinux.8 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,30 @@ +.TH "nfs_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "nfs Selinux Policy documentation" +.SH "NAME" @@ -346,12 +346,12 @@ +selinux(8), chcon(1), setsebool(8) diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/nis_selinux.8 serefpolicy-2.1.7/man/man8/nis_selinux.8 --- nsaserefpolicy/man/man8/nis_selinux.8 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/man/man8/nis_selinux.8 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/man/man8/nis_selinux.8 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1 @@ +.so man8/ypbind_selinux.8 diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/rsync_selinux.8 serefpolicy-2.1.7/man/man8/rsync_selinux.8 --- nsaserefpolicy/man/man8/rsync_selinux.8 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/man/man8/rsync_selinux.8 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/man/man8/rsync_selinux.8 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,41 @@ +.TH "rsync_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "rsync Selinux Policy documentation" +.SH "NAME" @@ -396,7 +396,7 @@ +selinux(8), rsync(1), chcon(1), setsebool(8) diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/samba_selinux.8 serefpolicy-2.1.7/man/man8/samba_selinux.8 --- nsaserefpolicy/man/man8/samba_selinux.8 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/man/man8/samba_selinux.8 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/man/man8/samba_selinux.8 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,60 @@ +.TH "samba_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "Samba Selinux Policy documentation" +.SH "NAME" @@ -460,7 +460,7 @@ +selinux(8), samba(7), chcon(1), setsebool(8) diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ypbind_selinux.8 serefpolicy-2.1.7/man/man8/ypbind_selinux.8 --- nsaserefpolicy/man/man8/ypbind_selinux.8 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/man/man8/ypbind_selinux.8 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/man/man8/ypbind_selinux.8 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,19 @@ +.TH "ypbind_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "ypbind Selinux Policy documentation" +.SH "NAME" @@ -483,7 +483,7 @@ +selinux(8), ypbind(8), chcon(1), setsebool(8) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.1.7/policy/global_tunables --- nsaserefpolicy/policy/global_tunables 2005-12-12 23:05:35.000000000 -0500 -+++ serefpolicy-2.1.7/policy/global_tunables 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/global_tunables 2006-01-05 11:12:20.000000000 -0500 @@ -42,6 +42,9 @@ ## Allow sasl to read shadow gen_tunable(allow_saslauthd_read_shadow,false) @@ -496,7 +496,7 @@ gen_tunable(allow_smbd_anon_write,false) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mcs serefpolicy-2.1.7/policy/mcs --- nsaserefpolicy/policy/mcs 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/mcs 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/mcs 2006-01-05 11:12:20.000000000 -0500 @@ -19,263 +19,70 @@ # # Each category has a name and zero or more aliases. @@ -827,7 +827,7 @@ # Each MCS level specifies a sensitivity and zero or more categories which may diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/mls serefpolicy-2.1.7/policy/mls --- nsaserefpolicy/policy/mls 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/mls 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/mls 2006-01-05 11:12:20.000000000 -0500 @@ -33,262 +33,70 @@ # # Each category has a name and zero or more aliases. @@ -1294,7 +1294,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.1.7/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/admin/amanda.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/admin/amanda.te 2006-01-05 11:12:20.000000000 -0500 @@ -165,6 +165,10 @@ sysnet_read_config(amanda_t) @@ -1308,7 +1308,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.1.7/policy/modules/admin/kudzu.te --- nsaserefpolicy/policy/modules/admin/kudzu.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/admin/kudzu.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/admin/kudzu.te 2006-01-05 11:12:20.000000000 -0500 @@ -23,7 +23,8 @@ allow kudzu_t self:capability { dac_override sys_admin sys_rawio net_admin sys_tty_config mknod }; @@ -1340,8 +1340,8 @@ gpm_getattr_gpmctl(kudzu_t) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logrotate.te serefpolicy-2.1.7/policy/modules/admin/logrotate.te ---- nsaserefpolicy/policy/modules/admin/logrotate.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/admin/logrotate.te 2006-01-04 10:50:14.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/logrotate.te 2006-01-04 17:28:52.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/admin/logrotate.te 2006-01-05 11:12:20.000000000 -0500 @@ -67,6 +67,10 @@ kernel_read_system_state(logrotate_t) kernel_read_kernel_sysctl(logrotate_t) @@ -1355,7 +1355,7 @@ fs_search_auto_mountpoints(logrotate_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.1.7/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/admin/rpm.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/admin/rpm.fc 2006-01-05 11:12:20.000000000 -0500 @@ -1,5 +1,6 @@ /bin/rpm -- gen_context(system_u:object_r:rpm_exec_t,s0) @@ -1365,7 +1365,7 @@ /usr/bin/apt-shell -- gen_context(system_u:object_r:rpm_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.1.7/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2005-12-14 10:38:49.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/admin/rpm.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/admin/rpm.te 2006-01-05 11:12:20.000000000 -0500 @@ -114,6 +114,10 @@ fs_getattr_all_fs(rpm_t) fs_search_auto_mountpoints(rpm_t) @@ -1411,9 +1411,22 @@ tunable_policy(`allow_execmem',` allow rpm_script_t self:process execmem; ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.1.7/policy/modules/admin/su.if +--- nsaserefpolicy/policy/modules/admin/su.if 2005-12-09 23:35:04.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/admin/su.if 2006-01-05 16:38:30.000000000 -0500 +@@ -193,7 +193,9 @@ + domain_use_wide_inherit_fd($1_su_t) + + files_read_etc_files($1_su_t) ++ files_read_etc_runtime_files($1_su_t) + files_search_var_lib($1_su_t) ++ files_dontaudit_getattr_tmp_dir($1_su_t) + + init_dontaudit_use_fd($1_su_t) + # Write to utmp. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-2.1.7/policy/modules/admin/tmpreaper.te --- nsaserefpolicy/policy/modules/admin/tmpreaper.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/admin/tmpreaper.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/admin/tmpreaper.te 2006-01-05 11:12:20.000000000 -0500 @@ -39,6 +39,9 @@ miscfiles_read_localization(tmpreaper_t) miscfiles_delete_man_pages(tmpreaper_t) @@ -1426,7 +1439,7 @@ ifdef(`TODO',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.1.7/policy/modules/admin/usermanage.te --- nsaserefpolicy/policy/modules/admin/usermanage.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/admin/usermanage.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/admin/usermanage.te 2006-01-05 11:12:20.000000000 -0500 @@ -44,6 +44,10 @@ type passwd_exec_t; domain_entry_file(passwd_t,passwd_exec_t) @@ -1479,7 +1492,7 @@ selinux_get_fs_mount(useradd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.1.7/policy/modules/apps/java.fc --- nsaserefpolicy/policy/modules/apps/java.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/apps/java.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/apps/java.fc 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,4 @@ + +/usr/.*/java -- gen_context(system_u:object_r:java_exec_t,s0) @@ -1487,7 +1500,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.1.7/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/apps/java.if 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/apps/java.if 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,23 @@ +## Load keyboard mappings. + @@ -1514,7 +1527,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.1.7/policy/modules/apps/java.te --- nsaserefpolicy/policy/modules/apps/java.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/apps/java.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/apps/java.te 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,25 @@ +policy_module(java,1.0.0) + @@ -1543,7 +1556,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/webalizer.te serefpolicy-2.1.7/policy/modules/apps/webalizer.te --- nsaserefpolicy/policy/modules/apps/webalizer.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/apps/webalizer.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/apps/webalizer.te 2006-01-05 11:12:20.000000000 -0500 @@ -87,6 +87,7 @@ sysnet_read_config(webalizer_t) @@ -1554,7 +1567,7 @@ apache_manage_sys_content(webalizer_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.te serefpolicy-2.1.7/policy/modules/kernel/corecommands.te --- nsaserefpolicy/policy/modules/kernel/corecommands.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/corecommands.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/corecommands.te 2006-01-05 11:12:20.000000000 -0500 @@ -35,3 +35,9 @@ type chroot_exec_t; @@ -1567,7 +1580,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corenetwork.te.in serefpolicy-2.1.7/policy/modules/kernel/corenetwork.te.in --- nsaserefpolicy/policy/modules/kernel/corenetwork.te.in 2005-12-02 17:53:26.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/corenetwork.te.in 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/corenetwork.te.in 2006-01-05 11:12:20.000000000 -0500 @@ -143,15 +143,15 @@ # nodes in net_contexts or net_contexts.mls. # @@ -1601,7 +1614,7 @@ #network_interface(eth0, eth0,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.fc serefpolicy-2.1.7/policy/modules/kernel/devices.fc --- nsaserefpolicy/policy/modules/kernel/devices.fc 2005-11-14 18:24:07.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/devices.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/devices.fc 2006-01-05 11:12:20.000000000 -0500 @@ -17,10 +17,10 @@ /dev/full -c gen_context(system_u:object_r:null_device_t,s0) /dev/irlpt[0-9]+ -c gen_context(system_u:object_r:printer_device_t,s0) @@ -1639,7 +1652,7 @@ /dev/s(ou)?nd/.* -c gen_context(system_u:object_r:sound_device_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.1.7/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2005-12-12 15:35:53.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/domain.if 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/domain.if 2006-01-05 11:12:20.000000000 -0500 @@ -501,6 +501,7 @@ ') @@ -1650,7 +1663,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.1.7/policy/modules/kernel/domain.te --- nsaserefpolicy/policy/modules/kernel/domain.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/domain.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/domain.te 2006-01-05 11:12:20.000000000 -0500 @@ -67,3 +67,7 @@ # cjp: also need to except correctly for SEFramework neverallow { domain unlabeled_t } file_type:process *; @@ -1661,8 +1674,8 @@ +') \ No newline at end of file diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.1.7/policy/modules/kernel/files.fc ---- nsaserefpolicy/policy/modules/kernel/files.fc 2005-12-01 17:57:16.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/files.fc 2006-01-04 10:50:14.000000000 -0500 +--- nsaserefpolicy/policy/modules/kernel/files.fc 2006-01-04 17:28:52.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/files.fc 2006-01-05 11:12:20.000000000 -0500 @@ -24,7 +24,7 @@ # /boot # @@ -1672,7 +1685,7 @@ /boot/lost\+found/.* <> # -@@ -88,9 +88,9 @@ +@@ -89,9 +89,9 @@ # HOME_ROOT # expanded by genhomedircon # @@ -1684,7 +1697,7 @@ HOME_ROOT/lost\+found/.* <> # -@@ -102,7 +102,7 @@ +@@ -103,7 +103,7 @@ # # /lost+found # @@ -1693,7 +1706,7 @@ /lost\+found/.* <> # -@@ -149,11 +149,11 @@ +@@ -150,11 +150,11 @@ # # /tmp # @@ -1707,7 +1720,7 @@ /tmp/lost\+found/.* <> # -@@ -170,19 +170,19 @@ +@@ -171,19 +171,19 @@ /usr/local/etc(/.*)? gen_context(system_u:object_r:etc_t,s0) @@ -1730,7 +1743,7 @@ /usr/tmp/.* <> # -@@ -201,16 +201,17 @@ +@@ -202,16 +202,17 @@ /var/lock(/.*)? gen_context(system_u:object_r:var_lock_t,s0) @@ -1753,9 +1766,9 @@ /var/tmp/lost\+found/.* <> /var/tmp/vi\.recover -d gen_context(system_u:object_r:tmp_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.1.7/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/files.if 2006-01-04 10:50:14.000000000 -0500 -@@ -3149,3 +3149,20 @@ +--- nsaserefpolicy/policy/modules/kernel/files.if 2006-01-04 17:28:52.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/files.if 2006-01-05 11:12:20.000000000 -0500 +@@ -3183,3 +3183,20 @@ ') ') ') @@ -1779,7 +1792,7 @@ \ No newline at end of file diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.1.7/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2005-12-06 19:49:49.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/kernel.if 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/kernel.if 2006-01-05 11:12:20.000000000 -0500 @@ -436,7 +436,7 @@ type debugfs_t; ') @@ -1799,7 +1812,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.1.7/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/kernel.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/kernel.te 2006-01-05 11:12:20.000000000 -0500 @@ -38,7 +38,7 @@ domain_base_type(kernel_t) mls_rangetrans_source(kernel_t) @@ -1886,7 +1899,7 @@ term_use_console(kernel_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.7/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2005-12-13 15:51:49.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/mls.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/mls.te 2006-01-05 11:12:20.000000000 -0500 @@ -36,8 +36,11 @@ attribute mlsxwinreadtoclr; attribute mlsxwinwrite; @@ -1915,7 +1928,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/selinux.te serefpolicy-2.1.7/policy/modules/kernel/selinux.te --- nsaserefpolicy/policy/modules/kernel/selinux.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/selinux.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/selinux.te 2006-01-05 11:12:20.000000000 -0500 @@ -18,7 +18,7 @@ type security_t; fs_type(security_t) @@ -1927,7 +1940,7 @@ neverallow ~can_load_policy security_t:security load_policy; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.1.7/policy/modules/kernel/storage.fc --- nsaserefpolicy/policy/modules/kernel/storage.fc 2005-11-14 18:24:07.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/kernel/storage.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/kernel/storage.fc 2006-01-05 11:12:20.000000000 -0500 @@ -5,35 +5,35 @@ /dev/n?osst[0-3].* -c gen_context(system_u:object_r:tape_device_t,s0) /dev/n?pt[0-9]+ -c gen_context(system_u:object_r:tape_device_t,s0) @@ -2012,7 +2025,7 @@ /dev/usb/rio500 -c gen_context(system_u:object_r:removable_device_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.1.7/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2005-12-12 23:05:35.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/apache.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/apache.te 2006-01-05 11:12:20.000000000 -0500 @@ -391,6 +391,10 @@ userdom_dontaudit_use_sysadm_terms(httpd_t) ') @@ -2035,7 +2048,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.1.7/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/apm.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/apm.te 2006-01-05 11:12:20.000000000 -0500 @@ -196,6 +196,7 @@ ') @@ -2046,7 +2059,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.1.7/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2005-12-13 15:51:49.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/automount.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/automount.te 2006-01-05 11:12:20.000000000 -0500 @@ -28,7 +28,7 @@ # Local policy # @@ -2086,7 +2099,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-2.1.7/policy/modules/services/bind.if --- nsaserefpolicy/policy/modules/services/bind.if 2005-12-02 17:53:53.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/bind.if 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/bind.if 2006-01-05 11:12:20.000000000 -0500 @@ -188,3 +188,22 @@ allow $1 named_var_run_t:dir setattr; @@ -2112,7 +2125,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.1.7/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/bluetooth.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/bluetooth.te 2006-01-05 11:12:20.000000000 -0500 @@ -54,6 +54,7 @@ allow bluetooth_t bluetooth_conf_t:dir rw_dir_perms; @@ -2123,7 +2136,7 @@ allow bluetooth_t bluetooth_conf_rw_t:file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.1.7/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2005-12-13 15:51:49.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/cron.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/cron.te 2006-01-05 11:12:20.000000000 -0500 @@ -1,5 +1,5 @@ -policy_module(cron, 1.1.1) @@ -2141,7 +2154,7 @@ libs_use_shared_libs(crond_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.1.7/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/cups.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/cups.te 2006-01-05 11:12:20.000000000 -0500 @@ -201,8 +201,7 @@ ') @@ -2172,7 +2185,7 @@ optional_policy(`dbus',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.fc serefpolicy-2.1.7/policy/modules/services/cvs.fc --- nsaserefpolicy/policy/modules/services/cvs.fc 2005-11-14 18:24:07.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/cvs.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/cvs.fc 2006-01-05 11:12:20.000000000 -0500 @@ -1,2 +1,4 @@ /usr/bin/cvs -- gen_context(system_u:object_r:cvs_exec_t,s0) @@ -2180,7 +2193,7 @@ +/opt/cvs(/.*)? gen_context(system_u:object_r:cvs_data_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cvs.te serefpolicy-2.1.7/policy/modules/services/cvs.te --- nsaserefpolicy/policy/modules/services/cvs.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/cvs.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/cvs.te 2006-01-05 11:12:20.000000000 -0500 @@ -86,6 +86,12 @@ mta_send_mail(cvs_t) @@ -2196,7 +2209,7 @@ kerberos_read_keytab(cvs_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.te serefpolicy-2.1.7/policy/modules/services/dbus.te --- nsaserefpolicy/policy/modules/services/dbus.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/dbus.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/dbus.te 2006-01-05 11:12:20.000000000 -0500 @@ -44,6 +44,7 @@ allow system_dbusd_t dbusd_etc_t:dir r_dir_perms; allow system_dbusd_t dbusd_etc_t:file r_file_perms; @@ -2207,7 +2220,7 @@ allow system_dbusd_t system_dbusd_tmp_t:file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.7/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2005-12-13 15:51:50.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/dovecot.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/dovecot.te 2006-01-05 11:12:20.000000000 -0500 @@ -95,6 +95,8 @@ files_read_etc_files(dovecot_t) files_search_spool(dovecot_t) @@ -2219,7 +2232,7 @@ init_use_script_pty(dovecot_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.7/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2005-12-14 10:38:50.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/hal.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/hal.te 2006-01-05 11:12:20.000000000 -0500 @@ -49,6 +49,8 @@ kernel_read_kernel_sysctl(hald_t) kernel_write_proc_file(hald_t) @@ -2247,7 +2260,7 @@ init_use_script_pty(hald_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ldap.te serefpolicy-2.1.7/policy/modules/services/ldap.te --- nsaserefpolicy/policy/modules/services/ldap.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/ldap.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/ldap.te 2006-01-05 11:12:20.000000000 -0500 @@ -142,6 +142,10 @@ nis_use_ypbind(slapd_t) ') @@ -2261,7 +2274,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.fc serefpolicy-2.1.7/policy/modules/services/locate.fc --- nsaserefpolicy/policy/modules/services/locate.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/locate.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/locate.fc 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,4 @@ +# locate - file locater +/usr/bin/updatedb -- gen_context(system_u:object_r:locate_exec_t, s0) @@ -2269,12 +2282,12 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.if serefpolicy-2.1.7/policy/modules/services/locate.if --- nsaserefpolicy/policy/modules/services/locate.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/locate.if 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/locate.if 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1 @@ +## Update database for mlocate diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.te serefpolicy-2.1.7/policy/modules/services/locate.te --- nsaserefpolicy/policy/modules/services/locate.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/locate.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/locate.te 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,50 @@ +policy_module(locate,1.0.0) + @@ -2328,19 +2341,19 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/logwatch.fc serefpolicy-2.1.7/policy/modules/services/logwatch.fc --- nsaserefpolicy/policy/modules/services/logwatch.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/logwatch.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/logwatch.fc 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,3 @@ +# logwatch - file logwatchr +/usr/share/logwatch/scripts/logwatch.pl -- gen_context(system_u:object_r:logwatch_exec_t, s0) +/var/cache/logwatch(/.*)? gen_context(system_u:object_r:logwatch_cache_t, s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/logwatch.if serefpolicy-2.1.7/policy/modules/services/logwatch.if --- nsaserefpolicy/policy/modules/services/logwatch.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/logwatch.if 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/logwatch.if 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1 @@ +## Update database for mlogwatch diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/logwatch.te serefpolicy-2.1.7/policy/modules/services/logwatch.te --- nsaserefpolicy/policy/modules/services/logwatch.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/logwatch.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/logwatch.te 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,103 @@ +policy_module(logwatch,1.0.0) + @@ -2446,8 +2459,8 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.1.7/policy/modules/services/mta.te ---- nsaserefpolicy/policy/modules/services/mta.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/mta.te 2006-01-04 10:50:14.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/mta.te 2006-01-04 17:28:52.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/mta.te 2006-01-05 11:12:20.000000000 -0500 @@ -47,6 +47,9 @@ allow system_mail_t etc_mail_t:dir { getattr search }; allow system_mail_t etc_mail_t:file r_file_perms; @@ -2469,7 +2482,7 @@ optional_policy(`postfix',` allow system_mail_t etc_aliases_t:dir create_dir_perms; allow system_mail_t etc_aliases_t:file create_file_perms; -@@ -170,3 +177,9 @@ +@@ -174,3 +181,9 @@ cron_read_system_job_tmp_files(mta_user_agent) ') ') @@ -2481,7 +2494,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.1.7/policy/modules/services/nscd.te --- nsaserefpolicy/policy/modules/services/nscd.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/nscd.te 2006-01-04 12:04:46.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/nscd.te 2006-01-05 11:12:20.000000000 -0500 @@ -128,7 +128,6 @@ optional_policy(`samba',` @@ -2492,7 +2505,7 @@ optional_policy(`udev',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.1.7/policy/modules/services/ntp.te --- nsaserefpolicy/policy/modules/services/ntp.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/ntp.te 2006-01-04 12:03:40.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/ntp.te 2006-01-05 11:12:20.000000000 -0500 @@ -148,8 +148,6 @@ ') @@ -2504,7 +2517,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ppp.te serefpolicy-2.1.7/policy/modules/services/ppp.te --- nsaserefpolicy/policy/modules/services/ppp.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/ppp.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/ppp.te 2006-01-05 11:12:20.000000000 -0500 @@ -318,10 +318,10 @@ udev_read_db(pptp_t) ') @@ -2520,7 +2533,7 @@ domain_auto_trans(pppd_t, pppd_script_exec_t, initrc_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.fc serefpolicy-2.1.7/policy/modules/services/prelink.fc --- nsaserefpolicy/policy/modules/services/prelink.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/prelink.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/prelink.fc 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,7 @@ +# prelink - prelink ELF shared libraries and binaries to speed up startup time +/usr/sbin/prelink -- gen_context(system_u:object_r:prelink_exec_t,s0) @@ -2531,7 +2544,7 @@ +/etc/prelink\.cache -- gen_context(system_u:object_r:prelink_cache_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.if serefpolicy-2.1.7/policy/modules/services/prelink.if --- nsaserefpolicy/policy/modules/services/prelink.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/prelink.if 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/prelink.if 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,39 @@ +## Prelink mappings. + @@ -2574,7 +2587,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.te serefpolicy-2.1.7/policy/modules/services/prelink.te --- nsaserefpolicy/policy/modules/services/prelink.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/prelink.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/prelink.te 2006-01-05 11:12:20.000000000 -0500 @@ -0,0 +1,64 @@ +policy_module(prelink,1.0.0) + @@ -2642,7 +2655,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/remotelogin.te serefpolicy-2.1.7/policy/modules/services/remotelogin.te --- nsaserefpolicy/policy/modules/services/remotelogin.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/remotelogin.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/remotelogin.te 2006-01-05 11:12:20.000000000 -0500 @@ -106,6 +106,7 @@ logging_send_syslog_msg(remote_login_t) @@ -2653,7 +2666,7 @@ mls_file_downgrade(remote_login_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.1.7/policy/modules/services/samba.if --- nsaserefpolicy/policy/modules/services/samba.if 2005-12-05 22:35:03.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/samba.if 2006-01-04 12:04:33.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/samba.if 2006-01-05 11:12:20.000000000 -0500 @@ -158,6 +158,7 @@ ') @@ -2674,7 +2687,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sasl.te serefpolicy-2.1.7/policy/modules/services/sasl.te --- nsaserefpolicy/policy/modules/services/sasl.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/sasl.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/sasl.te 2006-01-05 11:12:20.000000000 -0500 @@ -88,9 +88,11 @@ ') @@ -2692,7 +2705,7 @@ mysql_search_db_dir(saslauthd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.1.7/policy/modules/services/sendmail.te --- nsaserefpolicy/policy/modules/services/sendmail.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/sendmail.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/sendmail.te 2006-01-05 11:12:20.000000000 -0500 @@ -15,15 +15,10 @@ type sendmail_var_run_t; files_pid_file(sendmail_var_run_t) @@ -2775,7 +2788,7 @@ ') dnl end TODO diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.te serefpolicy-2.1.7/policy/modules/services/ssh.te --- nsaserefpolicy/policy/modules/services/ssh.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/ssh.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/ssh.te 2006-01-05 11:12:20.000000000 -0500 @@ -91,10 +91,6 @@ seutil_read_config(sshd_t) @@ -2802,7 +2815,7 @@ # Relabel and access ptys created by sshd diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xdm.te serefpolicy-2.1.7/policy/modules/services/xdm.te --- nsaserefpolicy/policy/modules/services/xdm.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/xdm.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/xdm.te 2006-01-05 11:12:20.000000000 -0500 @@ -319,6 +319,10 @@ allow xdm_xserver_t xkb_var_lib_t:lnk_file read; can_exec(xdm_xserver_t, xkb_var_lib_t) @@ -2816,7 +2829,7 @@ allow xdm_xserver_t sysctl_modprobe_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.1.7/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2005-12-08 15:57:16.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/authlogin.if 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/authlogin.if 2006-01-05 11:12:20.000000000 -0500 @@ -320,15 +320,25 @@ ## # @@ -2845,8 +2858,8 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.1.7/policy/modules/system/authlogin.te ---- nsaserefpolicy/policy/modules/system/authlogin.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/authlogin.te 2006-01-04 10:50:14.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/authlogin.te 2006-01-04 17:28:53.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/authlogin.te 2006-01-05 11:12:20.000000000 -0500 @@ -211,6 +211,7 @@ logging_send_syslog_msg(pam_console_t) @@ -2857,7 +2870,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/getty.te serefpolicy-2.1.7/policy/modules/system/getty.te --- nsaserefpolicy/policy/modules/system/getty.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/getty.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/getty.te 2006-01-05 11:12:20.000000000 -0500 @@ -63,6 +63,9 @@ kernel_list_proc(getty_t) kernel_read_proc_symlinks(getty_t) @@ -2870,7 +2883,7 @@ fs_search_auto_mountpoints(getty_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.if serefpolicy-2.1.7/policy/modules/system/hostname.if --- nsaserefpolicy/policy/modules/system/hostname.if 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/hostname.if 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/hostname.if 2006-01-05 11:12:20.000000000 -0500 @@ -66,3 +66,18 @@ can_exec($1,hostname_exec_t) @@ -2892,7 +2905,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.1.7/policy/modules/system/hostname.te --- nsaserefpolicy/policy/modules/system/hostname.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/hostname.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/hostname.te 2006-01-05 11:12:20.000000000 -0500 @@ -7,8 +7,10 @@ # @@ -2945,7 +2958,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.1.7/policy/modules/system/init.if --- nsaserefpolicy/policy/modules/system/init.if 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/init.if 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/init.if 2006-01-05 11:12:20.000000000 -0500 @@ -195,6 +195,19 @@ ######################################## @@ -2973,7 +2986,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.1.7/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2005-12-12 15:35:53.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/init.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/init.te 2006-01-05 11:12:20.000000000 -0500 @@ -369,6 +369,7 @@ mls_file_write_down(initrc_t) mls_process_read_up(initrc_t) @@ -3037,7 +3050,7 @@ ') dnl end TODO diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.1.7/policy/modules/system/iptables.te --- nsaserefpolicy/policy/modules/system/iptables.te 2005-12-09 23:35:07.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/iptables.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/iptables.te 2006-01-05 11:12:20.000000000 -0500 @@ -43,6 +43,8 @@ kernel_read_modprobe_sysctl(iptables_t) kernel_use_fd(iptables_t) @@ -3049,7 +3062,7 @@ fs_getattr_xattr_fs(iptables_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.1.7/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2005-12-14 10:38:50.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/libraries.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/libraries.fc 2006-01-05 11:12:20.000000000 -0500 @@ -11,6 +11,9 @@ /emul/ia32-linux/lib(/.*)? gen_context(system_u:object_r:lib_t,s0) /emul/ia32-linux/lib/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0) @@ -3233,7 +3246,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.1.7/policy/modules/system/libraries.te --- nsaserefpolicy/policy/modules/system/libraries.te 2005-12-12 15:35:54.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/libraries.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/libraries.te 2006-01-05 11:12:20.000000000 -0500 @@ -94,6 +94,10 @@ unconfined_domain_template(ldconfig_t) ') @@ -3247,7 +3260,7 @@ apache_dontaudit_search_modules(ldconfig_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.1.7/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/locallogin.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/locallogin.te 2006-01-05 11:12:20.000000000 -0500 @@ -152,6 +152,7 @@ miscfiles_read_localization(local_login_t) @@ -3266,7 +3279,7 @@ mta_getattr_spool(local_login_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.fc serefpolicy-2.1.7/policy/modules/system/logging.fc --- nsaserefpolicy/policy/modules/system/logging.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/logging.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/logging.fc 2006-01-05 11:12:20.000000000 -0500 @@ -19,10 +19,11 @@ /var/lib/stunnel/dev/log -s gen_context(system_u:object_r:devlog_t,s0) ') @@ -3284,7 +3297,7 @@ /var/run/log -s gen_context(system_u:object_r:devlog_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.if serefpolicy-2.1.7/policy/modules/system/logging.if --- nsaserefpolicy/policy/modules/system/logging.if 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/logging.if 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/logging.if 2006-01-05 11:12:20.000000000 -0500 @@ -341,3 +341,24 @@ allow $1 var_log_t:dir rw_dir_perms; allow $1 var_log_t:file create_file_perms; @@ -3312,7 +3325,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.1.7/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/logging.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/logging.te 2006-01-05 11:12:20.000000000 -0500 @@ -71,6 +71,8 @@ kernel_read_kernel_sysctl(auditctl_t) kernel_read_proc_symlinks(auditctl_t) @@ -3341,7 +3354,7 @@ optional_policy(`udev',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.1.7/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/lvm.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/lvm.te 2006-01-05 11:12:20.000000000 -0500 @@ -155,6 +155,8 @@ allow lvm_t lvm_etc_t:file r_file_perms; @@ -3353,7 +3366,7 @@ allow lvm_t lvm_metadata_t:file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.1.7/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2005-12-12 23:05:35.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/mount.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/mount.te 2006-01-05 11:12:20.000000000 -0500 @@ -46,7 +46,7 @@ fs_search_auto_mountpoints(mount_t) fs_use_tmpfs_chr_dev(mount_t) @@ -3365,7 +3378,7 @@ corecmd_exec_sbin(mount_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.fc serefpolicy-2.1.7/policy/modules/system/selinuxutil.fc --- nsaserefpolicy/policy/modules/system/selinuxutil.fc 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/selinuxutil.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/selinuxutil.fc 2006-01-05 11:12:20.000000000 -0500 @@ -9,9 +9,9 @@ /etc/selinux/([^/]*/)?contexts/files(/.*)? gen_context(system_u:object_r:file_context_t,s0) @@ -3381,7 +3394,7 @@ # /root diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.7/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/selinuxutil.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/selinuxutil.te 2006-01-05 11:12:20.000000000 -0500 @@ -182,6 +182,7 @@ # for mcs.conf @@ -3432,7 +3445,7 @@ # by a different user or has restrictive SE permissions, do not want to audit diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.fc serefpolicy-2.1.7/policy/modules/system/udev.fc --- nsaserefpolicy/policy/modules/system/udev.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/udev.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/udev.fc 2006-01-05 11:12:20.000000000 -0500 @@ -17,3 +17,4 @@ /sbin/wait_for_sysfs -- gen_context(system_u:object_r:udev_exec_t,s0) @@ -3440,7 +3453,7 @@ +/lib/udev/[^/]* -- gen_context(system_u:object_r:bin_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.1.7/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/udev.te 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/udev.te 2006-01-05 11:12:20.000000000 -0500 @@ -39,7 +39,7 @@ # Local policy # @@ -3468,7 +3481,7 @@ fs_manage_tmpfs_dirs(udev_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.fc serefpolicy-2.1.7/policy/modules/system/unconfined.fc --- nsaserefpolicy/policy/modules/system/unconfined.fc 2005-11-14 18:24:06.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/unconfined.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/unconfined.fc 2006-01-05 11:12:20.000000000 -0500 @@ -1,3 +1,5 @@ # Add programs here which should not be confined by SELinux # e.g.: @@ -3477,7 +3490,7 @@ +/usr/bin/vncserver -- gen_context(system_u:object_r:unconfined_exec_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.1.7/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2005-12-14 10:38:50.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/unconfined.te 2006-01-04 10:51:57.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/unconfined.te 2006-01-05 11:12:20.000000000 -0500 @@ -57,6 +57,10 @@ bluetooth_domtrans_helper(unconfined_t) ') @@ -3521,7 +3534,7 @@ rw_dir_create_file(sysadm_su_t, home_dir_type) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-2.1.7/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2005-11-15 09:13:40.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/userdomain.fc 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/userdomain.fc 2006-01-05 11:12:20.000000000 -0500 @@ -4,6 +4,6 @@ HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0) HOME_DIR/.+ gen_context(system_u:object_r:user_home_t,s0) @@ -3531,9 +3544,9 @@ HOME_DIR/.+ gen_context(system_u:object_r:ROLE_home_t,s0) ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.7/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2005-12-06 19:49:51.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/userdomain.if 2006-01-04 11:35:09.000000000 -0500 -@@ -568,6 +568,7 @@ +--- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-04 17:28:53.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/userdomain.if 2006-01-05 11:12:20.000000000 -0500 +@@ -572,6 +572,7 @@ corenet_dontaudit_tcp_bind_all_reserved_ports($1_t) files_read_etc_files($1_t) @@ -3541,7 +3554,7 @@ files_list_home($1_t) files_read_usr_files($1_t) files_exec_usr_files($1_t) -@@ -1880,9 +1881,14 @@ +@@ -1884,9 +1885,14 @@ type sysadm_home_dir_t; ') @@ -3556,7 +3569,7 @@ ######################################## ## ## Search the sysadm users home directory. -@@ -1913,8 +1919,12 @@ +@@ -1917,8 +1923,12 @@ type sysadm_home_dir_t; ') @@ -3569,7 +3582,7 @@ ######################################## ## -@@ -2644,6 +2654,23 @@ +@@ -2648,6 +2658,23 @@ ######################################## ## @@ -3594,10 +3607,10 @@ ## ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.1.7/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2005-12-09 23:35:10.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/userdomain.te 2006-01-04 11:28:50.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-04 17:28:53.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/system/userdomain.te 2006-01-05 11:12:20.000000000 -0500 @@ -2,7 +2,7 @@ - policy_module(userdomain,1.1.0) + policy_module(userdomain,1.1.1) gen_require(` - role sysadm_r, staff_r, user_r; @@ -3652,7 +3665,7 @@ optional_policy(`amanda',` amanda_run_recover(sysadm_t,sysadm_r,admin_terminal) ') -@@ -188,6 +201,7 @@ +@@ -192,6 +205,7 @@ optional_policy(`hostname',` hostname_run(sysadm_t,sysadm_r,admin_terminal) @@ -3660,7 +3673,7 @@ ') optional_policy(`ipsec',` -@@ -311,4 +325,5 @@ +@@ -315,4 +329,5 @@ optional_policy(`webalizer',` webalizer_run(sysadm_t,sysadm_r,admin_terminal) ') @@ -3668,7 +3681,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.7/policy/users --- nsaserefpolicy/policy/users 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.7/policy/users 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/policy/users 2006-01-05 11:12:20.000000000 -0500 @@ -26,7 +26,9 @@ ifdef(`targeted_policy',` gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) @@ -3693,7 +3706,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.1.7/Rules.modular --- nsaserefpolicy/Rules.modular 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/Rules.modular 2006-01-04 10:50:14.000000000 -0500 ++++ serefpolicy-2.1.7/Rules.modular 2006-01-05 11:12:20.000000000 -0500 @@ -170,6 +170,16 @@ ######################################## From fedora-cvs-commits at redhat.com Thu Jan 5 20:27:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 15:27:48 -0500 Subject: rpms/hal/devel hal.spec,1.70,1.71 Message-ID: <200601052027.k05KRmYT031978@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31957 Modified Files: hal.spec Log Message: - disable fstab-sync - scripts have been moved from /usr/sbin to /usr/share/hal/scripts Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- hal.spec 5 Jan 2006 19:45:23 -0000 1.70 +++ hal.spec 5 Jan 2006 20:27:45 -0000 1.71 @@ -83,13 +83,14 @@ %patch0 -p1 -b .match-on-capabilities %build -%configure --disable-docbook-docs --enable-fstab-sync --with-os-type=redhat --enable-pcmcia-support --with-stab-file=/var/lib/pcmcia/stab +%configure --disable-docbook-docs --with-os-type=redhat --enable-pcmcia-support --with-stab-file=/var/lib/pcmcia/stab make %install make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT/etc/hotplug.d/default/20-hal.hotplug %clean rm -rf %{buildroot} @@ -128,14 +129,6 @@ %{_sysconfdir}/hal/* %{_sbindir}/hald -%{_sbindir}/fstab-sync -%{_sbindir}/hal-luks-remove -%{_sbindir}/hal-luks-setup -%{_sbindir}/hal-system-power-hibernate -%{_sbindir}/hal-system-power-set-power-save -%{_sbindir}/hal-system-power-suspend -%{_sbindir}/hal-system-lcd-get-brightness -%{_sbindir}/hal-system-lcd-set-brightness %{_bindir}/lshal %{_bindir}/hal-get-property @@ -148,10 +141,10 @@ %{_libdir}/*hal*.so.* -/etc/hotplug.d/default/20-hal.hotplug - %dir %{_datadir}/hal %dir %{_datadir}/hal/fdi +%dir %{_datadir}/hal/scripts +%{_datadir}/hal/scripts/* %{_datadir}/hal/fdi/* %{_datadir}/locale/* %{_datadir}/man/* @@ -178,7 +171,8 @@ %changelog * Thu Jan 05 2006 John (J5) Palmieri - 0.5.5.1.cvs20060105-1 - Build CVS version of HAL which gives us the new mount support - +- disable fstab-sync +- scripts have been moved from /usr/sbin to /usr/share/hal/scripts * Fri Dec 09 2005 Jesse Keating - 0.5.5.1-2.1 - rebuilt From fedora-cvs-commits at redhat.com Fri Jan 6 03:08:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 22:08:43 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1553,1.1554 Message-ID: <200601060308.k0638hab005623@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv5579 Modified Files: kernel-2.6.spec Log Message: bump Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1553 retrieving revision 1.1554 diff -u -r1.1553 -r1.1554 --- kernel-2.6.spec 4 Jan 2006 02:41:11 -0000 1.1553 +++ kernel-2.6.spec 6 Jan 2006 03:08:40 -0000 1.1554 @@ -1279,6 +1279,9 @@ %endif %changelog +* Thu Jan 5 2006 Dave Jones [2.6.14-1.1656_FC4] +- Rebuild. + * Tue Jan 3 2006 Dave Jones [2.6.14-1.1655_FC4] - Small fixes from 2.6.15 sysctl: don't overflow the user-supplied buffer with '0' From fedora-cvs-commits at redhat.com Fri Jan 6 03:15:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 22:15:25 -0500 Subject: rpms/kernel/devel linux-2.6-vm-debug.patch, NONE, 1.1 kernel-2.6.spec, 1.1821, 1.1822 Message-ID: <200601060315.k063FP3G008720@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8626 Modified Files: kernel-2.6.spec Added Files: linux-2.6-vm-debug.patch Log Message: some more debug info about the pagecount going negative. linux-2.6-vm-debug.patch: drivers/scsi/st.c | 1 + include/linux/mm.h | 1 + mm/rmap.c | 7 +++++++ 3 files changed, 9 insertions(+) --- NEW FILE linux-2.6-vm-debug.patch --- --- linux-2.6.15/mm/rmap.c~ 2006-01-03 08:53:32.000000000 -0500 +++ linux-2.6.15/mm/rmap.c 2006-01-03 08:58:19.000000000 -0500 @@ -484,6 +484,13 @@ void page_remove_rmap(struct page *page) BUG_ON(PageReserved(page)); if (atomic_add_negative(-1, &page->_mapcount)) { + if (page_mapcount(page) < 0) { + printk (KERN_EMERG "Eeek! page_mapcount(page) went negative! (%d)\n", page_mapcount(page)); + printk (KERN_EMERG " page->flags = %lx\n", page->flags); + printk (KERN_EMERG " page->count = %x\n", page_count(page)); + printk (KERN_EMERG " page->mapping = %p\n", page->mapping); + } + BUG_ON(page_mapcount(page) < 0); /* * It would be tidy to reset the PageAnon mapping here, --- linux-2.6.15/drivers/scsi/st.c~ 2006-01-05 21:58:31.000000000 -0500 +++ linux-2.6.15/drivers/scsi/st.c 2006-01-05 21:59:31.000000000 -0500 @@ -4508,6 +4508,7 @@ static int sgl_unmap_user_pages(struct s for (i=0; i < nr_pages; i++) { struct page *page = sgl[i].page; + sgl[i].page = NULL; if (dirtied) SetPageDirty(page); /* FIXME: cache flush missing for rw==READ --- linux-2.6.15/include/linux/mm.h~ 2006-01-05 22:02:20.000000000 -0500 +++ linux-2.6.15/include/linux/mm.h 2006-01-05 22:02:48.000000000 -0500 @@ -299,6 +299,7 @@ struct page { #define put_page_testzero(p) \ ({ \ BUG_ON(page_count(p) == 0); \ + BUG_ON(page_count(p) <= page_mapcount(p)); \ atomic_add_negative(-1, &(p)->_count); \ }) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1821 retrieving revision 1.1822 diff -u -r1.1821 -r1.1822 --- kernel-2.6.spec 5 Jan 2006 11:02:08 -0000 1.1821 +++ kernel-2.6.spec 6 Jan 2006 03:15:23 -0000 1.1822 @@ -374,6 +374,7 @@ # VM bits. Patch2000: linux-2.6-vm-oomkiller-debugging.patch Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch +Patch2002: linux-2.6-vm-debug.patch # Broadcom wireless driver Patch5000: linux-2.6-bcm43xx.patch @@ -876,6 +877,8 @@ %patch2000 -p1 # Silence GFP_ATOMIC failures. %patch2001 -p1 +# Try to trace some negative pagecount errors. +%patch2002 -p1 # # Patches 5000 to 6000 are reserved for new drivers that are about to @@ -1391,6 +1394,9 @@ %endif %changelog +* Thu Jan 5 2006 Dave Jones +- Try to debug some negative pagecount errors. + * Tue Jan 3 2006 Dave Jones - Silence some gcc4.1 warnings. From fedora-cvs-commits at redhat.com Fri Jan 6 03:27:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 5 Jan 2006 22:27:53 -0500 Subject: rpms/glib2/devel .cvsignore, 1.40, 1.41 glib2.spec, 1.69, 1.70 sources, 1.40, 1.41 Message-ID: <200601060327.k063RrUM025539@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/glib2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25460 Modified Files: .cvsignore glib2.spec sources Log Message: test build Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 10 Dec 2005 20:50:09 -0000 1.40 +++ .cvsignore 6 Jan 2006 03:27:49 -0000 1.41 @@ -25,3 +25,4 @@ glib-2.9.1.cvs20051202_2.tar.bz1 glib-2.9.1.cvs20051202_2.tar.bz2 glib-2.9.1.tar.bz2 +glib-2.9.2.tar.gz Index: glib2.spec =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- glib2.spec 12 Dec 2005 05:58:51 -0000 1.69 +++ glib2.spec 6 Jan 2006 03:27:49 -0000 1.70 @@ -1,10 +1,10 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.9.1 +Version: 2.9.2 Release: 1 License: LGPL Group: System Environment/Libraries -Source: glib-%{version}.tar.bz2 +Source: glib-%{version}.tar.gz Source2: glib2.sh Source3: glib2.csh Conflicts: libgnomeui <= 2.2.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 10 Dec 2005 20:50:09 -0000 1.40 +++ sources 6 Jan 2006 03:27:49 -0000 1.41 @@ -1 +1 @@ -f4817f7e0546f8d4b37c20b6ceca69ad glib-2.9.1.tar.bz2 +7fac24e6c05fc620177f8fccd572043f glib-2.9.2.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 6 05:06:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 00:06:53 -0500 Subject: rpms/glibc/devel glibc-s390-waitid.patch, 1.1, 1.2 glibc.spec, 1.205, 1.206 Message-ID: <200601060506.k0656rnX020019@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19958 Modified Files: glibc-s390-waitid.patch glibc.spec Log Message: 2.3.90-27 glibc-s390-waitid.patch: kernel-features.h | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) Index: glibc-s390-waitid.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-s390-waitid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glibc-s390-waitid.patch 4 Jan 2006 09:41:29 -0000 1.1 +++ glibc-s390-waitid.patch 6 Jan 2006 05:06:44 -0000 1.2 @@ -1,10 +1,12 @@ -2006-01-04 Jakub Jelinek +2006-01-05 Jakub Jelinek * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_WAITID_SYSCALL): Only define for 2.6.12+ on s390{,x}. + (__ASSUME_GETDENTS32_D_TYPE): Only define for 2.6.8+ on most arches + and only for 2.6.11+ on s390{,x}. --- libc/sysdeps/unix/sysv/linux/kernel-features.h.jj 2005-12-13 16:42:22.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/kernel-features.h 2006-01-04 10:36:38.000000000 +0100 ++++ libc/sysdeps/unix/sysv/linux/kernel-features.h 2006-01-05 22:52:21.000000000 +0100 @@ -1,6 +1,6 @@ /* Set flags signalling availability of kernel features based on given kernel version number. @@ -13,7 +15,20 @@ This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or -@@ -435,9 +435,11 @@ +@@ -423,8 +423,10 @@ + #endif + + /* Starting with version 2.6.4-rc1 the getdents syscall returns d_type +- information as well. */ +-#if __LINUX_KERNEL_VERSION >= 132612 ++ information as well and in between 2.6.5 and 2.6.8 most compat wrappers ++ were fixed too. Except s390{,x} which was fixed in 2.6.11. */ ++#if (__LINUX_KERNEL_VERSION >= 0x020608 && !defined __s390__) \ ++ || (__LINUX_KERNEL_VERSION >= 0x02060b && defined __s390__) + # define __ASSUME_GETDENTS32_D_TYPE 1 + #endif + +@@ -435,9 +437,11 @@ #endif /* Starting with version 2.6.9, the waitid system call is available. Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- glibc.spec 4 Jan 2006 09:38:31 -0000 1.205 +++ glibc.spec 6 Jan 2006 05:06:44 -0000 1.206 @@ -3,7 +3,7 @@ %define glibcsrcdir glibc-20060104T0754 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 26 +%define glibcrelease 27 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -1135,6 +1135,9 @@ %endif %changelog +* Fri Jan 6 2006 Jakub Jelinek 2.3.90-27 +- only rely on d_type in 32-bit getdents on s390 for 2.6.11+ + * Wed Jan 4 2006 Jakub Jelinek 2.3.90-26 - update from CVS - for newly linked lio_listio* callers, send per request From fedora-cvs-commits at redhat.com Fri Jan 6 05:42:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 00:42:22 -0500 Subject: rpms/kernel/FC-4/configs config-generic, 1.44, 1.45 config-x86-generic, 1.16, 1.17 config-x86_64, 1.1, 1.2 config-x86_64-generic, 1.14, 1.15 Message-ID: <200601060542.k065gMZI008037@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv7762/configs Modified Files: config-generic config-x86-generic config-x86_64 config-x86_64-generic Log Message: 2.6.15 rebase. Let the fun begin. (again). Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- config-generic 14 Dec 2005 02:22:28 -0000 1.44 +++ config-generic 6 Jan 2006 05:42:19 -0000 1.45 @@ -3,7 +3,7 @@ # CONFIG_MMU=y CONFIG_SMP=y -# CONFIG_HOTPLUG_CPU is not set +CONFIG_HOTPLUG_CPU=y CONFIG_LOCALVERSION="" # @@ -13,7 +13,6 @@ CONFIG_CLEAN_COMPILE=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y - # # General setup # @@ -35,6 +34,7 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y +CONFIG_DEFAULT_CFQ=y CONFIG_POSIX_MQUEUE=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set @@ -61,7 +61,6 @@ # CONFIG_PCI_DEBUG is not set CONFIG_PCI_MSI=y CONFIG_PCI_LEGACY_PROC=y -# CONFIG_PCI_NAMES is not set CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set @@ -99,7 +98,7 @@ # CONFIG_INFINIBAND_MTHCA_DEBUG is not set CONFIG_INFINIBAND_IPOIB=m # CONFIG_INFINIBAND_IPOIB_DEBUG is not set -CONFIG_INFINIBAND_USER_VERBS=m +CONFIG_INFINIBAND_SRP=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_ACCESS=m @@ -124,10 +123,9 @@ # CONFIG_MTD=m # CONFIG_MTD_DEBUG is not set -CONFIG_MTD_PARTITIONS=m +CONFIG_MTD_PARTITIONS=y CONFIG_MTD_CONCAT=m CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_PARTITIONS=y # # User Modules And Translation Layers # @@ -139,7 +137,7 @@ CONFIG_NFTL=m CONFIG_NFTL_RW=y CONFIG_INFTL=m - +CONFIG_RFD_FTL=m # # RAM/ROM/Flash chip drivers @@ -203,6 +201,7 @@ # CONFIG_MTD_NAND_VERIFY_WRITE is not set CONFIG_MTD_NAND_IDS=m # CONFIG_MTD_NAND_NANDSIM is not set +# CONFIG_MTD_ONENAND is not set CONFIG_MTD_REDBOOT_PARTS=m # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set @@ -216,6 +215,9 @@ # CONFIG_MTD_PLATRAM is not set # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set # CONFIG_JFFS2_FS_WRITEBUFFER is not set +CONFIG_JFFS2_FS_WRITEBUFFER=y +CONFIG_JFFS2_SUMMARY=y + # # Parallel port support @@ -333,6 +335,7 @@ CONFIG_BLK_DEV_CY82C693=y CONFIG_BLK_DEV_CS5520=y CONFIG_BLK_DEV_CS5530=y +CONFIG_BLK_DEV_CS5535=y CONFIG_BLK_DEV_HPT34X=y CONFIG_BLK_DEV_HPT366=y CONFIG_BLK_DEV_IT821X=y @@ -384,6 +387,8 @@ CONFIG_SCSI_SAS_ATTRS=m CONFIG_RAID_ATTRS=m +CONFIG_ISCSI_TCP=m + # # SCSI low-level drivers # @@ -1728,6 +1733,7 @@ CONFIG_VIDEO_SAA5249=m CONFIG_VIDEO_SAA6588=m CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m CONFIG_TUNER_3036=m CONFIG_VIDEO_STRADIS=m @@ -2624,3 +2630,33 @@ CONFIG_IBMASR=m +CONFIG_PM_LEGACY=y +CONFIG_RFD_FTL=m +# CONFIG_MTD_ONENAND is not set +CONFIG_BLK_DEV_CS5535=y +CONFIG_ISCSI_TCP=m +CONFIG_SCSI_PDC_ADMA=m +CONFIG_SCSI_SATA_SIL24=m +# CONFIG_ATM_DUMMY is not set +CONFIG_PPP_MPPE=m +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +# CONFIG_TELCLOCK is not set +CONFIG_RTC_X1205_I2C=m +CONFIG_VIDEO_BT848_DVB=y +CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y +CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_AUDIO_DECODER=m +CONFIG_VIDEO_DECODER=m +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_USB_LIBUSUAL=y +CONFIG_USB_SERIAL_ANYDATA=m +CONFIG_INFINIBAND_SRP=m +CONFIG_JFFS2_SUMMARY=y +CONFIG_SQUASHFS=m +# CONFIG_SQUASHFS_EMBEDDED is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_RCU_TORTURE_TEST is not set + Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- config-x86-generic 2 Jan 2006 02:02:31 -0000 1.16 +++ config-x86-generic 6 Jan 2006 05:42:19 -0000 1.17 @@ -71,7 +71,9 @@ # CONFIG_MATH_EMULATION is not set CONFIG_MTRR=y CONFIG_HAVE_DEC_LOCK=y -# CONFIG_X86_UP_APIC is not set +CONFIG_X86_UP_APIC=y +CONFIG_X86_UP_APIC_DEFAULT_OFF=y +CONFIG_X86_UP_IOAPIC=y CONFIG_X86_PM_TIMER=y # CONFIG_EFI is not set @@ -225,7 +227,9 @@ # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set -CONFIG_HOTPLUG_PCI_SHPC=m + +# SHPC has half-arsed PCI probing, which makes it load on too many systems +# CONFIG_HOTPLUG_PCI_SHPC is not set # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set CONFIG_PM=y Index: config-x86_64 =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- config-x86_64 6 Feb 2005 05:49:11 -0000 1.1 +++ config-x86_64 6 Jan 2006 05:42:19 -0000 1.2 @@ -1,2 +0,0 @@ -# CONFIG_SMP is not set - Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- config-x86_64-generic 6 Dec 2005 23:34:14 -0000 1.14 +++ config-x86_64-generic 6 Jan 2006 05:42:19 -0000 1.15 @@ -7,8 +7,9 @@ CONFIG_MTRR=y CONFIG_NUMA=y CONFIG_K8_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y # CONFIG_NUMA_EMU is not set -CONFIG_NR_CPUS=32 +CONFIG_NR_CPUS=256 CONFIG_GART_IOMMU=y CONFIG_X86_POWERNOW_K8=y CONFIG_IA32_EMULATION=y @@ -16,6 +17,7 @@ CONFIG_INIT_DEBUG=y # CONFIG_IOMMU_DEBUG is not set # CONFIG_CHECKING is not set +CONFIG_DEBUG_RODATA=y CONFIG_MICROCODE=m CONFIG_SWIOTLB=y CONFIG_X86_PM_TIMER=y @@ -38,7 +40,8 @@ CONFIG_GENERIC_ISA_DMA=y CONFIG_SCHED_SMT=y # CONFIG_SOFTWARE_SUSPEND is not set -# CONFIG_PM_DEBUG is not set +# FIXME: Disable this before release. +CONFIG_PM_DEBUG=y CONFIG_CPU_FREQ=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set @@ -58,8 +61,6 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_ACPI=y -CONFIG_ACPI_BOOT=y -CONFIG_ACPI_INTERPRETER=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m @@ -70,18 +71,14 @@ CONFIG_ACPI_ASUS=m CONFIG_ACPI_TOSHIBA=m # CONFIG_ACPI_DEBUG is not set -CONFIG_ACPI_BUS=y CONFIG_ACPI_EC=y CONFIG_ACPI_POWER=y -CONFIG_ACPI_PCI=y CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_NUMA=y CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_VIDEO=m CONFIG_ACPI_IBM=m -CONFIG_CRASH=m - CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_FAKE is not set CONFIG_HOTPLUG_PCI_COMPAQ=m @@ -92,7 +89,8 @@ # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_PCIE=m # CONFIG_HOTPLUG_PCI_PCIE_POLL_EVENT_MODE is not set -CONFIG_HOTPLUG_PCI_SHPC=m +# SHPC has half-arsed PCI probing, which makes it load on too many systems +# CONFIG_HOTPLUG_PCI_SHPC is not set # CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE is not set # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set CONFIG_HPET=y @@ -103,15 +101,11 @@ CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set -CONFIG_IEEE80211_CRYPT=m -CONFIG_IEEE80211_WPA=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IPW2100=m -# CONFIG_IPW_DEBUG is not set -CONFIG_IPW2100_PROMISC=y -# CONFIG_IPW2100_LEGACY_FW_LOAD is not set CONFIG_IPW2100_MONITOR=y +# CONFIG_IPW_DEBUG is not set CONFIG_IPW2200=m CONFIG_PNP=y @@ -125,6 +119,7 @@ CONFIG_CRYPTO_AES_X86_64=m CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCE_AMD=y # CONFIG_I2C_ALI1535 is not set # CONFIG_I2C_ALI1563 is not set @@ -142,3 +137,6 @@ CONFIG_I2C_VIAPRO=m CONFIG_I2C_ISA=m +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m + From fedora-cvs-commits at redhat.com Fri Jan 6 05:42:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 00:42:22 -0500 Subject: rpms/kernel/FC-4 linux-2.6-debug-dual-line-backtrace.patch, NONE, 1.1 linux-2.6-debug-no-quiet.patch, NONE, 1.1 linux-2.6-debug-oops-pause.patch, NONE, 1.1 linux-2.6-debug-slab-leak-detector.patch, NONE, 1.1 linux-2.6-debug-sysfs-crash-debugging.patch, NONE, 1.1 linux-2.6-debug-taint-proprietary-helpers.patch, NONE, 1.1 linux-2.6-firmware-loader-timeout.patch, NONE, 1.1 linux-2.6-hvc-console.patch, NONE, 1.1 linux-2.6-hvc-rtas-console.patch, NONE, 1.1 linux-2.6-ide-cd-shutup.patch, NONE, 1.1 linux-2.6-powerpc-parport.patch, NONE, 1.1 linux-2.6-ppc-rtas-check.patch, NONE, 1.1 linux-2.6-sata-enable-atapi-by-default.patch, NONE, 1.1 linux-2.6-ub.patch, NONE, 1.1 linux-2.6-valid-ether-addr.patch, NONE, 1.1 linux-2.6-x86_64-disable-hotplug-guessing.patch, NONE, 1.1 linux-2.6-x86_64-silence-up-apic-errors.patch, NONE, 1.1 linux-2.6.14-intel-cache-build.patch, NONE, 1.1 linux-2.6.15-default-powerpc.patch, NONE, 1.1 linux-2.6.15-mv643xx-fixes.patch, NONE, 1.1 linux-2.6.15-rc1-ppc64-syscallpath.patch, NONE, 1.1 linu! x-2.6.15.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.169, 1.170 Makefile.config, 1.26, 1.27 kernel-2.6.spec, 1.1554, 1.1555 linux-2.6-NFSD-ctlbits.patch, 1.1, 1.2 linux-2.6-build-nonintconfig.patch, 1.3, 1.4 linux-2.6-build-userspace-headers-warning.patch, 1.3, 1.4 linux-2.6-bzimage.patch, 1.3, 1.4 linux-2.6-compile-fixes.patch, 1.6, 1.7 linux-2.6-crashdump-common.patch, 1.5, 1.6 linux-2.6-crashdump-reboot-exports.patch, 1.5, 1.6 linux-2.6-debug-spinlock-panic.patch, 1.3, 1.4 linux-2.6-debug-spinlock-taint.patch, 1.3, 1.4 linux-2.6-debug-taint-vm.patch, 1.3, 1.4 linux-2.6-devmem.patch, 1.1, 1.2 linux-2.6-diskdump.patch, 1.4, 1.5 linux-2.6-dump_smp_call_function.patch, 1.7, 1.8 linux-2.6-execshield.patch, 1.2, 1.3 linux-2.6-modsign-include.patch, 1.1, 1.2 linux-2.6-netdump.patch, 1.4, 1.5 linux-2.6-radeon-backlight.patch, 1.3, 1.4 linux-2.6-scsi-advansys-pcitable.patch, 1.1, 1.2 linux-2.6-serial-of.patch, 1.1, 1.2 linux-2.6-serial-tickle-nmi.patch, 1.1, 1.2 linux-2.6-tux.patch, 1.4, 1.5 linux-2.6-vm-debug.patch, 1.2, 1.3 linux-2.6-! write-protect-rodata.patch,1.3,1.4 linux-2.6-x86-apic-off-by-d! efault.p Message-ID: <200601060542.k065gMZ3008026@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv7762 Modified Files: .cvsignore Makefile.config kernel-2.6.spec linux-2.6-NFSD-ctlbits.patch linux-2.6-build-nonintconfig.patch linux-2.6-build-userspace-headers-warning.patch linux-2.6-bzimage.patch linux-2.6-compile-fixes.patch linux-2.6-crashdump-common.patch linux-2.6-crashdump-reboot-exports.patch linux-2.6-debug-spinlock-panic.patch linux-2.6-debug-spinlock-taint.patch linux-2.6-debug-taint-vm.patch linux-2.6-devmem.patch linux-2.6-diskdump.patch linux-2.6-dump_smp_call_function.patch linux-2.6-execshield.patch linux-2.6-modsign-include.patch linux-2.6-netdump.patch linux-2.6-radeon-backlight.patch linux-2.6-scsi-advansys-pcitable.patch linux-2.6-serial-of.patch linux-2.6-serial-tickle-nmi.patch linux-2.6-tux.patch linux-2.6-vm-debug.patch linux-2.6-write-protect-rodata.patch linux-2.6-x86-apic-off-by-default.patch linux-2.6-x86-tune-p4.patch sources upstream Added Files: linux-2.6-debug-dual-line-backtrace.patch linux-2.6-debug-no-quiet.patch linux-2.6-debug-oops-pause.patch linux-2.6-debug-slab-leak-detector.patch linux-2.6-debug-sysfs-crash-debugging.patch linux-2.6-debug-taint-proprietary-helpers.patch linux-2.6-firmware-loader-timeout.patch linux-2.6-hvc-console.patch linux-2.6-hvc-rtas-console.patch linux-2.6-ide-cd-shutup.patch linux-2.6-powerpc-parport.patch linux-2.6-ppc-rtas-check.patch linux-2.6-sata-enable-atapi-by-default.patch linux-2.6-ub.patch linux-2.6-valid-ether-addr.patch linux-2.6-x86_64-disable-hotplug-guessing.patch linux-2.6-x86_64-silence-up-apic-errors.patch linux-2.6.14-intel-cache-build.patch linux-2.6.15-default-powerpc.patch linux-2.6.15-mv643xx-fixes.patch linux-2.6.15-rc1-ppc64-syscallpath.patch linux-2.6.15.tar.bz2.sign Removed Files: linux-2.6-8139too-suspend.patch linux-2.6-NFSD-locking-fix.patch linux-2.6-acpi-20050902.patch linux-2.6-acpi-enable-ecburst.patch linux-2.6-acpi-ht.patch linux-2.6-acpi-owner_id-limit.patch linux-2.6-acpi-silence-cutoff.patch linux-2.6-alsa-maestro-hang.patch linux-2.6-build-qconfig-qt-lib64.patch linux-2.6-cx88-silence-debug.patch linux-2.6-debug-spinlock-emerg.patch linux-2.6-default-clocksource-tsc.patch linux-2.6-default-elevator.patch linux-2.6-fs-locks-leak.patch linux-2.6-ide-scsi-check_condition.patch linux-2.6-kauditd-suspend.patch linux-2.6-libata-intel-combined-quirk.patch linux-2.6-mcs-canonicalise-getxattr.patch linux-2.6-net-atm-lanai-nodev-rmmod.patch linux-2.6-net-bridge-feature-consolidation.patch linux-2.6-net-nf_queue-oops.patch linux-2.6-net-rtnetlink-infinite-loop.patch linux-2.6-net-sk98lin-vpd.patch linux-2.6-optimise-for-size.patch linux-2.6-ppc64-build.patch linux-2.6-ppc64-eeh-panic.patch linux-2.6-scsi-runqueue-oops.patch linux-2.6-suspend-mxcsr.patch linux-2.6-usbhid-wacom.patch linux-2.6-usbhid-wireless-security-lock.patch linux-2.6.14.4pre.patch linux-2.6.15-various-fixes.patch patch-2.6.14.5.bz2.sign Log Message: 2.6.15 rebase. Let the fun begin. (again). linux-2.6-debug-dual-line-backtrace.patch: traps.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-debug-dual-line-backtrace.patch --- --- linux-2.6.14/arch/i386/kernel/traps.c~ 2005-12-01 04:25:36.000000000 -0500 +++ linux-2.6.14/arch/i386/kernel/traps.c 2005-12-01 04:36:19.000000000 -0500 @@ -116,6 +116,7 @@ static inline unsigned long print_contex unsigned long *stack, unsigned long ebp) { unsigned long addr; + char space=0; #ifdef CONFIG_FRAME_POINTER while (valid_stack_ptr(tinfo, (void *)ebp)) { @@ -131,9 +132,17 @@ static inline unsigned long print_contex if (__kernel_text_address(addr)) { printk(" [<%08lx>]", addr); print_symbol(" %s", addr); - printk("\n"); + if (space == 0) { + printk(" "); + space = 1; + } else { + printk("\n"); + space = 0; + } } } + if (space==1) + printk("\n"); #endif return ebp; } linux-2.6-debug-no-quiet.patch: main.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-debug-no-quiet.patch --- --- linux-2.6.14/init/main.c~ 2005-12-02 01:23:31.000000000 -0500 +++ linux-2.6.14/init/main.c 2005-12-02 01:23:51.000000000 -0500 @@ -210,7 +210,7 @@ static int __init quiet_kernel(char *str { if (*str) return 0; - console_loglevel = 4; + console_loglevel = 10; return 1; } linux-2.6-debug-oops-pause.patch: traps.c | 9 +++++++++ 1 files changed, 9 insertions(+) --- NEW FILE linux-2.6-debug-oops-pause.patch --- if we oops, pause for a two minutes.. should help those 'it scrolled off the screen' bugs, and hopefully give people enough time to grab a digital camera to take a screenshot of the oops. (Wow, I'm really getting desperate for better debug data). --- linux-2.6.14/arch/i386/kernel/traps.c~ 2005-12-16 03:00:16.000000000 -0500 +++ linux-2.6.14/arch/i386/kernel/traps.c 2005-12-16 03:07:12.000000000 -0500 @@ -271,6 +271,15 @@ void show_registers(struct pt_regs *regs } } printk("\n"); + { + int i; + for (i=120;i>0;i--) { + mdelay(1000); + touch_nmi_watchdog(); + printk("Continuing in %d seconds. \r", i); + } + printk("\n"); + } } static void handle_BUG(struct pt_regs *regs) linux-2.6-debug-slab-leak-detector.patch: slab.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-debug-slab-leak-detector.patch --- http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.15-rc5/2.6.15-rc5-mm1/broken-out/slab-leak-detector.patch From: Manfred Spraul Maintenance work from Alexander Nyberg With the patch applied, echo "size-4096 0 0 0" > /proc/slabinfo walks the objects in the size-4096 slab, printing out the calling address of whoever allocated that object. It is for leak detection. Signed-off-by: Andrew Morton --- mm/slab.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 3 deletions(-) diff -puN mm/slab.c~slab-leak-detector mm/slab.c --- devel/mm/slab.c~slab-leak-detector 2005-11-18 19:15:09.000000000 -0800 +++ devel-akpm/mm/slab.c 2005-11-18 19:16:22.000000000 -0800 @@ -199,7 +199,7 @@ * is less than 512 (PAGE_SIZE<<3), but greater than 256. */ -typedef unsigned int kmem_bufctl_t; +typedef unsigned long kmem_bufctl_t; #define BUFCTL_END (((kmem_bufctl_t)(~0U))-0) #define BUFCTL_FREE (((kmem_bufctl_t)(~0U))-1) #define SLAB_LIMIT (((kmem_bufctl_t)(~0U))-2) @@ -2380,7 +2380,7 @@ bad: cachep->name, cachep->num, slabp, slabp->inuse); for (i=0;inum*sizeof(kmem_bufctl_t);i++) { if ((i%16)==0) - printk("\n%03x:", i); + printk("\n%04lx:", i); printk(" %02x", ((unsigned char*)slabp)[i]); } printk("\n"); @@ -2563,6 +2563,15 @@ static void *cache_alloc_debugcheck_afte *dbg_redzone1(cachep, objp) = RED_ACTIVE; *dbg_redzone2(cachep, objp) = RED_ACTIVE; } + { + int objnr; + struct slab *slabp; + + slabp = page_get_slab(virt_to_page(objp)); + + objnr = (objp - slabp->s_mem) / cachep->objsize; + slab_bufctl(slabp)[objnr] = (unsigned long)caller; + } objp += obj_dbghead(cachep); if (cachep->ctor && cachep->flags & SLAB_POISON) { unsigned long ctor_flags = SLAB_CTOR_CONSTRUCTOR; @@ -2713,7 +2722,7 @@ static void free_block(kmem_cache_t * ca check_spinlock_acquired_node(cachep, node); check_slabp(cachep, slabp); -#if DEBUG +#if 0 /* disabled, not compatible with leak detection */ /* Verify that the slab belongs to the intended node */ WARN_ON(slabp->nodeid != node); @@ -3604,6 +3613,36 @@ struct seq_operations slabinfo_op = { .show = s_show, }; +static void do_dump_slabp(kmem_cache_t *cachep) +{ +#if DEBUG + struct list_head *q; + int node; + + check_irq_on(); + spin_lock_irq(&cachep->spinlock); + for_each_online_node(node) { + struct kmem_list3 *rl3 = cachep->nodelists[node]; + spin_lock(&rl3->list_lock); + + list_for_each(q, &rl3->slabs_full) { + int i; + struct slab *slabp = list_entry(q, struct slab, list); + + for (i = 0; i < cachep->num; i++) { + unsigned long sym = slab_bufctl(slabp)[i]; + + printk("obj %p/%d: %p", slabp, i, (void *)sym); + print_symbol(" <%s>", sym); + printk("\n"); + } + } + spin_unlock(&rl3->list_lock); + } + spin_unlock_irq(&cachep->spinlock); +#endif +} + #define MAX_SLABINFO_WRITE 128 /** * slabinfo_write - Tuning for the slab allocator @@ -3641,6 +3641,7 @@ ssize_t slabinfo_write(struct file *file batchcount < 1 || batchcount > limit || shared < 0) { + do_dump_slabp(cachep); res = 0; } else { res = do_tune_cpucache(cachep, limit, linux-2.6-debug-sysfs-crash-debugging.patch: devel-akpm/arch/i386/kernel/traps.c | 5 +++++ devel-akpm/fs/sysfs/file.c | 8 ++++++++ linux-2.6.14/arch/x86_64/kernel/traps.c | 5 +++++ 3 files changed, 18 insertions(+) --- NEW FILE linux-2.6-debug-sysfs-crash-debugging.patch --- From: Andrew Morton Display the most-recently-opened sysfs file's name when oopsing. From: Adrian Bunk Build fix Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- arch/i386/kernel/traps.c | 5 +++++ fs/sysfs/file.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff -puN fs/sysfs/file.c~sysfs-crash-debugging fs/sysfs/file.c --- devel/fs/sysfs/file.c~sysfs-crash-debugging 2005-11-22 22:31:16.000000000 -0800 +++ devel-akpm/fs/sysfs/file.c 2005-11-22 22:31:16.000000000 -0800 @@ -6,6 +6,8 @@ #include #include #include +#include + #include #include @@ -324,8 +326,14 @@ static int check_perm(struct inode * ino return error; } +char last_sysfs_file[PATH_MAX]; + static int sysfs_open_file(struct inode * inode, struct file * filp) { + char *p = d_path(filp->f_dentry, sysfs_mount, last_sysfs_file, + sizeof(last_sysfs_file)); + if (p) + memmove(last_sysfs_file, p, strlen(p) + 1); return check_perm(inode,filp); } diff -puN arch/i386/kernel/traps.c~sysfs-crash-debugging arch/i386/kernel/traps.c --- devel/arch/i386/kernel/traps.c~sysfs-crash-debugging 2005-11-22 22:31:16.000000000 -0800 +++ devel-akpm/arch/i386/kernel/traps.c 2005-11-22 22:31:16.000000000 -0800 @@ -95,6 +95,8 @@ static int kstack_depth_to_print = 24; struct notifier_block *i386die_chain; static DEFINE_SPINLOCK(die_notifier_lock); +extern char last_sysfs_file[]; + int register_die_notifier(struct notifier_block *nb) { int err = 0; @@ -346,6 +346,9 @@ void die(const char * str, struct pt_reg #endif if (nl) printk("\n"); +#ifdef CONFIG_SYSFS + printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file); +#endif notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV); show_registers(regs); try_crashdump(regs); --- linux-2.6.14/arch/x86_64/kernel/traps.c~ 2005-12-02 18:38:28.000000000 -0500 +++ linux-2.6.14/arch/x86_64/kernel/traps.c 2005-12-02 18:38:57.000000000 -0500 @@ -75,6 +75,8 @@ asmlinkage void call_debug(void); struct notifier_block *die_chain; static DEFINE_SPINLOCK(die_notifier_lock); +extern char last_sysfs_file[]; + int register_die_notifier(struct notifier_block *nb) { int err = 0; @@ -385,6 +387,9 @@ void __die(const char * str, struct pt_r printk("DEBUG_PAGEALLOC"); #endif printk("\n"); +#ifdef CONFIG_SYSFS + printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file); +#endif notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV); show_registers(regs); /* Executive summary in case the oops scrolled away */ linux-2.6-debug-taint-proprietary-helpers.patch: module.c | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE linux-2.6-debug-taint-proprietary-helpers.patch --- Kernels that have had Windows drivers loaded into them are undebuggable. As we're not interested in those bug reports, make sure any oopses are marked accordingly. Signed-off-by: Dave Jones --- linux-2.6.14/kernel/module.c~ 2005-11-29 16:44:00.000000000 -0500 +++ linux-2.6.14/kernel/module.c 2005-11-29 17:03:55.000000000 -0500 @@ -1723,6 +1723,11 @@ static struct module *load_module(void _ /* Set up license info based on the info section */ set_license(mod, get_modinfo(sechdrs, infoindex, "license")); + if (strcmp(mod->name, "ndiswrapper") == 0) + add_taint(TAINT_PROPRIETARY_MODULE); + if (strcmp(mod->name, "driverloader") == 0) + add_taint(TAINT_PROPRIETARY_MODULE); + #ifdef CONFIG_MODULE_UNLOAD /* Set up MODINFO_ATTR fields */ setup_modinfo(mod, sechdrs, infoindex); linux-2.6-firmware-loader-timeout.patch: firmware_class.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-firmware-loader-timeout.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174589 The ipw driver sometimes takes a long time to load its firmware. Whilst the ipw driver should be using the async interface of the firmware loader to make this a non-issue, this is a minimal fix. Signed-off-by: Dave Jones --- linux-2.6.14/drivers/base/firmware_class.c~ 2005-12-01 16:56:29.000000000 -0500 +++ linux-2.6.14/drivers/base/firmware_class.c 2005-12-01 16:56:35.000000000 -0500 @@ -31,7 +31,7 @@ enum { FW_STATUS_READY_NOHOTPLUG, }; -static int loading_timeout = 10; /* In seconds */ +static int loading_timeout = 60; /* In seconds */ /* fw_lock could be moved to 'struct firmware_priv' but since it is just * guarding for corner cases a global lock should be OK */ linux-2.6-hvc-console.patch: arch/powerpc/kernel/setup-common.c | 11 ++ drivers/char/Kconfig | 13 +++ drivers/char/Makefile | 6 - drivers/char/hvc_console.c | 25 ------ drivers/char/hvc_console.h | 83 ++++++++++++++++++++ drivers/char/hvc_fss.c | 149 +++++++++++++++++++++++++++++++++++++ drivers/char/hvc_vio.c | 1 include/asm-powerpc/hvconsole.h | 21 ----- 8 files changed, 262 insertions(+), 47 deletions(-) --- NEW FILE linux-2.6-hvc-console.patch --- diff -uNr --exclude '*.orig' linux-2.6.14.cons/arch/powerpc/kernel/setup-common.c linux-2.6.14/arch/powerpc/kernel/setup-common.c --- linux-2.6.14.cons/arch/powerpc/kernel/setup-common.c 2005-12-07 16:33:31.000000000 +0100 +++ linux-2.6.14/arch/powerpc/kernel/setup-common.c 2005-12-07 16:34:00.000000000 +0100 @@ -304,6 +304,15 @@ DBG(" -> set_preferred_console()\n"); +#ifdef CONFIG_HVC_FSS + /* if we're on the full system simulator just circumvent the whole + * picking process because there is no device tree in which we'll + * find the console device. */ + if(__onsim()) { + DBG("Found hvc_fss console\n"); + return add_preferred_console("hvc", 0, NULL); + } +#endif /* The user has requested a console so this is already set up. */ if (strstr(saved_command_line, "console=")) { DBG(" console was specified !\n"); @@ -385,7 +393,7 @@ } else { /* pSeries LPAR virtual console */ of_node_put(prom_stdout); - DBG("Found hvc console\n"); + DBG("Found hvc_vio console\n"); return add_preferred_console("hvc", 0, NULL); } } diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_console.c linux-2.6.14/drivers/char/hvc_console.c --- linux-2.6.14.cons/drivers/char/hvc_console.c 2005-12-07 16:33:35.000000000 +0100 +++ linux-2.6.14/drivers/char/hvc_console.c 2005-12-07 16:33:56.000000000 +0100 @@ -40,7 +40,7 @@ #include #include #include -#include +#include "hvc_console.h" #define HVC_MAJOR 229 #define HVC_MINOR 0 @@ -61,11 +61,6 @@ */ #define HVC_ALLOC_TTY_ADAPTERS 8 -#define N_OUTBUF 16 -#define N_INBUF 16 - -#define __ALIGNED__ __attribute__((__aligned__(8))) - static struct tty_driver *hvc_driver; static struct task_struct *hvc_task; @@ -76,22 +71,6 @@ static int sysrq_pressed; #endif -struct hvc_struct { - spinlock_t lock; - int index; - struct tty_struct *tty; - unsigned int count; - int do_wakeup; - char outbuf[N_OUTBUF] __ALIGNED__; - int n_outbuf; - uint32_t vtermno; - struct hv_ops *ops; - int irq_requested; - int irq; - struct list_head next; - struct kobject kobj; /* ref count & hvc_struct lifetime */ -}; - /* dynamic list of hvc_struct instances */ static struct list_head hvc_structs = LIST_HEAD_INIT(hvc_structs); @@ -136,7 +115,6 @@ return hp; } - /* * Initial console vtermnos for console API usage prior to full console * initialization. Any vty adapter outside this range will not have usable @@ -154,6 +132,7 @@ void hvc_console_print(struct console *co, const char *b, unsigned count) { + /* This [16] should probably use a #define */ char c[16] __ALIGNED__; unsigned i = 0, n = 0; int r, donecr = 0, index = co->index; diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_console.h linux-2.6.14/drivers/char/hvc_console.h --- linux-2.6.14.cons/drivers/char/hvc_console.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.14/drivers/char/hvc_console.h 2005-12-07 16:33:56.000000000 +0100 @@ -0,0 +1,83 @@ +/* + * hvc_console.h + * Copyright (C) 2005 IBM Corporation + * + * Author(s): + * Ryan S. Arnold + * + * hvc_console header information: + * moved here from include/asm-ppc64/hvconsole.h + * and drivers/char/hvc_console.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef HVC_CONSOLE_H +#define HVC_CONSOLE_H + +#include +#include +#include + +/* + * This is the max number of console adapters that can/will be found as + * console devices on first stage console init. Any number beyond this range + * can't be used as a console device but is still a valid tty device. + */ +#define MAX_NR_HVC_CONSOLES 16 + +/* + * This is a design shortcoming, the number '16' is a vio required buffer + * size. This should be changeable per architecture, but hvc_struct relies + * upon it and that struct is used by all hvc_console backend drivers. This + * needs to be fixed. + */ +#define N_OUTBUF 16 +#define N_INBUF 16 + +#define __ALIGNED__ __attribute__((__aligned__(sizeof(long)))) + +/* implemented by a low level driver */ +struct hv_ops { + int (*get_chars)(uint32_t vtermno, char *buf, int count); + int (*put_chars)(uint32_t vtermno, const char *buf, int count); +}; + +struct hvc_struct { + spinlock_t lock; + int index; + struct tty_struct *tty; + unsigned int count; + int do_wakeup; + char outbuf[N_OUTBUF] __ALIGNED__; + int n_outbuf; + uint32_t vtermno; + struct hv_ops *ops; + int irq_requested; + int irq; + struct list_head next; + struct kobject kobj; /* ref count & hvc_struct lifetime */ +}; + +/* Register a vterm and a slot index for use as a console (console_init) */ +extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops); + +/* register a vterm for hvc tty operation (module_init or hotplug add) */ +extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq, + struct hv_ops *ops); +/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */ +extern int __devexit hvc_remove(struct hvc_struct *hp); + +#endif // HVC_CONSOLE_H diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_fss.c linux-2.6.14/drivers/char/hvc_fss.c --- linux-2.6.14.cons/drivers/char/hvc_fss.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.14/drivers/char/hvc_fss.c 2005-12-07 16:34:02.000000000 +0100 @@ -0,0 +1,149 @@ +/* + * IBM Full System Simulator driver interface to hvc_console.c + * + * (C) Copyright IBM Corporation 2001-2005 + * Author(s): Maximino Augilar + * : Ryan S. Arnold + * + * inspired by drivers/char/hvc_console.c + * written by Anton Blanchard and Paul Mackerras + * + * Some code is from the IBM Full System Simulator Group in ARL. + * Author: Patrick Bohrer + * + * Much of this code was moved here from the IBM Full System Simulator + * Bogus console driver in order to reuse the framework provided by the hvc + * console driver. Ryan S. Arnold + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include "hvc_console.h" + +static uint32_t hvc_fss_vtermno = 0; +struct hvc_struct *hvc_fss_dev; + +static inline int callthru0(int command) +{ + register int c asm ("r3") = command; + + asm volatile (".long 0x000EAEB0" : "=r" (c): "r" (c)); + return((c)); +} + +static inline int callthru3(int command, unsigned long arg1, unsigned long arg2, unsigned long arg3) +{ + register int c asm ("r3") = command; + register unsigned long a1 asm ("r4") = arg1; + register unsigned long a2 asm ("r5") = arg2; + register unsigned long a3 asm ("r6") = arg3; + + asm volatile (".long 0x000EAEB0" : "=r" (c): "r" (c), "r" (a1), "r" (a2), "r" (a3)); + return((c)); +} + +static inline int hvc_fss_write_console(uint32_t vtermno, const char *buf, int count) +{ + int ret = 0; + ret = callthru3(0, (unsigned long)buf, + (unsigned long)count, (unsigned long)1); + if (ret != 0) { + return (count - ret); /* is this right? */ + } + + /* the calling routine expects to receive the number of bytes sent */ + return count; +} + +static inline int hvc_fss_read_console(uint32_t vtermno, char *buf, int count) +{ + unsigned long got; + int c; + int i; + + for (got = 0, i = 0; i < count; i++) { + + if (( c = callthru0(60) ) != -1) { + buf[i] = c; + ++got; + } + else + break; + } + return got; +} + +static struct hv_ops hvc_fss_get_put_ops = { + .get_chars = hvc_fss_read_console, + .put_chars = hvc_fss_write_console, +}; + +static int hvc_fss_init(void) +{ + /* Register a single device with the driver */ + struct hvc_struct *hp; + + if(!__onsim()) { + return -1; + } + + if(hvc_fss_dev) { + return -1; /* This shouldn't happen */ + } + + /* Allocate an hvc_struct for the console device we instantiated + * earlier. Save off hp so that we can return it on exit */ + hp = hvc_alloc(hvc_fss_vtermno, NO_IRQ, &hvc_fss_get_put_ops); + if (IS_ERR(hp)) + return PTR_ERR(hp); + hvc_fss_dev = hp; + return 0; +} +module_init(hvc_fss_init); + +/* This will tear down the tty portion of the driver */ +static void __exit hvc_fss_exit(void) +{ + struct hvc_struct *hp_safe; + /* Hopefully this isn't premature */ + if (!hvc_fss_dev) + return; + + hp_safe = hvc_fss_dev; + hvc_fss_dev = NULL; + + /* Really the fun isn't over until the worker thread breaks down and the + * tty cleans up */ + hvc_remove(hp_safe); +} +module_exit(hvc_fss_exit); /* before drivers/char/hvc_console.c */ + +/* This will happen prior to module init. There is no tty at this time? */ +static int hvc_fss_console_init(void) +{ + /* Don't register if we aren't running on the simulator */ + if (__onsim()) { + /* Tell the driver we know of one console device. We + * shouldn't get a collision on the index as long as no-one + * else instantiates on hardware they don't have. */ + hvc_instantiate(hvc_fss_vtermno, 0, &hvc_fss_get_put_ops ); + } + return 0; +} +console_initcall(hvc_fss_console_init); diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/Kconfig linux-2.6.14/drivers/char/Kconfig --- linux-2.6.14.cons/drivers/char/Kconfig 2005-12-07 16:33:33.000000000 +0100 +++ linux-2.6.14/drivers/char/Kconfig 2005-12-07 16:33:58.000000000 +0100 @@ -552,14 +552,27 @@ If unsure, say N. +config HVC_DRIVER + bool + depends on PPC_PSERIES || PPC_CELL || PPC_RTAS + config HVC_CONSOLE bool "pSeries Hypervisor Virtual Console support" depends on PPC_PSERIES + select HVC_DRIVER help pSeries machines when partitioned support a hypervisor virtual console. This driver allows each pSeries partition to have a console which is accessed via the HMC. +config HVC_FSS + bool "IBM Full System Simulator Console support" + depends on MAMBO + select HVC_DRIVER + help + IBM Full System Simulator Console device driver which makes use of + the HVC_DRIVER front end. + config HVCS tristate "IBM Hypervisor Virtual Console Server support" depends on PPC_PSERIES diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/Makefile linux-2.6.14/drivers/char/Makefile --- linux-2.6.14.cons/drivers/char/Makefile 2005-12-07 16:33:33.000000000 +0100 +++ linux-2.6.14/drivers/char/Makefile 2005-12-07 16:33:58.000000000 +0100 @@ -40,11 +40,13 @@ obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o obj-$(CONFIG_SX) += sx.o generic_serial.o obj-$(CONFIG_RIO) += rio/ generic_serial.o -obj-$(CONFIG_HVC_CONSOLE) += hvc_console.o hvc_vio.o hvsi.o +obj-$(CONFIG_HVC_DRIVER) += hvc_console.o +obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o +obj-$(CONFIG_HVC_FSS) += hvc_fss.o obj-$(CONFIG_RAW_DRIVER) += raw.o obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o obj-$(CONFIG_MMTIMER) += mmtimer.o -obj-$(CONFIG_VIOCONS) += viocons.o +obj-$(CONFIG_VIOCONS) += viocons.o obj-$(CONFIG_VIOTAPE) += viotape.o obj-$(CONFIG_HVCS) += hvcs.o obj-$(CONFIG_SGI_MBCS) += mbcs.o diff -uNr --exclude '*.orig' linux-2.6.14.cons/include/asm-powerpc/hvconsole.h linux-2.6.14/include/asm-powerpc/hvconsole.h --- linux-2.6.14.cons/include/asm-powerpc/hvconsole.h 2005-12-07 16:33:35.000000000 +0100 +++ linux-2.6.14/include/asm-powerpc/hvconsole.h 2005-12-07 16:33:56.000000000 +0100 @@ -22,28 +22,7 @@ #ifndef _PPC64_HVCONSOLE_H #define _PPC64_HVCONSOLE_H -/* - * This is the max number of console adapters that can/will be found as - * console devices on first stage console init. Any number beyond this range - * can't be used as a console device but is still a valid tty device. - */ -#define MAX_NR_HVC_CONSOLES 16 - -/* implemented by a low level driver */ -struct hv_ops { - int (*get_chars)(uint32_t vtermno, char *buf, int count); - int (*put_chars)(uint32_t vtermno, const char *buf, int count); -}; extern int hvc_get_chars(uint32_t vtermno, char *buf, int count); extern int hvc_put_chars(uint32_t vtermno, const char *buf, int count); -struct hvc_struct; - -/* Register a vterm and a slot index for use as a console (console_init) */ -extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops); -/* register a vterm for hvc tty operation (module_init or hotplug add) */ -extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq, - struct hv_ops *ops); -/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */ -extern int __devexit hvc_remove(struct hvc_struct *hp); #endif /* _PPC64_HVCONSOLE_H */ --- linux-2.6.14/drivers/char/hvc_vio.c~ 2005-12-07 17:46:48.000000000 +0100 +++ linux-2.6.14/drivers/char/hvc_vio.c 2005-12-07 18:03:23.000000000 +0100 @@ -34,6 +34,7 @@ #include #include #include +#include "hvc_console.h" char hvc_driver_name[] = "hvc_console"; linux-2.6-hvc-rtas-console.patch: Kconfig | 7 ++ Makefile | 1 hvc_rtas.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+) --- NEW FILE linux-2.6-hvc-rtas-console.patch --- --- linux-2.6.14/drivers/char/hvc_rtas.c~ 2005-12-07 18:12:59.000000000 +0100 +++ linux-2.6.14/drivers/char/hvc_rtas.c 2005-12-07 18:15:39.000000000 +0100 @@ -0,0 +1,161 @@ +/* + * IBM RTAS driver interface to hvc_console.c + * + * (C) Copyright IBM Corporation 2001-2005 + * (C) Copyright Red Hat, Inc. 2005 + * + * Author(s): Maximino Augilar + * : Ryan S. Arnold + * : Utz Bacher + * : David Woodhouse + * + * inspired by drivers/char/hvc_console.c + * written by Anton Blanchard and Paul Mackerras + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include +#include +#include "hvc_console.h" + +static uint32_t hvc_rtas_vtermno = 0; +struct hvc_struct *hvc_rtas_dev; + +#define RTASCONS_PUT_ATTEMPTS 16 + +static int rtascons_put_char_token = -1; +static int rtascons_get_char_token = -1; +static int rtascons_put_delay; + +static inline int hvc_rtas_write_console(uint32_t vtermno, const char *buf, int count) +{ + int result = 0; + int attempts = RTASCONS_PUT_ATTEMPTS; + int done = 0; + + /* if there is more than one character to be displayed, wait a bit */ + for (; done < count && attempts; udelay(rtascons_put_delay)) { + attempts--; + result = rtas_call(rtascons_put_char_token, 1, 1, NULL, buf[done]); + + if (!result) { + attempts = RTASCONS_PUT_ATTEMPTS; + done++; + } + } + /* the calling routine expects to receive the number of bytes sent */ + return done?:result; +} + +static inline int rtascons_get_char(void) +{ + int result; + + if (rtas_call(rtascons_get_char_token, 0, 2, &result)) + result = -1; + + return result; +} + +static int hvc_rtas_read_console(uint32_t vtermno, char *buf, int count) +{ + unsigned long got; + int c; + int i; + + for (got = 0, i = 0; i < count; i++) { + + if (( c = rtascons_get_char() ) != -1) { + buf[i] = c; + ++got; + } + else + break; + } + return got; +} + +static struct hv_ops hvc_rtas_get_put_ops = { + .get_chars = hvc_rtas_read_console, + .put_chars = hvc_rtas_write_console, +}; + +static int hvc_rtas_init(void) +{ + struct hvc_struct *hp; + + if (rtascons_put_char_token == -1) + rtascons_put_char_token = rtas_token("put-term-char"); + if (rtascons_put_char_token == -1) + return -EIO; + + if (rtascons_get_char_token == -1) + rtascons_get_char_token = rtas_token("get-term-char"); + if (rtascons_get_char_token == -1) + return -EIO; + + if (__onsim()) + rtascons_put_delay = 0; + else + rtascons_put_delay = 100; + + BUG_ON(hvc_rtas_dev); + + /* Allocate an hvc_struct for the console device we instantiated + * earlier. Save off hp so that we can return it on exit */ + hp = hvc_alloc(hvc_rtas_vtermno, NO_IRQ, &hvc_rtas_get_put_ops); + if (IS_ERR(hp)) + return PTR_ERR(hp); + hvc_rtas_dev = hp; + return 0; +} +module_init(hvc_rtas_init); + +/* This will tear down the tty portion of the driver */ +static void __exit hvc_rtas_exit(void) +{ + struct hvc_struct *hp_safe; + /* Hopefully this isn't premature */ + if (!hvc_rtas_dev) + return; + + hp_safe = hvc_rtas_dev; + hvc_rtas_dev = NULL; + + /* Really the fun isn't over until the worker thread breaks down and the + * tty cleans up */ + hvc_remove(hp_safe); +} +module_exit(hvc_rtas_exit); /* before drivers/char/hvc_console.c */ + +/* This will happen prior to module init. There is no tty at this time? */ +static int hvc_rtas_console_init(void) +{ + rtascons_put_char_token = rtas_token("put-term-char"); + if (rtascons_put_char_token == -1) + return -EIO; + rtascons_get_char_token = rtas_token("get-term-char"); + if (rtascons_get_char_token == -1) + return -EIO; + + hvc_instantiate(hvc_rtas_vtermno, 0, &hvc_rtas_get_put_ops ); + return 0; +} +console_initcall(hvc_rtas_console_init); --- linux-2.6.14/drivers/char/Makefile~ 2005-12-07 17:47:05.000000000 +0100 +++ linux-2.6.14/drivers/char/Makefile 2005-12-07 18:12:07.000000000 +0100 @@ -43,6 +43,7 @@ obj-$(CONFIG_RIO) += rio/ generic_seria obj-$(CONFIG_HVC_DRIVER) += hvc_console.o obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o obj-$(CONFIG_HVC_FSS) += hvc_fss.o +obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o obj-$(CONFIG_RAW_DRIVER) += raw.o obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o obj-$(CONFIG_MMTIMER) += mmtimer.o --- linux-2.6.14/drivers/char/Kconfig~ 2005-12-07 17:47:05.000000000 +0100 +++ linux-2.6.14/drivers/char/Kconfig 2005-12-07 18:17:14.000000000 +0100 @@ -575,6 +575,13 @@ config HVC_FSS IBM Full System Simulator Console device driver which makes use of the HVC_DRIVER front end. +config HVC_RTAS + bool "IBM RTAS Console support" + depends on PPC_RTAS + select HVC_DRIVER + help + IBM Console device driver which makes use of RTAS + config HVCS tristate "IBM Hypervisor Virtual Console Server support" depends on PPC_PSERIES linux-2.6-ide-cd-shutup.patch: ide-cd.c | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE linux-2.6-ide-cd-shutup.patch --- --- linux-2.6.14/drivers/ide/ide-cd.c~ 2005-12-14 15:11:39.000000000 -0500 +++ linux-2.6.14/drivers/ide/ide-cd.c 2005-12-14 15:12:21.000000000 -0500 @@ -386,6 +386,12 @@ static int cdrom_log_sense(ide_drive_t * */ if (sense->asc == 0x3a || sense->asc == 0x04) break; + /* + * some drives spew this for an empty drive + */ + if (rq->cmd[0] == GPCMD_READ_CDVD_CAPACITY && + sense->asc == 0x30) + break; log = 1; break; case ILLEGAL_REQUEST: linux-2.6-powerpc-parport.patch: parport.h | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-powerpc-parport.patch --- Patch stops parport from accessing non existant ports. Signed-off-by: Michael Neuling include/asm-powerpc/parport.h | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) Index: linux-2.6-powerpc.nobackup/include/asm-powerpc/parport.h =================================================================== --- linux-2.6-powerpc.nobackup.orig/include/asm-powerpc/parport.h +++ linux-2.6-powerpc.nobackup/include/asm-powerpc/parport.h @@ -9,10 +9,34 @@ #ifndef _ASM_POWERPC_PARPORT_H #define _ASM_POWERPC_PARPORT_H -static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma); +#include + +extern struct parport *parport_pc_probe_port (unsigned long int base, + unsigned long int base_hi, + int irq, int dma, + struct pci_dev *dev); + static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) { - return parport_pc_find_isa_ports (autoirq, autodma); + struct device_node *np; + u32 *prop; + u32 io1, io2; + int propsize; + int count = 0; + for (np = NULL; (np = of_find_compatible_node(np, + "parallel", + "pnpPNP,400")) != NULL;) { + prop = (u32 *)get_property(np, "reg", &propsize); + if (!prop || propsize > 6*sizeof(u32)) + continue; + io1 = prop[1]; io2 = prop[2]; + prop = (u32 *)get_property(np, "interrupts", NULL); + if (!prop) + continue; + if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL) != NULL) + count++; + } + return count; } #endif /* !(_ASM_POWERPC_PARPORT_H) */ linux-2.6-ppc-rtas-check.patch: prom_init.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-ppc-rtas-check.patch --- --- linux-2.6.14/arch/powerpc/kernel/prom_init.c~ 2005-12-07 23:33:20.000000000 +0100 +++ linux-2.6.14/arch/powerpc/kernel/prom_init.c 2005-12-07 23:33:38.000000000 +0100 @@ -1051,7 +1051,7 @@ static void __init prom_instantiate_rtas if (call_prom_ret("call-method", 3, 2, &entry, ADDR("instantiate-rtas"), - rtas_inst, base) != 0 + rtas_inst, base) == PROM_ERROR || entry == 0) { prom_printf(" failed\n"); return; linux-2.6-sata-enable-atapi-by-default.patch: libata-core.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-sata-enable-atapi-by-default.patch --- --- linux-2.6.14/drivers/scsi/libata-core.c~ 2005-11-22 11:33:25.000000000 -0500 +++ linux-2.6.14/drivers/scsi/libata-core.c 2005-11-22 11:33:37.000000000 -0500 @@ -78,7 +78,7 @@ static void __ata_qc_complete(struct ata static unsigned int ata_unique_id = 1; static struct workqueue_struct *ata_wq; -int atapi_enabled = 0; +int atapi_enabled = 1; module_param(atapi_enabled, int, 0444); MODULE_PARM_DESC(atapi_enabled, "Enable discovery of ATAPI devices (0=off, 1=on)"); linux-2.6-ub.patch: drivers/block/ub.c | 482 +++++++--- linux-2.6.14-1.1674_FC5-ub/drivers/block/Kconfig | 3 linux-2.6.14-1.1674_FC5-ub/drivers/block/ub.c | 23 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/Kconfig | 14 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/Makefile | 4 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/libusual.c | 266 +++++ linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/protocol.h | 14 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/transport.h | 31 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/unusual_devs.h | 24 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/usb.c | 123 -- linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/usb.h | 31 linux-2.6.14-1.1674_FC5-ub/include/linux/usb_usual.h | 123 ++ linux-2.6.14/drivers/usb/Makefile | 1 13 files changed, 828 insertions(+), 311 deletions(-) --- NEW FILE linux-2.6-ub.patch --- diff -urpN -X dontdiff linux-2.6.14-1.1674_FC5/drivers/block/Kconfig linux-2.6.14-1.1674_FC5-ub/drivers/block/Kconfig --- linux-2.6.14-1.1674_FC5/drivers/block/Kconfig 2005-11-15 12:20:27.000000000 -0800 +++ linux-2.6.14-1.1674_FC5-ub/drivers/block/Kconfig 2005-11-15 13:30:19.000000000 -0800 @@ -358,7 +358,8 @@ config BLK_DEV_UB This driver supports certain USB attached storage devices such as flash keys. - Warning: Enabling this cripples the usb-storage driver. + If you enable this driver, it is recommended to avoid conflicts + with usb-storage by enabling USB_LIBUSUAL. If unsure, say N. diff -urpN -X dontdiff linux-2.6.14-1.1674_FC5/drivers/block/ub.c linux-2.6.14-1.1674_FC5-ub/drivers/block/ub.c --- linux-2.6.14-1.1674_FC5/drivers/block/ub.c 2005-11-15 12:19:32.000000000 -0800 +++ linux-2.6.14-1.1674_FC5-ub/drivers/block/ub.c 2005-11-15 13:30:19.000000000 -0800 @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -107,16 +108,6 @@ */ /* - * Definitions which have to be scattered once we understand the layout better. - */ - -/* Transport (despite PR in the name) */ -#define US_PR_BULK 0x50 /* bulk only */ - -/* Protocol */ -#define US_SC_SCSI 0x06 /* Transparent */ - -/* * This many LUNs per USB device. * Every one of them takes a host, see UB_MAX_HOSTS. */ @@ -422,13 +413,18 @@ static int ub_probe_lun(struct ub_dev *s /* */ +#ifdef CONFIG_USB_LIBUSUAL + +#define ub_usb_ids storage_usb_ids +#else + static struct usb_device_id ub_usb_ids[] = { - // { USB_DEVICE_VER(0x0781, 0x0002, 0x0009, 0x0009) }, /* SDDR-31 */ { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_SCSI, US_PR_BULK) }, { } }; MODULE_DEVICE_TABLE(usb, ub_usb_ids); +#endif /* CONFIG_USB_LIBUSUAL */ /* * Find me a way to identify "next free minor" for add_disk(), @@ -2172,6 +2168,9 @@ static int ub_probe(struct usb_interface int rc; int i; + if (usb_usual_check_type(dev_id, USB_US_TYPE_UB)) + return -ENXIO; + rc = -ENOMEM; if ((sc = kmalloc(sizeof(struct ub_dev), GFP_KERNEL)) == NULL) goto err_core; @@ -2479,6 +2478,7 @@ static int __init ub_init(void) if ((rc = usb_register(&ub_driver)) != 0) goto err_register; + usb_usual_set_present(USB_US_TYPE_UB); return 0; err_register: @@ -2494,6 +2494,7 @@ static void __exit ub_exit(void) devfs_remove(DEVFS_NAME); unregister_blkdev(UB_MAJOR, DRV_NAME); + usb_usual_clear_present(USB_US_TYPE_UB); } module_init(ub_init); diff -urpN -X dontdiff linux-2.6.14-1.1674_FC5/drivers/usb/storage/Kconfig linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/Kconfig --- linux-2.6.14-1.1674_FC5/drivers/usb/storage/Kconfig 2005-11-15 12:19:56.000000000 -0800 +++ linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/Kconfig 2005-11-15 13:30:19.000000000 -0800 @@ -124,3 +124,17 @@ config USB_STORAGE_ONETOUCH hard drive's as an input device. An action can be associated with this input in any keybinding software. (e.g. gnome's keyboard short- cuts) + +config USB_LIBUSUAL + bool "The shared table of common (or usual) storage devices" + depends on USB + help + This module contains a table of common (or usual) devices + for usb-storage and ub drivers, and allows to switch binding + of these devices without rebuilding modules. + + Typical syntax of /etc/modprobe.conf is: + + options libusual bias="ub" + + If unsure, say N. diff -urpN -X dontdiff linux-2.6.14-1.1674_FC5/drivers/usb/storage/libusual.c linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/libusual.c --- linux-2.6.14-1.1674_FC5/drivers/usb/storage/libusual.c 1969-12-31 16:00:00.000000000 -0800 +++ linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/libusual.c 2005-11-15 13:30:19.000000000 -0800 @@ -0,0 +1,266 @@ +/* + * libusual + * + * The libusual contains the table of devices common for ub and usb-storage. + */ +#include +#include +#include +#include +#include + +/* + */ +#define USU_MOD_FL_THREAD 1 /* Thread is running */ +#define USU_MOD_FL_PRESENT 2 /* The module is loaded */ + +struct mod_status { + unsigned long fls; +}; + +static struct mod_status stat[3]; +static DEFINE_SPINLOCK(usu_lock); + +/* + */ +#define USB_US_DEFAULT_BIAS USB_US_TYPE_STOR + +#define BIAS_NAME_SIZE (sizeof("usb-storage")) +static char bias[BIAS_NAME_SIZE]; +static int usb_usual_bias; +static const char *bias_names[3] = { "none", "usb-storage", "ub" }; + +static DECLARE_MUTEX_LOCKED(usu_init_notify); +static DECLARE_COMPLETION(usu_end_notify); +static atomic_t total_threads = ATOMIC_INIT(0); + +static int usu_probe_thread(void *arg); +static int parse_bias(const char *bias_s); + +/* + * The table. + */ +#define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \ + vendorName, productName,useProtocol, useTransport, \ + initFunction, flags) \ +{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin,bcdDeviceMax), \ + .driver_info = (flags)|(USB_US_TYPE_STOR<<24) } + +#define USUAL_DEV(useProto, useTrans, useType) \ +{ USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans), \ + .driver_info = ((useType)<<24) } + +struct usb_device_id storage_usb_ids [] = { +# include "unusual_devs.h" + { } /* Terminating entry */ +}; + +#undef USUAL_DEV +#undef UNUSUAL_DEV + +MODULE_DEVICE_TABLE(usb, storage_usb_ids); +EXPORT_SYMBOL(storage_usb_ids); + +/* + * @type: the module type as an integer + */ +void usb_usual_set_present(int type) +{ + struct mod_status *st; + unsigned long flags; + + if (type <= 0 || type >= 3) + return; + st = &stat[type]; + spin_lock_irqsave(&usu_lock, flags); + st->fls |= USU_MOD_FL_PRESENT; + spin_unlock_irqrestore(&usu_lock, flags); +} +EXPORT_SYMBOL(usb_usual_set_present); + +void usb_usual_clear_present(int type) +{ + struct mod_status *st; + unsigned long flags; + + if (type <= 0 || type >= 3) + return; + st = &stat[type]; + spin_lock_irqsave(&usu_lock, flags); + st->fls &= ~USU_MOD_FL_PRESENT; + spin_unlock_irqrestore(&usu_lock, flags); +} +EXPORT_SYMBOL(usb_usual_clear_present); + +/* + * Match the calling driver type against the table. + * Returns: 0 if the device matches. + */ +int usb_usual_check_type(const struct usb_device_id *id, int caller_type) +{ + int id_type = USB_US_TYPE(id->driver_info); + + if (caller_type <= 0 || caller_type >= 3) + return -EINVAL; + + /* Drivers grab fixed assignment devices */ + if (id_type == caller_type) + return 0; + /* Drivers grab devices biased to them */ + if (id_type == USB_US_TYPE_NONE && caller_type == usb_usual_bias) + return 0; + return -ENODEV; +} +EXPORT_SYMBOL(usb_usual_check_type); + +/* + */ +static int usu_probe(struct usb_interface *intf, + const struct usb_device_id *id) +{ + int type; + int rc; + unsigned long flags; + + type = USB_US_TYPE(id->driver_info); + if (type == 0) + type = usb_usual_bias; + + spin_lock_irqsave(&usu_lock, flags); + if ((stat[type].fls & (USU_MOD_FL_THREAD|USU_MOD_FL_PRESENT)) != 0) { + spin_unlock_irqrestore(&usu_lock, flags); + return -ENXIO; + } + stat[type].fls |= USU_MOD_FL_THREAD; + spin_unlock_irqrestore(&usu_lock, flags); + + rc = kernel_thread(usu_probe_thread, (void*)type, CLONE_VM); + if (rc < 0) { + printk(KERN_WARNING "libusual: " + "Unable to start the thread for %s: %d\n", + bias_names[type], rc); + spin_lock_irqsave(&usu_lock, flags); + stat[type].fls &= ~USU_MOD_FL_THREAD; + spin_unlock_irqrestore(&usu_lock, flags); + return rc; /* Not being -ENXIO causes a message printed */ + } + atomic_inc(&total_threads); + + return -ENXIO; +} + +static void usu_disconnect(struct usb_interface *intf) +{ + ; /* We should not be here. */ +} + +static struct usb_driver usu_driver = { + .owner = THIS_MODULE, + .name = "libusual", + .probe = usu_probe, + .disconnect = usu_disconnect, + .id_table = storage_usb_ids, +}; + +/* + * A whole new thread for a purpose of request_module seems quite stupid. + * The request_module forks once inside again. However, if we attempt + * to load a storage module from our own modprobe thread, that module + * references our symbols, which cannot be resolved until our module is + * initialized. I wish there was a way to wait for the end of initialization. + * The module notifier reports MODULE_STATE_COMING only. + * So, we wait until module->init ends as the next best thing. + */ +static int usu_probe_thread(void *arg) +{ + int type = (unsigned long) arg; + struct mod_status *st = &stat[type]; + int rc; + unsigned long flags; + + daemonize("libusual_%d", type); /* "usb-storage" is kinda too long */ + + /* A completion does not work here because it's counted. */ + down(&usu_init_notify); + up(&usu_init_notify); + + rc = request_module(bias_names[type]); + spin_lock_irqsave(&usu_lock, flags); + if (rc == 0 && (st->fls & USU_MOD_FL_PRESENT) == 0) { + /* + * This should not happen, but let us keep tabs on it. + */ + printk(KERN_NOTICE "libusual: " + "modprobe for %s succeeded, but module is not present\n", + bias_names[type]); + } + st->fls &= ~USU_MOD_FL_THREAD; + spin_unlock_irqrestore(&usu_lock, flags); + + complete_and_exit(&usu_end_notify, 0); +} + +/* + */ +static int __init usb_usual_init(void) +{ + int rc; + + bias[BIAS_NAME_SIZE-1] = 0; + usb_usual_bias = parse_bias(bias); + + rc = usb_register(&usu_driver); + up(&usu_init_notify); + return rc; +} + +static void __exit usb_usual_exit(void) +{ + /* + * We do not check for any drivers present, because + * they keep us pinned with symbol references. + */ + + usb_deregister(&usu_driver); + + while (atomic_read(&total_threads) > 0) { + wait_for_completion(&usu_end_notify); + atomic_dec(&total_threads); + } +} + +/* + * Validate and accept the bias parameter. + * Maybe make an sysfs method later. XXX + */ +static int parse_bias(const char *bias_s) +{ + int i; + int bias_n = 0; + + if (bias_s[0] == 0 || bias_s[0] == ' ') { + bias_n = USB_US_DEFAULT_BIAS; + } else { + for (i = 1; i < 3; i++) { + if (strcmp(bias_s, bias_names[i]) == 0) { + bias_n = i; + break; + } + } + if (bias_n == 0) { + bias_n = USB_US_DEFAULT_BIAS; + printk(KERN_INFO + "libusual: unknown bias \"%s\", using \"%s\"\n", + bias_s, bias_names[bias_n]); + } + } + return bias_n; +} + +module_init(usb_usual_init); +module_exit(usb_usual_exit); + +module_param_string(bias, bias, BIAS_NAME_SIZE, S_IRUGO|S_IWUSR); +MODULE_PARM_DESC(bias, "Bias to usb-storage or ub"); + +MODULE_LICENSE("GPL"); diff -urpN -X dontdiff linux-2.6.14-1.1674_FC5/drivers/usb/storage/Makefile linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/Makefile --- linux-2.6.14-1.1674_FC5/drivers/usb/storage/Makefile 2005-10-27 17:02:08.000000000 -0700 +++ linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/Makefile 2005-11-15 13:30:19.000000000 -0800 @@ -22,3 +22,7 @@ usb-storage-obj-$(CONFIG_USB_STORAGE_ONE usb-storage-objs := scsiglue.o protocol.o transport.o usb.o \ initializers.o $(usb-storage-obj-y) + +ifneq ($(CONFIG_USB_LIBUSUAL),) + obj-$(CONFIG_USB) += libusual.o +endif diff -urpN -X dontdiff linux-2.6.14-1.1674_FC5/drivers/usb/storage/protocol.h linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/protocol.h --- linux-2.6.14-1.1674_FC5/drivers/usb/storage/protocol.h 2005-10-27 17:02:08.000000000 -0700 +++ linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/protocol.h 2005-11-15 13:30:19.000000000 -0800 @@ -41,20 +41,6 @@ #ifndef _PROTOCOL_H_ #define _PROTOCOL_H_ -/* Sub Classes */ - -#define US_SC_RBC 0x01 /* Typically, flash devices */ -#define US_SC_8020 0x02 /* CD-ROM */ -#define US_SC_QIC 0x03 /* QIC-157 Tapes */ -#define US_SC_UFI 0x04 /* Floppy */ -#define US_SC_8070 0x05 /* Removable media */ -#define US_SC_SCSI 0x06 /* Transparent */ -#define US_SC_ISD200 0x07 /* ISD200 ATA */ -#define US_SC_MIN US_SC_RBC -#define US_SC_MAX US_SC_ISD200 - -#define US_SC_DEVICE 0xff /* Use device's value */ - /* Protocol handling routines */ extern void usb_stor_ATAPI_command(struct scsi_cmnd*, struct us_data*); extern void usb_stor_qic157_command(struct scsi_cmnd*, struct us_data*); diff -urpN -X dontdiff linux-2.6.14-1.1674_FC5/drivers/usb/storage/transport.h linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/transport.h --- linux-2.6.14-1.1674_FC5/drivers/usb/storage/transport.h 2005-11-15 12:19:56.000000000 -0800 +++ linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/transport.h 2005-11-15 13:36:41.000000000 -0800 @@ -41,39 +41,8 @@ #ifndef _TRANSPORT_H_ #define _TRANSPORT_H_ -#include #include -/* Protocols */ - -#define US_PR_CBI 0x00 /* Control/Bulk/Interrupt */ -#define US_PR_CB 0x01 /* Control/Bulk w/o interrupt */ -#define US_PR_BULK 0x50 /* bulk only */ -#ifdef CONFIG_USB_STORAGE_USBAT -#define US_PR_USBAT 0x80 /* SCM-ATAPI bridge */ -#endif -#ifdef CONFIG_USB_STORAGE_SDDR09 -#define US_PR_EUSB_SDDR09 0x81 /* SCM-SCSI bridge for SDDR-09 */ -#endif -#ifdef CONFIG_USB_STORAGE_SDDR55 -#define US_PR_SDDR55 0x82 /* SDDR-55 (made up) */ -#endif -#define US_PR_DPCM_USB 0xf0 /* Combination CB/SDDR09 */ - -#ifdef CONFIG_USB_STORAGE_FREECOM -#define US_PR_FREECOM 0xf1 /* Freecom */ -#endif - -#ifdef CONFIG_USB_STORAGE_DATAFAB -#define US_PR_DATAFAB 0xf2 /* Datafab chipsets */ -#endif - -#ifdef CONFIG_USB_STORAGE_JUMPSHOT -#define US_PR_JUMPSHOT 0xf3 /* Lexar Jumpshot */ -#endif - -#define US_PR_DEVICE 0xff /* Use device's value */ - /* * Bulk only data structures */ diff -urpN -X dontdiff linux-2.6.14-1.1674_FC5/drivers/usb/storage/unusual_devs.h linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/unusual_devs.h --- linux-2.6.14-1.1674_FC5/drivers/usb/storage/unusual_devs.h 2005-11-15 12:19:56.000000000 -0800 +++ linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/unusual_devs.h 2005-11-15 13:30:20.000000000 -0800 @@ -1125,3 +1125,27 @@ UNUSUAL_DEV( 0x55aa, 0xa103, 0x0000, 0x US_SC_SCSI, US_PR_SDDR55, NULL, US_FL_SINGLE_LUN), #endif + +/* Control/Bulk transport for all SubClass values */ +USUAL_DEV(US_SC_RBC, US_PR_CB, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_8020, US_PR_CB, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_QIC, US_PR_CB, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_UFI, US_PR_CB, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_8070, US_PR_CB, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_SCSI, US_PR_CB, USB_US_TYPE_STOR), + +/* Control/Bulk/Interrupt transport for all SubClass values */ +USUAL_DEV(US_SC_RBC, US_PR_CBI, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_8020, US_PR_CBI, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_QIC, US_PR_CBI, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_UFI, US_PR_CBI, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_8070, US_PR_CBI, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_SCSI, US_PR_CBI, USB_US_TYPE_STOR), + +/* Bulk-only transport for all SubClass values */ +USUAL_DEV(US_SC_RBC, US_PR_BULK, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_8020, US_PR_BULK, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_QIC, US_PR_BULK, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_UFI, US_PR_BULK, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_8070, US_PR_BULK, USB_US_TYPE_STOR), +USUAL_DEV(US_SC_SCSI, US_PR_BULK, 0), diff -urpN -X dontdiff linux-2.6.14-1.1674_FC5/drivers/usb/storage/usb.c linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/usb.c --- linux-2.6.14-1.1674_FC5/drivers/usb/storage/usb.c 2005-11-15 12:19:56.000000000 -0800 +++ linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/usb.c 2005-11-15 13:38:47.000000000 -0800 @@ -112,49 +112,33 @@ static atomic_t total_threads = ATOMIC_I static DECLARE_COMPLETION(threads_gone); -/* The entries in this table, except for final ones here - * (USB_MASS_STORAGE_CLASS and the empty entry), correspond, - * line for line with the entries of us_unsuaul_dev_list[]. +/* + * The entries in this table correspond, line for line, + * with the entries of us_unusual_dev_list[]. */ +#ifndef CONFIG_USB_LIBUSUAL #define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \ vendorName, productName,useProtocol, useTransport, \ initFunction, flags) \ -{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin,bcdDeviceMax) } +{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin,bcdDeviceMax), \ + .driver_info = (flags)|(USB_US_TYPE_STOR<<24) } + +#define USUAL_DEV(useProto, useTrans, useType) \ +{ USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans), \ + .driver_info = (USB_US_TYPE_STOR<<24) } static struct usb_device_id storage_usb_ids [] = { # include "unusual_devs.h" #undef UNUSUAL_DEV - /* Control/Bulk transport for all SubClass values */ - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_RBC, US_PR_CB) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_8020, US_PR_CB) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_QIC, US_PR_CB) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_UFI, US_PR_CB) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_8070, US_PR_CB) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_SCSI, US_PR_CB) }, - - /* Control/Bulk/Interrupt transport for all SubClass values */ - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_RBC, US_PR_CBI) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_8020, US_PR_CBI) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_QIC, US_PR_CBI) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_UFI, US_PR_CBI) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_8070, US_PR_CBI) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_SCSI, US_PR_CBI) }, - - /* Bulk-only transport for all SubClass values */ - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_RBC, US_PR_BULK) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_8020, US_PR_BULK) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_QIC, US_PR_BULK) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_UFI, US_PR_BULK) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_8070, US_PR_BULK) }, - { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_SCSI, US_PR_BULK) }, - +#undef USUAL_DEV /* Terminating entry */ { } }; MODULE_DEVICE_TABLE (usb, storage_usb_ids); +#endif /* CONFIG_USB_LIBUSUAL */ /* This is the list of devices we recognize, along with their flag data */ @@ -167,7 +151,6 @@ MODULE_DEVICE_TABLE (usb, storage_usb_id * are free to use as many characters as you like. */ -#undef UNUSUAL_DEV #define UNUSUAL_DEV(idVendor, idProduct, bcdDeviceMin, bcdDeviceMax, \ vendor_name, product_name, use_protocol, use_transport, \ init_function, Flags) \ @@ -177,53 +160,18 @@ MODULE_DEVICE_TABLE (usb, storage_usb_id .useProtocol = use_protocol, \ .useTransport = use_transport, \ .initFunction = init_function, \ - .flags = Flags, \ +} + +#define USUAL_DEV(use_protocol, use_transport, use_type) \ +{ \ + .useProtocol = use_protocol, \ + .useTransport = use_transport, \ } static struct us_unusual_dev us_unusual_dev_list[] = { # include "unusual_devs.h" # undef UNUSUAL_DEV - /* Control/Bulk transport for all SubClass values */ - { .useProtocol = US_SC_RBC, - .useTransport = US_PR_CB}, - { .useProtocol = US_SC_8020, - .useTransport = US_PR_CB}, - { .useProtocol = US_SC_QIC, - .useTransport = US_PR_CB}, - { .useProtocol = US_SC_UFI, - .useTransport = US_PR_CB}, - { .useProtocol = US_SC_8070, - .useTransport = US_PR_CB}, - { .useProtocol = US_SC_SCSI, - .useTransport = US_PR_CB}, - - /* Control/Bulk/Interrupt transport for all SubClass values */ - { .useProtocol = US_SC_RBC, - .useTransport = US_PR_CBI}, - { .useProtocol = US_SC_8020, - .useTransport = US_PR_CBI}, - { .useProtocol = US_SC_QIC, - .useTransport = US_PR_CBI}, - { .useProtocol = US_SC_UFI, - .useTransport = US_PR_CBI}, - { .useProtocol = US_SC_8070, - .useTransport = US_PR_CBI}, - { .useProtocol = US_SC_SCSI, - .useTransport = US_PR_CBI}, - - /* Bulk-only transport for all SubClass values */ - { .useProtocol = US_SC_RBC, - .useTransport = US_PR_BULK}, - { .useProtocol = US_SC_8020, - .useTransport = US_PR_BULK}, - { .useProtocol = US_SC_QIC, - .useTransport = US_PR_BULK}, - { .useProtocol = US_SC_UFI, - .useTransport = US_PR_BULK}, - { .useProtocol = US_SC_8070, - .useTransport = US_PR_BULK}, - { .useProtocol = US_SC_SCSI, - .useTransport = US_PR_BULK}, +# undef USUAL_DEV /* Terminating entry */ { NULL } @@ -483,15 +431,21 @@ static int associate_dev(struct us_data } return 0; } + +/* Find an unusual_dev descriptor (always succeeds in the current code) */ +static struct us_unusual_dev *find_unusual(const struct usb_device_id *id) +{ + const int id_index = id - storage_usb_ids; + return &us_unusual_dev_list[id_index]; +} /* Get the unusual_devs entries and the string descriptors */ -static void get_device_info(struct us_data *us, int id_index) +static void get_device_info(struct us_data *us, const struct usb_device_id *id) { struct usb_device *dev = us->pusb_dev; struct usb_interface_descriptor *idesc = &us->pusb_intf->cur_altsetting->desc; - struct us_unusual_dev *unusual_dev = &us_unusual_dev_list[id_index]; - struct usb_device_id *id = &storage_usb_ids[id_index]; + struct us_unusual_dev *unusual_dev = find_unusual(id); /* Store the entries */ us->unusual_dev = unusual_dev; @@ -501,7 +455,7 @@ static void get_device_info(struct us_da us->protocol = (unusual_dev->useTransport == US_PR_DEVICE) ? idesc->bInterfaceProtocol : unusual_dev->useTransport; - us->flags = unusual_dev->flags; + us->flags = USB_US_ORIG_FLAGS(id->driver_info); /* * This flag is only needed when we're in high-speed, so let's @@ -529,7 +483,7 @@ static void get_device_info(struct us_da if (unusual_dev->useTransport != US_PR_DEVICE && us->protocol == idesc->bInterfaceProtocol) msg += 2; - if (msg >= 0 && !(unusual_dev->flags & US_FL_NEED_OVERRIDE)) + if (msg >= 0 && !(us->flags & US_FL_NEED_OVERRIDE)) printk(KERN_NOTICE USB_STORAGE "This device " "(%04x,%04x,%04x S %02x P %02x)" " has %s in unusual_devs.h\n" @@ -921,10 +875,12 @@ static int storage_probe(struct usb_inte { struct Scsi_Host *host; struct us_data *us; - const int id_index = id - storage_usb_ids; int result; struct task_struct *th; + if (usb_usual_check_type(id, USB_US_TYPE_STOR)) + return -ENXIO; + US_DEBUGP("USB Mass Storage device detected\n"); /* @@ -952,12 +908,8 @@ static int storage_probe(struct usb_inte /* * Get the unusual_devs entries and the descriptors - * - * id_index is calculated in the declaration to be the index number - * of the match from the usb_device_id table, so we can find the - * corresponding entry in the private table. */ - get_device_info(us, id_index); + get_device_info(us, id); #ifdef CONFIG_USB_STORAGE_SDDR09 if (us->protocol == US_PR_EUSB_SDDR09 || @@ -1062,9 +1014,10 @@ static int __init usb_stor_init(void) /* register the driver, return usb_register return code if error */ retval = usb_register(&usb_storage_driver); - if (retval == 0) + if (retval == 0) { printk(KERN_INFO "USB Mass Storage support registered.\n"); - + usb_usual_set_present(USB_US_TYPE_STOR); + } return retval; } @@ -1088,6 +1041,8 @@ static void __exit usb_stor_exit(void) wait_for_completion(&threads_gone); atomic_dec(&total_threads); } + + usb_usual_clear_present(USB_US_TYPE_STOR); } module_init(usb_stor_init); diff -urpN -X dontdiff linux-2.6.14-1.1674_FC5/drivers/usb/storage/usb.h linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/usb.h --- linux-2.6.14-1.1674_FC5/drivers/usb/storage/usb.h 2005-11-15 12:19:56.000000000 -0800 +++ linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/usb.h 2005-11-15 13:30:20.000000000 -0800 @@ -45,6 +45,7 @@ #define _USB_H_ #include +#include #include #include #include @@ -63,38 +64,8 @@ struct us_unusual_dev { __u8 useProtocol; __u8 useTransport; int (*initFunction)(struct us_data *); - unsigned int flags; }; -/* - * Static flag definitions. We use this roundabout technique so that the - * proc_info() routine can automatically display a message for each flag. - */ -#define US_DO_ALL_FLAGS \ - US_FLAG(SINGLE_LUN, 0x00000001) \ - /* allow access to only LUN 0 */ \ - US_FLAG(NEED_OVERRIDE, 0x00000002) \ - /* unusual_devs entry is necessary */ \ - US_FLAG(SCM_MULT_TARG, 0x00000004) \ - /* supports multiple targets */ \ - US_FLAG(FIX_INQUIRY, 0x00000008) \ - /* INQUIRY response needs faking */ \ - US_FLAG(FIX_CAPACITY, 0x00000010) \ - /* READ CAPACITY response too big */ \ - US_FLAG(IGNORE_RESIDUE, 0x00000020) \ - /* reported residue is wrong */ \ - US_FLAG(BULK32, 0x00000040) \ - /* Uses 32-byte CBW length */ \ - US_FLAG(NOT_LOCKABLE, 0x00000080) \ - /* PREVENT/ALLOW not supported */ \ - US_FLAG(GO_SLOW, 0x00000100) \ - /* Need delay after Command phase */ \ - US_FLAG(NO_WP_DETECT, 0x00000200) \ - /* Don't check for write-protect */ \ - -#define US_FLAG(name, value) US_FL_##name = value , -enum { US_DO_ALL_FLAGS }; -#undef US_FLAG /* Dynamic flag definitions: used in set_bit() etc. */ #define US_FLIDX_URB_ACTIVE 18 /* 0x00040000 current_urb is in use */ diff -urpN -X dontdiff linux-2.6.14-1.1674_FC5/include/linux/usb_usual.h linux-2.6.14-1.1674_FC5-ub/include/linux/usb_usual.h --- linux-2.6.14-1.1674_FC5/include/linux/usb_usual.h 1969-12-31 16:00:00.000000000 -0800 +++ linux-2.6.14-1.1674_FC5-ub/include/linux/usb_usual.h 2005-11-15 13:35:50.000000000 -0800 @@ -0,0 +1,123 @@ +/* + * Interface to the libusual. + * + * Copyright (c) 2005 Pete Zaitcev + * Copyright (c) 1999-2002 Matthew Dharm (mdharm-usb at one-eyed-alien.net) + * Copyright (c) 1999 Michael Gee (michael at linuxspecific.com) + */ + +#ifndef __LINUX_USB_USUAL_H +#define __LINUX_USB_USUAL_H + +#include + +/* We should do this for cleanliness... But other usb_foo.h do not do this. */ +/* #include */ + +/* + * The flags field, which we store in usb_device_id.driver_info. + * It is compatible with the old usb-storage flags in lower 24 bits. + */ + +/* + * Static flag definitions. We use this roundabout technique so that the + * proc_info() routine can automatically display a message for each flag. + */ +#define US_DO_ALL_FLAGS \ + US_FLAG(SINGLE_LUN, 0x00000001) \ + /* allow access to only LUN 0 */ \ + US_FLAG(NEED_OVERRIDE, 0x00000002) \ + /* unusual_devs entry is necessary */ \ + US_FLAG(SCM_MULT_TARG, 0x00000004) \ + /* supports multiple targets */ \ + US_FLAG(FIX_INQUIRY, 0x00000008) \ + /* INQUIRY response needs faking */ \ + US_FLAG(FIX_CAPACITY, 0x00000010) \ + /* READ CAPACITY response too big */ \ + US_FLAG(IGNORE_RESIDUE, 0x00000020) \ + /* reported residue is wrong */ \ + US_FLAG(BULK32, 0x00000040) \ + /* Uses 32-byte CBW length */ \ + US_FLAG(NOT_LOCKABLE, 0x00000080) \ + /* PREVENT/ALLOW not supported */ \ + US_FLAG(GO_SLOW, 0x00000100) \ + /* Need delay after Command phase */ \ + US_FLAG(NO_WP_DETECT, 0x00000200) \ + /* Don't check for write-protect */ \ + +#define US_FLAG(name, value) US_FL_##name = value , +enum { US_DO_ALL_FLAGS }; +#undef US_FLAG + +/* + * The bias field for libusual and friends. + */ +#define USB_US_TYPE_NONE 0 +#define USB_US_TYPE_STOR 1 /* usb-storage */ +#define USB_US_TYPE_UB 2 /* ub */ + +#define USB_US_TYPE(flags) (((flags) >> 24) & 0xFF) +#define USB_US_ORIG_FLAGS(flags) ((flags) & 0x00FFFFFF) + +/* + * This is probably not the best place to keep these constants, conceptually. + * But it's the only header included into all places which need them. + */ + +/* Sub Classes */ + +#define US_SC_RBC 0x01 /* Typically, flash devices */ +#define US_SC_8020 0x02 /* CD-ROM */ +#define US_SC_QIC 0x03 /* QIC-157 Tapes */ +#define US_SC_UFI 0x04 /* Floppy */ +#define US_SC_8070 0x05 /* Removable media */ +#define US_SC_SCSI 0x06 /* Transparent */ +#define US_SC_ISD200 0x07 /* ISD200 ATA */ +#define US_SC_MIN US_SC_RBC +#define US_SC_MAX US_SC_ISD200 + +#define US_SC_DEVICE 0xff /* Use device's value */ + +/* Protocols */ + +#define US_PR_CBI 0x00 /* Control/Bulk/Interrupt */ +#define US_PR_CB 0x01 /* Control/Bulk w/o interrupt */ +#define US_PR_BULK 0x50 /* bulk only */ +#ifdef CONFIG_USB_STORAGE_USBAT +#define US_PR_USBAT 0x80 /* SCM-ATAPI bridge */ +#endif +#ifdef CONFIG_USB_STORAGE_SDDR09 +#define US_PR_EUSB_SDDR09 0x81 /* SCM-SCSI bridge for SDDR-09 */ +#endif +#ifdef CONFIG_USB_STORAGE_SDDR55 +#define US_PR_SDDR55 0x82 /* SDDR-55 (made up) */ +#endif +#define US_PR_DPCM_USB 0xf0 /* Combination CB/SDDR09 */ +#ifdef CONFIG_USB_STORAGE_FREECOM +#define US_PR_FREECOM 0xf1 /* Freecom */ +#endif +#ifdef CONFIG_USB_STORAGE_DATAFAB +#define US_PR_DATAFAB 0xf2 /* Datafab chipsets */ +#endif +#ifdef CONFIG_USB_STORAGE_JUMPSHOT +#define US_PR_JUMPSHOT 0xf3 /* Lexar Jumpshot */ +#endif + +#define US_PR_DEVICE 0xff /* Use device's value */ + +/* + */ +#ifdef CONFIG_USB_LIBUSUAL + +extern struct usb_device_id storage_usb_ids[]; +extern void usb_usual_set_present(int type); +extern void usb_usual_clear_present(int type); +extern int usb_usual_check_type(const struct usb_device_id *, int type); +#else + +#define usb_usual_set_present(t) do { } while(0) +#define usb_usual_clear_present(t) do { } while(0) +#define usb_usual_check_type(id, t) (0) +#endif /* CONFIG_USB_LIBUSUAL */ + +#endif /* __LINUX_USB_USUAL_H */ --- linux-2.6.14/drivers/usb/Makefile~ 2005-11-15 21:51:46.000000000 -0500 +++ linux-2.6.14/drivers/usb/Makefile 2005-11-15 21:52:24.000000000 -0500 @@ -22,6 +22,7 @@ obj-$(CONFIG_USB_MIDI) += class/ obj-$(CONFIG_USB_PRINTER) += class/ obj-$(CONFIG_USB_STORAGE) += storage/ +obj-$(CONFIG_USB) += storage/ obj-$(CONFIG_USB_AIPTEK) += input/ obj-$(CONFIG_USB_ATI_REMOTE) += input/ --- linux-2.6.14-1.1740_FC5/drivers/block/ub.c 2005-12-06 23:47:49.000000000 -0800 +++ linux-2.6.14-1.1740_FC5-rtr3/drivers/block/ub.c 2005-12-17 01:19:43.000000000 -0800 @@ -9,7 +9,6 @@ * * TODO (sorted by decreasing priority) * -- Kill first_open (Al Viro fixed the block layer now) - * -- Do resets with usb_device_reset (needs a thread context, use khubd) * -- set readonly flag for CDs, set removable flag for CF readers * -- do inquiry and verify we got a disk and not a tape (for LUN mismatch) * -- special case some senses, e.g. 3a/0 -> no media present, reduce retries @@ -236,6 +235,13 @@ struct ub_scsi_cmd { void *back; }; +struct ub_request { + struct request *rq; + unsigned int current_try; + unsigned int nsg; /* sgv[nsg] */ + struct scatterlist sgv[UB_MAX_REQ_SG]; +}; + /* */ struct ub_capacity { @@ -331,6 +337,8 @@ struct ub_lun { int readonly; int first_open; /* Kludge. See ub_bd_open. */ + struct ub_request urq; + /* Use Ingo's mempool if or when we have more than one command. */ /* * Currently we never need more than one command for the whole device. @@ -351,6 +359,7 @@ struct ub_dev { atomic_t poison; /* The USB device is disconnected */ int openc; /* protected by ub_lock! */ /* kref is too implicit for our taste */ + int reset; /* Reset is running */ unsigned int tagcnt; char name[12]; struct usb_device *dev; @@ -378,6 +387,9 @@ struct ub_dev { struct bulk_cs_wrap work_bcs; struct usb_ctrlrequest work_cr; + struct work_struct reset_work; + wait_queue_head_t reset_wait; + int sg_stat[6]; struct ub_scsi_trace tr; }; @@ -386,12 +398,14 @@ struct ub_dev { */ static void ub_cleanup(struct ub_dev *sc); static int ub_request_fn_1(struct ub_lun *lun, struct request *rq); -static int ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun, - struct ub_scsi_cmd *cmd, struct request *rq); -static int ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun, - struct ub_scsi_cmd *cmd, struct request *rq); +static void ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun, + struct ub_scsi_cmd *cmd, struct ub_request *urq); +static void ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun, + struct ub_scsi_cmd *cmd, struct ub_request *urq); static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd); static void ub_end_rq(struct request *rq, int uptodate); +static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun, + struct ub_request *urq, struct ub_scsi_cmd *cmd); static int ub_submit_scsi(struct ub_dev *sc, struct ub_scsi_cmd *cmd); static void ub_urb_complete(struct urb *urb, struct pt_regs *pt); static void ub_scsi_action(unsigned long _dev); @@ -406,6 +420,8 @@ static void ub_state_sense(struct ub_dev static int ub_submit_clear_stall(struct ub_dev *sc, struct ub_scsi_cmd *cmd, int stalled_pipe); static void ub_top_sense_done(struct ub_dev *sc, struct ub_scsi_cmd *scmd); +static void ub_reset_enter(struct ub_dev *sc); +static void ub_reset_task(void *arg); static int ub_sync_tur(struct ub_dev *sc, struct ub_lun *lun); static int ub_sync_read_cap(struct ub_dev *sc, struct ub_lun *lun, struct ub_capacity *ret); @@ -518,6 +534,9 @@ static ssize_t ub_diag_show(struct devic spin_lock_irqsave(&sc->lock, flags); cnt += sprintf(page + cnt, + "poison %d reset %d\n", + atomic_read(&sc->poison), sc->reset); + cnt += sprintf(page + cnt, "qlen %d qmax %d\n", sc->cmd_queue.qlen, sc->cmd_queue.qmax); cnt += sprintf(page + cnt, @@ -766,7 +785,8 @@ static int ub_request_fn_1(struct ub_lun { struct ub_dev *sc = lun->udev; struct ub_scsi_cmd *cmd; - int rc; + struct ub_request *urq; + int n_elem; if (atomic_read(&sc->poison) || lun->changed) { blkdev_dequeue_request(rq); @@ -774,65 +794,70 @@ static int ub_request_fn_1(struct ub_lun return 0; } + if (lun->urq.rq != NULL) + return -1; if ((cmd = ub_get_cmd(lun)) == NULL) return -1; memset(cmd, 0, sizeof(struct ub_scsi_cmd)); blkdev_dequeue_request(rq); + + urq = &lun->urq; + memset(urq, 0, sizeof(struct ub_request)); + urq->rq = rq; + + /* + * get scatterlist from block layer + */ + n_elem = blk_rq_map_sg(lun->disk->queue, rq, &urq->sgv[0]); + if (n_elem < 0) { + printk(KERN_INFO "%s: failed request map (%d)\n", + lun->name, n_elem); /* P3 */ + goto drop; + } + if (n_elem > UB_MAX_REQ_SG) { /* Paranoia */ + printk(KERN_WARNING "%s: request with %d segments\n", + lun->name, n_elem); + goto drop; + } + urq->nsg = n_elem; + sc->sg_stat[n_elem < 5 ? n_elem : 5]++; + if (blk_pc_request(rq)) { - rc = ub_cmd_build_packet(sc, lun, cmd, rq); + ub_cmd_build_packet(sc, lun, cmd, urq); } else { - rc = ub_cmd_build_block(sc, lun, cmd, rq); - } - if (rc != 0) { - ub_put_cmd(lun, cmd); - ub_end_rq(rq, 0); - return 0; + ub_cmd_build_block(sc, lun, cmd, urq); } cmd->state = UB_CMDST_INIT; cmd->lun = lun; cmd->done = ub_rw_cmd_done; - cmd->back = rq; + cmd->back = urq; cmd->tag = sc->tagcnt++; - if (ub_submit_scsi(sc, cmd) != 0) { - ub_put_cmd(lun, cmd); - ub_end_rq(rq, 0); - return 0; - } + if (ub_submit_scsi(sc, cmd) != 0) + goto drop; return 0; + +drop: + ub_put_cmd(lun, cmd); + ub_end_rq(rq, 0); + return 0; } -static int ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun, - struct ub_scsi_cmd *cmd, struct request *rq) +static void ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun, + struct ub_scsi_cmd *cmd, struct ub_request *urq) { - int ub_dir; - int n_elem; + struct request *rq = urq->rq; unsigned int block, nblks; if (rq_data_dir(rq) == WRITE) - ub_dir = UB_DIR_WRITE; + cmd->dir = UB_DIR_WRITE; else - ub_dir = UB_DIR_READ; - cmd->dir = ub_dir; + cmd->dir = UB_DIR_READ; - /* - * get scatterlist from block layer - */ - n_elem = blk_rq_map_sg(lun->disk->queue, rq, &cmd->sgv[0]); - if (n_elem <= 0) { - printk(KERN_INFO "%s: failed request map (%d)\n", - sc->name, n_elem); /* P3 */ - return -1; /* request with no s/g entries? */ - } - if (n_elem > UB_MAX_REQ_SG) { /* Paranoia */ - printk(KERN_WARNING "%s: request with %d segments\n", - sc->name, n_elem); - return -1; - } - cmd->nsg = n_elem; - sc->sg_stat[n_elem < 5 ? n_elem : 5]++; + cmd->nsg = urq->nsg; + memcpy(cmd->sgv, urq->sgv, sizeof(struct scatterlist) * cmd->nsg); /* * build the command @@ -843,7 +868,7 @@ static int ub_cmd_build_block(struct ub_ block = rq->sector >> lun->capacity.bshift; nblks = rq->nr_sectors >> lun->capacity.bshift; - cmd->cdb[0] = (ub_dir == UB_DIR_READ)? READ_10: WRITE_10; + cmd->cdb[0] = (cmd->dir == UB_DIR_READ)? READ_10: WRITE_10; /* 10-byte uses 4 bytes of LBA: 2147483648KB, 2097152MB, 2048GB */ cmd->cdb[2] = block >> 24; cmd->cdb[3] = block >> 16; @@ -854,14 +879,12 @@ static int ub_cmd_build_block(struct ub_ cmd->cdb_len = 10; cmd->len = rq->nr_sectors * 512; - - return 0; } -static int ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun, - struct ub_scsi_cmd *cmd, struct request *rq) +static void ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun, + struct ub_scsi_cmd *cmd, struct ub_request *urq) { - int n_elem; + struct request *rq = urq->rq; if (rq->data_len == 0) { cmd->dir = UB_DIR_NONE; @@ -870,40 +893,26 @@ static int ub_cmd_build_packet(struct ub cmd->dir = UB_DIR_WRITE; else cmd->dir = UB_DIR_READ; - } - /* - * get scatterlist from block layer - */ - n_elem = blk_rq_map_sg(lun->disk->queue, rq, &cmd->sgv[0]); - if (n_elem < 0) { - printk(KERN_INFO "%s: failed request map (%d)\n", - sc->name, n_elem); /* P3 */ - return -1; - } - if (n_elem > UB_MAX_REQ_SG) { /* Paranoia */ - printk(KERN_WARNING "%s: request with %d segments\n", - sc->name, n_elem); - return -1; - } - cmd->nsg = n_elem; - sc->sg_stat[n_elem < 5 ? n_elem : 5]++; + cmd->nsg = urq->nsg; + memcpy(cmd->sgv, urq->sgv, sizeof(struct scatterlist) * cmd->nsg); memcpy(&cmd->cdb, rq->cmd, rq->cmd_len); cmd->cdb_len = rq->cmd_len; cmd->len = rq->data_len; - - return 0; } static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd) { - struct request *rq = cmd->back; struct ub_lun *lun = cmd->lun; + struct ub_request *urq = cmd->back; + struct request *rq; int uptodate; + rq = urq->rq; + if (cmd->error == 0) { uptodate = 1; @@ -924,9 +933,16 @@ static void ub_rw_cmd_done(struct ub_dev rq->errors = SAM_STAT_CHECK_CONDITION; else rq->errors = DID_ERROR << 16; + } else { + if (cmd->error == -EIO) { + if (ub_rw_cmd_retry(sc, lun, urq, cmd) == 0) + return; + } } } + urq->rq = NULL; + ub_put_cmd(lun, cmd); ub_end_rq(rq, uptodate); blk_start_queue(lun->disk->queue); @@ -941,6 +957,41 @@ static void ub_end_rq(struct request *rq end_that_request_last(rq); } +static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun, + struct ub_request *urq, struct ub_scsi_cmd *cmd) +{ + + if (atomic_read(&sc->poison)) + return -ENXIO; + + ub_reset_enter(sc); + + if (urq->current_try >= 3) + return -EIO; + urq->current_try++; + /* P3 */ printk("%s: dir %c len/act %d/%d " + "[sense %x %02x %02x] retry %d\n", + sc->name, UB_DIR_CHAR(cmd->dir), cmd->len, cmd->act_len, + cmd->key, cmd->asc, cmd->ascq, urq->current_try); + + memset(cmd, 0, sizeof(struct ub_scsi_cmd)); + ub_cmd_build_block(sc, lun, cmd, urq); + + cmd->state = UB_CMDST_INIT; + cmd->lun = lun; + cmd->done = ub_rw_cmd_done; + cmd->back = urq; + + cmd->tag = sc->tagcnt++; + +#if 0 /* Wasteful */ + return ub_submit_scsi(sc, cmd); +#else + ub_cmdq_add(sc, cmd); + return 0; +#endif +} + /* * Submit a regular SCSI operation (not an auto-sense). * @@ -1071,7 +1122,7 @@ static void ub_scsi_dispatch(struct ub_d struct ub_scsi_cmd *cmd; int rc; - while ((cmd = ub_cmdq_peek(sc)) != NULL) { + while (!sc->reset && (cmd = ub_cmdq_peek(sc)) != NULL) { if (cmd->state == UB_CMDST_DONE) { ub_cmdq_pop(sc); (*cmd->done)(sc, cmd); @@ -1094,11 +1145,12 @@ static void ub_scsi_urb_compl(struct ub_ { struct urb *urb = &sc->work_urb; struct bulk_cs_wrap *bcs; + int len; int rc; if (atomic_read(&sc->poison)) { - /* A little too simplistic, I feel... */ - goto Bad_End; + ub_state_done(sc, cmd, -ENODEV); + return; } if (cmd->state == UB_CMDST_CLEAR) { @@ -1106,7 +1158,6 @@ static void ub_scsi_urb_compl(struct ub_ /* * STALL while clearning STALL. * The control pipe clears itself - nothing to do. - * XXX Might try to reset the device here and retry. */ printk(KERN_NOTICE "%s: stall on control pipe\n", sc->name); @@ -1125,11 +1176,6 @@ static void ub_scsi_urb_compl(struct ub_ } else if (cmd->state == UB_CMDST_CLR2STS) { if (urb->status == -EPIPE) { - /* - * STALL while clearning STALL. - * The control pipe clears itself - nothing to do. - * XXX Might try to reset the device here and retry. - */ printk(KERN_NOTICE "%s: stall on control pipe\n", sc->name); goto Bad_End; @@ -1147,11 +1193,6 @@ static void ub_scsi_urb_compl(struct ub_ } else if (cmd->state == UB_CMDST_CLRRS) { if (urb->status == -EPIPE) { - /* - * STALL while clearning STALL. - * The control pipe clears itself - nothing to do. - * XXX Might try to reset the device here and retry. - */ printk(KERN_NOTICE "%s: stall on control pipe\n", sc->name); goto Bad_End; @@ -1168,7 +1209,12 @@ static void ub_scsi_urb_compl(struct ub_ ub_state_stat_counted(sc, cmd); } else if (cmd->state == UB_CMDST_CMD) { - if (urb->status == -EPIPE) { + switch (urb->status) { + case 0: + break; + case -EOVERFLOW: + goto Bad_End; + case -EPIPE: rc = ub_submit_clear_stall(sc, cmd, sc->last_pipe); if (rc != 0) { printk(KERN_NOTICE "%s: " @@ -1178,17 +1224,20 @@ static void ub_scsi_urb_compl(struct ub_ * This is typically ENOMEM or some other such shit. * Retrying is pointless. Just do Bad End on it... */ - goto Bad_End; + ub_state_done(sc, cmd, rc); + return; } cmd->state = UB_CMDST_CLEAR; ub_cmdtr_state(sc, cmd); return; - } - if (urb->status != 0) { + case -ESHUTDOWN: /* unplug */ + case -EILSEQ: /* unplug timeout on uhci */ + ub_state_done(sc, cmd, -ENODEV); + return; + default: goto Bad_End; } if (urb->actual_length != US_BULK_CB_WRAP_LEN) { - /* XXX Must do reset here to unconfuse the device */ goto Bad_End; } @@ -1207,11 +1256,8 @@ static void ub_scsi_urb_compl(struct ub_ printk(KERN_NOTICE "%s: " "unable to submit clear (%d)\n", sc->name, rc); - /* - * This is typically ENOMEM or some other such shit. - * Retrying is pointless. Just do Bad End on it... - */ - goto Bad_End; + ub_state_done(sc, cmd, rc); + return; } cmd->state = UB_CMDST_CLR2STS; ub_cmdtr_state(sc, cmd); @@ -1220,14 +1266,50 @@ static void ub_scsi_urb_compl(struct ub_ if (urb->status == -EOVERFLOW) { /* * A babble? Failure, but we must transfer CSW now. - * XXX This is going to end in perpetual babble. Reset. */ cmd->error = -EOVERFLOW; /* A cheap trick... */ ub_state_stat(sc, cmd); return; } - if (urb->status != 0) - goto Bad_End; + + if (cmd->dir == UB_DIR_WRITE) { + /* + * Do not continue writes in case of a failure. + * Doing so would cause sectors to be mixed up, + * which is worse than sectors lost. + * + * We must try to read the CSW, or many devices + * get confused. + */ + len = urb->actual_length; + if (urb->status != 0 || + len != cmd->sgv[cmd->current_sg].length) { + cmd->act_len += len; + ub_cmdtr_act_len(sc, cmd); + + cmd->error = -EIO; + ub_state_stat(sc, cmd); + return; + } + + } else { + /* + * If an error occurs on read, we record it, and + * continue to fetch data in order to avoid bubble. + * + * As a small shortcut, we stop if we detect that + * a CSW mixed into data. + */ + if (urb->status != 0) + cmd->error = -EIO; + + len = urb->actual_length; + if (urb->status != 0 || + len != cmd->sgv[cmd->current_sg].length) { + if ((len & 0x1FF) == US_BULK_CS_WRAP_LEN) + goto Bad_End; + } + } cmd->act_len += urb->actual_length; ub_cmdtr_act_len(sc, cmd); @@ -1245,11 +1327,8 @@ static void ub_scsi_urb_compl(struct ub_ printk(KERN_NOTICE "%s: " "unable to submit clear (%d)\n", sc->name, rc); - /* - * This is typically ENOMEM or some other such shit. - * Retrying is pointless. Just do Bad End on it... - */ - goto Bad_End; + ub_state_done(sc, cmd, rc); + return; } /* @@ -1262,14 +1341,8 @@ static void ub_scsi_urb_compl(struct ub_ ub_cmdtr_state(sc, cmd); return; } - if (urb->status == -EOVERFLOW) { - /* - * XXX We are screwed here. Retrying is pointless, - * because the pipelined data will not get in until - * we read with a big enough buffer. We must reset XXX. - */ - goto Bad_End; - } + + /* Catch everything, including -EOVERFLOW and other nasties. */ if (urb->status != 0) goto Bad_End; @@ -1315,15 +1388,15 @@ static void ub_scsi_urb_compl(struct ub_ return; } - rc = le32_to_cpu(bcs->Residue); - if (rc != cmd->len - cmd->act_len) { + len = le32_to_cpu(bcs->Residue); + if (len != cmd->len - cmd->act_len) { /* * It is all right to transfer less, the caller has * to check. But it's not all right if the device * counts disagree with our counts. */ /* P3 */ printk("%s: resid %d len %d act %d\n", - sc->name, rc, cmd->len, cmd->act_len); + sc->name, len, cmd->len, cmd->act_len); goto Bad_End; } @@ -1334,13 +1407,13 @@ static void ub_scsi_urb_compl(struct ub_ ub_state_sense(sc, cmd); return; case US_BULK_STAT_PHASE: - /* XXX We must reset the transport here */ /* P3 */ printk("%s: status PHASE\n", sc->name); goto Bad_End; default: printk(KERN_INFO "%s: unknown CSW status 0x%x\n", sc->name, bcs->Status); - goto Bad_End; + ub_state_done(sc, cmd, -EINVAL); + return; } /* Not zeroing error to preserve a babble indicator */ @@ -1360,7 +1433,8 @@ static void ub_scsi_urb_compl(struct ub_ printk(KERN_WARNING "%s: " "wrong command state %d\n", sc->name, cmd->state); - goto Bad_End; + ub_state_done(sc, cmd, -EINVAL); + return; } return; @@ -1608,6 +1682,93 @@ static void ub_top_sense_done(struct ub_ } /* + * Reset management + */ + +static void ub_reset_enter(struct ub_dev *sc) +{ + + if (sc->reset) { + /* This happens often on multi-LUN devices. */ + return; + } + sc->reset = 1; + +#if 0 /* Not needed because the disconnect waits for us. */ + unsigned long flags; + spin_lock_irqsave(&ub_lock, flags); + sc->openc++; + spin_unlock_irqrestore(&ub_lock, flags); +#endif + +#if 0 /* We let them stop themselves. */ + struct list_head *p; + struct ub_lun *lun; + list_for_each(p, &sc->luns) { + lun = list_entry(p, struct ub_lun, link); + blk_stop_queue(lun->disk->queue); + } +#endif + + schedule_work(&sc->reset_work); +} + +static void ub_reset_task(void *arg) +{ + struct ub_dev *sc = arg; + unsigned long flags; + struct list_head *p; + struct ub_lun *lun; + int lkr, rc; + + if (!sc->reset) { + printk(KERN_WARNING "%s: Running reset unrequested\n", + sc->name); + return; + } + + if (atomic_read(&sc->poison)) { + printk(KERN_NOTICE "%s: Not resetting disconnected device\n", + sc->name); /* P3 This floods. Remove soon. XXX */ + } else if (sc->dev->actconfig->desc.bNumInterfaces != 1) { + printk(KERN_NOTICE "%s: Not resetting multi-interface device\n", + sc->name); /* P3 This floods. Remove soon. XXX */ + } else { + if ((lkr = usb_lock_device_for_reset(sc->dev, sc->intf)) < 0) { + printk(KERN_NOTICE + "%s: usb_lock_device_for_reset failed (%d)\n", + sc->name, lkr); + } else { + rc = usb_reset_device(sc->dev); + if (rc < 0) { + printk(KERN_NOTICE "%s: " + "usb_lock_device_for_reset failed (%d)\n", + sc->name, rc); + } + + if (lkr) + usb_unlock_device(sc->dev); + } + } + + /* + * In theory, no commands can be running while reset is active, + * so nobody can ask for another reset, and so we do not need any + * queues of resets or anything. We do need a spinlock though, + * to interact with block layer. + */ + spin_lock_irqsave(&sc->lock, flags); + sc->reset = 0; + tasklet_schedule(&sc->tasklet); + list_for_each(p, &sc->luns) { + lun = list_entry(p, struct ub_lun, link); + blk_start_queue(lun->disk->queue); + } + wake_up(&sc->reset_wait); + spin_unlock_irqrestore(&sc->lock, flags); +} + +/* * This is called from a process context. */ static void ub_revalidate(struct ub_dev *sc, struct ub_lun *lun) @@ -2142,7 +2303,7 @@ static int ub_get_pipes(struct ub_dev *s if (ep_in == NULL || ep_out == NULL) { printk(KERN_NOTICE "%s: failed endpoint check\n", sc->name); - return -EIO; + return -ENODEV; } /* Calculate and store the pipe values */ @@ -2180,6 +2341,8 @@ static int ub_probe(struct usb_interface usb_init_urb(&sc->work_urb); tasklet_init(&sc->tasklet, ub_scsi_action, (unsigned long)sc); atomic_set(&sc->poison, 0); + INIT_WORK(&sc->reset_work, ub_reset_task, sc); + init_waitqueue_head(&sc->reset_wait); init_timer(&sc->work_timer); sc->work_timer.data = (unsigned long) sc; @@ -2200,7 +2363,8 @@ static int ub_probe(struct usb_interface /* XXX Verify that we can handle the device (from descriptors) */ - ub_get_pipes(sc, sc->dev, intf); + if (ub_get_pipes(sc, sc->dev, intf) != 0) + goto err_dev_desc; if (device_create_file(&sc->intf->dev, &dev_attr_diag) != 0) goto err_diag; @@ -2271,6 +2435,7 @@ static int ub_probe(struct usb_interface /* device_remove_file(&sc->intf->dev, &dev_attr_diag); */ err_diag: +err_dev_desc: usb_set_intfdata(intf, NULL); // usb_put_intf(sc->intf); usb_put_dev(sc->dev); @@ -2379,6 +2544,11 @@ static void ub_disconnect(struct usb_int atomic_set(&sc->poison, 1); /* + * Wait for reset to end, if any. + */ + wait_event(sc->reset_wait, !sc->reset); + + /* * Blow away queued commands. * * Actually, this never works, because before we get here @@ -2391,7 +2561,7 @@ static void ub_disconnect(struct usb_int { struct ub_scsi_cmd *cmd; int cnt = 0; - while ((cmd = ub_cmdq_pop(sc)) != NULL) { + while ((cmd = ub_cmdq_peek(sc)) != NULL) { cmd->error = -ENOTCONN; cmd->state = UB_CMDST_DONE; ub_cmdtr_state(sc, cmd); On Fri, 9 Dec 2005 13:55:21 -0500, Dave Jones wrote: > > > [311578.273186] BUG: spinlock bad magic on CPU#1, pdflush/30788 (Not tainted) >[...] > > > [311578.499972] RIP: 0010:[] {spin_bug+138} > > > [311578.798449] Call Trace:{_raw_spin_lock+25} {cfq_exit_single_io_context+85} > > > [311578.828782] {cfq_exit_io_context+33} {exit_io_context+137} > > > [311578.856762] {do_exit+183} {keventd_create_kthread+0} > > > [311578.883192] {child_rip+15} {keventd_create_kthread+0} > > > [311578.909852] {kthread+0} {child_rip+0} > Hmm, I may have also been experimenting at the time with Pete Zaitcev's > ub driver. Pete, could ub have been doing something bad here? Yes, this is ub's fault. I thought that blk_cleanup_queue frees the queue, but this is not the case. In recent kernels, it only decrements its refcount. If CFQ is around, it keeps the queue pinned and uses the queue's spinlock. But when ub calls blk_init_queue(), it passes a spinlock located in its data structure (ub_dev), which corresponds to a device. The ub_dev is refcounted and freed when the device is disconnected or closed. As you can see, this leaves the queue's spinlock pointer dangling. The code was taken from Carmel, and it used to work fine for a long time. I suspect now that Carmel is vulnerable, if it's hot-removed while open. Maybe Jeff wants to look into it. The usb-storage is immune to this problem, because SCSI passes NULL to blk_init_queue. Schedulers other than CFQ use their own spinlocks, so they do not hit this problem. The attached patch works around this issue by using spinlocks which are static to the ub module. Thus, it places ub into the same group as floppy. This is not ideal, in case someone manages to remove the module yet have queues remaining... But I am reluctant to copy what scsi_request_fn is doing. After all, ub is supposed to be simpler. Any comments before I send this to Greg? With Christmas cheers, -- Pete --- linux-2.6.15-rc6-git4-gregkh/drivers/block/ub.c 2005-12-28 13:40:36.000000000 -0800 +++ linux-2.6.15-rc7-lem/drivers/block/ub.c 2005-12-26 15:02:35.000000000 -0800 @@ -355,7 +355,7 @@ struct ub_lun { * The USB device instance. */ struct ub_dev { - spinlock_t lock; + spinlock_t *lock; atomic_t poison; /* The USB device is disconnected */ int openc; /* protected by ub_lock! */ /* kref is too implicit for our taste */ @@ -452,6 +452,10 @@ MODULE_DEVICE_TABLE(usb, ub_usb_ids); #define UB_MAX_HOSTS 26 static char ub_hostv[UB_MAX_HOSTS]; +#define UB_QLOCK_NUM 5 +static spinlock_t ub_qlockv[UB_QLOCK_NUM]; +static int ub_qlock_next = 0; + static DEFINE_SPINLOCK(ub_lock); /* Locks globals and ->openc */ /* @@ -531,7 +535,7 @@ static ssize_t ub_diag_show(struct devic return 0; cnt = 0; - spin_lock_irqsave(&sc->lock, flags); + spin_lock_irqsave(sc->lock, flags); cnt += sprintf(page + cnt, "poison %d reset %d\n", @@ -579,7 +583,7 @@ static ssize_t ub_diag_show(struct devic if (++nc == SCMD_TRACE_SZ) nc = 0; } - spin_unlock_irqrestore(&sc->lock, flags); + spin_unlock_irqrestore(sc->lock, flags); return cnt; } @@ -627,6 +631,24 @@ static void ub_id_put(int id) } /* + * This is necessitated by the fact that blk_cleanup_queue does not + * necesserily destroy the queue. Instead, it may merely decrease q->refcnt. + * Since our blk_init_queue() passes a spinlock common with ub_dev, + * we have life time issues when ub_cleanup frees ub_dev. + */ +static spinlock_t *ub_next_lock(void) +{ + unsigned long flags; + spinlock_t *ret; + + spin_lock_irqsave(&ub_lock, flags); + ret = &ub_qlockv[ub_qlock_next]; + ub_qlock_next = (ub_qlock_next + 1) % UB_QLOCK_NUM; + spin_unlock_irqrestore(&ub_lock, flags); + return ret; +} + +/* * Downcount for deallocation. This rides on two assumptions: * - once something is poisoned, its refcount cannot grow * - opens cannot happen at this time (del_gendisk was done) @@ -1083,9 +1105,9 @@ static void ub_urb_timeout(unsigned long struct ub_dev *sc = (struct ub_dev *) arg; unsigned long flags; - spin_lock_irqsave(&sc->lock, flags); + spin_lock_irqsave(sc->lock, flags); usb_unlink_urb(&sc->work_urb); - spin_unlock_irqrestore(&sc->lock, flags); + spin_unlock_irqrestore(sc->lock, flags); } /* @@ -1108,10 +1130,10 @@ static void ub_scsi_action(unsigned long struct ub_dev *sc = (struct ub_dev *) _dev; unsigned long flags; - spin_lock_irqsave(&sc->lock, flags); + spin_lock_irqsave(sc->lock, flags); del_timer(&sc->work_timer); ub_scsi_dispatch(sc); - spin_unlock_irqrestore(&sc->lock, flags); + spin_unlock_irqrestore(sc->lock, flags); } static void ub_scsi_dispatch(struct ub_dev *sc) @@ -1754,7 +1776,7 @@ static void ub_reset_task(void *arg) * queues of resets or anything. We do need a spinlock though, * to interact with block layer. */ - spin_lock_irqsave(&sc->lock, flags); + spin_lock_irqsave(sc->lock, flags); sc->reset = 0; tasklet_schedule(&sc->tasklet); list_for_each(p, &sc->luns) { @@ -1762,7 +1784,7 @@ static void ub_reset_task(void *arg) blk_start_queue(lun->disk->queue); } wake_up(&sc->reset_wait); - spin_unlock_irqrestore(&sc->lock, flags); + spin_unlock_irqrestore(sc->lock, flags); } /* @@ -1990,11 +2012,11 @@ static int ub_sync_tur(struct ub_dev *sc cmd->done = ub_probe_done; cmd->back = &compl; - spin_lock_irqsave(&sc->lock, flags); + spin_lock_irqsave(sc->lock, flags); cmd->tag = sc->tagcnt++; rc = ub_submit_scsi(sc, cmd); - spin_unlock_irqrestore(&sc->lock, flags); + spin_unlock_irqrestore(sc->lock, flags); if (rc != 0) { printk("ub: testing ready: submit error (%d)\n", rc); /* P3 */ @@ -2052,11 +2074,11 @@ static int ub_sync_read_cap(struct ub_de cmd->done = ub_probe_done; cmd->back = &compl; - spin_lock_irqsave(&sc->lock, flags); + spin_lock_irqsave(sc->lock, flags); cmd->tag = sc->tagcnt++; rc = ub_submit_scsi(sc, cmd); - spin_unlock_irqrestore(&sc->lock, flags); + spin_unlock_irqrestore(sc->lock, flags); if (rc != 0) { printk("ub: reading capacity: submit error (%d)\n", rc); /* P3 */ @@ -2333,7 +2355,7 @@ static int ub_probe(struct usb_interface if ((sc = kmalloc(sizeof(struct ub_dev), GFP_KERNEL)) == NULL) goto err_core; memset(sc, 0, sizeof(struct ub_dev)); - spin_lock_init(&sc->lock); + sc->lock = ub_next_lock(); INIT_LIST_HEAD(&sc->luns); usb_init_urb(&sc->work_urb); tasklet_init(&sc->tasklet, ub_scsi_action, (unsigned long)sc); @@ -2483,7 +2505,7 @@ static int ub_probe_lun(struct ub_dev *s disk->driverfs_dev = &sc->intf->dev; rc = -ENOMEM; - if ((q = blk_init_queue(ub_request_fn, &sc->lock)) == NULL) + if ((q = blk_init_queue(ub_request_fn, sc->lock)) == NULL) goto err_blkqinit; disk->queue = q; @@ -2554,7 +2576,7 @@ static void ub_disconnect(struct usb_int * and the whole queue drains. So, we just use this code to * print warnings. */ - spin_lock_irqsave(&sc->lock, flags); + spin_lock_irqsave(sc->lock, flags); { struct ub_scsi_cmd *cmd; int cnt = 0; @@ -2571,7 +2593,7 @@ static void ub_disconnect(struct usb_int "%d was queued after shutdown\n", sc->name, cnt); } } - spin_unlock_irqrestore(&sc->lock, flags); + spin_unlock_irqrestore(sc->lock, flags); /* * Unregister the upper layer. @@ -2590,19 +2612,15 @@ static void ub_disconnect(struct usb_int } /* - * Taking a lock on a structure which is about to be freed - * is very nonsensual. Here it is largely a way to do a debug freeze, - * and a bracket which shows where the nonsensual code segment ends. - * * Testing for -EINPROGRESS is always a bug, so we are bending * the rules a little. */ - spin_lock_irqsave(&sc->lock, flags); + spin_lock_irqsave(sc->lock, flags); if (sc->work_urb.status == -EINPROGRESS) { /* janitors: ignore */ printk(KERN_WARNING "%s: " "URB is active after disconnect\n", sc->name); } - spin_unlock_irqrestore(&sc->lock, flags); + spin_unlock_irqrestore(sc->lock, flags); /* * There is virtually no chance that other CPU runs times so long @@ -2636,6 +2655,10 @@ static struct usb_driver ub_driver = { static int __init ub_init(void) { int rc; + int i; + + for (i = 0; i < UB_QLOCK_NUM; i++) + spin_lock_init(&ub_qlockv[i]); if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0) goto err_regblkdev; linux-2.6-valid-ether-addr.patch: etherdevice.h | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-valid-ether-addr.patch --- diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h @@ -91,9 +91,8 @@ static inline int is_broadcast_ether_add */ static inline int is_valid_ether_addr(const u8 *addr) { - /* FF:FF:FF:FF:FF:FF is a multicast address so we don't need to - * explicitly check for it here. */ - return !is_multicast_ether_addr(addr) && !is_zero_ether_addr(addr); + return !is_multicast_ether_addr(addr) && !is_zero_ether_addr(addr) && + !is_broadcast_ether_addr(addr); } /** linux-2.6-x86_64-disable-hotplug-guessing.patch: mpparse.c | 2 +- smpboot.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) --- NEW FILE linux-2.6-x86_64-disable-hotplug-guessing.patch --- Disable useless heuristic for guessing how many hotplug CPUs to enable. --- linux-2.6.14/arch/x86_64/kernel/smpboot.c~ 2005-12-09 22:54:48.000000000 -0500 +++ linux-2.6.14/arch/x86_64/kernel/smpboot.c 2005-12-09 22:56:27.000000000 -0500 @@ -938,13 +938,8 @@ __init void prefill_possible_map(void) int possible; if (additional_cpus == -1) { - if (disabled_cpus > 0) { + if (disabled_cpus >= 0) additional_cpus = disabled_cpus; - } else { - additional_cpus = num_processors / 2; - if (additional_cpus == 0) - additional_cpus = 2; - } } possible = num_processors + additional_cpus; if (possible > NR_CPUS) --- linux-2.6.14/arch/x86_64/kernel/mpparse.c~ 2005-12-16 02:10:58.000000000 -0500 +++ linux-2.6.14/arch/x86_64/kernel/mpparse.c 2005-12-16 02:11:01.000000000 -0500 @@ -67,7 +67,7 @@ unsigned int boot_cpu_id = -1U; /* Internal processor count */ unsigned int num_processors __initdata = 0; -unsigned disabled_cpus __initdata; +unsigned disabled_cpus __initdata = 0; /* Bitmask of physically existing CPUs */ physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE; linux-2.6-x86_64-silence-up-apic-errors.patch: apic.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-x86_64-silence-up-apic-errors.patch --- Quite a few UP x86-64 laptops print APIC error 40's repeatedly when they run an SMP kernel (And Fedora doesn't ship a UP x86-64 kernel any more). We can suppress this as there's not really anything we can do about them. --- linux-2.6.14/arch/x86_64/kernel/apic.c~ 2005-12-07 15:17:33.000000000 -0500 +++ linux-2.6.14/arch/x86_64/kernel/apic.c 2005-12-07 15:18:16.000000000 -0500 @@ -1032,7 +1032,8 @@ asmlinkage void smp_error_interrupt(void 6: Received illegal vector 7: Illegal register address */ - printk (KERN_DEBUG "APIC error on CPU%d: %02x(%02x)\n", + if (num_online_cpus() > 1) + printk (KERN_DEBUG "APIC error on CPU%d: %02x(%02x)\n", smp_processor_id(), v , v1); irq_exit(); } linux-2.6.14-intel-cache-build.patch: intel_cacheinfo.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6.14-intel-cache-build.patch --- --- linux-2.6.14/arch/i386/kernel/cpu/intel_cacheinfo.c.orig 2005-11-02 11:25:14.000000000 +0000 +++ linux-2.6.14/arch/i386/kernel/cpu/intel_cacheinfo.c 2005-11-02 11:25:23.000000000 +0000 @@ -569,7 +569,7 @@ static int __cpuinit cache_add_dev(struc return retval; } -static void __cpuexit cache_remove_dev(struct sys_device * sys_dev) +static void cache_remove_dev(struct sys_device * sys_dev) { unsigned int cpu = sys_dev->id; unsigned long i; linux-2.6.15-default-powerpc.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6.15-default-powerpc.patch --- --- linux-2.6.14/Makefile.orig 2005-11-19 17:13:52.000000000 +0000 +++ linux-2.6.14/Makefile 2005-11-19 17:14:04.000000000 +0000 @@ -169,7 +169,7 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/s390x/s390/ -e s/parisc64/parisc/ \ - -e s/ppc64/powerpc/ ) + -e s/ppc.*/powerpc/ ) # Cross compiling and selecting different set of gcc/bin-utils # --------------------------------------------------------------------------- linux-2.6.15-mv643xx-fixes.patch: mv643xx_eth.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 204 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6.15-mv643xx-fixes.patch --- diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -78,6 +78,7 @@ static int eth_port_link_is_up(unsigned int eth_port_num); static void eth_port_uc_addr_get(struct net_device *dev, unsigned char *MacAddr); +static void eth_port_set_multicast_list(struct net_device *); static int mv643xx_eth_real_open(struct net_device *); static int mv643xx_eth_real_stop(struct net_device *); static int mv643xx_eth_change_mtu(struct net_device *, int); @@ -175,12 +176,17 @@ static void mv643xx_eth_rx_task(void *da panic("%s: Error in test_set_bit / clear_bit", dev->name); while (mp->rx_ring_skbs < (mp->rx_ring_size - 5)) { - skb = dev_alloc_skb(RX_SKB_SIZE); + skb = dev_alloc_skb(RX_SKB_SIZE+4); if (!skb) break; mp->rx_ring_skbs++; pkt_info.cmd_sts = ETH_RX_ENABLE_INTERRUPT; pkt_info.byte_cnt = RX_SKB_SIZE; + + /* Must have 8-byte alignment */ + if ((unsigned long)skb->data & 4) + skb_reserve(skb, 4); + pkt_info.buf_ptr = dma_map_single(NULL, skb->data, RX_SKB_SIZE, DMA_FROM_DEVICE); pkt_info.return_info = skb; @@ -267,6 +273,8 @@ static void mv643xx_eth_set_rx_mode(stru mp->port_config &= ~(u32) MV643XX_ETH_UNICAST_PROMISCUOUS_MODE; mv_write(MV643XX_ETH_PORT_CONFIG_REG(mp->port_num), mp->port_config); + + eth_port_set_multicast_list(dev); } /* @@ -2053,6 +2061,197 @@ static int eth_port_uc_addr(unsigned int return 1; } +static void eth_port_set_filter_table_entry(int table, unsigned char entry) +{ + unsigned int table_reg; + unsigned int tbl_offset; + unsigned int reg_offset; + + tbl_offset = (entry / 4) * 4; /* Register offset of DA table entry */ + reg_offset = entry % 4; /* Entry offset within the register */ + + /* Set "accepts frame bit" at specified table entry */ + table_reg = mv_read(table + tbl_offset); + table_reg |= 0x01 << (8 * reg_offset); + mv_write(table + tbl_offset, table_reg); +} + +/******************************************************************************* +* eth_port_mc_addr - Multicast address settings. +* +* DESCRIPTION: +* This function controls the MV device MAC multicast support. +* The MV device supports multicast using two tables: +* 1) Special Multicast Table for MAC addresses of the form +* 0x01-00-5E-00-00-XX (where XX is between 0x00 and 0x_FF). +* The MAC DA[7:0] bits are used as a pointer to the Special Multicast +* Table entries in the DA-Filter table. +* 2) Other Multicast Table for multicast of another type. A CRC-8bit +* is used as an index to the Other Multicast Table entries in the +* DA-Filter table. This function calculates the CRC-8bit value. +* In either case, eth_port_set_filter_table_entry() is then called +* to set to set the actual table entry. +* INPUT: +* unsigned int eth_port_num Port number. +* unsigned char *p_addr Unicast MAC Address. +* +* OUTPUT: +* See description. +* +* RETURN: +* None. +* +*******************************************************************************/ +static void eth_port_mc_addr(unsigned int eth_port_num, unsigned char *p_addr) +{ + unsigned int mac_h; + unsigned int mac_l; + unsigned char crc_result = 0; + int table; + int mac_array[48]; + int crc[8]; + int i; + + if ((p_addr[0] == 0x01) && (p_addr[1] == 0x00) && + (p_addr[2] == 0x5E) && (p_addr[3] == 0x00) && (p_addr[4] == 0x00)) { + table = MV643XX_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE + (eth_port_num); + eth_port_set_filter_table_entry(table, p_addr[5]); + return; + } + + /* Calculate CRC-8 out of the given address */ + mac_h = (p_addr[0] << 8) | (p_addr[1]); + mac_l = (p_addr[2] << 24) | (p_addr[3] << 16) | + (p_addr[4] << 8) | (p_addr[5] << 0); + + for (i = 0; i < 32; i++) + mac_array[i] = (mac_l >> i) & 0x1; + for (i = 32; i < 48; i++) + mac_array[i] = (mac_h >> (i - 32)) & 0x1; + + crc[0] = mac_array[45] ^ mac_array[43] ^ mac_array[40] ^ mac_array[39] ^ + mac_array[35] ^ mac_array[34] ^ mac_array[31] ^ mac_array[30] ^ + mac_array[28] ^ mac_array[23] ^ mac_array[21] ^ mac_array[19] ^ + mac_array[18] ^ mac_array[16] ^ mac_array[14] ^ mac_array[12] ^ + mac_array[8] ^ mac_array[7] ^ mac_array[6] ^ mac_array[0]; + + crc[1] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^ + mac_array[41] ^ mac_array[39] ^ mac_array[36] ^ mac_array[34] ^ + mac_array[32] ^ mac_array[30] ^ mac_array[29] ^ mac_array[28] ^ + mac_array[24] ^ mac_array[23] ^ mac_array[22] ^ mac_array[21] ^ + mac_array[20] ^ mac_array[18] ^ mac_array[17] ^ mac_array[16] ^ + mac_array[15] ^ mac_array[14] ^ mac_array[13] ^ mac_array[12] ^ + mac_array[9] ^ mac_array[6] ^ mac_array[1] ^ mac_array[0]; + + crc[2] = mac_array[47] ^ mac_array[46] ^ mac_array[44] ^ mac_array[43] ^ + mac_array[42] ^ mac_array[39] ^ mac_array[37] ^ mac_array[34] ^ + mac_array[33] ^ mac_array[29] ^ mac_array[28] ^ mac_array[25] ^ + mac_array[24] ^ mac_array[22] ^ mac_array[17] ^ mac_array[15] ^ + mac_array[13] ^ mac_array[12] ^ mac_array[10] ^ mac_array[8] ^ + mac_array[6] ^ mac_array[2] ^ mac_array[1] ^ mac_array[0]; + + crc[3] = mac_array[47] ^ mac_array[45] ^ mac_array[44] ^ mac_array[43] ^ + mac_array[40] ^ mac_array[38] ^ mac_array[35] ^ mac_array[34] ^ + mac_array[30] ^ mac_array[29] ^ mac_array[26] ^ mac_array[25] ^ + mac_array[23] ^ mac_array[18] ^ mac_array[16] ^ mac_array[14] ^ + mac_array[13] ^ mac_array[11] ^ mac_array[9] ^ mac_array[7] ^ + mac_array[3] ^ mac_array[2] ^ mac_array[1]; + + crc[4] = mac_array[46] ^ mac_array[45] ^ mac_array[44] ^ mac_array[41] ^ + mac_array[39] ^ mac_array[36] ^ mac_array[35] ^ mac_array[31] ^ + mac_array[30] ^ mac_array[27] ^ mac_array[26] ^ mac_array[24] ^ + mac_array[19] ^ mac_array[17] ^ mac_array[15] ^ mac_array[14] ^ + mac_array[12] ^ mac_array[10] ^ mac_array[8] ^ mac_array[4] ^ + mac_array[3] ^ mac_array[2]; + + crc[5] = mac_array[47] ^ mac_array[46] ^ mac_array[45] ^ mac_array[42] ^ + mac_array[40] ^ mac_array[37] ^ mac_array[36] ^ mac_array[32] ^ + mac_array[31] ^ mac_array[28] ^ mac_array[27] ^ mac_array[25] ^ + mac_array[20] ^ mac_array[18] ^ mac_array[16] ^ mac_array[15] ^ + mac_array[13] ^ mac_array[11] ^ mac_array[9] ^ mac_array[5] ^ + mac_array[4] ^ mac_array[3]; + + crc[6] = mac_array[47] ^ mac_array[46] ^ mac_array[43] ^ mac_array[41] ^ + mac_array[38] ^ mac_array[37] ^ mac_array[33] ^ mac_array[32] ^ + mac_array[29] ^ mac_array[28] ^ mac_array[26] ^ mac_array[21] ^ + mac_array[19] ^ mac_array[17] ^ mac_array[16] ^ mac_array[14] ^ + mac_array[12] ^ mac_array[10] ^ mac_array[6] ^ mac_array[5] ^ + mac_array[4]; + + crc[7] = mac_array[47] ^ mac_array[44] ^ mac_array[42] ^ mac_array[39] ^ + mac_array[38] ^ mac_array[34] ^ mac_array[33] ^ mac_array[30] ^ + mac_array[29] ^ mac_array[27] ^ mac_array[22] ^ mac_array[20] ^ + mac_array[18] ^ mac_array[17] ^ mac_array[15] ^ mac_array[13] ^ + mac_array[11] ^ mac_array[7] ^ mac_array[6] ^ mac_array[5]; + + for (i = 0; i < 8; i++) + crc_result = crc_result | (crc[i] << i); + + table = MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE(eth_port_num); + eth_port_set_filter_table_entry(table, crc_result); +} + +/** Set the entire multicast list base on dev->mc_list. **/ +static void eth_port_set_multicast_list(struct net_device *dev) +{ + + struct dev_mc_list *mc_list; + int i; + int table_index; + struct mv643xx_private *mp = netdev_priv(dev); + unsigned int eth_port_num = mp->port_num; + + /** If the device is in promiscuous mode or in all multicast mode, + ** we will fully populate both multicast tables with accept. + ** This is guaranteed to yield a match on all multicast addresses... + **/ + if ((dev->flags & IFF_PROMISC) || (dev->flags & IFF_ALLMULTI)) { + for (table_index = 0; table_index <= 0xFC; table_index += 4) { + /** Set all entries in DA filter special multicast + ** table (Ex_dFSMT) + ** Set for ETH_Q0 for now + ** Bits + ** 0 Accept=1, Drop=0 + ** 3-1 Queue ETH_Q0=0 + ** 7-4 Reserved = 0; + **/ + mv_write(MV643XX_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101); + + /** Set all entries in DA filter other multicast + ** table (Ex_dFOMT) + ** Set for ETH_Q0 for now + ** Bits + ** 0 Accept=1, Drop=0 + ** 3-1 Queue ETH_Q0=0 + ** 7-4 Reserved = 0; + **/ + mv_write(MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE(eth_port_num) + table_index, 0x01010101); + } + return; + } + + /** We will clear out multicast tables everytime we get the list. + ** Then add the entire new list... + **/ + for (table_index = 0; table_index <= 0xFC; table_index += 4) { + /* Clear DA filter special multicast table (Ex_dFSMT) */ + mv_write(MV643XX_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE + (eth_port_num) + table_index, 0); + + /* Clear DA filter other multicast table (Ex_dFOMT) */ + mv_write(MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE + (eth_port_num) + table_index, 0); + } + + /** Get pointer to net_device multicast list and add each one... **/ + for(i = 0, mc_list = dev->mc_list; + (i < 256) && (mc_list != NULL) && (i < dev->mc_count); + i++, mc_list = mc_list->next) + if (mc_list->dmi_addrlen == 6) + eth_port_mc_addr(eth_port_num, mc_list->dmi_addr); +} + /* * eth_port_init_mac_tables - Clear all entrance in the UC, SMC and OMC tables * @@ -2080,11 +2279,11 @@ static void eth_port_init_mac_tables(uns for (table_index = 0; table_index <= 0xFC; table_index += 4) { /* Clear DA filter special multicast table (Ex_dFSMT) */ - mv_write((MV643XX_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE - (eth_port_num) + table_index), 0); + mv_write(MV643XX_ETH_DA_FILTER_SPECIAL_MULTICAST_TABLE_BASE + (eth_port_num) + table_index, 0); /* Clear DA filter other multicast table (Ex_dFOMT) */ - mv_write((MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE - (eth_port_num) + table_index), 0); + mv_write(MV643XX_ETH_DA_FILTER_OTHER_MULTICAST_TABLE_BASE + (eth_port_num) + table_index, 0); } } linux-2.6.15-rc1-ppc64-syscallpath.patch: arch/powerpc/kernel/asm-offsets.c | 4 arch/powerpc/kernel/entry_32.S | 167 +++++++++++++++++------------ arch/powerpc/kernel/entry_64.S | 214 ++++++++++++++++++++------------------ arch/powerpc/kernel/signal_32.c | 68 +++++------- arch/powerpc/kernel/signal_64.c | 23 +++- arch/powerpc/kernel/systbl.S | 10 - include/asm-powerpc/ptrace.h | 2 include/asm-powerpc/thread_info.h | 12 +- 8 files changed, 278 insertions(+), 222 deletions(-) --- NEW FILE linux-2.6.15-rc1-ppc64-syscallpath.patch --- diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c index 91538d2..3bf89d1 100644 --- a/arch/powerpc/kernel/asm-offsets.c +++ b/arch/powerpc/kernel/asm-offsets.c @@ -92,9 +92,9 @@ int main(void) DEFINE(TI_FLAGS, offsetof(struct thread_info, flags)); DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count)); - DEFINE(TI_SC_NOERR, offsetof(struct thread_info, syscall_noerror)); -#ifdef CONFIG_PPC32 + DEFINE(TI_SIGFRAME, offsetof(struct thread_info, nvgprs_frame)); DEFINE(TI_TASK, offsetof(struct thread_info, task)); +#ifdef CONFIG_PPC32 DEFINE(TI_EXECDOMAIN, offsetof(struct thread_info, exec_domain)); DEFINE(TI_CPU, offsetof(struct thread_info, cpu)); #endif /* CONFIG_PPC32 */ diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 2e99ae4..8fed953 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -200,8 +200,6 @@ _GLOBAL(DoSyscall) bl do_show_syscall #endif /* SHOW_SYSCALLS */ rlwinm r10,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */ - li r11,0 - stb r11,TI_SC_NOERR(r10) lwz r11,TI_FLAGS(r10) andi. r11,r11,_TIF_SYSCALL_T_OR_A bne- syscall_dotrace @@ -222,25 +220,21 @@ ret_from_syscall: bl do_show_syscall_exit #endif mr r6,r3 - li r11,-_LAST_ERRNO - cmplw 0,r3,r11 rlwinm r12,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */ - blt+ 30f - lbz r11,TI_SC_NOERR(r12) - cmpwi r11,0 - bne 30f - neg r3,r3 - lwz r10,_CCR(r1) /* Set SO bit in CR */ - oris r10,r10,0x1000 - stw r10,_CCR(r1) - /* disable interrupts so current_thread_info()->flags can't change */ -30: LOAD_MSR_KERNEL(r10,MSR_KERNEL) /* doesn't include MSR_EE */ + LOAD_MSR_KERNEL(r10,MSR_KERNEL) /* doesn't include MSR_EE */ SYNC MTMSRD(r10) lwz r9,TI_FLAGS(r12) - andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SIGPENDING|_TIF_NEED_RESCHED) + li r8,-_LAST_ERRNO + andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_RESTOREALL) bne- syscall_exit_work + cmplw 0,r3,r8 + blt+ syscall_exit_cont + lwz r11,_CCR(r1) /* Load CR */ + neg r3,r3 + oris r11,r11,0x1000 /* Set SO bit in CR */ + stw r11,_CCR(r1) syscall_exit_cont: #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE) /* If the process has its own DBCR0 value, load it up. The single @@ -292,46 +286,113 @@ syscall_dotrace: b syscall_dotrace_cont syscall_exit_work: - stw r6,RESULT(r1) /* Save result */ + andi. r0,r9,_TIF_RESTOREALL + bne- 2f + cmplw 0,r3,r8 + blt+ 1f + andi. r0,r9,_TIF_NOERROR + bne- 1f + lwz r11,_CCR(r1) /* Load CR */ + neg r3,r3 + oris r11,r11,0x1000 /* Set SO bit in CR */ + stw r11,_CCR(r1) + +1: stw r6,RESULT(r1) /* Save result */ stw r3,GPR3(r1) /* Update return value */ - andi. r0,r9,_TIF_SYSCALL_T_OR_A - beq 5f - ori r10,r10,MSR_EE - SYNC - MTMSRD(r10) /* re-enable interrupts */ +2: andi. r0,r9,(_TIF_PERSYSCALL_MASK) + beq 4f + + /* Clear per-syscall TIF flags if any are set, but _leave_ + _TIF_SAVE_NVGPRS set in r9 since we haven't dealt with that + yet. */ + + li r11,_TIF_PERSYSCALL_MASK + addi r12,r12,TI_FLAGS +3: lwarx r8,0,r12 + andc r8,r8,r11 +#ifdef CONFIG_IBM405_ERR77 + dcbt 0,r12 +#endif + stwcx. r8,0,r12 + bne- 3b + subi r12,r12,TI_FLAGS + +4: /* Anything which requires enabling interrupts? */ + andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP|_TIF_SAVE_NVGPRS) + beq 7f + + /* Save NVGPRS if they're not saved already */ lwz r4,_TRAP(r1) andi. r4,r4,1 - beq 4f + beq 5f SAVE_NVGPRS(r1) li r4,0xc00 stw r4,_TRAP(r1) -4: + + /* Re-enable interrupts */ +5: ori r10,r10,MSR_EE + SYNC + MTMSRD(r10) + + andi. r0,r9,_TIF_SAVE_NVGPRS + bne save_user_nvgprs + +save_user_nvgprs_cont: + andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP) + beq 7f + addi r3,r1,STACK_FRAME_OVERHEAD bl do_syscall_trace_leave REST_NVGPRS(r1) -2: - lwz r3,GPR3(r1) + +6: lwz r3,GPR3(r1) LOAD_MSR_KERNEL(r10,MSR_KERNEL) /* doesn't include MSR_EE */ SYNC MTMSRD(r10) /* disable interrupts again */ rlwinm r12,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */ lwz r9,TI_FLAGS(r12) -5: +7: andi. r0,r9,_TIF_NEED_RESCHED - bne 1f + bne 8f lwz r5,_MSR(r1) andi. r5,r5,MSR_PR - beq syscall_exit_cont + beq ret_from_except andi. r0,r9,_TIF_SIGPENDING - beq syscall_exit_cont + beq ret_from_except b do_user_signal -1: +8: ori r10,r10,MSR_EE SYNC MTMSRD(r10) /* re-enable interrupts */ bl schedule - b 2b + b 6b + +save_user_nvgprs: + lwz r8,TI_SIGFRAME(r12) +.macro savewords start, end + 1: stw \start,4*(\start)(r8) + .section __ex_table,"a" + .align 2 + .long 1b,save_user_nvgprs_fault + .previous + .if \end - \start + savewords "(\start+1)",\end + .endif +.endm + savewords 14,31 + b save_user_nvgprs_cont + + +save_user_nvgprs_fault: + li r3,11 /* SIGSEGV */ + lwz r4,TI_TASK(r12) + bl force_sigsegv + + rlwinm r12,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */ + lwz r9,TI_FLAGS(r12) + b save_user_nvgprs_cont + #ifdef SHOW_SYSCALLS do_show_syscall: #ifdef SHOW_SYSCALLS_TASK @@ -401,28 +462,10 @@ show_syscalls_task: #endif /* SHOW_SYSCALLS */ /* - * The sigsuspend and rt_sigsuspend system calls can call do_signal - * and thus put the process into the stopped state where we might - * want to examine its user state with ptrace. Therefore we need - * to save all the nonvolatile registers (r13 - r31) before calling - * the C code. + * The fork/clone functions need to copy the full register set into + * the child process. Therefore we need to save all the nonvolatile + * registers (r13 - r31) before calling the C code. */ - .globl ppc_sigsuspend -ppc_sigsuspend: - SAVE_NVGPRS(r1) - lwz r0,_TRAP(r1) - rlwinm r0,r0,0,0,30 /* clear LSB to indicate full */ - stw r0,_TRAP(r1) /* register set saved */ - b sys_sigsuspend - - .globl ppc_rt_sigsuspend -ppc_rt_sigsuspend: - SAVE_NVGPRS(r1) - lwz r0,_TRAP(r1) - rlwinm r0,r0,0,0,30 - stw r0,_TRAP(r1) - b sys_rt_sigsuspend - .globl ppc_fork ppc_fork: SAVE_NVGPRS(r1) @@ -447,14 +490,6 @@ ppc_clone: stw r0,_TRAP(r1) /* register set saved */ b sys_clone - .globl ppc_swapcontext -ppc_swapcontext: - SAVE_NVGPRS(r1) - lwz r0,_TRAP(r1) - rlwinm r0,r0,0,0,30 /* clear LSB to indicate full */ - stw r0,_TRAP(r1) /* register set saved */ - b sys_swapcontext - /* * Top-level page fault handling. * This is in assembler because if do_page_fault tells us that @@ -626,16 +661,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_601) .long ret_from_except #endif - .globl sigreturn_exit -sigreturn_exit: - subi r1,r3,STACK_FRAME_OVERHEAD - rlwinm r12,r1,0,0,(31-THREAD_SHIFT) /* current_thread_info() */ - lwz r9,TI_FLAGS(r12) - andi. r0,r9,_TIF_SYSCALL_T_OR_A - beq+ ret_from_except_full - bl do_syscall_trace_leave - /* fall through */ - .globl ret_from_except_full ret_from_except_full: REST_NVGPRS(r1) @@ -658,7 +683,7 @@ user_exc_return: /* r10 contains MSR_KE /* Check current_thread_info()->flags */ rlwinm r9,r1,0,0,(31-THREAD_SHIFT) lwz r9,TI_FLAGS(r9) - andi. r0,r9,(_TIF_SIGPENDING|_TIF_NEED_RESCHED) + andi. r0,r9,(_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_RESTOREALL) bne do_work restore_user: diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 2d22bf0..83b9edf 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -113,9 +113,7 @@ system_call_common: addi r9,r1,STACK_FRAME_OVERHEAD #endif clrrdi r11,r1,THREAD_SHIFT - li r12,0 ld r10,TI_FLAGS(r11) - stb r12,TI_SC_NOERR(r11) andi. r11,r10,_TIF_SYSCALL_T_OR_A bne- syscall_dotrace syscall_dotrace_cont: @@ -144,24 +142,12 @@ system_call: /* label this so stack tr bctrl /* Call handler */ syscall_exit: + std r3,RESULT(r1) #ifdef SHOW_SYSCALLS - std r3,GPR3(r1) bl .do_show_syscall_exit - ld r3,GPR3(r1) + ld r3,RESULT(r1) #endif - std r3,RESULT(r1) - ld r5,_CCR(r1) - li r10,-_LAST_ERRNO - cmpld r3,r10 clrrdi r12,r1,THREAD_SHIFT - bge- syscall_error -syscall_error_cont: - - /* check for syscall tracing or audit */ - ld r9,TI_FLAGS(r12) - andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP) - bne- syscall_exit_trace -syscall_exit_trace_cont: /* disable interrupts so current_thread_info()->flags can't change, and so that we don't get interrupted after loading SRR0/1. */ @@ -173,8 +159,13 @@ syscall_exit_trace_cont: rotldi r10,r10,16 mtmsrd r10,1 ld r9,TI_FLAGS(r12) - andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SIGPENDING|_TIF_NEED_RESCHED) + li r11,-_LAST_ERRNO + andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP|_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_RESTOREALL|_TIF_SAVE_NVGPRS|_TIF_NOERROR) bne- syscall_exit_work + cmpld r3,r11 + ld r5,_CCR(r1) + bge- syscall_error +syscall_error_cont: ld r7,_NIP(r1) stdcx. r0,0,r1 /* to clear the reservation */ andi. r6,r8,MSR_PR @@ -193,21 +184,12 @@ syscall_exit_trace_cont: rfid b . /* prevent speculative execution */ -syscall_enosys: - li r3,-ENOSYS - std r3,RESULT(r1) - clrrdi r12,r1,THREAD_SHIFT - ld r5,_CCR(r1) - -syscall_error: - lbz r11,TI_SC_NOERR(r12) - cmpwi 0,r11,0 - bne- syscall_error_cont - neg r3,r3 +syscall_error: oris r5,r5,0x1000 /* Set SO bit in CR */ + neg r3,r3 std r5,_CCR(r1) b syscall_error_cont - + /* Traced system call support */ syscall_dotrace: bl .save_nvgprs @@ -225,21 +207,69 @@ syscall_dotrace: ld r10,TI_FLAGS(r10) b syscall_dotrace_cont -syscall_exit_trace: - std r3,GPR3(r1) - bl .save_nvgprs +syscall_enosys: + li r3,-ENOSYS + b syscall_exit + +syscall_exit_work: + /* If TIF_RESTOREALL is set, don't scribble on either r3 or ccr. + If TIF_NOERROR is set, just save r3 as it is. */ + + andi. r0,r9,_TIF_RESTOREALL + bne- 2f + cmpld r3,r11 /* r10 is -LAST_ERRNO */ + blt+ 1f + andi. r0,r9,_TIF_NOERROR + bne- 1f + ld r5,_CCR(r1) + neg r3,r3 + oris r5,r5,0x1000 /* Set SO bit in CR */ + std r5,_CCR(r1) +1: std r3,GPR3(r1) +2: andi. r0,r9,(_TIF_PERSYSCALL_MASK) + beq 4f + + /* Clear per-syscall TIF flags if any are set, but _leave_ + _TIF_SAVE_NVGPRS set in r9 since we haven't dealt with that + yet. */ + + li r11,_TIF_PERSYSCALL_MASK + addi r12,r12,TI_FLAGS +3: ldarx r10,0,r12 + andc r10,r10,r11 + stdcx. r10,0,r12 + bne- 3b + subi r12,r12,TI_FLAGS + +4: bl .save_nvgprs + /* Anything else left to do? */ + andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP|_TIF_SAVE_NVGPRS) + beq .ret_from_except_lite + + /* Re-enable interrupts */ + mfmsr r10 + ori r10,r10,MSR_EE + mtmsrd r10,1 + + andi. r0,r9,_TIF_SAVE_NVGPRS + bne save_user_nvgprs + + /* If tracing, re-enable interrupts and do it */ +save_user_nvgprs_cont: + andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP) + beq 5f + addi r3,r1,STACK_FRAME_OVERHEAD bl .do_syscall_trace_leave REST_NVGPRS(r1) - ld r3,GPR3(r1) - ld r5,_CCR(r1) clrrdi r12,r1,THREAD_SHIFT - b syscall_exit_trace_cont -/* Stuff to do on exit from a system call. */ -syscall_exit_work: - std r3,GPR3(r1) - std r5,_CCR(r1) + /* Disable interrupts again and handle other work if any */ +5: mfmsr r10 + rldicl r10,r10,48,1 + rotldi r10,r10,16 + mtmsrd r10,1 + b .ret_from_except_lite /* Save non-volatile GPRs, if not already saved. */ @@ -252,6 +282,52 @@ _GLOBAL(save_nvgprs) std r0,_TRAP(r1) blr + +save_user_nvgprs: + ld r10,TI_SIGFRAME(r12) + andi. r0,r9,_TIF_32BIT + beq- save_user_nvgprs_64 + + /* 32-bit save to userspace */ + +.macro savewords start, end + 1: stw \start,4*(\start)(r10) + .section __ex_table,"a" + .align 3 + .llong 1b,save_user_nvgprs_fault + .previous + .if \end - \start + savewords "(\start+1)",\end + .endif +.endm + savewords 14,31 + b save_user_nvgprs_cont + +save_user_nvgprs_64: + /* 64-bit save to userspace */ + +.macro savelongs start, end + 1: std \start,8*(\start)(r10) + .section __ex_table,"a" + .align 3 + .llong 1b,save_user_nvgprs_fault + .previous + .if \end - \start + savelongs "(\start+1)",\end + .endif +.endm + savelongs 14,31 + b save_user_nvgprs_cont + +save_user_nvgprs_fault: + li r3,11 /* SIGSEGV */ + ld r4,TI_TASK(r12) + bl .force_sigsegv + + clrrdi r12,r1,THREAD_SHIFT + ld r9,TI_FLAGS(r12) + b save_user_nvgprs_cont + /* * The sigsuspend and rt_sigsuspend system calls can call do_signal * and thus put the process into the stopped state where we might @@ -260,35 +336,6 @@ _GLOBAL(save_nvgprs) * the C code. Similarly, fork, vfork and clone need the full * register state on the stack so that it can be copied to the child. */ -_GLOBAL(ppc32_sigsuspend) - bl .save_nvgprs - bl .compat_sys_sigsuspend - b 70f - -_GLOBAL(ppc64_rt_sigsuspend) - bl .save_nvgprs - bl .sys_rt_sigsuspend - b 70f - -_GLOBAL(ppc32_rt_sigsuspend) - bl .save_nvgprs - bl .compat_sys_rt_sigsuspend -70: cmpdi 0,r3,0 - /* If it returned an error, we need to return via syscall_exit to set - the SO bit in cr0 and potentially stop for ptrace. */ - bne syscall_exit - /* If sigsuspend() returns zero, we are going into a signal handler. We - may need to call audit_syscall_exit() to mark the exit from sigsuspend() */ -#ifdef CONFIG_AUDITSYSCALL - ld r3,PACACURRENT(r13) - ld r4,AUDITCONTEXT(r3) - cmpdi 0,r4,0 - beq .ret_from_except /* No audit_context: Leave immediately. */ - li r4, 2 /* AUDITSC_FAILURE */ - li r5,-4 /* It's always -EINTR */ - bl .audit_syscall_exit -#endif - b .ret_from_except _GLOBAL(ppc_fork) bl .save_nvgprs @@ -305,37 +352,6 @@ _GLOBAL(ppc_clone) bl .sys_clone b syscall_exit -_GLOBAL(ppc32_swapcontext) - bl .save_nvgprs - bl .compat_sys_swapcontext - b 80f - -_GLOBAL(ppc64_swapcontext) - bl .save_nvgprs - bl .sys_swapcontext - b 80f - -_GLOBAL(ppc32_sigreturn) - bl .compat_sys_sigreturn - b 80f - -_GLOBAL(ppc32_rt_sigreturn) - bl .compat_sys_rt_sigreturn - b 80f - -_GLOBAL(ppc64_rt_sigreturn) - bl .sys_rt_sigreturn - -80: cmpdi 0,r3,0 - blt syscall_exit - clrrdi r4,r1,THREAD_SHIFT - ld r4,TI_FLAGS(r4) - andi. r4,r4,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP) - beq+ 81f - addi r3,r1,STACK_FRAME_OVERHEAD - bl .do_syscall_trace_leave -81: b .ret_from_except - _GLOBAL(ret_from_fork) bl .schedule_tail REST_NVGPRS(r1) diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index 5a2eba6..c9d0275 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c @@ -76,7 +76,6 @@ * registers from *regs. This is what we need * to do when a signal has been delivered. */ -#define sigreturn_exit(regs) return 0 #define GP_REGS_SIZE min(sizeof(elf_gregset_t32), sizeof(struct pt_regs32)) #undef __SIGNAL_FRAMESIZE @@ -156,9 +155,17 @@ static inline int save_general_regs(stru elf_greg_t64 *gregs = (elf_greg_t64 *)regs; int i; - for (i = 0; i <= PT_RESULT; i ++) + if (!FULL_REGS(regs)) { + set_thread_flag(TIF_SAVE_NVGPRS); + current_thread_info()->nvgprs_frame = frame->mc_gregs; + } + + for (i = 0; i <= PT_RESULT; i ++) { + if (i == 14 && !FULL_REGS(regs)) + i = 32; if (__put_user((unsigned int)gregs[i], &frame->mc_gregs[i])) return -EFAULT; + } return 0; } @@ -179,8 +186,6 @@ static inline int restore_general_regs(s #else /* CONFIG_PPC64 */ -extern void sigreturn_exit(struct pt_regs *); - #define GP_REGS_SIZE min(sizeof(elf_gregset_t), sizeof(struct pt_regs)) static inline int put_sigset_t(sigset_t __user *uset, sigset_t *set) @@ -219,5 +219,14 @@ static inline int get_old_sigaction(stru static inline int save_general_regs(struct pt_regs *regs, struct mcontext __user *frame) { + if (!FULL_REGS(regs)) { + /* Zero out the unsaved GPRs to avoid information + leak, and set TIF_SAVE_NVGPRS to ensure that the + registers do actually get saved later. */ + memset(®s->gpr[14], 0, 18 * sizeof(unsigned long)); + current_thread_info()->nvgprs_frame = &frame->mc_gregs; + set_thread_flag(TIF_SAVE_NVGPRS); + } + return __copy_to_user(&frame->mc_gregs, regs, GP_REGS_SIZE); } @@ -256,8 +261,10 @@ long sys_sigsuspend(old_sigset_t mask, i while (1) { current->state = TASK_INTERRUPTIBLE; schedule(); - if (do_signal(&saveset, regs)) - sigreturn_exit(regs); + if (do_signal(&saveset, regs)) { + set_thread_flag(TIF_RESTOREALL); + return 0; + } } } @@ -292,8 +299,10 @@ long sys_rt_sigsuspend( while (1) { current->state = TASK_INTERRUPTIBLE; schedule(); - if (do_signal(&saveset, regs)) - sigreturn_exit(regs); + if (do_signal(&saveset, regs)) { + set_thread_flag(TIF_RESTOREALL); + return 0; + } } } @@ -391,9 +400,6 @@ struct rt_sigframe { static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame, int sigret) { -#ifdef CONFIG_PPC32 - CHECK_FULL_REGS(regs); -#endif /* Make sure floating point registers are stored in regs */ flush_fp_to_thread(current); @@ -828,12 +834,6 @@ static int handle_rt_signal(unsigned lon regs->gpr[6] = (unsigned long) rt_sf; regs->nip = (unsigned long) ka->sa.sa_handler; regs->trap = 0; -#ifdef CONFIG_PPC64 - regs->result = 0; - - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); -#endif return 1; badframe: @@ -911,8 +911,8 @@ long sys_swapcontext(struct ucontext __u */ if (do_setcontext(new_ctx, regs, 0)) do_exit(SIGSEGV); - sigreturn_exit(regs); - /* doesn't actually return back to here */ + + set_thread_flag(TIF_RESTOREALL); return 0; } @@ -945,12 +945,11 @@ long sys_rt_sigreturn(int r3, int r4, in * nobody does any... */ compat_sys_sigaltstack((u32)(u64)&rt_sf->uc.uc_stack, 0, 0, 0, 0, 0, regs); - return (int)regs->result; #else do_sigaltstack(&rt_sf->uc.uc_stack, NULL, regs->gpr[1]); - sigreturn_exit(regs); /* doesn't return here */ - return 0; #endif + set_thread_flag(TIF_RESTOREALL); + return 0; bad: force_sig(SIGSEGV, current); @@ -1041,9 +1040,7 @@ int sys_debug_setcontext(struct ucontext */ do_sigaltstack(&ctx->uc_stack, NULL, regs->gpr[1]); - sigreturn_exit(regs); - /* doesn't actually return back to here */ - + set_thread_flag(TIF_RESTOREALL); out: return 0; } @@ -1107,12 +1104,6 @@ static int handle_signal(unsigned long s regs->gpr[4] = (unsigned long) sc; regs->nip = (unsigned long) ka->sa.sa_handler; regs->trap = 0; -#ifdef CONFIG_PPC64 - regs->result = 0; - - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); -#endif return 1; @@ -1160,12 +1151,8 @@ long sys_sigreturn(int r3, int r4, int r || restore_user_regs(regs, sr, 1)) goto badframe; -#ifdef CONFIG_PPC64 - return (int)regs->result; -#else - sigreturn_exit(regs); /* doesn't return */ + set_thread_flag(TIF_RESTOREALL); return 0; -#endif badframe: force_sig(SIGSEGV, current); diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index 1decf27..5462bef 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c @@ -96,8 +96,10 @@ long sys_rt_sigsuspend(sigset_t __user * while (1) { current->state = TASK_INTERRUPTIBLE; schedule(); - if (do_signal(&saveset, regs)) + if (do_signal(&saveset, regs)) { + set_thread_flag(TIF_RESTOREALL); return 0; + } } } @@ -152,6 +154,14 @@ static long setup_sigcontext(struct sigc err |= __put_user(0, &sc->v_regs); #endif /* CONFIG_ALTIVEC */ err |= __put_user(&sc->gp_regs, &sc->regs); + if (!FULL_REGS(regs)) { + /* Zero out the unsaved GPRs to avoid information + leak, and set TIF_SAVE_NVGPRS to ensure that the + registers do actually get saved later. */ + memset(®s->gpr[14], 0, 18 * sizeof(unsigned long)); + set_thread_flag(TIF_SAVE_NVGPRS); + current_thread_info()->nvgprs_frame = &sc->gp_regs; + } err |= __copy_to_user(&sc->gp_regs, regs, GP_REGS_SIZE); err |= __copy_to_user(&sc->fp_regs, ¤t->thread.fpr, FP_REGS_SIZE); err |= __put_user(signr, &sc->signal); @@ -340,6 +350,7 @@ int sys_swapcontext(struct ucontext __us do_exit(SIGSEGV); /* This returns like rt_sigreturn */ + set_thread_flag(TIF_RESTOREALL); return 0; } @@ -372,7 +383,8 @@ int sys_rt_sigreturn(unsigned long r3, u */ do_sigaltstack(&uc->uc_stack, NULL, regs->gpr[1]); - return regs->result; + set_thread_flag(TIF_RESTOREALL); + return 0; badframe: #if DEBUG_SIG @@ -454,9 +466,6 @@ static int setup_rt_frame(int signr, str if (err) goto badframe; - if (test_thread_flag(TIF_SINGLESTEP)) - ptrace_notify(SIGTRAP); - return 1; badframe: @@ -502,6 +511,8 @@ static inline void syscall_restart(struc * we only get here if there is a handler, we dont restart. */ regs->result = -EINTR; + regs->gpr[3] = EINTR; + regs->ccr |= 0x10000000; break; case -ERESTARTSYS: /* ERESTARTSYS means to restart the syscall if there is no @@ -509,6 +520,8 @@ static inline void syscall_restart(struc */ if (!(ka->sa.sa_flags & SA_RESTART)) { regs->result = -EINTR; + regs->gpr[3] = EINTR; + regs->ccr |= 0x10000000; break; } /* fallthrough */ diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S index 65eaea9..4bb3650 100644 --- a/arch/powerpc/kernel/systbl.S +++ b/arch/powerpc/kernel/systbl.S @@ -113,7 +113,7 @@ SYSCALL(sgetmask) COMPAT_SYS(ssetmask) SYSCALL(setreuid) SYSCALL(setregid) -SYSX(sys_ni_syscall,ppc32_sigsuspend,ppc_sigsuspend) +SYS32ONLY(sigsuspend) COMPAT_SYS(sigpending) COMPAT_SYS(sethostname) COMPAT_SYS(setrlimit) @@ -160,7 +160,7 @@ SYSCALL(swapoff) COMPAT_SYS(sysinfo) COMPAT_SYS(ipc) SYSCALL(fsync) -SYSX(sys_ni_syscall,ppc32_sigreturn,sys_sigreturn) +SYS32ONLY(sigreturn) PPC_SYS(clone) COMPAT_SYS(setdomainname) PPC_SYS(newuname) @@ -213,13 +213,13 @@ COMPAT_SYS(nfsservctl) SYSCALL(setresgid) SYSCALL(getresgid) COMPAT_SYS(prctl) -SYSX(ppc64_rt_sigreturn,ppc32_rt_sigreturn,sys_rt_sigreturn) +COMPAT_SYS(rt_sigreturn) COMPAT_SYS(rt_sigaction) COMPAT_SYS(rt_sigprocmask) COMPAT_SYS(rt_sigpending) COMPAT_SYS(rt_sigtimedwait) COMPAT_SYS(rt_sigqueueinfo) -SYSX(ppc64_rt_sigsuspend,ppc32_rt_sigsuspend,ppc_rt_sigsuspend) +COMPAT_SYS(rt_sigsuspend) COMPAT_SYS(pread64) COMPAT_SYS(pwrite64) SYSCALL(chown) @@ -290,7 +290,7 @@ COMPAT_SYS(clock_settime) COMPAT_SYS(clock_gettime) COMPAT_SYS(clock_getres) COMPAT_SYS(clock_nanosleep) -SYSX(ppc64_swapcontext,ppc32_swapcontext,ppc_swapcontext) +COMPAT_SYS(swapcontext) COMPAT_SYS(tgkill) COMPAT_SYS(utimes) COMPAT_SYS(statfs64) diff --git a/include/asm-powerpc/ptrace.h b/include/asm-powerpc/ptrace.h index 1f7ecdb..9c550b3 100644 --- a/include/asm-powerpc/ptrace.h +++ b/include/asm-powerpc/ptrace.h @@ -87,7 +87,7 @@ extern unsigned long profile_pc(struct p #define force_successful_syscall_return() \ do { \ - current_thread_info()->syscall_noerror = 1; \ + set_thread_flag(TIF_NOERROR); \ } while(0) /* diff --git a/include/asm-powerpc/thread_info.h b/include/asm-powerpc/thread_info.h index e525f49..ac1e80e 100644 --- a/include/asm-powerpc/thread_info.h +++ b/include/asm-powerpc/thread_info.h @@ -37,8 +37,7 @@ struct thread_info { int preempt_count; /* 0 => preemptable, <0 => BUG */ struct restart_block restart_block; - /* set by force_successful_syscall_return */ - unsigned char syscall_noerror; + void *nvgprs_frame; /* low level flags - has atomic operations done on it */ unsigned long flags ____cacheline_aligned_in_smp; }; @@ -123,6 +122,9 @@ static inline struct thread_info *curren #define TIF_SINGLESTEP 9 /* singlestepping active */ #define TIF_MEMDIE 10 #define TIF_SECCOMP 11 /* secure computing */ +#define TIF_RESTOREALL 12 /* Restore all regs (implies NOERROR) */ +#define TIF_SAVE_NVGPRS 13 /* Save r14-r31 in signal frame */ +#define TIF_NOERROR 14 /* Force successful syscall return */ /* as above, but as bit values */ #define _TIF_SYSCALL_TRACE (1< $@ -temp-ppc64-generic: configs/config-ppc64-generic temp-generic +temp-powerpc-generic: configs/config-powerpc-generic temp-generic perl scripts/merge.pl $^ > $@ -temp-s390-generic: configs/config-s390-generic temp-generic - perl scripts/merge.pl $^ > $@ +temp-powerpc64-generic: configs/config-powerpc64-generic temp-powerpc-generic + perl scripts/merge.pl $^ > $@ -temp-ppc-generic: configs/config-ppc-generic temp-generic +temp-powerpc32-generic: configs/config-powerpc32-generic temp-powerpc-generic + perl scripts/merge.pl $^ > $@ + +temp-s390-generic: configs/config-s390-generic temp-generic perl scripts/merge.pl $^ > $@ temp-ia64-generic: configs/config-ia64-generic temp-generic @@ -91,11 +94,11 @@ kernel-$(VERSION)-sparc64.config: configs/config-sparc64 temp-sparc-generic perl scripts/merge.pl $^ sparc64 > $@ -kernel-$(VERSION)-ppc64.config: configs/config-ppc64 temp-ppc64-generic - perl scripts/merge.pl $^ ppc64 > $@ +kernel-$(VERSION)-ppc64.config: configs/config-powerpc64 temp-powerpc64-generic + perl scripts/merge.pl $^ powerpc > $@ -kernel-$(VERSION)-ppc64iseries.config: configs/config-ppc64-iseries temp-ppc64-generic - perl scripts/merge.pl $^ ppc64 > $@ +kernel-$(VERSION)-ppc64iseries.config: configs/config-powerpc64-iseries temp-powerpc64-generic + perl scripts/merge.pl $^ powerpc > $@ kernel-$(VERSION)-s390.config: configs/config-s390 temp-s390-generic perl scripts/merge.pl $^ s390 > $@ @@ -103,11 +106,11 @@ kernel-$(VERSION)-s390x.config: configs/config-s390x temp-s390-generic perl scripts/merge.pl $^ s390 > $@ -kernel-$(VERSION)-ppc.config: configs/config-ppc-pmac temp-ppc-generic - perl scripts/merge.pl $^ ppc > $@ +kernel-$(VERSION)-ppc.config: /dev/null temp-powerpc32-generic + perl scripts/merge.pl $^ powerpc > $@ -kernel-$(VERSION)-ppc-smp.config: configs/config-ppc-pmac-smp temp-ppc-generic - perl scripts/merge.pl $^ ppc > $@ +kernel-$(VERSION)-ppc-smp.config: configs/config-powerpc32-smp temp-powerpc32-generic + perl scripts/merge.pl $^ powerpc > $@ kernel-$(VERSION)-ia64.config: configs/config-ia64 temp-ia64-generic perl scripts/merge.pl $^ ia64 > $@ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1554 retrieving revision 1.1555 diff -u -r1.1554 -r1.1555 --- kernel-2.6.spec 6 Jan 2006 03:08:40 -0000 1.1554 +++ kernel-2.6.spec 6 Jan 2006 05:42:17 -0000 1.1555 @@ -16,13 +16,14 @@ # that the kernel isn't the stock distribution kernel, for example by # adding some text to the end of the version number. # -%define sublevel 14 +%define sublevel 15 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} %define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC4%{rhbsys} %define signmodules 0 %define make_target bzImage +%define kernel_image arch/$Arch/boot/bzImage %define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE} @@ -67,7 +68,8 @@ %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config %define image_install_path boot %define signmodules 1 -%define make_target bzImage +%define make_target vmlinux +%define kernel_image vmlinux %endif %ifarch ppc64iseries @@ -75,7 +77,8 @@ %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc64*.config %define image_install_path boot %define signmodules 1 -%define make_target bzImage +%define make_target vmlinux +%define kernel_image vmlinux %endif %ifarch s390 @@ -101,8 +104,9 @@ %ifarch ppc %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-ppc*.config -%define buildsmp 1 %define image_install_path boot +%define make_target vmlinux +%define kernel_image vmlinux %endif %ifarch ia64 @@ -133,7 +137,7 @@ # # Several packages had bugs in them that became obvious when the NPTL -# threading code got integrated. +# threading code got integrated. # %define nptl_conflicts SysVinit < 2.84-13, pam < 0.75-48, vixie-cron < 3.0.1-73, privoxy < 3.0.0-8, spamassassin < 2.44-4.8.x, cups < 1.1.17-13 @@ -202,8 +206,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.14.5.bz2 -Patch2: linux-2.6.15-various-fixes.patch +#Patch1: patch-2.6.15.1.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -213,13 +216,19 @@ Patch200: linux-2.6-x86-tune-p4.patch Patch201: linux-2.6-x86-apic-off-by-default.patch Patch202: linux-2.6-x86-vga-vidfail.patch -Patch203: linux-2.6-x86-hp-reboot.patch -Patch204: linux-2.6-x86_64-ati-apic-timer.patch +Patch203: linux-2.6.14-intel-cache-build.patch +Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch +Patch205: linux-2.6-x86_64-disable-hotplug-guessing.patch # 300 - 399 ppc(64) -Patch300: linux-2.6-ppc64-build.patch -Patch301: linux-2.6-ppc64-eeh-panic.patch -Patch302: linux-2.6-serial-of.patch +Patch300: linux-2.6.15-default-powerpc.patch +Patch301: linux-2.6-serial-of.patch +Patch302: linux-2.6.15-rc1-ppc64-syscallpath.patch +Patch303: linux-2.6.15-mv643xx-fixes.patch +Patch304: linux-2.6-hvc-console.patch +Patch305: linux-2.6-hvc-rtas-console.patch +Patch306: linux-2.6-ppc-rtas-check.patch +Patch307: linux-2.6-powerpc-parport.patch # 400 - 499 ia64 # 500 - 599 s390(x) @@ -236,8 +245,7 @@ # Patch800: linux-2.6-build-nonintconfig.patch Patch801: linux-2.6-build-userspace-headers-warning.patch -Patch802: linux-2.6-build-qconfig-qt-lib64.patch -Patch803: linux-2.6-build-reference-discarded-opd.patch +Patch802: linux-2.6-build-reference-discarded-opd.patch # Exec-shield. Patch810: linux-2.6-execshield.patch @@ -273,7 +281,12 @@ Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch Patch1021: linux-2.6-debug-reference-discarded-return-result.patch Patch1022: linux-2.6-debug-panic-stackdump.patch -Patch1023: linux-2.6-debug-spinlock-emerg.patch +Patch1023: linux-2.6-debug-taint-proprietary-helpers.patch +Patch1024: linux-2.6-debug-dual-line-backtrace.patch +Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch +Patch1026: linux-2.6-debug-no-quiet.patch +Patch1027: linux-2.6-debug-slab-leak-detector.patch +Patch1028: linux-2.6-debug-oops-pause.patch # Restrict /dev/mem usage. Patch1050: linux-2.6-devmem.patch @@ -286,29 +299,20 @@ Patch1070: linux-2.6-sleepon.patch # Tweak some defaults. -Patch1080: linux-2.6-default-elevator.patch Patch1081: linux-2.6-max-symlinks.patch -Patch1082: linux-2.6-optimise-for-size.patch # SCSI bits. Patch1101: linux-2.6-scsi-advansys-enabler.patch Patch1102: linux-2.6-scsi-megaraid-legacy.patch Patch1103: linux-2.6-scsi-advansys-pcitable.patch -Patch1104: linux-2.6-scsi-runqueue-oops.patch # NFS bits. Patch1200: linux-2.6-NFSD-non-null-getxattr.patch Patch1201: linux-2.6-NFSD-ctlbits.patch -Patch1202: linux-2.6-NFSD-locking-fix.patch Patch1203: linux-2.6-NFSD-badness.patch # NIC driver updates Patch1301: linux-2.6-net-sundance-ip100A.patch -Patch1302: linux-2.6-net-atm-lanai-nodev-rmmod.patch -Patch1303: linux-2.6-net-acenic-use-after-free.patch -Patch1304: linux-2.6-net-sk98lin-vpd.patch - -Patch1400: linux-2.6-pcmcia-disable-warning.patch # Netdump and Diskdump bits. Patch1500: linux-2.6-crashdump-common.patch @@ -321,41 +325,24 @@ # Misc bits. Patch1600: linux-2.6-procfs-i_nlink-miscalculate.patch Patch1610: linux-2.6-atkbd-dell-multimedia.patch -Patch1620: linux-2.6-mcs-canonicalise-getxattr.patch Patch1630: linux-2.6-module_version.patch -Patch1650: linux-2.6-cx88-silence-debug.patch -Patch1660: linux-2.6-swsusp-nofreeze.patch -Patch1670: linux-2.6-input-kill-stupid-messages.patch -Patch1680: linux-2.6-input-usblegacy.patch -Patch1690: linux-2.6-serial-tickle-nmi.patch -Patch1700: linux-2.6-missing-exports.patch -Patch1710: linux-2.6-radeon-backlight.patch -Patch1720: linux-2.6-ide-tune-locking.patch -Patch1730: linux-2.6-autofs-pathlookup.patch -Patch1740: linux-2.6-alsa-maestro-hang.patch -Patch1750: linux-2.6-8139too-suspend.patch -Patch1751: linux-2.6-selinux-hush.patch -Patch1753: linux-2.6-smsc-ircc2-pnp.patch -Patch1754: linux-2.6-ide-scsi-check_condition.patch -Patch1755: linux-2.6-usbhid-wireless-security-lock.patch -Patch1756: linux-2.6-net-rtnetlink-infinite-loop.patch -Patch1757: linux-2.6-w1-hush-debug.patch -Patch1758: linux-2.6-pwc-powerup-by-default.patch -Patch1759: linux-2.6-kauditd-suspend.patch -Patch1760: linux-2.6-firmware-timeout.patch -Patch1761: linux-2.6-suspend-mxcsr.patch -Patch1771: linux-2.6-sata-promise-pata-ports.patch -Patch1782: linux-2.6-selinux-mls-compat.patch -Patch1783: linux-2.6-usbhid-wacom.patch -Patch1790: linux-2.6-block-reduce-stack.patch +Patch1640: linux-2.6-swsusp-nofreeze.patch +Patch1650: linux-2.6-input-kill-stupid-messages.patch +Patch1660: linux-2.6-input-usblegacy.patch +Patch1670: linux-2.6-serial-tickle-nmi.patch +Patch1680: linux-2.6-missing-exports.patch +Patch1690: linux-2.6-radeon-backlight.patch +Patch1700: linux-2.6-ide-tune-locking.patch +Patch1710: linux-2.6-autofs-pathlookup.patch +Patch1720: linux-2.6-selinux-hush.patch +Patch1730: linux-2.6-ide-cd-shutup.patch +Patch1750: linux-2.6-ub.patch +Patch1760: linux-2.6-sata-enable-atapi-by-default.patch +Patch1770: linux-2.6-valid-ether-addr.patch +Patch1780: linux-2.6-firmware-loader-timeout.patch # ACPI patches. -Patch1800: linux-2.6-acpi-enable-ecburst.patch -Patch1801: linux-2.6-acpi-silence-cutoff.patch -Patch1802: linux-2.6-acpi-thinkpad-c2c3.patch -Patch1803: linux-2.6-acpi-20050902.patch -Patch1804: linux-2.6-acpi-ht.patch -Patch1805: linux-2.6-acpi-owner_id-limit.patch +Patch1800: linux-2.6-acpi-thinkpad-c2c3.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -364,20 +351,18 @@ # no external module should use these symbols. Patch1910: linux-2.6-unexport-symbols.patch - # VM bits. Patch2000: linux-2.6-vm-oomkiller-debugging.patch Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch -Patch2003: linux-2.6-vm-clear-unreclaimable.patch -Patch2004: linux-2.6-vm-debug.patch - +Patch2002: linux-2.6-vm-debug.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. # -Patch10000: linux-2.6-compile-fixes.patch + +Patch10004: linux-2.6-compile-fixes.patch # END OF PATCH DEFINITIONS @@ -528,24 +513,24 @@ This package provides kernel headers and makefiles sufficient to build modules against the kernel package. - - %prep if [ ! -d kernel-%{kversion}/vanilla ]; then - # Ok, first time we do a make prep. + # Ok, first time we do a make prep. %setup -q -n %{name}-%{version} -c - rm -f pax_global_header - mv linux-%{kversion} vanilla + rm -f pax_global_header + mv linux-%{kversion} vanilla else - # We already have a vanilla dir. - cd kernel-%{kversion} - rm -rf linux-%{kversion} + # We already have a vanilla dir. + cd kernel-%{kversion} + mv linux-%{kversion} deleteme + rm -rf deleteme & fi cp -rl vanilla linux-%{kversion} cd linux-%{kversion} -%patch1 -p1 -%patch2 -p1 +# Update to latest upstream. +#%patch1 -p1 +#%patch2 -p1 # # Patches 10 through 100 are meant for core subsystem upgrades @@ -566,27 +551,32 @@ # Compile 686 kernels tuned for Pentium4. %patch200 -p1 # Keep UP APIC off by default. -#%patch201 -p1 +%patch201 -p1 # add vidfail capability; # without this patch specifying a framebuffer on the kernel prompt would # make the boot stop if there's no supported framebuffer device; this is bad # for the installer cd that wants to automatically fall back to textmode # in that case %patch202 -p1 -# Reboot through the BIOS on newer HP laptops +# exitfunc called from initfunc. %patch203 -p1 -# Workaround ATI 'clock going too fast' bug +# Suppress APIC errors on UP x86-64. %patch204 -p1 +# Disable guessing of how many hotplug cpus to add. +%patch205 -p1 # # ppc64 # -# Patch for Kconfig and Makefile build issues %patch300 -p1 %patch301 -p1 -# Don't probe serial ports if they don't exist %patch302 -p1 +%patch303 -p1 +%patch304 -p1 +%patch305 -p1 +%patch306 -p1 +%patch307 -p1 # # Xen @@ -609,10 +599,8 @@ %patch800 -p1 # Warn if someone tries to build userspace using kernel headers %patch801 -p1 -# Fix qt config tool compilation on 64bit. -%patch802 -p1 # reference_discarded additions. -%patch803 -p1 +%patch802 -p1 # Exec shield %patch810 -p1 @@ -644,7 +632,7 @@ %patch905 -p1 # Tux -#%patch910 -p1 +%patch910 -p1 # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems @@ -666,6 +654,11 @@ %patch1021 -p1 %patch1022 -p1 %patch1023 -p1 +%patch1024 -p1 +%patch1025 -p1 +%patch1026 -p1 +%patch1027 -p1 +%patch1028 -p1 # # Make /dev/mem a need-to-know function @@ -689,12 +682,8 @@ %patch1070 -p1 # Adjust some defaults. -# Make CFQ default elevator again -%patch1080 -p1 # Bump up the number of recursive symlinks. %patch1081 -p1 -# Make optimise for size available without selecting CONFIG_EMBEDDED -%patch1082 -p1 # # SCSI Bits. @@ -705,8 +694,6 @@ %patch1102 -p1 # Add a pci table to advansys driver. %patch1103 -p1 -# fix usb storage oops -%patch1104 -p1 # # Various upstream NFS/NFSD fixes. @@ -714,23 +701,12 @@ %patch1200 -p1 # kNFSD: fixed '-p port' arg to rpc.nfsd and enables the defining proto versions and transports %patch1201 -p1 -# Fix badness in NFSD locking -%patch1202 -p1 -# more NFS badness +# Fix badness. %patch1203 -p1 # NIC driver fixes. # New PCI ID for sundance driver. %patch1301 -p1 -# Fix rmmod lanai -%patch1302 -p1 -# Acenic use after free -%patch1303 -p1 -# sk98lin vpd fix -%patch1304 -p1 - -# disable pcmcia warnings -%patch1400 -p1 # netdump bits %patch1500 -p1 @@ -749,74 +725,40 @@ %patch1600 -p1 # Make multimedia buttons on Dell Inspiron 8200 work. %patch1610 -p1 -# Canonicalise getxattr results. -%patch1620 -p1 # Add missing MODULE_VERSION tags to some modules. %patch1630 -p1 -# Silence silly debug message in cx88. (#168931) -%patch1650 -p1 # Fix suspend to sbp devices. (166452) -%patch1660 -p1 +%patch1640 -p1 # The input layer spews crap no-one cares about. -%patch1670 -p1 +%patch1650 -p1 # usb legacy workaround. -%patch1680 -p1 +%patch1660 -p1 # Tickle the NMI whilst doing serial writes. -%patch1690 -p1 +%patch1670 -p1 # Missing EXPORT_SYMBOL's -%patch1700 -p1 +%patch1680 -p1 # Radeon on thinkpad backlight power-management goodness. -%patch1710 -p1 +%patch1690 -p1 # Fix IDE locking bug. -%patch1720 -p1 +%patch1700 -p1 # autofs4 looks up wrong path element when ghosting is enabled +%patch1710 -p1 +# Silence some selinux messages. +%patch1720 -p1 +# Silence noisy CD drive spew %patch1730 -p1 -# Fix maestro driver hangs -%patch1740 -p1 -# 8139 suspend fix. +# Enable USB storage,UB & libusual magick. %patch1750 -p1 -# Silence some SELinux msgs -%patch1751 -p1 -# IRDA fix -%patch1753 -p1 -# check condition in ide-scsi -%patch1754 -p1 -# usbhid wireless security lock fix -%patch1755 -p1 -# Fix infinite loop in rtnetlink -%patch1756 -p1 -# silence w1 debug output -%patch1757 -p1 -# power up pwc cameras by default -%patch1758 -p1 -# stop kauditd from breaking suspend. -%patch1759 -p1 -# Increase timeout on firmware loader. +# Enable SATA ATAPI by default. %patch1760 -p1 -# Fix FPU corruption on return from S3 -%patch1761 -p1 -# Make PATA ports on Promise SATA work again. -%patch1771 -p1 -# SELinux MLS compat. -%patch1782 -p1 -# usbhid incorrectly claimed wacom penpartner tablet. -%patch1783 -p1 -# Decrease stack usage in block layer -%patch1790 -p1 +# +%patch1770 -p1 +# Increase timeout on firmware loader. +%patch1780 -p1 # ACPI patches. -# Enable EC burst -#%patch1800 -p1 -# Change printk level of cutoff msg. -%patch1801 -p1 # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. -%patch1802 -p1 -# update to 2.6.15 era acpi -%patch1803 -p1 -# Fix HT slowdown issue -%patch1804 -p1 -# Increase owner_id limit -%patch1805 -p1 +%patch1800 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -831,10 +773,8 @@ %patch2000 -p1 # Silence GFP_ATOMIC failures. %patch2001 -p1 -# prevent OOM kills and page allocation failures under load. -%patch2003 -p1 -# debug-fu -%patch2004 -p1 +# Debug-fu +%patch2002 -p1 # # Patches 5000 to 6000 are reserved for new drivers that are about to @@ -845,11 +785,11 @@ # # final stuff # -%patch10000 -p1 # # misc small stuff to make things compile or otherwise improve performance # +#%patch10004 -p1 # END OF PATCH APPLICATIONS @@ -858,23 +798,23 @@ mkdir configs -cp -fv %{all_arch_configs} . +cp -f %{all_arch_configs} . # now run oldconfig over all the config files for i in *.config do - mv $i .config - Arch=`head -1 .config | cut -b 3-` + mv $i .config + Arch=`head -1 .config | cut -b 3-` %if %{includexen} - make ARCH=$Arch nonint_oldconfig > /dev/null + make ARCH=$Arch nonint_oldconfig > /dev/null %else - if [ "$Arch" != "xen" ]; then - make ARCH=$Arch nonint_oldconfig > /dev/null - fi + if [ "$Arch" != "xen" ]; then + make ARCH=$Arch nonint_oldconfig > /dev/null + fi %endif - echo "# $Arch" > configs/$i - cat .config >> configs/$i + echo "# $Arch" > configs/$i + cat .config >> configs/$i done # make sure the kernel has the sublevel we know it has. This looks weird @@ -884,14 +824,12 @@ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -prep/" Makefile # get rid of unwanted files resulting from patch fuzz -find . -name "*.orig" -exec rm -fv {} \; -find . -name "*~" -exec rm -fv {} \; +find . -name "*.orig" -o -name "*~" -exec rm -f {} \; >/dev/null & ### ### build ### %build - # # Create gpg keys for signing the modules # @@ -909,13 +847,13 @@ # Pick the right config file for the kernel we're building if [ -n "$1" ] ; then - Config=kernel-%{kversion}-%{_target_cpu}-$1.config - DevelDir=/usr/src/kernels/%{KVERREL}-$1-%{_target_cpu} - DevelLink=/usr/src/kernels/%{KVERREL}$1-%{_target_cpu} + Config=kernel-%{kversion}-%{_target_cpu}-$1.config + DevelDir=/usr/src/kernels/%{KVERREL}-$1-%{_target_cpu} + DevelLink=/usr/src/kernels/%{KVERREL}$1-%{_target_cpu} else - Config=kernel-%{kversion}-%{_target_cpu}.config - DevelDir=/usr/src/kernels/%{KVERREL}-%{_target_cpu} - DevelLink= + Config=kernel-%{kversion}-%{_target_cpu}.config + DevelDir=/usr/src/kernels/%{KVERREL}-%{_target_cpu} + DevelLink= fi KernelVer=%{version}-%{release}$1 @@ -947,10 +885,10 @@ mkdir -p $RPM_BUILD_ROOT/%{image_install_path} install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer - cp arch/$Arch/boot/bzImage $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer - if [ -f arch/$Arch/boot/zImage.stub ]; then + cp %{kernel_image} $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer + if [ -f arch/$Arch/boot/zImage.stub ]; then cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || : - fi + fi mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer @@ -966,6 +904,9 @@ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/source mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build (cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source) + # dirs for additional modules per module-init-tools, kbuild/modules.txt + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates # first copy everything cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build @@ -985,8 +926,6 @@ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include - cp -a drivers/media/dvb/frontends/*.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/dvb/frontends - cp -a drivers/media/dvb/dvb-core/*.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/dvb/dvb-core cd include cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include %if %{buildxen} @@ -996,13 +935,14 @@ if [ "$Arch" = "x86_64" ]; then cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include fi - if [ "$Arch" = "ppc64" ]; then - cp -a asm-ppc $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include - fi - if [ "$Arch" = "ppc" -o "$Arch" = "ppc64" ]; then - cp -a asm-powerpc $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include + # While arch/powerpc/include/asm is still a symlink to the old + # include/asm-ppc{64,} directory, include that in kernel-devel too. + if [ "$Arch" = "powerpc" -a -r ../arch/powerpc/include/asm ]; then + cp -a `readlink ../arch/powerpc/include/asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/$Arch/include - ln -sf ../../../include/asm-powerpc $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/$Arch/include/asm + pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/$Arch/include + ln -sf ../../../include/asm-ppc* asm + popd fi # Make sure the Makefile and version.h have a matching timestamp so that # external modules can be built @@ -1018,37 +958,41 @@ cp vmlinux $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer %endif + find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames + # gpg sign the modules %if %{signmodules} gcc -o scripts/modsign/mod-extract scripts/modsign/mod-extract.c -Wall - KEYFLAGS="--no-default-keyring --homedir .." - KEYFLAGS="$KEYFLAGS --secret-keyring ../kernel.sec" - KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub" - export KEYFLAGS - for i in ` find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f` - do - sh ./scripts/modsign/modsign.sh $i Red - mv -f $i.signed $i + KEYFLAGS="--no-default-keyring --homedir .." + KEYFLAGS="$KEYFLAGS --secret-keyring ../kernel.sec" + KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub" + export KEYFLAGS + + for i in `cat modnames` + do + sh ./scripts/modsign/modsign.sh $i Red + mv -f $i.signed $i done - unset KEYFLAGS + unset KEYFLAGS %endif # mark modules executable so that strip-to-file can strip them - find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f | xargs chmod u+x + cat modnames | xargs chmod u+x # detect missing or incorrect license tags - for i in `find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" ` - do - echo -n "$i " - /sbin/modinfo -l $i >> modinfo - done + for i in `cat modnames` + do + echo -n "$i " + /sbin/modinfo -l $i >> modinfo + done cat modinfo |\ - grep -v "^GPL" | - grep -v "^Dual BSD/GPL" |\ - grep -v "^Dual MPL/GPL" |\ - grep -v "^GPL and additional rights" |\ - grep -v "^GPL v2" && exit 1 + grep -v "^GPL" | + grep -v "^Dual BSD/GPL" |\ + grep -v "^Dual MPL/GPL" |\ + grep -v "^GPL and additional rights" |\ + grep -v "^GPL v2" && exit 1 rm -f modinfo + rm -f modnames # remove files that will be auto generated by depmod at rpm -i time rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.* @@ -1080,7 +1024,6 @@ BuildKernel xenU %endif - ### ### install ### @@ -1139,9 +1082,9 @@ %post devel if [ -x /usr/sbin/hardlink ] ; then -pushd /usr/src/kernels/%{KVERREL}-%{_target_cpu} > /dev/null -/usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done -popd > /dev/null + pushd /usr/src/kernels/%{KVERREL}-%{_target_cpu} > /dev/null + /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done + popd > /dev/null fi %post smp @@ -1150,9 +1093,9 @@ %post smp-devel if [ -x /usr/sbin/hardlink ] ; then -pushd /usr/src/kernels/%{KVERREL}-smp-%{_target_cpu} > /dev/null -/usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done -popd > /dev/null + pushd /usr/src/kernels/%{KVERREL}-smp-%{_target_cpu} > /dev/null + /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done + popd > /dev/null fi %post xen0 @@ -1162,38 +1105,37 @@ %post xen0-devel if [ -x /usr/sbin/hardlink ] ; then -pushd /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu} > /dev/null -/usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done -popd > /dev/null + pushd /usr/src/kernels/%{KVERREL}-xen0-%{_target_cpu} > /dev/null + /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done + popd > /dev/null fi %post xenU -[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade +[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X %post xenU-devel if [ -x /usr/sbin/hardlink ] ; then -pushd /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu} > /dev/null -/usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done -popd > /dev/null + pushd /usr/src/kernels/%{KVERREL}-xenU-%{_target_cpu} > /dev/null + /usr/bin/find . -type f | while read f; do hardlink -c /usr/src/kernels/*FC*/$f $f ; done + popd > /dev/null fi - %preun /sbin/modprobe loop 2> /dev/null > /dev/null || : -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL} +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL} %preun smp /sbin/modprobe loop 2> /dev/null > /dev/null || : -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp %preun xen0 /sbin/modprobe loop 2> /dev/null > /dev/null || : -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0 +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}xen0 %preun xenU /sbin/modprobe loop 2> /dev/null > /dev/null || : -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU +/sbin/new-kernel-pkg --rmmoddep --remove %{KVERREL}xenU ### @@ -1210,6 +1152,8 @@ /lib/modules/%{KVERREL}/kernel /lib/modules/%{KVERREL}/build /lib/modules/%{KVERREL}/source +/lib/modules/%{KVERREL}/extra +/lib/modules/%{KVERREL}/updates %files devel %defattr(-,root,root) @@ -1226,6 +1170,8 @@ /lib/modules/%{KVERREL}smp/kernel /lib/modules/%{KVERREL}smp/build /lib/modules/%{KVERREL}smp/source +/lib/modules/%{KVERREL}smp/extra +/lib/modules/%{KVERREL}smp/updates %files smp-devel %defattr(-,root,root) @@ -1244,6 +1190,8 @@ %verify(not mtime) /lib/modules/%{KVERREL}xen0/build /lib/modules/%{KVERREL}xen0/source /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf +/lib/modules/%{KVERREL}xen0/extra +/lib/modules/%{KVERREL}xen0/updates %files xen0-devel %defattr(-,root,root) @@ -1260,6 +1208,8 @@ %verify(not mtime) /lib/modules/%{KVERREL}xenU/build /lib/modules/%{KVERREL}xenU/source /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf +/lib/modules/%{KVERREL}xenU/extra +/lib/modules/%{KVERREL}xenU/updates %files xenU-devel %defattr(-,root,root) @@ -1279,203 +1229,497 @@ %endif %changelog -* Thu Jan 5 2006 Dave Jones [2.6.14-1.1656_FC4] -- Rebuild. +* Tue Jan 3 2006 Dave Jones +- 2.6.15 + +* Sun Jan 01 2006 Dave Jones +- 2.6.15-rc7-git6 -* Tue Jan 3 2006 Dave Jones [2.6.14-1.1655_FC4] -- Small fixes from 2.6.15 - sysctl: don't overflow the user-supplied buffer with '0' - sysctl: make sure to terminate strings with a NUL - Insanity avoidance in /proc - -* Sun Jan 1 2006 Dave Jones -- Fix the ACPI whitelist date again. - -* Wed Dec 28 2005 Dave Jones -- Tighten permissions on /proc/pid/smaps. (#176687) - -* Wed Dec 28 2005 Dave Jones [2.6.14-1.1654_FC4] -- Fix usb storage oops. (#176576) -- Fix ACPI owner_id limit. -- Decrease stack usage in block layer. +* Sat Dec 31 2005 Dave Jones +- 2.6.15-rc7-git5 + +* Fri Dec 30 2005 Dave Jones +- 2.6.15-rc7-git4 + +* Thu Dec 29 2005 Dave Jones +- 2.6.15-rc7-git3 * Tue Dec 27 2005 Dave Jones -- 2.6.14.5 -- usbhid incorrectly claimed wacom penpartner tablet. (#161241) -- Reinstate the y2k ACPI blacklist cutoff. - It broke working suspend for apm users. +- 2.6.15-rc7-git1 + +* Fri Dec 23 2005 Dave Jones +- 2.6.15-rc6-git4 + +* Thu Dec 22 2005 Dave Jones +- 2.6.15-rc6-git3 + +* Wed Dec 21 2005 Dave Jones +- 2.6.15-rc6-git2 + +* Tue Dec 20 2005 Dave Jones +- 2.6.15-rc6-git1 +- Make APM work again + +* Mon Dec 19 2005 Dave Jones +- 2.6.15-rc6 +- Update ACPICA + +* Sat Dec 17 2005 Dave Jones +- 2.6.15-rc5-git7 * Fri Dec 16 2005 Dave Jones -- Rebase to final 2.6.14.4 +- 2.6.15-rc5-git6 + +* Thu Dec 15 2005 Dave Jones +- 2.6.15-rc5-git5 + +* Wed Dec 14 2005 Dave Jones +- 2.6.15-rc5-git4 +- Try 'optimise for size' again. +- Silence noisy CD drives that spew msgs when probed whilst empty. + +* Tue Dec 13 2005 Dave Jones +- 2.6.15-rc5-git3 +- Use MMIO instead of PIO for 8139too + +* Tue Dec 13 2005 David Woodhouse +- Remove workaround for fixed GCC PR25248 -* Tue Dec 13 2005 Dave Jones [2.6.14-1.1653_FC4] -- Use MMIO instead of PIO for 8139too driver. +* Mon Dec 12 2005 Dave Jones +- 2.6.15-rc5-git2 -* Tue Dec 13 2005 Dave Jones [2.6.14-1.1652_FC4] -- Include a bunch of patches likely to appear in 2.6.14.4 -- Hopefully fix ACPI performance issue with HT CPUs. - -* Sun Dec 11 2005 Dave Jones [2.6.14-1.1651_FC4] -- More Promise PATA fixes. - -* Sat Dec 10 2005 Dave Jones [2.6.14-1.1650_FC4] -- Update ACPI to 2.6.15 era. - -* Sat Dec 10 2005 Dave Jones [2.6.14-1.1649_FC4] -- Fix some possible problems with unnecessary OOM kills. -- Fix compile error in parport_pc when debugging on. (#175340) -- Disable voluntary preemption temporarily to diagnose some - strange bugs. - -* Fri Dec 9 2005 Dave Jones -- Drop change timesource default patch, it causes strange - interactions on some systems. (#171554) -- Make PATA ports on Promise SATA work again. (#172913) - -* Tue Dec 6 2005 Dave Jones [2.6.14-1.1648_FC4] -- Disable ACPI blacklist. - The interpretor is a lot better these days. Sadly, BIOS authors aren't. -- Re-enable i2o ioctls. (#174748) +* Mon Dec 12 2005 David Woodhouse +- Make mambo_disk not run on real hardware; only on sim +- Also make it a module +- Handle iommu on DD3 boards +- Fix parport patch + +* Sun Dec 11 2005 Dave Jones +- Re-add ISA soundblaster drivers. (#175492) + +* Sat Dec 10 2005 Dave Jones +- Disable guessing of how many x86-64 hotplug cpus to add. + +* Sat Dec 10 2005 David Woodhouse +- Work around GCC PR25248 +- Fix parport_pc driver to check before poking at legacy I/O ports + +* Thu Dec 8 2005 David Woodhouse +- Clean up Cell patches, make it boot on real hardware + +* Wed Dec 7 2005 Dave Jones +- Merge slab leak detector. +- Suppress APIC errors on UP x86-64. (#175193) + +* Tue Dec 6 2005 Dave Jones +- Test build with gcc4.1 + +* Mon Dec 05 2005 Dave Jones +- 2.6.15-rc5-git1 + +* Sun Dec 4 2005 Dave Jones +- 2.6.15-rc5 + +* Sat Dec 03 2005 Dave Jones +- 2.6.15-rc4-git2 + +* Fri Dec 02 2005 Dave Jones +- 2.6.15-rc4-git1 +- sysfs debug on x86-64 too. * Fri Dec 2 2005 Dave Jones -- SELinux MLS compatability. +- Better fix for the NFSD cache_change_attribute fix. (#174010) + +* Thu Dec 1 2005 Dave Jones +- 2.6.15-rc4 +- Flip default ioscheduler back to cfq. +- Increase firmware loader timeout. (#174589) +- Add sysfs debug info to oops output. * Wed Nov 30 2005 Dave Jones -- Reboot through the BIOS on newer HP laptops -- Workaround for ATI 'clock goes too fast' bug. +- Revert a broken NFS change from upstream. (#174010) +- Re-add a rediffed Tux http accelerator. +- 2.6.15-rc3-git1 + +* Tue Nov 29 2005 David Woodhouse +- Fix EHCI panic on initialisation +- Fix is_valid_ether_addr() not to claim broadcast is valid -* Tue Nov 29 2005 Dave Jones [2.6.14-1.1647_FC4] -- Fix feature consolidation in bonding & bridging code. +* Tue Nov 29 2005 Dave Jones +- 2.6.15rc3 -* Tue Nov 29 2005 Dave Jones [2.6.14-1.1646_FC4] -- Fix SATA locking. +* Mon Nov 28 2005 Dave Jones +- Additional ID for Conexant AccessRunner USB driver (#174339) -* Mon Nov 28 2005 Dave Jones [2.6.14-1.1645_FC4] -- Unbreak the cciss cli tools. (#170351) +* Mon Nov 28 2005 David Woodhouse +- Fix RX packet alignment and multicast on MV643xx Ethernet -* Sun Nov 27 2005 Dave Jones [2.6.14-1.1644_FC4] -- Port a change_page_attr() fix from x86-64 to i386. +* Sun Nov 27 2005 Dave Jones +- Port change_page_attr fixes from x86-64. + (Fixes rodata-readonly causes instant reboot) -* Sat Nov 26 2005 Dave Jones [2.6.14-1.1643_FC4] -- Fix infinite loop in rtnetlink. +* Sat Nov 26 2005 Dave Jones +- 2.6.15-rc2-git6 * Fri Nov 25 2005 Dave Jones -- 2.6.14.3 +- 2.6.15-rc2-git5 -* Wed Nov 23 2005 Dave Jones [2.6.14-1.1642_FC4] -- Fix 32bit integer overflow in invalidate_inode_pages2() (local DoS) +* Fri Nov 25 2005 Dave Jones +- 2.6.15-rc2-git4 + +* Thu Nov 24 2005 David Woodhouse +- Fix non-volatile register saving in ppc32 signal delivery +- Compile mambonet (IBM Cell sim network) as a module -* Wed Nov 23 2005 Dave Jones [2.6.14-1.1641_FC4] -- Merge patches likely to end up in 2.6.14.3 +* Wed Nov 23 2005 Dave Jones +- 2.6.15-rc2-git3 * Tue Nov 22 2005 Dave Jones -- Fix another NFSD badness warning. -- Fix some thinko's in the signed modules code. +- 2.6.15-rc2-git2 +- Add a 'nowprodata' to disable rodata protection during debug. +- Fix NFSD badness warning. +- Enable SATA ATAPI by default. +- Fix some silly thinko's in the signed modules code. + +* Mon Nov 21 2005 David Woodhouse +- No pcskpr on ppc64 +- Fix IBM Cell sim console output * Mon Nov 21 2005 Dave Jones -- Remove broken hostname changes in revision field of kernel spec. (#173366) -- Fix some broken locking in NFSD. +- 2.6.15-rc2-git1 +- Shrink the 586 kernel by removing some unnecessary modules. + +* Sun Nov 20 2005 Dave Jones +- Fix bad locking in NFS (#173364) + +* Sat Nov 19 2005 Dave Jones +- 2.6.15-rc2 -* Mon Nov 14 2005 Dave Jones [2.6.14-1.1640_FC4] -- Fix memory leak with file leases. (#172691) +* Sat Nov 19 2005 David Woodhouse +- Make kernel-devel packages work again for ppc/ppc64 +- Fix oops with MGA on root PCI bus -* Sat Nov 12 2005 Dave Jones [2.6.14-1.1639_FC4] +* Fri Nov 18 2005 David Woodhouse +- Fix ppc64 sparsemem with memory holes. + +* Fri Nov 18 2005 Dave Jones +- Write protect kernel space rodata on x86-32 too. +- Fix up the placement of Obsolete: on x86-64 + +* Thu Nov 17 2005 Dave Jones +- Disable 3c501 driver. Sorry, Alan. + +* Thu Nov 17 2005 David Woodhouse +- Disable HFC USB again since it's not fixed in -git3 + +* Thu Nov 17 2005 Stephen Tweedie +- 2.6.15-rc1-git3 + +* Thu Nov 17 2005 David Woodhouse +- Disable CONFIG_RTC on ppc64. It's CONFIG_GEN_RTC now +- Use anticipatory I/O scheduler by default. CFQ appears broken. + +* Wed Nov 16 2005 David Woodhouse +- 2.6.15-rc1-git4 +- Re-enable hfc_usb since it appears to be fixed +- Re-enable iSeries too on the same basis +- Fix EEH use of uninitialised spinlock again + +* Wed Nov 16 2005 David Woodhouse +- Support PPC64 kernel running in IBM Cell Broadband Engine simulator + (http://www.alphaworks.ibm.com/tech/cellsystemsim) +- Update serial-of patch + +* Wed Nov 16 2005 Dave Jones +- Unbreak config generation. HIGHMEM64G works again. + +* Tue Nov 15 2005 Dave Jones +- More UB fixing. + +* Tue Nov 15 2005 David Woodhouse +- Revamp ppc32 and ppc64 system call entry/exit paths +- Fix up PCI initialisation on ppc64 to prevent parport_pc killing G5s + +* Tue Nov 15 2005 Dave Jones +- 2.6.15-rc1-git3 +- Make lrmi using apps (ddcprobe et al) work again. + +* Tue Nov 15 2005 David Woodhouse +- More PPC vDSO fixes + +* Mon Nov 14 2005 Dave Jones +- Enable USB storage,UB & libusual magick. +- Disable busted HFC-S USB based HiSAX ISDN driver. + +* Mon Nov 14 2005 David Woodhouse +- Clean up ppc64 config a little; enable thermal support + +* Mon Nov 14 2005 Dave Jones +- 2.6.15-rc1-git2 - Ignore result from acpi_bus_find_driver(device); Should fix boot hangs on several HP systems (and maybe others). +- Terminate the device id list in hfc driver. + +* Mon Nov 14 2005 David Woodhouse +- PPC vDSO fixes from BenH + +* Sun Nov 13 2005 Dave Jones +- 2.6.15-rc1-git1 -* Fri Nov 11 2005 Dave Jones [2.6.14-1.1638_FC4] -- 2.6.14.2 -- Hopefully fix the i8k bug for real this time. -- nf_queue: Fix Oops when no queue handler registered +* Fri Nov 11 2005 Dave Jones +- 2.6.15-rc1 + - iseries broken, so disabled for now. +- 2.6.14-git14 + +* Fri Nov 11 2005 Bill Nottingham +- ipw2200 requires a new firmware version, tweak conflict * Thu Nov 10 2005 Dave Jones -- Write protect kernel rodata +- 2.6.14-git13 + +* Wed Nov 09 2005 Dave Jones +- 2.6.14-git12 + +* Tue Nov 08 2005 Dave Jones +- Update patch to write protect read-only kernel data. + +* Tue Nov 08 2005 David Woodhouse +- 2.6.14-git11 + +* Mon Nov 07 2005 Dave Jones +- 2.6.14-git10 -* Wed Nov 9 2005 Dave Jones [2.6.14-1.1637_FC4] -- 2.6.14.1 -- 2.6.14.2pre +* Mon Nov 07 2005 Dave Jones +- silence some selinux messages. -* Wed Nov 9 2005 David Woodhouse -- Fix kernel-devel headers on PPC -- Include DVB headers +* Sun Nov 06 2005 Dave Jones +- 2.6.14-git9 -* Sat Nov 5 2005 Dave Jones -- Fix FPU corruption on return from S3. (#140257) -- Fix up DMI usage in i8k driver. +* Sat Nov 05 2005 David Woodhouse +- Attempt ppc smp build again -* Sat Nov 5 2005 Dave Jones [2.6.14-1.1636_FC4] -- Increase firmware loader timeout. +* Sat Nov 05 2005 Dave Jones +- Add another IBM Thinkpad to the Radeon whitelist. -* Fri Nov 4 2005 Dave Jones -- Stop kauditd from preventing suspend. +* Sat Nov 05 2005 David Woodhouse +- 2.6.14-git8 +- Fix i8259 cascade initialisation in arch/powerpc +- disable ppc smp build for now -* Thu Nov 3 2005 Dave Jones [2.6.14-1.1634_FC4] -- Fix zero-length packet reception, which broke bind. +* Fri Nov 04 2005 Dave Jones +- Own /lib/modules//{extra,updates} (#172075) +- 2.6.14-git7 -* Sat Oct 29 2005 Dave Jones -- Disable deprecation warning in PCMCIA ioctl. +* Thu Nov 03 2005 Dave Jones +- prereq new kudzu. (Should fix upgrades for mptfusion users) +- 2.6.14-git6 +- Copy all Makefiles to -devel packages. + +* Wed Nov 02 2005 David Woodhouse +- Switch ppc64 and ppc kernels to arch/powerpc +- Add nvram driver back again +- Fix ppc32 initrd with arch/powerpc + +* Wed Nov 02 2005 David Woodhouse +- 2.6.14-git5 +- Fix up PPC configs in preparation for using arch/powerpc +- Prevent kauditd from aborting suspend + +* Sun Oct 30 2005 Dave Jones +- 2.6.14-git2 * Thu Oct 27 2005 Dave Jones -- Rebase to 2.6.14 +- 2.6.14 + +* Thu Oct 27 2005 Dave Jones +- 2.6.14-rc5-git7 + +* Wed Oct 26 2005 Dave Jones +- 2.6.14-rc5-git6 +- Disable CONFIG_OPTIMIZE_FOR_SIZE again + It seems to break booting randomly on x86-64 among other things. + +* Tue Oct 25 2005 Dave Jones +- 2.6.14-rc5-git5 + +* Mon Oct 24 2005 Dave Jones +- 2.6.14-rc5-git4 +- Fix up maestro driver hang at init. (#134507) + +* Mon Oct 24 2005 Dave Jones +- 2.6.14-rc5-git3 + +* Sat Oct 22 2005 Dave Jones +- 2.6.14-rc5-git2 + +* Sat Oct 22 2005 Dave Jones +- 2.6.14-rc5-git1 + +* Thu Oct 20 2005 Dave Jones +- 2.6.14-rc5 +- Aparently the ipw2200 drivers need 2.2 of the firmware right now. +- Fix autofs4 looking up wrong path element when ghosting is enabled. -* Wed Oct 19 2005 Dave Jones [2.6.13-1.1532_FC4] -- Fix CAN-2005-2973 (ipv6 infinite loop) -- Disable ACPI burst again, it's still problematic. -- Update to the final upstream variant of the IDE/SATA fix. +* Thu Oct 20 2005 David Woodhouse +- Bring forward 8250 OpenFirmware probe patch from FC4. -* Sun Oct 16 2005 Dave Jones [2.6.13-1.1531_FC4] +* Tue Oct 18 2005 Dave Jones +- 2.6.14-rc4-git6 + +* Mon Oct 17 2005 Dave Jones +- 2.6.14-rc4-git5 + +* Sun Oct 16 2005 Dave Jones +- Enable ACPI EC Burst. +- Change printk level of an ACPI message. - Stop IDE claiming legacy ports before libata in combined mode. -* Sun Oct 16 2005 Dave Jones [2.6.13-1.1530_FC4] -- Enable ACPI EC burst. -- Reenable change of timesource default. +* Sat Oct 15 2005 Dave Jones +- 2.6.14-rc4-git4 + +* Fri Oct 14 2005 Dave Jones +- 2.6.14-rc4-git3 + +* Thu Oct 13 2005 Dave Jones +- 2.6.14-rc4-git2 + +* Wed Oct 12 2005 Dave Jones +- 2.6.14-rc4-git1 -* Tue Oct 11 2005 Dave Jones [2.6.13-1.1529_FC4] -- 2.6.13.4 +* Tue Oct 11 2005 Dave Jones +- 2.6.14-rc4 + +* Fri Oct 07 2005 Dave Jones +- 2.6.14-rc3-git7 + +* Thu Oct 06 2005 Dave Jones +- 2.6.14-rc3-git6 * Thu Oct 06 2005 Dave Jones -- Fix information leak in orinoco driver. +- fix suspend to sbp devices. (#166452) * Wed Oct 05 2005 Dave Jones -- Further fixing to the 8139too suspend/resume problem. +- 2.6.14-rc3-git5 -* Mon Oct 03 2005 Dave Jones [2.6.13-1.1528_FC4] -- 2.6.13.3 +* Tue Oct 04 2005 Dave Jones +- 2.6.14-rc3-git4 +- canonicalise getxattr results. + +* Mon Oct 03 2005 Dave Jones +- silence silly debug message in cx88. (#168931) +- bring back ac97 sliders on emu10k1 +- 2.6.14-rc3-git3 -* Sun Oct 02 2005 Dave Jones [2.6.13-1.1527_FC4] -- Disable debug messages in w83781d sensor driver. (#169695) -- Re-add a bunch of patches that got accidentally dropped in last update. - - Fix suspend/resume with 8139too - - Fix usbhid/wireless security lock clash (#147479) - - Missing check condition in ide scsi (#160868) - - Fix nosense error with transcend usb keys (#162559) - - Fix sk98lin vpd problem. (#136158) -- Fix IDE floppy eject. (#158548) +* Sun Oct 02 2005 Dave Jones +- 2.6.14-rc3-git1 * Fri Sep 30 2005 Dave Jones -- irda-driver smsc-ircc2 needs pnp-functionality. (#153970) -- Reenable /proc/acpi/sleep (#169650) -- Silence some selinux messages. (#167852) - -* Wed Sep 28 2005 Dave Jones [2.6.13-1.1526_FC4] -- Fix boot-hang with serverworks AGP. (#154673) -- Fix off by one in pcmcia port reservation. -- Power up pwc cams by default. (#140258) -- Silence silly debug msg in w1 driver. (#167403) -- Don't abort module loading if passed unknown params. +- 2.6.14-rc3 +- fix eject on ide-floppy. (#158548) +- 2.6.14-rc2-git8 + +* Thu Sep 29 2005 Dave Jones +- 2.6.14-rc2-git7 +- Fix up module aliases for firedire. (#134047) +- rebuild. + +* Wed Sep 28 2005 Dave Jones +- Package ppc32 includes in ppc64 headers too. (#147724) +- Add another Thinkpad to the radeon backlight dmi list. (#168156) + +* Tue Sep 27 2005 Dave Jones +- Fix typo in previous knfsd patch. * Mon Sep 26 2005 Dave Jones -- Fix asm-x86_64 dependancy on asm-i386. (#150266) +- 2.6.14-rc2-git6 + +* Mon Sep 26 2005 Dave Jones +- 2.6.14-rc2-git5 + +* Sat Sep 24 2005 Dave Jones +- 2.6.14-rc2-git4 +- kNFSD: fixed '-p port' arg to rpc.nfsd and enables the + defining proto versions and transports * Fri Sep 23 2005 Dave Jones +- 2.6.14-rc2-git3 - Add another Radeon to the power saving backlight patch. (#165297) +- Enable UP APIC support, but disable by default. + +* Thu Sep 22 2005 Dave Jones +- 2.6.14-rc2-git2 + +* Thu Sep 22 2005 Dave Jones +- Reset some conflicts: to earlier revisions. + +* Thu Sep 22 2005 David Woodhouse +- Fix G5 boot by avoiding EEH checks + +* Wed Sep 21 2005 Dave Jones +- 2.6.14-rc2-git1 + +* Wed Sep 21 2005 Dave Jones +- 2.6.14-rc2 + +* Wed Sep 21 2005 David Woodhouse +- Fix zImage.stub build, but then disable it anyway since we don't need + it any more -- the stub is built as part of ppc64-utils instead. + +* Mon Sep 19 2005 David Woodhouse +- Add asm-powerpc directory, DVB include files from drivers/media/dvb/ + +* Sun Sep 18 2005 Dave Jones +- 2.6.14-rc1-git4 + +* Fri Sep 16 2005 Dave Jones +- 2.6.14-rc1-git3 + +* Fri Sep 16 2005 Dave Jones +- 2.6.14-rc1-git2 + +* Wed Sep 14 2005 Dave Jones +- Fix bug in mm/slab.c (#168258) + +* Tue Sep 13 2005 Dave Jones +- 2.6.14-rc1 +- Reenable fixed version of the execshield vdso patch. + +* Mon Sep 12 2005 Dave Jones +- 2.6.13-git12 + +* Sat Sep 10 2005 Dave Jones +- 2.6.13-git10 + +* Fri Sep 09 2005 Dave Jones +- 2.6.13-git9 + +* Thu Sep 08 2005 Dave Jones +- 2.6.13-git8 + +* Wed Sep 07 2005 Dave Jones +- 2.6.13-git7 + +* Tue Sep 06 2005 Dave Jones +- 2.6.13-git6 + +* Mon Sep 05 2005 Dave Jones +- 2.6.13-git5 + +* Sun Sep 04 2005 Dave Jones +- 2.6.13-git4 + +* Fri Sep 02 2005 Dave Jones +- 2.6.13-git3. + (For real this time, the last two builds didn't really rebase). + - Tux & Xen currently disabled. + - ipw2100/ipw2200 drivers are now upstream. +- "The yellow dart" strikes again. Kexec based kdump support. -* Fri Sep 23 2005 Dave Jones [2.6.13-1.1525_FC4] -- Fix some emu10k1/ac97 bugs. (#169152) -- Fix aic7xxx issue with >4GB. (#167049) +* Wed Aug 31 2005 Dave Jones +- 2.6.13-git2 -* Tue Sep 20 2005 Dave Jones -- 2.6.13.2 +* Tue Aug 30 2005 Dave Jones +- 2.6.13-git1 * Sun Aug 28 2005 Dave Jones - 2.6.13 final. linux-2.6-NFSD-ctlbits.patch: fs/nfsd/nfs4state.c | 3 ++ fs/nfsd/nfsctl.c | 59 +++++++++++++++++++++++++++++++++++++++++++ fs/nfsd/nfssvc.c | 10 +++++-- include/linux/nfsd/syscall.h | 14 ++++++++-- 4 files changed, 82 insertions(+), 4 deletions(-) Index: linux-2.6-NFSD-ctlbits.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-NFSD-ctlbits.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-NFSD-ctlbits.patch 28 Oct 2005 05:23:06 -0000 1.1 +++ linux-2.6-NFSD-ctlbits.patch 6 Jan 2006 05:42:17 -0000 1.2 @@ -1,88 +1,41 @@ ---- linux-2.6.13/fs/nfsd/nfs4state.c.ctlbits 2005-09-23 11:47:27.817646000 -0400 -+++ linux-2.6.13/fs/nfsd/nfs4state.c 2005-09-23 11:47:40.413006000 -0400 -@@ -3319,6 +3319,9 @@ __nfs4_state_shutdown(void) - void - nfs4_state_shutdown(void) - { -+ if (!nfs4_init) -+ return; -+ - nfs4_lock_state(); - nfs4_release_reclaim(); - __nfs4_state_shutdown(); ---- linux-2.6.13/fs/nfsd/nfsctl.c.ctlbits 2005-08-28 19:41:01.000000000 -0400 -+++ linux-2.6.13/fs/nfsd/nfsctl.c 2005-09-23 11:47:40.419006000 -0400 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -35,6 +36,10 @@ +--- linux-2.6.14/fs/nfsd/nfsctl.c.aa1 2005-11-08 09:31:44.000000000 +0000 ++++ linux-2.6.14/fs/nfsd/nfsctl.c 2005-11-08 09:32:14.000000000 +0000 +@@ -36,7 +36,9 @@ #include +int nfsd_port = 2049; +unsigned int nfsd_portbits = 0; -+unsigned int nfsd_versbits = 0; -+ + unsigned int nfsd_versbits = ~0; + /* * We have a single directory with 9 nodes in it. - */ -@@ -51,6 +56,8 @@ enum { +@@ -53,6 +55,7 @@ enum { NFSD_Fh, NFSD_Threads, - NFSD_Leasetime, + NFSD_Versions, + NFSD_Ports, -+ NFSD_Versions, - NFSD_RecoveryDir, - }; - -@@ -67,6 +74,8 @@ static ssize_t write_getfs(struct file * + /* + * The below MUST come last. Otherwise we leave a hole in nfsd_files[] + * with !CONFIG_NFSD_V4 and simple_fill_super() goes oops +@@ -76,6 +73,7 @@ static ssize_t write_getfd(struct file * static ssize_t write_filehandle(struct file *file, char *buf, size_t size); static ssize_t write_threads(struct file *file, char *buf, size_t size); - static ssize_t write_leasetime(struct file *file, char *buf, size_t size); + static ssize_t write_versions(struct file *file, char *buf, size_t size); +static ssize_t write_ports(struct file *file, char *buf, size_t size); -+static ssize_t write_versions(struct file *file, char *buf, size_t size); + #ifdef CONFIG_NFSD_V4 + static ssize_t write_leasetime(struct file *file, char *buf, size_t size); static ssize_t write_recoverydir(struct file *file, char *buf, size_t size); - - static ssize_t (*write_op[])(struct file *, char *, size_t) = { -@@ -80,6 +89,8 @@ static ssize_t (*write_op[])(struct file +@@ -92,7 +88,8 @@ static ssize_t (*write_op[])(struct file + [NFSD_Getfs] = write_getfs, [NFSD_Fh] = write_filehandle, [NFSD_Threads] = write_threads, - [NFSD_Leasetime] = write_leasetime, + [NFSD_Versions] = write_versions, + [NFSD_Ports] = write_ports, -+ [NFSD_Versions] = write_versions, + #ifdef CONFIG_NFSD_V4 + [NFSD_Leasetime] = write_leasetime, [NFSD_RecoveryDir] = write_recoverydir, - }; - -@@ -88,14 +99,12 @@ static ssize_t nfsctl_transaction_write( - ino_t ino = file->f_dentry->d_inode->i_ino; - char *data; - ssize_t rv; -- - if (ino >= sizeof(write_op)/sizeof(write_op[0]) || !write_op[ino]) - return -EINVAL; - - data = simple_transaction_get(file, buf, size); - if (IS_ERR(data)) - return PTR_ERR(data); -- - rv = write_op[ino](file, data, size); - if (rv>0) { - simple_transaction_set(file, rv); -@@ -259,7 +268,7 @@ static ssize_t write_filehandle(struct f - * qword quoting is used, so filehandle will be \x.... - */ - char *dname, *path; -- int maxsize; -+ int maxsize = 0; - char *mesg = buf; - int len; - struct auth_domain *dom; -@@ -328,6 +337,102 @@ static ssize_t write_threads(struct file +@@ -358,7 +351,60 @@ static ssize_t write_threads(struct file sprintf(buf, "%d\n", nfsd_nrthreads()); return strlen(buf); } @@ -100,7 +53,7 @@ + if (buf[size-1] != '\n') + return -EINVAL; + buf[size-1] = 0; -+ + + family = mesg; + len = qword_get(&mesg, family, size); + if (len <= 0) return -EINVAL; @@ -140,145 +93,52 @@ + + return tlen; +} -+static ssize_t write_versions(struct file *file, char *buf, size_t size) -+{ -+ /* -+ * Format: -+ * [-/+]vers [-/+]vers ... -+ */ -+ char *mesg = buf; -+ char *vers, sign; -+ int len, num; -+ ssize_t tlen = 0; -+ -+ if (buf[size-1] != '\n') -+ return -EINVAL; -+ buf[size-1] = 0; -+ -+ vers = mesg; -+ len = qword_get(&mesg, vers, size); -+ if (len <= 0) return -EINVAL; -+ do { -+ sign = *vers; -+ if (sign == '+' || sign == '-') -+ num = simple_strtol((vers+1), NULL, 0); -+ else -+ num = simple_strtol(vers, NULL, 0); -+ switch(num) { -+ case 2: -+ case 3: -+ case 4: -+ if (sign != '-') -+ NFSCTL_VERSET(nfsd_versbits, num); -+ else -+ NFSCTL_VERUNSET(nfsd_versbits, num); -+ break; -+ default: -+ return -EINVAL; -+ } -+ vers += len + 1; -+ tlen += len; -+ } while ((len = qword_get(&mesg, vers, size)) > 0); -+ -+ return tlen; -+} - - extern time_t nfs4_leasetime(void); - -@@ -393,6 +498,8 @@ static int nfsd_fill_super(struct super_ + static ssize_t write_versions(struct file *file, char *buf, size_t size) + { + /* +@@ -484,6 +508,7 @@ static int nfsd_fill_super(struct super_ + [NFSD_Fh] = {"filehandle", &transaction_ops, S_IWUSR|S_IRUSR}, + [NFSD_Threads] = {"threads", &transaction_ops, S_IWUSR|S_IRUSR}, + [NFSD_Versions] = {"versions", &transaction_ops, S_IWUSR|S_IRUSR}, ++ [NFSD_Ports] = {"ports", &transaction_ops, S_IWUSR|S_IRUSR}, + #ifdef CONFIG_NFSD_V4 [NFSD_Leasetime] = {"nfsv4leasetime", &transaction_ops, S_IWUSR|S_IRUSR}, [NFSD_RecoveryDir] = {"nfsv4recoverydir", &transaction_ops, S_IWUSR|S_IRUSR}, - #endif -+ [NFSD_Ports] = {"ports", &transaction_ops, S_IWUSR|S_IRUSR}, -+ [NFSD_Versions] = {"versions", &transaction_ops, S_IWUSR|S_IRUSR}, - /* last one */ {""} - }; - return simple_fill_super(sb, 0x6e667364, nfsd_files); ---- linux-2.6.13/fs/nfsd/nfssvc.c.ctlbits 2005-08-28 19:41:01.000000000 -0400 -+++ linux-2.6.13/fs/nfsd/nfssvc.c 2005-09-27 09:04:40.273630000 -0400 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -63,6 +64,33 @@ struct nfsd_list { +--- linux-2.6.14/fs/nfsd/nfs4state.c.aa1 2005-11-08 09:31:51.000000000 +0000 ++++ linux-2.6.14/fs/nfsd/nfs4state.c 2005-11-08 09:32:14.000000000 +0000 +@@ -3319,6 +3319,9 @@ __nfs4_state_shutdown(void) + void + nfs4_state_shutdown(void) + { ++ if (!nfs4_init) ++ return; ++ + nfs4_lock_state(); + nfs4_release_reclaim(); + __nfs4_state_shutdown(); +--- linux-2.6.14/fs/nfsd/nfssvc.c.aa1 2005-11-08 09:31:44.000000000 +0000 ++++ linux-2.6.14/fs/nfsd/nfssvc.c 2005-11-08 09:32:14.000000000 +0000 +@@ -64,6 +64,8 @@ struct nfsd_list { }; static struct list_head nfsd_list = LIST_HEAD_INIT(nfsd_list); +extern struct svc_version nfsd_version2, nfsd_version3, nfsd_version4; + -+static struct svc_version * nfsd_version[] = { -+ [2] = &nfsd_version2, -+#if defined(CONFIG_NFSD_V3) -+ [3] = &nfsd_version3, -+#endif -+#if defined(CONFIG_NFSD_V4) -+ [4] = &nfsd_version4, -+#endif -+}; -+ -+#define NFSD_MINVERS 2 -+#define NFSD_NRVERS (sizeof(nfsd_version)/sizeof(nfsd_version[0])) -+static struct svc_version *nfsd_versions[NFSD_NRVERS]; -+ -+struct svc_program nfsd_program = { -+ .pg_prog = NFS_PROGRAM, /* program number */ -+ .pg_nvers = NFSD_NRVERS, /* nr of entries in nfsd_version */ -+ .pg_vers = nfsd_versions, /* version table */ -+ .pg_name = "nfsd", /* program name */ -+ .pg_class = "nfsd", /* authentication class */ -+ .pg_stats = &nfsd_svcstats, /* version table */ -+ .pg_authenticate = &svc_set_client, /* export authentication */ -+ -+}; -+ - /* - * Maximum number of nfsd processes - */ -@@ -80,17 +108,37 @@ int - nfsd_svc(unsigned short port, int nrservs) - { - int error; -- int none_left; -+ int none_left, found_one, i; + static struct svc_version * nfsd_version[] = { + [2] = &nfsd_version2, + #if defined(CONFIG_NFSD_V3) +@@ -110,8 +112,8 @@ nfsd_svc(unsigned short port, int nrserv struct list_head *victim; lock_kernel(); -- dprintk("nfsd: creating service\n"); +- dprintk("nfsd: creating service: vers 0x%x\n", +- nfsd_versbits); + dprintk("nfsd: creating service: port %d vers 0x%x proto 0x%x\n", + nfsd_port, nfsd_versbits, nfsd_portbits); error = -EINVAL; if (nrservs <= 0) nrservs = 0; - if (nrservs > NFSD_MAXSERVS) - nrservs = NFSD_MAXSERVS; - -+ /* -+ * If set, use the nfsd_ctlbits to define which -+ * versions that will be advertised -+ */ -+ found_one = 0; -+ if (nfsd_versbits) { -+ for (i = NFSD_MINVERS; i < NFSD_NRVERS; i++) { -+ if (NFSCTL_VERISSET(nfsd_versbits, i)) { -+ nfsd_program.pg_vers[i] = nfsd_version[i]; -+ found_one = 1; -+ } else -+ nfsd_program.pg_vers[i] = NULL; -+ } -+ } -+ if (!found_one) { -+ for (i = NFSD_MINVERS; i < NFSD_NRVERS; i++) -+ nfsd_program.pg_vers[i] = nfsd_version[i]; -+ } -+ - /* Readahead param cache - will no-op if it already exists */ - error = nfsd_racache_init(2*nrservs); - if (error<0) -@@ -104,11 +152,14 @@ nfsd_svc(unsigned short port, int nrserv +@@ -126,11 +147,15 @@ nfsd_svc(unsigned short port, int nrserv nfsd_serv = svc_create(&nfsd_program, NFSD_BUFSIZE); if (nfsd_serv == NULL) goto out; @@ -287,54 +147,33 @@ error = svc_makesock(nfsd_serv, IPPROTO_UDP, port); if (error < 0) goto failure; -- + #ifdef CONFIG_NFSD_TCP + if (NFSCTL_TCPISSET(nfsd_portbits)) + port = nfsd_port; error = svc_makesock(nfsd_serv, IPPROTO_TCP, port); if (error < 0) goto failure; -@@ -389,28 +440,3 @@ static struct svc_stat nfsd_acl_svcstats - #else - #define nfsd_acl_program_p NULL - #endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */ -- --extern struct svc_version nfsd_version2, nfsd_version3, nfsd_version4; -- --static struct svc_version * nfsd_version[] = { -- [2] = &nfsd_version2, --#if defined(CONFIG_NFSD_V3) -- [3] = &nfsd_version3, --#endif --#if defined(CONFIG_NFSD_V4) -- [4] = &nfsd_version4, --#endif --}; -- --#define NFSD_NRVERS (sizeof(nfsd_version)/sizeof(nfsd_version[0])) --struct svc_program nfsd_program = { -- .pg_next = nfsd_acl_program_p, -- .pg_prog = NFS_PROGRAM, /* program number */ -- .pg_nvers = NFSD_NRVERS, /* nr of entries in nfsd_version */ -- .pg_vers = nfsd_version, /* version table */ -- .pg_name = "nfsd", /* program name */ -- .pg_class = "nfsd", /* authentication class */ -- .pg_stats = &nfsd_svcstats, /* version table */ -- .pg_authenticate = &svc_set_client, /* export authentication */ -- --}; ---- linux-2.6.13/include/linux/nfsd/syscall.h.ctlbits 2005-08-28 19:41:01.000000000 -0400 -+++ linux-2.6.13/include/linux/nfsd/syscall.h 2005-09-23 11:47:40.430008000 -0400 -@@ -39,6 +39,22 @@ - #define NFSCTL_GETFD 7 /* get an fh by path (used by mountd) */ +--- linux-2.6.14/include/linux/nfsd/syscall.h.aa1 2005-11-08 09:31:44.000000000 +0000 ++++ linux-2.6.14/include/linux/nfsd/syscall.h 2005-11-08 09:32:14.000000000 +0000 +@@ -40,19 +40,28 @@ #define NFSCTL_GETFS 8 /* get an fh by path with max FH len */ -+/* + /* +- * Macros used to set version + * Macros used to set version and protocol -+ */ -+#define NFSCTL_VERSET(_cltbits, _v) ((_cltbits) |= (1 << ((_v) - 1))) -+#define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << ((_v) - 1))) -+#define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << ((_v) - 1))) + */ + #define NFSCTL_VERSET(_cltbits, _v) ((_cltbits) |= (1 << (_v))) + #define NFSCTL_VERUNSET(_cltbits, _v) ((_cltbits) &= ~(1 << (_v))) + #define NFSCTL_VERISSET(_cltbits, _v) ((_cltbits) & (1 << (_v))) + + #if defined(CONFIG_NFSD_V4) + #define NFSCTL_VERALL (0x1c /* 0b011100 */) + #elif defined(CONFIG_NFSD_V3) + #define NFSCTL_VERALL (0x0c /* 0b001100 */) + #else + #define NFSCTL_VERALL (0x04 /* 0b000100 */) + #endif + +#define NFSCTL_UDPSET(_cltbits) ((_cltbits) |= (1 << (17 - 1))) +#define NFSCTL_UDPUNSET(_cltbits) ((_cltbits) &= ~(1 << (17 - 1))) @@ -344,17 +183,16 @@ +#define NFSCTL_TCPUNSET(_cltbits) ((_cltbits) &= ~(1 << (18 - 1))) +#define NFSCTL_TCPISSET(_cltbits) ((_cltbits) & (1 << (18 - 1))) + -+ + /* SVC */ struct nfsctl_svc { - unsigned short svc_port; -@@ -120,6 +136,9 @@ extern int exp_delclient(struct nfsctl_ +@@ -135,7 +136,8 @@ extern int exp_delclient(struct nfsctl_ extern int exp_export(struct nfsctl_export *nxp); extern int exp_unexport(struct nfsctl_export *nxp); +-extern unsigned int nfsd_versbits; +extern int nfsd_port; +extern unsigned int nfsd_versbits, nfsd_portbits; -+ + #endif /* __KERNEL__ */ - #endif /* NFSD_SYSCALL_H */ linux-2.6-build-nonintconfig.patch: linux-2.6.14/scripts/kconfig/confdata.c | 8 +++----- linux-800/scripts/kconfig/Makefile | 4 ++++ linux-800/scripts/kconfig/conf.c | 26 +++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 8 deletions(-) Index: linux-2.6-build-nonintconfig.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-build-nonintconfig.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-build-nonintconfig.patch 28 Oct 2005 05:23:06 -0000 1.3 +++ linux-2.6-build-nonintconfig.patch 6 Jan 2006 05:42:17 -0000 1.4 @@ -99,23 +99,52 @@ .PHONY: randconfig allyesconfig allnoconfig allmodconfig defconfig randconfig: $(obj)/conf ---- linux-2.6.12/scripts/kconfig/confdata.c~ 2005-06-22 13:17:13.000000000 -0400 -+++ linux-2.6.12/scripts/kconfig/confdata.c 2005-06-22 13:17:23.000000000 -0400 -@@ -129,7 +129,7 @@ int conf_read(const char *name) +--- linux-2.6.14/scripts/kconfig/confdata.c~ 2005-11-10 14:55:46.000000000 -0500 ++++ linux-2.6.14/scripts/kconfig/confdata.c 2005-11-10 14:56:01.000000000 -0500 +@@ -149,7 +149,7 @@ int conf_read_simple(const char *name) continue; sym = sym_find(line + 9); if (!sym) { -- fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 9); -+ //fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 9); +- conf_warning("trying to assign nonexistent symbol %s", line + 9); ++ //conf_warning("trying to assign nonexistent symbol %s", line + 9); break; - } - switch (sym->type) { -@@ -154,7 +154,7 @@ int conf_read(const char *name) + } else if (!(sym->flags & SYMBOL_NEW)) { + conf_warning("trying to reassign symbol %s", sym->name); +@@ -179,7 +179,7 @@ int conf_read_simple(const char *name) *p2 = 0; sym = sym_find(line + 7); if (!sym) { -- fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 7); -+ //fprintf(stderr, "%s:%d: trying to assign nonexistent symbol %s\n", name, lineno, line + 7); +- conf_warning("trying to assign nonexistent symbol %s", line + 7); ++ //conf_warning("trying to assign nonexistent symbol %s", line + 7); break; + } else if (!(sym->flags & SYMBOL_NEW)) { + conf_warning("trying to reassign symbol %s", sym->name); +--- linux-2.6.14/scripts/kconfig/confdata.c~ 2005-11-15 23:51:37.000000000 -0500 ++++ linux-2.6.14/scripts/kconfig/confdata.c 2005-11-15 23:52:50.000000000 -0500 +@@ -153,7 +153,6 @@ int conf_read_simple(const char *name) + break; + } else if (!(sym->flags & SYMBOL_NEW)) { + conf_warning("trying to reassign symbol %s", sym->name); +- break; } switch (sym->type) { + case S_BOOLEAN: +@@ -183,7 +182,6 @@ int conf_read_simple(const char *name) + break; + } else if (!(sym->flags & SYMBOL_NEW)) { + conf_warning("trying to reassign symbol %s", sym->name); +- break; + } + switch (sym->type) { + case S_TRISTATE: +--- linux-2.6.14/scripts/kconfig/confdata.c~ 2005-11-16 00:06:16.000000000 -0500 ++++ linux-2.6.14/scripts/kconfig/confdata.c 2005-11-16 00:06:40.000000000 -0500 +@@ -254,7 +254,7 @@ int conf_read_simple(const char *name) + cs->flags |= SYMBOL_NEW; + } else + cs->user.val = sym; +- break; ++ //break; + } + cs->user.tri = E_OR(cs->user.tri, sym->user.tri); + } linux-2.6-build-userspace-headers-warning.patch: linux-10000/include/linux/config.h | 4 +++- linux-10001/include/linux/config.h | 2 +- linux-2.6.13/arch/powerpc/boot/main.c | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) Index: linux-2.6-build-userspace-headers-warning.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-build-userspace-headers-warning.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-build-userspace-headers-warning.patch 28 Oct 2005 05:23:06 -0000 1.3 +++ linux-2.6-build-userspace-headers-warning.patch 6 Jan 2006 05:42:17 -0000 1.4 @@ -22,8 +22,8 @@ make[1]: *** [arch/ppc64/boot/main.o] Error 1 make[1]: *** Waiting for unfinished jobs.... ---- linux-2.6.13/arch/ppc64/boot/main.c~ 2005-09-04 16:45:23.000000000 -0400 -+++ linux-2.6.13/arch/ppc64/boot/main.c 2005-09-04 16:45:28.000000000 -0400 +--- linux-2.6.13/arch/powerpc/boot/main.c~ 2005-09-04 16:45:23.000000000 -0400 ++++ linux-2.6.13/arch/powerpc/boot/main.c 2005-09-04 16:45:28.000000000 -0400 @@ -8,6 +8,9 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. linux-2.6-bzimage.patch: linux-400/arch/ia64/Makefile | 4 ++++ linux-500/arch/s390/Makefile | 5 +++++ linux-600/arch/sparc/Makefile | 3 +++ linux-600/arch/sparc64/Makefile | 3 +++ 4 files changed, 15 insertions(+) Index: linux-2.6-bzimage.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-bzimage.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-bzimage.patch 28 Oct 2005 05:23:06 -0000 1.3 +++ linux-2.6-bzimage.patch 6 Jan 2006 05:42:17 -0000 1.4 @@ -2,40 +2,6 @@ so that every arch understands bzImage ---- linux-2.6.13/arch/ppc64/boot/Makefile~ 2005-09-10 18:01:04.000000000 -0400 -+++ linux-2.6.13/arch/ppc64/boot/Makefile 2005-09-10 18:01:21.000000000 -0400 -@@ -114,6 +114,9 @@ $(obj)/zImage: $(obj)/zImage.vmode $(obj - @cp -f $< $@ - $(call if_changed,addnote) - -+$(obj)/zImage.stub: $(obj-boot) FORCE -+ $(call cmd,bootld,$(obj-boot)) -+ - $(obj)/zImage.initrd: $(obj)/zImage.initrd.vmode $(obj)/addnote FORCE - @cp -f $< $@ - $(call if_changed,addnote) ---- linux-2.6.13/arch/ppc64/Makefile~ 2005-09-10 18:01:31.000000000 -0400 -+++ linux-2.6.13/arch/ppc64/Makefile 2005-09-10 18:01:45.000000000 -0400 -@@ -89,7 +89,7 @@ drivers-$(CONFIG_OPROFILE) += arch/ppc64 - - boot := arch/ppc64/boot - --boottargets-$(CONFIG_PPC_PSERIES) += zImage zImage.initrd -+boottargets-$(CONFIG_PPC_PSERIES) += zImage zImage.initrd zImage.stub - boottargets-$(CONFIG_PPC_PMAC) += zImage.vmode zImage.initrd.vmode - boottargets-$(CONFIG_PPC_MAPLE) += zImage zImage.initrd - boottargets-$(CONFIG_PPC_ISERIES) += vmlinux.sminitrd vmlinux.initrd vmlinux.sm -diff -urNp --exclude-from=/home/davej/.exclude linux-10000/arch/ppc/Makefile linux-10001/arch/ppc/Makefile ---- linux-10000/arch/ppc/Makefile -+++ linux-10001/arch/ppc/Makefile -@@ -78,6 +78,7 @@ CPPFLAGS_vmlinux.lds := -Upowerpc - - # All the instructions talk about "make bzImage". - bzImage: zImage -+ cp vmlinux arch/ppc/boot/bzImage - - boot := arch/$(ARCH)/boot - diff -urNp --exclude-from=/home/davej/.exclude linux-400/arch/s390/Makefile linux-500/arch/s390/Makefile --- linux-400/arch/s390/Makefile +++ linux-500/arch/s390/Makefile linux-2.6-compile-fixes.patch: 0 files changed Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-compile-fixes.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-compile-fixes.patch 10 Dec 2005 05:42:03 -0000 1.6 +++ linux-2.6-compile-fixes.patch 6 Jan 2006 05:42:17 -0000 1.7 @@ -1,11 +0,0 @@ ---- linux-2.6.14/include/linux/parport_pc.h~ 2005-12-10 00:26:42.000000000 -0500 -+++ linux-2.6.14/include/linux/parport_pc.h 2005-12-10 00:38:57.000000000 -0500 -@@ -86,7 +86,7 @@ extern __inline__ void dump_parport_stat - unsigned char dcr = inb (CONTROL (p)); - unsigned char dsr = inb (STATUS (p)); - static char *ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"}; -- const struct parport_pc_private *priv = (parport_pc_private *)p->physport->private_data; -+ const struct parport_pc_private *priv = p->physport->private_data; - int i; - - printk (KERN_DEBUG "*** parport state (%s): ecr=[%s", str, ecr_modes[(ecr & 0xe0) >> 5]); linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/i386/mm/pgtable.c | 3 linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 13 + linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 32 files changed, 963 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-crashdump-common.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-crashdump-common.patch 28 Oct 2005 05:23:06 -0000 1.5 +++ linux-2.6-crashdump-common.patch 6 Jan 2006 05:42:17 -0000 1.6 @@ -103,13 +103,13 @@ + +#endif /* _ASM_IA64_CRASHDUMP_H */ --- /dev/null 2005-08-18 08:15:49.820487896 -0400 -+++ linux-2.6.12/include/asm-ppc64/crashdump.h 2005-08-18 14:23:59.000000000 -0400 ++++ linux-2.6.12/include/asm-powerpc/crashdump.h 2005-08-18 14:23:59.000000000 -0400 @@ -0,0 +1,61 @@ -+#ifndef _ASM_PPC64_CRASHDUMP_H -+#define _ASM_PPC64_CRASHDUMP_H ++#ifndef _ASM_POWERPC_CRASHDUMP_H ++#define _ASM_POWERPC_CRASHDUMP_H + +/* -+ * linux/include/asm-ppc64/crashdump.h ++ * linux/include/asm-powerpc/crashdump.h + * + * Copyright (c) 2003, 2004 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004 IBM Corp. @@ -165,7 +165,7 @@ + +#endif /* __KERNEL__ */ + -+#endif /* _ASM_PPC64_CRASHDUMP_H */ ++#endif /* _ASM_POWERPC_CRASHDUMP_H */ --- /dev/null 2005-08-18 08:15:49.820487896 -0400 +++ linux-2.6.12/include/asm-x86_64/crashdump.h 2005-08-18 14:23:59.000000000 -0400 @@ -0,0 +1,86 @@ @@ -962,14 +962,6 @@ --- linux-2.6.12/arch/x86_64/mm/init.c.orig 2005-08-18 12:41:25.000000000 -0400 +++ linux-2.6.12/arch/x86_64/mm/init.c 2005-08-18 14:23:59.000000000 -0400 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - #include @@ -85,6 +86,8 @@ printk("%d pages swap cached\n",cached); } @@ -1286,17 +1278,9 @@ bust_spinlocks(0); die.lock_owner = -1; spin_unlock_irq(&die.lock); ---- linux-2.6.12/arch/ppc64/mm/init.c.orig 2005-08-18 12:41:13.000000000 -0400 -+++ linux-2.6.12/arch/ppc64/mm/init.c 2005-08-18 14:23:59.000000000 -0400 -@@ -113,6 +113,7 @@ - printk("%ld pages shared\n", shared); - printk("%ld pages swap cached\n", cached); - } -+EXPORT_SYMBOL_GPL(show_mem); - - #ifdef CONFIG_PPC_ISERIES - -@@ -528,6 +529,34 @@ +--- linux-2.6.12/arch/powerpc/mm/mem.c.orig 2005-08-18 12:41:13.000000000 -0400 ++++ linux-2.6.12/arch/powerpc/mm/mem.c 2005-08-18 14:23:59.000000000 -0400 +@@ -89,6 +89,34 @@ } EXPORT_SYMBOL(page_is_ram); @@ -1328,21 +1312,29 @@ +} +EXPORT_SYMBOL_GPL(next_ram_page); + + pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, + unsigned long size, pgprot_t vma_prot) + { +@@ -216,6 +216,7 @@ + printk("%ld pages shared\n", shared); + printk("%ld pages swap cached\n", cached); + } ++EXPORT_SYMBOL_GPL(show_mem); + /* * Initialize the bootmem system and give it all the memory we - * have available. ---- linux-2.6.12/arch/ppc64/kernel/process.c.orig 2005-08-18 12:40:01.000000000 -0400 -+++ linux-2.6.12/arch/ppc64/kernel/process.c 2005-08-18 14:23:59.000000000 -0400 -@@ -257,6 +257,7 @@ - - printk("\n"); +--- linux-2.6.12/arch/powerpc/kernel/process.c.orig 2005-08-18 12:40:01.000000000 -0400 ++++ linux-2.6.12/arch/powerpc/kernel/process.c 2005-08-18 14:23:59.000000000 -0400 +@@ -444,6 +444,7 @@ + if (!user_mode(regs)) + show_instructions(regs); } +EXPORT_SYMBOL_GPL(show_regs); - void show_regs(struct pt_regs * regs) + void exit_thread(void) { ---- linux-2.6.12/arch/ppc64/kernel/traps.c.orig 2005-08-18 12:40:01.000000000 -0400 -+++ linux-2.6.12/arch/ppc64/kernel/traps.c 2005-08-18 14:23:59.000000000 -0400 +--- linux-2.6.12/arch/powerpc/kernel/traps.c.orig 2005-08-18 12:40:01.000000000 -0400 ++++ linux-2.6.12/arch/powerpc/kernel/traps.c 2005-08-18 14:23:59.000000000 -0400 @@ -135,6 +135,7 @@ printk("\n"); print_modules(); @@ -1352,11 +1344,39 @@ spin_unlock_irq(&die_lock); @@ -142,6 +143,8 @@ - panic("Fatal exception in interrupt"); if (panic_on_oops) { + #ifdef CONFIG_PPC64 + if (netdump_func) + netdump_func = NULL; printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); ssleep(5); - panic("Fatal exception"); + #endif + +--- linux-2.6.13/drivers/char/sysrq.c.orig ++++ linux-2.6.13/drivers/char/sysrq.c +@@ -95,12 +95,14 @@ static struct sysrq_key_op sysrq_unraw_o + }; + #endif /* CONFIG_VT */ + +-#ifdef CONFIG_KEXEC + /* crashdump sysrq handler */ + static void sysrq_handle_crashdump(int key, struct pt_regs *pt_regs, + struct tty_struct *tty) + { ++#ifdef CONFIG_KEXEC + crash_kexec(pt_regs); ++#endif ++ *( (char *) 0) = 0; + } + static struct sysrq_key_op sysrq_crashdump_op = { + .handler = sysrq_handle_crashdump, +@@ -108,7 +110,6 @@ static struct sysrq_key_op sysrq_crashdu + .action_msg = "Trigger a crashdump", + .enable_mask = SYSRQ_ENABLE_DUMP, + }; +-#endif + + /* reboot sysrq handler */ + static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs, + linux-2.6-crashdump-reboot-exports.patch: linux-2.6.12/arch/i386/kernel/process.c | 2 ++ linux-2.6.12/arch/i386/kernel/reboot.c | 4 ++++ linux-2.6.12/arch/powerpc/kernel/setup-common.c | 2 ++ linux-2.6.12/arch/powerpc/kernel/setup_64.c | 2 ++ linux-2.6.12/arch/s390/kernel/process.c | 2 ++ linux-2.6.12/arch/s390/kernel/setup.c | 4 ++++ linux-2.6.12/arch/x86_64/kernel/reboot.c | 4 ++++ linux-2.6.14/arch/ia64/kernel/process.c | 2 ++ 8 files changed, 22 insertions(+) Index: linux-2.6-crashdump-reboot-exports.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-crashdump-reboot-exports.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-crashdump-reboot-exports.patch 28 Oct 2005 05:23:06 -0000 1.5 +++ linux-2.6-crashdump-reboot-exports.patch 6 Jan 2006 05:42:17 -0000 1.6 @@ -28,27 +28,26 @@ void machine_power_off(void) { console_unblank(); ---- linux-2.6.12/arch/ia64/kernel/process.c.orig 2005-08-22 14:07:34.782386720 -0400 -+++ linux-2.6.12/arch/ia64/kernel/process.c 2005-08-22 14:07:36.013178773 -0400 -@@ -812,12 +812,16 @@ machine_restart (char *restart_cmd) +--- linux-2.6.14/arch/ia64/kernel/process.c~ 2005-11-11 12:58:33.000000000 -0500 ++++ linux-2.6.14/arch/ia64/kernel/process.c 2005-11-11 12:58:48.000000000 -0500 +@@ -820,6 +820,7 @@ machine_restart (char *restart_cmd) + (void) notify_die(DIE_MACHINE_RESTART, restart_cmd, NULL, 0, 0, 0); (*efi.reset_system)(EFI_RESET_WARM, 0, 0, NULL); } - +EXPORT_SYMBOL(machine_restart); -+ + void machine_halt (void) - { +@@ -827,6 +828,7 @@ machine_halt (void) + (void) notify_die(DIE_MACHINE_HALT, "", NULL, 0, 0, 0); cpu_halt(); } - +EXPORT_SYMBOL(machine_halt); -+ + void machine_power_off (void) - { ---- linux-2.6.12/arch/ppc64/kernel/setup.c.orig 2005-08-22 14:09:24.318964809 -0400 -+++ linux-2.6.12/arch/ppc64/kernel/setup.c 2005-08-22 14:09:43.133825875 -0400 +--- linux-2.6.12/arch/powerpc/kernel/setup-common.c.orig 2005-08-22 14:09:24.318964809 -0400 ++++ linux-2.6.12/arch/powerpc/kernel/setup-common.c 2005-08-22 14:09:43.133825875 -0400 @@ -695,6 +695,8 @@ void machine_restart(char *cmd) while (1) ; } @@ -58,6 +57,8 @@ void machine_power_off(void) { machine_shutdown(); +--- linux-2.6.12/arch/powerpc/kernel/setup_64.c.orig 2005-08-22 14:09:24.318964809 -0400 ++++ linux-2.6.12/arch/powerpc/kernel/setup_64.c 2005-08-22 14:09:43.133825875 -0400 @@ -720,6 +722,8 @@ void machine_halt(void) while (1) ; } linux-2.6-debug-spinlock-panic.patch: spinlock_debug.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletion(-) Index: linux-2.6-debug-spinlock-panic.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-spinlock-panic.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-debug-spinlock-panic.patch 28 Oct 2005 05:23:06 -0000 1.3 +++ linux-2.6-debug-spinlock-panic.patch 6 Jan 2006 05:42:17 -0000 1.4 @@ -6,9 +6,10 @@ --- linux-2.6.13/lib/spinlock_debug.c~ 2005-09-12 20:14:31.000000000 -0400 +++ linux-2.6.13/lib/spinlock_debug.c 2005-09-12 20:15:56.000000000 -0400 -@@ -11,6 +11,16 @@ +@@ -11,6 +11,17 @@ #include #include ++#include +int nopanic; +static int __init nopanic_setup(char *str) @@ -29,7 +30,7 @@ */ -// panic("bad locking"); + if (nopanic) -+ printk("Bad locking\n"); ++ printk("bad locking\n"); + else + panic("bad locking"); #endif linux-2.6-debug-spinlock-taint.patch: spinlock_debug.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) Index: linux-2.6-debug-spinlock-taint.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-spinlock-taint.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-debug-spinlock-taint.patch 28 Oct 2005 05:23:06 -0000 1.3 +++ linux-2.6-debug-spinlock-taint.patch 6 Jan 2006 05:42:17 -0000 1.4 @@ -1,62 +1,64 @@ Print info about tainting in the spinlock debug printks. ---- linux-2.6.13/lib/spinlock_debug.c~ 2005-09-12 20:10:31.000000000 -0400 -+++ linux-2.6.13/lib/spinlock_debug.c 2005-09-12 20:13:57.000000000 -0400 -@@ -19,8 +19,8 @@ static void spin_bug(spinlock_t *lock, c +--- linux-2.6.14/lib/spinlock_debug.c~ 2005-12-21 11:42:59.000000000 -0500 ++++ linux-2.6.14/lib/spinlock_debug.c 2005-12-21 11:44:12.000000000 -0500 +@@ -19,9 +19,9 @@ static void spin_bug(spinlock_t *lock, c if (xchg(&print_once, 0)) { if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT) owner = lock->owner; - printk("BUG: spinlock %s on CPU#%d, %s/%d\n", -- msg, smp_processor_id(), current->comm, current->pid); + printk("BUG: spinlock %s on CPU#%d, %s/%d (%s)\n", -+ msg, smp_processor_id(), current->comm, current->pid, print_tainted()); + msg, raw_smp_processor_id(), +- current->comm, current->pid); ++ current->comm, current->pid, print_tainted()); printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n", lock, lock->magic, owner ? owner->comm : "", -@@ -77,9 +77,9 @@ static void __spin_lock_debug(spinlock_t +@@ -78,9 +78,9 @@ static void __spin_lock_debug(spinlock_t /* lockup suspected: */ if (print_once) { print_once = 0; - printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n", + printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p (%s)\n", - smp_processor_id(), current->comm, current->pid, -- lock); -+ lock, print_tainted()); + raw_smp_processor_id(), current->comm, +- current->pid, lock); ++ current->pid, lock, print_tainted()); dump_stack(); } } -@@ -119,8 +119,8 @@ static void rwlock_bug(rwlock_t *lock, c +@@ -120,9 +120,9 @@ static void rwlock_bug(rwlock_t *lock, c static long print_once = 1; if (xchg(&print_once, 0)) { - printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg, -- smp_processor_id(), current->comm, current->pid, lock); + printk("BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n", msg, -+ smp_processor_id(), current->comm, current->pid, lock, print_tainted()); + raw_smp_processor_id(), current->comm, +- current->pid, lock); ++ current->pid, lock, print_tainted()); dump_stack(); #ifdef CONFIG_SMP /* -@@ -147,9 +147,9 @@ static void __read_lock_debug(rwlock_t * +@@ -149,9 +149,9 @@ static void __read_lock_debug(rwlock_t * /* lockup suspected: */ if (print_once) { print_once = 0; - printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n", + printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p (%s)\n", - smp_processor_id(), current->comm, current->pid, -- lock); -+ lock, print_tainted()); + raw_smp_processor_id(), current->comm, +- current->pid, lock); ++ current->pid, lock, print_tainted()); dump_stack(); } } -@@ -219,9 +219,9 @@ static void __write_lock_debug(rwlock_t +@@ -221,9 +221,9 @@ static void __write_lock_debug(rwlock_t /* lockup suspected: */ if (print_once) { print_once = 0; - printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n", + printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p (%s)\n", - smp_processor_id(), current->comm, current->pid, -- lock); -+ lock, print_tainted()); + raw_smp_processor_id(), current->comm, +- current->pid, lock); ++ current->pid, lock, print_tainted()); dump_stack(); } } linux-2.6-debug-taint-vm.patch: linux-2.6.11/include/asm-generic/bug.h | 8 ++++++-- linux-2.6.14/mm/page_alloc.c | 4 ++-- linux-2000/kernel/panic.c | 1 + linux-2000/mm/slab.c | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-debug-taint-vm.patch 28 Oct 2005 05:23:06 -0000 1.3 +++ linux-2.6-debug-taint-vm.patch 6 Jan 2006 05:42:17 -0000 1.4 @@ -36,16 +36,15 @@ void add_taint(unsigned flag) { -diff -urNp --exclude-from=/home/davej/.exclude linux-1740/mm/page_alloc.c linux-2000/mm/page_alloc.c ---- linux-1740/mm/page_alloc.c -+++ linux-2000/mm/page_alloc.c -@@ -97,9 +97,9 @@ static void bad_page(const char *functio +--- linux-2.6.14/mm/page_alloc.c~ 2005-11-15 12:09:41.000000000 -0500 ++++ linux-2.6.14/mm/page_alloc.c 2005-11-15 12:10:01.000000000 -0500 +@@ -126,9 +126,9 @@ static void bad_page(const char *functio { printk(KERN_EMERG "Bad page state at %s (in process '%s', page %p)\n", function, current->comm, page); - printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d\n", + printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n", - (int)(2*sizeof(page_flags_t)), (unsigned long)page->flags, + (int)(2*sizeof(unsigned long)), (unsigned long)page->flags, - page->mapping, page_mapcount(page), page_count(page)); + page->mapping, page_mapcount(page), page_count(page), print_tainted()); printk(KERN_EMERG "Backtrace:\n"); linux-2.6-devmem.patch: arch/powerpc/mm/mem.c | 14 +++ linux-1050/arch/i386/mm/init.c | 19 ++++ linux-1050/arch/ia64/mm/init.c | 7 + linux-1050/arch/s390/mm/init.c | 5 + linux-1050/arch/x86_64/mm/init.c | 20 ++++ linux-1050/drivers/char/mem.c | 146 ++++---------------------------- linux-1050/fs/proc/kcore.c | 2 linux-1050/include/asm-alpha/page.h | 1 linux-1050/include/asm-arm/page.h | 2 linux-1050/include/asm-arm26/page.h | 2 linux-1050/include/asm-cris/page.h | 2 linux-1050/include/asm-h8300/page.h | 2 linux-1050/include/asm-i386/page.h | 4 linux-1050/include/asm-ia64/page.h | 2 linux-1050/include/asm-m68k/page.h | 2 linux-1050/include/asm-m68knommu/page.h | 2 linux-1050/include/asm-mips/page.h | 2 linux-1050/include/asm-parisc/page.h | 2 linux-1050/include/asm-ppc/page.h | 2 linux-1050/include/asm-s390/page.h | 2 linux-1050/include/asm-sh/page.h | 2 linux-1050/include/asm-sh64/page.h | 2 linux-1050/include/asm-sparc/page.h | 2 linux-1050/include/asm-sparc64/page.h | 2 linux-1050/include/asm-um/page.h | 1 linux-1050/include/asm-v850/page.h | 2 linux-1050/include/asm-x86_64/page.h | 4 linux-2.6.13/arch/x86_64/mm/init.c | 22 ++++ linux-2.6.14/include/asm-powerpc/page.h | 2 29 files changed, 154 insertions(+), 125 deletions(-) Index: linux-2.6-devmem.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-devmem.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-devmem.patch 28 Oct 2005 05:23:06 -0000 1.1 +++ linux-2.6-devmem.patch 6 Jan 2006 05:42:17 -0000 1.2 @@ -45,12 +45,21 @@ * This installs a clean page in the kernel's page table. */ diff -urNp --exclude-from=/home/davej/.exclude linux-1020/arch/ppc64/mm/init.c linux-1050/arch/ppc64/mm/init.c ---- linux-1020/arch/ppc64/mm/init.c -+++ linux-1050/arch/ppc64/mm/init.c -@@ -722,6 +722,18 @@ void __init mem_init(void) +--- linux-1020/arch/powerpc/mm/mem.c ++++ linux-1050/arch/powerpc/mm/mem.c +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + #include + + #include "mmu_decl.h" +@@ -722,6 +722,19 @@ void __init mem_init(void) + max_mapnr = num_physpages; totalram_pages += free_all_bootmem(); #endif - ++ +#ifdef CONFIG_PPC_PSERIES + /* Mark the RTAS pages as PG_reserved so userspace can mmap them */ + if (rtas_rmo_buf) { @@ -468,17 +477,17 @@ + #endif /* __KERNEL__ */ #endif /* _PPC_PAGE_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-ppc64/page.h linux-1050/include/asm-ppc64/page.h ---- linux-1020/include/asm-ppc64/page.h -+++ linux-1050/include/asm-ppc64/page.h -@@ -257,5 +257,7 @@ extern u64 ppc64_pft_size; /* Log 2 of - #define VM_STACK_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +--- linux-2.6.14/include/asm-powerpc/page.h~ 2005-11-15 12:12:43.000000000 -0500 ++++ linux-2.6.14/include/asm-powerpc/page.h 2005-11-15 12:13:21.000000000 -0500 +@@ -174,6 +174,8 @@ extern int page_is_ram(unsigned long pfn + + #endif /* __ASSEMBLY__ */ +#define devmem_is_allowed(x) 1 + #endif /* __KERNEL__ */ - #endif /* _PPC64_PAGE_H */ + + #endif /* _ASM_POWERPC_PAGE_H */ diff -urNp --exclude-from=/home/davej/.exclude linux-1020/include/asm-s390/page.h linux-1050/include/asm-s390/page.h --- linux-1020/include/asm-s390/page.h +++ linux-1050/include/asm-s390/page.h linux-2.6-diskdump.patch: drivers/block/Kconfig | 5 drivers/block/Makefile | 1 drivers/block/diskdump.c | 1121 +++++++++++++++++++++++++++++++++++++++++ include/asm-generic/diskdump.h | 13 include/asm-i386/diskdump.h | 55 ++ include/asm-ia64/diskdump.h | 63 ++ include/asm-powerpc/diskdump.h | 55 ++ include/asm-ppc/diskdump.h | 6 include/asm-s390/diskdump.h | 6 include/asm-x86_64/diskdump.h | 44 + include/linux/diskdump.h | 186 ++++++ include/linux/interrupt.h | 4 include/linux/timer.h | 3 include/linux/workqueue.h | 3 kernel/softirq.c | 32 + kernel/timer.c | 44 + kernel/workqueue.c | 34 + 17 files changed, 1671 insertions(+), 4 deletions(-) Index: linux-2.6-diskdump.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-diskdump.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-diskdump.patch 28 Oct 2005 05:23:06 -0000 1.4 +++ linux-2.6-diskdump.patch 6 Jan 2006 05:42:17 -0000 1.5 @@ -125,7 +125,7 @@ +static asmlinkage void disk_dump(struct pt_regs *, void *); + + -+#if CONFIG_SMP ++#ifdef CONFIG_SMP +static void freeze_cpu(void *dummy) +{ + unsigned int cpu = smp_processor_id(); @@ -477,7 +477,7 @@ + +static void freeze_other_cpus(void) +{ -+#if CONFIG_SMP ++#ifdef CONFIG_SMP + int i; + + smp_call_function(freeze_cpu, NULL, 1, -1); @@ -1693,7 +1693,7 @@ + +#endif /* _ASM_GENERIC_DISKDUMP_H */ --- /dev/null 2005-07-20 12:00:41.186496416 -0400 -+++ linux-2.6.12/include/asm-ppc64/diskdump.h 2005-08-19 16:47:34.233260834 -0400 ++++ linux-2.6.12/include/asm-powerpc/diskdump.h 2005-08-19 16:47:34.233260834 -0400 @@ -0,0 +1,55 @@ +#ifndef _ASM_PPC64_DISKDUMP_H_ +#define _ASM_PPC64_DISKDUMP_H_ linux-2.6-dump_smp_call_function.patch: arch/i386/kernel/smp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ arch/ia64/kernel/smp.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ arch/powerpc/kernel/smp.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- arch/x86_64/kernel/smp.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ drivers/block/diskdump.c | 2 +- drivers/net/netdump.c | 2 +- include/linux/smp.h | 2 ++ 7 files changed, 181 insertions(+), 3 deletions(-) Index: linux-2.6-dump_smp_call_function.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-dump_smp_call_function.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6-dump_smp_call_function.patch 28 Oct 2005 05:23:06 -0000 1.7 +++ linux-2.6-dump_smp_call_function.patch 6 Jan 2006 05:42:17 -0000 1.8 @@ -65,8 +65,8 @@ * this function sends a 'generic call function' IPI to all other CPUs * in the system. */ ---- linux-2.6.12/arch/ppc64/kernel/smp.c.orig 2005-08-23 10:49:53.005279633 -0400 -+++ linux-2.6.12/arch/ppc64/kernel/smp.c 2005-08-23 10:51:04.770473481 -0400 +--- linux-2.6.12/arch/powerpc/kernel/smp.c.orig 2005-08-23 10:49:53.005279633 -0400 ++++ linux-2.6.12/arch/powerpc/kernel/smp.c 2005-08-23 10:51:04.770473481 -0400 @@ -200,6 +200,7 @@ void smp_send_stop(void) * Stolen from the i386 version. */ @@ -82,8 +82,8 @@ -} *call_data; +} *call_data, *saved_call_data; - /* delay of at least 8 seconds on 1GHz cpu */ - #define SMP_CALL_TIMEOUT (1UL << (30 + 3)) + /* delay of at least 8 seconds */ + #define SMP_CALL_TIMEOUT 8 /* + * dump version of smp_call_function to avoid deadlock in call_lock linux-2.6-execshield.patch: linux-2.6.13-a/arch/x86_64/ia32/ia32_binfmt.c | 4 linux-2.6.13-a/arch/x86_64/kernel/process.c | 6 - linux-2.6.13-a/arch/x86_64/kernel/setup64.c | 25 ----- linux-2.6.13-a/include/asm-x86_64/pgtable.h | 2 linux-2.6.13/mm/fremap.c | 16 +-- linux-2.6.14/fs/proc/base.c | 2 linux-810/arch/i386/kernel/asm-offsets.c | 1 linux-810/arch/i386/kernel/entry.S | 8 + linux-810/arch/i386/kernel/process.c | 59 ++++++++++++ linux-810/arch/i386/kernel/signal.c | 4 linux-810/arch/i386/kernel/smp.c | 3 linux-810/arch/i386/kernel/sysenter.c | 55 +++++++++++ linux-810/arch/i386/kernel/traps.c | 93 ++++++++++++++++++- linux-810/arch/i386/kernel/vsyscall-sysenter.S | 6 - linux-810/arch/i386/kernel/vsyscall.lds.S | 4 linux-810/arch/i386/mm/init.c | 6 + linux-810/arch/i386/mm/mmap.c | 6 - linux-810/arch/ia64/ia32/binfmt_elf32.c | 2 linux-810/arch/x86_64/ia32/ia32_binfmt.c | 2 linux-810/arch/x86_64/kernel/process.c | 7 - linux-810/arch/x86_64/mm/Makefile | 2 linux-810/arch/x86_64/mm/fault.c | 2 linux-810/arch/x86_64/mm/mmap.c | 95 +++++++++++++++++++ linux-810/drivers/char/random.c | 7 + linux-810/fs/binfmt_elf.c | 120 ++++++++++++++++++++----- linux-810/fs/proc/array.c | 8 + linux-810/fs/proc/base.c | 4 linux-810/fs/proc/task_mmu.c | 25 ++++- linux-810/include/asm-i386/desc.h | 14 ++ linux-810/include/asm-i386/elf.h | 42 +++++--- linux-810/include/asm-i386/mmu.h | 6 + linux-810/include/asm-i386/pgalloc.h | 1 linux-810/include/asm-i386/processor.h | 8 + linux-810/include/asm-i386/thread_info.h | 1 linux-810/include/asm-ia64/pgalloc.h | 4 linux-810/include/asm-powerpc/pgalloc.h | 5 + linux-810/include/asm-ppc/pgalloc.h | 5 + linux-810/include/asm-s390/pgalloc.h | 4 linux-810/include/asm-sparc/pgalloc.h | 4 linux-810/include/asm-sparc64/pgalloc.h | 4 linux-810/include/asm-x86_64/pgalloc.h | 7 + linux-810/include/asm-x86_64/processor.h | 5 + linux-810/include/linux/mm.h | 9 + linux-810/include/linux/resource.h | 5 - linux-810/include/linux/sched.h | 9 + linux-810/include/linux/sysctl.h | 3 linux-810/kernel/signal.c | 38 +++++++ linux-810/kernel/sysctl.c | 39 ++++++++ linux-810/mm/mmap.c | 105 ++++++++++++++++++++- linux-810/mm/mprotect.c | 5 - linux-810/mm/mremap.c | 4 linux-813/arch/i386/kernel/cpu/common.c | 7 + 52 files changed, 781 insertions(+), 127 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-execshield.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-execshield.patch 30 Dec 2005 00:28:22 -0000 1.2 +++ linux-2.6-execshield.patch 6 Jan 2006 05:42:17 -0000 1.3 @@ -923,7 +923,7 @@ diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/proc/task_mmu.c linux-810/fs/proc/task_mmu.c --- linux-804/fs/proc/task_mmu.c +++ linux-810/fs/proc/task_mmu.c -@@ -26,13 +26,23 @@ char *task_mem(struct mm_struct *mm, cha +@@ -43,7 +43,11 @@ char *task_mem(struct mm_struct *mm, cha "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" "VmLib:\t%8lu kB\n" @@ -933,9 +933,11 @@ + "Brk:\t%08lx kB\n" + "StaStk:\t%08lx kB\n" + , - (mm->total_vm - mm->reserved_vm) << (PAGE_SHIFT-10), + hiwater_vm << (PAGE_SHIFT-10), + (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10), mm->locked_vm << (PAGE_SHIFT-10), - get_mm_counter(mm, rss) << (PAGE_SHIFT-10), +@@ -51,7 +55,13 @@ char *task_mem(struct mm_struct *mm, cha + total_rss << (PAGE_SHIFT-10), data << (PAGE_SHIFT-10), mm->stack_vm << (PAGE_SHIFT-10), text, lib, - (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10); @@ -944,7 +946,7 @@ +#ifdef __i386__ + if (!nx_enabled) + buffer += sprintf(buffer, -+ "ExecLim:\t%08lx\n", mm->context.exec_limit); ++ "ExecLim:\t%08lx\n", mm->context.exec_limit); +#endif return buffer; } @@ -1180,9 +1182,9 @@ + #endif /* _PPC_PGALLOC_H */ #endif /* __KERNEL__ */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-ppc64/pgalloc.h linux-810/include/asm-ppc64/pgalloc.h ---- linux-804/include/asm-ppc64/pgalloc.h -+++ linux-810/include/asm-ppc64/pgalloc.h +diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-powerpc/pgalloc.h linux-810/include/asm-powerpc/pgalloc.h +--- linux-804/include/asm-powerpc/pgalloc.h ++++ linux-810/include/asm-powerpc/pgalloc.h @@ -13,6 +13,11 @@ extern kmem_cache_t *pgtable_cache[]; #define PUD_CACHE_NUM 1 #define PGD_CACHE_NUM 0 @@ -1466,29 +1468,29 @@ .data = &core_uses_pid, --- linux-2.6.13/mm/fremap.c~ 2005-10-13 17:34:08.000000000 -0400 +++ linux-2.6.13/mm/fremap.c 2005-10-13 17:34:58.000000000 -0400 -@@ -85,13 +85,15 @@ int install_page(struct mm_struct *mm, s +@@ -83,13 +83,15 @@ int install_page(struct mm_struct *mm, s * caller about it. */ err = -EINVAL; - inode = vma->vm_file->f_mapping->host; - size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; - if (!page->mapping || page->index >= size) -- goto err_unlock; +- goto unlock; - err = -ENOMEM; - if (page_mapcount(page) > INT_MAX/2) -- goto err_unlock; +- goto unlock; + if (vma->vm_file) { + inode = vma->vm_file->f_mapping->host; + size = (i_size_read(inode) + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; + if (!page->mapping || page->index >= size) -+ goto err_unlock; ++ goto unlock; + err = -ENOMEM; + if (page_mapcount(page) > INT_MAX/2) -+ goto err_unlock; ++ goto unlock; + } - zap_pte(mm, vma, addr, pte); - + if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte)) + inc_mm_counter(mm, file_rss); diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mmap.c linux-810/mm/mmap.c --- linux-804/mm/mmap.c +++ linux-810/mm/mmap.c @@ -1612,7 +1614,7 @@ + * as much as possible: + */ + if (addr >= 0x01000000) { -+ tmp = randomize_range(0x01000000, PAGE_ALIGN(max(mm->start_brk, 0x08000000)), len); ++ tmp = randomize_range(0x01000000, PAGE_ALIGN(max(mm->start_brk, (unsigned long)0x08000000)), len); + vma = find_vma(mm, tmp); + if (TASK_SIZE - len >= tmp && + (!vma || tmp + len <= vma->vm_start)) @@ -1675,14 +1677,14 @@ vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); return 0; -@@ -1960,6 +2048,7 @@ void exit_mmap(struct mm_struct *mm) - set_mm_counter(mm, rss, 0); - mm->total_vm = 0; - mm->locked_vm = 0; +@@ -2048,6 +2048,7 @@ void exit_mmap(struct mm_struct *mm) + vm_unacct_memory(nr_accounted); + free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); + tlb_finish_mmu(tlb, 0, end); + arch_flush_exec_range(mm); - spin_unlock(&mm->page_table_lock); - + /* + * Walk the list again, actually closing and freeing it, diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mprotect.c linux-810/mm/mprotect.c --- linux-804/mm/mprotect.c +++ linux-810/mm/mprotect.c linux-2.6-modsign-include.patch: linux-2.6.13/include/asm-powerpc/module.h | 10 ++++++++++ linux-2.6.14/include/asm-mips/module.h | 12 ++++++++++-- linux-905/include/asm-alpha/module.h | 3 +++ linux-905/include/asm-arm/module.h | 5 +++++ linux-905/include/asm-cris/module.h | 5 +++++ linux-905/include/asm-h8300/module.h | 5 +++++ linux-905/include/asm-i386/module.h | 5 +++++ linux-905/include/asm-ia64/module.h | 5 +++++ linux-905/include/asm-m32r/module.h | 5 +++++ linux-905/include/asm-m68k/module.h | 5 +++++ linux-905/include/asm-parisc/module.h | 8 ++++++++ linux-905/include/asm-s390/module.h | 3 +++ linux-905/include/asm-sh/module.h | 5 +++++ linux-905/include/asm-sparc/module.h | 5 +++++ linux-905/include/asm-sparc64/module.h | 5 +++++ linux-905/include/asm-um/module-i386.h | 4 ++++ linux-905/include/asm-v850/module.h | 5 +++++ linux-905/include/asm-x86_64/module.h | 5 +++++ 18 files changed, 98 insertions(+), 2 deletions(-) Index: linux-2.6-modsign-include.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-modsign-include.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-modsign-include.patch 28 Oct 2005 05:23:06 -0000 1.1 +++ linux-2.6-modsign-include.patch 6 Jan 2006 05:42:17 -0000 1.2 @@ -141,9 +141,9 @@ +#define ELF_R_SYM(X) ELF32_R_SYM(X) #endif /* _ASM_M68K_MODULE_H */ ---- linux-2.6.13/include/asm-mips/module.h~ 2005-09-05 17:18:22.000000000 -0400 -+++ linux-2.6.13/include/asm-mips/module.h 2005-09-05 17:20:33.000000000 -0400 -@@ -26,19 +26,26 @@ typedef struct +--- linux-2.6.14/include/asm-mips/module.h~ 2005-10-30 21:31:42.000000000 -0500 ++++ linux-2.6.14/include/asm-mips/module.h 2005-10-30 21:33:30.000000000 -0500 +@@ -34,11 +34,15 @@ typedef struct { } Elf64_Mips_Rela; #ifdef CONFIG_32BIT @@ -152,11 +152,15 @@ #define Elf_Shdr Elf32_Shdr #define Elf_Sym Elf32_Sym #define Elf_Ehdr Elf32_Ehdr + #define Elf_Addr Elf32_Addr +#define Elf_Rel Elf32_Rel +#define Elf_Rela Elf32_Rela +#define ELF_R_TYPE(X) ELF32_R_TYPE(X) +#define ELF_R_SYM(X) ELF32_R_SYM(X) + #define Elf_Mips_Rel Elf32_Rel + #define Elf_Mips_Rela Elf32_Rela +@@ -49,11 +53,15 @@ typedef struct { #endif #ifdef CONFIG_64BIT @@ -165,14 +169,14 @@ #define Elf_Shdr Elf64_Shdr #define Elf_Sym Elf64_Sym #define Elf_Ehdr Elf64_Ehdr -- + #define Elf_Addr Elf64_Addr +#define Elf_Rel Elf64_Rel +#define Elf_Rela Elf64_Rela +#define ELF_R_TYPE(X) ELF64_R_TYPE(X) +#define ELF_R_SYM(X) ELF64_R_SYM(X) - #endif - #ifdef CONFIG_MODULES + #define Elf_Mips_Rel Elf64_Mips_Rel + #define Elf_Mips_Rela Elf64_Mips_Rela diff -urNp --exclude-from=/home/davej/.exclude linux-904/include/asm-parisc/module.h linux-905/include/asm-parisc/module.h --- linux-904/include/asm-parisc/module.h +++ linux-905/include/asm-parisc/module.h linux-2.6-netdump.patch: linux-2.6.12/drivers/net/Kconfig | 7 linux-2.6.12/drivers/net/netdump.c | 550 +++++++++++++++++++++++++++++ linux-2.6.12/drivers/net/netdump.h | 90 ++++ linux-2.6.12/include/asm-generic/netdump.h | 48 ++ linux-2.6.12/include/asm-i386/netdump.h | 79 ++++ linux-2.6.12/include/asm-ia64/netdump.h | 82 ++++ linux-2.6.12/include/asm-powerpc/netdump.h | 79 ++++ linux-2.6.12/include/asm-s390/netdump.h | 6 linux-2.6.12/include/asm-x86_64/netdump.h | 79 ++++ linux-2.6.12/include/linux/netdevice.h | 8 linux-2.6.12/include/linux/netpoll.h | 4 linux-2.6.12/net/core/netpoll.c | 17 linux-2.6.14/drivers/net/Makefile | 1 13 files changed, 1039 insertions(+), 11 deletions(-) Index: linux-2.6-netdump.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-netdump.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-netdump.patch 28 Oct 2005 05:23:06 -0000 1.4 +++ linux-2.6-netdump.patch 6 Jan 2006 05:42:17 -0000 1.5 @@ -660,13 +660,16 @@ endif #NETDEVICES config NETPOLL ---- linux-2.6.12/drivers/net/Makefile.netdump.orig 2005-08-19 17:45:43.053483367 -0400 -+++ linux-2.6.12/drivers/net/Makefile 2005-08-19 17:47:33.025203810 -0400 -@@ -195,3 +195,4 @@ obj-$(CONFIG_IRDA) += irda/ +--- linux-2.6.14/drivers/net/Makefile~ 2005-10-30 21:44:17.000000000 -0500 ++++ linux-2.6.14/drivers/net/Makefile 2005-10-30 21:44:33.000000000 -0500 +@@ -203,6 +203,7 @@ obj-$(CONFIG_IRDA) += irda/ obj-$(CONFIG_ETRAX_ETHERNET) += cris/ obj-$(CONFIG_NETCONSOLE) += netconsole.o +obj-$(CONFIG_NETDUMP) += netdump.o + + obj-$(CONFIG_FS_ENET) += fs_enet/ + --- linux-2.6.12/net/core/netpoll.c.netdump.orig 2005-08-19 17:46:01.104483015 -0400 +++ linux-2.6.12/net/core/netpoll.c 2005-08-19 17:47:33.034202314 -0400 @@ -20,10 +20,12 @@ @@ -998,13 +1001,13 @@ + +#endif /* _ASM_GENERIC_NETDUMP_H */ --- /dev/null 2005-07-20 12:00:41.186496416 -0400 -+++ linux-2.6.12/include/asm-ppc64/netdump.h 2005-08-19 17:47:33.036201981 -0400 ++++ linux-2.6.12/include/asm-powerpc/netdump.h 2005-08-19 17:47:33.036201981 -0400 @@ -0,0 +1,79 @@ +#ifndef _ASM_PPC64_NETDUMP_H_ +#define _ASM_PPC64_NETDUMP_H_ + +/* -+ * linux/include/asm-ppc64/netdump.h ++ * linux/include/asm-powerpc/netdump.h + * + * Copyright (c) 2003, 2004 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004 IBM Corp. linux-2.6-radeon-backlight.patch: radeon_base.c | 11 + radeon_pm.c | 557 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 567 insertions(+), 1 deletion(-) Index: linux-2.6-radeon-backlight.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-radeon-backlight.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-radeon-backlight.patch 28 Oct 2005 05:23:06 -0000 1.3 +++ linux-2.6-radeon-backlight.patch 6 Jan 2006 05:42:17 -0000 1.4 @@ -1,6 +1,9 @@ ---- linux-2.6.11-rc4-tank/drivers/video/aty/radeon_pm.c.tppm 2005-02-20 20:09:02.000000000 +0200 -+++ linux-2.6.11-rc4-tank/drivers/video/aty/radeon_pm.c 2005-02-20 21:35:27.000000000 +0200 -@@ -25,8 +25,274 @@ + +http://bugme.osdl.org/show_bug.cgi?id=3022 + +--- vanilla/drivers/video/aty/radeon_pm.c 2005-10-27 20:02:08.000000000 -0400 ++++ linux-2.6.14/drivers/video/aty/radeon_pm.c 2005-11-30 02:20:01.000000000 -0500 +@@ -25,8 +25,532 @@ #include #endif @@ -18,44 +21,70 @@ + * vendor and product codes for Your laptop. + */ +static struct dmi_system_id __devinitdata radeonfb_dmi_table[] = { ++ + { -+ /* Reported by George Avrunin */ -+ .ident = "IBM ThinkPad T40 (2372-9CU)", ++ /* Reported by Stephan Gro?? */ ++ .ident = "IBM ThinkPad T30 (2366-97G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23729CU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "236697G"), + }, + }, + { -+ /* Reported by Pete Toscano */ -+ .ident = "IBM ThinkPad R40 (2722-B3G)", ++ /* Reported by Phillip Jones */ ++ .ident = "IBM ThinkPad T30 (2366-MU9)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2722B3G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2366MU9"), + }, + }, + { -+ /* Reported by Phillip Jones */ -+ .ident = "IBM ThinkPad T30 (2366-MU9)", ++ /* Reported by Jakob Schiotz */ ++ .ident = "IBM ThinkPad T30 (2366-96G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2366MU9"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "236696G"), + }, + }, + { -+ /* Reported by Klaus Kurzmann */ -+ .ident = "IBM ThinkPad T40 (2373-25G)", ++ /* Reported by Thomas M Steenholdt */ ++ .ident = "IBM ThinkPad T30 (2366-JBG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237325G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2366JBG"), + }, + }, + { -+ /* Reported by Antti Andreimann */ -+ .ident = "IBM ThinkPad T41 (2373-2FG)", ++ /* Reported by ChazeFroy */ ++ .ident = "IBM ThinkPad T30 (2366-QU5)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23732FG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2366QU5"), ++ }, ++ }, ++ ++ { ++ /* Reported by George Avrunin */ ++ .ident = "IBM ThinkPad T40 (2372-9CU)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23729CU"), ++ }, ++ }, ++ { ++ /* Reported by Dmitriy Zavin */ ++ .ident = "IBM ThinkPad T40 (2373-14U)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "237314U"), ++ }, ++ }, ++ { ++ /* Reported by Klaus Kurzmann */ ++ .ident = "IBM ThinkPad T40 (2373-25G)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "237325G"), + }, + }, + { @@ -100,34 +129,34 @@ + }, + { + /* Reported by Peter Jones */ -+ .ident = "IBM ThinkPad T41 (2373-9FU)", ++ .ident = "IBM ThinkPad T40 (2373-BU7)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23739FU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373BU7"), + }, + }, + { -+ /* Reported by Ajay Ramaswamy */ -+ .ident = "IBM ThinkPad T41 (2373-9HU)", ++ /* Reported by Vernon Mauery */ ++ .ident = "IBM ThinkPad T40 (2373-MU4)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23739HU"), -+ }, ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373MU4"), ++ }, + }, + { -+ /* Reported by Peter Jones */ -+ .ident = "IBM ThinkPad T40 (2373-BU7)", ++ /* Reported by Michele Lamarca */ ++ .ident = "IBM ThinkPad T40 (2373-22G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373BU7"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "237322G"), + }, + }, + { -+ /* Reported by Jerome Poggi */ -+ .ident = "IBM ThinkPad T42 (2373-FWG)", ++ /* Reported by Adam Glasgall */ ++ .ident = "IBM ThinkPad T40 (2373-RU1)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373FWG"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373RU1"), + }, + }, + { @@ -154,29 +183,30 @@ + DMI_MATCH(DMI_PRODUCT_NAME, "2373G3G"), + }, + }, ++ + { -+ /* Reported by Eric Benson */ -+ .ident = "IBM ThinkPad T41p (2373-GEU)", ++ /* Reported by Antti Andreimann */ ++ .ident = "IBM ThinkPad T41 (2373-2FG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373GEU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23732FG"), + }, + }, + { -+ /* Reported by Dwight Barkley */ -+ .ident = "IBM ThinkPad T42 (2373-JTU)", ++ /* Reported by Peter Jones */ ++ .ident = "IBM ThinkPad T41 (2373-9FU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373JTU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23739FU"), + }, + }, + { -+ /* Reported by Vernon Mauery */ -+ .ident = "IBM ThinkPad T40 (2373-MU4)", ++ /* Reported by Ajay Ramaswamy */ ++ .ident = "IBM ThinkPad T41 (2373-9HU)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373MU4"), -+ }, ++ DMI_MATCH(DMI_PRODUCT_NAME, "23739HU"), ++ }, + }, + { + /* Reported by Ajay Ramaswamy */ @@ -203,7 +233,97 @@ + }, + }, + { -+ /* Reported by Pete Toscano */ ++ /* Reported by Paul Ionescu */ ++ .ident = "IBM ThinkPad T41 (2373-TG5)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373TG5"), ++ }, ++ }, ++ { ++ /* Reported by Matthew Saltzman */ ++ .ident = "IBM ThinkPad T41 (2373-7JU)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"), ++ }, ++ }, ++ { ++ /* Reported by David Zeuthen */ ++ .ident = "IBM ThinkPad T41 (2373-HU6)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"), ++ }, ++ }, ++ { ++ /* Reported by Grahame Bowland */ ++ .ident = "IBM ThinkPad T41 (2373-3HM)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23733HM"), ++ }, ++ }, ++ { ++ /* Reported by Aivo Prykk */ ++ .ident = "IBM ThinkPad T41 (2373-1FG)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23731FG"), ++ }, ++ }, ++ { ++ /* Reported by Chris Vanden Berghe */ ++ .ident = "IBM ThinkPad T41 (2373-9HG)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23739HG"), ++ }, ++ }, ++ { ++ /* Reported by Paul Stanisci */ ++ .ident = "IBM ThinkPad T41 (2378-DLU)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378DLU"), ++ }, ++ }, ++ { ++ .ident = "IBM ThinkPad T41 (2379-D6U)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2379D6U"), ++ }, ++ }, ++ ++ { ++ /* Reported by Eric Benson */ ++ .ident = "IBM ThinkPad T41p (2373-GEU)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373GEU"), ++ }, ++ }, ++ ++ { ++ /* Reported by Tim Hull */ ++ .ident = "IBM ThinkPad T42 (2374-6VU)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "23746VU"), ++ }, ++ }, ++ { ++ /* Reported by Dwight Barkley */ ++ .ident = "IBM ThinkPad T42 (2373-JTU)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373JTU"), ++ }, ++ }, ++ { ++ /* Reported by Jerome Poggi ++ and Pete Toscano */ + .ident = "IBM ThinkPad T42 (2373-FWG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), @@ -211,6 +331,80 @@ + }, + }, + { ++ /* Reported by Ulrich Drepper */ ++ .ident = "IBM ThinkPad T42 (2378-R2U)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378R2U"), ++ }, ++ }, ++ { ++ /* Reported by Nicolas Dufresne */ ++ .ident = "IBM ThinkPad T42 (2378-RBF)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBF"), ++ }, ++ }, ++ { ++ /* Reported by Nicolas Dufresne */ ++ .ident = "IBM ThinkPad T42 (2378-RBU)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378RBU"), ++ }, ++ }, ++ { ++ /* Reported by Johannes Hansen */ ++ .ident = "IBM ThinkPad T42 (2374-CTO)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2374CTO"), ++ }, ++ }, ++ { ++ /* Reported by Johannes Hansen */ ++ .ident = "IBM ThinkPad T42 (2374-ZEP)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2374ZEP"), ++ }, ++ }, ++ { ++ /* Reported by Tom Marshall */ ++ .ident = "IBM ThinkPad T42 (2378-XXE)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378XXE"), ++ }, ++ }, ++ { ++ /* Reported by Isaac Wilcox */ ++ .ident = "IBM ThinkPad T42 (2373-F2G)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2373F2G"), ++ }, ++ }, ++ { ++ /* Reported by Austin Clements */ ++ .ident = "IBM ThinkPad T42 (2378-DUU)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2378DUU"), ++ }, ++ }, ++ ++ { ++ /* Reported by Frank Otto */ ++ .ident = "IBM ThinkPad R32 (2658-BQG)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2658BQG"), ++ }, ++ }, ++ ++ { + /* Reported by Frank Schmitt */ + .ident = "IBM ThinkPad R40 (2722-3GG)", + .matches = { @@ -219,6 +413,14 @@ + }, + }, + { ++ /* Reported by Rushi Bhatt */ ++ .ident = "IBM ThinkPad R40 (2722-6YU)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "27226YU"), ++ }, ++ }, ++ { + /* Reported by Nils Trebing */ + .ident = "IBM ThinkPad R40 (2722-5MG)", + .matches = { @@ -227,21 +429,66 @@ + }, + }, + { -+ /* Reported by Paul Ionescu */ -+ .ident = "IBM ThinkPad T41 (2373-TG5)", ++ /* Reported by Meik Hellmund */ ++ .ident = "IBM ThinkPad R40 (2722-CDG)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373TG5"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2722CDG"), + }, + }, + { -+ /* Reported by Michele Lamarca */ -+ .ident = "IBM ThinkPad T40 (2373-22G)", ++ /* Reported by Pete Toscano */ ++ .ident = "IBM ThinkPad R40 (2722-B3G)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "237322G"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2722B3G"), ++ }, ++ }, ++ ++ ++ { ++ /* Reported by Borschuk Oleg */ ++ .ident = "IBM ThinkPad R50 (1829-7RG)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "18297RG"), ++ }, ++ }, ++ ++ { ++ /* Reported by Georges Herber */ ++ .ident = "IBM ThinkPad R51 (1829-9MG)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "18299MG"), ++ }, ++ }, ++ { ++ /* Reported by Eugene Pavlovsky */ ++ .ident = "IBM ThinkPad R51 (1836-Q6U)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "1836Q6U"), ++ }, ++ }, ++ { ++ /* Reported by Sten Heinze */ ++ .ident = "IBM ThinkPad R51 (1829-R6G)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "1829R6G"), ++ }, ++ }, ++ { ++ /* Reported by Wouter Cloetens */ ++ .ident = "IBM ThinkPad R51 (1829-EHG)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "1829EHG"), + }, + }, ++ ++ + { + /* Reported by Henrik Brix Andersen */ + .ident = "IBM ThinkPad X31 (2672-XXH)", @@ -251,17 +498,31 @@ + }, + }, + { -+ /* Reported by Matthew Saltzman */ -+ .ident = "IBM ThinkPad T41 (2373-7JU)", ++ /* Reported by Jeremy Katz */ ++ .ident = "IBM ThinkPad X31 (2672-A9U)", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2672A9U"), ++ }, ++ }, ++ { ++ /* Reported by Chris Lee */ ++ .ident = "IBM ThinkPad X31 (2672-5KU)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"), ++ }, ++ }, ++ { ++ /* Reported by Chris Blizzard */ ++ .ident = "IBM ThinkPad X31 (2672-RU3)", ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "2672RU3"), + }, + }, + { }, + /* Negative reports: */ -+ /* IBM thinkpad T30 2366 -> machine hangs -+ Reported by: Jakob Schiotz */ + /* IBM thinkpad T42p 2373-KUU -> machine hangs as X starts + Reported by: Dax Kelson */ + /* IBM ThinkPad X31 2672-XXH -> works, but doesn't fix the LCD @@ -275,7 +536,7 @@ static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo) { u32 tmp; -@@ -852,7 +1109,14 @@ +@@ -852,7 +1376,14 @@ static void radeon_pm_setup_for_suspend( /* because both INPLL and OUTPLL take the same lock, that's why. */ tmp = INPLL( pllMCLK_MISC) | MCLK_MISC__EN_MCLK_TRISTATE_IN_SUSPEND; OUTPLL( pllMCLK_MISC, tmp); @@ -291,7 +552,7 @@ /* AGP PLL control */ if (rinfo->family <= CHIP_FAMILY_RV280) { OUTREG(BUS_CNTL1, INREG(BUS_CNTL1) | BUS_CNTL1__AGPCLK_VALID); -@@ -864,6 +1128,7 @@ +@@ -864,6 +1395,7 @@ static void radeon_pm_setup_for_suspend( OUTREG(BUS_CNTL1, INREG(BUS_CNTL1)); OUTREG(BUS_CNTL1, (INREG(BUS_CNTL1) & ~0x4000) | 0x8000); } @@ -299,7 +560,7 @@ OUTREG(CRTC_OFFSET_CNTL, (INREG(CRTC_OFFSET_CNTL) & ~CRTC_OFFSET_CNTL__CRTC_STEREO_SYNC_OUT_EN)); -@@ -2790,6 +3055,29 @@ +@@ -2779,6 +3311,29 @@ void radeonfb_pm_init(struct radeonfb_in #endif } #endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_OF) */ @@ -329,8 +590,8 @@ } void radeonfb_pm_exit(struct radeonfb_info *rinfo) ---- linux-2.6.11-rc4-tank/drivers/video/aty/radeon_base.c.tppm 2005-02-20 20:08:15.000000000 +0200 -+++ linux-2.6.11-rc4-tank/drivers/video/aty/radeon_base.c 2005-02-20 20:18:20.000000000 +0200 +--- vanilla/drivers/video/aty/radeon_base.c 2005-02-20 20:08:15.000000000 +0200 ++++ linux-2.6.14/drivers/video/aty/radeon_base.c 2005-02-20 20:18:20.000000000 +0200 @@ -272,6 +272,9 @@ #ifdef CONFIG_MTRR static int nomtrr = 0; @@ -360,88 +621,3 @@ +module_param(radeon_force_sleep, int, 0); +MODULE_PARM_DESC(radeon_force_sleep, "bool: force ACPI sleep mode on untested machines"); +#endif ---- linux-2.6.12/drivers/video/aty/radeon_pm.c~ 2005-07-05 16:07:58.000000000 -0400 -+++ linux-2.6.12/drivers/video/aty/radeon_pm.c 2005-07-05 16:08:43.000000000 -0400 -@@ -271,6 +271,14 @@ static struct dmi_system_id __devinitdat - DMI_MATCH(DMI_PRODUCT_NAME, "23737JU"), - }, - }, -+ { -+ /* Reported by David Zeuthen */ -+ .ident = "IBM ThinkPad T41 (2373-HU6)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"), -+ }, -+ }, - { }, - /* Negative reports: */ - /* IBM thinkpad T30 2366 -> machine hangs ---- linux-2.6.12/drivers/video/aty/radeon_pm.c~ 2005-08-26 00:57:10.000000000 -0400 -+++ linux-2.6.12/drivers/video/aty/radeon_pm.c 2005-08-26 00:58:17.000000000 -0400 -@@ -232,6 +232,14 @@ static struct dmi_system_id __devinitdat - }, - }, - { -+ /* Reported by Ulrich Drepper */ -+ .ident = "IBM ThinkPad T42 (2378-R2U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2378R2U"), -+ }, -+ }, -+ { - /* Reported by Frank Schmitt */ - .ident = "IBM ThinkPad R40 (2722-3GG)", - .matches = { ---- linux-2.6.13/drivers/video/aty/radeon_pm.c~ 2005-09-23 20:11:34.000000000 -0400 -+++ linux-2.6.13/drivers/video/aty/radeon_pm.c 2005-09-23 20:12:23.000000000 -0400 -@@ -56,6 +56,14 @@ static struct dmi_system_id __devinitdat - }, - }, - { -+ /* Reported by Stephan Gro?? */ -+ .ident = "IBM ThinkPad T30 (2366-97G)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "236697G"), -+ }, -+ }, -+ { - /* Reported by Phillip Jones */ - .ident = "IBM ThinkPad T30 (2366-MU9)", - .matches = { ---- linux-2.6.13/drivers/video/aty/radeon_pm.c~ 2005-09-28 05:10:02.000000000 -0400 -+++ linux-2.6.13/drivers/video/aty/radeon_pm.c 2005-09-28 05:11:02.000000000 -0400 -@@ -288,6 +288,14 @@ static struct dmi_system_id __devinitdat - }, - }, - { -+ /* Reported by Jeremy Katz */ -+ .ident = "IBM ThinkPad X31 (2672-A9U)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "2672A9U"), -+ }, -+ }, -+ { - /* Reported by Matthew Saltzman */ - .ident = "IBM ThinkPad T41 (2373-7JU)", - .matches = { ---- linux-2.6.13/drivers/video/aty/radeon_pm.c~ 2005-10-24 15:12:33.000000000 -0400 -+++ linux-2.6.13/drivers/video/aty/radeon_pm.c 2005-10-24 15:13:52.000000000 -0400 -@@ -311,6 +311,14 @@ static struct dmi_system_id __devinitdat - DMI_MATCH(DMI_PRODUCT_NAME, "2373HU6"), - }, - }, -+ { -+ /* Reported by Chris Lee */ -+ .ident = "IBM ThinkPad X31 (2672-5KU)", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "26725KU"), -+ }, -+ }, - { }, - /* Negative reports: */ - /* IBM thinkpad T30 2366 -> machine hangs linux-2.6-scsi-advansys-pcitable.patch: drivers/scsi/advansys.c | 82 +++++++++++++++++------------------ linux-2.6.14/include/linux/pci_ids.h | 7 ++ 2 files changed, 48 insertions(+), 41 deletions(-) Index: linux-2.6-scsi-advansys-pcitable.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-scsi-advansys-pcitable.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-scsi-advansys-pcitable.patch 28 Oct 2005 05:23:06 -0000 1.1 +++ linux-2.6-scsi-advansys-pcitable.patch 6 Jan 2006 05:42:17 -0000 1.2 @@ -1,21 +1,21 @@ Remove a lot of duplicate #defines from the advansys driver. ---- linux-2.6.12/include/linux/pci_ids.h~ 2005-07-05 23:18:13.000000000 -0400 -+++ linux-2.6.12/include/linux/pci_ids.h 2005-07-05 23:30:02.000000000 -0400 -@@ -1101,9 +1101,12 @@ - #define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZVPLUS 0x0083 +--- linux-2.6.14/include/linux/pci_ids.h~ 2005-10-30 21:36:21.000000000 -0500 ++++ linux-2.6.14/include/linux/pci_ids.h 2005-10-30 21:37:16.000000000 -0500 +@@ -949,6 +949,13 @@ + #define PCI_DEVICE_ID_NEOMAGIC_NM256ZX_AUDIO 0x8006 + #define PCI_DEVICE_ID_NEOMAGIC_NM256XL_PLUS_AUDIO 0x8016 - #define PCI_VENDOR_ID_ASP 0x10cd ++#define PCI_VENDOR_ID_ASP 0x10cd +#define PCI_DEVICE_ID_ASP_1200A 0x1100 - #define PCI_DEVICE_ID_ASP_ABP940 0x1200 - #define PCI_DEVICE_ID_ASP_ABP940U 0x1300 - #define PCI_DEVICE_ID_ASP_ABP940UW 0x2300 ++#define PCI_DEVICE_ID_ASP_ABP940 0x1200 ++#define PCI_DEVICE_ID_ASP_ABP940U 0x1300 ++#define PCI_DEVICE_ID_ASP_ABP940UW 0x2300 +#define PCI_DEVICE_ID_38C0800_REV1 0x2500 +#define PCI_DEVICE_ID_38C1600_REV1 0x2700 - #define PCI_VENDOR_ID_MACRONIX 0x10d9 - #define PCI_DEVICE_ID_MACRONIX_MX98713 0x0512 - + #define PCI_VENDOR_ID_TCONRAD 0x10da + #define PCI_DEVICE_ID_TCONRAD_TOKENRING 0x0508 --- vanilla/drivers/scsi/advansys.c 2005-06-17 15:48:29.000000000 -0400 +++ linux-2.6.12/drivers/scsi/advansys.c 2005-07-05 23:27:48.000000000 -0400 @@ -889,10 +889,6 @@ typedef unsigned char uchar; linux-2.6-serial-of.patch: linux-2.6.13/arch/powerpc/kernel/setup_64.c | 184 ------------------------- linux-2.6.13/drivers/serial/8250_of.c | 206 ++++++++++++++++++++++++++++ linux-2.6.13/drivers/serial/Kconfig | 5 linux-2.6.14/drivers/serial/Makefile | 1 4 files changed, 212 insertions(+), 184 deletions(-) Index: linux-2.6-serial-of.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-serial-of.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-serial-of.patch 28 Oct 2005 05:23:06 -0000 1.1 +++ linux-2.6-serial-of.patch 6 Jan 2006 05:42:17 -0000 1.2 @@ -1,16 +1,31 @@ ---- linux-2.6.13/drivers/serial/Makefile.sof 2005-08-29 00:41:01.000000000 +0100 -+++ linux-2.6.13/drivers/serial/Makefile 2005-10-20 13:05:39.000000000 +0100 +--- linux-2.6.14/drivers/serial/Makefile~ 2005-11-07 22:17:27.000000000 -0500 ++++ linux-2.6.14/drivers/serial/Makefile 2005-11-07 22:17:35.000000000 -0500 @@ -22,6 +22,7 @@ obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250 obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o obj-$(CONFIG_SERIAL_8250_MCA) += 8250_mca.o +obj-$(CONFIG_SERIAL_8250_OF) += 8250_of.o + obj-$(CONFIG_SERIAL_8250_AU1X00) += 8250_au1x00.o obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o - obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o --- linux-2.6.13/drivers/serial/8250_of.c.sof 2005-10-20 13:19:07.000000000 +0100 +++ linux-2.6.13/drivers/serial/8250_of.c 2005-10-20 13:19:26.000000000 +0100 -@@ -0,0 +1,197 @@ +@@ -0,0 +1,206 @@ ++/* ++ * Search OpenFirmware device tree for 8250-compatible serial ports ++ * ++ * Moved from arch/powerpc/kernel/setup_64.c: ++ * ++ * Copyright (C) 2001 PPC64, IBM Corp ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License ++ * as published by the Free Software Foundation; either version ++ * 2 of the License, or (at your option) any later version. ++ */ ++ ++#undef DEBUG ++ +#include +#include +#include @@ -21,12 +36,6 @@ +#include +#include + -+#if 0 -+#define DBG(fmt...) printk(KERN_DEBUG fmt) -+#else -+#define DBG(fmt...) do { } while (0) -+#endif -+ +/* + * This function can be used by platforms to "find" legacy serial ports. + * It works for "serial" nodes under an "isa" node, and will try to @@ -52,7 +61,7 @@ + u32 size; + }; + -+ DBG(" -> generic_find_legacy_serial_port()\n"); ++ pr_debug(" -> generic_find_legacy_serial_port()\n"); + ports_probed = 1; + + *physport = 0; @@ -77,7 +86,7 @@ + /* Ok, first check if it's under an "isa" parent */ + isa = of_get_parent(np); + if (!isa || strcmp(isa->name, "isa")) { -+ DBG("%s: no isa parent found\n", np->full_name); ++ pr_debug("%s: no isa parent found\n", np->full_name); + continue; + } + @@ -117,12 +126,12 @@ + if (serial_ports[index].iobase != 0) { + /* if we still have some room, move it, else override */ + if (old_serial_count < MAX_LEGACY_SERIAL_PORTS) { -+ DBG("Moved legacy port %d -> %d\n", index, ++ pr_debug("Moved legacy port %d -> %d\n", index, + old_serial_count); + serial_ports[old_serial_count++] = + serial_ports[index]; + } else { -+ DBG("Replacing legacy port %d\n", index); ++ pr_debug("Replacing legacy port %d\n", index); + } + } + } @@ -138,7 +147,7 @@ + serial_ports[index].irq = interrupts ? interrupts[0] : 0; + serial_ports[index].flags = ASYNC_BOOT_AUTOCONF; + -+ DBG("Added legacy port, index: %d, port: %x, irq: %d, clk: %d\n", ++ pr_debug("Added legacy port, index: %d, port: %x, irq: %d, clk: %d\n", + index, + serial_ports[index].iobase, + serial_ports[index].irq, @@ -150,7 +159,7 @@ + + pci = of_get_parent(isa); + if (!pci) { -+ DBG("%s: no pci parent found\n", np->full_name); ++ pr_debug("%s: no pci parent found\n", np->full_name); + goto next_port; + } + @@ -187,7 +196,7 @@ + of_node_put(isa); + } + -+ DBG(" <- generic_find_legacy_serial_port()\n"); ++ pr_debug(" <- generic_find_legacy_serial_port()\n"); +} + +static struct platform_device serial_device = { @@ -217,13 +226,13 @@ +config SERIAL_8250_OF + bool + default y -+ depends on PPC_OF && SERIAL_8250 ++ depends on PPC_OF && SERIAL_8250 && PPC_MERGE + config SERIAL_8250_ACPI bool "8250/16550 device discovery via ACPI namespace" default y if IA64 ---- linux-2.6.13/arch/ppc64/kernel/setup.c.sof 2005-10-20 13:13:08.000000000 +0100 -+++ linux-2.6.13/arch/ppc64/kernel/setup.c 2005-10-20 13:16:28.000000000 +0100 +--- linux-2.6.13/arch/powerpc/kernel/setup_64.c.sof 2005-10-20 13:13:08.000000000 +0100 ++++ linux-2.6.13/arch/powerpc/kernel/setup_64.c 2005-10-20 13:16:28.000000000 +0100 @@ -31,8 +31,6 @@ #include #include @@ -429,25 +438,3 @@ int check_legacy_ioport(unsigned long base_port) { if (ppc_md.check_legacy_ioport == NULL) ---- linux-2.6.13/include/asm-ppc/pc_serial.h.sof 2005-08-29 00:41:01.000000000 +0100 -+++ linux-2.6.13/include/asm-ppc/pc_serial.h 2005-10-20 13:05:42.000000000 +0100 -@@ -26,18 +26,4 @@ - #define RS_TABLE_SIZE 4 - #endif - --/* Standard COM flags (except for COM4, because of the 8514 problem) */ --#ifdef CONFIG_SERIAL_DETECT_IRQ --#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ) --#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ) --#else --#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST) --#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF --#endif -- --#define SERIAL_PORT_DFNS \ -- /* UART CLK PORT IRQ FLAGS */ \ -- { 0, BASE_BAUD, 0x3F8, 4, STD_COM_FLAGS }, /* ttyS0 */ \ -- { 0, BASE_BAUD, 0x2F8, 3, STD_COM_FLAGS }, /* ttyS1 */ \ -- { 0, BASE_BAUD, 0x3E8, 4, STD_COM_FLAGS }, /* ttyS2 */ \ -- { 0, BASE_BAUD, 0x2E8, 3, STD_COM4_FLAGS }, /* ttyS3 */ -+#define SERIAL_PORT_DFNS /* */ linux-2.6-serial-tickle-nmi.patch: 8250.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) Index: linux-2.6-serial-tickle-nmi.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-serial-tickle-nmi.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-serial-tickle-nmi.patch 28 Oct 2005 05:23:06 -0000 1.1 +++ linux-2.6-serial-tickle-nmi.patch 6 Jan 2006 05:42:17 -0000 1.2 @@ -28,14 +28,6 @@ --- linux-2.6.11/drivers/serial/8250.c~ 2005-05-14 02:49:02.000000000 -0400 +++ linux-2.6.11/drivers/serial/8250.c 2005-05-14 02:54:30.000000000 -0400 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include - #include @@ -2098,9 +2098,11 @@ static inline void wait_for_xmitr(struct /* Wait up to 1s for flow control if necessary */ if (up->port.flags & UPF_CONS_FLOW) { linux-2.6-tux.patch: linux-2.6.14/net/ipv4/tcp_output.c | 1 linux/arch/alpha/kernel/systbls.S | 8 linux/arch/i386/kernel/syscall_table.S | 10 linux/arch/ia64/kernel/entry.S | 8 linux/arch/ia64/kernel/ia64_ksyms.c | 5 linux/arch/x86_64/ia32/ia32entry.S | 10 linux/fs/dcache.c | 36 linux/fs/exec.c | 2 linux/fs/fcntl.c | 4 linux/fs/namei.c | 18 linux/fs/namespace.c | 2 linux/fs/open.c | 4 linux/fs/pipe.c | 2 linux/fs/read_write.c | 2 linux/include/asm-alpha/fcntl.h | 1 linux/include/asm-generic/fcntl.h | 4 linux/include/asm-i386/unistd.h | 5 linux/include/asm-ia64/unistd.h | 2 linux/include/asm-sparc/fcntl.h | 1 linux/include/asm-sparc64/fcntl.h | 1 linux/include/asm-x86_64/unistd.h | 10 linux/include/linux/buffer_head.h | 1 linux/include/linux/dcache.h | 8 linux/include/linux/errno.h | 3 linux/include/linux/file.h | 2 linux/include/linux/fs.h | 7 linux/include/linux/kmod.h | 2 linux/include/linux/namei.h | 2 linux/include/linux/net.h | 1 linux/include/linux/sched.h | 5 linux/include/linux/skbuff.h | 2 linux/include/linux/socket.h | 5 linux/include/linux/sysctl.h | 50 linux/include/net/sock.h | 8 linux/include/net/tcp.h | 3 linux/include/net/tux.h | 804 ++++++++++++ linux/include/net/tux_u.h | 163 ++ linux/kernel/exit.c | 7 linux/kernel/fork.c | 1 linux/kernel/kmod.c | 28 linux/kernel/signal.c | 1 linux/mm/filemap.c | 19 linux/mm/truncate.c | 2 linux/net/Kconfig | 1 linux/net/Makefile | 1 linux/net/core/sock.c | 5 linux/net/ipv4/tcp.c | 3 linux/net/ipv4/tcp_input.c | 1 linux/net/ipv4/tcp_output.c | 1 linux/net/socket.c | 197 +- linux/net/tux/Kconfig | 25 linux/net/tux/Makefile | 12 linux/net/tux/abuf.c | 190 ++ linux/net/tux/accept.c | 863 ++++++++++++ linux/net/tux/cachemiss.c | 265 +++ linux/net/tux/cgi.c | 171 ++ linux/net/tux/directory.c | 302 ++++ linux/net/tux/extcgi.c | 329 ++++ linux/net/tux/gzip.c | 40 linux/net/tux/input.c | 641 +++++++++ linux/net/tux/logger.c | 837 ++++++++++++ linux/net/tux/main.c | 1417 +++++++++++++++++++++ linux/net/tux/mod.c | 262 +++ linux/net/tux/output.c | 352 +++++ linux/net/tux/parser.h | 102 + linux/net/tux/postpone.c | 77 + linux/net/tux/proc.c | 1149 +++++++++++++++++ linux/net/tux/proto_ftp.c | 1555 +++++++++++++++++++++++ linux/net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++ linux/net/tux/redirect.c | 172 ++ linux/net/tux/times.c | 392 +++++ linux/net/tux/times.h | 26 linux/net/tux/userspace.c | 27 73 files changed, 12774 insertions(+), 98 deletions(-) Index: linux-2.6-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-tux.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-tux.patch 12 Dec 2005 05:31:05 -0000 1.4 +++ linux-2.6-tux.patch 6 Jan 2006 05:42:17 -0000 1.5 @@ -715,11 +715,11 @@ =================================================================== --- linux.orig/include/linux/sysctl.h +++ linux/include/linux/sysctl.h -@@ -208,6 +208,7 @@ enum - NET_ECONET=16, +@@ -205,6 +205,7 @@ enum NET_SCTP=17, NET_LLC=18, -+ NET_TUX=19, + NET_NETFILTER=19, ++ NET_TUX=20, }; /* /proc/sys/kernel/random */ @@ -1858,7 +1858,7 @@ =================================================================== --- linux.orig/kernel/kmod.c +++ linux/kernel/kmod.c -@@ -128,7 +128,8 @@ struct subprocess_info { +@@ -128,14 +128,14 @@ struct subprocess_info { /* * This is the task which runs the usermode application */ @@ -1866,8 +1866,16 @@ +int +__exec_usermodehelper(char *path, char **argv, char **envp, struct key *ring) { - struct subprocess_info *sub_info = data; - struct key *old_session; +- struct subprocess_info *sub_info = data; + struct key *new_session, *old_session; + int retval; + + /* Unblock all signals and set the session keyring. */ +- new_session = key_get(sub_info->ring); ++ new_session = key_get(ring); + flush_signals(current); + spin_lock_irq(¤t->sighand->siglock); + old_session = __install_session_keyring(current, new_session); @@ -146,12 +146,28 @@ static int ____call_usermodehelper(void key_put(old_session); @@ -13844,3 +13852,13 @@ + * + ****************************************************************/ + +--- linux-2.6.14/net/ipv4/tcp_output.c~ 2005-12-12 00:42:02.000000000 -0500 ++++ linux-2.6.14/net/ipv4/tcp_output.c 2005-12-12 00:42:17.000000000 -0500 +@@ -703,6 +703,7 @@ unsigned int tcp_current_mss(struct sock + + return mss_now; + } ++EXPORT_SYMBOL_GPL(tcp_current_mss); + + /* Congestion window validation. (RFC2861) */ + linux-2.6-vm-debug.patch: drivers/scsi/st.c | 1 + include/linux/mm.h | 1 + mm/rmap.c | 7 +++++++ 3 files changed, 9 insertions(+) Index: linux-2.6-vm-debug.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-vm-debug.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-vm-debug.patch 3 Jan 2006 14:22:00 -0000 1.2 +++ linux-2.6-vm-debug.patch 6 Jan 2006 05:42:17 -0000 1.3 @@ -1,16 +1,36 @@ ---- linux-2.6.14/mm/rmap.c~ 2006-01-03 08:53:32.000000000 -0500 -+++ linux-2.6.14/mm/rmap.c 2006-01-03 08:58:19.000000000 -0500 +--- linux-2.6.15/mm/rmap.c~ 2006-01-03 08:53:32.000000000 -0500 ++++ linux-2.6.15/mm/rmap.c 2006-01-03 08:58:19.000000000 -0500 @@ -484,6 +484,13 @@ void page_remove_rmap(struct page *page) BUG_ON(PageReserved(page)); if (atomic_add_negative(-1, &page->_mapcount)) { + if (page_mapcount(page) < 0) { -+ printk (KERN_EMERG "Eeek! page_mapcount(page) went negative! (%d)\n", page->_mapcount); -+ printk (KERN_EMERG " page->flags = %x\n", page->flags); -+ printk (KERN_EMERG " page->count = %x\n", page->_count); ++ printk (KERN_EMERG "Eeek! page_mapcount(page) went negative! (%d)\n", page_mapcount(page)); ++ printk (KERN_EMERG " page->flags = %lx\n", page->flags); ++ printk (KERN_EMERG " page->count = %x\n", page_count(page)); + printk (KERN_EMERG " page->mapping = %p\n", page->mapping); + } + BUG_ON(page_mapcount(page) < 0); /* * It would be tidy to reset the PageAnon mapping here, +--- linux-2.6.15/drivers/scsi/st.c~ 2006-01-05 21:58:31.000000000 -0500 ++++ linux-2.6.15/drivers/scsi/st.c 2006-01-05 21:59:31.000000000 -0500 +@@ -4508,6 +4508,7 @@ static int sgl_unmap_user_pages(struct s + for (i=0; i < nr_pages; i++) { + struct page *page = sgl[i].page; + ++ sgl[i].page = NULL; + if (dirtied) + SetPageDirty(page); + /* FIXME: cache flush missing for rw==READ +--- linux-2.6.15/include/linux/mm.h~ 2006-01-05 22:02:20.000000000 -0500 ++++ linux-2.6.15/include/linux/mm.h 2006-01-05 22:02:48.000000000 -0500 +@@ -299,6 +299,7 @@ struct page { + #define put_page_testzero(p) \ + ({ \ + BUG_ON(page_count(p) == 0); \ ++ BUG_ON(page_count(p) <= page_mapcount(p)); \ + atomic_add_negative(-1, &(p)->_count); \ + }) + linux-2.6-write-protect-rodata.patch: linux-2.6.14-fordiff/arch/i386/Kconfig.debug | 10 +++++++ linux-2.6.14-fordiff/arch/i386/kernel/entry.S | 1 linux-2.6.14-fordiff/arch/i386/kernel/syscall_table.S | 1 linux-2.6.14-fordiff/arch/i386/mm/init.c | 24 +++++++++++++++++ linux-2.6.14-fordiff/arch/x86_64/Kconfig.debug | 10 +++++++ linux-2.6.14-fordiff/arch/x86_64/kernel/syscall.c | 2 - linux-2.6.14-fordiff/arch/x86_64/mm/init.c | 23 ++++++++++++++++ linux-2.6.14-fordiff/arch/x86_64/mm/pageattr.c | 9 ++++-- linux-2.6.14-fordiff/include/asm-generic/vmlinux.lds.h | 4 ++ linux-2.6.14-fordiff/include/asm-x86_64/pgtable.h | 2 + linux-2.6.14-fordiff/init/main.c | 6 ++++ linux-2.6.14/arch/i386/mm/init.c | 12 ++++++++ linux-2.6.14/arch/x86_64/ia32/ia32entry.S | 2 - linux-2.6.14/arch/x86_64/mm/init.c | 12 ++++++++ linux-2.6.9-22.EL/arch/i386/mm/pageattr.c | 23 ++++++++++++---- 15 files changed, 131 insertions(+), 10 deletions(-) Index: linux-2.6-write-protect-rodata.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-write-protect-rodata.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-write-protect-rodata.patch 27 Nov 2005 08:19:29 -0000 1.3 +++ linux-2.6-write-protect-rodata.patch 6 Jan 2006 05:42:17 -0000 1.4 @@ -378,3 +378,14 @@ kpte_page = split; } get_page(kpte_page); +--- linux-2.6.14/arch/x86_64/ia32/ia32entry.S~ 2005-12-01 12:25:15.000000000 -0500 ++++ linux-2.6.14/arch/x86_64/ia32/ia32entry.S 2005-12-01 12:25:30.000000000 -0500 +@@ -341,7 +341,7 @@ ENTRY(ia32_ptregs_common) + jmp ia32_sysret /* misbalances the return cache */ + CFI_ENDPROC + +- .data ++ .section .rodata,"a" + .align 8 + .globl ia32_sys_call_table + ia32_sys_call_table: linux-2.6-x86-apic-off-by-default.patch: arch/i386/Kconfig | 12 ++++++++++++ arch/i386/kernel/acpi/boot.c | 13 +++++++++++++ arch/i386/kernel/apic.c | 13 ++++++++++--- arch/i386/kernel/io_apic.c | 2 +- arch/i386/kernel/setup.c | 18 ++++++++++++++++-- include/asm-i386/acpi.h | 4 ++++ include/asm-i386/apic.h | 6 ++++++ 7 files changed, 62 insertions(+), 6 deletions(-) Index: linux-2.6-x86-apic-off-by-default.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-x86-apic-off-by-default.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-x86-apic-off-by-default.patch 23 Nov 2005 06:42:03 -0000 1.3 +++ linux-2.6-x86-apic-off-by-default.patch 6 Jan 2006 05:42:17 -0000 1.4 @@ -1,10 +1,7 @@ -From darrick at us.ibm.com -https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=167333 - -diff -Naur orig/arch/i386/Kconfig linux-2.6.13/arch/i386/Kconfig ---- orig/arch/i386/Kconfig 2005-10-24 17:54:05.000000000 -0700 -+++ linux-2.6.13/arch/i386/Kconfig 2005-10-24 15:39:37.000000000 -0700 -@@ -546,6 +546,18 @@ +diff -Naur orig/arch/i386/Kconfig new/arch/i386/Kconfig +--- orig/arch/i386/Kconfig 2005-11-22 13:32:50.000000000 -0800 ++++ new/arch/i386/Kconfig 2005-11-22 13:34:28.000000000 -0800 +@@ -253,6 +253,18 @@ to use it. If you say Y here even though your machine doesn't have an IO-APIC, then the kernel will still run with no slowdown at all. @@ -23,21 +20,51 @@ config X86_LOCAL_APIC bool depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) -diff -Naur orig/arch/i386/kernel/apic.c linux-2.6.13/arch/i386/kernel/apic.c ---- orig/arch/i386/kernel/apic.c 2005-10-24 17:54:05.000000000 -0700 -+++ linux-2.6.13/arch/i386/kernel/apic.c 2005-10-24 23:02:33.000000000 -0700 +diff -Naur orig/arch/i386/kernel/acpi/boot.c new/arch/i386/kernel/acpi/boot.c +--- orig/arch/i386/kernel/acpi/boot.c 2005-11-22 13:32:50.000000000 -0800 ++++ new/arch/i386/kernel/acpi/boot.c 2005-11-23 12:53:56.000000000 -0800 +@@ -37,6 +37,10 @@ + #include + #include + ++#ifdef CONFIG_X86_32 ++extern int enable_local_apic __initdata; ++#endif ++ + #ifdef CONFIG_X86_64 + + extern void __init clustered_apic_check(void); +@@ -800,6 +804,15 @@ + #ifdef CONFIG_X86_LOCAL_APIC + int count, error; + ++#ifdef CONFIG_X86_32 ++ if (enable_local_apic < 0) { ++ printk(KERN_INFO PREFIX "Local APIC disabled (%d); pass 'lapic' to re-enable.\n", enable_local_apic); ++ return; ++ } ++ ++ printk(KERN_INFO PREFIX "Local APIC enabled (%d).\n", enable_local_apic); ++#endif ++ + count = acpi_table_parse(ACPI_APIC, acpi_parse_madt); + if (count >= 1) { + +diff -Naur orig/arch/i386/kernel/apic.c new/arch/i386/kernel/apic.c +--- orig/arch/i386/kernel/apic.c 2005-11-22 13:32:46.000000000 -0800 ++++ new/arch/i386/kernel/apic.c 2005-11-22 18:06:18.000000000 -0800 @@ -42,8 +42,9 @@ /* * Knob to control our willingness to enable the local APIC. -+ * -2=default-disable, -1=force-disable, 1=force-disable, 0=automatic ++ * -2=default-disable, -1=force-disable, 1=force-enable, 0=automatic */ -int enable_local_apic __initdata = 0; /* -1=force-disable, +1=force-enable */ +int enable_local_apic __initdata = (X86_APIC_DEFAULT_OFF ? -2 : 0); /* * Debug level -@@ -751,7 +752,7 @@ +@@ -757,7 +758,7 @@ * APIC only if "lapic" specified. */ if (enable_local_apic <= 0) { @@ -46,7 +73,16 @@ "you can enable it with \"lapic\"\n"); return -1; } -@@ -1265,6 +1266,12 @@ +@@ -839,7 +840,7 @@ + int i; + + for (i = 0; i < nr_ioapics; i++) { +- if (smp_found_config) { ++ if (smp_found_config && !skip_ioapic_setup) { + ioapic_phys = mp_ioapics[i].mpc_apicaddr; + if (!ioapic_phys) { + printk(KERN_ERR +@@ -1272,6 +1273,12 @@ if (!smp_found_config && !cpu_has_apic) return -1; @@ -59,10 +95,10 @@ /* * Complain if the BIOS pretends there is one. */ -diff -Naur orig/arch/i386/kernel/io_apic.c linux-2.6.13/arch/i386/kernel/io_apic.c ---- orig/arch/i386/kernel/io_apic.c 2005-10-24 17:54:05.000000000 -0700 -+++ linux-2.6.13/arch/i386/kernel/io_apic.c 2005-10-24 15:39:36.000000000 -0700 -@@ -678,7 +678,7 @@ +diff -Naur orig/arch/i386/kernel/io_apic.c new/arch/i386/kernel/io_apic.c +--- orig/arch/i386/kernel/io_apic.c 2005-11-22 13:32:46.000000000 -0800 ++++ new/arch/i386/kernel/io_apic.c 2005-11-22 13:34:27.000000000 -0800 +@@ -681,7 +681,7 @@ #define MAX_PIRQS 8 static int pirq_entries [MAX_PIRQS]; static int pirqs_enabled; @@ -71,10 +107,21 @@ static int __init ioapic_setup(char *str) { -diff -Naur orig/arch/i386/kernel/setup.c linux-2.6.13/arch/i386/kernel/setup.c ---- orig/arch/i386/kernel/setup.c 2005-10-24 17:54:05.000000000 -0700 -+++ linux-2.6.13/arch/i386/kernel/setup.c 2005-10-24 15:39:36.000000000 -0700 -@@ -857,6 +857,10 @@ +diff -Naur orig/arch/i386/kernel/setup.c new/arch/i386/kernel/setup.c +--- orig/arch/i386/kernel/setup.c 2005-11-22 13:32:46.000000000 -0800 ++++ new/arch/i386/kernel/setup.c 2005-11-23 01:29:18.000000000 -0800 +@@ -60,6 +60,10 @@ + #include "setup_arch_pre.h" + #include + ++#ifdef CONFIG_X86_LOCAL_APIC ++extern int enable_local_apic __initdata; ++#endif ++ + /* Forward Declaration. */ + void __init find_max_pfn(void); + +@@ -865,6 +869,10 @@ /* disable IO-APIC */ else if (!memcmp(from, "noapic", 6)) disable_ioapic_setup(); @@ -85,9 +132,26 @@ #endif /* CONFIG_X86_IO_APIC */ #endif /* CONFIG_ACPI */ -diff -Naur orig/include/asm-i386/acpi.h linux-2.6.13/include/asm-i386/acpi.h ---- orig/include/asm-i386/acpi.h 2005-10-24 17:54:05.000000000 -0700 -+++ linux-2.6.13/include/asm-i386/acpi.h 2005-10-24 15:39:36.000000000 -0700 +@@ -1606,8 +1614,14 @@ + #endif + #endif + #ifdef CONFIG_X86_LOCAL_APIC +- if (smp_found_config) +- get_smp_config(); ++ if (smp_found_config) { ++ if (enable_local_apic >= 0) { ++ printk(KERN_INFO "LAPIC enabled (%d), calling get_smp_config\n", enable_local_apic); ++ get_smp_config(); ++ } else { ++ printk(KERN_INFO "LAPIC disabled (%d)\n", enable_local_apic); ++ } ++ } + #endif + + register_memory(); +diff -Naur orig/include/asm-i386/acpi.h new/include/asm-i386/acpi.h +--- orig/include/asm-i386/acpi.h 2005-10-27 17:02:08.000000000 -0700 ++++ new/include/asm-i386/acpi.h 2005-11-22 13:34:27.000000000 -0800 @@ -134,6 +134,10 @@ { skip_ioapic_setup = 1; @@ -99,9 +163,9 @@ static inline int ioapic_setup_disabled(void) { -diff -Naur orig/include/asm-i386/apic.h linux-2.6.13/include/asm-i386/apic.h ---- orig/include/asm-i386/apic.h 2005-10-24 17:54:05.000000000 -0700 -+++ linux-2.6.13/include/asm-i386/apic.h 2005-10-24 15:39:36.000000000 -0700 +diff -Naur orig/include/asm-i386/apic.h new/include/asm-i386/apic.h +--- orig/include/asm-i386/apic.h 2005-10-27 17:02:08.000000000 -0700 ++++ new/include/asm-i386/apic.h 2005-11-22 13:34:27.000000000 -0800 @@ -82,6 +82,12 @@ # define apic_write_around(x,y) apic_write_atomic((x),(y)) #endif linux-2.6-x86-tune-p4.patch: linux-2.6.10/arch/i386/Makefile.cpu | 2 +- linux-2.6.12/arch/x86_64/Makefile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) Index: linux-2.6-x86-tune-p4.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-x86-tune-p4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-x86-tune-p4.patch 28 Oct 2005 05:23:07 -0000 1.1 +++ linux-2.6-x86-tune-p4.patch 6 Jan 2006 05:42:17 -0000 1.2 @@ -1,15 +1,15 @@ diff -urNp --exclude-from=/home/davej/.exclude linux-1/arch/i386/Makefile linux-212/arch/i386/Makefile ---- linux-2.6.10/arch/i386/Makefile -+++ linux-2.6.10/arch/i386/Makefile +--- linux-2.6.10/arch/i386/Makefile.cpu ++++ linux-2.6.10/arch/i386/Makefile.cpu @@ -33,7 +33,7 @@ cflags-$(CONFIG_M486) += -march=i486 cflags-$(CONFIG_M586) += -march=i586 cflags-$(CONFIG_M586TSC) += -march=i586 cflags-$(CONFIG_M586MMX) += $(call cc-option,-march=pentium-mmx,-march=i586) -cflags-$(CONFIG_M686) += -march=i686 -+cflags-$(CONFIG_M686) += -march=i686 $(call cc-option,-mtune=pentium4) - cflags-$(CONFIG_MPENTIUMII) += -march=i686 $(call cc-option,-mtune=pentium2) - cflags-$(CONFIG_MPENTIUMIII) += -march=i686 $(call cc-option,-mtune=pentium3) - cflags-$(CONFIG_MPENTIUMM) += -march=i686 $(call cc-option,-mtune=pentium3) ++cflags-$(CONFIG_M686) += -march=i686 $(call tune,pentium4) + cflags-$(CONFIG_MPENTIUMII) += -march=i686 $(call tune,pentium2) + cflags-$(CONFIG_MPENTIUMIII) += -march=i686 $(call tune,pentium3) + cflags-$(CONFIG_MPENTIUMM) += -march=i686 $(call tune,pentium3) --- linux-2.6.12/arch/x86_64/Makefile~ 2005-07-05 19:48:18.000000000 -0400 +++ linux-2.6.12/arch/x86_64/Makefile 2005-07-05 19:49:06.000000000 -0400 @@ -39,9 +39,7 @@ LDFLAGS_vmlinux := Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- sources 27 Dec 2005 23:35:22 -0000 1.153 +++ sources 6 Jan 2006 05:42:18 -0000 1.154 @@ -1,2 +1 @@ -66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 -925557d87e27485a92b45e3e5ac172f8 patch-2.6.14.5.bz2 +cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- upstream 27 Dec 2005 23:35:22 -0000 1.94 +++ upstream 6 Jan 2006 05:42:18 -0000 1.95 @@ -1,2 +1 @@ -linux-2.6.14.tar.bz2 -patch-2.6.14.5.bz2 +linux-2.6.15.tar.bz2 --- linux-2.6-8139too-suspend.patch DELETED --- --- linux-2.6-NFSD-locking-fix.patch DELETED --- --- linux-2.6-acpi-20050902.patch DELETED --- --- linux-2.6-acpi-enable-ecburst.patch DELETED --- --- linux-2.6-acpi-ht.patch DELETED --- --- linux-2.6-acpi-owner_id-limit.patch DELETED --- --- linux-2.6-acpi-silence-cutoff.patch DELETED --- --- linux-2.6-alsa-maestro-hang.patch DELETED --- --- linux-2.6-build-qconfig-qt-lib64.patch DELETED --- --- linux-2.6-cx88-silence-debug.patch DELETED --- --- linux-2.6-debug-spinlock-emerg.patch DELETED --- --- linux-2.6-default-clocksource-tsc.patch DELETED --- --- linux-2.6-default-elevator.patch DELETED --- --- linux-2.6-fs-locks-leak.patch DELETED --- --- linux-2.6-ide-scsi-check_condition.patch DELETED --- --- linux-2.6-kauditd-suspend.patch DELETED --- --- linux-2.6-libata-intel-combined-quirk.patch DELETED --- --- linux-2.6-mcs-canonicalise-getxattr.patch DELETED --- --- linux-2.6-net-atm-lanai-nodev-rmmod.patch DELETED --- --- linux-2.6-net-bridge-feature-consolidation.patch DELETED --- --- linux-2.6-net-nf_queue-oops.patch DELETED --- --- linux-2.6-net-rtnetlink-infinite-loop.patch DELETED --- --- linux-2.6-net-sk98lin-vpd.patch DELETED --- --- linux-2.6-optimise-for-size.patch DELETED --- --- linux-2.6-ppc64-build.patch DELETED --- --- linux-2.6-ppc64-eeh-panic.patch DELETED --- --- linux-2.6-scsi-runqueue-oops.patch DELETED --- --- linux-2.6-suspend-mxcsr.patch DELETED --- --- linux-2.6-usbhid-wacom.patch DELETED --- --- linux-2.6-usbhid-wireless-security-lock.patch DELETED --- --- linux-2.6.14.4pre.patch DELETED --- --- linux-2.6.15-various-fixes.patch DELETED --- --- patch-2.6.14.5.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 05:48:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 00:48:05 -0500 Subject: rpms/kernel/FC-4 linux-2.6-selinux-mls-compat.patch,1.1,NONE Message-ID: <200601060548.k065m54m021948@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv21869 Removed Files: linux-2.6-selinux-mls-compat.patch Log Message: remove leftovers --- linux-2.6-selinux-mls-compat.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 05:50:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 00:50:33 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1555, 1.1556 linux-2.6-block-reduce-stack.patch, 1.1, 1.2 Message-ID: <200601060550.k065oXkn023015@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22967 Modified Files: kernel-2.6.spec linux-2.6-block-reduce-stack.patch Log Message: Reduce block layer stack usage. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1555 retrieving revision 1.1556 diff -u -r1.1555 -r1.1556 --- kernel-2.6.spec 6 Jan 2006 05:42:17 -0000 1.1555 +++ kernel-2.6.spec 6 Jan 2006 05:50:30 -0000 1.1556 @@ -336,6 +336,7 @@ Patch1710: linux-2.6-autofs-pathlookup.patch Patch1720: linux-2.6-selinux-hush.patch Patch1730: linux-2.6-ide-cd-shutup.patch +Patch1740: linux-2.6-block-reduce-stack.patch Patch1750: linux-2.6-ub.patch Patch1760: linux-2.6-sata-enable-atapi-by-default.patch Patch1770: linux-2.6-valid-ether-addr.patch @@ -747,6 +748,8 @@ %patch1720 -p1 # Silence noisy CD drive spew %patch1730 -p1 +# Reduce stack usage in block layer +%patch1740 -p1 # Enable USB storage,UB & libusual magick. %patch1750 -p1 # Enable SATA ATAPI by default. @@ -1229,6 +1232,9 @@ %endif %changelog +* Fri Jan 6 2006 Dave Jones +- Reduce block layer stack usage. + * Tue Jan 3 2006 Dave Jones - 2.6.15 linux-2.6-block-reduce-stack.patch: ./include/linux/sched.h | 3 ++ 2/block/ll_rw_blk.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) Index: linux-2.6-block-reduce-stack.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-block-reduce-stack.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-block-reduce-stack.patch 28 Dec 2005 07:13:33 -0000 1.1 +++ linux-2.6-block-reduce-stack.patch 6 Jan 2006 05:50:30 -0000 1.2 @@ -63,9 +63,9 @@ ./include/linux/sched.h | 3 ++ 2 files changed, 55 insertions(+), 1 deletion(-) -diff ./drivers/block/ll_rw_blk.c~current~ ./drivers/block/ll_rw_blk.c ---- ./drivers/block/ll_rw_blk.c~current~ 2005-11-07 10:01:36.000000000 +1100 -+++ ./drivers/block/ll_rw_blk.c 2005-11-07 10:33:47.000000000 +1100 +diff 1/block/ll_rw_blk.c~current~ 2/drivers/block/ll_rw_blk.c +--- 1/block/ll_rw_blk.c~current~ 2005-11-07 10:01:36.000000000 +1100 ++++ 2/block/ll_rw_blk.c 2005-11-07 10:33:47.000000000 +1100 @@ -2957,7 +2957,7 @@ static void handle_bad_sector(struct bio * bi_sector for remaps as it sees fit. So the values of these fields * should NOT be depended on after the call to generic_make_request. From fedora-cvs-commits at redhat.com Fri Jan 6 05:54:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 00:54:12 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1556,1.1557 Message-ID: <200601060554.k065sCOq024690@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv24587 Modified Files: kernel-2.6.spec Log Message: reboot thru bios on hp laptops. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1556 retrieving revision 1.1557 diff -u -r1.1556 -r1.1557 --- kernel-2.6.spec 6 Jan 2006 05:50:30 -0000 1.1556 +++ kernel-2.6.spec 6 Jan 2006 05:54:09 -0000 1.1557 @@ -341,6 +341,7 @@ Patch1760: linux-2.6-sata-enable-atapi-by-default.patch Patch1770: linux-2.6-valid-ether-addr.patch Patch1780: linux-2.6-firmware-loader-timeout.patch +Patch1790: linux-2.6-x86-hp-reboot.patch # ACPI patches. Patch1800: linux-2.6-acpi-thinkpad-c2c3.patch @@ -758,6 +759,8 @@ %patch1770 -p1 # Increase timeout on firmware loader. %patch1780 -p1 +# Set reboot through BIOS for HP laptops. +%patch1790 -p1 # ACPI patches. # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. @@ -1234,6 +1237,7 @@ %changelog * Fri Jan 6 2006 Dave Jones - Reduce block layer stack usage. +- Set reboot through BIOS for HP laptops. * Tue Jan 3 2006 Dave Jones - 2.6.15 From fedora-cvs-commits at redhat.com Fri Jan 6 05:54:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 00:54:39 -0500 Subject: rpms/kernel/FC-4/configs config-powerpc-generic, NONE, 1.1 config-powerpc32-generic, NONE, 1.1 config-powerpc32-smp, NONE, 1.1 config-powerpc64, NONE, 1.1 config-powerpc64-generic, NONE, 1.1 config-powerpc64-iseries, NONE, 1.1 Message-ID: <200601060554.k065sdPA024909@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv24846 Added Files: config-powerpc-generic config-powerpc32-generic config-powerpc32-smp config-powerpc64 config-powerpc64-generic config-powerpc64-iseries Log Message: add new config files for ppc --- NEW FILE config-powerpc-generic --- # Most PowerPC kernels we build are SMP CONFIG_SMP=y CONFIG_IRQ_ALL_CPUS=y CONFIG_PPC=y CONFIG_WATCHDOG_RTAS=m CONFIG_DEBUGGER=y # CONFIG_KPROBES is not set # CONFIG_KEXEC is not set CONFIG_GENERIC_NVRAM=y CONFIG_ALTIVEC=y CONFIG_TAU=y # CONFIG_TAU_INT is not set CONFIG_TAU_AVERAGE=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_DEBUG=y # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_STAT=m CONFIG_CPU_FREQ_STAT_DETAILS=y CONFIG_PM=y CONFIG_PM_DEBUG=y CONFIG_SOFTWARE_SUSPEND=y CONFIG_PM_STD_PARTITION="" # CONFIG_RTC is not set CONFIG_GEN_RTC=y # CONFIG_GEN_RTC_X is not set CONFIG_PROC_DEVICETREE=y # CONFIG_CMDLINE_BOOL is not set CONFIG_BLK_DEV_IDE_PMAC=y CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y CONFIG_BLK_DEV_IDEDMA_PMAC=y CONFIG_BLK_DEV_IDE_PMAC_BLINK=y CONFIG_ADB=y CONFIG_ADB_PMU=y CONFIG_WINDFARM=y CONFIG_I2C_KEYWEST=y CONFIG_APPLE_AIRPORT=m CONFIG_SERIAL_PMACZILOG=m CONFIG_AGP_UNINORTH=y CONFIG_FB_OF=y # CONFIG_FB_CONTROL is not set CONFIG_SND_POWERMAC=m CONFIG_SND_POWERMAC_AUTO_DRC=y CONFIG_XMON=y CONFIG_XMON_DEFAULT=y CONFIG_BOOTX_TEXT=y CONFIG_MAC_EMUMOUSEBTN=y CONFIG_CAPI_EICON=y CONFIG_NVRAM=y CONFIG_FB_RADEON=y CONFIG_PCI_LEGACY_PROC=y # CONFIG_PCMCIA_M8XX is not set # CONFIG_FB_VGA16 is not set # CONFIG_SCSI_AHA1542 is not set # CONFIG_SCSI_IN2000 is not set # CONFIG_NI52 is not set # CONFIG_NI65 is not set # CONFIG_LANCE is not set # CONFIG_3C515 is not set # CONFIG_ELPLUS is not set # CONFIG_MEMORY_HOTPLUG is not set # Stuff which wants bus_to_virt() or virt_to_bus() # CONFIG_BLK_CPQ_DA is not set # CONFIG_VIDEO_STRADIS is not set # CONFIG_VIDEO_ZORAN is not set # CONFIG_ATM_HORIZON is not set # CONFIG_ATM_FIRESTREAM is not set # CONFIG_ATM_AMBASSADOR is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_BUSLOGIC is not set --- NEW FILE config-powerpc32-generic --- # CONFIG_SMP is not set CONFIG_PPC32=y # CONFIG_PPC64 is not set # CONFIG_RTAS_PROC is not set # CONFIG_PCMCIA_M8XX is not set # CONFIG_HOTPLUG_PCI is not set CONFIG_CPU_FREQ_PMAC=y CONFIG_PPC_MULTIPLATFORM=y CONFIG_PPC_CHRP=y CONFIG_PPC_PMAC=y # CONFIG_PPC_PREP is not set CONFIG_PMAC_APM_EMU=y CONFIG_PMAC_BACKLIGHT=y CONFIG_HIGHMEM=y # CONFIG_HIGHMEM_START_BOOL is not set # CONFIG_LOWMEM_SIZE_BOOL is not set # CONFIG_TASK_SIZE_BOOL is not set # CONFIG_KERNEL_START_BOOL is not set # CONFIG_PPC601_SYNC_FIX is not set CONFIG_ADVANCED_OPTIONS=y CONFIG_BLK_DEV_SL82C105=m CONFIG_SCSI_MESH=m CONFIG_SCSI_MESH_SYNC_RATE=5 CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 CONFIG_SCSI_MAC53C94=m CONFIG_ADB_CUDA=y CONFIG_ADB_MACIO=y CONFIG_INPUT_ADBHID=y CONFIG_PMAC_MEDIABAY=y CONFIG_BMAC=m CONFIG_MACE=m # CONFIG_MACE_AAUI_PORT is not set CONFIG_MV643XX_ETH=m CONFIG_MV643XX_ETH_0=y CONFIG_MV643XX_ETH_1=y CONFIG_MV643XX_ETH_2=y CONFIG_I2C_HYDRA=m CONFIG_I2C_MPC=m CONFIG_THERM_WINDTUNNEL=m CONFIG_THERM_ADT746X=m # CONFIG_ANSLCD is not set CONFIG_SENSORS_M41T00=m CONFIG_FB_PLATINUM=y CONFIG_FB_VALKYRIE=y CONFIG_FB_CT65550=y CONFIG_DMASOUND_PMAC=m # CONFIG_BDI_SWITCH is not set CONFIG_MAC_FLOPPY=m CONFIG_FB_ATY128=y CONFIG_FB_ATY=y CONFIG_FB_ATY_XL_INIT=y CONFIG_FB_MATROX=y # CONFIG_KPROBES is not set # CONFIG_DISKDUMP is not set # CONFIG_CRASH is not set # drivers/media/video/cx25840/cx25840.ko needs unknown symbol __ucmpdi2 # CONFIG_VIDEO_DECODER is not set # CONFIG_HVC_RTAS is not set # CONFIG_MAMBO is not set --- NEW FILE config-powerpc32-smp --- CONFIG_SMP=y # CONFIG_HOTPLUG_CPU is not set CONFIG_NR_CPUS=4 --- NEW FILE config-powerpc64 --- CONFIG_WINDFARM_PM81=y CONFIG_WINDFARM_PM91=y CONFIG_PPC_PMAC64=y CONFIG_PPC_MAPLE=y CONFIG_PPC_CELL=y # CONFIG_PPC_ISERIES is not set CONFIG_PPC_PSERIES=y CONFIG_PPC_PMAC=y CONFIG_RTAS_FLASH=y CONFIG_PPC_SPLPAR=y CONFIG_SCANLOG=y CONFIG_LPARCFG=y CONFIG_SERIAL_ICOM=m CONFIG_HVCS=m CONFIG_HVC_CONSOLE=y CONFIG_HOTPLUG_PCI=y CONFIG_THERM_PM72=y CONFIG_IBMVETH=m CONFIG_SCSI_IBMVSCSI=m # CONFIG_HOTPLUG_PCI_FAKE is not set # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_SHPC=m CONFIG_HOTPLUG_PCI_RPA=m CONFIG_HOTPLUG_PCI_RPA_DLPAR=y CONFIG_PMAC_SMU=y CONFIG_CPU_FREQ_PMAC64=y CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set CONFIG_I2C_PMAC_SMU=m CONFIG_SCSI_IPR=m CONFIG_SCSI_IPR_TRACE=y CONFIG_SCSI_IPR_DUMP=y CONFIG_BLK_DEV_AMD74XX=y CONFIG_SPIDER_NET=m CONFIG_HVC_FSS=y CONFIG_HVC_RTAS=y CONFIG_MAMBO=y CONFIG_MAMBO_DISK=m CONFIG_MAMBO_NET=m --- NEW FILE config-powerpc64-generic --- CONFIG_PPC64=y CONFIG_NR_CPUS=128 CONFIG_BLK_DEV_SL82C105=y # CONFIG_FB_PLATINUM is not set # CONFIG_FB_VALKYRIE is not set # CONFIG_FB_CT65550 is not set # CONFIG_POWER4_ONLY is not set CONFIG_RTAS_PROC=y CONFIG_IOMMU_VMERGE=y CONFIG_NUMA=y # CONFIG_PPC_64K_PAGES is not set CONFIG_SCHED_SMT=y # CONFIG_MV643XX_ETH is not set CONFIG_IRQSTACKS=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_FB_VGA16 is not set # CONFIG_FB_ATY128 is not set # CONFIG_FB_ATY is not set # CONFIG_CRASH is not set # CONFIG_INPUT_PCSPKR is not set --- NEW FILE config-powerpc64-iseries --- CONFIG_PPC_ISERIES=y # CONFIG_PPC_PSERIES is not set # CONFIG_NUMA is not set # CONFIG_MAMBO is not set # # iSeries device drivers # CONFIG_ISERIES_VETH=m CONFIG_VIOCONS=y CONFIG_VIODASD=m CONFIG_VIOCD=m CONFIG_VIOTAPE=m # # disable some drivers # # CONFIG_VT is not set # CONFIG_IDE is not set # CONFIG_FB is not set # CONFIG_FB_OF is not set # CONFIG_BLK_DEV_FD is not set # CONFIG_USB is not set # CONFIG_INPUT is not set # CONFIG_NET_RADIO is not set # CONFIG_MTD is not set # CONFIG_PCMCIA is not set # CONFIG_SCSI_SATA is not set # CONFIG_PARPORT is not set # CONFIG_NE2K_PCI is not set # CONFIG_FEALNX is not set # CONFIG_R8169 is not set # CONFIG_DL2K is not set # CONFIG_8139TOO is not set # CONFIG_VORTEX is not set # CONFIG_SERIAL_8250 is not set # CONFIG_SERIO_I8042 is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_IPS is not set # CONFIG_SUNGEM is not set # CONFIG_ATM_AMBASSADOR is not set # CONFIG_ATM_HORIZON is not set # CONFIG_ATM_FIRESTREAM is not set # CONFIG_SCHED_SMT is not set # CONFIG_XMON is not set # CONFIG_ROCKETPORT is not set # Disabled due to compile failure 2005-09-21 (dwmw2) # drivers/infiniband/hw/mthca/mthca_cmd.c: In function 'mthca_cmd_poll': # drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: syntax error before 'do' # drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: called object '"i"' is not a function # CONFIG_INFINIBAND_MTHCA is not set # CONFIG_WINDFARM is not set CONFIG_LPARCFG=y CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_FAKE is not set # CONFIG_HOTPLUG_PCI_CPCI is not set CONFIG_HOTPLUG_PCI_SHPC=m CONFIG_HOTPLUG_PCI_SHPC_POLL_EVENT_MODE=y # CONFIG_HOTPLUG_PCI_SHPC_PHPRM_LEGACY is not set CONFIG_SCSI_IBMVSCSI=m CONFIG_SERIAL_ICOM=m # CONFIG_ISDN is not set # CONFIG_IEEE80211 is not set From fedora-cvs-commits at redhat.com Fri Jan 6 05:56:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 00:56:14 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1557,1.1558 Message-ID: <200601060556.k065uEmU025641@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv25548 Modified Files: kernel-2.6.spec Log Message: enable ati timer quirk Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1557 retrieving revision 1.1558 diff -u -r1.1557 -r1.1558 --- kernel-2.6.spec 6 Jan 2006 05:54:09 -0000 1.1557 +++ kernel-2.6.spec 6 Jan 2006 05:56:12 -0000 1.1558 @@ -219,6 +219,7 @@ Patch203: linux-2.6.14-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch Patch205: linux-2.6-x86_64-disable-hotplug-guessing.patch +Patch206: linux-2.6-x86_64-ati-apic-timer.patch # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch @@ -566,6 +567,8 @@ %patch204 -p1 # Disable guessing of how many hotplug cpus to add. %patch205 -p1 +# ATI timer quirk. +%patch206 -p1 # # ppc64 From fedora-cvs-commits at redhat.com Fri Jan 6 05:57:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 00:57:27 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1558,1.1559 Message-ID: <200601060557.k065vRDj026216@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26113 Modified Files: kernel-2.6.spec Log Message: disable w1 debug msgs Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1558 retrieving revision 1.1559 diff -u -r1.1558 -r1.1559 --- kernel-2.6.spec 6 Jan 2006 05:56:12 -0000 1.1558 +++ kernel-2.6.spec 6 Jan 2006 05:57:24 -0000 1.1559 @@ -326,6 +326,7 @@ # Misc bits. Patch1600: linux-2.6-procfs-i_nlink-miscalculate.patch Patch1610: linux-2.6-atkbd-dell-multimedia.patch +Patch1620: linux-2.6-w1-hush-debug.patch Patch1630: linux-2.6-module_version.patch Patch1640: linux-2.6-swsusp-nofreeze.patch Patch1650: linux-2.6-input-kill-stupid-messages.patch @@ -730,6 +731,8 @@ %patch1600 -p1 # Make multimedia buttons on Dell Inspiron 8200 work. %patch1610 -p1 +# hush some debug msgs +%patch1620 -p1 # Add missing MODULE_VERSION tags to some modules. %patch1630 -p1 # Fix suspend to sbp devices. (166452) From fedora-cvs-commits at redhat.com Fri Jan 6 05:58:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 00:58:02 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1559,1.1560 Message-ID: <200601060558.k065w2j2026497@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26443 Modified Files: kernel-2.6.spec Log Message: oom killer tweaks Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1559 retrieving revision 1.1560 diff -u -r1.1559 -r1.1560 --- kernel-2.6.spec 6 Jan 2006 05:57:24 -0000 1.1559 +++ kernel-2.6.spec 6 Jan 2006 05:57:59 -0000 1.1560 @@ -359,6 +359,7 @@ Patch2000: linux-2.6-vm-oomkiller-debugging.patch Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch Patch2002: linux-2.6-vm-debug.patch +Patch2003: linux-2.6-vm-clear-unreclaimable.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -787,6 +788,8 @@ %patch2001 -p1 # Debug-fu %patch2002 -p1 +# OOM killer tweaks. +%patch2003 -p1 # # Patches 5000 to 6000 are reserved for new drivers that are about to From fedora-cvs-commits at redhat.com Fri Jan 6 05:59:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 00:59:20 -0500 Subject: rpms/kernel/FC-4 linux-2.6-serial-nrports.patch, NONE, 1.1 kernel-2.6.spec, 1.1560, 1.1561 Message-ID: <200601060559.k065xKqb027140@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv27032 Modified Files: kernel-2.6.spec Added Files: linux-2.6-serial-nrports.patch Log Message: don't generate a zillion serial ttyS nodes. linux-2.6-serial-nrports.patch: Documentation/kernel-parameters.txt | 2 ++ drivers/serial/8250.c | 28 ++++++++++++++++++---------- drivers/serial/Kconfig | 10 ++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) --- NEW FILE linux-2.6-serial-nrports.patch --- Make the number of UARTs registered configurable. Also add a nr_uarts module option to the 8250 code to override this, up to a maximum of CONFIG_SERIAL_8250_NR_UARTS This should appease people who complain about a proliferation of /dev/ttyS & /sysfs nodes whilst at the same time allowing a single kernel image to support the rarer occasions of lots of devices. Signed-off-by: Dave Jones diff -urpN --exclude-from=/home/davej/.exclude vanilla/drivers/serial/8250.c serial/drivers/serial/8250.c --- vanilla/drivers/serial/8250.c 2005-10-27 20:02:08.000000000 -0400 +++ serial/drivers/serial/8250.c 2005-12-07 20:00:16.000000000 -0500 @@ -53,6 +53,8 @@ */ static unsigned int share_irqs = SERIAL8250_SHARE_IRQS; +static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS; + /* * Debugging. */ @@ -2047,7 +2049,7 @@ static void __init serial8250_isa_init_p return; first = 0; - for (i = 0; i < UART_NR; i++) { + for (i = 0; i < nr_uarts; i++) { struct uart_8250_port *up = &serial8250_ports[i]; up->port.line = i; @@ -2066,7 +2068,7 @@ static void __init serial8250_isa_init_p } for (i = 0, up = serial8250_ports; - i < ARRAY_SIZE(old_serial_port) && i < UART_NR; + i < ARRAY_SIZE(old_serial_port) && i < nr_uarts; i++, up++) { up->port.iobase = old_serial_port[i].port; up->port.irq = irq_canonicalize(old_serial_port[i].irq); @@ -2088,7 +2090,7 @@ serial8250_register_ports(struct uart_dr serial8250_isa_init_ports(); - for (i = 0; i < UART_NR; i++) { + for (i = 0; i < nr_uarts; i++) { struct uart_8250_port *up = &serial8250_ports[i]; up->port.dev = dev; @@ -2189,7 +2191,7 @@ static int serial8250_console_setup(stru * if so, search for the first available port that does have * console support. */ - if (co->index >= UART_NR) + if (co->index >= nr_uarts) co->index = 0; port = &serial8250_ports[co->index].port; if (!port->iobase && !port->membase) @@ -2225,7 +2227,7 @@ static int __init find_port(struct uart_ int line; struct uart_port *port; - for (line = 0; line < UART_NR; line++) { + for (line = 0; line < nr_uarts; line++) { port = &serial8250_ports[line].port; if (p->iotype == port->iotype && p->iobase == port->iobase && @@ -2349,7 +2351,7 @@ static int __devexit serial8250_remove(s { int i; - for (i = 0; i < UART_NR; i++) { + for (i = 0; i < nr_uarts; i++) { struct uart_8250_port *up = &serial8250_ports[i]; if (up->port.dev == dev) @@ -2421,7 +2423,7 @@ static struct uart_8250_port *serial8250 /* * First, find a port entry which matches. */ - for (i = 0; i < UART_NR; i++) + for (i = 0; i < nr_uarts; i++) if (uart_match_port(&serial8250_ports[i].port, port)) return &serial8250_ports[i]; @@ -2430,7 +2432,7 @@ static struct uart_8250_port *serial8250 * free entry. We look for one which hasn't been previously * used (indicated by zero iobase). */ - for (i = 0; i < UART_NR; i++) + for (i = 0; i < nr_uarts; i++) if (serial8250_ports[i].port.type == PORT_UNKNOWN && serial8250_ports[i].port.iobase == 0) return &serial8250_ports[i]; @@ -2439,7 +2441,7 @@ static struct uart_8250_port *serial8250 * That also failed. Last resort is to find any entry which * doesn't have a real port associated with it. */ - for (i = 0; i < UART_NR; i++) + for (i = 0; i < nr_uarts; i++) if (serial8250_ports[i].port.type == PORT_UNKNOWN) return &serial8250_ports[i]; @@ -2524,8 +2526,11 @@ static int __init serial8250_init(void) { int ret, i; + if (nr_uarts > UART_NR) + nr_uarts = UART_NR; + printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ " - "%d ports, IRQ sharing %sabled\n", (int) UART_NR, + "%d ports, IRQ sharing %sabled\n", nr_uarts, share_irqs ? "en" : "dis"); for (i = 0; i < NR_IRQS; i++) @@ -2585,6 +2590,9 @@ module_param(share_irqs, uint, 0644); MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices" " (unsafe)"); +module_param(nr_uarts, uint, 0644); +MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")"); + #ifdef CONFIG_SERIAL_8250_RSA module_param_array(probe_rsa, ulong, &probe_rsa_count, 0444); MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA"); diff -urpN --exclude-from=/home/davej/.exclude vanilla/drivers/serial/Kconfig serial/drivers/serial/Kconfig --- vanilla/drivers/serial/Kconfig 2005-10-27 20:02:08.000000000 -0400 +++ serial/drivers/serial/Kconfig 2005-12-07 19:24:11.000000000 -0500 @@ -95,6 +95,16 @@ config SERIAL_8250_NR_UARTS PCI enumeration and any ports that may be added at run-time via hot-plug, or any ISA multi-port serial cards. +config SERIAL_8250_RUNTIME_UARTS + int "Number of 8250/16550 serial ports to register at runtime" + depends on SERIAL_8250 + default "4" + help + Set this to the maximum number of serial ports you want + the kernel to register at boot time. This can be overriden + with the module parameter "nr_uarts", or boot-time parameter + 8250.nr_uarts + config SERIAL_8250_EXTENDED bool "Extended 8250/16550 serial driver options" depends on SERIAL_8250 --- serial/Documentation/kernel-parameters.txt~ 2005-12-07 20:16:18.000000000 -0500 +++ serial/Documentation/kernel-parameters.txt 2005-12-07 20:17:44.000000000 -0500 @@ -982,6 +982,8 @@ running once the system is up. nowb [ARM] + nr_uarts= [SERIAL] maximum number of UARTs to be registered. + opl3= [HW,OSS] Format: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1560 retrieving revision 1.1561 diff -u -r1.1560 -r1.1561 --- kernel-2.6.spec 6 Jan 2006 05:57:59 -0000 1.1560 +++ kernel-2.6.spec 6 Jan 2006 05:59:18 -0000 1.1561 @@ -332,6 +332,7 @@ Patch1650: linux-2.6-input-kill-stupid-messages.patch Patch1660: linux-2.6-input-usblegacy.patch Patch1670: linux-2.6-serial-tickle-nmi.patch +Patch1671: linux-2.6-serial-nrports.patch Patch1680: linux-2.6-missing-exports.patch Patch1690: linux-2.6-radeon-backlight.patch Patch1700: linux-2.6-ide-tune-locking.patch @@ -744,6 +745,8 @@ %patch1660 -p1 # Tickle the NMI whilst doing serial writes. %patch1670 -p1 +# Don't generate a zillion ttyS nodes. +%patch1671 -p1 # Missing EXPORT_SYMBOL's %patch1680 -p1 # Radeon on thinkpad backlight power-management goodness. From fedora-cvs-commits at redhat.com Fri Jan 6 06:01:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:01:40 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1561,1.1562 Message-ID: <200601060601.k0661el3027566@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv27497 Modified Files: kernel-2.6.spec Log Message: disable pcmcia obsolete warnings. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1561 retrieving revision 1.1562 diff -u -r1.1561 -r1.1562 --- kernel-2.6.spec 6 Jan 2006 05:59:18 -0000 1.1561 +++ kernel-2.6.spec 6 Jan 2006 06:01:22 -0000 1.1562 @@ -345,9 +345,7 @@ Patch1770: linux-2.6-valid-ether-addr.patch Patch1780: linux-2.6-firmware-loader-timeout.patch Patch1790: linux-2.6-x86-hp-reboot.patch - -# ACPI patches. -Patch1800: linux-2.6-acpi-thinkpad-c2c3.patch +Patch1800: linux-2.6-pcmcia-disable-warning.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -362,6 +360,9 @@ Patch2002: linux-2.6-vm-debug.patch Patch2003: linux-2.6-vm-clear-unreclaimable.patch +# ACPI patches. +Patch2100: linux-2.6-acpi-thinkpad-c2c3.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. @@ -771,9 +772,7 @@ %patch1780 -p1 # Set reboot through BIOS for HP laptops. %patch1790 -p1 - -# ACPI patches. -# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. +# Disable deprecation warning in old PCMCIA code. %patch1800 -p1 # Warn about obsolete functionality usage. @@ -794,6 +793,10 @@ # OOM killer tweaks. %patch2003 -p1 +# ACPI patches. +# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. +%patch2100 -p1 + # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream From fedora-cvs-commits at redhat.com Fri Jan 6 06:06:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:06:09 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1562,1.1563 Message-ID: <200601060606.k06669v2027745@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv27728 Modified Files: kernel-2.6.spec Log Message: power up pwc by default. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1562 retrieving revision 1.1563 diff -u -r1.1562 -r1.1563 --- kernel-2.6.spec 6 Jan 2006 06:01:22 -0000 1.1562 +++ kernel-2.6.spec 6 Jan 2006 06:06:06 -0000 1.1563 @@ -346,6 +346,7 @@ Patch1780: linux-2.6-firmware-loader-timeout.patch Patch1790: linux-2.6-x86-hp-reboot.patch Patch1800: linux-2.6-pcmcia-disable-warning.patch +Patch1810: linux-2.6-pwc-powerup-by-default.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -774,6 +775,8 @@ %patch1790 -p1 # Disable deprecation warning in old PCMCIA code. %patch1800 -p1 +# Power up pwc by default. +%patch1810 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 From fedora-cvs-commits at redhat.com Fri Jan 6 06:06:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:06:57 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1563,1.1564 Message-ID: <200601060606.k0666vnp028090@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv28023 Modified Files: kernel-2.6.spec Log Message: fix use-after-free in acenic Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1563 retrieving revision 1.1564 diff -u -r1.1563 -r1.1564 --- kernel-2.6.spec 6 Jan 2006 06:06:06 -0000 1.1563 +++ kernel-2.6.spec 6 Jan 2006 06:06:55 -0000 1.1564 @@ -347,6 +347,7 @@ Patch1790: linux-2.6-x86-hp-reboot.patch Patch1800: linux-2.6-pcmcia-disable-warning.patch Patch1810: linux-2.6-pwc-powerup-by-default.patch +Patch1820: linux-2.6-net-acenic-use-after-free.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -777,6 +778,8 @@ %patch1800 -p1 # Power up pwc by default. %patch1810 -p1 +# Use after free in acenic. +%patch1820 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 From fedora-cvs-commits at redhat.com Fri Jan 6 06:09:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:09:07 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1564, 1.1565 linux-2.6-smsc-ircc2-pnp.patch, 1.4, 1.5 Message-ID: <200601060609.k066979t029063@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv28990 Modified Files: kernel-2.6.spec linux-2.6-smsc-ircc2-pnp.patch Log Message: pnp support for smsc-ircc2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1564 retrieving revision 1.1565 diff -u -r1.1564 -r1.1565 --- kernel-2.6.spec 6 Jan 2006 06:06:55 -0000 1.1564 +++ kernel-2.6.spec 6 Jan 2006 06:09:05 -0000 1.1565 @@ -780,6 +780,8 @@ %patch1810 -p1 # Use after free in acenic. %patch1820 -p1 +# PNP support for smsc-ircc2 +%patch1830 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 linux-2.6-smsc-ircc2-pnp.patch: smsc-ircc2.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+) Index: linux-2.6-smsc-ircc2-pnp.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-smsc-ircc2-pnp.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-smsc-ircc2-pnp.patch 28 Oct 2005 05:23:06 -0000 1.4 +++ linux-2.6-smsc-ircc2-pnp.patch 6 Jan 2006 06:09:05 -0000 1.5 @@ -3,10 +3,10 @@ --- linux-2.6.13/drivers/net/irda/smsc-ircc2.c~ 2005-10-25 00:38:18.000000000 -0400 +++ linux-2.6.13/drivers/net/irda/smsc-ircc2.c 2005-10-25 00:43:03.000000000 -0400 -@@ -53,6 +53,7 @@ - #include +@@ -54,6 +54,7 @@ #include #include + #include +#include #include From fedora-cvs-commits at redhat.com Fri Jan 6 06:13:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:13:55 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1565, 1.1566 linux-2.6-sata-promise-pata-ports.patch, 1.4, 1.5 Message-ID: <200601060613.k066DtYV031198@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv31140 Modified Files: kernel-2.6.spec linux-2.6-sata-promise-pata-ports.patch Log Message: Enable PATA ports on Promise. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1565 retrieving revision 1.1566 diff -u -r1.1565 -r1.1566 --- kernel-2.6.spec 6 Jan 2006 06:09:05 -0000 1.1565 +++ kernel-2.6.spec 6 Jan 2006 06:13:52 -0000 1.1566 @@ -342,6 +342,7 @@ Patch1740: linux-2.6-block-reduce-stack.patch Patch1750: linux-2.6-ub.patch Patch1760: linux-2.6-sata-enable-atapi-by-default.patch +Patch1761: linux-2.6-sata-promise-pata-ports.patch Patch1770: linux-2.6-valid-ether-addr.patch Patch1780: linux-2.6-firmware-loader-timeout.patch Patch1790: linux-2.6-x86-hp-reboot.patch @@ -768,6 +769,8 @@ %patch1750 -p1 # Enable SATA ATAPI by default. %patch1760 -p1 +# Enable PATA ports on Promise. +%patch1761 -p1 # %patch1770 -p1 # Increase timeout on firmware loader. linux-2.6-sata-promise-pata-ports.patch: drivers/scsi/ata_piix.c | 40 +++++---------------------------- drivers/scsi/libata-core.c | 21 ++++++++++++++--- drivers/scsi/sata_promise.c | 52 ++++++++++++++++++++++++++++++++++++++------ include/linux/libata.h | 3 -- 4 files changed, 70 insertions(+), 46 deletions(-) Index: linux-2.6-sata-promise-pata-ports.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-sata-promise-pata-ports.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-sata-promise-pata-ports.patch 13 Dec 2005 02:26:22 -0000 1.4 +++ linux-2.6-sata-promise-pata-ports.patch 6 Jan 2006 06:13:52 -0000 1.5 @@ -115,15 +115,15 @@ static void pdc_pata_phy_reset(struct ata_port *ap); static void pdc_sata_phy_reset(struct ata_port *ap); static void pdc_qc_prep(struct ata_queued_cmd *qc); -@@ -162,7 +163,7 @@ static struct ata_port_info pdc_port_inf +@@ -165,7 +165,7 @@ static struct ata_port_info pdc_port_inf /* board_2037x */ { .sht = &pdc_ata_sht, -- .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | -+ .host_flags = /* ATA_FLAG_SATA | */ ATA_FLAG_NO_LEGACY | - ATA_FLAG_SRST | ATA_FLAG_MMIO, +- .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, ++ .host_flags = PDC_COMMON_FLAGS, .pio_mask = 0x1f, /* pio0-4 */ .mwdma_mask = 0x07, /* mwdma0-2 */ + .udma_mask = 0x7f, /* udma0-6 ; FIXME */ @@ -311,17 +312,34 @@ static void pdc_reset_port(struct ata_po static void pdc_sata_phy_reset(struct ata_port *ap) { From fedora-cvs-commits at redhat.com Fri Jan 6 06:14:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:14:50 -0500 Subject: rpms/kernel/FC-4 linux-2.6-firmware-timeout.patch,1.1,NONE Message-ID: <200601060614.k066EoWZ031632@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv31574 Removed Files: linux-2.6-firmware-timeout.patch Log Message: dupe. --- linux-2.6-firmware-timeout.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 06:15:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:15:26 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1566,1.1567 Message-ID: <200601060615.k066FQMD031909@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv31865 Modified Files: kernel-2.6.spec Log Message: doh Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1566 retrieving revision 1.1567 diff -u -r1.1566 -r1.1567 --- kernel-2.6.spec 6 Jan 2006 06:13:52 -0000 1.1566 +++ kernel-2.6.spec 6 Jan 2006 06:15:24 -0000 1.1567 @@ -349,6 +349,7 @@ Patch1800: linux-2.6-pcmcia-disable-warning.patch Patch1810: linux-2.6-pwc-powerup-by-default.patch Patch1820: linux-2.6-net-acenic-use-after-free.patch +Patch1830: linux-2.6-smsc-ircc2-pnp.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch From fedora-cvs-commits at redhat.com Fri Jan 6 06:17:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:17:28 -0500 Subject: rpms/kernel/FC-4/configs config-generic,1.45,1.46 Message-ID: <200601060617.k066HSdV011540@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv11483/configs Modified Files: config-generic Log Message: missing config option Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- config-generic 6 Jan 2006 05:42:19 -0000 1.45 +++ config-generic 6 Jan 2006 06:17:25 -0000 1.46 @@ -1470,6 +1470,7 @@ CONFIG_SERIAL_8250_CS=m # CONFIG_SERIAL_8250_ACPI is not set CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y From fedora-cvs-commits at redhat.com Fri Jan 6 06:18:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:18:34 -0500 Subject: rpms/kernel/FC-4/configs config-generic,1.46,1.47 Message-ID: <200601060618.k066IYSj012160@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv12073/configs Modified Files: config-generic Log Message: slab debug whilst in testing Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- config-generic 6 Jan 2006 06:17:25 -0000 1.46 +++ config-generic 6 Jan 2006 06:18:31 -0000 1.47 @@ -2519,7 +2519,7 @@ CONFIG_DEBUG_RODATA=y # Turn off these debug options for production kernels. -# CONFIG_DEBUG_SLAB is not set +CONFIG_DEBUG_SLAB=y # # Security options From fedora-cvs-commits at redhat.com Fri Jan 6 06:35:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:35:34 -0500 Subject: rpms/kernel/devel linux-2.6-acpi-thinkpad-c2c3.patch,1.1,1.2 Message-ID: <200601060635.k066ZYsu018082@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18002 Modified Files: linux-2.6-acpi-thinkpad-c2c3.patch Log Message: A few extra systems linux-2.6-acpi-thinkpad-c2c3.patch: processor_idle.c | 67 +++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 51 insertions(+), 16 deletions(-) Index: linux-2.6-acpi-thinkpad-c2c3.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-acpi-thinkpad-c2c3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-acpi-thinkpad-c2c3.patch 16 Oct 2005 22:23:45 -0000 1.1 +++ linux-2.6-acpi-thinkpad-c2c3.patch 6 Jan 2006 06:35:31 -0000 1.2 @@ -1,16 +1,30 @@ -processor_idle.c vs Lindent resulted in something of a trainwreck -with whitespace all over the place. This diff rearranges teh -processor_power_dmi_table to look like it did before that accident, -and adds two additional BIOS's to the list as encountered by -Fedora users. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165590 -Signed-off-by: Dave Jones ---- linux-2.6.13/drivers/acpi/processor_idle.c~ 2005-09-09 19:24:25.000000000 -0400 -+++ linux-2.6.13/drivers/acpi/processor_idle.c 2005-09-09 19:33:18.000000000 -0400 -@@ -94,22 +94,27 @@ static int set_max_cstate(struct dmi_sys +From: Thomas Rosner + +This adds all known BIOS versions of IBM R40e Laptops to the C2/C3 +processor state blacklist and thus prevents them from crashing. Fixes Bug +#3549. + +Implementation is probably overly verbose, but DMI_MATCH seems to give us +no choice. + +Signed-off-by: Thomas Rosner +Cc: +Cc: "Brown, Len" +Cc: Dave Jones +Signed-off-by: Andrew Morton +--- + + drivers/acpi/processor_idle.c | 67 ++++++++++++++++++++++++-------- + 1 files changed, 51 insertions(+), 16 deletions(-) + +diff -puN drivers/acpi/processor_idle.c~acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-for-2613-bug-3549 drivers/acpi/processor_idle.c +--- devel/drivers/acpi/processor_idle.c~acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-for-2613-bug-3549 2006-01-05 22:28:12.000000000 -0800 ++++ devel-akpm/drivers/acpi/processor_idle.c 2006-01-05 22:28:12.000000000 -0800 +@@ -95,22 +95,57 @@ static int set_max_cstate(struct dmi_sys } static struct dmi_system_id __initdata processor_power_dmi_table[] = { @@ -19,35 +33,70 @@ - "IBM"), - DMI_MATCH(DMI_BIOS_VERSION, - "1SET60WW")}, -+ { set_max_cstate, "IBM ThinkPad R40e", { -+ DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION, "1SET60WW")}, - (void *)1}, -+ { set_max_cstate, "IBM ThinkPad R40e", { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW")}, -+ (void*)1}, -+ { set_max_cstate, "IBM ThinkPad R40e", { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, -+ (void*)1}, -+ - {set_max_cstate, "Medion 41700", { +- (void *)1}, +- {set_max_cstate, "Medion 41700", { - DMI_MATCH(DMI_BIOS_VENDOR, - "Phoenix Technologies LTD"), - DMI_MATCH(DMI_BIOS_VERSION, - "R01-A1J")}, (void *)1}, -+ DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), -+ DMI_MATCH(DMI_BIOS_VERSION, "R01-A1J")}, -+ (void *)1}, -+ - {set_max_cstate, "Clevo 5600D", { +- {set_max_cstate, "Clevo 5600D", { - DMI_MATCH(DMI_BIOS_VENDOR, - "Phoenix Technologies LTD"), - DMI_MATCH(DMI_BIOS_VERSION, - "SHE845M0.86C.0013.D.0302131307")}, -+ DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), -+ DMI_MATCH(DMI_BIOS_VERSION, "SHE845M0.86C.0013.D.0302131307")}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW")}, (void *)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET43WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET45WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET47WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET50WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET52WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET55WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET56WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET59WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET62WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET64WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET65WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, (void*)1}, ++ { set_max_cstate, "Medion 41700", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), ++ DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J")}, (void *)1}, ++ { set_max_cstate, "Clevo 5600D", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), ++ DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")}, (void *)2}, {}, }; +_ + From fedora-cvs-commits at redhat.com Fri Jan 6 06:35:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:35:55 -0500 Subject: rpms/kernel/FC-4 linux-2.6-acpi-thinkpad-c2c3.patch,1.1,1.2 Message-ID: <200601060635.k066ZtbH018247@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18189 Modified Files: linux-2.6-acpi-thinkpad-c2c3.patch Log Message: more systems linux-2.6-acpi-thinkpad-c2c3.patch: processor_idle.c | 67 +++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 51 insertions(+), 16 deletions(-) Index: linux-2.6-acpi-thinkpad-c2c3.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-acpi-thinkpad-c2c3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-acpi-thinkpad-c2c3.patch 28 Oct 2005 05:23:06 -0000 1.1 +++ linux-2.6-acpi-thinkpad-c2c3.patch 6 Jan 2006 06:35:51 -0000 1.2 @@ -1,16 +1,30 @@ -processor_idle.c vs Lindent resulted in something of a trainwreck -with whitespace all over the place. This diff rearranges teh -processor_power_dmi_table to look like it did before that accident, -and adds two additional BIOS's to the list as encountered by -Fedora users. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165590 -Signed-off-by: Dave Jones ---- linux-2.6.13/drivers/acpi/processor_idle.c~ 2005-09-09 19:24:25.000000000 -0400 -+++ linux-2.6.13/drivers/acpi/processor_idle.c 2005-09-09 19:33:18.000000000 -0400 -@@ -94,22 +94,27 @@ static int set_max_cstate(struct dmi_sys +From: Thomas Rosner + +This adds all known BIOS versions of IBM R40e Laptops to the C2/C3 +processor state blacklist and thus prevents them from crashing. Fixes Bug +#3549. + +Implementation is probably overly verbose, but DMI_MATCH seems to give us +no choice. + +Signed-off-by: Thomas Rosner +Cc: +Cc: "Brown, Len" +Cc: Dave Jones +Signed-off-by: Andrew Morton +--- + + drivers/acpi/processor_idle.c | 67 ++++++++++++++++++++++++-------- + 1 files changed, 51 insertions(+), 16 deletions(-) + +diff -puN drivers/acpi/processor_idle.c~acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-for-2613-bug-3549 drivers/acpi/processor_idle.c +--- devel/drivers/acpi/processor_idle.c~acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-for-2613-bug-3549 2006-01-05 22:28:12.000000000 -0800 ++++ devel-akpm/drivers/acpi/processor_idle.c 2006-01-05 22:28:12.000000000 -0800 +@@ -95,22 +95,57 @@ static int set_max_cstate(struct dmi_sys } static struct dmi_system_id __initdata processor_power_dmi_table[] = { @@ -19,35 +33,70 @@ - "IBM"), - DMI_MATCH(DMI_BIOS_VERSION, - "1SET60WW")}, -+ { set_max_cstate, "IBM ThinkPad R40e", { -+ DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION, "1SET60WW")}, - (void *)1}, -+ { set_max_cstate, "IBM ThinkPad R40e", { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW")}, -+ (void*)1}, -+ { set_max_cstate, "IBM ThinkPad R40e", { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, -+ (void*)1}, -+ - {set_max_cstate, "Medion 41700", { +- (void *)1}, +- {set_max_cstate, "Medion 41700", { - DMI_MATCH(DMI_BIOS_VENDOR, - "Phoenix Technologies LTD"), - DMI_MATCH(DMI_BIOS_VERSION, - "R01-A1J")}, (void *)1}, -+ DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), -+ DMI_MATCH(DMI_BIOS_VERSION, "R01-A1J")}, -+ (void *)1}, -+ - {set_max_cstate, "Clevo 5600D", { +- {set_max_cstate, "Clevo 5600D", { - DMI_MATCH(DMI_BIOS_VENDOR, - "Phoenix Technologies LTD"), - DMI_MATCH(DMI_BIOS_VERSION, - "SHE845M0.86C.0013.D.0302131307")}, -+ DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), -+ DMI_MATCH(DMI_BIOS_VERSION, "SHE845M0.86C.0013.D.0302131307")}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW")}, (void *)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET43WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET45WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET47WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET50WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET52WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET55WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET56WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET59WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET62WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET64WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET65WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, (void*)1}, ++ { set_max_cstate, "Medion 41700", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), ++ DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J")}, (void *)1}, ++ { set_max_cstate, "Clevo 5600D", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), ++ DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")}, (void *)2}, {}, }; +_ + From fedora-cvs-commits at redhat.com Fri Jan 6 06:36:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:36:11 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1567, 1.1568 linux-2.6-hvc-console.patch, 1.1, NONE linux-2.6-hvc-rtas-console.patch, 1.1, NONE Message-ID: <200601060636.k066aBrY018393@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18279 Modified Files: kernel-2.6.spec Removed Files: linux-2.6-hvc-console.patch linux-2.6-hvc-rtas-console.patch Log Message: borken patches Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1567 retrieving revision 1.1568 diff -u -r1.1567 -r1.1568 --- kernel-2.6.spec 6 Jan 2006 06:15:24 -0000 1.1567 +++ kernel-2.6.spec 6 Jan 2006 06:36:08 -0000 1.1568 @@ -226,10 +226,8 @@ Patch301: linux-2.6-serial-of.patch Patch302: linux-2.6.15-rc1-ppc64-syscallpath.patch Patch303: linux-2.6.15-mv643xx-fixes.patch -Patch304: linux-2.6-hvc-console.patch -Patch305: linux-2.6-hvc-rtas-console.patch -Patch306: linux-2.6-ppc-rtas-check.patch -Patch307: linux-2.6-powerpc-parport.patch +Patch304: linux-2.6-ppc-rtas-check.patch +Patch305: linux-2.6-powerpc-parport.patch # 400 - 499 ia64 # 500 - 599 s390(x) @@ -588,8 +586,6 @@ %patch303 -p1 %patch304 -p1 %patch305 -p1 -%patch306 -p1 -%patch307 -p1 # # Xen --- linux-2.6-hvc-console.patch DELETED --- --- linux-2.6-hvc-rtas-console.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 06:41:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:41:28 -0500 Subject: rpms/kernel/devel linux-2.6-edid-check.patch, NONE, 1.1 linux-2.6-pwc-powerup-by-default.patch, NONE, 1.1 linux-2.6-smsc-ircc2-pnp.patch, NONE, 1.1 linux-2.6-usbhid-wireless-security-lock.patch, NONE, 1.1 linux-2.6-w1-hush-debug.patch, NONE, 1.1 linux-2.6-x86_64-ati-apic-timer.patch, NONE, 1.1 kernel-2.6.spec, 1.1822, 1.1823 Message-ID: <200601060641.k066fSBK012679@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12651 Modified Files: kernel-2.6.spec Added Files: linux-2.6-edid-check.patch linux-2.6-pwc-powerup-by-default.patch linux-2.6-smsc-ircc2-pnp.patch linux-2.6-usbhid-wireless-security-lock.patch linux-2.6-w1-hush-debug.patch linux-2.6-x86_64-ati-apic-timer.patch Log Message: - Add timer quirk for ATI chipsets. - Reboot through BIOS on HP laptops. - Additional check in x86 edid parser. - power up pwc webcam by default - don't confuse wireless security lock as a mouse. - Hush some debug messages in w1 driver. linux-2.6-edid-check.patch: video.S | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-edid-check.patch --- --- linux-2.6.15/arch/i386/boot/video.S~ 2006-01-06 01:26:06.000000000 -0500 +++ linux-2.6.15/arch/i386/boot/video.S 2006-01-06 01:28:40.000000000 -0500 @@ -1951,9 +1951,18 @@ store_edid: stosl movw $0x4f15, %ax # do VBE/DDC - movw $0x01, %bx + movw $0x00, %bx # INSTALLATION CHECK / CAPABILITIES movw $0x00, %cx - movw $0x00, %dx + movw $0x00, %dx + movw $0x140, %di + int $0x10 + cmpb $0x01, %ah + je no_edid + + movw $0x4f15, %ax # do VBE/DDC + movw $0x01, %bx # READ_EDID + movw $0x00, %cx + movw $0x00, %dx movw $0x140, %di int $0x10 linux-2.6-pwc-powerup-by-default.patch: pwc-if.c | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE linux-2.6-pwc-powerup-by-default.patch --- --- linux-2.6.13/drivers/usb/media/pwc/pwc-if.c~ 2005-09-28 18:59:49.000000000 -0400 +++ linux-2.6.13/drivers/usb/media/pwc/pwc-if.c 2005-09-28 19:09:08.000000000 -0400 @@ -1946,6 +1946,12 @@ static int usb_pwc_probe(struct usb_inte if (hint < MAX_DEV_HINTS) device_hint[hint].pdev = pdev; + if (!power_save) { + i = pwc_camera_power(pdev, 1); + if (i < 0) + Info("Failed to power up the camera! (%d)\n", i); + } + Trace(TRACE_PROBE, "probe() function returning struct at 0x%p.\n", pdev); usb_set_intfdata (intf, pdev); return 0; linux-2.6-smsc-ircc2-pnp.patch: smsc-ircc2.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+) --- NEW FILE linux-2.6-smsc-ircc2-pnp.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=153970 --- linux-2.6.13/drivers/net/irda/smsc-ircc2.c~ 2005-10-25 00:38:18.000000000 -0400 +++ linux-2.6.13/drivers/net/irda/smsc-ircc2.c 2005-10-25 00:43:03.000000000 -0400 @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -68,6 +69,7 @@ #include "smsc-ircc2.h" #include "smsc-sio.h" +static int pnp_registered_port; MODULE_AUTHOR("Daniele Peri "); MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver"); @@ -325,6 +327,61 @@ static inline void register_bank(int iob } +/* PNP probing */ + +static const struct pnp_device_id smsc_ircc_pnp_table[] = { +{ + .id = "SMCf010", + .driver_data = 0 +}, +{ } +}; + +MODULE_DEVICE_TABLE(pnp, smsc_ircc_pnp_table); + +static int __devinit +smsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id) +{ + unsigned int firbase, sirbase; + u8 dma, irq; + + if (pnp_port_valid(dev, 0) && + !(pnp_port_flags(dev, 0) & IORESOURCE_DISABLED)) + sirbase = pnp_port_start(dev, 0); + else + return -EINVAL; + + if (pnp_port_valid(dev, 1) && + !(pnp_port_flags(dev, 1) & IORESOURCE_DISABLED)) + firbase = pnp_port_start(dev, 1); + else + return -EINVAL; + + if (pnp_irq_valid(dev, 0) && + !(pnp_irq_flags(dev, 0) & IORESOURCE_DISABLED)) + irq = pnp_irq(dev, 0); + else + return -EINVAL; + + if (pnp_dma_valid(dev, 0) && + !(pnp_dma_flags(dev, 0) & IORESOURCE_DISABLED)) + dma = pnp_dma(dev, 0); + else + return -EINVAL; + + if (smsc_ircc_open(firbase, sirbase, dma, irq)) + return -ENODEV; + + return 0; +} + +static struct pnp_driver smsc_ircc_pnp_driver = { + .name = "smsc-ircc2", + .id_table = smsc_ircc_pnp_table, + .probe = smsc_ircc_pnp_probe, +}; + + /******************************************************************************* * * @@ -1741,6 +1798,8 @@ static void __exit smsc_ircc_cleanup(voi IRDA_DEBUG(1, "%s\n", __FUNCTION__); + if (pnp_registered_port) + pnp_unregister_driver(&smsc_ircc_pnp_driver); for (i = 0; i < 2; i++) { if (dev_self[i]) smsc_ircc_close(dev_self[i]); @@ -1998,8 +2057,16 @@ static int __init smsc_ircc_look_for_chi struct smsc_chip_address *address; char *type; unsigned int cfg_base, found; + int r; found = 0; + + r = pnp_register_driver(&smsc_ircc_pnp_driver); + if (r >= 0) { + pnp_registered_port = 1; + found += r; + } + address = possible_addresses; while (address->cfg_base) { linux-2.6-usbhid-wireless-security-lock.patch: hid-core.c | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE linux-2.6-usbhid-wireless-security-lock.patch --- bugzilla 147479 diff -ur linux-2.6.11.orig/drivers/usb/input/hid-core.c linux-2.6.11/drivers/usb/input/hid-core.c --- linux-2.6.11.orig/drivers/usb/input/hid-core.c 2005-03-02 08:38:10.000000000 +0100 +++ linux-2.6.11/drivers/usb/input/hid-core.c 2005-07-24 19:25:35.000000000 +0200 @@ -1494,6 +1494,9 @@ #define USB_VENDOR_ID_DELORME 0x1163 #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100 +#define USB_VENDOR_ID_CYPRES 0x04b4 +#define USB_DEVICE_ID_SITECOM_WSL 0x7417 + static struct hid_blacklist { __u16 idVendor; __u16 idProduct; @@ -1586,6 +1589,7 @@ { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_SITECOM_WSL, HID_QUIRK_IGNORE }, { 0, 0 } }; linux-2.6-w1-hush-debug.patch: w1.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-w1-hush-debug.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=167403 --- linux-2.6.13/drivers/w1/w1.c~ 2005-09-28 06:09:13.000000000 -0400 +++ linux-2.6.13/drivers/w1/w1.c 2005-09-28 06:09:27.000000000 -0400 @@ -593,7 +593,7 @@ void w1_search(struct w1_master *dev, w1 * Return 0 - device(s) present, 1 - no devices present. */ if (w1_reset_bus(dev)) { - dev_dbg(&dev->dev, "No devices present on the wire.\n"); + //dev_dbg(&dev->dev, "No devices present on the wire.\n"); break; } linux-2.6-x86_64-ati-apic-timer.patch: io_apic.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-x86_64-ati-apic-timer.patch --- ATI's AMD64 chipsets appear to have the interesting "feature" that every timer tick causes an interrupt from both the APIC and the legacy PIC. The following patch checks if the northbridge matches the affected chipsets, and if so disables APIC pin 1. As an added bonus, it skips the acpi timer override since I haven't found one of these machines where it's needed and it's actively harmful on at least some of them. We've been shipping this patch in Ubuntu with no reported issues. This is kernel bugzilla number 3927. Signed-off-by: Matthew Garrett --- io_apic.c.orig 2005-09-20 21:43:42.000000000 +0100 +++ a/arch/x86_64/kernel/io_apic.c 2005-09-20 22:33:42.000000000 +0100 @@ -258,18 +259,24 @@ void __init check_ioapic(void) for (func = 0; func < 8; func++) { u32 class; u32 vendor; + u16 product; u8 type; class = read_pci_config(num,slot,func, PCI_CLASS_REVISION); + if (class == 0xffffffff) break; - if ((class >> 16) != PCI_CLASS_BRIDGE_PCI) + if ((class >> 16) != PCI_CLASS_BRIDGE_PCI && + (class >> 16) != PCI_CLASS_BRIDGE_HOST) continue; vendor = read_pci_config(num, slot, func, PCI_VENDOR_ID); vendor &= 0xffff; + + product = read_pci_config_16(num, slot, func, + PCI_DEVICE_ID); switch (vendor) { case PCI_VENDOR_ID_VIA: #ifdef CONFIG_GART_IOMMU @@ -292,8 +299,18 @@ void __init check_ioapic(void) #endif /* RED-PEN skip them on mptables too? */ return; - } + case PCI_VENDOR_ID_ATI: + if (product==0x5950 || product==0x5951) { + printk(KERN_INFO "ATI board detected - disabling APIC pin 1\n"); +#ifdef CONFIG_ACPI + /* This seems to be wrong, too */ + acpi_skip_timer_override = 1; +#endif + disable_timer_pin_1 = 1; + } + return; + } /* No multi-function device? */ type = read_pci_config_byte(num,slot,func, PCI_HEADER_TYPE); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1822 retrieving revision 1.1823 diff -u -r1.1822 -r1.1823 --- kernel-2.6.spec 6 Jan 2006 03:15:23 -0000 1.1822 +++ kernel-2.6.spec 6 Jan 2006 06:41:25 -0000 1.1823 @@ -221,6 +221,8 @@ Patch203: linux-2.6.14-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch Patch205: linux-2.6-x86_64-disable-hotplug-guessing.patch +Patch206: linux-2.6-x86_64-ati-apic-timer.patch +Patch207: linux-2.6-edid-check.patch # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch @@ -360,9 +362,10 @@ Patch1770: linux-2.6-valid-ether-addr.patch Patch1780: linux-2.6-firmware-loader-timeout.patch Patch1790: linux-2.6-softcursor-persistent-alloc.patch - -# ACPI patches. -Patch1800: linux-2.6-acpi-thinkpad-c2c3.patch +Patch1800: linux-2.6-pwc-powerup-by-default.patch +Patch1810: linux-2.6-smsc-ircc2-pnp.patch +Patch1820: linux-2.6-usbhid-wireless-security-lock.patch +Patch1830: linux-2.6-w1-hush-debug.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -376,6 +379,9 @@ Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch Patch2002: linux-2.6-vm-debug.patch +# ACPI patches. +Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch + # Broadcom wireless driver Patch5000: linux-2.6-bcm43xx.patch Patch5001: linux-2.6-bcm43xx-quiet.patch @@ -630,6 +636,10 @@ %patch204 -p1 # Disable guessing of how many hotplug cpus to add. %patch205 -p1 +# ATI timer quirk. +%patch206 -p1 +# Reboot thru bios on HP laptops. +%patch207 -p1 # # ppc64 @@ -859,10 +869,14 @@ %patch1780 -p1 # Use persistent allocation in softcursor %patch1790 -p1 - -# ACPI patches. -# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. +# Power up PWC driver by default. %patch1800 -p1 +# PNP support for smsc-ircc2 +%patch1810 -p1 +# don't mistake security lock as a mouse +%patch1820 -p1 +# Silence debug messages in w1 +%patch1830 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -880,6 +894,10 @@ # Try to trace some negative pagecount errors. %patch2002 -p1 +# ACPI patches. +# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. +%patch2100 -p1 + # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream @@ -952,7 +970,7 @@ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -prep/" Makefile # get rid of unwanted files resulting from patch fuzz -find . -name "*.orig" -o -name "*~" -exec rm -fv {} \; >/dev/null & +find . -name "*.orig" -o -name "*~" -exec rm -f {} \; >/dev/null & ### ### build @@ -1394,6 +1412,14 @@ %endif %changelog +* Fri Jan 6 2006 Dave Jones +- Add timer quirk for ATI chipsets. +- Reboot through BIOS on HP laptops. +- Additional check in x86 edid parser. +- power up pwc webcam by default +- don't confuse wireless security lock as a mouse. +- Hush some debug messages in w1 driver. + * Thu Jan 5 2006 Dave Jones - Try to debug some negative pagecount errors. From fedora-cvs-commits at redhat.com Fri Jan 6 06:42:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:42:24 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1823,1.1824 Message-ID: <200601060642.k066gOG5012721@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12708 Modified Files: kernel-2.6.spec Log Message: Reboot through BIOS on HP laptops. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1823 retrieving revision 1.1824 diff -u -r1.1823 -r1.1824 --- kernel-2.6.spec 6 Jan 2006 06:41:25 -0000 1.1823 +++ kernel-2.6.spec 6 Jan 2006 06:42:22 -0000 1.1824 @@ -366,6 +366,7 @@ Patch1810: linux-2.6-smsc-ircc2-pnp.patch Patch1820: linux-2.6-usbhid-wireless-security-lock.patch Patch1830: linux-2.6-w1-hush-debug.patch +Patch1840: linux-2.6-x86-hp-reboot.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -877,6 +878,8 @@ %patch1820 -p1 # Silence debug messages in w1 %patch1830 -p1 +# Reboot through BIOS on HP laptops. +%patch1840 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 From fedora-cvs-commits at redhat.com Fri Jan 6 06:42:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 01:42:48 -0500 Subject: rpms/kernel/devel linux-2.6-x86-hp-reboot.patch,NONE,1.1 Message-ID: <200601060642.k066gmGc012746@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12732 Added Files: linux-2.6-x86-hp-reboot.patch Log Message: Reboot through BIOS on HP laptops. linux-2.6-x86-hp-reboot.patch: reboot.c | 8 ++++++++ 1 files changed, 8 insertions(+) --- NEW FILE linux-2.6-x86-hp-reboot.patch --- --- linux-2.6.14/arch/i386/kernel/reboot.c~ 2005-11-30 00:31:30.000000000 -0500 +++ linux-2.6.14/arch/i386/kernel/reboot.c 2005-11-30 00:32:23.000000000 -0500 @@ -111,6 +111,14 @@ static struct dmi_system_id __initdata r DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"), }, }, + { /* HP laptops have weird reboot issues */ + .callback = set_bios_reboot, + .ident = "HP Laptop", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"), + }, + }, { } }; From fedora-cvs-commits at redhat.com Fri Jan 6 07:37:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 02:37:05 -0500 Subject: rpms/kernel/devel/configs config-powerpc64-iseries,1.5,1.6 Message-ID: <200601060737.k067b5Po026347@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv26219/configs Modified Files: config-powerpc64-iseries Log Message: fix the iseries vs input layer nonsense. Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config-powerpc64-iseries 8 Dec 2005 22:50:06 -0000 1.5 +++ config-powerpc64-iseries 6 Jan 2006 07:37:03 -0000 1.6 @@ -22,6 +22,7 @@ # CONFIG_FB_OF is not set # CONFIG_BLK_DEV_FD is not set # CONFIG_USB is not set +# CONFIG_BT is not set # CONFIG_INPUT is not set # CONFIG_NET_RADIO is not set # CONFIG_MTD is not set From fedora-cvs-commits at redhat.com Fri Jan 6 07:37:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 02:37:06 -0500 Subject: rpms/kernel/devel linux-2.6-ppc-iseries-input-layer.patch, NONE, 1.1 kernel-2.6.spec, 1.1824, 1.1825 linux-2.6-missing-exports.patch, 1.1, NONE Message-ID: <200601060737.k067b6t7026337@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26219 Modified Files: kernel-2.6.spec Added Files: linux-2.6-ppc-iseries-input-layer.patch Removed Files: linux-2.6-missing-exports.patch Log Message: fix the iseries vs input layer nonsense. linux-2.6-ppc-iseries-input-layer.patch: Kconfig | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-ppc-iseries-input-layer.patch --- iSeries has no keyboard, so it's valid to build a kernel with no input layer. It seems a bit absurd to call one of these 'embedded'. Signed-off-by: Dave Jones --- linux-2.6.15/drivers/input/Kconfig~ 2006-01-06 02:27:56.000000000 -0500 +++ linux-2.6.15/drivers/input/Kconfig 2006-01-06 02:28:08.000000000 -0500 @@ -5,7 +5,7 @@ menu "Input device support" config INPUT - tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED + tristate "Generic input layer (needed for keyboard, mouse, ...)" default y ---help--- Say Y here if you have any input device (mouse, keyboard, tablet, Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1824 retrieving revision 1.1825 diff -u -r1.1824 -r1.1825 --- kernel-2.6.spec 6 Jan 2006 06:42:22 -0000 1.1824 +++ kernel-2.6.spec 6 Jan 2006 07:37:03 -0000 1.1825 @@ -241,6 +241,7 @@ Patch314: linux-2.6-ppc-rtas-check.patch Patch315: linux-2.6-powerpc-parport.patch Patch316: linux-2.6-cell-iommu.patch +Patch317: linux-2.6-ppc-iseries-input-layer.patch # 400 - 499 ia64 Patch400: linux-2.6-ia64-spinlock-size.patch @@ -350,7 +351,6 @@ Patch1660: linux-2.6-input-usblegacy.patch Patch1670: linux-2.6-serial-tickle-nmi.patch Patch1671: linux-2.6-serial-nrports.patch -Patch1680: linux-2.6-missing-exports.patch Patch1690: linux-2.6-radeon-backlight.patch Patch1700: linux-2.6-ide-tune-locking.patch Patch1710: linux-2.6-autofs-pathlookup.patch @@ -677,6 +677,8 @@ %patch315 -p1 # Handle new Cell boards with >512MiB RAM %patch316 -p1 +# No input layer on iseries +%patch317 -p1 # IA64 # Altix: Fix sn_flush_device_kernel & spinlock initialization @@ -846,8 +848,6 @@ %patch1670 -p1 # Limit number of serial ports registered. %patch1671 -p1 -# Missing EXPORT_SYMBOL's -%patch1680 -p1 # Radeon on thinkpad backlight power-management goodness. %patch1690 -p1 # Fix IDE locking bug. @@ -1422,6 +1422,7 @@ - power up pwc webcam by default - don't confuse wireless security lock as a mouse. - Hush some debug messages in w1 driver. +- Disable input layer on iseries. * Thu Jan 5 2006 Dave Jones - Try to debug some negative pagecount errors. --- linux-2.6-missing-exports.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 07:55:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 02:55:54 -0500 Subject: rpms/kernel/devel linux-2.6-edid-check.patch,1.1,1.2 Message-ID: <200601060755.k067tsIA013657@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13604 Modified Files: linux-2.6-edid-check.patch Log Message: build fix linux-2.6-edid-check.patch: video.S | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) Index: linux-2.6-edid-check.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-edid-check.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-edid-check.patch 6 Jan 2006 06:41:25 -0000 1.1 +++ linux-2.6-edid-check.patch 6 Jan 2006 07:55:50 -0000 1.2 @@ -21,3 +21,13 @@ movw $0x140, %di int $0x10 +--- linux-2.6.15/arch/i386/boot/video.S~ 2006-01-06 02:55:20.000000000 -0500 ++++ linux-2.6.15/arch/i386/boot/video.S 2006-01-06 02:55:28.000000000 -0500 +@@ -1966,6 +1966,7 @@ store_edid: + movw $0x140, %di + int $0x10 + ++no_edid: + popw %di # restore all registers + popw %dx + popw %cx From fedora-cvs-commits at redhat.com Fri Jan 6 08:08:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 03:08:16 -0500 Subject: rpms/kernel/devel linux-2.6-vm-clear-unreclaimable.patch, NONE, 1.1 kernel-2.6.spec, 1.1825, 1.1826 Message-ID: <200601060808.k0688Ght016804@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16751 Modified Files: kernel-2.6.spec Added Files: linux-2.6-vm-clear-unreclaimable.patch Log Message: tweak oom killer. linux-2.6-vm-clear-unreclaimable.patch: filemap.c | 7 +++++++ page_alloc.c | 6 ++++++ 2 files changed, 13 insertions(+) --- NEW FILE linux-2.6-vm-clear-unreclaimable.patch --- --- linux-2.6.14/mm/filemap.c~ 2005-12-10 01:47:15.000000000 -0500 +++ linux-2.6.14/mm/filemap.c 2005-12-10 01:47:46.000000000 -0500 @@ -471,11 +471,18 @@ EXPORT_SYMBOL(unlock_page); */ void end_page_writeback(struct page *page) { + struct zone *zone = page_zone(page); if (!TestClearPageReclaim(page) || rotate_reclaimable_page(page)) { if (!test_clear_page_writeback(page)) BUG(); } smp_mb__after_clear_bit(); + if (zone->all_unreclaimable) { + spin_lock(&zone->lock); + zone->all_unreclaimable = 0; + zone->pages_scanned = 0; + spin_unlock(&zone->lock); + } wake_up_page(page, PG_writeback); } EXPORT_SYMBOL(end_page_writeback); --- linux-2.6.14/mm/page_alloc.c~ 2005-12-10 01:47:51.000000000 -0500 +++ linux-2.6.14/mm/page_alloc.c 2005-12-10 01:48:25.000000000 -0500 @@ -657,6 +657,12 @@ static void fastcall free_hot_cold_page( pcp->count++; if (pcp->count >= pcp->high) pcp->count -= free_pages_bulk(zone, pcp->batch, &pcp->list, 0); + else if (zone->all_unreclaimable) { + spin_lock(&zone->lock); + zone->all_unreclaimable = 0; + zone->pages_scanned = 0; + spin_unlock(&zone->lock); + } local_irq_restore(flags); put_cpu(); } Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1825 retrieving revision 1.1826 diff -u -r1.1825 -r1.1826 --- kernel-2.6.spec 6 Jan 2006 07:37:03 -0000 1.1825 +++ kernel-2.6.spec 6 Jan 2006 08:08:13 -0000 1.1826 @@ -379,6 +379,7 @@ Patch2000: linux-2.6-vm-oomkiller-debugging.patch Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch Patch2002: linux-2.6-vm-debug.patch +Patch2003: linux-2.6-vm-clear-unreclaimable.patch # ACPI patches. Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch @@ -896,6 +897,8 @@ %patch2001 -p1 # Try to trace some negative pagecount errors. %patch2002 -p1 +# VM oom killer tweaks. +%patch2003 -p1 # ACPI patches. # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. @@ -1423,6 +1426,7 @@ - don't confuse wireless security lock as a mouse. - Hush some debug messages in w1 driver. - Disable input layer on iseries. +- VM OOM killer tweaks. * Thu Jan 5 2006 Dave Jones - Try to debug some negative pagecount errors. From fedora-cvs-commits at redhat.com Fri Jan 6 08:33:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 03:33:23 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1826,1.1826.2.1 Message-ID: <200601060833.k068XNM5027342@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27329 Modified Files: Tag: private-fc5-test2-branch kernel-2.6.spec Log Message: branch for test2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826 retrieving revision 1.1826.2.1 diff -u -r1.1826 -r1.1826.2.1 --- kernel-2.6.spec 6 Jan 2006 08:08:13 -0000 1.1826 +++ kernel-2.6.spec 6 Jan 2006 08:33:20 -0000 1.1826.2.1 @@ -1419,6 +1419,7 @@ %changelog * Fri Jan 6 2006 Dave Jones +- Branch CVS for test2. - Add timer quirk for ATI chipsets. - Reboot through BIOS on HP laptops. - Additional check in x86 edid parser. From fedora-cvs-commits at redhat.com Fri Jan 6 08:37:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 03:37:19 -0500 Subject: rpms/cadaver/devel cadaver-0.22.3.tar.gz.asc, NONE, 1.1 .cvsignore, 1.7, 1.8 cadaver.spec, 1.18, 1.19 sources, 1.7, 1.8 upstream, 1.1, 1.2 Message-ID: <200601060837.k068bJFW027390@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/cadaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27374 Modified Files: .cvsignore cadaver.spec sources upstream Added Files: cadaver-0.22.3.tar.gz.asc Log Message: * Fri Jan 6 2006 Joe Orton 0.22.3-1 - update to 0.22.3 --- NEW FILE cadaver-0.22.3.tar.gz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQBDtoVeR/aWnQ5EzwwRAnynAJ4sdTM+maFWusneWBcZO4YjhP1AbgCaA3Jh d0PL/BcPGXO9QiwbOQHVd8o= =UxfW -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/cadaver/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 12 Jan 2005 14:54:00 -0000 1.7 +++ .cvsignore 6 Jan 2006 08:37:17 -0000 1.8 @@ -1 +1 @@ -cadaver-0.22.2.tar.gz +cadaver-0.22.3.tar.gz Index: cadaver.spec =================================================================== RCS file: /cvs/dist/rpms/cadaver/devel/cadaver.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- cadaver.spec 9 Dec 2005 22:39:51 -0000 1.18 +++ cadaver.spec 6 Jan 2006 08:37:17 -0000 1.19 @@ -1,6 +1,6 @@ Name: cadaver -Version: 0.22.2 -Release: 3.1 +Version: 0.22.3 +Release: 1 Summary: Command-line WebDAV client License: GPL Group: Applications/Internet @@ -26,16 +26,21 @@ rm -rf $RPM_BUILD_ROOT %makeinstall +%find_lang %{name} + %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root) %{_bindir}/* %doc NEWS FAQ THANKS TODO COPYING README ChangeLog %{_mandir}/*/* %changelog +* Fri Jan 6 2006 Joe Orton 0.22.3-1 +- update to 0.22.3 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/cadaver/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 12 Jan 2005 14:54:00 -0000 1.7 +++ sources 6 Jan 2006 08:37:17 -0000 1.8 @@ -1 +1 @@ -167cca2089bdb86c42b6d5f0187cdc16 cadaver-0.22.2.tar.gz +0c5268286e732a8d5d94361cf93de412 cadaver-0.22.3.tar.gz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/cadaver/devel/upstream,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- upstream 12 Jan 2005 14:55:27 -0000 1.1 +++ upstream 6 Jan 2006 08:37:17 -0000 1.2 @@ -1 +1 @@ -cadaver-0.22.2.tar.gz +cadaver-0.22.3.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 6 08:37:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 03:37:40 -0500 Subject: rpms/cadaver/devel cadaver-0.22.2.tar.gz.asc,1.1,NONE Message-ID: <200601060837.k068bevj027418@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/cadaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27406 Removed Files: cadaver-0.22.2.tar.gz.asc Log Message: - remove old sig file --- cadaver-0.22.2.tar.gz.asc DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 08:48:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 03:48:22 -0500 Subject: rpms/mod_auth_pgsql/FC-3 mod_auth_pgsql-2.0.1-CVE-2005-3656.patch, NONE, 1.1 mod_auth_pgsql-2.0.1-ruser.patch, NONE, 1.1 mod_auth_pgsql.spec, 1.18, 1.19 mod_auth_pgsql-2.0.1-crasher.patch, 1.1, NONE Message-ID: <200601060848.k068mMcW006333@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/mod_auth_pgsql/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv6316 Modified Files: mod_auth_pgsql.spec Added Files: mod_auth_pgsql-2.0.1-CVE-2005-3656.patch mod_auth_pgsql-2.0.1-ruser.patch Removed Files: mod_auth_pgsql-2.0.1-crasher.patch Log Message: * Fri Jan 6 2006 Joe Orton 2.0.1-6.2 - add security fix for CVE-2005-3656 - don't strip .so file so debuginfo works - fix r->user handling (Mirko Streckenbach, #150087) mod_auth_pgsql-2.0.1-CVE-2005-3656.patch: mod_auth_pgsql.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE mod_auth_pgsql-2.0.1-CVE-2005-3656.patch --- --- mod_auth_pgsql-2.0.1/mod_auth_pgsql.c.cve3656 +++ mod_auth_pgsql-2.0.1/mod_auth_pgsql.c @@ -808,7 +808,7 @@ return DECLINED; } } - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); return res; } @@ -819,7 +819,7 @@ apr_snprintf(pg_errstr, MAX_STRING_LEN, "[mod_auth_pgsql.c] - Empty password accepted for user \"%s\"", user); - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "%s", pg_errstr); pg_log_auth_user(r, sec, user, sent_pw); return OK; }; @@ -831,7 +831,7 @@ apr_snprintf(pg_errstr, MAX_STRING_LEN, "[mod_auth_pgsql.c] - Empty password rejected for user \"%s\"", user); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); ap_note_basic_auth_failure(r); return HTTP_UNAUTHORIZED; }; @@ -861,7 +861,7 @@ ? strcasecmp(real_pw, sent_pw) : strcmp(real_pw, sent_pw)) { apr_snprintf(pg_errstr, MAX_STRING_LEN, "PG user %s: password mismatch", user); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); ap_note_basic_auth_failure(r); return HTTP_UNAUTHORIZED; } @@ -921,7 +921,7 @@ apr_snprintf(pg_errstr, MAX_STRING_LEN, "mod_auth_pgsql: user %s denied, no access rules specified (PG-Authoritative)", user); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); ap_note_basic_auth_failure(r); res = HTTP_UNAUTHORIZED; } else { @@ -951,7 +951,7 @@ apr_snprintf(pg_errstr, MAX_STRING_LEN, "mod_auth_pgsql: user %s denied, no access rules specified (PG-Authoritative)", user); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); ap_note_basic_auth_failure(r); return HTTP_UNAUTHORIZED; } @@ -967,7 +967,7 @@ }; if (pg_errstr[0]) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); return HTTP_INTERNAL_SERVER_ERROR; } @@ -978,7 +978,7 @@ apr_snprintf(pg_errstr, MAX_STRING_LEN, "[mod_auth_pgsql.c] - user %s not in right groups (PG-Authoritative)", user); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); ap_note_basic_auth_failure(r); return HTTP_UNAUTHORIZED; }; mod_auth_pgsql-2.0.1-ruser.patch: mod_auth_pgsql.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE mod_auth_pgsql-2.0.1-ruser.patch --- --- mod_auth_pgsql-2.0.1/mod_auth_pgsql.c.crasher +++ mod_auth_pgsql-2.0.1/mod_auth_pgsql.c @@ -757,11 +757,12 @@ char *sent_pw, *real_pw; int res; char *user; - user = r->user; if ((res = ap_get_basic_auth_pw(r, (const char **) &sent_pw))) return res; + user = r->user; + #ifdef DEBUG_AUTH_PGSQL ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "[mod_auth_pgsql.c] - pg_authenticate_basic_user - going to auth user \"%s\" pass \"%s\" uri \"%s\"", Index: mod_auth_pgsql.spec =================================================================== RCS file: /cvs/dist/rpms/mod_auth_pgsql/FC-3/mod_auth_pgsql.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mod_auth_pgsql.spec 4 Apr 2005 12:03:48 -0000 1.18 +++ mod_auth_pgsql.spec 6 Jan 2006 08:48:20 -0000 1.19 @@ -11,7 +11,8 @@ Patch0: mod_auth_pgsql-2.0.1-nonpgsql.patch Patch1: mod_auth_pgsql-2.0.1-pgconn.patch Patch2: mod_auth_pgsql-2.0.1-static.patch -Patch3: mod_auth_pgsql-2.0.1-crasher.patch +Patch3: mod_auth_pgsql-2.0.1-ruser.patch +Patch4: mod_auth_pgsql-2.0.1-CVE-2005-3656.patch License: Apache Software License BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: httpd-devel >= 2.0.40-6, postgresql-devel @@ -27,17 +28,16 @@ %patch0 -p1 -b .nonpgsql %patch1 -p1 -b .pgconn %patch2 -p1 -b .static -%patch3 -p1 -b .crasher +%patch3 -p1 -b .ruser +%patch4 -p1 -b .cve3656 %build -%{_sbindir}/apxs -c %{name}.c -lpq -mv .libs/%{name}.so . -%{__strip} -g %{name}.so +%{_sbindir}/apxs -Wc,-Wall -Wc,-Wformat-security -c %{name}.c -lpq %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules -install -m755 %{name}.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules +install -m755 .libs/%{name}.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules # Install the config file mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d @@ -59,8 +59,10 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog -* Mon Apr 4 2005 Joe Orton 2.0.1-6.1 -- fix possible crashes (Mirko Streckenbach, #150087) +* Fri Jan 6 2006 Joe Orton 2.0.1-6.2 +- add security fix for CVE-2005-3656 +- don't strip .so file so debuginfo works +- fix r->user handling (Mirko Streckenbach, #150087) * Thu Sep 23 2004 Joe Orton 2.0.1-5 - merge from Taroon: --- mod_auth_pgsql-2.0.1-crasher.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 08:51:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 03:51:17 -0500 Subject: rpms/mod_auth_pgsql/FC-4 mod_auth_pgsql-2.0.1-CVE-2005-3656.patch, NONE, 1.1 mod_auth_pgsql.spec, 1.18, 1.19 Message-ID: <200601060851.k068pHoG006377@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/mod_auth_pgsql/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv6360 Modified Files: mod_auth_pgsql.spec Added Files: mod_auth_pgsql-2.0.1-CVE-2005-3656.patch Log Message: * Fri Jan 6 2006 Joe Orton 2.0.1-8.1 - add security fix for CVE-2005-3656 - don't strip .so file so debuginfo works mod_auth_pgsql-2.0.1-CVE-2005-3656.patch: mod_auth_pgsql.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE mod_auth_pgsql-2.0.1-CVE-2005-3656.patch --- --- mod_auth_pgsql-2.0.1/mod_auth_pgsql.c.cve3656 +++ mod_auth_pgsql-2.0.1/mod_auth_pgsql.c @@ -808,7 +808,7 @@ return DECLINED; } } - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); return res; } @@ -819,7 +819,7 @@ apr_snprintf(pg_errstr, MAX_STRING_LEN, "[mod_auth_pgsql.c] - Empty password accepted for user \"%s\"", user); - ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r, "%s", pg_errstr); pg_log_auth_user(r, sec, user, sent_pw); return OK; }; @@ -831,7 +831,7 @@ apr_snprintf(pg_errstr, MAX_STRING_LEN, "[mod_auth_pgsql.c] - Empty password rejected for user \"%s\"", user); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); ap_note_basic_auth_failure(r); return HTTP_UNAUTHORIZED; }; @@ -861,7 +861,7 @@ ? strcasecmp(real_pw, sent_pw) : strcmp(real_pw, sent_pw)) { apr_snprintf(pg_errstr, MAX_STRING_LEN, "PG user %s: password mismatch", user); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); ap_note_basic_auth_failure(r); return HTTP_UNAUTHORIZED; } @@ -921,7 +921,7 @@ apr_snprintf(pg_errstr, MAX_STRING_LEN, "mod_auth_pgsql: user %s denied, no access rules specified (PG-Authoritative)", user); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); ap_note_basic_auth_failure(r); res = HTTP_UNAUTHORIZED; } else { @@ -951,7 +951,7 @@ apr_snprintf(pg_errstr, MAX_STRING_LEN, "mod_auth_pgsql: user %s denied, no access rules specified (PG-Authoritative)", user); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); ap_note_basic_auth_failure(r); return HTTP_UNAUTHORIZED; } @@ -967,7 +967,7 @@ }; if (pg_errstr[0]) { - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); return HTTP_INTERNAL_SERVER_ERROR; } @@ -978,7 +978,7 @@ apr_snprintf(pg_errstr, MAX_STRING_LEN, "[mod_auth_pgsql.c] - user %s not in right groups (PG-Authoritative)", user); - ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, pg_errstr); + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "%s", pg_errstr); ap_note_basic_auth_failure(r); return HTTP_UNAUTHORIZED; }; Index: mod_auth_pgsql.spec =================================================================== RCS file: /cvs/dist/rpms/mod_auth_pgsql/FC-4/mod_auth_pgsql.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mod_auth_pgsql.spec 13 Apr 2005 08:18:03 -0000 1.18 +++ mod_auth_pgsql.spec 6 Jan 2006 08:51:15 -0000 1.19 @@ -3,7 +3,7 @@ Summary: Basic authentication for the Apache web server using a PostgreSQL database. Name: mod_auth_pgsql Version: 2.0.1 -Release: 8 +Release: 8.1 Group: System Environment/Daemons URL: http://www.giuseppetanzilli.it/mod_auth_pgsql2/ Source: http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/mod_auth_pgsql-%{version}.tar.gz @@ -12,6 +12,7 @@ Patch1: mod_auth_pgsql-2.0.1-pgconn.patch Patch2: mod_auth_pgsql-2.0.1-static.patch Patch3: mod_auth_pgsql-2.0.1-crasher.patch +Patch4: mod_auth_pgsql-2.0.1-CVE-2005-3656.patch License: Apache Software License BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: httpd-devel >= 2.0.40-6, postgresql-devel @@ -28,16 +29,15 @@ %patch1 -p1 -b .pgconn %patch2 -p1 -b .static %patch3 -p1 -b .crasher +%patch4 -p1 -b .cve3656 %build %{_sbindir}/apxs -c %{name}.c -lpq -mv .libs/%{name}.so . -%{__strip} -g %{name}.so %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/httpd/modules -install -m755 %{name}.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules +install -m755 .libs/%{name}.so $RPM_BUILD_ROOT%{_libdir}/httpd/modules # Install the config file mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d @@ -59,6 +59,10 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Fri Jan 6 2006 Joe Orton 2.0.1-8.1 +- add security fix for CVE-2005-3656 +- don't strip .so file so debuginfo works + * Wed Apr 13 2005 Joe Orton 2.0.1-8 - rebuild for new libpq From fedora-cvs-commits at redhat.com Fri Jan 6 08:52:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 03:52:00 -0500 Subject: rpms/mod_auth_pgsql/FC-3 mod_auth_pgsql.spec,1.19,1.20 Message-ID: <200601060852.k068q02F006456@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/mod_auth_pgsql/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv6441 Modified Files: mod_auth_pgsql.spec Log Message: - do bump the release Index: mod_auth_pgsql.spec =================================================================== RCS file: /cvs/dist/rpms/mod_auth_pgsql/FC-3/mod_auth_pgsql.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- mod_auth_pgsql.spec 6 Jan 2006 08:48:20 -0000 1.19 +++ mod_auth_pgsql.spec 6 Jan 2006 08:51:58 -0000 1.20 @@ -3,7 +3,7 @@ Summary: Basic authentication for the Apache web server using a PostgreSQL database. Name: mod_auth_pgsql Version: 2.0.1 -Release: 6.1 +Release: 6.2 Group: System Environment/Daemons URL: http://www.giuseppetanzilli.it/mod_auth_pgsql2/ Source: http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/mod_auth_pgsql-%{version}.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 6 09:04:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 04:04:50 -0500 Subject: rpms/mod_auth_pgsql/devel .cvsignore, 1.6, 1.7 mod_auth_pgsql.spec, 1.20, 1.21 sources, 1.6, 1.7 mod_auth_pgsql-2.0.1-apr1x.patch, 1.4, NONE mod_auth_pgsql-2.0.1-crasher.patch, 1.1, NONE mod_auth_pgsql-2.0.1-pgconn.patch, 1.1, NONE mod_auth_pgsql-2.0.1-static.patch, 1.1, NONE Message-ID: <200601060904.k0694olS017660@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/mod_auth_pgsql/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17613 Modified Files: .cvsignore mod_auth_pgsql.spec sources Removed Files: mod_auth_pgsql-2.0.1-apr1x.patch mod_auth_pgsql-2.0.1-crasher.patch mod_auth_pgsql-2.0.1-pgconn.patch mod_auth_pgsql-2.0.1-static.patch Log Message: * Fri Jan 6 2006 Joe Orton 2.0.3-2 - update to 2.0.3 (includes fix for CVE-2005-3656) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mod_auth_pgsql/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Sep 2004 08:41:38 -0000 1.6 +++ .cvsignore 6 Jan 2006 09:04:46 -0000 1.7 @@ -1 +1,2 @@ mod_auth_pgsql-2.0.1.tar.gz +mod_auth_pgsql-2.0.3.tar.gz Index: mod_auth_pgsql.spec =================================================================== RCS file: /cvs/dist/rpms/mod_auth_pgsql/devel/mod_auth_pgsql.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- mod_auth_pgsql.spec 9 Dec 2005 22:42:03 -0000 1.20 +++ mod_auth_pgsql.spec 6 Jan 2006 09:04:46 -0000 1.21 @@ -2,17 +2,13 @@ Summary: Basic authentication for the Apache web server using a PostgreSQL database. Name: mod_auth_pgsql -Version: 2.0.1 -Release: 9.1 +Version: 2.0.3 +Release: 2 Group: System Environment/Daemons URL: http://www.giuseppetanzilli.it/mod_auth_pgsql2/ Source: http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/mod_auth_pgsql-%{version}.tar.gz Source1: auth_pgsql.conf Patch0: mod_auth_pgsql-2.0.1-nonpgsql.patch -Patch1: mod_auth_pgsql-2.0.1-pgconn.patch -Patch2: mod_auth_pgsql-2.0.1-static.patch -Patch3: mod_auth_pgsql-2.0.1-crasher.patch -Patch4: mod_auth_pgsql-2.0.1-apr1x.patch License: Apache Software License BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: httpd-devel >= 2.0.40-6, postgresql-devel @@ -26,13 +22,9 @@ %prep %setup -q %patch0 -p1 -b .nonpgsql -%patch1 -p1 -b .pgconn -%patch2 -p1 -b .static -%patch3 -p1 -b .crasher -%patch4 -p1 -b .apr1x %build -%{_sbindir}/apxs -c %{name}.c -lpq +%{_sbindir}/apxs -Wc,-Wformat-security -c %{name}.c -lpq %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -59,6 +51,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Fri Jan 6 2006 Joe Orton 2.0.3-2 +- update to 2.0.3 (includes fix for CVE-2005-3656) + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/mod_auth_pgsql/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Sep 2004 08:41:38 -0000 1.6 +++ sources 6 Jan 2006 09:04:46 -0000 1.7 @@ -1 +1,2 @@ 6d3cc25e997286e11f61907fc9cf4a63 mod_auth_pgsql-2.0.1.tar.gz +d44074b3b9bdb0a5eb9702814872ad43 mod_auth_pgsql-2.0.3.tar.gz --- mod_auth_pgsql-2.0.1-apr1x.patch DELETED --- --- mod_auth_pgsql-2.0.1-crasher.patch DELETED --- --- mod_auth_pgsql-2.0.1-pgconn.patch DELETED --- --- mod_auth_pgsql-2.0.1-static.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 09:08:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 04:08:16 -0500 Subject: rpms/kernel/devel patch-2.6.15-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.313, 1.314 kernel-2.6.spec, 1.1826, 1.1827 sources, 1.255, 1.256 upstream, 1.238, 1.239 linux-2.6-cell-spidernet.patch, 1.1, NONE linux-2.6-scsi-megaraid-legacy.patch, 1.1, NONE linux-2.6-usbhid-wireless-security-lock.patch, 1.1, NONE Message-ID: <200601060908.k0698GmS018967@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18899 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.15-git2.bz2.sign Removed Files: linux-2.6-cell-spidernet.patch linux-2.6-scsi-megaraid-legacy.patch linux-2.6-usbhid-wireless-security-lock.patch Log Message: git2 --- NEW FILE patch-2.6.15-git2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDvicSyGugalF9Dw4RAs3oAJ0Su0S7627J209DOuiTC8Do5zBg4gCfWYke TvOB2ZCpFvnCpvU5LUwA2QQ= =IZiQ -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.313 retrieving revision 1.314 diff -u -r1.313 -r1.314 --- .cvsignore 3 Jan 2006 10:57:13 -0000 1.313 +++ .cvsignore 6 Jan 2006 09:08:13 -0000 1.314 @@ -4,3 +4,4 @@ linux-2.6.15.tar.bz2 bcm43xx-20060103.tar.bz2 ieee80211softmac-20060103.tar.bz2 +patch-2.6.15-git2.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826 retrieving revision 1.1827 diff -u -r1.1826 -r1.1827 --- kernel-2.6.spec 6 Jan 2006 08:08:13 -0000 1.1826 +++ kernel-2.6.spec 6 Jan 2006 09:08:14 -0000 1.1827 @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -#Patch1: patch-2.6.16-git1.bz2 +Patch1: patch-2.6.15-git1.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -235,7 +235,6 @@ Patch308: linux-2.6-cell-idle-pmgt.patch Patch309: linux-2.6-cell-nvram-kmalloc.patch Patch310: linux-2.6-cell-spiderpic-no-devtree.patch -Patch311: linux-2.6-cell-spidernet.patch Patch312: linux-2.6-cell-no-legacy-io.patch Patch313: linux-2.6-hvc-rtas-console.patch Patch314: linux-2.6-ppc-rtas-check.patch @@ -320,8 +319,7 @@ # SCSI bits. Patch1101: linux-2.6-scsi-advansys-enabler.patch -Patch1102: linux-2.6-scsi-megaraid-legacy.patch -Patch1103: linux-2.6-scsi-advansys-pcitable.patch +Patch1102: linux-2.6-scsi-advansys-pcitable.patch # NFS bits. Patch1200: linux-2.6-NFSD-non-null-getxattr.patch @@ -364,7 +362,6 @@ Patch1790: linux-2.6-softcursor-persistent-alloc.patch Patch1800: linux-2.6-pwc-powerup-by-default.patch Patch1810: linux-2.6-smsc-ircc2-pnp.patch -Patch1820: linux-2.6-usbhid-wireless-security-lock.patch Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch @@ -603,7 +600,7 @@ cd linux-%{kversion} # Update to latest upstream. -#%patch1 -p1 +%patch1 -p1 #%patch2 -p1 # @@ -666,8 +663,6 @@ %patch309 -p1 # Hardcode PIC addresses for Cell spiderpic %patch310 -p1 -# Cell spidernet fixes; mostly to use firmware from devicetree. -%patch311 -p1 # Cell has no legacy I/O %patch312 -p1 # RTAS console support @@ -799,10 +794,8 @@ # # Enable Advansys driver %patch1101 -p1 -# Enable both new and old megaraid drivers. -%patch1102 -p1 # Add a pci table to advansys driver. -%patch1103 -p1 +%patch1102 -p1 # # Various upstream NFS/NFSD fixes. @@ -862,7 +855,7 @@ # Reduce stack usage in block layer %patch1740 -p1 # Enable USB storage,UB & libusual magick. -%patch1750 -p1 +#%patch1750 -p1 # Enable SATA ATAPI by default. %patch1760 -p1 # @@ -875,8 +868,6 @@ %patch1800 -p1 # PNP support for smsc-ircc2 %patch1810 -p1 -# don't mistake security lock as a mouse -%patch1820 -p1 # Silence debug messages in w1 %patch1830 -p1 # Reboot through BIOS on HP laptops. @@ -1419,6 +1410,7 @@ %changelog * Fri Jan 6 2006 Dave Jones +- 2.6.15-git2 - Add timer quirk for ATI chipsets. - Reboot through BIOS on HP laptops. - Additional check in x86 edid parser. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.255 retrieving revision 1.256 diff -u -r1.255 -r1.256 --- sources 3 Jan 2006 10:57:13 -0000 1.255 +++ sources 6 Jan 2006 09:08:14 -0000 1.256 @@ -1,3 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 96083b51cd30e60b86127113abed37a3 bcm43xx-20060103.tar.bz2 1eb2bb778090c59fbeba6278d63a9309 ieee80211softmac-20060103.tar.bz2 +0eee153ab442496ead0581d00e83a1ca patch-2.6.15-git2.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- upstream 3 Jan 2006 05:47:14 -0000 1.238 +++ upstream 6 Jan 2006 09:08:14 -0000 1.239 @@ -1 +1,3 @@ linux-2.6.15.tar.bz2 +patch-2.6.15-git2.bz2 + --- linux-2.6-cell-spidernet.patch DELETED --- --- linux-2.6-scsi-megaraid-legacy.patch DELETED --- --- linux-2.6-usbhid-wireless-security-lock.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 09:08:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 04:08:17 -0500 Subject: rpms/kernel/devel/configs config-generic,1.121,1.122 Message-ID: <200601060908.k0698HoJ018978@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv18899/configs Modified Files: config-generic Log Message: git2 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- config-generic 2 Jan 2006 21:56:59 -0000 1.121 +++ config-generic 6 Jan 2006 09:08:14 -0000 1.122 @@ -462,6 +462,7 @@ # CONFIG_SCSI_DEBUG is not set CONFIG_SCSI_DC390T=m CONFIG_SCSI_QLA2XXX=m +# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set CONFIG_SCSI_QLA21XX=m CONFIG_SCSI_QLA22XX=m CONFIG_SCSI_QLA2300=m @@ -982,6 +983,7 @@ # CONFIG_SK98LIN is not set CONFIG_SKGE=m CONFIG_TIGON3=m +CONFIG_SKY2=m # # Ethernet (10000 Mbit) @@ -1040,8 +1042,9 @@ CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m # CONFIG_IPW2100 is not set -# CONFIG_IPW_DEBUG is not set # CONFIG_IPW2200 is not set +# CONFIG_IPW2100_DEBUG is not set +# CONFIG_IPW2200_DEBUG is not set CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1855,6 +1858,8 @@ CONFIG_SND_RTCTIMER=m # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set +CONFIG_SND_DYNAMIC_MINORS=y +# CONFIG_SND_SUPPORT_OLD_API is not set # # Generic devices @@ -1879,12 +1884,14 @@ CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y CONFIG_SND_CS4281=m +CONFIG_SND_CS5535AUDIO=m CONFIG_SND_EMU10K1=m CONFIG_SND_EMU10K1X=m CONFIG_SND_CA0106=m CONFIG_SND_KORG1212=m CONFIG_SND_NM256=m CONFIG_SND_RME32=m +CONFIG_SND_PCXHR=m CONFIG_SND_RME96=m CONFIG_SND_RME9652=m CONFIG_SND_HDSP=m @@ -1984,6 +1991,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_STORAGE_USBAT=y CONFIG_USB_STORAGE_ONETOUCH=y +CONFIG_USB_STORAGE_ALAUDA=y CONFIG_USB_LIBUSUAL=y # @@ -2141,6 +2149,7 @@ # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_MTOUCH=m CONFIG_USB_ATI_REMOTE=m +CONFIG_USB_ATI_REMOTE2=m CONFIG_USB_ALI_M5632=y # CONFIG_USB_CYTHERM is not set CONFIG_USB_EGALAX=m @@ -2156,6 +2165,7 @@ CONFIG_USB_ATM=m CONFIG_USB_CXACRU=m CONFIG_USB_XUSBATM=m +CONFIG_USB_UEAGLEATM=m CONFIG_USB_KEYSPAN_REMOTE=m CONFIG_USB_LD=m CONFIG_USB_APPLETOUCH=m @@ -2404,6 +2414,7 @@ # CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set CONFIG_SECURITY_SELINUX=y @@ -2630,3 +2641,5 @@ # CONFIG_SND_PDAUDIOCF is not set ## END of ISA options. + + From fedora-cvs-commits at redhat.com Fri Jan 6 09:12:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 04:12:36 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1827,1.1828 Message-ID: <200601060912.k069CaMx020803@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20726 Modified Files: kernel-2.6.spec Log Message: ahem, git2. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1827 retrieving revision 1.1828 diff -u -r1.1827 -r1.1828 --- kernel-2.6.spec 6 Jan 2006 09:08:14 -0000 1.1827 +++ kernel-2.6.spec 6 Jan 2006 09:12:34 -0000 1.1828 @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git1.bz2 +Patch1: patch-2.6.15-git2.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches From fedora-cvs-commits at redhat.com Fri Jan 6 09:12:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 04:12:37 -0500 Subject: rpms/kernel/devel/configs config-generic,1.122,1.123 Message-ID: <200601060912.k069Cbpw020810@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv20726/configs Modified Files: config-generic Log Message: ahem, git2. Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- config-generic 6 Jan 2006 09:08:14 -0000 1.122 +++ config-generic 6 Jan 2006 09:12:34 -0000 1.123 @@ -2310,6 +2310,9 @@ # CONFIG_AFS_FS is not set # CONFIG_RXRPC is not set +CONFIG_OCFS2_FS=m +CONFIG_CONFIGFS_FS=m + # # Partition Types # From fedora-cvs-commits at redhat.com Fri Jan 6 09:12:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 04:12:39 -0500 Subject: rpms/gcc/devel gcc41-pr24940.patch, NONE, 1.1 .cvsignore, 1.124, 1.125 gcc41.spec, 1.15, 1.16 sources, 1.126, 1.127 Message-ID: <200601060912.k069CdfB020832@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17205 Modified Files: .cvsignore gcc41.spec sources Added Files: gcc41-pr24940.patch Log Message: 4.1.0-0.14 gcc41-pr24940.patch: configure | 20 ++++++++++---------- shlibpath.m4 | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) --- NEW FILE gcc41-pr24940.patch --- 2006-01-06 Jakub Jelinek PR libgcj/24940 * shlibpath.m4: Replace $SED with sed. * configure: Rebuilt. --- libjava/shlibpath.m4.jj 2005-10-28 23:13:27.000000000 +0200 +++ libjava/shlibpath.m4 2006-01-05 13:42:25.000000000 +0100 @@ -41,15 +41,15 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"` if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"` fi else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" @@ -164,13 +164,13 @@ cygwin* | mingw* | pw32*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + soname_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"` if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH printed by # mingw gcc, but we are running on Cygwin. Gcc prints its search @@ -178,20 +178,20 @@ cygwin* | mingw* | pw32*) # drive letters (cygwin fileutils understands them), so leave them, # especially as we might pass files found there to a mingw objdump, # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"` fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext}' ;; esac ;; *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ;; esac dynamic_linker='Win32 ld.exe' --- libjava/configure.jj 2005-10-28 23:13:27.000000000 +0200 +++ libjava/configure 2006-01-05 13:42:35.000000000 +0100 @@ -4031,15 +4031,15 @@ version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"` if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"` fi else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" @@ -4154,13 +4154,13 @@ cygwin* | mingw* | pw32*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext}' sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib" ;; mingw*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` + soname_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext}' + sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g"` if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH printed by # mingw gcc, but we are running on Cygwin. Gcc prints its search @@ -4168,20 +4168,20 @@ cygwin* | mingw* | pw32*) # drive letters (cygwin fileutils understands them), so leave them, # especially as we might pass files found there to a mingw objdump, # which wouldn't understand a cygwinified path. Ahh. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | sed -e "s/$PATH_SEPARATOR/ /g"` fi ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}${shared_ext}' ;; esac ;; *) - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' ;; esac dynamic_linker='Win32 ld.exe' Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- .cvsignore 5 Jan 2006 10:57:27 -0000 1.124 +++ .cvsignore 6 Jan 2006 09:12:36 -0000 1.125 @@ -1 +1 @@ -gcc-4.1.0-20060105.tar.bz2 +gcc-4.1.0-20060106.tar.bz2 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gcc41.spec 5 Jan 2006 10:57:27 -0000 1.15 +++ gcc41.spec 6 Jan 2006 09:12:36 -0000 1.16 @@ -1,6 +1,6 @@ -%define DATE 20060105 +%define DATE 20060106 %define gcc_version 4.1.0 -%define gcc_release 0.13 +%define gcc_release 0.14 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 @@ -99,6 +99,7 @@ Patch18: gcc41-pr25535.patch Patch19: gcc41-pr25324.patch Patch20: gcc41-rh176562.patch +Patch21: gcc41-pr24940.patch %define _gnu %{nil} %ifarch sparc @@ -449,6 +450,7 @@ %patch18 -p0 -b .pr25535~ %patch19 -p0 -b .pr25324~ %patch20 -p0 -b .rh176562~ +%patch21 -p0 -b .pr24940~ sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1534,6 +1536,12 @@ %endif %changelog +* Fri Jan 6 2006 Jakub Jelinek 4.1.0-0.14 +- update from gcc-4_1-branch (-r109369:109401) + - PR fortran/23675 + - fix Java shutdown hook (Tom Tromey, #165136) +- fix libjava/shlibpath.m4 (PR libgcj/24940) + * Thu Jan 5 2006 Jakub Jelinek 4.1.0-0.13 - update from gcc-4_1-branch (-r108957:109369) - PRs c++/23171, c++/23172, c++/24671, c++/24782, c++/25294, c++/25417, @@ -1551,7 +1559,7 @@ target/25554, target/25572, testsuite/25214, testsuite/25441, testsuite/25442, testsuite/25444, tree-opt/25513 - create java Package for compiled classes which are linked in but - loaded by the system class loader (#176956) + loaded by the system class loader (Tom Tromey, #176956) - fix posix_memalign prototype in (#176461) - update from gomp-20050608-branch (up to -r109349) - buildrequire libXtst-devel (#176898) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- sources 5 Jan 2006 10:57:27 -0000 1.126 +++ sources 6 Jan 2006 09:12:36 -0000 1.127 @@ -1 +1 @@ -f27bdcb7a666c31dc20c41eced50decd gcc-4.1.0-20060105.tar.bz2 +b2a01514112261eafd8c302d347ef632 gcc-4.1.0-20060106.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 6 09:19:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 04:19:20 -0500 Subject: rpms/tzdata/devel .cvsignore, 1.16, 1.17 sources, 1.18, 1.19 tzdata.spec, 1.22, 1.23 Message-ID: <200601060919.k069JKBh002476@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2442 Modified Files: .cvsignore sources tzdata.spec Log Message: Upstream changes. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 17 Dec 2005 10:02:32 -0000 1.16 +++ .cvsignore 6 Jan 2006 09:19:18 -0000 1.17 @@ -1,3 +1,3 @@ tzdata.tar.bz2 -tzcode2005q.tar.gz -tzdata2005q.tar.gz +tzdata2005r.tar.gz +tzcode2005r.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 17 Dec 2005 10:02:32 -0000 1.18 +++ sources 6 Jan 2006 09:19:18 -0000 1.19 @@ -1,3 +1,3 @@ 325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 -1177f3301dad001c337ebfcb68f7a8dc tzcode2005q.tar.gz -63551b3b24d37340cdc92d26c6c38195 tzdata2005q.tar.gz +b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz +063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- tzdata.spec 17 Dec 2005 10:02:32 -0000 1.22 +++ tzdata.spec 6 Jan 2006 09:19:18 -0000 1.23 @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2005q +Version: 2005r Release: 2 License: GPL Group: System Environment/Base @@ -46,6 +46,18 @@ %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Jan 5 2006 Petr Machata 2005r-2 +- 2005r + - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to + northamerica to guard against old files with obsolete information + being left in the time zone binary directory. + - Changes for countries that are supposed to join 2007 US DST + change. This includes most of Canada, however entries already in + the database (Alberta, British Columbia, Newfoundland, Northwest + Territories, and Yukon) were left alone for the time being. + - Fixes in zdump.c (abbrok): conditions are chained, and the string + is checked for emptiness. + * Sat Dec 17 2005 Jakub Jelinek 2005q-2 - 2005q - changes for Georgia, Azerbaijan, Jordan, Palestine, Cuba, Nicaragua From fedora-cvs-commits at redhat.com Fri Jan 6 09:22:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 04:22:17 -0500 Subject: rpms/openjade/devel openjade.spec,1.29,1.30 Message-ID: <200601060922.k069MHpY003729@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/openjade/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3701 Modified Files: openjade.spec Log Message: * Fri Jan 6 2006 Tim Waugh 1.3.2-23 - Rebuild against new opensp. Index: openjade.spec =================================================================== RCS file: /cvs/dist/rpms/openjade/devel/openjade.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- openjade.spec 19 Dec 2005 15:19:13 -0000 1.29 +++ openjade.spec 6 Jan 2006 09:22:14 -0000 1.30 @@ -1,7 +1,7 @@ Summary: A DSSSL implementation. Name: openjade Version: 1.3.2 -Release: 22 +Release: 23 Prereq: sgml-common >= 0.5 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz Patch0: openjade-ppc64.patch @@ -93,6 +93,9 @@ %{_libdir}/*.la %changelog +* Fri Jan 6 2006 Tim Waugh 1.3.2-23 +- Rebuild against new opensp. + * Mon Dec 19 2005 Tim Waugh 1.3.2-22 - Fix SOC files. - Quieten scriptlets. From fedora-cvs-commits at redhat.com Fri Jan 6 09:56:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 04:56:59 -0500 Subject: rpms/shadow-utils/devel shadow-4.0.14-goodname.patch, NONE, 1.1 shadow-4.0.14-redhat.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 shadow-utils.spec, 1.64, 1.65 sources, 1.9, 1.10 shadow-4.0.13-audit-update.patch, 1.2, NONE shadow-4.0.13-auditUserdel.patch, 1.1, NONE shadow-4.0.13-goodname.patch, 1.1, NONE shadow-4.0.13-redhat.patch, 1.2, NONE Message-ID: <200601060956.k069ux38028789@cvs.devel.redhat.com> Author: pvrabec Update of /cvs/dist/rpms/shadow-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28471 Modified Files: .cvsignore shadow-utils.spec sources Added Files: shadow-4.0.14-goodname.patch shadow-4.0.14-redhat.patch Removed Files: shadow-4.0.13-audit-update.patch shadow-4.0.13-auditUserdel.patch shadow-4.0.13-goodname.patch shadow-4.0.13-redhat.patch Log Message: upgrade 4.0.14 shadow-4.0.14-goodname.patch: libmisc/chkname.c | 39 ++++++++++++++++++++++++--------------- man/useradd.8 | 2 -- 2 files changed, 24 insertions(+), 17 deletions(-) --- NEW FILE shadow-4.0.14-goodname.patch --- --- shadow-4.0.14/man/useradd.8.goodname 2006-01-05 17:54:26.000000000 +0100 +++ shadow-4.0.14/man/useradd.8 2006-01-05 18:01:18.000000000 +0100 @@ -166,8 +166,6 @@ Similarly, if the username already exists in an external user database such as NIS, \fBuseradd\fR will deny the user account creation request. -.PP -Usernames must begin with a lower case letter or an underscore, and only lower case letters, underscores, dashes, and dollar signs may follow. In regular expression terms: [a\-z_][a\-z0\-9_\-]*[$] .SH "FILES" .TP \fI/etc/passwd\fR --- shadow-4.0.14/libmisc/chkname.c.goodname 2005-08-31 19:24:57.000000000 +0200 +++ shadow-4.0.14/libmisc/chkname.c 2006-01-05 17:59:45.000000000 +0100 @@ -18,16 +18,24 @@ static int good_name (const char *name) { /* - * User/group names must match [a-z_][a-z0-9_-]*[$] - */ - if (!*name || !((*name >= 'a' && *name <= 'z') || *name == '_')) + * User/group names must match gnu e-regex: + * [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]? + * + * as a non-POSIX, extension, allow "$" as the last char for + * sake of Samba 3.x "add machine script" + */ + if (!*name || !((*name >= 'a' && *name <= 'z') + || (*name >= 'A' && *name <= 'Z') + || (*name >= '0' && *name <= '9') + || *name == '_' || *name == '.')) return 0; while (*++name) { - if (!((*name >= 'a' && *name <= 'z') || - (*name >= '0' && *name <= '9') || - *name == '_' || *name == '-' || - (*name == '$' && *(name + 1) == '\0'))) + if (!( (*name >= 'a' && *name <= 'z') + || (*name >= 'A' && *name <= 'Z') + || (*name >= '0' && *name <= '9') + || *name == '_' || *name == '.' || *name == '-' + || (*name == '$' && *(name + 1) == '\0'))) return 0; } @@ -43,10 +51,9 @@ #endif /* - * User names are limited by whatever utmp can - * handle (usually max 8 characters). + * User names are limited by whatever utmp can handle. */ - if (strlen (name) > sizeof (ut.ut_user)) + if (strlen(name) + 1 > sizeof(ut.ut_user)) return 0; return good_name (name); @@ -54,11 +61,13 @@ int check_group_name (const char *name) { - /* - * Arbitrary limit for group names - max 16 - * characters (same as on HP-UX 10). - */ - if (strlen (name) > 16) +#if HAVE_UTMPX_H + struct utmpx ut; +#else + struct utmp ut; +#endif + + if (strlen(name) + 1 > sizeof(ut.ut_user)) return 0; return good_name (name); shadow-4.0.14-redhat.patch: man/groupadd.8 | 7 +++- man/useradd.8 | 22 +++++++++++-- src/groupadd.c | 19 +++++++++-- src/useradd.c | 94 ++++++++++++++++++++++++++++++++++++++------------------- 4 files changed, 103 insertions(+), 39 deletions(-) --- NEW FILE shadow-4.0.14-redhat.patch --- --- shadow-4.0.14/man/groupadd.8.redhat 2006-01-03 17:44:56.000000000 +0100 +++ shadow-4.0.14/man/groupadd.8 2006-01-04 15:12:43.000000000 +0100 @@ -11,7 +11,7 @@ groupadd \- Create a new group .SH "SYNOPSIS" .HP 9 -\fBgroupadd\fR [\-g\ \fIGID\fR\ [\-o]] [\-f] [\-K\ \fIKEY\fR=\fIVALUE\fR] \fIgroup\fR +\fBgroupadd\fR [\-g\ \fIgid\fR\ [\-o]] [\-r] [\-f] [\-K\ \fIKEY\fR=\fIVALUE\fR] \fIgroup\fR .SH "DESCRIPTION" .PP The @@ -29,10 +29,13 @@ \fB\-g\fR is turned off). .TP +\fB-r\fR +This flag instructs \fBgroupadd\fR to add a system account. The first available \fIgid\fR lower than 499 will be automatically selected unless the \fB-g\fR option is also given on the command line. This is an option added by Red Hat. +.TP \fB\-g\fR \fIGID\fR The numerical value of the group's ID. This value must be unique, unless the \fB\-o\fR -option is used. The value must be non\-negative. The default is to use the smallest ID value greater than 999 and greater than every other group. Values between 0 and 999 are typically reserved for system accounts. +option is used. The value must be non\-negative. The default is to use the smallest ID value greater than 500 and greater than every other group. Values between 0 and 499 are typically reserved for system accounts. .TP \fB\-h\fR, \fB\-\-help\fR Display help message and exit. --- shadow-4.0.14/man/useradd.8.redhat 2006-01-03 17:44:57.000000000 +0100 +++ shadow-4.0.14/man/useradd.8 2006-01-04 15:01:33.000000000 +0100 @@ -22,7 +22,7 @@ \fB\-D\fR option, the \fBuseradd\fR -command creates a new user account using the values specified on the command line and the default values from the system. Depending on command line options, the useradd command will update system files and may also create the new user's home directory and copy initial files. +command creates a new user account using the values specified on the command line and the default values from the system. Depending on command line options, the useradd command will update system files and may also create the new user's home directory and copy initial files. The version provided with Red Hat Linux will create a group for each user added to the system by default. .SH "OPTIONS" .PP The options which apply to the @@ -58,8 +58,7 @@ The number of days after a password expires until the account is permanently disabled. A value of 0 disables the account as soon as the password has expired, and a value of \-1 disables the feature. The default value is \-1. .TP \fB\-g\fR, \fB\-\-gid\fR \fIGROUP\fR -The group name or number of the user's initial login group. The group name must exist. A group number must refer to an already existing group. The default group number is 1 or whatever is specified in -\fI/etc/default/useradd\fR. +The group name or number of the user's initial login group. The group name must exist. A group number must refer to an already existing group. .TP \fB\-G\fR, \fB\-\-groups\fR \fIGROUP1\fR[\fI,GROUP2,...\fR[\fI,GROUPN\fR]]] A list of supplementary groups which the user is also a member of. Each group is separated from the next by a comma, with no intervening whitespace. The groups are subject to the same restrictions as the group given with the @@ -68,6 +67,9 @@ .TP \fB\-h\fR, \fB\-\-help\fR Display help message and exit. +.TP +\fB-M\fR +The user's home directory will not be created, even if the system wide settings from \fI/etc/login.defs\fR is to create home dirs. .TP \fB\-m\fR, \fB\-\-create\-home\fR The user's home directory will be created if it does not exist. The files contained in @@ -85,6 +87,9 @@ option is only valid in conjunction with the \fB\-m\fR option. The default is to not create the directory and to not copy any files. +.TP +\fB-n\fR +A group having the same name as the user being added to the system will be created by default. This option will turn off this Red Hat Linux specific behavior. When this option is used, users by default will be placed in whatever group is specified in \fI/etc/default/useradd\fR. If no default group is defined, group 1 will be used. .TP \fB\-K\fR, \fB\-\-key\fR \fIKEY\fR=\fIVALUE\fR Overrides /etc/login.defs defaults (UID_MIN, UID_MAX, UMASK, PASS_MAX_DAYS and others). @@ -106,6 +111,9 @@ \fB\-p\fR, \fB\-\-password\fR \fIPASSWORD\fR The encrypted password, as returned by \fBcrypt\fR(3). The default is to disable the account. +.TP +\fB-r\fR +This flag is used to create a system account. That is, a user with a UID lower than the value of UID_MIN defined in \fI/etc/login.defs\fR and whose password does not expire. Note that \fBuseradd\fR will not create a home directory for such an user, regardless of the default setting in \fI/etc/login.defs\fR. You have to specify \fB-m\fR option if you want a home directory for a system account to be created. This is an option added by Red Hat .TP \fB\-s\fR, \fB\-\-shell\fR \fISHELL\fR The name of the user's login shell. The default is to leave this field blank, which causes the system to select the default login shell. @@ -149,6 +157,8 @@ The system administrator is responsible for placing the default user files in the \fI/etc/skel/\fR directory. +.br +This version of useradd was modified by Red Hat to suit Red Hat user/group conventions. .SH "CAVEATS" .PP You may not add a user to a NIS group. This must be performed on the NIS server. @@ -169,9 +179,15 @@ \fI/etc/group\fR group account information .TP +\fI/etc/gshadow\fR +secure group information +.TP \fI/etc/default/useradd\fR default information .TP +\fI/etc/login.defs\fR +system-wide settings +.TP \fI/etc/skel/\fR directory containing default files .TP --- shadow-4.0.14/src/groupadd.c.redhat 2005-12-06 21:24:03.000000000 +0100 +++ shadow-4.0.14/src/groupadd.c 2006-01-04 15:01:45.000000000 +0100 @@ -74,6 +74,7 @@ static int oflg = 0; /* permit non-unique group ID to be specified with -g */ static int gflg = 0; /* ID value for the new group */ static int fflg = 0; /* if group already exists, do nothing and exit(0) */ +static int rflg = 0; /* for adding system accounts (Red Hat) */ /* local function prototypes */ static void usage (void); @@ -100,6 +101,7 @@ "Options:\n" " -f, --force force exit with success status if the specified\n" " group already exists\n" + " -r, create system account\n" " -g, --gid GID use GID for the new group\n" " -h, --help display this help message and exit\n" " -K, --key KEY=VALUE overrides /etc/login.defs defaults\n" @@ -197,8 +199,13 @@ const struct group *grp; gid_t gid_min, gid_max; - gid_min = getdef_unum ("GID_MIN", 1000); - gid_max = getdef_unum ("GID_MAX", 60000); + if (!rflg) { + gid_min = getdef_unum ("GID_MIN", 500); + gid_max = getdef_unum ("GID_MAX", 60000); + } else { + gid_min = 1; + gid_max = getdef_unum ("GID_MIN", 500) - 1; + } /* * Start with some GID value if the user didn't provide us with @@ -412,7 +419,7 @@ }; while ((c = - getopt_long (argc, argv, "fg:hK:o", long_options, + getopt_long (argc, argv, "frg:hK:o", long_options, &option_index)) != -1) { switch (c) { case 'f': @@ -425,6 +432,12 @@ */ fflg++; break; + case 'r': + /* + * create a system group + */ + rflg++; + break; case 'g': gflg++; if (!isdigit (optarg[0])) --- shadow-4.0.14/src/useradd.c.redhat 2005-12-15 16:06:28.000000000 +0100 +++ shadow-4.0.14/src/useradd.c 2006-01-04 15:01:33.000000000 +0100 @@ -81,7 +81,7 @@ static gid_t def_group = 100; static const char *def_gname = "other"; static const char *def_home = "/home"; -static const char *def_shell = ""; +static const char *def_shell = "/sbin/nologin"; static const char *def_template = SKEL_DIR; static const char *def_create_mail_spool = "no"; @@ -93,7 +93,7 @@ #define VALID(s) (strcspn (s, ":\n") == strlen (s)) static const char *user_name = ""; -static const char *user_pass = "!"; +static const char *user_pass = "!!"; static uid_t user_id; static gid_t user_gid; static const char *user_comment = ""; @@ -124,8 +124,10 @@ Gflg = 0, /* secondary group set for new account */ kflg = 0, /* specify a directory to fill new user directory */ mflg = 0, /* create user's home directory if it doesn't exist */ - nflg = 0, /* create a group having the same name as the user */ + Mflg = 0, /* do NOT create user's home directory no matter what */ + nflg = 0, /* do NOT create a group having the same name as the user */ oflg = 0, /* permit non-unique user ID to be specified with -u */ + rflg = 0, /* create a system account */ sflg = 0, /* shell program for new account */ uflg = 0; /* specify user ID for new account */ @@ -628,6 +630,8 @@ " -K, --key KEY=VALUE overrides /etc/login.defs defaults\n" " -m, --create-home create home directory for the new user\n" " account\n" + " -M, do not create user's home directory(overrides /etc/login.defs)\n" + " -r, create system account\n" " -o, --non-unique allow create user with duplicate\n" " (non-unique) UID\n" " -p, --password PASSWORD use encrypted password for the new user\n" @@ -679,11 +683,20 @@ spent->sp_namp = (char *) user_name; spent->sp_pwdp = (char *) user_pass; spent->sp_lstchg = time ((time_t *) 0) / SCALE; - spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1)); - spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1)); - spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1)); - spent->sp_inact = scale_age (def_inactive); - spent->sp_expire = scale_age (user_expire); + if (!rflg) { + spent->sp_min = scale_age (getdef_num ("PASS_MIN_DAYS", -1)); + spent->sp_max = scale_age (getdef_num ("PASS_MAX_DAYS", -1)); + spent->sp_warn = scale_age (getdef_num ("PASS_WARN_AGE", -1)); + spent->sp_inact = scale_age (def_inactive); + spent->sp_expire = scale_age (user_expire); + } + else { + spent->sp_min = scale_age(-1); + spent->sp_max = scale_age(-1); + spent->sp_warn = scale_age(-1); + spent->sp_inact = scale_age(-1); + spent->sp_expire = scale_age(-1); + } spent->sp_flag = -1; } @@ -831,8 +844,14 @@ const struct passwd *pwd; uid_t uid_min, uid_max; - uid_min = getdef_unum ("UID_MIN", 1000); - uid_max = getdef_unum ("UID_MAX", 60000); + if (!rflg) { + uid_min = getdef_unum ("UID_MIN", 500); + uid_max = getdef_unum ("UID_MAX", 60000); + } + else { + uid_min = 1; + uid_max = getdef_unum ("UID_MIN", 500) - 1; + } /* * Start with some UID value if the user didn't provide us with @@ -862,7 +881,7 @@ #endif exit (E_NAME_IN_USE); } - if (uflg && user_id == pwd->pw_uid) { + if (!oflg && uflg && user_id == pwd->pw_uid) { fprintf (stderr, _("%s: UID %u is not unique\n"), Prog, (unsigned int) user_id); #ifdef WITH_AUDIT @@ -1016,7 +1115,7 @@ {NULL, 0, NULL, '\0'} }; while ((c = - getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMop:s:u:", + getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mMnrop:s:u:", long_options, NULL)) != -1) { switch (c) { case 'b': @@ -1188,6 +1287,15 @@ user_id = get_uid (optarg); uflg++; break; + case 'n': + nflg++; + break; + case 'r': + rflg++; + break; + case 'M': + Mflg++; + break; default: usage (); } @@ -1195,6 +1303,9 @@ } } + if (mflg && Mflg) /* the admin is not decided .. create or not ? */ + usage(); + /* * Certain options are only valid in combination with others. * Check it here so that they can be specified in any order. @@ -1700,6 +1811,14 @@ } #endif /* USE_PAM */ + if (!rflg) /* for system accounts defaults are ignored and we + * do not create a home dir -- gafton */ + if (getdef_bool("CREATE_HOME")) + mflg = 1; + + if (Mflg) /* absolutely sure that we do not create home dirs */ + mflg = 0; + /* * See if we are messing with the defaults file, or creating * a new user. @@ -1730,7 +1849,7 @@ * to that group, use useradd -g username username. * --bero */ - if (!gflg) { + if ( !(nflg || gflg) ) { if (getgrnam (user_name)) { fprintf (stderr, _ @@ -1779,25 +1910,18 @@ ("%s: warning: the home directory already exists.\n" "Not copying any file from skel directory into it.\n"), Prog); - - } else if (getdef_str ("CREATE_HOME")) { - /* - * RedHat added the CREATE_HOME option in login.defs in their - * version of shadow-utils (which makes -m the default, with - * new -M option to turn it off). Unfortunately, this - * changes the way useradd works (it can be run by scripts - * expecting some standard behaviour), compared to other - * Unices and other Linux distributions, and also adds a lot - * of confusion :-(. - * So we now recognize CREATE_HOME and give a warning here - * (better than "configuration error ... notify administrator" - * errors in every program that reads /etc/login.defs). -MM - */ - fprintf (stderr, - _ - ("%s: warning: CREATE_HOME not supported, please use -m instead.\n"), - Prog); } + /* Warning removed to protect the innocent. */ + /* + * The whole idea about breaking some stupid scripts by creating a new + * variable is crap - I could care less about the scripts. Historically + * adduser type programs have always created the home directories and + * I don't like the idea of providing a script when we can fix the + * binary itself. And if the scripts are using the right options to the + * useradd then they will not break. If not, they depend on unspecified + * behavior and they will break, but they were broken anyway to begin + * with --gafton + */ create_mail (); Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 22 Oct 2005 12:38:17 -0000 1.9 +++ .cvsignore 6 Jan 2006 09:56:57 -0000 1.10 @@ -1 +1 @@ -shadow-4.0.13.tar.bz2 +shadow-4.0.14.tar.bz2 Index: shadow-utils.spec =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/devel/shadow-utils.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- shadow-utils.spec 9 Dec 2005 22:43:13 -0000 1.64 +++ shadow-utils.spec 6 Jan 2006 09:56:57 -0000 1.65 @@ -2,25 +2,21 @@ %define WITH_SELINUX 1 %endif -%define utf8_man_pages 1 - Summary: Utilities for managing accounts and shadow password files. Name: shadow-utils -Version: 4.0.13 -Release: 4.1 +Version: 4.0.14 +Release: 1 Epoch: 2 URL: http://shadow.pld.org.pl/ Source0: ftp://ftp.pld.org.pl/software/shadow/shadow-%{version}.tar.bz2 Source1: shadow-970616.login.defs Source2: shadow-970616.useradd -Patch0: shadow-4.0.13-redhat.patch +Patch0: shadow-4.0.14-redhat.patch Patch1: shadow-4.0.3-noinst.patch Patch2: shadow-4.0.11.1-vipw.patch -Patch3: shadow-4.0.13-goodname.patch +Patch3: shadow-4.0.14-goodname.patch Patch4: shadow-4.0.13-newgrpPwd.patch Patch5: shadow-4.0.12-lOption.patch -Patch6: shadow-4.0.13-audit-update.patch -Patch7: shadow-4.0.13-auditUserdel.patch License: BSD Group: System Environment/Base BuildRequires: autoconf, automake, libtool, gettext-devel @@ -51,46 +47,10 @@ %patch3 -p1 -b .goodname %patch4 -p1 -b .newgrpPwd %patch5 -p1 -b .lOption -%patch6 -p1 -b .audit -%patch7 -p1 -b .auditUserdel rm po/*.gmo rm po/stamp-po -# Recode man pages from euc-jp to UTF-8. -manconv() { -flags="$-" -set +x -incode=$1 -outcode=$2 -shift 2 -for page in $* ; do - if ! iconv -f ${outcode} -t ${outcode} ${page} > /dev/null 2> /dev/null ; then - if iconv -f ${incode} -t ${outcode} ${page} > /dev/null 2> /dev/null ; then - iconv -f ${incode} -t ${outcode} ${page} > ${page}.tmp && \ - cat ${page}.tmp > ${page} && \ - rm ${page}.tmp - fi - fi -done -set -"$flags" -} -%if %{utf8_man_pages} -manconv euc-jp utf-8 man/ja/*.* -manconv iso-8859-1 utf-8 man/de/* -manconv iso-8859-1 utf-8 man/fr/* -manconv iso-8859-1 utf-8 man/it/* -manconv iso-8859-1 utf-8 man/pt_BR/* -manconv iso-8859-2 utf-8 man/hu/* -manconv iso-8859-2 utf-8 man/pl/* -manconv iso-8859-2 utf-8 man/cs/* -manconv iso-8859-1 utf-8 man/es/* -manconv koi8-u utf-8 man/ru/* -manconv euc-kr utf-8 man/ko/*.* -manconv gb2312 utf-8 man/zh_CN/*.* -manconv big5 utf-8 man/zh_TW/*.* -%endif - libtoolize --force aclocal automake -a @@ -135,7 +95,7 @@ rm $RPM_BUILD_ROOT/%{_sbindir}/logoutd rm $RPM_BUILD_ROOT/%{_sbindir}/vipw rm $RPM_BUILD_ROOT/%{_sbindir}/vigr - +rm $RPM_BUILD_ROOT/%{_sbindir}/nologin rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/id.* rm $RPM_BUILD_ROOT/%{_mandir}/man1/chfn.* rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/chfn.* @@ -167,6 +127,8 @@ rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vipw.* rm $RPM_BUILD_ROOT/%{_mandir}/man8/vigr.* rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/vigr.* +rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/sulogin.* +rm $RPM_BUILD_ROOT/%{_mandir}/*/man3/pw_auth.* %find_lang shadow @@ -175,7 +137,7 @@ %files -f shadow.lang %defattr(-,root,root) -%doc NEWS doc/HOWTO doc/LICENSE README doc/README.linux +%doc NEWS doc/HOWTO README %dir /etc/default %attr(0644,root,root) %config /etc/login.defs %attr(0600,root,root) %config /etc/default/useradd @@ -210,6 +172,7 @@ %{_mandir}/man5/login.defs.5* %{_mandir}/*/man5/login.defs.5* %{_mandir}/man5/gshadow.5* +%{_mandir}/*/man5/gshadow.5* %{_mandir}/man5/faillog.5* %{_mandir}/*/man5/faillog.5* %{_mandir}/man8/adduser.8* @@ -234,6 +197,9 @@ %{_mandir}/*/man8/faillog.8* %changelog +* Fri Jan 06 2006 Peter Vrabec 2:4.0.14-1 +- upgrade + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/shadow-utils/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Oct 2005 12:38:17 -0000 1.9 +++ sources 6 Jan 2006 09:56:57 -0000 1.10 @@ -1 +1 @@ -5c6a105d89afb0900922260e9c5650cc shadow-4.0.13.tar.bz2 +903f55cf05bbe082617d3337743792fb shadow-4.0.14.tar.bz2 --- shadow-4.0.13-audit-update.patch DELETED --- --- shadow-4.0.13-auditUserdel.patch DELETED --- --- shadow-4.0.13-goodname.patch DELETED --- --- shadow-4.0.13-redhat.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 09:59:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 04:59:54 -0500 Subject: rpms/glibc/devel .cvsignore, 1.129, 1.130 glibc-fedora.patch, 1.120, 1.121 glibc.spec, 1.206, 1.207 sources, 1.151, 1.152 glibc-s390-waitid.patch, 1.2, NONE Message-ID: <200601060959.k069xss5030202@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30163/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Removed Files: glibc-s390-waitid.patch Log Message: auto-import glibc-2.3.90-28 on branch devel from glibc-2.3.90-28.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- .cvsignore 4 Jan 2006 08:23:00 -0000 1.129 +++ .cvsignore 6 Jan 2006 09:59:51 -0000 1.130 @@ -1,2 +1,2 @@ -glibc-20060104T0754.tar.bz2 -glibc-fedora-20060104T0754.tar.bz2 +glibc-20060106T0916.tar.bz2 +glibc-fedora-20060106T0916.tar.bz2 glibc-fedora.patch: ChangeLog | 58 ++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 +++ csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 38 ++ elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 ++- include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 + libio/stdio.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 ++ localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 +- malloc/mtrace.c | 20 + nptl/ChangeLog | 19 + nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 + nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - nscd/selinux.c | 2 posix/Makefile | 19 - posix/getconf.speclist.h | 15 + sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------------------- sysdeps/ia64/libgcc-compat.c | 84 ++++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 ++ sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/tcsetattr.c | 32 ++ 47 files changed, 769 insertions(+), 448 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- glibc-fedora.patch 4 Jan 2006 08:23:00 -0000 1.120 +++ glibc-fedora.patch 6 Jan 2006 09:59:51 -0000 1.121 @@ -1,6 +1,6 @@ ---- glibc-20060104T0754/ChangeLog 4 Jan 2006 07:36:31 -0000 1.9851 -+++ glibc-20060104T0754-fedora/ChangeLog 4 Jan 2006 07:58:20 -0000 1.8782.2.147 -@@ -371,6 +371,10 @@ +--- glibc-20060106T0916/ChangeLog 6 Jan 2006 07:30:36 -0000 1.9860 ++++ glibc-20060106T0916-fedora/ChangeLog 6 Jan 2006 09:23:22 -0000 1.8782.2.148 +@@ -452,6 +452,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -11,7 +11,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -654,6 +658,26 @@ +@@ -735,6 +739,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -38,7 +38,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -3772,6 +3796,11 @@ +@@ -3853,6 +3877,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -50,7 +50,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -4766,6 +4795,12 @@ +@@ -4847,6 +4876,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -63,7 +63,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -4890,6 +4925,17 @@ +@@ -4971,6 +5006,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -81,7 +81,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -7950,6 +7996,18 @@ +@@ -8031,6 +8077,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -100,8 +100,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060104T0754/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060104T0754-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060106T0916/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060106T0916-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -151,8 +151,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20060104T0754/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060104T0754-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060106T0916/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060106T0916-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -179,8 +179,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060104T0754/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060104T0754-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060106T0916/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060106T0916-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -261,8 +261,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060104T0754/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060104T0754-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060106T0916/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060106T0916-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -287,8 +287,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060104T0754/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060104T0754-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060106T0916/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060106T0916-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -317,8 +317,8 @@ # define O 0 #else # define O 1 ---- glibc-20060104T0754/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 -+++ glibc-20060104T0754-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 +--- glibc-20060106T0916/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 ++++ glibc-20060106T0916-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr #endif !is_hwcap_platform (direntry->d_name))) @@ -420,8 +420,8 @@ } search_dirs (); ---- glibc-20060104T0754/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060104T0754-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060106T0916/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060106T0916-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -446,8 +446,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060104T0754/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060104T0754-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060106T0916/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060106T0916-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -524,9 +524,9 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060104T0754/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 -+++ glibc-20060104T0754-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 -@@ -265,7 +265,13 @@ +--- glibc-20060106T0916/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 ++++ glibc-20060106T0916-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 +@@ -275,7 +275,13 @@ #endif #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \ @@ -541,8 +541,8 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060104T0754/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060104T0754-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060106T0916/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060106T0916-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -552,8 +552,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060104T0754/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 -+++ glibc-20060104T0754-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 +--- glibc-20060106T0916/libio/stdio.h 5 Jan 2006 12:25:35 -0000 1.84 ++++ glibc-20060106T0916-fedora/libio/stdio.h 6 Jan 2006 09:23:23 -0000 1.78.2.7 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -567,8 +567,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060104T0754/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060104T0754-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060106T0916/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060106T0916-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -599,8 +599,8 @@ #endif ---- glibc-20060104T0754/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20060104T0754-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060106T0916/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060106T0916-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -692,8 +692,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060104T0754/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060104T0754-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060106T0916/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060106T0916-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -737,8 +737,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060104T0754/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20060104T0754-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060106T0916/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060106T0916-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -747,8 +747,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060104T0754/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20060104T0754-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060106T0916/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060106T0916-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -790,8 +790,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060104T0754/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060104T0754-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060106T0916/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060106T0916-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -806,8 +806,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060104T0754/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060104T0754-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060106T0916/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060106T0916-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -819,8 +819,8 @@ date_fmt "/ / " ---- glibc-20060104T0754/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060104T0754-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060106T0916/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T0916-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -891,8 +891,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060104T0754/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060104T0754-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060106T0916/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060106T0916-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -920,8 +920,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060104T0754/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060104T0754-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060106T0916/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060106T0916-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -997,8 +997,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060104T0754/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060104T0754-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060106T0916/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060106T0916-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1054,9 +1054,9 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060104T0754/nptl/ChangeLog 4 Jan 2006 00:20:45 -0000 1.834 -+++ glibc-20060104T0754-fedora/nptl/ChangeLog 4 Jan 2006 07:58:21 -0000 1.706.2.71 -@@ -375,6 +375,15 @@ +--- glibc-20060106T0916/nptl/ChangeLog 6 Jan 2006 03:08:04 -0000 1.838 ++++ glibc-20060106T0916-fedora/nptl/ChangeLog 6 Jan 2006 09:23:24 -0000 1.706.2.72 +@@ -397,6 +397,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1072,7 +1072,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1111,6 +1120,11 @@ +@@ -1133,6 +1142,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1084,7 +1084,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3185,6 +3199,11 @@ +@@ -3207,6 +3221,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1096,8 +1096,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060104T0754/nptl/Makefile 28 Dec 2005 20:48:24 -0000 1.174 -+++ glibc-20060104T0754-fedora/nptl/Makefile 2 Jan 2006 10:52:51 -0000 1.157.2.15 +--- glibc-20060106T0916/nptl/Makefile 5 Jan 2006 08:16:20 -0000 1.175 ++++ glibc-20060106T0916-fedora/nptl/Makefile 6 Jan 2006 09:23:24 -0000 1.157.2.16 @@ -507,15 +507,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1120,8 +1120,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060104T0754/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060104T0754-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060106T0916/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060106T0916-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1146,8 +1146,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060104T0754/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060104T0754-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060106T0916/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T0916-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1155,8 +1155,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060104T0754/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 -+++ glibc-20060104T0754-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 +--- glibc-20060106T0916/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 ++++ glibc-20060106T0916-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void) exit (4); } @@ -1176,8 +1176,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060104T0754/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 -+++ glibc-20060104T0754-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +--- glibc-20060106T0916/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060106T0916-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1196,8 +1196,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060104T0754/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20060104T0754-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060106T0916/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060106T0916-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 @@ -32,8 +32,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1209,8 +1209,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060104T0754/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060104T0754-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060106T0916/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060106T0916-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1251,8 +1251,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060104T0754/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 -+++ glibc-20060104T0754-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 +--- glibc-20060106T0916/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 ++++ glibc-20060106T0916-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 @@ -147,7 +147,7 @@ audit_init (void) if (audit_fd < 0 /* If kernel doesn't support audit, bail out */ @@ -1262,8 +1262,8 @@ } #endif /* HAVE_LIBAUDIT */ ---- glibc-20060104T0754/posix/Makefile 2 Jan 2006 20:39:39 -0000 1.187 -+++ glibc-20060104T0754-fedora/posix/Makefile 2 Jan 2006 21:28:09 -0000 1.171.2.15 +--- glibc-20060106T0916/posix/Makefile 2 Jan 2006 20:39:39 -0000 1.187 ++++ glibc-20060106T0916-fedora/posix/Makefile 2 Jan 2006 21:28:09 -0000 1.171.2.15 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1297,8 +1297,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060104T0754/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060104T0754-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060106T0916/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T0916-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1315,8 +1315,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060104T0754/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060104T0754-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060106T0916/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060106T0916-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1332,8 +1332,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20060104T0754/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060104T0754-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060106T0916/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060106T0916-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1345,8 +1345,8 @@ endif endif ---- glibc-20060104T0754/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060104T0754-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060106T0916/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060106T0916-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1698,8 +1698,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20060104T0754/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060104T0754-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060106T0916/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T0916-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1785,8 +1785,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060104T0754/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060104T0754-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060106T0916/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060106T0916-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -1801,8 +1801,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060104T0754/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 -+++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 +--- glibc-20060106T0916/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 ++++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -1851,8 +1851,8 @@ + ret ^= stk; return ret; } ---- glibc-20060104T0754/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060106T0916/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -1862,8 +1862,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060104T0754/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060106T0916/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -1909,8 +1909,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060104T0754/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060106T0916/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -1971,8 +1971,8 @@ + } while (0) + +#include_next ---- glibc-20060104T0754/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060106T0916/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2005,24 +2005,24 @@ + } while (0) + #include_next ---- glibc-20060104T0754/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060106T0916/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060104T0754/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060106T0916/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060104T0754/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060104T0754-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060106T0916/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- glibc.spec 6 Jan 2006 05:06:44 -0000 1.206 +++ glibc.spec 6 Jan 2006 09:59:51 -0000 1.207 @@ -1,9 +1,9 @@ -%define glibcdate 20060104T0754 +%define glibcdate 20060106T0916 %define glibcname glibc -%define glibcsrcdir glibc-20060104T0754 +%define glibcsrcdir glibc-20060106T0916 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 27 +%define glibcrelease 28 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -33,7 +33,6 @@ Patch0: %{glibcname}-fedora.patch Patch1: %{name}-ppc-assume.patch Patch2: %{name}-ia64-lib64.patch -Patch3: glibc-s390-waitid.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -241,7 +240,6 @@ %patch2 -p1 %endif %endif -%patch3 -p1 # Hack till glibc-kernheaders get updated, argh mkdir -p override_headers/linux @@ -1135,6 +1133,10 @@ %endif %changelog +* Fri Jan 6 2006 Jakub Jelinek 2.3.90-28 +- update from CVS + - make aio_suspend interruptible by signals (#171968) + * Fri Jan 6 2006 Jakub Jelinek 2.3.90-27 - only rely on d_type in 32-bit getdents on s390 for 2.6.11+ Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- sources 4 Jan 2006 08:23:00 -0000 1.151 +++ sources 6 Jan 2006 09:59:51 -0000 1.152 @@ -1,2 +1,2 @@ -f70b1d2963a725c661a26a79b389a2b4 glibc-20060104T0754.tar.bz2 -3f73e8750831648a4d1d96051eaa0d0f glibc-fedora-20060104T0754.tar.bz2 +6898b0af980cc372d55c34749787d018 glibc-20060106T0916.tar.bz2 +28d64f7b1368208777770040639cfdc0 glibc-fedora-20060106T0916.tar.bz2 --- glibc-s390-waitid.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 11:15:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 06:15:14 -0500 Subject: rpms/aspell-sv/devel .cvsignore, 1.7, 1.8 aspell-sv.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200601061115.k06BFEgD004383@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/aspell-sv/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3750 Modified Files: .cvsignore aspell-sv.spec sources Log Message: - update to 0.51-0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/aspell-sv/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Sep 2004 03:16:29 -0000 1.7 +++ .cvsignore 6 Jan 2006 11:15:12 -0000 1.8 @@ -1 +1 @@ -aspell-sv-0.50-2.tar.bz2 +aspell-sv-0.51-0.tar.bz2 Index: aspell-sv.spec =================================================================== RCS file: /cvs/dist/rpms/aspell-sv/devel/aspell-sv.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- aspell-sv.spec 9 Dec 2005 22:39:40 -0000 1.14 +++ aspell-sv.spec 6 Jan 2006 11:15:12 -0000 1.15 @@ -1,10 +1,10 @@ %define lang sv -%define langrelease 2 +%define langrelease 0 Summary: Swedish dictionaries for Aspell. Name: aspell-%{lang} Epoch: 50 -Version: 0.50 -Release: 8.1 +Version: 0.51 +Release: 1 License: GPL Group: Applications/Text URL: http://aspell.net/ @@ -44,6 +44,9 @@ #%{_datadir}/aspell/* %changelog +* Fri Jan 6 2006 Ivana Varekova 50:0.51-1 +- update to 0.51-0 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/aspell-sv/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Sep 2004 03:16:29 -0000 1.7 +++ sources 6 Jan 2006 11:15:12 -0000 1.8 @@ -1 +1 @@ -8d50ddf72f750d187b0ffc440328db84 aspell-sv-0.50-2.tar.bz2 +d180c781f8986ea0f65b6b18f02a494e aspell-sv-0.51-0.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 6 13:10:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 08:10:56 -0500 Subject: rpms/man-pages/devel .cvsignore, 1.18, 1.19 man-pages.spec, 1.35, 1.36 sources, 1.18, 1.19 Message-ID: <200601061310.k06DAug1016537@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16437 Modified Files: .cvsignore man-pages.spec sources Log Message: - update to 2.20 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/man-pages/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 8 Dec 2005 15:21:11 -0000 1.18 +++ .cvsignore 6 Jan 2006 13:10:53 -0000 1.19 @@ -1,3 +1,3 @@ man-pages-extralocale.tar.bz2 man2.tar.gz -man-pages-2.16.tar.gz +man-pages-2.20.tar.gz Index: man-pages.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- man-pages.spec 13 Dec 2005 09:52:57 -0000 1.35 +++ man-pages.spec 6 Jan 2006 13:10:53 -0000 1.36 @@ -1,7 +1,7 @@ Summary: Man (manual) pages from the Linux Documentation Project. Name: man-pages -Version: 2.16 -Release: 2 +Version: 2.20 +Release: 1 License: distributable Group: Documentation Source0: http://www.kernel.org/pub/linux/docs/manpages/man-pages-%{version}.tar.gz @@ -145,6 +145,9 @@ %{_mandir}/en/man*/* %changelog +* Fri Jan 6 2006 Ivana Varekova 2.20-1 +- update to 2.20 + * Tue Dec 13 2005 Ivana Varekova 2.16-2 - fix bug 174628 - mmap(2) CAN return mappings at location 0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/man-pages/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 8 Dec 2005 15:21:11 -0000 1.18 +++ sources 6 Jan 2006 13:10:53 -0000 1.19 @@ -1,3 +1,3 @@ 57f2e0500d177e05647990eae439a8ee man-pages-extralocale.tar.bz2 af09d031dcee66929510e078d00066f2 man2.tar.gz -107e2926a70220d24fd682bd72d6256d man-pages-2.16.tar.gz +fcd3de7266a5e2999ea77fe5fbea13c1 man-pages-2.20.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 6 13:56:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 08:56:35 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch, 1.3, 1.4 sources, 1.21, 1.22 Message-ID: <200601061356.k06DuZGa025444@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25385 Modified Files: policy-20060104.patch sources Log Message: * Thu Jan 5 2006 Dan Walsh 2.1.7-3 - Handle new location of hal scripts policy-20060104.patch: Makefile | 2 Rules.modular | 10 config/appconfig-strict-mcs/default_type | 6 config/appconfig-strict-mls/default_type | 7 config/appconfig-strict-mls/initrc_context | 2 config/appconfig-targeted-mcs/default_type | 2 config/appconfig-targeted-mls/default_type | 2 config/appconfig-targeted-mls/initrc_context | 2 man/man8/ftpd_selinux.8 | 56 ++++ man/man8/httpd_selinux.8 | 123 ++++++++ man/man8/kerberos_selinux.8 | 31 ++ man/man8/named_selinux.8 | 29 ++ man/man8/nfs_selinux.8 | 30 ++ man/man8/nis_selinux.8 | 1 man/man8/rsync_selinux.8 | 41 ++ man/man8/samba_selinux.8 | 60 ++++ man/man8/ypbind_selinux.8 | 19 + policy/global_tunables | 3 policy/mcs | 321 ++++------------------- policy/mls | 371 +++++---------------------- policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 9 policy/modules/admin/logrotate.te | 4 policy/modules/admin/rpm.fc | 1 policy/modules/admin/rpm.te | 19 - policy/modules/admin/su.if | 2 policy/modules/admin/tmpreaper.te | 3 policy/modules/admin/usermanage.te | 15 - policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 + policy/modules/apps/java.te | 25 + policy/modules/apps/webalizer.te | 1 policy/modules/kernel/corecommands.te | 6 policy/modules/kernel/corenetwork.te.in | 12 policy/modules/kernel/devices.fc | 9 policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.fc | 27 + policy/modules/kernel/files.if | 17 + policy/modules/kernel/kernel.if | 3 policy/modules/kernel/kernel.te | 30 +- policy/modules/kernel/mls.te | 9 policy/modules/kernel/selinux.te | 2 policy/modules/kernel/storage.fc | 46 +-- policy/modules/services/apache.te | 9 policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 14 - policy/modules/services/bind.if | 19 + policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 3 policy/modules/services/cups.te | 7 policy/modules/services/cvs.fc | 2 policy/modules/services/cvs.te | 6 policy/modules/services/dbus.te | 1 policy/modules/services/dovecot.te | 2 policy/modules/services/hal.fc | 1 policy/modules/services/hal.te | 4 policy/modules/services/ldap.te | 4 policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 103 +++++++ policy/modules/services/mta.te | 13 policy/modules/services/nscd.te | 1 policy/modules/services/ntp.te | 2 policy/modules/services/ppp.te | 4 policy/modules/services/prelink.fc | 7 policy/modules/services/prelink.if | 39 ++ policy/modules/services/prelink.te | 64 ++++ policy/modules/services/remotelogin.te | 1 policy/modules/services/samba.if | 3 policy/modules/services/sasl.te | 8 policy/modules/services/sendmail.te | 36 -- policy/modules/services/ssh.te | 10 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 12 policy/modules/system/authlogin.te | 1 policy/modules/system/getty.te | 3 policy/modules/system/hostname.if | 15 + policy/modules/system/hostname.te | 37 -- policy/modules/system/init.if | 14 + policy/modules/system/init.te | 22 + policy/modules/system/iptables.te | 2 policy/modules/system/libraries.fc | 126 ++++----- policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 2 policy/modules/system/logging.fc | 7 policy/modules/system/logging.if | 21 + policy/modules/system/logging.te | 5 policy/modules/system/lvm.te | 2 policy/modules/system/mount.te | 2 policy/modules/system/selinuxutil.fc | 6 policy/modules/system/selinuxutil.te | 11 policy/modules/system/udev.fc | 1 policy/modules/system/udev.te | 4 policy/modules/system/unconfined.fc | 2 policy/modules/system/unconfined.te | 13 policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 43 +++ policy/modules/system/userdomain.te | 17 + policy/users | 8 103 files changed, 1415 insertions(+), 789 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- policy-20060104.patch 6 Jan 2006 01:04:01 -0000 1.3 +++ policy-20060104.patch 6 Jan 2006 13:56:31 -0000 1.4 @@ -2059,7 +2059,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.1.7/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2005-12-13 15:51:49.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/services/automount.te 2006-01-05 11:12:20.000000000 -0500 ++++ serefpolicy-2.1.7/policy/modules/services/automount.te 2006-01-05 20:23:34.000000000 -0500 @@ -28,7 +28,7 @@ # Local policy # @@ -2097,6 +2097,18 @@ miscfiles_read_localization(automount_t) +@@ -140,6 +145,11 @@ + fstools_domtrans(automount_t) + ') + ++optional_policy(`bind',` ++ allow automount_t named_conf_t:dir search; ++ allow automount_t named_zone_t:dir search; ++') ++ + optional_policy(`nis',` + nis_use_ypbind(automount_t) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-2.1.7/policy/modules/services/bind.if --- nsaserefpolicy/policy/modules/services/bind.if 2005-12-02 17:53:53.000000000 -0500 +++ serefpolicy-2.1.7/policy/modules/services/bind.if 2006-01-05 11:12:20.000000000 -0500 Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 4 Jan 2006 19:02:16 -0000 1.21 +++ sources 6 Jan 2006 13:56:31 -0000 1.22 @@ -1 +1 @@ -324533d57b4d149d1b6f4fdfda93567f serefpolicy-2.1.7.tgz +bb6c7f0e43c8cb894daff5a3b31fdef5 serefpolicy-2.1.7.tgz From fedora-cvs-commits at redhat.com Fri Jan 6 14:39:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 09:39:41 -0500 Subject: rpms/glib2/devel .cvsignore, 1.41, 1.42 glib2.spec, 1.70, 1.71 sources, 1.41, 1.42 Message-ID: <200601061439.k06EdfVd006369@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/glib2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6354 Modified Files: .cvsignore glib2.spec sources Log Message: 2.9.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 6 Jan 2006 03:27:49 -0000 1.41 +++ .cvsignore 6 Jan 2006 14:39:39 -0000 1.42 @@ -26,3 +26,4 @@ glib-2.9.1.cvs20051202_2.tar.bz2 glib-2.9.1.tar.bz2 glib-2.9.2.tar.gz +glib-2.9.2.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- glib2.spec 6 Jan 2006 03:27:49 -0000 1.70 +++ glib2.spec 6 Jan 2006 14:39:39 -0000 1.71 @@ -4,7 +4,7 @@ Release: 1 License: LGPL Group: System Environment/Libraries -Source: glib-%{version}.tar.gz +Source: glib-%{version}.tar.bz2 Source2: glib2.sh Source3: glib2.csh Conflicts: libgnomeui <= 2.2.0 @@ -18,7 +18,8 @@ GLib is the low-level core library that forms the basis for projects such as GTK+ and GNOME. It provides data structure handling for C, portability wrappers, and interfaces for such runtime -functionality as an event loop, threads, dynamic loading, and anobject system. +functionality as an event loop, threads, dynamic loading, and an +object system. This package provides version 2 of GLib. @@ -95,6 +96,9 @@ %{_mandir}/man1/* %changelog +* Fri Jan 6 2006 Matthias Clasen - 2.9.2-1 +- Update to 2.9.2 + * Sun Dec 11 2005 Matthias Clasen - Specfile cosmetics Index: sources =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 6 Jan 2006 03:27:49 -0000 1.41 +++ sources 6 Jan 2006 14:39:39 -0000 1.42 @@ -1 +1 @@ -7fac24e6c05fc620177f8fccd572043f glib-2.9.2.tar.gz +98a33482d62735ed7e202bbbd5b27851 glib-2.9.2.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 6 14:41:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 09:41:41 -0500 Subject: rpms/glib2/devel glib2.spec,1.71,1.72 Message-ID: <200601061441.k06EffuY006495@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/glib2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6482 Modified Files: glib2.spec Log Message: Bump rev Index: glib2.spec =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- glib2.spec 6 Jan 2006 14:39:39 -0000 1.71 +++ glib2.spec 6 Jan 2006 14:41:39 -0000 1.72 @@ -1,7 +1,7 @@ Summary: A library of handy utility functions Name: glib2 Version: 2.9.2 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries Source: glib-%{version}.tar.bz2 @@ -96,7 +96,7 @@ %{_mandir}/man1/* %changelog -* Fri Jan 6 2006 Matthias Clasen - 2.9.2-1 +* Fri Jan 6 2006 Matthias Clasen - 2.9.2-2 - Update to 2.9.2 * Sun Dec 11 2005 Matthias Clasen From fedora-cvs-commits at redhat.com Fri Jan 6 15:02:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 10:02:17 -0500 Subject: rpms/kernel/devel/configs config-generic,1.123,1.124 Message-ID: <200601061502.k06F2HVk028667@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv28557/configs Modified Files: config-generic Log Message: update bcm43xx, fix mv643xx_eth Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- config-generic 6 Jan 2006 09:12:34 -0000 1.123 +++ config-generic 6 Jan 2006 15:02:01 -0000 1.124 @@ -1041,6 +1041,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m +CONFIG_IEEE80211_SOFTMAC_DEBUG=y # CONFIG_IPW2100 is not set # CONFIG_IPW2200 is not set # CONFIG_IPW2100_DEBUG is not set From fedora-cvs-commits at redhat.com Fri Jan 6 15:02:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 10:02:00 -0500 Subject: rpms/kernel/devel linux-2.6-mv643xx-compile-fix.patch, NONE, 1.1 linux-2.6-softmac-git.patch, NONE, 1.1 .cvsignore, 1.314, 1.315 kernel-2.6.spec, 1.1828, 1.1829 linux-2.6-bcm43xx-resume.patch, 1.1, 1.2 linux-2.6-bcm43xx.patch, 1.1, 1.2 sources, 1.256, 1.257 linux-2.6-bcm43xx-device-table.patch, 1.1, NONE linux-2.6-bcm43xx-promisc.patch, 1.1, NONE linux-2.6-bcm43xx-quiet.patch, 1.1, NONE linux-2.6.14-ieee80211-hw-wep.patch, 1.1, NONE Message-ID: <200601061502.k06F20XJ028630@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28557 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-bcm43xx-resume.patch linux-2.6-bcm43xx.patch sources Added Files: linux-2.6-mv643xx-compile-fix.patch linux-2.6-softmac-git.patch Removed Files: linux-2.6-bcm43xx-device-table.patch linux-2.6-bcm43xx-promisc.patch linux-2.6-bcm43xx-quiet.patch linux-2.6.14-ieee80211-hw-wep.patch Log Message: update bcm43xx, fix mv643xx_eth linux-2.6-mv643xx-compile-fix.patch: mv643xx_eth.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6-mv643xx-compile-fix.patch --- --- linux-2.6.15/drivers/net/mv643xx_eth.c~ 2006-01-06 13:13:34.000000000 +0000 +++ linux-2.6.15/drivers/net/mv643xx_eth.c 2006-01-06 13:41:03.000000000 +0000 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include linux-2.6-softmac-git.patch: include/net/ieee80211.h | 6 include/net/ieee80211softmac.h | 266 +++++++++++++ include/net/ieee80211softmac_wx.h | 66 +++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/ieee80211_crypt_wep.c | 61 ++- net/ieee80211/ieee80211_module.c | 2 net/ieee80211/ieee80211_rx.c | 4 net/ieee80211/ieee80211_tx.c | 2 net/ieee80211/ieee80211_wx.c | 2 net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 356 ++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 348 +++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 135 ++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 436 ++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 211 ++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 216 ++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 390 +++++++++++++++++++ 20 files changed, 2971 insertions(+), 25 deletions(-) --- NEW FILE linux-2.6-softmac-git.patch --- diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index cde2f4f..df05f46 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -363,8 +363,9 @@ enum ieee80211_reasoncode { #define IEEE80211_OFDM_SHIFT_MASK_A 4 /* NOTE: This data is for statistical purposes; not all hardware provides this - * information for frames received. Not setting these will not cause - * any adverse affects. */ + * information for frames received. + * For ieee80211_rx_mgt, you need to set at least the 'len' parameter. + */ struct ieee80211_rx_stats { u32 mac_time; s8 rssi; @@ -1088,6 +1089,7 @@ extern int ieee80211_tx_frame(struct iee /* ieee80211_rx.c */ extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, struct ieee80211_rx_stats *rx_stats); +/* make sure to set stats->len */ extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, struct ieee80211_hdr_4addr *header, struct ieee80211_rx_stats *stats); diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h new file mode 100644 index 0000000..7264bd8 --- /dev/null +++ b/include/net/ieee80211softmac.h @@ -0,0 +1,266 @@ +#ifndef IEEE80211SOFTMAC_H_ +#define IEEE80211SOFTMAC_H_ + +#include +#include +#include +#include +#include + +/* Once the API is considered more or less stable, + * this should be incremented on API incompatible changes. + */ +#define IEEE80211SOFTMAC_API 0 + +#define IEEE80211SOFTMAC_MAX_RATES_LEN 8 +#define IEEE80211SOFTMAC_MAX_EX_RATES_LEN 255 + +struct ieee80211softmac_ratesinfo { + u8 count; + u8 rates[IEEE80211SOFTMAC_MAX_RATES_LEN + IEEE80211SOFTMAC_MAX_EX_RATES_LEN]; +}; + +/* internal structures */ +struct ieee80211softmac_network; +struct ieee80211softmac_scaninfo; + +struct ieee80211softmac_essid { + u8 len; + char data[IW_ESSID_MAX_SIZE+1]; +}; + +struct ieee80211softmac_wpa { + char *IE; + int IElen; + int IEbuflen; +}; + +/* + * Information about association + * + * Do we need a lock for this? + * We only ever use this structure inlined + * into our global struct. I've used its lock, + * but maybe we need a local one here? + */ +struct ieee80211softmac_assoc_info { + /* + * This is the requested ESSID. It is written + * only by the WX handlers. + * + */ + struct ieee80211softmac_essid req_essid; + /* + * the ESSID of the network we're currently + * associated (or trying) to. This is + * updated to the network's actual ESSID + * even if the requested ESSID was 'ANY' + */ + struct ieee80211softmac_essid associate_essid; + + /* BSSID we're trying to associate to */ + char bssid[ETH_ALEN]; + + /* some flags. + * static_essid is valid if the essid is constant, + * this is for use by the wx handlers only. + * + * associating is true, if the network has been + * auth'ed on and we are in the process of associating. + * + * bssvalid is true if we found a matching network + * and saved it's BSSID into the bssid above. + */ + u8 static_essid:1, + associating:1, + bssvalid:1; + + /* Scan retries remaining */ + int scan_retry; + + struct work_struct work; + struct work_struct timeout; +}; + +enum { + IEEE80211SOFTMAC_AUTH_OPEN_REQUEST = 1, + IEEE80211SOFTMAC_AUTH_OPEN_RESPONSE = 2, +}; + +enum { + IEEE80211SOFTMAC_AUTH_SHARED_REQUEST = 1, + IEEE80211SOFTMAC_AUTH_SHARED_CHALLENGE = 2, + IEEE80211SOFTMAC_AUTH_SHARED_RESPONSE = 3, + IEEE80211SOFTMAC_AUTH_SHARED_PASS = 4, +}; + +/* We should make these tunable + * AUTH_TIMEOUT seems really long, but that's what it is in BSD */ +#define IEEE80211SOFTMAC_AUTH_TIMEOUT (12 * HZ) +#define IEEE80211SOFTMAC_AUTH_RETRY_LIMIT 5 +#define IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT 3 + +struct ieee80211softmac_txrates { + /* The Bit-Rate to be used for multicast frames. */ + u8 mcast_rate; + /* The Bit-Rate to be used for multicast fallback + * (If the device supports fallback and hardware-retry) + */ + u8 mcast_fallback; + /* The Bit-Rate to be used for any other (normal) data packet. */ + u8 default_rate; + /* The Bit-Rate to be used for default fallback + * (If the device supports fallback and hardware-retry) + */ + u8 default_fallback; +}; + +/* Bits for txrates_change callback. */ +#define IEEE80211SOFTMAC_TXRATECHG_DEFAULT (1 << 0) /* default_rate */ +#define IEEE80211SOFTMAC_TXRATECHG_DEFAULT_FBACK (1 << 1) /* default_fallback */ +#define IEEE80211SOFTMAC_TXRATECHG_MCAST (1 << 2) /* mcast_rate */ +#define IEEE80211SOFTMAC_TXRATECHG_MCAST_FBACK (1 << 3) /* mcast_fallback */ + +struct ieee80211softmac_device { + /* 802.11 structure for data stuff */ + struct ieee80211_device *ieee; + struct net_device *dev; + + /* only valid if associated, then holds the Association ID */ + u16 association_id; + + /* the following methods are callbacks that the driver + * using this framework has to assign + */ + + /* always assign these */ + void (*set_bssid_filter)(struct net_device *dev, const u8 *bssid); + void (*set_channel)(struct net_device *dev, u8 channel); + + /* assign if you need it, informational only */ + void (*link_change)(struct net_device *dev); + + /* If the hardware can do scanning, assign _all_ three of these callbacks. + * When the scan finishes, call ieee80211softmac_scan_finished(). + */ + + /* when called, start_scan is guaranteed to not be called again + * until you call ieee80211softmac_scan_finished. + * Return 0 if scanning could start, error otherwise. + * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_start_scan */ + int (*start_scan)(struct net_device *dev); + /* this should block until after ieee80211softmac_scan_finished was called + * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_wait_for_scan */ + void (*wait_for_scan)(struct net_device *dev); + /* stop_scan aborts a scan, but is asynchronous. + * if you want to wait for it too, use wait_for_scan + * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_stop_scan */ + void (*stop_scan)(struct net_device *dev); + + /* we'll need something about beacons here too, for AP or ad-hoc modes */ + + /* Transmission rates to be used by the driver. + * The SoftMAC figures out the best possible rates. + * The driver just needs to read them. + */ + struct ieee80211softmac_txrates txrates; + /* If the driver needs to do stuff on TX rate changes, assign this callback. */ + void (*txrates_change)(struct net_device *dev, + u32 changes, /* see IEEE80211SOFTMAC_TXRATECHG flags */ [...2780 lines suppressed...] + struct iw_request_info *info, + union iwreq_data *data, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); + unsigned long flags; + int err = -EINVAL; + + spin_lock_irqsave(&mac->lock, flags); + switch (mac->txrates.default_rate) { + case IEEE80211_CCK_RATE_1MB: + data->bitrate.value = 1000000; + break; + case IEEE80211_CCK_RATE_2MB: + data->bitrate.value = 2000000; + break; + case IEEE80211_CCK_RATE_5MB: + data->bitrate.value = 5500000; + break; + case IEEE80211_CCK_RATE_11MB: + data->bitrate.value = 11000000; + break; + case IEEE80211_OFDM_RATE_6MB: + data->bitrate.value = 6000000; + break; + case IEEE80211_OFDM_RATE_9MB: + data->bitrate.value = 9000000; + break; + case IEEE80211_OFDM_RATE_12MB: + data->bitrate.value = 12000000; + break; + case IEEE80211_OFDM_RATE_18MB: + data->bitrate.value = 18000000; + break; + case IEEE80211_OFDM_RATE_24MB: + data->bitrate.value = 24000000; + break; + case IEEE80211_OFDM_RATE_36MB: + data->bitrate.value = 36000000; + break; + case IEEE80211_OFDM_RATE_48MB: + data->bitrate.value = 48000000; + break; + case IEEE80211_OFDM_RATE_54MB: + data->bitrate.value = 54000000; + break; + default: + assert(0); + goto out_unlock; + } + err = 0; +out_unlock: + spin_unlock_irqrestore(&mac->lock, flags); + + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_rate); + +int +ieee80211softmac_wx_get_wap(struct net_device *net_dev, + struct iw_request_info *info, + union iwreq_data *data, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); + int err = 0; + unsigned long flags; + + spin_lock_irqsave(&mac->lock, flags); + if (mac->associnfo.bssvalid) + memcpy(data->ap_addr.sa_data, mac->associnfo.bssid, ETH_ALEN); + else + memset(data->ap_addr.sa_data, 0xff, ETH_ALEN); + data->ap_addr.sa_family = ARPHRD_ETHER; + spin_unlock_irqrestore(&mac->lock, flags); + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_wap); + +int +ieee80211softmac_wx_set_wap(struct net_device *net_dev, + struct iw_request_info *info, + union iwreq_data *data, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); + static const unsigned char any[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + static const unsigned char off[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + unsigned long flags; + + /* sanity check */ + if (data->ap_addr.sa_family != ARPHRD_ETHER) { + return -EINVAL; + } + + spin_lock_irqsave(&mac->lock, flags); + if (!memcmp(any, data->ap_addr.sa_data, ETH_ALEN) || + !memcmp(off, data->ap_addr.sa_data, ETH_ALEN)) { + schedule_work(&mac->associnfo.work); + goto out; + } else { + if (!memcmp(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN)) { + if (mac->associnfo.associating || mac->associated) { + /* bssid unchanged and associated or associating - just return */ + goto out; + } + } else { + /* copy new value in data->ap_addr.sa_data to bssid */ + memcpy(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN); + } + /* queue associate if new bssid or (old one again and not associated) */ + schedule_work(&mac->associnfo.work); + } + +out: + spin_unlock_irqrestore(&mac->lock, flags); + return 0; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_wap); + +int +ieee80211softmac_wx_set_genie(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(dev); + unsigned long flags; + int err = 0; + char *buf; + int i; + + spin_lock_irqsave(&mac->lock, flags); + /* bleh. shouldn't be locked for that kmalloc... */ + + if (wrqu->data.length) { + if ((wrqu->data.length < 2) || (extra[1]+2 != wrqu->data.length)) { + /* this is an IE, so the length must be + * correct. Is it possible though that + * more than one IE is passed in? + */ + err = -EINVAL; + goto out; + } + if (mac->wpa.IEbuflen <= wrqu->data.length) { + buf = kmalloc(wrqu->data.length, GFP_ATOMIC); + if (!buf) { + err = -ENOMEM; + goto out; + } + kfree(mac->wpa.IE); + mac->wpa.IE = buf; + mac->wpa.IEbuflen = wrqu->data.length; + } + memcpy(mac->wpa.IE, extra, wrqu->data.length); + dprintk(KERN_INFO PFX "generic IE set to "); + for (i=0;idata.length;i++) + dprintk("%.2x", mac->wpa.IE[i]); + dprintk("\n"); + mac->wpa.IElen = wrqu->data.length; + } else { + kfree(mac->wpa.IE); + mac->wpa.IE = NULL; + mac->wpa.IElen = 0; + mac->wpa.IEbuflen = 0; + } + + out: + spin_unlock_irqrestore(&mac->lock, flags); + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_genie); + +int +ieee80211softmac_wx_get_genie(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(dev); + unsigned long flags; + int err = 0; + int space = wrqu->data.length; + + spin_lock_irqsave(&mac->lock, flags); + + wrqu->data.length = 0; + + if (mac->wpa.IE && mac->wpa.IElen) { + wrqu->data.length = mac->wpa.IElen; + if (mac->wpa.IElen <= space) + memcpy(extra, mac->wpa.IE, mac->wpa.IElen); + else + err = -E2BIG; + } + spin_unlock_irqrestore(&mac->lock, flags); + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_genie); + Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.314 retrieving revision 1.315 diff -u -r1.314 -r1.315 --- .cvsignore 6 Jan 2006 09:08:13 -0000 1.314 +++ .cvsignore 6 Jan 2006 15:01:25 -0000 1.315 @@ -2,6 +2,5 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 -bcm43xx-20060103.tar.bz2 -ieee80211softmac-20060103.tar.bz2 patch-2.6.15-git2.bz2 +bcm43xx-20060106.tar.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1828 retrieving revision 1.1829 diff -u -r1.1828 -r1.1829 --- kernel-2.6.spec 6 Jan 2006 09:12:34 -0000 1.1828 +++ kernel-2.6.spec 6 Jan 2006 15:01:40 -0000 1.1829 @@ -182,8 +182,7 @@ Source10: COPYING.modules Source11: genkey -%define BCMVER 20060103 -Source12: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/softmac/ieee80211softmac-%{BCMVER}.tar.bz2 +%define BCMVER 20060106 Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2 Source20: kernel-%{kversion}-i586.config @@ -364,6 +363,7 @@ Patch1810: linux-2.6-smsc-ircc2-pnp.patch Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch +Patch1850: linux-2.6-mv643xx-compile-fix.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -382,12 +382,9 @@ Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch # Broadcom wireless driver -Patch5000: linux-2.6-bcm43xx.patch -Patch5001: linux-2.6-bcm43xx-quiet.patch -Patch5002: linux-2.6-bcm43xx-promisc.patch -Patch5003: linux-2.6.14-ieee80211-hw-wep.patch -Patch5004: linux-2.6-bcm43xx-device-table.patch -Patch5005: linux-2.6-bcm43xx-resume.patch +Patch5000: linux-2.6-softmac-git.patch +Patch5001: linux-2.6-bcm43xx.patch +Patch5002: linux-2.6-bcm43xx-resume.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -872,6 +869,8 @@ %patch1830 -p1 # Reboot through BIOS on HP laptops. %patch1840 -p1 +# Fix compilation for MV643xx Ethernet +%patch1850 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -903,24 +902,15 @@ # Broadcom BCM43xx wireless driver. # Extract snapshot tarballs and move them into place. -tar xvfj %{SOURCE12} -mv ieee80211softmac-%{BCMVER}/net/*.h include/net -mv ieee80211softmac-%{BCMVER} net/ieee80211/softmac tar xvfj %{SOURCE13} mv bcm43xx-%{BCMVER} drivers/net/wireless/bcm43xx -# Patch Kconfig and Makefiles to merge it 'properly' +# Import softmac code from git tree %patch5000 -p1 -# Make it shut up about dropping packets it didn't want +# Patch Kconfig and Makefiles to merge bcm43xx 'properly' %patch5001 -p1 -# Operate in promiscuous mode, to make multicast and broadcast RX work +# Fix the reassociate on resume code %patch5002 -p1 -# Handle host_build_iv properly -%patch5003 -p1 -# Include pci device table so it gets autoloaded -%patch5004 -p1 -# Reassociate on resume -%patch5005 -p1 # # final stuff @@ -1409,6 +1399,10 @@ %endif %changelog +* Fri Jan 6 2006 David Woodhouse +- Fix mv643xx_eth compilation +- Update Broadcom driver, switch to git tree for softmac + * Fri Jan 6 2006 Dave Jones - 2.6.15-git2 - Add timer quirk for ATI chipsets. linux-2.6-bcm43xx-resume.patch: bcm43xx.h | 11 +++++++++-- bcm43xx_main.c | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) Index: linux-2.6-bcm43xx-resume.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx-resume.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-bcm43xx-resume.patch 3 Jan 2006 23:04:52 -0000 1.1 +++ linux-2.6-bcm43xx-resume.patch 6 Jan 2006 15:01:44 -0000 1.2 @@ -1,10 +1,39 @@ --- linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c~ 2006-01-03 22:56:55.000000000 +0000 +++ linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-01-03 23:00:15.000000000 +0000 -@@ -4543,6 +4541,7 @@ static int bcm43xx_resume(struct pci_dev - } +@@ -4583,8 +4583,8 @@ static int bcm43xx_resume(struct pci_dev netif_device_attach(net_dev); -+ queue_work(bcm->softmac->workqueue,&bcm->softmac->associnfo.work); + + /*FIXME: This should be handled by softmac instead. */ +- queue_work(bcm->softmac->workqueue, &bcm->softmac->associnfo.work); ++ schedule_work(&bcm->softmac->associnfo.work); dprintk(KERN_INFO PFX "Device resumed.\n"); +--- linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx.h.orig 2006-01-06 05:00:12.000000000 +0000 ++++ linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx.h 2006-01-06 14:07:38.000000000 +0000 +@@ -648,7 +648,8 @@ struct bcm43xx_private { + bad_frames_preempt:1, /* Use "Bad Frames Preemption" (default off) */ + reg124_set_0x4:1, /* Some variable to keep track of IRQ stuff. */ + powersaving:1, /* TRUE if we are in PowerSaving mode. FALSE otherwise. */ +- short_preamble:1; /* TRUE, if short preamble is enabled. */ ++ short_preamble:1, /* TRUE, if short preamble is enabled. */ ++ firmware_norelease:1; /* Do not release the firmware. Used on suspend. */ + + struct bcm43xx_stats stats; + +@@ -728,7 +729,13 @@ struct bcm43xx_private { + u16 security_offset; + struct bcm43xx_key key[54]; + u8 default_key_idx; +- ++ ++ /* Firmware. */ ++ const struct firmware *ucode; ++ const struct firmware *pcm; ++ const struct firmware *initvals0; ++ const struct firmware *initvals1; ++ + /* Debugging stuff follows. */ + #ifdef BCM43xx_DEBUG + struct bcm43xx_dfsentry *dfsentry; linux-2.6-bcm43xx.patch: Kconfig | 8 ++++++++ Makefile | 1 + 2 files changed, 9 insertions(+) Index: linux-2.6-bcm43xx.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-bcm43xx.patch 2 Jan 2006 21:56:59 -0000 1.1 +++ linux-2.6-bcm43xx.patch 6 Jan 2006 15:01:44 -0000 1.2 @@ -25,26 +25,3 @@ # 16-bit wireless PCMCIA client drivers obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o ---- linux-2.6.14/net/ieee80211/Kconfig~ 2005-12-30 23:42:06.000000000 +0000 -+++ linux-2.6.14/net/ieee80211/Kconfig 2005-12-30 23:51:55.000000000 +0000 -@@ -66,3 +66,10 @@ config IEEE80211_CRYPT_TKIP - This can be compiled as a modules and it will be called - "ieee80211_crypt_tkip". - -+config IEEE80211_SOFTMAC -+ tristate "IEEE 802.11 softmac" -+ depends on IEEE80211 && EXPERIMENTAL -+ ---help--- -+ The softmac layer handles IEEE 802.11 protocol management functions -+ such as scanning, association and similar tasks, which recent hardware -+ often leaves to software rather than implementing it all in hardware. ---- linux-2.6.14/net/ieee80211/Makefile~ 2005-12-30 23:42:06.000000000 +0000 -+++ linux-2.6.14/net/ieee80211/Makefile 2005-12-30 23:52:26.000000000 +0000 -@@ -3,6 +3,7 @@ obj-$(CONFIG_IEEE80211) += ieee80211_cry - obj-$(CONFIG_IEEE80211_CRYPT_WEP) += ieee80211_crypt_wep.o - obj-$(CONFIG_IEEE80211_CRYPT_CCMP) += ieee80211_crypt_ccmp.o - obj-$(CONFIG_IEEE80211_CRYPT_TKIP) += ieee80211_crypt_tkip.o -+obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/ - ieee80211-objs := \ - ieee80211_module.o \ - ieee80211_tx.o \ Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.256 retrieving revision 1.257 diff -u -r1.256 -r1.257 --- sources 6 Jan 2006 09:08:14 -0000 1.256 +++ sources 6 Jan 2006 15:01:57 -0000 1.257 @@ -1,4 +1,3 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -96083b51cd30e60b86127113abed37a3 bcm43xx-20060103.tar.bz2 -1eb2bb778090c59fbeba6278d63a9309 ieee80211softmac-20060103.tar.bz2 0eee153ab442496ead0581d00e83a1ca patch-2.6.15-git2.bz2 +1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2 --- linux-2.6-bcm43xx-device-table.patch DELETED --- --- linux-2.6-bcm43xx-promisc.patch DELETED --- --- linux-2.6-bcm43xx-quiet.patch DELETED --- --- linux-2.6.14-ieee80211-hw-wep.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 15:35:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 10:35:58 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.78, 1.79 libsepol.spec, 1.101, 1.102 sources, 1.79, 1.80 Message-ID: <200601061535.k06FZwIj019419@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19387 Modified Files: .cvsignore libsepol.spec sources Log Message: * Fri Jan 7 2006 Dan Walsh 1.11.7-1 - Upgrade to latest from NSA * Merged const in APIs patch from Ivan Gyurdiev. * Merged compare2 function patch from Ivan Gyurdiev. * Fixed hierarchy checker to only check allow rules. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- .cvsignore 5 Jan 2006 19:43:51 -0000 1.78 +++ .cvsignore 6 Jan 2006 15:35:55 -0000 1.79 @@ -75,3 +75,4 @@ libsepol-1.11.2.tgz libsepol-1.11.4.tgz libsepol-1.11.5.tgz +libsepol-1.11.7.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- libsepol.spec 5 Jan 2006 19:43:51 -0000 1.101 +++ libsepol.spec 6 Jan 2006 15:35:55 -0000 1.102 @@ -1,6 +1,6 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.11.5 +Version: 1.11.7 Release: 1 License: GPL Group: System Environment/Libraries @@ -80,6 +80,12 @@ %{_includedir}/sepol/policydb/*.h %changelog +* Fri Jan 7 2006 Dan Walsh 1.11.7-1 +- Upgrade to latest from NSA + * Merged const in APIs patch from Ivan Gyurdiev. + * Merged compare2 function patch from Ivan Gyurdiev. + * Fixed hierarchy checker to only check allow rules. + * Thu Jan 5 2006 Dan Walsh 1.11.5-1 - Upgrade to latest from NSA * Merged further fixes from Russell Coker, specifically: Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- sources 5 Jan 2006 19:43:51 -0000 1.79 +++ sources 6 Jan 2006 15:35:55 -0000 1.80 @@ -1 +1 @@ -a311b9d3efc1f5af209470a0ddfeb8dc libsepol-1.11.5.tgz +a40cc63ab70ee3d2f35650750056a0d9 libsepol-1.11.7.tgz From fedora-cvs-commits at redhat.com Fri Jan 6 15:47:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 10:47:05 -0500 Subject: rpms/libselinux/devel .cvsignore, 1.97, 1.98 libselinux.spec, 1.173, 1.174 sources, 1.99, 1.100 Message-ID: <200601061547.k06Fl5di003077@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3039 Modified Files: .cvsignore libselinux.spec sources Log Message: * Fri Jan 7 2006 Dan Walsh 1.29.4-1 - Upgrade to latest from NSA * Added format attribute to myprintf in matchpathcon.c and removed obsoleted rootlen variable in init_selinux_config(). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- .cvsignore 4 Jan 2006 15:40:59 -0000 1.97 +++ .cvsignore 6 Jan 2006 15:47:03 -0000 1.98 @@ -71,3 +71,4 @@ libselinux-1.29.1.tgz libselinux-1.29.2.tgz libselinux-1.29.3.tgz +libselinux-1.29.4.tgz Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- libselinux.spec 4 Jan 2006 18:34:57 -0000 1.173 +++ libselinux.spec 6 Jan 2006 15:47:03 -0000 1.174 @@ -1,9 +1,9 @@ -%define libsepolver 1.11.2-2 +%define libsepolver 1.11.7-1 %define libsetransver 0.1.15-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 1.29.3 -Release: 2 +Version: 1.29.4 +Release: 1 License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -110,7 +110,12 @@ %{_libdir}/python2.4/site-packages/selinux.py* %changelog -* Wed Jan 4 2006 Dan Walsh 1.29.4-1 +* Fri Jan 7 2006 Dan Walsh 1.29.4-1 +- Upgrade to latest from NSA + * Added format attribute to myprintf in matchpathcon.c and + removed obsoleted rootlen variable in init_selinux_config(). + +* Wed Jan 4 2006 Dan Walsh 1.29.3-2 - Build with new libsepol * Wed Jan 4 2006 Dan Walsh 1.29.3-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/sources,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- sources 4 Jan 2006 15:40:59 -0000 1.99 +++ sources 6 Jan 2006 15:47:03 -0000 1.100 @@ -1 +1 @@ -f65f31e4fd2edb0cf4070f44b1afe633 libselinux-1.29.3.tgz +14a01eff41a58032ed94f4c51c76efb7 libselinux-1.29.4.tgz From fedora-cvs-commits at redhat.com Fri Jan 6 16:07:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 11:07:03 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.43, 1.44 libsemanage.spec, 1.61, 1.62 sources, 1.45, 1.46 Message-ID: <200601061607.k06G73j2009383@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9343 Modified Files: .cvsignore libsemanage.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 5 Jan 2006 19:52:36 -0000 1.43 +++ .cvsignore 6 Jan 2006 16:07:00 -0000 1.44 @@ -45,3 +45,4 @@ libsemanage-1.5.4.tgz libsemanage-1.5.6.tgz libsemanage-1.5.8.tgz +libsemanage-1.5.9.tgz Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- libsemanage.spec 5 Jan 2006 19:52:36 -0000 1.61 +++ libsemanage.spec 6 Jan 2006 16:07:00 -0000 1.62 @@ -1,8 +1,8 @@ -%define libsepolver 1.11.5-1 -%define libselinuxver 1.29.3-1 +%define libsepolver 1.11.7-1 +%define libselinuxver 1.29.4-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.5.8 +Version: 1.5.9 Release: 1 License: GPL Group: System Environment/Libraries @@ -76,6 +76,13 @@ %changelog +* Fri Jan 7 2006 Dan Walsh 1.5.9-1 +- Upgrade to latest from NSA + * Merged const in APIs patch from Ivan Gyurdiev. + * Merged validation of local file contexts patch from Ivan Gyurdiev. + * Merged compare2 function patch from Ivan Gyurdiev. + * Merged hidden def/proto update patch from Ivan Gyurdiev. + * Thu Jan 6 2006 Dan Walsh 1.5.8-1 - Upgrade to latest from NSA * Re-applied string and file optimization patch from Russell Coker, Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 5 Jan 2006 19:52:36 -0000 1.45 +++ sources 6 Jan 2006 16:07:00 -0000 1.46 @@ -1 +1 @@ -af16e7c96d77e58b69edb9fb7ce09417 libsemanage-1.5.8.tgz +4b27bec1cb92dac96c2fda30b4c6cafe libsemanage-1.5.9.tgz From fedora-cvs-commits at redhat.com Fri Jan 6 16:10:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 11:10:16 -0500 Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.42,1.43 Message-ID: <200601061610.k06GAGg2010882@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10852 Modified Files: linux-2.6-compile-fixes.patch Log Message: Fix IA64 compilation -- asm-generic/signal.h needs compiler.h linux-2.6-compile-fixes.patch: signal.h | 1 + 1 files changed, 1 insertion(+) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- linux-2.6-compile-fixes.patch 15 Dec 2005 18:57:47 -0000 1.42 +++ linux-2.6-compile-fixes.patch 6 Jan 2006 16:10:12 -0000 1.43 @@ -0,0 +1,10 @@ +--- linux-2.6.15/include/asm-generic/signal.h.orig 2006-01-06 16:05:09.000000000 +0000 ++++ linux-2.6.15/include/asm-generic/signal.h 2006-01-06 16:05:19.000000000 +0000 +@@ -9,6 +9,7 @@ + #endif + + #ifndef __ASSEMBLY__ ++#include + typedef void __signalfn_t(int); + typedef __signalfn_t __user *__sighandler_t; + From fedora-cvs-commits at redhat.com Fri Jan 6 16:21:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 11:21:03 -0500 Subject: rpms/gstreamer08-plugins/devel gstreamer08-plugins.spec,1.1,1.2 Message-ID: <200601061621.k06GL3ZB026913@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer08-plugins/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26857 Modified Files: gstreamer08-plugins.spec Log Message: - Obsolete the old gstreamer-plugins package Index: gstreamer08-plugins.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer08-plugins/devel/gstreamer08-plugins.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gstreamer08-plugins.spec 4 Jan 2006 19:54:33 -0000 1.1 +++ gstreamer08-plugins.spec 6 Jan 2006 16:21:00 -0000 1.2 @@ -8,7 +8,7 @@ Name: %{gstreamer}-plugins Version: 0.8.11 -Release: 2 +Release: 3 Summary: GStreamer Streaming media framework plug-ins Group: Applications/Multimedia @@ -36,6 +36,7 @@ Requires: arts Requires: cdparanoia-libs >= alpha9.7 Requires: libmusicbrainz >= 2.1.1 +Obsoletes: gstreamer-plugins BuildRequires: glib2-devel >= %_glib2 BuildRequires: gtk2-devel @@ -316,6 +317,9 @@ %{_libdir}/*so %changelog +* Fri Jan 06 2006 John (J5) Palmieri - 0.8.11.3 +- Obsolete the old gstreamer-plugins package + * Sat Dec 17 2005 Thomas Vander Stichele - 0.8.11-2 - rebuilt using gstreamer08 as base package name for devel - properly do Requires(post) and Requires(postun) From fedora-cvs-commits at redhat.com Fri Jan 6 16:31:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 11:31:06 -0500 Subject: rpms/totem/devel totem.spec,1.38,1.39 Message-ID: <200601061631.k06GV6JE021522@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21507 Modified Files: totem.spec Log Message: - Build with gstreamer 0.10 - Enable the mozilla plugin Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- totem.spec 5 Jan 2006 23:36:45 -0000 1.38 +++ totem.spec 6 Jan 2006 16:31:04 -0000 1.39 @@ -1,10 +1,10 @@ -%define gstreamer_version 0.8.7 -%define gstreamer_plugins_version 0.8.5 +%define gstreamer_version 0.10.0 +%define gstreamer_plugins_version 0.10.0 Summary: Movie player for GNOME 2 Name: totem Version: 1.3.0 -Release: 2 +Release: 3 License: GPL Group: Applications/Multimedia URL: http://www.hadess.net/totem.php3 @@ -13,15 +13,18 @@ Patch1: totem-0.99.19-feature-help-removal.patch Requires(post): GConf2 Requires: gnome-desktop >= 2.6.0 -Requires: gstreamer08 >= %gstreamer_version -Requires: gstreamer08-plugins >= %gstreamer_plugins_version +Requires: gstreamer >= %gstreamer_version +Requires: gstreamer-plugins-base >= %gstreamer_plugins_version +Requires: gstreamer-plugins-good >= %gstreamer_plugins_version + Requires: iso-codes BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper -BuildRequires: gstreamer08-devel >= %gstreamer_version -BuildRequires: gstreamer08-plugins-devel >= %gstreamer_plugins_version +BuildRequires: gstreamer-devel >= %gstreamer_version +BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_version BuildRequires: gnome-desktop-devel >= 2.6.0, gnome-vfs2-devel, libglade2-devel BuildRequires: perl-XML-Parser BuildRequires: iso-codes-devel +BuildRequires: mozilla-devel Obsoletes: nautilus-media %description @@ -52,7 +55,7 @@ %build autoreconf -%configure --enable-gstreamer --disable-lirc --disable-vanity --disable-mozilla --disable-nvtv +%configure --enable-gstreamer=0.10 --disable-lirc --disable-vanity --enable-mozilla --disable-nvtv #apparently someone forgot to autogen before disting 0.99.17 :) #perl -pi -e 's/gstvideowidget.h//g' src/Makefile @@ -116,6 +119,10 @@ %{_libdir}/*so %changelog +* Fri Jan 06 2006 John (J5) Palmieri 1.3.0-3 +- Build with gstreamer 0.10 +- Enable the mozilla plugin + * Thu Jan 05 2006 John (J5) Palmieri 1.3.0-2 - GStreamer has been split into gstreamer08 and gstreamer (0.10) packages we need gstreamer08 for now From fedora-cvs-commits at redhat.com Fri Jan 6 16:40:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 11:40:23 -0500 Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.43,1.44 Message-ID: <200601061640.k06GeNkN022029@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22012 Modified Files: linux-2.6-compile-fixes.patch Log Message: fix spidernet too linux-2.6-compile-fixes.patch: drivers/net/spider_net.c | 1 + include/asm-generic/signal.h | 1 + 2 files changed, 2 insertions(+) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- linux-2.6-compile-fixes.patch 6 Jan 2006 16:10:12 -0000 1.43 +++ linux-2.6-compile-fixes.patch 6 Jan 2006 16:40:20 -0000 1.44 @@ -8,3 +8,13 @@ typedef void __signalfn_t(int); typedef __signalfn_t __user *__sighandler_t; +--- linux-2.6.15/drivers/net/spider_net.c.orig 2006-01-06 16:38:43.000000000 +0000 ++++ linux-2.6.15/drivers/net/spider_net.c 2006-01-06 16:39:10.000000000 +0000 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + #include "spider_net.h" + From fedora-cvs-commits at redhat.com Fri Jan 6 16:44:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 11:44:03 -0500 Subject: rpms/authconfig/devel .cvsignore, 1.37, 1.38 authconfig.spec, 1.49, 1.50 sources, 1.43, 1.44 Message-ID: <200601061644.k06Gi3jf022314@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/authconfig/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22300 Modified Files: .cvsignore authconfig.spec sources Log Message: * Fri Jan 6 2006 Tomas Mraz - 5.1.1-1 - print warning if PAM module is missing when the PAM configuration is saved (#168880) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 17 Dec 2005 13:12:19 -0000 1.37 +++ .cvsignore 6 Jan 2006 16:44:00 -0000 1.38 @@ -1 +1 @@ -authconfig-5.1.0.tar.bz2 +authconfig-5.1.1.tar.bz2 Index: authconfig.spec =================================================================== RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- authconfig.spec 17 Dec 2005 13:12:19 -0000 1.49 +++ authconfig.spec 6 Jan 2006 16:44:00 -0000 1.50 @@ -1,6 +1,6 @@ Summary: Text-mode tool for setting up NIS and shadow passwords. Name: authconfig -Version: 5.1.0 +Version: 5.1.1 # Don't change release in elvis CVS, up version after merging all patches # from dist CVS instead. Release: 1 @@ -93,6 +93,13 @@ %{_datadir}/pixmaps/* %changelog +* Fri Jan 6 2006 Tomas Mraz - 5.1.1-1 +- print warning if PAM module is missing when the PAM configuration + is saved (#168880) + +* Fri Dec 23 2005 Tomas Mraz +- make child dialog preset code more robust (#176462) + * Sat Dec 17 2005 Tomas Mraz - 5.1.0-1 - update only configuration files which settings were modified (#72290) Index: sources =================================================================== RCS file: /cvs/dist/rpms/authconfig/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 17 Dec 2005 13:12:19 -0000 1.43 +++ sources 6 Jan 2006 16:44:00 -0000 1.44 @@ -1 +1 @@ -d9b676709fcef3dbc0f5469edf64783f authconfig-5.1.0.tar.bz2 +792d9fe2a3d87d59958256ab532ed39b authconfig-5.1.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 6 16:47:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 11:47:49 -0500 Subject: rpms/bash/devel bash-aq.patch,NONE,1.1 bash.spec,1.97,1.98 Message-ID: <200601061647.k06GlnBv001175@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1160 Modified Files: bash.spec Added Files: bash-aq.patch Log Message: * Fri Jan 6 2006 Tim Waugh - Use literal single-quote in bash man page where appropriate (bug #177051). bash-aq.patch: bash.1 | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) --- NEW FILE bash-aq.patch --- --- bash-3.1/doc/bash.1.aq 2006-01-06 16:40:40.000000000 +0000 +++ bash-3.1/doc/bash.1 2006-01-06 16:46:36.000000000 +0000 @@ -977,7 +977,7 @@ .B PARAMETERS below). .PP -Words of the form \fB$\fP'\fIstring\fP' are treated specially. The +Words of the form \fB$\fP\(aq\fIstring\fP\(aq are treated specially. The word expands to \fIstring\fP, with backslash-escaped characters replaced as specified by the ANSI C standard. Backslash escape sequences, if present, are decoded as follows: @@ -1011,7 +1011,7 @@ .B \e\e backslash .TP -.B \e' +.B \e\(aq single quote .TP .B \e\fInnn\fP @@ -1845,7 +1845,7 @@ Example: .RS .PP -\fBMAILPATH\fP='/var/mail/bfox?"You have mail":~/shell\-mail?"$_ has mail!"' +\fBMAILPATH\fP=\(aq/var/mail/bfox?"You have mail":~/shell\-mail?"$_ has mail!"\(aq .PP .B Bash supplies a default value for this variable, but the location of the user @@ -1979,7 +1979,7 @@ included. .IP If this variable is not set, \fBbash\fP acts as if it had the -value \fB$'\enreal\et%3lR\enuser\et%3lU\ensys\t%3lS'\fP. +value \fB$\(aq\enreal\et%3lR\enuser\et%3lU\ensys\t%3lS\(aq\fP. If the value is null, no timing information is displayed. A trailing newline is added when the format string is displayed. .TP @@ -2708,7 +2708,7 @@ .B IFS is null, no word splitting occurs. .PP -Explicit null arguments (\^\f3"\^"\fP or \^\f3'\^'\fP\^) are retained. +Explicit null arguments (\^\f3"\^"\fP or \^\f3\(aq\^\(aq\fP\^) are retained. Unquoted implicit null arguments, resulting from the expansion of parameters that have no values, are removed. If a parameter with no value is expanded within double quotes, a @@ -2930,7 +2930,7 @@ After the preceding expansions, all unquoted occurrences of the characters .BR \e , -.BR ' , +.BR \(aq , and \^\f3"\fP\^ that did not result from one of the above expansions are removed. .SH REDIRECTION @@ -4495,8 +4495,8 @@ .B \e" literal " .TP -.B \e' -literal ' +.B \e\(aq +literal \(aq .RE .PD .PP @@ -4544,7 +4544,7 @@ Unquoted text is assumed to be a function name. In the macro body, the backslash escapes described above are expanded. Backslash will quote any other character in the macro text, -including " and '. +including " and \(aq. .PP .B Bash allows the current readline key bindings to be displayed or modified @@ -7320,7 +7320,7 @@ In addition to the standard \fIprintf\fP(1) formats, \fB%b\fP causes \fBprintf\fP to expand backslash escape sequences in the corresponding \fIargument\fP (except that \fB\ec\fP terminates output, backslashes in -\fB\e'\fP, \fB\e"\fP, and \fB\e?\fP are not removed, and octal escapes +\fB\e\(aq\fP, \fB\e"\fP, and \fB\e?\fP are not removed, and octal escapes beginning with \fB\e0\fP may contain up to four digits), and \fB%q\fP causes \fBprintf\fP to output the corresponding \fIargument\fP in a format that can be reused as shell input. @@ -8037,7 +8037,7 @@ \fBPathname Expansion\fP are enabled. .TP 8 .B extquote -If set, \fB$\fP'\fIstring\fP' and \fB$\fP"\fIstring\fP" quoting is +If set, \fB$\fP\(aq\fIstring\fP\(aq and \fB$\fP"\fIstring\fP" quoting is performed within \fB${\fP\fIparameter\fP\fB}\fP expansions enclosed in double quotes. This option is enabled by default. .TP 8 Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- bash.spec 2 Jan 2006 11:02:47 -0000 1.97 +++ bash.spec 6 Jan 2006 16:47:46 -0000 1.98 @@ -19,6 +19,7 @@ Patch102: bash-2.03-profile.patch Patch103: bash-2.05a-requires.patch Patch104: bash-2.05a-shellfunc.patch +Patch105: bash-aq.patch Patch106: bash-2.05a-loadables.patch Patch107: bash-2.05a-interpreter.patch Patch108: bash-2.05b-readline-oom.patch @@ -64,6 +65,7 @@ %patch102 -p1 -b .profile %patch103 -p1 -b .requires %patch104 -p1 -b .shellfunc +%patch105 -p1 -b .aq %patch106 -p1 -b .loadables %patch107 -p1 -b .interpreter %patch108 -p1 -b .readline-oom @@ -209,6 +211,9 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Fri Jan 6 2006 Tim Waugh +- Use literal single-quote in bash man page where appropriate (bug #177051). + * Mon Jan 2 2006 Tim Waugh 3.1-1 - 3.1. - No longer need ia64, utf8, multibyteifs, jobs, sigpipe, From fedora-cvs-commits at redhat.com Fri Jan 6 16:56:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 11:56:08 -0500 Subject: rpms/gstreamer/devel .cvsignore, 1.16, 1.17 gstreamer.spec, 1.40, 1.41 sources, 1.17, 1.18 Message-ID: <200601061656.k06Gu8hK010050@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9969 Modified Files: .cvsignore gstreamer.spec sources Log Message: - new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 4 Jan 2006 20:08:55 -0000 1.16 +++ .cvsignore 6 Jan 2006 16:56:04 -0000 1.17 @@ -1 +1,2 @@ gstreamer-0.10.0.tar.bz2 +gstreamer-0.10.1.tar.bz2 Index: gstreamer.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- gstreamer.spec 4 Jan 2006 20:08:55 -0000 1.40 +++ gstreamer.spec 6 Jan 2006 16:56:04 -0000 1.41 @@ -5,7 +5,7 @@ %define _libxml2 2.4.0 Name: %{gstreamer} -Version: 0.10.0 +Version: 0.10.1 Release: 1 Summary: GStreamer streaming media framework runtime @@ -197,6 +197,9 @@ %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/* %changelog +* Fri Jan 06 2006 John (J5) Palmieri - 0.10.1-1 +- New upstream version + * Fri Dec 16 2005 Thomas Vander Stichele - 0.10.0-1 - rebuilt for Fedora Core Development Index: sources =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 4 Jan 2006 20:08:55 -0000 1.17 +++ sources 6 Jan 2006 16:56:04 -0000 1.18 @@ -1 +1 @@ -479b3308da0b75d973f11df65e6aef02 gstreamer-0.10.0.tar.bz2 +2a56154a6636a404ab9107524d4b7a89 gstreamer-0.10.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 6 16:57:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 11:57:21 -0500 Subject: rpms/gstreamer/devel gstreamer.spec,1.41,1.42 Message-ID: <200601061657.k06GvLgl010622@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10565 Modified Files: gstreamer.spec Log Message: - require the plugins Index: gstreamer.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- gstreamer.spec 6 Jan 2006 16:56:04 -0000 1.41 +++ gstreamer.spec 6 Jan 2006 16:57:18 -0000 1.42 @@ -16,6 +16,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: gstreamer-tools >= %{version} +Requires: gstreamer-plugins-base +Requires: gstreamer-plugins-good BuildRequires: glib2-devel >= %{_glib2} BuildRequires: libxml2-devel >= %{_libxml2} From fedora-cvs-commits at redhat.com Fri Jan 6 17:01:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 12:01:20 -0500 Subject: rpms/pup/devel .cvsignore, 1.15, 1.16 pup.spec, 1.17, 1.18 sources, 1.17, 1.18 Message-ID: <200601061701.k06H1KjW012132@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/pup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12058/devel Modified Files: .cvsignore pup.spec sources Log Message: auto-import pup-0.9.2-1 on branch devel from pup-0.9.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pup/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 5 Jan 2006 05:16:03 -0000 1.15 +++ .cvsignore 6 Jan 2006 17:01:16 -0000 1.16 @@ -1 +1 @@ -pup-0.9.1.tar.bz2 +pup-0.9.2.tar.bz2 Index: pup.spec =================================================================== RCS file: /cvs/dist/rpms/pup/devel/pup.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- pup.spec 5 Jan 2006 05:16:03 -0000 1.17 +++ pup.spec 6 Jan 2006 17:01:16 -0000 1.18 @@ -1,6 +1,6 @@ Summary: Graphical package updater Name: pup -Version: 0.9.1 +Version: 0.9.2 Release: 1 License: GPL Group: System Environment/Base @@ -42,6 +42,9 @@ %attr(0644,root,root) %config /etc/pam.d/pup %changelog +* Fri Jan 6 2006 Jeremy Katz - 0.9.2-1 +- add a scrollbar to the details text buffer + * Wed Jan 4 2006 Jeremy Katz - 0.9.1-1 - fix a silly traceback Index: sources =================================================================== RCS file: /cvs/dist/rpms/pup/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 5 Jan 2006 05:16:03 -0000 1.17 +++ sources 6 Jan 2006 17:01:17 -0000 1.18 @@ -1 +1 @@ -6cae8ff23c49eeae116aa0056fee797e pup-0.9.1.tar.bz2 +cad0ce7611ec80ed37f9c1fd19860ae9 pup-0.9.2.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 6 17:03:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 12:03:00 -0500 Subject: rpms/gstreamer-plugins-base/devel .cvsignore, 1.2, 1.3 gstreamer-plugins-base.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200601061703.k06H30tY012371@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer-plugins-base/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12287 Modified Files: .cvsignore gstreamer-plugins-base.spec sources Log Message: - Update to new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Jan 2006 20:10:40 -0000 1.2 +++ .cvsignore 6 Jan 2006 17:02:57 -0000 1.3 @@ -1 +1,2 @@ gst-plugins-base-0.10.0.tar.bz2 +gst-plugins-base-0.10.1.tar.bz2 Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gstreamer-plugins-base.spec 4 Jan 2006 20:10:40 -0000 1.1 +++ gstreamer-plugins-base.spec 6 Jan 2006 17:02:57 -0000 1.2 @@ -1,10 +1,10 @@ %define gstreamer gstreamer %define majorminor 0.10 -%define _gst 0.10.0 +%define _gst 0.10.1 Name: %{gstreamer}-plugins-base -Version: 0.10.0 +Version: 0.10.1 Release: 1 Summary: GStreamer streaming media framework base plug-ins @@ -179,6 +179,9 @@ %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Fri Jan 06 2006 John (J5) Palmieri - 0.10.1-1 +- New upstream version + * Sat Dec 17 2005 Thomas Vander Stichele - 0.10.0-1 - Fedora Development build Index: sources =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Jan 2006 20:10:40 -0000 1.2 +++ sources 6 Jan 2006 17:02:57 -0000 1.3 @@ -1 +1 @@ -4444497ab2b42a1ca9b3f6989f678fa7 gst-plugins-base-0.10.0.tar.bz2 +303fc88af1eed2ec2fd094bee98113d2 gst-plugins-base-0.10.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 6 17:19:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 12:19:52 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1829,1.1830 Message-ID: <200601061719.k06HJqWB028728@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28693 Modified Files: kernel-2.6.spec Log Message: actually apply the compile-fixes patch Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1829 retrieving revision 1.1830 diff -u -r1.1829 -r1.1830 --- kernel-2.6.spec 6 Jan 2006 15:01:40 -0000 1.1829 +++ kernel-2.6.spec 6 Jan 2006 17:19:49 -0000 1.1830 @@ -922,7 +922,7 @@ %patch10001 -p1 %patch10002 -p1 %patch10003 -p1 -#%patch10004 -p1 +%patch10004 -p1 # END OF PATCH APPLICATIONS @@ -1400,8 +1400,9 @@ %changelog * Fri Jan 6 2006 David Woodhouse -- Fix mv643xx_eth compilation +- Fix mv643xx_eth and spider_net compilation - Update Broadcom driver, switch to git tree for softmac +- Fix IA64 build (asm-generic/signal.h needs linux/compiler.h) * Fri Jan 6 2006 Dave Jones - 2.6.15-git2 From fedora-cvs-commits at redhat.com Fri Jan 6 17:29:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 12:29:20 -0500 Subject: rpms/bash/devel bash.spec, 1.98, 1.99 bash-2.05a-loadables.patch, 1.2, NONE bash-2.05a-shellfunc.patch, 1.2, NONE bash-2.05b-mbinc.patch, 1.1, NONE Message-ID: <200601061729.k06HTKAK000603@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv569 Modified Files: bash.spec Removed Files: bash-2.05a-loadables.patch bash-2.05a-shellfunc.patch bash-2.05b-mbinc.patch Log Message: * Fri Jan 6 2006 Tim Waugh 3.1-2 - No longer need loadables, mbinc or shellfunc patches. - Use literal single-quote in bash man page where appropriate (bug #177051). Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- bash.spec 6 Jan 2006 16:47:46 -0000 1.98 +++ bash.spec 6 Jan 2006 17:29:17 -0000 1.99 @@ -1,7 +1,7 @@ Version: 3.1 Name: bash Summary: The GNU Bourne Again shell (bash) version %{version}. -Release: 1 +Release: 2 Group: System Environment/Shells License: GPL Url: http://www.gnu.org/software/bash @@ -18,12 +18,9 @@ Patch101: bash-2.02-security.patch Patch102: bash-2.03-profile.patch Patch103: bash-2.05a-requires.patch -Patch104: bash-2.05a-shellfunc.patch Patch105: bash-aq.patch -Patch106: bash-2.05a-loadables.patch Patch107: bash-2.05a-interpreter.patch Patch108: bash-2.05b-readline-oom.patch -Patch110: bash-2.05b-mbinc.patch Patch112: bash-ulimit.patch Patch114: bash-2.05b-xcc.patch Patch115: bash-2.05b-pgrp_sync.patch @@ -64,12 +61,9 @@ %patch101 -p1 -b .security %patch102 -p1 -b .profile %patch103 -p1 -b .requires -%patch104 -p1 -b .shellfunc %patch105 -p1 -b .aq -%patch106 -p1 -b .loadables %patch107 -p1 -b .interpreter %patch108 -p1 -b .readline-oom -%patch110 -p1 -b .mbinc %patch112 -p1 -b .ulimit %patch114 -p1 -b .xcc %patch115 -p1 -b .pgrp_sync @@ -211,7 +205,8 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog -* Fri Jan 6 2006 Tim Waugh +* Fri Jan 6 2006 Tim Waugh 3.1-2 +- No longer need loadables, mbinc or shellfunc patches. - Use literal single-quote in bash man page where appropriate (bug #177051). * Mon Jan 2 2006 Tim Waugh 3.1-1 --- bash-2.05a-loadables.patch DELETED --- --- bash-2.05a-shellfunc.patch DELETED --- --- bash-2.05b-mbinc.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 6 17:45:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 12:45:49 -0500 Subject: rpms/totem/devel totem.spec,1.39,1.40 Message-ID: <200601061745.k06Hjn6o009099@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7369 Modified Files: totem.spec Log Message: - fix plugins versioning Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- totem.spec 6 Jan 2006 16:31:04 -0000 1.39 +++ totem.spec 6 Jan 2006 17:45:46 -0000 1.40 @@ -1,5 +1,6 @@ -%define gstreamer_version 0.10.0 -%define gstreamer_plugins_version 0.10.0 +%define gstreamer_version 0.10.1 +%define gstreamer_plugins_base_version 0.10.1 +%define gstreamer_plugins_good_version 0.10.0 Summary: Movie player for GNOME 2 Name: totem @@ -14,13 +15,13 @@ Requires(post): GConf2 Requires: gnome-desktop >= 2.6.0 Requires: gstreamer >= %gstreamer_version -Requires: gstreamer-plugins-base >= %gstreamer_plugins_version -Requires: gstreamer-plugins-good >= %gstreamer_plugins_version +Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version +Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version Requires: iso-codes BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper BuildRequires: gstreamer-devel >= %gstreamer_version -BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_version +BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version BuildRequires: gnome-desktop-devel >= 2.6.0, gnome-vfs2-devel, libglade2-devel BuildRequires: perl-XML-Parser BuildRequires: iso-codes-devel From fedora-cvs-commits at redhat.com Fri Jan 6 18:46:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 13:46:37 -0500 Subject: rpms/booty/devel .cvsignore, 1.33, 1.34 booty.spec, 1.36, 1.37 sources, 1.35, 1.36 Message-ID: <200601061846.k06IkbDl017699@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17684 Modified Files: .cvsignore booty.spec sources Log Message: update to 0.63-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 4 Jan 2006 23:08:41 -0000 1.33 +++ .cvsignore 6 Jan 2006 18:46:35 -0000 1.34 @@ -1 +1 @@ -booty-0.62.tar.bz2 +booty-0.63.tar.bz2 Index: booty.spec =================================================================== RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- booty.spec 4 Jan 2006 23:08:31 -0000 1.36 +++ booty.spec 6 Jan 2006 18:46:35 -0000 1.37 @@ -1,6 +1,6 @@ Summary: simple python bootloader config lib Name: booty -Version: 0.62 +Version: 0.63 Release: 1 License: LGPL Source0: %{name}-%{version}.tar.bz2 @@ -34,6 +34,9 @@ %changelog +* Fri Jan 6 2006 Peter Jones - 0.63-1 +- don't write a log, for now. + * Wed Jan 4 2006 Peter Jones - 0.62-1 - fix degraded raid detection for dmraid Index: sources =================================================================== RCS file: /cvs/dist/rpms/booty/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 4 Jan 2006 23:08:41 -0000 1.35 +++ sources 6 Jan 2006 18:46:35 -0000 1.36 @@ -1 +1 @@ -ae6f7c2eac7d11814729d9dca3139b35 booty-0.62.tar.bz2 +d389f248c9569cf0bb019328a896e455 booty-0.63.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 6 18:51:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 13:51:39 -0500 Subject: rpms/tzdata/FC-4 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 tzdata.spec, 1.15, 1.16 Message-ID: <200601061851.k06IpdGh017794@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv17781 Modified Files: .cvsignore sources tzdata.spec Log Message: Pushing upstream changes. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 7 Sep 2005 07:23:00 -0000 1.13 +++ .cvsignore 6 Jan 2006 18:51:37 -0000 1.14 @@ -1,3 +1,3 @@ tzdata.tar.bz2 -tzcode2005m.tar.gz -tzdata2005m.tar.gz +tzdata2005r.tar.gz +tzcode2005r.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 7 Sep 2005 07:23:00 -0000 1.13 +++ sources 6 Jan 2006 18:51:37 -0000 1.14 @@ -1,3 +1,3 @@ -d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -ed8bc594989edefb418a8803bcaf09d6 tzcode2005m.tar.gz -536a39879579a5fc6b9347dfa845a11c tzdata2005m.tar.gz +325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 +b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz +063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-4/tzdata.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- tzdata.spec 7 Sep 2005 07:23:00 -0000 1.15 +++ tzdata.spec 6 Jan 2006 18:51:37 -0000 1.16 @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2005m +Version: 2005r Release: 1.fc4 License: GPL Group: System Environment/Base @@ -46,6 +46,18 @@ %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Jan 5 2006 Petr Machata 2005r-2 +- 2005r + - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to + northamerica to guard against old files with obsolete information + being left in the time zone binary directory. + - Changes for countries that are supposed to join 2007 US DST + change. This includes most of Canada, however entries already in + the database (Alberta, British Columbia, Newfoundland, Northwest + Territories, and Yukon) were left alone for the time being. + - Fixes in zdump.c (abbrok): conditions are chained, and the string + is checked for emptiness. + * Tue Sep 6 2005 Jakub Jelinek 2005m-1.fc4 - 2005m - changes for USA (extending DST by 4 weeks since 2007), Tunisia, From fedora-cvs-commits at redhat.com Fri Jan 6 19:36:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 14:36:48 -0500 Subject: rpms/groff/devel groff.spec,1.30,1.31 nroff,1.1,1.2 Message-ID: <200601061936.k06JamME018343@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18301 Modified Files: groff.spec nroff Log Message: * Fri Jan 06 2006 Jindrich Novy - 1.18.1.1-7 - require X dependencies only for gxditview (#177118) - work if bash's noclobber is on (#127492) Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- groff.spec 5 Jan 2006 15:15:06 -0000 1.30 +++ groff.spec 6 Jan 2006 19:36:42 -0000 1.31 @@ -3,7 +3,7 @@ Summary: A document formatting system. Name: groff Version: 1.18.1.1 -Release: 6 +Release: 7 License: GPL Group: Applications/Publishing Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz @@ -36,13 +36,8 @@ Buildroot: %{_tmppath}/%{name}-root Obsoletes: groff-tools Provides: nroff-i18n -BuildRequires: netpbm-progs zlib-devel texinfo imake -BuildRequires: xorg-x11-proto-devel libX11-devel libXaw-devel -BuildRequires: libXt-devel libXpm-devel libXp-devel libXext-devel +BuildRequires: netpbm-progs zlib-devel texinfo BuildPrereq: byacc -%if %{with_x} -#BuildRequires: xorg-x11-devel -%endif %description Groff is a document formatting system. Groff takes standard text and @@ -71,6 +66,8 @@ %package gxditview Summary: An X previewer for groff text processor output. Group: Applications/Publishing +BuildRequires: imake xorg-x11-proto-devel libX11-devel libXaw-devel +BuildRequires: libXt-devel libXpm-devel libXp-devel libXext-devel %description gxditview Gxditview displays the groff text processor's output on an X Window @@ -208,6 +205,10 @@ %endif %changelog +* Fri Jan 06 2006 Jindrich Novy - 1.18.1.1-7 +- require X dependencies only for gxditview (#177118) +- work if bash's noclobber is on (#127492) + * Thu Jan 05 2006 Jindrich Novy - 1.18.1.1-6 - add BuildRequires imake and update dependencies for modular X - spec cleanup Index: nroff =================================================================== RCS file: /cvs/dist/rpms/groff/devel/nroff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nroff 9 Sep 2004 05:56:32 -0000 1.1 +++ nroff 6 Jan 2006 19:36:42 -0000 1.2 @@ -47,7 +47,7 @@ TMPFILE=$(mktemp /tmp/man.XXXXXX) trap "rm -f $TMPFILE" 0 1 2 3 15 -cat ${1+"$@"} > ${TMPFILE} +cat ${1+"$@"} >| ${TMPFILE} if iconv -f utf-8 -t utf-8 -o /dev/null ${TMPFILE} 2>/dev/null then From fedora-cvs-commits at redhat.com Fri Jan 6 19:48:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 14:48:39 -0500 Subject: rpms/tzdata/FC-3 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tzdata.spec, 1.8, 1.9 Message-ID: <200601061948.k06JmdeB002259@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv2163 Modified Files: .cvsignore sources tzdata.spec Log Message: Pushing upstream changes. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-3/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 7 Sep 2005 07:23:25 -0000 1.8 +++ .cvsignore 6 Jan 2006 19:48:36 -0000 1.9 @@ -1,3 +1,3 @@ tzdata.tar.bz2 -tzcode2005m.tar.gz -tzdata2005m.tar.gz +tzdata2005r.tar.gz +tzcode2005r.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-3/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 7 Sep 2005 07:23:25 -0000 1.8 +++ sources 6 Jan 2006 19:48:36 -0000 1.9 @@ -1,3 +1,3 @@ -d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -ed8bc594989edefb418a8803bcaf09d6 tzcode2005m.tar.gz -536a39879579a5fc6b9347dfa845a11c tzdata2005m.tar.gz +325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 +b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz +063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-3/tzdata.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tzdata.spec 7 Sep 2005 07:23:25 -0000 1.8 +++ tzdata.spec 6 Jan 2006 19:48:36 -0000 1.9 @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2005m +Version: 2005r Release: 1.fc3 License: GPL Group: System Environment/Base @@ -46,6 +46,18 @@ %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Jan 5 2006 Petr Machata 2005r-1.fc3 +- 2005r + - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to + northamerica to guard against old files with obsolete information + being left in the time zone binary directory. + - Changes for countries that are supposed to join 2007 US DST + change. This includes most of Canada, however entries already in + the database (Alberta, British Columbia, Newfoundland, Northwest + Territories, and Yukon) were left alone for the time being. + - Fixes in zdump.c (abbrok): conditions are chained, and the string + is checked for emptiness. + * Tue Sep 6 2005 Jakub Jelinek 2005m-1.fc3 - 2005m - changes for USA (extending DST by 4 weeks since 2007), Tunisia, From fedora-cvs-commits at redhat.com Fri Jan 6 19:56:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 14:56:36 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.42, 1.43 java-1.4.2-gcj-compat.spec, 1.116, 1.117 sources, 1.46, 1.47 Message-ID: <200601061956.k06JuaoR006046@cvs.devel.redhat.com> Author: ashah Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5956 Modified Files: .cvsignore java-1.4.2-gcj-compat.spec sources Log Message: - Import java-gcj-compat 1.0.48. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 4 Jan 2006 22:46:22 -0000 1.42 +++ .cvsignore 6 Jan 2006 19:56:34 -0000 1.43 @@ -1,3 +1,3 @@ -java-gcj-compat-1.0.47.tar.gz +java-gcj-compat-1.0.48.tar.gz bcprov-jdk14-127.tar.gz eclipse-ecj-3.1.0_fc-12.jar Index: java-1.4.2-gcj-compat.spec =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- java-1.4.2-gcj-compat.spec 4 Jan 2006 22:46:22 -0000 1.116 +++ java-1.4.2-gcj-compat.spec 6 Jan 2006 19:56:34 -0000 1.117 @@ -17,11 +17,11 @@ %define buildver 0 # the version-release string for the gcj rpms we require %define gccver 4.0.0-0.42 -%define jgcver 1.0.47 +%define jgcver 1.0.48 %define name java-%{javaver}-%{origin}-compat %define version %{javaver}.%{buildver} -%define release 40jpp_59rh +%define release 40jpp_60rh %define cname java-%{javaver}-%{origin} #%define bcarchivever 127 @@ -542,6 +542,9 @@ %defattr(-,root,root) %changelog +* Fri Jan 6 2006 Archit Shah - 0:1.4.2.0-40jpp_60rh +- Import java-gcj-compat 1.0.48. + * Wed Jan 4 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_59rh - Import java-gcj-compat 1.0.47. Index: sources =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 4 Jan 2006 22:46:22 -0000 1.46 +++ sources 6 Jan 2006 19:56:34 -0000 1.47 @@ -1,3 +1,3 @@ -26d8f072fe4e98fa73cfb0261adfc0b5 java-gcj-compat-1.0.47.tar.gz +e1495da454ddaace26db340bd876ada2 java-gcj-compat-1.0.48.tar.gz d17b7fa532fc87fdf14d42c2d293ec3f bcprov-jdk14-127.tar.gz 95766e40c6ab6b641341f3a44dcf0b9e eclipse-ecj-3.1.0_fc-12.jar From fedora-cvs-commits at redhat.com Fri Jan 6 20:17:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 15:17:19 -0500 Subject: rpms/tzdata/FC-2 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 tzdata.spec, 1.8, 1.9 Message-ID: <200601062017.k06KHJtK022945@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/FC-2 In directory cvs.devel.redhat.com:/tmp/cvs-serv10203 Modified Files: .cvsignore sources tzdata.spec Log Message: Pushing upstream changes. This fixes #173091. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-2/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 1 Mar 2005 14:40:27 -0000 1.7 +++ .cvsignore 6 Jan 2006 20:17:14 -0000 1.8 @@ -1,2 +1,3 @@ tzdata.tar.bz2 -tzdata2005f.tar.gz +tzdata2005r.tar.gz +tzcode2005r.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-2/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Mar 2005 14:40:27 -0000 1.7 +++ sources 6 Jan 2006 20:17:17 -0000 1.8 @@ -1,2 +1,3 @@ -d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -898be3e528225711dc2feff505938520 tzdata2005f.tar.gz +325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 +b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz +063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-2/tzdata.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tzdata.spec 1 Mar 2005 14:40:27 -0000 1.8 +++ tzdata.spec 6 Jan 2006 20:17:17 -0000 1.9 @@ -1,6 +1,6 @@ Summary: Timezone data Name: tzdata -Version: 2005f +Version: 2005r Release: 1.fc2 License: GPL Group: System Environment/Base @@ -41,6 +41,56 @@ %{_datadir}/zoneinfo %changelog +* Thu Jan 5 2006 Petr Machata 2005r-1.fc2 +- 2005r + - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to + northamerica to guard against old files with obsolete information + being left in the time zone binary directory. + - Changes for countries that are supposed to join 2007 US DST + change. This includes most of Canada, however entries already in + the database (Alberta, British Columbia, Newfoundland, Northwest + Territories, and Yukon) were left alone for the time being. + - Fixes in zdump.c (abbrok): conditions are chained, and the string + is checked for emptiness. + +* Sat Dec 17 2005 Jakub Jelinek 2005q-2 +- 2005q + - changes for Georgia, Azerbaijan, Jordan, Palestine, Cuba, Nicaragua + - SystemV timezone changes + +* Wed Nov 2 2005 Jakub Jelinek 2005n-2 +- 2005n + - changes for Kyrgyzstan and Uruguay +- fix a typo in the Makefile (used TZDATA env var instead of TZDIR during + make check), update tst-timezone.c from glibc CVS (#172102) + +* Tue Sep 6 2005 Jakub Jelinek 2005m-2 +- 2005m + - changes for USA (extending DST by 4 weeks since 2007), Tunisia, + Australia, Kazakhstan + - historical timezone data changes for Japan, Poland, Northern Ireland and + Mali + - timezone name change for East Timor + +* Fri Jul 15 2005 Jakub Jelinek 2005k-2 +- 2005k + - leap seconds update + +* Sat Apr 30 2005 Jakub Jelinek 2005i-2 +- 2005i + - updates for Iran, Haiti and Nicaragua + +* Mon Apr 4 2005 Jakub Jelinek 2005h-2 +- 2005h + - fixes for Kazakhstan + +* Thu Mar 17 2005 Jakub Jelinek 2005g-2 +- 2005g + - fixes for Uruguay +- include README and Theory from tzcode tarball in %{_docdir}; + Theory includes a good summary of how the timezone data files + are supposed to be named + * Tue Mar 1 2005 Jakub Jelinek 2005f-1.fc2 - 2005f - more updates for Israel, updates for Azerbaijan From fedora-cvs-commits at redhat.com Fri Jan 6 20:39:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 15:39:01 -0500 Subject: rpms/tzdata/FC-2 tzdata.spec,1.9,1.10 Message-ID: <200601062039.k06Kd1uf022246@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/FC-2 In directory cvs.devel.redhat.com:/tmp/cvs-serv22230 Modified Files: tzdata.spec Log Message: Fixing specfile which still described the old build version. Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-2/tzdata.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tzdata.spec 6 Jan 2006 20:17:17 -0000 1.9 +++ tzdata.spec 6 Jan 2006 20:38:59 -0000 1.10 @@ -6,6 +6,7 @@ Group: System Environment/Base Source0: %{name}.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz +Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz Buildroot: /var/tmp/tzdata-root BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 @@ -19,6 +20,8 @@ %setup -n tzdata mkdir %{name}%{version} tar xzf %{SOURCE1} -C %{name}%{version} +mkdir tzcode%{version} +tar xzf %{SOURCE2} -C tzcode%{version} %build sed -e 's|@objpfx@|'`pwd`'/obj/|' \ @@ -26,6 +29,7 @@ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig make +grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html %install make install @@ -39,6 +43,7 @@ %files %defattr(-,root,root) %{_datadir}/zoneinfo +%doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog * Thu Jan 5 2006 Petr Machata 2005r-1.fc2 From fedora-cvs-commits at redhat.com Fri Jan 6 20:43:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 15:43:44 -0500 Subject: rpms/tzdata/FC-1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tzdata.spec, 1.3, 1.4 Message-ID: <200601062043.k06KhiA0022330@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/FC-1 In directory cvs.devel.redhat.com:/tmp/cvs-serv22315 Modified Files: .cvsignore sources tzdata.spec Log Message: Pushing upstream changes. This fixes #173091. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-1/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 13:43:00 -0000 1.4 +++ .cvsignore 6 Jan 2006 20:43:42 -0000 1.5 @@ -1,2 +1,3 @@ tzdata.tar.bz2 -tzdata2004b.tar.gz +tzdata2005r.tar.gz +tzcode2005r.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-1/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 13:43:00 -0000 1.4 +++ sources 6 Jan 2006 20:43:42 -0000 1.5 @@ -1,2 +1,3 @@ -d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 -8e1443ccafd17648a105d15c0d63858f tzdata2004b.tar.gz +325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 +b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz +063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-1/tzdata.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tzdata.spec 9 Sep 2004 13:43:00 -0000 1.3 +++ tzdata.spec 6 Jan 2006 20:43:42 -0000 1.4 @@ -1,11 +1,12 @@ Summary: Timezone data Name: tzdata -Version: 2004b +Version: 2005r Release: 1.fc1 -Copyright: GPL +License: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz +Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz Buildroot: /var/tmp/tzdata-root BuildRequires: gawk, glibc, glibc-common, perl Conflicts: glibc-common <= 2.3.2-63 @@ -19,6 +20,8 @@ %setup -n tzdata mkdir %{name}%{version} tar xzf %{SOURCE1} -C %{name}%{version} +mkdir tzcode%{version} +tar xzf %{SOURCE2} -C tzcode%{version} %build sed -e 's|@objpfx@|'`pwd`'/obj/|' \ @@ -26,6 +29,7 @@ -e 's|@install_root@|%{buildroot}|' \ Makeconfig.in > Makeconfig make +grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html %install make install @@ -39,8 +43,75 @@ %files %defattr(-,root,root) %{_datadir}/zoneinfo +%doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Thu Jan 5 2006 Petr Machata 2005r-1.fc1 +- 2005r + - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to + northamerica to guard against old files with obsolete information + being left in the time zone binary directory. + - Changes for countries that are supposed to join 2007 US DST + change. This includes most of Canada, however entries already in + the database (Alberta, British Columbia, Newfoundland, Northwest + Territories, and Yukon) were left alone for the time being. + - Fixes in zdump.c (abbrok): conditions are chained, and the string + is checked for emptiness. + +* Sat Dec 17 2005 Jakub Jelinek 2005q-2 +- 2005q + - changes for Georgia, Azerbaijan, Jordan, Palestine, Cuba, Nicaragua + - SystemV timezone changes + +* Wed Nov 2 2005 Jakub Jelinek 2005n-2 +- 2005n + - changes for Kyrgyzstan and Uruguay +- fix a typo in the Makefile (used TZDATA env var instead of TZDIR during + make check), update tst-timezone.c from glibc CVS (#172102) + +* Tue Sep 6 2005 Jakub Jelinek 2005m-2 +- 2005m + - changes for USA (extending DST by 4 weeks since 2007), Tunisia, + Australia, Kazakhstan + - historical timezone data changes for Japan, Poland, Northern Ireland and + Mali + - timezone name change for East Timor + +* Fri Jul 15 2005 Jakub Jelinek 2005k-2 +- 2005k + - leap seconds update + +* Sat Apr 30 2005 Jakub Jelinek 2005i-2 +- 2005i + - updates for Iran, Haiti and Nicaragua + +* Mon Apr 4 2005 Jakub Jelinek 2005h-2 +- 2005h + - fixes for Kazakhstan + +* Thu Mar 17 2005 Jakub Jelinek 2005g-2 +- 2005g + - fixes for Uruguay +- include README and Theory from tzcode tarball in %{_docdir}; + Theory includes a good summary of how the timezone data files + are supposed to be named + +* Tue Mar 1 2005 Jakub Jelinek 2005f-2 +- 2005f + - more updates for Israel, updates for Azerbaijan + +* Wed Jan 26 2005 Jakub Jelinek 2005c-3 +- 2005c + - updates for Israel and Paraguay + +* Mon Nov 29 2004 Jakub Jelinek 2004g-1 +- 2004g (#141107) + - updates for Cuba + +* Mon Oct 11 2004 Jakub Jelinek 2004e-2 +- 2004e (#135194) + - updates for Brazil, Uruguay and Argentina + * Wed Aug 4 2004 Jakub Jelinek 2004d-1.fc1 - 2004b From fedora-cvs-commits at redhat.com Fri Jan 6 20:52:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 15:52:13 -0500 Subject: rpms/tzdata/FC-2 tzdata.spec,1.10,1.11 Message-ID: <200601062052.k06KqDJj001266@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/FC-2 In directory cvs.devel.redhat.com:/tmp/cvs-serv1249 Modified Files: tzdata.spec Log Message: And a change in version, necessary for retagging... Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-2/tzdata.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tzdata.spec 6 Jan 2006 20:38:59 -0000 1.10 +++ tzdata.spec 6 Jan 2006 20:52:11 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata Version: 2005r -Release: 1.fc2 +Release: 2.fc2 License: GPL Group: System Environment/Base Source0: %{name}.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 6 21:00:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 16:00:24 -0500 Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.2, 1.3 Message-ID: <200601062100.k06L0Ohw012019@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer-plugins-base/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11952 Modified Files: gstreamer-plugins-base.spec Log Message: - gst-launch-ext removed from upstream Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gstreamer-plugins-base.spec 6 Jan 2006 17:02:57 -0000 1.2 +++ gstreamer-plugins-base.spec 6 Jan 2006 21:00:15 -0000 1.3 @@ -75,9 +75,7 @@ %doc AUTHORS COPYING README REQUIREMENTS # helper programs -%{_bindir}/gst-launch-ext-%{majorminor} %{_bindir}/gst-visualise-%{majorminor} -%{_mandir}/man1/gst-launch-ext-%{majorminor}.* %{_mandir}/man1/gst-visualise-%{majorminor}* # libraries @@ -181,6 +179,7 @@ %changelog * Fri Jan 06 2006 John (J5) Palmieri - 0.10.1-1 - New upstream version +- gst-launch removed from upstream * Sat Dec 17 2005 Thomas Vander Stichele - 0.10.0-1 From fedora-cvs-commits at redhat.com Fri Jan 6 21:08:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 16:08:41 -0500 Subject: rpms/kernel/devel/configs config-powerpc64-iseries,1.6,1.7 Message-ID: <200601062108.k06L8f8t012909@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv12840/configs Modified Files: config-powerpc64-iseries Log Message: disable more noise on iseries Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- config-powerpc64-iseries 6 Jan 2006 07:37:03 -0000 1.6 +++ config-powerpc64-iseries 6 Jan 2006 21:08:39 -0000 1.7 @@ -67,3 +67,6 @@ # CONFIG_ISDN is not set # CONFIG_IEEE80211 is not set +# CONFIG_DVB is not set +# CONFIG_VIDEO_DEV is not set + From fedora-cvs-commits at redhat.com Fri Jan 6 21:26:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 16:26:58 -0500 Subject: rpms/totem/devel totem.spec,1.40,1.41 Message-ID: <200601062126.k06LQwJg032322@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32142 Modified Files: totem.spec Log Message: - Add --with-mozilla=firefox to the configure stage Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- totem.spec 6 Jan 2006 17:45:46 -0000 1.40 +++ totem.spec 6 Jan 2006 21:26:55 -0000 1.41 @@ -56,7 +56,7 @@ %build autoreconf -%configure --enable-gstreamer=0.10 --disable-lirc --disable-vanity --enable-mozilla --disable-nvtv +%configure --enable-gstreamer=0.10 --disable-lirc --disable-vanity --enable-mozilla --with-mozilla=firefox --disable-nvtv #apparently someone forgot to autogen before disting 0.99.17 :) #perl -pi -e 's/gstvideowidget.h//g' src/Makefile From fedora-cvs-commits at redhat.com Fri Jan 6 21:27:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 16:27:34 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.228,1.229 Message-ID: <200601062127.k06LRYjG032650@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32619 Modified Files: eclipse.spec Log Message: Disable GNU formatter patches again until they can be forward-ported to 3.1.1. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- eclipse.spec 5 Jan 2006 02:26:42 -0000 1.228 +++ eclipse.spec 6 Jan 2006 21:27:32 -0000 1.229 @@ -73,8 +73,8 @@ Patch19: %{name}-efj.patch # GNU-style JDT formatter # https://bugs.eclipse.org/bugs/show_bug.cgi?id=91770 -Patch20: %{name}-gnuformatterjdt.patch -Patch21: %{name}-gnuformatterjdtui.patch +#Patch20: %{name}-gnuformatterjdt.patch +#Patch21: %{name}-gnuformatterjdtui.patch # https://bugs.eclipse.org/bugs/show_bug.cgi?id=90630 Patch22: %{name}-updatehomedir-core.patch Patch23: %{name}-updatehomedir-ui.patch @@ -344,11 +344,11 @@ popd pushd plugins/org.eclipse.jdt.core %patch19 -p0 -%patch20 -p0 -popd -pushd plugins/org.eclipse.jdt.ui -%patch21 -p0 +#%patch20 -p0 popd +#pushd plugins/org.eclipse.jdt.ui +#%patch21 -p0 +#popd pushd plugins/org.eclipse.update.core %patch22 -p0 popd From fedora-cvs-commits at redhat.com Fri Jan 6 21:32:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 16:32:36 -0500 Subject: rpms/totem/devel totem.spec,1.41,1.42 Message-ID: <200601062132.k06LWaev001523@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1479 Modified Files: totem.spec Log Message: - remove --with-mozilla=firefox Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- totem.spec 6 Jan 2006 21:26:55 -0000 1.41 +++ totem.spec 6 Jan 2006 21:32:23 -0000 1.42 @@ -56,7 +56,7 @@ %build autoreconf -%configure --enable-gstreamer=0.10 --disable-lirc --disable-vanity --enable-mozilla --with-mozilla=firefox --disable-nvtv +%configure --enable-gstreamer=0.10 --disable-lirc --disable-vanity --enable-mozilla --disable-nvtv #apparently someone forgot to autogen before disting 0.99.17 :) #perl -pi -e 's/gstvideowidget.h//g' src/Makefile From fedora-cvs-commits at redhat.com Fri Jan 6 21:51:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 16:51:52 -0500 Subject: rpms/gnome-games/devel .cvsignore, 1.29, 1.30 gnome-games.spec, 1.57, 1.58 sources, 1.32, 1.33 Message-ID: <200601062151.k06Lpq7a020691@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-games/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20604 Modified Files: .cvsignore gnome-games.spec sources Log Message: - remove "Windows" theme from gnobots Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 3 Jan 2006 18:59:25 -0000 1.29 +++ .cvsignore 6 Jan 2006 21:51:48 -0000 1.30 @@ -1,24 +1,2 @@ -gnome-games-2.7.7.tar.bz2 -gnome-games-extra-data-2.7.0.tar.bz2 -gnome-games-extra-data-2.8.0.tar.bz2 -gnome-games-2.8.0.tar.bz2 -gnome-games-no-stones-2.8.0.tar.bz2 -gnome-games-2.9.5.tar.bz2 -gnome-games-no-stones-2.9.5.tar.bz2 -gnome-games-2.9.6.tar.bz2 -gnome-games-no-stones-2.9.6.tar.bz2 -gnome-games-no-stones-2.10.0.tar.bz2 -gnome-games-extra-data-2.10.0.tar.bz2 -gnome-games-2.11.1.tar.bz2 -gnome-games-no-stones-2.11.1.tar.bz2 -gnome-games-2.11.3.tar.bz2 -gnome-games-no-stones-2.11.3.tar.bz2 -gnome-games-2.11.4.tar.bz2 -gnome-games-2.11.4-no-stones.tar.bz2 -gnome-games-2.12.0-no-stones.tar.bz2 -gnome-games-2.12.1.tar.bz2 -gnome-games-2.12.1-no-stones.tar.bz2 -gnome-games-2.13.2.tar.bz2 -gnome-games-extra-data-2.12.0.tar.bz2 -gnome-games-2.13.3.tar.bz2 gnome-games-2.13.4.tar.bz2 +gnome-games-extra-data-no-windows-2.12.0.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- gnome-games.spec 3 Jan 2006 18:59:25 -0000 1.57 +++ gnome-games.spec 6 Jan 2006 21:51:49 -0000 1.58 @@ -11,12 +11,12 @@ Summary: GNOME games. Name: gnome-games Version: 2.13.4 -Release: 1 +Release: 2 Epoch: 1 License: LGPL Group: Amusements/Games Source: gnome-games-%{version}.tar.bz2 -Source2: gnome-games-extra-data-%{gnome_games_extra_data_version}.tar.bz2 +Source2: gnome-games-extra-data-no-windows-%{gnome_games_extra_data_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: gnome-games-devel URL: http://www.gnome.org @@ -176,6 +176,9 @@ %changelog +* Fri Jan 06 2006 Ray Strode 1:2.13.4-2 +- remove "Windows" theme from gnobots + * Tue Jan 03 2006 Matthias Clasen 1:2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 3 Jan 2006 18:59:25 -0000 1.32 +++ sources 6 Jan 2006 21:51:49 -0000 1.33 @@ -1,2 +1,2 @@ -51b2b54c41b6d9cb1a228143723b43a1 gnome-games-extra-data-2.12.0.tar.bz2 dc83b2ed649c5866b70ad165eb71ad0d gnome-games-2.13.4.tar.bz2 +19b2d6dbca182fb426a0bd86d322a2ac gnome-games-extra-data-no-windows-2.12.0.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 6 21:56:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 16:56:34 -0500 Subject: rpms/totem/devel totem.spec,1.42,1.43 Message-ID: <200601062156.k06LuYFF022773@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22625 Modified Files: totem.spec Log Message: - force the mozilla plugin dir to be %{_libdir}/mozilla/plugins Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- totem.spec 6 Jan 2006 21:32:23 -0000 1.42 +++ totem.spec 6 Jan 2006 21:56:32 -0000 1.43 @@ -56,7 +56,7 @@ %build autoreconf -%configure --enable-gstreamer=0.10 --disable-lirc --disable-vanity --enable-mozilla --disable-nvtv +MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins %configure --enable-gstreamer=0.10 --disable-lirc --disable-vanity --enable-mozilla --disable-nvtv #apparently someone forgot to autogen before disting 0.99.17 :) #perl -pi -e 's/gstvideowidget.h//g' src/Makefile From fedora-cvs-commits at redhat.com Fri Jan 6 22:05:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 17:05:39 -0500 Subject: rpms/totem/devel totem.spec,1.43,1.44 Message-ID: <200601062205.k06M5dBN024686@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24351 Modified Files: totem.spec Log Message: - use make install DESTDIR=$RPM_BUILD_ROOT instead of %makeinstall Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- totem.spec 6 Jan 2006 21:56:32 -0000 1.43 +++ totem.spec 6 Jan 2006 22:05:35 -0000 1.44 @@ -56,7 +56,8 @@ %build autoreconf -MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins %configure --enable-gstreamer=0.10 --disable-lirc --disable-vanity --enable-mozilla --disable-nvtv +export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins +%configure --enable-gstreamer=0.10 --disable-lirc --disable-vanity --enable-mozilla --disable-nvtv #apparently someone forgot to autogen before disting 0.99.17 :) #perl -pi -e 's/gstvideowidget.h//g' src/Makefile @@ -66,7 +67,7 @@ %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} #nor vanity From fedora-cvs-commits at redhat.com Fri Jan 6 22:17:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 17:17:54 -0500 Subject: rpms/glibc/devel .cvsignore, 1.130, 1.131 glibc-fedora.patch, 1.121, 1.122 glibc.spec, 1.207, 1.208 sources, 1.152, 1.153 Message-ID: <200601062217.k06MHsi0006705@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6664/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.3.90-29 on branch devel from glibc-2.3.90-29.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- .cvsignore 6 Jan 2006 09:59:51 -0000 1.130 +++ .cvsignore 6 Jan 2006 22:17:50 -0000 1.131 @@ -1,2 +1,2 @@ -glibc-20060106T0916.tar.bz2 -glibc-fedora-20060106T0916.tar.bz2 +glibc-20060106T2148.tar.bz2 +glibc-fedora-20060106T2148.tar.bz2 glibc-fedora.patch: ChangeLog | 58 ++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 +++ csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 38 ++ elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 ++- include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 + libio/stdio.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 ++ localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 +- malloc/mtrace.c | 20 + nptl/ChangeLog | 19 + nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 + nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - nscd/selinux.c | 2 posix/Makefile | 19 - posix/getconf.speclist.h | 15 + sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------------------- sysdeps/ia64/libgcc-compat.c | 84 ++++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 ++ sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/tcsetattr.c | 32 ++ 47 files changed, 769 insertions(+), 448 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- glibc-fedora.patch 6 Jan 2006 09:59:51 -0000 1.121 +++ glibc-fedora.patch 6 Jan 2006 22:17:50 -0000 1.122 @@ -1,6 +1,6 @@ ---- glibc-20060106T0916/ChangeLog 6 Jan 2006 07:30:36 -0000 1.9860 -+++ glibc-20060106T0916-fedora/ChangeLog 6 Jan 2006 09:23:22 -0000 1.8782.2.148 -@@ -452,6 +452,10 @@ +--- glibc-20060106T2148/ChangeLog 6 Jan 2006 19:15:13 -0000 1.9872 ++++ glibc-20060106T2148-fedora/ChangeLog 6 Jan 2006 21:55:54 -0000 1.8782.2.149 +@@ -529,6 +529,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -11,7 +11,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -735,6 +739,26 @@ +@@ -812,6 +816,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -38,7 +38,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -3853,6 +3877,11 @@ +@@ -3930,6 +3954,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -50,7 +50,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -4847,6 +4876,12 @@ +@@ -4924,6 +4953,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -63,7 +63,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -4971,6 +5006,17 @@ +@@ -5048,6 +5083,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -81,7 +81,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -8031,6 +8077,18 @@ +@@ -8108,6 +8154,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -100,8 +100,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060106T0916/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060106T0916-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060106T2148/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060106T2148-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -151,8 +151,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20060106T0916/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060106T0916-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060106T2148/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060106T2148-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -179,8 +179,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060106T0916/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060106T0916-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060106T2148/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060106T2148-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -261,8 +261,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060106T0916/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060106T0916-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060106T2148/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060106T2148-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -287,8 +287,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060106T0916/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060106T0916-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060106T2148/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060106T2148-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -317,8 +317,8 @@ # define O 0 #else # define O 1 ---- glibc-20060106T0916/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 -+++ glibc-20060106T0916-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 +--- glibc-20060106T2148/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 ++++ glibc-20060106T2148-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr #endif !is_hwcap_platform (direntry->d_name))) @@ -420,8 +420,8 @@ } search_dirs (); ---- glibc-20060106T0916/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060106T0916-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060106T2148/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060106T2148-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -446,8 +446,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060106T0916/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060106T0916-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060106T2148/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060106T2148-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -524,8 +524,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060106T0916/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 -+++ glibc-20060106T0916-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 +--- glibc-20060106T2148/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 ++++ glibc-20060106T2148-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 @@ -275,7 +275,13 @@ #endif @@ -541,8 +541,8 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060106T0916/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060106T0916-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060106T2148/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060106T2148-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -552,8 +552,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060106T0916/libio/stdio.h 5 Jan 2006 12:25:35 -0000 1.84 -+++ glibc-20060106T0916-fedora/libio/stdio.h 6 Jan 2006 09:23:23 -0000 1.78.2.7 +--- glibc-20060106T2148/libio/stdio.h 5 Jan 2006 12:25:35 -0000 1.84 ++++ glibc-20060106T2148-fedora/libio/stdio.h 6 Jan 2006 09:23:23 -0000 1.78.2.7 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -567,8 +567,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060106T0916/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060106T0916-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060106T2148/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060106T2148-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -599,8 +599,8 @@ #endif ---- glibc-20060106T0916/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20060106T0916-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060106T2148/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060106T2148-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -692,8 +692,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060106T0916/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060106T0916-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060106T2148/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060106T2148-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -737,8 +737,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060106T0916/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20060106T0916-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060106T2148/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060106T2148-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -747,8 +747,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060106T0916/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20060106T0916-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060106T2148/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060106T2148-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -790,8 +790,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060106T0916/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060106T0916-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060106T2148/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060106T2148-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -806,8 +806,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060106T0916/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060106T0916-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060106T2148/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060106T2148-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -819,8 +819,8 @@ date_fmt "/ / " ---- glibc-20060106T0916/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T0916-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060106T2148/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T2148-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -891,8 +891,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060106T0916/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060106T0916-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060106T2148/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060106T2148-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -920,8 +920,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060106T0916/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060106T0916-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060106T2148/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060106T2148-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -997,8 +997,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060106T0916/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060106T0916-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060106T2148/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060106T2148-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1054,9 +1054,9 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060106T0916/nptl/ChangeLog 6 Jan 2006 03:08:04 -0000 1.838 -+++ glibc-20060106T0916-fedora/nptl/ChangeLog 6 Jan 2006 09:23:24 -0000 1.706.2.72 -@@ -397,6 +397,15 @@ +--- glibc-20060106T2148/nptl/ChangeLog 6 Jan 2006 21:47:59 -0000 1.840 ++++ glibc-20060106T2148-fedora/nptl/ChangeLog 6 Jan 2006 21:55:55 -0000 1.706.2.73 +@@ -413,6 +413,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1072,7 +1072,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1133,6 +1142,11 @@ +@@ -1149,6 +1158,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1084,7 +1084,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3207,6 +3221,11 @@ +@@ -3223,6 +3237,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1096,8 +1096,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060106T0916/nptl/Makefile 5 Jan 2006 08:16:20 -0000 1.175 -+++ glibc-20060106T0916-fedora/nptl/Makefile 6 Jan 2006 09:23:24 -0000 1.157.2.16 +--- glibc-20060106T2148/nptl/Makefile 5 Jan 2006 08:16:20 -0000 1.175 ++++ glibc-20060106T2148-fedora/nptl/Makefile 6 Jan 2006 09:23:24 -0000 1.157.2.16 @@ -507,15 +507,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1120,8 +1120,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060106T0916/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060106T0916-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060106T2148/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060106T2148-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1146,8 +1146,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060106T0916/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T0916-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060106T2148/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T2148-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1155,8 +1155,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060106T0916/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 -+++ glibc-20060106T0916-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 +--- glibc-20060106T2148/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 ++++ glibc-20060106T2148-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void) exit (4); } @@ -1176,8 +1176,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060106T0916/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 -+++ glibc-20060106T0916-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +--- glibc-20060106T2148/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060106T2148-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1196,8 +1196,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060106T0916/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20060106T0916-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060106T2148/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060106T2148-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 @@ -32,8 +32,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1209,8 +1209,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060106T0916/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060106T0916-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060106T2148/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060106T2148-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1251,8 +1251,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060106T0916/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 -+++ glibc-20060106T0916-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 +--- glibc-20060106T2148/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 ++++ glibc-20060106T2148-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 @@ -147,7 +147,7 @@ audit_init (void) if (audit_fd < 0 /* If kernel doesn't support audit, bail out */ @@ -1262,8 +1262,8 @@ } #endif /* HAVE_LIBAUDIT */ ---- glibc-20060106T0916/posix/Makefile 2 Jan 2006 20:39:39 -0000 1.187 -+++ glibc-20060106T0916-fedora/posix/Makefile 2 Jan 2006 21:28:09 -0000 1.171.2.15 +--- glibc-20060106T2148/posix/Makefile 2 Jan 2006 20:39:39 -0000 1.187 ++++ glibc-20060106T2148-fedora/posix/Makefile 2 Jan 2006 21:28:09 -0000 1.171.2.15 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1297,8 +1297,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060106T0916/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T0916-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060106T2148/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T2148-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1315,8 +1315,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060106T0916/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060106T0916-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060106T2148/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060106T2148-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1332,8 +1332,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20060106T0916/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060106T0916-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060106T2148/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060106T2148-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1345,8 +1345,8 @@ endif endif ---- glibc-20060106T0916/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060106T0916-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060106T2148/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060106T2148-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1698,8 +1698,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20060106T0916/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T0916-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060106T2148/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T2148-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1785,8 +1785,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060106T0916/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060106T0916-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060106T2148/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060106T2148-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -1801,8 +1801,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060106T0916/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 -+++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 +--- glibc-20060106T2148/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 ++++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -1851,8 +1851,8 @@ + ret ^= stk; return ret; } ---- glibc-20060106T0916/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060106T2148/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -1862,8 +1862,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060106T0916/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060106T2148/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -1909,8 +1909,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060106T0916/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060106T2148/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -1971,8 +1971,8 @@ + } while (0) + +#include_next ---- glibc-20060106T0916/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060106T2148/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2005,24 +2005,24 @@ + } while (0) + #include_next ---- glibc-20060106T0916/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060106T2148/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060106T0916/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060106T2148/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060106T0916/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060106T0916-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060106T2148/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- glibc.spec 6 Jan 2006 09:59:51 -0000 1.207 +++ glibc.spec 6 Jan 2006 22:17:50 -0000 1.208 @@ -1,9 +1,9 @@ -%define glibcdate 20060106T0916 +%define glibcdate 20060106T2148 %define glibcname glibc -%define glibcsrcdir glibc-20060106T0916 +%define glibcsrcdir glibc-20060106T2148 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 28 +%define glibcrelease 29 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -1133,6 +1133,11 @@ %endif %changelog +* Fri Jan 6 2006 Jakub Jelinek 2.3.90-29 +- update from CVS + - make pthread_mutex_t an unnamed union again, as it affects + libstdc++ ABI mangling + * Fri Jan 6 2006 Jakub Jelinek 2.3.90-28 - update from CVS - make aio_suspend interruptible by signals (#171968) Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- sources 6 Jan 2006 09:59:51 -0000 1.152 +++ sources 6 Jan 2006 22:17:50 -0000 1.153 @@ -1,2 +1,2 @@ -6898b0af980cc372d55c34749787d018 glibc-20060106T0916.tar.bz2 -28d64f7b1368208777770040639cfdc0 glibc-fedora-20060106T0916.tar.bz2 +a525e450e3f692d432811e9f6c9381ea glibc-20060106T2148.tar.bz2 +9f1c2990fba476a115239d1272d22db4 glibc-fedora-20060106T2148.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 6 22:21:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 17:21:49 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.229,1.230 Message-ID: <200601062221.k06MLnXa008371@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8335 Modified Files: eclipse.spec Log Message: Don't build on s390{,x}. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- eclipse.spec 6 Jan 2006 21:27:32 -0000 1.229 +++ eclipse.spec 6 Jan 2006 22:21:46 -0000 1.230 @@ -115,9 +115,9 @@ Patch48: %{name}-javadoclinks.patch %if %{gcj_support} -ExcludeArch: ppc64 +ExcludeArch: ppc64 s390 s390x %else -ExclusiveArch: %{ix86} x86_64 ppc ia64 s390 s390x +ExclusiveArch: %{ix86} x86_64 ppc ia64 %endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ant @@ -1267,7 +1267,7 @@ * Wed Jan 04 2006 Andrew Overholt 3.1.1-1jpp_15fc - Update s390{,x} patches. - Use natively-compiled ecj during build. -- Attempt build on ia64, s390, and s390x. +- Attempt build on ia64. * Fri Dec 23 2005 Andrew Overholt 3.1.1-1jpp_14fc - Rebuild again. From fedora-cvs-commits at redhat.com Fri Jan 6 22:27:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 17:27:43 -0500 Subject: rpms/glibc/devel glibc-fedora.patch,1.122,1.123 Message-ID: <200601062227.k06MRhh6010889@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10828 Modified Files: glibc-fedora.patch Log Message: 2.3.90-29 glibc-fedora.patch: ChangeLog | 58 ++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 +++ csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 38 ++ elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 ++- include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 + libio/stdio.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 ++ localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 +- malloc/mtrace.c | 20 + nptl/ChangeLog | 19 + nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 + nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - nscd/selinux.c | 2 posix/Makefile | 19 - posix/getconf.speclist.h | 15 + sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------------------- sysdeps/ia64/libgcc-compat.c | 84 ++++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 ++ sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/ia64/sysdep.h | 3 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/tcsetattr.c | 32 ++ 48 files changed, 771 insertions(+), 449 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- glibc-fedora.patch 6 Jan 2006 22:17:50 -0000 1.122 +++ glibc-fedora.patch 6 Jan 2006 22:27:39 -0000 1.123 @@ -2026,3 +2026,15 @@ @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ +--- glibc-20060106T2148/sysdeps/unix/sysv/linux/ia64/sysdep.h 20 Dec 2005 06:53:38 -0000 1.24 ++++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/ia64/sysdep.h 6 Jan 2006 22:24:17 -0000 1.22.2.3 +@@ -205,7 +205,8 @@ + register long _r8 __asm ("r8"); \ + register long _r10 __asm ("r10"); \ + register long _r15 __asm ("r15") = name; \ +- register void *_b7 __asm ("b7") = ((tcbhead_t *) __thread_self)->private; \ ++ register void *_b7 __asm ("b7") \ ++ = ((tcbhead_t *) __thread_self)->__private; \ + long _retval; \ + LOAD_REGS_##nr \ + /* \ From fedora-cvs-commits at redhat.com Fri Jan 6 22:32:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 17:32:45 -0500 Subject: rpms/totem/devel totem.spec,1.44,1.45 Message-ID: <200601062232.k06MWj0n012123@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12083 Modified Files: totem.spec Log Message: - add the mozplugin subpackage Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- totem.spec 6 Jan 2006 22:05:35 -0000 1.44 +++ totem.spec 6 Jan 2006 22:32:41 -0000 1.45 @@ -33,6 +33,14 @@ simple playlist, a full-screen mode, seek and volume controls, as well as a pretty complete keyboard navigation. +%package mozplugin +Summary: Mozilla plugin for Totem +Group: Applications/Internet + +%description mozplugin +Totem is simple movie player for the Gnome desktop. The mozilla plugin +for totem allows totem to be embeded into a web browser. + %package devel Summary: Libraries/include files for Totem. Group: Development/Libraries @@ -56,7 +64,7 @@ %build autoreconf -export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins +export MOZILLA_PLUGINDIR=%{_libdir}/mozilla %configure --enable-gstreamer=0.10 --disable-lirc --disable-vanity --enable-mozilla --disable-nvtv #apparently someone forgot to autogen before disting 0.99.17 :) @@ -78,6 +86,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins/*.la %clean rm -rf $RPM_BUILD_ROOT @@ -114,6 +124,10 @@ %{_mandir}/man1/%{name}.1* %{_mandir}/man1/totem-video-thumbnailer.1.gz +%files mozplugin +%defattr(-, root, root) +%{_libdir}/mozilla/plugins/* + %files devel %defattr(-, root, root) %{_includedir}/%{name}/1/plparser From fedora-cvs-commits at redhat.com Fri Jan 6 22:39:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 17:39:21 -0500 Subject: rpms/totem/devel totem.spec,1.45,1.46 Message-ID: <200601062239.k06MdLoc013680@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13509 Modified Files: totem.spec Log Message: - added totem-mozilla-viewer to the files list for the mozilla plugin Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- totem.spec 6 Jan 2006 22:32:41 -0000 1.45 +++ totem.spec 6 Jan 2006 22:39:18 -0000 1.46 @@ -127,6 +127,7 @@ %files mozplugin %defattr(-, root, root) %{_libdir}/mozilla/plugins/* +%{_libexecdir}/totem-mozilla-viewer %files devel %defattr(-, root, root) From fedora-cvs-commits at redhat.com Fri Jan 6 22:45:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 17:45:38 -0500 Subject: rpms/kernel/FC-4/configs config-generic, 1.44, 1.44.4.1 config-x86-generic, 1.16, 1.16.2.1 config-x86_64-generic, 1.14, 1.14.8.1 Message-ID: <200601062245.k06MjVLa008479@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv8345/configs Modified Files: Tag: private-linville-netdev-fc4-7-branch config-generic config-x86-generic config-x86_64-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.44 retrieving revision 1.44.4.1 diff -u -r1.44 -r1.44.4.1 --- config-generic 14 Dec 2005 02:22:28 -0000 1.44 +++ config-generic 6 Jan 2006 22:45:25 -0000 1.44.4.1 @@ -1035,6 +1035,7 @@ CONFIG_R8169_VLAN=y CONFIG_SK98LIN=m CONFIG_SKGE=m +CONFIG_SKY2=m CONFIG_TIGON3=m # @@ -1058,6 +1059,7 @@ CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m +CONFIG_PPP_MPPE=m CONFIG_IPPP_FILTER=y # CONFIG_PPP_BSDCOMP is not set CONFIG_PPPOE=m @@ -1093,11 +1095,14 @@ CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +CONFIG_IEEE80211_SOFTMAC_DEBUG=y # CONFIG_IPW2100 is not set -# CONFIG_IPW_DEBUG is not set +# CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100_PROMISC is not set # CONFIG_IPW2100_LEGACY_FW_LOAD is not set # CONFIG_IPW2200 is not set +# CONFIG_IPW2200_DEBUG is not set CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1107,6 +1112,7 @@ CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m CONFIG_PRISM54=m +CONFIG_BCM43XX=m # # Wireless 802.11b Pcmcia/Cardbus cards support Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -r1.16 -r1.16.2.1 --- config-x86-generic 2 Jan 2006 02:02:31 -0000 1.16 +++ config-x86-generic 6 Jan 2006 22:45:25 -0000 1.16.2.1 @@ -238,11 +238,12 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IPW2100=m -# CONFIG_IPW_DEBUG is not set +CONFIG_IPW2100_DEBUG=y CONFIG_IPW2100_PROMISC=y # CONFIG_IPW2100_LEGACY_FW_LOAD is not set CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m +CONFIG_IPW2200_DEBUG=y CONFIG_BLK_DEV_AMD74XX=y Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v retrieving revision 1.14 retrieving revision 1.14.8.1 diff -u -r1.14 -r1.14.8.1 --- config-x86_64-generic 6 Dec 2005 23:34:14 -0000 1.14 +++ config-x86_64-generic 6 Jan 2006 22:45:25 -0000 1.14.8.1 @@ -108,11 +108,12 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IPW2100=m -# CONFIG_IPW_DEBUG is not set +CONFIG_IPW2100_DEBUG=y CONFIG_IPW2100_PROMISC=y # CONFIG_IPW2100_LEGACY_FW_LOAD is not set CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m +CONFIG_IPW2200_DEBUG=y CONFIG_PNP=y CONFIG_PNPACPI=y From fedora-cvs-commits at redhat.com Fri Jan 6 22:49:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 17:49:22 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1568,1.1569 Message-ID: <200601062249.k06MnMDB019970@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv19954 Modified Files: kernel-2.6.spec Log Message: bump From fedora-cvs-commits at redhat.com Fri Jan 6 23:07:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 18:07:49 -0500 Subject: rpms/kernel/devel/configs config-generic,1.121,1.121.2.1 Message-ID: <200601062307.k06N7njl020224@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv20183/configs Modified Files: Tag: private-fc5-test2-branch config-generic Log Message: Flip IO scheduler to 'AS' by default again. (CFQ has slab corruption bugs right now). Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.121 retrieving revision 1.121.2.1 diff -u -r1.121 -r1.121.2.1 --- config-generic 2 Jan 2006 21:56:59 -0000 1.121 +++ config-generic 6 Jan 2006 23:07:39 -0000 1.121.2.1 @@ -34,7 +34,7 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y -CONFIG_DEFAULT_CFQ=y +CONFIG_DEFAULT_AS=y CONFIG_POSIX_MQUEUE=y # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y From fedora-cvs-commits at redhat.com Fri Jan 6 23:07:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 18:07:49 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1826.2.1,1.1826.2.2 Message-ID: <200601062307.k06N7nVb020226@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20183 Modified Files: Tag: private-fc5-test2-branch kernel-2.6.spec Log Message: Flip IO scheduler to 'AS' by default again. (CFQ has slab corruption bugs right now). Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.1 retrieving revision 1.1826.2.2 diff -u -r1.1826.2.1 -r1.1826.2.2 --- kernel-2.6.spec 6 Jan 2006 08:33:20 -0000 1.1826.2.1 +++ kernel-2.6.spec 6 Jan 2006 23:07:27 -0000 1.1826.2.2 @@ -1428,6 +1428,8 @@ - Hush some debug messages in w1 driver. - Disable input layer on iseries. - VM OOM killer tweaks. +- Flip IO scheduler to 'AS' by default again. + (CFQ has slab corruption bugs right now). * Thu Jan 5 2006 Dave Jones - Try to debug some negative pagecount errors. From fedora-cvs-commits at redhat.com Fri Jan 6 23:08:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 18:08:30 -0500 Subject: rpms/glibc/devel glibc-fedora.patch,1.123,1.124 Message-ID: <200601062308.k06N8UGn020257@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20242 Modified Files: glibc-fedora.patch Log Message: 2.3.90-29 glibc-fedora.patch: ChangeLog | 58 ++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 +++ csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 38 ++ elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 ++- include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 + libio/stdio.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 ++ localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 +- malloc/mtrace.c | 20 + nptl/ChangeLog | 19 + nptl/Makefile | 8 nptl/descr.h | 2 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 + nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - nscd/selinux.c | 2 posix/Makefile | 19 - posix/getconf.speclist.h | 15 + sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------------------- sysdeps/ia64/libgcc-compat.c | 84 ++++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 ++ sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/ia64/sysdep.h | 3 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/tcsetattr.c | 32 ++ 49 files changed, 772 insertions(+), 450 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- glibc-fedora.patch 6 Jan 2006 22:27:39 -0000 1.123 +++ glibc-fedora.patch 6 Jan 2006 23:08:27 -0000 1.124 @@ -1120,6 +1120,17 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif +--- glibc-20060106T2148/nptl/descr.h 6 Jan 2006 21:42:24 -0000 1.29 ++++ glibc-20060106T2148-fedora/nptl/descr.h 6 Jan 2006 23:04:24 -0000 1.23.2.9 +@@ -165,7 +165,7 @@ struct pthread + } while (0) + # define DEQUEUE_MUTEX(mutex) \ + do { \ +- struct pthread_mutex_s *runp = THREAD_GETMEM (THREAD_SELF, robust_list); \ ++ struct __pthread_mutex_s *runp = THREAD_GETMEM (THREAD_SELF, robust_list);\ + if (runp == &mutex->__data) \ + THREAD_SETMEM (THREAD_SELF, robust_list, runp->__next); \ + else \ --- glibc-20060106T2148/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 +++ glibc-20060106T2148-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) From fedora-cvs-commits at redhat.com Fri Jan 6 23:32:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 18:32:22 -0500 Subject: rpms/kernel/devel/configs config-x86_64-generic,1.26,1.26.2.1 Message-ID: <200601062332.k06NWMGq010121@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv10060/configs Modified Files: Tag: private-fc5-test2-branch config-x86_64-generic Log Message: enable nvram for x86-64 Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v retrieving revision 1.26 retrieving revision 1.26.2.1 diff -u -r1.26 -r1.26.2.1 --- config-x86_64-generic 30 Dec 2005 05:09:24 -0000 1.26 +++ config-x86_64-generic 6 Jan 2006 23:32:19 -0000 1.26.2.1 @@ -146,3 +146,5 @@ CONFIG_LATENCY_TRACE=y CONFIG_MCOUNT=y +CONFIG_NVRAM=m + From fedora-cvs-commits at redhat.com Fri Jan 6 23:32:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 18:32:22 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1826.2.2,1.1826.2.3 Message-ID: <200601062332.k06NWMFW010115@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10060 Modified Files: Tag: private-fc5-test2-branch kernel-2.6.spec Log Message: enable nvram for x86-64 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.2 retrieving revision 1.1826.2.3 diff -u -r1.1826.2.2 -r1.1826.2.3 --- kernel-2.6.spec 6 Jan 2006 23:07:27 -0000 1.1826.2.2 +++ kernel-2.6.spec 6 Jan 2006 23:32:18 -0000 1.1826.2.3 @@ -1430,6 +1430,7 @@ - VM OOM killer tweaks. - Flip IO scheduler to 'AS' by default again. (CFQ has slab corruption bugs right now). +- Enable nvram driver for x86-64 * Thu Jan 5 2006 Dave Jones - Try to debug some negative pagecount errors. From fedora-cvs-commits at redhat.com Fri Jan 6 23:33:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 18:33:21 -0500 Subject: rpms/kernel/devel/configs config-x86_64-generic,1.26,1.27 Message-ID: <200601062333.k06NXLKC010325@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv10290/configs Modified Files: config-x86_64-generic Log Message: * Fri Jan 6 2006 Dave Jones - Enable nvram driver for x86-64 Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- config-x86_64-generic 30 Dec 2005 05:09:24 -0000 1.26 +++ config-x86_64-generic 6 Jan 2006 23:33:19 -0000 1.27 @@ -146,3 +146,5 @@ CONFIG_LATENCY_TRACE=y CONFIG_MCOUNT=y +CONFIG_NVRAM=m + From fedora-cvs-commits at redhat.com Fri Jan 6 23:33:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 18:33:21 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1830,1.1831 Message-ID: <200601062333.k06NXLZd010315@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10290 Modified Files: kernel-2.6.spec Log Message: * Fri Jan 6 2006 Dave Jones - Enable nvram driver for x86-64 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1830 retrieving revision 1.1831 diff -u -r1.1830 -r1.1831 --- kernel-2.6.spec 6 Jan 2006 17:19:49 -0000 1.1830 +++ kernel-2.6.spec 6 Jan 2006 23:33:18 -0000 1.1831 @@ -1399,6 +1399,9 @@ %endif %changelog +* Fri Jan 6 2006 Dave Jones +- Enable nvram driver for x86-64 + * Fri Jan 6 2006 David Woodhouse - Fix mv643xx_eth and spider_net compilation - Update Broadcom driver, switch to git tree for softmac From fedora-cvs-commits at redhat.com Fri Jan 6 23:35:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 18:35:12 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1569,1.1570 Message-ID: <200601062335.k06NZCLS010731@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv10690 Modified Files: kernel-2.6.spec Log Message: enable nvram for x86-64 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1569 retrieving revision 1.1570 diff -u -r1.1569 -r1.1570 --- kernel-2.6.spec 6 Jan 2006 22:49:19 -0000 1.1569 +++ kernel-2.6.spec 6 Jan 2006 23:35:06 -0000 1.1570 @@ -1259,6 +1259,9 @@ %changelog * Fri Jan 6 2006 Dave Jones +- Enable nvram driver for x86-64 + +* Fri Jan 6 2006 Dave Jones [2.6.15-1.1823_FC4] - Reduce block layer stack usage. - Set reboot through BIOS for HP laptops. From fedora-cvs-commits at redhat.com Fri Jan 6 23:35:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 18:35:12 -0500 Subject: rpms/kernel/FC-4/configs config-x86_64-generic,1.15,1.16 Message-ID: <200601062335.k06NZCUs010733@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv10690/configs Modified Files: config-x86_64-generic Log Message: enable nvram for x86-64 Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- config-x86_64-generic 6 Jan 2006 05:42:19 -0000 1.15 +++ config-x86_64-generic 6 Jan 2006 23:35:07 -0000 1.16 @@ -140,3 +140,5 @@ CONFIG_DELL_RBU=m CONFIG_DCDBAS=m +CONFIG_NVRAM=m + From fedora-cvs-commits at redhat.com Sat Jan 7 03:46:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 22:46:04 -0500 Subject: rpms/kernel/devel linux-2.6-debug-oops-pause.patch,1.4,1.5 Message-ID: <200601070346.k073k4JA017256@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14624 Modified Files: linux-2.6-debug-oops-pause.patch Log Message: arch/i386/kernel/traps.c:300: warning: implicit declaration of function `touch_nmi_watchdog' linux-2.6-debug-oops-pause.patch: traps.c | 10 ++++++++++ 1 files changed, 10 insertions(+) Index: linux-2.6-debug-oops-pause.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-oops-pause.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-debug-oops-pause.patch 5 Jan 2006 04:46:06 -0000 1.4 +++ linux-2.6-debug-oops-pause.patch 7 Jan 2006 03:46:01 -0000 1.5 @@ -8,6 +8,14 @@ --- vanilla/arch/i386/kernel/traps.c 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/i386/kernel/traps.c 2006-01-04 23:42:46.000000000 -0500 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #ifdef CONFIG_EISA + #include @@ -256,6 +271,15 @@ void show_registers(struct pt_regs *regs } } From fedora-cvs-commits at redhat.com Sat Jan 7 04:14:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 23:14:07 -0500 Subject: rpms/kernel/devel linux-2.6-posix-timers-sched_time-accumulation.patch, NONE, 1.1 kernel-2.6.spec, 1.1831, 1.1832 Message-ID: <200601070414.k074E7Rb000573@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv525 Modified Files: kernel-2.6.spec Added Files: linux-2.6-posix-timers-sched_time-accumulation.patch Log Message: Fix posix-cpu-timers sched_time accumulation linux-2.6-posix-timers-sched_time-accumulation.patch: posix-cpu-timers.c | 13 +------------ 1 files changed, 1 insertion(+), 12 deletions(-) --- NEW FILE linux-2.6-posix-timers-sched_time-accumulation.patch --- Message-Id: <20060106.153648.27161028.davem at davemloft.net> To: linux-kernel at vger.kernel.org CC: roland at redhat.com, torvalds at osdl.org Subject: [PATCH]: Fix posix-cpu-timers sched_time accumulation From: "David S. Miller" I've spent the past 3 days digging into a glibc testsuite failure in current CVS, specifically libc/rt/tst-cputimer1.c The thr1 and thr2 timers fire too early in the second pass of this test. The second pass is noteworthy because it makes use of intervals, whereas the first pass does not. All throughout the posix-cpu-timers.c code, the calculation of the process sched_time sum is implemented roughly as: unsigned long long sum; sum = tsk->signal->sched_time; t = tsk; do { sum += t->sched_time; t = next_thread(t); } while (t != tsk); In fact this is the exact scheme used by check_process_timers(). In the case of check_process_timers(), current->sched_time has just been updated (via scheduler_tick(), which is invoked by update_process_times(), which subsequently invokes run_posix_cpu_timers()) So there is no special processing necessary wrt. that. In other contexts, we have to allot for the fact that tsk->sched_time might be a bit out of date if we are current. And the posix-cpu-timers.c code uses current_sched_time() to deal with that. Unfortunately it does so in an erroneous and inconsistent manner in one spot which is what results in the early timer firing. In cpu_clock_sample_group_locked(), it does this: cpu->sched = p->signal->sched_time; /* Add in each other live thread. */ while ((t = next_thread(t)) != p) { cpu->sched += t->sched_time; } if (p->tgid == current->tgid) { /* * We're sampling ourselves, so include the * cycles not yet banked. We still omit * other threads running on other CPUs, * so the total can always be behind as * much as max(nthreads-1,ncpus) * (NSEC_PER_SEC/HZ). */ cpu->sched += current_sched_time(current); } else { cpu->sched += p->sched_time; } The problem is the "p->tgid == current->tgid" test. If "p" is not current, and the tgids are the same, we will add the process t->sched_time twice into cpu->sched and omit "p"'s sched_time which is very very very wrong. posix-cpu-timers.c has a helper function, sched_ns(p) which takes care of this, so my fix is to use that here instead of this special tgid test. The fact that current can be one of the sub-threads of "p" points out that we could make things a little bit more accurate, perhaps by using sched_ns() on every thread we process in these loops. It also points out that we don't use the most accurate value for threads in the group actively running other cpus (and this is mentioned in the comment). But that is a future enhancement, and this fix here definitely makes sense. Signed-off-by: David S. Miller diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index cae4f57..4c68edf 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c @@ -238,18 +238,7 @@ static int cpu_clock_sample_group_locked while ((t = next_thread(t)) != p) { cpu->sched += t->sched_time; } - if (p->tgid == current->tgid) { - /* - * We're sampling ourselves, so include the - * cycles not yet banked. We still omit - * other threads running on other CPUs, - * so the total can always be behind as - * much as max(nthreads-1,ncpus) * (NSEC_PER_SEC/HZ). - */ - cpu->sched += current_sched_time(current); - } else { - cpu->sched += p->sched_time; - } + cpu->sched += sched_ns(p); break; } return 0; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1831 retrieving revision 1.1832 diff -u -r1.1831 -r1.1832 --- kernel-2.6.spec 6 Jan 2006 23:33:18 -0000 1.1831 +++ kernel-2.6.spec 7 Jan 2006 04:14:03 -0000 1.1832 @@ -364,6 +364,7 @@ Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch Patch1850: linux-2.6-mv643xx-compile-fix.patch +Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -871,6 +872,8 @@ %patch1840 -p1 # Fix compilation for MV643xx Ethernet %patch1850 -p1 +# Fix posix-cpu-timers sched_time accumulation +%patch1860 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1401,6 +1404,7 @@ %changelog * Fri Jan 6 2006 Dave Jones - Enable nvram driver for x86-64 +- Fix posix-cpu-timers sched_time accumulation * Fri Jan 6 2006 David Woodhouse - Fix mv643xx_eth and spider_net compilation From fedora-cvs-commits at redhat.com Sat Jan 7 04:16:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 23:16:56 -0500 Subject: rpms/kernel/devel linux-2.6-posix-timers-sched_time-accumulation.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.1826.2.3, 1.1826.2.4 Message-ID: <200601070416.k074Gu3d013048@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13001 Modified Files: Tag: private-fc5-test2-branch kernel-2.6.spec Added Files: Tag: private-fc5-test2-branch linux-2.6-posix-timers-sched_time-accumulation.patch Log Message: Fix posix-cpu-timers sched_time accumulation. linux-2.6-posix-timers-sched_time-accumulation.patch: posix-cpu-timers.c | 13 +------------ 1 files changed, 1 insertion(+), 12 deletions(-) --- NEW FILE linux-2.6-posix-timers-sched_time-accumulation.patch --- Message-Id: <20060106.153648.27161028.davem at davemloft.net> To: linux-kernel at vger.kernel.org CC: roland at redhat.com, torvalds at osdl.org Subject: [PATCH]: Fix posix-cpu-timers sched_time accumulation From: "David S. Miller" I've spent the past 3 days digging into a glibc testsuite failure in current CVS, specifically libc/rt/tst-cputimer1.c The thr1 and thr2 timers fire too early in the second pass of this test. The second pass is noteworthy because it makes use of intervals, whereas the first pass does not. All throughout the posix-cpu-timers.c code, the calculation of the process sched_time sum is implemented roughly as: unsigned long long sum; sum = tsk->signal->sched_time; t = tsk; do { sum += t->sched_time; t = next_thread(t); } while (t != tsk); In fact this is the exact scheme used by check_process_timers(). In the case of check_process_timers(), current->sched_time has just been updated (via scheduler_tick(), which is invoked by update_process_times(), which subsequently invokes run_posix_cpu_timers()) So there is no special processing necessary wrt. that. In other contexts, we have to allot for the fact that tsk->sched_time might be a bit out of date if we are current. And the posix-cpu-timers.c code uses current_sched_time() to deal with that. Unfortunately it does so in an erroneous and inconsistent manner in one spot which is what results in the early timer firing. In cpu_clock_sample_group_locked(), it does this: cpu->sched = p->signal->sched_time; /* Add in each other live thread. */ while ((t = next_thread(t)) != p) { cpu->sched += t->sched_time; } if (p->tgid == current->tgid) { /* * We're sampling ourselves, so include the * cycles not yet banked. We still omit * other threads running on other CPUs, * so the total can always be behind as * much as max(nthreads-1,ncpus) * (NSEC_PER_SEC/HZ). */ cpu->sched += current_sched_time(current); } else { cpu->sched += p->sched_time; } The problem is the "p->tgid == current->tgid" test. If "p" is not current, and the tgids are the same, we will add the process t->sched_time twice into cpu->sched and omit "p"'s sched_time which is very very very wrong. posix-cpu-timers.c has a helper function, sched_ns(p) which takes care of this, so my fix is to use that here instead of this special tgid test. The fact that current can be one of the sub-threads of "p" points out that we could make things a little bit more accurate, perhaps by using sched_ns() on every thread we process in these loops. It also points out that we don't use the most accurate value for threads in the group actively running other cpus (and this is mentioned in the comment). But that is a future enhancement, and this fix here definitely makes sense. Signed-off-by: David S. Miller diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index cae4f57..4c68edf 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c @@ -238,18 +238,7 @@ static int cpu_clock_sample_group_locked while ((t = next_thread(t)) != p) { cpu->sched += t->sched_time; } - if (p->tgid == current->tgid) { - /* - * We're sampling ourselves, so include the - * cycles not yet banked. We still omit - * other threads running on other CPUs, - * so the total can always be behind as - * much as max(nthreads-1,ncpus) * (NSEC_PER_SEC/HZ). - */ - cpu->sched += current_sched_time(current); - } else { - cpu->sched += p->sched_time; - } + cpu->sched += sched_ns(p); break; } return 0; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.3 retrieving revision 1.1826.2.4 diff -u -r1.1826.2.3 -r1.1826.2.4 --- kernel-2.6.spec 6 Jan 2006 23:32:18 -0000 1.1826.2.3 +++ kernel-2.6.spec 7 Jan 2006 04:16:53 -0000 1.1826.2.4 @@ -367,6 +367,7 @@ Patch1820: linux-2.6-usbhid-wireless-security-lock.patch Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch +Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -881,6 +882,8 @@ %patch1830 -p1 # Reboot through BIOS on HP laptops. %patch1840 -p1 +# Fix posix-cpu-timers sched_time accumulation +%patch1860 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1431,6 +1434,7 @@ - Flip IO scheduler to 'AS' by default again. (CFQ has slab corruption bugs right now). - Enable nvram driver for x86-64 +- Fix posix-cpu-timers sched_time accumulation. * Thu Jan 5 2006 Dave Jones - Try to debug some negative pagecount errors. From fedora-cvs-commits at redhat.com Sat Jan 7 04:19:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 23:19:21 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.195, 1.196 anaconda.spec, 1.314, 1.315 sources, 1.313, 1.314 Message-ID: <200601070419.k074JLWt014201@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14141/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.90.24-1 on branch devel from anaconda-10.90.24-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- .cvsignore 20 Dec 2005 21:39:25 -0000 1.195 +++ .cvsignore 7 Jan 2006 04:19:18 -0000 1.196 @@ -1 +1 @@ -anaconda-10.90.23.tar.bz2 +anaconda-10.90.24.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.314 retrieving revision 1.315 diff -u -r1.314 -r1.315 --- anaconda.spec 20 Dec 2005 21:39:25 -0000 1.314 +++ anaconda.spec 7 Jan 2006 04:19:18 -0000 1.315 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.90.23 +Version: 10.90.24 Release: 1 License: GPL Summary: Graphical system installer @@ -78,6 +78,21 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri Jan 6 2006 Jeremy Katz - 10.90.24-1 +- move a11y stuff earlier +- fix the text mode progress bar (pnasrat, #176367) +- fix ppc drive unreadable warnings (#176024) +- add serbian locales (#175611) +- preserve review checkbox between combo box selections (dcantrell, #176212) +- quote ethtool args (#176918) +- various spacing cleanups (dcantrell) +- a few fixes to the group selector (dcantrell) +- don't try to make the timezone widget bigger than screen (clumens, #176025) +- fix rescue mode traceback (clumens) +- fix message wording on package retry (clumens, #155884) +- quiet debug spew in anaconda.log (clumens, #171663) +- add ppc rescue script from jkeating (#177003) + * Tue Dec 20 2005 Jeremy Katz - 10.90.23-1 - more pkgorder fixes (pnasrat) - fix some debug spew (notting) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.313 retrieving revision 1.314 diff -u -r1.313 -r1.314 --- sources 20 Dec 2005 21:39:25 -0000 1.313 +++ sources 7 Jan 2006 04:19:18 -0000 1.314 @@ -1 +1 @@ -fc4862bbcdb4ea497eaacf22a89513c0 anaconda-10.90.23.tar.bz2 +21eadd74d99c513dc1a8ce7c333c5bcf anaconda-10.90.24.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 7 04:20:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 23:20:14 -0500 Subject: rpms/kernel/FC-4 linux-2.6-posix-timers-sched_time-accumulation.patch, NONE, 1.1 kernel-2.6.spec, 1.1570, 1.1571 Message-ID: <200601070420.k074KEeu014664@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv14616 Modified Files: kernel-2.6.spec Added Files: linux-2.6-posix-timers-sched_time-accumulation.patch Log Message: Fix posix-cpu-timers sched_time accumulation. linux-2.6-posix-timers-sched_time-accumulation.patch: posix-cpu-timers.c | 13 +------------ 1 files changed, 1 insertion(+), 12 deletions(-) --- NEW FILE linux-2.6-posix-timers-sched_time-accumulation.patch --- Message-Id: <20060106.153648.27161028.davem at davemloft.net> To: linux-kernel at vger.kernel.org CC: roland at redhat.com, torvalds at osdl.org Subject: [PATCH]: Fix posix-cpu-timers sched_time accumulation From: "David S. Miller" I've spent the past 3 days digging into a glibc testsuite failure in current CVS, specifically libc/rt/tst-cputimer1.c The thr1 and thr2 timers fire too early in the second pass of this test. The second pass is noteworthy because it makes use of intervals, whereas the first pass does not. All throughout the posix-cpu-timers.c code, the calculation of the process sched_time sum is implemented roughly as: unsigned long long sum; sum = tsk->signal->sched_time; t = tsk; do { sum += t->sched_time; t = next_thread(t); } while (t != tsk); In fact this is the exact scheme used by check_process_timers(). In the case of check_process_timers(), current->sched_time has just been updated (via scheduler_tick(), which is invoked by update_process_times(), which subsequently invokes run_posix_cpu_timers()) So there is no special processing necessary wrt. that. In other contexts, we have to allot for the fact that tsk->sched_time might be a bit out of date if we are current. And the posix-cpu-timers.c code uses current_sched_time() to deal with that. Unfortunately it does so in an erroneous and inconsistent manner in one spot which is what results in the early timer firing. In cpu_clock_sample_group_locked(), it does this: cpu->sched = p->signal->sched_time; /* Add in each other live thread. */ while ((t = next_thread(t)) != p) { cpu->sched += t->sched_time; } if (p->tgid == current->tgid) { /* * We're sampling ourselves, so include the * cycles not yet banked. We still omit * other threads running on other CPUs, * so the total can always be behind as * much as max(nthreads-1,ncpus) * (NSEC_PER_SEC/HZ). */ cpu->sched += current_sched_time(current); } else { cpu->sched += p->sched_time; } The problem is the "p->tgid == current->tgid" test. If "p" is not current, and the tgids are the same, we will add the process t->sched_time twice into cpu->sched and omit "p"'s sched_time which is very very very wrong. posix-cpu-timers.c has a helper function, sched_ns(p) which takes care of this, so my fix is to use that here instead of this special tgid test. The fact that current can be one of the sub-threads of "p" points out that we could make things a little bit more accurate, perhaps by using sched_ns() on every thread we process in these loops. It also points out that we don't use the most accurate value for threads in the group actively running other cpus (and this is mentioned in the comment). But that is a future enhancement, and this fix here definitely makes sense. Signed-off-by: David S. Miller diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index cae4f57..4c68edf 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c @@ -238,18 +238,7 @@ static int cpu_clock_sample_group_locked while ((t = next_thread(t)) != p) { cpu->sched += t->sched_time; } - if (p->tgid == current->tgid) { - /* - * We're sampling ourselves, so include the - * cycles not yet banked. We still omit - * other threads running on other CPUs, - * so the total can always be behind as - * much as max(nthreads-1,ncpus) * (NSEC_PER_SEC/HZ). - */ - cpu->sched += current_sched_time(current); - } else { - cpu->sched += p->sched_time; - } + cpu->sched += sched_ns(p); break; } return 0; Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1570 retrieving revision 1.1571 diff -u -r1.1570 -r1.1571 --- kernel-2.6.spec 6 Jan 2006 23:35:06 -0000 1.1570 +++ kernel-2.6.spec 7 Jan 2006 04:20:10 -0000 1.1571 @@ -348,6 +348,7 @@ Patch1810: linux-2.6-pwc-powerup-by-default.patch Patch1820: linux-2.6-net-acenic-use-after-free.patch Patch1830: linux-2.6-smsc-ircc2-pnp.patch +Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -782,6 +783,8 @@ %patch1820 -p1 # PNP support for smsc-ircc2 %patch1830 -p1 +# Fix posix-cpu-timers sched_time accumulation +%patch1860 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1260,6 +1263,7 @@ %changelog * Fri Jan 6 2006 Dave Jones - Enable nvram driver for x86-64 +- Fix posix-cpu-timers sched_time accumulation. * Fri Jan 6 2006 Dave Jones [2.6.15-1.1823_FC4] - Reduce block layer stack usage. From fedora-cvs-commits at redhat.com Sat Jan 7 04:21:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 23:21:25 -0500 Subject: rpms/gnucash/devel gnucash-1.8.12-aq.patch, NONE, 1.1.2.1 gnucash-gmemchunk.patch, NONE, 1.1.2.1 .cvsignore, 1.12, 1.12.2.1 gnucash-1.8.6-64bit-fixes.patch, 1.1, 1.1.2.1 gnucash.spec, 1.18, 1.18.2.1 sources, 1.12, 1.12.2.1 Message-ID: <200601070421.k074LPC6015222@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15095 Modified Files: Tag: gnucash-g2-branch .cvsignore gnucash-1.8.6-64bit-fixes.patch gnucash.spec sources Added Files: Tag: gnucash-g2-branch gnucash-1.8.12-aq.patch gnucash-gmemchunk.patch Log Message: g2. warning: very not stable. gnucash-1.8.12-aq.patch: aqbanking.m4 | 36 +++++++++--------------------------- 1 files changed, 9 insertions(+), 27 deletions(-) --- NEW FILE gnucash-1.8.12-aq.patch --- --- gnucash-1.8.12/macros/aqbanking.m4.foo 2005-12-22 01:38:10.000000000 -0500 +++ gnucash-1.8.12/macros/aqbanking.m4 2005-12-22 01:43:49.000000000 -0500 @@ -49,7 +49,7 @@ /"]) for li in $lcc_dir; do - if test -x "$li/bin/aqbanking-config"; then + if test -x "$li/include/aqbanking"; then aqbanking_dir="$li"; break fi @@ -65,19 +65,19 @@ else AC_MSG_RESULT($aqbanking_dir) AC_MSG_CHECKING(for aqbanking libs) - aqbanking_libs="`$aqbanking_dir/bin/aqbanking-config --libraries`" + aqbanking_libs="`pkg-config --libs aqbanking`" AC_MSG_RESULT($aqbanking_libs) AC_MSG_CHECKING(for aqbanking C++ libs) - aqbanking_libspp="`$aqbanking_dir/bin/aqbanking-config --libraries++`" + aqbanking_libspp="`pkg-config --libs aqbanking++`" AC_MSG_RESULT($aqbanking_libspp) AC_MSG_CHECKING(for aqbanking includes) - aqbanking_includes="`$aqbanking_dir/bin/aqbanking-config --includes`" + aqbanking_includes="`pkg-config --cflags aqbanking`" AC_MSG_RESULT($aqbanking_includes) AC_MSG_CHECKING(for aqbanking plugins) - aqbanking_plugins="`$aqbanking_dir/bin/aqbanking-config --plugins`" + aqbanking_plugins="`pkg-config --variable=plugindir aqbanking`" AC_MSG_RESULT($aqbanking_plugins) AC_MSG_CHECKING(for aqbanking data) - aqbanking_data="`$aqbanking_dir/bin/aqbanking-config --data`" + aqbanking_data="`pkg-config --variable=pkgdatadir aqbanking`" AC_MSG_RESULT($aqbanking_data) fi AC_MSG_CHECKING(if aqbanking test desired) @@ -88,27 +88,9 @@ AC_MSG_RESULT($enable_aqbanking_test) AC_MSG_CHECKING(for AqBanking version >=$vma.$vmi.$vpl.$vbld) if test "$enable_aqbanking_test" != "no"; then - aqbanking_versionstring="`$aqbanking_dir/bin/aqbanking-config --vstring`.`$aqbanking_dir/bin/aqbanking-config --vbuild`" - AC_MSG_RESULT([found $aqbanking_versionstring]) - if test "$vma" -gt "`$aqbanking_dir/bin/aqbanking-config --vmajor`"; then - AC_MSG_ERROR([Your AqBanking version is way too old. - Please update from http://www.aquamaniac.de/aqbanking/]) - elif test "$vma" = "`$aqbanking_dir/bin/aqbanking-config --vmajor`"; then - if test "$vmi" -gt "`$aqbanking_dir/bin/aqbanking-config --vminor`"; then - AC_MSG_ERROR([Your AqBanking version is too old. - Please update from http://www.aquamaniac.de/aqbanking/]) - elif test "$vmi" = "`$aqbanking_dir/bin/aqbanking-config --vminor`"; then - if test "$vpl" -gt "`$aqbanking_dir/bin/aqbanking-config --vpatchlevel`"; then - AC_MSG_ERROR([Your AqBanking version is a little bit too old. - Please update from http://www.aquamaniac.de/aqbanking/]) - elif test "$vpl" = "`$aqbanking_dir/bin/aqbanking-config --vpatchlevel`"; then - if test "$vbld" -gt "`$aqbanking_dir/bin/aqbanking-config --vbuild`"; then - AC_MSG_ERROR([Your AqBanking version is a little bit too old. - Please update to the latest CVS version. Instructions for accessing - CVS can be found on http://www.aquamaniac.de/aqbanking/]) - fi - fi - fi + if ! pkg-config --atleast-version $vma.$vmi.$vpl.$vbld aqbanking; then + AC_MSG_ERROR([Your AqBanking version is too old. + Please update from http://www.aquamaniac.de/aqbanking/]) fi have_aqbanking="yes" #AC_MSG_RESULT(yes) gnucash-gmemchunk.patch: guid.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE gnucash-gmemchunk.patch --- --- gnucash/lib/libqof/qof/guid.c.foo 2005-12-22 17:13:33.000000000 -0500 +++ gnucash/lib/libqof/qof/guid.c 2005-12-22 17:17:02.000000000 -0500 @@ -27,6 +27,8 @@ #ifdef HAVE_CONFIG_H # include #endif +/* fix for glib-2.10 */ +#undef G_DISABLE_DEPRECATED #include #include Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -r1.12 -r1.12.2.1 --- .cvsignore 9 Feb 2005 20:09:09 -0000 1.12 +++ .cvsignore 7 Jan 2006 04:21:21 -0000 1.12.2.1 @@ -1,2 +1,4 @@ gnucash-1.8.11.tar.gz gnucash-docs-1.8.5.tar.gz +gnucash-docs-1.9.0.svn12279.tar.gz +gnucash-1.9.0.svn12279.tar.gz gnucash-1.8.6-64bit-fixes.patch: gnc-html.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: gnucash-1.8.6-64bit-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash-1.8.6-64bit-fixes.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- gnucash-1.8.6-64bit-fixes.patch 9 Sep 2004 05:47:58 -0000 1.1 +++ gnucash-1.8.6-64bit-fixes.patch 7 Jan 2006 04:21:21 -0000 1.1.2.1 @@ -9,25 +9,3 @@ gpointer user_data) { FILE *fh = (FILE *) user_data; ---- gnucash-1.8.8/aclocal.m4.cow 2004-03-12 17:36:40.478189512 -0500 -+++ gnucash-1.8.8/aclocal.m4 2004-03-12 17:37:23.728614448 -0500 -@@ -3304,7 +3304,7 @@ - # This must be Linux ELF. - linux-gnu*) - case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) -+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | x86_64* | s390* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM ---- gnucash-1.8.8/acinclude.m4.cow 2004-03-12 17:36:51.352536360 -0500 -+++ gnucash-1.8.8/acinclude.m4 2004-03-12 17:37:10.250663408 -0500 -@@ -3374,7 +3374,7 @@ - # This must be Linux ELF. - linux-gnu*) - case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) -+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | x86_64* | s390* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.18 retrieving revision 1.18.2.1 diff -u -r1.18 -r1.18.2.1 --- gnucash.spec 9 Dec 2005 22:40:46 -0000 1.18 +++ gnucash.spec 7 Jan 2006 04:21:21 -0000 1.18.2.1 @@ -1,23 +1,28 @@ -%define docver 1.8.5 +%define docver 1.9.0.svn12279 + +%define svnrev 12279 Name: gnucash Summary: GnuCash is an application to keep track of your finances. -Version: 1.8.11 -Release: 4.1 +Version: 1.9.0 +Release: 0.svn%{svnrev}.1 License: GPL/GFDL Group: Applications/Productivity -Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz -Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz +#Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz +#Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz +Source: gnucash-%{version}.svn%{svnrev}.tar.bz2 +Source1: gnucash-docs-%{docver}.tar.bz2 +Patch: gnucash-gmemchunk.patch Patch3: gnucash-1.8.11-icon.patch Patch4: gnucash-1.8.6-64bit-fixes.patch +Patch5: gnucash-1.8.12-aq.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: g-wrap-devel >= 1.3.2, gtkhtml-devel >= 1.1.4, -BuildPrereq: Guppi-devel, gal-devel, libxml-devel, db4-devel -BuildPrereq: libglade-devel, libghttp-devel, python-devel, libtermcap-devel -BuildPrereq: readline-devel postgresql-devel /usr/bin/autoconf-2.13 -BuildPrereq: libofx-devel, aqhbci-devel, docbook-style-xsl -BuildPrereq: libtool-ltdl-devel, GConf-devel -BuildRequires: desktop-file-utils, scrollkeeper +BuildPrereq: g-wrap-devel >= 1.3.2, gtkhtml3-devel +BuildPrereq: postgresql-devel, libgsf-devel >= 1.12.2 +# cairo-devel >= 0.5.0 +BuildPrereq: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0 +BuildPrereq: libofx-devel, aqbanking-devel, docbook-style-xsl +BuildRequires: desktop-file-utils, scrollkeeper texinfo Requires: slib >= 3a1-5 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4 %define __perl_requires %{nil} @@ -42,21 +47,23 @@ (recommended for large volumes of data and commercial sites). %prep -%setup -q -a 1 -%patch3 -p1 -b .icon +%setup -q -n gnucash -a 1 +%patch -p1 +#%patch3 -p1 -b .icon %patch4 -p1 -b .64bit +%patch5 -p1 -b .aq %build -autoconf-2.13 -cp %{_datadir}/libtool/config.{sub,guess} . +./autogen.sh --prefix=/usr %configure --enable-sql --enable-error-on-warning=no \ --enable-ofx \ - --enable-hbci + --enable-hbci \ +# --with-cairo \ -make LIBTOOL=/usr/bin/libtool +make LIBTOOL=/usr/bin/libtool CC=gcc -cd gnucash-docs-%{docver} -autoconf-2.13 +cd gnucash-docs +./autogen.sh --prefix=/usr %configure make @@ -67,7 +74,7 @@ %find_lang %{name} -cd gnucash-docs-%{docver} +cd gnucash-docs make install DESTDIR=$RPM_BUILD_ROOT || : # vfolder desktop file install stuff @@ -85,7 +92,9 @@ $RPM_BUILD_ROOT/%{_datadir}/aclocal \ $RPM_BUILD_ROOT/var/scrollkeeper \ $RPM_BUILD_ROOT/%{_libdir}/lib*.a \ - $RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a + $RPM_BUILD_ROOT/%{_libdir}/gnucash/lib*.a \ + $RPM_BUILD_ROOT/%{_datadir}/gnome/apps \ + $RPM_BUILD_ROOT/%{_libdir}/pkgconfig %clean rm -rf $RPM_BUILD_ROOT @@ -94,22 +103,33 @@ /sbin/ldconfig /usr/bin/scrollkeeper-update -o %{_datadir}/omf/gnucash-docs +export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) +SCHEMAS="apps_gnucash_dialog_business_common.schemas apps_gnucash_dialog_commodities.schemas apps_gnucash_dialog_common.schemas apps_gnucash_dialog_hbci.schemas apps_gnucash_dialog_prices.schemas apps_gnucash_dialog_reconcile.schemas apps_gnucash_dialog_totd.schemas apps_gnucash_general.schemas apps_gnucash_history.schemas apps_gnucash_import_generic_matcher.schemas apps_gnucash_warnings.schemas apps_gnucash_window_pages_account_tree.schemas apps_gnucash_window_pages_register.schemas" + +for S in $SCHEMAS; do + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null +done + %postun /sbin/ldconfig /usr/bin/scrollkeeper-update %files -f %{name}.lang %defattr(-,root,root,755) +%{_sysconfdir}/gconf/schemas/* +%{_sysconfdir}/gnucash %{_bindir}/* %{_libexecdir}/gnucash %{_libdir}/* %exclude /usr/lib/debug -%exclude %{_libdir}/gnucash/libgncmod-backend-postgres* +%exclude %{_libdir}/libgnc-backend-postgres* +%{_datadir}/xml/* %{_datadir}/gnucash %{_datadir}/gnome/help/gnucash %{_datadir}/mime-info/gnucash.* %{_datadir}/omf/gnucash-docs -%{_datadir}/pixmaps/gnucash +%{_datadir}/pixmaps/goffice +%{_datadir}/goffice %{_datadir}/applications/* %{_mandir}/man*/* %config %{_sysconfdir}/gnucash @@ -119,9 +139,15 @@ %files backend-postgres %defattr(-,root,root) %doc src/backend/postgres/README -%{_libdir}/gnucash/libgncmod-backend-postgres* +%{_libdir}/libgnc-backend-postgres* %changelog +* Sat Dec 24 2005 Bill Nottingham 1.9.0-0.12168.1 +- update to 2.x branch + +* Thu Dec 22 2005 Bill Nottingham 1.8.12-1 +- update to 1.8.12 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/sources,v retrieving revision 1.12 retrieving revision 1.12.2.1 diff -u -r1.12 -r1.12.2.1 --- sources 9 Feb 2005 20:09:09 -0000 1.12 +++ sources 7 Jan 2006 04:21:21 -0000 1.12.2.1 @@ -1,2 +1,2 @@ -62f94331936e37ed1b1d28b5a1863bb3 gnucash-1.8.11.tar.gz -9758d8e523530c2509912761e327a9d5 gnucash-docs-1.8.5.tar.gz +d8e816b84ec5c58e4e7b45e8f39d5573 gnucash-docs-1.9.0.svn12279.tar.gz +a585938158130ca5432e05be165982bd gnucash-1.9.0.svn12279.tar.gz From fedora-cvs-commits at redhat.com Sat Jan 7 04:23:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 23:23:01 -0500 Subject: rpms/gnucash/devel gnucash.spec,1.18.2.1,1.18.2.2 Message-ID: <200601070423.k074N117016003@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15964 Modified Files: Tag: gnucash-g2-branch gnucash.spec Log Message: oops Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.18.2.1 retrieving revision 1.18.2.2 diff -u -r1.18.2.1 -r1.18.2.2 --- gnucash.spec 7 Jan 2006 04:21:21 -0000 1.18.2.1 +++ gnucash.spec 7 Jan 2006 04:22:58 -0000 1.18.2.2 @@ -10,8 +10,8 @@ Group: Applications/Productivity #Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz #Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz -Source: gnucash-%{version}.svn%{svnrev}.tar.bz2 -Source1: gnucash-docs-%{docver}.tar.bz2 +Source: gnucash-%{version}.svn%{svnrev}.tar.gz +Source1: gnucash-docs-%{docver}.tar.gz Patch: gnucash-gmemchunk.patch Patch3: gnucash-1.8.11-icon.patch Patch4: gnucash-1.8.6-64bit-fixes.patch From fedora-cvs-commits at redhat.com Sat Jan 7 04:27:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 23:27:10 -0500 Subject: rpms/kernel/devel/configs config-powerpc64-iseries,1.6,1.6.2.1 Message-ID: <200601070427.k074RApH017930@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv17851/configs Modified Files: Tag: private-fc5-test2-branch config-powerpc64-iseries Log Message: hush iseries. Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v retrieving revision 1.6 retrieving revision 1.6.2.1 diff -u -r1.6 -r1.6.2.1 --- config-powerpc64-iseries 6 Jan 2006 07:37:03 -0000 1.6 +++ config-powerpc64-iseries 7 Jan 2006 04:27:07 -0000 1.6.2.1 @@ -67,3 +67,6 @@ # CONFIG_ISDN is not set # CONFIG_IEEE80211 is not set +# CONFIG_DVB is not set +# CONFIG_VIDEO_DEV is not set + From fedora-cvs-commits at redhat.com Sat Jan 7 04:36:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 6 Jan 2006 23:36:05 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.196, 1.197 anaconda.spec, 1.315, 1.316 sources, 1.314, 1.315 Message-ID: <200601070436.k074a5C8020005@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19952/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.90.25-1 on branch devel from anaconda-10.90.25-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- .cvsignore 7 Jan 2006 04:19:18 -0000 1.196 +++ .cvsignore 7 Jan 2006 04:36:02 -0000 1.197 @@ -1 +1 @@ -anaconda-10.90.24.tar.bz2 +anaconda-10.90.25.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.315 retrieving revision 1.316 diff -u -r1.315 -r1.316 --- anaconda.spec 7 Jan 2006 04:19:18 -0000 1.315 +++ anaconda.spec 7 Jan 2006 04:36:02 -0000 1.316 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.90.24 +Version: 10.90.25 Release: 1 License: GPL Summary: Graphical system installer @@ -78,6 +78,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri Jan 6 2006 Jeremy Katz - 10.90.25-1 +- no sr at Latn yet since the po files haven't been added + * Fri Jan 6 2006 Jeremy Katz - 10.90.24-1 - move a11y stuff earlier - fix the text mode progress bar (pnasrat, #176367) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.314 retrieving revision 1.315 diff -u -r1.314 -r1.315 --- sources 7 Jan 2006 04:19:18 -0000 1.314 +++ sources 7 Jan 2006 04:36:02 -0000 1.315 @@ -1 +1 @@ -21eadd74d99c513dc1a8ce7c333c5bcf anaconda-10.90.24.tar.bz2 +0862dbdef8fba0269368362ff0effb48 anaconda-10.90.25.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 7 05:19:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 7 Jan 2006 00:19:00 -0500 Subject: rpms/gnucash/devel gnucash.spec, 1.18.2.2, 1.18.2.3 gnucash-gmemchunk.patch, 1.1.2.1, NONE Message-ID: <200601070519.k075J0dJ006368@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5898 Modified Files: Tag: gnucash-g2-branch gnucash.spec Removed Files: Tag: gnucash-g2-branch gnucash-gmemchunk.patch Log Message: remove patch, fixed upstream Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.18.2.2 retrieving revision 1.18.2.3 diff -u -r1.18.2.2 -r1.18.2.3 --- gnucash.spec 7 Jan 2006 04:22:58 -0000 1.18.2.2 +++ gnucash.spec 7 Jan 2006 05:18:51 -0000 1.18.2.3 @@ -12,7 +12,6 @@ #Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz Source: gnucash-%{version}.svn%{svnrev}.tar.gz Source1: gnucash-docs-%{docver}.tar.gz -Patch: gnucash-gmemchunk.patch Patch3: gnucash-1.8.11-icon.patch Patch4: gnucash-1.8.6-64bit-fixes.patch Patch5: gnucash-1.8.12-aq.patch @@ -48,7 +47,6 @@ %prep %setup -q -n gnucash -a 1 -%patch -p1 #%patch3 -p1 -b .icon %patch4 -p1 -b .64bit %patch5 -p1 -b .aq --- gnucash-gmemchunk.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 7 06:15:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 7 Jan 2006 01:15:00 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1826.2.4,1.1826.2.5 Message-ID: <200601070615.k076F0sn015523@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15430 Modified Files: Tag: private-fc5-test2-branch kernel-2.6.spec Log Message: stfu iseries. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.4 retrieving revision 1.1826.2.5 diff -u -r1.1826.2.4 -r1.1826.2.5 --- kernel-2.6.spec 7 Jan 2006 04:16:53 -0000 1.1826.2.4 +++ kernel-2.6.spec 7 Jan 2006 06:14:57 -0000 1.1826.2.5 @@ -1421,6 +1421,9 @@ %endif %changelog +* Sat Jan 7 2006 Dave Jones +- Silence some iseries build warnings. + * Fri Jan 6 2006 Dave Jones - Branch CVS for test2. - Add timer quirk for ATI chipsets. From fedora-cvs-commits at redhat.com Sat Jan 7 06:15:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 7 Jan 2006 01:15:00 -0500 Subject: rpms/kernel/devel/configs config-powerpc64-iseries,1.6.2.1,1.6.2.2 Message-ID: <200601070615.k076F0xe015533@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv15430/configs Modified Files: Tag: private-fc5-test2-branch config-powerpc64-iseries Log Message: stfu iseries. Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v retrieving revision 1.6.2.1 retrieving revision 1.6.2.2 diff -u -r1.6.2.1 -r1.6.2.2 --- config-powerpc64-iseries 7 Jan 2006 04:27:07 -0000 1.6.2.1 +++ config-powerpc64-iseries 7 Jan 2006 06:14:57 -0000 1.6.2.2 @@ -69,4 +69,6 @@ # CONFIG_DVB is not set # CONFIG_VIDEO_DEV is not set +# CONFIG_SND_FM801_TEA575X is not set +# CONFIG_IEEE1394 is not set From fedora-cvs-commits at redhat.com Sat Jan 7 15:59:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 7 Jan 2006 10:59:28 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1554.2.1,1.1554.2.2 Message-ID: <200601071559.k07FxSSc016839@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16803 Modified Files: Tag: private-linville-netdev-fc4-7-branch kernel-2.6.spec Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1554.2.1 retrieving revision 1.1554.2.2 diff -u -r1.1554.2.1 -r1.1554.2.2 --- kernel-2.6.spec 6 Jan 2006 22:45:20 -0000 1.1554.2.1 +++ kernel-2.6.spec 7 Jan 2006 15:59:25 -0000 1.1554.2.2 @@ -2142,7 +2142,7 @@ %patch20205 -p1 # [DECNET]: Remove some redundant ifdeffed code %patch20206 -p1 -# [NET]: Wider use of for_each_\1cpu() +# [NET]: Wider use of for_each_\*cpu() %patch20207 -p1 # [PKTGEN]: Sleeping function called under lock %patch20208 -p1 @@ -2176,7 +2176,7 @@ %patch20222 -p1 # RPC: Ensure that nobody can queue up new upcalls after rpc_close_pipes() %patch20223 -p1 -# gfp_t: net/\1 +# gfp_t: net/\* %patch20224 -p1 # gfp_t: drivers/net %patch20225 -p1 @@ -2456,7 +2456,7 @@ %patch20362 -p1 # bnx2: update version and minor fixes %patch20363 -p1 -# Remove linux/version.h include from drivers/net/phy/\1 and net/ieee80211/\1. +# Remove linux/version.h include from drivers/net/phy/\* and net/ieee80211/\*. %patch20364 -p1 # [netdrvr] fac_8xx build fix %patch20365 -p1 @@ -2474,7 +2474,7 @@ %patch20371 -p1 # 3c59x: convert to use of pci_iomap API %patch20372 -p1 -# 3c59x: cleanup of mdio_read routines to use MII_\1 macros +# 3c59x: cleanup of mdio_read routines to use MII_\* macros %patch20373 -p1 # 3c59x: avoid blindly reading link status twice %patch20374 -p1 @@ -3182,7 +3182,7 @@ %patch20725 -p1 # s2io: __iomem annotations for recent changes %patch20726 -p1 -# Address of void __user 0036-sky2-new-experimental-Marvell-Yukon2-driver.txt 0072-8139cp-support-ETHTOOL_GPERMADDR.txt 0073-8139too-support-ETHTOOL_GPERMADDR.txt 0074-b44-support-ETHTOOL_GPERMADDR.txt 0075-e1000-support-ETHTOOL_GPERMADDR.txt 0076-e100-support-ETHTOOL_GPERMADDR.txt 0077-forcedeth-support-ETHTOOL_GPERMADDR.txt 0078-ixgb-support-ETHTOOL_GPERMADDR.txt 0079-ne2k-pci-support-ETHTOOL_GPERMADDR.txt 0080-pcnet32-support-ETHTOOL_GPERMADDR.txt 0081-r8169-support-ETHTOOL_GPERMADDR.txt 0082-skge-support-ETHTOOL_GPERMADDR.txt 0083-sundance-support-ETHTOOL_GPERMADDR.txt 0084-via-rhine-support-ETHTOOL_GPERMADDR.txt 0087-Replace-drivers-net-wan-custom-ctype-macros-with-standard-ones.txt 0088-drivers-net-wan-possible-cleanups.txt 0089-lne390-bogus-casts.txt 0090-C99-initializers-in-ray_cs.c.txt 0091-mii-Add-test-for-GigE-support.txt 0092-Add-rapidio-net-driver.txt 0100-pcnet32-set_ringparam-implementation.txt 0101-pcnet32-set-min-ring-size-to-4.txt 0102-sky2-driver-update.t! xt 0103-orinoco-Remove-conditionals-that-are-useless-in-the-kernel-drivers.txt 0104-orinoco-Don-t-include-net-ieee80211.h-twice.txt 0105-orinoco-Update-PCMCIA-ID-s.txt 0106-Fixed-some-endian-issues-with-802.11-header-usage-in-ieee80211_rx.c.txt 0107-ieee80211-quality-scaling-algorithm-extension-handler.txt 0108-ieee80211-Added-wireless-spy-support.txt 0109-Changed-802.11-headers-to-use-ieee80211_info_element-0.txt 0110-ieee80211-Removed-ieee80211_info_element_hdr.txt 0111-ieee80211-Cleanup-memcpy-parameters.txt 0112-ieee80211-Switched-to-sscanf-in-store_debug_level.txt 0113-ieee80211-Fixed-type-o-of-abg_ture-abg_true.txt 0114-Updated-ipw2200-to-compile-with-ieee80211-abg_ture-to-abg_true-change.txt 0163-sky2-fix-FIFO-DMA-alignment-problems.txt 0164-sky2-allow-ethtool-debug-access-to-all-of-PCI-space.txt 0165-sky2-version-0.5.txt 0166-ieee80211-Updated-ipw2100-to-be-compatible-with-ieee80211_hdr-changes.txt 0167-ieee80211-Updated-ipw2100-to-be-compatible-with-ieee80211-s-hard! _start_xmit-change.txt 0168-ieee80211-Updated-ipw2200-to-be-c! ompatibl e-with-ieee80211_hdr-changes.txt 0169-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0170-ieee80211-Updated-atmel-to-be-compatible-with-ieee80211_hdr-changes.txt 0171-ieee80211-Fixed-a-kernel-oops-on-module-unload.txt 0172-ieee80211-Hardware-crypto-and-fragmentation-offload-support.txt 0173-ieee80211-Fix-time-calculation-switching-to-use-jiffies_to_msecs.txt 0174-ieee80211-Fix-kernel-Oops-when-module-unload.txt 0175-ieee80211-Allow-drivers-to-fix-an-issue-when-using-wpa_supplicant-with-WEP.txt 0176-ieee82011-Added-WE-18-support-to-default-wireless-extension-handler.txt 0177-ieee80211-Renamed-ieee80211_hdr-to-ieee80211_hdr_3addr.txt 0178-ieee80211-adds-support-for-the-creation-of-RTS-packets.txt 0179-ieee82011-Added-ieee80211_tx_frame-to-convert-generic-802.11-data-frames-and-callbacks.txt 0180-ieee80211-Fix-TKIP-repeated-fragmentation-problem-and-payload_size-reporting.txt 0181-ieee80211-Return-NETDEV_TX_BUSY-when-QoS-buffer-full.txt 0! 182-ieee80211-Add-QoS-WME-support-to-the-ieee80211-subsystem.txt 0183-ieee80211-Added-ieee80211_geo-to-provide-helper-functions.txt 0184-ieee80211-Added-ieee80211_radiotap.h.txt 0185-ieee80211-Additional-fixes-for-endian-aware-types.txt 0186-ieee80211-extern-inline-to-static-inline.txt 0187-ieee80211-Type-o-capbility-definition-for-QoS-and-ERP-parsing.txt 0188-ieee80211-Mixed-PTK-GTK-CCMP-TKIP-support.txt 0189-ieee80211-Keep-auth-mode-unchanged-after-iwconfig-key-off-on-cycle.txt 0190-ieee80211-Updated-copyright-dates.txt 0191-ieee80211-Updated-hostap-to-be-compatible-with-ieee80211_hdr-changes.txt 0192-ieee80211-Updated-hostap-to-be-compatible-with-extra_prefix_len-changes.txt 0193-ieee82011-Remove-WIRELESS_EXT-ifdefs.txt 0194-forcedeth-add-hardware-tx-checksumming.txt 0199-ieee80211-Added-subsystem-version-string-and-reporting-via-MODULE_VERSION.txt 0200-ieee80211-Added-handle_deauth-callback-enhanced-tkip-ccmp-support-of-varying-hw-sw-offload.txt 0201-ieee80211-added-IE-c! omments-reason_code-to-reason-removed-info_element-from-ieee8! 0211_dis assoc.txt 0202-ieee80211-in-tree-driver-updates-to-sync-with-latest-ieee80211-series.txt 0203-ieee80211-update-orinoco-wl3501-drivers-for-latest-struct-naming.txt 0216-orinoco-Remove-inneeded-system-includes.txt 0217-orinoco-Make-nortel_pci_hw_init-static.txt 0218-orinoco-Fix-memory-leak-and-unneeded-unlock-in-orinoco_join_ap.txt 0219-orinoco-orinoco_send_wevents-could-return-without-unlocking.txt 0220-orinoco-Remove-unneeded-forward-declarations.txt 0221-orinoco-Annotate-endianess-of-variables-and-structure-members.txt 0222-orinoco-Read-only-needed-data-in-__orinoco_ev_txexc.txt 0223-orinoco-Bump-version-to-0.15rc3.txt 0227-RPC-Report-connection-errors-properly-when-mounting-with-soft.txt 0228-RPC-proper-soft-timeout-behavior-for-rpcbind.txt 0229-NFS-use-a-constant-value-for-TCP-retransmit-timeouts.txt 0230-RPC-portmapper-doesn-t-need-a-reserved-port.txt 0231-RPC-extract-socket-logic-common-to-both-client-and-server.txt 0232-RPC-introduce-client-side-transport-switch.txt 02! 33-RPC-transport-switch-function-naming.txt 0234-RPC-Reduce-stack-utilization-in-xs_sendpages.txt 0235-RPC-Rename-sock_lock.txt 0236-RPC-Rename-xprt_lock.txt 0237-RPC-rename-the-sockstate-field.txt 0238-RPC-Eliminate-socket.h-includes-in-RPC-client.txt 0239-RPC-Add-helper-for-waking-tasks-pending-on-a-transport.txt 0240-RPC-client-side-transport-switch-cleanup.txt 0241-RPC-separate-TCP-and-UDP-write-space-callbacks.txt 0242-RPC-separate-TCP-and-UDP-transport-connection-logic.txt 0243-RPC-separate-TCP-and-UDP-socket-write-paths.txt 0244-RPC-skip-over-transport-specific-heads-automatically.txt 0245-RPC-get-rid-of-xprt-stream.txt 0246-RPC-add-API-to-set-transport-specific-timeouts.txt 0247-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0248-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0249-RPC-separate-xprt_timer-implementations.txt 0250-RPC-add-generic-interface-for-adjusting-the-congestion-window.txt 0251-RPC-add-a-release_rqst-callout-to-the-RPC-t! ransport-switch.txt 0252-RPC-remove-xprt-nocong.txt 0253-RPC-! clean-up -after-nocong-was-removed.txt 0254-RPC-allow-RPC-client-s-port-range-to-be-adjustable.txt 0255-RPC-make-sure-to-get-the-same-local-port-number-when-reconnecting.txt 0256-RPC-parametrize-various-transport-connect-timeouts.txt 0257-RPC-rationalize-set_buffer_size.txt 0258-RPC-NFS-new-rpc_pipefs-patch.txt 0260-Revert-PATCH-RPC-NFS-new-rpc_pipefs-patch.txt 0262-SUNRPC-fix-bug-in-patch-portmapper-doesn-t-need-a-reserved-port.txt 0266-netdrvr-gianfar-use-new-phy-layer.txt 0267-netdrvr-delete-CONFIG_PHYCONTROL.txt 0268-hostap-Fix-pci_driver-name-for-hostap_plx-and-hostap_pci.txt 0269-hostap-Add-support-for-WE-19.txt 0270-hostap-Use-GFP_ATOMIC-to-get-rid-of-weird-might_sleep-issue.txt 0271-hostap-Remove-iwe_stream_add_event-kludge.txt 0272-Remove-WIRELESS_EXT-ifdefs-from-several-wireless-drivers.txt 0273-wireless-airo-remove-needed-dma_addr_t-obfuscation.txt 0312-sky2-changing-mtu-doesn-t-have-to-reset-link.txt 0313-sky2-cleanup-interrupt-processing.txt 0314-sky2-add-hardware-VLAN-a! cceleration-support.txt 0315-sky2-explicit-set-power-state.txt 0316-sky2-version-0.6.txt 0317-sky2-nway-reset-BONUS-FEATURE.txt 0323-This-patch-fixes-a-typo-in-ieee80211.h-ieee82011_deauth-ieee80211_deauth.txt 0346-This-will-move-the-ieee80211_is_ofdm_rate-function-to-the-ieee80211.h.txt 0348-Currently-the-info_element-is-parsed-by-2-seperate-functions-this.txt 0349-When-an-assoc_resp-is-received-the-network-structure-is-not-completely.txt 0350-Lindent-and-trailing-whitespace-script-executed-ieee80211-subsystem.txt 0356-hostap-Remove-hw-specific-dev_open-close-handlers.txt 0357-hostap-Fix-hostap_pci-build-with-PRISM2_IO_DEBUG.txt 0358-hostap-Do-not-free-local-hw_priv-before-unregistering-netdev.txt 0359-hostap-Unregister-netdevs-before-freeing-local-data.txt 0366-S2io-MSI-MSI-X-support-runtime-configurable.txt 0367-e1000-Support-for-82571-and-82572-controllers.txt 0368-e1000-multi-queue-defines-modification-to-data-structures.txt 0369-e1000-implementation-of-the-multi-queue-! feature.txt 0370-e1000-Enable-custom-configuration-bits-for-8! 2571-2-c ontrollers.txt 0371-e1000-Fixes-for-packet-split-related-issues.txt 0372-e1000-Added-msleep_interruptible-delay.txt 0373-e1000-Flush-shadow-RAM.txt 0374-e1000-fix-warnings.txt 0375-AX.25-Delete-debug-printk-from-mkiss-driver.txt 0376-AX.25-Convert-mkiss.c-to-DEFINE_RWLOCK.txt 0377-airo-fix-resume.txt 0378-s2io-change-strncpy-length-arg-to-use-size-of-target.txt 0379-netdrvr-s2io-Add-a-MODULE_VERSION-entry.txt 0380-bonding-replicate-IGMP-traffic-in-activebackup-mode.txt 0381-sky2-add-permanent-address-support.txt 0383-wireless-ipw2200-remove-redundant-return-statement.txt 0546-S2io-Offline-diagnostics-fixes.txt 0547-rcu-in-bpqether-driver.txt 0548-SMACK-support-for-mkiss.txt 0549-Initialize-the-.owner-field-the-tty_ldisc-structure.txt 0555-SUNRPC-Retry-rpcbind-requests-if-the-server-s-portmapper-isn-t-up.txt 0556-RPC-allow-call_encode-to-delay-transmission-of-an-RPC-call.txt 0575-ieee80211-division-by-zero-fix.txt 0577-sb1250-mac-Check-the-actual-setting-for-reporting-hw-chec! ksumming.txt 0578-sb1250-mac-Ensure-16-byte-alignment-of-the-descriptor-ring.txt 0579-au1000_eth-Misc-Au1000-net-driver-fixes.txt 0580-de2104x-Resurrect-Cobalt-support-for-2.6.txt 0581-sgiseeq-Fix-resource-handling.txt 0582-sgiseeq-Configure-PIO-and-DMA-timing-requests.txt 0583-declance-Convert-to-irqreturn_t.txt 0584-declance-Fix-mapping-of-device.txt 0585-declance-Deal-with-the-bloody-KSEG-vs-CKSEG-horror.txt 0586-declance-Use-physical-addresses-at-the-interface-level.txt 0587-ne-Support-for-RBHMA4500-eval-board.txt 0588-mipsnet-Virtual-ethernet-driver-for-MIPSsim.txt 0589-e1000_intr-build-fix.txt 0590-s2io-build-fix.txt 0592-via-rhine-change-mdelay-to-msleep-and-remove-from-ISR-path.txt 0593-epic100-fix-counting-of-work_done-in-epic_poll.txt 0596-bonding-cleanup-comment-for-mode-1-IGMP-xmit-hack.txt 0597-b44-alternate-allocation-option-for-DMA-descriptors.txt 0598-orinoco-remove-redundance-skb-length-check-before-padding.txt 0599-sundance-remove-if-1-.-block-in-sundance_p! robe1.txt 0600-sundance-expand-reset-mask.txt 0601-e1000-buil! d-fix.tx t 0603-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0606-SUNRPC-Add-support-for-privacy-to-generic-gss-api-code.txt 0607-SUNRPC-Provide-a-callback-to-allow-free-pages-allocated-during-xdr-encoding.txt 0608-SUNRPC-Retry-wrap-in-case-of-memory-allocation-failure.txt 0609-RPCSEC_GSS-cleanup-au_rslack-calculation.txt 0610-RPCSEC_GSS-client-side-privacy-support.txt 0611-RPCSEC_GSS-Simplify-rpcsec_gss-crypto-code.txt 0612-RPCSEC_GSS-krb5-pre-privacy-cleanup.txt 0613-RPCSEC_GSS-Add-support-for-privacy-to-krb5-rpcsec_gss-mechanism.txt 0614-RPCSEC_GSS-remove-all-qop-parameters.txt 0615-RPCSEC_GSS-krb5-cleanup.txt 0622-Fixed-problem-with-not-being-able-to-decrypt-encrypt-broadcast-packets.txt 0631-sb1250-mac-Get-rid-of-all-the-funny-SBMAC_WRITECSR-and-SBMAC_READCSR-macros.txt 0632-sb1250-mac-Whitespace-cleanup.txt 0645-sundance-include-MII-address-0-in-PHY-probe.txt 0646-e1000-Driver-version-white-space-comments-device-id-other.txt 0647-Fixed-oops-if-an-uninitialized! -key-is-used-for-encryption.txt 0652-sb1250-mac-PHY-probing-fixes.txt 0670-ieee80211-subsystem.txt 0671-Update-version-ieee80211-stamp-to-1.1.6.txt 0675-PARISC-Change-the-driver-names-so-sys-bus-parisc-drivers-looks-better.txt 0676-PARISC-Convert-parisc_device-to-use-struct-resource-for-hpa.txt 0714-PARISC-Add-NETPOLL-support-to-lasi_82596.txt 0771-DECNET-Remove-some-redundant-ifdeffed-code.txt 0772-NET-Wider-use-of-for_each_-cpu.txt 0773-PKTGEN-Sleeping-function-called-under-lock.txt 0774-PKTGEN-Use-kzalloc.txt 0775-PKTGEN-Spelling-and-white-space.txt 0776-PKTGEN-proc-interface-revision.txt 0777-NETFILTER-ip_conntrack-Make-hashsize-conntrack-parameter-writable.txt 0778-IPV4-Kill-redundant-rcu_dereference-on-fa_info.txt 0779-IPSEC-Kill-obsolete-get_mss-function.txt 0780-NETLINK-Remove-dead-code-in-af_netlink.c.txt 0781-IPV4-Remove-dead-code-from-ip_output.c.txt 0782-SK_BUFF-kernel-doc-fix-skbuff-warnings.txt 0783-AX.25-Use-constant-instead-of-magic-number.txt 0784-IPV4-Fix-s! etting-broadcast-for-SIOCSIFNETMASK.txt 0785-netdrvr-forcedet! h-scatte r-gather-and-segmentation-offload-support.txt 0786-ieee80211-build-fix.txt 0834-Revert-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0855-RPC-Ensure-that-nobody-can-queue-up-new-upcalls-after-rpc_close_pipes.txt 0931-gfp_t-net.txt 0952-gfp_t-drivers-net.txt 0957-ARM-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 0963-ARM-2897-2-PXA2xx-IRDA-support.txt 0971-sky2-remove-unused-definitions.txt 0972-sky2-use-kzalloc.txt 0973-sky2-spelling-fixes.txt 0974-sky2-fix-NAPI-and-receive-handling.txt 0975-sky2-version-0.7.txt 1029-DRIVER-MODEL-Get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.txt 1037-Bluetooth-Make-more-functions-static.txt 1038-Bluetooth-Update-security-filter-for-Extended-Inquiry-Response.txt 1043-IPv4-IPv6-UFO-Scatter-gather-approach.txt 1044-MCAST-IPv6-Fix-algorithm-to-compute-Querier-s-Query-Interval.txt 1055-tg3-add-5714-5715-support.txt 1056-tg3-fix-ASF-heartbeat.txt 1057-tg3-update-version-and-minor-fixes.txt 10! 58-ibmveth-fix-bonding.txt 1059-ibmveth-fix-buffer-pool-management.txt 1060-ibmveth-fix-buffer-replenishing.txt 1061-ibmveth-lockless-TX.txt 1062-ibmveth-fix-failed-addbuf.txt 1063-pcnet_cs-fix-mii-init-code-for-older-DL10019-based-cards.txt 1065-s2io-kconfig-help-fix.txt 1066-b44-reports-wrong-advertised-flags.txt 1067-sis190.c-fix-multicast-MAC-filter.txt 1068-smc91x-shut-down-power-after-probing.txt 1070-starfire-free_irq-on-error-path-of-netdev_open.txt 1073-netdrvr-b44-include-linux-dma-mapping.h-to-eliminate-warning.txt 1074-sundance-fix-DFE-580TX-Tx-Underrun.txt 1075-New-PowerPC-4xx-on-chip-ethernet-controller-driver.txt 1078-sis900-come-alive-after-temporary-memory-shortage.txt 1079-Add-Wake-on-LAN-support-to-sis900-2.txt 1080-drivers-net-Remove-pointless-checks-for-NULL-prior-to-calling-kfree.txt 1082-netdrvr-ne2k-pci-based-card-does-not-support-bus-mastering.txt 1083-ipw2200-Missing-kmalloc-check.txt 1159-SCTP-Rename-SCTP-specific-control-message-flags.txt 1163-SCT! P-Fix-SCTP_SETADAPTION-sockopt-to-use-the-correct-structure.t! xt 1164- SCTP-Allow-SCTP_MAXSEG-to-revert-to-default-frag-point-with-a-0-value.txt 1196-SCTP-Do-not-allow-unprivileged-programs-initiating-new-associations-on.txt 1200-e1000-remove-warning-about-e1000_suspend.txt 1201-eepro.c-module_param_array-cleanup.txt 1202-b44-fix-suspend-resume.txt 1203-e1000-use-vmalloc_node.txt 1204-revert-orinoco-Information-leakage-due-to-incorrect-padding.txt 1205-Better-fixup-for-the-orinoco-driver.txt 1206-e1000-Fixes-e1000_suspend-warning-when-CONFIG_PM-is-not-enabled.txt 1320-ETH-ether-address-compare.txt 1324-Add-modalias-for-pmac-network-drivers.txt 1328-mv643xx_eth_showsram-Added-information-message-when-using-the-SRAM.txt 1329-IPV4-Fix-issue-reported-by-Coverity-in-ipv4-fib_frontend.c.txt 1389-s2io-iomem-annotations.txt 1397-bluetooth-hidp-is-broken-on-s390.txt 1403-drivers-net-tg3-Use-the-DMA_-32-64-BIT_MASK-constants.txt 1405-prism54-Free-skb-after-disabling-interrupts.txt 1748-DRIVER-MODEL-Add-missing-platform_device.h-header.txt 1749-PPC-44x-EM! AC-driver-add-440SPe-support.txt 1750-PPC-44x-EMAC-driver-add-440GR-support.txt 1751-PPC-4xx-EMAC-driver-fix-VSC8201-PHY-initialization.txt 1754-fec_8xx-Remove-dependency-on-NETTA-NETPHONE.txt 1755-fec_8xx-Add-support-for-Intel-PHY-LX971.txt 1761-vmalloc_node.txt 1854-ARM-3066-1-Fix-PXA-irda-driver-suspend-resume-functions.txt 1920-m32r-SMC91x-driver-update.txt 1929-smsc-ircc2-PM-cleanup-do-not-close-device-when-suspending.txt 1941-remove-some-more-check_region-stuff.txt 1961-Typo-fix-dot-after-newline-in-printk-strings.txt 2026-sparse-cleanups-NULL-pointers-C99-struct-init.txt 2067-netdrvr-8139too-replace-hand-crafted-kernel-thread-with-workqueue.txt 2078-BRIDGE-Use-ether_compare.txt 2079-NETFILTER-Add-revision-support-to-arp_tables-and-ip6_tables.txt 2080-ROSE-rose_heartbeat_expiry-locking-fix.txt 2081-IPV6-Fix-behavior-of-ip6_route_input-for-link-local-address.txt 2083-DCCP-Simplify-skb_set_owner_w-semantics.txt 2089-DCCP-Set-socket-owner-iff-packet-is-not-data.txt 2090-M! CAST-IPv6-Check-packet-size-when-process-Multicast.txt 2227-i! bmveth-f ix-panic-in-initial-replenish-cycle.txt 2245-MCAST-ip-6-_mc_add_src-should-be-called-when-number-of-sources-is-zero.txt 2256-IPV6-inet6_ifinfo_notify-should-use-RTM_DELLINK-in-addrconf_ifdown.txt 2267-PKT_SCHED-Rework-QoS-and-or-fair-queueing-configuration.txt 2396-ARM-Reverted-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 2410-SUNRPC-allow-sunrpc.o-to-link-when-CONFIG_SYSCTL-is-disabled.txt 2411-NFS-SUNRPC-NLM-fix-unused-variable-warnings-when-CONFIG_SYSCTL-is-disabled.txt 2416-NETFILTER-PPTP-helper-Fix-compilation-of-conntrack-helper-without-NAT.txt 2421-netdrvr-8139too-use-cancel_rearming_delayed_work-to-cancel-thread.txt 2422-netdrvr-8139too-use-rtnl_shlock_nowait-rather-than-rtnl_lock_interruptible.txt 2425-NETFILTER-Fix-double-free-after-netlink_unicast-in-ctnetlink.txt 2430-NETFILTER-nfnetlink-Use-kzalloc.txt 2431-NETFILTER-CONNMARK-target-needs-ip_conntrack.txt 2433-NETEM-use-PSCHED_LESS.txt 2435-drivers-net-wireless-airo.c-unsigned-comparas! on.txt 2436-S2io-Multi-buffer-mode-support.txt 2438-pcnet32-show-name-of-failing-device.txt 2439-pcnet32-AT2700-2701-and-Bugzilla-2699-4551.txt 2440-pcnet32-Prevent-hang-with-79c976.txt 2441-phy-address-mask-support-for-generic-phy-layer.txt 2442-PKT_SCHED-Generic-RED-layer.txt 2443-NET-Introduce-INET_ECN_set_ce-function.txt 2444-PKT_SCHED-RED-Use-new-generic-red-interface.txt 2445-PKT_SCHED-RED-Use-generic-queue-management-interface.txt 2446-PKT_SCHED-RED-Dont-start-idle-periods-while-already-idling.txt 2447-PKT_SCHED-RED-Cleanup-and-remove-unnecessary-code.txt 2448-PKT_SCHED-GRED-Cleanup-equalize-flag-and-add-new-WRED-mode-detection.txt 2449-PKT_SCHED-GRED-Transform-grio-to-GRED_RIO_MODE.txt 2450-PKT_SCHED-GRED-Cleanup-dumping.txt 2451-PKT_SCHED-GRED-Dump-table-definition.txt 2452-PKT_SCHED-GRED-Use-a-central-table-definition-change-procedure.txt 2453-PKT_SCHED-GRED-Report-out-of-bound-DPs-as-illegal.txt 2454-PKT_SCHED-GRED-Use-central-VQ-change-procedure.txt 2455-PKT_SCHE! D-GRED-Use-new-generic-red-interface.txt 2456-PKT_SCHED-GRED-! Do-not-r eset-statistics-in-gred_reset-gred_change.txt 2457-PKT_SCHED-GRED-Report-congestion-related-drops-as-NET_XMIT_CN.txt 2458-PKT_SCHED-GRED-Use-generic-queue-management-interface.txt 2459-PKT_SCHED-GRED-Introduce-tc_index_to_dp.txt 2460-PKT_SCHED-GRED-Improve-error-handling-and-messages.txt 2461-PKT_SCHED-GRED-Remove-initd-flag.txt 2462-PKT_SCHED-GRED-Dont-abuse-default-VQ-for-equalizing.txt 2463-PKT_SCHED-GRED-Remove-auto-creation-of-default-VQ.txt 2464-PKT_SCHED-GRED-Cleanup-and-remove-unnecessary-code.txt 2465-PKT_SCHED-GRED-Fix-restart-of-idle-period-in-WRED-mode-upon-dequeue-and-drop.txt 2466-PKT_SCHED-GRED-Support-ECN-marking.txt 2467-PKT_SCHED-G-RED-Introduce-hard-dropping.txt 2468-DRIVER-MODEL-Improved-dynamically-allocated-platform_device-interface.txt 2469-DRIVER-MODEL-Fix-depca.txt 2470-DRIVER-MODEL-Fix-jazzsonic.txt 2471-DRIVER-MODEL-Fix-macsonic.txt 2476-NETEM-Support-time-based-reordering.txt 2477-NETEM-Add-version-string.txt 2478-NET-Fix-race-condition-in-sk_stre! am_wait_connect.txt 2479-TCP-DCCP-Randomize-port-selection.txt 2481-drivers-net-ixgb-make-some-code-static.txt 2482-drivers-net-e1000-possible-cleanups.txt 2483-drivers-net-hamradio-dmascc.c-remove-dmascc_setup.txt 2484-prism54-Remove-redundant-assignment.txt 2485-bnx2-add-5708-support.txt 2486-bnx2-update-firmware-for-5708.txt 2487-bnx2-update-nvram-code-for-5708.txt 2488-bnx2-update-firmware-handshake-for-5708.txt 2489-bnx2-refine-bnx2_poll.txt 2490-bnx2-update-version-and-minor-fixes.txt 2493-Remove-linux-version.h-include-from-drivers-net-phy-and-net-ieee80211.txt 2494-netdrvr-fac_8xx-build-fix.txt 2495-netdrvr-s2io-warning-fixes.txt 2645-b44-b44_start_xmit-returns-with-a-lock-held-when-it-fails-allocating.txt 2646-b44-miscellaneous-cleanup.txt 2647-b44-expose-counters-through-ethtool.txt 2648-b44-s-spin_lock_irqsave-spin_lock-in-b44_interrupt.txt 2649-b44-late-request_irq-in-b44_open.txt 2688-3c59x-convert-to-use-of-pci_iomap-API.txt 2689-3c59x-cleanup-of-mdio_read-rout! ines-to-use-MII_-macros.txt 2690-3c59x-avoid-blindly-reading-! link-sta tus-twice.txt 2691-3c59x-bounds-checking-for-hw_checksums.txt 2692-3c59x-cleanup-init-of-module-parameter-arrays.txt 2693-3c59x-fix-some-grammar-in-module-parameter-descriptions.txt 2694-3c59x-support-ETHTOOL_GPERMADDR.txt 2695-3c59x-correct-rx_dropped-counting.txt 2696-3c59x-enable-use-of-memory-mapped-PCI-I-O.txt 2697-3c59x-don-t-enable-scatter-gather-w-o-checksum-support.txt 2828-knfsd-make-sure-svc_process-call-the-correct-pg_authenticate-for-multi-service-port.txt 2934-m68knommu-FEC-ethernet-header-support-for-the-ColdFire-5208.txt 2935-m68knommu-FEC-ethernet-support-for-the-ColdFire-5208.txt 2984-scripts-Lindent-on-ieee80211-subsystem.txt 2985-Fix-problem-with-WEP-unicast-key-index-0.txt 2986-Update-version-ieee80211-stamp-to-1.1.7.txt 2987-Ran-scripts-Lindent-on-drivers-net-wireless-ipw2-1-2-00.-c-h.txt 2988-IPW_DEBUG-has-already-included-DRV_NAME-remove-double-prefix-print.txt 2989-Catch-ipw2200-up-to-equivelancy-with-v1.0.1.txt 2990-Catch-ipw2200-up-to-equivelancy-w! ith-v1.0.2.txt 2991-Catch-ipw2200-up-to-equivelancy-with-v1.0.3.txt 2992-Catch-ipw2200-up-to-equivelancy-with-v1.0.4.txt 2993-Catch-ipw2100-up-to-equivelancy-with-v1.1.1.txt 2994-Fixed-WEP-on-ipw2100-priv-sec-was-being-used-instead-of.txt 2995-Bug-339-Fix-ipw2100-iwconfig-set-get-txpower.txt 2996-Move-code-from-ipw2100_wpa_enable-to-IPW2100_PARAM_DROP_UNENCRYPTED-to.txt 2997-Catch-ipw2200-up-to-equivelancy-with-v1.0.5.txt 2998-Fix-hardware-encryption-both-WEP-and-AES-doesn-t-work-with-fragmentation.txt 2999-Fix-is_duplicate_packet-bug-for-fragmentation-number-setting.txt 3000-bug-667-Fix-the-notorious-No-space-for-Tx-bug.txt 3001-Bug-637-Set-tx-power-for-A-band.txt 3002-Changed-default-of-missed-beacons-to-miss-before-disassociation-to-24.txt 3003-Updated-to-support-ieee80211-callback-to-is_queue_full-for-802.11e.txt 3004-Fixed-some-compiler-issues-if-CONFIG_IPW2200_QOS-is-enabled.txt 3005-Added-more-useful-geography-encoding-so-people-s-experience-with.txt 3006-Workaround-k! ernel-BUG_ON-panic-caused-by-unexpected-duplicate-packets.txt! 3007-Di sable-host-fragmentation-in-open-mode-since-IPW2200-2915-hardware.txt 3008-Bug-792-Fix-WPA-PSK-AES-both-for-Dipw-and-Dwext.txt 3009-Fixes-the-ad-hoc-network-WEP-key-list-issue.txt 3010-Bug-701-Fix-a-misuse-of-ieee-mode-with-ieee-iw_mode.txt 3011-Fix-ipw_wx_get_txpow-shows-wrong-disabled-value.txt 3012-Fix-firmware-error-when-setting-tx_power.txt 3013-Modified-ipw_config-and-STATUS_INIT-setting-to-correct-race-condition.txt 3014-Switched-firmware-error-dumping-so-that-it-will-capture-a-log-available.txt 3015-Changed-all-of-the-ipw_send_cmd-calls-to-return-any-ipw_send_cmd-error.txt 3016-Added-cmdlog-in-non-debug-systems.txt 3017-Migrated-some-of-the-channel-verification-code-back-into-the-driver-to.txt 3018-Updated-ipw2200-to-use-the-new-ieee80211-callbacks.txt 3019-Added-wait_state-wakeup-on-scan-completion.txt 3020-Bug-455-Fix-frequent-channel-change-generates-firmware-fatal-error.txt 3021-Bug-760-Fix-setting-WEP-key-in-monitor-mode-causes-IV-lost.txt 3022-Don-t-set-hardwar! e-WEP-if-we-are-actually-using-TKIP-AES.txt 3023-Make-all-the-places-the-firmware-fails-to-load-showerrors-in-decimal.txt 3024-Adds-radiotap-support-to-ipw2200-in-monitor-mode.txt 3025-Fixed-is_network_packet-to-include-checking-for-broadcast-packets.txt 3026-Mixed-PTK-GTK-CCMP-TKIP-support.txt 3027-Card-with-WEP-enabled-and-using-shared-key-auth-will-have-firmware.txt 3028-Fixed-problem-with-get_cmd_string-not-existing-if-CONFIG_IPW_DEBUG-disabled.txt 3029-Removed-PF_SYNCTHREAD-legacy.txt 3030-Fixes-problem-with-WEP-not-working-association-succeeds-but-no-Tx-Rx.txt 3031-Fix-bug-771-Too-many-8-bytes-recieved-when-using-AES-hwcrypto.txt 3032-Fixes-WEP-firmware-error-condition.txt 3033-Updated-driver-version-stamps-for-ipw2100-1.1.3-and-ipw2200-1.0.7.txt 3034-Pulled-out-a-stray-KERNEL_VERSION-check-around-the-suspend-handler.txt 3035-Fix-Driver-using-old-proc-net-wireless-support-please-fix-driver-message.txt 3036-Removed-legacy-WIRELESS_EXT-checks-from-ipw2200.c.txt 3037-Fixe! s-missed-beacon-logic-in-relation-to-on-network-AP-roaming.tx! t 3038-R emoved-warning-about-TKIP-not-being-configured-if-countermeasures-are.txt 3039-Added-channel-support-for-ipw2200-cards-identified-as-ZZR.txt 3040-Fixed-problem-with-not-being-able-to-send-broadcast-packets.txt 3041-Fixed-parameter-reordering-in-firmware-log-routine.txt 3042-Updated-firmware-version-stamp-to-2.4-from-2.3-so-it-will-use-the-latest-firmware.txt 3043-Update-version-ipw2200-stamp-to-1.0.8.txt 3081-fix-NET_RADIO-n-IEEE80211-y-compile.txt 3083-kill-include-linux-eeprom.h.txt 3084-drivers-net-s2io.c-make-functions-static.txt 3085-prism54-Unused-variable-extraneous-udelay.txt 3086-prism54-Transmit-stats-updated-in-wrong-place.txt 3087-Fix-sparse-warning-in-e100-driver.txt 3088-atmel-memset-correct-range.txt 3117-IPV6-Put-addr_diff-into-common-header-for-future-use.txt 3118-IPV6-Make-ipv6_addr_type-more-generic-so-that-we-can-use-it-for-source-address-selection.txt 3119-IPV6-RFC3484-compliant-source-address-selection.txt 3121-PKT_SCHED-Correctly-handle-empty-ematch-tr! ees.txt 3122-NET-sk_add_backlog-convert-from-macro-to-inline.txt 3124-PPP-handle-misaligned-accesses.txt 3125-PPP-add-PPP-MPPE-encryption-module.txt 3126-IRDA-donauboe-locking-fix.txt 3127-NET-kfree-cleanup.txt 3128-IPV4-Fix-ip_queue_xmit-identity-increment-for-TSO-packets.txt 3131-Bluetooth-Add-endian-annotations-to-the-core.txt 3132-Bluetooth-Remove-the-usage-of-proc-completely.txt 3155-SERIAL-IOC3-Update-8250-driver-bits.txt 3160-skge-clear-PCI-PHY-COMA-mode-on-boot.txt 3161-skge-use-kzalloc.txt 3162-skge-add-mii-ioctl-support.txt 3163-skge-goto-low-power-mode-on-shutdown.txt 3164-skge-use-prefetch-on-receive.txt 3165-skge-spelling-fixes.txt 3166-skge-increase-version-number.txt 3168-wireless-ipw2100-kill-unused-var-warnings-for-debug-disabled-code.txt 3169-ieee80211-cleanup-crypto-list-handling-other-minor-cleanups.txt 3170-b44-replace-B44_FLAG_INIT_COMPLETE-with-netif_running.txt 3171-b44-race-on-device-closing.txt 3172-b44-increase-version-number.txt 3178-dgrs-fix-warn! ings-when-CONFIG_ISA-and-CONFIG_PCI-are-not-enabled.txt 3179-! IOC-And- don-t-mark-the-things-as-broken-Cowboy.txt 3231-sanitize-lookup_hash-prototype.txt 3530-NETFILTER-packet-counter-of-conntrack-is-32bits.txt 3534-NETFILTER-ctnetlink-add-marking-support-from-userspace.txt 3535-NETFILTER-ctnetlink-add-module-alias-to-fix-autoloading.txt 3536-NETFILTER-ctnetlink-kill-unused-includes.txt 3537-NETFILTER-ctnetlink-get_conntrack-can-use-GFP_KERNEL.txt 3539-NETFILTER-nfnetlink-only-load-subsystems-if-CAP_NET_ADMIN-is-set.txt 3540-NETFILTER-stop-tracking-ICMP-error-at-early-point.txt 3542-NETFILTER-ctnetlink-propagate-error-instaed-of-returning-EPERM.txt 3543-NETFILTER-ctnetlink-Add-support-to-identify-expectations-by-ID-s.txt 3545-NETFILTER-ctnetlink-ICMP_ID-is-u_int16_t-not-u_int8_t.txt 3546-IPV6-Fix-fallout-from-CONFIG_IPV6_PRIVACY.txt 3547-IPV6-ip6ip6_lock-is-not-unlocked-in-error-path.txt 3566-txt 3596-NETFILTER-Add-nf_conntrack-subsystem.txt 3599-NETLINK-Type-safe-netlink-messages-attributes-interface.txt 3600-NETLINK-Make-netlink_callback-done! -optional.txt 3601-NETLINK-Generic-netlink-receive-queue-processor.txt 3602-XFRM-Use-generic-netlink-receive-queue-processor.txt 3603-RTNETLINK-Use-generic-netlink-receive-queue-processor.txt 3604-NETLINK-Generic-netlink-family.txt 3615-SUNRPC-don-t-reencode-when-looping-in-call-transmit.txt 3627-netdrvr-8139too-fast-poll-for-thread-if-an-unlikely-race-occurs.txt 3660-BNX2-output-driver-name-as-prefix-in-error-message.txt 3661-BNX2-check-return-of-dev_alloc_skb-in-bnx2_test_loopback.txt 3662-BNX2-simplify-parameter-checks-in-bnx2_-get-set-_eeprom.txt 3663-NET-Detect-hardware-rx-checksum-faults-correctly.txt 3689-TCP-fix-congestion-window-update-when-using-TSO-deferal.txt 3690-TCP-simplify-microsecond-rtt-sampling.txt 3691-TCP-add-tcp_slow_start-helper.txt 3692-TCP-Appropriate-Byte-Count-support.txt 3693-TCP-receive-buffer-growth-limiting-with-mixed-MTU.txt 3694-TCP-spelling-fixes.txt 3695-TCP-speed-up-SACK-processing.txt 3701-disable-DEBUG-in-ibmveth.txt 3703-sky2-needs-dma_! mapping.h.txt 3728-gianfar-mii-needs-to-zero-out-the-mii_bus-! structur e.txt 3729-netdrvr-forcedeth-remove-superfluous-rx-engine-stop-start.txt 3730-netdrvr-forcedeth-support-for-irq-mitigation.txt 3731-netdrvr-forcedeth-phy-address-scan-range.txt 3732-SAA9730-Whitespace-cleanup.txt 3733-SAA9730-Driver-overhaul.txt 3734-smc91x-DB1200-support.txt 3735-gt96100eth.c-Don-t-concatenate-__FUNCTION__-with-strings.txt 3737-TCP-fix-vegas-build.txt 3742-DECNET-fix-SIGPIPE.txt 3752-IPV6-Fix-inet6_init-missing-unregister.txt 3754-SCTP-Fix-potential-NULL-pointer-dereference-in-sctp_v4_get_saddr.txt 3755-SCTP-Remove-timeouts-array-from-sctp_endpoint.txt 3756-SCTP-Fix-ia64-NaT-consumption-fault-with-sctp_sideffect-commands.txt 3757-SCTP-Include-ulpevents-in-socket-receive-buffer-accounting.txt 3789-IPV6-Fix-unnecessary-GFP_ATOMIC-allocation-in-fib6-dump.txt 3792-ARM-Use-correct-IO-operations-for-Pleb.txt 3815-net-allow-newline-terminated-IP-addresses-in-in_aton.txt 3816-net-make-dev_valid_name-public.txt 3817-bonding-add-bond-name-to-all-error-messages.txt 38! 18-bonding-expand-module-param-descriptions.txt 3819-bonding-Add-transmit-policy-to-proc.txt 3820-bonding-get-slave-name-from-actual-slave-instead-of-param-list.txt 3821-bonding-move-kmalloc-out-of-spinlock-in-ALB-init.txt 3822-bonding-explicitly-clear-RLB-flag-during-ALB-init.txt 3823-bonding-expose-some-structs.txt 3824-bonding-make-functions-not-static.txt 3825-bonding-move-bond-creation-into-separate-function.txt 3826-bonding-make-bond_init-not-__init.txt 3827-bonding-Allow-ARP-target-table-to-have-empty-entries.txt 3828-bonding-add-ARP-entries-to-proc.txt 3829-bonding-add-sysfs-functionality-to-bonding-large.txt 3830-bonding-version-update.txt 3831-bonding-spelling-and-whitespace-corrections.txt 3832-bonding-comments-and-changelog.txt 3860-ppc-add-support-for-new-powerbooks.txt 3959-NETFILTER-nf_conntrack-Add-missing-code-to-TCP-conntrack-module.txt 3960-NETFILTER-nfnetlink-unconditionally-require-CAP_NET_ADMIN.txt 3961-NETFILTER-link-netfilter-before-ipv4.txt 3962-NETF! ILTER-cleanup-IPv6-Netfilter-Kconfig.txt 3963-NETFILTER-fix-t! ype-of-s ysctl-variables-in-nf_conntrack_ipv6.txt 3964-NETFILTER-nf_conntrack-fix-possibility-of-infinite-loop-while-evicting-nf_ct_frag6_queue.txt 3965-NETFILTER-fix-leak-of-fragment-queue-at-unloading-nf_conntrack_ipv6.txt 4016-IPV6-small-fix-for-ipv6_dev_get_saddr-..txt 4017-IPV6-Fixes-sparse-warning-in-ipv6-ipv6_sockglue.c.txt 4018-LLC-Fix-TX-window-scaling.txt 4019-LLC-Make-core-block-on-remote-busy.txt 4020-LLC-Fix-typo.txt 4028-knfsd-make-sure-nfsd-doesn-t-hog-a-cpu-forever.txt 4032-sdladrv.c-build-fix.txt 4041-TCP-More-spelling-fixes.txt 4045-NETFILTER-Remove-nf_conntrack-stat-proc-file-when-cleaning-up.txt 4046-NETFILTER-Free-layer-3-specific-protocol-tables-at-cleanup.txt 4079-drivers-net-sk98lin-skge.c-make-SkPciWriteCfgDWord-a-static-inline.txt 4080-skge-fix-warning-from-inlining-SkPciWriteCfgDWord.txt 4085-IPV4-IPV6-replace-handmade-list-with-hlist-in-IPv-4-6-reassembly.txt 4087-r8169-fix-printk_ratelimit-in-the-interrupt-handler.txt 4088-r8169-do-not-abort-when-the-powe! r-management-capabilities-are-disabled.txt 4094-NETFILTER-Fix-nf_conntrack-compilation-with-CONFIG_NETFILTER_DEBUG.txt 4127-ipw2200-disallow-direct-scanning-when-device-is-down.txt 4128-ipw2200-fix-error-log-offset-calculation.txt 4179-TCP-TCP-highspeed-build-error.txt 4183-LLC-Fix-compiler-warnings-introduced-by-TX-window-scaling-changes.txt 4184-NET-Sanitize-NET_SCHED-protection-in-net-sched-Kconfig.txt 4185-IPV6-Fib-dump-really-needs-GFP_ATOMIC.txt 4220-smc91x-fix-one-source-of-spurious-interrupts.txt 4221-smc91x-fix-bank-mismatch.txt 4226-e100-re-enable-microcode-with-more-useful-defaults.txt 4227-s2io-UFO-support.txt 4228-i82593.h-make-header-comment-GPL-compatible.txt 4229-IOC3-Replace-obsolete-PCI-API.txt 4230-au1000_eth-Include-linux-config.h.txt 4231-SAA9730-Add-missing-header-bits.txt 4232-prism54-Remove-extraneous-udelay-register-read.txt 4233-drivers-net-wireless-hermes.c-unsigned-int-comparision.txt 4234-Gianfar-update-and-sysfs-support.txt 4235-intel-ixp2000-ne! twork-driver.txt 4236-git-netdev-all-ieee80211_get_payload-wa! rning-fi x.txt 4240-fec_8xx-make-CONFIG_FEC_8XX-depend-on-CONFIG_8xx.txt 4241-ipw2100-Fix-Driver-using-old-proc-net-wireless.-message.txt 4242-e1000-avoid-leak-when-e1000_setup_loopback_test-fails.txt 4243-e1000-zero-out-pointers-in-e1000_free_desc_rings.txt 4246-wireless-hermes-build-fix.txt 4322-PKT_SCHED-sch_netem-correctly-order-packets-to-be-sent-simultaneously.txt 4324-NET-Reject-socket-filter-if-division-by-constant-zero-is-attempted.txt 4326-IPV6-Acquire-addrconf_hash_lock-for-read-in-addrconf_verify-..txt 4330-FIB_TRIE-Don-t-show-local-table-in-proc-net-route-output.txt 4331-NETFILTER-fixed-dependencies-between-modules-related-with-ip_conntrack.txt 4333-DCCP-Add-missing-no_policy-flag-to-struct-net_protocol.txt 4353-net-Fix-compiler-error-on-dgrs.c-when-CONFIG_PCI.txt 4393-NETLINK-Use-tgid-instead-of-pid-for-nlmsg_pid.txt 4394-IPV4-Fix-secondary-IP-addresses-after-promotion.txt 4395-NETFILTER-ctnetlink-Fix-refcount-leak-ip_conntrack-nat_proto.txt 4419-NETFILTER-ip_conntrack_! netlink.c-needs-linux-interrupt.h.txt 4461-SUNRPC-Funny-looking-code-in-__rpc_purge_upcall.txt 4471-bonding-Remove-superfluous-changelog.txt 4510-IPV6-Implement-appropriate-dummy-rule-4-in-ipv6_dev_get_saddr.txt 4541-IPV4-tcp-route-Another-look-at-hash-table-sizes.txt 4542-ATM-always-return-the-first-interface-for-ATM_ITF_ANY.txt 4543-ATM-atm_pcr_goal-doesn-t-modify-its-argument-s-contents-mark-it-as-const.txt 4547-ATM-attempt-to-autoload-atm-drivers.txt 4550-ATM-avoid-race-conditions-related-to-atm_devs-list.txt 4551-ATM-deregistration-removes-device-from-atm_devs-list-immediately.txt 4553-NET-Add-const-markers-to-various-variables.txt 4554-IPV4-make-two-functions-static.txt 4555-NETFILTER-ipv4-small-cleanups.txt 4556-IPV6-make-two-functions-static.txt 4589-b44-missing-netif_wake_queue-in-b44_open.txt 4590-b44-early-return-in-dev-do_ioctl-when-the-device-is-not-up.txt 4592-b44-increase-version-number.txt 4601-e1000-fix-for-dhcp-issue.txt 4602-sky2-eliminate-special-case-for! -EC-A1.txt 4603-sky2-add-MII-support.txt 4604-sky2-fix-receiv! e-flush- pause-issues.txt 4605-sky2-improve-receive-performance.txt 4606-sky2-add-Yukon-EC-ultra-support.txt 4607-sky2-handle-DMA-boundary-crossing.txt 4608-sky2-change-netif_rx_schedule_test-to-__netif_schedule_prep.txt 4609-sky2-race-with-MTU-change.txt 4610-sky2-dual-port-tx-completion.txt 4611-sky2-byteorder-annotation.txt 4612-sky2-remove-pci-express-hacks.txt 4613-sky2-use-pci_register_driver.txt 4614-sky2-update-version-number.txt 4616-sk98lin-add-permanent-address-support.txt 4617-sk98lin-avoid-message-confusion-with-skge.txt 4619-sk98lin-remove-redundant-fields-in-device-info.txt 4621-ibm_emac-fix-graceful-stop-timeout-handling.txt 4622-ixp2000-register-netdevices-last.txt 4623-pm3386-zero-stats-properly.txt 4624-pm3386-remove-unnecessary-udelays.txt 4625-caleb-pm3386-include-proper-header-files.txt 4626-ixp2000-use-netif_rx_schedule_test.txt 4627-enp2611-don-t-check-netif_running-in-link-status-timer.txt 4628-enp2611-use-dev-in-link-status-timer.txt 4629-enp2611-report-link! -up-down-events.txt 4630-ixp2000-report-MAC-addresses-for-each-port-on-init.txt 4631-pm3386-add-hook-for-setting-MAC-address.txt 4632-pm3386-add-hook-for-setting-carrier.txt 4633-pm3386-implement-reset.txt 4634-enp2611-disable-enable-SERDES-carrier-on-interface-down-up.txt 4635-ixp2000-add-netpoll-support.txt 4636-ixp2000-add-driver-version-bump-version-to-0.2.txt 4637-mipsnet-Fix-Copyright-notice.txt 4638-jazzsonic-Fix-build-error.txt 4639-jazzsonic-Fix-platform-device-code.txt 4640-orinoco-fix-setting-power-management-parameters.txt 4641-skge-handle-VLAN-checksum-correctly-on-yukon-rev-0.txt 4643-wireless-airo-reset-card-in-init.txt 4644-netdrvr-fmvj18x_cs-fix-multicast-bug.txt 4645-airo.c-add-support-for-IW_ENCODE_TEMP-i.e.-xsupplicant.txt 4649-netdrvr-skge-fix-typo-fix-build.txt 4650-ipw2200-kzalloc-conversion-and-Kconfig-dependency-fix.txt 4651-Duplicate-IPW_DEBUG-option-for-ipw2100-and-2200.txt 4680-NETFILTER-Ignore-ACKs-ACKs-on-half-open-connections-in-TCP-conntrack.t! xt 4681-NETFILTER-Fix-recent-match-jiffies-wrap-mismatches.tx! t 4729-S CTP-Return-socket-errors-only-if-the-receive-queue-is-empty.txt 4730-SCTP-Fix-getsockname-for-sctp-when-an-ipv6-socket-accepts-a-connection-from.txt 4731-IGMP-workaround-for-IGMP-v1-v2-bug.txt 4732-IPV4-Fix-EPROTONOSUPPORT-error-in-inet_create.txt 4733-IPV6-Load-protocol-module-dynamically.txt 4737-SUNRPC-Fix-Oopsable-condition-in-rpc_pipefs.txt 4741-ixp2000-change-netif_schedule_test-to-__netif_schedule_prep.txt 4742-sky2-interrupt-not-cleared.txt 4760-NETFILTER-Fix-incorrect-argument-to-ip_nat_initialized-in-ctnetlink.txt 4761-NETFILTER-nf_conntrack-Fix-missing-check-for-ICMPv6-type.txt 4762-NETFILTER-nfnetlink-Fix-calculation-of-minimum-message-length.txt 4763-NETFILTER-Fix-ip_conntrack_flush-abuse-in-ctnetlink.txt 4765-NETFILTER-Mark-ctnetlink-as-EXPERIMENTAL.txt 4766-NETFILTER-Wait-for-untracked-references-in-nf_conntrack-module-unload.txt 4768-NETFILTER-Don-t-use-conntrack-entry-after-dropping-the-reference.txt 4769-NET-make-function-pointer-argument-parseable-by-kerne! l-doc.txt 4770-DECNET-add-memory-buffer-settings.txt 4783-TCP-Vegas-stop-resetting-rtt-every-ack.txt 4784-TCP-Vegas-Remove-extra-call-to-tcp_vegas_rtt_calc.txt 4785-TCP-Vegas-timestamp-before-clone.txt 4787-TG3-remove-warning-on-race.txt 4801-NET-Fix-NULL-pointer-deref-in-checksum-debugging.txt 4807-IPv6-IPsec-fix-pmtu-calculation-of-esp.txt 4855-sky2-don-t-die-if-we-see-chip-rev-0xb5.txt 4856-sky2-device-structure-alignment.txt 4857-sky2-copy-threshold-as-module-parameter.txt 4858-sky2-ethtool-get-set-interrupt-coalescing.txt 4859-sky2-phy-processing-in-workqueue-rather-than-tasklet.txt 4860-sky2-no-irq-disable-needed-during-tx.txt 4861-sky2-ring-distance-optimization.txt 4862-sky2-map-length-optimization.txt 4863-sky2-tx-rx-ring-data-structure-split.txt 4864-sky2-transmit-logic-fixes.txt 4865-sky2-transmit-complete-index-optimization.txt 4866-sky2-transmit-complete-routine-optimization.txt 4867-sky2-interrupt-poll-optimization.txt 4868-sky2-interrupt-coalescing-tuning.txt ! 4869-sky2-handle-tx-timeout.txt 4870-sky2-quiet-ring-full-mes! sage-in- case-of-race.txt 4871-sky2-prefetch-tuning.txt 4872-sky2-turn-on-tx-flow-control.txt 4873-sky2-disable-rx-checksum-on-Yukon-XL.txt 4874-sky2-version-0.10.txt 4875-pcnet32-use-MAC-address-from-prom-also-on-powerpc.txt 4878-TCPv6-Fix-skb-leak.txt 4883-NETFILTER-ip_nat_tftp-Fix-expectation-NAT.txt 4892-skge-get-rid-of-warning-on-race.txt 4893-ieee80211_crypt_tkip-depends-on-NET_RADIO.txt 4895-e1000-Fixes-for-8357x.txt 4921-netdrvr-skge-fix-build.txt 4975-TG3-Fix-nvram-arbitration-bugs.txt 4976-TG3-Fix-suspend-and-resume.txt 4977-TG3-Fix-5704-single-port-mode.txt 4978-TG3-Fix-low-power-state.txt 4984-IPV6-addrconf-Do-not-print-device-pointer-in-privacy-log-message.txt 4985-PKT_SCHED-Disable-debug-tracing-logs-by-default-in-packet-action-API.txt 5023-s2io-__iomem-annotations-for-recent-changes.txt 5035-Address-of-void-__user-is-void-__user-not-void-__user.txt 5101-XFRM-Handle-DCCP-in-xfrm-4-6-_decode_session.txt 5104-SCTP-Fix-sctp-to-not-return-erroneous-POLLOUT-events.txt 5106-T! G3-Fix-peer-device-handling.txt 5107-TG3-Some-low-power-fixes.txt 5108-TG3-Add-tw32_wait_f-for-some-sensitive-registers.txt 5109-TG3-Fix-ethtool-memory-test.txt 5112-RPC-Do-not-block-on-skb-allocation.txt 5114-SUNRPC-Fix-EPIPE-error-on-mount-of-rpcsec_gss-protected-partitions.txt 5131-IPV6-Flag-RTF_ANYCAST-for-anycast-routes.txt 5132-IPV6-Try-not-to-send-icmp-to-anycast-address.txt 5133-IPV6-Defer-IPv6-device-initialization-until-the-link-becomes-ready.txt 5134-IPV6-Run-DAD-when-the-link-becomes-ready.txt 5135-IPV6-Don-t-select-a-tentative-address-as-a-source-address.txt 5140-NETROM-Fix-three-if-statements-in-nr_state1_machine.txt 5141-VLAN-Add-two-missing-checks-to-vlan_ioctl_handler.txt 5142-IPV6-Fix-address-deletion.txt 5143-DCCP-Comment-typo.txt 5147-IPSEC-Fix-policy-updates-missed-by-sockets.txt 5153-SUNGEM-Fix-link-error-with-CONFIG_HOTPLUG-disabled.txt 5156-IPV6-Fix-dead-lock.txt 5157-IPV6-Fix-Temporary-Address-Generation.txt 5158-chelsio-transmit-routine-return-value! s.txt 5159-skge-avoid-up-down-on-speed-changes.txt 5160-skge-! avoid-up -down-on-pause-param-changes.txt 5161-skge-handle-out-of-memory-on-MTU-size-changes.txt 5162-skge-get-rid-of-Yukon2-defines.txt 5163-skge-handle-out-of-memory-on-ring-parameter-change.txt 5164-skge-version-number-1.3.txt 5165-git-netdev-all-s2io-warning-fix.txt 5166-spidernet-fix-Kconfig-after-BPA-CELL-rename.txt 5167-skge-error-handling-on-resume.txt 5168-sky2-handle-out-of-memory-on-admin-changes.txt 5169-sky2-don-t-lose-multicast-addresses.txt 5170-sky2-handle-hardware-packet-overrun.txt 5171-sky2-version-0.11.txt 5173-orinoco_nortel-Fix-incorrect-PCI-resource-use.txt 5174-orinoco_nortel-Add-Symbol-LA-4123-ID.txt 5175-missing-license-for-libphy.ko.txt 5179-forcedeth-fix-random-memory-scribbling-bug.txt 5198-IPV6-Increase-default-MLD_MAX_MSF-to-64.txt 5199-BR_NETFILTER-Fix-leak-if-skb-traverses-1-bridge.txt 5201-IPV6-Fix-addrconf-dead-lock.txt 5202-NET-Validate-socket-filters-against-BPF_MAXINSNS-in-one-spot.txt 5203-IPV6-mcast-Fix-multiple-issues-in-MLDv2-reports.txt 5205! -TG3-ethtool-d-hangs-PCIe-systems.txt 5206-TG3-Update-driver-version-and-reldate.txt 5518-s-retreiv-retriev-g.txt 5541-TCP-BIC-remove-low-utilization-code.txt 5542-TCP-BIC-spelling-and-whitespace.txt 5543-TCP-BIC-CUBIC-window-growth-2.0.txt 5544-NETFILTER-ip_tables-NUMA-aware-allocation.txt 5545-NETFILTER-ebtables-Support-nf_log-API-from-ebt_log-and-ebt_ulog.txt 5546-IPV4-Safer-reassembly.txt 5547-IPV6-Reuse-inet_csk_get_port-in-tcp_v6_get_port.txt 5548-IPV6-Generalise-__tcp_v6_hash-renaming-it-to-__inet6_hash.txt 5549-ICSK-make-inet_csk_reqsk_queue_hash_add-timeout-arg-unsigned-long.txt 5550-IPV6-Generalise-tcp_v6_search_req-tcp_v6_synq_add.txt 5551-IPV6-Introduce-inet6_rsk.txt 5552-ICSK-Rename-struct-tcp_func-to-struct-inet_connection_sock_af_ops.txt 5553-ICSK-Move-v4_addr2sockaddr-from-TCP-to-icsk.txt 5554-DCCP-Introduce-dccp_ipv4_af_ops.txt 5555-IP-Simplify-and-consolidate-MSG_PEEK-error-handling.txt 5556-UDP-udp_checksum_init-return-value.txt 5557-IPVS-remove-dead-code.! txt 5558-NET-Avoid-atomic-xchg-for-non-error-case.txt 5559-AF! _UNIX-Re move-superfluous-reference-counting-in-unix_stream_sendmsg.txt 5560-IPV6-Generalise-some-functions.txt 5561-IPV6-Introduce-inet6_timewait_sock.txt 5562-IPV6-Export-some-symbols-for-DCCPv6.txt 5563-DCCP-Just-rename-dccp_v4_prot-to-dccp_prot.txt 5564-DCCP-Prepare-the-AF-agnostic-core-for-the-introduction-of-DCCPv6.txt 5565-IPV6-Export-ipv6_opt_accepted.txt 5567-DCCP-Use-reqsk_free-in-dccp_v4_conn_request.txt 5571-TCP-Move-the-TCPF_-enum-to-tcp_states.h.txt 5573-AF_UNIX-Use-spinlock-for-unix_table_lock.txt 5574-BRIDGE-allow-setting-hardware-address-of-bridge-pseudo-dev.txt 5575-BRIDGE-handle-speed-detection-after-carrier-changes.txt 5576-BRIDGE-filter-packets-in-learning-state.txt 5577-BRIDGE-limited-ethtool-support.txt 5578-BRIDGE-add-version-number.txt 5579-PKT_SCHED-netem-packet-corruption-option.txt 5582-TCP-cubic-precompute-constants.txt 5583-TCP-cubic-use-Newton-Raphson.txt 5584-IPV4-fib_trie-Add-credits.txt 5585-SCTP-Update-SCTP_PEER_ADDR_PARAMS-socket-option-to-the-late! st-api-draft.txt 5586-SCTP-Add-support-for-SCTP_DELAYED_ACK_TIME-socket-option.txt 5587-NET-Small-cleanup-to-socket-initialization.txt 5588-NET-move-struct-proto_ops-to-const.txt 5589-PKTGEN-Deinitialise-static-variables.txt 5590-NET-Fix-sock_init-return-value.txt 5591-NET-restructure-sock_aio_-read-write-sock_-readv-writev.txt 5594-TCP-Don-t-use-__constant_htonl-for-a-non-const-arg.txt 5595-PPPOX-Fix-assignment-into-const-proto_ops.txt 5596-NET-Speed-up-__alloc_skb.txt 5597-AF_UNIX-Convert-to-use-a-spinlock-instead-of-rwlock.txt 5598-NETLINK-genetlink-fix-cmd-type-in-genl_ops-to-be-consistent-to-u8.txt 5599-NETROM-Remove-unessecary-lock_sock-calls-in-netrom_ioctl.txt 5600-NET-Add-a-dev_ioctl-fallback-to-sock_ioctl.txt 5601-TG3-fixup-tot_len-calculation.txt 5602-IPVS-Cleanup-IP_VS_DBG-statements.txt 5603-DECNET-Only-use-local-routers.txt 5604-DCCP-Do-not-process-a-packet-twice-when-it-s-not-in-state-DCCP_OPEN.txt 5605-DCCP-Send-an-ACK-vector-when-ACKing-a-response-packet.txt! 5606-DCCP-Notify-CCID-only-after-ACK-vectors-have-been-proce! ssed.txt 5607-BRIDGE-Fix-faulty-check-in-br_stp_recalculate_bridge_id.txt 5608-IPV4-fib_trie-build-fix.txt 5610-IEEE80211-ipw2200-Simplify-multicast-checks.txt 5611-TCP-less-inline-s.txt 5612-DCCP-ackvec-Fix-spelling-of-throw.txt 5613-DCCP-ackvec-use-u8-for-the-buf-offsets.txt 5614-TCP-syn_flood_warning-is-only-needed-if-CONFIG_SYN_COOKIES-is-selected.txt 5700-ECONET-Use-macro-for-spinlock_t-definition.txt 5701-IPV6-Use-macro-for-rwlock_t-initialization.txt 5702-NETFILTER-Use-macro-for-spinlock_t-rwlock_t-initializations-definition.txt 5703-NET-More-instruction-checks-fornet-core-filter.c.txt 5704-TCP-tcp_vegas-Fix-slow-start.txt 5730-IPVS-Fix-compilation.txt 5731-NETFILTER-Decrease-number-of-pointer-derefs-in-nfnetlink_queue.c.txt 5732-NETFILTER-Decrease-number-of-pointer-derefs-in-nf_conntrack_core.c.txt 5733-NETFILTER-ctnetlink-remove-bogus-checks-in-ICMP-protocol-at-dumping.txt 5734-NETFILTER-ctnetlink-Add-sanity-checkings-for-ICMP.txt 5735-NETFILTER-ctnetlink-propagate-ctnetlin! k_dump_tuples_proto-return-value-back.txt 5736-NETFILTER-ctnetlink-use-u_int32_t-instead-of-unsigned-int.txt 5737-NETFILTER-ctnetlink-ctnetlink_event-cleanup.txt 5738-NETFILTER-ctnetlink-fix-conntrack-mark-race.txt 5739-NETFILTER-ctnetlink-remove-unused-variable.txt 5740-NETFILTER-Add-ctnetlink-port-for-nf_conntrack.txt 5741-NETFILTER-Filter-dumped-entries-based-on-the-layer-3-protocol-number.txt 5742-NETFILTER-Fix-module_param-types-and-permissions.txt 5743-NETFILTER-ctnetlink-Fix-dumping-of-helper-name.txt 5744-NETFILTER-Remove-okfn-usage-in-ip_vs_core.c.txt 5745-NETFILTER-Call-POST_ROUTING-hook-before-fragmentation.txt 5746-NETFILTER-make-ipv6_find_hdr-find-transport-protocol-header.txt 5747-NETFILTER-Export-ip6_masked_addrcmp-don-t-pass-IPv6-addresses-on-stack.txt 5748-NETFILTER-nf_conntrack_l3proto_ipv4.c-needs-net-route.h.txt 5749-NETFILTER-Use-HOPLIMIT-metric-as-TTL-of-TCP-reset-sent-by-REJECT.txt 5776-NET-Change-1500-to-ETH_DATA_LEN-in-some-files.txt 5796-knfsd-fix-h! ash-function-for-IP-addresses-on-64bit-little-endian-machines! .txt 600 8-parport-include-fixes.txt 6015-Keep-nfsd-from-exiting-when-seeing-recv-errors.txt added hold last reject removed is void __user 0036-sky2-new-experimental-Marvell-Yukon2-driver.txt 0072-8139cp-support-ETHTOOL_GPERMADDR.txt 0073-8139too-support-ETHTOOL_GPERMADDR.txt 0074-b44-support-ETHTOOL_GPERMADDR.txt 0075-e1000-support-ETHTOOL_GPERMADDR.txt 0076-e100-support-ETHTOOL_GPERMADDR.txt 0077-forcedeth-support-ETHTOOL_GPERMADDR.txt 0078-ixgb-support-ETHTOOL_GPERMADDR.txt 0079-ne2k-pci-support-ETHTOOL_GPERMADDR.txt 0080-pcnet32-support-ETHTOOL_GPERMADDR.txt 0081-r8169-support-ETHTOOL_GPERMADDR.txt 0082-skge-support-ETHTOOL_GPERMADDR.txt 0083-sundance-support-ETHTOOL_GPERMADDR.txt 0084-via-rhine-support-ETHTOOL_GPERMADDR.txt 0087-Replace-drivers-net-wan-custom-ctype-macros-with-standard-ones.txt 0088-drivers-net-wan-possible-cleanups.txt 0089-lne390-bogus-casts.txt 0090-C99-initializers-in-ray_cs.c.txt 0091-mii-Add-test-for-GigE-support.txt 0092-Add-rapidio-net-driver.txt 0100-pc! net32-set_ringparam-implementation.txt 0101-pcnet32-set-min-ring-size-to-4.txt 0102-sky2-driver-update.txt 0103-orinoco-Remove-conditionals-that-are-useless-in-the-kernel-drivers.txt 0104-orinoco-Don-t-include-net-ieee80211.h-twice.txt 0105-orinoco-Update-PCMCIA-ID-s.txt 0106-Fixed-some-endian-issues-with-802.11-header-usage-in-ieee80211_rx.c.txt 0107-ieee80211-quality-scaling-algorithm-extension-handler.txt 0108-ieee80211-Added-wireless-spy-support.txt 0109-Changed-802.11-headers-to-use-ieee80211_info_element-0.txt 0110-ieee80211-Removed-ieee80211_info_element_hdr.txt 0111-ieee80211-Cleanup-memcpy-parameters.txt 0112-ieee80211-Switched-to-sscanf-in-store_debug_level.txt 0113-ieee80211-Fixed-type-o-of-abg_ture-abg_true.txt 0114-Updated-ipw2200-to-compile-with-ieee80211-abg_ture-to-abg_true-change.txt 0163-sky2-fix-FIFO-DMA-alignment-problems.txt 0164-sky2-allow-ethtool-debug-access-to-all-of-PCI-space.txt 0165-sky2-version-0.5.txt 0166-ieee80211-Updated-ipw2100-to-be-compati! ble-with-ieee80211_hdr-changes.txt 0167-ieee80211-Updated-ipw! 2100-to- be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0168-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211_hdr-changes.txt 0169-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0170-ieee80211-Updated-atmel-to-be-compatible-with-ieee80211_hdr-changes.txt 0171-ieee80211-Fixed-a-kernel-oops-on-module-unload.txt 0172-ieee80211-Hardware-crypto-and-fragmentation-offload-support.txt 0173-ieee80211-Fix-time-calculation-switching-to-use-jiffies_to_msecs.txt 0174-ieee80211-Fix-kernel-Oops-when-module-unload.txt 0175-ieee80211-Allow-drivers-to-fix-an-issue-when-using-wpa_supplicant-with-WEP.txt 0176-ieee82011-Added-WE-18-support-to-default-wireless-extension-handler.txt 0177-ieee80211-Renamed-ieee80211_hdr-to-ieee80211_hdr_3addr.txt 0178-ieee80211-adds-support-for-the-creation-of-RTS-packets.txt 0179-ieee82011-Added-ieee80211_tx_frame-to-convert-generic-802.11-data-frames-and-callbacks.txt 0180-ieee80211-Fix-TKIP-repeated-fragmentatio! n-problem-and-payload_size-reporting.txt 0181-ieee80211-Return-NETDEV_TX_BUSY-when-QoS-buffer-full.txt 0182-ieee80211-Add-QoS-WME-support-to-the-ieee80211-subsystem.txt 0183-ieee80211-Added-ieee80211_geo-to-provide-helper-functions.txt 0184-ieee80211-Added-ieee80211_radiotap.h.txt 0185-ieee80211-Additional-fixes-for-endian-aware-types.txt 0186-ieee80211-extern-inline-to-static-inline.txt 0187-ieee80211-Type-o-capbility-definition-for-QoS-and-ERP-parsing.txt 0188-ieee80211-Mixed-PTK-GTK-CCMP-TKIP-support.txt 0189-ieee80211-Keep-auth-mode-unchanged-after-iwconfig-key-off-on-cycle.txt 0190-ieee80211-Updated-copyright-dates.txt 0191-ieee80211-Updated-hostap-to-be-compatible-with-ieee80211_hdr-changes.txt 0192-ieee80211-Updated-hostap-to-be-compatible-with-extra_prefix_len-changes.txt 0193-ieee82011-Remove-WIRELESS_EXT-ifdefs.txt 0194-forcedeth-add-hardware-tx-checksumming.txt 0199-ieee80211-Added-subsystem-version-string-and-reporting-via-MODULE_VERSION.txt 0200-ieee80211-Added-! handle_deauth-callback-enhanced-tkip-ccmp-support-of-varying-! hw-sw-of fload.txt 0201-ieee80211-added-IE-comments-reason_code-to-reason-removed-info_element-from-ieee80211_disassoc.txt 0202-ieee80211-in-tree-driver-updates-to-sync-with-latest-ieee80211-series.txt 0203-ieee80211-update-orinoco-wl3501-drivers-for-latest-struct-naming.txt 0216-orinoco-Remove-inneeded-system-includes.txt 0217-orinoco-Make-nortel_pci_hw_init-static.txt 0218-orinoco-Fix-memory-leak-and-unneeded-unlock-in-orinoco_join_ap.txt 0219-orinoco-orinoco_send_wevents-could-return-without-unlocking.txt 0220-orinoco-Remove-unneeded-forward-declarations.txt 0221-orinoco-Annotate-endianess-of-variables-and-structure-members.txt 0222-orinoco-Read-only-needed-data-in-__orinoco_ev_txexc.txt 0223-orinoco-Bump-version-to-0.15rc3.txt 0227-RPC-Report-connection-errors-properly-when-mounting-with-soft.txt 0228-RPC-proper-soft-timeout-behavior-for-rpcbind.txt 0229-NFS-use-a-constant-value-for-TCP-retransmit-timeouts.txt 0230-RPC-portmapper-doesn-t-need-a-reserved-port.txt 0231-RPC-extract-! socket-logic-common-to-both-client-and-server.txt 0232-RPC-introduce-client-side-transport-switch.txt 0233-RPC-transport-switch-function-naming.txt 0234-RPC-Reduce-stack-utilization-in-xs_sendpages.txt 0235-RPC-Rename-sock_lock.txt 0236-RPC-Rename-xprt_lock.txt 0237-RPC-rename-the-sockstate-field.txt 0238-RPC-Eliminate-socket.h-includes-in-RPC-client.txt 0239-RPC-Add-helper-for-waking-tasks-pending-on-a-transport.txt 0240-RPC-client-side-transport-switch-cleanup.txt 0241-RPC-separate-TCP-and-UDP-write-space-callbacks.txt 0242-RPC-separate-TCP-and-UDP-transport-connection-logic.txt 0243-RPC-separate-TCP-and-UDP-socket-write-paths.txt 0244-RPC-skip-over-transport-specific-heads-automatically.txt 0245-RPC-get-rid-of-xprt-stream.txt 0246-RPC-add-API-to-set-transport-specific-timeouts.txt 0247-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0248-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0249-RPC-separate-xprt_timer-implementations.txt 0250-RPC-add-ge! neric-interface-for-adjusting-the-congestion-window.txt 0251-! RPC-add- a-release_rqst-callout-to-the-RPC-transport-switch.txt 0252-RPC-remove-xprt-nocong.txt 0253-RPC-clean-up-after-nocong-was-removed.txt 0254-RPC-allow-RPC-client-s-port-range-to-be-adjustable.txt 0255-RPC-make-sure-to-get-the-same-local-port-number-when-reconnecting.txt 0256-RPC-parametrize-various-transport-connect-timeouts.txt 0257-RPC-rationalize-set_buffer_size.txt 0258-RPC-NFS-new-rpc_pipefs-patch.txt 0260-Revert-PATCH-RPC-NFS-new-rpc_pipefs-patch.txt 0262-SUNRPC-fix-bug-in-patch-portmapper-doesn-t-need-a-reserved-port.txt 0266-netdrvr-gianfar-use-new-phy-layer.txt 0267-netdrvr-delete-CONFIG_PHYCONTROL.txt 0268-hostap-Fix-pci_driver-name-for-hostap_plx-and-hostap_pci.txt 0269-hostap-Add-support-for-WE-19.txt 0270-hostap-Use-GFP_ATOMIC-to-get-rid-of-weird-might_sleep-issue.txt 0271-hostap-Remove-iwe_stream_add_event-kludge.txt 0272-Remove-WIRELESS_EXT-ifdefs-from-several-wireless-drivers.txt 0273-wireless-airo-remove-needed-dma_addr_t-obfuscation.txt 0312-sky2-changing-mtu! -doesn-t-have-to-reset-link.txt 0313-sky2-cleanup-interrupt-processing.txt 0314-sky2-add-hardware-VLAN-acceleration-support.txt 0315-sky2-explicit-set-power-state.txt 0316-sky2-version-0.6.txt 0317-sky2-nway-reset-BONUS-FEATURE.txt 0323-This-patch-fixes-a-typo-in-ieee80211.h-ieee82011_deauth-ieee80211_deauth.txt 0346-This-will-move-the-ieee80211_is_ofdm_rate-function-to-the-ieee80211.h.txt 0348-Currently-the-info_element-is-parsed-by-2-seperate-functions-this.txt 0349-When-an-assoc_resp-is-received-the-network-structure-is-not-completely.txt 0350-Lindent-and-trailing-whitespace-script-executed-ieee80211-subsystem.txt 0356-hostap-Remove-hw-specific-dev_open-close-handlers.txt 0357-hostap-Fix-hostap_pci-build-with-PRISM2_IO_DEBUG.txt 0358-hostap-Do-not-free-local-hw_priv-before-unregistering-netdev.txt 0359-hostap-Unregister-netdevs-before-freeing-local-data.txt 0366-S2io-MSI-MSI-X-support-runtime-configurable.txt 0367-e1000-Support-for-82571-and-82572-controllers.txt 0368-e10! 00-multi-queue-defines-modification-to-data-structures.txt 03! 69-e1000 -implementation-of-the-multi-queue-feature.txt 0370-e1000-Enable-custom-configuration-bits-for-82571-2-controllers.txt 0371-e1000-Fixes-for-packet-split-related-issues.txt 0372-e1000-Added-msleep_interruptible-delay.txt 0373-e1000-Flush-shadow-RAM.txt 0374-e1000-fix-warnings.txt 0375-AX.25-Delete-debug-printk-from-mkiss-driver.txt 0376-AX.25-Convert-mkiss.c-to-DEFINE_RWLOCK.txt 0377-airo-fix-resume.txt 0378-s2io-change-strncpy-length-arg-to-use-size-of-target.txt 0379-netdrvr-s2io-Add-a-MODULE_VERSION-entry.txt 0380-bonding-replicate-IGMP-traffic-in-activebackup-mode.txt 0381-sky2-add-permanent-address-support.txt 0383-wireless-ipw2200-remove-redundant-return-statement.txt 0546-S2io-Offline-diagnostics-fixes.txt 0547-rcu-in-bpqether-driver.txt 0548-SMACK-support-for-mkiss.txt 0549-Initialize-the-.owner-field-the-tty_ldisc-structure.txt 0555-SUNRPC-Retry-rpcbind-requests-if-the-server-s-portmapper-isn-t-up.txt 0556-RPC-allow-call_encode-to-delay-transmission-of-an-RPC-call.tx! t 0575-ieee80211-division-by-zero-fix.txt 0577-sb1250-mac-Check-the-actual-setting-for-reporting-hw-checksumming.txt 0578-sb1250-mac-Ensure-16-byte-alignment-of-the-descriptor-ring.txt 0579-au1000_eth-Misc-Au1000-net-driver-fixes.txt 0580-de2104x-Resurrect-Cobalt-support-for-2.6.txt 0581-sgiseeq-Fix-resource-handling.txt 0582-sgiseeq-Configure-PIO-and-DMA-timing-requests.txt 0583-declance-Convert-to-irqreturn_t.txt 0584-declance-Fix-mapping-of-device.txt 0585-declance-Deal-with-the-bloody-KSEG-vs-CKSEG-horror.txt 0586-declance-Use-physical-addresses-at-the-interface-level.txt 0587-ne-Support-for-RBHMA4500-eval-board.txt 0588-mipsnet-Virtual-ethernet-driver-for-MIPSsim.txt 0589-e1000_intr-build-fix.txt 0590-s2io-build-fix.txt 0592-via-rhine-change-mdelay-to-msleep-and-remove-from-ISR-path.txt 0593-epic100-fix-counting-of-work_done-in-epic_poll.txt 0596-bonding-cleanup-comment-for-mode-1-IGMP-xmit-hack.txt 0597-b44-alternate-allocation-option-for-DMA-descriptors.txt 0598-orino! co-remove-redundance-skb-length-check-before-padding.txt 0599! -sundanc e-remove-if-1-.-block-in-sundance_probe1.txt 0600-sundance-expand-reset-mask.txt 0601-e1000-build-fix.txt 0603-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0606-SUNRPC-Add-support-for-privacy-to-generic-gss-api-code.txt 0607-SUNRPC-Provide-a-callback-to-allow-free-pages-allocated-during-xdr-encoding.txt 0608-SUNRPC-Retry-wrap-in-case-of-memory-allocation-failure.txt 0609-RPCSEC_GSS-cleanup-au_rslack-calculation.txt 0610-RPCSEC_GSS-client-side-privacy-support.txt 0611-RPCSEC_GSS-Simplify-rpcsec_gss-crypto-code.txt 0612-RPCSEC_GSS-krb5-pre-privacy-cleanup.txt 0613-RPCSEC_GSS-Add-support-for-privacy-to-krb5-rpcsec_gss-mechanism.txt 0614-RPCSEC_GSS-remove-all-qop-parameters.txt 0615-RPCSEC_GSS-krb5-cleanup.txt 0622-Fixed-problem-with-not-being-able-to-decrypt-encrypt-broadcast-packets.txt 0631-sb1250-mac-Get-rid-of-all-the-funny-SBMAC_WRITECSR-and-SBMAC_READCSR-macros.txt 0632-sb1250-mac-Whitespace-cleanup.txt 0645-sundance-include-MII-address-0-in-PHY-probe.tx! t 0646-e1000-Driver-version-white-space-comments-device-id-other.txt 0647-Fixed-oops-if-an-uninitialized-key-is-used-for-encryption.txt 0652-sb1250-mac-PHY-probing-fixes.txt 0670-ieee80211-subsystem.txt 0671-Update-version-ieee80211-stamp-to-1.1.6.txt 0675-PARISC-Change-the-driver-names-so-sys-bus-parisc-drivers-looks-better.txt 0676-PARISC-Convert-parisc_device-to-use-struct-resource-for-hpa.txt 0714-PARISC-Add-NETPOLL-support-to-lasi_82596.txt 0771-DECNET-Remove-some-redundant-ifdeffed-code.txt 0772-NET-Wider-use-of-for_each_-cpu.txt 0773-PKTGEN-Sleeping-function-called-under-lock.txt 0774-PKTGEN-Use-kzalloc.txt 0775-PKTGEN-Spelling-and-white-space.txt 0776-PKTGEN-proc-interface-revision.txt 0777-NETFILTER-ip_conntrack-Make-hashsize-conntrack-parameter-writable.txt 0778-IPV4-Kill-redundant-rcu_dereference-on-fa_info.txt 0779-IPSEC-Kill-obsolete-get_mss-function.txt 0780-NETLINK-Remove-dead-code-in-af_netlink.c.txt 0781-IPV4-Remove-dead-code-from-ip_output.c.txt 0782-SK_BUF! F-kernel-doc-fix-skbuff-warnings.txt 0783-AX.25-Use-constant-! instead- of-magic-number.txt 0784-IPV4-Fix-setting-broadcast-for-SIOCSIFNETMASK.txt 0785-netdrvr-forcedeth-scatter-gather-and-segmentation-offload-support.txt 0786-ieee80211-build-fix.txt 0834-Revert-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0855-RPC-Ensure-that-nobody-can-queue-up-new-upcalls-after-rpc_close_pipes.txt 0931-gfp_t-net.txt 0952-gfp_t-drivers-net.txt 0957-ARM-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 0963-ARM-2897-2-PXA2xx-IRDA-support.txt 0971-sky2-remove-unused-definitions.txt 0972-sky2-use-kzalloc.txt 0973-sky2-spelling-fixes.txt 0974-sky2-fix-NAPI-and-receive-handling.txt 0975-sky2-version-0.7.txt 1029-DRIVER-MODEL-Get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.txt 1037-Bluetooth-Make-more-functions-static.txt 1038-Bluetooth-Update-security-filter-for-Extended-Inquiry-Response.txt 1043-IPv4-IPv6-UFO-Scatter-gather-approach.txt 1044-MCAST-IPv6-Fix-algorithm-to-compute-Querier-s-Query-Interval.txt 1055-tg3! -add-5714-5715-support.txt 1056-tg3-fix-ASF-heartbeat.txt 1057-tg3-update-version-and-minor-fixes.txt 1058-ibmveth-fix-bonding.txt 1059-ibmveth-fix-buffer-pool-management.txt 1060-ibmveth-fix-buffer-replenishing.txt 1061-ibmveth-lockless-TX.txt 1062-ibmveth-fix-failed-addbuf.txt 1063-pcnet_cs-fix-mii-init-code-for-older-DL10019-based-cards.txt 1065-s2io-kconfig-help-fix.txt 1066-b44-reports-wrong-advertised-flags.txt 1067-sis190.c-fix-multicast-MAC-filter.txt 1068-smc91x-shut-down-power-after-probing.txt 1070-starfire-free_irq-on-error-path-of-netdev_open.txt 1073-netdrvr-b44-include-linux-dma-mapping.h-to-eliminate-warning.txt 1074-sundance-fix-DFE-580TX-Tx-Underrun.txt 1075-New-PowerPC-4xx-on-chip-ethernet-controller-driver.txt 1078-sis900-come-alive-after-temporary-memory-shortage.txt 1079-Add-Wake-on-LAN-support-to-sis900-2.txt 1080-drivers-net-Remove-pointless-checks-for-NULL-prior-to-calling-kfree.txt 1082-netdrvr-ne2k-pci-based-card-does-not-support-bus-mastering.txt ! 1083-ipw2200-Missing-kmalloc-check.txt 1159-SCTP-Rename-SCTP-! specific -control-message-flags.txt 1163-SCTP-Fix-SCTP_SETADAPTION-sockopt-to-use-the-correct-structure.txt 1164-SCTP-Allow-SCTP_MAXSEG-to-revert-to-default-frag-point-with-a-0-value.txt 1196-SCTP-Do-not-allow-unprivileged-programs-initiating-new-associations-on.txt 1200-e1000-remove-warning-about-e1000_suspend.txt 1201-eepro.c-module_param_array-cleanup.txt 1202-b44-fix-suspend-resume.txt 1203-e1000-use-vmalloc_node.txt 1204-revert-orinoco-Information-leakage-due-to-incorrect-padding.txt 1205-Better-fixup-for-the-orinoco-driver.txt 1206-e1000-Fixes-e1000_suspend-warning-when-CONFIG_PM-is-not-enabled.txt 1320-ETH-ether-address-compare.txt 1324-Add-modalias-for-pmac-network-drivers.txt 1328-mv643xx_eth_showsram-Added-information-message-when-using-the-SRAM.txt 1329-IPV4-Fix-issue-reported-by-Coverity-in-ipv4-fib_frontend.c.txt 1389-s2io-iomem-annotations.txt 1397-bluetooth-hidp-is-broken-on-s390.txt 1403-drivers-net-tg3-Use-the-DMA_-32-64-BIT_MASK-constants.txt 1405-prism54-Free-skb-a! fter-disabling-interrupts.txt 1748-DRIVER-MODEL-Add-missing-platform_device.h-header.txt 1749-PPC-44x-EMAC-driver-add-440SPe-support.txt 1750-PPC-44x-EMAC-driver-add-440GR-support.txt 1751-PPC-4xx-EMAC-driver-fix-VSC8201-PHY-initialization.txt 1754-fec_8xx-Remove-dependency-on-NETTA-NETPHONE.txt 1755-fec_8xx-Add-support-for-Intel-PHY-LX971.txt 1761-vmalloc_node.txt 1854-ARM-3066-1-Fix-PXA-irda-driver-suspend-resume-functions.txt 1920-m32r-SMC91x-driver-update.txt 1929-smsc-ircc2-PM-cleanup-do-not-close-device-when-suspending.txt 1941-remove-some-more-check_region-stuff.txt 1961-Typo-fix-dot-after-newline-in-printk-strings.txt 2026-sparse-cleanups-NULL-pointers-C99-struct-init.txt 2067-netdrvr-8139too-replace-hand-crafted-kernel-thread-with-workqueue.txt 2078-BRIDGE-Use-ether_compare.txt 2079-NETFILTER-Add-revision-support-to-arp_tables-and-ip6_tables.txt 2080-ROSE-rose_heartbeat_expiry-locking-fix.txt 2081-IPV6-Fix-behavior-of-ip6_route_input-for-link-local-address.txt 2083-! DCCP-Simplify-skb_set_owner_w-semantics.txt 2089-DCCP-Set-soc! ket-owne r-iff-packet-is-not-data.txt 2090-MCAST-IPv6-Check-packet-size-when-process-Multicast.txt 2227-ibmveth-fix-panic-in-initial-replenish-cycle.txt 2245-MCAST-ip-6-_mc_add_src-should-be-called-when-number-of-sources-is-zero.txt 2256-IPV6-inet6_ifinfo_notify-should-use-RTM_DELLINK-in-addrconf_ifdown.txt 2267-PKT_SCHED-Rework-QoS-and-or-fair-queueing-configuration.txt 2396-ARM-Reverted-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 2410-SUNRPC-allow-sunrpc.o-to-link-when-CONFIG_SYSCTL-is-disabled.txt 2411-NFS-SUNRPC-NLM-fix-unused-variable-warnings-when-CONFIG_SYSCTL-is-disabled.txt 2416-NETFILTER-PPTP-helper-Fix-compilation-of-conntrack-helper-without-NAT.txt 2421-netdrvr-8139too-use-cancel_rearming_delayed_work-to-cancel-thread.txt 2422-netdrvr-8139too-use-rtnl_shlock_nowait-rather-than-rtnl_lock_interruptible.txt 2425-NETFILTER-Fix-double-free-after-netlink_unicast-in-ctnetlink.txt 2430-NETFILTER-nfnetlink-Use-kzalloc.txt 2431-NETFILTER-CONNMARK-target-! needs-ip_conntrack.txt 2433-NETEM-use-PSCHED_LESS.txt 2435-drivers-net-wireless-airo.c-unsigned-comparason.txt 2436-S2io-Multi-buffer-mode-support.txt 2438-pcnet32-show-name-of-failing-device.txt 2439-pcnet32-AT2700-2701-and-Bugzilla-2699-4551.txt 2440-pcnet32-Prevent-hang-with-79c976.txt 2441-phy-address-mask-support-for-generic-phy-layer.txt 2442-PKT_SCHED-Generic-RED-layer.txt 2443-NET-Introduce-INET_ECN_set_ce-function.txt 2444-PKT_SCHED-RED-Use-new-generic-red-interface.txt 2445-PKT_SCHED-RED-Use-generic-queue-management-interface.txt 2446-PKT_SCHED-RED-Dont-start-idle-periods-while-already-idling.txt 2447-PKT_SCHED-RED-Cleanup-and-remove-unnecessary-code.txt 2448-PKT_SCHED-GRED-Cleanup-equalize-flag-and-add-new-WRED-mode-detection.txt 2449-PKT_SCHED-GRED-Transform-grio-to-GRED_RIO_MODE.txt 2450-PKT_SCHED-GRED-Cleanup-dumping.txt 2451-PKT_SCHED-GRED-Dump-table-definition.txt 2452-PKT_SCHED-GRED-Use-a-central-table-definition-change-procedure.txt 2453-PKT_SCHED-GRED-Repo! rt-out-of-bound-DPs-as-illegal.txt 2454-PKT_SCHED-GRED-Use-ce! ntral-VQ -change-procedure.txt 2455-PKT_SCHED-GRED-Use-new-generic-red-interface.txt 2456-PKT_SCHED-GRED-Do-not-reset-statistics-in-gred_reset-gred_change.txt 2457-PKT_SCHED-GRED-Report-congestion-related-drops-as-NET_XMIT_CN.txt 2458-PKT_SCHED-GRED-Use-generic-queue-management-interface.txt 2459-PKT_SCHED-GRED-Introduce-tc_index_to_dp.txt 2460-PKT_SCHED-GRED-Improve-error-handling-and-messages.txt 2461-PKT_SCHED-GRED-Remove-initd-flag.txt 2462-PKT_SCHED-GRED-Dont-abuse-default-VQ-for-equalizing.txt 2463-PKT_SCHED-GRED-Remove-auto-creation-of-default-VQ.txt 2464-PKT_SCHED-GRED-Cleanup-and-remove-unnecessary-code.txt 2465-PKT_SCHED-GRED-Fix-restart-of-idle-period-in-WRED-mode-upon-dequeue-and-drop.txt 2466-PKT_SCHED-GRED-Support-ECN-marking.txt 2467-PKT_SCHED-G-RED-Introduce-hard-dropping.txt 2468-DRIVER-MODEL-Improved-dynamically-allocated-platform_device-interface.txt 2469-DRIVER-MODEL-Fix-depca.txt 2470-DRIVER-MODEL-Fix-jazzsonic.txt 2471-DRIVER-MODEL-Fix-macsonic.txt 2476-NETEM-Su! pport-time-based-reordering.txt 2477-NETEM-Add-version-string.txt 2478-NET-Fix-race-condition-in-sk_stream_wait_connect.txt 2479-TCP-DCCP-Randomize-port-selection.txt 2481-drivers-net-ixgb-make-some-code-static.txt 2482-drivers-net-e1000-possible-cleanups.txt 2483-drivers-net-hamradio-dmascc.c-remove-dmascc_setup.txt 2484-prism54-Remove-redundant-assignment.txt 2485-bnx2-add-5708-support.txt 2486-bnx2-update-firmware-for-5708.txt 2487-bnx2-update-nvram-code-for-5708.txt 2488-bnx2-update-firmware-handshake-for-5708.txt 2489-bnx2-refine-bnx2_poll.txt 2490-bnx2-update-version-and-minor-fixes.txt 2493-Remove-linux-version.h-include-from-drivers-net-phy-and-net-ieee80211.txt 2494-netdrvr-fac_8xx-build-fix.txt 2495-netdrvr-s2io-warning-fixes.txt 2645-b44-b44_start_xmit-returns-with-a-lock-held-when-it-fails-allocating.txt 2646-b44-miscellaneous-cleanup.txt 2647-b44-expose-counters-through-ethtool.txt 2648-b44-s-spin_lock_irqsave-spin_lock-in-b44_interrupt.txt 2649-b44-late-request! _irq-in-b44_open.txt 2688-3c59x-convert-to-use-of-pci_iomap-A! PI.txt 2 689-3c59x-cleanup-of-mdio_read-routines-to-use-MII_-macros.txt 2690-3c59x-avoid-blindly-reading-link-status-twice.txt 2691-3c59x-bounds-checking-for-hw_checksums.txt 2692-3c59x-cleanup-init-of-module-parameter-arrays.txt 2693-3c59x-fix-some-grammar-in-module-parameter-descriptions.txt 2694-3c59x-support-ETHTOOL_GPERMADDR.txt 2695-3c59x-correct-rx_dropped-counting.txt 2696-3c59x-enable-use-of-memory-mapped-PCI-I-O.txt 2697-3c59x-don-t-enable-scatter-gather-w-o-checksum-support.txt 2828-knfsd-make-sure-svc_process-call-the-correct-pg_authenticate-for-multi-service-port.txt 2934-m68knommu-FEC-ethernet-header-support-for-the-ColdFire-5208.txt 2935-m68knommu-FEC-ethernet-support-for-the-ColdFire-5208.txt 2984-scripts-Lindent-on-ieee80211-subsystem.txt 2985-Fix-problem-with-WEP-unicast-key-index-0.txt 2986-Update-version-ieee80211-stamp-to-1.1.7.txt 2987-Ran-scripts-Lindent-on-drivers-net-wireless-ipw2-1-2-00.-c-h.txt 2988-IPW_DEBUG-has-already-included-DRV_NAME-remove-double-pref! ix-print.txt 2989-Catch-ipw2200-up-to-equivelancy-with-v1.0.1.txt 2990-Catch-ipw2200-up-to-equivelancy-with-v1.0.2.txt 2991-Catch-ipw2200-up-to-equivelancy-with-v1.0.3.txt 2992-Catch-ipw2200-up-to-equivelancy-with-v1.0.4.txt 2993-Catch-ipw2100-up-to-equivelancy-with-v1.1.1.txt 2994-Fixed-WEP-on-ipw2100-priv-sec-was-being-used-instead-of.txt 2995-Bug-339-Fix-ipw2100-iwconfig-set-get-txpower.txt 2996-Move-code-from-ipw2100_wpa_enable-to-IPW2100_PARAM_DROP_UNENCRYPTED-to.txt 2997-Catch-ipw2200-up-to-equivelancy-with-v1.0.5.txt 2998-Fix-hardware-encryption-both-WEP-and-AES-doesn-t-work-with-fragmentation.txt 2999-Fix-is_duplicate_packet-bug-for-fragmentation-number-setting.txt 3000-bug-667-Fix-the-notorious-No-space-for-Tx-bug.txt 3001-Bug-637-Set-tx-power-for-A-band.txt 3002-Changed-default-of-missed-beacons-to-miss-before-disassociation-to-24.txt 3003-Updated-to-support-ieee80211-callback-to-is_queue_full-for-802.11e.txt 3004-Fixed-some-compiler-issues-if-CONFIG_IPW2200_QOS-is! -enabled.txt 3005-Added-more-useful-geography-encoding-so-peo! ple-s-ex perience-with.txt 3006-Workaround-kernel-BUG_ON-panic-caused-by-unexpected-duplicate-packets.txt 3007-Disable-host-fragmentation-in-open-mode-since-IPW2200-2915-hardware.txt 3008-Bug-792-Fix-WPA-PSK-AES-both-for-Dipw-and-Dwext.txt 3009-Fixes-the-ad-hoc-network-WEP-key-list-issue.txt 3010-Bug-701-Fix-a-misuse-of-ieee-mode-with-ieee-iw_mode.txt 3011-Fix-ipw_wx_get_txpow-shows-wrong-disabled-value.txt 3012-Fix-firmware-error-when-setting-tx_power.txt 3013-Modified-ipw_config-and-STATUS_INIT-setting-to-correct-race-condition.txt 3014-Switched-firmware-error-dumping-so-that-it-will-capture-a-log-available.txt 3015-Changed-all-of-the-ipw_send_cmd-calls-to-return-any-ipw_send_cmd-error.txt 3016-Added-cmdlog-in-non-debug-systems.txt 3017-Migrated-some-of-the-channel-verification-code-back-into-the-driver-to.txt 3018-Updated-ipw2200-to-use-the-new-ieee80211-callbacks.txt 3019-Added-wait_state-wakeup-on-scan-completion.txt 3020-Bug-455-Fix-frequent-channel-change-generates-firmware-fa! tal-error.txt 3021-Bug-760-Fix-setting-WEP-key-in-monitor-mode-causes-IV-lost.txt 3022-Don-t-set-hardware-WEP-if-we-are-actually-using-TKIP-AES.txt 3023-Make-all-the-places-the-firmware-fails-to-load-showerrors-in-decimal.txt 3024-Adds-radiotap-support-to-ipw2200-in-monitor-mode.txt 3025-Fixed-is_network_packet-to-include-checking-for-broadcast-packets.txt 3026-Mixed-PTK-GTK-CCMP-TKIP-support.txt 3027-Card-with-WEP-enabled-and-using-shared-key-auth-will-have-firmware.txt 3028-Fixed-problem-with-get_cmd_string-not-existing-if-CONFIG_IPW_DEBUG-disabled.txt 3029-Removed-PF_SYNCTHREAD-legacy.txt 3030-Fixes-problem-with-WEP-not-working-association-succeeds-but-no-Tx-Rx.txt 3031-Fix-bug-771-Too-many-8-bytes-recieved-when-using-AES-hwcrypto.txt 3032-Fixes-WEP-firmware-error-condition.txt 3033-Updated-driver-version-stamps-for-ipw2100-1.1.3-and-ipw2200-1.0.7.txt 3034-Pulled-out-a-stray-KERNEL_VERSION-check-around-the-suspend-handler.txt 3035-Fix-Driver-using-old-proc-net-wireless-su! pport-please-fix-driver-message.txt 3036-Removed-legacy-WIREL! ESS_EXT- checks-from-ipw2200.c.txt 3037-Fixes-missed-beacon-logic-in-relation-to-on-network-AP-roaming.txt 3038-Removed-warning-about-TKIP-not-being-configured-if-countermeasures-are.txt 3039-Added-channel-support-for-ipw2200-cards-identified-as-ZZR.txt 3040-Fixed-problem-with-not-being-able-to-send-broadcast-packets.txt 3041-Fixed-parameter-reordering-in-firmware-log-routine.txt 3042-Updated-firmware-version-stamp-to-2.4-from-2.3-so-it-will-use-the-latest-firmware.txt 3043-Update-version-ipw2200-stamp-to-1.0.8.txt 3081-fix-NET_RADIO-n-IEEE80211-y-compile.txt 3083-kill-include-linux-eeprom.h.txt 3084-drivers-net-s2io.c-make-functions-static.txt 3085-prism54-Unused-variable-extraneous-udelay.txt 3086-prism54-Transmit-stats-updated-in-wrong-place.txt 3087-Fix-sparse-warning-in-e100-driver.txt 3088-atmel-memset-correct-range.txt 3117-IPV6-Put-addr_diff-into-common-header-for-future-use.txt 3118-IPV6-Make-ipv6_addr_type-more-generic-so-that-we-can-use-it-for-source-address-selection.txt ! 3119-IPV6-RFC3484-compliant-source-address-selection.txt 3121-PKT_SCHED-Correctly-handle-empty-ematch-trees.txt 3122-NET-sk_add_backlog-convert-from-macro-to-inline.txt 3124-PPP-handle-misaligned-accesses.txt 3125-PPP-add-PPP-MPPE-encryption-module.txt 3126-IRDA-donauboe-locking-fix.txt 3127-NET-kfree-cleanup.txt 3128-IPV4-Fix-ip_queue_xmit-identity-increment-for-TSO-packets.txt 3131-Bluetooth-Add-endian-annotations-to-the-core.txt 3132-Bluetooth-Remove-the-usage-of-proc-completely.txt 3155-SERIAL-IOC3-Update-8250-driver-bits.txt 3160-skge-clear-PCI-PHY-COMA-mode-on-boot.txt 3161-skge-use-kzalloc.txt 3162-skge-add-mii-ioctl-support.txt 3163-skge-goto-low-power-mode-on-shutdown.txt 3164-skge-use-prefetch-on-receive.txt 3165-skge-spelling-fixes.txt 3166-skge-increase-version-number.txt 3168-wireless-ipw2100-kill-unused-var-warnings-for-debug-disabled-code.txt 3169-ieee80211-cleanup-crypto-list-handling-other-minor-cleanups.txt 3170-b44-replace-B44_FLAG_INIT_COMPLETE-with-netif! _running.txt 3171-b44-race-on-device-closing.txt 3172-b44-inc! rease-ve rsion-number.txt 3178-dgrs-fix-warnings-when-CONFIG_ISA-and-CONFIG_PCI-are-not-enabled.txt 3179-IOC-And-don-t-mark-the-things-as-broken-Cowboy.txt 3231-sanitize-lookup_hash-prototype.txt 3530-NETFILTER-packet-counter-of-conntrack-is-32bits.txt 3534-NETFILTER-ctnetlink-add-marking-support-from-userspace.txt 3535-NETFILTER-ctnetlink-add-module-alias-to-fix-autoloading.txt 3536-NETFILTER-ctnetlink-kill-unused-includes.txt 3537-NETFILTER-ctnetlink-get_conntrack-can-use-GFP_KERNEL.txt 3539-NETFILTER-nfnetlink-only-load-subsystems-if-CAP_NET_ADMIN-is-set.txt 3540-NETFILTER-stop-tracking-ICMP-error-at-early-point.txt 3542-NETFILTER-ctnetlink-propagate-error-instaed-of-returning-EPERM.txt 3543-NETFILTER-ctnetlink-Add-support-to-identify-expectations-by-ID-s.txt 3545-NETFILTER-ctnetlink-ICMP_ID-is-u_int16_t-not-u_int8_t.txt 3546-IPV6-Fix-fallout-from-CONFIG_IPV6_PRIVACY.txt 3547-IPV6-ip6ip6_lock-is-not-unlocked-in-error-path.txt 3566-txt 3596-NETFILTER-Add-nf_conntrack-subsystem.txt ! 3599-NETLINK-Type-safe-netlink-messages-attributes-interface.txt 3600-NETLINK-Make-netlink_callback-done-optional.txt 3601-NETLINK-Generic-netlink-receive-queue-processor.txt 3602-XFRM-Use-generic-netlink-receive-queue-processor.txt 3603-RTNETLINK-Use-generic-netlink-receive-queue-processor.txt 3604-NETLINK-Generic-netlink-family.txt 3615-SUNRPC-don-t-reencode-when-looping-in-call-transmit.txt 3627-netdrvr-8139too-fast-poll-for-thread-if-an-unlikely-race-occurs.txt 3660-BNX2-output-driver-name-as-prefix-in-error-message.txt 3661-BNX2-check-return-of-dev_alloc_skb-in-bnx2_test_loopback.txt 3662-BNX2-simplify-parameter-checks-in-bnx2_-get-set-_eeprom.txt 3663-NET-Detect-hardware-rx-checksum-faults-correctly.txt 3689-TCP-fix-congestion-window-update-when-using-TSO-deferal.txt 3690-TCP-simplify-microsecond-rtt-sampling.txt 3691-TCP-add-tcp_slow_start-helper.txt 3692-TCP-Appropriate-Byte-Count-support.txt 3693-TCP-receive-buffer-growth-limiting-with-mixed-MTU.txt 3694-TCP-spellin! g-fixes.txt 3695-TCP-speed-up-SACK-processing.txt 3701-disabl! e-DEBUG- in-ibmveth.txt 3703-sky2-needs-dma_mapping.h.txt 3728-gianfar-mii-needs-to-zero-out-the-mii_bus-structure.txt 3729-netdrvr-forcedeth-remove-superfluous-rx-engine-stop-start.txt 3730-netdrvr-forcedeth-support-for-irq-mitigation.txt 3731-netdrvr-forcedeth-phy-address-scan-range.txt 3732-SAA9730-Whitespace-cleanup.txt 3733-SAA9730-Driver-overhaul.txt 3734-smc91x-DB1200-support.txt 3735-gt96100eth.c-Don-t-concatenate-__FUNCTION__-with-strings.txt 3737-TCP-fix-vegas-build.txt 3742-DECNET-fix-SIGPIPE.txt 3752-IPV6-Fix-inet6_init-missing-unregister.txt 3754-SCTP-Fix-potential-NULL-pointer-dereference-in-sctp_v4_get_saddr.txt 3755-SCTP-Remove-timeouts-array-from-sctp_endpoint.txt 3756-SCTP-Fix-ia64-NaT-consumption-fault-with-sctp_sideffect-commands.txt 3757-SCTP-Include-ulpevents-in-socket-receive-buffer-accounting.txt 3789-IPV6-Fix-unnecessary-GFP_ATOMIC-allocation-in-fib6-dump.txt 3792-ARM-Use-correct-IO-operations-for-Pleb.txt 3815-net-allow-newline-terminated-IP-addresses-in-in_! aton.txt 3816-net-make-dev_valid_name-public.txt 3817-bonding-add-bond-name-to-all-error-messages.txt 3818-bonding-expand-module-param-descriptions.txt 3819-bonding-Add-transmit-policy-to-proc.txt 3820-bonding-get-slave-name-from-actual-slave-instead-of-param-list.txt 3821-bonding-move-kmalloc-out-of-spinlock-in-ALB-init.txt 3822-bonding-explicitly-clear-RLB-flag-during-ALB-init.txt 3823-bonding-expose-some-structs.txt 3824-bonding-make-functions-not-static.txt 3825-bonding-move-bond-creation-into-separate-function.txt 3826-bonding-make-bond_init-not-__init.txt 3827-bonding-Allow-ARP-target-table-to-have-empty-entries.txt 3828-bonding-add-ARP-entries-to-proc.txt 3829-bonding-add-sysfs-functionality-to-bonding-large.txt 3830-bonding-version-update.txt 3831-bonding-spelling-and-whitespace-corrections.txt 3832-bonding-comments-and-changelog.txt 3860-ppc-add-support-for-new-powerbooks.txt 3959-NETFILTER-nf_conntrack-Add-missing-code-to-TCP-conntrack-module.txt 3960-NETFILTER-nfn! etlink-unconditionally-require-CAP_NET_ADMIN.txt 3961-NETFILT! ER-link- netfilter-before-ipv4.txt 3962-NETFILTER-cleanup-IPv6-Netfilter-Kconfig.txt 3963-NETFILTER-fix-type-of-sysctl-variables-in-nf_conntrack_ipv6.txt 3964-NETFILTER-nf_conntrack-fix-possibility-of-infinite-loop-while-evicting-nf_ct_frag6_queue.txt 3965-NETFILTER-fix-leak-of-fragment-queue-at-unloading-nf_conntrack_ipv6.txt 4016-IPV6-small-fix-for-ipv6_dev_get_saddr-..txt 4017-IPV6-Fixes-sparse-warning-in-ipv6-ipv6_sockglue.c.txt 4018-LLC-Fix-TX-window-scaling.txt 4019-LLC-Make-core-block-on-remote-busy.txt 4020-LLC-Fix-typo.txt 4028-knfsd-make-sure-nfsd-doesn-t-hog-a-cpu-forever.txt 4032-sdladrv.c-build-fix.txt 4041-TCP-More-spelling-fixes.txt 4045-NETFILTER-Remove-nf_conntrack-stat-proc-file-when-cleaning-up.txt 4046-NETFILTER-Free-layer-3-specific-protocol-tables-at-cleanup.txt 4079-drivers-net-sk98lin-skge.c-make-SkPciWriteCfgDWord-a-static-inline.txt 4080-skge-fix-warning-from-inlining-SkPciWriteCfgDWord.txt 4085-IPV4-IPV6-replace-handmade-list-with-hlist-in-IPv-4-6-reassembl! y.txt 4087-r8169-fix-printk_ratelimit-in-the-interrupt-handler.txt 4088-r8169-do-not-abort-when-the-power-management-capabilities-are-disabled.txt 4094-NETFILTER-Fix-nf_conntrack-compilation-with-CONFIG_NETFILTER_DEBUG.txt 4127-ipw2200-disallow-direct-scanning-when-device-is-down.txt 4128-ipw2200-fix-error-log-offset-calculation.txt 4179-TCP-TCP-highspeed-build-error.txt 4183-LLC-Fix-compiler-warnings-introduced-by-TX-window-scaling-changes.txt 4184-NET-Sanitize-NET_SCHED-protection-in-net-sched-Kconfig.txt 4185-IPV6-Fib-dump-really-needs-GFP_ATOMIC.txt 4220-smc91x-fix-one-source-of-spurious-interrupts.txt 4221-smc91x-fix-bank-mismatch.txt 4226-e100-re-enable-microcode-with-more-useful-defaults.txt 4227-s2io-UFO-support.txt 4228-i82593.h-make-header-comment-GPL-compatible.txt 4229-IOC3-Replace-obsolete-PCI-API.txt 4230-au1000_eth-Include-linux-config.h.txt 4231-SAA9730-Add-missing-header-bits.txt 4232-prism54-Remove-extraneous-udelay-register-read.txt 4233-drivers-net-wirele! ss-hermes.c-unsigned-int-comparision.txt 4234-Gianfar-update-! and-sysf s-support.txt 4235-intel-ixp2000-network-driver.txt 4236-git-netdev-all-ieee80211_get_payload-warning-fix.txt 4240-fec_8xx-make-CONFIG_FEC_8XX-depend-on-CONFIG_8xx.txt 4241-ipw2100-Fix-Driver-using-old-proc-net-wireless.-message.txt 4242-e1000-avoid-leak-when-e1000_setup_loopback_test-fails.txt 4243-e1000-zero-out-pointers-in-e1000_free_desc_rings.txt 4246-wireless-hermes-build-fix.txt 4322-PKT_SCHED-sch_netem-correctly-order-packets-to-be-sent-simultaneously.txt 4324-NET-Reject-socket-filter-if-division-by-constant-zero-is-attempted.txt 4326-IPV6-Acquire-addrconf_hash_lock-for-read-in-addrconf_verify-..txt 4330-FIB_TRIE-Don-t-show-local-table-in-proc-net-route-output.txt 4331-NETFILTER-fixed-dependencies-between-modules-related-with-ip_conntrack.txt 4333-DCCP-Add-missing-no_policy-flag-to-struct-net_protocol.txt 4353-net-Fix-compiler-error-on-dgrs.c-when-CONFIG_PCI.txt 4393-NETLINK-Use-tgid-instead-of-pid-for-nlmsg_pid.txt 4394-IPV4-Fix-secondary-IP-addresses-after-promotio! n.txt 4395-NETFILTER-ctnetlink-Fix-refcount-leak-ip_conntrack-nat_proto.txt 4419-NETFILTER-ip_conntrack_netlink.c-needs-linux-interrupt.h.txt 4461-SUNRPC-Funny-looking-code-in-__rpc_purge_upcall.txt 4471-bonding-Remove-superfluous-changelog.txt 4510-IPV6-Implement-appropriate-dummy-rule-4-in-ipv6_dev_get_saddr.txt 4541-IPV4-tcp-route-Another-look-at-hash-table-sizes.txt 4542-ATM-always-return-the-first-interface-for-ATM_ITF_ANY.txt 4543-ATM-atm_pcr_goal-doesn-t-modify-its-argument-s-contents-mark-it-as-const.txt 4547-ATM-attempt-to-autoload-atm-drivers.txt 4550-ATM-avoid-race-conditions-related-to-atm_devs-list.txt 4551-ATM-deregistration-removes-device-from-atm_devs-list-immediately.txt 4553-NET-Add-const-markers-to-various-variables.txt 4554-IPV4-make-two-functions-static.txt 4555-NETFILTER-ipv4-small-cleanups.txt 4556-IPV6-make-two-functions-static.txt 4589-b44-missing-netif_wake_queue-in-b44_open.txt 4590-b44-early-return-in-dev-do_ioctl-when-the-device-is-not-up.txt 459! 2-b44-increase-version-number.txt 4601-e1000-fix-for-dhcp-iss! ue.txt 4 602-sky2-eliminate-special-case-for-EC-A1.txt 4603-sky2-add-MII-support.txt 4604-sky2-fix-receive-flush-pause-issues.txt 4605-sky2-improve-receive-performance.txt 4606-sky2-add-Yukon-EC-ultra-support.txt 4607-sky2-handle-DMA-boundary-crossing.txt 4608-sky2-change-netif_rx_schedule_test-to-__netif_schedule_prep.txt 4609-sky2-race-with-MTU-change.txt 4610-sky2-dual-port-tx-completion.txt 4611-sky2-byteorder-annotation.txt 4612-sky2-remove-pci-express-hacks.txt 4613-sky2-use-pci_register_driver.txt 4614-sky2-update-version-number.txt 4616-sk98lin-add-permanent-address-support.txt 4617-sk98lin-avoid-message-confusion-with-skge.txt 4619-sk98lin-remove-redundant-fields-in-device-info.txt 4621-ibm_emac-fix-graceful-stop-timeout-handling.txt 4622-ixp2000-register-netdevices-last.txt 4623-pm3386-zero-stats-properly.txt 4624-pm3386-remove-unnecessary-udelays.txt 4625-caleb-pm3386-include-proper-header-files.txt 4626-ixp2000-use-netif_rx_schedule_test.txt 4627-enp2611-don-t-check-netif! _running-in-link-status-timer.txt 4628-enp2611-use-dev-in-link-status-timer.txt 4629-enp2611-report-link-up-down-events.txt 4630-ixp2000-report-MAC-addresses-for-each-port-on-init.txt 4631-pm3386-add-hook-for-setting-MAC-address.txt 4632-pm3386-add-hook-for-setting-carrier.txt 4633-pm3386-implement-reset.txt 4634-enp2611-disable-enable-SERDES-carrier-on-interface-down-up.txt 4635-ixp2000-add-netpoll-support.txt 4636-ixp2000-add-driver-version-bump-version-to-0.2.txt 4637-mipsnet-Fix-Copyright-notice.txt 4638-jazzsonic-Fix-build-error.txt 4639-jazzsonic-Fix-platform-device-code.txt 4640-orinoco-fix-setting-power-management-parameters.txt 4641-skge-handle-VLAN-checksum-correctly-on-yukon-rev-0.txt 4643-wireless-airo-reset-card-in-init.txt 4644-netdrvr-fmvj18x_cs-fix-multicast-bug.txt 4645-airo.c-add-support-for-IW_ENCODE_TEMP-i.e.-xsupplicant.txt 4649-netdrvr-skge-fix-typo-fix-build.txt 4650-ipw2200-kzalloc-conversion-and-Kconfig-dependency-fix.txt 4651-Duplicate-IPW_DEBUG-opt! ion-for-ipw2100-and-2200.txt 4680-NETFILTER-Ignore-ACKs-ACKs-! on-half- open-connections-in-TCP-conntrack.txt 4681-NETFILTER-Fix-recent-match-jiffies-wrap-mismatches.txt 4729-SCTP-Return-socket-errors-only-if-the-receive-queue-is-empty.txt 4730-SCTP-Fix-getsockname-for-sctp-when-an-ipv6-socket-accepts-a-connection-from.txt 4731-IGMP-workaround-for-IGMP-v1-v2-bug.txt 4732-IPV4-Fix-EPROTONOSUPPORT-error-in-inet_create.txt 4733-IPV6-Load-protocol-module-dynamically.txt 4737-SUNRPC-Fix-Oopsable-condition-in-rpc_pipefs.txt 4741-ixp2000-change-netif_schedule_test-to-__netif_schedule_prep.txt 4742-sky2-interrupt-not-cleared.txt 4760-NETFILTER-Fix-incorrect-argument-to-ip_nat_initialized-in-ctnetlink.txt 4761-NETFILTER-nf_conntrack-Fix-missing-check-for-ICMPv6-type.txt 4762-NETFILTER-nfnetlink-Fix-calculation-of-minimum-message-length.txt 4763-NETFILTER-Fix-ip_conntrack_flush-abuse-in-ctnetlink.txt 4765-NETFILTER-Mark-ctnetlink-as-EXPERIMENTAL.txt 4766-NETFILTER-Wait-for-untracked-references-in-nf_conntrack-module-unload.txt 4768-NETFILTER-Don-t-use-con! ntrack-entry-after-dropping-the-reference.txt 4769-NET-make-function-pointer-argument-parseable-by-kernel-doc.txt 4770-DECNET-add-memory-buffer-settings.txt 4783-TCP-Vegas-stop-resetting-rtt-every-ack.txt 4784-TCP-Vegas-Remove-extra-call-to-tcp_vegas_rtt_calc.txt 4785-TCP-Vegas-timestamp-before-clone.txt 4787-TG3-remove-warning-on-race.txt 4801-NET-Fix-NULL-pointer-deref-in-checksum-debugging.txt 4807-IPv6-IPsec-fix-pmtu-calculation-of-esp.txt 4855-sky2-don-t-die-if-we-see-chip-rev-0xb5.txt 4856-sky2-device-structure-alignment.txt 4857-sky2-copy-threshold-as-module-parameter.txt 4858-sky2-ethtool-get-set-interrupt-coalescing.txt 4859-sky2-phy-processing-in-workqueue-rather-than-tasklet.txt 4860-sky2-no-irq-disable-needed-during-tx.txt 4861-sky2-ring-distance-optimization.txt 4862-sky2-map-length-optimization.txt 4863-sky2-tx-rx-ring-data-structure-split.txt 4864-sky2-transmit-logic-fixes.txt 4865-sky2-transmit-complete-index-optimization.txt 4866-sky2-transmit-complete-routi! ne-optimization.txt 4867-sky2-interrupt-poll-optimization.txt! 4868-sk y2-interrupt-coalescing-tuning.txt 4869-sky2-handle-tx-timeout.txt 4870-sky2-quiet-ring-full-message-in-case-of-race.txt 4871-sky2-prefetch-tuning.txt 4872-sky2-turn-on-tx-flow-control.txt 4873-sky2-disable-rx-checksum-on-Yukon-XL.txt 4874-sky2-version-0.10.txt 4875-pcnet32-use-MAC-address-from-prom-also-on-powerpc.txt 4878-TCPv6-Fix-skb-leak.txt 4883-NETFILTER-ip_nat_tftp-Fix-expectation-NAT.txt 4892-skge-get-rid-of-warning-on-race.txt 4893-ieee80211_crypt_tkip-depends-on-NET_RADIO.txt 4895-e1000-Fixes-for-8357x.txt 4921-netdrvr-skge-fix-build.txt 4975-TG3-Fix-nvram-arbitration-bugs.txt 4976-TG3-Fix-suspend-and-resume.txt 4977-TG3-Fix-5704-single-port-mode.txt 4978-TG3-Fix-low-power-state.txt 4984-IPV6-addrconf-Do-not-print-device-pointer-in-privacy-log-message.txt 4985-PKT_SCHED-Disable-debug-tracing-logs-by-default-in-packet-action-API.txt 5023-s2io-__iomem-annotations-for-recent-changes.txt 5035-Address-of-void-__user-is-void-__user-not-void-__user.txt 5101-XFRM-Handle-D! CCP-in-xfrm-4-6-_decode_session.txt 5104-SCTP-Fix-sctp-to-not-return-erroneous-POLLOUT-events.txt 5106-TG3-Fix-peer-device-handling.txt 5107-TG3-Some-low-power-fixes.txt 5108-TG3-Add-tw32_wait_f-for-some-sensitive-registers.txt 5109-TG3-Fix-ethtool-memory-test.txt 5112-RPC-Do-not-block-on-skb-allocation.txt 5114-SUNRPC-Fix-EPIPE-error-on-mount-of-rpcsec_gss-protected-partitions.txt 5131-IPV6-Flag-RTF_ANYCAST-for-anycast-routes.txt 5132-IPV6-Try-not-to-send-icmp-to-anycast-address.txt 5133-IPV6-Defer-IPv6-device-initialization-until-the-link-becomes-ready.txt 5134-IPV6-Run-DAD-when-the-link-becomes-ready.txt 5135-IPV6-Don-t-select-a-tentative-address-as-a-source-address.txt 5140-NETROM-Fix-three-if-statements-in-nr_state1_machine.txt 5141-VLAN-Add-two-missing-checks-to-vlan_ioctl_handler.txt 5142-IPV6-Fix-address-deletion.txt 5143-DCCP-Comment-typo.txt 5147-IPSEC-Fix-policy-updates-missed-by-sockets.txt 5153-SUNGEM-Fix-link-error-with-CONFIG_HOTPLUG-disabled.txt 5156-IPV6-Fix! -dead-lock.txt 5157-IPV6-Fix-Temporary-Address-Generation.txt! 5158-ch elsio-transmit-routine-return-values.txt 5159-skge-avoid-up-down-on-speed-changes.txt 5160-skge-avoid-up-down-on-pause-param-changes.txt 5161-skge-handle-out-of-memory-on-MTU-size-changes.txt 5162-skge-get-rid-of-Yukon2-defines.txt 5163-skge-handle-out-of-memory-on-ring-parameter-change.txt 5164-skge-version-number-1.3.txt 5165-git-netdev-all-s2io-warning-fix.txt 5166-spidernet-fix-Kconfig-after-BPA-CELL-rename.txt 5167-skge-error-handling-on-resume.txt 5168-sky2-handle-out-of-memory-on-admin-changes.txt 5169-sky2-don-t-lose-multicast-addresses.txt 5170-sky2-handle-hardware-packet-overrun.txt 5171-sky2-version-0.11.txt 5173-orinoco_nortel-Fix-incorrect-PCI-resource-use.txt 5174-orinoco_nortel-Add-Symbol-LA-4123-ID.txt 5175-missing-license-for-libphy.ko.txt 5179-forcedeth-fix-random-memory-scribbling-bug.txt 5198-IPV6-Increase-default-MLD_MAX_MSF-to-64.txt 5199-BR_NETFILTER-Fix-leak-if-skb-traverses-1-bridge.txt 5201-IPV6-Fix-addrconf-dead-lock.txt 5202-NET-Validate-socket-fi! lters-against-BPF_MAXINSNS-in-one-spot.txt 5203-IPV6-mcast-Fix-multiple-issues-in-MLDv2-reports.txt 5205-TG3-ethtool-d-hangs-PCIe-systems.txt 5206-TG3-Update-driver-version-and-reldate.txt 5518-s-retreiv-retriev-g.txt 5541-TCP-BIC-remove-low-utilization-code.txt 5542-TCP-BIC-spelling-and-whitespace.txt 5543-TCP-BIC-CUBIC-window-growth-2.0.txt 5544-NETFILTER-ip_tables-NUMA-aware-allocation.txt 5545-NETFILTER-ebtables-Support-nf_log-API-from-ebt_log-and-ebt_ulog.txt 5546-IPV4-Safer-reassembly.txt 5547-IPV6-Reuse-inet_csk_get_port-in-tcp_v6_get_port.txt 5548-IPV6-Generalise-__tcp_v6_hash-renaming-it-to-__inet6_hash.txt 5549-ICSK-make-inet_csk_reqsk_queue_hash_add-timeout-arg-unsigned-long.txt 5550-IPV6-Generalise-tcp_v6_search_req-tcp_v6_synq_add.txt 5551-IPV6-Introduce-inet6_rsk.txt 5552-ICSK-Rename-struct-tcp_func-to-struct-inet_connection_sock_af_ops.txt 5553-ICSK-Move-v4_addr2sockaddr-from-TCP-to-icsk.txt 5554-DCCP-Introduce-dccp_ipv4_af_ops.txt 5555-IP-Simplify-and-consoli! date-MSG_PEEK-error-handling.txt 5556-UDP-udp_checksum_init-r! eturn-va lue.txt 5557-IPVS-remove-dead-code.txt 5558-NET-Avoid-atomic-xchg-for-non-error-case.txt 5559-AF_UNIX-Remove-superfluous-reference-counting-in-unix_stream_sendmsg.txt 5560-IPV6-Generalise-some-functions.txt 5561-IPV6-Introduce-inet6_timewait_sock.txt 5562-IPV6-Export-some-symbols-for-DCCPv6.txt 5563-DCCP-Just-rename-dccp_v4_prot-to-dccp_prot.txt 5564-DCCP-Prepare-the-AF-agnostic-core-for-the-introduction-of-DCCPv6.txt 5565-IPV6-Export-ipv6_opt_accepted.txt 5567-DCCP-Use-reqsk_free-in-dccp_v4_conn_request.txt 5571-TCP-Move-the-TCPF_-enum-to-tcp_states.h.txt 5573-AF_UNIX-Use-spinlock-for-unix_table_lock.txt 5574-BRIDGE-allow-setting-hardware-address-of-bridge-pseudo-dev.txt 5575-BRIDGE-handle-speed-detection-after-carrier-changes.txt 5576-BRIDGE-filter-packets-in-learning-state.txt 5577-BRIDGE-limited-ethtool-support.txt 5578-BRIDGE-add-version-number.txt 5579-PKT_SCHED-netem-packet-corruption-option.txt 5582-TCP-cubic-precompute-constants.txt 5583-TCP-cubic-use-Newton-Raphson! .txt 5584-IPV4-fib_trie-Add-credits.txt 5585-SCTP-Update-SCTP_PEER_ADDR_PARAMS-socket-option-to-the-latest-api-draft.txt 5586-SCTP-Add-support-for-SCTP_DELAYED_ACK_TIME-socket-option.txt 5587-NET-Small-cleanup-to-socket-initialization.txt 5588-NET-move-struct-proto_ops-to-const.txt 5589-PKTGEN-Deinitialise-static-variables.txt 5590-NET-Fix-sock_init-return-value.txt 5591-NET-restructure-sock_aio_-read-write-sock_-readv-writev.txt 5594-TCP-Don-t-use-__constant_htonl-for-a-non-const-arg.txt 5595-PPPOX-Fix-assignment-into-const-proto_ops.txt 5596-NET-Speed-up-__alloc_skb.txt 5597-AF_UNIX-Convert-to-use-a-spinlock-instead-of-rwlock.txt 5598-NETLINK-genetlink-fix-cmd-type-in-genl_ops-to-be-consistent-to-u8.txt 5599-NETROM-Remove-unessecary-lock_sock-calls-in-netrom_ioctl.txt 5600-NET-Add-a-dev_ioctl-fallback-to-sock_ioctl.txt 5601-TG3-fixup-tot_len-calculation.txt 5602-IPVS-Cleanup-IP_VS_DBG-statements.txt 5603-DECNET-Only-use-local-routers.txt 5604-DCCP-Do-not-process-a-packet-t! wice-when-it-s-not-in-state-DCCP_OPEN.txt 5605-DCCP-Send-an-A! CK-vecto r-when-ACKing-a-response-packet.txt 5606-DCCP-Notify-CCID-only-after-ACK-vectors-have-been-processed.txt 5607-BRIDGE-Fix-faulty-check-in-br_stp_recalculate_bridge_id.txt 5608-IPV4-fib_trie-build-fix.txt 5610-IEEE80211-ipw2200-Simplify-multicast-checks.txt 5611-TCP-less-inline-s.txt 5612-DCCP-ackvec-Fix-spelling-of-throw.txt 5613-DCCP-ackvec-use-u8-for-the-buf-offsets.txt 5614-TCP-syn_flood_warning-is-only-needed-if-CONFIG_SYN_COOKIES-is-selected.txt 5700-ECONET-Use-macro-for-spinlock_t-definition.txt 5701-IPV6-Use-macro-for-rwlock_t-initialization.txt 5702-NETFILTER-Use-macro-for-spinlock_t-rwlock_t-initializations-definition.txt 5703-NET-More-instruction-checks-fornet-core-filter.c.txt 5704-TCP-tcp_vegas-Fix-slow-start.txt 5730-IPVS-Fix-compilation.txt 5731-NETFILTER-Decrease-number-of-pointer-derefs-in-nfnetlink_queue.c.txt 5732-NETFILTER-Decrease-number-of-pointer-derefs-in-nf_conntrack_core.c.txt 5733-NETFILTER-ctnetlink-remove-bogus-checks-in-ICMP-protocol-at-dumping.tx! t 5734-NETFILTER-ctnetlink-Add-sanity-checkings-for-ICMP.txt 5735-NETFILTER-ctnetlink-propagate-ctnetlink_dump_tuples_proto-return-value-back.txt 5736-NETFILTER-ctnetlink-use-u_int32_t-instead-of-unsigned-int.txt 5737-NETFILTER-ctnetlink-ctnetlink_event-cleanup.txt 5738-NETFILTER-ctnetlink-fix-conntrack-mark-race.txt 5739-NETFILTER-ctnetlink-remove-unused-variable.txt 5740-NETFILTER-Add-ctnetlink-port-for-nf_conntrack.txt 5741-NETFILTER-Filter-dumped-entries-based-on-the-layer-3-protocol-number.txt 5742-NETFILTER-Fix-module_param-types-and-permissions.txt 5743-NETFILTER-ctnetlink-Fix-dumping-of-helper-name.txt 5744-NETFILTER-Remove-okfn-usage-in-ip_vs_core.c.txt 5745-NETFILTER-Call-POST_ROUTING-hook-before-fragmentation.txt 5746-NETFILTER-make-ipv6_find_hdr-find-transport-protocol-header.txt 5747-NETFILTER-Export-ip6_masked_addrcmp-don-t-pass-IPv6-addresses-on-stack.txt 5748-NETFILTER-nf_conntrack_l3proto_ipv4.c-needs-net-route.h.txt 5749-NETFILTER-Use-HOPLIMIT-metric-as-TTL! -of-TCP-reset-sent-by-REJECT.txt 5776-NET-Change-1500-to-ETH_! DATA_LEN -in-some-files.txt 5796-knfsd-fix-hash-function-for-IP-addresses-on-64bit-little-endian-machines.txt 6008-parport-include-fixes.txt 6015-Keep-nfsd-from-exiting-when-seeing-recv-errors.txt added hold last reject removed \1, not void 0036-sky2-new-experimental-Marvell-Yukon2-driver.txt 0072-8139cp-support-ETHTOOL_GPERMADDR.txt 0073-8139too-support-ETHTOOL_GPERMADDR.txt 0074-b44-support-ETHTOOL_GPERMADDR.txt 0075-e1000-support-ETHTOOL_GPERMADDR.txt 0076-e100-support-ETHTOOL_GPERMADDR.txt 0077-forcedeth-support-ETHTOOL_GPERMADDR.txt 0078-ixgb-support-ETHTOOL_GPERMADDR.txt 0079-ne2k-pci-support-ETHTOOL_GPERMADDR.txt 0080-pcnet32-support-ETHTOOL_GPERMADDR.txt 0081-r8169-support-ETHTOOL_GPERMADDR.txt 0082-skge-support-ETHTOOL_GPERMADDR.txt 0083-sundance-support-ETHTOOL_GPERMADDR.txt 0084-via-rhine-support-ETHTOOL_GPERMADDR.txt 0087-Replace-drivers-net-wan-custom-ctype-macros-with-standard-ones.txt 0088-drivers-net-wan-possible-cleanups.txt 0089-lne390-bogus-casts.txt 0090-C99-initi! alizers-in-ray_cs.c.txt 0091-mii-Add-test-for-GigE-support.txt 0092-Add-rapidio-net-driver.txt 0100-pcnet32-set_ringparam-implementation.txt 0101-pcnet32-set-min-ring-size-to-4.txt 0102-sky2-driver-update.txt 0103-orinoco-Remove-conditionals-that-are-useless-in-the-kernel-drivers.txt 0104-orinoco-Don-t-include-net-ieee80211.h-twice.txt 0105-orinoco-Update-PCMCIA-ID-s.txt 0106-Fixed-some-endian-issues-with-802.11-header-usage-in-ieee80211_rx.c.txt 0107-ieee80211-quality-scaling-algorithm-extension-handler.txt 0108-ieee80211-Added-wireless-spy-support.txt 0109-Changed-802.11-headers-to-use-ieee80211_info_element-0.txt 0110-ieee80211-Removed-ieee80211_info_element_hdr.txt 0111-ieee80211-Cleanup-memcpy-parameters.txt 0112-ieee80211-Switched-to-sscanf-in-store_debug_level.txt 0113-ieee80211-Fixed-type-o-of-abg_ture-abg_true.txt 0114-Updated-ipw2200-to-compile-with-ieee80211-abg_ture-to-abg_true-change.txt 0163-sky2-fix-FIFO-DMA-alignment-problems.txt 0164-sky2-allow-ethtool-debug! -access-to-all-of-PCI-space.txt 0165-sky2-version-0.5.txt 016! 6-ieee80 211-Updated-ipw2100-to-be-compatible-with-ieee80211_hdr-changes.txt 0167-ieee80211-Updated-ipw2100-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0168-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211_hdr-changes.txt 0169-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0170-ieee80211-Updated-atmel-to-be-compatible-with-ieee80211_hdr-changes.txt 0171-ieee80211-Fixed-a-kernel-oops-on-module-unload.txt 0172-ieee80211-Hardware-crypto-and-fragmentation-offload-support.txt 0173-ieee80211-Fix-time-calculation-switching-to-use-jiffies_to_msecs.txt 0174-ieee80211-Fix-kernel-Oops-when-module-unload.txt 0175-ieee80211-Allow-drivers-to-fix-an-issue-when-using-wpa_supplicant-with-WEP.txt 0176-ieee82011-Added-WE-18-support-to-default-wireless-extension-handler.txt 0177-ieee80211-Renamed-ieee80211_hdr-to-ieee80211_hdr_3addr.txt 0178-ieee80211-adds-support-for-the-creation-of-RTS-packets.txt 0179-ieee82011-Added-ieee80211_tx_frame! -to-convert-generic-802.11-data-frames-and-callbacks.txt 0180-ieee80211-Fix-TKIP-repeated-fragmentation-problem-and-payload_size-reporting.txt 0181-ieee80211-Return-NETDEV_TX_BUSY-when-QoS-buffer-full.txt 0182-ieee80211-Add-QoS-WME-support-to-the-ieee80211-subsystem.txt 0183-ieee80211-Added-ieee80211_geo-to-provide-helper-functions.txt 0184-ieee80211-Added-ieee80211_radiotap.h.txt 0185-ieee80211-Additional-fixes-for-endian-aware-types.txt 0186-ieee80211-extern-inline-to-static-inline.txt 0187-ieee80211-Type-o-capbility-definition-for-QoS-and-ERP-parsing.txt 0188-ieee80211-Mixed-PTK-GTK-CCMP-TKIP-support.txt 0189-ieee80211-Keep-auth-mode-unchanged-after-iwconfig-key-off-on-cycle.txt 0190-ieee80211-Updated-copyright-dates.txt 0191-ieee80211-Updated-hostap-to-be-compatible-with-ieee80211_hdr-changes.txt 0192-ieee80211-Updated-hostap-to-be-compatible-with-extra_prefix_len-changes.txt 0193-ieee82011-Remove-WIRELESS_EXT-ifdefs.txt 0194-forcedeth-add-hardware-tx-checksumming.txt 01! 99-ieee80211-Added-subsystem-version-string-and-reporting-via! -MODULE_ VERSION.txt 0200-ieee80211-Added-handle_deauth-callback-enhanced-tkip-ccmp-support-of-varying-hw-sw-offload.txt 0201-ieee80211-added-IE-comments-reason_code-to-reason-removed-info_element-from-ieee80211_disassoc.txt 0202-ieee80211-in-tree-driver-updates-to-sync-with-latest-ieee80211-series.txt 0203-ieee80211-update-orinoco-wl3501-drivers-for-latest-struct-naming.txt 0216-orinoco-Remove-inneeded-system-includes.txt 0217-orinoco-Make-nortel_pci_hw_init-static.txt 0218-orinoco-Fix-memory-leak-and-unneeded-unlock-in-orinoco_join_ap.txt 0219-orinoco-orinoco_send_wevents-could-return-without-unlocking.txt 0220-orinoco-Remove-unneeded-forward-declarations.txt 0221-orinoco-Annotate-endianess-of-variables-and-structure-members.txt 0222-orinoco-Read-only-needed-data-in-__orinoco_ev_txexc.txt 0223-orinoco-Bump-version-to-0.15rc3.txt 0227-RPC-Report-connection-errors-properly-when-mounting-with-soft.txt 0228-RPC-proper-soft-timeout-behavior-for-rpcbind.txt 0229-NFS-use-a-constant-value-! for-TCP-retransmit-timeouts.txt 0230-RPC-portmapper-doesn-t-need-a-reserved-port.txt 0231-RPC-extract-socket-logic-common-to-both-client-and-server.txt 0232-RPC-introduce-client-side-transport-switch.txt 0233-RPC-transport-switch-function-naming.txt 0234-RPC-Reduce-stack-utilization-in-xs_sendpages.txt 0235-RPC-Rename-sock_lock.txt 0236-RPC-Rename-xprt_lock.txt 0237-RPC-rename-the-sockstate-field.txt 0238-RPC-Eliminate-socket.h-includes-in-RPC-client.txt 0239-RPC-Add-helper-for-waking-tasks-pending-on-a-transport.txt 0240-RPC-client-side-transport-switch-cleanup.txt 0241-RPC-separate-TCP-and-UDP-write-space-callbacks.txt 0242-RPC-separate-TCP-and-UDP-transport-connection-logic.txt 0243-RPC-separate-TCP-and-UDP-socket-write-paths.txt 0244-RPC-skip-over-transport-specific-heads-automatically.txt 0245-RPC-get-rid-of-xprt-stream.txt 0246-RPC-add-API-to-set-transport-specific-timeouts.txt 0247-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0248-RPC-expose-API-for-ser! ializing-access-to-RPC-transports.txt 0249-RPC-separate-xprt_! timer-im plementations.txt 0250-RPC-add-generic-interface-for-adjusting-the-congestion-window.txt 0251-RPC-add-a-release_rqst-callout-to-the-RPC-transport-switch.txt 0252-RPC-remove-xprt-nocong.txt 0253-RPC-clean-up-after-nocong-was-removed.txt 0254-RPC-allow-RPC-client-s-port-range-to-be-adjustable.txt 0255-RPC-make-sure-to-get-the-same-local-port-number-when-reconnecting.txt 0256-RPC-parametrize-various-transport-connect-timeouts.txt 0257-RPC-rationalize-set_buffer_size.txt 0258-RPC-NFS-new-rpc_pipefs-patch.txt 0260-Revert-PATCH-RPC-NFS-new-rpc_pipefs-patch.txt 0262-SUNRPC-fix-bug-in-patch-portmapper-doesn-t-need-a-reserved-port.txt 0266-netdrvr-gianfar-use-new-phy-layer.txt 0267-netdrvr-delete-CONFIG_PHYCONTROL.txt 0268-hostap-Fix-pci_driver-name-for-hostap_plx-and-hostap_pci.txt 0269-hostap-Add-support-for-WE-19.txt 0270-hostap-Use-GFP_ATOMIC-to-get-rid-of-weird-might_sleep-issue.txt 0271-hostap-Remove-iwe_stream_add_event-kludge.txt 0272-Remove-WIRELESS_EXT-ifdefs-from-several-w! ireless-drivers.txt 0273-wireless-airo-remove-needed-dma_addr_t-obfuscation.txt 0312-sky2-changing-mtu-doesn-t-have-to-reset-link.txt 0313-sky2-cleanup-interrupt-processing.txt 0314-sky2-add-hardware-VLAN-acceleration-support.txt 0315-sky2-explicit-set-power-state.txt 0316-sky2-version-0.6.txt 0317-sky2-nway-reset-BONUS-FEATURE.txt 0323-This-patch-fixes-a-typo-in-ieee80211.h-ieee82011_deauth-ieee80211_deauth.txt 0346-This-will-move-the-ieee80211_is_ofdm_rate-function-to-the-ieee80211.h.txt 0348-Currently-the-info_element-is-parsed-by-2-seperate-functions-this.txt 0349-When-an-assoc_resp-is-received-the-network-structure-is-not-completely.txt 0350-Lindent-and-trailing-whitespace-script-executed-ieee80211-subsystem.txt 0356-hostap-Remove-hw-specific-dev_open-close-handlers.txt 0357-hostap-Fix-hostap_pci-build-with-PRISM2_IO_DEBUG.txt 0358-hostap-Do-not-free-local-hw_priv-before-unregistering-netdev.txt 0359-hostap-Unregister-netdevs-before-freeing-local-data.txt 0366-S2io-MSI-! MSI-X-support-runtime-configurable.txt 0367-e1000-Support-for! -82571-a nd-82572-controllers.txt 0368-e1000-multi-queue-defines-modification-to-data-structures.txt 0369-e1000-implementation-of-the-multi-queue-feature.txt 0370-e1000-Enable-custom-configuration-bits-for-82571-2-controllers.txt 0371-e1000-Fixes-for-packet-split-related-issues.txt 0372-e1000-Added-msleep_interruptible-delay.txt 0373-e1000-Flush-shadow-RAM.txt 0374-e1000-fix-warnings.txt 0375-AX.25-Delete-debug-printk-from-mkiss-driver.txt 0376-AX.25-Convert-mkiss.c-to-DEFINE_RWLOCK.txt 0377-airo-fix-resume.txt 0378-s2io-change-strncpy-length-arg-to-use-size-of-target.txt 0379-netdrvr-s2io-Add-a-MODULE_VERSION-entry.txt 0380-bonding-replicate-IGMP-traffic-in-activebackup-mode.txt 0381-sky2-add-permanent-address-support.txt 0383-wireless-ipw2200-remove-redundant-return-statement.txt 0546-S2io-Offline-diagnostics-fixes.txt 0547-rcu-in-bpqether-driver.txt 0548-SMACK-support-for-mkiss.txt 0549-Initialize-the-.owner-field-the-tty_ldisc-structure.txt 0555-SUNRPC-Retry-rpcbind-requests-if-t! he-server-s-portmapper-isn-t-up.txt 0556-RPC-allow-call_encode-to-delay-transmission-of-an-RPC-call.txt 0575-ieee80211-division-by-zero-fix.txt 0577-sb1250-mac-Check-the-actual-setting-for-reporting-hw-checksumming.txt 0578-sb1250-mac-Ensure-16-byte-alignment-of-the-descriptor-ring.txt 0579-au1000_eth-Misc-Au1000-net-driver-fixes.txt 0580-de2104x-Resurrect-Cobalt-support-for-2.6.txt 0581-sgiseeq-Fix-resource-handling.txt 0582-sgiseeq-Configure-PIO-and-DMA-timing-requests.txt 0583-declance-Convert-to-irqreturn_t.txt 0584-declance-Fix-mapping-of-device.txt 0585-declance-Deal-with-the-bloody-KSEG-vs-CKSEG-horror.txt 0586-declance-Use-physical-addresses-at-the-interface-level.txt 0587-ne-Support-for-RBHMA4500-eval-board.txt 0588-mipsnet-Virtual-ethernet-driver-for-MIPSsim.txt 0589-e1000_intr-build-fix.txt 0590-s2io-build-fix.txt 0592-via-rhine-change-mdelay-to-msleep-and-remove-from-ISR-path.txt 0593-epic100-fix-counting-of-work_done-in-epic_poll.txt 0596-bonding-cleanup-comment! -for-mode-1-IGMP-xmit-hack.txt 0597-b44-alternate-allocation-! option-f or-DMA-descriptors.txt 0598-orinoco-remove-redundance-skb-length-check-before-padding.txt 0599-sundance-remove-if-1-.-block-in-sundance_probe1.txt 0600-sundance-expand-reset-mask.txt 0601-e1000-build-fix.txt 0603-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0606-SUNRPC-Add-support-for-privacy-to-generic-gss-api-code.txt 0607-SUNRPC-Provide-a-callback-to-allow-free-pages-allocated-during-xdr-encoding.txt 0608-SUNRPC-Retry-wrap-in-case-of-memory-allocation-failure.txt 0609-RPCSEC_GSS-cleanup-au_rslack-calculation.txt 0610-RPCSEC_GSS-client-side-privacy-support.txt 0611-RPCSEC_GSS-Simplify-rpcsec_gss-crypto-code.txt 0612-RPCSEC_GSS-krb5-pre-privacy-cleanup.txt 0613-RPCSEC_GSS-Add-support-for-privacy-to-krb5-rpcsec_gss-mechanism.txt 0614-RPCSEC_GSS-remove-all-qop-parameters.txt 0615-RPCSEC_GSS-krb5-cleanup.txt 0622-Fixed-problem-with-not-being-able-to-decrypt-encrypt-broadcast-packets.txt 0631-sb1250-mac-Get-rid-of-all-the-funny-SBMAC_WRITECSR-and-SBMAC_READCSR! -macros.txt 0632-sb1250-mac-Whitespace-cleanup.txt 0645-sundance-include-MII-address-0-in-PHY-probe.txt 0646-e1000-Driver-version-white-space-comments-device-id-other.txt 0647-Fixed-oops-if-an-uninitialized-key-is-used-for-encryption.txt 0652-sb1250-mac-PHY-probing-fixes.txt 0670-ieee80211-subsystem.txt 0671-Update-version-ieee80211-stamp-to-1.1.6.txt 0675-PARISC-Change-the-driver-names-so-sys-bus-parisc-drivers-looks-better.txt 0676-PARISC-Convert-parisc_device-to-use-struct-resource-for-hpa.txt 0714-PARISC-Add-NETPOLL-support-to-lasi_82596.txt 0771-DECNET-Remove-some-redundant-ifdeffed-code.txt 0772-NET-Wider-use-of-for_each_-cpu.txt 0773-PKTGEN-Sleeping-function-called-under-lock.txt 0774-PKTGEN-Use-kzalloc.txt 0775-PKTGEN-Spelling-and-white-space.txt 0776-PKTGEN-proc-interface-revision.txt 0777-NETFILTER-ip_conntrack-Make-hashsize-conntrack-parameter-writable.txt 0778-IPV4-Kill-redundant-rcu_dereference-on-fa_info.txt 0779-IPSEC-Kill-obsolete-get_mss-function.txt 0780-NE! TLINK-Remove-dead-code-in-af_netlink.c.txt 0781-IPV4-Remove-d! ead-code -from-ip_output.c.txt 0782-SK_BUFF-kernel-doc-fix-skbuff-warnings.txt 0783-AX.25-Use-constant-instead-of-magic-number.txt 0784-IPV4-Fix-setting-broadcast-for-SIOCSIFNETMASK.txt 0785-netdrvr-forcedeth-scatter-gather-and-segmentation-offload-support.txt 0786-ieee80211-build-fix.txt 0834-Revert-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0855-RPC-Ensure-that-nobody-can-queue-up-new-upcalls-after-rpc_close_pipes.txt 0931-gfp_t-net.txt 0952-gfp_t-drivers-net.txt 0957-ARM-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 0963-ARM-2897-2-PXA2xx-IRDA-support.txt 0971-sky2-remove-unused-definitions.txt 0972-sky2-use-kzalloc.txt 0973-sky2-spelling-fixes.txt 0974-sky2-fix-NAPI-and-receive-handling.txt 0975-sky2-version-0.7.txt 1029-DRIVER-MODEL-Get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.txt 1037-Bluetooth-Make-more-functions-static.txt 1038-Bluetooth-Update-security-filter-for-Extended-Inquiry-Response.txt 1043-IPv4-IPv6-UFO-Scat! ter-gather-approach.txt 1044-MCAST-IPv6-Fix-algorithm-to-compute-Querier-s-Query-Interval.txt 1055-tg3-add-5714-5715-support.txt 1056-tg3-fix-ASF-heartbeat.txt 1057-tg3-update-version-and-minor-fixes.txt 1058-ibmveth-fix-bonding.txt 1059-ibmveth-fix-buffer-pool-management.txt 1060-ibmveth-fix-buffer-replenishing.txt 1061-ibmveth-lockless-TX.txt 1062-ibmveth-fix-failed-addbuf.txt 1063-pcnet_cs-fix-mii-init-code-for-older-DL10019-based-cards.txt 1065-s2io-kconfig-help-fix.txt 1066-b44-reports-wrong-advertised-flags.txt 1067-sis190.c-fix-multicast-MAC-filter.txt 1068-smc91x-shut-down-power-after-probing.txt 1070-starfire-free_irq-on-error-path-of-netdev_open.txt 1073-netdrvr-b44-include-linux-dma-mapping.h-to-eliminate-warning.txt 1074-sundance-fix-DFE-580TX-Tx-Underrun.txt 1075-New-PowerPC-4xx-on-chip-ethernet-controller-driver.txt 1078-sis900-come-alive-after-temporary-memory-shortage.txt 1079-Add-Wake-on-LAN-support-to-sis900-2.txt 1080-drivers-net-Remove-pointless-checks-fo! r-NULL-prior-to-calling-kfree.txt 1082-netdrvr-ne2k-pci-based! -card-do es-not-support-bus-mastering.txt 1083-ipw2200-Missing-kmalloc-check.txt 1159-SCTP-Rename-SCTP-specific-control-message-flags.txt 1163-SCTP-Fix-SCTP_SETADAPTION-sockopt-to-use-the-correct-structure.txt 1164-SCTP-Allow-SCTP_MAXSEG-to-revert-to-default-frag-point-with-a-0-value.txt 1196-SCTP-Do-not-allow-unprivileged-programs-initiating-new-associations-on.txt 1200-e1000-remove-warning-about-e1000_suspend.txt 1201-eepro.c-module_param_array-cleanup.txt 1202-b44-fix-suspend-resume.txt 1203-e1000-use-vmalloc_node.txt 1204-revert-orinoco-Information-leakage-due-to-incorrect-padding.txt 1205-Better-fixup-for-the-orinoco-driver.txt 1206-e1000-Fixes-e1000_suspend-warning-when-CONFIG_PM-is-not-enabled.txt 1320-ETH-ether-address-compare.txt 1324-Add-modalias-for-pmac-network-drivers.txt 1328-mv643xx_eth_showsram-Added-information-message-when-using-the-SRAM.txt 1329-IPV4-Fix-issue-reported-by-Coverity-in-ipv4-fib_frontend.c.txt 1389-s2io-iomem-annotations.txt 1397-bluetooth-hidp-is-bro! ken-on-s390.txt 1403-drivers-net-tg3-Use-the-DMA_-32-64-BIT_MASK-constants.txt 1405-prism54-Free-skb-after-disabling-interrupts.txt 1748-DRIVER-MODEL-Add-missing-platform_device.h-header.txt 1749-PPC-44x-EMAC-driver-add-440SPe-support.txt 1750-PPC-44x-EMAC-driver-add-440GR-support.txt 1751-PPC-4xx-EMAC-driver-fix-VSC8201-PHY-initialization.txt 1754-fec_8xx-Remove-dependency-on-NETTA-NETPHONE.txt 1755-fec_8xx-Add-support-for-Intel-PHY-LX971.txt 1761-vmalloc_node.txt 1854-ARM-3066-1-Fix-PXA-irda-driver-suspend-resume-functions.txt 1920-m32r-SMC91x-driver-update.txt 1929-smsc-ircc2-PM-cleanup-do-not-close-device-when-suspending.txt 1941-remove-some-more-check_region-stuff.txt 1961-Typo-fix-dot-after-newline-in-printk-strings.txt 2026-sparse-cleanups-NULL-pointers-C99-struct-init.txt 2067-netdrvr-8139too-replace-hand-crafted-kernel-thread-with-workqueue.txt 2078-BRIDGE-Use-ether_compare.txt 2079-NETFILTER-Add-revision-support-to-arp_tables-and-ip6_tables.txt 2080-ROSE-rose_heart! beat_expiry-locking-fix.txt 2081-IPV6-Fix-behavior-of-ip6_rou! te_input -for-link-local-address.txt 2083-DCCP-Simplify-skb_set_owner_w-semantics.txt 2089-DCCP-Set-socket-owner-iff-packet-is-not-data.txt 2090-MCAST-IPv6-Check-packet-size-when-process-Multicast.txt 2227-ibmveth-fix-panic-in-initial-replenish-cycle.txt 2245-MCAST-ip-6-_mc_add_src-should-be-called-when-number-of-sources-is-zero.txt 2256-IPV6-inet6_ifinfo_notify-should-use-RTM_DELLINK-in-addrconf_ifdown.txt 2267-PKT_SCHED-Rework-QoS-and-or-fair-queueing-configuration.txt 2396-ARM-Reverted-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 2410-SUNRPC-allow-sunrpc.o-to-link-when-CONFIG_SYSCTL-is-disabled.txt 2411-NFS-SUNRPC-NLM-fix-unused-variable-warnings-when-CONFIG_SYSCTL-is-disabled.txt 2416-NETFILTER-PPTP-helper-Fix-compilation-of-conntrack-helper-without-NAT.txt 2421-netdrvr-8139too-use-cancel_rearming_delayed_work-to-cancel-thread.txt 2422-netdrvr-8139too-use-rtnl_shlock_nowait-rather-than-rtnl_lock_interruptible.txt 2425-NETFILTER-Fix-double-free-after-net! link_unicast-in-ctnetlink.txt 2430-NETFILTER-nfnetlink-Use-kzalloc.txt 2431-NETFILTER-CONNMARK-target-needs-ip_conntrack.txt 2433-NETEM-use-PSCHED_LESS.txt 2435-drivers-net-wireless-airo.c-unsigned-comparason.txt 2436-S2io-Multi-buffer-mode-support.txt 2438-pcnet32-show-name-of-failing-device.txt 2439-pcnet32-AT2700-2701-and-Bugzilla-2699-4551.txt 2440-pcnet32-Prevent-hang-with-79c976.txt 2441-phy-address-mask-support-for-generic-phy-layer.txt 2442-PKT_SCHED-Generic-RED-layer.txt 2443-NET-Introduce-INET_ECN_set_ce-function.txt 2444-PKT_SCHED-RED-Use-new-generic-red-interface.txt 2445-PKT_SCHED-RED-Use-generic-queue-management-interface.txt 2446-PKT_SCHED-RED-Dont-start-idle-periods-while-already-idling.txt 2447-PKT_SCHED-RED-Cleanup-and-remove-unnecessary-code.txt 2448-PKT_SCHED-GRED-Cleanup-equalize-flag-and-add-new-WRED-mode-detection.txt 2449-PKT_SCHED-GRED-Transform-grio-to-GRED_RIO_MODE.txt 2450-PKT_SCHED-GRED-Cleanup-dumping.txt 2451-PKT_SCHED-GRED-Dump-table-definitio! n.txt 2452-PKT_SCHED-GRED-Use-a-central-table-definition-chan! ge-proce dure.txt 2453-PKT_SCHED-GRED-Report-out-of-bound-DPs-as-illegal.txt 2454-PKT_SCHED-GRED-Use-central-VQ-change-procedure.txt 2455-PKT_SCHED-GRED-Use-new-generic-red-interface.txt 2456-PKT_SCHED-GRED-Do-not-reset-statistics-in-gred_reset-gred_change.txt 2457-PKT_SCHED-GRED-Report-congestion-related-drops-as-NET_XMIT_CN.txt 2458-PKT_SCHED-GRED-Use-generic-queue-management-interface.txt 2459-PKT_SCHED-GRED-Introduce-tc_index_to_dp.txt 2460-PKT_SCHED-GRED-Improve-error-handling-and-messages.txt 2461-PKT_SCHED-GRED-Remove-initd-flag.txt 2462-PKT_SCHED-GRED-Dont-abuse-default-VQ-for-equalizing.txt 2463-PKT_SCHED-GRED-Remove-auto-creation-of-default-VQ.txt 2464-PKT_SCHED-GRED-Cleanup-and-remove-unnecessary-code.txt 2465-PKT_SCHED-GRED-Fix-restart-of-idle-period-in-WRED-mode-upon-dequeue-and-drop.txt 2466-PKT_SCHED-GRED-Support-ECN-marking.txt 2467-PKT_SCHED-G-RED-Introduce-hard-dropping.txt 2468-DRIVER-MODEL-Improved-dynamically-allocated-platform_device-interface.txt 2469-DRIVER-MO! DEL-Fix-depca.txt 2470-DRIVER-MODEL-Fix-jazzsonic.txt 2471-DRIVER-MODEL-Fix-macsonic.txt 2476-NETEM-Support-time-based-reordering.txt 2477-NETEM-Add-version-string.txt 2478-NET-Fix-race-condition-in-sk_stream_wait_connect.txt 2479-TCP-DCCP-Randomize-port-selection.txt 2481-drivers-net-ixgb-make-some-code-static.txt 2482-drivers-net-e1000-possible-cleanups.txt 2483-drivers-net-hamradio-dmascc.c-remove-dmascc_setup.txt 2484-prism54-Remove-redundant-assignment.txt 2485-bnx2-add-5708-support.txt 2486-bnx2-update-firmware-for-5708.txt 2487-bnx2-update-nvram-code-for-5708.txt 2488-bnx2-update-firmware-handshake-for-5708.txt 2489-bnx2-refine-bnx2_poll.txt 2490-bnx2-update-version-and-minor-fixes.txt 2493-Remove-linux-version.h-include-from-drivers-net-phy-and-net-ieee80211.txt 2494-netdrvr-fac_8xx-build-fix.txt 2495-netdrvr-s2io-warning-fixes.txt 2645-b44-b44_start_xmit-returns-with-a-lock-held-when-it-fails-allocating.txt 2646-b44-miscellaneous-cleanup.txt 2647-b44-expose-counters! -through-ethtool.txt 2648-b44-s-spin_lock_irqsave-spin_lock-i! n-b44_in terrupt.txt 2649-b44-late-request_irq-in-b44_open.txt 2688-3c59x-convert-to-use-of-pci_iomap-API.txt 2689-3c59x-cleanup-of-mdio_read-routines-to-use-MII_-macros.txt 2690-3c59x-avoid-blindly-reading-link-status-twice.txt 2691-3c59x-bounds-checking-for-hw_checksums.txt 2692-3c59x-cleanup-init-of-module-parameter-arrays.txt 2693-3c59x-fix-some-grammar-in-module-parameter-descriptions.txt 2694-3c59x-support-ETHTOOL_GPERMADDR.txt 2695-3c59x-correct-rx_dropped-counting.txt 2696-3c59x-enable-use-of-memory-mapped-PCI-I-O.txt 2697-3c59x-don-t-enable-scatter-gather-w-o-checksum-support.txt 2828-knfsd-make-sure-svc_process-call-the-correct-pg_authenticate-for-multi-service-port.txt 2934-m68knommu-FEC-ethernet-header-support-for-the-ColdFire-5208.txt 2935-m68knommu-FEC-ethernet-support-for-the-ColdFire-5208.txt 2984-scripts-Lindent-on-ieee80211-subsystem.txt 2985-Fix-problem-with-WEP-unicast-key-index-0.txt 2986-Update-version-ieee80211-stamp-to-1.1.7.txt 2987-Ran-scripts-Lindent-on-dri! vers-net-wireless-ipw2-1-2-00.-c-h.txt 2988-IPW_DEBUG-has-already-included-DRV_NAME-remove-double-prefix-print.txt 2989-Catch-ipw2200-up-to-equivelancy-with-v1.0.1.txt 2990-Catch-ipw2200-up-to-equivelancy-with-v1.0.2.txt 2991-Catch-ipw2200-up-to-equivelancy-with-v1.0.3.txt 2992-Catch-ipw2200-up-to-equivelancy-with-v1.0.4.txt 2993-Catch-ipw2100-up-to-equivelancy-with-v1.1.1.txt 2994-Fixed-WEP-on-ipw2100-priv-sec-was-being-used-instead-of.txt 2995-Bug-339-Fix-ipw2100-iwconfig-set-get-txpower.txt 2996-Move-code-from-ipw2100_wpa_enable-to-IPW2100_PARAM_DROP_UNENCRYPTED-to.txt 2997-Catch-ipw2200-up-to-equivelancy-with-v1.0.5.txt 2998-Fix-hardware-encryption-both-WEP-and-AES-doesn-t-work-with-fragmentation.txt 2999-Fix-is_duplicate_packet-bug-for-fragmentation-number-setting.txt 3000-bug-667-Fix-the-notorious-No-space-for-Tx-bug.txt 3001-Bug-637-Set-tx-power-for-A-band.txt 3002-Changed-default-of-missed-beacons-to-miss-before-disassociation-to-24.txt 3003-Updated-to-support-ieee80! 211-callback-to-is_queue_full-for-802.11e.txt 3004-Fixed-some! -compile r-issues-if-CONFIG_IPW2200_QOS-is-enabled.txt 3005-Added-more-useful-geography-encoding-so-people-s-experience-with.txt 3006-Workaround-kernel-BUG_ON-panic-caused-by-unexpected-duplicate-packets.txt 3007-Disable-host-fragmentation-in-open-mode-since-IPW2200-2915-hardware.txt 3008-Bug-792-Fix-WPA-PSK-AES-both-for-Dipw-and-Dwext.txt 3009-Fixes-the-ad-hoc-network-WEP-key-list-issue.txt 3010-Bug-701-Fix-a-misuse-of-ieee-mode-with-ieee-iw_mode.txt 3011-Fix-ipw_wx_get_txpow-shows-wrong-disabled-value.txt 3012-Fix-firmware-error-when-setting-tx_power.txt 3013-Modified-ipw_config-and-STATUS_INIT-setting-to-correct-race-condition.txt 3014-Switched-firmware-error-dumping-so-that-it-will-capture-a-log-available.txt 3015-Changed-all-of-the-ipw_send_cmd-calls-to-return-any-ipw_send_cmd-error.txt 3016-Added-cmdlog-in-non-debug-systems.txt 3017-Migrated-some-of-the-channel-verification-code-back-into-the-driver-to.txt 3018-Updated-ipw2200-to-use-the-new-ieee80211-callbacks.txt 3019-Added-w! ait_state-wakeup-on-scan-completion.txt 3020-Bug-455-Fix-frequent-channel-change-generates-firmware-fatal-error.txt 3021-Bug-760-Fix-setting-WEP-key-in-monitor-mode-causes-IV-lost.txt 3022-Don-t-set-hardware-WEP-if-we-are-actually-using-TKIP-AES.txt 3023-Make-all-the-places-the-firmware-fails-to-load-showerrors-in-decimal.txt 3024-Adds-radiotap-support-to-ipw2200-in-monitor-mode.txt 3025-Fixed-is_network_packet-to-include-checking-for-broadcast-packets.txt 3026-Mixed-PTK-GTK-CCMP-TKIP-support.txt 3027-Card-with-WEP-enabled-and-using-shared-key-auth-will-have-firmware.txt 3028-Fixed-problem-with-get_cmd_string-not-existing-if-CONFIG_IPW_DEBUG-disabled.txt 3029-Removed-PF_SYNCTHREAD-legacy.txt 3030-Fixes-problem-with-WEP-not-working-association-succeeds-but-no-Tx-Rx.txt 3031-Fix-bug-771-Too-many-8-bytes-recieved-when-using-AES-hwcrypto.txt 3032-Fixes-WEP-firmware-error-condition.txt 3033-Updated-driver-version-stamps-for-ipw2100-1.1.3-and-ipw2200-1.0.7.txt 3034-Pulled-out-a-st! ray-KERNEL_VERSION-check-around-the-suspend-handler.txt 3035-! Fix-Driv er-using-old-proc-net-wireless-support-please-fix-driver-message.txt 3036-Removed-legacy-WIRELESS_EXT-checks-from-ipw2200.c.txt 3037-Fixes-missed-beacon-logic-in-relation-to-on-network-AP-roaming.txt 3038-Removed-warning-about-TKIP-not-being-configured-if-countermeasures-are.txt 3039-Added-channel-support-for-ipw2200-cards-identified-as-ZZR.txt 3040-Fixed-problem-with-not-being-able-to-send-broadcast-packets.txt 3041-Fixed-parameter-reordering-in-firmware-log-routine.txt 3042-Updated-firmware-version-stamp-to-2.4-from-2.3-so-it-will-use-the-latest-firmware.txt 3043-Update-version-ipw2200-stamp-to-1.0.8.txt 3081-fix-NET_RADIO-n-IEEE80211-y-compile.txt 3083-kill-include-linux-eeprom.h.txt 3084-drivers-net-s2io.c-make-functions-static.txt 3085-prism54-Unused-variable-extraneous-udelay.txt 3086-prism54-Transmit-stats-updated-in-wrong-place.txt 3087-Fix-sparse-warning-in-e100-driver.txt 3088-atmel-memset-correct-range.txt 3117-IPV6-Put-addr_diff-into-common-header-for-future-use.! txt 3118-IPV6-Make-ipv6_addr_type-more-generic-so-that-we-can-use-it-for-source-address-selection.txt 3119-IPV6-RFC3484-compliant-source-address-selection.txt 3121-PKT_SCHED-Correctly-handle-empty-ematch-trees.txt 3122-NET-sk_add_backlog-convert-from-macro-to-inline.txt 3124-PPP-handle-misaligned-accesses.txt 3125-PPP-add-PPP-MPPE-encryption-module.txt 3126-IRDA-donauboe-locking-fix.txt 3127-NET-kfree-cleanup.txt 3128-IPV4-Fix-ip_queue_xmit-identity-increment-for-TSO-packets.txt 3131-Bluetooth-Add-endian-annotations-to-the-core.txt 3132-Bluetooth-Remove-the-usage-of-proc-completely.txt 3155-SERIAL-IOC3-Update-8250-driver-bits.txt 3160-skge-clear-PCI-PHY-COMA-mode-on-boot.txt 3161-skge-use-kzalloc.txt 3162-skge-add-mii-ioctl-support.txt 3163-skge-goto-low-power-mode-on-shutdown.txt 3164-skge-use-prefetch-on-receive.txt 3165-skge-spelling-fixes.txt 3166-skge-increase-version-number.txt 3168-wireless-ipw2100-kill-unused-var-warnings-for-debug-disabled-code.txt 3169-ieee80211-cl! eanup-crypto-list-handling-other-minor-cleanups.txt 3170-b44-! replace- B44_FLAG_INIT_COMPLETE-with-netif_running.txt 3171-b44-race-on-device-closing.txt 3172-b44-increase-version-number.txt 3178-dgrs-fix-warnings-when-CONFIG_ISA-and-CONFIG_PCI-are-not-enabled.txt 3179-IOC-And-don-t-mark-the-things-as-broken-Cowboy.txt 3231-sanitize-lookup_hash-prototype.txt 3530-NETFILTER-packet-counter-of-conntrack-is-32bits.txt 3534-NETFILTER-ctnetlink-add-marking-support-from-userspace.txt 3535-NETFILTER-ctnetlink-add-module-alias-to-fix-autoloading.txt 3536-NETFILTER-ctnetlink-kill-unused-includes.txt 3537-NETFILTER-ctnetlink-get_conntrack-can-use-GFP_KERNEL.txt 3539-NETFILTER-nfnetlink-only-load-subsystems-if-CAP_NET_ADMIN-is-set.txt 3540-NETFILTER-stop-tracking-ICMP-error-at-early-point.txt 3542-NETFILTER-ctnetlink-propagate-error-instaed-of-returning-EPERM.txt 3543-NETFILTER-ctnetlink-Add-support-to-identify-expectations-by-ID-s.txt 3545-NETFILTER-ctnetlink-ICMP_ID-is-u_int16_t-not-u_int8_t.txt 3546-IPV6-Fix-fallout-from-CONFIG_IPV6_PRIVACY.txt 3547-IPV6! -ip6ip6_lock-is-not-unlocked-in-error-path.txt 3566-txt 3596-NETFILTER-Add-nf_conntrack-subsystem.txt 3599-NETLINK-Type-safe-netlink-messages-attributes-interface.txt 3600-NETLINK-Make-netlink_callback-done-optional.txt 3601-NETLINK-Generic-netlink-receive-queue-processor.txt 3602-XFRM-Use-generic-netlink-receive-queue-processor.txt 3603-RTNETLINK-Use-generic-netlink-receive-queue-processor.txt 3604-NETLINK-Generic-netlink-family.txt 3615-SUNRPC-don-t-reencode-when-looping-in-call-transmit.txt 3627-netdrvr-8139too-fast-poll-for-thread-if-an-unlikely-race-occurs.txt 3660-BNX2-output-driver-name-as-prefix-in-error-message.txt 3661-BNX2-check-return-of-dev_alloc_skb-in-bnx2_test_loopback.txt 3662-BNX2-simplify-parameter-checks-in-bnx2_-get-set-_eeprom.txt 3663-NET-Detect-hardware-rx-checksum-faults-correctly.txt 3689-TCP-fix-congestion-window-update-when-using-TSO-deferal.txt 3690-TCP-simplify-microsecond-rtt-sampling.txt 3691-TCP-add-tcp_slow_start-helper.txt 3692-TCP-Appropri! ate-Byte-Count-support.txt 3693-TCP-receive-buffer-growth-lim! iting-wi th-mixed-MTU.txt 3694-TCP-spelling-fixes.txt 3695-TCP-speed-up-SACK-processing.txt 3701-disable-DEBUG-in-ibmveth.txt 3703-sky2-needs-dma_mapping.h.txt 3728-gianfar-mii-needs-to-zero-out-the-mii_bus-structure.txt 3729-netdrvr-forcedeth-remove-superfluous-rx-engine-stop-start.txt 3730-netdrvr-forcedeth-support-for-irq-mitigation.txt 3731-netdrvr-forcedeth-phy-address-scan-range.txt 3732-SAA9730-Whitespace-cleanup.txt 3733-SAA9730-Driver-overhaul.txt 3734-smc91x-DB1200-support.txt 3735-gt96100eth.c-Don-t-concatenate-__FUNCTION__-with-strings.txt 3737-TCP-fix-vegas-build.txt 3742-DECNET-fix-SIGPIPE.txt 3752-IPV6-Fix-inet6_init-missing-unregister.txt 3754-SCTP-Fix-potential-NULL-pointer-dereference-in-sctp_v4_get_saddr.txt 3755-SCTP-Remove-timeouts-array-from-sctp_endpoint.txt 3756-SCTP-Fix-ia64-NaT-consumption-fault-with-sctp_sideffect-commands.txt 3757-SCTP-Include-ulpevents-in-socket-receive-buffer-accounting.txt 3789-IPV6-Fix-unnecessary-GFP_ATOMIC-allocation-in-fib6-dump.txt! 3792-ARM-Use-correct-IO-operations-for-Pleb.txt 3815-net-allow-newline-terminated-IP-addresses-in-in_aton.txt 3816-net-make-dev_valid_name-public.txt 3817-bonding-add-bond-name-to-all-error-messages.txt 3818-bonding-expand-module-param-descriptions.txt 3819-bonding-Add-transmit-policy-to-proc.txt 3820-bonding-get-slave-name-from-actual-slave-instead-of-param-list.txt 3821-bonding-move-kmalloc-out-of-spinlock-in-ALB-init.txt 3822-bonding-explicitly-clear-RLB-flag-during-ALB-init.txt 3823-bonding-expose-some-structs.txt 3824-bonding-make-functions-not-static.txt 3825-bonding-move-bond-creation-into-separate-function.txt 3826-bonding-make-bond_init-not-__init.txt 3827-bonding-Allow-ARP-target-table-to-have-empty-entries.txt 3828-bonding-add-ARP-entries-to-proc.txt 3829-bonding-add-sysfs-functionality-to-bonding-large.txt 3830-bonding-version-update.txt 3831-bonding-spelling-and-whitespace-corrections.txt 3832-bonding-comments-and-changelog.txt 3860-ppc-add-support-for-new-powe! rbooks.txt 3959-NETFILTER-nf_conntrack-Add-missing-code-to-TC! P-conntr ack-module.txt 3960-NETFILTER-nfnetlink-unconditionally-require-CAP_NET_ADMIN.txt 3961-NETFILTER-link-netfilter-before-ipv4.txt 3962-NETFILTER-cleanup-IPv6-Netfilter-Kconfig.txt 3963-NETFILTER-fix-type-of-sysctl-variables-in-nf_conntrack_ipv6.txt 3964-NETFILTER-nf_conntrack-fix-possibility-of-infinite-loop-while-evicting-nf_ct_frag6_queue.txt 3965-NETFILTER-fix-leak-of-fragment-queue-at-unloading-nf_conntrack_ipv6.txt 4016-IPV6-small-fix-for-ipv6_dev_get_saddr-..txt 4017-IPV6-Fixes-sparse-warning-in-ipv6-ipv6_sockglue.c.txt 4018-LLC-Fix-TX-window-scaling.txt 4019-LLC-Make-core-block-on-remote-busy.txt 4020-LLC-Fix-typo.txt 4028-knfsd-make-sure-nfsd-doesn-t-hog-a-cpu-forever.txt 4032-sdladrv.c-build-fix.txt 4041-TCP-More-spelling-fixes.txt 4045-NETFILTER-Remove-nf_conntrack-stat-proc-file-when-cleaning-up.txt 4046-NETFILTER-Free-layer-3-specific-protocol-tables-at-cleanup.txt 4079-drivers-net-sk98lin-skge.c-make-SkPciWriteCfgDWord-a-static-inline.txt 4080-skge-fix-warning-fro! m-inlining-SkPciWriteCfgDWord.txt 4085-IPV4-IPV6-replace-handmade-list-with-hlist-in-IPv-4-6-reassembly.txt 4087-r8169-fix-printk_ratelimit-in-the-interrupt-handler.txt 4088-r8169-do-not-abort-when-the-power-management-capabilities-are-disabled.txt 4094-NETFILTER-Fix-nf_conntrack-compilation-with-CONFIG_NETFILTER_DEBUG.txt 4127-ipw2200-disallow-direct-scanning-when-device-is-down.txt 4128-ipw2200-fix-error-log-offset-calculation.txt 4179-TCP-TCP-highspeed-build-error.txt 4183-LLC-Fix-compiler-warnings-introduced-by-TX-window-scaling-changes.txt 4184-NET-Sanitize-NET_SCHED-protection-in-net-sched-Kconfig.txt 4185-IPV6-Fib-dump-really-needs-GFP_ATOMIC.txt 4220-smc91x-fix-one-source-of-spurious-interrupts.txt 4221-smc91x-fix-bank-mismatch.txt 4226-e100-re-enable-microcode-with-more-useful-defaults.txt 4227-s2io-UFO-support.txt 4228-i82593.h-make-header-comment-GPL-compatible.txt 4229-IOC3-Replace-obsolete-PCI-API.txt 4230-au1000_eth-Include-linux-config.h.txt 4231-SAA9730-Add-m! issing-header-bits.txt 4232-prism54-Remove-extraneous-udelay-! register -read.txt 4233-drivers-net-wireless-hermes.c-unsigned-int-comparision.txt 4234-Gianfar-update-and-sysfs-support.txt 4235-intel-ixp2000-network-driver.txt 4236-git-netdev-all-ieee80211_get_payload-warning-fix.txt 4240-fec_8xx-make-CONFIG_FEC_8XX-depend-on-CONFIG_8xx.txt 4241-ipw2100-Fix-Driver-using-old-proc-net-wireless.-message.txt 4242-e1000-avoid-leak-when-e1000_setup_loopback_test-fails.txt 4243-e1000-zero-out-pointers-in-e1000_free_desc_rings.txt 4246-wireless-hermes-build-fix.txt 4322-PKT_SCHED-sch_netem-correctly-order-packets-to-be-sent-simultaneously.txt 4324-NET-Reject-socket-filter-if-division-by-constant-zero-is-attempted.txt 4326-IPV6-Acquire-addrconf_hash_lock-for-read-in-addrconf_verify-..txt 4330-FIB_TRIE-Don-t-show-local-table-in-proc-net-route-output.txt 4331-NETFILTER-fixed-dependencies-between-modules-related-with-ip_conntrack.txt 4333-DCCP-Add-missing-no_policy-flag-to-struct-net_protocol.txt 4353-net-Fix-compiler-error-on-dgrs.c-when-CONFIG_PCI.txt 4393! -NETLINK-Use-tgid-instead-of-pid-for-nlmsg_pid.txt 4394-IPV4-Fix-secondary-IP-addresses-after-promotion.txt 4395-NETFILTER-ctnetlink-Fix-refcount-leak-ip_conntrack-nat_proto.txt 4419-NETFILTER-ip_conntrack_netlink.c-needs-linux-interrupt.h.txt 4461-SUNRPC-Funny-looking-code-in-__rpc_purge_upcall.txt 4471-bonding-Remove-superfluous-changelog.txt 4510-IPV6-Implement-appropriate-dummy-rule-4-in-ipv6_dev_get_saddr.txt 4541-IPV4-tcp-route-Another-look-at-hash-table-sizes.txt 4542-ATM-always-return-the-first-interface-for-ATM_ITF_ANY.txt 4543-ATM-atm_pcr_goal-doesn-t-modify-its-argument-s-contents-mark-it-as-const.txt 4547-ATM-attempt-to-autoload-atm-drivers.txt 4550-ATM-avoid-race-conditions-related-to-atm_devs-list.txt 4551-ATM-deregistration-removes-device-from-atm_devs-list-immediately.txt 4553-NET-Add-const-markers-to-various-variables.txt 4554-IPV4-make-two-functions-static.txt 4555-NETFILTER-ipv4-small-cleanups.txt 4556-IPV6-make-two-functions-static.txt 4589-b44-missing-ne! tif_wake_queue-in-b44_open.txt 4590-b44-early-return-in-dev-d! o_ioctl- when-the-device-is-not-up.txt 4592-b44-increase-version-number.txt 4601-e1000-fix-for-dhcp-issue.txt 4602-sky2-eliminate-special-case-for-EC-A1.txt 4603-sky2-add-MII-support.txt 4604-sky2-fix-receive-flush-pause-issues.txt 4605-sky2-improve-receive-performance.txt 4606-sky2-add-Yukon-EC-ultra-support.txt 4607-sky2-handle-DMA-boundary-crossing.txt 4608-sky2-change-netif_rx_schedule_test-to-__netif_schedule_prep.txt 4609-sky2-race-with-MTU-change.txt 4610-sky2-dual-port-tx-completion.txt 4611-sky2-byteorder-annotation.txt 4612-sky2-remove-pci-express-hacks.txt 4613-sky2-use-pci_register_driver.txt 4614-sky2-update-version-number.txt 4616-sk98lin-add-permanent-address-support.txt 4617-sk98lin-avoid-message-confusion-with-skge.txt 4619-sk98lin-remove-redundant-fields-in-device-info.txt 4621-ibm_emac-fix-graceful-stop-timeout-handling.txt 4622-ixp2000-register-netdevices-last.txt 4623-pm3386-zero-stats-properly.txt 4624-pm3386-remove-unnecessary-udelays.txt 4625-caleb-pm3386-incl! ude-proper-header-files.txt 4626-ixp2000-use-netif_rx_schedule_test.txt 4627-enp2611-don-t-check-netif_running-in-link-status-timer.txt 4628-enp2611-use-dev-in-link-status-timer.txt 4629-enp2611-report-link-up-down-events.txt 4630-ixp2000-report-MAC-addresses-for-each-port-on-init.txt 4631-pm3386-add-hook-for-setting-MAC-address.txt 4632-pm3386-add-hook-for-setting-carrier.txt 4633-pm3386-implement-reset.txt 4634-enp2611-disable-enable-SERDES-carrier-on-interface-down-up.txt 4635-ixp2000-add-netpoll-support.txt 4636-ixp2000-add-driver-version-bump-version-to-0.2.txt 4637-mipsnet-Fix-Copyright-notice.txt 4638-jazzsonic-Fix-build-error.txt 4639-jazzsonic-Fix-platform-device-code.txt 4640-orinoco-fix-setting-power-management-parameters.txt 4641-skge-handle-VLAN-checksum-correctly-on-yukon-rev-0.txt 4643-wireless-airo-reset-card-in-init.txt 4644-netdrvr-fmvj18x_cs-fix-multicast-bug.txt 4645-airo.c-add-support-for-IW_ENCODE_TEMP-i.e.-xsupplicant.txt 4649-netdrvr-skge-fix-typo-fix! -build.txt 4650-ipw2200-kzalloc-conversion-and-Kconfig-depend! ency-fix .txt 4651-Duplicate-IPW_DEBUG-option-for-ipw2100-and-2200.txt 4680-NETFILTER-Ignore-ACKs-ACKs-on-half-open-connections-in-TCP-conntrack.txt 4681-NETFILTER-Fix-recent-match-jiffies-wrap-mismatches.txt 4729-SCTP-Return-socket-errors-only-if-the-receive-queue-is-empty.txt 4730-SCTP-Fix-getsockname-for-sctp-when-an-ipv6-socket-accepts-a-connection-from.txt 4731-IGMP-workaround-for-IGMP-v1-v2-bug.txt 4732-IPV4-Fix-EPROTONOSUPPORT-error-in-inet_create.txt 4733-IPV6-Load-protocol-module-dynamically.txt 4737-SUNRPC-Fix-Oopsable-condition-in-rpc_pipefs.txt 4741-ixp2000-change-netif_schedule_test-to-__netif_schedule_prep.txt 4742-sky2-interrupt-not-cleared.txt 4760-NETFILTER-Fix-incorrect-argument-to-ip_nat_initialized-in-ctnetlink.txt 4761-NETFILTER-nf_conntrack-Fix-missing-check-for-ICMPv6-type.txt 4762-NETFILTER-nfnetlink-Fix-calculation-of-minimum-message-length.txt 4763-NETFILTER-Fix-ip_conntrack_flush-abuse-in-ctnetlink.txt 4765-NETFILTER-Mark-ctnetlink-as-EXPERIMENTAL.txt 4766-! NETFILTER-Wait-for-untracked-references-in-nf_conntrack-module-unload.txt 4768-NETFILTER-Don-t-use-conntrack-entry-after-dropping-the-reference.txt 4769-NET-make-function-pointer-argument-parseable-by-kernel-doc.txt 4770-DECNET-add-memory-buffer-settings.txt 4783-TCP-Vegas-stop-resetting-rtt-every-ack.txt 4784-TCP-Vegas-Remove-extra-call-to-tcp_vegas_rtt_calc.txt 4785-TCP-Vegas-timestamp-before-clone.txt 4787-TG3-remove-warning-on-race.txt 4801-NET-Fix-NULL-pointer-deref-in-checksum-debugging.txt 4807-IPv6-IPsec-fix-pmtu-calculation-of-esp.txt 4855-sky2-don-t-die-if-we-see-chip-rev-0xb5.txt 4856-sky2-device-structure-alignment.txt 4857-sky2-copy-threshold-as-module-parameter.txt 4858-sky2-ethtool-get-set-interrupt-coalescing.txt 4859-sky2-phy-processing-in-workqueue-rather-than-tasklet.txt 4860-sky2-no-irq-disable-needed-during-tx.txt 4861-sky2-ring-distance-optimization.txt 4862-sky2-map-length-optimization.txt 4863-sky2-tx-rx-ring-data-structure-split.txt 4864-sky2-transmi! t-logic-fixes.txt 4865-sky2-transmit-complete-index-optimizat! ion.txt 4866-sky2-transmit-complete-routine-optimization.txt 4867-sky2-interrupt-poll-optimization.txt 4868-sky2-interrupt-coalescing-tuning.txt 4869-sky2-handle-tx-timeout.txt 4870-sky2-quiet-ring-full-message-in-case-of-race.txt 4871-sky2-prefetch-tuning.txt 4872-sky2-turn-on-tx-flow-control.txt 4873-sky2-disable-rx-checksum-on-Yukon-XL.txt 4874-sky2-version-0.10.txt 4875-pcnet32-use-MAC-address-from-prom-also-on-powerpc.txt 4878-TCPv6-Fix-skb-leak.txt 4883-NETFILTER-ip_nat_tftp-Fix-expectation-NAT.txt 4892-skge-get-rid-of-warning-on-race.txt 4893-ieee80211_crypt_tkip-depends-on-NET_RADIO.txt 4895-e1000-Fixes-for-8357x.txt 4921-netdrvr-skge-fix-build.txt 4975-TG3-Fix-nvram-arbitration-bugs.txt 4976-TG3-Fix-suspend-and-resume.txt 4977-TG3-Fix-5704-single-port-mode.txt 4978-TG3-Fix-low-power-state.txt 4984-IPV6-addrconf-Do-not-print-device-pointer-in-privacy-log-message.txt 4985-PKT_SCHED-Disable-debug-tracing-logs-by-default-in-packet-action-API.txt 5023-s2io-__iomem-annotations-fo! r-recent-changes.txt 5035-Address-of-void-__user-is-void-__user-not-void-__user.txt 5101-XFRM-Handle-DCCP-in-xfrm-4-6-_decode_session.txt 5104-SCTP-Fix-sctp-to-not-return-erroneous-POLLOUT-events.txt 5106-TG3-Fix-peer-device-handling.txt 5107-TG3-Some-low-power-fixes.txt 5108-TG3-Add-tw32_wait_f-for-some-sensitive-registers.txt 5109-TG3-Fix-ethtool-memory-test.txt 5112-RPC-Do-not-block-on-skb-allocation.txt 5114-SUNRPC-Fix-EPIPE-error-on-mount-of-rpcsec_gss-protected-partitions.txt 5131-IPV6-Flag-RTF_ANYCAST-for-anycast-routes.txt 5132-IPV6-Try-not-to-send-icmp-to-anycast-address.txt 5133-IPV6-Defer-IPv6-device-initialization-until-the-link-becomes-ready.txt 5134-IPV6-Run-DAD-when-the-link-becomes-ready.txt 5135-IPV6-Don-t-select-a-tentative-address-as-a-source-address.txt 5140-NETROM-Fix-three-if-statements-in-nr_state1_machine.txt 5141-VLAN-Add-two-missing-checks-to-vlan_ioctl_handler.txt 5142-IPV6-Fix-address-deletion.txt 5143-DCCP-Comment-typo.txt 5147-IPSEC-Fix-policy-u! pdates-missed-by-sockets.txt 5153-SUNGEM-Fix-link-error-with-! CONFIG_H OTPLUG-disabled.txt 5156-IPV6-Fix-dead-lock.txt 5157-IPV6-Fix-Temporary-Address-Generation.txt 5158-chelsio-transmit-routine-return-values.txt 5159-skge-avoid-up-down-on-speed-changes.txt 5160-skge-avoid-up-down-on-pause-param-changes.txt 5161-skge-handle-out-of-memory-on-MTU-size-changes.txt 5162-skge-get-rid-of-Yukon2-defines.txt 5163-skge-handle-out-of-memory-on-ring-parameter-change.txt 5164-skge-version-number-1.3.txt 5165-git-netdev-all-s2io-warning-fix.txt 5166-spidernet-fix-Kconfig-after-BPA-CELL-rename.txt 5167-skge-error-handling-on-resume.txt 5168-sky2-handle-out-of-memory-on-admin-changes.txt 5169-sky2-don-t-lose-multicast-addresses.txt 5170-sky2-handle-hardware-packet-overrun.txt 5171-sky2-version-0.11.txt 5173-orinoco_nortel-Fix-incorrect-PCI-resource-use.txt 5174-orinoco_nortel-Add-Symbol-LA-4123-ID.txt 5175-missing-license-for-libphy.ko.txt 5179-forcedeth-fix-random-memory-scribbling-bug.txt 5198-IPV6-Increase-default-MLD_MAX_MSF-to-64.txt 5199-BR_NETFILTER-F! ix-leak-if-skb-traverses-1-bridge.txt 5201-IPV6-Fix-addrconf-dead-lock.txt 5202-NET-Validate-socket-filters-against-BPF_MAXINSNS-in-one-spot.txt 5203-IPV6-mcast-Fix-multiple-issues-in-MLDv2-reports.txt 5205-TG3-ethtool-d-hangs-PCIe-systems.txt 5206-TG3-Update-driver-version-and-reldate.txt 5518-s-retreiv-retriev-g.txt 5541-TCP-BIC-remove-low-utilization-code.txt 5542-TCP-BIC-spelling-and-whitespace.txt 5543-TCP-BIC-CUBIC-window-growth-2.0.txt 5544-NETFILTER-ip_tables-NUMA-aware-allocation.txt 5545-NETFILTER-ebtables-Support-nf_log-API-from-ebt_log-and-ebt_ulog.txt 5546-IPV4-Safer-reassembly.txt 5547-IPV6-Reuse-inet_csk_get_port-in-tcp_v6_get_port.txt 5548-IPV6-Generalise-__tcp_v6_hash-renaming-it-to-__inet6_hash.txt 5549-ICSK-make-inet_csk_reqsk_queue_hash_add-timeout-arg-unsigned-long.txt 5550-IPV6-Generalise-tcp_v6_search_req-tcp_v6_synq_add.txt 5551-IPV6-Introduce-inet6_rsk.txt 5552-ICSK-Rename-struct-tcp_func-to-struct-inet_connection_sock_af_ops.txt 5553-ICSK-Move-v4_ad! dr2sockaddr-from-TCP-to-icsk.txt 5554-DCCP-Introduce-dccp_ipv! 4_af_ops .txt 5555-IP-Simplify-and-consolidate-MSG_PEEK-error-handling.txt 5556-UDP-udp_checksum_init-return-value.txt 5557-IPVS-remove-dead-code.txt 5558-NET-Avoid-atomic-xchg-for-non-error-case.txt 5559-AF_UNIX-Remove-superfluous-reference-counting-in-unix_stream_sendmsg.txt 5560-IPV6-Generalise-some-functions.txt 5561-IPV6-Introduce-inet6_timewait_sock.txt 5562-IPV6-Export-some-symbols-for-DCCPv6.txt 5563-DCCP-Just-rename-dccp_v4_prot-to-dccp_prot.txt 5564-DCCP-Prepare-the-AF-agnostic-core-for-the-introduction-of-DCCPv6.txt 5565-IPV6-Export-ipv6_opt_accepted.txt 5567-DCCP-Use-reqsk_free-in-dccp_v4_conn_request.txt 5571-TCP-Move-the-TCPF_-enum-to-tcp_states.h.txt 5573-AF_UNIX-Use-spinlock-for-unix_table_lock.txt 5574-BRIDGE-allow-setting-hardware-address-of-bridge-pseudo-dev.txt 5575-BRIDGE-handle-speed-detection-after-carrier-changes.txt 5576-BRIDGE-filter-packets-in-learning-state.txt 5577-BRIDGE-limited-ethtool-support.txt 5578-BRIDGE-add-version-number.txt 5579-PKT_SCHED-netem-! packet-corruption-option.txt 5582-TCP-cubic-precompute-constants.txt 5583-TCP-cubic-use-Newton-Raphson.txt 5584-IPV4-fib_trie-Add-credits.txt 5585-SCTP-Update-SCTP_PEER_ADDR_PARAMS-socket-option-to-the-latest-api-draft.txt 5586-SCTP-Add-support-for-SCTP_DELAYED_ACK_TIME-socket-option.txt 5587-NET-Small-cleanup-to-socket-initialization.txt 5588-NET-move-struct-proto_ops-to-const.txt 5589-PKTGEN-Deinitialise-static-variables.txt 5590-NET-Fix-sock_init-return-value.txt 5591-NET-restructure-sock_aio_-read-write-sock_-readv-writev.txt 5594-TCP-Don-t-use-__constant_htonl-for-a-non-const-arg.txt 5595-PPPOX-Fix-assignment-into-const-proto_ops.txt 5596-NET-Speed-up-__alloc_skb.txt 5597-AF_UNIX-Convert-to-use-a-spinlock-instead-of-rwlock.txt 5598-NETLINK-genetlink-fix-cmd-type-in-genl_ops-to-be-consistent-to-u8.txt 5599-NETROM-Remove-unessecary-lock_sock-calls-in-netrom_ioctl.txt 5600-NET-Add-a-dev_ioctl-fallback-to-sock_ioctl.txt 5601-TG3-fixup-tot_len-calculation.txt 5602-IPVS-Clean! up-IP_VS_DBG-statements.txt 5603-DECNET-Only-use-local-router! s.txt 56 04-DCCP-Do-not-process-a-packet-twice-when-it-s-not-in-state-DCCP_OPEN.txt 5605-DCCP-Send-an-ACK-vector-when-ACKing-a-response-packet.txt 5606-DCCP-Notify-CCID-only-after-ACK-vectors-have-been-processed.txt 5607-BRIDGE-Fix-faulty-check-in-br_stp_recalculate_bridge_id.txt 5608-IPV4-fib_trie-build-fix.txt 5610-IEEE80211-ipw2200-Simplify-multicast-checks.txt 5611-TCP-less-inline-s.txt 5612-DCCP-ackvec-Fix-spelling-of-throw.txt 5613-DCCP-ackvec-use-u8-for-the-buf-offsets.txt 5614-TCP-syn_flood_warning-is-only-needed-if-CONFIG_SYN_COOKIES-is-selected.txt 5700-ECONET-Use-macro-for-spinlock_t-definition.txt 5701-IPV6-Use-macro-for-rwlock_t-initialization.txt 5702-NETFILTER-Use-macro-for-spinlock_t-rwlock_t-initializations-definition.txt 5703-NET-More-instruction-checks-fornet-core-filter.c.txt 5704-TCP-tcp_vegas-Fix-slow-start.txt 5730-IPVS-Fix-compilation.txt 5731-NETFILTER-Decrease-number-of-pointer-derefs-in-nfnetlink_queue.c.txt 5732-NETFILTER-Decrease-number-of-pointer-derefs-! in-nf_conntrack_core.c.txt 5733-NETFILTER-ctnetlink-remove-bogus-checks-in-ICMP-protocol-at-dumping.txt 5734-NETFILTER-ctnetlink-Add-sanity-checkings-for-ICMP.txt 5735-NETFILTER-ctnetlink-propagate-ctnetlink_dump_tuples_proto-return-value-back.txt 5736-NETFILTER-ctnetlink-use-u_int32_t-instead-of-unsigned-int.txt 5737-NETFILTER-ctnetlink-ctnetlink_event-cleanup.txt 5738-NETFILTER-ctnetlink-fix-conntrack-mark-race.txt 5739-NETFILTER-ctnetlink-remove-unused-variable.txt 5740-NETFILTER-Add-ctnetlink-port-for-nf_conntrack.txt 5741-NETFILTER-Filter-dumped-entries-based-on-the-layer-3-protocol-number.txt 5742-NETFILTER-Fix-module_param-types-and-permissions.txt 5743-NETFILTER-ctnetlink-Fix-dumping-of-helper-name.txt 5744-NETFILTER-Remove-okfn-usage-in-ip_vs_core.c.txt 5745-NETFILTER-Call-POST_ROUTING-hook-before-fragmentation.txt 5746-NETFILTER-make-ipv6_find_hdr-find-transport-protocol-header.txt 5747-NETFILTER-Export-ip6_masked_addrcmp-don-t-pass-IPv6-addresses-on-stack.txt 5748! -NETFILTER-nf_conntrack_l3proto_ipv4.c-needs-net-route.h.txt ! 5749-NET FILTER-Use-HOPLIMIT-metric-as-TTL-of-TCP-reset-sent-by-REJECT.txt 5776-NET-Change-1500-to-ETH_DATA_LEN-in-some-files.txt 5796-knfsd-fix-hash-function-for-IP-addresses-on-64bit-little-endian-machines.txt 6008-parport-include-fixes.txt 6015-Keep-nfsd-from-exiting-when-seeing-recv-errors.txt added hold last reject removed __user 0036-sky2-new-experimental-Marvell-Yukon2-driver.txt 0072-8139cp-support-ETHTOOL_GPERMADDR.txt 0073-8139too-support-ETHTOOL_GPERMADDR.txt 0074-b44-support-ETHTOOL_GPERMADDR.txt 0075-e1000-support-ETHTOOL_GPERMADDR.txt 0076-e100-support-ETHTOOL_GPERMADDR.txt 0077-forcedeth-support-ETHTOOL_GPERMADDR.txt 0078-ixgb-support-ETHTOOL_GPERMADDR.txt 0079-ne2k-pci-support-ETHTOOL_GPERMADDR.txt 0080-pcnet32-support-ETHTOOL_GPERMADDR.txt 0081-r8169-support-ETHTOOL_GPERMADDR.txt 0082-skge-support-ETHTOOL_GPERMADDR.txt 0083-sundance-support-ETHTOOL_GPERMADDR.txt 0084-via-rhine-support-ETHTOOL_GPERMADDR.txt 0087-Replace-drivers-net-wan-custom-ctype-macros-with-standar! d-ones.txt 0088-drivers-net-wan-possible-cleanups.txt 0089-lne390-bogus-casts.txt 0090-C99-initializers-in-ray_cs.c.txt 0091-mii-Add-test-for-GigE-support.txt 0092-Add-rapidio-net-driver.txt 0100-pcnet32-set_ringparam-implementation.txt 0101-pcnet32-set-min-ring-size-to-4.txt 0102-sky2-driver-update.txt 0103-orinoco-Remove-conditionals-that-are-useless-in-the-kernel-drivers.txt 0104-orinoco-Don-t-include-net-ieee80211.h-twice.txt 0105-orinoco-Update-PCMCIA-ID-s.txt 0106-Fixed-some-endian-issues-with-802.11-header-usage-in-ieee80211_rx.c.txt 0107-ieee80211-quality-scaling-algorithm-extension-handler.txt 0108-ieee80211-Added-wireless-spy-support.txt 0109-Changed-802.11-headers-to-use-ieee80211_info_element-0.txt 0110-ieee80211-Removed-ieee80211_info_element_hdr.txt 0111-ieee80211-Cleanup-memcpy-parameters.txt 0112-ieee80211-Switched-to-sscanf-in-store_debug_level.txt 0113-ieee80211-Fixed-type-o-of-abg_ture-abg_true.txt 0114-Updated-ipw2200-to-compile-with-ieee80211-abg_ture-to! -abg_true-change.txt 0163-sky2-fix-FIFO-DMA-alignment-problem! s.txt 01 64-sky2-allow-ethtool-debug-access-to-all-of-PCI-space.txt 0165-sky2-version-0.5.txt 0166-ieee80211-Updated-ipw2100-to-be-compatible-with-ieee80211_hdr-changes.txt 0167-ieee80211-Updated-ipw2100-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0168-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211_hdr-changes.txt 0169-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0170-ieee80211-Updated-atmel-to-be-compatible-with-ieee80211_hdr-changes.txt 0171-ieee80211-Fixed-a-kernel-oops-on-module-unload.txt 0172-ieee80211-Hardware-crypto-and-fragmentation-offload-support.txt 0173-ieee80211-Fix-time-calculation-switching-to-use-jiffies_to_msecs.txt 0174-ieee80211-Fix-kernel-Oops-when-module-unload.txt 0175-ieee80211-Allow-drivers-to-fix-an-issue-when-using-wpa_supplicant-with-WEP.txt 0176-ieee82011-Added-WE-18-support-to-default-wireless-extension-handler.txt 0177-ieee80211-Renamed-ieee80211_hdr-to-ieee80211_hdr_3addr.txt 0178-ie! ee80211-adds-support-for-the-creation-of-RTS-packets.txt 0179-ieee82011-Added-ieee80211_tx_frame-to-convert-generic-802.11-data-frames-and-callbacks.txt 0180-ieee80211-Fix-TKIP-repeated-fragmentation-problem-and-payload_size-reporting.txt 0181-ieee80211-Return-NETDEV_TX_BUSY-when-QoS-buffer-full.txt 0182-ieee80211-Add-QoS-WME-support-to-the-ieee80211-subsystem.txt 0183-ieee80211-Added-ieee80211_geo-to-provide-helper-functions.txt 0184-ieee80211-Added-ieee80211_radiotap.h.txt 0185-ieee80211-Additional-fixes-for-endian-aware-types.txt 0186-ieee80211-extern-inline-to-static-inline.txt 0187-ieee80211-Type-o-capbility-definition-for-QoS-and-ERP-parsing.txt 0188-ieee80211-Mixed-PTK-GTK-CCMP-TKIP-support.txt 0189-ieee80211-Keep-auth-mode-unchanged-after-iwconfig-key-off-on-cycle.txt 0190-ieee80211-Updated-copyright-dates.txt 0191-ieee80211-Updated-hostap-to-be-compatible-with-ieee80211_hdr-changes.txt 0192-ieee80211-Updated-hostap-to-be-compatible-with-extra_prefix_len-changes.txt ! 0193-ieee82011-Remove-WIRELESS_EXT-ifdefs.txt 0194-forcedeth-! add-hard ware-tx-checksumming.txt 0199-ieee80211-Added-subsystem-version-string-and-reporting-via-MODULE_VERSION.txt 0200-ieee80211-Added-handle_deauth-callback-enhanced-tkip-ccmp-support-of-varying-hw-sw-offload.txt 0201-ieee80211-added-IE-comments-reason_code-to-reason-removed-info_element-from-ieee80211_disassoc.txt 0202-ieee80211-in-tree-driver-updates-to-sync-with-latest-ieee80211-series.txt 0203-ieee80211-update-orinoco-wl3501-drivers-for-latest-struct-naming.txt 0216-orinoco-Remove-inneeded-system-includes.txt 0217-orinoco-Make-nortel_pci_hw_init-static.txt 0218-orinoco-Fix-memory-leak-and-unneeded-unlock-in-orinoco_join_ap.txt 0219-orinoco-orinoco_send_wevents-could-return-without-unlocking.txt 0220-orinoco-Remove-unneeded-forward-declarations.txt 0221-orinoco-Annotate-endianess-of-variables-and-structure-members.txt 0222-orinoco-Read-only-needed-data-in-__orinoco_ev_txexc.txt 0223-orinoco-Bump-version-to-0.15rc3.txt 0227-RPC-Report-connection-errors-properly-when-mounting-wi! th-soft.txt 0228-RPC-proper-soft-timeout-behavior-for-rpcbind.txt 0229-NFS-use-a-constant-value-for-TCP-retransmit-timeouts.txt 0230-RPC-portmapper-doesn-t-need-a-reserved-port.txt 0231-RPC-extract-socket-logic-common-to-both-client-and-server.txt 0232-RPC-introduce-client-side-transport-switch.txt 0233-RPC-transport-switch-function-naming.txt 0234-RPC-Reduce-stack-utilization-in-xs_sendpages.txt 0235-RPC-Rename-sock_lock.txt 0236-RPC-Rename-xprt_lock.txt 0237-RPC-rename-the-sockstate-field.txt 0238-RPC-Eliminate-socket.h-includes-in-RPC-client.txt 0239-RPC-Add-helper-for-waking-tasks-pending-on-a-transport.txt 0240-RPC-client-side-transport-switch-cleanup.txt 0241-RPC-separate-TCP-and-UDP-write-space-callbacks.txt 0242-RPC-separate-TCP-and-UDP-transport-connection-logic.txt 0243-RPC-separate-TCP-and-UDP-socket-write-paths.txt 0244-RPC-skip-over-transport-specific-heads-automatically.txt 0245-RPC-get-rid-of-xprt-stream.txt 0246-RPC-add-API-to-set-transport-specific-timeouts.! txt 0247-RPC-expose-API-for-serializing-access-to-RPC-transpo! rts.txt 0248-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0249-RPC-separate-xprt_timer-implementations.txt 0250-RPC-add-generic-interface-for-adjusting-the-congestion-window.txt 0251-RPC-add-a-release_rqst-callout-to-the-RPC-transport-switch.txt 0252-RPC-remove-xprt-nocong.txt 0253-RPC-clean-up-after-nocong-was-removed.txt 0254-RPC-allow-RPC-client-s-port-range-to-be-adjustable.txt 0255-RPC-make-sure-to-get-the-same-local-port-number-when-reconnecting.txt 0256-RPC-parametrize-various-transport-connect-timeouts.txt 0257-RPC-rationalize-set_buffer_size.txt 0258-RPC-NFS-new-rpc_pipefs-patch.txt 0260-Revert-PATCH-RPC-NFS-new-rpc_pipefs-patch.txt 0262-SUNRPC-fix-bug-in-patch-portmapper-doesn-t-need-a-reserved-port.txt 0266-netdrvr-gianfar-use-new-phy-layer.txt 0267-netdrvr-delete-CONFIG_PHYCONTROL.txt 0268-hostap-Fix-pci_driver-name-for-hostap_plx-and-hostap_pci.txt 0269-hostap-Add-support-for-WE-19.txt 0270-hostap-Use-GFP_ATOMIC-to-get-rid-of-weird-might_sleep-issue.txt 0! 271-hostap-Remove-iwe_stream_add_event-kludge.txt 0272-Remove-WIRELESS_EXT-ifdefs-from-several-wireless-drivers.txt 0273-wireless-airo-remove-needed-dma_addr_t-obfuscation.txt 0312-sky2-changing-mtu-doesn-t-have-to-reset-link.txt 0313-sky2-cleanup-interrupt-processing.txt 0314-sky2-add-hardware-VLAN-acceleration-support.txt 0315-sky2-explicit-set-power-state.txt 0316-sky2-version-0.6.txt 0317-sky2-nway-reset-BONUS-FEATURE.txt 0323-This-patch-fixes-a-typo-in-ieee80211.h-ieee82011_deauth-ieee80211_deauth.txt 0346-This-will-move-the-ieee80211_is_ofdm_rate-function-to-the-ieee80211.h.txt 0348-Currently-the-info_element-is-parsed-by-2-seperate-functions-this.txt 0349-When-an-assoc_resp-is-received-the-network-structure-is-not-completely.txt 0350-Lindent-and-trailing-whitespace-script-executed-ieee80211-subsystem.txt 0356-hostap-Remove-hw-specific-dev_open-close-handlers.txt 0357-hostap-Fix-hostap_pci-build-with-PRISM2_IO_DEBUG.txt 0358-hostap-Do-not-free-local-hw_priv-before-unre! gistering-netdev.txt 0359-hostap-Unregister-netdevs-before-fr! eeing-lo cal-data.txt 0366-S2io-MSI-MSI-X-support-runtime-configurable.txt 0367-e1000-Support-for-82571-and-82572-controllers.txt 0368-e1000-multi-queue-defines-modification-to-data-structures.txt 0369-e1000-implementation-of-the-multi-queue-feature.txt 0370-e1000-Enable-custom-configuration-bits-for-82571-2-controllers.txt 0371-e1000-Fixes-for-packet-split-related-issues.txt 0372-e1000-Added-msleep_interruptible-delay.txt 0373-e1000-Flush-shadow-RAM.txt 0374-e1000-fix-warnings.txt 0375-AX.25-Delete-debug-printk-from-mkiss-driver.txt 0376-AX.25-Convert-mkiss.c-to-DEFINE_RWLOCK.txt 0377-airo-fix-resume.txt 0378-s2io-change-strncpy-length-arg-to-use-size-of-target.txt 0379-netdrvr-s2io-Add-a-MODULE_VERSION-entry.txt 0380-bonding-replicate-IGMP-traffic-in-activebackup-mode.txt 0381-sky2-add-permanent-address-support.txt 0383-wireless-ipw2200-remove-redundant-return-statement.txt 0546-S2io-Offline-diagnostics-fixes.txt 0547-rcu-in-bpqether-driver.txt 0548-SMACK-support-for-mkiss.txt 0549! -Initialize-the-.owner-field-the-tty_ldisc-structure.txt 0555-SUNRPC-Retry-rpcbind-requests-if-the-server-s-portmapper-isn-t-up.txt 0556-RPC-allow-call_encode-to-delay-transmission-of-an-RPC-call.txt 0575-ieee80211-division-by-zero-fix.txt 0577-sb1250-mac-Check-the-actual-setting-for-reporting-hw-checksumming.txt 0578-sb1250-mac-Ensure-16-byte-alignment-of-the-descriptor-ring.txt 0579-au1000_eth-Misc-Au1000-net-driver-fixes.txt 0580-de2104x-Resurrect-Cobalt-support-for-2.6.txt 0581-sgiseeq-Fix-resource-handling.txt 0582-sgiseeq-Configure-PIO-and-DMA-timing-requests.txt 0583-declance-Convert-to-irqreturn_t.txt 0584-declance-Fix-mapping-of-device.txt 0585-declance-Deal-with-the-bloody-KSEG-vs-CKSEG-horror.txt 0586-declance-Use-physical-addresses-at-the-interface-level.txt 0587-ne-Support-for-RBHMA4500-eval-board.txt 0588-mipsnet-Virtual-ethernet-driver-for-MIPSsim.txt 0589-e1000_intr-build-fix.txt 0590-s2io-build-fix.txt 0592-via-rhine-change-mdelay-to-msleep-and-remove-from-I! SR-path.txt 0593-epic100-fix-counting-of-work_done-in-epic_po! ll.txt 0 596-bonding-cleanup-comment-for-mode-1-IGMP-xmit-hack.txt 0597-b44-alternate-allocation-option-for-DMA-descriptors.txt 0598-orinoco-remove-redundance-skb-length-check-before-padding.txt 0599-sundance-remove-if-1-.-block-in-sundance_probe1.txt 0600-sundance-expand-reset-mask.txt 0601-e1000-build-fix.txt 0603-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0606-SUNRPC-Add-support-for-privacy-to-generic-gss-api-code.txt 0607-SUNRPC-Provide-a-callback-to-allow-free-pages-allocated-during-xdr-encoding.txt 0608-SUNRPC-Retry-wrap-in-case-of-memory-allocation-failure.txt 0609-RPCSEC_GSS-cleanup-au_rslack-calculation.txt 0610-RPCSEC_GSS-client-side-privacy-support.txt 0611-RPCSEC_GSS-Simplify-rpcsec_gss-crypto-code.txt 0612-RPCSEC_GSS-krb5-pre-privacy-cleanup.txt 0613-RPCSEC_GSS-Add-support-for-privacy-to-krb5-rpcsec_gss-mechanism.txt 0614-RPCSEC_GSS-remove-all-qop-parameters.txt 0615-RPCSEC_GSS-krb5-cleanup.txt 0622-Fixed-problem-with-not-being-able-to-decrypt-encrypt! -broadcast-packets.txt 0631-sb1250-mac-Get-rid-of-all-the-funny-SBMAC_WRITECSR-and-SBMAC_READCSR-macros.txt 0632-sb1250-mac-Whitespace-cleanup.txt 0645-sundance-include-MII-address-0-in-PHY-probe.txt 0646-e1000-Driver-version-white-space-comments-device-id-other.txt 0647-Fixed-oops-if-an-uninitialized-key-is-used-for-encryption.txt 0652-sb1250-mac-PHY-probing-fixes.txt 0670-ieee80211-subsystem.txt 0671-Update-version-ieee80211-stamp-to-1.1.6.txt 0675-PARISC-Change-the-driver-names-so-sys-bus-parisc-drivers-looks-better.txt 0676-PARISC-Convert-parisc_device-to-use-struct-resource-for-hpa.txt 0714-PARISC-Add-NETPOLL-support-to-lasi_82596.txt 0771-DECNET-Remove-some-redundant-ifdeffed-code.txt 0772-NET-Wider-use-of-for_each_-cpu.txt 0773-PKTGEN-Sleeping-function-called-under-lock.txt 0774-PKTGEN-Use-kzalloc.txt 0775-PKTGEN-Spelling-and-white-space.txt 0776-PKTGEN-proc-interface-revision.txt 0777-NETFILTER-ip_conntrack-Make-hashsize-conntrack-parameter-writable.txt 0778-IPV4-Kil! l-redundant-rcu_dereference-on-fa_info.txt 0779-IPSEC-Kill-ob! solete-g et_mss-function.txt 0780-NETLINK-Remove-dead-code-in-af_netlink.c.txt 0781-IPV4-Remove-dead-code-from-ip_output.c.txt 0782-SK_BUFF-kernel-doc-fix-skbuff-warnings.txt 0783-AX.25-Use-constant-instead-of-magic-number.txt 0784-IPV4-Fix-setting-broadcast-for-SIOCSIFNETMASK.txt 0785-netdrvr-forcedeth-scatter-gather-and-segmentation-offload-support.txt 0786-ieee80211-build-fix.txt 0834-Revert-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0855-RPC-Ensure-that-nobody-can-queue-up-new-upcalls-after-rpc_close_pipes.txt 0931-gfp_t-net.txt 0952-gfp_t-drivers-net.txt 0957-ARM-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 0963-ARM-2897-2-PXA2xx-IRDA-support.txt 0971-sky2-remove-unused-definitions.txt 0972-sky2-use-kzalloc.txt 0973-sky2-spelling-fixes.txt 0974-sky2-fix-NAPI-and-receive-handling.txt 0975-sky2-version-0.7.txt 1029-DRIVER-MODEL-Get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.txt 1037-Bluetooth-Make-more-functions-static.txt! 1038-Bluetooth-Update-security-filter-for-Extended-Inquiry-Response.txt 1043-IPv4-IPv6-UFO-Scatter-gather-approach.txt 1044-MCAST-IPv6-Fix-algorithm-to-compute-Querier-s-Query-Interval.txt 1055-tg3-add-5714-5715-support.txt 1056-tg3-fix-ASF-heartbeat.txt 1057-tg3-update-version-and-minor-fixes.txt 1058-ibmveth-fix-bonding.txt 1059-ibmveth-fix-buffer-pool-management.txt 1060-ibmveth-fix-buffer-replenishing.txt 1061-ibmveth-lockless-TX.txt 1062-ibmveth-fix-failed-addbuf.txt 1063-pcnet_cs-fix-mii-init-code-for-older-DL10019-based-cards.txt 1065-s2io-kconfig-help-fix.txt 1066-b44-reports-wrong-advertised-flags.txt 1067-sis190.c-fix-multicast-MAC-filter.txt 1068-smc91x-shut-down-power-after-probing.txt 1070-starfire-free_irq-on-error-path-of-netdev_open.txt 1073-netdrvr-b44-include-linux-dma-mapping.h-to-eliminate-warning.txt 1074-sundance-fix-DFE-580TX-Tx-Underrun.txt 1075-New-PowerPC-4xx-on-chip-ethernet-controller-driver.txt 1078-sis900-come-alive-after-temporary-memory-short! age.txt 1079-Add-Wake-on-LAN-support-to-sis900-2.txt 1080-dri! vers-net -Remove-pointless-checks-for-NULL-prior-to-calling-kfree.txt 1082-netdrvr-ne2k-pci-based-card-does-not-support-bus-mastering.txt 1083-ipw2200-Missing-kmalloc-check.txt 1159-SCTP-Rename-SCTP-specific-control-message-flags.txt 1163-SCTP-Fix-SCTP_SETADAPTION-sockopt-to-use-the-correct-structure.txt 1164-SCTP-Allow-SCTP_MAXSEG-to-revert-to-default-frag-point-with-a-0-value.txt 1196-SCTP-Do-not-allow-unprivileged-programs-initiating-new-associations-on.txt 1200-e1000-remove-warning-about-e1000_suspend.txt 1201-eepro.c-module_param_array-cleanup.txt 1202-b44-fix-suspend-resume.txt 1203-e1000-use-vmalloc_node.txt 1204-revert-orinoco-Information-leakage-due-to-incorrect-padding.txt 1205-Better-fixup-for-the-orinoco-driver.txt 1206-e1000-Fixes-e1000_suspend-warning-when-CONFIG_PM-is-not-enabled.txt 1320-ETH-ether-address-compare.txt 1324-Add-modalias-for-pmac-network-drivers.txt 1328-mv643xx_eth_showsram-Added-information-message-when-using-the-SRAM.txt 1329-IPV4-Fix-issue-reported-b! y-Coverity-in-ipv4-fib_frontend.c.txt 1389-s2io-iomem-annotations.txt 1397-bluetooth-hidp-is-broken-on-s390.txt 1403-drivers-net-tg3-Use-the-DMA_-32-64-BIT_MASK-constants.txt 1405-prism54-Free-skb-after-disabling-interrupts.txt 1748-DRIVER-MODEL-Add-missing-platform_device.h-header.txt 1749-PPC-44x-EMAC-driver-add-440SPe-support.txt 1750-PPC-44x-EMAC-driver-add-440GR-support.txt 1751-PPC-4xx-EMAC-driver-fix-VSC8201-PHY-initialization.txt 1754-fec_8xx-Remove-dependency-on-NETTA-NETPHONE.txt 1755-fec_8xx-Add-support-for-Intel-PHY-LX971.txt 1761-vmalloc_node.txt 1854-ARM-3066-1-Fix-PXA-irda-driver-suspend-resume-functions.txt 1920-m32r-SMC91x-driver-update.txt 1929-smsc-ircc2-PM-cleanup-do-not-close-device-when-suspending.txt 1941-remove-some-more-check_region-stuff.txt 1961-Typo-fix-dot-after-newline-in-printk-strings.txt 2026-sparse-cleanups-NULL-pointers-C99-struct-init.txt 2067-netdrvr-8139too-replace-hand-crafted-kernel-thread-with-workqueue.txt 2078-BRIDGE-Use-ether_compa! re.txt 2079-NETFILTER-Add-revision-support-to-arp_tables-and-! ip6_tabl es.txt 2080-ROSE-rose_heartbeat_expiry-locking-fix.txt 2081-IPV6-Fix-behavior-of-ip6_route_input-for-link-local-address.txt 2083-DCCP-Simplify-skb_set_owner_w-semantics.txt 2089-DCCP-Set-socket-owner-iff-packet-is-not-data.txt 2090-MCAST-IPv6-Check-packet-size-when-process-Multicast.txt 2227-ibmveth-fix-panic-in-initial-replenish-cycle.txt 2245-MCAST-ip-6-_mc_add_src-should-be-called-when-number-of-sources-is-zero.txt 2256-IPV6-inet6_ifinfo_notify-should-use-RTM_DELLINK-in-addrconf_ifdown.txt 2267-PKT_SCHED-Rework-QoS-and-or-fair-queueing-configuration.txt 2396-ARM-Reverted-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 2410-SUNRPC-allow-sunrpc.o-to-link-when-CONFIG_SYSCTL-is-disabled.txt 2411-NFS-SUNRPC-NLM-fix-unused-variable-warnings-when-CONFIG_SYSCTL-is-disabled.txt 2416-NETFILTER-PPTP-helper-Fix-compilation-of-conntrack-helper-without-NAT.txt 2421-netdrvr-8139too-use-cancel_rearming_delayed_work-to-cancel-thread.txt 2422-netdrvr-8139too-use-rtn! l_shlock_nowait-rather-than-rtnl_lock_interruptible.txt 2425-NETFILTER-Fix-double-free-after-netlink_unicast-in-ctnetlink.txt 2430-NETFILTER-nfnetlink-Use-kzalloc.txt 2431-NETFILTER-CONNMARK-target-needs-ip_conntrack.txt 2433-NETEM-use-PSCHED_LESS.txt 2435-drivers-net-wireless-airo.c-unsigned-comparason.txt 2436-S2io-Multi-buffer-mode-support.txt 2438-pcnet32-show-name-of-failing-device.txt 2439-pcnet32-AT2700-2701-and-Bugzilla-2699-4551.txt 2440-pcnet32-Prevent-hang-with-79c976.txt 2441-phy-address-mask-support-for-generic-phy-layer.txt 2442-PKT_SCHED-Generic-RED-layer.txt 2443-NET-Introduce-INET_ECN_set_ce-function.txt 2444-PKT_SCHED-RED-Use-new-generic-red-interface.txt 2445-PKT_SCHED-RED-Use-generic-queue-management-interface.txt 2446-PKT_SCHED-RED-Dont-start-idle-periods-while-already-idling.txt 2447-PKT_SCHED-RED-Cleanup-and-remove-unnecessary-code.txt 2448-PKT_SCHED-GRED-Cleanup-equalize-flag-and-add-new-WRED-mode-detection.txt 2449-PKT_SCHED-GRED-Transform-grio-to-GR! ED_RIO_MODE.txt 2450-PKT_SCHED-GRED-Cleanup-dumping.txt 2451-! PKT_SCHE D-GRED-Dump-table-definition.txt 2452-PKT_SCHED-GRED-Use-a-central-table-definition-change-procedure.txt 2453-PKT_SCHED-GRED-Report-out-of-bound-DPs-as-illegal.txt 2454-PKT_SCHED-GRED-Use-central-VQ-change-procedure.txt 2455-PKT_SCHED-GRED-Use-new-generic-red-interface.txt 2456-PKT_SCHED-GRED-Do-not-reset-statistics-in-gred_reset-gred_change.txt 2457-PKT_SCHED-GRED-Report-congestion-related-drops-as-NET_XMIT_CN.txt 2458-PKT_SCHED-GRED-Use-generic-queue-management-interface.txt 2459-PKT_SCHED-GRED-Introduce-tc_index_to_dp.txt 2460-PKT_SCHED-GRED-Improve-error-handling-and-messages.txt 2461-PKT_SCHED-GRED-Remove-initd-flag.txt 2462-PKT_SCHED-GRED-Dont-abuse-default-VQ-for-equalizing.txt 2463-PKT_SCHED-GRED-Remove-auto-creation-of-default-VQ.txt 2464-PKT_SCHED-GRED-Cleanup-and-remove-unnecessary-code.txt 2465-PKT_SCHED-GRED-Fix-restart-of-idle-period-in-WRED-mode-upon-dequeue-and-drop.txt 2466-PKT_SCHED-GRED-Support-ECN-marking.txt 2467-PKT_SCHED-G-RED-Introduce-hard-dropping.t! xt 2468-DRIVER-MODEL-Improved-dynamically-allocated-platform_device-interface.txt 2469-DRIVER-MODEL-Fix-depca.txt 2470-DRIVER-MODEL-Fix-jazzsonic.txt 2471-DRIVER-MODEL-Fix-macsonic.txt 2476-NETEM-Support-time-based-reordering.txt 2477-NETEM-Add-version-string.txt 2478-NET-Fix-race-condition-in-sk_stream_wait_connect.txt 2479-TCP-DCCP-Randomize-port-selection.txt 2481-drivers-net-ixgb-make-some-code-static.txt 2482-drivers-net-e1000-possible-cleanups.txt 2483-drivers-net-hamradio-dmascc.c-remove-dmascc_setup.txt 2484-prism54-Remove-redundant-assignment.txt 2485-bnx2-add-5708-support.txt 2486-bnx2-update-firmware-for-5708.txt 2487-bnx2-update-nvram-code-for-5708.txt 2488-bnx2-update-firmware-handshake-for-5708.txt 2489-bnx2-refine-bnx2_poll.txt 2490-bnx2-update-version-and-minor-fixes.txt 2493-Remove-linux-version.h-include-from-drivers-net-phy-and-net-ieee80211.txt 2494-netdrvr-fac_8xx-build-fix.txt 2495-netdrvr-s2io-warning-fixes.txt 2645-b44-b44_start_xmit-returns-with-a-lo! ck-held-when-it-fails-allocating.txt 2646-b44-miscellaneous-c! leanup.t xt 2647-b44-expose-counters-through-ethtool.txt 2648-b44-s-spin_lock_irqsave-spin_lock-in-b44_interrupt.txt 2649-b44-late-request_irq-in-b44_open.txt 2688-3c59x-convert-to-use-of-pci_iomap-API.txt 2689-3c59x-cleanup-of-mdio_read-routines-to-use-MII_-macros.txt 2690-3c59x-avoid-blindly-reading-link-status-twice.txt 2691-3c59x-bounds-checking-for-hw_checksums.txt 2692-3c59x-cleanup-init-of-module-parameter-arrays.txt 2693-3c59x-fix-some-grammar-in-module-parameter-descriptions.txt 2694-3c59x-support-ETHTOOL_GPERMADDR.txt 2695-3c59x-correct-rx_dropped-counting.txt 2696-3c59x-enable-use-of-memory-mapped-PCI-I-O.txt 2697-3c59x-don-t-enable-scatter-gather-w-o-checksum-support.txt 2828-knfsd-make-sure-svc_process-call-the-correct-pg_authenticate-for-multi-service-port.txt 2934-m68knommu-FEC-ethernet-header-support-for-the-ColdFire-5208.txt 2935-m68knommu-FEC-ethernet-support-for-the-ColdFire-5208.txt 2984-scripts-Lindent-on-ieee80211-subsystem.txt 2985-Fix-problem-with-WEP-unicast-! key-index-0.txt 2986-Update-version-ieee80211-stamp-to-1.1.7.txt 2987-Ran-scripts-Lindent-on-drivers-net-wireless-ipw2-1-2-00.-c-h.txt 2988-IPW_DEBUG-has-already-included-DRV_NAME-remove-double-prefix-print.txt 2989-Catch-ipw2200-up-to-equivelancy-with-v1.0.1.txt 2990-Catch-ipw2200-up-to-equivelancy-with-v1.0.2.txt 2991-Catch-ipw2200-up-to-equivelancy-with-v1.0.3.txt 2992-Catch-ipw2200-up-to-equivelancy-with-v1.0.4.txt 2993-Catch-ipw2100-up-to-equivelancy-with-v1.1.1.txt 2994-Fixed-WEP-on-ipw2100-priv-sec-was-being-used-instead-of.txt 2995-Bug-339-Fix-ipw2100-iwconfig-set-get-txpower.txt 2996-Move-code-from-ipw2100_wpa_enable-to-IPW2100_PARAM_DROP_UNENCRYPTED-to.txt 2997-Catch-ipw2200-up-to-equivelancy-with-v1.0.5.txt 2998-Fix-hardware-encryption-both-WEP-and-AES-doesn-t-work-with-fragmentation.txt 2999-Fix-is_duplicate_packet-bug-for-fragmentation-number-setting.txt 3000-bug-667-Fix-the-notorious-No-space-for-Tx-bug.txt 3001-Bug-637-Set-tx-power-for-A-band.txt 3002-Changed-! default-of-missed-beacons-to-miss-before-disassociation-to-24! .txt 300 3-Updated-to-support-ieee80211-callback-to-is_queue_full-for-802.11e.txt 3004-Fixed-some-compiler-issues-if-CONFIG_IPW2200_QOS-is-enabled.txt 3005-Added-more-useful-geography-encoding-so-people-s-experience-with.txt 3006-Workaround-kernel-BUG_ON-panic-caused-by-unexpected-duplicate-packets.txt 3007-Disable-host-fragmentation-in-open-mode-since-IPW2200-2915-hardware.txt 3008-Bug-792-Fix-WPA-PSK-AES-both-for-Dipw-and-Dwext.txt 3009-Fixes-the-ad-hoc-network-WEP-key-list-issue.txt 3010-Bug-701-Fix-a-misuse-of-ieee-mode-with-ieee-iw_mode.txt 3011-Fix-ipw_wx_get_txpow-shows-wrong-disabled-value.txt 3012-Fix-firmware-error-when-setting-tx_power.txt 3013-Modified-ipw_config-and-STATUS_INIT-setting-to-correct-race-condition.txt 3014-Switched-firmware-error-dumping-so-that-it-will-capture-a-log-available.txt 3015-Changed-all-of-the-ipw_send_cmd-calls-to-return-any-ipw_send_cmd-error.txt 3016-Added-cmdlog-in-non-debug-systems.txt 3017-Migrated-some-of-the-channel-verification-code-back! -into-the-driver-to.txt 3018-Updated-ipw2200-to-use-the-new-ieee80211-callbacks.txt 3019-Added-wait_state-wakeup-on-scan-completion.txt 3020-Bug-455-Fix-frequent-channel-change-generates-firmware-fatal-error.txt 3021-Bug-760-Fix-setting-WEP-key-in-monitor-mode-causes-IV-lost.txt 3022-Don-t-set-hardware-WEP-if-we-are-actually-using-TKIP-AES.txt 3023-Make-all-the-places-the-firmware-fails-to-load-showerrors-in-decimal.txt 3024-Adds-radiotap-support-to-ipw2200-in-monitor-mode.txt 3025-Fixed-is_network_packet-to-include-checking-for-broadcast-packets.txt 3026-Mixed-PTK-GTK-CCMP-TKIP-support.txt 3027-Card-with-WEP-enabled-and-using-shared-key-auth-will-have-firmware.txt 3028-Fixed-problem-with-get_cmd_string-not-existing-if-CONFIG_IPW_DEBUG-disabled.txt 3029-Removed-PF_SYNCTHREAD-legacy.txt 3030-Fixes-problem-with-WEP-not-working-association-succeeds-but-no-Tx-Rx.txt 3031-Fix-bug-771-Too-many-8-bytes-recieved-when-using-AES-hwcrypto.txt 3032-Fixes-WEP-firmware-error-condition.txt! 3033-Updated-driver-version-stamps-for-ipw2100-1.1.3-and-ipw! 2200-1.0 .7.txt 3034-Pulled-out-a-stray-KERNEL_VERSION-check-around-the-suspend-handler.txt 3035-Fix-Driver-using-old-proc-net-wireless-support-please-fix-driver-message.txt 3036-Removed-legacy-WIRELESS_EXT-checks-from-ipw2200.c.txt 3037-Fixes-missed-beacon-logic-in-relation-to-on-network-AP-roaming.txt 3038-Removed-warning-about-TKIP-not-being-configured-if-countermeasures-are.txt 3039-Added-channel-support-for-ipw2200-cards-identified-as-ZZR.txt 3040-Fixed-problem-with-not-being-able-to-send-broadcast-packets.txt 3041-Fixed-parameter-reordering-in-firmware-log-routine.txt 3042-Updated-firmware-version-stamp-to-2.4-from-2.3-so-it-will-use-the-latest-firmware.txt 3043-Update-version-ipw2200-stamp-to-1.0.8.txt 3081-fix-NET_RADIO-n-IEEE80211-y-compile.txt 3083-kill-include-linux-eeprom.h.txt 3084-drivers-net-s2io.c-make-functions-static.txt 3085-prism54-Unused-variable-extraneous-udelay.txt 3086-prism54-Transmit-stats-updated-in-wrong-place.txt 3087-Fix-sparse-warning-in-e100-driver.tx! t 3088-atmel-memset-correct-range.txt 3117-IPV6-Put-addr_diff-into-common-header-for-future-use.txt 3118-IPV6-Make-ipv6_addr_type-more-generic-so-that-we-can-use-it-for-source-address-selection.txt 3119-IPV6-RFC3484-compliant-source-address-selection.txt 3121-PKT_SCHED-Correctly-handle-empty-ematch-trees.txt 3122-NET-sk_add_backlog-convert-from-macro-to-inline.txt 3124-PPP-handle-misaligned-accesses.txt 3125-PPP-add-PPP-MPPE-encryption-module.txt 3126-IRDA-donauboe-locking-fix.txt 3127-NET-kfree-cleanup.txt 3128-IPV4-Fix-ip_queue_xmit-identity-increment-for-TSO-packets.txt 3131-Bluetooth-Add-endian-annotations-to-the-core.txt 3132-Bluetooth-Remove-the-usage-of-proc-completely.txt 3155-SERIAL-IOC3-Update-8250-driver-bits.txt 3160-skge-clear-PCI-PHY-COMA-mode-on-boot.txt 3161-skge-use-kzalloc.txt 3162-skge-add-mii-ioctl-support.txt 3163-skge-goto-low-power-mode-on-shutdown.txt 3164-skge-use-prefetch-on-receive.txt 3165-skge-spelling-fixes.txt 3166-skge-increase-version-number.! txt 3168-wireless-ipw2100-kill-unused-var-warnings-for-debug-! disabled -code.txt 3169-ieee80211-cleanup-crypto-list-handling-other-minor-cleanups.txt 3170-b44-replace-B44_FLAG_INIT_COMPLETE-with-netif_running.txt 3171-b44-race-on-device-closing.txt 3172-b44-increase-version-number.txt 3178-dgrs-fix-warnings-when-CONFIG_ISA-and-CONFIG_PCI-are-not-enabled.txt 3179-IOC-And-don-t-mark-the-things-as-broken-Cowboy.txt 3231-sanitize-lookup_hash-prototype.txt 3530-NETFILTER-packet-counter-of-conntrack-is-32bits.txt 3534-NETFILTER-ctnetlink-add-marking-support-from-userspace.txt 3535-NETFILTER-ctnetlink-add-module-alias-to-fix-autoloading.txt 3536-NETFILTER-ctnetlink-kill-unused-includes.txt 3537-NETFILTER-ctnetlink-get_conntrack-can-use-GFP_KERNEL.txt 3539-NETFILTER-nfnetlink-only-load-subsystems-if-CAP_NET_ADMIN-is-set.txt 3540-NETFILTER-stop-tracking-ICMP-error-at-early-point.txt 3542-NETFILTER-ctnetlink-propagate-error-instaed-of-returning-EPERM.txt 3543-NETFILTER-ctnetlink-Add-support-to-identify-expectations-by-ID-s.txt 3545-NETFILTER-ctnetlink-IC! MP_ID-is-u_int16_t-not-u_int8_t.txt 3546-IPV6-Fix-fallout-from-CONFIG_IPV6_PRIVACY.txt 3547-IPV6-ip6ip6_lock-is-not-unlocked-in-error-path.txt 3566-txt 3596-NETFILTER-Add-nf_conntrack-subsystem.txt 3599-NETLINK-Type-safe-netlink-messages-attributes-interface.txt 3600-NETLINK-Make-netlink_callback-done-optional.txt 3601-NETLINK-Generic-netlink-receive-queue-processor.txt 3602-XFRM-Use-generic-netlink-receive-queue-processor.txt 3603-RTNETLINK-Use-generic-netlink-receive-queue-processor.txt 3604-NETLINK-Generic-netlink-family.txt 3615-SUNRPC-don-t-reencode-when-looping-in-call-transmit.txt 3627-netdrvr-8139too-fast-poll-for-thread-if-an-unlikely-race-occurs.txt 3660-BNX2-output-driver-name-as-prefix-in-error-message.txt 3661-BNX2-check-return-of-dev_alloc_skb-in-bnx2_test_loopback.txt 3662-BNX2-simplify-parameter-checks-in-bnx2_-get-set-_eeprom.txt 3663-NET-Detect-hardware-rx-checksum-faults-correctly.txt 3689-TCP-fix-congestion-window-update-when-using-TSO-deferal.txt 3690-TC! P-simplify-microsecond-rtt-sampling.txt 3691-TCP-add-tcp_slow! _start-h elper.txt 3692-TCP-Appropriate-Byte-Count-support.txt 3693-TCP-receive-buffer-growth-limiting-with-mixed-MTU.txt 3694-TCP-spelling-fixes.txt 3695-TCP-speed-up-SACK-processing.txt 3701-disable-DEBUG-in-ibmveth.txt 3703-sky2-needs-dma_mapping.h.txt 3728-gianfar-mii-needs-to-zero-out-the-mii_bus-structure.txt 3729-netdrvr-forcedeth-remove-superfluous-rx-engine-stop-start.txt 3730-netdrvr-forcedeth-support-for-irq-mitigation.txt 3731-netdrvr-forcedeth-phy-address-scan-range.txt 3732-SAA9730-Whitespace-cleanup.txt 3733-SAA9730-Driver-overhaul.txt 3734-smc91x-DB1200-support.txt 3735-gt96100eth.c-Don-t-concatenate-__FUNCTION__-with-strings.txt 3737-TCP-fix-vegas-build.txt 3742-DECNET-fix-SIGPIPE.txt 3752-IPV6-Fix-inet6_init-missing-unregister.txt 3754-SCTP-Fix-potential-NULL-pointer-dereference-in-sctp_v4_get_saddr.txt 3755-SCTP-Remove-timeouts-array-from-sctp_endpoint.txt 3756-SCTP-Fix-ia64-NaT-consumption-fault-with-sctp_sideffect-commands.txt 3757-SCTP-Include-ulpevents-in-socke! t-receive-buffer-accounting.txt 3789-IPV6-Fix-unnecessary-GFP_ATOMIC-allocation-in-fib6-dump.txt 3792-ARM-Use-correct-IO-operations-for-Pleb.txt 3815-net-allow-newline-terminated-IP-addresses-in-in_aton.txt 3816-net-make-dev_valid_name-public.txt 3817-bonding-add-bond-name-to-all-error-messages.txt 3818-bonding-expand-module-param-descriptions.txt 3819-bonding-Add-transmit-policy-to-proc.txt 3820-bonding-get-slave-name-from-actual-slave-instead-of-param-list.txt 3821-bonding-move-kmalloc-out-of-spinlock-in-ALB-init.txt 3822-bonding-explicitly-clear-RLB-flag-during-ALB-init.txt 3823-bonding-expose-some-structs.txt 3824-bonding-make-functions-not-static.txt 3825-bonding-move-bond-creation-into-separate-function.txt 3826-bonding-make-bond_init-not-__init.txt 3827-bonding-Allow-ARP-target-table-to-have-empty-entries.txt 3828-bonding-add-ARP-entries-to-proc.txt 3829-bonding-add-sysfs-functionality-to-bonding-large.txt 3830-bonding-version-update.txt 3831-bonding-spelling-and-whit! espace-corrections.txt 3832-bonding-comments-and-changelog.tx! t 3860-p pc-add-support-for-new-powerbooks.txt 3959-NETFILTER-nf_conntrack-Add-missing-code-to-TCP-conntrack-module.txt 3960-NETFILTER-nfnetlink-unconditionally-require-CAP_NET_ADMIN.txt 3961-NETFILTER-link-netfilter-before-ipv4.txt 3962-NETFILTER-cleanup-IPv6-Netfilter-Kconfig.txt 3963-NETFILTER-fix-type-of-sysctl-variables-in-nf_conntrack_ipv6.txt 3964-NETFILTER-nf_conntrack-fix-possibility-of-infinite-loop-while-evicting-nf_ct_frag6_queue.txt 3965-NETFILTER-fix-leak-of-fragment-queue-at-unloading-nf_conntrack_ipv6.txt 4016-IPV6-small-fix-for-ipv6_dev_get_saddr-..txt 4017-IPV6-Fixes-sparse-warning-in-ipv6-ipv6_sockglue.c.txt 4018-LLC-Fix-TX-window-scaling.txt 4019-LLC-Make-core-block-on-remote-busy.txt 4020-LLC-Fix-typo.txt 4028-knfsd-make-sure-nfsd-doesn-t-hog-a-cpu-forever.txt 4032-sdladrv.c-build-fix.txt 4041-TCP-More-spelling-fixes.txt 4045-NETFILTER-Remove-nf_conntrack-stat-proc-file-when-cleaning-up.txt 4046-NETFILTER-Free-layer-3-specific-protocol-tables-at-cleanup.txt 4079-! drivers-net-sk98lin-skge.c-make-SkPciWriteCfgDWord-a-static-inline.txt 4080-skge-fix-warning-from-inlining-SkPciWriteCfgDWord.txt 4085-IPV4-IPV6-replace-handmade-list-with-hlist-in-IPv-4-6-reassembly.txt 4087-r8169-fix-printk_ratelimit-in-the-interrupt-handler.txt 4088-r8169-do-not-abort-when-the-power-management-capabilities-are-disabled.txt 4094-NETFILTER-Fix-nf_conntrack-compilation-with-CONFIG_NETFILTER_DEBUG.txt 4127-ipw2200-disallow-direct-scanning-when-device-is-down.txt 4128-ipw2200-fix-error-log-offset-calculation.txt 4179-TCP-TCP-highspeed-build-error.txt 4183-LLC-Fix-compiler-warnings-introduced-by-TX-window-scaling-changes.txt 4184-NET-Sanitize-NET_SCHED-protection-in-net-sched-Kconfig.txt 4185-IPV6-Fib-dump-really-needs-GFP_ATOMIC.txt 4220-smc91x-fix-one-source-of-spurious-interrupts.txt 4221-smc91x-fix-bank-mismatch.txt 4226-e100-re-enable-microcode-with-more-useful-defaults.txt 4227-s2io-UFO-support.txt 4228-i82593.h-make-header-comment-GPL-compatible.txt 4229! -IOC3-Replace-obsolete-PCI-API.txt 4230-au1000_eth-Include-li! nux-conf ig.h.txt 4231-SAA9730-Add-missing-header-bits.txt 4232-prism54-Remove-extraneous-udelay-register-read.txt 4233-drivers-net-wireless-hermes.c-unsigned-int-comparision.txt 4234-Gianfar-update-and-sysfs-support.txt 4235-intel-ixp2000-network-driver.txt 4236-git-netdev-all-ieee80211_get_payload-warning-fix.txt 4240-fec_8xx-make-CONFIG_FEC_8XX-depend-on-CONFIG_8xx.txt 4241-ipw2100-Fix-Driver-using-old-proc-net-wireless.-message.txt 4242-e1000-avoid-leak-when-e1000_setup_loopback_test-fails.txt 4243-e1000-zero-out-pointers-in-e1000_free_desc_rings.txt 4246-wireless-hermes-build-fix.txt 4322-PKT_SCHED-sch_netem-correctly-order-packets-to-be-sent-simultaneously.txt 4324-NET-Reject-socket-filter-if-division-by-constant-zero-is-attempted.txt 4326-IPV6-Acquire-addrconf_hash_lock-for-read-in-addrconf_verify-..txt 4330-FIB_TRIE-Don-t-show-local-table-in-proc-net-route-output.txt 4331-NETFILTER-fixed-dependencies-between-modules-related-with-ip_conntrack.txt 4333-DCCP-Add-missing-no_polic! y-flag-to-struct-net_protocol.txt 4353-net-Fix-compiler-error-on-dgrs.c-when-CONFIG_PCI.txt 4393-NETLINK-Use-tgid-instead-of-pid-for-nlmsg_pid.txt 4394-IPV4-Fix-secondary-IP-addresses-after-promotion.txt 4395-NETFILTER-ctnetlink-Fix-refcount-leak-ip_conntrack-nat_proto.txt 4419-NETFILTER-ip_conntrack_netlink.c-needs-linux-interrupt.h.txt 4461-SUNRPC-Funny-looking-code-in-__rpc_purge_upcall.txt 4471-bonding-Remove-superfluous-changelog.txt 4510-IPV6-Implement-appropriate-dummy-rule-4-in-ipv6_dev_get_saddr.txt 4541-IPV4-tcp-route-Another-look-at-hash-table-sizes.txt 4542-ATM-always-return-the-first-interface-for-ATM_ITF_ANY.txt 4543-ATM-atm_pcr_goal-doesn-t-modify-its-argument-s-contents-mark-it-as-const.txt 4547-ATM-attempt-to-autoload-atm-drivers.txt 4550-ATM-avoid-race-conditions-related-to-atm_devs-list.txt 4551-ATM-deregistration-removes-device-from-atm_devs-list-immediately.txt 4553-NET-Add-const-markers-to-various-variables.txt 4554-IPV4-make-two-functions-static.txt 45! 55-NETFILTER-ipv4-small-cleanups.txt 4556-IPV6-make-two-funct! ions-sta tic.txt 4589-b44-missing-netif_wake_queue-in-b44_open.txt 4590-b44-early-return-in-dev-do_ioctl-when-the-device-is-not-up.txt 4592-b44-increase-version-number.txt 4601-e1000-fix-for-dhcp-issue.txt 4602-sky2-eliminate-special-case-for-EC-A1.txt 4603-sky2-add-MII-support.txt 4604-sky2-fix-receive-flush-pause-issues.txt 4605-sky2-improve-receive-performance.txt 4606-sky2-add-Yukon-EC-ultra-support.txt 4607-sky2-handle-DMA-boundary-crossing.txt 4608-sky2-change-netif_rx_schedule_test-to-__netif_schedule_prep.txt 4609-sky2-race-with-MTU-change.txt 4610-sky2-dual-port-tx-completion.txt 4611-sky2-byteorder-annotation.txt 4612-sky2-remove-pci-express-hacks.txt 4613-sky2-use-pci_register_driver.txt 4614-sky2-update-version-number.txt 4616-sk98lin-add-permanent-address-support.txt 4617-sk98lin-avoid-message-confusion-with-skge.txt 4619-sk98lin-remove-redundant-fields-in-device-info.txt 4621-ibm_emac-fix-graceful-stop-timeout-handling.txt 4622-ixp2000-register-netdevices-last.txt 4623-! pm3386-zero-stats-properly.txt 4624-pm3386-remove-unnecessary-udelays.txt 4625-caleb-pm3386-include-proper-header-files.txt 4626-ixp2000-use-netif_rx_schedule_test.txt 4627-enp2611-don-t-check-netif_running-in-link-status-timer.txt 4628-enp2611-use-dev-in-link-status-timer.txt 4629-enp2611-report-link-up-down-events.txt 4630-ixp2000-report-MAC-addresses-for-each-port-on-init.txt 4631-pm3386-add-hook-for-setting-MAC-address.txt 4632-pm3386-add-hook-for-setting-carrier.txt 4633-pm3386-implement-reset.txt 4634-enp2611-disable-enable-SERDES-carrier-on-interface-down-up.txt 4635-ixp2000-add-netpoll-support.txt 4636-ixp2000-add-driver-version-bump-version-to-0.2.txt 4637-mipsnet-Fix-Copyright-notice.txt 4638-jazzsonic-Fix-build-error.txt 4639-jazzsonic-Fix-platform-device-code.txt 4640-orinoco-fix-setting-power-management-parameters.txt 4641-skge-handle-VLAN-checksum-correctly-on-yukon-rev-0.txt 4643-wireless-airo-reset-card-in-init.txt 4644-netdrvr-fmvj18x_cs-fix-multicast-bug.tx! t 4645-airo.c-add-support-for-IW_ENCODE_TEMP-i.e.-xsupplicant! .txt 464 9-netdrvr-skge-fix-typo-fix-build.txt 4650-ipw2200-kzalloc-conversion-and-Kconfig-dependency-fix.txt 4651-Duplicate-IPW_DEBUG-option-for-ipw2100-and-2200.txt 4680-NETFILTER-Ignore-ACKs-ACKs-on-half-open-connections-in-TCP-conntrack.txt 4681-NETFILTER-Fix-recent-match-jiffies-wrap-mismatches.txt 4729-SCTP-Return-socket-errors-only-if-the-receive-queue-is-empty.txt 4730-SCTP-Fix-getsockname-for-sctp-when-an-ipv6-socket-accepts-a-connection-from.txt 4731-IGMP-workaround-for-IGMP-v1-v2-bug.txt 4732-IPV4-Fix-EPROTONOSUPPORT-error-in-inet_create.txt 4733-IPV6-Load-protocol-module-dynamically.txt 4737-SUNRPC-Fix-Oopsable-condition-in-rpc_pipefs.txt 4741-ixp2000-change-netif_schedule_test-to-__netif_schedule_prep.txt 4742-sky2-interrupt-not-cleared.txt 4760-NETFILTER-Fix-incorrect-argument-to-ip_nat_initialized-in-ctnetlink.txt 4761-NETFILTER-nf_conntrack-Fix-missing-check-for-ICMPv6-type.txt 4762-NETFILTER-nfnetlink-Fix-calculation-of-minimum-message-length.txt 4763-NETFILTER-Fix-i! p_conntrack_flush-abuse-in-ctnetlink.txt 4765-NETFILTER-Mark-ctnetlink-as-EXPERIMENTAL.txt 4766-NETFILTER-Wait-for-untracked-references-in-nf_conntrack-module-unload.txt 4768-NETFILTER-Don-t-use-conntrack-entry-after-dropping-the-reference.txt 4769-NET-make-function-pointer-argument-parseable-by-kernel-doc.txt 4770-DECNET-add-memory-buffer-settings.txt 4783-TCP-Vegas-stop-resetting-rtt-every-ack.txt 4784-TCP-Vegas-Remove-extra-call-to-tcp_vegas_rtt_calc.txt 4785-TCP-Vegas-timestamp-before-clone.txt 4787-TG3-remove-warning-on-race.txt 4801-NET-Fix-NULL-pointer-deref-in-checksum-debugging.txt 4807-IPv6-IPsec-fix-pmtu-calculation-of-esp.txt 4855-sky2-don-t-die-if-we-see-chip-rev-0xb5.txt 4856-sky2-device-structure-alignment.txt 4857-sky2-copy-threshold-as-module-parameter.txt 4858-sky2-ethtool-get-set-interrupt-coalescing.txt 4859-sky2-phy-processing-in-workqueue-rather-than-tasklet.txt 4860-sky2-no-irq-disable-needed-during-tx.txt 4861-sky2-ring-distance-optimization.txt 4862-! sky2-map-length-optimization.txt 4863-sky2-tx-rx-ring-data-st! ructure- split.txt 4864-sky2-transmit-logic-fixes.txt 4865-sky2-transmit-complete-index-optimization.txt 4866-sky2-transmit-complete-routine-optimization.txt 4867-sky2-interrupt-poll-optimization.txt 4868-sky2-interrupt-coalescing-tuning.txt 4869-sky2-handle-tx-timeout.txt 4870-sky2-quiet-ring-full-message-in-case-of-race.txt 4871-sky2-prefetch-tuning.txt 4872-sky2-turn-on-tx-flow-control.txt 4873-sky2-disable-rx-checksum-on-Yukon-XL.txt 4874-sky2-version-0.10.txt 4875-pcnet32-use-MAC-address-from-prom-also-on-powerpc.txt 4878-TCPv6-Fix-skb-leak.txt 4883-NETFILTER-ip_nat_tftp-Fix-expectation-NAT.txt 4892-skge-get-rid-of-warning-on-race.txt 4893-ieee80211_crypt_tkip-depends-on-NET_RADIO.txt 4895-e1000-Fixes-for-8357x.txt 4921-netdrvr-skge-fix-build.txt 4975-TG3-Fix-nvram-arbitration-bugs.txt 4976-TG3-Fix-suspend-and-resume.txt 4977-TG3-Fix-5704-single-port-mode.txt 4978-TG3-Fix-low-power-state.txt 4984-IPV6-addrconf-Do-not-print-device-pointer-in-privacy-log-message.txt 4985-PKT_SCHED! -Disable-debug-tracing-logs-by-default-in-packet-action-API.txt 5023-s2io-__iomem-annotations-for-recent-changes.txt 5035-Address-of-void-__user-is-void-__user-not-void-__user.txt 5101-XFRM-Handle-DCCP-in-xfrm-4-6-_decode_session.txt 5104-SCTP-Fix-sctp-to-not-return-erroneous-POLLOUT-events.txt 5106-TG3-Fix-peer-device-handling.txt 5107-TG3-Some-low-power-fixes.txt 5108-TG3-Add-tw32_wait_f-for-some-sensitive-registers.txt 5109-TG3-Fix-ethtool-memory-test.txt 5112-RPC-Do-not-block-on-skb-allocation.txt 5114-SUNRPC-Fix-EPIPE-error-on-mount-of-rpcsec_gss-protected-partitions.txt 5131-IPV6-Flag-RTF_ANYCAST-for-anycast-routes.txt 5132-IPV6-Try-not-to-send-icmp-to-anycast-address.txt 5133-IPV6-Defer-IPv6-device-initialization-until-the-link-becomes-ready.txt 5134-IPV6-Run-DAD-when-the-link-becomes-ready.txt 5135-IPV6-Don-t-select-a-tentative-address-as-a-source-address.txt 5140-NETROM-Fix-three-if-statements-in-nr_state1_machine.txt 5141-VLAN-Add-two-missing-checks-to-vlan_ioctl_h! andler.txt 5142-IPV6-Fix-address-deletion.txt 5143-DCCP-Comme! nt-typo. txt 5147-IPSEC-Fix-policy-updates-missed-by-sockets.txt 5153-SUNGEM-Fix-link-error-with-CONFIG_HOTPLUG-disabled.txt 5156-IPV6-Fix-dead-lock.txt 5157-IPV6-Fix-Temporary-Address-Generation.txt 5158-chelsio-transmit-routine-return-values.txt 5159-skge-avoid-up-down-on-speed-changes.txt 5160-skge-avoid-up-down-on-pause-param-changes.txt 5161-skge-handle-out-of-memory-on-MTU-size-changes.txt 5162-skge-get-rid-of-Yukon2-defines.txt 5163-skge-handle-out-of-memory-on-ring-parameter-change.txt 5164-skge-version-number-1.3.txt 5165-git-netdev-all-s2io-warning-fix.txt 5166-spidernet-fix-Kconfig-after-BPA-CELL-rename.txt 5167-skge-error-handling-on-resume.txt 5168-sky2-handle-out-of-memory-on-admin-changes.txt 5169-sky2-don-t-lose-multicast-addresses.txt 5170-sky2-handle-hardware-packet-overrun.txt 5171-sky2-version-0.11.txt 5173-orinoco_nortel-Fix-incorrect-PCI-resource-use.txt 5174-orinoco_nortel-Add-Symbol-LA-4123-ID.txt 5175-missing-license-for-libphy.ko.txt 5179-forcedeth-fix-rando! m-memory-scribbling-bug.txt 5198-IPV6-Increase-default-MLD_MAX_MSF-to-64.txt 5199-BR_NETFILTER-Fix-leak-if-skb-traverses-1-bridge.txt 5201-IPV6-Fix-addrconf-dead-lock.txt 5202-NET-Validate-socket-filters-against-BPF_MAXINSNS-in-one-spot.txt 5203-IPV6-mcast-Fix-multiple-issues-in-MLDv2-reports.txt 5205-TG3-ethtool-d-hangs-PCIe-systems.txt 5206-TG3-Update-driver-version-and-reldate.txt 5518-s-retreiv-retriev-g.txt 5541-TCP-BIC-remove-low-utilization-code.txt 5542-TCP-BIC-spelling-and-whitespace.txt 5543-TCP-BIC-CUBIC-window-growth-2.0.txt 5544-NETFILTER-ip_tables-NUMA-aware-allocation.txt 5545-NETFILTER-ebtables-Support-nf_log-API-from-ebt_log-and-ebt_ulog.txt 5546-IPV4-Safer-reassembly.txt 5547-IPV6-Reuse-inet_csk_get_port-in-tcp_v6_get_port.txt 5548-IPV6-Generalise-__tcp_v6_hash-renaming-it-to-__inet6_hash.txt 5549-ICSK-make-inet_csk_reqsk_queue_hash_add-timeout-arg-unsigned-long.txt 5550-IPV6-Generalise-tcp_v6_search_req-tcp_v6_synq_add.txt 5551-IPV6-Introduce-inet6_rsk.txt! 5552-ICSK-Rename-struct-tcp_func-to-struct-inet_connection_s! ock_af_o ps.txt 5553-ICSK-Move-v4_addr2sockaddr-from-TCP-to-icsk.txt 5554-DCCP-Introduce-dccp_ipv4_af_ops.txt 5555-IP-Simplify-and-consolidate-MSG_PEEK-error-handling.txt 5556-UDP-udp_checksum_init-return-value.txt 5557-IPVS-remove-dead-code.txt 5558-NET-Avoid-atomic-xchg-for-non-error-case.txt 5559-AF_UNIX-Remove-superfluous-reference-counting-in-unix_stream_sendmsg.txt 5560-IPV6-Generalise-some-functions.txt 5561-IPV6-Introduce-inet6_timewait_sock.txt 5562-IPV6-Export-some-symbols-for-DCCPv6.txt 5563-DCCP-Just-rename-dccp_v4_prot-to-dccp_prot.txt 5564-DCCP-Prepare-the-AF-agnostic-core-for-the-introduction-of-DCCPv6.txt 5565-IPV6-Export-ipv6_opt_accepted.txt 5567-DCCP-Use-reqsk_free-in-dccp_v4_conn_request.txt 5571-TCP-Move-the-TCPF_-enum-to-tcp_states.h.txt 5573-AF_UNIX-Use-spinlock-for-unix_table_lock.txt 5574-BRIDGE-allow-setting-hardware-address-of-bridge-pseudo-dev.txt 5575-BRIDGE-handle-speed-detection-after-carrier-changes.txt 5576-BRIDGE-filter-packets-in-learning-state.txt ! 5577-BRIDGE-limited-ethtool-support.txt 5578-BRIDGE-add-version-number.txt 5579-PKT_SCHED-netem-packet-corruption-option.txt 5582-TCP-cubic-precompute-constants.txt 5583-TCP-cubic-use-Newton-Raphson.txt 5584-IPV4-fib_trie-Add-credits.txt 5585-SCTP-Update-SCTP_PEER_ADDR_PARAMS-socket-option-to-the-latest-api-draft.txt 5586-SCTP-Add-support-for-SCTP_DELAYED_ACK_TIME-socket-option.txt 5587-NET-Small-cleanup-to-socket-initialization.txt 5588-NET-move-struct-proto_ops-to-const.txt 5589-PKTGEN-Deinitialise-static-variables.txt 5590-NET-Fix-sock_init-return-value.txt 5591-NET-restructure-sock_aio_-read-write-sock_-readv-writev.txt 5594-TCP-Don-t-use-__constant_htonl-for-a-non-const-arg.txt 5595-PPPOX-Fix-assignment-into-const-proto_ops.txt 5596-NET-Speed-up-__alloc_skb.txt 5597-AF_UNIX-Convert-to-use-a-spinlock-instead-of-rwlock.txt 5598-NETLINK-genetlink-fix-cmd-type-in-genl_ops-to-be-consistent-to-u8.txt 5599-NETROM-Remove-unessecary-lock_sock-calls-in-netrom_ioctl.txt 5600-NET-A! dd-a-dev_ioctl-fallback-to-sock_ioctl.txt 5601-TG3-fixup-tot_! len-calc ulation.txt 5602-IPVS-Cleanup-IP_VS_DBG-statements.txt 5603-DECNET-Only-use-local-routers.txt 5604-DCCP-Do-not-process-a-packet-twice-when-it-s-not-in-state-DCCP_OPEN.txt 5605-DCCP-Send-an-ACK-vector-when-ACKing-a-response-packet.txt 5606-DCCP-Notify-CCID-only-after-ACK-vectors-have-been-processed.txt 5607-BRIDGE-Fix-faulty-check-in-br_stp_recalculate_bridge_id.txt 5608-IPV4-fib_trie-build-fix.txt 5610-IEEE80211-ipw2200-Simplify-multicast-checks.txt 5611-TCP-less-inline-s.txt 5612-DCCP-ackvec-Fix-spelling-of-throw.txt 5613-DCCP-ackvec-use-u8-for-the-buf-offsets.txt 5614-TCP-syn_flood_warning-is-only-needed-if-CONFIG_SYN_COOKIES-is-selected.txt 5700-ECONET-Use-macro-for-spinlock_t-definition.txt 5701-IPV6-Use-macro-for-rwlock_t-initialization.txt 5702-NETFILTER-Use-macro-for-spinlock_t-rwlock_t-initializations-definition.txt 5703-NET-More-instruction-checks-fornet-core-filter.c.txt 5704-TCP-tcp_vegas-Fix-slow-start.txt 5730-IPVS-Fix-compilation.txt 5731-NETFILTER-Decrease-num! ber-of-pointer-derefs-in-nfnetlink_queue.c.txt 5732-NETFILTER-Decrease-number-of-pointer-derefs-in-nf_conntrack_core.c.txt 5733-NETFILTER-ctnetlink-remove-bogus-checks-in-ICMP-protocol-at-dumping.txt 5734-NETFILTER-ctnetlink-Add-sanity-checkings-for-ICMP.txt 5735-NETFILTER-ctnetlink-propagate-ctnetlink_dump_tuples_proto-return-value-back.txt 5736-NETFILTER-ctnetlink-use-u_int32_t-instead-of-unsigned-int.txt 5737-NETFILTER-ctnetlink-ctnetlink_event-cleanup.txt 5738-NETFILTER-ctnetlink-fix-conntrack-mark-race.txt 5739-NETFILTER-ctnetlink-remove-unused-variable.txt 5740-NETFILTER-Add-ctnetlink-port-for-nf_conntrack.txt 5741-NETFILTER-Filter-dumped-entries-based-on-the-layer-3-protocol-number.txt 5742-NETFILTER-Fix-module_param-types-and-permissions.txt 5743-NETFILTER-ctnetlink-Fix-dumping-of-helper-name.txt 5744-NETFILTER-Remove-okfn-usage-in-ip_vs_core.c.txt 5745-NETFILTER-Call-POST_ROUTING-hook-before-fragmentation.txt 5746-NETFILTER-make-ipv6_find_hdr-find-transport-protocol! -header.txt 5747-NETFILTER-Export-ip6_masked_addrcmp-don-t-pa! ss-IPv6- addresses-on-stack.txt 5748-NETFILTER-nf_conntrack_l3proto_ipv4.c-needs-net-route.h.txt 5749-NETFILTER-Use-HOPLIMIT-metric-as-TTL-of-TCP-reset-sent-by-REJECT.txt 5776-NET-Change-1500-to-ETH_DATA_LEN-in-some-files.txt 5796-knfsd-fix-hash-function-for-IP-addresses-on-64bit-little-endian-machines.txt 6008-parport-include-fixes.txt 6015-Keep-nfsd-from-exiting-when-seeing-recv-errors.txt added hold last reject removed +# Address of void __user \* is void __user \* \*, not void \* __user \* %patch20727 -p1 # [XFRM]: Handle DCCP in xfrm{4,6}_decode_session %patch20728 -p1 @@ -4115,7 +4115,7 @@ - [PARISC] Convert parisc_device to use struct resource for hpa - [PARISC] Add NETPOLL support to lasi_82596 - [DECNET]: Remove some redundant ifdeffed code -- [NET]: Wider use of for_each_\1cpu() +- [NET]: Wider use of for_each_\*cpu() - [PKTGEN]: Sleeping function called under lock - [PKTGEN]: Use kzalloc - [PKTGEN]: Spelling and white space @@ -4132,7 +4132,7 @@ - ieee80211 build fix - Revert "RPC: stops the release_pipe() funtion from being called twice" - RPC: Ensure that nobody can queue up new upcalls after rpc_close_pipes() -- gfp_t: net/\1 +- gfp_t: net/\* - gfp_t: drivers/net - [ARM] 2919/1: CS8900A ethernet driver modifications for the Comdial MP1000 - [ARM] 2897/2: PXA2xx IRDA support @@ -4272,7 +4272,7 @@ - bnx2: update firmware handshake for 5708 - bnx2: refine bnx2_poll - bnx2: update version and minor fixes -- Remove linux/version.h include from drivers/net/phy/\1 and net/ieee80211/\1. +- Remove linux/version.h include from drivers/net/phy/\* and net/ieee80211/\*. - [netdrvr] fac_8xx build fix - [netdrvr s2io] warning fixes - b44: b44_start_xmit returns with a lock held when it fails allocating @@ -4281,7 +4281,7 @@ - b44: s/spin_lock_irqsave/spin_lock/ in b44_interrupt - b44: late request_irq in b44_open - 3c59x: convert to use of pci_iomap API -- 3c59x: cleanup of mdio_read routines to use MII_\1 macros +- 3c59x: cleanup of mdio_read routines to use MII_\* macros - 3c59x: avoid blindly reading link status twice - 3c59x: bounds checking for hw_checksums - 3c59x: cleanup init of module parameter arrays @@ -4635,7 +4635,7 @@ - [IPV6] addrconf: Do not print device pointer in privacy log message. - [PKT_SCHED]: Disable debug tracing logs by default in packet action API. - s2io: __iomem annotations for recent changes -- Address of void __user 0036-sky2-new-experimental-Marvell-Yukon2-driver.txt 0072-8139cp-support-ETHTOOL_GPERMADDR.txt 0073-8139too-support-ETHTOOL_GPERMADDR.txt 0074-b44-support-ETHTOOL_GPERMADDR.txt 0075-e1000-support-ETHTOOL_GPERMADDR.txt 0076-e100-support-ETHTOOL_GPERMADDR.txt 0077-forcedeth-support-ETHTOOL_GPERMADDR.txt 0078-ixgb-support-ETHTOOL_GPERMADDR.txt 0079-ne2k-pci-support-ETHTOOL_GPERMADDR.txt 0080-pcnet32-support-ETHTOOL_GPERMADDR.txt 0081-r8169-support-ETHTOOL_GPERMADDR.txt 0082-skge-support-ETHTOOL_GPERMADDR.txt 0083-sundance-support-ETHTOOL_GPERMADDR.txt 0084-via-rhine-support-ETHTOOL_GPERMADDR.txt 0087-Replace-drivers-net-wan-custom-ctype-macros-with-standard-ones.txt 0088-drivers-net-wan-possible-cleanups.txt 0089-lne390-bogus-casts.txt 0090-C99-initializers-in-ray_cs.c.txt 0091-mii-Add-test-for-GigE-support.txt 0092-Add-rapidio-net-driver.txt 0100-pcnet32-set_ringparam-implementation.txt 0101-pcnet32-set-min-ring-size-to-4.txt 0102-sky2-driver-update.t! xt 0103-orinoco-Remove-conditionals-that-are-useless-in-the-kernel-drivers.txt 0104-orinoco-Don-t-include-net-ieee80211.h-twice.txt 0105-orinoco-Update-PCMCIA-ID-s.txt 0106-Fixed-some-endian-issues-with-802.11-header-usage-in-ieee80211_rx.c.txt 0107-ieee80211-quality-scaling-algorithm-extension-handler.txt 0108-ieee80211-Added-wireless-spy-support.txt 0109-Changed-802.11-headers-to-use-ieee80211_info_element-0.txt 0110-ieee80211-Removed-ieee80211_info_element_hdr.txt 0111-ieee80211-Cleanup-memcpy-parameters.txt 0112-ieee80211-Switched-to-sscanf-in-store_debug_level.txt 0113-ieee80211-Fixed-type-o-of-abg_ture-abg_true.txt 0114-Updated-ipw2200-to-compile-with-ieee80211-abg_ture-to-abg_true-change.txt 0163-sky2-fix-FIFO-DMA-alignment-problems.txt 0164-sky2-allow-ethtool-debug-access-to-all-of-PCI-space.txt 0165-sky2-version-0.5.txt 0166-ieee80211-Updated-ipw2100-to-be-compatible-with-ieee80211_hdr-changes.txt 0167-ieee80211-Updated-ipw2100-to-be-compatible-with-ieee80211-s-hard! _start_xmit-change.txt 0168-ieee80211-Updated-ipw2200-to-be-c! ompatibl e-with-ieee80211_hdr-changes.txt 0169-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0170-ieee80211-Updated-atmel-to-be-compatible-with-ieee80211_hdr-changes.txt 0171-ieee80211-Fixed-a-kernel-oops-on-module-unload.txt 0172-ieee80211-Hardware-crypto-and-fragmentation-offload-support.txt 0173-ieee80211-Fix-time-calculation-switching-to-use-jiffies_to_msecs.txt 0174-ieee80211-Fix-kernel-Oops-when-module-unload.txt 0175-ieee80211-Allow-drivers-to-fix-an-issue-when-using-wpa_supplicant-with-WEP.txt 0176-ieee82011-Added-WE-18-support-to-default-wireless-extension-handler.txt 0177-ieee80211-Renamed-ieee80211_hdr-to-ieee80211_hdr_3addr.txt 0178-ieee80211-adds-support-for-the-creation-of-RTS-packets.txt 0179-ieee82011-Added-ieee80211_tx_frame-to-convert-generic-802.11-data-frames-and-callbacks.txt 0180-ieee80211-Fix-TKIP-repeated-fragmentation-problem-and-payload_size-reporting.txt 0181-ieee80211-Return-NETDEV_TX_BUSY-when-QoS-buffer-full.txt 0! 182-ieee80211-Add-QoS-WME-support-to-the-ieee80211-subsystem.txt 0183-ieee80211-Added-ieee80211_geo-to-provide-helper-functions.txt 0184-ieee80211-Added-ieee80211_radiotap.h.txt 0185-ieee80211-Additional-fixes-for-endian-aware-types.txt 0186-ieee80211-extern-inline-to-static-inline.txt 0187-ieee80211-Type-o-capbility-definition-for-QoS-and-ERP-parsing.txt 0188-ieee80211-Mixed-PTK-GTK-CCMP-TKIP-support.txt 0189-ieee80211-Keep-auth-mode-unchanged-after-iwconfig-key-off-on-cycle.txt 0190-ieee80211-Updated-copyright-dates.txt 0191-ieee80211-Updated-hostap-to-be-compatible-with-ieee80211_hdr-changes.txt 0192-ieee80211-Updated-hostap-to-be-compatible-with-extra_prefix_len-changes.txt 0193-ieee82011-Remove-WIRELESS_EXT-ifdefs.txt 0194-forcedeth-add-hardware-tx-checksumming.txt 0199-ieee80211-Added-subsystem-version-string-and-reporting-via-MODULE_VERSION.txt 0200-ieee80211-Added-handle_deauth-callback-enhanced-tkip-ccmp-support-of-varying-hw-sw-offload.txt 0201-ieee80211-added-IE-c! omments-reason_code-to-reason-removed-info_element-from-ieee8! 0211_dis assoc.txt 0202-ieee80211-in-tree-driver-updates-to-sync-with-latest-ieee80211-series.txt 0203-ieee80211-update-orinoco-wl3501-drivers-for-latest-struct-naming.txt 0216-orinoco-Remove-inneeded-system-includes.txt 0217-orinoco-Make-nortel_pci_hw_init-static.txt 0218-orinoco-Fix-memory-leak-and-unneeded-unlock-in-orinoco_join_ap.txt 0219-orinoco-orinoco_send_wevents-could-return-without-unlocking.txt 0220-orinoco-Remove-unneeded-forward-declarations.txt 0221-orinoco-Annotate-endianess-of-variables-and-structure-members.txt 0222-orinoco-Read-only-needed-data-in-__orinoco_ev_txexc.txt 0223-orinoco-Bump-version-to-0.15rc3.txt 0227-RPC-Report-connection-errors-properly-when-mounting-with-soft.txt 0228-RPC-proper-soft-timeout-behavior-for-rpcbind.txt 0229-NFS-use-a-constant-value-for-TCP-retransmit-timeouts.txt 0230-RPC-portmapper-doesn-t-need-a-reserved-port.txt 0231-RPC-extract-socket-logic-common-to-both-client-and-server.txt 0232-RPC-introduce-client-side-transport-switch.txt 02! 33-RPC-transport-switch-function-naming.txt 0234-RPC-Reduce-stack-utilization-in-xs_sendpages.txt 0235-RPC-Rename-sock_lock.txt 0236-RPC-Rename-xprt_lock.txt 0237-RPC-rename-the-sockstate-field.txt 0238-RPC-Eliminate-socket.h-includes-in-RPC-client.txt 0239-RPC-Add-helper-for-waking-tasks-pending-on-a-transport.txt 0240-RPC-client-side-transport-switch-cleanup.txt 0241-RPC-separate-TCP-and-UDP-write-space-callbacks.txt 0242-RPC-separate-TCP-and-UDP-transport-connection-logic.txt 0243-RPC-separate-TCP-and-UDP-socket-write-paths.txt 0244-RPC-skip-over-transport-specific-heads-automatically.txt 0245-RPC-get-rid-of-xprt-stream.txt 0246-RPC-add-API-to-set-transport-specific-timeouts.txt 0247-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0248-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0249-RPC-separate-xprt_timer-implementations.txt 0250-RPC-add-generic-interface-for-adjusting-the-congestion-window.txt 0251-RPC-add-a-release_rqst-callout-to-the-RPC-t! ransport-switch.txt 0252-RPC-remove-xprt-nocong.txt 0253-RPC-! clean-up -after-nocong-was-removed.txt 0254-RPC-allow-RPC-client-s-port-range-to-be-adjustable.txt 0255-RPC-make-sure-to-get-the-same-local-port-number-when-reconnecting.txt 0256-RPC-parametrize-various-transport-connect-timeouts.txt 0257-RPC-rationalize-set_buffer_size.txt 0258-RPC-NFS-new-rpc_pipefs-patch.txt 0260-Revert-PATCH-RPC-NFS-new-rpc_pipefs-patch.txt 0262-SUNRPC-fix-bug-in-patch-portmapper-doesn-t-need-a-reserved-port.txt 0266-netdrvr-gianfar-use-new-phy-layer.txt 0267-netdrvr-delete-CONFIG_PHYCONTROL.txt 0268-hostap-Fix-pci_driver-name-for-hostap_plx-and-hostap_pci.txt 0269-hostap-Add-support-for-WE-19.txt 0270-hostap-Use-GFP_ATOMIC-to-get-rid-of-weird-might_sleep-issue.txt 0271-hostap-Remove-iwe_stream_add_event-kludge.txt 0272-Remove-WIRELESS_EXT-ifdefs-from-several-wireless-drivers.txt 0273-wireless-airo-remove-needed-dma_addr_t-obfuscation.txt 0312-sky2-changing-mtu-doesn-t-have-to-reset-link.txt 0313-sky2-cleanup-interrupt-processing.txt 0314-sky2-add-hardware-VLAN-a! cceleration-support.txt 0315-sky2-explicit-set-power-state.txt 0316-sky2-version-0.6.txt 0317-sky2-nway-reset-BONUS-FEATURE.txt 0323-This-patch-fixes-a-typo-in-ieee80211.h-ieee82011_deauth-ieee80211_deauth.txt 0346-This-will-move-the-ieee80211_is_ofdm_rate-function-to-the-ieee80211.h.txt 0348-Currently-the-info_element-is-parsed-by-2-seperate-functions-this.txt 0349-When-an-assoc_resp-is-received-the-network-structure-is-not-completely.txt 0350-Lindent-and-trailing-whitespace-script-executed-ieee80211-subsystem.txt 0356-hostap-Remove-hw-specific-dev_open-close-handlers.txt 0357-hostap-Fix-hostap_pci-build-with-PRISM2_IO_DEBUG.txt 0358-hostap-Do-not-free-local-hw_priv-before-unregistering-netdev.txt 0359-hostap-Unregister-netdevs-before-freeing-local-data.txt 0366-S2io-MSI-MSI-X-support-runtime-configurable.txt 0367-e1000-Support-for-82571-and-82572-controllers.txt 0368-e1000-multi-queue-defines-modification-to-data-structures.txt 0369-e1000-implementation-of-the-multi-queue-! feature.txt 0370-e1000-Enable-custom-configuration-bits-for-8! 2571-2-c ontrollers.txt 0371-e1000-Fixes-for-packet-split-related-issues.txt 0372-e1000-Added-msleep_interruptible-delay.txt 0373-e1000-Flush-shadow-RAM.txt 0374-e1000-fix-warnings.txt 0375-AX.25-Delete-debug-printk-from-mkiss-driver.txt 0376-AX.25-Convert-mkiss.c-to-DEFINE_RWLOCK.txt 0377-airo-fix-resume.txt 0378-s2io-change-strncpy-length-arg-to-use-size-of-target.txt 0379-netdrvr-s2io-Add-a-MODULE_VERSION-entry.txt 0380-bonding-replicate-IGMP-traffic-in-activebackup-mode.txt 0381-sky2-add-permanent-address-support.txt 0383-wireless-ipw2200-remove-redundant-return-statement.txt 0546-S2io-Offline-diagnostics-fixes.txt 0547-rcu-in-bpqether-driver.txt 0548-SMACK-support-for-mkiss.txt 0549-Initialize-the-.owner-field-the-tty_ldisc-structure.txt 0555-SUNRPC-Retry-rpcbind-requests-if-the-server-s-portmapper-isn-t-up.txt 0556-RPC-allow-call_encode-to-delay-transmission-of-an-RPC-call.txt 0575-ieee80211-division-by-zero-fix.txt 0577-sb1250-mac-Check-the-actual-setting-for-reporting-hw-chec! ksumming.txt 0578-sb1250-mac-Ensure-16-byte-alignment-of-the-descriptor-ring.txt 0579-au1000_eth-Misc-Au1000-net-driver-fixes.txt 0580-de2104x-Resurrect-Cobalt-support-for-2.6.txt 0581-sgiseeq-Fix-resource-handling.txt 0582-sgiseeq-Configure-PIO-and-DMA-timing-requests.txt 0583-declance-Convert-to-irqreturn_t.txt 0584-declance-Fix-mapping-of-device.txt 0585-declance-Deal-with-the-bloody-KSEG-vs-CKSEG-horror.txt 0586-declance-Use-physical-addresses-at-the-interface-level.txt 0587-ne-Support-for-RBHMA4500-eval-board.txt 0588-mipsnet-Virtual-ethernet-driver-for-MIPSsim.txt 0589-e1000_intr-build-fix.txt 0590-s2io-build-fix.txt 0592-via-rhine-change-mdelay-to-msleep-and-remove-from-ISR-path.txt 0593-epic100-fix-counting-of-work_done-in-epic_poll.txt 0596-bonding-cleanup-comment-for-mode-1-IGMP-xmit-hack.txt 0597-b44-alternate-allocation-option-for-DMA-descriptors.txt 0598-orinoco-remove-redundance-skb-length-check-before-padding.txt 0599-sundance-remove-if-1-.-block-in-sundance_p! robe1.txt 0600-sundance-expand-reset-mask.txt 0601-e1000-buil! d-fix.tx t 0603-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0606-SUNRPC-Add-support-for-privacy-to-generic-gss-api-code.txt 0607-SUNRPC-Provide-a-callback-to-allow-free-pages-allocated-during-xdr-encoding.txt 0608-SUNRPC-Retry-wrap-in-case-of-memory-allocation-failure.txt 0609-RPCSEC_GSS-cleanup-au_rslack-calculation.txt 0610-RPCSEC_GSS-client-side-privacy-support.txt 0611-RPCSEC_GSS-Simplify-rpcsec_gss-crypto-code.txt 0612-RPCSEC_GSS-krb5-pre-privacy-cleanup.txt 0613-RPCSEC_GSS-Add-support-for-privacy-to-krb5-rpcsec_gss-mechanism.txt 0614-RPCSEC_GSS-remove-all-qop-parameters.txt 0615-RPCSEC_GSS-krb5-cleanup.txt 0622-Fixed-problem-with-not-being-able-to-decrypt-encrypt-broadcast-packets.txt 0631-sb1250-mac-Get-rid-of-all-the-funny-SBMAC_WRITECSR-and-SBMAC_READCSR-macros.txt 0632-sb1250-mac-Whitespace-cleanup.txt 0645-sundance-include-MII-address-0-in-PHY-probe.txt 0646-e1000-Driver-version-white-space-comments-device-id-other.txt 0647-Fixed-oops-if-an-uninitialized! -key-is-used-for-encryption.txt 0652-sb1250-mac-PHY-probing-fixes.txt 0670-ieee80211-subsystem.txt 0671-Update-version-ieee80211-stamp-to-1.1.6.txt 0675-PARISC-Change-the-driver-names-so-sys-bus-parisc-drivers-looks-better.txt 0676-PARISC-Convert-parisc_device-to-use-struct-resource-for-hpa.txt 0714-PARISC-Add-NETPOLL-support-to-lasi_82596.txt 0771-DECNET-Remove-some-redundant-ifdeffed-code.txt 0772-NET-Wider-use-of-for_each_-cpu.txt 0773-PKTGEN-Sleeping-function-called-under-lock.txt 0774-PKTGEN-Use-kzalloc.txt 0775-PKTGEN-Spelling-and-white-space.txt 0776-PKTGEN-proc-interface-revision.txt 0777-NETFILTER-ip_conntrack-Make-hashsize-conntrack-parameter-writable.txt 0778-IPV4-Kill-redundant-rcu_dereference-on-fa_info.txt 0779-IPSEC-Kill-obsolete-get_mss-function.txt 0780-NETLINK-Remove-dead-code-in-af_netlink.c.txt 0781-IPV4-Remove-dead-code-from-ip_output.c.txt 0782-SK_BUFF-kernel-doc-fix-skbuff-warnings.txt 0783-AX.25-Use-constant-instead-of-magic-number.txt 0784-IPV4-Fix-s! etting-broadcast-for-SIOCSIFNETMASK.txt 0785-netdrvr-forcedet! h-scatte r-gather-and-segmentation-offload-support.txt 0786-ieee80211-build-fix.txt 0834-Revert-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0855-RPC-Ensure-that-nobody-can-queue-up-new-upcalls-after-rpc_close_pipes.txt 0931-gfp_t-net.txt 0952-gfp_t-drivers-net.txt 0957-ARM-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 0963-ARM-2897-2-PXA2xx-IRDA-support.txt 0971-sky2-remove-unused-definitions.txt 0972-sky2-use-kzalloc.txt 0973-sky2-spelling-fixes.txt 0974-sky2-fix-NAPI-and-receive-handling.txt 0975-sky2-version-0.7.txt 1029-DRIVER-MODEL-Get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.txt 1037-Bluetooth-Make-more-functions-static.txt 1038-Bluetooth-Update-security-filter-for-Extended-Inquiry-Response.txt 1043-IPv4-IPv6-UFO-Scatter-gather-approach.txt 1044-MCAST-IPv6-Fix-algorithm-to-compute-Querier-s-Query-Interval.txt 1055-tg3-add-5714-5715-support.txt 1056-tg3-fix-ASF-heartbeat.txt 1057-tg3-update-version-and-minor-fixes.txt 10! 58-ibmveth-fix-bonding.txt 1059-ibmveth-fix-buffer-pool-management.txt 1060-ibmveth-fix-buffer-replenishing.txt 1061-ibmveth-lockless-TX.txt 1062-ibmveth-fix-failed-addbuf.txt 1063-pcnet_cs-fix-mii-init-code-for-older-DL10019-based-cards.txt 1065-s2io-kconfig-help-fix.txt 1066-b44-reports-wrong-advertised-flags.txt 1067-sis190.c-fix-multicast-MAC-filter.txt 1068-smc91x-shut-down-power-after-probing.txt 1070-starfire-free_irq-on-error-path-of-netdev_open.txt 1073-netdrvr-b44-include-linux-dma-mapping.h-to-eliminate-warning.txt 1074-sundance-fix-DFE-580TX-Tx-Underrun.txt 1075-New-PowerPC-4xx-on-chip-ethernet-controller-driver.txt 1078-sis900-come-alive-after-temporary-memory-shortage.txt 1079-Add-Wake-on-LAN-support-to-sis900-2.txt 1080-drivers-net-Remove-pointless-checks-for-NULL-prior-to-calling-kfree.txt 1082-netdrvr-ne2k-pci-based-card-does-not-support-bus-mastering.txt 1083-ipw2200-Missing-kmalloc-check.txt 1159-SCTP-Rename-SCTP-specific-control-message-flags.txt 1163-SCT! P-Fix-SCTP_SETADAPTION-sockopt-to-use-the-correct-structure.t! xt 1164- SCTP-Allow-SCTP_MAXSEG-to-revert-to-default-frag-point-with-a-0-value.txt 1196-SCTP-Do-not-allow-unprivileged-programs-initiating-new-associations-on.txt 1200-e1000-remove-warning-about-e1000_suspend.txt 1201-eepro.c-module_param_array-cleanup.txt 1202-b44-fix-suspend-resume.txt 1203-e1000-use-vmalloc_node.txt 1204-revert-orinoco-Information-leakage-due-to-incorrect-padding.txt 1205-Better-fixup-for-the-orinoco-driver.txt 1206-e1000-Fixes-e1000_suspend-warning-when-CONFIG_PM-is-not-enabled.txt 1320-ETH-ether-address-compare.txt 1324-Add-modalias-for-pmac-network-drivers.txt 1328-mv643xx_eth_showsram-Added-information-message-when-using-the-SRAM.txt 1329-IPV4-Fix-issue-reported-by-Coverity-in-ipv4-fib_frontend.c.txt 1389-s2io-iomem-annotations.txt 1397-bluetooth-hidp-is-broken-on-s390.txt 1403-drivers-net-tg3-Use-the-DMA_-32-64-BIT_MASK-constants.txt 1405-prism54-Free-skb-after-disabling-interrupts.txt 1748-DRIVER-MODEL-Add-missing-platform_device.h-header.txt 1749-PPC-44x-EM! AC-driver-add-440SPe-support.txt 1750-PPC-44x-EMAC-driver-add-440GR-support.txt 1751-PPC-4xx-EMAC-driver-fix-VSC8201-PHY-initialization.txt 1754-fec_8xx-Remove-dependency-on-NETTA-NETPHONE.txt 1755-fec_8xx-Add-support-for-Intel-PHY-LX971.txt 1761-vmalloc_node.txt 1854-ARM-3066-1-Fix-PXA-irda-driver-suspend-resume-functions.txt 1920-m32r-SMC91x-driver-update.txt 1929-smsc-ircc2-PM-cleanup-do-not-close-device-when-suspending.txt 1941-remove-some-more-check_region-stuff.txt 1961-Typo-fix-dot-after-newline-in-printk-strings.txt 2026-sparse-cleanups-NULL-pointers-C99-struct-init.txt 2067-netdrvr-8139too-replace-hand-crafted-kernel-thread-with-workqueue.txt 2078-BRIDGE-Use-ether_compare.txt 2079-NETFILTER-Add-revision-support-to-arp_tables-and-ip6_tables.txt 2080-ROSE-rose_heartbeat_expiry-locking-fix.txt 2081-IPV6-Fix-behavior-of-ip6_route_input-for-link-local-address.txt 2083-DCCP-Simplify-skb_set_owner_w-semantics.txt 2089-DCCP-Set-socket-owner-iff-packet-is-not-data.txt 2090-M! CAST-IPv6-Check-packet-size-when-process-Multicast.txt 2227-i! bmveth-f ix-panic-in-initial-replenish-cycle.txt 2245-MCAST-ip-6-_mc_add_src-should-be-called-when-number-of-sources-is-zero.txt 2256-IPV6-inet6_ifinfo_notify-should-use-RTM_DELLINK-in-addrconf_ifdown.txt 2267-PKT_SCHED-Rework-QoS-and-or-fair-queueing-configuration.txt 2396-ARM-Reverted-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 2410-SUNRPC-allow-sunrpc.o-to-link-when-CONFIG_SYSCTL-is-disabled.txt 2411-NFS-SUNRPC-NLM-fix-unused-variable-warnings-when-CONFIG_SYSCTL-is-disabled.txt 2416-NETFILTER-PPTP-helper-Fix-compilation-of-conntrack-helper-without-NAT.txt 2421-netdrvr-8139too-use-cancel_rearming_delayed_work-to-cancel-thread.txt 2422-netdrvr-8139too-use-rtnl_shlock_nowait-rather-than-rtnl_lock_interruptible.txt 2425-NETFILTER-Fix-double-free-after-netlink_unicast-in-ctnetlink.txt 2430-NETFILTER-nfnetlink-Use-kzalloc.txt 2431-NETFILTER-CONNMARK-target-needs-ip_conntrack.txt 2433-NETEM-use-PSCHED_LESS.txt 2435-drivers-net-wireless-airo.c-unsigned-comparas! on.txt 2436-S2io-Multi-buffer-mode-support.txt 2438-pcnet32-show-name-of-failing-device.txt 2439-pcnet32-AT2700-2701-and-Bugzilla-2699-4551.txt 2440-pcnet32-Prevent-hang-with-79c976.txt 2441-phy-address-mask-support-for-generic-phy-layer.txt 2442-PKT_SCHED-Generic-RED-layer.txt 2443-NET-Introduce-INET_ECN_set_ce-function.txt 2444-PKT_SCHED-RED-Use-new-generic-red-interface.txt 2445-PKT_SCHED-RED-Use-generic-queue-management-interface.txt 2446-PKT_SCHED-RED-Dont-start-idle-periods-while-already-idling.txt 2447-PKT_SCHED-RED-Cleanup-and-remove-unnecessary-code.txt 2448-PKT_SCHED-GRED-Cleanup-equalize-flag-and-add-new-WRED-mode-detection.txt 2449-PKT_SCHED-GRED-Transform-grio-to-GRED_RIO_MODE.txt 2450-PKT_SCHED-GRED-Cleanup-dumping.txt 2451-PKT_SCHED-GRED-Dump-table-definition.txt 2452-PKT_SCHED-GRED-Use-a-central-table-definition-change-procedure.txt 2453-PKT_SCHED-GRED-Report-out-of-bound-DPs-as-illegal.txt 2454-PKT_SCHED-GRED-Use-central-VQ-change-procedure.txt 2455-PKT_SCHE! D-GRED-Use-new-generic-red-interface.txt 2456-PKT_SCHED-GRED-! Do-not-r eset-statistics-in-gred_reset-gred_change.txt 2457-PKT_SCHED-GRED-Report-congestion-related-drops-as-NET_XMIT_CN.txt 2458-PKT_SCHED-GRED-Use-generic-queue-management-interface.txt 2459-PKT_SCHED-GRED-Introduce-tc_index_to_dp.txt 2460-PKT_SCHED-GRED-Improve-error-handling-and-messages.txt 2461-PKT_SCHED-GRED-Remove-initd-flag.txt 2462-PKT_SCHED-GRED-Dont-abuse-default-VQ-for-equalizing.txt 2463-PKT_SCHED-GRED-Remove-auto-creation-of-default-VQ.txt 2464-PKT_SCHED-GRED-Cleanup-and-remove-unnecessary-code.txt 2465-PKT_SCHED-GRED-Fix-restart-of-idle-period-in-WRED-mode-upon-dequeue-and-drop.txt 2466-PKT_SCHED-GRED-Support-ECN-marking.txt 2467-PKT_SCHED-G-RED-Introduce-hard-dropping.txt 2468-DRIVER-MODEL-Improved-dynamically-allocated-platform_device-interface.txt 2469-DRIVER-MODEL-Fix-depca.txt 2470-DRIVER-MODEL-Fix-jazzsonic.txt 2471-DRIVER-MODEL-Fix-macsonic.txt 2476-NETEM-Support-time-based-reordering.txt 2477-NETEM-Add-version-string.txt 2478-NET-Fix-race-condition-in-sk_stre! am_wait_connect.txt 2479-TCP-DCCP-Randomize-port-selection.txt 2481-drivers-net-ixgb-make-some-code-static.txt 2482-drivers-net-e1000-possible-cleanups.txt 2483-drivers-net-hamradio-dmascc.c-remove-dmascc_setup.txt 2484-prism54-Remove-redundant-assignment.txt 2485-bnx2-add-5708-support.txt 2486-bnx2-update-firmware-for-5708.txt 2487-bnx2-update-nvram-code-for-5708.txt 2488-bnx2-update-firmware-handshake-for-5708.txt 2489-bnx2-refine-bnx2_poll.txt 2490-bnx2-update-version-and-minor-fixes.txt 2493-Remove-linux-version.h-include-from-drivers-net-phy-and-net-ieee80211.txt 2494-netdrvr-fac_8xx-build-fix.txt 2495-netdrvr-s2io-warning-fixes.txt 2645-b44-b44_start_xmit-returns-with-a-lock-held-when-it-fails-allocating.txt 2646-b44-miscellaneous-cleanup.txt 2647-b44-expose-counters-through-ethtool.txt 2648-b44-s-spin_lock_irqsave-spin_lock-in-b44_interrupt.txt 2649-b44-late-request_irq-in-b44_open.txt 2688-3c59x-convert-to-use-of-pci_iomap-API.txt 2689-3c59x-cleanup-of-mdio_read-rout! ines-to-use-MII_-macros.txt 2690-3c59x-avoid-blindly-reading-! link-sta tus-twice.txt 2691-3c59x-bounds-checking-for-hw_checksums.txt 2692-3c59x-cleanup-init-of-module-parameter-arrays.txt 2693-3c59x-fix-some-grammar-in-module-parameter-descriptions.txt 2694-3c59x-support-ETHTOOL_GPERMADDR.txt 2695-3c59x-correct-rx_dropped-counting.txt 2696-3c59x-enable-use-of-memory-mapped-PCI-I-O.txt 2697-3c59x-don-t-enable-scatter-gather-w-o-checksum-support.txt 2828-knfsd-make-sure-svc_process-call-the-correct-pg_authenticate-for-multi-service-port.txt 2934-m68knommu-FEC-ethernet-header-support-for-the-ColdFire-5208.txt 2935-m68knommu-FEC-ethernet-support-for-the-ColdFire-5208.txt 2984-scripts-Lindent-on-ieee80211-subsystem.txt 2985-Fix-problem-with-WEP-unicast-key-index-0.txt 2986-Update-version-ieee80211-stamp-to-1.1.7.txt 2987-Ran-scripts-Lindent-on-drivers-net-wireless-ipw2-1-2-00.-c-h.txt 2988-IPW_DEBUG-has-already-included-DRV_NAME-remove-double-prefix-print.txt 2989-Catch-ipw2200-up-to-equivelancy-with-v1.0.1.txt 2990-Catch-ipw2200-up-to-equivelancy-w! ith-v1.0.2.txt 2991-Catch-ipw2200-up-to-equivelancy-with-v1.0.3.txt 2992-Catch-ipw2200-up-to-equivelancy-with-v1.0.4.txt 2993-Catch-ipw2100-up-to-equivelancy-with-v1.1.1.txt 2994-Fixed-WEP-on-ipw2100-priv-sec-was-being-used-instead-of.txt 2995-Bug-339-Fix-ipw2100-iwconfig-set-get-txpower.txt 2996-Move-code-from-ipw2100_wpa_enable-to-IPW2100_PARAM_DROP_UNENCRYPTED-to.txt 2997-Catch-ipw2200-up-to-equivelancy-with-v1.0.5.txt 2998-Fix-hardware-encryption-both-WEP-and-AES-doesn-t-work-with-fragmentation.txt 2999-Fix-is_duplicate_packet-bug-for-fragmentation-number-setting.txt 3000-bug-667-Fix-the-notorious-No-space-for-Tx-bug.txt 3001-Bug-637-Set-tx-power-for-A-band.txt 3002-Changed-default-of-missed-beacons-to-miss-before-disassociation-to-24.txt 3003-Updated-to-support-ieee80211-callback-to-is_queue_full-for-802.11e.txt 3004-Fixed-some-compiler-issues-if-CONFIG_IPW2200_QOS-is-enabled.txt 3005-Added-more-useful-geography-encoding-so-people-s-experience-with.txt 3006-Workaround-k! ernel-BUG_ON-panic-caused-by-unexpected-duplicate-packets.txt! 3007-Di sable-host-fragmentation-in-open-mode-since-IPW2200-2915-hardware.txt 3008-Bug-792-Fix-WPA-PSK-AES-both-for-Dipw-and-Dwext.txt 3009-Fixes-the-ad-hoc-network-WEP-key-list-issue.txt 3010-Bug-701-Fix-a-misuse-of-ieee-mode-with-ieee-iw_mode.txt 3011-Fix-ipw_wx_get_txpow-shows-wrong-disabled-value.txt 3012-Fix-firmware-error-when-setting-tx_power.txt 3013-Modified-ipw_config-and-STATUS_INIT-setting-to-correct-race-condition.txt 3014-Switched-firmware-error-dumping-so-that-it-will-capture-a-log-available.txt 3015-Changed-all-of-the-ipw_send_cmd-calls-to-return-any-ipw_send_cmd-error.txt 3016-Added-cmdlog-in-non-debug-systems.txt 3017-Migrated-some-of-the-channel-verification-code-back-into-the-driver-to.txt 3018-Updated-ipw2200-to-use-the-new-ieee80211-callbacks.txt 3019-Added-wait_state-wakeup-on-scan-completion.txt 3020-Bug-455-Fix-frequent-channel-change-generates-firmware-fatal-error.txt 3021-Bug-760-Fix-setting-WEP-key-in-monitor-mode-causes-IV-lost.txt 3022-Don-t-set-hardwar! e-WEP-if-we-are-actually-using-TKIP-AES.txt 3023-Make-all-the-places-the-firmware-fails-to-load-showerrors-in-decimal.txt 3024-Adds-radiotap-support-to-ipw2200-in-monitor-mode.txt 3025-Fixed-is_network_packet-to-include-checking-for-broadcast-packets.txt 3026-Mixed-PTK-GTK-CCMP-TKIP-support.txt 3027-Card-with-WEP-enabled-and-using-shared-key-auth-will-have-firmware.txt 3028-Fixed-problem-with-get_cmd_string-not-existing-if-CONFIG_IPW_DEBUG-disabled.txt 3029-Removed-PF_SYNCTHREAD-legacy.txt 3030-Fixes-problem-with-WEP-not-working-association-succeeds-but-no-Tx-Rx.txt 3031-Fix-bug-771-Too-many-8-bytes-recieved-when-using-AES-hwcrypto.txt 3032-Fixes-WEP-firmware-error-condition.txt 3033-Updated-driver-version-stamps-for-ipw2100-1.1.3-and-ipw2200-1.0.7.txt 3034-Pulled-out-a-stray-KERNEL_VERSION-check-around-the-suspend-handler.txt 3035-Fix-Driver-using-old-proc-net-wireless-support-please-fix-driver-message.txt 3036-Removed-legacy-WIRELESS_EXT-checks-from-ipw2200.c.txt 3037-Fixe! s-missed-beacon-logic-in-relation-to-on-network-AP-roaming.tx! t 3038-R emoved-warning-about-TKIP-not-being-configured-if-countermeasures-are.txt 3039-Added-channel-support-for-ipw2200-cards-identified-as-ZZR.txt 3040-Fixed-problem-with-not-being-able-to-send-broadcast-packets.txt 3041-Fixed-parameter-reordering-in-firmware-log-routine.txt 3042-Updated-firmware-version-stamp-to-2.4-from-2.3-so-it-will-use-the-latest-firmware.txt 3043-Update-version-ipw2200-stamp-to-1.0.8.txt 3081-fix-NET_RADIO-n-IEEE80211-y-compile.txt 3083-kill-include-linux-eeprom.h.txt 3084-drivers-net-s2io.c-make-functions-static.txt 3085-prism54-Unused-variable-extraneous-udelay.txt 3086-prism54-Transmit-stats-updated-in-wrong-place.txt 3087-Fix-sparse-warning-in-e100-driver.txt 3088-atmel-memset-correct-range.txt 3117-IPV6-Put-addr_diff-into-common-header-for-future-use.txt 3118-IPV6-Make-ipv6_addr_type-more-generic-so-that-we-can-use-it-for-source-address-selection.txt 3119-IPV6-RFC3484-compliant-source-address-selection.txt 3121-PKT_SCHED-Correctly-handle-empty-ematch-tr! ees.txt 3122-NET-sk_add_backlog-convert-from-macro-to-inline.txt 3124-PPP-handle-misaligned-accesses.txt 3125-PPP-add-PPP-MPPE-encryption-module.txt 3126-IRDA-donauboe-locking-fix.txt 3127-NET-kfree-cleanup.txt 3128-IPV4-Fix-ip_queue_xmit-identity-increment-for-TSO-packets.txt 3131-Bluetooth-Add-endian-annotations-to-the-core.txt 3132-Bluetooth-Remove-the-usage-of-proc-completely.txt 3155-SERIAL-IOC3-Update-8250-driver-bits.txt 3160-skge-clear-PCI-PHY-COMA-mode-on-boot.txt 3161-skge-use-kzalloc.txt 3162-skge-add-mii-ioctl-support.txt 3163-skge-goto-low-power-mode-on-shutdown.txt 3164-skge-use-prefetch-on-receive.txt 3165-skge-spelling-fixes.txt 3166-skge-increase-version-number.txt 3168-wireless-ipw2100-kill-unused-var-warnings-for-debug-disabled-code.txt 3169-ieee80211-cleanup-crypto-list-handling-other-minor-cleanups.txt 3170-b44-replace-B44_FLAG_INIT_COMPLETE-with-netif_running.txt 3171-b44-race-on-device-closing.txt 3172-b44-increase-version-number.txt 3178-dgrs-fix-warn! ings-when-CONFIG_ISA-and-CONFIG_PCI-are-not-enabled.txt 3179-! IOC-And- don-t-mark-the-things-as-broken-Cowboy.txt 3231-sanitize-lookup_hash-prototype.txt 3530-NETFILTER-packet-counter-of-conntrack-is-32bits.txt 3534-NETFILTER-ctnetlink-add-marking-support-from-userspace.txt 3535-NETFILTER-ctnetlink-add-module-alias-to-fix-autoloading.txt 3536-NETFILTER-ctnetlink-kill-unused-includes.txt 3537-NETFILTER-ctnetlink-get_conntrack-can-use-GFP_KERNEL.txt 3539-NETFILTER-nfnetlink-only-load-subsystems-if-CAP_NET_ADMIN-is-set.txt 3540-NETFILTER-stop-tracking-ICMP-error-at-early-point.txt 3542-NETFILTER-ctnetlink-propagate-error-instaed-of-returning-EPERM.txt 3543-NETFILTER-ctnetlink-Add-support-to-identify-expectations-by-ID-s.txt 3545-NETFILTER-ctnetlink-ICMP_ID-is-u_int16_t-not-u_int8_t.txt 3546-IPV6-Fix-fallout-from-CONFIG_IPV6_PRIVACY.txt 3547-IPV6-ip6ip6_lock-is-not-unlocked-in-error-path.txt 3566-txt 3596-NETFILTER-Add-nf_conntrack-subsystem.txt 3599-NETLINK-Type-safe-netlink-messages-attributes-interface.txt 3600-NETLINK-Make-netlink_callback-done! -optional.txt 3601-NETLINK-Generic-netlink-receive-queue-processor.txt 3602-XFRM-Use-generic-netlink-receive-queue-processor.txt 3603-RTNETLINK-Use-generic-netlink-receive-queue-processor.txt 3604-NETLINK-Generic-netlink-family.txt 3615-SUNRPC-don-t-reencode-when-looping-in-call-transmit.txt 3627-netdrvr-8139too-fast-poll-for-thread-if-an-unlikely-race-occurs.txt 3660-BNX2-output-driver-name-as-prefix-in-error-message.txt 3661-BNX2-check-return-of-dev_alloc_skb-in-bnx2_test_loopback.txt 3662-BNX2-simplify-parameter-checks-in-bnx2_-get-set-_eeprom.txt 3663-NET-Detect-hardware-rx-checksum-faults-correctly.txt 3689-TCP-fix-congestion-window-update-when-using-TSO-deferal.txt 3690-TCP-simplify-microsecond-rtt-sampling.txt 3691-TCP-add-tcp_slow_start-helper.txt 3692-TCP-Appropriate-Byte-Count-support.txt 3693-TCP-receive-buffer-growth-limiting-with-mixed-MTU.txt 3694-TCP-spelling-fixes.txt 3695-TCP-speed-up-SACK-processing.txt 3701-disable-DEBUG-in-ibmveth.txt 3703-sky2-needs-dma_! mapping.h.txt 3728-gianfar-mii-needs-to-zero-out-the-mii_bus-! structur e.txt 3729-netdrvr-forcedeth-remove-superfluous-rx-engine-stop-start.txt 3730-netdrvr-forcedeth-support-for-irq-mitigation.txt 3731-netdrvr-forcedeth-phy-address-scan-range.txt 3732-SAA9730-Whitespace-cleanup.txt 3733-SAA9730-Driver-overhaul.txt 3734-smc91x-DB1200-support.txt 3735-gt96100eth.c-Don-t-concatenate-__FUNCTION__-with-strings.txt 3737-TCP-fix-vegas-build.txt 3742-DECNET-fix-SIGPIPE.txt 3752-IPV6-Fix-inet6_init-missing-unregister.txt 3754-SCTP-Fix-potential-NULL-pointer-dereference-in-sctp_v4_get_saddr.txt 3755-SCTP-Remove-timeouts-array-from-sctp_endpoint.txt 3756-SCTP-Fix-ia64-NaT-consumption-fault-with-sctp_sideffect-commands.txt 3757-SCTP-Include-ulpevents-in-socket-receive-buffer-accounting.txt 3789-IPV6-Fix-unnecessary-GFP_ATOMIC-allocation-in-fib6-dump.txt 3792-ARM-Use-correct-IO-operations-for-Pleb.txt 3815-net-allow-newline-terminated-IP-addresses-in-in_aton.txt 3816-net-make-dev_valid_name-public.txt 3817-bonding-add-bond-name-to-all-error-messages.txt 38! 18-bonding-expand-module-param-descriptions.txt 3819-bonding-Add-transmit-policy-to-proc.txt 3820-bonding-get-slave-name-from-actual-slave-instead-of-param-list.txt 3821-bonding-move-kmalloc-out-of-spinlock-in-ALB-init.txt 3822-bonding-explicitly-clear-RLB-flag-during-ALB-init.txt 3823-bonding-expose-some-structs.txt 3824-bonding-make-functions-not-static.txt 3825-bonding-move-bond-creation-into-separate-function.txt 3826-bonding-make-bond_init-not-__init.txt 3827-bonding-Allow-ARP-target-table-to-have-empty-entries.txt 3828-bonding-add-ARP-entries-to-proc.txt 3829-bonding-add-sysfs-functionality-to-bonding-large.txt 3830-bonding-version-update.txt 3831-bonding-spelling-and-whitespace-corrections.txt 3832-bonding-comments-and-changelog.txt 3860-ppc-add-support-for-new-powerbooks.txt 3959-NETFILTER-nf_conntrack-Add-missing-code-to-TCP-conntrack-module.txt 3960-NETFILTER-nfnetlink-unconditionally-require-CAP_NET_ADMIN.txt 3961-NETFILTER-link-netfilter-before-ipv4.txt 3962-NETF! ILTER-cleanup-IPv6-Netfilter-Kconfig.txt 3963-NETFILTER-fix-t! ype-of-s ysctl-variables-in-nf_conntrack_ipv6.txt 3964-NETFILTER-nf_conntrack-fix-possibility-of-infinite-loop-while-evicting-nf_ct_frag6_queue.txt 3965-NETFILTER-fix-leak-of-fragment-queue-at-unloading-nf_conntrack_ipv6.txt 4016-IPV6-small-fix-for-ipv6_dev_get_saddr-..txt 4017-IPV6-Fixes-sparse-warning-in-ipv6-ipv6_sockglue.c.txt 4018-LLC-Fix-TX-window-scaling.txt 4019-LLC-Make-core-block-on-remote-busy.txt 4020-LLC-Fix-typo.txt 4028-knfsd-make-sure-nfsd-doesn-t-hog-a-cpu-forever.txt 4032-sdladrv.c-build-fix.txt 4041-TCP-More-spelling-fixes.txt 4045-NETFILTER-Remove-nf_conntrack-stat-proc-file-when-cleaning-up.txt 4046-NETFILTER-Free-layer-3-specific-protocol-tables-at-cleanup.txt 4079-drivers-net-sk98lin-skge.c-make-SkPciWriteCfgDWord-a-static-inline.txt 4080-skge-fix-warning-from-inlining-SkPciWriteCfgDWord.txt 4085-IPV4-IPV6-replace-handmade-list-with-hlist-in-IPv-4-6-reassembly.txt 4087-r8169-fix-printk_ratelimit-in-the-interrupt-handler.txt 4088-r8169-do-not-abort-when-the-powe! r-management-capabilities-are-disabled.txt 4094-NETFILTER-Fix-nf_conntrack-compilation-with-CONFIG_NETFILTER_DEBUG.txt 4127-ipw2200-disallow-direct-scanning-when-device-is-down.txt 4128-ipw2200-fix-error-log-offset-calculation.txt 4179-TCP-TCP-highspeed-build-error.txt 4183-LLC-Fix-compiler-warnings-introduced-by-TX-window-scaling-changes.txt 4184-NET-Sanitize-NET_SCHED-protection-in-net-sched-Kconfig.txt 4185-IPV6-Fib-dump-really-needs-GFP_ATOMIC.txt 4220-smc91x-fix-one-source-of-spurious-interrupts.txt 4221-smc91x-fix-bank-mismatch.txt 4226-e100-re-enable-microcode-with-more-useful-defaults.txt 4227-s2io-UFO-support.txt 4228-i82593.h-make-header-comment-GPL-compatible.txt 4229-IOC3-Replace-obsolete-PCI-API.txt 4230-au1000_eth-Include-linux-config.h.txt 4231-SAA9730-Add-missing-header-bits.txt 4232-prism54-Remove-extraneous-udelay-register-read.txt 4233-drivers-net-wireless-hermes.c-unsigned-int-comparision.txt 4234-Gianfar-update-and-sysfs-support.txt 4235-intel-ixp2000-ne! twork-driver.txt 4236-git-netdev-all-ieee80211_get_payload-wa! rning-fi x.txt 4240-fec_8xx-make-CONFIG_FEC_8XX-depend-on-CONFIG_8xx.txt 4241-ipw2100-Fix-Driver-using-old-proc-net-wireless.-message.txt 4242-e1000-avoid-leak-when-e1000_setup_loopback_test-fails.txt 4243-e1000-zero-out-pointers-in-e1000_free_desc_rings.txt 4246-wireless-hermes-build-fix.txt 4322-PKT_SCHED-sch_netem-correctly-order-packets-to-be-sent-simultaneously.txt 4324-NET-Reject-socket-filter-if-division-by-constant-zero-is-attempted.txt 4326-IPV6-Acquire-addrconf_hash_lock-for-read-in-addrconf_verify-..txt 4330-FIB_TRIE-Don-t-show-local-table-in-proc-net-route-output.txt 4331-NETFILTER-fixed-dependencies-between-modules-related-with-ip_conntrack.txt 4333-DCCP-Add-missing-no_policy-flag-to-struct-net_protocol.txt 4353-net-Fix-compiler-error-on-dgrs.c-when-CONFIG_PCI.txt 4393-NETLINK-Use-tgid-instead-of-pid-for-nlmsg_pid.txt 4394-IPV4-Fix-secondary-IP-addresses-after-promotion.txt 4395-NETFILTER-ctnetlink-Fix-refcount-leak-ip_conntrack-nat_proto.txt 4419-NETFILTER-ip_conntrack_! netlink.c-needs-linux-interrupt.h.txt 4461-SUNRPC-Funny-looking-code-in-__rpc_purge_upcall.txt 4471-bonding-Remove-superfluous-changelog.txt 4510-IPV6-Implement-appropriate-dummy-rule-4-in-ipv6_dev_get_saddr.txt 4541-IPV4-tcp-route-Another-look-at-hash-table-sizes.txt 4542-ATM-always-return-the-first-interface-for-ATM_ITF_ANY.txt 4543-ATM-atm_pcr_goal-doesn-t-modify-its-argument-s-contents-mark-it-as-const.txt 4547-ATM-attempt-to-autoload-atm-drivers.txt 4550-ATM-avoid-race-conditions-related-to-atm_devs-list.txt 4551-ATM-deregistration-removes-device-from-atm_devs-list-immediately.txt 4553-NET-Add-const-markers-to-various-variables.txt 4554-IPV4-make-two-functions-static.txt 4555-NETFILTER-ipv4-small-cleanups.txt 4556-IPV6-make-two-functions-static.txt 4589-b44-missing-netif_wake_queue-in-b44_open.txt 4590-b44-early-return-in-dev-do_ioctl-when-the-device-is-not-up.txt 4592-b44-increase-version-number.txt 4601-e1000-fix-for-dhcp-issue.txt 4602-sky2-eliminate-special-case-for! -EC-A1.txt 4603-sky2-add-MII-support.txt 4604-sky2-fix-receiv! e-flush- pause-issues.txt 4605-sky2-improve-receive-performance.txt 4606-sky2-add-Yukon-EC-ultra-support.txt 4607-sky2-handle-DMA-boundary-crossing.txt 4608-sky2-change-netif_rx_schedule_test-to-__netif_schedule_prep.txt 4609-sky2-race-with-MTU-change.txt 4610-sky2-dual-port-tx-completion.txt 4611-sky2-byteorder-annotation.txt 4612-sky2-remove-pci-express-hacks.txt 4613-sky2-use-pci_register_driver.txt 4614-sky2-update-version-number.txt 4616-sk98lin-add-permanent-address-support.txt 4617-sk98lin-avoid-message-confusion-with-skge.txt 4619-sk98lin-remove-redundant-fields-in-device-info.txt 4621-ibm_emac-fix-graceful-stop-timeout-handling.txt 4622-ixp2000-register-netdevices-last.txt 4623-pm3386-zero-stats-properly.txt 4624-pm3386-remove-unnecessary-udelays.txt 4625-caleb-pm3386-include-proper-header-files.txt 4626-ixp2000-use-netif_rx_schedule_test.txt 4627-enp2611-don-t-check-netif_running-in-link-status-timer.txt 4628-enp2611-use-dev-in-link-status-timer.txt 4629-enp2611-report-link! -up-down-events.txt 4630-ixp2000-report-MAC-addresses-for-each-port-on-init.txt 4631-pm3386-add-hook-for-setting-MAC-address.txt 4632-pm3386-add-hook-for-setting-carrier.txt 4633-pm3386-implement-reset.txt 4634-enp2611-disable-enable-SERDES-carrier-on-interface-down-up.txt 4635-ixp2000-add-netpoll-support.txt 4636-ixp2000-add-driver-version-bump-version-to-0.2.txt 4637-mipsnet-Fix-Copyright-notice.txt 4638-jazzsonic-Fix-build-error.txt 4639-jazzsonic-Fix-platform-device-code.txt 4640-orinoco-fix-setting-power-management-parameters.txt 4641-skge-handle-VLAN-checksum-correctly-on-yukon-rev-0.txt 4643-wireless-airo-reset-card-in-init.txt 4644-netdrvr-fmvj18x_cs-fix-multicast-bug.txt 4645-airo.c-add-support-for-IW_ENCODE_TEMP-i.e.-xsupplicant.txt 4649-netdrvr-skge-fix-typo-fix-build.txt 4650-ipw2200-kzalloc-conversion-and-Kconfig-dependency-fix.txt 4651-Duplicate-IPW_DEBUG-option-for-ipw2100-and-2200.txt 4680-NETFILTER-Ignore-ACKs-ACKs-on-half-open-connections-in-TCP-conntrack.t! xt 4681-NETFILTER-Fix-recent-match-jiffies-wrap-mismatches.tx! t 4729-S CTP-Return-socket-errors-only-if-the-receive-queue-is-empty.txt 4730-SCTP-Fix-getsockname-for-sctp-when-an-ipv6-socket-accepts-a-connection-from.txt 4731-IGMP-workaround-for-IGMP-v1-v2-bug.txt 4732-IPV4-Fix-EPROTONOSUPPORT-error-in-inet_create.txt 4733-IPV6-Load-protocol-module-dynamically.txt 4737-SUNRPC-Fix-Oopsable-condition-in-rpc_pipefs.txt 4741-ixp2000-change-netif_schedule_test-to-__netif_schedule_prep.txt 4742-sky2-interrupt-not-cleared.txt 4760-NETFILTER-Fix-incorrect-argument-to-ip_nat_initialized-in-ctnetlink.txt 4761-NETFILTER-nf_conntrack-Fix-missing-check-for-ICMPv6-type.txt 4762-NETFILTER-nfnetlink-Fix-calculation-of-minimum-message-length.txt 4763-NETFILTER-Fix-ip_conntrack_flush-abuse-in-ctnetlink.txt 4765-NETFILTER-Mark-ctnetlink-as-EXPERIMENTAL.txt 4766-NETFILTER-Wait-for-untracked-references-in-nf_conntrack-module-unload.txt 4768-NETFILTER-Don-t-use-conntrack-entry-after-dropping-the-reference.txt 4769-NET-make-function-pointer-argument-parseable-by-kerne! l-doc.txt 4770-DECNET-add-memory-buffer-settings.txt 4783-TCP-Vegas-stop-resetting-rtt-every-ack.txt 4784-TCP-Vegas-Remove-extra-call-to-tcp_vegas_rtt_calc.txt 4785-TCP-Vegas-timestamp-before-clone.txt 4787-TG3-remove-warning-on-race.txt 4801-NET-Fix-NULL-pointer-deref-in-checksum-debugging.txt 4807-IPv6-IPsec-fix-pmtu-calculation-of-esp.txt 4855-sky2-don-t-die-if-we-see-chip-rev-0xb5.txt 4856-sky2-device-structure-alignment.txt 4857-sky2-copy-threshold-as-module-parameter.txt 4858-sky2-ethtool-get-set-interrupt-coalescing.txt 4859-sky2-phy-processing-in-workqueue-rather-than-tasklet.txt 4860-sky2-no-irq-disable-needed-during-tx.txt 4861-sky2-ring-distance-optimization.txt 4862-sky2-map-length-optimization.txt 4863-sky2-tx-rx-ring-data-structure-split.txt 4864-sky2-transmit-logic-fixes.txt 4865-sky2-transmit-complete-index-optimization.txt 4866-sky2-transmit-complete-routine-optimization.txt 4867-sky2-interrupt-poll-optimization.txt 4868-sky2-interrupt-coalescing-tuning.txt ! 4869-sky2-handle-tx-timeout.txt 4870-sky2-quiet-ring-full-mes! sage-in- case-of-race.txt 4871-sky2-prefetch-tuning.txt 4872-sky2-turn-on-tx-flow-control.txt 4873-sky2-disable-rx-checksum-on-Yukon-XL.txt 4874-sky2-version-0.10.txt 4875-pcnet32-use-MAC-address-from-prom-also-on-powerpc.txt 4878-TCPv6-Fix-skb-leak.txt 4883-NETFILTER-ip_nat_tftp-Fix-expectation-NAT.txt 4892-skge-get-rid-of-warning-on-race.txt 4893-ieee80211_crypt_tkip-depends-on-NET_RADIO.txt 4895-e1000-Fixes-for-8357x.txt 4921-netdrvr-skge-fix-build.txt 4975-TG3-Fix-nvram-arbitration-bugs.txt 4976-TG3-Fix-suspend-and-resume.txt 4977-TG3-Fix-5704-single-port-mode.txt 4978-TG3-Fix-low-power-state.txt 4984-IPV6-addrconf-Do-not-print-device-pointer-in-privacy-log-message.txt 4985-PKT_SCHED-Disable-debug-tracing-logs-by-default-in-packet-action-API.txt 5023-s2io-__iomem-annotations-for-recent-changes.txt 5035-Address-of-void-__user-is-void-__user-not-void-__user.txt 5101-XFRM-Handle-DCCP-in-xfrm-4-6-_decode_session.txt 5104-SCTP-Fix-sctp-to-not-return-erroneous-POLLOUT-events.txt 5106-T! G3-Fix-peer-device-handling.txt 5107-TG3-Some-low-power-fixes.txt 5108-TG3-Add-tw32_wait_f-for-some-sensitive-registers.txt 5109-TG3-Fix-ethtool-memory-test.txt 5112-RPC-Do-not-block-on-skb-allocation.txt 5114-SUNRPC-Fix-EPIPE-error-on-mount-of-rpcsec_gss-protected-partitions.txt 5131-IPV6-Flag-RTF_ANYCAST-for-anycast-routes.txt 5132-IPV6-Try-not-to-send-icmp-to-anycast-address.txt 5133-IPV6-Defer-IPv6-device-initialization-until-the-link-becomes-ready.txt 5134-IPV6-Run-DAD-when-the-link-becomes-ready.txt 5135-IPV6-Don-t-select-a-tentative-address-as-a-source-address.txt 5140-NETROM-Fix-three-if-statements-in-nr_state1_machine.txt 5141-VLAN-Add-two-missing-checks-to-vlan_ioctl_handler.txt 5142-IPV6-Fix-address-deletion.txt 5143-DCCP-Comment-typo.txt 5147-IPSEC-Fix-policy-updates-missed-by-sockets.txt 5153-SUNGEM-Fix-link-error-with-CONFIG_HOTPLUG-disabled.txt 5156-IPV6-Fix-dead-lock.txt 5157-IPV6-Fix-Temporary-Address-Generation.txt 5158-chelsio-transmit-routine-return-value! s.txt 5159-skge-avoid-up-down-on-speed-changes.txt 5160-skge-! avoid-up -down-on-pause-param-changes.txt 5161-skge-handle-out-of-memory-on-MTU-size-changes.txt 5162-skge-get-rid-of-Yukon2-defines.txt 5163-skge-handle-out-of-memory-on-ring-parameter-change.txt 5164-skge-version-number-1.3.txt 5165-git-netdev-all-s2io-warning-fix.txt 5166-spidernet-fix-Kconfig-after-BPA-CELL-rename.txt 5167-skge-error-handling-on-resume.txt 5168-sky2-handle-out-of-memory-on-admin-changes.txt 5169-sky2-don-t-lose-multicast-addresses.txt 5170-sky2-handle-hardware-packet-overrun.txt 5171-sky2-version-0.11.txt 5173-orinoco_nortel-Fix-incorrect-PCI-resource-use.txt 5174-orinoco_nortel-Add-Symbol-LA-4123-ID.txt 5175-missing-license-for-libphy.ko.txt 5179-forcedeth-fix-random-memory-scribbling-bug.txt 5198-IPV6-Increase-default-MLD_MAX_MSF-to-64.txt 5199-BR_NETFILTER-Fix-leak-if-skb-traverses-1-bridge.txt 5201-IPV6-Fix-addrconf-dead-lock.txt 5202-NET-Validate-socket-filters-against-BPF_MAXINSNS-in-one-spot.txt 5203-IPV6-mcast-Fix-multiple-issues-in-MLDv2-reports.txt 5205! -TG3-ethtool-d-hangs-PCIe-systems.txt 5206-TG3-Update-driver-version-and-reldate.txt 5518-s-retreiv-retriev-g.txt 5541-TCP-BIC-remove-low-utilization-code.txt 5542-TCP-BIC-spelling-and-whitespace.txt 5543-TCP-BIC-CUBIC-window-growth-2.0.txt 5544-NETFILTER-ip_tables-NUMA-aware-allocation.txt 5545-NETFILTER-ebtables-Support-nf_log-API-from-ebt_log-and-ebt_ulog.txt 5546-IPV4-Safer-reassembly.txt 5547-IPV6-Reuse-inet_csk_get_port-in-tcp_v6_get_port.txt 5548-IPV6-Generalise-__tcp_v6_hash-renaming-it-to-__inet6_hash.txt 5549-ICSK-make-inet_csk_reqsk_queue_hash_add-timeout-arg-unsigned-long.txt 5550-IPV6-Generalise-tcp_v6_search_req-tcp_v6_synq_add.txt 5551-IPV6-Introduce-inet6_rsk.txt 5552-ICSK-Rename-struct-tcp_func-to-struct-inet_connection_sock_af_ops.txt 5553-ICSK-Move-v4_addr2sockaddr-from-TCP-to-icsk.txt 5554-DCCP-Introduce-dccp_ipv4_af_ops.txt 5555-IP-Simplify-and-consolidate-MSG_PEEK-error-handling.txt 5556-UDP-udp_checksum_init-return-value.txt 5557-IPVS-remove-dead-code.! txt 5558-NET-Avoid-atomic-xchg-for-non-error-case.txt 5559-AF! _UNIX-Re move-superfluous-reference-counting-in-unix_stream_sendmsg.txt 5560-IPV6-Generalise-some-functions.txt 5561-IPV6-Introduce-inet6_timewait_sock.txt 5562-IPV6-Export-some-symbols-for-DCCPv6.txt 5563-DCCP-Just-rename-dccp_v4_prot-to-dccp_prot.txt 5564-DCCP-Prepare-the-AF-agnostic-core-for-the-introduction-of-DCCPv6.txt 5565-IPV6-Export-ipv6_opt_accepted.txt 5567-DCCP-Use-reqsk_free-in-dccp_v4_conn_request.txt 5571-TCP-Move-the-TCPF_-enum-to-tcp_states.h.txt 5573-AF_UNIX-Use-spinlock-for-unix_table_lock.txt 5574-BRIDGE-allow-setting-hardware-address-of-bridge-pseudo-dev.txt 5575-BRIDGE-handle-speed-detection-after-carrier-changes.txt 5576-BRIDGE-filter-packets-in-learning-state.txt 5577-BRIDGE-limited-ethtool-support.txt 5578-BRIDGE-add-version-number.txt 5579-PKT_SCHED-netem-packet-corruption-option.txt 5582-TCP-cubic-precompute-constants.txt 5583-TCP-cubic-use-Newton-Raphson.txt 5584-IPV4-fib_trie-Add-credits.txt 5585-SCTP-Update-SCTP_PEER_ADDR_PARAMS-socket-option-to-the-late! st-api-draft.txt 5586-SCTP-Add-support-for-SCTP_DELAYED_ACK_TIME-socket-option.txt 5587-NET-Small-cleanup-to-socket-initialization.txt 5588-NET-move-struct-proto_ops-to-const.txt 5589-PKTGEN-Deinitialise-static-variables.txt 5590-NET-Fix-sock_init-return-value.txt 5591-NET-restructure-sock_aio_-read-write-sock_-readv-writev.txt 5594-TCP-Don-t-use-__constant_htonl-for-a-non-const-arg.txt 5595-PPPOX-Fix-assignment-into-const-proto_ops.txt 5596-NET-Speed-up-__alloc_skb.txt 5597-AF_UNIX-Convert-to-use-a-spinlock-instead-of-rwlock.txt 5598-NETLINK-genetlink-fix-cmd-type-in-genl_ops-to-be-consistent-to-u8.txt 5599-NETROM-Remove-unessecary-lock_sock-calls-in-netrom_ioctl.txt 5600-NET-Add-a-dev_ioctl-fallback-to-sock_ioctl.txt 5601-TG3-fixup-tot_len-calculation.txt 5602-IPVS-Cleanup-IP_VS_DBG-statements.txt 5603-DECNET-Only-use-local-routers.txt 5604-DCCP-Do-not-process-a-packet-twice-when-it-s-not-in-state-DCCP_OPEN.txt 5605-DCCP-Send-an-ACK-vector-when-ACKing-a-response-packet.txt! 5606-DCCP-Notify-CCID-only-after-ACK-vectors-have-been-proce! ssed.txt 5607-BRIDGE-Fix-faulty-check-in-br_stp_recalculate_bridge_id.txt 5608-IPV4-fib_trie-build-fix.txt 5610-IEEE80211-ipw2200-Simplify-multicast-checks.txt 5611-TCP-less-inline-s.txt 5612-DCCP-ackvec-Fix-spelling-of-throw.txt 5613-DCCP-ackvec-use-u8-for-the-buf-offsets.txt 5614-TCP-syn_flood_warning-is-only-needed-if-CONFIG_SYN_COOKIES-is-selected.txt 5700-ECONET-Use-macro-for-spinlock_t-definition.txt 5701-IPV6-Use-macro-for-rwlock_t-initialization.txt 5702-NETFILTER-Use-macro-for-spinlock_t-rwlock_t-initializations-definition.txt 5703-NET-More-instruction-checks-fornet-core-filter.c.txt 5704-TCP-tcp_vegas-Fix-slow-start.txt 5730-IPVS-Fix-compilation.txt 5731-NETFILTER-Decrease-number-of-pointer-derefs-in-nfnetlink_queue.c.txt 5732-NETFILTER-Decrease-number-of-pointer-derefs-in-nf_conntrack_core.c.txt 5733-NETFILTER-ctnetlink-remove-bogus-checks-in-ICMP-protocol-at-dumping.txt 5734-NETFILTER-ctnetlink-Add-sanity-checkings-for-ICMP.txt 5735-NETFILTER-ctnetlink-propagate-ctnetlin! k_dump_tuples_proto-return-value-back.txt 5736-NETFILTER-ctnetlink-use-u_int32_t-instead-of-unsigned-int.txt 5737-NETFILTER-ctnetlink-ctnetlink_event-cleanup.txt 5738-NETFILTER-ctnetlink-fix-conntrack-mark-race.txt 5739-NETFILTER-ctnetlink-remove-unused-variable.txt 5740-NETFILTER-Add-ctnetlink-port-for-nf_conntrack.txt 5741-NETFILTER-Filter-dumped-entries-based-on-the-layer-3-protocol-number.txt 5742-NETFILTER-Fix-module_param-types-and-permissions.txt 5743-NETFILTER-ctnetlink-Fix-dumping-of-helper-name.txt 5744-NETFILTER-Remove-okfn-usage-in-ip_vs_core.c.txt 5745-NETFILTER-Call-POST_ROUTING-hook-before-fragmentation.txt 5746-NETFILTER-make-ipv6_find_hdr-find-transport-protocol-header.txt 5747-NETFILTER-Export-ip6_masked_addrcmp-don-t-pass-IPv6-addresses-on-stack.txt 5748-NETFILTER-nf_conntrack_l3proto_ipv4.c-needs-net-route.h.txt 5749-NETFILTER-Use-HOPLIMIT-metric-as-TTL-of-TCP-reset-sent-by-REJECT.txt 5776-NET-Change-1500-to-ETH_DATA_LEN-in-some-files.txt 5796-knfsd-fix-h! ash-function-for-IP-addresses-on-64bit-little-endian-machines! .txt 600 8-parport-include-fixes.txt 6015-Keep-nfsd-from-exiting-when-seeing-recv-errors.txt added hold last reject removed is void __user 0036-sky2-new-experimental-Marvell-Yukon2-driver.txt 0072-8139cp-support-ETHTOOL_GPERMADDR.txt 0073-8139too-support-ETHTOOL_GPERMADDR.txt 0074-b44-support-ETHTOOL_GPERMADDR.txt 0075-e1000-support-ETHTOOL_GPERMADDR.txt 0076-e100-support-ETHTOOL_GPERMADDR.txt 0077-forcedeth-support-ETHTOOL_GPERMADDR.txt 0078-ixgb-support-ETHTOOL_GPERMADDR.txt 0079-ne2k-pci-support-ETHTOOL_GPERMADDR.txt 0080-pcnet32-support-ETHTOOL_GPERMADDR.txt 0081-r8169-support-ETHTOOL_GPERMADDR.txt 0082-skge-support-ETHTOOL_GPERMADDR.txt 0083-sundance-support-ETHTOOL_GPERMADDR.txt 0084-via-rhine-support-ETHTOOL_GPERMADDR.txt 0087-Replace-drivers-net-wan-custom-ctype-macros-with-standard-ones.txt 0088-drivers-net-wan-possible-cleanups.txt 0089-lne390-bogus-casts.txt 0090-C99-initializers-in-ray_cs.c.txt 0091-mii-Add-test-for-GigE-support.txt 0092-Add-rapidio-net-driver.txt 0100-pc! net32-set_ringparam-implementation.txt 0101-pcnet32-set-min-ring-size-to-4.txt 0102-sky2-driver-update.txt 0103-orinoco-Remove-conditionals-that-are-useless-in-the-kernel-drivers.txt 0104-orinoco-Don-t-include-net-ieee80211.h-twice.txt 0105-orinoco-Update-PCMCIA-ID-s.txt 0106-Fixed-some-endian-issues-with-802.11-header-usage-in-ieee80211_rx.c.txt 0107-ieee80211-quality-scaling-algorithm-extension-handler.txt 0108-ieee80211-Added-wireless-spy-support.txt 0109-Changed-802.11-headers-to-use-ieee80211_info_element-0.txt 0110-ieee80211-Removed-ieee80211_info_element_hdr.txt 0111-ieee80211-Cleanup-memcpy-parameters.txt 0112-ieee80211-Switched-to-sscanf-in-store_debug_level.txt 0113-ieee80211-Fixed-type-o-of-abg_ture-abg_true.txt 0114-Updated-ipw2200-to-compile-with-ieee80211-abg_ture-to-abg_true-change.txt 0163-sky2-fix-FIFO-DMA-alignment-problems.txt 0164-sky2-allow-ethtool-debug-access-to-all-of-PCI-space.txt 0165-sky2-version-0.5.txt 0166-ieee80211-Updated-ipw2100-to-be-compati! ble-with-ieee80211_hdr-changes.txt 0167-ieee80211-Updated-ipw! 2100-to- be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0168-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211_hdr-changes.txt 0169-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0170-ieee80211-Updated-atmel-to-be-compatible-with-ieee80211_hdr-changes.txt 0171-ieee80211-Fixed-a-kernel-oops-on-module-unload.txt 0172-ieee80211-Hardware-crypto-and-fragmentation-offload-support.txt 0173-ieee80211-Fix-time-calculation-switching-to-use-jiffies_to_msecs.txt 0174-ieee80211-Fix-kernel-Oops-when-module-unload.txt 0175-ieee80211-Allow-drivers-to-fix-an-issue-when-using-wpa_supplicant-with-WEP.txt 0176-ieee82011-Added-WE-18-support-to-default-wireless-extension-handler.txt 0177-ieee80211-Renamed-ieee80211_hdr-to-ieee80211_hdr_3addr.txt 0178-ieee80211-adds-support-for-the-creation-of-RTS-packets.txt 0179-ieee82011-Added-ieee80211_tx_frame-to-convert-generic-802.11-data-frames-and-callbacks.txt 0180-ieee80211-Fix-TKIP-repeated-fragmentatio! n-problem-and-payload_size-reporting.txt 0181-ieee80211-Return-NETDEV_TX_BUSY-when-QoS-buffer-full.txt 0182-ieee80211-Add-QoS-WME-support-to-the-ieee80211-subsystem.txt 0183-ieee80211-Added-ieee80211_geo-to-provide-helper-functions.txt 0184-ieee80211-Added-ieee80211_radiotap.h.txt 0185-ieee80211-Additional-fixes-for-endian-aware-types.txt 0186-ieee80211-extern-inline-to-static-inline.txt 0187-ieee80211-Type-o-capbility-definition-for-QoS-and-ERP-parsing.txt 0188-ieee80211-Mixed-PTK-GTK-CCMP-TKIP-support.txt 0189-ieee80211-Keep-auth-mode-unchanged-after-iwconfig-key-off-on-cycle.txt 0190-ieee80211-Updated-copyright-dates.txt 0191-ieee80211-Updated-hostap-to-be-compatible-with-ieee80211_hdr-changes.txt 0192-ieee80211-Updated-hostap-to-be-compatible-with-extra_prefix_len-changes.txt 0193-ieee82011-Remove-WIRELESS_EXT-ifdefs.txt 0194-forcedeth-add-hardware-tx-checksumming.txt 0199-ieee80211-Added-subsystem-version-string-and-reporting-via-MODULE_VERSION.txt 0200-ieee80211-Added-! handle_deauth-callback-enhanced-tkip-ccmp-support-of-varying-! hw-sw-of fload.txt 0201-ieee80211-added-IE-comments-reason_code-to-reason-removed-info_element-from-ieee80211_disassoc.txt 0202-ieee80211-in-tree-driver-updates-to-sync-with-latest-ieee80211-series.txt 0203-ieee80211-update-orinoco-wl3501-drivers-for-latest-struct-naming.txt 0216-orinoco-Remove-inneeded-system-includes.txt 0217-orinoco-Make-nortel_pci_hw_init-static.txt 0218-orinoco-Fix-memory-leak-and-unneeded-unlock-in-orinoco_join_ap.txt 0219-orinoco-orinoco_send_wevents-could-return-without-unlocking.txt 0220-orinoco-Remove-unneeded-forward-declarations.txt 0221-orinoco-Annotate-endianess-of-variables-and-structure-members.txt 0222-orinoco-Read-only-needed-data-in-__orinoco_ev_txexc.txt 0223-orinoco-Bump-version-to-0.15rc3.txt 0227-RPC-Report-connection-errors-properly-when-mounting-with-soft.txt 0228-RPC-proper-soft-timeout-behavior-for-rpcbind.txt 0229-NFS-use-a-constant-value-for-TCP-retransmit-timeouts.txt 0230-RPC-portmapper-doesn-t-need-a-reserved-port.txt 0231-RPC-extract-! socket-logic-common-to-both-client-and-server.txt 0232-RPC-introduce-client-side-transport-switch.txt 0233-RPC-transport-switch-function-naming.txt 0234-RPC-Reduce-stack-utilization-in-xs_sendpages.txt 0235-RPC-Rename-sock_lock.txt 0236-RPC-Rename-xprt_lock.txt 0237-RPC-rename-the-sockstate-field.txt 0238-RPC-Eliminate-socket.h-includes-in-RPC-client.txt 0239-RPC-Add-helper-for-waking-tasks-pending-on-a-transport.txt 0240-RPC-client-side-transport-switch-cleanup.txt 0241-RPC-separate-TCP-and-UDP-write-space-callbacks.txt 0242-RPC-separate-TCP-and-UDP-transport-connection-logic.txt 0243-RPC-separate-TCP-and-UDP-socket-write-paths.txt 0244-RPC-skip-over-transport-specific-heads-automatically.txt 0245-RPC-get-rid-of-xprt-stream.txt 0246-RPC-add-API-to-set-transport-specific-timeouts.txt 0247-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0248-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0249-RPC-separate-xprt_timer-implementations.txt 0250-RPC-add-ge! neric-interface-for-adjusting-the-congestion-window.txt 0251-! RPC-add- a-release_rqst-callout-to-the-RPC-transport-switch.txt 0252-RPC-remove-xprt-nocong.txt 0253-RPC-clean-up-after-nocong-was-removed.txt 0254-RPC-allow-RPC-client-s-port-range-to-be-adjustable.txt 0255-RPC-make-sure-to-get-the-same-local-port-number-when-reconnecting.txt 0256-RPC-parametrize-various-transport-connect-timeouts.txt 0257-RPC-rationalize-set_buffer_size.txt 0258-RPC-NFS-new-rpc_pipefs-patch.txt 0260-Revert-PATCH-RPC-NFS-new-rpc_pipefs-patch.txt 0262-SUNRPC-fix-bug-in-patch-portmapper-doesn-t-need-a-reserved-port.txt 0266-netdrvr-gianfar-use-new-phy-layer.txt 0267-netdrvr-delete-CONFIG_PHYCONTROL.txt 0268-hostap-Fix-pci_driver-name-for-hostap_plx-and-hostap_pci.txt 0269-hostap-Add-support-for-WE-19.txt 0270-hostap-Use-GFP_ATOMIC-to-get-rid-of-weird-might_sleep-issue.txt 0271-hostap-Remove-iwe_stream_add_event-kludge.txt 0272-Remove-WIRELESS_EXT-ifdefs-from-several-wireless-drivers.txt 0273-wireless-airo-remove-needed-dma_addr_t-obfuscation.txt 0312-sky2-changing-mtu! -doesn-t-have-to-reset-link.txt 0313-sky2-cleanup-interrupt-processing.txt 0314-sky2-add-hardware-VLAN-acceleration-support.txt 0315-sky2-explicit-set-power-state.txt 0316-sky2-version-0.6.txt 0317-sky2-nway-reset-BONUS-FEATURE.txt 0323-This-patch-fixes-a-typo-in-ieee80211.h-ieee82011_deauth-ieee80211_deauth.txt 0346-This-will-move-the-ieee80211_is_ofdm_rate-function-to-the-ieee80211.h.txt 0348-Currently-the-info_element-is-parsed-by-2-seperate-functions-this.txt 0349-When-an-assoc_resp-is-received-the-network-structure-is-not-completely.txt 0350-Lindent-and-trailing-whitespace-script-executed-ieee80211-subsystem.txt 0356-hostap-Remove-hw-specific-dev_open-close-handlers.txt 0357-hostap-Fix-hostap_pci-build-with-PRISM2_IO_DEBUG.txt 0358-hostap-Do-not-free-local-hw_priv-before-unregistering-netdev.txt 0359-hostap-Unregister-netdevs-before-freeing-local-data.txt 0366-S2io-MSI-MSI-X-support-runtime-configurable.txt 0367-e1000-Support-for-82571-and-82572-controllers.txt 0368-e10! 00-multi-queue-defines-modification-to-data-structures.txt 03! 69-e1000 -implementation-of-the-multi-queue-feature.txt 0370-e1000-Enable-custom-configuration-bits-for-82571-2-controllers.txt 0371-e1000-Fixes-for-packet-split-related-issues.txt 0372-e1000-Added-msleep_interruptible-delay.txt 0373-e1000-Flush-shadow-RAM.txt 0374-e1000-fix-warnings.txt 0375-AX.25-Delete-debug-printk-from-mkiss-driver.txt 0376-AX.25-Convert-mkiss.c-to-DEFINE_RWLOCK.txt 0377-airo-fix-resume.txt 0378-s2io-change-strncpy-length-arg-to-use-size-of-target.txt 0379-netdrvr-s2io-Add-a-MODULE_VERSION-entry.txt 0380-bonding-replicate-IGMP-traffic-in-activebackup-mode.txt 0381-sky2-add-permanent-address-support.txt 0383-wireless-ipw2200-remove-redundant-return-statement.txt 0546-S2io-Offline-diagnostics-fixes.txt 0547-rcu-in-bpqether-driver.txt 0548-SMACK-support-for-mkiss.txt 0549-Initialize-the-.owner-field-the-tty_ldisc-structure.txt 0555-SUNRPC-Retry-rpcbind-requests-if-the-server-s-portmapper-isn-t-up.txt 0556-RPC-allow-call_encode-to-delay-transmission-of-an-RPC-call.tx! t 0575-ieee80211-division-by-zero-fix.txt 0577-sb1250-mac-Check-the-actual-setting-for-reporting-hw-checksumming.txt 0578-sb1250-mac-Ensure-16-byte-alignment-of-the-descriptor-ring.txt 0579-au1000_eth-Misc-Au1000-net-driver-fixes.txt 0580-de2104x-Resurrect-Cobalt-support-for-2.6.txt 0581-sgiseeq-Fix-resource-handling.txt 0582-sgiseeq-Configure-PIO-and-DMA-timing-requests.txt 0583-declance-Convert-to-irqreturn_t.txt 0584-declance-Fix-mapping-of-device.txt 0585-declance-Deal-with-the-bloody-KSEG-vs-CKSEG-horror.txt 0586-declance-Use-physical-addresses-at-the-interface-level.txt 0587-ne-Support-for-RBHMA4500-eval-board.txt 0588-mipsnet-Virtual-ethernet-driver-for-MIPSsim.txt 0589-e1000_intr-build-fix.txt 0590-s2io-build-fix.txt 0592-via-rhine-change-mdelay-to-msleep-and-remove-from-ISR-path.txt 0593-epic100-fix-counting-of-work_done-in-epic_poll.txt 0596-bonding-cleanup-comment-for-mode-1-IGMP-xmit-hack.txt 0597-b44-alternate-allocation-option-for-DMA-descriptors.txt 0598-orino! co-remove-redundance-skb-length-check-before-padding.txt 0599! -sundanc e-remove-if-1-.-block-in-sundance_probe1.txt 0600-sundance-expand-reset-mask.txt 0601-e1000-build-fix.txt 0603-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0606-SUNRPC-Add-support-for-privacy-to-generic-gss-api-code.txt 0607-SUNRPC-Provide-a-callback-to-allow-free-pages-allocated-during-xdr-encoding.txt 0608-SUNRPC-Retry-wrap-in-case-of-memory-allocation-failure.txt 0609-RPCSEC_GSS-cleanup-au_rslack-calculation.txt 0610-RPCSEC_GSS-client-side-privacy-support.txt 0611-RPCSEC_GSS-Simplify-rpcsec_gss-crypto-code.txt 0612-RPCSEC_GSS-krb5-pre-privacy-cleanup.txt 0613-RPCSEC_GSS-Add-support-for-privacy-to-krb5-rpcsec_gss-mechanism.txt 0614-RPCSEC_GSS-remove-all-qop-parameters.txt 0615-RPCSEC_GSS-krb5-cleanup.txt 0622-Fixed-problem-with-not-being-able-to-decrypt-encrypt-broadcast-packets.txt 0631-sb1250-mac-Get-rid-of-all-the-funny-SBMAC_WRITECSR-and-SBMAC_READCSR-macros.txt 0632-sb1250-mac-Whitespace-cleanup.txt 0645-sundance-include-MII-address-0-in-PHY-probe.tx! t 0646-e1000-Driver-version-white-space-comments-device-id-other.txt 0647-Fixed-oops-if-an-uninitialized-key-is-used-for-encryption.txt 0652-sb1250-mac-PHY-probing-fixes.txt 0670-ieee80211-subsystem.txt 0671-Update-version-ieee80211-stamp-to-1.1.6.txt 0675-PARISC-Change-the-driver-names-so-sys-bus-parisc-drivers-looks-better.txt 0676-PARISC-Convert-parisc_device-to-use-struct-resource-for-hpa.txt 0714-PARISC-Add-NETPOLL-support-to-lasi_82596.txt 0771-DECNET-Remove-some-redundant-ifdeffed-code.txt 0772-NET-Wider-use-of-for_each_-cpu.txt 0773-PKTGEN-Sleeping-function-called-under-lock.txt 0774-PKTGEN-Use-kzalloc.txt 0775-PKTGEN-Spelling-and-white-space.txt 0776-PKTGEN-proc-interface-revision.txt 0777-NETFILTER-ip_conntrack-Make-hashsize-conntrack-parameter-writable.txt 0778-IPV4-Kill-redundant-rcu_dereference-on-fa_info.txt 0779-IPSEC-Kill-obsolete-get_mss-function.txt 0780-NETLINK-Remove-dead-code-in-af_netlink.c.txt 0781-IPV4-Remove-dead-code-from-ip_output.c.txt 0782-SK_BUF! F-kernel-doc-fix-skbuff-warnings.txt 0783-AX.25-Use-constant-! instead- of-magic-number.txt 0784-IPV4-Fix-setting-broadcast-for-SIOCSIFNETMASK.txt 0785-netdrvr-forcedeth-scatter-gather-and-segmentation-offload-support.txt 0786-ieee80211-build-fix.txt 0834-Revert-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0855-RPC-Ensure-that-nobody-can-queue-up-new-upcalls-after-rpc_close_pipes.txt 0931-gfp_t-net.txt 0952-gfp_t-drivers-net.txt 0957-ARM-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 0963-ARM-2897-2-PXA2xx-IRDA-support.txt 0971-sky2-remove-unused-definitions.txt 0972-sky2-use-kzalloc.txt 0973-sky2-spelling-fixes.txt 0974-sky2-fix-NAPI-and-receive-handling.txt 0975-sky2-version-0.7.txt 1029-DRIVER-MODEL-Get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.txt 1037-Bluetooth-Make-more-functions-static.txt 1038-Bluetooth-Update-security-filter-for-Extended-Inquiry-Response.txt 1043-IPv4-IPv6-UFO-Scatter-gather-approach.txt 1044-MCAST-IPv6-Fix-algorithm-to-compute-Querier-s-Query-Interval.txt 1055-tg3! -add-5714-5715-support.txt 1056-tg3-fix-ASF-heartbeat.txt 1057-tg3-update-version-and-minor-fixes.txt 1058-ibmveth-fix-bonding.txt 1059-ibmveth-fix-buffer-pool-management.txt 1060-ibmveth-fix-buffer-replenishing.txt 1061-ibmveth-lockless-TX.txt 1062-ibmveth-fix-failed-addbuf.txt 1063-pcnet_cs-fix-mii-init-code-for-older-DL10019-based-cards.txt 1065-s2io-kconfig-help-fix.txt 1066-b44-reports-wrong-advertised-flags.txt 1067-sis190.c-fix-multicast-MAC-filter.txt 1068-smc91x-shut-down-power-after-probing.txt 1070-starfire-free_irq-on-error-path-of-netdev_open.txt 1073-netdrvr-b44-include-linux-dma-mapping.h-to-eliminate-warning.txt 1074-sundance-fix-DFE-580TX-Tx-Underrun.txt 1075-New-PowerPC-4xx-on-chip-ethernet-controller-driver.txt 1078-sis900-come-alive-after-temporary-memory-shortage.txt 1079-Add-Wake-on-LAN-support-to-sis900-2.txt 1080-drivers-net-Remove-pointless-checks-for-NULL-prior-to-calling-kfree.txt 1082-netdrvr-ne2k-pci-based-card-does-not-support-bus-mastering.txt ! 1083-ipw2200-Missing-kmalloc-check.txt 1159-SCTP-Rename-SCTP-! specific -control-message-flags.txt 1163-SCTP-Fix-SCTP_SETADAPTION-sockopt-to-use-the-correct-structure.txt 1164-SCTP-Allow-SCTP_MAXSEG-to-revert-to-default-frag-point-with-a-0-value.txt 1196-SCTP-Do-not-allow-unprivileged-programs-initiating-new-associations-on.txt 1200-e1000-remove-warning-about-e1000_suspend.txt 1201-eepro.c-module_param_array-cleanup.txt 1202-b44-fix-suspend-resume.txt 1203-e1000-use-vmalloc_node.txt 1204-revert-orinoco-Information-leakage-due-to-incorrect-padding.txt 1205-Better-fixup-for-the-orinoco-driver.txt 1206-e1000-Fixes-e1000_suspend-warning-when-CONFIG_PM-is-not-enabled.txt 1320-ETH-ether-address-compare.txt 1324-Add-modalias-for-pmac-network-drivers.txt 1328-mv643xx_eth_showsram-Added-information-message-when-using-the-SRAM.txt 1329-IPV4-Fix-issue-reported-by-Coverity-in-ipv4-fib_frontend.c.txt 1389-s2io-iomem-annotations.txt 1397-bluetooth-hidp-is-broken-on-s390.txt 1403-drivers-net-tg3-Use-the-DMA_-32-64-BIT_MASK-constants.txt 1405-prism54-Free-skb-a! fter-disabling-interrupts.txt 1748-DRIVER-MODEL-Add-missing-platform_device.h-header.txt 1749-PPC-44x-EMAC-driver-add-440SPe-support.txt 1750-PPC-44x-EMAC-driver-add-440GR-support.txt 1751-PPC-4xx-EMAC-driver-fix-VSC8201-PHY-initialization.txt 1754-fec_8xx-Remove-dependency-on-NETTA-NETPHONE.txt 1755-fec_8xx-Add-support-for-Intel-PHY-LX971.txt 1761-vmalloc_node.txt 1854-ARM-3066-1-Fix-PXA-irda-driver-suspend-resume-functions.txt 1920-m32r-SMC91x-driver-update.txt 1929-smsc-ircc2-PM-cleanup-do-not-close-device-when-suspending.txt 1941-remove-some-more-check_region-stuff.txt 1961-Typo-fix-dot-after-newline-in-printk-strings.txt 2026-sparse-cleanups-NULL-pointers-C99-struct-init.txt 2067-netdrvr-8139too-replace-hand-crafted-kernel-thread-with-workqueue.txt 2078-BRIDGE-Use-ether_compare.txt 2079-NETFILTER-Add-revision-support-to-arp_tables-and-ip6_tables.txt 2080-ROSE-rose_heartbeat_expiry-locking-fix.txt 2081-IPV6-Fix-behavior-of-ip6_route_input-for-link-local-address.txt 2083-! DCCP-Simplify-skb_set_owner_w-semantics.txt 2089-DCCP-Set-soc! ket-owne r-iff-packet-is-not-data.txt 2090-MCAST-IPv6-Check-packet-size-when-process-Multicast.txt 2227-ibmveth-fix-panic-in-initial-replenish-cycle.txt 2245-MCAST-ip-6-_mc_add_src-should-be-called-when-number-of-sources-is-zero.txt 2256-IPV6-inet6_ifinfo_notify-should-use-RTM_DELLINK-in-addrconf_ifdown.txt 2267-PKT_SCHED-Rework-QoS-and-or-fair-queueing-configuration.txt 2396-ARM-Reverted-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 2410-SUNRPC-allow-sunrpc.o-to-link-when-CONFIG_SYSCTL-is-disabled.txt 2411-NFS-SUNRPC-NLM-fix-unused-variable-warnings-when-CONFIG_SYSCTL-is-disabled.txt 2416-NETFILTER-PPTP-helper-Fix-compilation-of-conntrack-helper-without-NAT.txt 2421-netdrvr-8139too-use-cancel_rearming_delayed_work-to-cancel-thread.txt 2422-netdrvr-8139too-use-rtnl_shlock_nowait-rather-than-rtnl_lock_interruptible.txt 2425-NETFILTER-Fix-double-free-after-netlink_unicast-in-ctnetlink.txt 2430-NETFILTER-nfnetlink-Use-kzalloc.txt 2431-NETFILTER-CONNMARK-target-! needs-ip_conntrack.txt 2433-NETEM-use-PSCHED_LESS.txt 2435-drivers-net-wireless-airo.c-unsigned-comparason.txt 2436-S2io-Multi-buffer-mode-support.txt 2438-pcnet32-show-name-of-failing-device.txt 2439-pcnet32-AT2700-2701-and-Bugzilla-2699-4551.txt 2440-pcnet32-Prevent-hang-with-79c976.txt 2441-phy-address-mask-support-for-generic-phy-layer.txt 2442-PKT_SCHED-Generic-RED-layer.txt 2443-NET-Introduce-INET_ECN_set_ce-function.txt 2444-PKT_SCHED-RED-Use-new-generic-red-interface.txt 2445-PKT_SCHED-RED-Use-generic-queue-management-interface.txt 2446-PKT_SCHED-RED-Dont-start-idle-periods-while-already-idling.txt 2447-PKT_SCHED-RED-Cleanup-and-remove-unnecessary-code.txt 2448-PKT_SCHED-GRED-Cleanup-equalize-flag-and-add-new-WRED-mode-detection.txt 2449-PKT_SCHED-GRED-Transform-grio-to-GRED_RIO_MODE.txt 2450-PKT_SCHED-GRED-Cleanup-dumping.txt 2451-PKT_SCHED-GRED-Dump-table-definition.txt 2452-PKT_SCHED-GRED-Use-a-central-table-definition-change-procedure.txt 2453-PKT_SCHED-GRED-Repo! rt-out-of-bound-DPs-as-illegal.txt 2454-PKT_SCHED-GRED-Use-ce! ntral-VQ -change-procedure.txt 2455-PKT_SCHED-GRED-Use-new-generic-red-interface.txt 2456-PKT_SCHED-GRED-Do-not-reset-statistics-in-gred_reset-gred_change.txt 2457-PKT_SCHED-GRED-Report-congestion-related-drops-as-NET_XMIT_CN.txt 2458-PKT_SCHED-GRED-Use-generic-queue-management-interface.txt 2459-PKT_SCHED-GRED-Introduce-tc_index_to_dp.txt 2460-PKT_SCHED-GRED-Improve-error-handling-and-messages.txt 2461-PKT_SCHED-GRED-Remove-initd-flag.txt 2462-PKT_SCHED-GRED-Dont-abuse-default-VQ-for-equalizing.txt 2463-PKT_SCHED-GRED-Remove-auto-creation-of-default-VQ.txt 2464-PKT_SCHED-GRED-Cleanup-and-remove-unnecessary-code.txt 2465-PKT_SCHED-GRED-Fix-restart-of-idle-period-in-WRED-mode-upon-dequeue-and-drop.txt 2466-PKT_SCHED-GRED-Support-ECN-marking.txt 2467-PKT_SCHED-G-RED-Introduce-hard-dropping.txt 2468-DRIVER-MODEL-Improved-dynamically-allocated-platform_device-interface.txt 2469-DRIVER-MODEL-Fix-depca.txt 2470-DRIVER-MODEL-Fix-jazzsonic.txt 2471-DRIVER-MODEL-Fix-macsonic.txt 2476-NETEM-Su! pport-time-based-reordering.txt 2477-NETEM-Add-version-string.txt 2478-NET-Fix-race-condition-in-sk_stream_wait_connect.txt 2479-TCP-DCCP-Randomize-port-selection.txt 2481-drivers-net-ixgb-make-some-code-static.txt 2482-drivers-net-e1000-possible-cleanups.txt 2483-drivers-net-hamradio-dmascc.c-remove-dmascc_setup.txt 2484-prism54-Remove-redundant-assignment.txt 2485-bnx2-add-5708-support.txt 2486-bnx2-update-firmware-for-5708.txt 2487-bnx2-update-nvram-code-for-5708.txt 2488-bnx2-update-firmware-handshake-for-5708.txt 2489-bnx2-refine-bnx2_poll.txt 2490-bnx2-update-version-and-minor-fixes.txt 2493-Remove-linux-version.h-include-from-drivers-net-phy-and-net-ieee80211.txt 2494-netdrvr-fac_8xx-build-fix.txt 2495-netdrvr-s2io-warning-fixes.txt 2645-b44-b44_start_xmit-returns-with-a-lock-held-when-it-fails-allocating.txt 2646-b44-miscellaneous-cleanup.txt 2647-b44-expose-counters-through-ethtool.txt 2648-b44-s-spin_lock_irqsave-spin_lock-in-b44_interrupt.txt 2649-b44-late-request! _irq-in-b44_open.txt 2688-3c59x-convert-to-use-of-pci_iomap-A! PI.txt 2 689-3c59x-cleanup-of-mdio_read-routines-to-use-MII_-macros.txt 2690-3c59x-avoid-blindly-reading-link-status-twice.txt 2691-3c59x-bounds-checking-for-hw_checksums.txt 2692-3c59x-cleanup-init-of-module-parameter-arrays.txt 2693-3c59x-fix-some-grammar-in-module-parameter-descriptions.txt 2694-3c59x-support-ETHTOOL_GPERMADDR.txt 2695-3c59x-correct-rx_dropped-counting.txt 2696-3c59x-enable-use-of-memory-mapped-PCI-I-O.txt 2697-3c59x-don-t-enable-scatter-gather-w-o-checksum-support.txt 2828-knfsd-make-sure-svc_process-call-the-correct-pg_authenticate-for-multi-service-port.txt 2934-m68knommu-FEC-ethernet-header-support-for-the-ColdFire-5208.txt 2935-m68knommu-FEC-ethernet-support-for-the-ColdFire-5208.txt 2984-scripts-Lindent-on-ieee80211-subsystem.txt 2985-Fix-problem-with-WEP-unicast-key-index-0.txt 2986-Update-version-ieee80211-stamp-to-1.1.7.txt 2987-Ran-scripts-Lindent-on-drivers-net-wireless-ipw2-1-2-00.-c-h.txt 2988-IPW_DEBUG-has-already-included-DRV_NAME-remove-double-pref! ix-print.txt 2989-Catch-ipw2200-up-to-equivelancy-with-v1.0.1.txt 2990-Catch-ipw2200-up-to-equivelancy-with-v1.0.2.txt 2991-Catch-ipw2200-up-to-equivelancy-with-v1.0.3.txt 2992-Catch-ipw2200-up-to-equivelancy-with-v1.0.4.txt 2993-Catch-ipw2100-up-to-equivelancy-with-v1.1.1.txt 2994-Fixed-WEP-on-ipw2100-priv-sec-was-being-used-instead-of.txt 2995-Bug-339-Fix-ipw2100-iwconfig-set-get-txpower.txt 2996-Move-code-from-ipw2100_wpa_enable-to-IPW2100_PARAM_DROP_UNENCRYPTED-to.txt 2997-Catch-ipw2200-up-to-equivelancy-with-v1.0.5.txt 2998-Fix-hardware-encryption-both-WEP-and-AES-doesn-t-work-with-fragmentation.txt 2999-Fix-is_duplicate_packet-bug-for-fragmentation-number-setting.txt 3000-bug-667-Fix-the-notorious-No-space-for-Tx-bug.txt 3001-Bug-637-Set-tx-power-for-A-band.txt 3002-Changed-default-of-missed-beacons-to-miss-before-disassociation-to-24.txt 3003-Updated-to-support-ieee80211-callback-to-is_queue_full-for-802.11e.txt 3004-Fixed-some-compiler-issues-if-CONFIG_IPW2200_QOS-is! -enabled.txt 3005-Added-more-useful-geography-encoding-so-peo! ple-s-ex perience-with.txt 3006-Workaround-kernel-BUG_ON-panic-caused-by-unexpected-duplicate-packets.txt 3007-Disable-host-fragmentation-in-open-mode-since-IPW2200-2915-hardware.txt 3008-Bug-792-Fix-WPA-PSK-AES-both-for-Dipw-and-Dwext.txt 3009-Fixes-the-ad-hoc-network-WEP-key-list-issue.txt 3010-Bug-701-Fix-a-misuse-of-ieee-mode-with-ieee-iw_mode.txt 3011-Fix-ipw_wx_get_txpow-shows-wrong-disabled-value.txt 3012-Fix-firmware-error-when-setting-tx_power.txt 3013-Modified-ipw_config-and-STATUS_INIT-setting-to-correct-race-condition.txt 3014-Switched-firmware-error-dumping-so-that-it-will-capture-a-log-available.txt 3015-Changed-all-of-the-ipw_send_cmd-calls-to-return-any-ipw_send_cmd-error.txt 3016-Added-cmdlog-in-non-debug-systems.txt 3017-Migrated-some-of-the-channel-verification-code-back-into-the-driver-to.txt 3018-Updated-ipw2200-to-use-the-new-ieee80211-callbacks.txt 3019-Added-wait_state-wakeup-on-scan-completion.txt 3020-Bug-455-Fix-frequent-channel-change-generates-firmware-fa! tal-error.txt 3021-Bug-760-Fix-setting-WEP-key-in-monitor-mode-causes-IV-lost.txt 3022-Don-t-set-hardware-WEP-if-we-are-actually-using-TKIP-AES.txt 3023-Make-all-the-places-the-firmware-fails-to-load-showerrors-in-decimal.txt 3024-Adds-radiotap-support-to-ipw2200-in-monitor-mode.txt 3025-Fixed-is_network_packet-to-include-checking-for-broadcast-packets.txt 3026-Mixed-PTK-GTK-CCMP-TKIP-support.txt 3027-Card-with-WEP-enabled-and-using-shared-key-auth-will-have-firmware.txt 3028-Fixed-problem-with-get_cmd_string-not-existing-if-CONFIG_IPW_DEBUG-disabled.txt 3029-Removed-PF_SYNCTHREAD-legacy.txt 3030-Fixes-problem-with-WEP-not-working-association-succeeds-but-no-Tx-Rx.txt 3031-Fix-bug-771-Too-many-8-bytes-recieved-when-using-AES-hwcrypto.txt 3032-Fixes-WEP-firmware-error-condition.txt 3033-Updated-driver-version-stamps-for-ipw2100-1.1.3-and-ipw2200-1.0.7.txt 3034-Pulled-out-a-stray-KERNEL_VERSION-check-around-the-suspend-handler.txt 3035-Fix-Driver-using-old-proc-net-wireless-su! pport-please-fix-driver-message.txt 3036-Removed-legacy-WIREL! ESS_EXT- checks-from-ipw2200.c.txt 3037-Fixes-missed-beacon-logic-in-relation-to-on-network-AP-roaming.txt 3038-Removed-warning-about-TKIP-not-being-configured-if-countermeasures-are.txt 3039-Added-channel-support-for-ipw2200-cards-identified-as-ZZR.txt 3040-Fixed-problem-with-not-being-able-to-send-broadcast-packets.txt 3041-Fixed-parameter-reordering-in-firmware-log-routine.txt 3042-Updated-firmware-version-stamp-to-2.4-from-2.3-so-it-will-use-the-latest-firmware.txt 3043-Update-version-ipw2200-stamp-to-1.0.8.txt 3081-fix-NET_RADIO-n-IEEE80211-y-compile.txt 3083-kill-include-linux-eeprom.h.txt 3084-drivers-net-s2io.c-make-functions-static.txt 3085-prism54-Unused-variable-extraneous-udelay.txt 3086-prism54-Transmit-stats-updated-in-wrong-place.txt 3087-Fix-sparse-warning-in-e100-driver.txt 3088-atmel-memset-correct-range.txt 3117-IPV6-Put-addr_diff-into-common-header-for-future-use.txt 3118-IPV6-Make-ipv6_addr_type-more-generic-so-that-we-can-use-it-for-source-address-selection.txt ! 3119-IPV6-RFC3484-compliant-source-address-selection.txt 3121-PKT_SCHED-Correctly-handle-empty-ematch-trees.txt 3122-NET-sk_add_backlog-convert-from-macro-to-inline.txt 3124-PPP-handle-misaligned-accesses.txt 3125-PPP-add-PPP-MPPE-encryption-module.txt 3126-IRDA-donauboe-locking-fix.txt 3127-NET-kfree-cleanup.txt 3128-IPV4-Fix-ip_queue_xmit-identity-increment-for-TSO-packets.txt 3131-Bluetooth-Add-endian-annotations-to-the-core.txt 3132-Bluetooth-Remove-the-usage-of-proc-completely.txt 3155-SERIAL-IOC3-Update-8250-driver-bits.txt 3160-skge-clear-PCI-PHY-COMA-mode-on-boot.txt 3161-skge-use-kzalloc.txt 3162-skge-add-mii-ioctl-support.txt 3163-skge-goto-low-power-mode-on-shutdown.txt 3164-skge-use-prefetch-on-receive.txt 3165-skge-spelling-fixes.txt 3166-skge-increase-version-number.txt 3168-wireless-ipw2100-kill-unused-var-warnings-for-debug-disabled-code.txt 3169-ieee80211-cleanup-crypto-list-handling-other-minor-cleanups.txt 3170-b44-replace-B44_FLAG_INIT_COMPLETE-with-netif! _running.txt 3171-b44-race-on-device-closing.txt 3172-b44-inc! rease-ve rsion-number.txt 3178-dgrs-fix-warnings-when-CONFIG_ISA-and-CONFIG_PCI-are-not-enabled.txt 3179-IOC-And-don-t-mark-the-things-as-broken-Cowboy.txt 3231-sanitize-lookup_hash-prototype.txt 3530-NETFILTER-packet-counter-of-conntrack-is-32bits.txt 3534-NETFILTER-ctnetlink-add-marking-support-from-userspace.txt 3535-NETFILTER-ctnetlink-add-module-alias-to-fix-autoloading.txt 3536-NETFILTER-ctnetlink-kill-unused-includes.txt 3537-NETFILTER-ctnetlink-get_conntrack-can-use-GFP_KERNEL.txt 3539-NETFILTER-nfnetlink-only-load-subsystems-if-CAP_NET_ADMIN-is-set.txt 3540-NETFILTER-stop-tracking-ICMP-error-at-early-point.txt 3542-NETFILTER-ctnetlink-propagate-error-instaed-of-returning-EPERM.txt 3543-NETFILTER-ctnetlink-Add-support-to-identify-expectations-by-ID-s.txt 3545-NETFILTER-ctnetlink-ICMP_ID-is-u_int16_t-not-u_int8_t.txt 3546-IPV6-Fix-fallout-from-CONFIG_IPV6_PRIVACY.txt 3547-IPV6-ip6ip6_lock-is-not-unlocked-in-error-path.txt 3566-txt 3596-NETFILTER-Add-nf_conntrack-subsystem.txt ! 3599-NETLINK-Type-safe-netlink-messages-attributes-interface.txt 3600-NETLINK-Make-netlink_callback-done-optional.txt 3601-NETLINK-Generic-netlink-receive-queue-processor.txt 3602-XFRM-Use-generic-netlink-receive-queue-processor.txt 3603-RTNETLINK-Use-generic-netlink-receive-queue-processor.txt 3604-NETLINK-Generic-netlink-family.txt 3615-SUNRPC-don-t-reencode-when-looping-in-call-transmit.txt 3627-netdrvr-8139too-fast-poll-for-thread-if-an-unlikely-race-occurs.txt 3660-BNX2-output-driver-name-as-prefix-in-error-message.txt 3661-BNX2-check-return-of-dev_alloc_skb-in-bnx2_test_loopback.txt 3662-BNX2-simplify-parameter-checks-in-bnx2_-get-set-_eeprom.txt 3663-NET-Detect-hardware-rx-checksum-faults-correctly.txt 3689-TCP-fix-congestion-window-update-when-using-TSO-deferal.txt 3690-TCP-simplify-microsecond-rtt-sampling.txt 3691-TCP-add-tcp_slow_start-helper.txt 3692-TCP-Appropriate-Byte-Count-support.txt 3693-TCP-receive-buffer-growth-limiting-with-mixed-MTU.txt 3694-TCP-spellin! g-fixes.txt 3695-TCP-speed-up-SACK-processing.txt 3701-disabl! e-DEBUG- in-ibmveth.txt 3703-sky2-needs-dma_mapping.h.txt 3728-gianfar-mii-needs-to-zero-out-the-mii_bus-structure.txt 3729-netdrvr-forcedeth-remove-superfluous-rx-engine-stop-start.txt 3730-netdrvr-forcedeth-support-for-irq-mitigation.txt 3731-netdrvr-forcedeth-phy-address-scan-range.txt 3732-SAA9730-Whitespace-cleanup.txt 3733-SAA9730-Driver-overhaul.txt 3734-smc91x-DB1200-support.txt 3735-gt96100eth.c-Don-t-concatenate-__FUNCTION__-with-strings.txt 3737-TCP-fix-vegas-build.txt 3742-DECNET-fix-SIGPIPE.txt 3752-IPV6-Fix-inet6_init-missing-unregister.txt 3754-SCTP-Fix-potential-NULL-pointer-dereference-in-sctp_v4_get_saddr.txt 3755-SCTP-Remove-timeouts-array-from-sctp_endpoint.txt 3756-SCTP-Fix-ia64-NaT-consumption-fault-with-sctp_sideffect-commands.txt 3757-SCTP-Include-ulpevents-in-socket-receive-buffer-accounting.txt 3789-IPV6-Fix-unnecessary-GFP_ATOMIC-allocation-in-fib6-dump.txt 3792-ARM-Use-correct-IO-operations-for-Pleb.txt 3815-net-allow-newline-terminated-IP-addresses-in-in_! aton.txt 3816-net-make-dev_valid_name-public.txt 3817-bonding-add-bond-name-to-all-error-messages.txt 3818-bonding-expand-module-param-descriptions.txt 3819-bonding-Add-transmit-policy-to-proc.txt 3820-bonding-get-slave-name-from-actual-slave-instead-of-param-list.txt 3821-bonding-move-kmalloc-out-of-spinlock-in-ALB-init.txt 3822-bonding-explicitly-clear-RLB-flag-during-ALB-init.txt 3823-bonding-expose-some-structs.txt 3824-bonding-make-functions-not-static.txt 3825-bonding-move-bond-creation-into-separate-function.txt 3826-bonding-make-bond_init-not-__init.txt 3827-bonding-Allow-ARP-target-table-to-have-empty-entries.txt 3828-bonding-add-ARP-entries-to-proc.txt 3829-bonding-add-sysfs-functionality-to-bonding-large.txt 3830-bonding-version-update.txt 3831-bonding-spelling-and-whitespace-corrections.txt 3832-bonding-comments-and-changelog.txt 3860-ppc-add-support-for-new-powerbooks.txt 3959-NETFILTER-nf_conntrack-Add-missing-code-to-TCP-conntrack-module.txt 3960-NETFILTER-nfn! etlink-unconditionally-require-CAP_NET_ADMIN.txt 3961-NETFILT! ER-link- netfilter-before-ipv4.txt 3962-NETFILTER-cleanup-IPv6-Netfilter-Kconfig.txt 3963-NETFILTER-fix-type-of-sysctl-variables-in-nf_conntrack_ipv6.txt 3964-NETFILTER-nf_conntrack-fix-possibility-of-infinite-loop-while-evicting-nf_ct_frag6_queue.txt 3965-NETFILTER-fix-leak-of-fragment-queue-at-unloading-nf_conntrack_ipv6.txt 4016-IPV6-small-fix-for-ipv6_dev_get_saddr-..txt 4017-IPV6-Fixes-sparse-warning-in-ipv6-ipv6_sockglue.c.txt 4018-LLC-Fix-TX-window-scaling.txt 4019-LLC-Make-core-block-on-remote-busy.txt 4020-LLC-Fix-typo.txt 4028-knfsd-make-sure-nfsd-doesn-t-hog-a-cpu-forever.txt 4032-sdladrv.c-build-fix.txt 4041-TCP-More-spelling-fixes.txt 4045-NETFILTER-Remove-nf_conntrack-stat-proc-file-when-cleaning-up.txt 4046-NETFILTER-Free-layer-3-specific-protocol-tables-at-cleanup.txt 4079-drivers-net-sk98lin-skge.c-make-SkPciWriteCfgDWord-a-static-inline.txt 4080-skge-fix-warning-from-inlining-SkPciWriteCfgDWord.txt 4085-IPV4-IPV6-replace-handmade-list-with-hlist-in-IPv-4-6-reassembl! y.txt 4087-r8169-fix-printk_ratelimit-in-the-interrupt-handler.txt 4088-r8169-do-not-abort-when-the-power-management-capabilities-are-disabled.txt 4094-NETFILTER-Fix-nf_conntrack-compilation-with-CONFIG_NETFILTER_DEBUG.txt 4127-ipw2200-disallow-direct-scanning-when-device-is-down.txt 4128-ipw2200-fix-error-log-offset-calculation.txt 4179-TCP-TCP-highspeed-build-error.txt 4183-LLC-Fix-compiler-warnings-introduced-by-TX-window-scaling-changes.txt 4184-NET-Sanitize-NET_SCHED-protection-in-net-sched-Kconfig.txt 4185-IPV6-Fib-dump-really-needs-GFP_ATOMIC.txt 4220-smc91x-fix-one-source-of-spurious-interrupts.txt 4221-smc91x-fix-bank-mismatch.txt 4226-e100-re-enable-microcode-with-more-useful-defaults.txt 4227-s2io-UFO-support.txt 4228-i82593.h-make-header-comment-GPL-compatible.txt 4229-IOC3-Replace-obsolete-PCI-API.txt 4230-au1000_eth-Include-linux-config.h.txt 4231-SAA9730-Add-missing-header-bits.txt 4232-prism54-Remove-extraneous-udelay-register-read.txt 4233-drivers-net-wirele! ss-hermes.c-unsigned-int-comparision.txt 4234-Gianfar-update-! and-sysf s-support.txt 4235-intel-ixp2000-network-driver.txt 4236-git-netdev-all-ieee80211_get_payload-warning-fix.txt 4240-fec_8xx-make-CONFIG_FEC_8XX-depend-on-CONFIG_8xx.txt 4241-ipw2100-Fix-Driver-using-old-proc-net-wireless.-message.txt 4242-e1000-avoid-leak-when-e1000_setup_loopback_test-fails.txt 4243-e1000-zero-out-pointers-in-e1000_free_desc_rings.txt 4246-wireless-hermes-build-fix.txt 4322-PKT_SCHED-sch_netem-correctly-order-packets-to-be-sent-simultaneously.txt 4324-NET-Reject-socket-filter-if-division-by-constant-zero-is-attempted.txt 4326-IPV6-Acquire-addrconf_hash_lock-for-read-in-addrconf_verify-..txt 4330-FIB_TRIE-Don-t-show-local-table-in-proc-net-route-output.txt 4331-NETFILTER-fixed-dependencies-between-modules-related-with-ip_conntrack.txt 4333-DCCP-Add-missing-no_policy-flag-to-struct-net_protocol.txt 4353-net-Fix-compiler-error-on-dgrs.c-when-CONFIG_PCI.txt 4393-NETLINK-Use-tgid-instead-of-pid-for-nlmsg_pid.txt 4394-IPV4-Fix-secondary-IP-addresses-after-promotio! n.txt 4395-NETFILTER-ctnetlink-Fix-refcount-leak-ip_conntrack-nat_proto.txt 4419-NETFILTER-ip_conntrack_netlink.c-needs-linux-interrupt.h.txt 4461-SUNRPC-Funny-looking-code-in-__rpc_purge_upcall.txt 4471-bonding-Remove-superfluous-changelog.txt 4510-IPV6-Implement-appropriate-dummy-rule-4-in-ipv6_dev_get_saddr.txt 4541-IPV4-tcp-route-Another-look-at-hash-table-sizes.txt 4542-ATM-always-return-the-first-interface-for-ATM_ITF_ANY.txt 4543-ATM-atm_pcr_goal-doesn-t-modify-its-argument-s-contents-mark-it-as-const.txt 4547-ATM-attempt-to-autoload-atm-drivers.txt 4550-ATM-avoid-race-conditions-related-to-atm_devs-list.txt 4551-ATM-deregistration-removes-device-from-atm_devs-list-immediately.txt 4553-NET-Add-const-markers-to-various-variables.txt 4554-IPV4-make-two-functions-static.txt 4555-NETFILTER-ipv4-small-cleanups.txt 4556-IPV6-make-two-functions-static.txt 4589-b44-missing-netif_wake_queue-in-b44_open.txt 4590-b44-early-return-in-dev-do_ioctl-when-the-device-is-not-up.txt 459! 2-b44-increase-version-number.txt 4601-e1000-fix-for-dhcp-iss! ue.txt 4 602-sky2-eliminate-special-case-for-EC-A1.txt 4603-sky2-add-MII-support.txt 4604-sky2-fix-receive-flush-pause-issues.txt 4605-sky2-improve-receive-performance.txt 4606-sky2-add-Yukon-EC-ultra-support.txt 4607-sky2-handle-DMA-boundary-crossing.txt 4608-sky2-change-netif_rx_schedule_test-to-__netif_schedule_prep.txt 4609-sky2-race-with-MTU-change.txt 4610-sky2-dual-port-tx-completion.txt 4611-sky2-byteorder-annotation.txt 4612-sky2-remove-pci-express-hacks.txt 4613-sky2-use-pci_register_driver.txt 4614-sky2-update-version-number.txt 4616-sk98lin-add-permanent-address-support.txt 4617-sk98lin-avoid-message-confusion-with-skge.txt 4619-sk98lin-remove-redundant-fields-in-device-info.txt 4621-ibm_emac-fix-graceful-stop-timeout-handling.txt 4622-ixp2000-register-netdevices-last.txt 4623-pm3386-zero-stats-properly.txt 4624-pm3386-remove-unnecessary-udelays.txt 4625-caleb-pm3386-include-proper-header-files.txt 4626-ixp2000-use-netif_rx_schedule_test.txt 4627-enp2611-don-t-check-netif! _running-in-link-status-timer.txt 4628-enp2611-use-dev-in-link-status-timer.txt 4629-enp2611-report-link-up-down-events.txt 4630-ixp2000-report-MAC-addresses-for-each-port-on-init.txt 4631-pm3386-add-hook-for-setting-MAC-address.txt 4632-pm3386-add-hook-for-setting-carrier.txt 4633-pm3386-implement-reset.txt 4634-enp2611-disable-enable-SERDES-carrier-on-interface-down-up.txt 4635-ixp2000-add-netpoll-support.txt 4636-ixp2000-add-driver-version-bump-version-to-0.2.txt 4637-mipsnet-Fix-Copyright-notice.txt 4638-jazzsonic-Fix-build-error.txt 4639-jazzsonic-Fix-platform-device-code.txt 4640-orinoco-fix-setting-power-management-parameters.txt 4641-skge-handle-VLAN-checksum-correctly-on-yukon-rev-0.txt 4643-wireless-airo-reset-card-in-init.txt 4644-netdrvr-fmvj18x_cs-fix-multicast-bug.txt 4645-airo.c-add-support-for-IW_ENCODE_TEMP-i.e.-xsupplicant.txt 4649-netdrvr-skge-fix-typo-fix-build.txt 4650-ipw2200-kzalloc-conversion-and-Kconfig-dependency-fix.txt 4651-Duplicate-IPW_DEBUG-opt! ion-for-ipw2100-and-2200.txt 4680-NETFILTER-Ignore-ACKs-ACKs-! on-half- open-connections-in-TCP-conntrack.txt 4681-NETFILTER-Fix-recent-match-jiffies-wrap-mismatches.txt 4729-SCTP-Return-socket-errors-only-if-the-receive-queue-is-empty.txt 4730-SCTP-Fix-getsockname-for-sctp-when-an-ipv6-socket-accepts-a-connection-from.txt 4731-IGMP-workaround-for-IGMP-v1-v2-bug.txt 4732-IPV4-Fix-EPROTONOSUPPORT-error-in-inet_create.txt 4733-IPV6-Load-protocol-module-dynamically.txt 4737-SUNRPC-Fix-Oopsable-condition-in-rpc_pipefs.txt 4741-ixp2000-change-netif_schedule_test-to-__netif_schedule_prep.txt 4742-sky2-interrupt-not-cleared.txt 4760-NETFILTER-Fix-incorrect-argument-to-ip_nat_initialized-in-ctnetlink.txt 4761-NETFILTER-nf_conntrack-Fix-missing-check-for-ICMPv6-type.txt 4762-NETFILTER-nfnetlink-Fix-calculation-of-minimum-message-length.txt 4763-NETFILTER-Fix-ip_conntrack_flush-abuse-in-ctnetlink.txt 4765-NETFILTER-Mark-ctnetlink-as-EXPERIMENTAL.txt 4766-NETFILTER-Wait-for-untracked-references-in-nf_conntrack-module-unload.txt 4768-NETFILTER-Don-t-use-con! ntrack-entry-after-dropping-the-reference.txt 4769-NET-make-function-pointer-argument-parseable-by-kernel-doc.txt 4770-DECNET-add-memory-buffer-settings.txt 4783-TCP-Vegas-stop-resetting-rtt-every-ack.txt 4784-TCP-Vegas-Remove-extra-call-to-tcp_vegas_rtt_calc.txt 4785-TCP-Vegas-timestamp-before-clone.txt 4787-TG3-remove-warning-on-race.txt 4801-NET-Fix-NULL-pointer-deref-in-checksum-debugging.txt 4807-IPv6-IPsec-fix-pmtu-calculation-of-esp.txt 4855-sky2-don-t-die-if-we-see-chip-rev-0xb5.txt 4856-sky2-device-structure-alignment.txt 4857-sky2-copy-threshold-as-module-parameter.txt 4858-sky2-ethtool-get-set-interrupt-coalescing.txt 4859-sky2-phy-processing-in-workqueue-rather-than-tasklet.txt 4860-sky2-no-irq-disable-needed-during-tx.txt 4861-sky2-ring-distance-optimization.txt 4862-sky2-map-length-optimization.txt 4863-sky2-tx-rx-ring-data-structure-split.txt 4864-sky2-transmit-logic-fixes.txt 4865-sky2-transmit-complete-index-optimization.txt 4866-sky2-transmit-complete-routi! ne-optimization.txt 4867-sky2-interrupt-poll-optimization.txt! 4868-sk y2-interrupt-coalescing-tuning.txt 4869-sky2-handle-tx-timeout.txt 4870-sky2-quiet-ring-full-message-in-case-of-race.txt 4871-sky2-prefetch-tuning.txt 4872-sky2-turn-on-tx-flow-control.txt 4873-sky2-disable-rx-checksum-on-Yukon-XL.txt 4874-sky2-version-0.10.txt 4875-pcnet32-use-MAC-address-from-prom-also-on-powerpc.txt 4878-TCPv6-Fix-skb-leak.txt 4883-NETFILTER-ip_nat_tftp-Fix-expectation-NAT.txt 4892-skge-get-rid-of-warning-on-race.txt 4893-ieee80211_crypt_tkip-depends-on-NET_RADIO.txt 4895-e1000-Fixes-for-8357x.txt 4921-netdrvr-skge-fix-build.txt 4975-TG3-Fix-nvram-arbitration-bugs.txt 4976-TG3-Fix-suspend-and-resume.txt 4977-TG3-Fix-5704-single-port-mode.txt 4978-TG3-Fix-low-power-state.txt 4984-IPV6-addrconf-Do-not-print-device-pointer-in-privacy-log-message.txt 4985-PKT_SCHED-Disable-debug-tracing-logs-by-default-in-packet-action-API.txt 5023-s2io-__iomem-annotations-for-recent-changes.txt 5035-Address-of-void-__user-is-void-__user-not-void-__user.txt 5101-XFRM-Handle-D! CCP-in-xfrm-4-6-_decode_session.txt 5104-SCTP-Fix-sctp-to-not-return-erroneous-POLLOUT-events.txt 5106-TG3-Fix-peer-device-handling.txt 5107-TG3-Some-low-power-fixes.txt 5108-TG3-Add-tw32_wait_f-for-some-sensitive-registers.txt 5109-TG3-Fix-ethtool-memory-test.txt 5112-RPC-Do-not-block-on-skb-allocation.txt 5114-SUNRPC-Fix-EPIPE-error-on-mount-of-rpcsec_gss-protected-partitions.txt 5131-IPV6-Flag-RTF_ANYCAST-for-anycast-routes.txt 5132-IPV6-Try-not-to-send-icmp-to-anycast-address.txt 5133-IPV6-Defer-IPv6-device-initialization-until-the-link-becomes-ready.txt 5134-IPV6-Run-DAD-when-the-link-becomes-ready.txt 5135-IPV6-Don-t-select-a-tentative-address-as-a-source-address.txt 5140-NETROM-Fix-three-if-statements-in-nr_state1_machine.txt 5141-VLAN-Add-two-missing-checks-to-vlan_ioctl_handler.txt 5142-IPV6-Fix-address-deletion.txt 5143-DCCP-Comment-typo.txt 5147-IPSEC-Fix-policy-updates-missed-by-sockets.txt 5153-SUNGEM-Fix-link-error-with-CONFIG_HOTPLUG-disabled.txt 5156-IPV6-Fix! -dead-lock.txt 5157-IPV6-Fix-Temporary-Address-Generation.txt! 5158-ch elsio-transmit-routine-return-values.txt 5159-skge-avoid-up-down-on-speed-changes.txt 5160-skge-avoid-up-down-on-pause-param-changes.txt 5161-skge-handle-out-of-memory-on-MTU-size-changes.txt 5162-skge-get-rid-of-Yukon2-defines.txt 5163-skge-handle-out-of-memory-on-ring-parameter-change.txt 5164-skge-version-number-1.3.txt 5165-git-netdev-all-s2io-warning-fix.txt 5166-spidernet-fix-Kconfig-after-BPA-CELL-rename.txt 5167-skge-error-handling-on-resume.txt 5168-sky2-handle-out-of-memory-on-admin-changes.txt 5169-sky2-don-t-lose-multicast-addresses.txt 5170-sky2-handle-hardware-packet-overrun.txt 5171-sky2-version-0.11.txt 5173-orinoco_nortel-Fix-incorrect-PCI-resource-use.txt 5174-orinoco_nortel-Add-Symbol-LA-4123-ID.txt 5175-missing-license-for-libphy.ko.txt 5179-forcedeth-fix-random-memory-scribbling-bug.txt 5198-IPV6-Increase-default-MLD_MAX_MSF-to-64.txt 5199-BR_NETFILTER-Fix-leak-if-skb-traverses-1-bridge.txt 5201-IPV6-Fix-addrconf-dead-lock.txt 5202-NET-Validate-socket-fi! lters-against-BPF_MAXINSNS-in-one-spot.txt 5203-IPV6-mcast-Fix-multiple-issues-in-MLDv2-reports.txt 5205-TG3-ethtool-d-hangs-PCIe-systems.txt 5206-TG3-Update-driver-version-and-reldate.txt 5518-s-retreiv-retriev-g.txt 5541-TCP-BIC-remove-low-utilization-code.txt 5542-TCP-BIC-spelling-and-whitespace.txt 5543-TCP-BIC-CUBIC-window-growth-2.0.txt 5544-NETFILTER-ip_tables-NUMA-aware-allocation.txt 5545-NETFILTER-ebtables-Support-nf_log-API-from-ebt_log-and-ebt_ulog.txt 5546-IPV4-Safer-reassembly.txt 5547-IPV6-Reuse-inet_csk_get_port-in-tcp_v6_get_port.txt 5548-IPV6-Generalise-__tcp_v6_hash-renaming-it-to-__inet6_hash.txt 5549-ICSK-make-inet_csk_reqsk_queue_hash_add-timeout-arg-unsigned-long.txt 5550-IPV6-Generalise-tcp_v6_search_req-tcp_v6_synq_add.txt 5551-IPV6-Introduce-inet6_rsk.txt 5552-ICSK-Rename-struct-tcp_func-to-struct-inet_connection_sock_af_ops.txt 5553-ICSK-Move-v4_addr2sockaddr-from-TCP-to-icsk.txt 5554-DCCP-Introduce-dccp_ipv4_af_ops.txt 5555-IP-Simplify-and-consoli! date-MSG_PEEK-error-handling.txt 5556-UDP-udp_checksum_init-r! eturn-va lue.txt 5557-IPVS-remove-dead-code.txt 5558-NET-Avoid-atomic-xchg-for-non-error-case.txt 5559-AF_UNIX-Remove-superfluous-reference-counting-in-unix_stream_sendmsg.txt 5560-IPV6-Generalise-some-functions.txt 5561-IPV6-Introduce-inet6_timewait_sock.txt 5562-IPV6-Export-some-symbols-for-DCCPv6.txt 5563-DCCP-Just-rename-dccp_v4_prot-to-dccp_prot.txt 5564-DCCP-Prepare-the-AF-agnostic-core-for-the-introduction-of-DCCPv6.txt 5565-IPV6-Export-ipv6_opt_accepted.txt 5567-DCCP-Use-reqsk_free-in-dccp_v4_conn_request.txt 5571-TCP-Move-the-TCPF_-enum-to-tcp_states.h.txt 5573-AF_UNIX-Use-spinlock-for-unix_table_lock.txt 5574-BRIDGE-allow-setting-hardware-address-of-bridge-pseudo-dev.txt 5575-BRIDGE-handle-speed-detection-after-carrier-changes.txt 5576-BRIDGE-filter-packets-in-learning-state.txt 5577-BRIDGE-limited-ethtool-support.txt 5578-BRIDGE-add-version-number.txt 5579-PKT_SCHED-netem-packet-corruption-option.txt 5582-TCP-cubic-precompute-constants.txt 5583-TCP-cubic-use-Newton-Raphson! .txt 5584-IPV4-fib_trie-Add-credits.txt 5585-SCTP-Update-SCTP_PEER_ADDR_PARAMS-socket-option-to-the-latest-api-draft.txt 5586-SCTP-Add-support-for-SCTP_DELAYED_ACK_TIME-socket-option.txt 5587-NET-Small-cleanup-to-socket-initialization.txt 5588-NET-move-struct-proto_ops-to-const.txt 5589-PKTGEN-Deinitialise-static-variables.txt 5590-NET-Fix-sock_init-return-value.txt 5591-NET-restructure-sock_aio_-read-write-sock_-readv-writev.txt 5594-TCP-Don-t-use-__constant_htonl-for-a-non-const-arg.txt 5595-PPPOX-Fix-assignment-into-const-proto_ops.txt 5596-NET-Speed-up-__alloc_skb.txt 5597-AF_UNIX-Convert-to-use-a-spinlock-instead-of-rwlock.txt 5598-NETLINK-genetlink-fix-cmd-type-in-genl_ops-to-be-consistent-to-u8.txt 5599-NETROM-Remove-unessecary-lock_sock-calls-in-netrom_ioctl.txt 5600-NET-Add-a-dev_ioctl-fallback-to-sock_ioctl.txt 5601-TG3-fixup-tot_len-calculation.txt 5602-IPVS-Cleanup-IP_VS_DBG-statements.txt 5603-DECNET-Only-use-local-routers.txt 5604-DCCP-Do-not-process-a-packet-t! wice-when-it-s-not-in-state-DCCP_OPEN.txt 5605-DCCP-Send-an-A! CK-vecto r-when-ACKing-a-response-packet.txt 5606-DCCP-Notify-CCID-only-after-ACK-vectors-have-been-processed.txt 5607-BRIDGE-Fix-faulty-check-in-br_stp_recalculate_bridge_id.txt 5608-IPV4-fib_trie-build-fix.txt 5610-IEEE80211-ipw2200-Simplify-multicast-checks.txt 5611-TCP-less-inline-s.txt 5612-DCCP-ackvec-Fix-spelling-of-throw.txt 5613-DCCP-ackvec-use-u8-for-the-buf-offsets.txt 5614-TCP-syn_flood_warning-is-only-needed-if-CONFIG_SYN_COOKIES-is-selected.txt 5700-ECONET-Use-macro-for-spinlock_t-definition.txt 5701-IPV6-Use-macro-for-rwlock_t-initialization.txt 5702-NETFILTER-Use-macro-for-spinlock_t-rwlock_t-initializations-definition.txt 5703-NET-More-instruction-checks-fornet-core-filter.c.txt 5704-TCP-tcp_vegas-Fix-slow-start.txt 5730-IPVS-Fix-compilation.txt 5731-NETFILTER-Decrease-number-of-pointer-derefs-in-nfnetlink_queue.c.txt 5732-NETFILTER-Decrease-number-of-pointer-derefs-in-nf_conntrack_core.c.txt 5733-NETFILTER-ctnetlink-remove-bogus-checks-in-ICMP-protocol-at-dumping.tx! t 5734-NETFILTER-ctnetlink-Add-sanity-checkings-for-ICMP.txt 5735-NETFILTER-ctnetlink-propagate-ctnetlink_dump_tuples_proto-return-value-back.txt 5736-NETFILTER-ctnetlink-use-u_int32_t-instead-of-unsigned-int.txt 5737-NETFILTER-ctnetlink-ctnetlink_event-cleanup.txt 5738-NETFILTER-ctnetlink-fix-conntrack-mark-race.txt 5739-NETFILTER-ctnetlink-remove-unused-variable.txt 5740-NETFILTER-Add-ctnetlink-port-for-nf_conntrack.txt 5741-NETFILTER-Filter-dumped-entries-based-on-the-layer-3-protocol-number.txt 5742-NETFILTER-Fix-module_param-types-and-permissions.txt 5743-NETFILTER-ctnetlink-Fix-dumping-of-helper-name.txt 5744-NETFILTER-Remove-okfn-usage-in-ip_vs_core.c.txt 5745-NETFILTER-Call-POST_ROUTING-hook-before-fragmentation.txt 5746-NETFILTER-make-ipv6_find_hdr-find-transport-protocol-header.txt 5747-NETFILTER-Export-ip6_masked_addrcmp-don-t-pass-IPv6-addresses-on-stack.txt 5748-NETFILTER-nf_conntrack_l3proto_ipv4.c-needs-net-route.h.txt 5749-NETFILTER-Use-HOPLIMIT-metric-as-TTL! -of-TCP-reset-sent-by-REJECT.txt 5776-NET-Change-1500-to-ETH_! DATA_LEN -in-some-files.txt 5796-knfsd-fix-hash-function-for-IP-addresses-on-64bit-little-endian-machines.txt 6008-parport-include-fixes.txt 6015-Keep-nfsd-from-exiting-when-seeing-recv-errors.txt added hold last reject removed \1, not void 0036-sky2-new-experimental-Marvell-Yukon2-driver.txt 0072-8139cp-support-ETHTOOL_GPERMADDR.txt 0073-8139too-support-ETHTOOL_GPERMADDR.txt 0074-b44-support-ETHTOOL_GPERMADDR.txt 0075-e1000-support-ETHTOOL_GPERMADDR.txt 0076-e100-support-ETHTOOL_GPERMADDR.txt 0077-forcedeth-support-ETHTOOL_GPERMADDR.txt 0078-ixgb-support-ETHTOOL_GPERMADDR.txt 0079-ne2k-pci-support-ETHTOOL_GPERMADDR.txt 0080-pcnet32-support-ETHTOOL_GPERMADDR.txt 0081-r8169-support-ETHTOOL_GPERMADDR.txt 0082-skge-support-ETHTOOL_GPERMADDR.txt 0083-sundance-support-ETHTOOL_GPERMADDR.txt 0084-via-rhine-support-ETHTOOL_GPERMADDR.txt 0087-Replace-drivers-net-wan-custom-ctype-macros-with-standard-ones.txt 0088-drivers-net-wan-possible-cleanups.txt 0089-lne390-bogus-casts.txt 0090-C99-initi! alizers-in-ray_cs.c.txt 0091-mii-Add-test-for-GigE-support.txt 0092-Add-rapidio-net-driver.txt 0100-pcnet32-set_ringparam-implementation.txt 0101-pcnet32-set-min-ring-size-to-4.txt 0102-sky2-driver-update.txt 0103-orinoco-Remove-conditionals-that-are-useless-in-the-kernel-drivers.txt 0104-orinoco-Don-t-include-net-ieee80211.h-twice.txt 0105-orinoco-Update-PCMCIA-ID-s.txt 0106-Fixed-some-endian-issues-with-802.11-header-usage-in-ieee80211_rx.c.txt 0107-ieee80211-quality-scaling-algorithm-extension-handler.txt 0108-ieee80211-Added-wireless-spy-support.txt 0109-Changed-802.11-headers-to-use-ieee80211_info_element-0.txt 0110-ieee80211-Removed-ieee80211_info_element_hdr.txt 0111-ieee80211-Cleanup-memcpy-parameters.txt 0112-ieee80211-Switched-to-sscanf-in-store_debug_level.txt 0113-ieee80211-Fixed-type-o-of-abg_ture-abg_true.txt 0114-Updated-ipw2200-to-compile-with-ieee80211-abg_ture-to-abg_true-change.txt 0163-sky2-fix-FIFO-DMA-alignment-problems.txt 0164-sky2-allow-ethtool-debug! -access-to-all-of-PCI-space.txt 0165-sky2-version-0.5.txt 016! 6-ieee80 211-Updated-ipw2100-to-be-compatible-with-ieee80211_hdr-changes.txt 0167-ieee80211-Updated-ipw2100-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0168-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211_hdr-changes.txt 0169-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0170-ieee80211-Updated-atmel-to-be-compatible-with-ieee80211_hdr-changes.txt 0171-ieee80211-Fixed-a-kernel-oops-on-module-unload.txt 0172-ieee80211-Hardware-crypto-and-fragmentation-offload-support.txt 0173-ieee80211-Fix-time-calculation-switching-to-use-jiffies_to_msecs.txt 0174-ieee80211-Fix-kernel-Oops-when-module-unload.txt 0175-ieee80211-Allow-drivers-to-fix-an-issue-when-using-wpa_supplicant-with-WEP.txt 0176-ieee82011-Added-WE-18-support-to-default-wireless-extension-handler.txt 0177-ieee80211-Renamed-ieee80211_hdr-to-ieee80211_hdr_3addr.txt 0178-ieee80211-adds-support-for-the-creation-of-RTS-packets.txt 0179-ieee82011-Added-ieee80211_tx_frame! -to-convert-generic-802.11-data-frames-and-callbacks.txt 0180-ieee80211-Fix-TKIP-repeated-fragmentation-problem-and-payload_size-reporting.txt 0181-ieee80211-Return-NETDEV_TX_BUSY-when-QoS-buffer-full.txt 0182-ieee80211-Add-QoS-WME-support-to-the-ieee80211-subsystem.txt 0183-ieee80211-Added-ieee80211_geo-to-provide-helper-functions.txt 0184-ieee80211-Added-ieee80211_radiotap.h.txt 0185-ieee80211-Additional-fixes-for-endian-aware-types.txt 0186-ieee80211-extern-inline-to-static-inline.txt 0187-ieee80211-Type-o-capbility-definition-for-QoS-and-ERP-parsing.txt 0188-ieee80211-Mixed-PTK-GTK-CCMP-TKIP-support.txt 0189-ieee80211-Keep-auth-mode-unchanged-after-iwconfig-key-off-on-cycle.txt 0190-ieee80211-Updated-copyright-dates.txt 0191-ieee80211-Updated-hostap-to-be-compatible-with-ieee80211_hdr-changes.txt 0192-ieee80211-Updated-hostap-to-be-compatible-with-extra_prefix_len-changes.txt 0193-ieee82011-Remove-WIRELESS_EXT-ifdefs.txt 0194-forcedeth-add-hardware-tx-checksumming.txt 01! 99-ieee80211-Added-subsystem-version-string-and-reporting-via! -MODULE_ VERSION.txt 0200-ieee80211-Added-handle_deauth-callback-enhanced-tkip-ccmp-support-of-varying-hw-sw-offload.txt 0201-ieee80211-added-IE-comments-reason_code-to-reason-removed-info_element-from-ieee80211_disassoc.txt 0202-ieee80211-in-tree-driver-updates-to-sync-with-latest-ieee80211-series.txt 0203-ieee80211-update-orinoco-wl3501-drivers-for-latest-struct-naming.txt 0216-orinoco-Remove-inneeded-system-includes.txt 0217-orinoco-Make-nortel_pci_hw_init-static.txt 0218-orinoco-Fix-memory-leak-and-unneeded-unlock-in-orinoco_join_ap.txt 0219-orinoco-orinoco_send_wevents-could-return-without-unlocking.txt 0220-orinoco-Remove-unneeded-forward-declarations.txt 0221-orinoco-Annotate-endianess-of-variables-and-structure-members.txt 0222-orinoco-Read-only-needed-data-in-__orinoco_ev_txexc.txt 0223-orinoco-Bump-version-to-0.15rc3.txt 0227-RPC-Report-connection-errors-properly-when-mounting-with-soft.txt 0228-RPC-proper-soft-timeout-behavior-for-rpcbind.txt 0229-NFS-use-a-constant-value-! for-TCP-retransmit-timeouts.txt 0230-RPC-portmapper-doesn-t-need-a-reserved-port.txt 0231-RPC-extract-socket-logic-common-to-both-client-and-server.txt 0232-RPC-introduce-client-side-transport-switch.txt 0233-RPC-transport-switch-function-naming.txt 0234-RPC-Reduce-stack-utilization-in-xs_sendpages.txt 0235-RPC-Rename-sock_lock.txt 0236-RPC-Rename-xprt_lock.txt 0237-RPC-rename-the-sockstate-field.txt 0238-RPC-Eliminate-socket.h-includes-in-RPC-client.txt 0239-RPC-Add-helper-for-waking-tasks-pending-on-a-transport.txt 0240-RPC-client-side-transport-switch-cleanup.txt 0241-RPC-separate-TCP-and-UDP-write-space-callbacks.txt 0242-RPC-separate-TCP-and-UDP-transport-connection-logic.txt 0243-RPC-separate-TCP-and-UDP-socket-write-paths.txt 0244-RPC-skip-over-transport-specific-heads-automatically.txt 0245-RPC-get-rid-of-xprt-stream.txt 0246-RPC-add-API-to-set-transport-specific-timeouts.txt 0247-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0248-RPC-expose-API-for-ser! ializing-access-to-RPC-transports.txt 0249-RPC-separate-xprt_! timer-im plementations.txt 0250-RPC-add-generic-interface-for-adjusting-the-congestion-window.txt 0251-RPC-add-a-release_rqst-callout-to-the-RPC-transport-switch.txt 0252-RPC-remove-xprt-nocong.txt 0253-RPC-clean-up-after-nocong-was-removed.txt 0254-RPC-allow-RPC-client-s-port-range-to-be-adjustable.txt 0255-RPC-make-sure-to-get-the-same-local-port-number-when-reconnecting.txt 0256-RPC-parametrize-various-transport-connect-timeouts.txt 0257-RPC-rationalize-set_buffer_size.txt 0258-RPC-NFS-new-rpc_pipefs-patch.txt 0260-Revert-PATCH-RPC-NFS-new-rpc_pipefs-patch.txt 0262-SUNRPC-fix-bug-in-patch-portmapper-doesn-t-need-a-reserved-port.txt 0266-netdrvr-gianfar-use-new-phy-layer.txt 0267-netdrvr-delete-CONFIG_PHYCONTROL.txt 0268-hostap-Fix-pci_driver-name-for-hostap_plx-and-hostap_pci.txt 0269-hostap-Add-support-for-WE-19.txt 0270-hostap-Use-GFP_ATOMIC-to-get-rid-of-weird-might_sleep-issue.txt 0271-hostap-Remove-iwe_stream_add_event-kludge.txt 0272-Remove-WIRELESS_EXT-ifdefs-from-several-w! ireless-drivers.txt 0273-wireless-airo-remove-needed-dma_addr_t-obfuscation.txt 0312-sky2-changing-mtu-doesn-t-have-to-reset-link.txt 0313-sky2-cleanup-interrupt-processing.txt 0314-sky2-add-hardware-VLAN-acceleration-support.txt 0315-sky2-explicit-set-power-state.txt 0316-sky2-version-0.6.txt 0317-sky2-nway-reset-BONUS-FEATURE.txt 0323-This-patch-fixes-a-typo-in-ieee80211.h-ieee82011_deauth-ieee80211_deauth.txt 0346-This-will-move-the-ieee80211_is_ofdm_rate-function-to-the-ieee80211.h.txt 0348-Currently-the-info_element-is-parsed-by-2-seperate-functions-this.txt 0349-When-an-assoc_resp-is-received-the-network-structure-is-not-completely.txt 0350-Lindent-and-trailing-whitespace-script-executed-ieee80211-subsystem.txt 0356-hostap-Remove-hw-specific-dev_open-close-handlers.txt 0357-hostap-Fix-hostap_pci-build-with-PRISM2_IO_DEBUG.txt 0358-hostap-Do-not-free-local-hw_priv-before-unregistering-netdev.txt 0359-hostap-Unregister-netdevs-before-freeing-local-data.txt 0366-S2io-MSI-! MSI-X-support-runtime-configurable.txt 0367-e1000-Support-for! -82571-a nd-82572-controllers.txt 0368-e1000-multi-queue-defines-modification-to-data-structures.txt 0369-e1000-implementation-of-the-multi-queue-feature.txt 0370-e1000-Enable-custom-configuration-bits-for-82571-2-controllers.txt 0371-e1000-Fixes-for-packet-split-related-issues.txt 0372-e1000-Added-msleep_interruptible-delay.txt 0373-e1000-Flush-shadow-RAM.txt 0374-e1000-fix-warnings.txt 0375-AX.25-Delete-debug-printk-from-mkiss-driver.txt 0376-AX.25-Convert-mkiss.c-to-DEFINE_RWLOCK.txt 0377-airo-fix-resume.txt 0378-s2io-change-strncpy-length-arg-to-use-size-of-target.txt 0379-netdrvr-s2io-Add-a-MODULE_VERSION-entry.txt 0380-bonding-replicate-IGMP-traffic-in-activebackup-mode.txt 0381-sky2-add-permanent-address-support.txt 0383-wireless-ipw2200-remove-redundant-return-statement.txt 0546-S2io-Offline-diagnostics-fixes.txt 0547-rcu-in-bpqether-driver.txt 0548-SMACK-support-for-mkiss.txt 0549-Initialize-the-.owner-field-the-tty_ldisc-structure.txt 0555-SUNRPC-Retry-rpcbind-requests-if-t! he-server-s-portmapper-isn-t-up.txt 0556-RPC-allow-call_encode-to-delay-transmission-of-an-RPC-call.txt 0575-ieee80211-division-by-zero-fix.txt 0577-sb1250-mac-Check-the-actual-setting-for-reporting-hw-checksumming.txt 0578-sb1250-mac-Ensure-16-byte-alignment-of-the-descriptor-ring.txt 0579-au1000_eth-Misc-Au1000-net-driver-fixes.txt 0580-de2104x-Resurrect-Cobalt-support-for-2.6.txt 0581-sgiseeq-Fix-resource-handling.txt 0582-sgiseeq-Configure-PIO-and-DMA-timing-requests.txt 0583-declance-Convert-to-irqreturn_t.txt 0584-declance-Fix-mapping-of-device.txt 0585-declance-Deal-with-the-bloody-KSEG-vs-CKSEG-horror.txt 0586-declance-Use-physical-addresses-at-the-interface-level.txt 0587-ne-Support-for-RBHMA4500-eval-board.txt 0588-mipsnet-Virtual-ethernet-driver-for-MIPSsim.txt 0589-e1000_intr-build-fix.txt 0590-s2io-build-fix.txt 0592-via-rhine-change-mdelay-to-msleep-and-remove-from-ISR-path.txt 0593-epic100-fix-counting-of-work_done-in-epic_poll.txt 0596-bonding-cleanup-comment! -for-mode-1-IGMP-xmit-hack.txt 0597-b44-alternate-allocation-! option-f or-DMA-descriptors.txt 0598-orinoco-remove-redundance-skb-length-check-before-padding.txt 0599-sundance-remove-if-1-.-block-in-sundance_probe1.txt 0600-sundance-expand-reset-mask.txt 0601-e1000-build-fix.txt 0603-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0606-SUNRPC-Add-support-for-privacy-to-generic-gss-api-code.txt 0607-SUNRPC-Provide-a-callback-to-allow-free-pages-allocated-during-xdr-encoding.txt 0608-SUNRPC-Retry-wrap-in-case-of-memory-allocation-failure.txt 0609-RPCSEC_GSS-cleanup-au_rslack-calculation.txt 0610-RPCSEC_GSS-client-side-privacy-support.txt 0611-RPCSEC_GSS-Simplify-rpcsec_gss-crypto-code.txt 0612-RPCSEC_GSS-krb5-pre-privacy-cleanup.txt 0613-RPCSEC_GSS-Add-support-for-privacy-to-krb5-rpcsec_gss-mechanism.txt 0614-RPCSEC_GSS-remove-all-qop-parameters.txt 0615-RPCSEC_GSS-krb5-cleanup.txt 0622-Fixed-problem-with-not-being-able-to-decrypt-encrypt-broadcast-packets.txt 0631-sb1250-mac-Get-rid-of-all-the-funny-SBMAC_WRITECSR-and-SBMAC_READCSR! -macros.txt 0632-sb1250-mac-Whitespace-cleanup.txt 0645-sundance-include-MII-address-0-in-PHY-probe.txt 0646-e1000-Driver-version-white-space-comments-device-id-other.txt 0647-Fixed-oops-if-an-uninitialized-key-is-used-for-encryption.txt 0652-sb1250-mac-PHY-probing-fixes.txt 0670-ieee80211-subsystem.txt 0671-Update-version-ieee80211-stamp-to-1.1.6.txt 0675-PARISC-Change-the-driver-names-so-sys-bus-parisc-drivers-looks-better.txt 0676-PARISC-Convert-parisc_device-to-use-struct-resource-for-hpa.txt 0714-PARISC-Add-NETPOLL-support-to-lasi_82596.txt 0771-DECNET-Remove-some-redundant-ifdeffed-code.txt 0772-NET-Wider-use-of-for_each_-cpu.txt 0773-PKTGEN-Sleeping-function-called-under-lock.txt 0774-PKTGEN-Use-kzalloc.txt 0775-PKTGEN-Spelling-and-white-space.txt 0776-PKTGEN-proc-interface-revision.txt 0777-NETFILTER-ip_conntrack-Make-hashsize-conntrack-parameter-writable.txt 0778-IPV4-Kill-redundant-rcu_dereference-on-fa_info.txt 0779-IPSEC-Kill-obsolete-get_mss-function.txt 0780-NE! TLINK-Remove-dead-code-in-af_netlink.c.txt 0781-IPV4-Remove-d! ead-code -from-ip_output.c.txt 0782-SK_BUFF-kernel-doc-fix-skbuff-warnings.txt 0783-AX.25-Use-constant-instead-of-magic-number.txt 0784-IPV4-Fix-setting-broadcast-for-SIOCSIFNETMASK.txt 0785-netdrvr-forcedeth-scatter-gather-and-segmentation-offload-support.txt 0786-ieee80211-build-fix.txt 0834-Revert-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0855-RPC-Ensure-that-nobody-can-queue-up-new-upcalls-after-rpc_close_pipes.txt 0931-gfp_t-net.txt 0952-gfp_t-drivers-net.txt 0957-ARM-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 0963-ARM-2897-2-PXA2xx-IRDA-support.txt 0971-sky2-remove-unused-definitions.txt 0972-sky2-use-kzalloc.txt 0973-sky2-spelling-fixes.txt 0974-sky2-fix-NAPI-and-receive-handling.txt 0975-sky2-version-0.7.txt 1029-DRIVER-MODEL-Get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.txt 1037-Bluetooth-Make-more-functions-static.txt 1038-Bluetooth-Update-security-filter-for-Extended-Inquiry-Response.txt 1043-IPv4-IPv6-UFO-Scat! ter-gather-approach.txt 1044-MCAST-IPv6-Fix-algorithm-to-compute-Querier-s-Query-Interval.txt 1055-tg3-add-5714-5715-support.txt 1056-tg3-fix-ASF-heartbeat.txt 1057-tg3-update-version-and-minor-fixes.txt 1058-ibmveth-fix-bonding.txt 1059-ibmveth-fix-buffer-pool-management.txt 1060-ibmveth-fix-buffer-replenishing.txt 1061-ibmveth-lockless-TX.txt 1062-ibmveth-fix-failed-addbuf.txt 1063-pcnet_cs-fix-mii-init-code-for-older-DL10019-based-cards.txt 1065-s2io-kconfig-help-fix.txt 1066-b44-reports-wrong-advertised-flags.txt 1067-sis190.c-fix-multicast-MAC-filter.txt 1068-smc91x-shut-down-power-after-probing.txt 1070-starfire-free_irq-on-error-path-of-netdev_open.txt 1073-netdrvr-b44-include-linux-dma-mapping.h-to-eliminate-warning.txt 1074-sundance-fix-DFE-580TX-Tx-Underrun.txt 1075-New-PowerPC-4xx-on-chip-ethernet-controller-driver.txt 1078-sis900-come-alive-after-temporary-memory-shortage.txt 1079-Add-Wake-on-LAN-support-to-sis900-2.txt 1080-drivers-net-Remove-pointless-checks-fo! r-NULL-prior-to-calling-kfree.txt 1082-netdrvr-ne2k-pci-based! -card-do es-not-support-bus-mastering.txt 1083-ipw2200-Missing-kmalloc-check.txt 1159-SCTP-Rename-SCTP-specific-control-message-flags.txt 1163-SCTP-Fix-SCTP_SETADAPTION-sockopt-to-use-the-correct-structure.txt 1164-SCTP-Allow-SCTP_MAXSEG-to-revert-to-default-frag-point-with-a-0-value.txt 1196-SCTP-Do-not-allow-unprivileged-programs-initiating-new-associations-on.txt 1200-e1000-remove-warning-about-e1000_suspend.txt 1201-eepro.c-module_param_array-cleanup.txt 1202-b44-fix-suspend-resume.txt 1203-e1000-use-vmalloc_node.txt 1204-revert-orinoco-Information-leakage-due-to-incorrect-padding.txt 1205-Better-fixup-for-the-orinoco-driver.txt 1206-e1000-Fixes-e1000_suspend-warning-when-CONFIG_PM-is-not-enabled.txt 1320-ETH-ether-address-compare.txt 1324-Add-modalias-for-pmac-network-drivers.txt 1328-mv643xx_eth_showsram-Added-information-message-when-using-the-SRAM.txt 1329-IPV4-Fix-issue-reported-by-Coverity-in-ipv4-fib_frontend.c.txt 1389-s2io-iomem-annotations.txt 1397-bluetooth-hidp-is-bro! ken-on-s390.txt 1403-drivers-net-tg3-Use-the-DMA_-32-64-BIT_MASK-constants.txt 1405-prism54-Free-skb-after-disabling-interrupts.txt 1748-DRIVER-MODEL-Add-missing-platform_device.h-header.txt 1749-PPC-44x-EMAC-driver-add-440SPe-support.txt 1750-PPC-44x-EMAC-driver-add-440GR-support.txt 1751-PPC-4xx-EMAC-driver-fix-VSC8201-PHY-initialization.txt 1754-fec_8xx-Remove-dependency-on-NETTA-NETPHONE.txt 1755-fec_8xx-Add-support-for-Intel-PHY-LX971.txt 1761-vmalloc_node.txt 1854-ARM-3066-1-Fix-PXA-irda-driver-suspend-resume-functions.txt 1920-m32r-SMC91x-driver-update.txt 1929-smsc-ircc2-PM-cleanup-do-not-close-device-when-suspending.txt 1941-remove-some-more-check_region-stuff.txt 1961-Typo-fix-dot-after-newline-in-printk-strings.txt 2026-sparse-cleanups-NULL-pointers-C99-struct-init.txt 2067-netdrvr-8139too-replace-hand-crafted-kernel-thread-with-workqueue.txt 2078-BRIDGE-Use-ether_compare.txt 2079-NETFILTER-Add-revision-support-to-arp_tables-and-ip6_tables.txt 2080-ROSE-rose_heart! beat_expiry-locking-fix.txt 2081-IPV6-Fix-behavior-of-ip6_rou! te_input -for-link-local-address.txt 2083-DCCP-Simplify-skb_set_owner_w-semantics.txt 2089-DCCP-Set-socket-owner-iff-packet-is-not-data.txt 2090-MCAST-IPv6-Check-packet-size-when-process-Multicast.txt 2227-ibmveth-fix-panic-in-initial-replenish-cycle.txt 2245-MCAST-ip-6-_mc_add_src-should-be-called-when-number-of-sources-is-zero.txt 2256-IPV6-inet6_ifinfo_notify-should-use-RTM_DELLINK-in-addrconf_ifdown.txt 2267-PKT_SCHED-Rework-QoS-and-or-fair-queueing-configuration.txt 2396-ARM-Reverted-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 2410-SUNRPC-allow-sunrpc.o-to-link-when-CONFIG_SYSCTL-is-disabled.txt 2411-NFS-SUNRPC-NLM-fix-unused-variable-warnings-when-CONFIG_SYSCTL-is-disabled.txt 2416-NETFILTER-PPTP-helper-Fix-compilation-of-conntrack-helper-without-NAT.txt 2421-netdrvr-8139too-use-cancel_rearming_delayed_work-to-cancel-thread.txt 2422-netdrvr-8139too-use-rtnl_shlock_nowait-rather-than-rtnl_lock_interruptible.txt 2425-NETFILTER-Fix-double-free-after-net! link_unicast-in-ctnetlink.txt 2430-NETFILTER-nfnetlink-Use-kzalloc.txt 2431-NETFILTER-CONNMARK-target-needs-ip_conntrack.txt 2433-NETEM-use-PSCHED_LESS.txt 2435-drivers-net-wireless-airo.c-unsigned-comparason.txt 2436-S2io-Multi-buffer-mode-support.txt 2438-pcnet32-show-name-of-failing-device.txt 2439-pcnet32-AT2700-2701-and-Bugzilla-2699-4551.txt 2440-pcnet32-Prevent-hang-with-79c976.txt 2441-phy-address-mask-support-for-generic-phy-layer.txt 2442-PKT_SCHED-Generic-RED-layer.txt 2443-NET-Introduce-INET_ECN_set_ce-function.txt 2444-PKT_SCHED-RED-Use-new-generic-red-interface.txt 2445-PKT_SCHED-RED-Use-generic-queue-management-interface.txt 2446-PKT_SCHED-RED-Dont-start-idle-periods-while-already-idling.txt 2447-PKT_SCHED-RED-Cleanup-and-remove-unnecessary-code.txt 2448-PKT_SCHED-GRED-Cleanup-equalize-flag-and-add-new-WRED-mode-detection.txt 2449-PKT_SCHED-GRED-Transform-grio-to-GRED_RIO_MODE.txt 2450-PKT_SCHED-GRED-Cleanup-dumping.txt 2451-PKT_SCHED-GRED-Dump-table-definitio! n.txt 2452-PKT_SCHED-GRED-Use-a-central-table-definition-chan! ge-proce dure.txt 2453-PKT_SCHED-GRED-Report-out-of-bound-DPs-as-illegal.txt 2454-PKT_SCHED-GRED-Use-central-VQ-change-procedure.txt 2455-PKT_SCHED-GRED-Use-new-generic-red-interface.txt 2456-PKT_SCHED-GRED-Do-not-reset-statistics-in-gred_reset-gred_change.txt 2457-PKT_SCHED-GRED-Report-congestion-related-drops-as-NET_XMIT_CN.txt 2458-PKT_SCHED-GRED-Use-generic-queue-management-interface.txt 2459-PKT_SCHED-GRED-Introduce-tc_index_to_dp.txt 2460-PKT_SCHED-GRED-Improve-error-handling-and-messages.txt 2461-PKT_SCHED-GRED-Remove-initd-flag.txt 2462-PKT_SCHED-GRED-Dont-abuse-default-VQ-for-equalizing.txt 2463-PKT_SCHED-GRED-Remove-auto-creation-of-default-VQ.txt 2464-PKT_SCHED-GRED-Cleanup-and-remove-unnecessary-code.txt 2465-PKT_SCHED-GRED-Fix-restart-of-idle-period-in-WRED-mode-upon-dequeue-and-drop.txt 2466-PKT_SCHED-GRED-Support-ECN-marking.txt 2467-PKT_SCHED-G-RED-Introduce-hard-dropping.txt 2468-DRIVER-MODEL-Improved-dynamically-allocated-platform_device-interface.txt 2469-DRIVER-MO! DEL-Fix-depca.txt 2470-DRIVER-MODEL-Fix-jazzsonic.txt 2471-DRIVER-MODEL-Fix-macsonic.txt 2476-NETEM-Support-time-based-reordering.txt 2477-NETEM-Add-version-string.txt 2478-NET-Fix-race-condition-in-sk_stream_wait_connect.txt 2479-TCP-DCCP-Randomize-port-selection.txt 2481-drivers-net-ixgb-make-some-code-static.txt 2482-drivers-net-e1000-possible-cleanups.txt 2483-drivers-net-hamradio-dmascc.c-remove-dmascc_setup.txt 2484-prism54-Remove-redundant-assignment.txt 2485-bnx2-add-5708-support.txt 2486-bnx2-update-firmware-for-5708.txt 2487-bnx2-update-nvram-code-for-5708.txt 2488-bnx2-update-firmware-handshake-for-5708.txt 2489-bnx2-refine-bnx2_poll.txt 2490-bnx2-update-version-and-minor-fixes.txt 2493-Remove-linux-version.h-include-from-drivers-net-phy-and-net-ieee80211.txt 2494-netdrvr-fac_8xx-build-fix.txt 2495-netdrvr-s2io-warning-fixes.txt 2645-b44-b44_start_xmit-returns-with-a-lock-held-when-it-fails-allocating.txt 2646-b44-miscellaneous-cleanup.txt 2647-b44-expose-counters! -through-ethtool.txt 2648-b44-s-spin_lock_irqsave-spin_lock-i! n-b44_in terrupt.txt 2649-b44-late-request_irq-in-b44_open.txt 2688-3c59x-convert-to-use-of-pci_iomap-API.txt 2689-3c59x-cleanup-of-mdio_read-routines-to-use-MII_-macros.txt 2690-3c59x-avoid-blindly-reading-link-status-twice.txt 2691-3c59x-bounds-checking-for-hw_checksums.txt 2692-3c59x-cleanup-init-of-module-parameter-arrays.txt 2693-3c59x-fix-some-grammar-in-module-parameter-descriptions.txt 2694-3c59x-support-ETHTOOL_GPERMADDR.txt 2695-3c59x-correct-rx_dropped-counting.txt 2696-3c59x-enable-use-of-memory-mapped-PCI-I-O.txt 2697-3c59x-don-t-enable-scatter-gather-w-o-checksum-support.txt 2828-knfsd-make-sure-svc_process-call-the-correct-pg_authenticate-for-multi-service-port.txt 2934-m68knommu-FEC-ethernet-header-support-for-the-ColdFire-5208.txt 2935-m68knommu-FEC-ethernet-support-for-the-ColdFire-5208.txt 2984-scripts-Lindent-on-ieee80211-subsystem.txt 2985-Fix-problem-with-WEP-unicast-key-index-0.txt 2986-Update-version-ieee80211-stamp-to-1.1.7.txt 2987-Ran-scripts-Lindent-on-dri! vers-net-wireless-ipw2-1-2-00.-c-h.txt 2988-IPW_DEBUG-has-already-included-DRV_NAME-remove-double-prefix-print.txt 2989-Catch-ipw2200-up-to-equivelancy-with-v1.0.1.txt 2990-Catch-ipw2200-up-to-equivelancy-with-v1.0.2.txt 2991-Catch-ipw2200-up-to-equivelancy-with-v1.0.3.txt 2992-Catch-ipw2200-up-to-equivelancy-with-v1.0.4.txt 2993-Catch-ipw2100-up-to-equivelancy-with-v1.1.1.txt 2994-Fixed-WEP-on-ipw2100-priv-sec-was-being-used-instead-of.txt 2995-Bug-339-Fix-ipw2100-iwconfig-set-get-txpower.txt 2996-Move-code-from-ipw2100_wpa_enable-to-IPW2100_PARAM_DROP_UNENCRYPTED-to.txt 2997-Catch-ipw2200-up-to-equivelancy-with-v1.0.5.txt 2998-Fix-hardware-encryption-both-WEP-and-AES-doesn-t-work-with-fragmentation.txt 2999-Fix-is_duplicate_packet-bug-for-fragmentation-number-setting.txt 3000-bug-667-Fix-the-notorious-No-space-for-Tx-bug.txt 3001-Bug-637-Set-tx-power-for-A-band.txt 3002-Changed-default-of-missed-beacons-to-miss-before-disassociation-to-24.txt 3003-Updated-to-support-ieee80! 211-callback-to-is_queue_full-for-802.11e.txt 3004-Fixed-some! -compile r-issues-if-CONFIG_IPW2200_QOS-is-enabled.txt 3005-Added-more-useful-geography-encoding-so-people-s-experience-with.txt 3006-Workaround-kernel-BUG_ON-panic-caused-by-unexpected-duplicate-packets.txt 3007-Disable-host-fragmentation-in-open-mode-since-IPW2200-2915-hardware.txt 3008-Bug-792-Fix-WPA-PSK-AES-both-for-Dipw-and-Dwext.txt 3009-Fixes-the-ad-hoc-network-WEP-key-list-issue.txt 3010-Bug-701-Fix-a-misuse-of-ieee-mode-with-ieee-iw_mode.txt 3011-Fix-ipw_wx_get_txpow-shows-wrong-disabled-value.txt 3012-Fix-firmware-error-when-setting-tx_power.txt 3013-Modified-ipw_config-and-STATUS_INIT-setting-to-correct-race-condition.txt 3014-Switched-firmware-error-dumping-so-that-it-will-capture-a-log-available.txt 3015-Changed-all-of-the-ipw_send_cmd-calls-to-return-any-ipw_send_cmd-error.txt 3016-Added-cmdlog-in-non-debug-systems.txt 3017-Migrated-some-of-the-channel-verification-code-back-into-the-driver-to.txt 3018-Updated-ipw2200-to-use-the-new-ieee80211-callbacks.txt 3019-Added-w! ait_state-wakeup-on-scan-completion.txt 3020-Bug-455-Fix-frequent-channel-change-generates-firmware-fatal-error.txt 3021-Bug-760-Fix-setting-WEP-key-in-monitor-mode-causes-IV-lost.txt 3022-Don-t-set-hardware-WEP-if-we-are-actually-using-TKIP-AES.txt 3023-Make-all-the-places-the-firmware-fails-to-load-showerrors-in-decimal.txt 3024-Adds-radiotap-support-to-ipw2200-in-monitor-mode.txt 3025-Fixed-is_network_packet-to-include-checking-for-broadcast-packets.txt 3026-Mixed-PTK-GTK-CCMP-TKIP-support.txt 3027-Card-with-WEP-enabled-and-using-shared-key-auth-will-have-firmware.txt 3028-Fixed-problem-with-get_cmd_string-not-existing-if-CONFIG_IPW_DEBUG-disabled.txt 3029-Removed-PF_SYNCTHREAD-legacy.txt 3030-Fixes-problem-with-WEP-not-working-association-succeeds-but-no-Tx-Rx.txt 3031-Fix-bug-771-Too-many-8-bytes-recieved-when-using-AES-hwcrypto.txt 3032-Fixes-WEP-firmware-error-condition.txt 3033-Updated-driver-version-stamps-for-ipw2100-1.1.3-and-ipw2200-1.0.7.txt 3034-Pulled-out-a-st! ray-KERNEL_VERSION-check-around-the-suspend-handler.txt 3035-! Fix-Driv er-using-old-proc-net-wireless-support-please-fix-driver-message.txt 3036-Removed-legacy-WIRELESS_EXT-checks-from-ipw2200.c.txt 3037-Fixes-missed-beacon-logic-in-relation-to-on-network-AP-roaming.txt 3038-Removed-warning-about-TKIP-not-being-configured-if-countermeasures-are.txt 3039-Added-channel-support-for-ipw2200-cards-identified-as-ZZR.txt 3040-Fixed-problem-with-not-being-able-to-send-broadcast-packets.txt 3041-Fixed-parameter-reordering-in-firmware-log-routine.txt 3042-Updated-firmware-version-stamp-to-2.4-from-2.3-so-it-will-use-the-latest-firmware.txt 3043-Update-version-ipw2200-stamp-to-1.0.8.txt 3081-fix-NET_RADIO-n-IEEE80211-y-compile.txt 3083-kill-include-linux-eeprom.h.txt 3084-drivers-net-s2io.c-make-functions-static.txt 3085-prism54-Unused-variable-extraneous-udelay.txt 3086-prism54-Transmit-stats-updated-in-wrong-place.txt 3087-Fix-sparse-warning-in-e100-driver.txt 3088-atmel-memset-correct-range.txt 3117-IPV6-Put-addr_diff-into-common-header-for-future-use.! txt 3118-IPV6-Make-ipv6_addr_type-more-generic-so-that-we-can-use-it-for-source-address-selection.txt 3119-IPV6-RFC3484-compliant-source-address-selection.txt 3121-PKT_SCHED-Correctly-handle-empty-ematch-trees.txt 3122-NET-sk_add_backlog-convert-from-macro-to-inline.txt 3124-PPP-handle-misaligned-accesses.txt 3125-PPP-add-PPP-MPPE-encryption-module.txt 3126-IRDA-donauboe-locking-fix.txt 3127-NET-kfree-cleanup.txt 3128-IPV4-Fix-ip_queue_xmit-identity-increment-for-TSO-packets.txt 3131-Bluetooth-Add-endian-annotations-to-the-core.txt 3132-Bluetooth-Remove-the-usage-of-proc-completely.txt 3155-SERIAL-IOC3-Update-8250-driver-bits.txt 3160-skge-clear-PCI-PHY-COMA-mode-on-boot.txt 3161-skge-use-kzalloc.txt 3162-skge-add-mii-ioctl-support.txt 3163-skge-goto-low-power-mode-on-shutdown.txt 3164-skge-use-prefetch-on-receive.txt 3165-skge-spelling-fixes.txt 3166-skge-increase-version-number.txt 3168-wireless-ipw2100-kill-unused-var-warnings-for-debug-disabled-code.txt 3169-ieee80211-cl! eanup-crypto-list-handling-other-minor-cleanups.txt 3170-b44-! replace- B44_FLAG_INIT_COMPLETE-with-netif_running.txt 3171-b44-race-on-device-closing.txt 3172-b44-increase-version-number.txt 3178-dgrs-fix-warnings-when-CONFIG_ISA-and-CONFIG_PCI-are-not-enabled.txt 3179-IOC-And-don-t-mark-the-things-as-broken-Cowboy.txt 3231-sanitize-lookup_hash-prototype.txt 3530-NETFILTER-packet-counter-of-conntrack-is-32bits.txt 3534-NETFILTER-ctnetlink-add-marking-support-from-userspace.txt 3535-NETFILTER-ctnetlink-add-module-alias-to-fix-autoloading.txt 3536-NETFILTER-ctnetlink-kill-unused-includes.txt 3537-NETFILTER-ctnetlink-get_conntrack-can-use-GFP_KERNEL.txt 3539-NETFILTER-nfnetlink-only-load-subsystems-if-CAP_NET_ADMIN-is-set.txt 3540-NETFILTER-stop-tracking-ICMP-error-at-early-point.txt 3542-NETFILTER-ctnetlink-propagate-error-instaed-of-returning-EPERM.txt 3543-NETFILTER-ctnetlink-Add-support-to-identify-expectations-by-ID-s.txt 3545-NETFILTER-ctnetlink-ICMP_ID-is-u_int16_t-not-u_int8_t.txt 3546-IPV6-Fix-fallout-from-CONFIG_IPV6_PRIVACY.txt 3547-IPV6! -ip6ip6_lock-is-not-unlocked-in-error-path.txt 3566-txt 3596-NETFILTER-Add-nf_conntrack-subsystem.txt 3599-NETLINK-Type-safe-netlink-messages-attributes-interface.txt 3600-NETLINK-Make-netlink_callback-done-optional.txt 3601-NETLINK-Generic-netlink-receive-queue-processor.txt 3602-XFRM-Use-generic-netlink-receive-queue-processor.txt 3603-RTNETLINK-Use-generic-netlink-receive-queue-processor.txt 3604-NETLINK-Generic-netlink-family.txt 3615-SUNRPC-don-t-reencode-when-looping-in-call-transmit.txt 3627-netdrvr-8139too-fast-poll-for-thread-if-an-unlikely-race-occurs.txt 3660-BNX2-output-driver-name-as-prefix-in-error-message.txt 3661-BNX2-check-return-of-dev_alloc_skb-in-bnx2_test_loopback.txt 3662-BNX2-simplify-parameter-checks-in-bnx2_-get-set-_eeprom.txt 3663-NET-Detect-hardware-rx-checksum-faults-correctly.txt 3689-TCP-fix-congestion-window-update-when-using-TSO-deferal.txt 3690-TCP-simplify-microsecond-rtt-sampling.txt 3691-TCP-add-tcp_slow_start-helper.txt 3692-TCP-Appropri! ate-Byte-Count-support.txt 3693-TCP-receive-buffer-growth-lim! iting-wi th-mixed-MTU.txt 3694-TCP-spelling-fixes.txt 3695-TCP-speed-up-SACK-processing.txt 3701-disable-DEBUG-in-ibmveth.txt 3703-sky2-needs-dma_mapping.h.txt 3728-gianfar-mii-needs-to-zero-out-the-mii_bus-structure.txt 3729-netdrvr-forcedeth-remove-superfluous-rx-engine-stop-start.txt 3730-netdrvr-forcedeth-support-for-irq-mitigation.txt 3731-netdrvr-forcedeth-phy-address-scan-range.txt 3732-SAA9730-Whitespace-cleanup.txt 3733-SAA9730-Driver-overhaul.txt 3734-smc91x-DB1200-support.txt 3735-gt96100eth.c-Don-t-concatenate-__FUNCTION__-with-strings.txt 3737-TCP-fix-vegas-build.txt 3742-DECNET-fix-SIGPIPE.txt 3752-IPV6-Fix-inet6_init-missing-unregister.txt 3754-SCTP-Fix-potential-NULL-pointer-dereference-in-sctp_v4_get_saddr.txt 3755-SCTP-Remove-timeouts-array-from-sctp_endpoint.txt 3756-SCTP-Fix-ia64-NaT-consumption-fault-with-sctp_sideffect-commands.txt 3757-SCTP-Include-ulpevents-in-socket-receive-buffer-accounting.txt 3789-IPV6-Fix-unnecessary-GFP_ATOMIC-allocation-in-fib6-dump.txt! 3792-ARM-Use-correct-IO-operations-for-Pleb.txt 3815-net-allow-newline-terminated-IP-addresses-in-in_aton.txt 3816-net-make-dev_valid_name-public.txt 3817-bonding-add-bond-name-to-all-error-messages.txt 3818-bonding-expand-module-param-descriptions.txt 3819-bonding-Add-transmit-policy-to-proc.txt 3820-bonding-get-slave-name-from-actual-slave-instead-of-param-list.txt 3821-bonding-move-kmalloc-out-of-spinlock-in-ALB-init.txt 3822-bonding-explicitly-clear-RLB-flag-during-ALB-init.txt 3823-bonding-expose-some-structs.txt 3824-bonding-make-functions-not-static.txt 3825-bonding-move-bond-creation-into-separate-function.txt 3826-bonding-make-bond_init-not-__init.txt 3827-bonding-Allow-ARP-target-table-to-have-empty-entries.txt 3828-bonding-add-ARP-entries-to-proc.txt 3829-bonding-add-sysfs-functionality-to-bonding-large.txt 3830-bonding-version-update.txt 3831-bonding-spelling-and-whitespace-corrections.txt 3832-bonding-comments-and-changelog.txt 3860-ppc-add-support-for-new-powe! rbooks.txt 3959-NETFILTER-nf_conntrack-Add-missing-code-to-TC! P-conntr ack-module.txt 3960-NETFILTER-nfnetlink-unconditionally-require-CAP_NET_ADMIN.txt 3961-NETFILTER-link-netfilter-before-ipv4.txt 3962-NETFILTER-cleanup-IPv6-Netfilter-Kconfig.txt 3963-NETFILTER-fix-type-of-sysctl-variables-in-nf_conntrack_ipv6.txt 3964-NETFILTER-nf_conntrack-fix-possibility-of-infinite-loop-while-evicting-nf_ct_frag6_queue.txt 3965-NETFILTER-fix-leak-of-fragment-queue-at-unloading-nf_conntrack_ipv6.txt 4016-IPV6-small-fix-for-ipv6_dev_get_saddr-..txt 4017-IPV6-Fixes-sparse-warning-in-ipv6-ipv6_sockglue.c.txt 4018-LLC-Fix-TX-window-scaling.txt 4019-LLC-Make-core-block-on-remote-busy.txt 4020-LLC-Fix-typo.txt 4028-knfsd-make-sure-nfsd-doesn-t-hog-a-cpu-forever.txt 4032-sdladrv.c-build-fix.txt 4041-TCP-More-spelling-fixes.txt 4045-NETFILTER-Remove-nf_conntrack-stat-proc-file-when-cleaning-up.txt 4046-NETFILTER-Free-layer-3-specific-protocol-tables-at-cleanup.txt 4079-drivers-net-sk98lin-skge.c-make-SkPciWriteCfgDWord-a-static-inline.txt 4080-skge-fix-warning-fro! m-inlining-SkPciWriteCfgDWord.txt 4085-IPV4-IPV6-replace-handmade-list-with-hlist-in-IPv-4-6-reassembly.txt 4087-r8169-fix-printk_ratelimit-in-the-interrupt-handler.txt 4088-r8169-do-not-abort-when-the-power-management-capabilities-are-disabled.txt 4094-NETFILTER-Fix-nf_conntrack-compilation-with-CONFIG_NETFILTER_DEBUG.txt 4127-ipw2200-disallow-direct-scanning-when-device-is-down.txt 4128-ipw2200-fix-error-log-offset-calculation.txt 4179-TCP-TCP-highspeed-build-error.txt 4183-LLC-Fix-compiler-warnings-introduced-by-TX-window-scaling-changes.txt 4184-NET-Sanitize-NET_SCHED-protection-in-net-sched-Kconfig.txt 4185-IPV6-Fib-dump-really-needs-GFP_ATOMIC.txt 4220-smc91x-fix-one-source-of-spurious-interrupts.txt 4221-smc91x-fix-bank-mismatch.txt 4226-e100-re-enable-microcode-with-more-useful-defaults.txt 4227-s2io-UFO-support.txt 4228-i82593.h-make-header-comment-GPL-compatible.txt 4229-IOC3-Replace-obsolete-PCI-API.txt 4230-au1000_eth-Include-linux-config.h.txt 4231-SAA9730-Add-m! issing-header-bits.txt 4232-prism54-Remove-extraneous-udelay-! register -read.txt 4233-drivers-net-wireless-hermes.c-unsigned-int-comparision.txt 4234-Gianfar-update-and-sysfs-support.txt 4235-intel-ixp2000-network-driver.txt 4236-git-netdev-all-ieee80211_get_payload-warning-fix.txt 4240-fec_8xx-make-CONFIG_FEC_8XX-depend-on-CONFIG_8xx.txt 4241-ipw2100-Fix-Driver-using-old-proc-net-wireless.-message.txt 4242-e1000-avoid-leak-when-e1000_setup_loopback_test-fails.txt 4243-e1000-zero-out-pointers-in-e1000_free_desc_rings.txt 4246-wireless-hermes-build-fix.txt 4322-PKT_SCHED-sch_netem-correctly-order-packets-to-be-sent-simultaneously.txt 4324-NET-Reject-socket-filter-if-division-by-constant-zero-is-attempted.txt 4326-IPV6-Acquire-addrconf_hash_lock-for-read-in-addrconf_verify-..txt 4330-FIB_TRIE-Don-t-show-local-table-in-proc-net-route-output.txt 4331-NETFILTER-fixed-dependencies-between-modules-related-with-ip_conntrack.txt 4333-DCCP-Add-missing-no_policy-flag-to-struct-net_protocol.txt 4353-net-Fix-compiler-error-on-dgrs.c-when-CONFIG_PCI.txt 4393! -NETLINK-Use-tgid-instead-of-pid-for-nlmsg_pid.txt 4394-IPV4-Fix-secondary-IP-addresses-after-promotion.txt 4395-NETFILTER-ctnetlink-Fix-refcount-leak-ip_conntrack-nat_proto.txt 4419-NETFILTER-ip_conntrack_netlink.c-needs-linux-interrupt.h.txt 4461-SUNRPC-Funny-looking-code-in-__rpc_purge_upcall.txt 4471-bonding-Remove-superfluous-changelog.txt 4510-IPV6-Implement-appropriate-dummy-rule-4-in-ipv6_dev_get_saddr.txt 4541-IPV4-tcp-route-Another-look-at-hash-table-sizes.txt 4542-ATM-always-return-the-first-interface-for-ATM_ITF_ANY.txt 4543-ATM-atm_pcr_goal-doesn-t-modify-its-argument-s-contents-mark-it-as-const.txt 4547-ATM-attempt-to-autoload-atm-drivers.txt 4550-ATM-avoid-race-conditions-related-to-atm_devs-list.txt 4551-ATM-deregistration-removes-device-from-atm_devs-list-immediately.txt 4553-NET-Add-const-markers-to-various-variables.txt 4554-IPV4-make-two-functions-static.txt 4555-NETFILTER-ipv4-small-cleanups.txt 4556-IPV6-make-two-functions-static.txt 4589-b44-missing-ne! tif_wake_queue-in-b44_open.txt 4590-b44-early-return-in-dev-d! o_ioctl- when-the-device-is-not-up.txt 4592-b44-increase-version-number.txt 4601-e1000-fix-for-dhcp-issue.txt 4602-sky2-eliminate-special-case-for-EC-A1.txt 4603-sky2-add-MII-support.txt 4604-sky2-fix-receive-flush-pause-issues.txt 4605-sky2-improve-receive-performance.txt 4606-sky2-add-Yukon-EC-ultra-support.txt 4607-sky2-handle-DMA-boundary-crossing.txt 4608-sky2-change-netif_rx_schedule_test-to-__netif_schedule_prep.txt 4609-sky2-race-with-MTU-change.txt 4610-sky2-dual-port-tx-completion.txt 4611-sky2-byteorder-annotation.txt 4612-sky2-remove-pci-express-hacks.txt 4613-sky2-use-pci_register_driver.txt 4614-sky2-update-version-number.txt 4616-sk98lin-add-permanent-address-support.txt 4617-sk98lin-avoid-message-confusion-with-skge.txt 4619-sk98lin-remove-redundant-fields-in-device-info.txt 4621-ibm_emac-fix-graceful-stop-timeout-handling.txt 4622-ixp2000-register-netdevices-last.txt 4623-pm3386-zero-stats-properly.txt 4624-pm3386-remove-unnecessary-udelays.txt 4625-caleb-pm3386-incl! ude-proper-header-files.txt 4626-ixp2000-use-netif_rx_schedule_test.txt 4627-enp2611-don-t-check-netif_running-in-link-status-timer.txt 4628-enp2611-use-dev-in-link-status-timer.txt 4629-enp2611-report-link-up-down-events.txt 4630-ixp2000-report-MAC-addresses-for-each-port-on-init.txt 4631-pm3386-add-hook-for-setting-MAC-address.txt 4632-pm3386-add-hook-for-setting-carrier.txt 4633-pm3386-implement-reset.txt 4634-enp2611-disable-enable-SERDES-carrier-on-interface-down-up.txt 4635-ixp2000-add-netpoll-support.txt 4636-ixp2000-add-driver-version-bump-version-to-0.2.txt 4637-mipsnet-Fix-Copyright-notice.txt 4638-jazzsonic-Fix-build-error.txt 4639-jazzsonic-Fix-platform-device-code.txt 4640-orinoco-fix-setting-power-management-parameters.txt 4641-skge-handle-VLAN-checksum-correctly-on-yukon-rev-0.txt 4643-wireless-airo-reset-card-in-init.txt 4644-netdrvr-fmvj18x_cs-fix-multicast-bug.txt 4645-airo.c-add-support-for-IW_ENCODE_TEMP-i.e.-xsupplicant.txt 4649-netdrvr-skge-fix-typo-fix! -build.txt 4650-ipw2200-kzalloc-conversion-and-Kconfig-depend! ency-fix .txt 4651-Duplicate-IPW_DEBUG-option-for-ipw2100-and-2200.txt 4680-NETFILTER-Ignore-ACKs-ACKs-on-half-open-connections-in-TCP-conntrack.txt 4681-NETFILTER-Fix-recent-match-jiffies-wrap-mismatches.txt 4729-SCTP-Return-socket-errors-only-if-the-receive-queue-is-empty.txt 4730-SCTP-Fix-getsockname-for-sctp-when-an-ipv6-socket-accepts-a-connection-from.txt 4731-IGMP-workaround-for-IGMP-v1-v2-bug.txt 4732-IPV4-Fix-EPROTONOSUPPORT-error-in-inet_create.txt 4733-IPV6-Load-protocol-module-dynamically.txt 4737-SUNRPC-Fix-Oopsable-condition-in-rpc_pipefs.txt 4741-ixp2000-change-netif_schedule_test-to-__netif_schedule_prep.txt 4742-sky2-interrupt-not-cleared.txt 4760-NETFILTER-Fix-incorrect-argument-to-ip_nat_initialized-in-ctnetlink.txt 4761-NETFILTER-nf_conntrack-Fix-missing-check-for-ICMPv6-type.txt 4762-NETFILTER-nfnetlink-Fix-calculation-of-minimum-message-length.txt 4763-NETFILTER-Fix-ip_conntrack_flush-abuse-in-ctnetlink.txt 4765-NETFILTER-Mark-ctnetlink-as-EXPERIMENTAL.txt 4766-! NETFILTER-Wait-for-untracked-references-in-nf_conntrack-module-unload.txt 4768-NETFILTER-Don-t-use-conntrack-entry-after-dropping-the-reference.txt 4769-NET-make-function-pointer-argument-parseable-by-kernel-doc.txt 4770-DECNET-add-memory-buffer-settings.txt 4783-TCP-Vegas-stop-resetting-rtt-every-ack.txt 4784-TCP-Vegas-Remove-extra-call-to-tcp_vegas_rtt_calc.txt 4785-TCP-Vegas-timestamp-before-clone.txt 4787-TG3-remove-warning-on-race.txt 4801-NET-Fix-NULL-pointer-deref-in-checksum-debugging.txt 4807-IPv6-IPsec-fix-pmtu-calculation-of-esp.txt 4855-sky2-don-t-die-if-we-see-chip-rev-0xb5.txt 4856-sky2-device-structure-alignment.txt 4857-sky2-copy-threshold-as-module-parameter.txt 4858-sky2-ethtool-get-set-interrupt-coalescing.txt 4859-sky2-phy-processing-in-workqueue-rather-than-tasklet.txt 4860-sky2-no-irq-disable-needed-during-tx.txt 4861-sky2-ring-distance-optimization.txt 4862-sky2-map-length-optimization.txt 4863-sky2-tx-rx-ring-data-structure-split.txt 4864-sky2-transmi! t-logic-fixes.txt 4865-sky2-transmit-complete-index-optimizat! ion.txt 4866-sky2-transmit-complete-routine-optimization.txt 4867-sky2-interrupt-poll-optimization.txt 4868-sky2-interrupt-coalescing-tuning.txt 4869-sky2-handle-tx-timeout.txt 4870-sky2-quiet-ring-full-message-in-case-of-race.txt 4871-sky2-prefetch-tuning.txt 4872-sky2-turn-on-tx-flow-control.txt 4873-sky2-disable-rx-checksum-on-Yukon-XL.txt 4874-sky2-version-0.10.txt 4875-pcnet32-use-MAC-address-from-prom-also-on-powerpc.txt 4878-TCPv6-Fix-skb-leak.txt 4883-NETFILTER-ip_nat_tftp-Fix-expectation-NAT.txt 4892-skge-get-rid-of-warning-on-race.txt 4893-ieee80211_crypt_tkip-depends-on-NET_RADIO.txt 4895-e1000-Fixes-for-8357x.txt 4921-netdrvr-skge-fix-build.txt 4975-TG3-Fix-nvram-arbitration-bugs.txt 4976-TG3-Fix-suspend-and-resume.txt 4977-TG3-Fix-5704-single-port-mode.txt 4978-TG3-Fix-low-power-state.txt 4984-IPV6-addrconf-Do-not-print-device-pointer-in-privacy-log-message.txt 4985-PKT_SCHED-Disable-debug-tracing-logs-by-default-in-packet-action-API.txt 5023-s2io-__iomem-annotations-fo! r-recent-changes.txt 5035-Address-of-void-__user-is-void-__user-not-void-__user.txt 5101-XFRM-Handle-DCCP-in-xfrm-4-6-_decode_session.txt 5104-SCTP-Fix-sctp-to-not-return-erroneous-POLLOUT-events.txt 5106-TG3-Fix-peer-device-handling.txt 5107-TG3-Some-low-power-fixes.txt 5108-TG3-Add-tw32_wait_f-for-some-sensitive-registers.txt 5109-TG3-Fix-ethtool-memory-test.txt 5112-RPC-Do-not-block-on-skb-allocation.txt 5114-SUNRPC-Fix-EPIPE-error-on-mount-of-rpcsec_gss-protected-partitions.txt 5131-IPV6-Flag-RTF_ANYCAST-for-anycast-routes.txt 5132-IPV6-Try-not-to-send-icmp-to-anycast-address.txt 5133-IPV6-Defer-IPv6-device-initialization-until-the-link-becomes-ready.txt 5134-IPV6-Run-DAD-when-the-link-becomes-ready.txt 5135-IPV6-Don-t-select-a-tentative-address-as-a-source-address.txt 5140-NETROM-Fix-three-if-statements-in-nr_state1_machine.txt 5141-VLAN-Add-two-missing-checks-to-vlan_ioctl_handler.txt 5142-IPV6-Fix-address-deletion.txt 5143-DCCP-Comment-typo.txt 5147-IPSEC-Fix-policy-u! pdates-missed-by-sockets.txt 5153-SUNGEM-Fix-link-error-with-! CONFIG_H OTPLUG-disabled.txt 5156-IPV6-Fix-dead-lock.txt 5157-IPV6-Fix-Temporary-Address-Generation.txt 5158-chelsio-transmit-routine-return-values.txt 5159-skge-avoid-up-down-on-speed-changes.txt 5160-skge-avoid-up-down-on-pause-param-changes.txt 5161-skge-handle-out-of-memory-on-MTU-size-changes.txt 5162-skge-get-rid-of-Yukon2-defines.txt 5163-skge-handle-out-of-memory-on-ring-parameter-change.txt 5164-skge-version-number-1.3.txt 5165-git-netdev-all-s2io-warning-fix.txt 5166-spidernet-fix-Kconfig-after-BPA-CELL-rename.txt 5167-skge-error-handling-on-resume.txt 5168-sky2-handle-out-of-memory-on-admin-changes.txt 5169-sky2-don-t-lose-multicast-addresses.txt 5170-sky2-handle-hardware-packet-overrun.txt 5171-sky2-version-0.11.txt 5173-orinoco_nortel-Fix-incorrect-PCI-resource-use.txt 5174-orinoco_nortel-Add-Symbol-LA-4123-ID.txt 5175-missing-license-for-libphy.ko.txt 5179-forcedeth-fix-random-memory-scribbling-bug.txt 5198-IPV6-Increase-default-MLD_MAX_MSF-to-64.txt 5199-BR_NETFILTER-F! ix-leak-if-skb-traverses-1-bridge.txt 5201-IPV6-Fix-addrconf-dead-lock.txt 5202-NET-Validate-socket-filters-against-BPF_MAXINSNS-in-one-spot.txt 5203-IPV6-mcast-Fix-multiple-issues-in-MLDv2-reports.txt 5205-TG3-ethtool-d-hangs-PCIe-systems.txt 5206-TG3-Update-driver-version-and-reldate.txt 5518-s-retreiv-retriev-g.txt 5541-TCP-BIC-remove-low-utilization-code.txt 5542-TCP-BIC-spelling-and-whitespace.txt 5543-TCP-BIC-CUBIC-window-growth-2.0.txt 5544-NETFILTER-ip_tables-NUMA-aware-allocation.txt 5545-NETFILTER-ebtables-Support-nf_log-API-from-ebt_log-and-ebt_ulog.txt 5546-IPV4-Safer-reassembly.txt 5547-IPV6-Reuse-inet_csk_get_port-in-tcp_v6_get_port.txt 5548-IPV6-Generalise-__tcp_v6_hash-renaming-it-to-__inet6_hash.txt 5549-ICSK-make-inet_csk_reqsk_queue_hash_add-timeout-arg-unsigned-long.txt 5550-IPV6-Generalise-tcp_v6_search_req-tcp_v6_synq_add.txt 5551-IPV6-Introduce-inet6_rsk.txt 5552-ICSK-Rename-struct-tcp_func-to-struct-inet_connection_sock_af_ops.txt 5553-ICSK-Move-v4_ad! dr2sockaddr-from-TCP-to-icsk.txt 5554-DCCP-Introduce-dccp_ipv! 4_af_ops .txt 5555-IP-Simplify-and-consolidate-MSG_PEEK-error-handling.txt 5556-UDP-udp_checksum_init-return-value.txt 5557-IPVS-remove-dead-code.txt 5558-NET-Avoid-atomic-xchg-for-non-error-case.txt 5559-AF_UNIX-Remove-superfluous-reference-counting-in-unix_stream_sendmsg.txt 5560-IPV6-Generalise-some-functions.txt 5561-IPV6-Introduce-inet6_timewait_sock.txt 5562-IPV6-Export-some-symbols-for-DCCPv6.txt 5563-DCCP-Just-rename-dccp_v4_prot-to-dccp_prot.txt 5564-DCCP-Prepare-the-AF-agnostic-core-for-the-introduction-of-DCCPv6.txt 5565-IPV6-Export-ipv6_opt_accepted.txt 5567-DCCP-Use-reqsk_free-in-dccp_v4_conn_request.txt 5571-TCP-Move-the-TCPF_-enum-to-tcp_states.h.txt 5573-AF_UNIX-Use-spinlock-for-unix_table_lock.txt 5574-BRIDGE-allow-setting-hardware-address-of-bridge-pseudo-dev.txt 5575-BRIDGE-handle-speed-detection-after-carrier-changes.txt 5576-BRIDGE-filter-packets-in-learning-state.txt 5577-BRIDGE-limited-ethtool-support.txt 5578-BRIDGE-add-version-number.txt 5579-PKT_SCHED-netem-! packet-corruption-option.txt 5582-TCP-cubic-precompute-constants.txt 5583-TCP-cubic-use-Newton-Raphson.txt 5584-IPV4-fib_trie-Add-credits.txt 5585-SCTP-Update-SCTP_PEER_ADDR_PARAMS-socket-option-to-the-latest-api-draft.txt 5586-SCTP-Add-support-for-SCTP_DELAYED_ACK_TIME-socket-option.txt 5587-NET-Small-cleanup-to-socket-initialization.txt 5588-NET-move-struct-proto_ops-to-const.txt 5589-PKTGEN-Deinitialise-static-variables.txt 5590-NET-Fix-sock_init-return-value.txt 5591-NET-restructure-sock_aio_-read-write-sock_-readv-writev.txt 5594-TCP-Don-t-use-__constant_htonl-for-a-non-const-arg.txt 5595-PPPOX-Fix-assignment-into-const-proto_ops.txt 5596-NET-Speed-up-__alloc_skb.txt 5597-AF_UNIX-Convert-to-use-a-spinlock-instead-of-rwlock.txt 5598-NETLINK-genetlink-fix-cmd-type-in-genl_ops-to-be-consistent-to-u8.txt 5599-NETROM-Remove-unessecary-lock_sock-calls-in-netrom_ioctl.txt 5600-NET-Add-a-dev_ioctl-fallback-to-sock_ioctl.txt 5601-TG3-fixup-tot_len-calculation.txt 5602-IPVS-Clean! up-IP_VS_DBG-statements.txt 5603-DECNET-Only-use-local-router! s.txt 56 04-DCCP-Do-not-process-a-packet-twice-when-it-s-not-in-state-DCCP_OPEN.txt 5605-DCCP-Send-an-ACK-vector-when-ACKing-a-response-packet.txt 5606-DCCP-Notify-CCID-only-after-ACK-vectors-have-been-processed.txt 5607-BRIDGE-Fix-faulty-check-in-br_stp_recalculate_bridge_id.txt 5608-IPV4-fib_trie-build-fix.txt 5610-IEEE80211-ipw2200-Simplify-multicast-checks.txt 5611-TCP-less-inline-s.txt 5612-DCCP-ackvec-Fix-spelling-of-throw.txt 5613-DCCP-ackvec-use-u8-for-the-buf-offsets.txt 5614-TCP-syn_flood_warning-is-only-needed-if-CONFIG_SYN_COOKIES-is-selected.txt 5700-ECONET-Use-macro-for-spinlock_t-definition.txt 5701-IPV6-Use-macro-for-rwlock_t-initialization.txt 5702-NETFILTER-Use-macro-for-spinlock_t-rwlock_t-initializations-definition.txt 5703-NET-More-instruction-checks-fornet-core-filter.c.txt 5704-TCP-tcp_vegas-Fix-slow-start.txt 5730-IPVS-Fix-compilation.txt 5731-NETFILTER-Decrease-number-of-pointer-derefs-in-nfnetlink_queue.c.txt 5732-NETFILTER-Decrease-number-of-pointer-derefs-! in-nf_conntrack_core.c.txt 5733-NETFILTER-ctnetlink-remove-bogus-checks-in-ICMP-protocol-at-dumping.txt 5734-NETFILTER-ctnetlink-Add-sanity-checkings-for-ICMP.txt 5735-NETFILTER-ctnetlink-propagate-ctnetlink_dump_tuples_proto-return-value-back.txt 5736-NETFILTER-ctnetlink-use-u_int32_t-instead-of-unsigned-int.txt 5737-NETFILTER-ctnetlink-ctnetlink_event-cleanup.txt 5738-NETFILTER-ctnetlink-fix-conntrack-mark-race.txt 5739-NETFILTER-ctnetlink-remove-unused-variable.txt 5740-NETFILTER-Add-ctnetlink-port-for-nf_conntrack.txt 5741-NETFILTER-Filter-dumped-entries-based-on-the-layer-3-protocol-number.txt 5742-NETFILTER-Fix-module_param-types-and-permissions.txt 5743-NETFILTER-ctnetlink-Fix-dumping-of-helper-name.txt 5744-NETFILTER-Remove-okfn-usage-in-ip_vs_core.c.txt 5745-NETFILTER-Call-POST_ROUTING-hook-before-fragmentation.txt 5746-NETFILTER-make-ipv6_find_hdr-find-transport-protocol-header.txt 5747-NETFILTER-Export-ip6_masked_addrcmp-don-t-pass-IPv6-addresses-on-stack.txt 5748! -NETFILTER-nf_conntrack_l3proto_ipv4.c-needs-net-route.h.txt ! 5749-NET FILTER-Use-HOPLIMIT-metric-as-TTL-of-TCP-reset-sent-by-REJECT.txt 5776-NET-Change-1500-to-ETH_DATA_LEN-in-some-files.txt 5796-knfsd-fix-hash-function-for-IP-addresses-on-64bit-little-endian-machines.txt 6008-parport-include-fixes.txt 6015-Keep-nfsd-from-exiting-when-seeing-recv-errors.txt added hold last reject removed __user 0036-sky2-new-experimental-Marvell-Yukon2-driver.txt 0072-8139cp-support-ETHTOOL_GPERMADDR.txt 0073-8139too-support-ETHTOOL_GPERMADDR.txt 0074-b44-support-ETHTOOL_GPERMADDR.txt 0075-e1000-support-ETHTOOL_GPERMADDR.txt 0076-e100-support-ETHTOOL_GPERMADDR.txt 0077-forcedeth-support-ETHTOOL_GPERMADDR.txt 0078-ixgb-support-ETHTOOL_GPERMADDR.txt 0079-ne2k-pci-support-ETHTOOL_GPERMADDR.txt 0080-pcnet32-support-ETHTOOL_GPERMADDR.txt 0081-r8169-support-ETHTOOL_GPERMADDR.txt 0082-skge-support-ETHTOOL_GPERMADDR.txt 0083-sundance-support-ETHTOOL_GPERMADDR.txt 0084-via-rhine-support-ETHTOOL_GPERMADDR.txt 0087-Replace-drivers-net-wan-custom-ctype-macros-with-standar! d-ones.txt 0088-drivers-net-wan-possible-cleanups.txt 0089-lne390-bogus-casts.txt 0090-C99-initializers-in-ray_cs.c.txt 0091-mii-Add-test-for-GigE-support.txt 0092-Add-rapidio-net-driver.txt 0100-pcnet32-set_ringparam-implementation.txt 0101-pcnet32-set-min-ring-size-to-4.txt 0102-sky2-driver-update.txt 0103-orinoco-Remove-conditionals-that-are-useless-in-the-kernel-drivers.txt 0104-orinoco-Don-t-include-net-ieee80211.h-twice.txt 0105-orinoco-Update-PCMCIA-ID-s.txt 0106-Fixed-some-endian-issues-with-802.11-header-usage-in-ieee80211_rx.c.txt 0107-ieee80211-quality-scaling-algorithm-extension-handler.txt 0108-ieee80211-Added-wireless-spy-support.txt 0109-Changed-802.11-headers-to-use-ieee80211_info_element-0.txt 0110-ieee80211-Removed-ieee80211_info_element_hdr.txt 0111-ieee80211-Cleanup-memcpy-parameters.txt 0112-ieee80211-Switched-to-sscanf-in-store_debug_level.txt 0113-ieee80211-Fixed-type-o-of-abg_ture-abg_true.txt 0114-Updated-ipw2200-to-compile-with-ieee80211-abg_ture-to! -abg_true-change.txt 0163-sky2-fix-FIFO-DMA-alignment-problem! s.txt 01 64-sky2-allow-ethtool-debug-access-to-all-of-PCI-space.txt 0165-sky2-version-0.5.txt 0166-ieee80211-Updated-ipw2100-to-be-compatible-with-ieee80211_hdr-changes.txt 0167-ieee80211-Updated-ipw2100-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0168-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211_hdr-changes.txt 0169-ieee80211-Updated-ipw2200-to-be-compatible-with-ieee80211-s-hard_start_xmit-change.txt 0170-ieee80211-Updated-atmel-to-be-compatible-with-ieee80211_hdr-changes.txt 0171-ieee80211-Fixed-a-kernel-oops-on-module-unload.txt 0172-ieee80211-Hardware-crypto-and-fragmentation-offload-support.txt 0173-ieee80211-Fix-time-calculation-switching-to-use-jiffies_to_msecs.txt 0174-ieee80211-Fix-kernel-Oops-when-module-unload.txt 0175-ieee80211-Allow-drivers-to-fix-an-issue-when-using-wpa_supplicant-with-WEP.txt 0176-ieee82011-Added-WE-18-support-to-default-wireless-extension-handler.txt 0177-ieee80211-Renamed-ieee80211_hdr-to-ieee80211_hdr_3addr.txt 0178-ie! ee80211-adds-support-for-the-creation-of-RTS-packets.txt 0179-ieee82011-Added-ieee80211_tx_frame-to-convert-generic-802.11-data-frames-and-callbacks.txt 0180-ieee80211-Fix-TKIP-repeated-fragmentation-problem-and-payload_size-reporting.txt 0181-ieee80211-Return-NETDEV_TX_BUSY-when-QoS-buffer-full.txt 0182-ieee80211-Add-QoS-WME-support-to-the-ieee80211-subsystem.txt 0183-ieee80211-Added-ieee80211_geo-to-provide-helper-functions.txt 0184-ieee80211-Added-ieee80211_radiotap.h.txt 0185-ieee80211-Additional-fixes-for-endian-aware-types.txt 0186-ieee80211-extern-inline-to-static-inline.txt 0187-ieee80211-Type-o-capbility-definition-for-QoS-and-ERP-parsing.txt 0188-ieee80211-Mixed-PTK-GTK-CCMP-TKIP-support.txt 0189-ieee80211-Keep-auth-mode-unchanged-after-iwconfig-key-off-on-cycle.txt 0190-ieee80211-Updated-copyright-dates.txt 0191-ieee80211-Updated-hostap-to-be-compatible-with-ieee80211_hdr-changes.txt 0192-ieee80211-Updated-hostap-to-be-compatible-with-extra_prefix_len-changes.txt ! 0193-ieee82011-Remove-WIRELESS_EXT-ifdefs.txt 0194-forcedeth-! add-hard ware-tx-checksumming.txt 0199-ieee80211-Added-subsystem-version-string-and-reporting-via-MODULE_VERSION.txt 0200-ieee80211-Added-handle_deauth-callback-enhanced-tkip-ccmp-support-of-varying-hw-sw-offload.txt 0201-ieee80211-added-IE-comments-reason_code-to-reason-removed-info_element-from-ieee80211_disassoc.txt 0202-ieee80211-in-tree-driver-updates-to-sync-with-latest-ieee80211-series.txt 0203-ieee80211-update-orinoco-wl3501-drivers-for-latest-struct-naming.txt 0216-orinoco-Remove-inneeded-system-includes.txt 0217-orinoco-Make-nortel_pci_hw_init-static.txt 0218-orinoco-Fix-memory-leak-and-unneeded-unlock-in-orinoco_join_ap.txt 0219-orinoco-orinoco_send_wevents-could-return-without-unlocking.txt 0220-orinoco-Remove-unneeded-forward-declarations.txt 0221-orinoco-Annotate-endianess-of-variables-and-structure-members.txt 0222-orinoco-Read-only-needed-data-in-__orinoco_ev_txexc.txt 0223-orinoco-Bump-version-to-0.15rc3.txt 0227-RPC-Report-connection-errors-properly-when-mounting-wi! th-soft.txt 0228-RPC-proper-soft-timeout-behavior-for-rpcbind.txt 0229-NFS-use-a-constant-value-for-TCP-retransmit-timeouts.txt 0230-RPC-portmapper-doesn-t-need-a-reserved-port.txt 0231-RPC-extract-socket-logic-common-to-both-client-and-server.txt 0232-RPC-introduce-client-side-transport-switch.txt 0233-RPC-transport-switch-function-naming.txt 0234-RPC-Reduce-stack-utilization-in-xs_sendpages.txt 0235-RPC-Rename-sock_lock.txt 0236-RPC-Rename-xprt_lock.txt 0237-RPC-rename-the-sockstate-field.txt 0238-RPC-Eliminate-socket.h-includes-in-RPC-client.txt 0239-RPC-Add-helper-for-waking-tasks-pending-on-a-transport.txt 0240-RPC-client-side-transport-switch-cleanup.txt 0241-RPC-separate-TCP-and-UDP-write-space-callbacks.txt 0242-RPC-separate-TCP-and-UDP-transport-connection-logic.txt 0243-RPC-separate-TCP-and-UDP-socket-write-paths.txt 0244-RPC-skip-over-transport-specific-heads-automatically.txt 0245-RPC-get-rid-of-xprt-stream.txt 0246-RPC-add-API-to-set-transport-specific-timeouts.! txt 0247-RPC-expose-API-for-serializing-access-to-RPC-transpo! rts.txt 0248-RPC-expose-API-for-serializing-access-to-RPC-transports.txt 0249-RPC-separate-xprt_timer-implementations.txt 0250-RPC-add-generic-interface-for-adjusting-the-congestion-window.txt 0251-RPC-add-a-release_rqst-callout-to-the-RPC-transport-switch.txt 0252-RPC-remove-xprt-nocong.txt 0253-RPC-clean-up-after-nocong-was-removed.txt 0254-RPC-allow-RPC-client-s-port-range-to-be-adjustable.txt 0255-RPC-make-sure-to-get-the-same-local-port-number-when-reconnecting.txt 0256-RPC-parametrize-various-transport-connect-timeouts.txt 0257-RPC-rationalize-set_buffer_size.txt 0258-RPC-NFS-new-rpc_pipefs-patch.txt 0260-Revert-PATCH-RPC-NFS-new-rpc_pipefs-patch.txt 0262-SUNRPC-fix-bug-in-patch-portmapper-doesn-t-need-a-reserved-port.txt 0266-netdrvr-gianfar-use-new-phy-layer.txt 0267-netdrvr-delete-CONFIG_PHYCONTROL.txt 0268-hostap-Fix-pci_driver-name-for-hostap_plx-and-hostap_pci.txt 0269-hostap-Add-support-for-WE-19.txt 0270-hostap-Use-GFP_ATOMIC-to-get-rid-of-weird-might_sleep-issue.txt 0! 271-hostap-Remove-iwe_stream_add_event-kludge.txt 0272-Remove-WIRELESS_EXT-ifdefs-from-several-wireless-drivers.txt 0273-wireless-airo-remove-needed-dma_addr_t-obfuscation.txt 0312-sky2-changing-mtu-doesn-t-have-to-reset-link.txt 0313-sky2-cleanup-interrupt-processing.txt 0314-sky2-add-hardware-VLAN-acceleration-support.txt 0315-sky2-explicit-set-power-state.txt 0316-sky2-version-0.6.txt 0317-sky2-nway-reset-BONUS-FEATURE.txt 0323-This-patch-fixes-a-typo-in-ieee80211.h-ieee82011_deauth-ieee80211_deauth.txt 0346-This-will-move-the-ieee80211_is_ofdm_rate-function-to-the-ieee80211.h.txt 0348-Currently-the-info_element-is-parsed-by-2-seperate-functions-this.txt 0349-When-an-assoc_resp-is-received-the-network-structure-is-not-completely.txt 0350-Lindent-and-trailing-whitespace-script-executed-ieee80211-subsystem.txt 0356-hostap-Remove-hw-specific-dev_open-close-handlers.txt 0357-hostap-Fix-hostap_pci-build-with-PRISM2_IO_DEBUG.txt 0358-hostap-Do-not-free-local-hw_priv-before-unre! gistering-netdev.txt 0359-hostap-Unregister-netdevs-before-fr! eeing-lo cal-data.txt 0366-S2io-MSI-MSI-X-support-runtime-configurable.txt 0367-e1000-Support-for-82571-and-82572-controllers.txt 0368-e1000-multi-queue-defines-modification-to-data-structures.txt 0369-e1000-implementation-of-the-multi-queue-feature.txt 0370-e1000-Enable-custom-configuration-bits-for-82571-2-controllers.txt 0371-e1000-Fixes-for-packet-split-related-issues.txt 0372-e1000-Added-msleep_interruptible-delay.txt 0373-e1000-Flush-shadow-RAM.txt 0374-e1000-fix-warnings.txt 0375-AX.25-Delete-debug-printk-from-mkiss-driver.txt 0376-AX.25-Convert-mkiss.c-to-DEFINE_RWLOCK.txt 0377-airo-fix-resume.txt 0378-s2io-change-strncpy-length-arg-to-use-size-of-target.txt 0379-netdrvr-s2io-Add-a-MODULE_VERSION-entry.txt 0380-bonding-replicate-IGMP-traffic-in-activebackup-mode.txt 0381-sky2-add-permanent-address-support.txt 0383-wireless-ipw2200-remove-redundant-return-statement.txt 0546-S2io-Offline-diagnostics-fixes.txt 0547-rcu-in-bpqether-driver.txt 0548-SMACK-support-for-mkiss.txt 0549! -Initialize-the-.owner-field-the-tty_ldisc-structure.txt 0555-SUNRPC-Retry-rpcbind-requests-if-the-server-s-portmapper-isn-t-up.txt 0556-RPC-allow-call_encode-to-delay-transmission-of-an-RPC-call.txt 0575-ieee80211-division-by-zero-fix.txt 0577-sb1250-mac-Check-the-actual-setting-for-reporting-hw-checksumming.txt 0578-sb1250-mac-Ensure-16-byte-alignment-of-the-descriptor-ring.txt 0579-au1000_eth-Misc-Au1000-net-driver-fixes.txt 0580-de2104x-Resurrect-Cobalt-support-for-2.6.txt 0581-sgiseeq-Fix-resource-handling.txt 0582-sgiseeq-Configure-PIO-and-DMA-timing-requests.txt 0583-declance-Convert-to-irqreturn_t.txt 0584-declance-Fix-mapping-of-device.txt 0585-declance-Deal-with-the-bloody-KSEG-vs-CKSEG-horror.txt 0586-declance-Use-physical-addresses-at-the-interface-level.txt 0587-ne-Support-for-RBHMA4500-eval-board.txt 0588-mipsnet-Virtual-ethernet-driver-for-MIPSsim.txt 0589-e1000_intr-build-fix.txt 0590-s2io-build-fix.txt 0592-via-rhine-change-mdelay-to-msleep-and-remove-from-I! SR-path.txt 0593-epic100-fix-counting-of-work_done-in-epic_po! ll.txt 0 596-bonding-cleanup-comment-for-mode-1-IGMP-xmit-hack.txt 0597-b44-alternate-allocation-option-for-DMA-descriptors.txt 0598-orinoco-remove-redundance-skb-length-check-before-padding.txt 0599-sundance-remove-if-1-.-block-in-sundance_probe1.txt 0600-sundance-expand-reset-mask.txt 0601-e1000-build-fix.txt 0603-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0606-SUNRPC-Add-support-for-privacy-to-generic-gss-api-code.txt 0607-SUNRPC-Provide-a-callback-to-allow-free-pages-allocated-during-xdr-encoding.txt 0608-SUNRPC-Retry-wrap-in-case-of-memory-allocation-failure.txt 0609-RPCSEC_GSS-cleanup-au_rslack-calculation.txt 0610-RPCSEC_GSS-client-side-privacy-support.txt 0611-RPCSEC_GSS-Simplify-rpcsec_gss-crypto-code.txt 0612-RPCSEC_GSS-krb5-pre-privacy-cleanup.txt 0613-RPCSEC_GSS-Add-support-for-privacy-to-krb5-rpcsec_gss-mechanism.txt 0614-RPCSEC_GSS-remove-all-qop-parameters.txt 0615-RPCSEC_GSS-krb5-cleanup.txt 0622-Fixed-problem-with-not-being-able-to-decrypt-encrypt! -broadcast-packets.txt 0631-sb1250-mac-Get-rid-of-all-the-funny-SBMAC_WRITECSR-and-SBMAC_READCSR-macros.txt 0632-sb1250-mac-Whitespace-cleanup.txt 0645-sundance-include-MII-address-0-in-PHY-probe.txt 0646-e1000-Driver-version-white-space-comments-device-id-other.txt 0647-Fixed-oops-if-an-uninitialized-key-is-used-for-encryption.txt 0652-sb1250-mac-PHY-probing-fixes.txt 0670-ieee80211-subsystem.txt 0671-Update-version-ieee80211-stamp-to-1.1.6.txt 0675-PARISC-Change-the-driver-names-so-sys-bus-parisc-drivers-looks-better.txt 0676-PARISC-Convert-parisc_device-to-use-struct-resource-for-hpa.txt 0714-PARISC-Add-NETPOLL-support-to-lasi_82596.txt 0771-DECNET-Remove-some-redundant-ifdeffed-code.txt 0772-NET-Wider-use-of-for_each_-cpu.txt 0773-PKTGEN-Sleeping-function-called-under-lock.txt 0774-PKTGEN-Use-kzalloc.txt 0775-PKTGEN-Spelling-and-white-space.txt 0776-PKTGEN-proc-interface-revision.txt 0777-NETFILTER-ip_conntrack-Make-hashsize-conntrack-parameter-writable.txt 0778-IPV4-Kil! l-redundant-rcu_dereference-on-fa_info.txt 0779-IPSEC-Kill-ob! solete-g et_mss-function.txt 0780-NETLINK-Remove-dead-code-in-af_netlink.c.txt 0781-IPV4-Remove-dead-code-from-ip_output.c.txt 0782-SK_BUFF-kernel-doc-fix-skbuff-warnings.txt 0783-AX.25-Use-constant-instead-of-magic-number.txt 0784-IPV4-Fix-setting-broadcast-for-SIOCSIFNETMASK.txt 0785-netdrvr-forcedeth-scatter-gather-and-segmentation-offload-support.txt 0786-ieee80211-build-fix.txt 0834-Revert-RPC-stops-the-release_pipe-funtion-from-being-called-twice.txt 0855-RPC-Ensure-that-nobody-can-queue-up-new-upcalls-after-rpc_close_pipes.txt 0931-gfp_t-net.txt 0952-gfp_t-drivers-net.txt 0957-ARM-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 0963-ARM-2897-2-PXA2xx-IRDA-support.txt 0971-sky2-remove-unused-definitions.txt 0972-sky2-use-kzalloc.txt 0973-sky2-spelling-fixes.txt 0974-sky2-fix-NAPI-and-receive-handling.txt 0975-sky2-version-0.7.txt 1029-DRIVER-MODEL-Get-rid-of-the-obsolete-tri-level-suspend-resume-callbacks.txt 1037-Bluetooth-Make-more-functions-static.txt! 1038-Bluetooth-Update-security-filter-for-Extended-Inquiry-Response.txt 1043-IPv4-IPv6-UFO-Scatter-gather-approach.txt 1044-MCAST-IPv6-Fix-algorithm-to-compute-Querier-s-Query-Interval.txt 1055-tg3-add-5714-5715-support.txt 1056-tg3-fix-ASF-heartbeat.txt 1057-tg3-update-version-and-minor-fixes.txt 1058-ibmveth-fix-bonding.txt 1059-ibmveth-fix-buffer-pool-management.txt 1060-ibmveth-fix-buffer-replenishing.txt 1061-ibmveth-lockless-TX.txt 1062-ibmveth-fix-failed-addbuf.txt 1063-pcnet_cs-fix-mii-init-code-for-older-DL10019-based-cards.txt 1065-s2io-kconfig-help-fix.txt 1066-b44-reports-wrong-advertised-flags.txt 1067-sis190.c-fix-multicast-MAC-filter.txt 1068-smc91x-shut-down-power-after-probing.txt 1070-starfire-free_irq-on-error-path-of-netdev_open.txt 1073-netdrvr-b44-include-linux-dma-mapping.h-to-eliminate-warning.txt 1074-sundance-fix-DFE-580TX-Tx-Underrun.txt 1075-New-PowerPC-4xx-on-chip-ethernet-controller-driver.txt 1078-sis900-come-alive-after-temporary-memory-short! age.txt 1079-Add-Wake-on-LAN-support-to-sis900-2.txt 1080-dri! vers-net -Remove-pointless-checks-for-NULL-prior-to-calling-kfree.txt 1082-netdrvr-ne2k-pci-based-card-does-not-support-bus-mastering.txt 1083-ipw2200-Missing-kmalloc-check.txt 1159-SCTP-Rename-SCTP-specific-control-message-flags.txt 1163-SCTP-Fix-SCTP_SETADAPTION-sockopt-to-use-the-correct-structure.txt 1164-SCTP-Allow-SCTP_MAXSEG-to-revert-to-default-frag-point-with-a-0-value.txt 1196-SCTP-Do-not-allow-unprivileged-programs-initiating-new-associations-on.txt 1200-e1000-remove-warning-about-e1000_suspend.txt 1201-eepro.c-module_param_array-cleanup.txt 1202-b44-fix-suspend-resume.txt 1203-e1000-use-vmalloc_node.txt 1204-revert-orinoco-Information-leakage-due-to-incorrect-padding.txt 1205-Better-fixup-for-the-orinoco-driver.txt 1206-e1000-Fixes-e1000_suspend-warning-when-CONFIG_PM-is-not-enabled.txt 1320-ETH-ether-address-compare.txt 1324-Add-modalias-for-pmac-network-drivers.txt 1328-mv643xx_eth_showsram-Added-information-message-when-using-the-SRAM.txt 1329-IPV4-Fix-issue-reported-b! y-Coverity-in-ipv4-fib_frontend.c.txt 1389-s2io-iomem-annotations.txt 1397-bluetooth-hidp-is-broken-on-s390.txt 1403-drivers-net-tg3-Use-the-DMA_-32-64-BIT_MASK-constants.txt 1405-prism54-Free-skb-after-disabling-interrupts.txt 1748-DRIVER-MODEL-Add-missing-platform_device.h-header.txt 1749-PPC-44x-EMAC-driver-add-440SPe-support.txt 1750-PPC-44x-EMAC-driver-add-440GR-support.txt 1751-PPC-4xx-EMAC-driver-fix-VSC8201-PHY-initialization.txt 1754-fec_8xx-Remove-dependency-on-NETTA-NETPHONE.txt 1755-fec_8xx-Add-support-for-Intel-PHY-LX971.txt 1761-vmalloc_node.txt 1854-ARM-3066-1-Fix-PXA-irda-driver-suspend-resume-functions.txt 1920-m32r-SMC91x-driver-update.txt 1929-smsc-ircc2-PM-cleanup-do-not-close-device-when-suspending.txt 1941-remove-some-more-check_region-stuff.txt 1961-Typo-fix-dot-after-newline-in-printk-strings.txt 2026-sparse-cleanups-NULL-pointers-C99-struct-init.txt 2067-netdrvr-8139too-replace-hand-crafted-kernel-thread-with-workqueue.txt 2078-BRIDGE-Use-ether_compa! re.txt 2079-NETFILTER-Add-revision-support-to-arp_tables-and-! ip6_tabl es.txt 2080-ROSE-rose_heartbeat_expiry-locking-fix.txt 2081-IPV6-Fix-behavior-of-ip6_route_input-for-link-local-address.txt 2083-DCCP-Simplify-skb_set_owner_w-semantics.txt 2089-DCCP-Set-socket-owner-iff-packet-is-not-data.txt 2090-MCAST-IPv6-Check-packet-size-when-process-Multicast.txt 2227-ibmveth-fix-panic-in-initial-replenish-cycle.txt 2245-MCAST-ip-6-_mc_add_src-should-be-called-when-number-of-sources-is-zero.txt 2256-IPV6-inet6_ifinfo_notify-should-use-RTM_DELLINK-in-addrconf_ifdown.txt 2267-PKT_SCHED-Rework-QoS-and-or-fair-queueing-configuration.txt 2396-ARM-Reverted-2919-1-CS8900A-ethernet-driver-modifications-for-the-Comdial-MP1000.txt 2410-SUNRPC-allow-sunrpc.o-to-link-when-CONFIG_SYSCTL-is-disabled.txt 2411-NFS-SUNRPC-NLM-fix-unused-variable-warnings-when-CONFIG_SYSCTL-is-disabled.txt 2416-NETFILTER-PPTP-helper-Fix-compilation-of-conntrack-helper-without-NAT.txt 2421-netdrvr-8139too-use-cancel_rearming_delayed_work-to-cancel-thread.txt 2422-netdrvr-8139too-use-rtn! l_shlock_nowait-rather-than-rtnl_lock_interruptible.txt 2425-NETFILTER-Fix-double-free-after-netlink_unicast-in-ctnetlink.txt 2430-NETFILTER-nfnetlink-Use-kzalloc.txt 2431-NETFILTER-CONNMARK-target-needs-ip_conntrack.txt 2433-NETEM-use-PSCHED_LESS.txt 2435-drivers-net-wireless-airo.c-unsigned-comparason.txt 2436-S2io-Multi-buffer-mode-support.txt 2438-pcnet32-show-name-of-failing-device.txt 2439-pcnet32-AT2700-2701-and-Bugzilla-2699-4551.txt 2440-pcnet32-Prevent-hang-with-79c976.txt 2441-phy-address-mask-support-for-generic-phy-layer.txt 2442-PKT_SCHED-Generic-RED-layer.txt 2443-NET-Introduce-INET_ECN_set_ce-function.txt 2444-PKT_SCHED-RED-Use-new-generic-red-interface.txt 2445-PKT_SCHED-RED-Use-generic-queue-management-interface.txt 2446-PKT_SCHED-RED-Dont-start-idle-periods-while-already-idling.txt 2447-PKT_SCHED-RED-Cleanup-and-remove-unnecessary-code.txt 2448-PKT_SCHED-GRED-Cleanup-equalize-flag-and-add-new-WRED-mode-detection.txt 2449-PKT_SCHED-GRED-Transform-grio-to-GR! ED_RIO_MODE.txt 2450-PKT_SCHED-GRED-Cleanup-dumping.txt 2451-! PKT_SCHE D-GRED-Dump-table-definition.txt 2452-PKT_SCHED-GRED-Use-a-central-table-definition-change-procedure.txt 2453-PKT_SCHED-GRED-Report-out-of-bound-DPs-as-illegal.txt 2454-PKT_SCHED-GRED-Use-central-VQ-change-procedure.txt 2455-PKT_SCHED-GRED-Use-new-generic-red-interface.txt 2456-PKT_SCHED-GRED-Do-not-reset-statistics-in-gred_reset-gred_change.txt 2457-PKT_SCHED-GRED-Report-congestion-related-drops-as-NET_XMIT_CN.txt 2458-PKT_SCHED-GRED-Use-generic-queue-management-interface.txt 2459-PKT_SCHED-GRED-Introduce-tc_index_to_dp.txt 2460-PKT_SCHED-GRED-Improve-error-handling-and-messages.txt 2461-PKT_SCHED-GRED-Remove-initd-flag.txt 2462-PKT_SCHED-GRED-Dont-abuse-default-VQ-for-equalizing.txt 2463-PKT_SCHED-GRED-Remove-auto-creation-of-default-VQ.txt 2464-PKT_SCHED-GRED-Cleanup-and-remove-unnecessary-code.txt 2465-PKT_SCHED-GRED-Fix-restart-of-idle-period-in-WRED-mode-upon-dequeue-and-drop.txt 2466-PKT_SCHED-GRED-Support-ECN-marking.txt 2467-PKT_SCHED-G-RED-Introduce-hard-dropping.t! xt 2468-DRIVER-MODEL-Improved-dynamically-allocated-platform_device-interface.txt 2469-DRIVER-MODEL-Fix-depca.txt 2470-DRIVER-MODEL-Fix-jazzsonic.txt 2471-DRIVER-MODEL-Fix-macsonic.txt 2476-NETEM-Support-time-based-reordering.txt 2477-NETEM-Add-version-string.txt 2478-NET-Fix-race-condition-in-sk_stream_wait_connect.txt 2479-TCP-DCCP-Randomize-port-selection.txt 2481-drivers-net-ixgb-make-some-code-static.txt 2482-drivers-net-e1000-possible-cleanups.txt 2483-drivers-net-hamradio-dmascc.c-remove-dmascc_setup.txt 2484-prism54-Remove-redundant-assignment.txt 2485-bnx2-add-5708-support.txt 2486-bnx2-update-firmware-for-5708.txt 2487-bnx2-update-nvram-code-for-5708.txt 2488-bnx2-update-firmware-handshake-for-5708.txt 2489-bnx2-refine-bnx2_poll.txt 2490-bnx2-update-version-and-minor-fixes.txt 2493-Remove-linux-version.h-include-from-drivers-net-phy-and-net-ieee80211.txt 2494-netdrvr-fac_8xx-build-fix.txt 2495-netdrvr-s2io-warning-fixes.txt 2645-b44-b44_start_xmit-returns-with-a-lo! ck-held-when-it-fails-allocating.txt 2646-b44-miscellaneous-c! leanup.t xt 2647-b44-expose-counters-through-ethtool.txt 2648-b44-s-spin_lock_irqsave-spin_lock-in-b44_interrupt.txt 2649-b44-late-request_irq-in-b44_open.txt 2688-3c59x-convert-to-use-of-pci_iomap-API.txt 2689-3c59x-cleanup-of-mdio_read-routines-to-use-MII_-macros.txt 2690-3c59x-avoid-blindly-reading-link-status-twice.txt 2691-3c59x-bounds-checking-for-hw_checksums.txt 2692-3c59x-cleanup-init-of-module-parameter-arrays.txt 2693-3c59x-fix-some-grammar-in-module-parameter-descriptions.txt 2694-3c59x-support-ETHTOOL_GPERMADDR.txt 2695-3c59x-correct-rx_dropped-counting.txt 2696-3c59x-enable-use-of-memory-mapped-PCI-I-O.txt 2697-3c59x-don-t-enable-scatter-gather-w-o-checksum-support.txt 2828-knfsd-make-sure-svc_process-call-the-correct-pg_authenticate-for-multi-service-port.txt 2934-m68knommu-FEC-ethernet-header-support-for-the-ColdFire-5208.txt 2935-m68knommu-FEC-ethernet-support-for-the-ColdFire-5208.txt 2984-scripts-Lindent-on-ieee80211-subsystem.txt 2985-Fix-problem-with-WEP-unicast-! key-index-0.txt 2986-Update-version-ieee80211-stamp-to-1.1.7.txt 2987-Ran-scripts-Lindent-on-drivers-net-wireless-ipw2-1-2-00.-c-h.txt 2988-IPW_DEBUG-has-already-included-DRV_NAME-remove-double-prefix-print.txt 2989-Catch-ipw2200-up-to-equivelancy-with-v1.0.1.txt 2990-Catch-ipw2200-up-to-equivelancy-with-v1.0.2.txt 2991-Catch-ipw2200-up-to-equivelancy-with-v1.0.3.txt 2992-Catch-ipw2200-up-to-equivelancy-with-v1.0.4.txt 2993-Catch-ipw2100-up-to-equivelancy-with-v1.1.1.txt 2994-Fixed-WEP-on-ipw2100-priv-sec-was-being-used-instead-of.txt 2995-Bug-339-Fix-ipw2100-iwconfig-set-get-txpower.txt 2996-Move-code-from-ipw2100_wpa_enable-to-IPW2100_PARAM_DROP_UNENCRYPTED-to.txt 2997-Catch-ipw2200-up-to-equivelancy-with-v1.0.5.txt 2998-Fix-hardware-encryption-both-WEP-and-AES-doesn-t-work-with-fragmentation.txt 2999-Fix-is_duplicate_packet-bug-for-fragmentation-number-setting.txt 3000-bug-667-Fix-the-notorious-No-space-for-Tx-bug.txt 3001-Bug-637-Set-tx-power-for-A-band.txt 3002-Changed-! default-of-missed-beacons-to-miss-before-disassociation-to-24! .txt 300 3-Updated-to-support-ieee80211-callback-to-is_queue_full-for-802.11e.txt 3004-Fixed-some-compiler-issues-if-CONFIG_IPW2200_QOS-is-enabled.txt 3005-Added-more-useful-geography-encoding-so-people-s-experience-with.txt 3006-Workaround-kernel-BUG_ON-panic-caused-by-unexpected-duplicate-packets.txt 3007-Disable-host-fragmentation-in-open-mode-since-IPW2200-2915-hardware.txt 3008-Bug-792-Fix-WPA-PSK-AES-both-for-Dipw-and-Dwext.txt 3009-Fixes-the-ad-hoc-network-WEP-key-list-issue.txt 3010-Bug-701-Fix-a-misuse-of-ieee-mode-with-ieee-iw_mode.txt 3011-Fix-ipw_wx_get_txpow-shows-wrong-disabled-value.txt 3012-Fix-firmware-error-when-setting-tx_power.txt 3013-Modified-ipw_config-and-STATUS_INIT-setting-to-correct-race-condition.txt 3014-Switched-firmware-error-dumping-so-that-it-will-capture-a-log-available.txt 3015-Changed-all-of-the-ipw_send_cmd-calls-to-return-any-ipw_send_cmd-error.txt 3016-Added-cmdlog-in-non-debug-systems.txt 3017-Migrated-some-of-the-channel-verification-code-back! -into-the-driver-to.txt 3018-Updated-ipw2200-to-use-the-new-ieee80211-callbacks.txt 3019-Added-wait_state-wakeup-on-scan-completion.txt 3020-Bug-455-Fix-frequent-channel-change-generates-firmware-fatal-error.txt 3021-Bug-760-Fix-setting-WEP-key-in-monitor-mode-causes-IV-lost.txt 3022-Don-t-set-hardware-WEP-if-we-are-actually-using-TKIP-AES.txt 3023-Make-all-the-places-the-firmware-fails-to-load-showerrors-in-decimal.txt 3024-Adds-radiotap-support-to-ipw2200-in-monitor-mode.txt 3025-Fixed-is_network_packet-to-include-checking-for-broadcast-packets.txt 3026-Mixed-PTK-GTK-CCMP-TKIP-support.txt 3027-Card-with-WEP-enabled-and-using-shared-key-auth-will-have-firmware.txt 3028-Fixed-problem-with-get_cmd_string-not-existing-if-CONFIG_IPW_DEBUG-disabled.txt 3029-Removed-PF_SYNCTHREAD-legacy.txt 3030-Fixes-problem-with-WEP-not-working-association-succeeds-but-no-Tx-Rx.txt 3031-Fix-bug-771-Too-many-8-bytes-recieved-when-using-AES-hwcrypto.txt 3032-Fixes-WEP-firmware-error-condition.txt! 3033-Updated-driver-version-stamps-for-ipw2100-1.1.3-and-ipw! 2200-1.0 .7.txt 3034-Pulled-out-a-stray-KERNEL_VERSION-check-around-the-suspend-handler.txt 3035-Fix-Driver-using-old-proc-net-wireless-support-please-fix-driver-message.txt 3036-Removed-legacy-WIRELESS_EXT-checks-from-ipw2200.c.txt 3037-Fixes-missed-beacon-logic-in-relation-to-on-network-AP-roaming.txt 3038-Removed-warning-about-TKIP-not-being-configured-if-countermeasures-are.txt 3039-Added-channel-support-for-ipw2200-cards-identified-as-ZZR.txt 3040-Fixed-problem-with-not-being-able-to-send-broadcast-packets.txt 3041-Fixed-parameter-reordering-in-firmware-log-routine.txt 3042-Updated-firmware-version-stamp-to-2.4-from-2.3-so-it-will-use-the-latest-firmware.txt 3043-Update-version-ipw2200-stamp-to-1.0.8.txt 3081-fix-NET_RADIO-n-IEEE80211-y-compile.txt 3083-kill-include-linux-eeprom.h.txt 3084-drivers-net-s2io.c-make-functions-static.txt 3085-prism54-Unused-variable-extraneous-udelay.txt 3086-prism54-Transmit-stats-updated-in-wrong-place.txt 3087-Fix-sparse-warning-in-e100-driver.tx! t 3088-atmel-memset-correct-range.txt 3117-IPV6-Put-addr_diff-into-common-header-for-future-use.txt 3118-IPV6-Make-ipv6_addr_type-more-generic-so-that-we-can-use-it-for-source-address-selection.txt 3119-IPV6-RFC3484-compliant-source-address-selection.txt 3121-PKT_SCHED-Correctly-handle-empty-ematch-trees.txt 3122-NET-sk_add_backlog-convert-from-macro-to-inline.txt 3124-PPP-handle-misaligned-accesses.txt 3125-PPP-add-PPP-MPPE-encryption-module.txt 3126-IRDA-donauboe-locking-fix.txt 3127-NET-kfree-cleanup.txt 3128-IPV4-Fix-ip_queue_xmit-identity-increment-for-TSO-packets.txt 3131-Bluetooth-Add-endian-annotations-to-the-core.txt 3132-Bluetooth-Remove-the-usage-of-proc-completely.txt 3155-SERIAL-IOC3-Update-8250-driver-bits.txt 3160-skge-clear-PCI-PHY-COMA-mode-on-boot.txt 3161-skge-use-kzalloc.txt 3162-skge-add-mii-ioctl-support.txt 3163-skge-goto-low-power-mode-on-shutdown.txt 3164-skge-use-prefetch-on-receive.txt 3165-skge-spelling-fixes.txt 3166-skge-increase-version-number.! txt 3168-wireless-ipw2100-kill-unused-var-warnings-for-debug-! disabled -code.txt 3169-ieee80211-cleanup-crypto-list-handling-other-minor-cleanups.txt 3170-b44-replace-B44_FLAG_INIT_COMPLETE-with-netif_running.txt 3171-b44-race-on-device-closing.txt 3172-b44-increase-version-number.txt 3178-dgrs-fix-warnings-when-CONFIG_ISA-and-CONFIG_PCI-are-not-enabled.txt 3179-IOC-And-don-t-mark-the-things-as-broken-Cowboy.txt 3231-sanitize-lookup_hash-prototype.txt 3530-NETFILTER-packet-counter-of-conntrack-is-32bits.txt 3534-NETFILTER-ctnetlink-add-marking-support-from-userspace.txt 3535-NETFILTER-ctnetlink-add-module-alias-to-fix-autoloading.txt 3536-NETFILTER-ctnetlink-kill-unused-includes.txt 3537-NETFILTER-ctnetlink-get_conntrack-can-use-GFP_KERNEL.txt 3539-NETFILTER-nfnetlink-only-load-subsystems-if-CAP_NET_ADMIN-is-set.txt 3540-NETFILTER-stop-tracking-ICMP-error-at-early-point.txt 3542-NETFILTER-ctnetlink-propagate-error-instaed-of-returning-EPERM.txt 3543-NETFILTER-ctnetlink-Add-support-to-identify-expectations-by-ID-s.txt 3545-NETFILTER-ctnetlink-IC! MP_ID-is-u_int16_t-not-u_int8_t.txt 3546-IPV6-Fix-fallout-from-CONFIG_IPV6_PRIVACY.txt 3547-IPV6-ip6ip6_lock-is-not-unlocked-in-error-path.txt 3566-txt 3596-NETFILTER-Add-nf_conntrack-subsystem.txt 3599-NETLINK-Type-safe-netlink-messages-attributes-interface.txt 3600-NETLINK-Make-netlink_callback-done-optional.txt 3601-NETLINK-Generic-netlink-receive-queue-processor.txt 3602-XFRM-Use-generic-netlink-receive-queue-processor.txt 3603-RTNETLINK-Use-generic-netlink-receive-queue-processor.txt 3604-NETLINK-Generic-netlink-family.txt 3615-SUNRPC-don-t-reencode-when-looping-in-call-transmit.txt 3627-netdrvr-8139too-fast-poll-for-thread-if-an-unlikely-race-occurs.txt 3660-BNX2-output-driver-name-as-prefix-in-error-message.txt 3661-BNX2-check-return-of-dev_alloc_skb-in-bnx2_test_loopback.txt 3662-BNX2-simplify-parameter-checks-in-bnx2_-get-set-_eeprom.txt 3663-NET-Detect-hardware-rx-checksum-faults-correctly.txt 3689-TCP-fix-congestion-window-update-when-using-TSO-deferal.txt 3690-TC! P-simplify-microsecond-rtt-sampling.txt 3691-TCP-add-tcp_slow! _start-h elper.txt 3692-TCP-Appropriate-Byte-Count-support.txt 3693-TCP-receive-buffer-growth-limiting-with-mixed-MTU.txt 3694-TCP-spelling-fixes.txt 3695-TCP-speed-up-SACK-processing.txt 3701-disable-DEBUG-in-ibmveth.txt 3703-sky2-needs-dma_mapping.h.txt 3728-gianfar-mii-needs-to-zero-out-the-mii_bus-structure.txt 3729-netdrvr-forcedeth-remove-superfluous-rx-engine-stop-start.txt 3730-netdrvr-forcedeth-support-for-irq-mitigation.txt 3731-netdrvr-forcedeth-phy-address-scan-range.txt 3732-SAA9730-Whitespace-cleanup.txt 3733-SAA9730-Driver-overhaul.txt 3734-smc91x-DB1200-support.txt 3735-gt96100eth.c-Don-t-concatenate-__FUNCTION__-with-strings.txt 3737-TCP-fix-vegas-build.txt 3742-DECNET-fix-SIGPIPE.txt 3752-IPV6-Fix-inet6_init-missing-unregister.txt 3754-SCTP-Fix-potential-NULL-pointer-dereference-in-sctp_v4_get_saddr.txt 3755-SCTP-Remove-timeouts-array-from-sctp_endpoint.txt 3756-SCTP-Fix-ia64-NaT-consumption-fault-with-sctp_sideffect-commands.txt 3757-SCTP-Include-ulpevents-in-socke! t-receive-buffer-accounting.txt 3789-IPV6-Fix-unnecessary-GFP_ATOMIC-allocation-in-fib6-dump.txt 3792-ARM-Use-correct-IO-operations-for-Pleb.txt 3815-net-allow-newline-terminated-IP-addresses-in-in_aton.txt 3816-net-make-dev_valid_name-public.txt 3817-bonding-add-bond-name-to-all-error-messages.txt 3818-bonding-expand-module-param-descriptions.txt 3819-bonding-Add-transmit-policy-to-proc.txt 3820-bonding-get-slave-name-from-actual-slave-instead-of-param-list.txt 3821-bonding-move-kmalloc-out-of-spinlock-in-ALB-init.txt 3822-bonding-explicitly-clear-RLB-flag-during-ALB-init.txt 3823-bonding-expose-some-structs.txt 3824-bonding-make-functions-not-static.txt 3825-bonding-move-bond-creation-into-separate-function.txt 3826-bonding-make-bond_init-not-__init.txt 3827-bonding-Allow-ARP-target-table-to-have-empty-entries.txt 3828-bonding-add-ARP-entries-to-proc.txt 3829-bonding-add-sysfs-functionality-to-bonding-large.txt 3830-bonding-version-update.txt 3831-bonding-spelling-and-whit! espace-corrections.txt 3832-bonding-comments-and-changelog.tx! t 3860-p pc-add-support-for-new-powerbooks.txt 3959-NETFILTER-nf_conntrack-Add-missing-code-to-TCP-conntrack-module.txt 3960-NETFILTER-nfnetlink-unconditionally-require-CAP_NET_ADMIN.txt 3961-NETFILTER-link-netfilter-before-ipv4.txt 3962-NETFILTER-cleanup-IPv6-Netfilter-Kconfig.txt 3963-NETFILTER-fix-type-of-sysctl-variables-in-nf_conntrack_ipv6.txt 3964-NETFILTER-nf_conntrack-fix-possibility-of-infinite-loop-while-evicting-nf_ct_frag6_queue.txt 3965-NETFILTER-fix-leak-of-fragment-queue-at-unloading-nf_conntrack_ipv6.txt 4016-IPV6-small-fix-for-ipv6_dev_get_saddr-..txt 4017-IPV6-Fixes-sparse-warning-in-ipv6-ipv6_sockglue.c.txt 4018-LLC-Fix-TX-window-scaling.txt 4019-LLC-Make-core-block-on-remote-busy.txt 4020-LLC-Fix-typo.txt 4028-knfsd-make-sure-nfsd-doesn-t-hog-a-cpu-forever.txt 4032-sdladrv.c-build-fix.txt 4041-TCP-More-spelling-fixes.txt 4045-NETFILTER-Remove-nf_conntrack-stat-proc-file-when-cleaning-up.txt 4046-NETFILTER-Free-layer-3-specific-protocol-tables-at-cleanup.txt 4079-! drivers-net-sk98lin-skge.c-make-SkPciWriteCfgDWord-a-static-inline.txt 4080-skge-fix-warning-from-inlining-SkPciWriteCfgDWord.txt 4085-IPV4-IPV6-replace-handmade-list-with-hlist-in-IPv-4-6-reassembly.txt 4087-r8169-fix-printk_ratelimit-in-the-interrupt-handler.txt 4088-r8169-do-not-abort-when-the-power-management-capabilities-are-disabled.txt 4094-NETFILTER-Fix-nf_conntrack-compilation-with-CONFIG_NETFILTER_DEBUG.txt 4127-ipw2200-disallow-direct-scanning-when-device-is-down.txt 4128-ipw2200-fix-error-log-offset-calculation.txt 4179-TCP-TCP-highspeed-build-error.txt 4183-LLC-Fix-compiler-warnings-introduced-by-TX-window-scaling-changes.txt 4184-NET-Sanitize-NET_SCHED-protection-in-net-sched-Kconfig.txt 4185-IPV6-Fib-dump-really-needs-GFP_ATOMIC.txt 4220-smc91x-fix-one-source-of-spurious-interrupts.txt 4221-smc91x-fix-bank-mismatch.txt 4226-e100-re-enable-microcode-with-more-useful-defaults.txt 4227-s2io-UFO-support.txt 4228-i82593.h-make-header-comment-GPL-compatible.txt 4229! -IOC3-Replace-obsolete-PCI-API.txt 4230-au1000_eth-Include-li! nux-conf ig.h.txt 4231-SAA9730-Add-missing-header-bits.txt 4232-prism54-Remove-extraneous-udelay-register-read.txt 4233-drivers-net-wireless-hermes.c-unsigned-int-comparision.txt 4234-Gianfar-update-and-sysfs-support.txt 4235-intel-ixp2000-network-driver.txt 4236-git-netdev-all-ieee80211_get_payload-warning-fix.txt 4240-fec_8xx-make-CONFIG_FEC_8XX-depend-on-CONFIG_8xx.txt 4241-ipw2100-Fix-Driver-using-old-proc-net-wireless.-message.txt 4242-e1000-avoid-leak-when-e1000_setup_loopback_test-fails.txt 4243-e1000-zero-out-pointers-in-e1000_free_desc_rings.txt 4246-wireless-hermes-build-fix.txt 4322-PKT_SCHED-sch_netem-correctly-order-packets-to-be-sent-simultaneously.txt 4324-NET-Reject-socket-filter-if-division-by-constant-zero-is-attempted.txt 4326-IPV6-Acquire-addrconf_hash_lock-for-read-in-addrconf_verify-..txt 4330-FIB_TRIE-Don-t-show-local-table-in-proc-net-route-output.txt 4331-NETFILTER-fixed-dependencies-between-modules-related-with-ip_conntrack.txt 4333-DCCP-Add-missing-no_polic! y-flag-to-struct-net_protocol.txt 4353-net-Fix-compiler-error-on-dgrs.c-when-CONFIG_PCI.txt 4393-NETLINK-Use-tgid-instead-of-pid-for-nlmsg_pid.txt 4394-IPV4-Fix-secondary-IP-addresses-after-promotion.txt 4395-NETFILTER-ctnetlink-Fix-refcount-leak-ip_conntrack-nat_proto.txt 4419-NETFILTER-ip_conntrack_netlink.c-needs-linux-interrupt.h.txt 4461-SUNRPC-Funny-looking-code-in-__rpc_purge_upcall.txt 4471-bonding-Remove-superfluous-changelog.txt 4510-IPV6-Implement-appropriate-dummy-rule-4-in-ipv6_dev_get_saddr.txt 4541-IPV4-tcp-route-Another-look-at-hash-table-sizes.txt 4542-ATM-always-return-the-first-interface-for-ATM_ITF_ANY.txt 4543-ATM-atm_pcr_goal-doesn-t-modify-its-argument-s-contents-mark-it-as-const.txt 4547-ATM-attempt-to-autoload-atm-drivers.txt 4550-ATM-avoid-race-conditions-related-to-atm_devs-list.txt 4551-ATM-deregistration-removes-device-from-atm_devs-list-immediately.txt 4553-NET-Add-const-markers-to-various-variables.txt 4554-IPV4-make-two-functions-static.txt 45! 55-NETFILTER-ipv4-small-cleanups.txt 4556-IPV6-make-two-funct! ions-sta tic.txt 4589-b44-missing-netif_wake_queue-in-b44_open.txt 4590-b44-early-return-in-dev-do_ioctl-when-the-device-is-not-up.txt 4592-b44-increase-version-number.txt 4601-e1000-fix-for-dhcp-issue.txt 4602-sky2-eliminate-special-case-for-EC-A1.txt 4603-sky2-add-MII-support.txt 4604-sky2-fix-receive-flush-pause-issues.txt 4605-sky2-improve-receive-performance.txt 4606-sky2-add-Yukon-EC-ultra-support.txt 4607-sky2-handle-DMA-boundary-crossing.txt 4608-sky2-change-netif_rx_schedule_test-to-__netif_schedule_prep.txt 4609-sky2-race-with-MTU-change.txt 4610-sky2-dual-port-tx-completion.txt 4611-sky2-byteorder-annotation.txt 4612-sky2-remove-pci-express-hacks.txt 4613-sky2-use-pci_register_driver.txt 4614-sky2-update-version-number.txt 4616-sk98lin-add-permanent-address-support.txt 4617-sk98lin-avoid-message-confusion-with-skge.txt 4619-sk98lin-remove-redundant-fields-in-device-info.txt 4621-ibm_emac-fix-graceful-stop-timeout-handling.txt 4622-ixp2000-register-netdevices-last.txt 4623-! pm3386-zero-stats-properly.txt 4624-pm3386-remove-unnecessary-udelays.txt 4625-caleb-pm3386-include-proper-header-files.txt 4626-ixp2000-use-netif_rx_schedule_test.txt 4627-enp2611-don-t-check-netif_running-in-link-status-timer.txt 4628-enp2611-use-dev-in-link-status-timer.txt 4629-enp2611-report-link-up-down-events.txt 4630-ixp2000-report-MAC-addresses-for-each-port-on-init.txt 4631-pm3386-add-hook-for-setting-MAC-address.txt 4632-pm3386-add-hook-for-setting-carrier.txt 4633-pm3386-implement-reset.txt 4634-enp2611-disable-enable-SERDES-carrier-on-interface-down-up.txt 4635-ixp2000-add-netpoll-support.txt 4636-ixp2000-add-driver-version-bump-version-to-0.2.txt 4637-mipsnet-Fix-Copyright-notice.txt 4638-jazzsonic-Fix-build-error.txt 4639-jazzsonic-Fix-platform-device-code.txt 4640-orinoco-fix-setting-power-management-parameters.txt 4641-skge-handle-VLAN-checksum-correctly-on-yukon-rev-0.txt 4643-wireless-airo-reset-card-in-init.txt 4644-netdrvr-fmvj18x_cs-fix-multicast-bug.tx! t 4645-airo.c-add-support-for-IW_ENCODE_TEMP-i.e.-xsupplicant! .txt 464 9-netdrvr-skge-fix-typo-fix-build.txt 4650-ipw2200-kzalloc-conversion-and-Kconfig-dependency-fix.txt 4651-Duplicate-IPW_DEBUG-option-for-ipw2100-and-2200.txt 4680-NETFILTER-Ignore-ACKs-ACKs-on-half-open-connections-in-TCP-conntrack.txt 4681-NETFILTER-Fix-recent-match-jiffies-wrap-mismatches.txt 4729-SCTP-Return-socket-errors-only-if-the-receive-queue-is-empty.txt 4730-SCTP-Fix-getsockname-for-sctp-when-an-ipv6-socket-accepts-a-connection-from.txt 4731-IGMP-workaround-for-IGMP-v1-v2-bug.txt 4732-IPV4-Fix-EPROTONOSUPPORT-error-in-inet_create.txt 4733-IPV6-Load-protocol-module-dynamically.txt 4737-SUNRPC-Fix-Oopsable-condition-in-rpc_pipefs.txt 4741-ixp2000-change-netif_schedule_test-to-__netif_schedule_prep.txt 4742-sky2-interrupt-not-cleared.txt 4760-NETFILTER-Fix-incorrect-argument-to-ip_nat_initialized-in-ctnetlink.txt 4761-NETFILTER-nf_conntrack-Fix-missing-check-for-ICMPv6-type.txt 4762-NETFILTER-nfnetlink-Fix-calculation-of-minimum-message-length.txt 4763-NETFILTER-Fix-i! p_conntrack_flush-abuse-in-ctnetlink.txt 4765-NETFILTER-Mark-ctnetlink-as-EXPERIMENTAL.txt 4766-NETFILTER-Wait-for-untracked-references-in-nf_conntrack-module-unload.txt 4768-NETFILTER-Don-t-use-conntrack-entry-after-dropping-the-reference.txt 4769-NET-make-function-pointer-argument-parseable-by-kernel-doc.txt 4770-DECNET-add-memory-buffer-settings.txt 4783-TCP-Vegas-stop-resetting-rtt-every-ack.txt 4784-TCP-Vegas-Remove-extra-call-to-tcp_vegas_rtt_calc.txt 4785-TCP-Vegas-timestamp-before-clone.txt 4787-TG3-remove-warning-on-race.txt 4801-NET-Fix-NULL-pointer-deref-in-checksum-debugging.txt 4807-IPv6-IPsec-fix-pmtu-calculation-of-esp.txt 4855-sky2-don-t-die-if-we-see-chip-rev-0xb5.txt 4856-sky2-device-structure-alignment.txt 4857-sky2-copy-threshold-as-module-parameter.txt 4858-sky2-ethtool-get-set-interrupt-coalescing.txt 4859-sky2-phy-processing-in-workqueue-rather-than-tasklet.txt 4860-sky2-no-irq-disable-needed-during-tx.txt 4861-sky2-ring-distance-optimization.txt 4862-! sky2-map-length-optimization.txt 4863-sky2-tx-rx-ring-data-st! ructure- split.txt 4864-sky2-transmit-logic-fixes.txt 4865-sky2-transmit-complete-index-optimization.txt 4866-sky2-transmit-complete-routine-optimization.txt 4867-sky2-interrupt-poll-optimization.txt 4868-sky2-interrupt-coalescing-tuning.txt 4869-sky2-handle-tx-timeout.txt 4870-sky2-quiet-ring-full-message-in-case-of-race.txt 4871-sky2-prefetch-tuning.txt 4872-sky2-turn-on-tx-flow-control.txt 4873-sky2-disable-rx-checksum-on-Yukon-XL.txt 4874-sky2-version-0.10.txt 4875-pcnet32-use-MAC-address-from-prom-also-on-powerpc.txt 4878-TCPv6-Fix-skb-leak.txt 4883-NETFILTER-ip_nat_tftp-Fix-expectation-NAT.txt 4892-skge-get-rid-of-warning-on-race.txt 4893-ieee80211_crypt_tkip-depends-on-NET_RADIO.txt 4895-e1000-Fixes-for-8357x.txt 4921-netdrvr-skge-fix-build.txt 4975-TG3-Fix-nvram-arbitration-bugs.txt 4976-TG3-Fix-suspend-and-resume.txt 4977-TG3-Fix-5704-single-port-mode.txt 4978-TG3-Fix-low-power-state.txt 4984-IPV6-addrconf-Do-not-print-device-pointer-in-privacy-log-message.txt 4985-PKT_SCHED! -Disable-debug-tracing-logs-by-default-in-packet-action-API.txt 5023-s2io-__iomem-annotations-for-recent-changes.txt 5035-Address-of-void-__user-is-void-__user-not-void-__user.txt 5101-XFRM-Handle-DCCP-in-xfrm-4-6-_decode_session.txt 5104-SCTP-Fix-sctp-to-not-return-erroneous-POLLOUT-events.txt 5106-TG3-Fix-peer-device-handling.txt 5107-TG3-Some-low-power-fixes.txt 5108-TG3-Add-tw32_wait_f-for-some-sensitive-registers.txt 5109-TG3-Fix-ethtool-memory-test.txt 5112-RPC-Do-not-block-on-skb-allocation.txt 5114-SUNRPC-Fix-EPIPE-error-on-mount-of-rpcsec_gss-protected-partitions.txt 5131-IPV6-Flag-RTF_ANYCAST-for-anycast-routes.txt 5132-IPV6-Try-not-to-send-icmp-to-anycast-address.txt 5133-IPV6-Defer-IPv6-device-initialization-until-the-link-becomes-ready.txt 5134-IPV6-Run-DAD-when-the-link-becomes-ready.txt 5135-IPV6-Don-t-select-a-tentative-address-as-a-source-address.txt 5140-NETROM-Fix-three-if-statements-in-nr_state1_machine.txt 5141-VLAN-Add-two-missing-checks-to-vlan_ioctl_h! andler.txt 5142-IPV6-Fix-address-deletion.txt 5143-DCCP-Comme! nt-typo. txt 5147-IPSEC-Fix-policy-updates-missed-by-sockets.txt 5153-SUNGEM-Fix-link-error-with-CONFIG_HOTPLUG-disabled.txt 5156-IPV6-Fix-dead-lock.txt 5157-IPV6-Fix-Temporary-Address-Generation.txt 5158-chelsio-transmit-routine-return-values.txt 5159-skge-avoid-up-down-on-speed-changes.txt 5160-skge-avoid-up-down-on-pause-param-changes.txt 5161-skge-handle-out-of-memory-on-MTU-size-changes.txt 5162-skge-get-rid-of-Yukon2-defines.txt 5163-skge-handle-out-of-memory-on-ring-parameter-change.txt 5164-skge-version-number-1.3.txt 5165-git-netdev-all-s2io-warning-fix.txt 5166-spidernet-fix-Kconfig-after-BPA-CELL-rename.txt 5167-skge-error-handling-on-resume.txt 5168-sky2-handle-out-of-memory-on-admin-changes.txt 5169-sky2-don-t-lose-multicast-addresses.txt 5170-sky2-handle-hardware-packet-overrun.txt 5171-sky2-version-0.11.txt 5173-orinoco_nortel-Fix-incorrect-PCI-resource-use.txt 5174-orinoco_nortel-Add-Symbol-LA-4123-ID.txt 5175-missing-license-for-libphy.ko.txt 5179-forcedeth-fix-rando! m-memory-scribbling-bug.txt 5198-IPV6-Increase-default-MLD_MAX_MSF-to-64.txt 5199-BR_NETFILTER-Fix-leak-if-skb-traverses-1-bridge.txt 5201-IPV6-Fix-addrconf-dead-lock.txt 5202-NET-Validate-socket-filters-against-BPF_MAXINSNS-in-one-spot.txt 5203-IPV6-mcast-Fix-multiple-issues-in-MLDv2-reports.txt 5205-TG3-ethtool-d-hangs-PCIe-systems.txt 5206-TG3-Update-driver-version-and-reldate.txt 5518-s-retreiv-retriev-g.txt 5541-TCP-BIC-remove-low-utilization-code.txt 5542-TCP-BIC-spelling-and-whitespace.txt 5543-TCP-BIC-CUBIC-window-growth-2.0.txt 5544-NETFILTER-ip_tables-NUMA-aware-allocation.txt 5545-NETFILTER-ebtables-Support-nf_log-API-from-ebt_log-and-ebt_ulog.txt 5546-IPV4-Safer-reassembly.txt 5547-IPV6-Reuse-inet_csk_get_port-in-tcp_v6_get_port.txt 5548-IPV6-Generalise-__tcp_v6_hash-renaming-it-to-__inet6_hash.txt 5549-ICSK-make-inet_csk_reqsk_queue_hash_add-timeout-arg-unsigned-long.txt 5550-IPV6-Generalise-tcp_v6_search_req-tcp_v6_synq_add.txt 5551-IPV6-Introduce-inet6_rsk.txt! 5552-ICSK-Rename-struct-tcp_func-to-struct-inet_connection_s! ock_af_o ps.txt 5553-ICSK-Move-v4_addr2sockaddr-from-TCP-to-icsk.txt 5554-DCCP-Introduce-dccp_ipv4_af_ops.txt 5555-IP-Simplify-and-consolidate-MSG_PEEK-error-handling.txt 5556-UDP-udp_checksum_init-return-value.txt 5557-IPVS-remove-dead-code.txt 5558-NET-Avoid-atomic-xchg-for-non-error-case.txt 5559-AF_UNIX-Remove-superfluous-reference-counting-in-unix_stream_sendmsg.txt 5560-IPV6-Generalise-some-functions.txt 5561-IPV6-Introduce-inet6_timewait_sock.txt 5562-IPV6-Export-some-symbols-for-DCCPv6.txt 5563-DCCP-Just-rename-dccp_v4_prot-to-dccp_prot.txt 5564-DCCP-Prepare-the-AF-agnostic-core-for-the-introduction-of-DCCPv6.txt 5565-IPV6-Export-ipv6_opt_accepted.txt 5567-DCCP-Use-reqsk_free-in-dccp_v4_conn_request.txt 5571-TCP-Move-the-TCPF_-enum-to-tcp_states.h.txt 5573-AF_UNIX-Use-spinlock-for-unix_table_lock.txt 5574-BRIDGE-allow-setting-hardware-address-of-bridge-pseudo-dev.txt 5575-BRIDGE-handle-speed-detection-after-carrier-changes.txt 5576-BRIDGE-filter-packets-in-learning-state.txt ! 5577-BRIDGE-limited-ethtool-support.txt 5578-BRIDGE-add-version-number.txt 5579-PKT_SCHED-netem-packet-corruption-option.txt 5582-TCP-cubic-precompute-constants.txt 5583-TCP-cubic-use-Newton-Raphson.txt 5584-IPV4-fib_trie-Add-credits.txt 5585-SCTP-Update-SCTP_PEER_ADDR_PARAMS-socket-option-to-the-latest-api-draft.txt 5586-SCTP-Add-support-for-SCTP_DELAYED_ACK_TIME-socket-option.txt 5587-NET-Small-cleanup-to-socket-initialization.txt 5588-NET-move-struct-proto_ops-to-const.txt 5589-PKTGEN-Deinitialise-static-variables.txt 5590-NET-Fix-sock_init-return-value.txt 5591-NET-restructure-sock_aio_-read-write-sock_-readv-writev.txt 5594-TCP-Don-t-use-__constant_htonl-for-a-non-const-arg.txt 5595-PPPOX-Fix-assignment-into-const-proto_ops.txt 5596-NET-Speed-up-__alloc_skb.txt 5597-AF_UNIX-Convert-to-use-a-spinlock-instead-of-rwlock.txt 5598-NETLINK-genetlink-fix-cmd-type-in-genl_ops-to-be-consistent-to-u8.txt 5599-NETROM-Remove-unessecary-lock_sock-calls-in-netrom_ioctl.txt 5600-NET-A! dd-a-dev_ioctl-fallback-to-sock_ioctl.txt 5601-TG3-fixup-tot_! len-calc ulation.txt 5602-IPVS-Cleanup-IP_VS_DBG-statements.txt 5603-DECNET-Only-use-local-routers.txt 5604-DCCP-Do-not-process-a-packet-twice-when-it-s-not-in-state-DCCP_OPEN.txt 5605-DCCP-Send-an-ACK-vector-when-ACKing-a-response-packet.txt 5606-DCCP-Notify-CCID-only-after-ACK-vectors-have-been-processed.txt 5607-BRIDGE-Fix-faulty-check-in-br_stp_recalculate_bridge_id.txt 5608-IPV4-fib_trie-build-fix.txt 5610-IEEE80211-ipw2200-Simplify-multicast-checks.txt 5611-TCP-less-inline-s.txt 5612-DCCP-ackvec-Fix-spelling-of-throw.txt 5613-DCCP-ackvec-use-u8-for-the-buf-offsets.txt 5614-TCP-syn_flood_warning-is-only-needed-if-CONFIG_SYN_COOKIES-is-selected.txt 5700-ECONET-Use-macro-for-spinlock_t-definition.txt 5701-IPV6-Use-macro-for-rwlock_t-initialization.txt 5702-NETFILTER-Use-macro-for-spinlock_t-rwlock_t-initializations-definition.txt 5703-NET-More-instruction-checks-fornet-core-filter.c.txt 5704-TCP-tcp_vegas-Fix-slow-start.txt 5730-IPVS-Fix-compilation.txt 5731-NETFILTER-Decrease-num! ber-of-pointer-derefs-in-nfnetlink_queue.c.txt 5732-NETFILTER-Decrease-number-of-pointer-derefs-in-nf_conntrack_core.c.txt 5733-NETFILTER-ctnetlink-remove-bogus-checks-in-ICMP-protocol-at-dumping.txt 5734-NETFILTER-ctnetlink-Add-sanity-checkings-for-ICMP.txt 5735-NETFILTER-ctnetlink-propagate-ctnetlink_dump_tuples_proto-return-value-back.txt 5736-NETFILTER-ctnetlink-use-u_int32_t-instead-of-unsigned-int.txt 5737-NETFILTER-ctnetlink-ctnetlink_event-cleanup.txt 5738-NETFILTER-ctnetlink-fix-conntrack-mark-race.txt 5739-NETFILTER-ctnetlink-remove-unused-variable.txt 5740-NETFILTER-Add-ctnetlink-port-for-nf_conntrack.txt 5741-NETFILTER-Filter-dumped-entries-based-on-the-layer-3-protocol-number.txt 5742-NETFILTER-Fix-module_param-types-and-permissions.txt 5743-NETFILTER-ctnetlink-Fix-dumping-of-helper-name.txt 5744-NETFILTER-Remove-okfn-usage-in-ip_vs_core.c.txt 5745-NETFILTER-Call-POST_ROUTING-hook-before-fragmentation.txt 5746-NETFILTER-make-ipv6_find_hdr-find-transport-protocol! -header.txt 5747-NETFILTER-Export-ip6_masked_addrcmp-don-t-pa! ss-IPv6- addresses-on-stack.txt 5748-NETFILTER-nf_conntrack_l3proto_ipv4.c-needs-net-route.h.txt 5749-NETFILTER-Use-HOPLIMIT-metric-as-TTL-of-TCP-reset-sent-by-REJECT.txt 5776-NET-Change-1500-to-ETH_DATA_LEN-in-some-files.txt 5796-knfsd-fix-hash-function-for-IP-addresses-on-64bit-little-endian-machines.txt 6008-parport-include-fixes.txt 6015-Keep-nfsd-from-exiting-when-seeing-recv-errors.txt added hold last reject removed +- Address of void __user \* is void __user \* \*, not void \* __user \* - [XFRM]: Handle DCCP in xfrm{4,6}_decode_session - [SCTP]: Fix sctp to not return erroneous POLLOUT events. - [TG3]: Fix peer device handling @@ -4776,6 +4776,7 @@ - knfsd: fix hash function for IP addresses on 64bit little-endian machines. - parport: include fixes - Keep nfsd from exiting when seeing recv() errors +- Add bcm43xx support from FC5 (thanks dwmw2!) * Thu Jan 5 2006 Dave Jones [2.6.14-1.1656_FC4] - Rebuild. From fedora-cvs-commits at redhat.com Sat Jan 7 16:06:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 7 Jan 2006 11:06:20 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.230,1.231 Message-ID: <200601071606.k07G6KA2017507@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17477 Modified Files: eclipse.spec Log Message: - Change about_files to be i386 and x86_64 only (will patch file upstream). Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.230 retrieving revision 1.231 diff -u -r1.230 -r1.231 --- eclipse.spec 6 Jan 2006 22:21:46 -0000 1.230 +++ eclipse.spec 7 Jan 2006 16:06:17 -0000 1.231 @@ -1116,7 +1116,7 @@ %{_datadir}/%{name}/features/org.eclipse.rcp.source_3.* %files platform -f %{name}-platform.install -%ifnarch ppc +%ifarch %{ix86} x86_64 %{_datadir}/%{name}/about.html %{_datadir}/%{name}/about_files %endif @@ -1268,6 +1268,7 @@ - Update s390{,x} patches. - Use natively-compiled ecj during build. - Attempt build on ia64. +- Change about_files to be i386 and x86_64 only (will patch file upstream). * Fri Dec 23 2005 Andrew Overholt 3.1.1-1jpp_14fc - Rebuild again. From fedora-cvs-commits at redhat.com Sat Jan 7 18:06:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 7 Jan 2006 13:06:05 -0500 Subject: rpms/booty/devel .cvsignore, 1.34, 1.35 booty.spec, 1.37, 1.38 sources, 1.36, 1.37 Message-ID: <200601071806.k07I65Fx031771@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31724/devel Modified Files: .cvsignore booty.spec sources Log Message: auto-import booty-0.64-1 on branch devel from booty-0.64-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 6 Jan 2006 18:46:35 -0000 1.34 +++ .cvsignore 7 Jan 2006 18:06:02 -0000 1.35 @@ -1 +1 @@ -booty-0.63.tar.bz2 +booty-0.64.tar.bz2 Index: booty.spec =================================================================== RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- booty.spec 6 Jan 2006 18:46:35 -0000 1.37 +++ booty.spec 7 Jan 2006 18:06:02 -0000 1.38 @@ -1,6 +1,6 @@ Summary: simple python bootloader config lib Name: booty -Version: 0.63 +Version: 0.64 Release: 1 License: LGPL Source0: %{name}-%{version}.tar.bz2 @@ -34,6 +34,9 @@ %changelog +* Sat Jan 7 2006 Jeremy Katz - 0.64-1 +- fix syntax error + * Fri Jan 6 2006 Peter Jones - 0.63-1 - don't write a log, for now. Index: sources =================================================================== RCS file: /cvs/dist/rpms/booty/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 6 Jan 2006 18:46:35 -0000 1.36 +++ sources 7 Jan 2006 18:06:02 -0000 1.37 @@ -1 +1 @@ -d389f248c9569cf0bb019328a896e455 booty-0.63.tar.bz2 +e5d252359b8738d7a35177d8ac1d36a7 booty-0.64.tar.bz2 From fedora-cvs-commits at redhat.com Sun Jan 8 01:59:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 7 Jan 2006 20:59:07 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.124, 1.125 config-s390-generic, 1.7, 1.8 Message-ID: <200601080159.k081x7Tk021969@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv21913/configs Modified Files: config-generic config-s390-generic Log Message: * Sat Jan 07 2006 Dave Jones - 2.6.15-git3 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- config-generic 6 Jan 2006 15:02:01 -0000 1.124 +++ config-generic 8 Jan 2006 01:59:04 -0000 1.125 @@ -550,6 +550,7 @@ # I2O device support # # CONFIG_I2O is not set +# CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set # # Networking support @@ -1512,6 +1513,7 @@ CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83L785TS=m @@ -2646,4 +2648,3 @@ ## END of ISA options. - Index: config-s390-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-s390-generic,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config-s390-generic 19 Sep 2005 20:12:04 -0000 1.7 +++ config-s390-generic 8 Jan 2006 01:59:04 -0000 1.8 @@ -135,8 +135,10 @@ # # S390 crypto hw # -CONFIG_CRYPTO_SHA1_Z990=m -CONFIG_CRYPTO_DES_Z990=m +CONFIG_CRYPTO_SHA1_S390=m +CONFIG_CRYPTO_SHA256_S390=m +CONFIG_CRYPTO_DES_S390=m +CONFIG_CRYPTO_AES_S390=m # # Kernel hacking @@ -171,4 +173,3 @@ # CONFIG_ATA_OVER_ETH is not set # CONFIG_MII is not set - From fedora-cvs-commits at redhat.com Sun Jan 8 01:59:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 7 Jan 2006 20:59:07 -0500 Subject: rpms/kernel/devel patch-2.6.15-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.315, 1.316 kernel-2.6.spec, 1.1832, 1.1833 linux-2.6-debug-taint-vm.patch, 1.2, 1.3 linux-2.6-gcc41.patch, 1.5, 1.6 sources, 1.257, 1.258 upstream, 1.239, 1.240 linux-2.6-posix-timers-sched_time-accumulation.patch, 1.1, NONE linux-2.6-swsusp-nofreeze.patch, 1.1, NONE linux-2.6-write-protect-rodata.patch, 1.8, NONE patch-2.6.15-git2.bz2.sign, 1.1, NONE Message-ID: <200601080159.k081x7uK021950@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21913 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-debug-taint-vm.patch linux-2.6-gcc41.patch sources upstream Added Files: patch-2.6.15-git3.bz2.sign Removed Files: linux-2.6-posix-timers-sched_time-accumulation.patch linux-2.6-swsusp-nofreeze.patch linux-2.6-write-protect-rodata.patch patch-2.6.15-git2.bz2.sign Log Message: * Sat Jan 07 2006 Dave Jones - 2.6.15-git3 --- NEW FILE patch-2.6.15-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDv3dqyGugalF9Dw4RAltGAJ9ZAdQaFjaJVqnh1hIkd7BkB+l+kQCZAS1Y e0BszdDaVdrUy7y3FrFXyPw= =hofb -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.315 retrieving revision 1.316 diff -u -r1.315 -r1.316 --- .cvsignore 6 Jan 2006 15:01:25 -0000 1.315 +++ .cvsignore 8 Jan 2006 01:59:03 -0000 1.316 @@ -2,5 +2,5 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 -patch-2.6.15-git2.bz2 +patch-2.6.15-git3.bz2 bcm43xx-20060106.tar.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1832 retrieving revision 1.1833 diff -u -r1.1832 -r1.1833 --- kernel-2.6.spec 7 Jan 2006 04:14:03 -0000 1.1832 +++ kernel-2.6.spec 8 Jan 2006 01:59:03 -0000 1.1833 @@ -206,7 +206,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git2.bz2 +Patch1: patch-2.6.15-git3.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -265,7 +265,6 @@ Patch811: linux-2.6-execshield-xen.patch Patch812: linux-2.6-execshield-vdso.patch Patch813: linux-2.6-xen-vdso-note.patch -Patch814: linux-2.6-write-protect-rodata.patch # Module signing infrastructure. Patch900: linux-2.6-modsign-core.patch @@ -343,7 +342,6 @@ Patch1600: linux-2.6-procfs-i_nlink-miscalculate.patch Patch1610: linux-2.6-atkbd-dell-multimedia.patch Patch1630: linux-2.6-module_version.patch -Patch1640: linux-2.6-swsusp-nofreeze.patch Patch1650: linux-2.6-input-kill-stupid-messages.patch Patch1660: linux-2.6-input-usblegacy.patch Patch1670: linux-2.6-serial-tickle-nmi.patch @@ -364,7 +362,6 @@ Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch Patch1850: linux-2.6-mv643xx-compile-fix.patch -Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -718,9 +715,6 @@ %patch813 -p1 %endif -# Write protect rodata -%patch814 -p1 - # # GPG signed kernel modules # @@ -830,8 +824,6 @@ %patch1610 -p1 # Add missing MODULE_VERSION tags to some modules. %patch1630 -p1 -# Fix suspend to sbp devices. (166452) -%patch1640 -p1 # The input layer spews crap no-one cares about. %patch1650 -p1 # usb legacy workaround. @@ -872,8 +864,6 @@ %patch1840 -p1 # Fix compilation for MV643xx Ethernet %patch1850 -p1 -# Fix posix-cpu-timers sched_time accumulation -%patch1860 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1402,6 +1392,9 @@ %endif %changelog +* Sat Jan 07 2006 Dave Jones +- 2.6.15-git3 + * Fri Jan 6 2006 Dave Jones - Enable nvram driver for x86-64 - Fix posix-cpu-timers sched_time accumulation linux-2.6-debug-taint-vm.patch: linux-2.6.11/include/asm-generic/bug.h | 8 ++++++-- linux-2.6.15/mm/page_alloc.c | 4 ++-- linux-2000/kernel/panic.c | 1 + linux-2000/mm/slab.c | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-taint-vm.patch 15 Nov 2005 17:23:57 -0000 1.2 +++ linux-2.6-debug-taint-vm.patch 8 Jan 2006 01:59:03 -0000 1.3 @@ -36,20 +36,23 @@ void add_taint(unsigned flag) { ---- linux-2.6.14/mm/page_alloc.c~ 2005-11-15 12:09:41.000000000 -0500 -+++ linux-2.6.14/mm/page_alloc.c 2005-11-15 12:10:01.000000000 -0500 -@@ -126,9 +126,9 @@ static void bad_page(const char *functio +--- linux-2.6.15/mm/page_alloc.c~ 2006-01-07 20:48:33.000000000 -0500 ++++ linux-2.6.15/mm/page_alloc.c 2006-01-07 20:49:24.000000000 -0500 +@@ -136,12 +136,12 @@ static inline int bad_range(struct zone + static void bad_page(struct page *page) { - printk(KERN_EMERG "Bad page state at %s (in process '%s', page %p)\n", - function, current->comm, page); -- printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d\n", -+ printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n", - (int)(2*sizeof(unsigned long)), (unsigned long)page->flags, -- page->mapping, page_mapcount(page), page_count(page)); -+ page->mapping, page_mapcount(page), page_count(page), print_tainted()); - printk(KERN_EMERG "Backtrace:\n"); + printk(KERN_EMERG "Bad page state in process '%s'\n" +- "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n" ++ "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n" + "Trying to fix it up, but a reboot is needed\n" + "Backtrace:\n", + current->comm, page, (int)(2*sizeof(unsigned long)), + (unsigned long)page->flags, page->mapping, +- page_mapcount(page), page_count(page)); ++ page_mapcount(page), page_count(page), print_tainted()); dump_stack(); - printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"); + page->flags &= ~(1 << PG_lru | + 1 << PG_private | diff -urNp --exclude-from=/home/davej/.exclude linux-1740/mm/slab.c linux-2000/mm/slab.c --- linux-1740/mm/slab.c +++ linux-2000/mm/slab.c linux-2.6-gcc41.patch: linux-2.6.14/include/asm-x86_64/apic.h | 2 linux-2.6/drivers/isdn/act2000/capi.h | 88 +++++++++--------- linux-2.6/drivers/isdn/hisax/hisax.h | 20 ++-- linux-2.6/drivers/isdn/hisax/hisax_fcpcipnp.h | 18 +-- linux-2.6/drivers/net/3c527.h | 50 +++++----- linux-2.6/drivers/net/irda/vlsi_ir.h | 4 linux-2.6/drivers/net/wan/sdla.c | 6 - linux-2.6/fs/afs/volume.h | 4 linux-2.6/include/linux/atalk.h | 18 +-- linux-2.6/include/linux/cycx_x25.h | 66 ++++++------- linux-2.6/include/linux/if_frad.h | 12 +- linux-2.6/include/linux/isdnif.h | 70 +++++++------- linux-2.6/include/linux/ncp.h | 126 +++++++++++++------------- linux-2.6/include/linux/sdla.h | 64 ++++++------- linux-2.6/include/linux/wavefront.h | 34 +++---- linux-2.6/include/net/dn_dev.h | 80 ++++++++-------- linux-2.6/include/net/dn_nsp.h | 74 +++++++-------- linux-2.6/include/sound/wavefront.h | 34 +++---- 18 files changed, 384 insertions(+), 386 deletions(-) Index: linux-2.6-gcc41.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gcc41.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-gcc41.patch 4 Jan 2006 02:13:39 -0000 1.5 +++ linux-2.6-gcc41.patch 8 Jan 2006 01:59:03 -0000 1.6 @@ -1,17 +1,6 @@ Silence some gcc4.1 warnings. ---- linux-2.6.14/include/asm-x86_64/mpspec.h~ 2005-12-06 23:04:19.000000000 -0500 -+++ linux-2.6.14/include/asm-x86_64/mpspec.h 2005-12-06 23:05:32.000000000 -0500 -@@ -76,7 +76,7 @@ struct mpc_config_bus - { - unsigned char mpc_type; - unsigned char mpc_busid; -- unsigned char mpc_bustype[6] __attribute((packed)); -+ unsigned char mpc_bustype[6]; - }; - - /* List of Bus Type string values, Intel MP Spec. */ Prevent a zillion 'value computed is not used' warnings. @@ -58,7 +47,6 @@ drivers/net/3c527.h | 50 +++++++------- drivers/net/irda/vlsi_ir.h | 4 - drivers/net/wan/sdla.c | 6 - - include/asm-i386/mpspec_def.h | 4 - include/linux/atalk.h | 18 ++--- include/linux/cycx_x25.h | 66 +++++++++--------- include/linux/if_frad.h | 12 +-- @@ -71,21 +59,6 @@ include/sound/wavefront.h | 34 ++++----- 16 files changed, 340 insertions(+), 340 deletions(-) -Index: linux-2.6/include/asm-i386/mpspec_def.h -=================================================================== ---- linux-2.6.orig/include/asm-i386/mpspec_def.h -+++ linux-2.6/include/asm-i386/mpspec_def.h -@@ -75,8 +75,8 @@ struct mpc_config_bus - { - unsigned char mpc_type; - unsigned char mpc_busid; -- unsigned char mpc_bustype[6] __attribute((packed)); --}; -+ unsigned char mpc_bustype[6]; -+} __attribute((packed)); - - /* List of Bus Type string values, Intel MP Spec. */ - #define BUSTYPE_EISA "EISA" Index: linux-2.6/include/linux/if_frad.h =================================================================== --- linux-2.6.orig/include/linux/if_frad.h Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- sources 6 Jan 2006 15:01:57 -0000 1.257 +++ sources 8 Jan 2006 01:59:03 -0000 1.258 @@ -1,3 +1,3 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 0eee153ab442496ead0581d00e83a1ca patch-2.6.15-git2.bz2 -1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2 +d1eedbc54fa76391548a927b3325d235 patch-2.6.15-git3.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.239 retrieving revision 1.240 diff -u -r1.239 -r1.240 --- upstream 6 Jan 2006 09:08:14 -0000 1.239 +++ upstream 8 Jan 2006 01:59:03 -0000 1.240 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 -patch-2.6.15-git2.bz2 +patch-2.6.15-git3.bz2 --- linux-2.6-posix-timers-sched_time-accumulation.patch DELETED --- --- linux-2.6-swsusp-nofreeze.patch DELETED --- --- linux-2.6-write-protect-rodata.patch DELETED --- --- patch-2.6.15-git2.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Sun Jan 8 02:04:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 7 Jan 2006 21:04:14 -0500 Subject: rpms/kernel/devel .cvsignore,1.316,1.317 sources,1.258,1.259 Message-ID: <200601080204.k0824Ewl023053@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23008 Modified Files: .cvsignore sources Log Message: unbreak Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- .cvsignore 8 Jan 2006 01:59:03 -0000 1.316 +++ .cvsignore 8 Jan 2006 02:04:10 -0000 1.317 @@ -4,3 +4,4 @@ linux-2.6.15.tar.bz2 patch-2.6.15-git3.bz2 bcm43xx-20060106.tar.bz2 +ieee80211softmac-20060103.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.258 retrieving revision 1.259 diff -u -r1.258 -r1.259 --- sources 8 Jan 2006 01:59:03 -0000 1.258 +++ sources 8 Jan 2006 02:04:10 -0000 1.259 @@ -1,3 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -0eee153ab442496ead0581d00e83a1ca patch-2.6.15-git2.bz2 d1eedbc54fa76391548a927b3325d235 patch-2.6.15-git3.bz2 +1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2 +1eb2bb778090c59fbeba6278d63a9309 ieee80211softmac-20060103.tar.bz2 From fedora-cvs-commits at redhat.com Sun Jan 8 10:36:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 8 Jan 2006 05:36:43 -0500 Subject: rpms/foomatic/FC-4 foomatic.spec,1.93,1.94 Message-ID: <200601081036.k08Aahfv007107@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv7071 Modified Files: foomatic.spec Log Message: * Sun Jan 8 2006 Tim Waugh 3.0.2-19.1 - Fix hpijs conflict (bug #177230). Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/FC-4/foomatic.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- foomatic.spec 7 Jun 2005 14:18:41 -0000 1.93 +++ foomatic.spec 8 Jan 2006 10:36:39 -0000 1.94 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 19 +Release: 19.1 License: GPL Group: System Environment/Libraries @@ -94,7 +94,7 @@ # We need ghostscript to have the gimp-print-4.2.0 driver, and hpijs 1.1. Conflicts: ghostscript < 7.05 -Conflicts: hpijs < 1.5 +Conflicts: hpijs < 0:1.5 %description Foomatic is a comprehensive, spooler-independent database of printers, @@ -289,6 +289,9 @@ %{_mandir}/*/* %changelog +* Sun Jan 8 2006 Tim Waugh 3.0.2-19.1 +- Fix hpijs conflict (bug #177230). + * Tue Jun 7 2005 Tim Waugh - Add IEEE 1284 ID for Epson Stylus Photo 870 (bug #159719). From fedora-cvs-commits at redhat.com Mon Jan 9 01:14:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 8 Jan 2006 20:14:38 -0500 Subject: rpms/postgresql/devel .cvsignore, 1.27, 1.28 postgresql.spec, 1.61, 1.62 sources, 1.28, 1.29 Message-ID: <200601090114.k091EcEu017600@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/postgresql/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17585 Modified Files: .cvsignore postgresql.spec sources Log Message: Update to PostgreSQL 8.1.2. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/postgresql/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 14 Dec 2005 22:32:59 -0000 1.27 +++ .cvsignore 9 Jan 2006 01:14:36 -0000 1.28 @@ -1,4 +1,4 @@ -postgresql-8.1.1.tar.bz2 +postgresql-8.1.2.tar.bz2 PyGreSQL-3.7.tgz pgtcl1.5.2.tar.gz pgtcldocs-20041108.zip Index: postgresql.spec =================================================================== RCS file: /cvs/dist/rpms/postgresql/devel/postgresql.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- postgresql.spec 15 Dec 2005 19:38:07 -0000 1.61 +++ postgresql.spec 9 Jan 2006 01:14:36 -0000 1.62 @@ -81,8 +81,8 @@ Summary: PostgreSQL client programs and libraries. Name: postgresql -Version: 8.1.1 -Release: 3 +Version: 8.1.2 +Release: 1 License: BSD Group: Applications/Databases Url: http://www.postgresql.org/ @@ -816,6 +816,9 @@ %endif %changelog +* Sun Jan 8 2006 Tom Lane 8.1.2-1 +- Update to PostgreSQL 8.1.2 + * Thu Dec 15 2005 Tom Lane 8.1.1-3 - fix pg_config.h for 64-bit and ppc platforms - update Makefile.regress (needs to --load-language=plpgsql) Index: sources =================================================================== RCS file: /cvs/dist/rpms/postgresql/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 14 Dec 2005 22:33:00 -0000 1.28 +++ sources 9 Jan 2006 01:14:36 -0000 1.29 @@ -1,4 +1,4 @@ -d22d7bd1d5e5f9aa89d574ff66e2c8bb postgresql-8.1.1.tar.bz2 +12d54a11bc3a414477d37ef338bec161 postgresql-8.1.2.tar.bz2 9fa4c2fc1dd0b3b93a3381c048443e16 PyGreSQL-3.7.tgz d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz 3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip From fedora-cvs-commits at redhat.com Mon Jan 9 02:47:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 8 Jan 2006 21:47:03 -0500 Subject: rpms/gedit/devel gedit-2.13.1-filesel-persistent-size.patch, NONE, 1.1 gedit.spec, 1.55, 1.56 gedit-2.5.90-filesel.patch, 1.2, NONE gedit-2.7.92-opensize.patch, 1.1, NONE Message-ID: <200601090247.k092l3oK002646@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2572 Modified Files: gedit.spec Added Files: gedit-2.13.1-filesel-persistent-size.patch Removed Files: gedit-2.5.90-filesel.patch gedit-2.7.92-opensize.patch Log Message: * Sun Jan 8 2006 Dan Williams - 1:2.13.1-2 - Fix up and re-enable persistent file selector size patch gedit-2.13.1-filesel-persistent-size.patch: data/gedit.schemas.in | 24 ++++++++++++++++++++++++ gedit/gedit-commands-file.c | 25 +++++++++++++++++++++++++ gedit/gedit-prefs-manager.c | 10 ++++++++++ gedit/gedit-prefs-manager.h | 16 ++++++++++++++++ 4 files changed, 75 insertions(+) --- NEW FILE gedit-2.13.1-filesel-persistent-size.patch --- --- gedit-2.13.1/data/gedit.schemas.in.filesel 2006-01-08 21:06:29.000000000 -0500 +++ gedit-2.13.1/data/gedit.schemas.in 2006-01-08 21:19:10.000000000 -0500 @@ -604,5 +604,29 @@ is writable by default. + + + /schemas/apps/gedit-2/preferences/ui/open_save/selector_width + /apps/gedit-2/preferences/ui/open_save/selector_width + gedit + int + 400 + + Open/Save Dialog Width + Persistent Open/Save dialog width. + + + + + /schemas/apps/gedit-2/preferences/ui/open_save/selector_height + /apps/gedit-2/preferences/ui/open_save/selector_height + gedit + int + 400 + + Open/Save Dialog Height + Persistent Open/Save dialog height. + + --- gedit-2.13.1/gedit/gedit-prefs-manager.h.filesel 2006-01-08 21:10:21.000000000 -0500 +++ gedit-2.13.1/gedit/gedit-prefs-manager.h 2006-01-08 21:22:10.000000000 -0500 @@ -101,6 +101,10 @@ #define GPM_RECENTS_DIR GPM_PREFS_DIR "/ui/recents" #define GPM_MAX_RECENTS GPM_RECENTS_DIR "/max_recents" +#define GPM_OPENSAVE_DIR GPM_PREFS_DIR "/ui/open_save" +#define GPM_OPENSAVE_WIDTH GPM_OPENSAVE_DIR "/selector_width" +#define GPM_OPENSAVE_HEIGHT GPM_OPENSAVE_DIR "/selector_height" + /* Print */ #define GPM_PRINT_PAGE_DIR GPM_PREFS_DIR "/print/page" #define GPM_PRINT_SYNTAX GPM_PRINT_PAGE_DIR "/print_syntax_highlighting" @@ -184,6 +188,9 @@ #define GPM_DEFAULT_MAX_RECENTS 5 +#define GPM_DEFAULT_OPENSAVE_WIDTH 400 +#define GPM_DEFAULT_OPENSAVE_HEIGHT 400 + #define GPM_DEFAULT_WINDOW_STATE 0 #define GPM_DEFAULT_WINDOW_WIDTH 650 #define GPM_DEFAULT_WINDOW_HEIGHT 500 @@ -377,6 +384,15 @@ */ gint gedit_prefs_manager_get_max_recents (void); +/* Persistent size of open/save dialogs */ +gint gedit_prefs_manager_get_opensave_dialog_width (void); +void gedit_prefs_manager_set_opensave_dialog_width (gint width); +gboolean gedit_prefs_manager_opensave_dialog_width_can_set (void); + +gint gedit_prefs_manager_get_opensave_dialog_height (void); +void gedit_prefs_manager_set_opensave_dialog_height (gint height); +gboolean gedit_prefs_manager_opensave_dialog_height_can_set (void); + /* Encodings */ GSList *gedit_prefs_manager_get_auto_detected_encodings (void); --- gedit-2.13.1/gedit/gedit-commands-file.c.filesel 2006-01-08 21:22:53.000000000 -0500 +++ gedit-2.13.1/gedit/gedit-commands-file.c 2006-01-08 21:29:17.000000000 -0500 @@ -50,6 +50,7 @@ #include "dialogs/gedit-close-confirmation-dialog.h" #include "dialogs/gedit-open-location-dialog.h" #include "gedit-file-chooser-dialog.h" +#include "gedit-prefs-manager.h" /* Defined constants */ @@ -239,9 +240,15 @@ { GSList *uris; const GeditEncoding *encoding; + gint selector_width; + gint selector_height; gedit_debug (DEBUG_COMMANDS); + gtk_window_get_size (GTK_WINDOW (dialog), &selector_width, &selector_height); + gedit_prefs_manager_set_opensave_dialog_width (selector_width); + gedit_prefs_manager_set_opensave_dialog_height (selector_height); + if (response_id != GTK_RESPONSE_OK) { gtk_widget_destroy (GTK_WIDGET (dialog)); @@ -272,6 +279,8 @@ gpointer data; GeditDocument *doc; gchar *default_path = NULL; + gint selector_width; + gint selector_height; gedit_debug (DEBUG_COMMANDS); @@ -336,6 +345,10 @@ g_free (default_path); + selector_width = gedit_prefs_manager_get_opensave_dialog_width (); + selector_height = gedit_prefs_manager_get_opensave_dialog_height (); + gtk_window_resize (GTK_WINDOW (open_dialog), selector_width, selector_height); + g_signal_connect (open_dialog, "response", G_CALLBACK (open_dialog_response_cb), @@ -585,6 +598,8 @@ GeditTab *tab; gpointer data; GSList *tabs_to_save_as; + gint selector_width; + gint selector_height; gedit_debug (DEBUG_COMMANDS); @@ -603,6 +618,10 @@ encoding = gedit_file_chooser_dialog_get_encoding (dialog); + gtk_window_get_size (GTK_WINDOW (dialog), &selector_width, &selector_height); + gedit_prefs_manager_set_opensave_dialog_width (selector_width); + gedit_prefs_manager_set_opensave_dialog_height (selector_height); + gtk_widget_destroy (GTK_WIDGET (dialog)); if (tab != NULL) @@ -701,6 +720,8 @@ gchar *uri; gboolean uri_set = FALSE; const GeditEncoding *encoding; + gint selector_width; + gint selector_height; g_return_if_fail (GEDIT_IS_TAB (tab)); g_return_if_fail (GEDIT_IS_WINDOW (window)); @@ -778,6 +799,10 @@ G_CALLBACK (save_dialog_response_cb), window); + selector_width = gedit_prefs_manager_get_opensave_dialog_width(); + selector_height = gedit_prefs_manager_get_opensave_dialog_height(); + gtk_window_resize (GTK_WINDOW (save_dialog), selector_width, selector_height); + gtk_widget_show (save_dialog); } --- gedit-2.13.1/gedit/gedit-prefs-manager.c.filesel 2006-01-08 21:10:08.000000000 -0500 +++ gedit-2.13.1/gedit/gedit-prefs-manager.c 2006-01-08 21:20:17.000000000 -0500 @@ -721,6 +721,16 @@ } +/* Open/Save dialog width */ +DEFINE_INT_PREF (opensave_dialog_width, + GPM_OPENSAVE_WIDTH, + GPM_DEFAULT_OPENSAVE_WIDTH) + +/* Open/Save dialog height */ +DEFINE_INT_PREF (opensave_dialog_height, + GPM_OPENSAVE_HEIGHT, + GPM_DEFAULT_OPENSAVE_HEIGHT) + /* Statusbar visiblity */ DEFINE_BOOL_PREF (statusbar_visible, GPM_STATUSBAR_VISIBLE, Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- gedit.spec 3 Jan 2006 17:08:48 -0000 1.55 +++ gedit.spec 9 Jan 2006 02:46:59 -0000 1.56 @@ -15,7 +15,7 @@ Summary: gEdit is a small but powerful text editor for GNOME. Name: gedit Version: 2.13.1 -Release: 1 +Release: 2 Epoch: 1 License: GPL Group: Applications/Editors @@ -27,9 +27,8 @@ PreReq: GConf2 PreReq: desktop-file-utils >= %{desktop_file_utils_version} -# Make the file selector remember last window size and directory -#Patch4: gedit-2.5.90-filesel.patch -#Patch6: gedit-2.7.92-opensize.patch +# Make the file selector remember last window size +Patch0: gedit-2.13.1-filesel-persistent-size.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -78,8 +77,7 @@ %prep %setup -n gedit-%{version} -q -#%patch4 -p1 -b .filesel -#%patch6 -p1 -b .opensize +%patch0 -p1 -b .filesel %build %configure --disable-scrollkeeper @@ -150,6 +148,9 @@ %{_libdir}/pkgconfig/gedit-2.10.pc %changelog +* Sun Jan 8 2006 Dan Williams - 1:2.13.1-2 +- Fix up and re-enable persistent file selector size patch + * Tue Jan 3 2006 Matthias Clasen - 1:2.13.1-1 - Update to 2.13.1 - Disable scrollkeeper --- gedit-2.5.90-filesel.patch DELETED --- --- gedit-2.7.92-opensize.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 08:27:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 03:27:55 -0500 Subject: rpms/tzdata/FC-4 sources,1.14,1.15 tzdata.spec,1.16,1.17 Message-ID: <200601090827.k098RtCv028644@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv27184 Modified Files: sources tzdata.spec Log Message: Trying to re-commit original tzdata.tar.bz2 file, as is yelling at me that the file contents changed. Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 6 Jan 2006 18:51:37 -0000 1.14 +++ sources 9 Jan 2006 08:27:52 -0000 1.15 @@ -1,3 +1,3 @@ -325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 +d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz 063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-4/tzdata.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tzdata.spec 6 Jan 2006 18:51:37 -0000 1.16 +++ tzdata.spec 9 Jan 2006 08:27:52 -0000 1.17 @@ -46,7 +46,7 @@ %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog -* Thu Jan 5 2006 Petr Machata 2005r-2 +* Thu Jan 5 2006 Petr Machata 2005r-1.fc4 - 2005r - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to northamerica to guard against old files with obsolete information @@ -58,6 +58,11 @@ - Fixes in zdump.c (abbrok): conditions are chained, and the string is checked for emptiness. +* Sat Dec 17 2005 Jakub Jelinek 2005q-2 +- 2005q + - changes for Georgia, Azerbaijan, Jordan, Palestine, Cuba, Nicaragua + - SystemV timezone changes + * Tue Sep 6 2005 Jakub Jelinek 2005m-1.fc4 - 2005m - changes for USA (extending DST by 4 weeks since 2007), Tunisia, From fedora-cvs-commits at redhat.com Mon Jan 9 09:13:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 04:13:40 -0500 Subject: rpms/rhgb/devel rhgb.spec,1.41,1.42 Message-ID: <200601090913.k099DeJM009444@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/rhgb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9432 Modified Files: rhgb.spec Log Message: - rebuild against modular X Index: rhgb.spec =================================================================== RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- rhgb.spec 23 Dec 2005 04:49:21 -0000 1.41 +++ rhgb.spec 9 Jan 2006 09:13:37 -0000 1.42 @@ -3,7 +3,7 @@ Summary: Red Hat Graphical Boot Name: rhgb Version: 0.16.2 -Release: 17 +Release: 18 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL @@ -40,11 +40,15 @@ %build %configure -make %{?_smp_mflags} + +# FIXME: need to drop the CPPFLAGS junk and fix this upstream +# (as well as upstream all the patches that have built up) +make %{?_smp_mflags} \ + CPPFLAGS="-I$(pkg-config --variable sdkdir xorg-server)" %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT \ %find_lang %{gettext_package} @@ -61,6 +65,9 @@ %doc doc/HOW_IT_WORKS %changelog +* Sun Jan 8 2006 Ray Strode 0.16.2-18 +- rebuild against modular X + * Thu Dec 22 2005 Jesse Keating 0.16.2-16 - versioned BuildRequires of libxf86config-devel From fedora-cvs-commits at redhat.com Mon Jan 9 09:33:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 04:33:34 -0500 Subject: rpms/traceroute/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 traceroute.spec, 1.19, 1.20 traceroute-1.0.3-compat.patch, 1.1, NONE traceroute-1.0.3-notneighbor.patch, 1.1, NONE Message-ID: <200601090933.k099XYLB032035@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/traceroute/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32002 Modified Files: .cvsignore sources traceroute.spec Removed Files: traceroute-1.0.3-compat.patch traceroute-1.0.3-notneighbor.patch Log Message: - upgrade to 1.0.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/traceroute/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Nov 2005 10:13:52 -0000 1.5 +++ .cvsignore 9 Jan 2006 09:33:31 -0000 1.6 @@ -1 +1 @@ -traceroute-1.0.3.tar.bz2 +traceroute-1.0.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/traceroute/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Nov 2005 10:13:52 -0000 1.5 +++ sources 9 Jan 2006 09:33:31 -0000 1.6 @@ -1 +1 @@ -abd013aadcd289dc2319b35f787de6ef traceroute-1.0.3.tar.bz2 +1217755c6287caa7ca0bfc1ddaa2d9ac traceroute-1.0.4.tar.bz2 Index: traceroute.spec =================================================================== RCS file: /cvs/dist/rpms/traceroute/devel/traceroute.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- traceroute.spec 9 Dec 2005 22:43:38 -0000 1.19 +++ traceroute.spec 9 Jan 2006 09:33:31 -0000 1.20 @@ -1,13 +1,12 @@ Summary: Traces the route taken by packets over a TCP/IP network. Name: traceroute -Version: 1.0.3 -Release: 5.1 +Version: 1.0.4 +Release: 1 Epoch: 2 License: GPL Group: Applications/Internet Source: ftp://ftp.lst.de/pub/people/okir/traceroute/%{name}-%{version}.tar.bz2 -Patch0: traceroute-1.0.3-compat.patch -Patch1: traceroute-1.0.3-notneighbor.patch +Patch0: traceroute-1.0.4-compat.patch BuildRoot: %{_tmppath}/%{name}-root %description @@ -29,7 +28,6 @@ %prep %setup -q %patch0 -p1 -b .compat -%patch1 -p1 -b .notneighbor %build %ifarch s390 s390x @@ -59,6 +57,10 @@ %{_mandir}/man8/* %changelog +* Mon Jan 09 2006 Radek Vokal 1.0.4-1 +- upgrade to 1.0.4 +- proper fix for bug #173762 + * Fri Dec 09 2005 Jesse Keating - rebuilt --- traceroute-1.0.3-compat.patch DELETED --- --- traceroute-1.0.3-notneighbor.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 09:34:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 04:34:25 -0500 Subject: rpms/tzdata/FC-4 .cvsignore, 1.14, 1.15 sources, 1.15, 1.16 tzdata.spec, 1.17, 1.18 Message-ID: <200601090934.k099YPHb032244@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv31869 Modified Files: .cvsignore sources tzdata.spec Log Message: Another round of my personal build-the-damn-thing-for-FC4 war. Changed tzdata.tar.gz to tzdata2005r.tar.gz so that it's possible to update the file in the future. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-4/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 6 Jan 2006 18:51:37 -0000 1.14 +++ .cvsignore 9 Jan 2006 09:34:23 -0000 1.15 @@ -1,3 +1,3 @@ -tzdata.tar.bz2 +tzdata2005r-base.tar.bz2 tzdata2005r.tar.gz tzcode2005r.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-4/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 9 Jan 2006 08:27:52 -0000 1.15 +++ sources 9 Jan 2006 09:34:23 -0000 1.16 @@ -1,3 +1,3 @@ -d20ffc3a857fd1714daadf8edacfb37a tzdata.tar.bz2 +cff383e96d64b7f5d207596827e7cab1 tzdata2005r-base.tar.bz2 b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz 063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-4/tzdata.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- tzdata.spec 9 Jan 2006 08:27:52 -0000 1.17 +++ tzdata.spec 9 Jan 2006 09:34:23 -0000 1.18 @@ -1,10 +1,10 @@ Summary: Timezone data Name: tzdata Version: 2005r -Release: 1.fc4 +Release: 3.fc4 License: GPL Group: System Environment/Base -Source0: %{name}.tar.bz2 +Source0: %{name}%{version}-base.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz Buildroot: /var/tmp/tzdata-root @@ -17,7 +17,7 @@ the world. %prep -%setup -n tzdata +%setup -n %{name} mkdir %{name}%{version} tar xzf %{SOURCE1} -C %{name}%{version} mkdir tzcode%{version} @@ -46,6 +46,11 @@ %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Mon Jan 9 2006 Petr Machata 2005r-3.fc4 +- 2005r-2 + - Meta changes. Renaming tzdata.tar.bz2 file to tzdata$ver-base, + so that it won't clash across updates. + * Thu Jan 5 2006 Petr Machata 2005r-1.fc4 - 2005r - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to From fedora-cvs-commits at redhat.com Mon Jan 9 09:34:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 04:34:46 -0500 Subject: rpms/traceroute/devel traceroute-1.0.4-compat.patch,NONE,1.1 Message-ID: <200601090934.k099YkgW032341@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/traceroute/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32289 Added Files: traceroute-1.0.4-compat.patch Log Message: + patch traceroute-1.0.4-compat.patch: traceroute.1 | 8 ++++---- traceroute.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE traceroute-1.0.4-compat.patch --- --- traceroute-1.0.4/traceroute.1.compat 2003-04-10 10:51:53.000000000 +0200 +++ traceroute-1.0.4/traceroute.1 2006-01-09 10:22:48.000000000 +0100 @@ -1,4 +1,4 @@ -.TH TRACEROUTE 1 "6 December 2000" +.TH TRACEROUTE 8 "6 December 2000" .UC 6 .SH NAME traceroute \- print the route packets take to network host @@ -13,7 +13,7 @@ .BR "" "[" "-t tos" "] [" "-w timeout" "] [" "-q nqueries" ] .br .ti +8 -.BR "" "[" "-S source_addr" "] [" "-I interface" "] +.BR "" "[" "-s source_addr" "] [" "-i interface" "] .br .ti +8 .BR "" [ "-g gateway" "] " host " [" "packetlen" "]" @@ -74,7 +74,7 @@ Not very useful, because most routers have disabled source routing for security reasons. .TP -.BI \-I " interface +.BI \-i " interface Specifies the interface through which to .I traceroute should send packets. By default, the interface is selected @@ -146,7 +146,7 @@ .IP This feature hasn't been implemented yet. .TP -.BI \-S " source_addr +.BI \-s " source_addr Chooses an alternative source address. Note that you must select the address of one of the interfaces. By default, the address of the outgoing interface is used. --- traceroute-1.0.4/traceroute.c.compat 2005-12-19 15:44:09.000000000 +0100 +++ traceroute-1.0.4/traceroute.c 2006-01-09 10:24:05.000000000 +0100 @@ -133,7 +133,7 @@ /* Set the locale - needed for international domain names */ setlocale (LC_ALL, ""); - while ((c = getopt(argc, argv, "46DFVf:g:I:m:N:np:t:w:q:rRS:")) != -1) { + while ((c = getopt(argc, argv, "46DFVf:g:i:m:N:np:t:w:q:rRs:")) != -1) { switch (c) { case '4': af = AF_INET; @@ -160,7 +160,7 @@ opt_gateway_name[ngateways++] = optarg; break; - case 'I': + case 'i': src_device = optarg; break; @@ -200,7 +200,7 @@ opt_rr = 1; break; - case 'S': + case 's': src_addr_name = optarg; break; @@ -364,7 +364,7 @@ { fprintf(stderr, "usage: traceroute [-nFV] [-f first_ttl] [-m max_hops] [-p port]\n" - " [-S source_addr] [-I interface] [-g gateway]\n" + " [-s source_addr] [-i interface] [-g gateway]\n" " [-t tos] [-w timeout] [-q nqueries] host [packetlen]\n"); exit(1); } From fedora-cvs-commits at redhat.com Mon Jan 9 10:07:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 05:07:00 -0500 Subject: rpms/gdm/devel gdm-2.13.0.4-add-gnome-cflags.patch, NONE, 1.1 gdm-2.13.0.4-add-locale-header.patch, NONE, 1.1 gdm-2.13.0.4-add-ve-cflags.patch, NONE, 1.1 gdm-2.13.0.4-audit-login.patch, NONE, 1.1 gdm-2.13.0.4-change-defaults.patch, NONE, 1.1 gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch, NONE, 1.1 gdm-2.13.0.4-fix-selinux-check.patch, NONE, 1.1 gdm-2.13.0.4-modularx.patch, NONE, 1.1 gdm-2.13.0.4-update-switchdesk-location.patch, NONE, 1.1 gdm.spec, 1.107, 1.108 gdm-2.8.0.2-change-defaults.patch, 1.2, NONE gdm-2.8.0.2-fix-selinux-check.patch, 1.4, NONE gdm-2.8.0.2-update-switchdesk-location.patch, 1.1, NONE gdm-2.8.0.4-audit-login.patch, 1.1, NONE gdm-2.8.0.4-clean-up-leaks.patch, 1.1, NONE Message-ID: <200601091007.k09A70IE023310@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23199 Modified Files: gdm.spec Added Files: gdm-2.13.0.4-add-gnome-cflags.patch gdm-2.13.0.4-add-locale-header.patch gdm-2.13.0.4-add-ve-cflags.patch gdm-2.13.0.4-audit-login.patch gdm-2.13.0.4-change-defaults.patch gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch gdm-2.13.0.4-fix-selinux-check.patch gdm-2.13.0.4-modularx.patch gdm-2.13.0.4-update-switchdesk-location.patch Removed Files: gdm-2.8.0.2-change-defaults.patch gdm-2.8.0.2-fix-selinux-check.patch gdm-2.8.0.2-update-switchdesk-location.patch gdm-2.8.0.4-audit-login.patch gdm-2.8.0.4-clean-up-leaks.patch Log Message: - update to 2.13.0.4 gdm-2.13.0.4-add-gnome-cflags.patch: Makefile.am | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE gdm-2.13.0.4-add-gnome-cflags.patch --- --- gdm-2.13.0.4/gui/Makefile.am.add-ve-cflags 2005-12-20 21:22:37.000000000 -0500 +++ gdm-2.13.0.4/gui/Makefile.am 2006-01-09 00:45:29.000000000 -0500 @@ -16,7 +16,10 @@ INCLUDES = \ -I$(top_srcdir)/daemon \ -I$(top_srcdir)/vicious-extensions \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(GUI_CFLAGS) + $(GUI_CFLAGS) \ + $(VICIOUS_CFLAGS) \ + $(LIBGNOME_CFLAGS) \ + $(LIBGNOMEUI_CFLAGS) # # -DG_DISABLE_DEPRECATED \ gdm-2.13.0.4-add-locale-header.patch: gdm-dmx-reconnect-proxy.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE gdm-2.13.0.4-add-locale-header.patch --- --- gdm-2.13.0.4/utils/gdm-dmx-reconnect-proxy.c.add-locale-header 2006-01-09 00:49:41.000000000 -0500 +++ gdm-2.13.0.4/utils/gdm-dmx-reconnect-proxy.c 2006-01-09 00:50:33.000000000 -0500 @@ -20,6 +20,8 @@ #include #include + +#include #include #include gdm-2.13.0.4-add-ve-cflags.patch: Makefile.am | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE gdm-2.13.0.4-add-ve-cflags.patch --- --- gdm-2.13.0.4/gui/Makefile.am.add-ve-cflags 2006-01-09 00:37:41.000000000 -0500 +++ gdm-2.13.0.4/gui/Makefile.am 2006-01-09 00:36:21.000000000 -0500 @@ -16,7 +16,8 @@ INCLUDES = \ -I$(top_srcdir)/daemon \ -I$(top_srcdir)/vicious-extensions \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(GUI_CFLAGS) + $(GUI_CFLAGS) \ + $(VICIOUS_CFLAGS) # # -DG_DISABLE_DEPRECATED \ gdm-2.13.0.4-audit-login.patch: configure.ac | 22 ++++++++++++++++ daemon/verify-pam.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) --- NEW FILE gdm-2.13.0.4-audit-login.patch --- --- gdm-2.13.0.4/daemon/verify-pam.c.audit-login 2005-12-21 23:50:43.000000000 -0500 +++ gdm-2.13.0.4/daemon/verify-pam.c 2006-01-08 23:41:38.000000000 -0500 @@ -47,6 +47,14 @@ #include #endif /* HAVE_ADT */ +#define AU_FAILED 0 +#define AU_SUCCESS 1 +#ifdef HAVE_LIBAUDIT +#include +#else +#define log_to_audit_system(l,h,d,s) do { ; } while (0) +#endif + /* Evil, but this way these things are passed to the child session */ static pam_handle_t *pamh = NULL; @@ -783,6 +791,53 @@ create_pamh (GdmDisplay *d, return TRUE; } +/** + * log_to_audit_system: + * @login: Name of user + * @hostname: Name of host machine + * @tty: Name of display + * @success: 1 for success, 0 for failure + * + * Logs the success or failure of the login attempt with the linux kernel + * audit system. The intent is to capture failed events where the user + * fails authentication or otherwise is not permitted to login. There are + * many other places where pam could potentially fail and cause login to + * fail, but these are system failures rather than the signs of an account + * being hacked. + * + * Returns nothing. + */ + +#ifdef HAVE_LIBAUDIT +static void +log_to_audit_system(const char *login, + const char *hostname, + const char *tty, + gboolean success) +{ + struct passwd *pw; + char buf[64]; + int audit_fd; + + audit_fd = audit_open(); + if (login) + pw = getpwnam(login); + else { + login = "unknown"; + pw = NULL; + } + if (pw) { + snprintf(buf, sizeof(buf), "uid=%d", pw->pw_uid); + audit_log_user_message(audit_fd, AUDIT_USER_LOGIN, + buf, hostname, NULL, tty, (int)success); + } else { + snprintf(buf, sizeof(buf), "acct=%s", login); + audit_log_user_message(audit_fd, AUDIT_USER_LOGIN, + buf, hostname, NULL, tty, (int)success); + } + close(audit_fd); +} +#endif /** * gdm_verify_user: @@ -875,6 +930,9 @@ authenticate_again: /* Start authentication session */ did_we_ask_for_password = FALSE; if ((pamerr = pam_authenticate (pamh, null_tok)) != PAM_SUCCESS) { + /* Log the failed login attempt */ + log_to_audit_system(tmp_PAM_USER, d->hostname, display, AU_FAILED); + if ( ! ve_string_empty (selected_user)) { pam_handle_t *tmp_pamh; @@ -962,6 +1020,8 @@ authenticate_again: ( ! gdm_get_value_bool (GDM_KEY_ALLOW_REMOTE_ROOT) && ! local) ) && pwent != NULL && pwent->pw_uid == 0) { + /* Log the failed login attempt */ + log_to_audit_system(login, d->hostname, display, AU_FAILED); gdm_error (_("Root login disallowed on display '%s'"), display); gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX, @@ -989,6 +1049,8 @@ authenticate_again: break; case PAM_NEW_AUTHTOK_REQD : if ((pamerr = pam_chauthtok (pamh, PAM_CHANGE_EXPIRED_AUTHTOK)) != PAM_SUCCESS) { + /* Log the failed login attempt */ + log_to_audit_system(login, d->hostname, display, AU_FAILED); gdm_error (_("Authentication token change failed for user %s"), login); gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX, _("\nThe change of the authentication token failed. " @@ -1006,18 +1068,24 @@ authenticate_again: #endif /* HAVE_ADT */ break; case PAM_ACCT_EXPIRED : + /* Log the failed login attempt */ + log_to_audit_system(login, d->hostname, display, AU_FAILED); gdm_error (_("User %s no longer permitted to access the system"), login); gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX, _("\nThe system administrator has disabled your account.")); error_msg_given = TRUE; goto pamerr; case PAM_PERM_DENIED : + /* Log the failed login attempt */ + log_to_audit_system(login, d->hostname, display, AU_FAILED); gdm_error (_("User %s not permitted to gain access at this time"), login); gdm_slave_greeter_ctl_no_ret (GDM_ERRBOX, _("\nThe system administrator has disabled access to the system temporarily.")); error_msg_given = TRUE; goto pamerr; default : + /* Log the failed login attempt */ + log_to_audit_system(login, d->hostname, display, AU_FAILED); if (gdm_slave_action_pending ()) gdm_error (_("Couldn't set acct. mgmt for %s"), login); goto pamerr; @@ -1069,6 +1137,8 @@ authenticate_again: gdm_error (_("Couldn't open session for %s"), login); goto pamerr; } + /* Login succeeded */ + log_to_audit_system(login, d->hostname, display, AU_SUCCESS); /* Workaround to avoid gdm messages being logged as PAM_pwdb */ closelog (); --- gdm-2.13.0.4/configure.ac.audit-login 2006-01-02 07:52:23.000000000 -0500 +++ gdm-2.13.0.4/configure.ac 2006-01-08 23:37:16.000000000 -0500 @@ -72,6 +72,10 @@ AC_ARG_WITH(dmx, AC_ARG_WITH(selinux, [ --with-selinux Add SELinux support]) +AC_ARG_WITH(libaudit, + [ --with-libaudit=[auto/yes/no] Add Linux audit support [default=auto]],, + with_libaudit=auto) + withval="" AC_ARG_WITH(post-path, [ --with-post-path= add PATH to end of user's PATH when logging in],[ @@ -888,6 +892,24 @@ else AC_MSG_RESULT(no) fi +# Check for Linux auditing API +# +# libaudit detection +if test x$with_libaudit = xno ; then + have_libaudit=no; +else + # See if we have audit daemon library + AC_CHECK_LIB(audit, audit_log_user_message, + have_libaudit=yes, have_libaudit=no) +fi + +AM_CONDITIONAL(HAVE_LIBAUDIT, test x$have_libaudit = xyes) + +if test x$have_libaudit = xyes ; then + EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -laudit" + AC_DEFINE(HAVE_LIBAUDIT,1,[linux audit support]) +fi + # Check for Solaris auditing API # Note, Solaris auditing not supported for Solaris 9 or earlier and # should not be used on these versions of Solaris if auditing is gdm-2.13.0.4-change-defaults.patch: gdm.conf.in | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) --- NEW FILE gdm-2.13.0.4-change-defaults.patch --- --- gdm-2.13.0.4/config/gdm.conf.in.change-defaults 2005-12-20 21:22:36.000000000 -0500 +++ gdm-2.13.0.4/config/gdm.conf.in 2006-01-08 23:12:51.000000000 -0500 @@ -59,9 +59,9 @@ TimedLoginDelay=30 # should leave this alone. #Chooser=@EXPANDED_LIBEXECDIR@/gdmchooser -# The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to -# get the new graphical greeter. -#Greeter=@EXPANDED_LIBEXECDIR@/gdmlogin +# The greeter for local (non-xdmcp) logins. Change gdmgreeter to gdmlogin to +# get the boring greeter. +Greeter=@EXPANDED_LIBEXECDIR@/gdmgreeter # The greeter for xdmcp logins, usually you want a less graphically intensive # greeter here so it's better to leave this with gdmlogin @@ -78,11 +78,11 @@ TimedLoginDelay=30 # Default path to set. The profile scripts will likely override this value. # This value will be overridden with the value from /etc/default/login if it # contains "ROOT=". -#DefaultPath=@GDM_USER_PATH@ +DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin # Default path for root. The profile scripts will likely override this value. # This value will be overridden with the value from /etc/default/login if it # contains "SUROOT=". -#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@ +RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin # If you are having trouble with using a single server for a long time and want # GDM to kill/restart the server, turn this on. On Solaris, this value is @@ -116,8 +116,8 @@ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing # Reboot, Halt and suspend commands, you can add different commands separated # by a semicolon. GDM will use the first one it can find. -#RebootCommand=@REBOOT_COMMAND@ -#HaltCommand=@HALT_COMMAND@ +RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot +HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff #SuspendCommand=@SUSPEND_COMMAND@ # Probably should not touch the below this is the standard setup. ServAuthDir=@EXPANDED_AUTHDIR@ @@ -131,7 +131,7 @@ BaseXsession=@EXPANDED_SYSCONFDIR@/gdm/X # compatibility reasons with 2.4.4.x. #SessionDesktopDir=/etc/X11/sessions/:@EXPANDED_SYSCONFDIR@/dm/Sessions/:@EXPANDED_DATADIR@/gdm/BuiltInSessions/:@EXPANDED_DATADIR@/xsessions/ # This is the default .desktop session. One of the ones in SessionDesktopDir -#DefaultSession=gnome.desktop +DefaultSession=default.desktop # Better leave this blank and HOME will be used. You can use syntax ~/ below # to indicate home directory of the user. You can also set this to something # like /tmp if you don't want the authorizations to be in home directories. @@ -280,7 +280,7 @@ Enable=false #GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc # The GTK+ theme to use for the GUI. -#GtkTheme=Default +GtkTheme=Clearlooks # If to allow changing the GTK+ (widget) theme from the greeter. Currently # this only affects the standard greeter as the graphical greeter does not yet # have this ability. @@ -297,7 +297,7 @@ Enable=false [greeter] # Greeter has a nice title bar that the user can move. -#TitleBar=true +TitleBar=false # Configuration is available from the system menu of the greeter. #ConfigAvailable=false # Face browser is enabled. This only works currently for the standard greeter @@ -308,7 +308,7 @@ Browser=false # User ID's less than the MinimalUID value will not be included in the face # browser or in the gdmselection list for Automatic/Timed login. They will not # be displayed regardless of the settings for Include and Exclude. -#MinimalUID=100 +MinimalUID=500 # Users listed in Include will be included in the face browser and in the # gdmsetup selection list for Automatic/Timed login. Users should be separated # by commas. @@ -333,7 +333,7 @@ Browser=false # file, although GDM will be able to read a standard locale.alias file as well. #LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias # Logo shown in the standard greeter. -#Logo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png +Logo= # Logo shown on file chooser button in gdmsetup (do not modify this value). #ChooserButtonLogo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png # The standard greeter should shake if a user entered the wrong username or @@ -381,7 +381,7 @@ DefaultRemoteWelcome=true #BackgroundType=2 #BackgroundImage= #BackgroundScaleToFit=true -#BackgroundColor=#76848F +BackgroundColor=#20305a # XDMCP session should only get a color, this is the sanest setting since you # don't want to take up too much bandwidth #BackgroundRemoteOnlyColor=true @@ -394,7 +394,7 @@ DefaultRemoteWelcome=true # Show the Failsafe sessions. These are much MUCH nicer (focus for xterm for # example) and more failsafe then those supplied by scripts so distros should # use this rather then just running an xterm from a script. -#ShowGnomeFailsafeSession=true +ShowGnomeFailsafeSession=false #ShowXtermFailsafeSession=true # Normally there is a session type called 'Last' that is shown which refers to # the last session the user used. If off, we will be in 'switchdesk' mode @@ -413,7 +413,7 @@ DefaultRemoteWelcome=true # list that is delimited by /: to the GraphicalThemes key and set # GraphicalThemeRand to true. Otherwise use GraphicalTheme and specify just # one theme. -#GraphicalTheme=circles +GraphicalTheme=Bluecurve #GraphicalThemes=circles/:happygnome GraphicalThemeDir=@EXPANDED_DATADIR@/gdm/themes/ GraphicalThemeRand=false gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch: gdm-safe-restart.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch --- --- gdm-2.13.0.4/gdm-safe-restart.in.handle-new-custom-stuff 2006-01-09 04:34:28.000000000 -0500 +++ gdm-2.13.0.4/gdm-safe-restart.in 2006-01-09 04:35:16.000000000 -0500 @@ -1,5 +1,5 @@ #!/bin/sh -PIDFILE=`grep '^PidFile=' @EXPANDED_SYSCONFDIR@/gdm/gdm.conf | sed -e 's/^PidFile=//'` +PIDFILE=`grep '^PidFile=' @GDM_CONFIGDIR@/gdm.conf | sed -e 's/^PidFile=//'` if test x$PIDFILE = x ; then echo "Can't find the PID file in the configuration file, going to try:" echo "/var/run/gdm.pid" gdm-2.13.0.4-fix-selinux-check.patch: slave.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) --- NEW FILE gdm-2.13.0.4-fix-selinux-check.patch --- --- gdm-2.13.0.4/daemon/slave.c.fix-selinux-check 2005-12-24 21:30:14.000000000 -0500 +++ gdm-2.13.0.4/daemon/slave.c 2006-01-08 23:17:01.000000000 -0500 @@ -3266,17 +3266,23 @@ static gboolean gdm_selinux_setup (const char *login) { security_context_t scontext; - + int ret=-1; + char *seuser=NULL; + char *level=NULL; + /* If selinux is not enabled, then we don't do anything */ - if ( ! is_selinux_enabled ()) + if (is_selinux_enabled () <= 0) return TRUE; - if (get_default_context ((char*) login,0, &scontext) < 0) { + if (getseuserbyname(login, &seuser, &level) == 0) + ret=get_default_context_with_level(seuser, level, 0, &scontext); + + if (ret < 0) { gdm_error ("SELinux gdm login: unable to obtain default security context for %s.", login); /* note that this will be run when the .xsession-errors is already being logged, so we can use stderr */ gdm_fdprintf (2, "SELinux gdm login: unable to obtain default security context for %s.", login); - return FALSE; + return (security_getenforce()==0); } gdm_assert (scontext != NULL); @@ -3286,7 +3292,8 @@ gdm_selinux_setup (const char *login) (char *)scontext); gdm_fdprintf (2, "SELinux gdm login: unable to set executable context %s.", (char *)scontext); - return FALSE; + freecon (scontext); + return (security_getenforce()==0); } freecon (scontext); gdm-2.13.0.4-modularx.patch: configure.ac | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE gdm-2.13.0.4-modularx.patch --- --- gdm-2.13.0.4/configure.ac.modularx 2006-01-08 23:49:21.000000000 -0500 +++ gdm-2.13.0.4/configure.ac 2006-01-09 00:11:33.000000000 -0500 @@ -984,6 +984,11 @@ elif test -x /usr/X11R6/bin/X; then X_SERVER="/usr/X11R6/bin/X" GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin" X_CONFIG_OPTIONS="-audit 0" +elif test -x /usr/bin/Xorg; then + X_PATH="/usr/bin" + X_SERVER_PATH="/usr/bin" + X_SERVER="/usr/bin/Xorg" + X_CONFIG_OPTIONS="-audit 0" elif test -x /usr/X11/bin/X; then X_PATH="/usr/X11/bin" X_SERVER_PATH="/usr/X11/bin" gdm-2.13.0.4-update-switchdesk-location.patch: greeter_session.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gdm-2.13.0.4-update-switchdesk-location.patch --- --- gdm-2.13.0.4/gui/greeter/greeter_session.c.update-switchdesk-location 2005-12-24 21:30:15.000000000 -0500 +++ gdm-2.13.0.4/gui/greeter/greeter_session.c 2006-01-08 23:25:22.000000000 -0500 @@ -165,7 +165,7 @@ greeter_session_lookup (const char *save * irrelevant, we are in "switchdesk mode" and the relevant * thing is the saved session in .Xclients */ - if (g_access ("/usr/bin/switchdesk", F_OK) == 0) + if (g_access ("/usr/share/switchdesk/switchdesk-gui.py", F_OK) == 0) { firstmsg = g_strdup_printf (_("You have chosen %s for this " "session"), Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- gdm.spec 9 Dec 2005 22:40:32 -0000 1.107 +++ gdm.spec 9 Jan 2006 10:06:50 -0000 1.108 @@ -14,22 +14,22 @@ Summary: The GNOME Display Manager. Name: gdm -Version: 2.8.0.4 -Release: 13.1 +Version: 2.13.0.4 +Release: 1 Epoch: 1 License: LGPL/GPL Group: User Interface/X -Source: ftp://ftp.gnome.org/pub/GNOME/sources/gdm-%{PACKAGE_VERSION}.tar.bz2 +URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm +Source: gdm-%{PACKAGE_VERSION}.tar.bz2 Source1: gdm-allow-login.init Source2: gdm-early-login.init Source3: zzz-bootup-complete.init -URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm -Patch1: gdm-2.8.0.2-change-defaults.patch +Patch1: gdm-2.13.0.4-change-defaults.patch Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch -Patch3: gdm-2.8.0.2-fix-selinux-check.patch +Patch3: gdm-2.13.0.4-fix-selinux-check.patch Patch4: gdm-2.8.0.2-session-errors-in-tmp.patch -Patch5: gdm-2.8.0.2-update-switchdesk-location.patch +Patch5: gdm-2.13.0.4-update-switchdesk-location.patch Patch6: gdm-2.6.0.7-wait-for-bootup.patch Patch7: gdm-2.8.0.2-clean-up-xsession-errors.patch Patch8: gdm-2.8.0.2-merge-resources.patch @@ -38,11 +38,13 @@ Patch11: gdm-2.6.0.8-xdmcp.patch Patch12: gdm-2.8.0.2-process-all-messages.patch Patch13: gdm-2.8.0.2-hide-throbber.patch -Patch14: gdm-2.8.0.4-clean-up-leaks.patch -Patch15: gdm-2.8.0.4-audit-login.patch -Patch16: gdm-2.8.0.4-modularx.patch +Patch15: gdm-2.13.0.4-audit-login.patch +Patch16: gdm-2.13.0.4-modularx.patch Patch17: gdm-2.8.0.4-call-dbus-launch.patch Patch18: gdm-2.8.0.4-dont-call-xsm.patch +Patch19: gdm-2.13.0.4-add-gnome-cflags.patch +Patch20: gdm-2.13.0.4-add-locale-header.patch +Patch21: gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root @@ -106,38 +108,42 @@ #%patch9 -p1 -b .boot-throbber %patch10 -p1 -b .dont-malloc-in-signal-handlers #%patch11 -p1 -b .xdmcp -%patch12 -p1 -b .process-all-messages +#%patch12 -p1 -b .process-all-messages %patch13 -p1 -b .hide-throbber -%patch14 -p1 -b .clean-up-leaks %patch15 -p1 -b .audit-login %patch16 -p1 -b .modularx %patch17 -p1 -b .call-dbus-launch %patch18 -p1 -b .dont-call-xsm +%patch19 -p1 -b .add-gnome-cflags +%patch20 -p1 -b .add-locale-header +%patch21 -p1 -b .fix-gdm-safe-restart-conf-path # fix the time format for ja perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po %build intltoolize --force --copy -aclocal-1.4 +aclocal-1.9 libtoolize --force --copy -automake-1.4 --add-missing +automake-1.9 --add-missing autoconf autoheader -%configure --sysconfdir=/etc/X11 \ +%configure --sysconfdir=%{_sysconfdir}/X11 \ --with-pam-prefix=/etc \ --localstatedir=/var \ --enable-console-helper \ --disable-scrollkeeper \ - --with-selinux + --with-selinux \ + --with-configdir=%{_datadir}/gdm/config make %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/etc/X11/gdm/Init -mkdir -p $RPM_BUILD_ROOT/etc/X11/gdm/PreSession -mkdir -p $RPM_BUILD_ROOT/etc/X11/gdm/PostSession +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Init +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/PreSession +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/PostSession +mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/config make install DESTDIR=$RPM_BUILD_ROOT @@ -183,6 +189,13 @@ #install -m755 ${RPM_SOURCE_DIR}/zzz-bootup-complete.init \ # ${RPM_BUILD_ROOT}/etc/rc.d/init.d/zzz-bootup-complete +# gdm has two config files: gdm.conf and gdm.conf-custom. gdm.conf-custom is +# the editable file and gdm.conf is a distro fallbacks/defaults file. We want +# the sysadmin editable file in /etc and the distro-defaults file in +# /usr/share/gdm/config +(cd $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm && \ + ln -sf ../../..%{_datadir}/gdm/config/gdm.conf-custom custom.conf) + %find_lang gdm %clean @@ -198,29 +211,19 @@ %post /sbin/ldconfig scrollkeeper-update + touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -# Attempt to restart GDM softly by use of the fifo. Wont work on older -# then 2.2.3.1 versions but should work nicely on later upgrades. -# FIXME: this is just way too complex -FIFOFILE=`grep '^ServAuthDir=' %{_sysconfdir}/X11/gdm/gdm.conf | sed -e 's/^ServAuthDir=//'` -if test x$FIFOFILE = x ; then - FIFOFILE=%{_localstatedir}/gdm/.gdmfifo -else - FIFOFILE="$FIFOFILE"/.gdmfifo -fi -PIDFILE=`grep '^PidFile=' %{_sysconfdir}/X11/gdm/gdm.conf | sed -e 's/^PidFile=//'` -if test x$PIDFILE = x ; then - PIDFILE=/var/run/gdm.pid +# if the user already has a config file, then +# migrate it to the new location +if [ $1 -ge 2 ] && [ -f %{_sysconfdir}/X11/gdm/gdm.conf ]; then + mv -f %{_sysconfdir}/X11/gdm/gdm.conf %{_datadir}/gdm/config/gdm.conf-custom fi -if test -w $FIFOFILE && test -f $PIDFILE && kill -0 `cat $PIDFILE` 2>/dev/null ; then - (echo;echo SOFT_RESTART) >> $FIFOFILE -fi -# ignore error in the above -exit 0 + +%{_sbindir}/gdm-safe-restart || : %postun /sbin/ldconfig @@ -235,27 +238,27 @@ %doc AUTHORS COPYING ChangeLog NEWS README TODO -%dir /etc/X11/gdm -%config(noreplace) /etc/X11/gdm/gdm.conf -/etc/X11/gdm/factory-gdm.conf -/etc/X11/gdm/Xsession -%config /etc/X11/gdm/XKeepsCrashing -%config /etc/X11/gdm/locale.alias -%config /etc/X11/gdm/Init/* -%config /etc/X11/gdm/PostLogin/* -%config /etc/X11/gdm/PreSession/* -%config /etc/X11/gdm/PostSession/* -%config /etc/X11/gdm/modules/* -%config /etc/pam.d/gdm -%config /etc/pam.d/gdmsetup -%config /etc/pam.d/gdm-autologin -%config /etc/security/console.apps/gdmsetup -#%config /etc/rc.d/init.d/* -%dir /etc/X11/gdm/Init -%dir /etc/X11/gdm/PreSession -%dir /etc/X11/gdm/PostSession -%dir /etc/X11/gdm/PostLogin -%dir /etc/X11/gdm/modules +%dir %{_sysconfdir}/X11/gdm +%{_sysconfdir}/X11/gdm/Xsession +%config(noreplace) %{_sysconfdir}/X11/gdm/custom.conf +%config(noreplace) %{_datadir}/gdm/config/gdm.conf-custom +%config %{_sysconfdir}/X11/gdm/XKeepsCrashing +%config %{_sysconfdir}/X11/gdm/locale.alias +%config %{_sysconfdir}/X11/gdm/Init/* +%config %{_sysconfdir}/X11/gdm/PostLogin/* +%config %{_sysconfdir}/X11/gdm/PreSession/* +%config %{_sysconfdir}/X11/gdm/PostSession/* +%config %{_sysconfdir}/X11/gdm/modules/* +%config %{_sysconfdir}/pam.d/gdm +%config %{_sysconfdir}/pam.d/gdmsetup +%config %{_sysconfdir}/pam.d/gdm-autologin +%config %{_sysconfdir}/security/console.apps/gdmsetup +#%config %{_sysconfdir}/rc.d/init.d/* +%dir %{_sysconfdir}/X11/gdm/Init +%dir %{_sysconfdir}/X11/gdm/PreSession +%dir %{_sysconfdir}/X11/gdm/PostSession +%dir %{_sysconfdir}/X11/gdm/PostLogin +%dir %{_sysconfdir}/X11/gdm/modules %{_datadir}/pixmaps %{_datadir}/icons %{_datadir}/gdm @@ -269,10 +272,12 @@ %{_sbindir}/* %dir %{_localstatedir}/log/gdm - %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Mon Jan 9 2005 Ray Strode - 1:2.13.0.4-1 +- update to 2.13.0.4 + * Fri Dec 09 2005 Jesse Keating - rebuilt --- gdm-2.8.0.2-change-defaults.patch DELETED --- --- gdm-2.8.0.2-fix-selinux-check.patch DELETED --- --- gdm-2.8.0.2-update-switchdesk-location.patch DELETED --- --- gdm-2.8.0.4-audit-login.patch DELETED --- --- gdm-2.8.0.4-clean-up-leaks.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 10:08:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 05:08:16 -0500 Subject: rpms/gdm/devel gdm.spec,1.108,1.109 Message-ID: <200601091008.k09A8GWk023768@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23651 Modified Files: gdm.spec Log Message: fix changelog entry year to be right Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- gdm.spec 9 Jan 2006 10:06:50 -0000 1.108 +++ gdm.spec 9 Jan 2006 10:08:13 -0000 1.109 @@ -275,7 +275,7 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog -* Mon Jan 9 2005 Ray Strode - 1:2.13.0.4-1 +* Mon Jan 9 2006 Ray Strode - 1:2.13.0.4-1 - update to 2.13.0.4 * Fri Dec 09 2005 Jesse Keating From fedora-cvs-commits at redhat.com Mon Jan 9 10:14:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 05:14:18 -0500 Subject: rpms/authconfig/devel .cvsignore, 1.38, 1.39 authconfig.spec, 1.50, 1.51 sources, 1.44, 1.45 Message-ID: <200601091014.k09AEIwN026528@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/authconfig/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26483 Modified Files: .cvsignore authconfig.spec sources Log Message: * Mon Jan 9 2006 Tomas Mraz - 5.1.2-1 - fixed regression when saving nsswitch.conf Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/authconfig/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 6 Jan 2006 16:44:00 -0000 1.38 +++ .cvsignore 9 Jan 2006 10:14:16 -0000 1.39 @@ -1 +1 @@ -authconfig-5.1.1.tar.bz2 +authconfig-5.1.2.tar.bz2 Index: authconfig.spec =================================================================== RCS file: /cvs/dist/rpms/authconfig/devel/authconfig.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- authconfig.spec 6 Jan 2006 16:44:00 -0000 1.50 +++ authconfig.spec 9 Jan 2006 10:14:16 -0000 1.51 @@ -1,6 +1,6 @@ Summary: Text-mode tool for setting up NIS and shadow passwords. Name: authconfig -Version: 5.1.1 +Version: 5.1.2 # Don't change release in elvis CVS, up version after merging all patches # from dist CVS instead. Release: 1 @@ -93,6 +93,9 @@ %{_datadir}/pixmaps/* %changelog +* Mon Jan 9 2006 Tomas Mraz - 5.1.2-1 +- fixed regression when saving nsswitch.conf + * Fri Jan 6 2006 Tomas Mraz - 5.1.1-1 - print warning if PAM module is missing when the PAM configuration is saved (#168880) Index: sources =================================================================== RCS file: /cvs/dist/rpms/authconfig/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 6 Jan 2006 16:44:00 -0000 1.44 +++ sources 9 Jan 2006 10:14:16 -0000 1.45 @@ -1 +1 @@ -792d9fe2a3d87d59958256ab532ed39b authconfig-5.1.1.tar.bz2 +ce3f3a51997d90420c0adee88f4413aa authconfig-5.1.2.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 9 10:17:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 05:17:42 -0500 Subject: rpms/gdm/devel .cvsignore,1.17,1.18 sources,1.19,1.20 Message-ID: <200601091017.k09AHg2T006879@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6775 Modified Files: .cvsignore sources Log Message: update sources Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 8 Sep 2005 19:18:45 -0000 1.17 +++ .cvsignore 9 Jan 2006 10:17:40 -0000 1.18 @@ -1 +1,4 @@ -gdm-2.8.0.4.tar.bz2 +gdm-2.13.0.4.tar.bz2 +gdm-allow-login.init +gdm-early-login.init +zzz-bootup-complete.init Index: sources =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 8 Sep 2005 19:18:45 -0000 1.19 +++ sources 9 Jan 2006 10:17:40 -0000 1.20 @@ -1 +1,4 @@ -d08cb22cfdc26f98d8b033cd8b8c48f1 gdm-2.8.0.4.tar.bz2 +91dc905826a5ec78774df1cf0f1f8173 gdm-2.13.0.4.tar.bz2 +565fe41afc00943d07a59df6aaa21b09 gdm-allow-login.init +6faa704d32a73754f9d1658f888a80a0 gdm-early-login.init +c887b142b08c6faec6e9be74f4efad33 zzz-bootup-complete.init From fedora-cvs-commits at redhat.com Mon Jan 9 13:12:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 08:12:09 -0500 Subject: rpms/less/FC-4 less-382-fixline.patch, NONE, 1.1 less-392-Foption.patch, NONE, 1.1 less.spec, 1.19, 1.20 sources, 1.5, 1.6 less-382-ncursesw.patch, 1.1, NONE less-382-utf8detect.patch, 1.1, NONE Message-ID: <200601091312.k09DC9oN007173@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/less/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv7155 Modified Files: less.spec sources Added Files: less-382-fixline.patch less-392-Foption.patch Removed Files: less-382-ncursesw.patch less-382-utf8detect.patch Log Message: * Mon Jan 9 2006 Jindrich Novy 394-1 - update to less-394 - new less comes with much better UTF-8 support (#177255) less-382-fixline.patch: command.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE less-382-fixline.patch --- --- less-382/command.c.fixline 2004-02-04 05:52:26.000000000 +0100 +++ less-382/command.c 2005-09-05 09:24:03.000000000 +0200 @@ -1168,6 +1168,7 @@ jump_forw(); else jump_back(number); + repaint(); break; case A_GOPOS: less-392-Foption.patch: screen.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE less-392-Foption.patch --- --- less-392/screen.c.Foption 2005-09-17 19:17:02.000000000 +0200 +++ less-392/screen.c 2005-10-21 16:25:16.000000000 +0200 @@ -233,6 +233,7 @@ extern int wscroll; extern int screen_trashed; extern int tty; extern int top_scroll; +extern int quit_if_one_screen; #if HILITE_SEARCH extern int hilite_search; #endif @@ -1547,7 +1548,7 @@ deinit() #if !MSDOS_COMPILER if (!no_keypad) tputs(sc_e_keypad, sc_height, putchr); - if (!no_init) + if (!no_init && !quit_if_one_screen) tputs(sc_deinit, sc_height, putchr); #else /* Restore system colors. */ Index: less.spec =================================================================== RCS file: /cvs/dist/rpms/less/FC-4/less.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- less.spec 4 Mar 2005 13:57:55 -0000 1.19 +++ less.spec 9 Jan 2006 13:12:07 -0000 1.20 @@ -1,16 +1,15 @@ Summary: A text file browser similar to more, but better. Name: less -Version: 382 -Release: 7 +Version: 394 +Release: 1.fc4 License: GPL Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz Source1: lesspipe.sh Source2: less.sh Source3: less.csh - -Patch0: less-382-ncursesw.patch -Patch1: less-382-utf8detect.patch +Patch0: less-382-fixline.patch +Patch1: less-392-Foption.patch URL: http://www.greenwoodsoftware.com/less/ Buildroot: %{_tmppath}/%{name}-root @@ -28,8 +27,8 @@ %prep %setup -q -%patch0 -p1 -b .ncursesw -%patch1 -p1 -b .utf8detect +%patch0 -p1 -b .fixline +%patch1 -p1 -b .Foption chmod -R a+w * %build @@ -55,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 9 2006 Jindrich Novy 394-1 +- update to less-394 +- new less comes with much better UTF-8 support (#177255) + * Fri Mar 4 2005 Jindrich Novy 382-7 - rebuilt with gcc4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/less/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Sep 2004 07:16:06 -0000 1.5 +++ sources 9 Jan 2006 13:12:07 -0000 1.6 @@ -1 +1 @@ -103fe4aef6297b93f0f73f38cc3b1bd7 less-382.tar.gz +a9f072ccefa0d315b325f3e9cdbd4b97 less-394.tar.gz --- less-382-ncursesw.patch DELETED --- --- less-382-utf8detect.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 13:38:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 08:38:47 -0500 Subject: rpms/less/FC-3 less-382-fixline.patch, NONE, 1.1 less-392-Foption.patch, NONE, 1.1 less.spec, 1.16, 1.17 sources, 1.5, 1.6 less-382-ncursesw.patch, 1.1, NONE Message-ID: <200601091338.k09DckFu031281@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/less/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv31193 Modified Files: less.spec sources Added Files: less-382-fixline.patch less-392-Foption.patch Removed Files: less-382-ncursesw.patch Log Message: * Mon Jan 9 2006 Jindrich Novy 394-1.fc3 - update to less-394 - new less comes with much better UTF-8 support (#177255) less-382-fixline.patch: command.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE less-382-fixline.patch --- --- less-382/command.c.fixline 2004-02-04 05:52:26.000000000 +0100 +++ less-382/command.c 2005-09-05 09:24:03.000000000 +0200 @@ -1168,6 +1168,7 @@ jump_forw(); else jump_back(number); + repaint(); break; case A_GOPOS: less-392-Foption.patch: screen.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE less-392-Foption.patch --- --- less-392/screen.c.Foption 2005-09-17 19:17:02.000000000 +0200 +++ less-392/screen.c 2005-10-21 16:25:16.000000000 +0200 @@ -233,6 +233,7 @@ extern int wscroll; extern int screen_trashed; extern int tty; extern int top_scroll; +extern int quit_if_one_screen; #if HILITE_SEARCH extern int hilite_search; #endif @@ -1547,7 +1548,7 @@ deinit() #if !MSDOS_COMPILER if (!no_keypad) tputs(sc_e_keypad, sc_height, putchr); - if (!no_init) + if (!no_init && !quit_if_one_screen) tputs(sc_deinit, sc_height, putchr); #else /* Restore system colors. */ Index: less.spec =================================================================== RCS file: /cvs/dist/rpms/less/FC-3/less.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- less.spec 9 Sep 2004 07:16:41 -0000 1.16 +++ less.spec 9 Jan 2006 13:38:43 -0000 1.17 @@ -1,15 +1,15 @@ Summary: A text file browser similar to more, but better. Name: less -Version: 382 -Release: 4 +Version: 394 +Release: 1.fc3 License: GPL Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz Source1: lesspipe.sh Source2: less.sh Source3: less.csh - -Patch0: less-382-ncursesw.patch +Patch0: less-382-fixline.patch +Patch1: less-392-Foption.patch URL: http://www.greenwoodsoftware.com/less/ Buildroot: %{_tmppath}/%{name}-root @@ -27,7 +27,8 @@ %prep %setup -q -%patch0 -p1 -b .ncursesw +%patch0 -p1 -b .fixline +%patch1 -p1 -b .Foption chmod -R a+w * %build @@ -53,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 9 2006 Jindrich Novy 394-1.fc3 +- update to less-394 +- new less comes with much better UTF-8 support (#177255) + * Tue Jun 15 2004 Elliot Lee - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/less/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Sep 2004 07:16:06 -0000 1.5 +++ sources 9 Jan 2006 13:38:43 -0000 1.6 @@ -1 +1 @@ -103fe4aef6297b93f0f73f38cc3b1bd7 less-382.tar.gz +a9f072ccefa0d315b325f3e9cdbd4b97 less-394.tar.gz --- less-382-ncursesw.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 13:47:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 08:47:37 -0500 Subject: rpms/kernel/devel/configs config-generic,1.121.2.1,1.121.2.2 Message-ID: <200601091347.k09DlbNv014112@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv14046/configs Modified Files: Tag: private-fc5-test2-branch config-generic Log Message: usblp fixes, bcm43xx update Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.121.2.1 retrieving revision 1.121.2.2 diff -u -r1.121.2.1 -r1.121.2.2 --- config-generic 6 Jan 2006 23:07:39 -0000 1.121.2.1 +++ config-generic 9 Jan 2006 13:47:35 -0000 1.121.2.2 @@ -1039,6 +1039,7 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IEEE80211_SOFTMAC=m +CONFIG_IEEE80211_SOFTMAC_DEBUG=y # CONFIG_IPW2100 is not set # CONFIG_IPW_DEBUG is not set # CONFIG_IPW2200 is not set From fedora-cvs-commits at redhat.com Mon Jan 9 13:47:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 08:47:37 -0500 Subject: rpms/kernel/devel linux-2.6-softmac-git.patch, NONE, 1.1.2.1 linux-2.6.15-usb-find-interface.patch, NONE, 1.1.2.1 linux-2.6.15-usblp-fixes.patch, NONE, 1.1.2.1 .cvsignore, 1.313, 1.313.2.1 kernel-2.6.spec, 1.1826.2.5, 1.1826.2.6 linux-2.6-bcm43xx-resume.patch, 1.1, 1.1.2.1 linux-2.6-bcm43xx.patch, 1.1, 1.1.2.1 sources, 1.255, 1.255.2.1 linux-2.6-bcm43xx-device-table.patch, 1.1, NONE linux-2.6-bcm43xx-promisc.patch, 1.1, NONE linux-2.6-bcm43xx-quiet.patch, 1.1, NONE linux-2.6.14-ieee80211-hw-wep.patch, 1.1, NONE Message-ID: <200601091347.k09Dlbqn014098@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14046 Modified Files: Tag: private-fc5-test2-branch .cvsignore kernel-2.6.spec linux-2.6-bcm43xx-resume.patch linux-2.6-bcm43xx.patch sources Added Files: Tag: private-fc5-test2-branch linux-2.6-softmac-git.patch linux-2.6.15-usb-find-interface.patch linux-2.6.15-usblp-fixes.patch Removed Files: Tag: private-fc5-test2-branch linux-2.6-bcm43xx-device-table.patch linux-2.6-bcm43xx-promisc.patch linux-2.6-bcm43xx-quiet.patch linux-2.6.14-ieee80211-hw-wep.patch Log Message: usblp fixes, bcm43xx update linux-2.6-softmac-git.patch: include/net/ieee80211.h | 6 include/net/ieee80211softmac.h | 266 +++++++++++++ include/net/ieee80211softmac_wx.h | 66 +++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/ieee80211_crypt_wep.c | 61 ++- net/ieee80211/ieee80211_module.c | 2 net/ieee80211/ieee80211_rx.c | 4 net/ieee80211/ieee80211_tx.c | 2 net/ieee80211/ieee80211_wx.c | 2 net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 356 ++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 348 +++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 135 ++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 436 ++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 211 ++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 216 ++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 390 +++++++++++++++++++ 20 files changed, 2971 insertions(+), 25 deletions(-) --- NEW FILE linux-2.6-softmac-git.patch --- diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index cde2f4f..df05f46 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -363,8 +363,9 @@ enum ieee80211_reasoncode { #define IEEE80211_OFDM_SHIFT_MASK_A 4 /* NOTE: This data is for statistical purposes; not all hardware provides this - * information for frames received. Not setting these will not cause - * any adverse affects. */ + * information for frames received. + * For ieee80211_rx_mgt, you need to set at least the 'len' parameter. + */ struct ieee80211_rx_stats { u32 mac_time; s8 rssi; @@ -1088,6 +1089,7 @@ extern int ieee80211_tx_frame(struct iee /* ieee80211_rx.c */ extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, struct ieee80211_rx_stats *rx_stats); +/* make sure to set stats->len */ extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, struct ieee80211_hdr_4addr *header, struct ieee80211_rx_stats *stats); diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h new file mode 100644 index 0000000..7264bd8 --- /dev/null +++ b/include/net/ieee80211softmac.h @@ -0,0 +1,266 @@ +#ifndef IEEE80211SOFTMAC_H_ +#define IEEE80211SOFTMAC_H_ + +#include +#include +#include +#include +#include + +/* Once the API is considered more or less stable, + * this should be incremented on API incompatible changes. + */ +#define IEEE80211SOFTMAC_API 0 + +#define IEEE80211SOFTMAC_MAX_RATES_LEN 8 +#define IEEE80211SOFTMAC_MAX_EX_RATES_LEN 255 + +struct ieee80211softmac_ratesinfo { + u8 count; + u8 rates[IEEE80211SOFTMAC_MAX_RATES_LEN + IEEE80211SOFTMAC_MAX_EX_RATES_LEN]; +}; + +/* internal structures */ +struct ieee80211softmac_network; +struct ieee80211softmac_scaninfo; + +struct ieee80211softmac_essid { + u8 len; + char data[IW_ESSID_MAX_SIZE+1]; +}; + +struct ieee80211softmac_wpa { + char *IE; + int IElen; + int IEbuflen; +}; + +/* + * Information about association + * + * Do we need a lock for this? + * We only ever use this structure inlined + * into our global struct. I've used its lock, + * but maybe we need a local one here? + */ +struct ieee80211softmac_assoc_info { + /* + * This is the requested ESSID. It is written + * only by the WX handlers. + * + */ + struct ieee80211softmac_essid req_essid; + /* + * the ESSID of the network we're currently + * associated (or trying) to. This is + * updated to the network's actual ESSID + * even if the requested ESSID was 'ANY' + */ + struct ieee80211softmac_essid associate_essid; + + /* BSSID we're trying to associate to */ + char bssid[ETH_ALEN]; + + /* some flags. + * static_essid is valid if the essid is constant, + * this is for use by the wx handlers only. + * + * associating is true, if the network has been + * auth'ed on and we are in the process of associating. + * + * bssvalid is true if we found a matching network + * and saved it's BSSID into the bssid above. + */ + u8 static_essid:1, + associating:1, + bssvalid:1; + + /* Scan retries remaining */ + int scan_retry; + + struct work_struct work; + struct work_struct timeout; +}; + +enum { + IEEE80211SOFTMAC_AUTH_OPEN_REQUEST = 1, + IEEE80211SOFTMAC_AUTH_OPEN_RESPONSE = 2, +}; + +enum { + IEEE80211SOFTMAC_AUTH_SHARED_REQUEST = 1, + IEEE80211SOFTMAC_AUTH_SHARED_CHALLENGE = 2, + IEEE80211SOFTMAC_AUTH_SHARED_RESPONSE = 3, + IEEE80211SOFTMAC_AUTH_SHARED_PASS = 4, +}; + +/* We should make these tunable + * AUTH_TIMEOUT seems really long, but that's what it is in BSD */ +#define IEEE80211SOFTMAC_AUTH_TIMEOUT (12 * HZ) +#define IEEE80211SOFTMAC_AUTH_RETRY_LIMIT 5 +#define IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT 3 + +struct ieee80211softmac_txrates { + /* The Bit-Rate to be used for multicast frames. */ + u8 mcast_rate; + /* The Bit-Rate to be used for multicast fallback + * (If the device supports fallback and hardware-retry) + */ + u8 mcast_fallback; + /* The Bit-Rate to be used for any other (normal) data packet. */ + u8 default_rate; + /* The Bit-Rate to be used for default fallback + * (If the device supports fallback and hardware-retry) + */ + u8 default_fallback; +}; + +/* Bits for txrates_change callback. */ +#define IEEE80211SOFTMAC_TXRATECHG_DEFAULT (1 << 0) /* default_rate */ +#define IEEE80211SOFTMAC_TXRATECHG_DEFAULT_FBACK (1 << 1) /* default_fallback */ +#define IEEE80211SOFTMAC_TXRATECHG_MCAST (1 << 2) /* mcast_rate */ +#define IEEE80211SOFTMAC_TXRATECHG_MCAST_FBACK (1 << 3) /* mcast_fallback */ + +struct ieee80211softmac_device { + /* 802.11 structure for data stuff */ + struct ieee80211_device *ieee; + struct net_device *dev; + + /* only valid if associated, then holds the Association ID */ + u16 association_id; + + /* the following methods are callbacks that the driver + * using this framework has to assign + */ + + /* always assign these */ + void (*set_bssid_filter)(struct net_device *dev, const u8 *bssid); + void (*set_channel)(struct net_device *dev, u8 channel); + + /* assign if you need it, informational only */ + void (*link_change)(struct net_device *dev); + + /* If the hardware can do scanning, assign _all_ three of these callbacks. + * When the scan finishes, call ieee80211softmac_scan_finished(). + */ + + /* when called, start_scan is guaranteed to not be called again + * until you call ieee80211softmac_scan_finished. + * Return 0 if scanning could start, error otherwise. + * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_start_scan */ + int (*start_scan)(struct net_device *dev); + /* this should block until after ieee80211softmac_scan_finished was called + * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_wait_for_scan */ + void (*wait_for_scan)(struct net_device *dev); + /* stop_scan aborts a scan, but is asynchronous. + * if you want to wait for it too, use wait_for_scan + * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_stop_scan */ + void (*stop_scan)(struct net_device *dev); + + /* we'll need something about beacons here too, for AP or ad-hoc modes */ + + /* Transmission rates to be used by the driver. + * The SoftMAC figures out the best possible rates. + * The driver just needs to read them. + */ + struct ieee80211softmac_txrates txrates; + /* If the driver needs to do stuff on TX rate changes, assign this callback. */ + void (*txrates_change)(struct net_device *dev, + u32 changes, /* see IEEE80211SOFTMAC_TXRATECHG flags */ [...2780 lines suppressed...] + struct iw_request_info *info, + union iwreq_data *data, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); + unsigned long flags; + int err = -EINVAL; + + spin_lock_irqsave(&mac->lock, flags); + switch (mac->txrates.default_rate) { + case IEEE80211_CCK_RATE_1MB: + data->bitrate.value = 1000000; + break; + case IEEE80211_CCK_RATE_2MB: + data->bitrate.value = 2000000; + break; + case IEEE80211_CCK_RATE_5MB: + data->bitrate.value = 5500000; + break; + case IEEE80211_CCK_RATE_11MB: + data->bitrate.value = 11000000; + break; + case IEEE80211_OFDM_RATE_6MB: + data->bitrate.value = 6000000; + break; + case IEEE80211_OFDM_RATE_9MB: + data->bitrate.value = 9000000; + break; + case IEEE80211_OFDM_RATE_12MB: + data->bitrate.value = 12000000; + break; + case IEEE80211_OFDM_RATE_18MB: + data->bitrate.value = 18000000; + break; + case IEEE80211_OFDM_RATE_24MB: + data->bitrate.value = 24000000; + break; + case IEEE80211_OFDM_RATE_36MB: + data->bitrate.value = 36000000; + break; + case IEEE80211_OFDM_RATE_48MB: + data->bitrate.value = 48000000; + break; + case IEEE80211_OFDM_RATE_54MB: + data->bitrate.value = 54000000; + break; + default: + assert(0); + goto out_unlock; + } + err = 0; +out_unlock: + spin_unlock_irqrestore(&mac->lock, flags); + + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_rate); + +int +ieee80211softmac_wx_get_wap(struct net_device *net_dev, + struct iw_request_info *info, + union iwreq_data *data, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); + int err = 0; + unsigned long flags; + + spin_lock_irqsave(&mac->lock, flags); + if (mac->associnfo.bssvalid) + memcpy(data->ap_addr.sa_data, mac->associnfo.bssid, ETH_ALEN); + else + memset(data->ap_addr.sa_data, 0xff, ETH_ALEN); + data->ap_addr.sa_family = ARPHRD_ETHER; + spin_unlock_irqrestore(&mac->lock, flags); + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_wap); + +int +ieee80211softmac_wx_set_wap(struct net_device *net_dev, + struct iw_request_info *info, + union iwreq_data *data, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); + static const unsigned char any[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + static const unsigned char off[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + unsigned long flags; + + /* sanity check */ + if (data->ap_addr.sa_family != ARPHRD_ETHER) { + return -EINVAL; + } + + spin_lock_irqsave(&mac->lock, flags); + if (!memcmp(any, data->ap_addr.sa_data, ETH_ALEN) || + !memcmp(off, data->ap_addr.sa_data, ETH_ALEN)) { + schedule_work(&mac->associnfo.work); + goto out; + } else { + if (!memcmp(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN)) { + if (mac->associnfo.associating || mac->associated) { + /* bssid unchanged and associated or associating - just return */ + goto out; + } + } else { + /* copy new value in data->ap_addr.sa_data to bssid */ + memcpy(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN); + } + /* queue associate if new bssid or (old one again and not associated) */ + schedule_work(&mac->associnfo.work); + } + +out: + spin_unlock_irqrestore(&mac->lock, flags); + return 0; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_wap); + +int +ieee80211softmac_wx_set_genie(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(dev); + unsigned long flags; + int err = 0; + char *buf; + int i; + + spin_lock_irqsave(&mac->lock, flags); + /* bleh. shouldn't be locked for that kmalloc... */ + + if (wrqu->data.length) { + if ((wrqu->data.length < 2) || (extra[1]+2 != wrqu->data.length)) { + /* this is an IE, so the length must be + * correct. Is it possible though that + * more than one IE is passed in? + */ + err = -EINVAL; + goto out; + } + if (mac->wpa.IEbuflen <= wrqu->data.length) { + buf = kmalloc(wrqu->data.length, GFP_ATOMIC); + if (!buf) { + err = -ENOMEM; + goto out; + } + kfree(mac->wpa.IE); + mac->wpa.IE = buf; + mac->wpa.IEbuflen = wrqu->data.length; + } + memcpy(mac->wpa.IE, extra, wrqu->data.length); + dprintk(KERN_INFO PFX "generic IE set to "); + for (i=0;idata.length;i++) + dprintk("%.2x", mac->wpa.IE[i]); + dprintk("\n"); + mac->wpa.IElen = wrqu->data.length; + } else { + kfree(mac->wpa.IE); + mac->wpa.IE = NULL; + mac->wpa.IElen = 0; + mac->wpa.IEbuflen = 0; + } + + out: + spin_unlock_irqrestore(&mac->lock, flags); + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_genie); + +int +ieee80211softmac_wx_get_genie(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(dev); + unsigned long flags; + int err = 0; + int space = wrqu->data.length; + + spin_lock_irqsave(&mac->lock, flags); + + wrqu->data.length = 0; + + if (mac->wpa.IE && mac->wpa.IElen) { + wrqu->data.length = mac->wpa.IElen; + if (mac->wpa.IElen <= space) + memcpy(extra, mac->wpa.IE, mac->wpa.IElen); + else + err = -E2BIG; + } + spin_unlock_irqrestore(&mac->lock, flags); + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_genie); + linux-2.6.15-usb-find-interface.patch: usb.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) --- NEW FILE linux-2.6.15-usb-find-interface.patch --- --- linux-2.6.15/drivers/usb/core/usb.c.orig 2006-01-03 03:21:10.000000000 +0000 +++ linux-2.6.15/drivers/usb/core/usb.c 2006-01-09 13:40:41.000000000 +0000 @@ -483,20 +483,23 @@ usb_match_id(struct usb_interface *inter return NULL; } +struct find_interface_arg { + int minor; + struct usb_interface *interface; +}; static int __find_interface(struct device * dev, void * data) { - struct usb_interface ** ret = (struct usb_interface **)data; - struct usb_interface * intf = *ret; - int *minor = (int *)data; + struct find_interface_arg *arg = data; + struct usb_interface *intf; /* can't look at usb devices, only interfaces */ if (dev->driver == &usb_generic_driver) return 0; intf = to_usb_interface(dev); - if (intf->minor != -1 && intf->minor == *minor) { - *ret = intf; + if (intf->minor != -1 && intf->minor == arg->minor) { + arg->interface = intf; return 1; } return 0; @@ -513,12 +516,12 @@ static int __find_interface(struct devic */ struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor) { - struct usb_interface *intf = (struct usb_interface *)(long)minor; - int ret; - - ret = driver_for_each_device(&drv->driver, NULL, &intf, __find_interface); + struct find_interface_arg argb; - return ret ? intf : NULL; + argb.minor = minor; + argb.interface = NULL; + driver_for_each_device(&drv->driver, NULL, &argb, __find_interface); + return argb.interface; } static int usb_device_match (struct device *dev, struct device_driver *drv) linux-2.6.15-usblp-fixes.patch: usblp.c | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-) --- NEW FILE linux-2.6.15-usblp-fixes.patch --- diff -u b/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c --- b/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c @@ -438,7 +438,7 @@ | (!usblp->wcomplete ? 0 : POLLOUT | POLLWRNORM); } -static int usblp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) +static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct usblp *usblp = file->private_data; int length, err, i; @@ -838,7 +838,8 @@ .read = usblp_read, .write = usblp_write, .poll = usblp_poll, - .ioctl = usblp_ioctl, + .unlocked_ioctl = usblp_ioctl, + .compat_ioctl = usblp_ioctl, .open = usblp_open, .release = usblp_release, }; @@ -849,6 +850,20 @@ .minor_base = USBLP_MINOR_BASE, }; +static ssize_t usblp_show_ieee1284_id(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct usb_interface *intf = to_usb_interface(dev); + struct usblp *usblp = usb_get_intfdata (intf); + + if (usblp->device_id_string[0] == 0 && + usblp->device_id_string[1] == 0) + return 0; + + return sprintf(buf, "%s", usblp->device_id_string+2); +} + +static DEVICE_ATTR(ieee1284_id, S_IRUGO, usblp_show_ieee1284_id, NULL); + static int usblp_probe(struct usb_interface *intf, const struct usb_device_id *id) { @@ -933,20 +948,12 @@ /* Retrieve and store the device ID string. */ usblp_cache_device_id_string(usblp); + device_create_file(&intf->dev, &dev_attr_ieee1284_id); #ifdef DEBUG usblp_check_status(usblp, 0); #endif - info("usblp%d: USB %sdirectional printer dev %d " - "if %d alt %d proto %d vid 0x%4.4X pid 0x%4.4X", - usblp->minor, usblp->bidir ? "Bi" : "Uni", dev->devnum, - usblp->ifnum, - usblp->protocol[usblp->current_protocol].alt_setting, - usblp->current_protocol, - le16_to_cpu(usblp->dev->descriptor.idVendor), - le16_to_cpu(usblp->dev->descriptor.idProduct)); - usb_set_intfdata (intf, usblp); usblp->present = 1; @@ -957,11 +964,20 @@ goto abort_intfdata; } usblp->minor = intf->minor; + info("usblp%d: USB %sdirectional printer dev %d " + "if %d alt %d proto %d vid 0x%4.4X pid 0x%4.4X", + usblp->minor, usblp->bidir ? "Bi" : "Uni", dev->devnum, + usblp->ifnum, + usblp->protocol[usblp->current_protocol].alt_setting, + usblp->current_protocol, + le16_to_cpu(usblp->dev->descriptor.idVendor), + le16_to_cpu(usblp->dev->descriptor.idProduct)); return 0; abort_intfdata: usb_set_intfdata (intf, NULL); + device_remove_file(&intf->dev, &dev_attr_ieee1284_id); abort: if (usblp) { if (usblp->writebuf) @@ -1156,6 +1172,8 @@ BUG (); } + device_remove_file(&intf->dev, &dev_attr_ieee1284_id); + down (&usblp_sem); down (&usblp->sem); usblp->present = 0; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.313 retrieving revision 1.313.2.1 diff -u -r1.313 -r1.313.2.1 --- .cvsignore 3 Jan 2006 10:57:13 -0000 1.313 +++ .cvsignore 9 Jan 2006 13:47:34 -0000 1.313.2.1 @@ -2,5 +2,4 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 -bcm43xx-20060103.tar.bz2 -ieee80211softmac-20060103.tar.bz2 +bcm43xx-20060106.tar.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.5 retrieving revision 1.1826.2.6 diff -u -r1.1826.2.5 -r1.1826.2.6 --- kernel-2.6.spec 7 Jan 2006 06:14:57 -0000 1.1826.2.5 +++ kernel-2.6.spec 9 Jan 2006 13:47:35 -0000 1.1826.2.6 @@ -182,8 +182,7 @@ Source10: COPYING.modules Source11: genkey -%define BCMVER 20060103 -Source12: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/softmac/ieee80211softmac-%{BCMVER}.tar.bz2 +%define BCMVER 20060106 Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2 Source20: kernel-%{kversion}-i586.config @@ -304,6 +303,8 @@ Patch1028: linux-2.6-debug-oops-pause.patch Patch1029: linux-2.6-debug-account-kmalloc.patch Patch1030: linux-2.6-debug-latency-tracing.patch +Patch1031: linux-2.6.15-usblp-fixes.patch +Patch1032: linux-2.6.15-usb-find-interface.patch # Restrict /dev/mem usage. Patch1050: linux-2.6-devmem.patch @@ -386,12 +387,9 @@ Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch # Broadcom wireless driver -Patch5000: linux-2.6-bcm43xx.patch -Patch5001: linux-2.6-bcm43xx-quiet.patch -Patch5002: linux-2.6-bcm43xx-promisc.patch -Patch5003: linux-2.6.14-ieee80211-hw-wep.patch -Patch5004: linux-2.6-bcm43xx-device-table.patch -Patch5005: linux-2.6-bcm43xx-resume.patch +Patch5000: linux-2.6-softmac-git.patch +Patch5001: linux-2.6-bcm43xx.patch +Patch5002: linux-2.6-bcm43xx-resume.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -769,7 +767,8 @@ %patch1028 -p1 #%patch1029 -p1 #%patch1030 -p1 - +%patch1031 -p1 +%patch1032 -p1 # # Make /dev/mem a need-to-know function # @@ -915,24 +914,15 @@ # Broadcom BCM43xx wireless driver. # Extract snapshot tarballs and move them into place. -tar xvfj %{SOURCE12} -mv ieee80211softmac-%{BCMVER}/net/*.h include/net -mv ieee80211softmac-%{BCMVER} net/ieee80211/softmac tar xvfj %{SOURCE13} mv bcm43xx-%{BCMVER} drivers/net/wireless/bcm43xx -# Patch Kconfig and Makefiles to merge it 'properly' +# Import softmac code from git tree %patch5000 -p1 -# Make it shut up about dropping packets it didn't want +# Patch Kconfig and Makefiles to merge bcm43xx 'properly' %patch5001 -p1 -# Operate in promiscuous mode, to make multicast and broadcast RX work +# Fix the reassociate on resume code %patch5002 -p1 -# Handle host_build_iv properly -%patch5003 -p1 -# Include pci device table so it gets autoloaded -%patch5004 -p1 -# Reassociate on resume -%patch5005 -p1 # # final stuff @@ -1421,6 +1411,10 @@ %endif %changelog +* Mon Jan 9 2006 David Woodhouse +- Fix some usblp problems, add ieee1284_id to sysfs +- update bcm43xx driver to version tested in -HEAD + * Sat Jan 7 2006 Dave Jones - Silence some iseries build warnings. linux-2.6-bcm43xx-resume.patch: bcm43xx.h | 11 +++++++++-- bcm43xx_main.c | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) Index: linux-2.6-bcm43xx-resume.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx-resume.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- linux-2.6-bcm43xx-resume.patch 3 Jan 2006 23:04:52 -0000 1.1 +++ linux-2.6-bcm43xx-resume.patch 9 Jan 2006 13:47:35 -0000 1.1.2.1 @@ -1,10 +1,39 @@ --- linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c~ 2006-01-03 22:56:55.000000000 +0000 +++ linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-01-03 23:00:15.000000000 +0000 -@@ -4543,6 +4541,7 @@ static int bcm43xx_resume(struct pci_dev - } +@@ -4583,8 +4583,8 @@ static int bcm43xx_resume(struct pci_dev netif_device_attach(net_dev); -+ queue_work(bcm->softmac->workqueue,&bcm->softmac->associnfo.work); + + /*FIXME: This should be handled by softmac instead. */ +- queue_work(bcm->softmac->workqueue, &bcm->softmac->associnfo.work); ++ schedule_work(&bcm->softmac->associnfo.work); dprintk(KERN_INFO PFX "Device resumed.\n"); +--- linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx.h.orig 2006-01-06 05:00:12.000000000 +0000 ++++ linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx.h 2006-01-06 14:07:38.000000000 +0000 +@@ -648,7 +648,8 @@ struct bcm43xx_private { + bad_frames_preempt:1, /* Use "Bad Frames Preemption" (default off) */ + reg124_set_0x4:1, /* Some variable to keep track of IRQ stuff. */ + powersaving:1, /* TRUE if we are in PowerSaving mode. FALSE otherwise. */ +- short_preamble:1; /* TRUE, if short preamble is enabled. */ ++ short_preamble:1, /* TRUE, if short preamble is enabled. */ ++ firmware_norelease:1; /* Do not release the firmware. Used on suspend. */ + + struct bcm43xx_stats stats; + +@@ -728,7 +729,13 @@ struct bcm43xx_private { + u16 security_offset; + struct bcm43xx_key key[54]; + u8 default_key_idx; +- ++ ++ /* Firmware. */ ++ const struct firmware *ucode; ++ const struct firmware *pcm; ++ const struct firmware *initvals0; ++ const struct firmware *initvals1; ++ + /* Debugging stuff follows. */ + #ifdef BCM43xx_DEBUG + struct bcm43xx_dfsentry *dfsentry; linux-2.6-bcm43xx.patch: Kconfig | 8 ++++++++ Makefile | 1 + 2 files changed, 9 insertions(+) Index: linux-2.6-bcm43xx.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- linux-2.6-bcm43xx.patch 2 Jan 2006 21:56:59 -0000 1.1 +++ linux-2.6-bcm43xx.patch 9 Jan 2006 13:47:35 -0000 1.1.2.1 @@ -25,26 +25,3 @@ # 16-bit wireless PCMCIA client drivers obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o ---- linux-2.6.14/net/ieee80211/Kconfig~ 2005-12-30 23:42:06.000000000 +0000 -+++ linux-2.6.14/net/ieee80211/Kconfig 2005-12-30 23:51:55.000000000 +0000 -@@ -66,3 +66,10 @@ config IEEE80211_CRYPT_TKIP - This can be compiled as a modules and it will be called - "ieee80211_crypt_tkip". - -+config IEEE80211_SOFTMAC -+ tristate "IEEE 802.11 softmac" -+ depends on IEEE80211 && EXPERIMENTAL -+ ---help--- -+ The softmac layer handles IEEE 802.11 protocol management functions -+ such as scanning, association and similar tasks, which recent hardware -+ often leaves to software rather than implementing it all in hardware. ---- linux-2.6.14/net/ieee80211/Makefile~ 2005-12-30 23:42:06.000000000 +0000 -+++ linux-2.6.14/net/ieee80211/Makefile 2005-12-30 23:52:26.000000000 +0000 -@@ -3,6 +3,7 @@ obj-$(CONFIG_IEEE80211) += ieee80211_cry - obj-$(CONFIG_IEEE80211_CRYPT_WEP) += ieee80211_crypt_wep.o - obj-$(CONFIG_IEEE80211_CRYPT_CCMP) += ieee80211_crypt_ccmp.o - obj-$(CONFIG_IEEE80211_CRYPT_TKIP) += ieee80211_crypt_tkip.o -+obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/ - ieee80211-objs := \ - ieee80211_module.o \ - ieee80211_tx.o \ Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.255 retrieving revision 1.255.2.1 diff -u -r1.255 -r1.255.2.1 --- sources 3 Jan 2006 10:57:13 -0000 1.255 +++ sources 9 Jan 2006 13:47:35 -0000 1.255.2.1 @@ -1,3 +1,2 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -96083b51cd30e60b86127113abed37a3 bcm43xx-20060103.tar.bz2 -1eb2bb778090c59fbeba6278d63a9309 ieee80211softmac-20060103.tar.bz2 +1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2 --- linux-2.6-bcm43xx-device-table.patch DELETED --- --- linux-2.6-bcm43xx-promisc.patch DELETED --- --- linux-2.6-bcm43xx-quiet.patch DELETED --- --- linux-2.6.14-ieee80211-hw-wep.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 14:06:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 09:06:45 -0500 Subject: rpms/ltrace/devel ltrace-fixes.patch, NONE, 1.1 ltrace-ia64.patch, NONE, 1.1 ltrace-ppc64-2.patch, NONE, 1.1 ltrace-ppc64.patch, NONE, 1.1 ltrace-s390x.patch, NONE, 1.1 ltrace-syscallent-update.patch, NONE, 1.1 ltrace.spec, 1.19, 1.20 ltrace_0.3.36-biarch.patch, 1.1, NONE Message-ID: <200601091406.k09E6j7N020590@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/ltrace/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20546/devel Modified Files: ltrace.spec Added Files: ltrace-fixes.patch ltrace-ia64.patch ltrace-ppc64-2.patch ltrace-ppc64.patch ltrace-s390x.patch ltrace-syscallent-update.patch Removed Files: ltrace_0.3.36-biarch.patch Log Message: auto-import ltrace-0.3.36-4 on branch devel from ltrace-0.3.36-4.src.rpm ltrace-fixes.patch: Makefile.in | 5 breakpoints.c | 2 configure | 222 ++++++++++++++++++++++++++++++------------ configure.ac | 20 +++ elf.c | 13 +- ltrace.h | 1 sysdeps/linux-gnu/ppc/trace.c | 2 7 files changed, 190 insertions(+), 75 deletions(-) --- NEW FILE ltrace-fixes.patch --- --- ltrace-0.3.36/sysdeps/linux-gnu/ppc/trace.c.jj 2006-01-09 12:22:56.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/ppc/trace.c 2006-01-09 12:35:02.000000000 +0100 @@ -7,9 +7,7 @@ #include #include #include -#ifdef __powerpc64__ #include -#endif #include "ltrace.h" --- ltrace-0.3.36/Makefile.in.jj 2006-01-09 12:36:27.000000000 +0100 +++ ltrace-0.3.36/Makefile.in 2006-01-09 12:47:12.000000000 +0100 @@ -13,12 +13,9 @@ bindir = $(prefix)/bin mandir = @mandir@ docdir = $(prefix)/doc/ltrace -cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \ - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) - CC = @CC@ CFLAGS = -Wall @CFLAGS@ -CPPFLAGS = -I$(TOPDIR) -I$(TOPDIR)/sysdeps/$(OS) $(call cc-option,-I-,-iquote) @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@ +CPPFLAGS = @iquote@$(TOPDIR) @iquote@$(TOPDIR)/sysdeps/$(OS) @iquoteend@ @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@ LDFLAGS = LIBS = @LIBS@ --- ltrace-0.3.36/configure.ac.jj 2006-01-09 12:22:56.000000000 +0100 +++ ltrace-0.3.36/configure.ac 2006-01-09 12:46:29.000000000 +0100 @@ -41,7 +41,8 @@ dnl AC_FUNC_VPRINTF dnl AC_CHECK_FUNCS(gettimeofday strdup strerror strspn) AC_CHECK_FUNCS(getopt getopt_long) -for path in /usr/include/elfutils /usr/local/include/elfutils /usr/include/libelf /usr/local/include/libelf; do +for path in /usr/include/elfutils /usr/local/include/elfutils \ + /usr/include/libelf /usr/local/include/libelf; do if test -f ${path}/gelf.h; then CPPFLAGS="$CPPFLAGS -I ${path}" fi @@ -51,6 +52,23 @@ AC_CHECK_HEADER(gelf.h,,AC_MSG_ERROR([** AC_CHECK_LIB(elf,gelf_getdyn) +ac_cv_have_iquote=no +AC_MSG_CHECKING(compiler accepts -iquote dir) +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS -iquote ." +AC_TRY_COMPILE(,,[ac_cv_have_iquote=yes]) +CPPFLAGS="$save_CPPFLAGS" +AC_MSG_RESULT($ac_cv_have_iquote) +if test $ac_cv_have_iquote = yes; then + iquote="-iquote " + iquoteend="" +else + iquote="-I " + iquoteend="-I-" +fi +AC_SUBST(iquote) +AC_SUBST(iquoteend) + ac_cv_have_elf_c_read_mmap=no AC_MSG_CHECKING(elf_begin accepts ELF_C_READ_MMAP) AC_TRY_COMPILE([#include ], --- ltrace-0.3.36/ltrace.h.jj 2006-01-09 13:16:44.000000000 +0100 +++ ltrace-0.3.36/ltrace.h 2006-01-09 13:31:48.000000000 +0100 @@ -75,6 +75,7 @@ struct library_symbol { struct breakpoint *brkpnt; char needs_init; char static_plt2addr; + char is_weak; struct library_symbol * next; }; --- ltrace-0.3.36/elf.c.jj 2006-01-09 13:16:44.000000000 +0100 +++ ltrace-0.3.36/elf.c 2006-01-09 13:36:04.000000000 +0100 @@ -21,7 +21,7 @@ static void do_init_elf (struct ltelf *l static void do_close_elf (struct ltelf *lte); static void add_library_symbol (GElf_Addr addr, const char *name, struct library_symbol **library_symbolspp, - int use_elf_plt2addr); + int use_elf_plt2addr, int is_weak); static int in_load_libraries (const char *name, struct ltelf *lte); static GElf_Addr elf_plt2addr (struct ltelf *ltc, void *addr); @@ -269,7 +269,7 @@ do_close_elf (struct ltelf *lte) static void add_library_symbol (GElf_Addr addr, const char *name, struct library_symbol **library_symbolspp, - int use_elf_plt2addr) + int use_elf_plt2addr, int is_weak) { struct library_symbol *s; s = malloc (sizeof (struct library_symbol) + strlen (name) + 1); @@ -277,6 +277,7 @@ add_library_symbol (GElf_Addr addr, cons error (EXIT_FAILURE, errno, "add_library_symbol failed"); s->needs_init = 1; + s->is_weak = is_weak; s->static_plt2addr = use_elf_plt2addr; s->next = *library_symbolspp; s->enter_addr = (void *) (uintptr_t) addr; @@ -395,7 +396,8 @@ read_elf (struct process * proc) if (in_load_libraries (name, lte)) { addr = arch_plt_sym_val (lte, i, &rela); - add_library_symbol (addr, name, &library_symbols, 0); + add_library_symbol (addr, name, &library_symbols, 0, + ELF64_ST_BIND (sym.st_info) != 0); if (!lib_tail) lib_tail = &(library_symbols->next); } @@ -440,7 +442,8 @@ read_elf (struct process * proc) { /* FIXME: Should be able to use &library_symbols as above. But when you do, none of the real library symbols cause breaks. */ - add_library_symbol (elf_plt2addr(lte, (void *)addr), name, lib_tail, 1); + add_library_symbol (elf_plt2addr(lte, (void *)addr), name, + lib_tail, 1, 0); break; } } @@ -449,7 +452,7 @@ read_elf (struct process * proc) { if (strcmp(xptr->name, E_ENTRY_NAME) == 0) add_library_symbol (elf_plt2addr(lte, (void*)lte->ehdr.e_entry), - "_start", lib_tail, 1); + "_start", lib_tail, 1, 0); else fprintf (stderr, "Warning: Couldn't get symbol \"%s\" " "from \"%s\" or it's a duplicate", --- ltrace-0.3.36/breakpoints.c.jj 2006-01-09 13:16:44.000000000 +0100 +++ ltrace-0.3.36/breakpoints.c 2006-01-09 13:35:32.000000000 +0100 @@ -177,7 +177,7 @@ reinitialize_breakpoints (struct process while (sym) { if (sym->needs_init) { insert_breakpoint(proc, plt2addr(proc, sym->enter_addr), sym); - if (sym->needs_init) { + if (sym->needs_init && !sym->is_weak) { fprintf(stderr, "could not re-initialize breakpoint for \"%s\" in file \"%s\"\n", sym->name, proc->filename); exit(1); } --- ltrace-0.3.36/configure.jj 2004-11-10 00:15:11.000000000 +0100 +++ ltrace-0.3.36/configure 2006-01-09 12:47:56.000000000 +0100 @@ -1,6 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. +# Generated by GNU Autoconf 2.59 for ltrace 0.3.36. +# +# Report bugs to >. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -265,11 +267,11 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='ltrace' +PACKAGE_TARNAME='ltrace' +PACKAGE_VERSION='0.3.36' +PACKAGE_STRING='ltrace 0.3.36' +PACKAGE_BUGREPORT='Juan Cespedes ' ac_unique_file="ltrace.c" # Factoring default headers for most tests. @@ -309,7 +311,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HOST_OS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HOST_OS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP iquote iquoteend LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -778,7 +780,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. +\`configure' configures ltrace 0.3.36 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -838,7 +840,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of ltrace 0.3.36:";; + esac cat <<\_ACEOF Optional Features: @@ -858,6 +862,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to >. _ACEOF fi @@ -946,13 +951,15 @@ esac else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" + cd $ac_popdir done fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF +ltrace configure 0.3.36 +generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -965,7 +972,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by ltrace $as_me 0.3.36, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1293,10 +1300,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - ac_config_headers="$ac_config_headers config.h" + + + + + + + ac_config_headers="$ac_config_headers config.h" + + ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1947,7 +1962,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2005,7 +2021,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2121,7 +2138,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2175,7 +2193,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2220,7 +2239,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2264,7 +2284,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2423,7 +2444,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2496,7 +2518,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2815,7 +2838,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -2985,7 +3009,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3052,7 +3077,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3139,9 +3165,9 @@ echo "$as_me: WARNING: $ac_header: proce echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## -------------------------------------------------- ## +## Report this to Juan Cespedes ## +## -------------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -3242,7 +3268,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3343,7 +3370,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3446,7 +3474,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3479,6 +3508,13 @@ fi done +for path in /usr/include/elfutils /usr/local/include/elfutils \ + /usr/include/libelf /usr/local/include/libelf; do + if test -f ${path}/gelf.h; then + CPPFLAGS="$CPPFLAGS -I ${path}" + fi +done + if test "${ac_cv_header_gelf_h+set}" = set; then echo "$as_me:$LINENO: checking for gelf.h" >&5 echo $ECHO_N "checking for gelf.h... $ECHO_C" >&6 @@ -3509,7 +3545,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3596,9 +3633,9 @@ echo "$as_me: WARNING: gelf.h: proceedin echo "$as_me: WARNING: gelf.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## +## -------------------------------------------------- ## +## Report this to Juan Cespedes ## +## -------------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -3618,24 +3655,14 @@ fi if test $ac_cv_header_gelf_h = yes; then : else - - if test -f /usr/include/elfutils/gelf.h; then - CPPFLAGS="$CPPFLAGS -I /usr/include/elfutils" - elif test -f /usr/local/include/elfutils/gelf.h; then - CPPFLAGS="$CPPFLAGS -I /usr/local/include/elfutils" - elif test -f /usr/include/libelf/gelf.h; then - CPPFLAGS="$CPPFLAGS -I /usr/include/libelf" - elif test -f /usr/local/include/libelf/gelf.h; then - CPPFLAGS="$CPPFLAGS -I /usr/local/include/libelf" - else - { { echo "$as_me:$LINENO: error: gelf.h not found" >&5 -echo "$as_me: error: gelf.h not found" >&2;} + { { echo "$as_me:$LINENO: error: ***** gelf.h not found *****" >&5 +echo "$as_me: error: ***** gelf.h not found *****" >&2;} { (exit 1); exit 1; }; } - fi fi + echo "$as_me:$LINENO: checking for gelf_getdyn in -lelf" >&5 echo $ECHO_N "checking for gelf_getdyn in -lelf... $ECHO_C" >&6 if test "${ac_cv_lib_elf_gelf_getdyn+set}" = set; then @@ -3674,7 +3701,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3709,6 +3737,68 @@ _ACEOF fi +ac_cv_have_iquote=no +echo "$as_me:$LINENO: checking compiler accepts -iquote dir" >&5 +echo $ECHO_N "checking compiler accepts -iquote dir... $ECHO_C" >&6 +save_CPPFLAGS="$CPPFLAGS" +CPPFLAGS="$CPPFLAGS -iquote ." +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_have_iquote=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +CPPFLAGS="$save_CPPFLAGS" +echo "$as_me:$LINENO: result: $ac_cv_have_iquote" >&5 +echo "${ECHO_T}$ac_cv_have_iquote" >&6 +if test $ac_cv_have_iquote = yes; then + iquote="-iquote " + iquoteend="" +else + iquote="-I " + iquoteend="-I-" +fi + + + ac_cv_have_elf_c_read_mmap=no echo "$as_me:$LINENO: checking elf_begin accepts ELF_C_READ_MMAP" >&5 echo $ECHO_N "checking elf_begin accepts ELF_C_READ_MMAP... $ECHO_C" >&6 @@ -3736,7 +3826,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3813,7 +3904,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3842,7 +3934,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3912,7 +4005,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -3964,7 +4058,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4035,7 +4130,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4087,7 +4183,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -4485,7 +4582,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by $as_me, which was +This file was extended by ltrace $as_me 0.3.36, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4545,7 +4642,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +ltrace config.status 0.3.36 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -4755,6 +4852,8 @@ s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t s, at INSTALL_DATA@,$INSTALL_DATA,;t t s, at CPP@,$CPP,;t t s, at EGREP@,$EGREP,;t t +s, at iquote@,$iquote,;t t +s, at iquoteend@,$iquoteend,;t t s, at LIBOBJS@,$LIBOBJS,;t t s, at LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -4923,6 +5022,11 @@ esac *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -4961,12 +5065,6 @@ echo "$as_me: error: cannot find input f fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub ltrace-ia64.patch: README | 5 debian/control | 2 debian/copyright | 4 debian/rules | 2 elf.c | 5 elf.h | 1 ltrace.1 | 2 options.c | 2 sysdeps/linux-gnu/breakpoint.c | 17 sysdeps/linux-gnu/ia64/Makefile | 10 sysdeps/linux-gnu/ia64/arch.h | 12 sysdeps/linux-gnu/ia64/breakpoint.c | 222 ++++++ sysdeps/linux-gnu/ia64/plt.c | 47 + sysdeps/linux-gnu/ia64/ptrace.h | 1 sysdeps/linux-gnu/ia64/regs.c | 47 + sysdeps/linux-gnu/ia64/signalent.h | 32 sysdeps/linux-gnu/ia64/syscallent.h | 1280 ++++++++++++++++++++++++++++++++++++ sysdeps/linux-gnu/ia64/trace.c | 140 +++ sysdeps/linux-gnu/trace.c | 3 19 files changed, 1824 insertions(+), 10 deletions(-) --- NEW FILE ltrace-ia64.patch --- --- ltrace-0.3.36/sysdeps/linux-gnu/breakpoint.c.jj 2006-01-09 13:16:44.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/breakpoint.c 2006-01-09 14:33:18.000000000 +0100 @@ -3,6 +3,7 @@ #endif #include +#include #include "arch.h" #include "options.h" #include "output.h" @@ -10,6 +11,13 @@ static unsigned char break_insn[] = BREAKPOINT_VALUE; +#ifdef ARCH_HAVE_ENABLE_BREAKPOINT +extern void arch_enable_breakpoint(pid_t, struct breakpoint*); +void enable_breakpoint(pid_t pid, struct breakpoint *sbp) +{ + arch_enable_breakpoint(pid, sbp); +} +#else void enable_breakpoint(pid_t pid, struct breakpoint * sbp) { int i,j; @@ -27,7 +35,15 @@ enable_breakpoint(pid_t pid, struct brea ptrace(PTRACE_POKETEXT, pid, sbp->addr + i*sizeof(long), a); } } +#endif /* ARCH_HAVE_ENABLE_BREAKPOINT */ +#ifdef ARCH_HAVE_DISABLE_BREAKPOINT +extern void arch_disable_breakpoint(pid_t, const struct breakpoint * sbp); +void +disable_breakpoint(pid_t pid, const struct breakpoint * sbp) { + arch_disable_breakpoint(pid, sbp); +} +#else void disable_breakpoint(pid_t pid, const struct breakpoint * sbp) { int i,j; @@ -46,3 +62,4 @@ disable_breakpoint(pid_t pid, const stru ptrace(PTRACE_POKETEXT, pid, sbp->addr + i*sizeof(long), a); } } +#endif /* ARCH_HAVE_DISABLE_BREAKPOINT */ --- ltrace-0.3.36/sysdeps/linux-gnu/ia64/arch.h.jj 2006-01-09 14:36:14.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/ia64/arch.h 2006-01-09 14:37:29.000000000 +0100 @@ -0,0 +1,12 @@ +#define ARCH_HAVE_DISABLE_BREAKPOINT 1 +#define ARCH_HAVE_ENABLE_BREAKPOINT 1 + +#define BREAKPOINT_LENGTH 16 +#define BREAKPOINT_VALUE {0} +#define DECR_PC_AFTER_BREAK 0 + +#define LT_ELFCLASS ELFCLASS64 +#define LT_ELF_MACHINE EM_IA_64 + +#define PLTs_INIT_BY_HERE NULL +#define E_ENTRY_NAME "_start" --- ltrace-0.3.36/sysdeps/linux-gnu/ia64/breakpoint.c.jj 2006-01-09 14:36:14.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/ia64/breakpoint.c 2006-01-09 14:36:14.000000000 +0100 @@ -0,0 +1,222 @@ +/* IA64 breakpoint support. Much of this clagged from gdb + * -Ian Wienand 10/3/2005 + */ + +#include "config.h" + +#include +#include +#include "arch.h" +#include "options.h" +#include "output.h" +#include "debug.h" + +static long long +extract_bit_field (char *bundle, int from, int len) +{ + long long result = 0LL; + int to = from + len; + int from_byte = from / 8; + int to_byte = to / 8; + unsigned char *b = (unsigned char *) bundle; + unsigned char c; + int lshift; + int i; + + c = b[from_byte]; + if (from_byte == to_byte) + c = ((unsigned char) (c << (8 - to % 8))) >> (8 - to % 8); + result = c >> (from % 8); + lshift = 8 - (from % 8); + + for (i = from_byte+1; i < to_byte; i++) + { + result |= ((long long) b[i]) << lshift; + lshift += 8; + } + + if (from_byte < to_byte && (to % 8 != 0)) + { + c = b[to_byte]; + c = ((unsigned char) (c << (8 - to % 8))) >> (8 - to % 8); + result |= ((long long) c) << lshift; + } + + return result; +} + +/* Replace the specified bits in an instruction bundle */ +static void +replace_bit_field (char *bundle, long long val, int from, int len) +{ + int to = from + len; + int from_byte = from / 8; + int to_byte = to / 8; + unsigned char *b = (unsigned char *) bundle; + unsigned char c; + + if (from_byte == to_byte) + { + unsigned char left, right; + c = b[from_byte]; + left = (c >> (to % 8)) << (to % 8); + right = ((unsigned char) (c << (8 - from % 8))) >> (8 - from % 8); + c = (unsigned char) (val & 0xff); + c = (unsigned char) (c << (from % 8 + 8 - to % 8)) >> (8 - to % 8); + c |= right | left; + b[from_byte] = c; + } + else + { + int i; + c = b[from_byte]; + c = ((unsigned char) (c << (8 - from % 8))) >> (8 - from % 8); + c = c | (val << (from % 8)); + b[from_byte] = c; + val >>= 8 - from % 8; + + for (i = from_byte+1; i < to_byte; i++) + { + c = val & 0xff; + val >>= 8; + b[i] = c; + } + + if (to % 8 != 0) + { + unsigned char cv = (unsigned char) val; + c = b[to_byte]; + c = c >> (to % 8) << (to % 8); + c |= ((unsigned char) (cv << (8 - to % 8))) >> (8 - to % 8); + b[to_byte] = c; + } + } +} + +/* Return the contents of slot N (for N = 0, 1, or 2) in + and instruction bundle */ +static long long +slotN_contents (char *bundle, int slotnum) +{ + return extract_bit_field (bundle, 5+41*slotnum, 41); +} + +/* Store an instruction in an instruction bundle */ + +static void +replace_slotN_contents (char *bundle, long long instr, int slotnum) +{ + replace_bit_field (bundle, instr, 5+41*slotnum, 41); +} + +typedef enum instruction_type +{ + A, /* Integer ALU ; I-unit or M-unit */ + I, /* Non-ALU integer; I-unit */ + M, /* Memory ; M-unit */ + F, /* Floating-point ; F-unit */ + B, /* Branch ; B-unit */ + L, /* Extended (L+X) ; I-unit */ + X, /* Extended (L+X) ; I-unit */ + undefined /* undefined or reserved */ +} instruction_type; + +static enum instruction_type template_encoding_table[32][3] = +{ + { M, I, I }, /* 00 */ + { M, I, I }, /* 01 */ + { M, I, I }, /* 02 */ + { M, I, I }, /* 03 */ + { M, L, X }, /* 04 */ + { M, L, X }, /* 05 */ + { undefined, undefined, undefined }, /* 06 */ + { undefined, undefined, undefined }, /* 07 */ + { M, M, I }, /* 08 */ + { M, M, I }, /* 09 */ + { M, M, I }, /* 0A */ + { M, M, I }, /* 0B */ + { M, F, I }, /* 0C */ + { M, F, I }, /* 0D */ + { M, M, F }, /* 0E */ + { M, M, F }, /* 0F */ + { M, I, B }, /* 10 */ + { M, I, B }, /* 11 */ + { M, B, B }, /* 12 */ + { M, B, B }, /* 13 */ + { undefined, undefined, undefined }, /* 14 */ + { undefined, undefined, undefined }, /* 15 */ + { B, B, B }, /* 16 */ + { B, B, B }, /* 17 */ + { M, M, B }, /* 18 */ + { M, M, B }, /* 19 */ + { undefined, undefined, undefined }, /* 1A */ + { undefined, undefined, undefined }, /* 1B */ + { M, F, B }, /* 1C */ + { M, F, B }, /* 1D */ + { undefined, undefined, undefined }, /* 1E */ + { undefined, undefined, undefined }, /* 1F */ +}; + +union bundle_t { + char cbundle[16]; + unsigned long ubundle[2]; +}; + +void +arch_enable_breakpoint(pid_t pid, struct breakpoint * sbp) { + + unsigned long addr = (unsigned long)sbp->addr; + union bundle_t bundle; + int slotnum = (int) (addr & 0x0f) & 0x3; + long long instr; + int template; + + debug(1, "Enable Breakpoint at %p)", sbp->addr); + + if (slotnum > 2) + printf("Can't insert breakpoint for slot numbers greater than 2."); + + addr &= ~0x0f; + bundle.ubundle[0] = ptrace(PTRACE_PEEKTEXT, pid, addr, 0); + bundle.ubundle[1] = ptrace(PTRACE_PEEKTEXT, pid, addr+8, 0); + + /* Check for L type instruction in 2nd slot, if present then + bump up the slot number to the 3rd slot */ + template = extract_bit_field (bundle.cbundle, 0, 5); + if (slotnum == 1 && template_encoding_table[template][1] == L) + { + slotnum = 2; + } + + instr = slotN_contents (bundle.cbundle, slotnum); + + memcpy(sbp->orig_value, &instr, sizeof(instr)); + + replace_slotN_contents (bundle.cbundle, 0x00002000040LL, slotnum); + + ptrace(PTRACE_POKETEXT, pid, addr, bundle.ubundle[0]); + ptrace(PTRACE_POKETEXT, pid, addr+8, bundle.ubundle[1]); + +} + +void +arch_disable_breakpoint(pid_t pid, const struct breakpoint * sbp) { + + unsigned long addr = (unsigned long)sbp->addr; + int slotnum = (int)(addr & 0x0f) & 0x3; + union bundle_t bundle; + unsigned long instr; + + debug(1, "Disable Breakpoint at %p", sbp->addr); + + addr &= ~0x0f; + + bundle.ubundle[0] = ptrace(PTRACE_PEEKTEXT, pid, addr, 0); + bundle.ubundle[1] = ptrace(PTRACE_PEEKTEXT, pid, addr+8, 0); + + memcpy (&instr, sbp->orig_value, sizeof(instr)); + + replace_slotN_contents (bundle.cbundle, instr, slotnum); + ptrace(PTRACE_POKETEXT, pid, addr, bundle.ubundle[0]); + ptrace(PTRACE_POKETEXT, pid, addr+8, bundle.ubundle[1]); +} --- ltrace-0.3.36/sysdeps/linux-gnu/ia64/Makefile.jj 2006-01-09 14:36:14.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/ia64/Makefile 2006-01-09 14:36:14.000000000 +0100 @@ -0,0 +1,10 @@ +OBJ = trace.o regs.o plt.o breakpoint.o + +all: arch.o + +arch.o: $(OBJ) + $(LD) -r -o arch.o $(OBJ) + +clean: + $(RM) $(OBJ) arch.o + --- ltrace-0.3.36/sysdeps/linux-gnu/ia64/plt.c.jj 2006-01-09 14:36:14.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/ia64/plt.c 2006-01-09 14:39:08.000000000 +0100 @@ -0,0 +1,47 @@ +#include +#include "ltrace.h" +#include "elf.h" +#include "debug.h" + +/* A bundle is 128 bits */ +#define BUNDLE_SIZE 16 + +/* + + The PLT has + + ] 3 bundles as a header + + ] The special reserved entry + + ] Following that, each PLT entry has it's initial code that the GOT entry + points to. Each PLT entry has one bundle allocated. + + ] Following that, each PLT entry has two bundles of actual PLT code, + i.e. load up the address from the GOT and jump to it. This is the + point we want to insert the breakpoint, as this will be captured + every time we jump to the PLT entry in the code. + +*/ + +GElf_Addr +arch_plt_sym_val (struct ltelf *lte, size_t ndx, GElf_Rela *rela) +{ + /* Find number of entires by removing header and special + * entry, dividing total size by three, since each PLT entry + * will have 3 bundles (1 for inital entry and two for the PLT + * code). */ + int entries = (lte->plt_size - 4*BUNDLE_SIZE) / (3*BUNDLE_SIZE); + + /* Now the point we want to break on is the PLT entry after + * all the header stuff */ + unsigned long addr = lte->plt_addr + (4*BUNDLE_SIZE) + (BUNDLE_SIZE*entries) + (2*ndx*BUNDLE_SIZE); + debug(3, "Found PLT %d entry at %lx\n", ndx, addr); + + return addr; +} + +void * plt2addr(struct process *proc, void ** plt) +{ + return (void *) plt; +} --- ltrace-0.3.36/sysdeps/linux-gnu/ia64/ptrace.h.jj 2006-01-09 14:36:14.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/ia64/ptrace.h 2006-01-09 14:36:14.000000000 +0100 @@ -0,0 +1 @@ +#include --- ltrace-0.3.36/sysdeps/linux-gnu/ia64/regs.c.jj 2006-01-09 14:36:14.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/ia64/regs.c 2006-01-09 14:36:14.000000000 +0100 @@ -0,0 +1,47 @@ +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include + +#include +#include + +#include +#include "debug.h" +#include "ltrace.h" + +void * +get_instruction_pointer(struct process * proc) { + unsigned long ip = ptrace(PTRACE_PEEKUSER, proc->pid, PT_CR_IIP, 0); + unsigned long slot = (ptrace(PTRACE_PEEKUSER, proc->pid, PT_CR_IPSR, 0) >> 41) & 3; + + return (void*)(ip | slot); +} + +void +set_instruction_pointer(struct process * proc, void * addr) { + + unsigned long newip = (unsigned long)addr; + int slot = (int) addr & 0xf; + unsigned long psr = ptrace(PTRACE_PEEKUSER, proc->pid, PT_CR_IPSR, 0); + + psr &= ~(3UL << 41); + psr |= (unsigned long)(slot & 0x3) << 41; + + newip &= ~0xfUL; + + ptrace(PTRACE_POKEUSER, proc->pid, PT_CR_IIP, (long)newip); + ptrace(PTRACE_POKEUSER, proc->pid, PT_CR_IPSR, psr); +} + +void * +get_stack_pointer(struct process * proc) { + return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, PT_R12, 0); +} + +void * +get_return_addr(struct process * proc, void * stack_pointer) { + return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, PT_B0, 0); +} --- ltrace-0.3.36/sysdeps/linux-gnu/ia64/signalent.h.jj 2006-01-09 14:36:14.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/ia64/signalent.h 2006-01-09 14:36:14.000000000 +0100 @@ -0,0 +1,32 @@ + "SIG_0", /* 0 */ + "SIGHUP", /* 1 */ + "SIGINT", /* 2 */ + "SIGQUIT", /* 3 */ + "SIGILL", /* 4 */ + "SIGTRAP", /* 5 */ + "SIGABRT", /* 6 */ + "SIGBUS", /* 7 */ + "SIGFPE", /* 8 */ + "SIGKILL", /* 9 */ + "SIGUSR1", /* 10 */ + "SIGSEGV", /* 11 */ + "SIGUSR2", /* 12 */ + "SIGPIPE", /* 13 */ + "SIGALRM", /* 14 */ + "SIGTERM", /* 15 */ + "SIGSTKFLT", /* 16 */ + "SIGCHLD", /* 17 */ + "SIGCONT", /* 18 */ + "SIGSTOP", /* 19 */ + "SIGTSTP", /* 20 */ + "SIGTTIN", /* 21 */ + "SIGTTOU", /* 22 */ + "SIGURG", /* 23 */ + "SIGXCPU", /* 24 */ + "SIGXFSZ", /* 25 */ + "SIGVTALRM", /* 26 */ + "SIGPROF", /* 27 */ + "SIGWINCH", /* 28 */ + "SIGIO", /* 29 */ + "SIGPWR", /* 30 */ + "SIGSYS", /* 31 */ --- ltrace-0.3.36/sysdeps/linux-gnu/ia64/syscallent.h.jj 2006-01-09 14:36:14.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/ia64/syscallent.h 2006-01-09 14:41:36.000000000 +0100 @@ -0,0 +1,1280 @@ + "0", /* 0 */ + "1", /* 1 */ + "2", /* 2 */ + "3", /* 3 */ + "4", /* 4 */ + "5", /* 5 */ + "6", /* 6 */ + "7", /* 7 */ + "8", /* 8 */ + "9", /* 9 */ + "10", /* 10 */ + "11", /* 11 */ + "12", /* 12 */ + "13", /* 13 */ + "14", /* 14 */ + "15", /* 15 */ + "16", /* 16 */ + "17", /* 17 */ + "18", /* 18 */ + "19", /* 19 */ + "20", /* 20 */ + "21", /* 21 */ + "22", /* 22 */ + "23", /* 23 */ + "24", /* 24 */ + "25", /* 25 */ + "26", /* 26 */ + "27", /* 27 */ + "28", /* 28 */ + "29", /* 29 */ + "30", /* 30 */ + "31", /* 31 */ + "32", /* 32 */ + "33", /* 33 */ + "34", /* 34 */ + "35", /* 35 */ + "36", /* 36 */ + "37", /* 37 */ + "38", /* 38 */ + "39", /* 39 */ + "40", /* 40 */ + "41", /* 41 */ + "42", /* 42 */ + "43", /* 43 */ + "44", /* 44 */ + "45", /* 45 */ + "46", /* 46 */ + "47", /* 47 */ + "48", /* 48 */ + "49", /* 49 */ + "50", /* 50 */ + "51", /* 51 */ + "52", /* 52 */ + "53", /* 53 */ + "54", /* 54 */ + "55", /* 55 */ + "56", /* 56 */ + "57", /* 57 */ + "58", /* 58 */ + "59", /* 59 */ + "60", /* 60 */ + "61", /* 61 */ + "62", /* 62 */ + "63", /* 63 */ + "64", /* 64 */ + "65", /* 65 */ + "66", /* 66 */ + "67", /* 67 */ + "68", /* 68 */ + "69", /* 69 */ + "70", /* 70 */ + "71", /* 71 */ + "72", /* 72 */ + "73", /* 73 */ + "74", /* 74 */ + "75", /* 75 */ + "76", /* 76 */ + "77", /* 77 */ + "78", /* 78 */ + "79", /* 79 */ + "80", /* 80 */ + "81", /* 81 */ + "82", /* 82 */ + "83", /* 83 */ + "84", /* 84 */ + "85", /* 85 */ + "86", /* 86 */ + "87", /* 87 */ + "88", /* 88 */ + "89", /* 89 */ + "90", /* 90 */ + "91", /* 91 */ + "92", /* 92 */ + "93", /* 93 */ + "94", /* 94 */ + "95", /* 95 */ + "96", /* 96 */ + "97", /* 97 */ + "98", /* 98 */ + "99", /* 99 */ + "100", /* 100 */ + "101", /* 101 */ + "102", /* 102 */ + "103", /* 103 */ + "104", /* 104 */ + "105", /* 105 */ + "106", /* 106 */ + "107", /* 107 */ + "108", /* 108 */ + "109", /* 109 */ + "110", /* 110 */ + "111", /* 111 */ + "112", /* 112 */ + "113", /* 113 */ + "114", /* 114 */ + "115", /* 115 */ + "116", /* 116 */ + "117", /* 117 */ + "118", /* 118 */ + "119", /* 119 */ + "120", /* 120 */ + "121", /* 121 */ + "122", /* 122 */ + "123", /* 123 */ + "124", /* 124 */ + "125", /* 125 */ + "126", /* 126 */ + "127", /* 127 */ + "128", /* 128 */ + "129", /* 129 */ + "130", /* 130 */ + "131", /* 131 */ + "132", /* 132 */ + "133", /* 133 */ + "134", /* 134 */ + "135", /* 135 */ + "136", /* 136 */ + "137", /* 137 */ + "138", /* 138 */ + "139", /* 139 */ + "140", /* 140 */ + "141", /* 141 */ + "142", /* 142 */ + "143", /* 143 */ + "144", /* 144 */ + "145", /* 145 */ + "146", /* 146 */ + "147", /* 147 */ + "148", /* 148 */ + "149", /* 149 */ + "150", /* 150 */ + "151", /* 151 */ + "152", /* 152 */ + "153", /* 153 */ + "154", /* 154 */ + "155", /* 155 */ + "156", /* 156 */ + "157", /* 157 */ + "158", /* 158 */ + "159", /* 159 */ + "160", /* 160 */ + "161", /* 161 */ + "162", /* 162 */ + "163", /* 163 */ + "164", /* 164 */ + "165", /* 165 */ + "166", /* 166 */ + "167", /* 167 */ + "168", /* 168 */ + "169", /* 169 */ + "170", /* 170 */ + "171", /* 171 */ + "172", /* 172 */ + "173", /* 173 */ + "174", /* 174 */ + "175", /* 175 */ + "176", /* 176 */ + "177", /* 177 */ + "178", /* 178 */ + "179", /* 179 */ + "180", /* 180 */ + "181", /* 181 */ + "182", /* 182 */ + "183", /* 183 */ + "184", /* 184 */ + "185", /* 185 */ + "186", /* 186 */ + "187", /* 187 */ + "188", /* 188 */ + "189", /* 189 */ + "190", /* 190 */ + "191", /* 191 */ + "192", /* 192 */ + "193", /* 193 */ + "194", /* 194 */ + "195", /* 195 */ + "196", /* 196 */ + "197", /* 197 */ + "198", /* 198 */ + "199", /* 199 */ + "200", /* 200 */ + "201", /* 201 */ + "202", /* 202 */ + "203", /* 203 */ + "204", /* 204 */ + "205", /* 205 */ + "206", /* 206 */ + "207", /* 207 */ + "208", /* 208 */ + "209", /* 209 */ + "210", /* 210 */ + "211", /* 211 */ + "212", /* 212 */ + "213", /* 213 */ + "214", /* 214 */ + "215", /* 215 */ + "216", /* 216 */ + "217", /* 217 */ + "218", /* 218 */ + "219", /* 219 */ + "220", /* 220 */ + "221", /* 221 */ + "222", /* 222 */ + "223", /* 223 */ + "224", /* 224 */ + "225", /* 225 */ + "226", /* 226 */ + "227", /* 227 */ + "228", /* 228 */ + "229", /* 229 */ + "230", /* 230 */ + "231", /* 231 */ + "232", /* 232 */ + "233", /* 233 */ + "234", /* 234 */ + "235", /* 235 */ + "236", /* 236 */ + "237", /* 237 */ + "238", /* 238 */ + "239", /* 239 */ + "240", /* 240 */ + "241", /* 241 */ + "242", /* 242 */ + "243", /* 243 */ + "244", /* 244 */ + "245", /* 245 */ + "246", /* 246 */ + "247", /* 247 */ + "248", /* 248 */ + "249", /* 249 */ + "250", /* 250 */ + "251", /* 251 */ + "252", /* 252 */ + "253", /* 253 */ + "254", /* 254 */ + "255", /* 255 */ + "256", /* 256 */ + "257", /* 257 */ + "258", /* 258 */ + "259", /* 259 */ + "260", /* 260 */ + "261", /* 261 */ + "262", /* 262 */ + "263", /* 263 */ + "264", /* 264 */ + "265", /* 265 */ + "266", /* 266 */ + "267", /* 267 */ + "268", /* 268 */ + "269", /* 269 */ + "270", /* 270 */ + "271", /* 271 */ + "272", /* 272 */ + "273", /* 273 */ + "274", /* 274 */ + "275", /* 275 */ + "276", /* 276 */ + "277", /* 277 */ + "278", /* 278 */ + "279", /* 279 */ + "280", /* 280 */ + "281", /* 281 */ + "282", /* 282 */ + "283", /* 283 */ + "284", /* 284 */ + "285", /* 285 */ + "286", /* 286 */ + "287", /* 287 */ + "288", /* 288 */ + "289", /* 289 */ + "290", /* 290 */ + "291", /* 291 */ + "292", /* 292 */ + "293", /* 293 */ + "294", /* 294 */ + "295", /* 295 */ + "296", /* 296 */ + "297", /* 297 */ + "298", /* 298 */ + "299", /* 299 */ + "300", /* 300 */ + "301", /* 301 */ + "302", /* 302 */ + "303", /* 303 */ + "304", /* 304 */ + "305", /* 305 */ + "306", /* 306 */ + "307", /* 307 */ + "308", /* 308 */ + "309", /* 309 */ + "310", /* 310 */ + "311", /* 311 */ + "312", /* 312 */ + "313", /* 313 */ + "314", /* 314 */ + "315", /* 315 */ + "316", /* 316 */ + "317", /* 317 */ + "318", /* 318 */ + "319", /* 319 */ + "320", /* 320 */ + "321", /* 321 */ + "322", /* 322 */ + "323", /* 323 */ + "324", /* 324 */ + "325", /* 325 */ + "326", /* 326 */ + "327", /* 327 */ + "328", /* 328 */ + "329", /* 329 */ + "330", /* 330 */ + "331", /* 331 */ + "332", /* 332 */ + "333", /* 333 */ + "334", /* 334 */ + "335", /* 335 */ + "336", /* 336 */ + "337", /* 337 */ + "338", /* 338 */ + "339", /* 339 */ + "340", /* 340 */ + "341", /* 341 */ + "342", /* 342 */ + "343", /* 343 */ + "344", /* 344 */ + "345", /* 345 */ + "346", /* 346 */ + "347", /* 347 */ + "348", /* 348 */ + "349", /* 349 */ + "350", /* 350 */ + "351", /* 351 */ + "352", /* 352 */ + "353", /* 353 */ + "354", /* 354 */ + "355", /* 355 */ + "356", /* 356 */ + "357", /* 357 */ + "358", /* 358 */ + "359", /* 359 */ + "360", /* 360 */ + "361", /* 361 */ + "362", /* 362 */ + "363", /* 363 */ + "364", /* 364 */ + "365", /* 365 */ + "366", /* 366 */ + "367", /* 367 */ + "368", /* 368 */ + "369", /* 369 */ + "370", /* 370 */ + "371", /* 371 */ + "372", /* 372 */ + "373", /* 373 */ + "374", /* 374 */ + "375", /* 375 */ + "376", /* 376 */ + "377", /* 377 */ + "378", /* 378 */ + "379", /* 379 */ + "380", /* 380 */ + "381", /* 381 */ + "382", /* 382 */ + "383", /* 383 */ + "384", /* 384 */ + "385", /* 385 */ + "386", /* 386 */ + "387", /* 387 */ + "388", /* 388 */ + "389", /* 389 */ + "390", /* 390 */ + "391", /* 391 */ + "392", /* 392 */ + "393", /* 393 */ + "394", /* 394 */ + "395", /* 395 */ + "396", /* 396 */ + "397", /* 397 */ + "398", /* 398 */ + "399", /* 399 */ + "400", /* 400 */ + "401", /* 401 */ + "402", /* 402 */ + "403", /* 403 */ + "404", /* 404 */ + "405", /* 405 */ + "406", /* 406 */ + "407", /* 407 */ + "408", /* 408 */ + "409", /* 409 */ + "410", /* 410 */ + "411", /* 411 */ + "412", /* 412 */ + "413", /* 413 */ + "414", /* 414 */ + "415", /* 415 */ + "416", /* 416 */ + "417", /* 417 */ + "418", /* 418 */ + "419", /* 419 */ + "420", /* 420 */ + "421", /* 421 */ + "422", /* 422 */ + "423", /* 423 */ + "424", /* 424 */ + "425", /* 425 */ + "426", /* 426 */ + "427", /* 427 */ + "428", /* 428 */ + "429", /* 429 */ + "430", /* 430 */ + "431", /* 431 */ + "432", /* 432 */ + "433", /* 433 */ + "434", /* 434 */ + "435", /* 435 */ + "436", /* 436 */ + "437", /* 437 */ + "438", /* 438 */ + "439", /* 439 */ + "440", /* 440 */ + "441", /* 441 */ + "442", /* 442 */ + "443", /* 443 */ + "444", /* 444 */ + "445", /* 445 */ + "446", /* 446 */ + "447", /* 447 */ + "448", /* 448 */ + "449", /* 449 */ + "450", /* 450 */ + "451", /* 451 */ + "452", /* 452 */ + "453", /* 453 */ + "454", /* 454 */ + "455", /* 455 */ + "456", /* 456 */ + "457", /* 457 */ + "458", /* 458 */ + "459", /* 459 */ + "460", /* 460 */ + "461", /* 461 */ + "462", /* 462 */ + "463", /* 463 */ + "464", /* 464 */ + "465", /* 465 */ + "466", /* 466 */ + "467", /* 467 */ + "468", /* 468 */ + "469", /* 469 */ + "470", /* 470 */ + "471", /* 471 */ + "472", /* 472 */ + "473", /* 473 */ + "474", /* 474 */ + "475", /* 475 */ + "476", /* 476 */ + "477", /* 477 */ + "478", /* 478 */ + "479", /* 479 */ + "480", /* 480 */ + "481", /* 481 */ + "482", /* 482 */ + "483", /* 483 */ + "484", /* 484 */ + "485", /* 485 */ + "486", /* 486 */ + "487", /* 487 */ + "488", /* 488 */ + "489", /* 489 */ + "490", /* 490 */ + "491", /* 491 */ + "492", /* 492 */ + "493", /* 493 */ + "494", /* 494 */ + "495", /* 495 */ + "496", /* 496 */ + "497", /* 497 */ + "498", /* 498 */ + "499", /* 499 */ + "500", /* 500 */ + "501", /* 501 */ + "502", /* 502 */ + "503", /* 503 */ + "504", /* 504 */ + "505", /* 505 */ + "506", /* 506 */ + "507", /* 507 */ + "508", /* 508 */ + "509", /* 509 */ + "510", /* 510 */ + "511", /* 511 */ + "512", /* 512 */ + "513", /* 513 */ + "514", /* 514 */ + "515", /* 515 */ + "516", /* 516 */ + "517", /* 517 */ + "518", /* 518 */ + "519", /* 519 */ + "520", /* 520 */ + "521", /* 521 */ + "522", /* 522 */ + "523", /* 523 */ + "524", /* 524 */ + "525", /* 525 */ + "526", /* 526 */ + "527", /* 527 */ + "528", /* 528 */ + "529", /* 529 */ + "530", /* 530 */ + "531", /* 531 */ + "532", /* 532 */ + "533", /* 533 */ + "534", /* 534 */ + "535", /* 535 */ + "536", /* 536 */ + "537", /* 537 */ + "538", /* 538 */ + "539", /* 539 */ + "540", /* 540 */ + "541", /* 541 */ + "542", /* 542 */ + "543", /* 543 */ + "544", /* 544 */ + "545", /* 545 */ + "546", /* 546 */ + "547", /* 547 */ + "548", /* 548 */ + "549", /* 549 */ + "550", /* 550 */ + "551", /* 551 */ + "552", /* 552 */ + "553", /* 553 */ + "554", /* 554 */ + "555", /* 555 */ + "556", /* 556 */ + "557", /* 557 */ + "558", /* 558 */ + "559", /* 559 */ + "560", /* 560 */ + "561", /* 561 */ + "562", /* 562 */ + "563", /* 563 */ + "564", /* 564 */ + "565", /* 565 */ + "566", /* 566 */ + "567", /* 567 */ + "568", /* 568 */ + "569", /* 569 */ + "570", /* 570 */ + "571", /* 571 */ + "572", /* 572 */ + "573", /* 573 */ + "574", /* 574 */ + "575", /* 575 */ + "576", /* 576 */ + "577", /* 577 */ + "578", /* 578 */ + "579", /* 579 */ + "580", /* 580 */ + "581", /* 581 */ + "582", /* 582 */ + "583", /* 583 */ + "584", /* 584 */ + "585", /* 585 */ + "586", /* 586 */ + "587", /* 587 */ + "588", /* 588 */ + "589", /* 589 */ + "590", /* 590 */ + "591", /* 591 */ + "592", /* 592 */ + "593", /* 593 */ + "594", /* 594 */ + "595", /* 595 */ + "596", /* 596 */ + "597", /* 597 */ + "598", /* 598 */ + "599", /* 599 */ + "600", /* 600 */ + "601", /* 601 */ + "602", /* 602 */ + "603", /* 603 */ + "604", /* 604 */ + "605", /* 605 */ + "606", /* 606 */ + "607", /* 607 */ + "608", /* 608 */ + "609", /* 609 */ + "610", /* 610 */ + "611", /* 611 */ + "612", /* 612 */ + "613", /* 613 */ + "614", /* 614 */ + "615", /* 615 */ + "616", /* 616 */ + "617", /* 617 */ + "618", /* 618 */ + "619", /* 619 */ + "620", /* 620 */ + "621", /* 621 */ + "622", /* 622 */ + "623", /* 623 */ + "624", /* 624 */ + "625", /* 625 */ + "626", /* 626 */ + "627", /* 627 */ + "628", /* 628 */ + "629", /* 629 */ + "630", /* 630 */ + "631", /* 631 */ + "632", /* 632 */ + "633", /* 633 */ + "634", /* 634 */ + "635", /* 635 */ + "636", /* 636 */ + "637", /* 637 */ + "638", /* 638 */ + "639", /* 639 */ + "640", /* 640 */ + "641", /* 641 */ + "642", /* 642 */ + "643", /* 643 */ + "644", /* 644 */ + "645", /* 645 */ + "646", /* 646 */ + "647", /* 647 */ + "648", /* 648 */ + "649", /* 649 */ + "650", /* 650 */ + "651", /* 651 */ + "652", /* 652 */ + "653", /* 653 */ + "654", /* 654 */ + "655", /* 655 */ + "656", /* 656 */ + "657", /* 657 */ + "658", /* 658 */ + "659", /* 659 */ + "660", /* 660 */ + "661", /* 661 */ + "662", /* 662 */ + "663", /* 663 */ + "664", /* 664 */ + "665", /* 665 */ + "666", /* 666 */ + "667", /* 667 */ + "668", /* 668 */ + "669", /* 669 */ + "670", /* 670 */ + "671", /* 671 */ + "672", /* 672 */ + "673", /* 673 */ + "674", /* 674 */ + "675", /* 675 */ + "676", /* 676 */ + "677", /* 677 */ + "678", /* 678 */ + "679", /* 679 */ + "680", /* 680 */ + "681", /* 681 */ + "682", /* 682 */ + "683", /* 683 */ + "684", /* 684 */ + "685", /* 685 */ + "686", /* 686 */ + "687", /* 687 */ + "688", /* 688 */ + "689", /* 689 */ + "690", /* 690 */ + "691", /* 691 */ + "692", /* 692 */ + "693", /* 693 */ + "694", /* 694 */ + "695", /* 695 */ + "696", /* 696 */ + "697", /* 697 */ + "698", /* 698 */ + "699", /* 699 */ + "700", /* 700 */ + "701", /* 701 */ + "702", /* 702 */ + "703", /* 703 */ + "704", /* 704 */ + "705", /* 705 */ + "706", /* 706 */ + "707", /* 707 */ + "708", /* 708 */ + "709", /* 709 */ + "710", /* 710 */ + "711", /* 711 */ + "712", /* 712 */ + "713", /* 713 */ + "714", /* 714 */ + "715", /* 715 */ + "716", /* 716 */ + "717", /* 717 */ + "718", /* 718 */ + "719", /* 719 */ + "720", /* 720 */ + "721", /* 721 */ + "722", /* 722 */ + "723", /* 723 */ + "724", /* 724 */ + "725", /* 725 */ + "726", /* 726 */ + "727", /* 727 */ + "728", /* 728 */ + "729", /* 729 */ + "730", /* 730 */ + "731", /* 731 */ + "732", /* 732 */ + "733", /* 733 */ + "734", /* 734 */ + "735", /* 735 */ + "736", /* 736 */ + "737", /* 737 */ + "738", /* 738 */ + "739", /* 739 */ + "740", /* 740 */ + "741", /* 741 */ + "742", /* 742 */ + "743", /* 743 */ + "744", /* 744 */ + "745", /* 745 */ + "746", /* 746 */ + "747", /* 747 */ + "748", /* 748 */ + "749", /* 749 */ + "750", /* 750 */ + "751", /* 751 */ + "752", /* 752 */ + "753", /* 753 */ + "754", /* 754 */ + "755", /* 755 */ + "756", /* 756 */ + "757", /* 757 */ + "758", /* 758 */ + "759", /* 759 */ + "760", /* 760 */ + "761", /* 761 */ + "762", /* 762 */ + "763", /* 763 */ + "764", /* 764 */ + "765", /* 765 */ + "766", /* 766 */ + "767", /* 767 */ + "768", /* 768 */ + "769", /* 769 */ + "770", /* 770 */ + "771", /* 771 */ + "772", /* 772 */ + "773", /* 773 */ + "774", /* 774 */ + "775", /* 775 */ + "776", /* 776 */ + "777", /* 777 */ + "778", /* 778 */ + "779", /* 779 */ + "780", /* 780 */ + "781", /* 781 */ + "782", /* 782 */ + "783", /* 783 */ + "784", /* 784 */ + "785", /* 785 */ + "786", /* 786 */ + "787", /* 787 */ + "788", /* 788 */ + "789", /* 789 */ + "790", /* 790 */ + "791", /* 791 */ + "792", /* 792 */ + "793", /* 793 */ + "794", /* 794 */ + "795", /* 795 */ + "796", /* 796 */ + "797", /* 797 */ + "798", /* 798 */ + "799", /* 799 */ + "800", /* 800 */ + "801", /* 801 */ + "802", /* 802 */ + "803", /* 803 */ + "804", /* 804 */ + "805", /* 805 */ + "806", /* 806 */ + "807", /* 807 */ + "808", /* 808 */ + "809", /* 809 */ + "810", /* 810 */ + "811", /* 811 */ + "812", /* 812 */ + "813", /* 813 */ + "814", /* 814 */ + "815", /* 815 */ + "816", /* 816 */ + "817", /* 817 */ + "818", /* 818 */ + "819", /* 819 */ + "820", /* 820 */ + "821", /* 821 */ + "822", /* 822 */ + "823", /* 823 */ + "824", /* 824 */ + "825", /* 825 */ + "826", /* 826 */ + "827", /* 827 */ + "828", /* 828 */ + "829", /* 829 */ + "830", /* 830 */ + "831", /* 831 */ + "832", /* 832 */ + "833", /* 833 */ + "834", /* 834 */ + "835", /* 835 */ + "836", /* 836 */ + "837", /* 837 */ + "838", /* 838 */ + "839", /* 839 */ + "840", /* 840 */ + "841", /* 841 */ + "842", /* 842 */ + "843", /* 843 */ + "844", /* 844 */ + "845", /* 845 */ + "846", /* 846 */ + "847", /* 847 */ + "848", /* 848 */ + "849", /* 849 */ + "850", /* 850 */ + "851", /* 851 */ + "852", /* 852 */ + "853", /* 853 */ + "854", /* 854 */ + "855", /* 855 */ + "856", /* 856 */ + "857", /* 857 */ + "858", /* 858 */ + "859", /* 859 */ + "860", /* 860 */ + "861", /* 861 */ + "862", /* 862 */ + "863", /* 863 */ + "864", /* 864 */ + "865", /* 865 */ + "866", /* 866 */ + "867", /* 867 */ + "868", /* 868 */ + "869", /* 869 */ + "870", /* 870 */ + "871", /* 871 */ + "872", /* 872 */ + "873", /* 873 */ + "874", /* 874 */ + "875", /* 875 */ + "876", /* 876 */ + "877", /* 877 */ + "878", /* 878 */ + "879", /* 879 */ + "880", /* 880 */ + "881", /* 881 */ + "882", /* 882 */ + "883", /* 883 */ + "884", /* 884 */ + "885", /* 885 */ + "886", /* 886 */ + "887", /* 887 */ + "888", /* 888 */ + "889", /* 889 */ + "890", /* 890 */ + "891", /* 891 */ + "892", /* 892 */ + "893", /* 893 */ + "894", /* 894 */ + "895", /* 895 */ + "896", /* 896 */ + "897", /* 897 */ + "898", /* 898 */ + "899", /* 899 */ + "900", /* 900 */ + "901", /* 901 */ + "902", /* 902 */ + "903", /* 903 */ + "904", /* 904 */ + "905", /* 905 */ + "906", /* 906 */ + "907", /* 907 */ + "908", /* 908 */ + "909", /* 909 */ + "910", /* 910 */ + "911", /* 911 */ + "912", /* 912 */ + "913", /* 913 */ + "914", /* 914 */ + "915", /* 915 */ + "916", /* 916 */ + "917", /* 917 */ + "918", /* 918 */ + "919", /* 919 */ + "920", /* 920 */ + "921", /* 921 */ + "922", /* 922 */ + "923", /* 923 */ + "924", /* 924 */ + "925", /* 925 */ + "926", /* 926 */ + "927", /* 927 */ + "928", /* 928 */ + "929", /* 929 */ + "930", /* 930 */ + "931", /* 931 */ + "932", /* 932 */ + "933", /* 933 */ + "934", /* 934 */ + "935", /* 935 */ + "936", /* 936 */ + "937", /* 937 */ + "938", /* 938 */ + "939", /* 939 */ + "940", /* 940 */ + "941", /* 941 */ + "942", /* 942 */ + "943", /* 943 */ + "944", /* 944 */ + "945", /* 945 */ + "946", /* 946 */ + "947", /* 947 */ + "948", /* 948 */ + "949", /* 949 */ + "950", /* 950 */ + "951", /* 951 */ + "952", /* 952 */ + "953", /* 953 */ + "954", /* 954 */ + "955", /* 955 */ + "956", /* 956 */ + "957", /* 957 */ + "958", /* 958 */ + "959", /* 959 */ + "960", /* 960 */ + "961", /* 961 */ + "962", /* 962 */ + "963", /* 963 */ + "964", /* 964 */ + "965", /* 965 */ + "966", /* 966 */ + "967", /* 967 */ + "968", /* 968 */ + "969", /* 969 */ + "970", /* 970 */ + "971", /* 971 */ + "972", /* 972 */ + "973", /* 973 */ + "974", /* 974 */ + "975", /* 975 */ + "976", /* 976 */ + "977", /* 977 */ + "978", /* 978 */ + "979", /* 979 */ + "980", /* 980 */ + "981", /* 981 */ + "982", /* 982 */ + "983", /* 983 */ + "984", /* 984 */ + "985", /* 985 */ + "986", /* 986 */ + "987", /* 987 */ + "988", /* 988 */ + "989", /* 989 */ + "990", /* 990 */ + "991", /* 991 */ + "992", /* 992 */ + "993", /* 993 */ + "994", /* 994 */ + "995", /* 995 */ + "996", /* 996 */ + "997", /* 997 */ + "998", /* 998 */ + "999", /* 999 */ + "1000", /* 1000 */ + "1001", /* 1001 */ + "1002", /* 1002 */ + "1003", /* 1003 */ + "1004", /* 1004 */ + "1005", /* 1005 */ + "1006", /* 1006 */ + "1007", /* 1007 */ + "1008", /* 1008 */ + "1009", /* 1009 */ + "1010", /* 1010 */ + "1011", /* 1011 */ + "1012", /* 1012 */ + "1013", /* 1013 */ + "1014", /* 1014 */ + "1015", /* 1015 */ + "1016", /* 1016 */ + "1017", /* 1017 */ + "1018", /* 1018 */ + "1019", /* 1019 */ + "1020", /* 1020 */ + "1021", /* 1021 */ + "1022", /* 1022 */ + "1023", /* 1023 */ + "ni_syscall", /* 1024 */ + "exit", /* 1025 */ + "read", /* 1026 */ + "write", /* 1027 */ + "open", /* 1028 */ + "close", /* 1029 */ + "creat", /* 1030 */ + "link", /* 1031 */ + "unlink", /* 1032 */ + "execve", /* 1033 */ + "chdir", /* 1034 */ + "fchdir", /* 1035 */ + "utimes", /* 1036 */ + "mknod", /* 1037 */ + "chmod", /* 1038 */ + "chown", /* 1039 */ + "lseek", /* 1040 */ + "getpid", /* 1041 */ + "getppid", /* 1042 */ + "mount", /* 1043 */ + "umount", /* 1044 */ + "setuid", /* 1045 */ + "getuid", /* 1046 */ + "geteuid", /* 1047 */ + "ptrace", /* 1048 */ + "access", /* 1049 */ + "sync", /* 1050 */ + "fsync", /* 1051 */ + "fdatasync", /* 1052 */ + "kill", /* 1053 */ + "rename", /* 1054 */ + "mkdir", /* 1055 */ + "rmdir", /* 1056 */ + "dup", /* 1057 */ + "pipe", /* 1058 */ + "times", /* 1059 */ + "brk", /* 1060 */ + "setgid", /* 1061 */ + "getgid", /* 1062 */ + "getegid", /* 1063 */ + "acct", /* 1064 */ + "ioctl", /* 1065 */ + "fcntl", /* 1066 */ + "umask", /* 1067 */ + "chroot", /* 1068 */ + "ustat", /* 1069 */ + "dup2", /* 1070 */ + "setreuid", /* 1071 */ + "setregid", /* 1072 */ + "getresuid", /* 1073 */ + "setresuid", /* 1074 */ + "getresgid", /* 1075 */ + "setresgid", /* 1076 */ + "getgroups", /* 1077 */ + "setgroups", /* 1078 */ + "getpgid", /* 1079 */ + "setpgid", /* 1080 */ + "setsid", /* 1081 */ + "getsid", /* 1082 */ + "sethostname", /* 1083 */ + "setrlimit", /* 1084 */ + "getrlimit", /* 1085 */ + "getrusage", /* 1086 */ + "gettimeofday", /* 1087 */ + "settimeofday", /* 1088 */ + "select", /* 1089 */ + "poll", /* 1090 */ + "symlink", /* 1091 */ + "readlink", /* 1092 */ + "uselib", /* 1093 */ + "swapon", /* 1094 */ + "swapoff", /* 1095 */ + "reboot", /* 1096 */ + "truncate", /* 1097 */ + "ftruncate", /* 1098 */ + "fchmod", /* 1099 */ + "fchown", /* 1100 */ + "getpriority", /* 1101 */ + "setpriority", /* 1102 */ + "statfs", /* 1103 */ + "fstatfs", /* 1104 */ + "gettid", /* 1105 */ + "semget", /* 1106 */ + "semop", /* 1107 */ + "semctl", /* 1108 */ + "msgget", /* 1109 */ + "msgsnd", /* 1110 */ + "msgrcv", /* 1111 */ + "msgctl", /* 1112 */ + "shmget", /* 1113 */ + "shmat", /* 1114 */ + "shmdt", /* 1115 */ + "shmctl", /* 1116 */ + "syslog", /* 1117 */ + "setitimer", /* 1118 */ + "getitimer", /* 1119 */ + "1120", /* 1120 */ + "1121", /* 1121 */ + "1122", /* 1122 */ + "vhangup", /* 1123 */ + "lchown", /* 1124 */ + "remap_file_pages", /* 1125 */ + "wait4", /* 1126 */ + "sysinfo", /* 1127 */ + "clone", /* 1128 */ + "setdomainname", /* 1129 */ + "uname", /* 1130 */ + "adjtimex", /* 1131 */ + "create_module", /* 1132 */ + "init_module", /* 1133 */ + "delete_module", /* 1134 */ + "get_kernel_syms", /* 1135 */ + "query_module", /* 1136 */ + "quotactl", /* 1137 */ + "bdflush", /* 1138 */ + "sysfs", /* 1139 */ + "personality", /* 1140 */ + "afs_syscall", /* 1141 */ + "setfsuid", /* 1142 */ + "setfsgid", /* 1143 */ + "getdents", /* 1144 */ + "flock", /* 1145 */ + "readv", /* 1146 */ + "writev", /* 1147 */ + "pread64", /* 1148 */ + "pwrite64", /* 1149 */ + "_sysctl", /* 1150 */ + "mmap", /* 1151 */ + "munmap", /* 1152 */ + "mlock", /* 1153 */ + "mlockall", /* 1154 */ + "mprotect", /* 1155 */ + "mremap", /* 1156 */ + "msync", /* 1157 */ + "munlock", /* 1158 */ + "munlockall", /* 1159 */ + "sched_getparam", /* 1160 */ + "sched_setparam", /* 1161 */ + "sched_getscheduler", /* 1162 */ + "sched_setscheduler", /* 1163 */ + "sched_yield", /* 1164 */ + "sched_get_priority_max", /* 1165 */ + "sched_get_priority_min", /* 1166 */ + "sched_rr_get_interval", /* 1167 */ + "nanosleep", /* 1168 */ + "nfsservctl", /* 1169 */ + "prctl", /* 1170 */ + "1171", /* 1171 */ + "mmap2", /* 1172 */ + "pciconfig_read", /* 1173 */ + "pciconfig_write", /* 1174 */ + "perfmonctl", /* 1175 */ + "sigaltstack", /* 1176 */ + "rt_sigaction", /* 1177 */ + "rt_sigpending", /* 1178 */ + "rt_sigprocmask", /* 1179 */ + "rt_sigqueueinfo", /* 1180 */ + "rt_sigreturn", /* 1181 */ + "rt_sigsuspend", /* 1182 */ + "rt_sigtimedwait", /* 1183 */ + "getcwd", /* 1184 */ + "capget", /* 1185 */ + "capset", /* 1186 */ + "sendfile", /* 1187 */ + "getpmsg", /* 1188 */ + "putpmsg", /* 1189 */ + "socket", /* 1190 */ + "bind", /* 1191 */ + "connect", /* 1192 */ + "listen", /* 1193 */ + "accept", /* 1194 */ + "getsockname", /* 1195 */ + "getpeername", /* 1196 */ + "socketpair", /* 1197 */ + "send", /* 1198 */ + "sendto", /* 1199 */ + "recv", /* 1200 */ + "recvfrom", /* 1201 */ + "shutdown", /* 1202 */ + "setsockopt", /* 1203 */ + "getsockopt", /* 1204 */ + "sendmsg", /* 1205 */ + "recvmsg", /* 1206 */ + "pivot_root", /* 1207 */ + "mincore", /* 1208 */ + "madvise", /* 1209 */ + "stat", /* 1210 */ + "lstat", /* 1211 */ + "fstat", /* 1212 */ + "clone2", /* 1213 */ + "getdents64", /* 1214 */ + "getunwind", /* 1215 */ + "readahead", /* 1216 */ + "setxattr", /* 1217 */ + "lsetxattr", /* 1218 */ + "fsetxattr", /* 1219 */ + "getxattr", /* 1220 */ + "lgetxattr", /* 1221 */ + "fgetxattr", /* 1222 */ + "listxattr", /* 1223 */ + "llistxattr", /* 1224 */ + "flistxattr", /* 1225 */ + "removexattr", /* 1226 */ + "lremovexattr", /* 1227 */ + "fremovexattr", /* 1228 */ + "tkill", /* 1229 */ + "futex", /* 1230 */ + "sched_setaffinity", /* 1231 */ + "sched_getaffinity", /* 1232 */ + "set_tid_address", /* 1233 */ + "fadvise64", /* 1234 */ + "tgkill", /* 1235 */ + "exit_group", /* 1236 */ + "lookup_dcookie", /* 1237 */ + "io_setup", /* 1238 */ + "io_destroy", /* 1239 */ + "io_getevents", /* 1240 */ + "io_submit", /* 1241 */ + "io_cancel", /* 1242 */ + "epoll_create", /* 1243 */ + "epoll_ctl", /* 1244 */ + "epoll_wait", /* 1245 */ + "restart_syscall", /* 1246 */ + "semtimedop", /* 1247 */ + "timer_create", /* 1248 */ + "timer_settime", /* 1249 */ + "timer_gettime", /* 1250 */ + "timer_getoverrun", /* 1251 */ + "timer_delete", /* 1252 */ + "clock_settime", /* 1253 */ + "clock_gettime", /* 1254 */ + "clock_getres", /* 1255 */ + "clock_nanosleep", /* 1256 */ + "fstatfs64", /* 1257 */ + "statfs64", /* 1258 */ + "mbind", /* 1259 */ + "get_mempolicy", /* 1260 */ + "set_mempolicy", /* 1261 */ + "mq_open", /* 1262 */ + "mq_unlink", /* 1263 */ + "mq_timedsend", /* 1264 */ + "mq_timedreceive", /* 1265 */ + "mq_notify", /* 1266 */ + "mq_getsetattr", /* 1267 */ + "kexec_load", /* 1268 */ + "vserver", /* 1269 */ + "waitid", /* 1270 */ + "add_key", /* 1271 */ + "request_key", /* 1272 */ + "keyctl", /* 1273 */ + "ioprio_set", /* 1274 */ + "ioprio_get", /* 1275 */ + "set_zone_reclaim", /* 1276 */ + "inotify_init", /* 1277 */ + "inotify_add_watch", /* 1278 */ + "inotify_rm_watch", /* 1279 */ --- ltrace-0.3.36/sysdeps/linux-gnu/ia64/trace.c.jj 2006-01-09 14:36:14.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/ia64/trace.c 2006-01-09 14:36:14.000000000 +0100 @@ -0,0 +1,140 @@ +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "ltrace.h" + +/* What we think of as a bundle, ptrace thinks of it as two unsigned + * longs */ +union bundle_t { + /* An IA64 instruction bundle has a 5 bit header describing the + * type of bundle, then 3 41 bit instructions + */ + struct { + struct { + unsigned long template : 5 ; + unsigned long slot0 : 41; + unsigned long bot_slot1 : 18; + } word0; + struct { + unsigned long top_slot1 : 23; + unsigned long slot2 : 41; + } word1; + } bitmap; + unsigned long code[2]; +}; + +int +syscall_p(struct process * proc, int status, int * sysnum) { + + if (WIFSTOPPED(status) && WSTOPSIG(status) == (SIGTRAP | proc->tracesysgood)) { + unsigned long slot = (ptrace (PTRACE_PEEKUSER, proc->pid, PT_CR_IPSR, 0) >> 41) & 0x3; + unsigned long ip = ptrace(PTRACE_PEEKUSER, proc->pid, PT_CR_IIP, 0); + + /* r15 holds the system call number */ + unsigned long r15 = ptrace (PTRACE_PEEKUSER, proc->pid, PT_R15, 0); + unsigned long insn; + + union bundle_t bundle; + + /* On fault, the IP has moved forward to the next + * slot. If that is zero, then the actual place we + * broke was in the previous bundle, so wind back the + * IP. + */ + if (slot == 0) + ip = ip - 16; + bundle.code[0] = ptrace (PTRACE_PEEKTEXT, proc->pid, ip, 0); + bundle.code[1] = ptrace (PTRACE_PEEKTEXT, proc->pid, ip+8, 0); + + unsigned long bot = 0UL | bundle.bitmap.word0.bot_slot1; + unsigned long top = 0UL | bundle.bitmap.word1.top_slot1; + + /* handle the rollback, slot 0 is actually slot 2 of + * the previous instruction (see above) */ + switch (slot) { + case 0: + insn = bundle.bitmap.word1.slot2; + break; + case 1: + insn = bundle.bitmap.word0.slot0; + break; + case 2: + /* make sure we're shifting about longs */ + insn = 0UL | bot | (top << 18UL); + break; + default: + printf("Ummm, can't find instruction slot?\n"); + exit(1); + } + + /* We need to support both the older break instruction + * type syscalls, and the new epc type ones. + * + * Bit 20 of the break constant is encoded in the "i" + * bit (bit 36) of the instruction, hence you should + * see 0x1000000000. + * + * An EPC call is just 0x1ffffffffff + */ + if (insn == 0x1000000000 || insn == 0x1ffffffffff) { + *sysnum = r15; + if (proc->callstack_depth > 0 && + proc->callstack[proc->callstack_depth-1].is_syscall) { + return 2; + } + return 1; + } + } + return 0; +} + +long +gimme_arg(enum tof type, struct process * proc, int arg_num) { + + unsigned long bsp, cfm; + + bsp = ptrace (PTRACE_PEEKUSER, proc->pid, PT_AR_BSP, 0); + cfm = ptrace(PTRACE_PEEKUSER, proc->pid, PT_CFM, 0); + + if (arg_num==-1) /* return value */ + return ptrace (PTRACE_PEEKUSER, proc->pid, PT_R8, 0); + + /* First 8 arguments are passed in registers on the register + * stack, the following arguments are passed on the stack + * after a 16 byte scratch area + */ + if (type==LT_TOF_FUNCTION || LT_TOF_FUNCTIONR) { + if (arg_num < 8) + return ptrace (PTRACE_PEEKDATA, proc->pid, (long)ia64_rse_skip_regs((long*)bsp, -cfm+arg_num), 0); + else { + unsigned long sp = ptrace (PTRACE_PEEKUSER, proc->pid, PT_R12, 0) + 16; + return ptrace (PTRACE_PEEKDATA, proc->pid, sp + (8*(arg_num - 8))); + } + } + + if (type==LT_TOF_SYSCALL || LT_TOF_SYSCALLR ) + return ptrace (PTRACE_PEEKDATA, proc->pid, (long)ia64_rse_skip_regs((long *) bsp, arg_num), 0); + + /* error if we get here */ + fprintf(stderr, "gimme_arg called with wrong arguments\n"); + exit(1); +} + +void +save_register_args(enum tof type, struct process * proc) { +} + +void +get_arch_dep(struct process * proc) { +} --- ltrace-0.3.36/sysdeps/linux-gnu/trace.c.jj 2006-01-09 13:16:44.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/trace.c 2006-01-09 14:31:13.000000000 +0100 @@ -141,7 +141,8 @@ continue_after_breakpoint(struct process continue_process(proc->pid); } else { proc->breakpoint_being_enabled = sbp; -#ifdef __sparc__ +#if defined __sparc__ || defined __ia64___ + /* we don't want to singlestep here */ continue_process(proc->pid); #else ptrace(PTRACE_SINGLESTEP, proc->pid, 0, 0); --- ltrace-0.3.36/debian/control.jj 2006-01-09 13:16:44.000000000 +0100 +++ ltrace-0.3.36/debian/control 2006-01-09 14:14:41.000000000 +0100 @@ -6,7 +6,7 @@ Standards-Version: 3.6.1 Build-Depends: binutils-dev, dpatch, libelfg0-dev Package: ltrace -Architecture: i386 arm m68k s390 powerpc sparc alpha amd64 +Architecture: i386 arm m68k s390 powerpc sparc alpha amd64 ia64 Depends: ${shlibs:Depends} Description: Tracks runtime library calls in dynamically linked programs ltrace is a debugging program which runs a specified command until it --- ltrace-0.3.36/debian/copyright.jj 2006-01-09 13:16:44.000000000 +0100 +++ ltrace-0.3.36/debian/copyright 2006-01-09 14:14:41.000000000 +0100 @@ -4,7 +4,7 @@ Dynamic Library Tracer ``ltrace''. Copyrights ---------- -Copyright (C) 1997-2004 Juan Cespedes +Copyright (C) 1997-2005 Juan Cespedes ARMLinux port: Copyright (C) 1998 Pat Beirne m68k port: Copyright (C) 1998 Roman Hodek @@ -13,7 +13,7 @@ s390 port: Copyright (C) 2001 IBM Poughk ELF hacking: Copyright (C) 1999 Silvio Cesare PowerPC port: Copyright (C) 2001-2002 Anton Blanchard SPARC port: Copyright (C) 1999 Jakub Jelinek - +IA64 port: Copyright (C) 2004 Ian Wienand Autoconf stuff: Copyright 1992-1996 Free Software Foundation, Inc. install-sh: Copyright 1991 by the Massachusetts Institute of Technology --- ltrace-0.3.36/debian/rules.jj 2006-01-09 13:16:44.000000000 +0100 +++ ltrace-0.3.36/debian/rules 2006-01-09 14:14:41.000000000 +0100 @@ -1,6 +1,6 @@ #! /usr/bin/make -f # -# Copyright (C) 1997-2004 Juan Cespedes +# Copyright (C) 1997-2005 Juan Cespedes # .PHONY: binary binary-indep binary-arch clean --- ltrace-0.3.36/ltrace.1.jj 2006-01-09 13:16:44.000000000 +0100 +++ ltrace-0.3.36/ltrace.1 2006-01-09 14:14:41.000000000 +0100 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1997-2004 Juan Cespedes +.\" Copyright (c) 1997-2005 Juan Cespedes .\" This file is covered by the GNU GPL .TH ltrace 1 .SH NAME --- ltrace-0.3.36/options.c.jj 2006-01-09 13:16:44.000000000 +0100 +++ ltrace-0.3.36/options.c 2006-01-09 14:15:10.000000000 +0100 @@ -290,7 +290,7 @@ process_options(int argc, char **argv) { case 'u': opt_u = optarg; break; case 'V': printf("ltrace version " PACKAGE_VERSION ".\n" -"Copyright (C) 1997-2005 Juan Cespedes .\n" +"Copyright (C) 1997-2006 Juan Cespedes .\n" "This is free software; see the GNU General Public Licence\n" "version 2 or later for copying conditions. There is NO warranty.\n"); exit(0); --- ltrace-0.3.36/elf.c.jj 2006-01-09 13:36:04.000000000 +0100 +++ ltrace-0.3.36/elf.c 2006-01-09 14:20:51.000000000 +0100 @@ -206,7 +206,10 @@ do_init_elf (struct ltelf *lte, const ch else if (shdr.sh_type == SHT_PROGBITS || shdr.sh_type == SHT_NOBITS) { if (strcmp (name, ".plt") == 0) - lte->plt_addr = shdr.sh_addr; + { + lte->plt_addr = shdr.sh_addr; + lte->plt_size = shdr.sh_size; + } else if (strcmp (name, ".opd") == 0) { lte->opd_addr = (GElf_Addr *)shdr.sh_addr; --- ltrace-0.3.36/README.jj 2004-11-10 00:08:55.000000000 +0100 +++ ltrace-0.3.36/README 2006-01-09 14:14:41.000000000 +0100 @@ -2,7 +2,7 @@ A Dynamic Library Tracer - Copyright 1997-2004 Juan Cespedes + Copyright 1997-2005 Juan Cespedes Contents @@ -31,6 +31,7 @@ people have contributed significantly to * Jakub Jelinek (SPARC port, support for libelf, many fixes) * Jakub Bogusz (alpha port) * SuSE (amd64 port) +* Ian Wienand (IA64 port) 1. Introduction --------------- @@ -70,7 +71,7 @@ This file is very incomplete and out-of- 6. License ---------- - Copyright (C) 1997-2004 Juan Cespedes + Copyright (C) 1997-2005 Juan Cespedes This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by --- ltrace-0.3.36/elf.h.jj 2006-01-09 13:16:44.000000000 +0100 +++ ltrace-0.3.36/elf.h 2006-01-09 14:17:17.000000000 +0100 @@ -15,6 +15,7 @@ struct ltelf size_t dynsym_count; const char *dynstr; GElf_Addr plt_addr; + size_t plt_size; Elf_Data *relplt; size_t relplt_count; Elf_Data *symtab; ltrace-ppc64-2.patch: breakpoints.c | 2 +- elf.c | 16 +++++++++++----- ltrace.1 | 14 +++++++++++++- options.c | 19 ++++++++++++++----- sysdeps/linux-gnu/alpha/arch.h | 1 + sysdeps/linux-gnu/arm/arch.h | 1 + sysdeps/linux-gnu/i386/arch.h | 1 + sysdeps/linux-gnu/m68k/arch.h | 1 + sysdeps/linux-gnu/ppc/arch.h | 3 ++- sysdeps/linux-gnu/s390/arch.h | 1 + sysdeps/linux-gnu/sparc/arch.h | 1 + sysdeps/linux-gnu/x86_64/arch.h | 1 + 12 files changed, 48 insertions(+), 13 deletions(-) --- NEW FILE ltrace-ppc64-2.patch --- --- ltrace-0.3.36/breakpoints.c 26 Jun 2005 18:18:52 -0000 1.5 +++ ltrace-0.3.36/breakpoints.c 27 Sep 2005 17:23:27 -0000 1.6 @@ -48,7 +48,7 @@ sbp->addr = addr; sbp->libsym = libsym; if (libsym) - libsym->brkpnt = addr; + libsym->brkpnt = sbp; } sbp->enabled++; if (sbp->enabled==1 && proc->pid) enable_breakpoint(proc->pid, sbp); --- ltrace-0.3.36/elf.c 26 Jun 2005 18:18:52 -0000 1.6 +++ ltrace-0.3.36/elf.c 23 Dec 2005 22:15:52 -0000 1.10 @@ -335,14 +335,14 @@ GElf_Addr ret_val; if (!lte->opd) - error (EXIT_FAILURE, 0, "Couldn't do static plt2addr"); + return (GElf_Addr)addr; base = (long)lte->opd->d_buf; offset = (long)addr - (long)lte->opd_addr; if (offset > lte->opd_size) error (EXIT_FAILURE, 0, "static plt not in .opd"); - ret_val = (void *) *(long*)(base + offset); + ret_val = (GElf_Addr) *(long*)(base + offset); return ret_val; } @@ -388,7 +388,7 @@ error (EXIT_FAILURE, 0, "Couldn't get relocation from \"%s\"", proc->filename); - if ( ! sym.st_value) + if ( ! sym.st_value && PLTs_initialized_by_here) proc->need_to_reinitialize_breakpoints = 1; name = lte->dynstr + sym.st_name; @@ -441,14 +441,20 @@ /* FIXME: Should be able to use &library_symbols as above. But when you do, none of the real library symbols cause breaks. */ add_library_symbol (elf_plt2addr(lte, (void *)addr), name, lib_tail, 1); - xptr->name = NULL; break; } } for (xptr=opt_x; xptr; xptr=xptr->next) if (xptr->name) - fprintf (stderr, "Warning: Couldn't get symbol \"%s\" from \"%s\" or it's a duplicate", + { + if (strcmp(xptr->name, E_ENTRY_NAME) == 0) + add_library_symbol (elf_plt2addr(lte, (void*)lte->ehdr.e_entry), + "_start", lib_tail, 1); + else + fprintf (stderr, "Warning: Couldn't get symbol \"%s\" " + "from \"%s\" or it's a duplicate", xptr->name, proc->filename); + } for (i = 0; i < library_num + 1; ++i) do_close_elf (<e[i]); --- ltrace-0.3.36/ltrace.1 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/ltrace.1 27 Sep 2005 17:23:27 -0000 1.2 @@ -6,7 +6,7 @@ .SH SYNOPSIS .B ltrace -.I "[-CdfhiLrStttV] [-a column] [-e expr] [-l filename] [-n nr] [-o filename] [-p pid] ... [-s strsize] [-u username] [--align=column] [--debug] [--demangle] [--help] [--indent=nr] [--library=filename] [--output=filename] [--version] [command [arg ...]]" +.I "[-CdfhiLrStttV] [-a column] [-e expr] [-l filename] [-n nr] [-o filename] [-p pid] ... [-s strsize] [-u username] [-X extern] [-x extern] ... [--align=column] [--debug] [--demangle] [--help] [--indent=nr] [--library=filename] [--output=filename] [--version] [command [arg ...]]" .SH DESCRIPTION .B ltrace @@ -127,6 +127,18 @@ This option is only useful when running as root and enables the correct execution of setuid and/or setgid binaries. .TP +.I \-X extern +Some architectures need to know where to set a breakpoint that will be hit +after the dynamic linker has run. If this flag is used, then the breakpoint +is set at +.IR extern , +which must be an external function. By default, 'main' is used. +.TP +.I \-x extern +Trace the external function +.IR extern . +This option may be repeated. +.TP .I \-V, \-\-version Show the version number of ltrace and exit. --- ltrace-0.3.36/options.c 26 Jun 2005 18:15:15 -0000 1.4 +++ ltrace-0.3.36/options.c 20 Dec 2005 00:40:08 -0000 1.5 @@ -299,14 +299,23 @@ case 'x': { - struct opt_e_t * tmp = malloc(sizeof(struct opt_e_t)); - if (!tmp) { + struct opt_e_t * p = opt_x; + + /* First, check for duplicate. */ + while (p && strcmp(p->name, optarg)) { + p = p->next; + } + if (p) { break; } + + /* If not duplicate, add to list. */ + p = malloc(sizeof(struct opt_e_t)); + if (!p) { perror("ltrace: malloc"); exit(1); } - tmp->name = optarg; - tmp->next = opt_x; - opt_x = tmp; + p->name = optarg; + p->next = opt_x; + opt_x = p; break; } --- ltrace-0.3.36/sysdeps/linux-gnu/alpha/arch.h 26 Jun 2005 18:15:26 -0000 1.3 +++ ltrace-0.3.36/sysdeps/linux-gnu/alpha/arch.h 22 Dec 2005 22:37:16 -0000 1.4 @@ -8,3 +8,4 @@ #define LT_ELF_MACHINE2 EM_FAKE_ALPHA #define PLTs_INIT_BY_HERE NULL +#define E_ENTRY_NAME "_start" --- ltrace-0.3.36/sysdeps/linux-gnu/arm/arch.h 26 Jun 2005 18:15:26 -0000 1.2 +++ ltrace-0.3.36/sysdeps/linux-gnu/arm/arch.h 22 Dec 2005 22:37:16 -0000 1.3 @@ -6,3 +6,4 @@ #define LT_ELF_MACHINE EM_ARM #define PLTs_INIT_BY_HERE NULL +#define E_ENTRY_NAME "_start" --- ltrace-0.3.36/sysdeps/linux-gnu/i386/arch.h 26 Jun 2005 18:15:26 -0000 1.2 +++ ltrace-0.3.36/sysdeps/linux-gnu/i386/arch.h 22 Dec 2005 22:37:16 -0000 1.3 @@ -6,3 +6,4 @@ #define LT_ELF_MACHINE EM_386 #define PLTs_INIT_BY_HERE NULL +#define E_ENTRY_NAME "_start" --- ltrace-0.3.36/sysdeps/linux-gnu/m68k/arch.h 26 Jun 2005 18:15:26 -0000 1.2 +++ ltrace-0.3.36/sysdeps/linux-gnu/m68k/arch.h 22 Dec 2005 22:37:16 -0000 1.3 @@ -6,3 +6,4 @@ #define LT_ELF_MACHINE EM_68K #define PLTs_INIT_BY_HERE NULL +#define E_ENTRY_NAME "_start" --- ltrace-0.3.36/sysdeps/linux-gnu/ppc/arch.h 26 Jun 2005 18:15:26 -0000 1.3 +++ ltrace-0.3.36/sysdeps/linux-gnu/ppc/arch.h 22 Dec 2005 22:37:16 -0000 1.4 @@ -1,6 +1,7 @@ #define BREAKPOINT_VALUE { 0x7f, 0xe0, 0x00, 0x08 } #define BREAKPOINT_LENGTH 4 #define DECR_PC_AFTER_BREAK 0 +#define E_ENTRY_NAME "_start" #define LT_ELFCLASS ELFCLASS32 #define LT_ELF_MACHINE EM_PPC @@ -8,7 +9,7 @@ #define LT_ELFCLASS2 ELFCLASS64 #define LT_ELF_MACHINE2 EM_PPC64 -#define PLTs_INIT_BY_HERE "main" +#define PLTs_INIT_BY_HERE E_ENTRY_NAME #else --- ltrace-0.3.36/sysdeps/linux-gnu/s390/arch.h 26 Jun 2005 18:15:26 -0000 1.2 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/arch.h 29 Dec 2005 22:45:14 -0000 1.3 @@ -12,3 +12,4 @@ #define PLTs_INIT_BY_HERE NULL +#define E_ENTRY_NAME "_start" --- ltrace-0.3.36/sysdeps/linux-gnu/sparc/arch.h 26 Jun 2005 18:15:26 -0000 1.3 +++ ltrace-0.3.36/sysdeps/linux-gnu/sparc/arch.h 22 Dec 2005 22:37:16 -0000 1.4 @@ -8,3 +8,4 @@ #define LT_ELF_MACHINE2 EM_SPARC32PLUS #define PLTs_INIT_BY_HERE NULL +#define E_ENTRY_NAME "_start" --- ltrace-0.3.36/sysdeps/linux-gnu/x86_64/arch.h 26 Jun 2005 18:15:26 -0000 1.3 +++ ltrace-0.3.36/sysdeps/linux-gnu/x86_64/arch.h 22 Dec 2005 22:37:16 -0000 1.4 @@ -8,6 +8,7 @@ #define LT_ELF_MACHINE2 EM_386 #define PLTs_INIT_BY_HERE NULL +#define E_ENTRY_NAME "_start" /* __NR_fork, __NR_clone, __NR_clone2, __NR_vfork and __NR_execve from asm-i386/unistd.h. */ ltrace-ppc64.patch: Makefile.in | 5 - breakpoints.c | 43 ++++++++- configure.ac | 25 ++--- debug.c | 137 +++++++++++++++++++++++++++++ debug.h | 12 ++ dict.c | 2 display_args.c | 22 +++- elf.c | 152 +++++++++++++++++++++++++++++---- elf.h | 8 + ltrace.c | 2 ltrace.h | 27 ++++- options.c | 37 ++++++-- options.h | 2 proc.c | 15 +-- process_event.c | 147 ++++++++++++++++++++----------- sysdeps/linux-gnu/Makefile | 20 +++- sysdeps/linux-gnu/alpha/arch.h | 3 sysdeps/linux-gnu/alpha/plt.c | 5 + sysdeps/linux-gnu/arm/arch.h | 2 sysdeps/linux-gnu/arm/plt.c | 5 + sysdeps/linux-gnu/breakpoint.c | 5 - sysdeps/linux-gnu/i386/arch.h | 2 sysdeps/linux-gnu/i386/plt.c | 5 + sysdeps/linux-gnu/m68k/arch.h | 2 sysdeps/linux-gnu/m68k/plt.c | 5 + sysdeps/linux-gnu/ppc/arch.h | 11 ++ sysdeps/linux-gnu/ppc/plt.c | 33 +++++++ sysdeps/linux-gnu/ppc/regs.c | 8 - sysdeps/linux-gnu/ppc/trace.c | 24 +++-- sysdeps/linux-gnu/s390/arch.h | 3 sysdeps/linux-gnu/s390/plt.c | 6 + sysdeps/linux-gnu/sparc/arch.h | 3 sysdeps/linux-gnu/sparc/plt.c | 5 + sysdeps/linux-gnu/trace.c | 66 +++++++++++--- sysdeps/linux-gnu/x86_64/arch.h | 8 + sysdeps/linux-gnu/x86_64/plt.c | 5 + sysdeps/linux-gnu/x86_64/regs.c | 18 +++ sysdeps/linux-gnu/x86_64/signalent1.h | 1 sysdeps/linux-gnu/x86_64/syscallent1.h | 1 sysdeps/linux-gnu/x86_64/trace.c | 41 ++++++++ 40 files changed, 761 insertions(+), 162 deletions(-) --- NEW FILE ltrace-ppc64.patch --- --- ltrace-0.3.36/Makefile.in 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/Makefile.in 25 Jun 2005 00:58:14 -0000 1.2 @@ -13,9 +13,12 @@ mandir = @mandir@ docdir = $(prefix)/doc/ltrace +cc-option = $(shell if $(CC) $(CFLAGS) $(1) -S -o /dev/null -xc /dev/null \ + > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) + CC = @CC@ -CPPFLAGS = -I$(TOPDIR) -I$(TOPDIR)/sysdeps/$(OS) -I- @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)\" CFLAGS = -Wall @CFLAGS@ +CPPFLAGS = -I$(TOPDIR) -I$(TOPDIR)/sysdeps/$(OS) $(call cc-option,-I-,-iquote) @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)\" @CPPFLAGS@ LDFLAGS = LIBS = @LIBS@ --- ltrace-0.3.36/breakpoints.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/breakpoints.c 26 Jun 2005 18:18:52 -0000 1.5 @@ -24,22 +24,31 @@ } void -insert_breakpoint(struct process * proc, void * addr) { +insert_breakpoint(struct process * proc, void * addr, struct library_symbol * libsym) { struct breakpoint * sbp; if (!proc->breakpoints) { proc->breakpoints = dict_init(dict_key2hash_int, dict_key_cmp_int); /* atexit(brk_dict_clear); */ /* why bother to do this on exit? */ } + + if (!addr) + return; + + if (libsym) + libsym->needs_init = 0; + sbp = dict_find_entry(proc->breakpoints, addr); if (!sbp) { - sbp = malloc(sizeof(struct breakpoint)); + sbp = calloc(1, sizeof(struct breakpoint)); if (!sbp) { return; /* TODO FIXME XXX: error_mem */ } dict_enter(proc->breakpoints, addr, sbp); sbp->addr = addr; - sbp->enabled = 0; + sbp->libsym = libsym; + if (libsym) + libsym->brkpnt = addr; } sbp->enabled++; if (sbp->enabled==1 && proc->pid) enable_breakpoint(proc->pid, sbp); @@ -76,7 +85,7 @@ * dont enable the breakpoints */ if (opt_L) { - a = ptrace(PTRACE_PEEKTEXT, proc->pid, proc->list_of_symbols->enter_addr, 0); + a = ptrace(PTRACE_PEEKTEXT, proc->pid, plt2addr(proc, proc->list_of_symbols->enter_addr), 0); if (a == 0x0) return; } @@ -124,7 +133,7 @@ } if (opt_L && proc->filename) { - proc->list_of_symbols = read_elf(proc->filename); + proc->list_of_symbols = read_elf(proc); if (opt_e) { struct library_symbol ** tmp1 = &(proc->list_of_symbols); while(*tmp1) { @@ -149,9 +158,31 @@ } sym = proc->list_of_symbols; while (sym) { - insert_breakpoint(proc, sym->enter_addr); /* proc->pid==0 delays enabling. */ + /* proc->pid==0 delays enabling. */ + if (sym->static_plt2addr) { + insert_breakpoint(proc, sym->enter_addr, sym); + } else { + insert_breakpoint(proc, plt2addr(proc, sym->enter_addr), sym); /* proc->pid==0 delays enabling. */ + } sym = sym->next; } proc->callstack_depth = 0; proc->breakpoints_enabled = -1; } + +void +reinitialize_breakpoints (struct process * proc) { + struct library_symbol * sym = proc->list_of_symbols; + + while (sym) { + if (sym->needs_init) { + insert_breakpoint(proc, plt2addr(proc, sym->enter_addr), sym); + if (sym->needs_init) { + fprintf(stderr, "could not re-initialize breakpoint for \"%s\" in file \"%s\"\n", sym->name, proc->filename); + exit(1); + } + } + sym = sym->next; + } +} + --- ltrace-0.3.36/configure.ac 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/configure.ac 25 Jun 2005 01:06:54 -0000 1.3 @@ -1,7 +1,8 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(ltrace.c) +AC_PREREQ(2.57) +AC_INIT(ltrace,0.3.36,[Juan Cespedes ]) +AC_CONFIG_SRCDIR(ltrace.c) AC_CONFIG_HEADER(config.h) -AC_PREREQ(2.50) dnl Check host system type AC_CANONICAL_HOST @@ -40,18 +41,14 @@ dnl AC_CHECK_FUNCS(gettimeofday strdup strerror strspn) AC_CHECK_FUNCS(getopt getopt_long) -AC_CHECK_HEADER(gelf.h,,[ - if test -f /usr/include/elfutils/gelf.h; then - CPPFLAGS="$CPPFLAGS -I /usr/include/elfutils" - elif test -f /usr/local/include/elfutils/gelf.h; then - CPPFLAGS="$CPPFLAGS -I /usr/local/include/elfutils" - elif test -f /usr/include/libelf/gelf.h; then - CPPFLAGS="$CPPFLAGS -I /usr/include/libelf" - elif test -f /usr/local/include/libelf/gelf.h; then - CPPFLAGS="$CPPFLAGS -I /usr/local/include/libelf" - else - AC_MSG_ERROR(gelf.h not found) - fi]) +for path in /usr/include/elfutils /usr/local/include/elfutils /usr/include/libelf /usr/local/include/libelf; do + if test -f ${path}/gelf.h; then + CPPFLAGS="$CPPFLAGS -I ${path}" + fi +done + +AC_CHECK_HEADER(gelf.h,,AC_MSG_ERROR([***** gelf.h not found *****])) + AC_CHECK_LIB(elf,gelf_getdyn) ac_cv_have_elf_c_read_mmap=no --- ltrace-0.3.36/debug.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/debug.c 26 Jun 2005 19:01:57 -0000 1.3 @@ -6,7 +6,7 @@ #include "output.h" void -debug_(int level, char *file, int line, char *func, char *fmt, ...) { +debug_(int level, const char *file, int line, const char *func, const char *fmt, ...) { char buf[1024]; va_list args; @@ -19,3 +19,138 @@ output_line(NULL, "DEBUG: %s:%d: %s(): %s", file, line, func, buf); } + +// The following section provides a way to print things, like hex dumps, +// with out using buffered output. This was written by Steve Munroe of IBM. + +#include +#include +#include +#include +#include + +int xwrite(const char *string, size_t len) +{ + int rc = 0; + rc = write (1, string, len); + return rc; +} + +int xwrites(const char *string) +{ + size_t len = 0; + int rc = 0; + const char *tstring = string; + + while (*tstring++ != '\0') + { + len++; + } + + if (len >0) + { + rc = xwrite( string, len ); + } + + return rc; +} + +int xwritehexi(int i) +{ + int rc = 0; + char text[9]; + int j; + unsigned int temp = (unsigned int)i; + + for ( j = 7; j >= 0; j--) + { + char c; + c = (char)((temp & 0x0f ) + '0'); + if ( c > '9' ) + { + c = (char)(c + ('a' - '9' - 1)); + } + text[j] = c; + temp = temp>>4; + } + + rc = write (1, text, 8); + return rc; +} + +int xwritehexl(long i) +{ + int rc = 0; + char text[17]; + int j; + unsigned long temp = (unsigned long)i; + + for ( j = 15; j >= 0; j--) + { + char c; + c = (char)((temp & 0x0f ) + '0'); + if ( c > '9' ) + { + c = (char)(c + ('a' - '9' - 1)); + } + text[j] = c; + temp = temp>>4; + } + + rc = write (1, text, 16); + return rc; +} + +int xwritec(char c) +{ + char temp = c; + char *text = &temp; + int rc = 0; + rc = write (1, text, 1); + return rc; +} + +int xwritecr(void) +{ + return xwritec('\n'); +} + +int xwritedump(void *ptr, long addr, int len) +{ + int rc = 0; + long *tprt = (long*)ptr; + int i; + + for ( i = 0; i < len ; i+=8 ) + { + xwritehexl( addr); + xwritec('-'); + xwritec('>'); + xwritehexl( *tprt++); + xwritecr(); + addr += sizeof(long); + } + + return rc; +} + +int xinfdump(long pid, void *ptr, int len) +{ + int rc; + int i; + long wrdcnt = len / sizeof(long) + 1; + long *infwords = malloc(wrdcnt*sizeof(long)); + long addr = (long)ptr; + + addr = ((addr + sizeof(long) - 1) / sizeof(long)) * sizeof(long); + + for (i=0; i -void debug_(int level, char *file, int line, char *func, char *fmt, ...); +void debug_(int level, const char *file, int line, const char *func, const char *fmt, ...); + +int xwrite(const char *, size_t); +int xwrites(const char *); +int xwritehexi(int); +int xwritehexl(long); +int xwritec(char); +int xwritecr(void); +int xwritedump(void *, long, int); +int xinfdump(long, void *, int); + # define debug(level, expr...) debug_(level, __FILE__, __LINE__, DEBUG_FUNCTION, expr) --- ltrace-0.3.36/dict.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/dict.c 26 Jun 2005 18:20:47 -0000 1.2 @@ -88,7 +88,7 @@ if (entry) entry->next = newentry; else d->buckets[bucketpos] = newentry; - debug(3, "new dict entry at %p[%d]: (%p,%p)\n", d, bucketpos, key, value); + debug(3, "new dict entry at %p[%d]: (%p,%p)", d, bucketpos, key, value); return 0; } --- ltrace-0.3.36/display_args.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/display_args.c 25 Jun 2005 00:49:40 -0000 1.2 @@ -29,8 +29,12 @@ case ARGTYPE_UINT: return fprintf(output, "%u", (unsigned)gimme_arg(type, proc, arg_num)); case ARGTYPE_LONG: + if (proc->mask_32bit) + return fprintf(output, "%d", (int)gimme_arg(type, proc, arg_num)); return fprintf(output, "%ld", gimme_arg(type, proc, arg_num)); case ARGTYPE_ULONG: + if (proc->mask_32bit) + return fprintf(output, "%u", (unsigned)gimme_arg(type, proc, arg_num)); return fprintf(output, "%lu", (unsigned long)gimme_arg(type, proc, arg_num)); case ARGTYPE_OCTAL: return fprintf(output, "0%o", (unsigned)gimme_arg(type, proc, arg_num)); @@ -140,7 +144,12 @@ tmp = gimme_arg(type, proc, arg_num); - if (tmp<1000000 && tmp>-1000000) { + if (proc->mask_32bit) { + if ((int)tmp<1000000 && (int)tmp>-1000000) + return fprintf(output, "%d", (int)tmp); + else + return fprintf(output, "%p", (void *)tmp); + } else if (tmp<1000000 && tmp>-1000000) { return fprintf(output, "%ld", tmp); } else { return fprintf(output, "%p", (void *)tmp); @@ -189,31 +198,32 @@ is_long++; if (c == 'j') is_long++; - if (is_long > 1 && sizeof (long) < sizeof (long long)) { + if (is_long > 1 + && (sizeof (long) < sizeof (long long) || proc->mask_32bit)) { len += fprintf(output, ", ..."); str1[i+1]='\0'; break; } } else if (c=='d' || c=='i') { - if (is_long) + if (!is_long || proc->mask_32bit) len += fprintf(output, ", %d", (int)gimme_arg(type, proc, ++arg_num)); else len += fprintf(output, ", %ld", gimme_arg(type, proc, ++arg_num)); break; } else if (c=='u') { - if (is_long) + if (!is_long || proc->mask_32bit) len += fprintf(output, ", %u", (int)gimme_arg(type, proc, ++arg_num)); else len += fprintf(output, ", %lu", gimme_arg(type, proc, ++arg_num)); break; } else if (c=='o') { - if (is_long) + if (!is_long || proc->mask_32bit) len += fprintf(output, ", 0%o", (int)gimme_arg(type, proc, ++arg_num)); else len += fprintf(output, ", 0%lo", gimme_arg(type, proc, ++arg_num)); break; } else if (c=='x' || c=='X') { - if (is_long) + if (!is_long || proc->mask_32bit) len += fprintf(output, ", %#x", (int)gimme_arg(type, proc, ++arg_num)); else len += fprintf(output, ", %#lx", gimme_arg(type, proc, ++arg_num)); --- ltrace-0.3.36/elf.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/elf.c 26 Jun 2005 18:18:52 -0000 1.6 @@ -15,12 +15,18 @@ #include "ltrace.h" #include "elf.h" #include "debug.h" +#include "options.h" static void do_init_elf (struct ltelf *lte, const char *filename); static void do_close_elf (struct ltelf *lte); static void add_library_symbol (GElf_Addr addr, const char *name, - struct library_symbol **library_symbolspp); + struct library_symbol **library_symbolspp, + int use_elf_plt2addr); static int in_load_libraries (const char *name, struct ltelf *lte); +static GElf_Addr elf_plt2addr (struct ltelf *ltc, void *addr); + + +extern char * PLTs_initialized_by_here; static void do_init_elf (struct ltelf *lte, const char *filename) @@ -52,15 +58,17 @@ error (EXIT_FAILURE, 0, "\"%s\" is not an ELF executable nor shared library", filename); - if (lte->ehdr.e_ident[EI_CLASS] != LT_ELFCLASS - || (lte->ehdr.e_machine != LT_ELF_MACHINE + if ((lte->ehdr.e_ident[EI_CLASS] != LT_ELFCLASS + || lte->ehdr.e_machine != LT_ELF_MACHINE) #ifdef LT_ELF_MACHINE2 - && lte->ehdr.e_machine != LT_ELF_MACHINE2 + && (lte->ehdr.e_ident[EI_CLASS] != LT_ELFCLASS2 + || lte->ehdr.e_machine != LT_ELF_MACHINE2) #endif #ifdef LT_ELF_MACHINE3 - && lte->ehdr.e_machine != LT_ELF_MACHINE3 + && (lte->ehdr.e_ident[EI_CLASS] != LT_ELFCLASS3 + || lte->ehdr.e_machine != LT_ELF_MACHINE3) #endif - )) + ) error (EXIT_FAILURE, 0, "\"%s\" is ELF from incompatible architecture", filename); @@ -80,7 +88,31 @@ error (EXIT_FAILURE, 0, "Couldn't get section header from \"%s\"", filename); - if (shdr.sh_type == SHT_DYNSYM) + if (shdr.sh_type == SHT_SYMTAB) + { + Elf_Data *data; + + lte->symtab = elf_getdata (scn,NULL); + lte->symtab_count = shdr.sh_size / shdr.sh_entsize; + if ((lte->symtab == NULL || elf_getdata(scn, lte->symtab) != NULL) + && opt_x != NULL) + error (EXIT_FAILURE, 0, "Couldn't get .symtab data from \"%s\"", + filename); + + scn = elf_getscn (lte->elf, shdr.sh_link); + if (scn == NULL || gelf_getshdr (scn, &shdr) == NULL) + error (EXIT_FAILURE, 0, "Couldn't get section header from \"%s\"", + filename); + + data = elf_getdata (scn, NULL); + if (data == NULL || elf_getdata (scn, data) != NULL + || shdr.sh_size != data->d_size || data->d_off) + error (EXIT_FAILURE, 0, "Couldn't get .strtab data from \"%s\"", + filename); + + lte->strtab = data->d_buf; + } + else if (shdr.sh_type == SHT_DYNSYM) { Elf_Data *data; @@ -171,9 +203,17 @@ error (EXIT_FAILURE, 0, "Unknown .hash sh_entsize in \"%s\"", filename); } - else if ((shdr.sh_type == SHT_PROGBITS || shdr.sh_type == SHT_NOBITS) - && strcmp (name, ".plt") == 0) - lte->plt_addr = shdr.sh_addr; + else if (shdr.sh_type == SHT_PROGBITS || shdr.sh_type == SHT_NOBITS) + { + if (strcmp (name, ".plt") == 0) + lte->plt_addr = shdr.sh_addr; + else if (strcmp (name, ".opd") == 0) + { + lte->opd_addr = (GElf_Addr *)shdr.sh_addr; + lte->opd_size = shdr.sh_size; + lte->opd = elf_rawdata (scn, NULL); + } + } } if (lte->dynsym == NULL || lte->dynstr == NULL) @@ -228,15 +268,19 @@ static void add_library_symbol (GElf_Addr addr, const char *name, - struct library_symbol **library_symbolspp) + struct library_symbol **library_symbolspp, + int use_elf_plt2addr) { struct library_symbol *s; s = malloc (sizeof (struct library_symbol) + strlen (name) + 1); if (s == NULL) error (EXIT_FAILURE, errno, "add_library_symbol failed"); + s->needs_init = 1; + s->static_plt2addr = use_elf_plt2addr; s->next = *library_symbolspp; s->enter_addr = (void *) (uintptr_t) addr; + s->brkpnt = NULL; s->name = (char *) (s + 1); strcpy (s->name, name); *library_symbolspp = s; @@ -283,16 +327,39 @@ return 0; } +static GElf_Addr +elf_plt2addr (struct ltelf *lte, void *addr) +{ + long base; + long offset; + GElf_Addr ret_val; + + if (!lte->opd) + error (EXIT_FAILURE, 0, "Couldn't do static plt2addr"); + + base = (long)lte->opd->d_buf; + offset = (long)addr - (long)lte->opd_addr; + if (offset > lte->opd_size) + error (EXIT_FAILURE, 0, "static plt not in .opd"); + + ret_val = (void *) *(long*)(base + offset); + return ret_val; +} + struct library_symbol * -read_elf (const char *filename) +read_elf (struct process * proc) { struct library_symbol *library_symbols = NULL; struct ltelf lte[MAX_LIBRARY + 1]; size_t i; + struct opt_e_t * xptr; + struct library_symbol **lib_tail = NULL; + struct opt_e_t *main_cheat; elf_version (EV_CURRENT); - do_init_elf (lte, filename); + do_init_elf (lte, proc->filename); + proc->e_machine = lte->ehdr.e_machine; for (i = 0; i < library_num; ++i) do_init_elf (<e[i + 1], library[i]); @@ -319,17 +386,70 @@ || ELF64_R_SYM (rela.r_info) >= lte->dynsym_count || gelf_getsym (lte->dynsym, ELF64_R_SYM (rela.r_info), &sym) == NULL) error (EXIT_FAILURE, 0, "Couldn't get relocation from \"%s\"", - filename); + proc->filename); + + if ( ! sym.st_value) + proc->need_to_reinitialize_breakpoints = 1; name = lte->dynstr + sym.st_name; if (in_load_libraries (name, lte)) { addr = arch_plt_sym_val (lte, i, &rela); - if (addr != 0) - add_library_symbol (addr, name, &library_symbols); + add_library_symbol (addr, name, &library_symbols, 0); + if (!lib_tail) + lib_tail = &(library_symbols->next); } } + if (proc->need_to_reinitialize_breakpoints) + { + /* Add "PLTs_initialized_by_here" to opt_x list, if not already there. */ + main_cheat = (struct opt_e_t *)malloc(sizeof(struct opt_e_t)); + if (main_cheat == NULL) + error (EXIT_FAILURE, 0, "Couldn allocate memory"); + main_cheat->next = opt_x; + main_cheat->name = PLTs_initialized_by_here; + + for (xptr=opt_x; xptr; xptr=xptr->next) + if (strcmp(xptr->name, PLTs_initialized_by_here) == 0 && main_cheat) + { + free(main_cheat); + main_cheat = NULL; + break; + } + if (main_cheat) + opt_x = main_cheat; + } + + for (i = 0; i < lte->symtab_count; ++i) + { + GElf_Sym sym; + GElf_Addr addr; + const char *name; + + if (gelf_getsym (lte->symtab, i, &sym) == NULL) + error (EXIT_FAILURE, 0, "Couldn't get symbol from \"%s\"", proc->filename); + + name = lte->strtab + sym.st_name; + addr = sym.st_value; + if ( ! addr) + continue; + + for (xptr=opt_x; xptr; xptr=xptr->next) + if (xptr->name && strcmp (xptr->name, name) == 0) + { + /* FIXME: Should be able to use &library_symbols as above. But + when you do, none of the real library symbols cause breaks. */ + add_library_symbol (elf_plt2addr(lte, (void *)addr), name, lib_tail, 1); + xptr->name = NULL; + break; + } + } + for (xptr=opt_x; xptr; xptr=xptr->next) + if (xptr->name) + fprintf (stderr, "Warning: Couldn't get symbol \"%s\" from \"%s\" or it's a duplicate", + xptr->name, proc->filename); + for (i = 0; i < library_num + 1; ++i) do_close_elf (<e[i]); --- ltrace-0.3.36/elf.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/elf.h 26 Jun 2005 18:18:52 -0000 1.4 @@ -17,6 +17,12 @@ GElf_Addr plt_addr; Elf_Data *relplt; size_t relplt_count; + Elf_Data *symtab; + const char *strtab; + size_t symtab_count; + Elf_Data *opd; + GElf_Addr *opd_addr; + size_t opd_size; Elf32_Word *hash; int hash_malloced; }; @@ -24,7 +30,7 @@ extern int library_num; extern char *library[MAX_LIBRARY]; -extern struct library_symbol *read_elf (const char *); +extern struct library_symbol *read_elf (struct process *); extern GElf_Addr arch_plt_sym_val (struct ltelf *, size_t, GElf_Rela *); --- ltrace-0.3.36/ltrace.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/ltrace.c 26 Jun 2005 18:20:47 -0000 1.2 @@ -126,7 +126,7 @@ } } if (command) { - execute_program(open_program(command), argv); + execute_program(open_program(command,0), argv); } opt_p_tmp = opt_p; while (opt_p_tmp) { --- ltrace-0.3.36/ltrace.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/ltrace.h 26 Jun 2005 18:20:47 -0000 1.7 @@ -25,6 +25,7 @@ void * addr; unsigned char orig_value[BREAKPOINT_LENGTH]; int enabled; + struct library_symbol * libsym; }; enum arg_type { @@ -66,12 +67,16 @@ }; extern struct function * list_of_functions; +extern char * PLTs_initialized_by_here; struct library_symbol { - char * name; - void * enter_addr; + char * name; + void * enter_addr; + struct breakpoint *brkpnt; + char needs_init; + char static_plt2addr; - struct library_symbol * next; + struct library_symbol * next; }; struct callstack_element { @@ -91,6 +96,8 @@ pid_t pid; struct dict * breakpoints; int breakpoints_enabled; /* -1:not enabled yet, 0:disabled, 1:enabled */ + int mask_32bit; /* 1 if 64-bit ltrace is tracing 32-bit process. */ + int personality; int callstack_depth; struct callstack_element callstack[MAX_CALLDEPTH]; @@ -102,6 +109,8 @@ void * return_addr; struct breakpoint * breakpoint_being_enabled; void * arch_ptr; + short e_machine; + short need_to_reinitialize_breakpoints; /* output: */ enum tof type_being_displayed; @@ -145,11 +154,13 @@ extern int display_arg(enum tof type, struct process * proc, int arg_num, enum arg_type at); extern struct breakpoint * address2bpstruct(struct process * proc, void * addr); extern void breakpoints_init(struct process * proc); -extern void insert_breakpoint(struct process * proc, void * addr); +extern void insert_breakpoint(struct process * proc, void * addr, struct library_symbol * libsym); extern void delete_breakpoint(struct process * proc, void * addr); extern void enable_all_breakpoints(struct process * proc); extern void disable_all_breakpoints(struct process * proc); -extern struct process * open_program(char * filename); +extern void reinitialize_breakpoints (struct process *); + +extern struct process * open_program(char * filename, pid_t pid); extern void open_pid(pid_t pid, int verbose); extern void show_summary(void); @@ -166,8 +177,8 @@ extern void * get_return_addr(struct process * proc, void * stack_pointer); extern void enable_breakpoint(pid_t pid, struct breakpoint * sbp); extern void disable_breakpoint(pid_t pid, const struct breakpoint * sbp); -extern int fork_p(int sysnum); -extern int exec_p(int sysnum); +extern int fork_p(struct process * proc, int sysnum); +extern int exec_p(struct process * proc, int sysnum); extern int syscall_p(struct process * proc, int status, int * sysnum); extern void continue_process(pid_t pid); extern void continue_after_signal(pid_t pid, int signum); @@ -177,6 +188,8 @@ extern void save_register_args(enum tof type, struct process * proc); extern int umovestr(struct process * proc, void * addr, int len, void * laddr); extern int ffcheck(void *maddr); +extern void * plt2addr(struct process *, void **); + #if 0 /* not yet */ extern int umoven(struct process * proc, void * addr, int len, void * laddr); #endif --- ltrace-0.3.36/options.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/options.c 26 Jun 2005 18:15:15 -0000 1.4 @@ -2,8 +2,8 @@ #include "config.h" #endif -#ifndef VERSION -# define VERSION "0.3.32" +#ifndef PACKAGE_VERSION +# define PACKAGE_VERSION "0.3.32" #endif #include @@ -50,6 +50,13 @@ struct opt_e_t * opt_e = NULL; int opt_e_enable=1; +/* List of global function names given to -x: */ +struct opt_e_t * opt_x = NULL; + +/* Set a break on the routine named here in order to re-initialize breakpoints + after all the PLTs have been initialzed */ +char * PLTs_initialized_by_here = PLTs_INIT_BY_HERE; + static void usage(void) { #if !(HAVE_GETOPT || HAVE_GETOPT_LONG) @@ -113,6 +120,8 @@ # else " -V output version information and exit.\n" # endif +" -x NAME treat the global NAME like a library subroutine.\n" +" -X NAME same as -x; and PLT's will be initialized by here.\n" "\nReport bugs to Juan Cespedes \n" , progname); #endif @@ -177,13 +186,13 @@ # ifdef USE_DEMANGLE "C" # endif - "a:e:l:n:o:p:s:u:", long_options, &option_index); + "a:e:l:n:o:p:s:u:x:X:", long_options, &option_index); #else c = getopt(argc, argv, "+cdfhiLrStTV" # ifdef USE_DEMANGLE "C" # endif - "a:e:l:n:o:p:s:u:"); + "a:e:l:n:o:p:s:u:x:X:"); #endif if (c==-1) { break; @@ -280,11 +289,27 @@ break; case 'u': opt_u = optarg; break; - case 'V': printf("ltrace version " VERSION ".\n" -"Copyright (C) 1997-2004 Juan Cespedes .\n" + case 'V': printf("ltrace version " PACKAGE_VERSION ".\n" +"Copyright (C) 1997-2005 Juan Cespedes .\n" "This is free software; see the GNU General Public Licence\n" "version 2 or later for copying conditions. There is NO warranty.\n"); exit(0); + case 'X': PLTs_initialized_by_here = optarg; + /* Fall Thru */ + + case 'x': + { + struct opt_e_t * tmp = malloc(sizeof(struct opt_e_t)); + if (!tmp) { + perror("ltrace: malloc"); + exit(1); + } + tmp->name = optarg; + tmp->next = opt_x; + opt_x = tmp; + break; + } + default: #if HAVE_GETOPT_LONG --- ltrace-0.3.36/options.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/options.h 26 Jun 2005 18:06:09 -0000 1.2 @@ -36,4 +36,6 @@ extern struct opt_e_t * opt_e; /* list of function names to display */ extern int opt_e_enable; /* 0 if '!' is used, 1 otherwise */ +extern struct opt_e_t * opt_x; /* list of functions to break at */ + extern char ** process_options(int argc, char **argv); --- ltrace-0.3.36/proc.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/proc.c 26 Jun 2005 18:20:47 -0000 1.3 @@ -13,22 +13,17 @@ #include "elf.h" struct process * -open_program(char * filename) { +open_program(char * filename, pid_t pid) { struct process * proc; - proc = malloc(sizeof(struct process)); + proc = calloc(sizeof(struct process), 1); if (!proc) { perror("malloc"); exit(1); } - memset(proc, 0, sizeof(struct process)); proc->filename = filename; - proc->pid = 0; - proc->breakpoints = NULL; proc->breakpoints_enabled = -1; - proc->callstack_depth = 0; - proc->breakpoint_being_enabled = NULL; + if (pid) { proc->pid = pid; } breakpoints_init(proc); - proc->next = NULL; proc->next = list_of_processes; list_of_processes = proc; @@ -56,6 +51,6 @@ } #endif - proc = open_program(filename); - proc->pid = pid; + proc = open_program(filename, pid); + proc->breakpoints_enabled = 1; } --- ltrace-0.3.36/process_event.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/process_event.c 26 Jun 2005 18:20:47 -0000 1.6 @@ -33,32 +33,46 @@ static void callstack_pop(struct process * proc); static char * -shortsignal(int signum) { +shortsignal(struct process *proc, int signum) { static char * signalent0[] = { #include "signalent.h" }; - int nsignals0 = sizeof signalent0 / sizeof signalent0[0]; - - if (signum < 0 || signum >= nsignals0) { + static char * signalent1[] = { + #include "signalent1.h" + }; + static char **signalents[] = { signalent0, signalent1 }; + int nsignals[] = { sizeof signalent0 / sizeof signalent0[0], + sizeof signalent1 / sizeof signalent1[0] }; + + if (proc->personality > sizeof signalents / sizeof signalents[0]) + abort (); + if (signum < 0 || signum >= nsignals[proc->personality]) { return "UNKNOWN_SIGNAL"; } else { - return signalent0[signum]; + return signalents[proc->personality][signum]; } } static char * -sysname(int sysnum) { +sysname(struct process *proc, int sysnum) { static char result[128]; static char * syscalent0[] = { #include "syscallent.h" }; - int nsyscals0 = sizeof syscalent0 / sizeof syscalent0[0]; - - if (sysnum < 0 || sysnum >= nsyscals0) { + static char * syscalent1[] = { + #include "syscallent1.h" + }; + static char **syscalents[] = { syscalent0, syscalent1 }; + int nsyscals[] = { sizeof syscalent0 / sizeof syscalent0[0], + sizeof syscalent1 / sizeof syscalent1[0] }; + + if (proc->personality > sizeof syscalents / sizeof syscalents[0]) + abort (); + if (sysnum < 0 || sysnum >= nsyscals[proc->personality]) { sprintf(result, "SYS_%d", sysnum); return result; } else { - sprintf(result, "SYS_%s", syscalent0[sysnum]); + sprintf(result, "SYS_%s", syscalents[proc->personality][sysnum]); return result; } } @@ -70,7 +84,7 @@ debug(1, "event: none"); return; case LT_EV_SIGNAL: - debug(1, "event: signal (%s [%d])", shortsignal(event->e_un.signum), event->e_un.signum); + debug(1, "event: signal (%s [%d])", shortsignal(event->proc, event->e_un.signum), event->e_un.signum); process_signal(event); return; case LT_EV_EXIT: @@ -78,15 +92,15 @@ process_exit(event); return; case LT_EV_EXIT_SIGNAL: - debug(1, "event: exit signal (%s [%d])", shortsignal(event->e_un.signum), event->e_un.signum); + debug(1, "event: exit signal (%s [%d])", shortsignal(event->proc, event->e_un.signum), event->e_un.signum); process_exit_signal(event); return; case LT_EV_SYSCALL: - debug(1, "event: syscall (%s [%d])", sysname (event->e_un.sysnum), event->e_un.sysnum); + debug(1, "event: syscall (%s [%d])", sysname (event->proc, event->e_un.sysnum), event->e_un.sysnum); process_syscall(event); return; case LT_EV_SYSRET: - debug(1, "event: sysret (%s [%d])", sysname (event->e_un.sysnum), event->e_un.sysnum); + debug(1, "event: sysret (%s [%d])", sysname (event->proc, event->e_un.sysnum), event->e_un.sysnum); process_sysret(event); return; case LT_EV_BREAKPOINT: @@ -110,7 +124,7 @@ return; } output_line(event->proc, "--- %s (%s) ---", - shortsignal(event->e_un.signum), strsignal(event->e_un.signum)); + shortsignal(event->proc, event->e_un.signum), strsignal(event->e_un.signum)); continue_after_signal(event->proc->pid, event->e_un.signum); } @@ -124,7 +138,7 @@ static void process_exit_signal(struct event * event) { output_line(event->proc, "+++ killed by %s +++", - shortsignal(event->e_un.signum)); + shortsignal(event->proc, event->e_un.signum)); remove_proc(event->proc); } @@ -155,11 +169,12 @@ static void process_syscall(struct event * event) { if (opt_S) { - output_left(LT_TOF_SYSCALL, event->proc, sysname(event->e_un.sysnum)); + output_left(LT_TOF_SYSCALL, event->proc, sysname(event->proc, event->e_un.sysnum)); } - if (fork_p(event->e_un.sysnum)) { + if (fork_p(event->proc, event->e_un.sysnum) + || exec_p(event->proc, event->e_un.sysnum)) { disable_all_breakpoints(event->proc); - } else if (!event->proc->breakpoints_enabled) { + } else if (event->proc->breakpoints_enabled == 0) { enable_all_breakpoints(event->proc); } callstack_push_syscall(event->proc, event->e_un.sysnum); @@ -194,7 +209,7 @@ if (opt_T || opt_c) { calc_time_spent(event->proc); } - if (fork_p(event->e_un.sysnum)) { + if (fork_p(event->proc, event->e_un.sysnum)) { if (opt_f) { pid_t child = gimme_arg(LT_TOF_SYSCALLR,event->proc,-1); if (child>0) { @@ -205,21 +220,31 @@ } callstack_pop(event->proc); if (opt_S) { - output_right(LT_TOF_SYSCALLR, event->proc, sysname(event->e_un.sysnum)); + output_right(LT_TOF_SYSCALLR, event->proc, sysname(event->proc, event->e_un.sysnum)); } - if (exec_p(event->e_un.sysnum)) { + if (exec_p(event->proc, event->e_un.sysnum)) { if (gimme_arg(LT_TOF_SYSCALLR,event->proc,-1)==0) { + pid_t saved_pid; + event->proc->mask_32bit = 0; + event->proc->personality = 0; + /* FIXME: Leak, should have arch_dep_free. + But we are leaking here much more than that. */ + event->proc->arch_ptr = NULL; event->proc->filename = pid2name(event->proc->pid); + saved_pid = event->proc->pid; + event->proc->pid = 0; breakpoints_init(event->proc); - } + event->proc->pid = saved_pid; + } else + enable_all_breakpoints(event->proc); } continue_process(event->proc->pid); } static void process_breakpoint(struct event * event) { - struct library_symbol * tmp; int i,j; + struct breakpoint *sbp; debug(2, "event: breakpoint (%p)", event->e_un.brk_addr); if (event->proc->breakpoint_being_enabled) { @@ -232,22 +257,33 @@ for(i=event->proc->callstack_depth-1; i>=0; i--) { if (event->e_un.brk_addr == event->proc->callstack[i].return_addr) { #ifdef __powerpc__ - unsigned long a; - unsigned long addr = event->proc->callstack[i].c_un.libfunc->enter_addr; - struct breakpoint *sbp = address2bpstruct(event->proc, addr); - unsigned char break_insn[] = BREAKPOINT_VALUE; - - /* - * PPC HACK! (XXX FIXME TODO) - * The PLT gets modified during the first call, - * so be sure to re-enable the breakpoint. - */ - a = ptrace(PTRACE_PEEKTEXT, event->proc->pid, addr); - - if (memcmp(&a, break_insn, 4)) { - sbp->enabled--; - insert_breakpoint(event->proc, addr); - } + /* + * PPC HACK! (XXX FIXME TODO) + * The PLT gets modified during the first call, + * so be sure to re-enable the breakpoint. + */ + unsigned long a; + struct library_symbol *libsym = + event->proc->callstack[i].c_un.libfunc; + void *addr = plt2addr(event->proc, libsym->enter_addr); + + if (event->proc->e_machine == EM_PPC) { + unsigned char break_insn[] = BREAKPOINT_VALUE; + + sbp = address2bpstruct(event->proc, addr); + assert(sbp); + a = ptrace(PTRACE_PEEKTEXT, event->proc->pid, addr); + + if (memcmp(&a, break_insn, 4)) { + sbp->enabled--; + insert_breakpoint(event->proc, addr, libsym); + } + } else { + sbp = libsym->brkpnt; + assert(sbp); + if (addr != sbp->addr) + insert_breakpoint(event->proc, addr, libsym); + } #endif for(j=event->proc->callstack_depth-1; j>i; j--) { callstack_pop(event->proc); @@ -265,19 +301,22 @@ } } - tmp = event->proc->list_of_symbols; - while(tmp) { - if (event->e_un.brk_addr == tmp->enter_addr) { - event->proc->stack_pointer = get_stack_pointer(event->proc); - event->proc->return_addr = get_return_addr(event->proc, event->proc->stack_pointer); - output_left(LT_TOF_FUNCTION, event->proc, tmp->name); - callstack_push_symfunc(event->proc, tmp); - continue_after_breakpoint(event->proc, address2bpstruct(event->proc, tmp->enter_addr)); - return; - } - tmp = tmp->next; - } - output_line(event->proc, "breakpointed at %p (?)", + if ((sbp = address2bpstruct(event->proc, event->e_un.brk_addr))) + { + event->proc->stack_pointer = get_stack_pointer(event->proc); + event->proc->return_addr = get_return_addr(event->proc, event->proc->stack_pointer); + output_left(LT_TOF_FUNCTION, event->proc, sbp->libsym->name); + callstack_push_symfunc(event->proc, sbp->libsym); + if (PLTs_initialized_by_here + && event->proc->need_to_reinitialize_breakpoints + && (strcmp(sbp->libsym->name, PLTs_initialized_by_here) == 0)) + reinitialize_breakpoints(event->proc); + + continue_after_breakpoint(event->proc, sbp); + return; + } + + output_line(event->proc, "unexpected breakpoint at %p", (void *)event->e_un.brk_addr); continue_process(event->proc->pid); } @@ -319,7 +358,7 @@ elem->c_un.libfunc = sym; elem->return_addr = proc->return_addr; - insert_breakpoint(proc, elem->return_addr); + insert_breakpoint(proc, elem->return_addr, 0); proc->callstack_depth++; if (opt_T || opt_c) { --- ltrace-0.3.36/sysdeps/linux-gnu/Makefile 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/Makefile 25 Jun 2005 01:09:01 -0000 1.3 @@ -1,20 +1,33 @@ -ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) +ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/) CPPFLAGS += -I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH) OBJ = trace.o proc.o breakpoint.o -all: sysdep.h signalent.h syscallent.h ../sysdep.o +all: sysdep.h signalent.h syscallent.h signalent1.h syscallent1.h ../sysdep.o sysdep.h: $(ARCH)/arch.h cat $(ARCH)/arch.h > sysdep.h signalent.h: cp $(ARCH)/signalent.h signalent.h +signalent1.h: + if [ -f $(ARCH)/signalent1.h ]; then \ + cp $(ARCH)/signalent1.h signalent1.h; \ + else \ + > signalent1.h; \ + fi syscallent.h: cp $(ARCH)/syscallent.h syscallent.h +syscallent1.h: + if [ -f $(ARCH)/syscallent1.h ]; then \ + cp $(ARCH)/syscallent1.h syscallent1.h; \ + else \ + > syscallent1.h; \ + fi + ../sysdep.o: os.o $(ARCH)/arch.o $(CC) -nostdlib -r -o ../sysdep.o os.o $(ARCH)/arch.o @@ -26,6 +39,7 @@ clean: $(MAKE) -C $(ARCH) clean - rm -f $(OBJ) sysdep.h signalent.h syscallent.h os.o sysdep.o ../sysdep.o + rm -f $(OBJ) sysdep.h signalent.h signalent1.h syscallent.h + rm -f syscallent1.h os.o sysdep.o ../sysdep.o dummy: --- ltrace-0.3.36/sysdeps/linux-gnu/breakpoint.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/breakpoint.c 26 Jun 2005 18:20:55 -0000 1.2 @@ -6,6 +6,7 @@ #include "arch.h" #include "options.h" #include "output.h" +#include "debug.h" static unsigned char break_insn[] = BREAKPOINT_VALUE; @@ -13,9 +14,7 @@ enable_breakpoint(pid_t pid, struct breakpoint * sbp) { int i,j; - if (opt_d>1) { - output_line(0, "enable_breakpoint(%d,%p)", pid, sbp->addr); - } + debug(1, "enable_breakpoint(%d,%p)", pid, sbp->addr); for(i=0; i < 1+((BREAKPOINT_LENGTH-1)/sizeof(long)); i++) { long a = ptrace(PTRACE_PEEKTEXT, pid, sbp->addr + i*sizeof(long), 0); --- ltrace-0.3.36/sysdeps/linux-gnu/trace.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/trace.c 25 Jun 2005 00:49:56 -0000 1.2 @@ -9,31 +9,69 @@ #include "ltrace.h" #include "options.h" +#include "sysdep.h" + +static int fork_exec_syscalls[][5] = { +{ +#ifdef __NR_fork + __NR_fork, +#else + -1, +#endif +#ifdef __NR_clone + __NR_clone, +#else + -1, +#endif +#ifdef __NR_clone2 + __NR_clone2, +#else + -1, +#endif +#ifdef __NR_vfork + __NR_vfork, +#else + -1, +#endif +#ifdef __NR_execve + __NR_execve, +#else + -1, +#endif +} +#ifdef FORK_EXEC_SYSCALLS +FORK_EXEC_SYSCALLS +#endif +}; /* Returns 1 if the sysnum may make a new child to be created * (ie, with fork() or clone()) * Returns 0 otherwise. */ int -fork_p(int sysnum) { - return 0 -#if defined(__NR_fork) - || (sysnum == __NR_fork) -#endif -#if defined(__NR_clone) - || (sysnum == __NR_clone) -#endif -#if defined(__NR_vfork) - || (sysnum == __NR_vfork) -#endif - ; +fork_p(struct process * proc, int sysnum) { + int i; + if (proc->personality + >= sizeof fork_exec_syscalls / sizeof (fork_exec_syscalls [0])) + return 0; + for (i = 0; i < sizeof (fork_exec_syscalls[0]) / sizeof (int) - 1; ++i) + if (sysnum == fork_exec_syscalls[proc->personality][i]) + return 1; + return 0; } /* Returns 1 if the sysnum may make the process exec other program */ int -exec_p(int sysnum) { - return (sysnum == __NR_execve); +exec_p(struct process * proc, int sysnum) { + int i; + if (proc->personality + >= sizeof fork_exec_syscalls / sizeof (fork_exec_syscalls [0])) + return 0; + i = sizeof (fork_exec_syscalls[0]) / sizeof (int) - 1; + if (sysnum == fork_exec_syscalls[proc->personality][i]) + return 1; + return 0; } void --- ltrace-0.3.36/sysdeps/linux-gnu/alpha/arch.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/alpha/arch.h 26 Jun 2005 18:15:26 -0000 1.3 @@ -4,4 +4,7 @@ #define LT_ELFCLASS ELFCLASS64 #define LT_ELF_MACHINE EM_ALPHA +#define LT_ELFCLASS2 ELFCLASS64 #define LT_ELF_MACHINE2 EM_FAKE_ALPHA + +#define PLTs_INIT_BY_HERE NULL --- ltrace-0.3.36/sysdeps/linux-gnu/alpha/plt.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/alpha/plt.c 26 Jun 2005 18:18:59 -0000 1.2 @@ -7,3 +7,8 @@ { return lte->plt_addr + ndx * 12 + 32; } + +void * plt2addr(struct process *proc, void ** plt) +{ + return (void *) plt; +} --- ltrace-0.3.36/sysdeps/linux-gnu/arm/arch.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/arm/arch.h 26 Jun 2005 18:15:26 -0000 1.2 @@ -4,3 +4,5 @@ #define LT_ELFCLASS ELFCLASS32 #define LT_ELF_MACHINE EM_ARM + +#define PLTs_INIT_BY_HERE NULL --- ltrace-0.3.36/sysdeps/linux-gnu/arm/plt.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/arm/plt.c 26 Jun 2005 18:18:59 -0000 1.2 @@ -7,3 +7,8 @@ { return lte->plt_addr + 20 + ndx * 12; } + +void * plt2addr(struct process *proc, void ** plt) +{ + return (void *) plt; +} --- ltrace-0.3.36/sysdeps/linux-gnu/i386/arch.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/i386/arch.h 26 Jun 2005 18:15:26 -0000 1.2 @@ -4,3 +4,5 @@ #define LT_ELFCLASS ELFCLASS32 #define LT_ELF_MACHINE EM_386 + +#define PLTs_INIT_BY_HERE NULL --- ltrace-0.3.36/sysdeps/linux-gnu/i386/plt.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/i386/plt.c 26 Jun 2005 18:18:59 -0000 1.2 @@ -7,3 +7,8 @@ { return lte->plt_addr + (ndx + 1) * 16; } + +void * plt2addr(struct process *proc, void ** plt) +{ + return (void *) plt; +} --- ltrace-0.3.36/sysdeps/linux-gnu/m68k/arch.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/m68k/arch.h 26 Jun 2005 18:15:26 -0000 1.2 @@ -4,3 +4,5 @@ #define LT_ELFCLASS ELFCLASS32 #define LT_ELF_MACHINE EM_68K + +#define PLTs_INIT_BY_HERE NULL --- ltrace-0.3.36/sysdeps/linux-gnu/m68k/plt.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/m68k/plt.c 26 Jun 2005 18:18:59 -0000 1.2 @@ -8,3 +8,8 @@ return lte->plt_addr + (ndx + 1) * ((lte->ehdr.e_flags & EF_CPU32) ? 24 : 12); } + +void * plt2addr(struct process *proc, void ** plt) +{ + return (void *) plt; +} --- ltrace-0.3.36/sysdeps/linux-gnu/ppc/arch.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/ppc/arch.h 26 Jun 2005 18:15:26 -0000 1.3 @@ -4,3 +4,14 @@ #define LT_ELFCLASS ELFCLASS32 #define LT_ELF_MACHINE EM_PPC +#ifdef __powerpc64__ +#define LT_ELFCLASS2 ELFCLASS64 +#define LT_ELF_MACHINE2 EM_PPC64 + +#define PLTs_INIT_BY_HERE "main" + +#else + +#define PLTs_INIT_BY_HERE NULL + +#endif --- ltrace-0.3.36/sysdeps/linux-gnu/ppc/plt.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/ppc/plt.c 26 Jun 2005 18:18:59 -0000 1.2 @@ -1,9 +1,42 @@ #include #include "ltrace.h" #include "elf.h" +#include "debug.h" +#include "ptrace.h" +#include "options.h" GElf_Addr arch_plt_sym_val (struct ltelf *lte, size_t ndx, GElf_Rela *rela) { return rela->r_offset; } + +void * plt2addr(struct process *proc, void ** plt) +{ + long addr; + + debug(3, 0); + + if (proc->e_machine == EM_PPC || plt == 0) + return (void *)plt; + + if (proc->pid == 0) + return (void *)0; + + // On a PowerPC-64 system, a plt is three 64-bit words: the first is the + // 64-bit address of the routine. Before the PLT has been initialized, this + // will be 0x0. In fact, the symbol table won't have the plt's address even. + // Ater the PLT has been initialized, but before it has been resolved, the + // first word will be the address of the function in the dynamic linker that + // will reslove the PLT. After the PLT is resolved, this will will be the + // address of the routine whose symbol is in the symbol table. + + addr = ptrace(PTRACE_PEEKTEXT, proc->pid, plt); + + if (opt_d >= 3) { + xinfdump(proc->pid, plt, sizeof(void*)*3); + } + + return (void *)addr; +} + --- ltrace-0.3.36/sysdeps/linux-gnu/ppc/regs.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/ppc/regs.c 25 Jun 2005 01:33:12 -0000 1.2 @@ -18,20 +18,20 @@ void * get_instruction_pointer(struct process * proc) { - return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, 4*PT_NIP, 0); + return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, sizeof(long)*PT_NIP, 0); } void set_instruction_pointer(struct process * proc, void * addr) { - ptrace(PTRACE_POKEUSER, proc->pid, 4*PT_NIP, addr); + ptrace(PTRACE_POKEUSER, proc->pid, sizeof(long)*PT_NIP, addr); } void * get_stack_pointer(struct process * proc) { - return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, 4*PT_R1, 0); + return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, sizeof(long)*PT_R1, 0); } void * get_return_addr(struct process * proc, void * stack_pointer) { - return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, 4*PT_LNK, 0); + return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, sizeof(long)*PT_LNK, 0); } --- ltrace-0.3.36/sysdeps/linux-gnu/ppc/trace.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/ppc/trace.c 26 Jun 2005 18:18:59 -0000 1.3 @@ -7,6 +7,9 @@ #include #include #include +#ifdef __powerpc64__ +#include +#endif #include "ltrace.h" @@ -18,21 +21,28 @@ # define PTRACE_POKEUSER PTRACE_POKEUSR #endif -void -get_arch_dep(struct process * proc) { +void get_arch_dep(struct process *proc) +{ +#ifdef __powerpc64__ + if (proc->arch_ptr) + return; + proc->mask_32bit = (proc->e_machine == EM_PPC); + proc->arch_ptr = (void *) 1; +#endif } + /* Returns 1 if syscall, 2 if sysret, 0 otherwise. */ #define SYSCALL_INSN 0x44000002 int syscall_p(struct process * proc, int status, int * sysnum) { if (WIFSTOPPED(status) && WSTOPSIG(status)==SIGTRAP) { - int pc = ptrace(PTRACE_PEEKUSER, proc->pid, 4*PT_NIP, 0); - int insn = ptrace(PTRACE_PEEKTEXT, proc->pid, pc-4, 0); + long pc = (long)get_instruction_pointer(proc); + int insn = (int)ptrace(PTRACE_PEEKTEXT, proc->pid, pc-sizeof(long), 0); if (insn == SYSCALL_INSN) { - *sysnum = ptrace(PTRACE_PEEKUSER, proc->pid, 4*PT_R0, 0); + *sysnum = (int)ptrace(PTRACE_PEEKUSER, proc->pid, sizeof(long)*PT_R0, 0); if (proc->callstack_depth > 0 && proc->callstack[proc->callstack_depth-1].is_syscall) { return 2; @@ -46,9 +56,9 @@ long gimme_arg(enum tof type, struct process * proc, int arg_num) { if (arg_num==-1) { /* return value */ - return ptrace(PTRACE_PEEKUSER, proc->pid, 4*PT_R3, 0); + return ptrace(PTRACE_PEEKUSER, proc->pid, sizeof(long)*PT_R3, 0); } else if (arg_num < 8) { - return ptrace(PTRACE_PEEKUSER, proc->pid, 4*(arg_num+PT_R3), 0); + return ptrace(PTRACE_PEEKUSER, proc->pid, sizeof(long)*(arg_num+PT_R3), 0); } else { return ptrace(PTRACE_PEEKDATA, proc->pid, proc->stack_pointer+8*(arg_num-8), 0); } --- ltrace-0.3.36/sysdeps/linux-gnu/s390/arch.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/arch.h 26 Jun 2005 18:15:26 -0000 1.2 @@ -9,3 +9,6 @@ #define LT_ELFCLASS ELFCLASS32 #define LT_ELF_MACHINE EM_S390 + + +#define PLTs_INIT_BY_HERE NULL --- ltrace-0.3.36/sysdeps/linux-gnu/s390/plt.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/plt.c 26 Jun 2005 18:18:59 -0000 1.2 @@ -7,3 +7,9 @@ { return lte->plt_addr + (ndx + 1) * 32; } + + +void * plt2addr(struct process *proc, void ** plt) +{ + return (void *) plt; +} --- ltrace-0.3.36/sysdeps/linux-gnu/sparc/arch.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/sparc/arch.h 26 Jun 2005 18:15:26 -0000 1.3 @@ -4,4 +4,7 @@ #define LT_ELFCLASS ELFCLASS32 #define LT_ELF_MACHINE EM_SPARC +#define LT_ELFCLASS2 ELFCLASS32 #define LT_ELF_MACHINE2 EM_SPARC32PLUS + +#define PLTs_INIT_BY_HERE NULL --- ltrace-0.3.36/sysdeps/linux-gnu/sparc/plt.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/sparc/plt.c 26 Jun 2005 18:18:59 -0000 1.2 @@ -7,3 +7,8 @@ { return rela->r_offset + 4; } + +void * plt2addr(struct process *proc, void ** plt) +{ + return (void *) plt; +} --- ltrace-0.3.36/sysdeps/linux-gnu/x86_64/arch.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/x86_64/arch.h 26 Jun 2005 18:15:26 -0000 1.3 @@ -4,3 +4,11 @@ #define LT_ELFCLASS ELFCLASS64 #define LT_ELF_MACHINE EM_X86_64 +#define LT_ELFCLASS2 ELFCLASS32 +#define LT_ELF_MACHINE2 EM_386 + +#define PLTs_INIT_BY_HERE NULL + +/* __NR_fork, __NR_clone, __NR_clone2, __NR_vfork and __NR_execve + from asm-i386/unistd.h. */ +#define FORK_EXEC_SYSCALLS , { 2, 120, -1, 190, 11 } --- ltrace-0.3.36/sysdeps/linux-gnu/x86_64/plt.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/x86_64/plt.c 26 Jun 2005 18:18:59 -0000 1.2 @@ -7,3 +7,8 @@ { return lte->plt_addr + (ndx + 1) * 16; } + +void * plt2addr(struct process *proc, void ** plt) +{ + return (void *) plt; +} --- ltrace-0.3.36/sysdeps/linux-gnu/x86_64/regs.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/x86_64/regs.c 25 Jun 2005 00:49:56 -0000 1.2 @@ -18,20 +18,32 @@ void * get_instruction_pointer(struct process * proc) { - return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, 8*RIP, 0); + long int ret = ptrace(PTRACE_PEEKUSER, proc->pid, 8*RIP, 0); + if (proc->mask_32bit) + ret &= 0xffffffff; + return (void *)ret; } void set_instruction_pointer(struct process * proc, void * addr) { + if (proc->mask_32bit) + addr = (void *)((long int) addr & 0xffffffff); ptrace(PTRACE_POKEUSER, proc->pid, 8*RIP, addr); } void * get_stack_pointer(struct process * proc) { - return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, 8*RSP, 0); + long int ret = ptrace(PTRACE_PEEKUSER, proc->pid, 8*RSP, 0); + if (proc->mask_32bit) + ret &= 0xffffffff; + return (void *)ret; } void * get_return_addr(struct process * proc, void * stack_pointer) { - return (void *)ptrace(PTRACE_PEEKTEXT, proc->pid, stack_pointer, 0); + unsigned long int ret; + ret = ptrace(PTRACE_PEEKTEXT, proc->pid, stack_pointer, 0); + if (proc->mask_32bit) + ret &= 0xffffffff; + return (void *)ret; } --- ltrace-0.3.36/sysdeps/linux-gnu/x86_64/signalent1.h 1 Jan 1970 00:00:00 -0000 +++ ltrace-0.3.36/sysdeps/linux-gnu/x86_64/signalent1.h 25 Jun 2005 00:52:21 -0000 1.1 @@ -0,0 +1 @@ +#include "i386/signalent.h" --- ltrace-0.3.36/sysdeps/linux-gnu/x86_64/syscallent1.h 1 Jan 1970 00:00:00 -0000 +++ ltrace-0.3.36/sysdeps/linux-gnu/x86_64/syscallent1.h 25 Jun 2005 00:52:21 -0000 1.1 @@ -0,0 +1 @@ +#include "i386/syscallent.h" --- ltrace-0.3.36/sysdeps/linux-gnu/x86_64/trace.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/x86_64/trace.c 25 Jun 2005 00:49:56 -0000 1.2 @@ -21,6 +21,15 @@ void get_arch_dep(struct process *proc) { + unsigned long cs; + if (proc->arch_ptr) + return; + cs = ptrace(PTRACE_PEEKUSER, proc->pid, 8*CS, 0); + if (cs == 0x23) { + proc->mask_32bit = 1; + proc->personality = 1; + } + proc->arch_ptr = (void *) 1; } /* Returns 1 if syscall, 2 if sysret, 0 otherwise. @@ -42,8 +51,36 @@ return 0; } +static unsigned int +gimme_arg32(enum tof type, struct process * proc, int arg_num) { + if (arg_num==-1) { /* return value */ + return ptrace(PTRACE_PEEKUSER, proc->pid, 8*RAX, 0); + } + + if (type==LT_TOF_FUNCTION || type==LT_TOF_FUNCTIONR) { + return ptrace(PTRACE_PEEKTEXT, proc->pid, proc->stack_pointer+4*(arg_num+1), 0); + } else if (type==LT_TOF_SYSCALL || type==LT_TOF_SYSCALLR) { + switch(arg_num) { + case 0: return ptrace(PTRACE_PEEKUSER, proc->pid, 8*RBX, 0); + case 1: return ptrace(PTRACE_PEEKUSER, proc->pid, 8*RCX, 0); + case 2: return ptrace(PTRACE_PEEKUSER, proc->pid, 8*RDX, 0); + case 3: return ptrace(PTRACE_PEEKUSER, proc->pid, 8*RSI, 0); + case 4: return ptrace(PTRACE_PEEKUSER, proc->pid, 8*RDI, 0); + case 5: return ptrace(PTRACE_PEEKUSER, proc->pid, 8*RBP, 0); + default: + fprintf(stderr, "gimme_arg32 called with wrong arguments\n"); + exit(2); + } + } + fprintf(stderr, "gimme_arg called with wrong arguments\n"); + exit(1); +} + long gimme_arg(enum tof type, struct process * proc, int arg_num) { + if (proc->mask_32bit) + return (unsigned int)gimme_arg32(type, proc, arg_num); + if (arg_num==-1) { /* return value */ return ptrace(PTRACE_PEEKUSER, proc->pid, 8*RAX, 0); } @@ -58,9 +95,7 @@ case 5: return ptrace(PTRACE_PEEKUSER, proc->pid, 8*R9, 0); default: return ptrace(PTRACE_PEEKTEXT, proc->pid, - proc->stack_pointer + 8 * (arg_num - 6 + 1), 0); - fprintf(stderr, "gimme_arg called with wrong arguments\n"); - exit(2); + proc->stack_pointer + 8 * (arg_num - 6 + 1), 0); } } else if (type==LT_TOF_SYSCALL || LT_TOF_SYSCALLR) { switch(arg_num) { ltrace-s390x.patch: ltrace.h | 2 sysdeps/linux-gnu/Makefile | 3 sysdeps/linux-gnu/alpha/trace.c | 2 sysdeps/linux-gnu/arm/trace.c | 2 sysdeps/linux-gnu/i386/trace.c | 2 sysdeps/linux-gnu/m68k/trace.c | 2 sysdeps/linux-gnu/ppc/trace.c | 2 sysdeps/linux-gnu/s390/arch.h | 8 sysdeps/linux-gnu/s390/regs.c | 32 +++ sysdeps/linux-gnu/s390/signalent.h | 3 sysdeps/linux-gnu/s390/signalent1.h | 1 sysdeps/linux-gnu/s390/syscallent.h | 282 ---------------------------------- sysdeps/linux-gnu/s390/syscallent1.h | 1 sysdeps/linux-gnu/s390/syscalls31.h | 287 +++++++++++++++++++++++++++++++++++ sysdeps/linux-gnu/s390/syscalls64.h | 287 +++++++++++++++++++++++++++++++++++ sysdeps/linux-gnu/s390/trace.c | 159 +++++++++++++++---- sysdeps/linux-gnu/sparc/trace.c | 2 sysdeps/linux-gnu/trace.c | 21 ++ sysdeps/linux-gnu/x86_64/trace.c | 2 wait_for_something.c | 4 20 files changed, 782 insertions(+), 322 deletions(-) --- NEW FILE ltrace-s390x.patch --- --- ltrace-0.3.36/ltrace.h 26 Jun 2005 18:20:47 -0000 1.7 +++ ltrace-0.3.36/ltrace.h 22 Dec 2005 22:37:16 -0000 1.8 @@ -98,6 +98,7 @@ int breakpoints_enabled; /* -1:not enabled yet, 0:disabled, 1:enabled */ int mask_32bit; /* 1 if 64-bit ltrace is tracing 32-bit process. */ int personality; + int tracesysgood; /* signal indicating a PTRACE_SYSCALL trap */ int callstack_depth; struct callstack_element callstack[MAX_CALLDEPTH]; @@ -167,6 +168,7 @@ /* Arch-dependent stuff: */ extern char * pid2name(pid_t pid); +extern void trace_set_options(struct process * proc, pid_t pid); extern void trace_me(void); extern int trace_pid(pid_t pid); extern void untrace_pid(pid_t pid); --- ltrace-0.3.36/wait_for_something.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/wait_for_something.c 22 Dec 2005 22:37:16 -0000 1.2 @@ -54,6 +54,7 @@ if (event.proc->breakpoints_enabled == -1) { enable_all_breakpoints(event.proc); event.thing = LT_EV_NONE; + trace_set_options(event.proc, event.proc->pid); continue_process(event.proc->pid); return &event; } @@ -82,7 +83,8 @@ event.thing = LT_EV_UNKNOWN; return &event; } - if (WSTOPSIG(status) != SIGTRAP) { + if ((WSTOPSIG(status) != (SIGTRAP | event.proc->tracesysgood)) && + (WSTOPSIG(status) != SIGTRAP)) { event.thing = LT_EV_SIGNAL; event.e_un.signum = WSTOPSIG(status); return &event; --- ltrace-0.3.36/sysdeps/linux-gnu/Makefile 25 Jun 2005 01:09:01 -0000 1.3 +++ ltrace-0.3.36/sysdeps/linux-gnu/Makefile 22 Dec 2005 22:37:16 -0000 1.4 @@ -1,4 +1,5 @@ -ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/) +ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ + -e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/ppc/ -e s/s390x/s390/) CPPFLAGS += -I$(TOPDIR)/sysdeps/linux-gnu/$(ARCH) --- ltrace-0.3.36/sysdeps/linux-gnu/trace.c 25 Jun 2005 00:49:56 -0000 1.2 +++ ltrace-0.3.36/sysdeps/linux-gnu/trace.c 22 Dec 2005 22:37:16 -0000 1.3 @@ -91,6 +91,27 @@ } void +trace_set_options(struct process * proc, pid_t pid) { +#ifndef PTRACE_SETOPTIONS + #define PTRACE_SETOPTIONS 0x4200 +#endif +#ifndef PTRACE_OLDSETOPTIONS + #define PTRACE_OLDSETOPTIONS 21 +#endif +#ifndef PTRACE_O_TRACESYSGOOD + #define PTRACE_O_TRACESYSGOOD 0x00000001 +#endif + if (proc->tracesysgood & 0x80) + return; + if (ptrace(PTRACE_SETOPTIONS, pid, 0, PTRACE_O_TRACESYSGOOD) < 0 && + ptrace(PTRACE_OLDSETOPTIONS, pid, 0, PTRACE_O_TRACESYSGOOD) < 0) { + perror("PTRACE_SETOPTIONS"); + return; + } + proc->tracesysgood |= 0x80; +} + +void untrace_pid(pid_t pid) { ptrace(PTRACE_DETACH, pid, 1, 0); } --- ltrace-0.3.36/sysdeps/linux-gnu/alpha/trace.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/alpha/trace.c 22 Dec 2005 22:37:16 -0000 1.2 @@ -27,7 +27,7 @@ */ int syscall_p(struct process * proc, int status, int * sysnum) { - if (WIFSTOPPED(status) && WSTOPSIG(status)==SIGTRAP) { + if (WIFSTOPPED(status) && WSTOPSIG(status)==(SIGTRAP | proc->tracesysgood)) { char *ip=get_instruction_pointer(proc) - 4; long x = ptrace(PTRACE_PEEKTEXT, proc->pid, ip, 0); debug(2, "instr: %016lx", x); --- ltrace-0.3.36/sysdeps/linux-gnu/arm/trace.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/arm/trace.c 22 Dec 2005 22:37:16 -0000 1.2 @@ -34,7 +34,7 @@ */ int syscall_p(struct process * proc, int status, int * sysnum) { - if (WIFSTOPPED(status) && WSTOPSIG(status)==SIGTRAP) { + if (WIFSTOPPED(status) && WSTOPSIG(status)==(SIGTRAP | proc->tracesysgood)) { /* get the user's pc (plus 8) */ int pc = ptrace(PTRACE_PEEKUSER, proc->pid, off_pc, 0); /* fetch the SWI instruction */ --- ltrace-0.3.36/sysdeps/linux-gnu/i386/trace.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/i386/trace.c 22 Dec 2005 22:37:16 -0000 1.2 @@ -27,7 +27,7 @@ */ int syscall_p(struct process * proc, int status, int * sysnum) { - if (WIFSTOPPED(status) && WSTOPSIG(status)==SIGTRAP) { + if (WIFSTOPPED(status) && WSTOPSIG(status)==(SIGTRAP | proc->tracesysgood)) { *sysnum = ptrace(PTRACE_PEEKUSER, proc->pid, 4*ORIG_EAX, 0); if (proc->callstack_depth > 0 && --- ltrace-0.3.36/sysdeps/linux-gnu/m68k/trace.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/m68k/trace.c 22 Dec 2005 22:37:16 -0000 1.2 @@ -28,7 +28,7 @@ syscall_p(struct process * proc, int status, int * sysnum) { int depth; - if (WIFSTOPPED(status) && WSTOPSIG(status)==SIGTRAP) { + if (WIFSTOPPED(status) && WSTOPSIG(status)==(SIGTRAP | proc->tracesysgood)) { *sysnum = ptrace(PTRACE_PEEKUSER, proc->pid, 4*PT_ORIG_D0, 0); if (*sysnum == -1) return 0; if (*sysnum>=0) { --- ltrace-0.3.36/sysdeps/linux-gnu/ppc/trace.c 26 Jun 2005 18:18:59 -0000 1.3 +++ ltrace-0.3.36/sysdeps/linux-gnu/ppc/trace.c 22 Dec 2005 22:37:16 -0000 1.4 @@ -37,7 +37,7 @@ #define SYSCALL_INSN 0x44000002 int syscall_p(struct process * proc, int status, int * sysnum) { - if (WIFSTOPPED(status) && WSTOPSIG(status)==SIGTRAP) { + if (WIFSTOPPED(status) && WSTOPSIG(status)==(SIGTRAP | proc->tracesysgood)) { long pc = (long)get_instruction_pointer(proc); int insn = (int)ptrace(PTRACE_PEEKTEXT, proc->pid, pc-sizeof(long), 0); --- ltrace-0.3.36/sysdeps/linux-gnu/s390/arch.h 29 Dec 2005 22:45:14 -0000 1.3 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/arch.h 29 Dec 2005 23:00:35 -0000 1.4 @@ -7,9 +7,15 @@ #define BREAKPOINT_LENGTH 2 #define DECR_PC_AFTER_BREAK 2 +#ifdef __s390x__ +#define LT_ELFCLASS ELFCLASS64 +#define LT_ELF_MACHINE EM_S390 +#define LT_ELFCLASS2 ELFCLASS32 +#define LT_ELF_MACHINE2 EM_S390 +#else #define LT_ELFCLASS ELFCLASS32 #define LT_ELF_MACHINE EM_S390 - +#endif #define PLTs_INIT_BY_HERE NULL #define E_ENTRY_NAME "_start" --- ltrace-0.3.36/sysdeps/linux-gnu/s390/regs.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/regs.c 22 Dec 2005 22:37:16 -0000 1.2 @@ -21,22 +21,48 @@ # define PTRACE_POKEUSER PTRACE_POKEUSR #endif +#ifdef __s390x__ +#define PSW_MASK 0xffffffffffffffff +#define PSW_MASK31 0x7fffffff +#else +#define PSW_MASK 0x7fffffff +#endif + void * get_instruction_pointer(struct process * proc) { - return (void *)(ptrace(PTRACE_PEEKUSER, proc->pid, PT_PSWADDR, 0) & 0x7fffffff); + long ret = ptrace(PTRACE_PEEKUSER, proc->pid, PT_PSWADDR, 0) & PSW_MASK; +#ifdef __s390x__ + if (proc->mask_32bit) + ret &= PSW_MASK31; +#endif + return (void *) ret; } void set_instruction_pointer(struct process * proc, void * addr) { +#ifdef __s390x__ + if (proc->mask_32bit) + addr = (void *) ((long) addr & PSW_MASK31); +#endif ptrace(PTRACE_POKEUSER, proc->pid, PT_PSWADDR, addr); } void * get_stack_pointer(struct process * proc) { - return (void *)ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR15, 0); + long ret = ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR15, 0) & PSW_MASK; +#ifdef __s390x__ + if (proc->mask_32bit) + ret &= PSW_MASK31; +#endif + return (void *) ret; } void * get_return_addr(struct process * proc, void * stack_pointer) { - return (void *)(ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR14, 0) & 0x7fffffff); + long ret = ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR14, 0) & PSW_MASK; +#ifdef __s390x__ + if (proc->mask_32bit) + ret &= PSW_MASK31; +#endif + return (void *) ret; } --- ltrace-0.3.36/sysdeps/linux-gnu/s390/signalent.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/signalent.h 22 Dec 2005 22:37:16 -0000 1.2 @@ -29,4 +29,5 @@ "SIGWINCH", /* 28 */ "SIGIO", /* 29 */ "SIGPWR", /* 30 */ - "SIGSYS", /* 31 */ + "SIGUNUSED", /* 31 */ + "SIGRTMIN", /* 32 */ --- ltrace-0.3.36//dev/null 1 Jan 1970 00:00:00 -0000 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/signalent1.h 22 Dec 2005 22:37:16 -0000 1.1 @@ -0,0 +1 @@ +#include "s390/signalent.h" --- ltrace-0.3.36/sysdeps/linux-gnu/s390/syscallent.h 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/syscallent.h 22 Dec 2005 22:37:16 -0000 1.2 @@ -1,277 +1,5 @@ - "0", /* 0 */ - "exit", /* 1 */ - "fork", /* 2 */ - "read", /* 3 */ - "write", /* 4 */ - "open", /* 5 */ - "close", /* 6 */ - "7", /* 7 */ - "creat", /* 8 */ - "link", /* 9 */ - "unlink", /* 10 */ - "execve", /* 11 */ - "chdir", /* 12 */ - "time", /* 13 */ - "mknod", /* 14 */ - "chmod", /* 15 */ - "lchown", /* 16 */ - "17", /* 17 */ - "18", /* 18 */ - "lseek", /* 19 */ - "getpid", /* 20 */ - "mount", /* 21 */ - "umount", /* 22 */ - "setuid", /* 23 */ - "getuid", /* 24 */ - "stime", /* 25 */ - "ptrace", /* 26 */ - "alarm", /* 27 */ - "28", /* 28 */ - "pause", /* 29 */ - "utime", /* 30 */ - "31", /* 31 */ - "32", /* 32 */ - "access", /* 33 */ - "nice", /* 34 */ - "35", /* 35 */ - "sync", /* 36 */ - "kill", /* 37 */ - "rename", /* 38 */ - "mkdir", /* 39 */ - "rmdir", /* 40 */ - "dup", /* 41 */ - "pipe", /* 42 */ - "times", /* 43 */ - "44", /* 44 */ - "brk", /* 45 */ - "setgid", /* 46 */ - "getgid", /* 47 */ - "signal", /* 48 */ - "geteuid", /* 49 */ - "getegid", /* 50 */ - "acct", /* 51 */ - "umount2", /* 52 */ - "53", /* 53 */ - "ioctl", /* 54 */ - "fcntl", /* 55 */ - "56", /* 56 */ - "setpgid", /* 57 */ - "58", /* 58 */ - "59", /* 59 */ - "umask", /* 60 */ - "chroot", /* 61 */ - "ustat", /* 62 */ - "dup2", /* 63 */ - "getppid", /* 64 */ - "getpgrp", /* 65 */ - "setsid", /* 66 */ - "sigaction", /* 67 */ - "68", /* 68 */ - "69", /* 69 */ - "setreuid", /* 70 */ - "setregid", /* 71 */ - "sigsuspend", /* 72 */ - "sigpending", /* 73 */ - "sethostname", /* 74 */ - "setrlimit", /* 75 */ - "getrlimit", /* 76 */ - "getrusage", /* 77 */ - "gettimeofday", /* 78 */ - "settimeofday", /* 79 */ - "getgroups", /* 80 */ - "setgroups", /* 81 */ - "82", /* 82 */ - "symlink", /* 83 */ - "84", /* 84 */ - "readlink", /* 85 */ - "uselib", /* 86 */ - "swapon", /* 87 */ - "reboot", /* 88 */ - "readdir", /* 89 */ - "mmap", /* 90 */ - "munmap", /* 91 */ - "truncate", /* 92 */ - "ftruncate", /* 93 */ - "fchmod", /* 94 */ - "fchown", /* 95 */ - "getpriority", /* 96 */ - "setpriority", /* 97 */ - "98", /* 98 */ - "statfs", /* 99 */ - "fstatfs", /* 100 */ - "ioperm", /* 101 */ - "socketcall", /* 102 */ - "syslog", /* 103 */ - "setitimer", /* 104 */ - "getitimer", /* 105 */ - "stat", /* 106 */ - "lstat", /* 107 */ - "fstat", /* 108 */ - "109", /* 109 */ - "110", /* 110 */ - "vhangup", /* 111 */ - "idle", /* 112 */ - "113", /* 113 */ - "wait4", /* 114 */ - "swapoff", /* 115 */ - "sysinfo", /* 116 */ - "ipc", /* 117 */ - "fsync", /* 118 */ - "sigreturn", /* 119 */ - "clone", /* 120 */ - "setdomainname", /* 121 */ - "uname", /* 122 */ - "123", /* 123 */ - "adjtimex", /* 124 */ - "mprotect", /* 125 */ - "sigprocmask", /* 126 */ - "create_module", /* 127 */ - "init_module", /* 128 */ - "delete_module", /* 129 */ - "get_kernel_syms", /* 130 */ - "quotactl", /* 131 */ - "getpgid", /* 132 */ - "fchdir", /* 133 */ - "bdflush", /* 134 */ - "sysfs", /* 135 */ - "personality", /* 136 */ - "afs_syscall", /* 137 */ - "setfsuid", /* 138 */ - "setfsgid", /* 139 */ - "_llseek", /* 140 */ - "getdents", /* 141 */ - "_newselect", /* 142 */ - "flock", /* 143 */ - "msync", /* 144 */ - "readv", /* 145 */ - "writev", /* 146 */ - "getsid", /* 147 */ - "fdatasync", /* 148 */ - "_sysctl", /* 149 */ - "mlock", /* 150 */ - "munlock", /* 151 */ - "mlockall", /* 152 */ - "munlockall", /* 153 */ - "sched_setparam", /* 154 */ - "sched_getparam", /* 155 */ - "sched_setscheduler", /* 156 */ - "sched_getscheduler", /* 157 */ - "sched_yield", /* 158 */ - "sched_get_priority_max", /* 159 */ - "sched_get_priority_min", /* 160 */ - "sched_rr_get_interval", /* 161 */ - "nanosleep", /* 162 */ - "mremap", /* 163 */ - "setresuid", /* 164 */ - "getresuid", /* 165 */ - "166", /* 166 */ - "query_module", /* 167 */ - "poll", /* 168 */ - "nfsservctl", /* 169 */ - "setresgid", /* 170 */ - "getresgid", /* 171 */ - "prctl", /* 172 */ - "rt_sigreturn", /* 173 */ - "rt_sigaction", /* 174 */ - "rt_sigprocmask", /* 175 */ - "rt_sigpending", /* 176 */ - "rt_sigtimedwait", /* 177 */ - "rt_sigqueueinfo", /* 178 */ - "rt_sigsuspend", /* 179 */ - "pread", /* 180 */ - "pwrite", /* 181 */ - "chown", /* 182 */ - "getcwd", /* 183 */ - "capget", /* 184 */ - "capset", /* 185 */ - "sigaltstack", /* 186 */ - "sendfile", /* 187 */ - "getpmsg", /* 188 */ - "putpmsg", /* 189 */ - "vfork", /* 190 */ - "ugetrlimit", /* 191 */ - "mmap2", /* 192 */ - "truncate64", /* 193 */ - "ftruncate64", /* 194 */ - "stat64", /* 195 */ - "lstat64", /* 196 */ - "fstat64", /* 197 */ - "lchown32", /* 198 */ - "getuid32", /* 199 */ - "getgid32", /* 200 */ - "geteuid32", /* 201 */ - "getegid32", /* 202 */ - "setreuid32", /* 203 */ - "setregid32", /* 204 */ - "getgroups32", /* 205 */ - "setgroups32", /* 206 */ - "fchown32", /* 207 */ - "setresuid32", /* 208 */ - "getresuid32", /* 209 */ - "setresgid32", /* 210 */ - "getresgid32", /* 211 */ - "chown32", /* 212 */ - "setuid32", /* 213 */ - "setgid32", /* 214 */ - "setfsuid32", /* 215 */ - "setfsgid32", /* 216 */ - "pivot_root", /* 217 */ - "mincore", /* 218 */ - "madvise", /* 219 */ - "getdents64", /* 220 */ - "fcntl64", /* 221 */ - "readahead", /* 222 */ - "sendfile64", /* 223 */ - "setxattr", /* 224 */ - "lsetxattr", /* 225 */ - "fsetxattr", /* 226 */ - "getxattr", /* 227 */ - "lgetxattr", /* 228 */ - "fgetxattr", /* 229 */ - "listxattr", /* 230 */ - "llistxattr", /* 231 */ - "flistxattr", /* 232 */ - "removexattr", /* 233 */ - "lremovexattr", /* 234 */ - "fremovexattr", /* 235 */ - "gettid", /* 236 */ - "tkill", /* 237 */ - "futex", /* 238 */ - "sched_setaffinity", /* 239 */ - "sched_getaffinity", /* 240 */ - "241", /* 241 */ - "242", /* 242 */ - "io_setup", /* 243 */ - "io_destroy", /* 244 */ - "io_getevents", /* 245 */ - "io_submit", /* 246 */ - "io_cancel", /* 247 */ - "exit_group", /* 248 */ - "epoll_create", /* 249 */ - "epoll_ctl", /* 250 */ - "epoll_wait", /* 251 */ - "set_tid_address", /* 252 */ - "fadvise64", /* 253 */ - "timer_create", /* 254 */ - "timer_settime", /* 255 */ - "timer_gettime", /* 256 */ - "timer_getoverrun", /* 257 */ - "timer_delete", /* 258 */ - "clock_settime", /* 259 */ - "clock_gettime", /* 260 */ - "clock_getres", /* 261 */ - "clock_nanosleep", /* 262 */ - "263", /* 263 */ - "fadvise64_64", /* 264 */ - "statfs64", /* 265 */ - "fstatfs64", /* 266 */ - "267", /* 267 */ - "268", /* 268 */ - "269", /* 269 */ - "270", /* 270 */ - "mq_open", /* 271 */ - "mq_unlink", /* 272 */ - "mq_timedsend", /* 273 */ - "mq_timedreceive", /* 274 */ - "mq_notify", /* 275 */ - "mq_getsetattr", /* 276 */ +#ifdef __s390x__ +#include "s390/syscalls64.h" +#else +#include "s390/syscalls31.h" +#endif --- ltrace-0.3.36//dev/null 1 Jan 1970 00:00:00 -0000 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/syscallent1.h 22 Dec 2005 22:37:16 -0000 1.1 @@ -0,0 +1 @@ +#include "s390/syscalls31.h" --- ltrace-0.3.36//dev/null 1 Jan 1970 00:00:00 -0000 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/syscalls31.h 22 Dec 2005 22:37:16 -0000 1.1 @@ -0,0 +1,287 @@ +"0", +"exit", +"fork", +"read", +"write", +"open", +"close", +"7", +"creat", +"link", +"unlink", +"execve", +"chdir", +"time", +"mknod", +"chmod", +"lchown16", +"17", +"18", +"lseek", +"getpid", +"mount", +"oldumount", +"setuid16", +"getuid16", +"stime", +"ptrace", +"alarm", +"28", +"pause", +"utime", +"31", +"32", +"access", +"nice", +"35", +"sync", +"kill", +"rename", +"mkdir", +"rmdir", +"dup", +"pipe", +"times", +"44", +"brk", +"setgid16", +"getgid16", +"signal", +"geteuid16", +"getegid16", +"acct", +"umount", +"53", +"ioctl", +"fcntl", +"56", +"setpgid", +"58", +"59", +"umask", +"chroot", +"ustat", +"dup2", +"getppid", +"getpgrp", +"setsid", +"sigaction", +"68", +"69", +"setreuid16", +"setregid16", +"sigsuspend", +"sigpending", +"sethostname", +"setrlimit", +"old_getrlimit", +"getrusage", +"gettimeofday", +"settimeofday", +"getgroups16", +"setgroups16", +"82", +"symlink", +"84", +"readlink", +"uselib", +"swapon", +"reboot", +"89", +"old_mmap", +"munmap", +"truncate", +"ftruncate", +"fchmod", +"fchown16", +"getpriority", +"setpriority", +"98", +"statfs", +"fstatfs", +"101", +"socketcall", +"syslog", +"setitimer", +"getitimer", +"newstat", +"newlstat", +"newfstat", +"109", +"lookup_dcookie", +"vhangup", +"112", +"113", +"wait4", +"swapoff", +"sysinfo", +"ipc", +"fsync", +"sigreturn", +"clone", +"setdomainname", +"newuname", +"123", +"adjtimex", +"mprotect", +"sigprocmask", +"127", +"init_module", +"delete_module", +"130", +"quotactl", +"getpgid", +"fchdir", +"bdflush", +"sysfs", +"personality", +"137", +"setfsuid16", +"setfsgid16", +"llseek", +"getdents", +"select", +"flock", +"msync", +"readv", +"writev", +"getsid", +"fdatasync", +"sysctl", +"mlock", +"munlock", +"mlockall", +"munlockall", +"sched_setparam", +"sched_getparam", +"sched_setscheduler", +"sched_getscheduler", +"sched_yield", +"sched_get_priority_max", +"sched_get_priority_min", +"sched_rr_get_interval", +"nanosleep", +"mremap", +"setresuid16", +"getresuid16", +"166", +"167", +"poll", +"nfsservctl", +"setresgid16", +"getresgid16", +"prctl", +"rt_sigreturn", +"rt_sigaction", +"rt_sigprocmask", +"rt_sigpending", +"rt_sigtimedwait", +"rt_sigqueueinfo", +"rt_sigsuspend", +"pread64", +"pwrite64", +"chown16", +"getcwd", +"capget", +"capset", +"sigaltstack", +"sendfile", +"188", +"189", +"vfork", +"getrlimit", +"mmap2", +"truncate64", +"ftruncate64", +"stat64", +"lstat64", +"fstat64", +"lchown", +"getuid", +"getgid", +"geteuid", +"getegid", +"setreuid", +"setregid", +"getgroups", +"setgroups", +"fchown", +"setresuid", +"getresuid", +"setresgid", +"getresgid", +"chown", +"setuid", +"setgid", +"setfsuid", +"setfsgid", +"pivot_root", +"mincore", +"madvise", +"getdents64", +"fcntl64", +"readahead", +"sendfile64", +"setxattr", +"lsetxattr", +"fsetxattr", +"getxattr", +"lgetxattr", +"fgetxattr", +"listxattr", +"llistxattr", +"flistxattr", +"removexattr", +"lremovexattr", +"fremovexattr", +"gettid", +"tkill", +"futex", +"sched_setaffinity", +"sched_getaffinity", +"tgkill", +"242", +"io_setup", +"io_destroy", +"io_getevents", +"io_submit", +"io_cancel", +"exit_group", +"epoll_create", +"epoll_ctl", +"epoll_wait", +"set_tid_address", +"fadvise64", +"timer_create", +"timer_settime", +"timer_gettime", +"timer_getoverrun", +"timer_delete", +"clock_settime", +"clock_gettime", +"clock_getres", +"clock_nanosleep", +"263", +"fadvise64_64", +"statfs64", +"fstatfs64", +"remap_file_pages", +"268", +"269", +"270", +"mq_open", +"mq_unlink", +"mq_timedsend", +"mq_timedreceive", +"mq_notify", +"mq_getsetattr", +"kexec_load", +"add_key", +"request_key", +"keyctl", +"waitid", +"ioprio_set", +"ioprio_get", +"inotify_init", +"inotify_add_watch", +"inotify_rm_watch", --- ltrace-0.3.36//dev/null 1 Jan 1970 00:00:00 -0000 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/syscalls64.h 22 Dec 2005 22:37:16 -0000 1.1 @@ -0,0 +1,287 @@ +"0", +"exit", +"fork", +"read", +"write", +"open", +"close", +"7", +"creat", +"link", +"unlink", +"execve", +"chdir", +"13", +"mknod", +"chmod", +"16", +"17", +"18", +"lseek", +"getpid", +"mount", +"oldumount", +"23", +"24", +"25", +"ptrace", +"alarm", +"28", +"pause", +"utime", +"31", +"32", +"access", +"nice", +"35", +"sync", +"kill", +"rename", +"mkdir", +"rmdir", +"dup", +"pipe", +"times", +"44", +"brk", +"46", +"47", +"signal", +"49", +"50", +"acct", +"umount", +"53", +"ioctl", +"fcntl", +"56", +"setpgid", +"58", +"59", +"umask", +"chroot", +"ustat", +"dup2", +"getppid", +"getpgrp", +"setsid", +"sigaction", +"68", +"69", +"70", +"71", +"sigsuspend", +"sigpending", +"sethostname", +"setrlimit", +"getrlimit", +"getrusage", +"gettimeofday", +"settimeofday", +"80", +"81", +"82", +"symlink", +"84", +"readlink", +"uselib", +"swapon", +"reboot", +"89", +"old_mmap", +"munmap", +"truncate", +"ftruncate", +"fchmod", +"95", +"getpriority", +"setpriority", +"98", +"statfs", +"fstatfs", +"101", +"socketcall", +"syslog", +"setitimer", +"getitimer", +"newstat", +"newlstat", +"newfstat", +"109", +"lookup_dcookie", +"vhangup", +"112", +"113", +"wait4", +"swapoff", +"sysinfo", +"ipc", +"fsync", +"sigreturn", +"clone", +"setdomainname", +"newuname", +"123", +"adjtimex", +"mprotect", +"sigprocmask", +"127", +"init_module", +"delete_module", +"130", +"quotactl", +"getpgid", +"fchdir", +"bdflush", +"sysfs", +"personality", +"137", +"138", +"139", +"llseek", +"getdents", +"select", +"flock", +"msync", +"readv", +"writev", +"getsid", +"fdatasync", +"sysctl", +"mlock", +"munlock", +"mlockall", +"munlockall", +"sched_setparam", +"sched_getparam", +"sched_setscheduler", +"sched_getscheduler", +"sched_yield", +"sched_get_priority_max", +"sched_get_priority_min", +"sched_rr_get_interval", +"nanosleep", +"mremap", +"164", +"165", +"166", +"167", +"poll", +"nfsservctl", +"170", +"171", +"prctl", +"rt_sigreturn", +"rt_sigaction", +"rt_sigprocmask", +"rt_sigpending", +"rt_sigtimedwait", +"rt_sigqueueinfo", +"rt_sigsuspend", +"pread64", +"pwrite64", +"182", +"getcwd", +"capget", +"capset", +"sigaltstack", +"sendfile64", +"188", +"189", +"vfork", +"getrlimit", +"mmap2", +"193", +"194", +"195", +"196", +"197", +"lchown", +"getuid", +"getgid", +"geteuid", +"getegid", +"setreuid", +"setregid", +"getgroups", +"setgroups", +"fchown", +"setresuid", +"getresuid", +"setresgid", +"getresgid", +"chown", +"setuid", +"setgid", +"setfsuid", +"setfsgid", +"pivot_root", +"mincore", +"madvise", +"getdents64", +"221", +"readahead", +"223", +"setxattr", +"lsetxattr", +"fsetxattr", +"getxattr", +"lgetxattr", +"fgetxattr", +"listxattr", +"llistxattr", +"flistxattr", +"removexattr", +"lremovexattr", +"fremovexattr", +"gettid", +"tkill", +"futex", +"sched_setaffinity", +"sched_getaffinity", +"tgkill", +"242", +"io_setup", +"io_destroy", +"io_getevents", +"io_submit", +"io_cancel", +"exit_group", +"epoll_create", +"epoll_ctl", +"epoll_wait", +"set_tid_address", +"fadvise64_64", +"timer_create", +"timer_settime", +"timer_gettime", +"timer_getoverrun", +"timer_delete", +"clock_settime", +"clock_gettime", +"clock_getres", +"clock_nanosleep", +"263", +"264", +"statfs64", +"fstatfs64", +"remap_file_pages", +"268", +"269", +"270", +"mq_open", +"mq_unlink", +"mq_timedsend", +"mq_timedreceive", +"mq_notify", +"mq_getsetattr", +"kexec_load", +"add_key", +"request_key", +"keyctl", +"waitid", +"ioprio_set", +"ioprio_get", +"inotify_init", +"inotify_add_watch", +"inotify_rm_watch", --- ltrace-0.3.36/sysdeps/linux-gnu/s390/trace.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/s390/trace.c 22 Dec 2005 22:37:16 -0000 1.2 @@ -4,14 +4,15 @@ ** Other routines are in ../trace.c and need to be combined ** at link time with this code. ** -** S/390 version -** Copyright (C) 2001 IBM Poughkeepsie, IBM Corporation +** Copyright (C) 2001,2005 IBM Corp. */ #if HAVE_CONFIG_H #include "config.h" #endif +#include +#include #include #include #include @@ -30,46 +31,129 @@ void get_arch_dep(struct process * proc) { +#ifdef __s390x__ + unsigned long psw; + + if (proc->arch_ptr) + return; + + psw = ptrace(PTRACE_PEEKUSER, proc->pid, PT_PSWMASK, 0); + + if ((psw & 0x000000180000000) == 0x000000080000000) { + proc->mask_32bit = 1; + proc->personality = 1; + } + + proc->arch_ptr = (void *) 1; +#endif } /* Returns 1 if syscall, 2 if sysret, 0 otherwise. */ int syscall_p(struct process * proc, int status, int * sysnum) { - long pswa; - long svcinst; - long svcno; - long svcop; - - if (WIFSTOPPED(status) && WSTOPSIG(status)==SIGTRAP) { + long pc, opcode, offset_reg, scno, tmp; + void *svc_addr; + int gpr_offset[16] = {PT_GPR0, PT_GPR1, PT_ORIGGPR2, PT_GPR3, + PT_GPR4, PT_GPR5, PT_GPR6, PT_GPR7, + PT_GPR8, PT_GPR9, PT_GPR10, PT_GPR11, + PT_GPR12, PT_GPR13, PT_GPR14, PT_GPR15}; + + if (WIFSTOPPED(status) && WSTOPSIG(status)==(SIGTRAP | proc->tracesysgood)) { + + /* + * If we have PTRACE_O_TRACESYSGOOD and we have the new style + * of passing the system call number to user space via PT_GPR2 + * then the task is quite easy. + */ - pswa = ptrace(PTRACE_PEEKUSER, proc->pid, PT_PSWADDR, 0); - svcinst = ptrace(PTRACE_PEEKTEXT, proc->pid, (char *)(pswa-4),0); - svcop = (svcinst >> 8) & 0xFF; - svcno = svcinst & 0xFF; + *sysnum = ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR2, 0); - *sysnum = svcno; - - if (*sysnum == -1) { - return 0; - } - if (svcop == 0 && svcno == 1) { - /* Breakpoint was hit... */ - return 0; - } - if (svcop == 10 && *sysnum>=0) { + if (proc->tracesysgood) { /* System call was encountered... */ if (proc->callstack_depth > 0 && - proc->callstack[proc->callstack_depth-1].is_syscall) { + proc->callstack[proc->callstack_depth-1].is_syscall) { + /* syscall exit */ + *sysnum = proc->callstack[proc->callstack_depth-1].c_un.syscall; return 2; } else { - return 1; + /* syscall enter */ + if (*sysnum != -ENOSYS) + return 1; } } + + /* + * At least one of the two requirements mentioned above is not + * met. Therefore the fun part starts here: + * We try to do some instruction decoding without even knowing + * the instruction code length of the last instruction executed. + * Needs to be done to get the system call number or to decide + * if we reached a breakpoint or even checking for a completely + * unrelated instruction. + * Just a heuristic that most of the time appears to work... + */ + + pc = ptrace(PTRACE_PEEKUSER, proc->pid, PT_PSWADDR, 0); + opcode = ptrace(PTRACE_PEEKTEXT, proc->pid, + (char *)(pc-sizeof(long)),0); + + if ((opcode & 0xffff) == 0x0001) { + /* Breakpoint */ + return 0; + } + else if ((opcode & 0xff00) == 0x0a00) { + /* SVC opcode */ + scno = opcode & 0xff; + } + else if ((opcode & 0xff000000) == 0x44000000) { + /* Instruction decoding of EXECUTE... */ + svc_addr = (void *) (opcode & 0xfff); + + offset_reg = (opcode & 0x000f0000) >> 16; + if (offset_reg) + svc_addr += ptrace(PTRACE_PEEKUSER, proc->pid, + gpr_offset[offset_reg], 0); + + offset_reg = (opcode & 0x0000f000) >> 12; + if (offset_reg) + svc_addr += ptrace(PTRACE_PEEKUSER, proc->pid, + gpr_offset[offset_reg], 0); + + scno = ptrace(PTRACE_PEEKTEXT, proc->pid, svc_addr, 0); +#ifdef __s390x__ + scno >>= 48; +#else + scno >>= 16; +#endif + if ((scno & 0xff00) != 0x0a000) + return 0; + + tmp = 0; + offset_reg = (opcode & 0x00f00000) >> 20; + if (offset_reg) + tmp = ptrace(PTRACE_PEEKUSER, proc->pid, + gpr_offset[offset_reg], 0); + + scno = (scno | tmp) & 0xff; + } else { - /* Unknown trap was encountered... */ + /* No opcode related to syscall handling */ return 0; } + + if (scno == 0) + scno = ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR1, 0); + + *sysnum = scno; + + /* System call was encountered... */ + if (proc->callstack_depth > 0 && + proc->callstack[proc->callstack_depth-1].is_syscall) { + return 2; + } else { + return 1; + } } /* Unknown status... */ return 0; @@ -77,18 +161,31 @@ long gimme_arg(enum tof type, struct process * proc, int arg_num) { + long ret; + switch(arg_num) { case -1: /* return value */ - return ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR2, 0); - case 0: return ptrace(PTRACE_PEEKUSER, proc->pid, PT_ORIGGPR2, 0); - case 1: return ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR3, 0); - case 2: return ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR4, 0); - case 3: return ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR5, 0); - case 4: return ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR6, 0); + ret = ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR2, 0); + break; + case 0: ret = ptrace(PTRACE_PEEKUSER, proc->pid, PT_ORIGGPR2, 0); + break; + case 1: ret = ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR3, 0); + break; + case 2: ret = ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR4, 0); + break; + case 3: ret = ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR5, 0); + break; + case 4: ret = ptrace(PTRACE_PEEKUSER, proc->pid, PT_GPR6, 0); + break; default: fprintf(stderr, "gimme_arg called with wrong arguments\n"); exit(2); } +#ifdef __s390x__ + if (proc->mask_32bit) + ret &= 0xffffffff; +#endif + return ret; } void --- ltrace-0.3.36/sysdeps/linux-gnu/sparc/trace.c 25 Jun 2005 00:37:30 -0000 1.1.1.1 +++ ltrace-0.3.36/sysdeps/linux-gnu/sparc/trace.c 22 Dec 2005 22:37:16 -0000 1.2 @@ -27,7 +27,7 @@ */ int syscall_p(struct process *proc, int status, int *sysnum) { - if (WIFSTOPPED(status) && WSTOPSIG(status)==SIGTRAP) { + if (WIFSTOPPED(status) && WSTOPSIG(status)==(SIGTRAP | proc->tracesysgood)) { void *ip = get_instruction_pointer(proc); unsigned int insn; if (ip == (void *)-1) return 0; --- ltrace-0.3.36/sysdeps/linux-gnu/x86_64/trace.c 25 Jun 2005 00:49:56 -0000 1.2 +++ ltrace-0.3.36/sysdeps/linux-gnu/x86_64/trace.c 22 Dec 2005 22:37:16 -0000 1.3 @@ -36,7 +36,7 @@ */ int syscall_p(struct process * proc, int status, int * sysnum) { - if (WIFSTOPPED(status) && WSTOPSIG(status)==SIGTRAP) { + if (WIFSTOPPED(status) && WSTOPSIG(status)==(SIGTRAP | proc->tracesysgood)) { *sysnum = ptrace(PTRACE_PEEKUSER, proc->pid, 8*ORIG_RAX, 0); if (proc->callstack_depth > 0 && ltrace-syscallent-update.patch: i386/syscallent.h | 9 +++++++++ ppc/syscallent.h | 9 +++++++++ sparc/syscallent.h | 14 +++++++++----- x86_64/syscallent.h | 8 ++++++++ 4 files changed, 35 insertions(+), 5 deletions(-) --- NEW FILE ltrace-syscallent-update.patch --- --- ltrace-0.3.36/sysdeps/linux-gnu/ppc/syscallent.h.jj 2004-11-09 13:25:16.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/ppc/syscallent.h 2006-01-09 11:58:09.000000000 +0100 @@ -261,3 +261,12 @@ "mq_notify", /* 266 */ "mq_getsetattr", /* 267 */ "kexec_load", /* 268 */ + "add_key", /* 269 */ + "request_key", /* 270 */ + "keyctl", /* 271 */ + "waitid", /* 272 */ + "ioprio_set", /* 273 */ + "ioprio_get", /* 274 */ + "inotify_init", /* 275 */ + "inotify_add_watch", /* 276 */ + "inotify_rm_watch", /* 277 */ --- ltrace-0.3.36/sysdeps/linux-gnu/i386/syscallent.h.jj 2004-11-09 13:25:16.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/i386/syscallent.h 2006-01-09 11:58:09.000000000 +0100 @@ -283,3 +283,12 @@ "mq_getsetattr", /* 282 */ "kexec_load", /* 283 */ "waitid", /* 284 */ + "285", /* 285 */ + "add_key", /* 286 */ + "request_key", /* 287 */ + "keyctl", /* 288 */ + "ioprio_set", /* 289 */ + "ioprio_get", /* 290 */ + "inotify_init", /* 291 */ + "inotify_add_watch", /* 292 */ + "inotify_rm_watch", /* 293 */ --- ltrace-0.3.36/sysdeps/linux-gnu/sparc/syscallent.h.jj 2004-11-09 13:25:16.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/sparc/syscallent.h 2006-01-09 11:58:09.000000000 +0100 @@ -149,12 +149,12 @@ "pciconfig_read", /* 148 */ "pciconfig_write", /* 149 */ "getsockname", /* 150 */ - "151", /* 151 */ - "152", /* 152 */ + "inotify_init", /* 151 */ + "inotify_add_watch", /* 152 */ "poll", /* 153 */ "getdents64", /* 154 */ "fcntl64", /* 155 */ - "156", /* 156 */ + "inotify_rm_watch", /* 156 */ "statfs", /* 157 */ "fstatfs", /* 158 */ "umount", /* 159 */ @@ -194,7 +194,7 @@ "epoll_create", /* 193 */ "epoll_ctl", /* 194 */ "epoll_wait", /* 195 */ - "196", /* 196 */ + "ioprio_set", /* 196 */ "getppid", /* 197 */ "sigaction", /* 198 */ "sgetmask", /* 199 */ @@ -216,7 +216,7 @@ "ipc", /* 215 */ "sigreturn", /* 216 */ "clone", /* 217 */ - "218", /* 218 */ + "ioprio_get", /* 218 */ "adjtimex", /* 219 */ "sigprocmask", /* 220 */ "create_module", /* 221 */ @@ -278,3 +278,7 @@ "mq_notify", /* 277 */ "mq_getsetattr", /* 278 */ "waitid", /* 279 */ + "setaltroot", /* 280 */ + "add_key", /* 281 */ + "request_key", /* 282 */ + "keyctl", /* 283 */ --- ltrace-0.3.36/sysdeps/linux-gnu/x86_64/syscallent.h.jj 2004-11-09 13:25:16.000000000 +0100 +++ ltrace-0.3.36/sysdeps/linux-gnu/x86_64/syscallent.h 2006-01-09 11:58:09.000000000 +0100 @@ -246,3 +246,11 @@ "mq_getsetattr", /* 245 */ "kexec_load", /* 246 */ "waitid", /* 247 */ + "add_key", /* 248 */ + "request_key", /* 249 */ + "keyctl", /* 250 */ + "ioprio_set", /* 251 */ + "ioprio_get", /* 252 */ + "inotify_init", /* 253 */ + "inotify_add_watch", /* 254 */ + "inotify_rm_watch", /* 255 */ Index: ltrace.spec =================================================================== RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- ltrace.spec 9 Dec 2005 22:41:50 -0000 1.19 +++ ltrace.spec 9 Jan 2006 14:06:43 -0000 1.20 @@ -1,13 +1,18 @@ Summary: Tracks runtime library calls from dynamically linked executables. Name: ltrace Version: 0.3.36 -Release: 3.1 +Release: 4 Source: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_%{version}.orig.tar.gz Patch1: ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.3.36-2.diff.gz -Patch2: ltrace_0.3.36-biarch.patch +Patch2: ltrace-ppc64.patch +Patch3: ltrace-ppc64-2.patch +Patch4: ltrace-s390x.patch +Patch5: ltrace-syscallent-update.patch +Patch6: ltrace-fixes.patch +Patch7: ltrace-ia64.patch License: GPL Group: Development/Debuggers -ExclusiveArch: i386 s390 ppc x86_64 alpha sparc +ExclusiveArch: i386 x86_64 ia64 ppc ppc64 s390 s390x alpha sparc Prefix: %{_prefix} BuildRoot: /var/tmp/%{name}-root BuildRequires: elfutils-libelf-devel @@ -26,9 +31,15 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build -%configure +export CC="gcc`echo $RPM_OPT_FLAGS | sed -n 's/^.*\(-m[36][124]\).*$/ \1/p'`" +%configure CC="$CC" make %install @@ -47,8 +58,9 @@ %config /etc/ltrace.conf %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Mon Jan 9 2006 Jakub Jelinek 0.3.36-4 +- added ppc64 and s390x support (IBM) +- added ia64 support (Ian Wienand) * Sat Mar 5 2005 Jakub Jelinek 0.3.36-3 - rebuilt with GCC 4 --- ltrace_0.3.36-biarch.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 14:16:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 09:16:25 -0500 Subject: rpms/ltrace/devel ltrace.spec,1.20,1.21 Message-ID: <200601091416.k09EGPRN025119@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/ltrace/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24568 Modified Files: ltrace.spec Log Message: 0.3.36-4 Index: ltrace.spec =================================================================== RCS file: /cvs/dist/rpms/ltrace/devel/ltrace.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ltrace.spec 9 Jan 2006 14:06:43 -0000 1.20 +++ ltrace.spec 9 Jan 2006 14:16:21 -0000 1.21 @@ -36,6 +36,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +sed -i -e 's/-o root -g root//' Makefile.in %build export CC="gcc`echo $RPM_OPT_FLAGS | sed -n 's/^.*\(-m[36][124]\).*$/ \1/p'`" From fedora-cvs-commits at redhat.com Mon Jan 9 14:56:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 09:56:28 -0500 Subject: rpms/system-config-lvm/devel .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 system-config-lvm.spec, 1.16, 1.17 Message-ID: <200601091456.k09EuSvP021958@cvs.devel.redhat.com> Author: jparsons Update of /cvs/dist/rpms/system-config-lvm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21943 Modified Files: .cvsignore sources system-config-lvm.spec Log Message: fix for bz176967 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-lvm/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 14 Nov 2005 18:59:15 -0000 1.16 +++ .cvsignore 9 Jan 2006 14:56:26 -0000 1.17 @@ -13,3 +13,4 @@ system-config-lvm-1.0.6.tar.gz system-config-lvm-1.0.7.tar.gz system-config-lvm-1.0.8.tar.gz +system-config-lvm-1.0.10.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-lvm/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 14 Nov 2005 18:59:15 -0000 1.16 +++ sources 9 Jan 2006 14:56:26 -0000 1.17 @@ -1 +1 @@ -f0580026c6bab6897d5f62ec8bdf40d2 system-config-lvm-1.0.8.tar.gz +e2f3db44bf8e96fbc23be4a4d4368106 system-config-lvm-1.0.10.tar.gz Index: system-config-lvm.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-lvm/devel/system-config-lvm.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- system-config-lvm.spec 9 Dec 2005 22:43:26 -0000 1.16 +++ system-config-lvm.spec 9 Jan 2006 14:56:26 -0000 1.17 @@ -1,8 +1,13 @@ # -*- RPM-SPEC -*- Summary: A utility for graphically configuring Logical Volumes. Name: system-config-lvm +<<<<<<< system-config-lvm.spec +Version: 1.0.10 +Release: 1.0 +======= Version: 1.0.8 Release: 1.0.1 +>>>>>>> 1.16 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL @@ -51,9 +56,12 @@ %config %{_sysconfdir}/security/console.apps/system-config-lvm %changelog +* Thu Jan 05 2006 Stanko Kupcevic 1.0.10-1.0 + - Fix for bz176967 * Fri Dec 09 2005 Jesse Keating -- rebuilt - + - rebuilt +* Fri Dec 2 2005 Jim Parsons 1.0.9-1.0 + - Removed cLVM test. * Mon Nov 14 2005 Jim Parsons 1.0.8-1.0 - Fixes for bz171744,171746,171747,171751,171753,171754,171755,171758,159457 * Mon Sep 26 2005 Jim Parsons 1.0.7-1.0 From fedora-cvs-commits at redhat.com Mon Jan 9 14:58:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 09:58:40 -0500 Subject: rpms/system-config-lvm/devel system-config-lvm.spec,1.17,1.18 Message-ID: <200601091458.k09Ewe3b022021@cvs.devel.redhat.com> Author: jparsons Update of /cvs/dist/rpms/system-config-lvm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22008 Modified Files: system-config-lvm.spec Log Message: spec file bookkeeping Index: system-config-lvm.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-lvm/devel/system-config-lvm.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- system-config-lvm.spec 9 Jan 2006 14:56:26 -0000 1.17 +++ system-config-lvm.spec 9 Jan 2006 14:58:37 -0000 1.18 @@ -1,13 +1,8 @@ # -*- RPM-SPEC -*- Summary: A utility for graphically configuring Logical Volumes. Name: system-config-lvm -<<<<<<< system-config-lvm.spec Version: 1.0.10 Release: 1.0 -======= -Version: 1.0.8 -Release: 1.0.1 ->>>>>>> 1.16 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL From fedora-cvs-commits at redhat.com Mon Jan 9 14:58:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 09:58:50 -0500 Subject: rpms/man-pages-pl/devel .cvsignore, 1.3, 1.4 man-pages-pl.spec, 1.16, 1.17 sources, 1.3, 1.4 Message-ID: <200601091458.k09EwoxN022074@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages-pl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22007 Modified Files: .cvsignore man-pages-pl.spec sources Log Message: - update source - add pidof patch (created by Marcin Garski) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/man-pages-pl/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Sep 2004 08:25:13 -0000 1.3 +++ .cvsignore 9 Jan 2006 14:58:47 -0000 1.4 @@ -1 +1 @@ -man-PL01-04-2004.tar.gz +man-PL24-10-2005.tar.gz Index: man-pages-pl.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-pl/devel/man-pages-pl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- man-pages-pl.spec 9 Dec 2005 22:41:57 -0000 1.16 +++ man-pages-pl.spec 9 Jan 2006 14:58:47 -0000 1.17 @@ -1,12 +1,13 @@ -%define releasedate 01-04-2004 +%define releasedate 24-10-2005 Summary: Polish man pages from the Linux Documentation Project. Name: man-pages-pl -Version: 0.23 -Release: 7.1 +Version: 0.24 +Release: 1 License: Distributable Group: Documentation Source: http://ptm.linux.pl/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 BuildArchitectures: noarch @@ -18,6 +19,7 @@ %prep %setup -q -n pl_PL #%patch0 -p1 -b .rofffix +%patch1 -p1 %build @@ -58,6 +60,10 @@ %{_mandir}/pl/* %changelog +* Mon Jan 9 2006 Ivana Varekova 0.24-1 +- update source +- add pidof patch (created by Marcin Garski) + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/man-pages-pl/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Sep 2004 08:25:13 -0000 1.3 +++ sources 9 Jan 2006 14:58:47 -0000 1.4 @@ -1 +1 @@ -05ac044f4f5733431173a80cb226ccc3 man-PL01-04-2004.tar.gz +53dbc41853d166e7e96d7f8054015adc man-PL24-10-2005.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 9 15:01:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:01:10 -0500 Subject: rpms/man-pages-pl/devel man-pages-pl-0.24-pidof.patch, NONE, 1.1 man-pages-pl.spec, 1.17, 1.18 Message-ID: <200601091501.k09F1AwY022137@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages-pl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22118 Modified Files: man-pages-pl.spec Added Files: man-pages-pl-0.24-pidof.patch Log Message: - foorgotten patch man-pages-pl-0.24-pidof.patch: pidof.8 | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE man-pages-pl-0.24-pidof.patch --- --- pl_PL/man8/pidof.8-orig 2003-08-21 15:07:53.000000000 +0200 +++ pl_PL/man8/pidof.8 2006-01-06 17:18:23.000000000 +0100 @@ -5,6 +5,7 @@ .SH SK?ADNIA .B pidof .RB [ \-s ] +.RB [ \-c ] .RB [ \-x ] .RB [ \-o .IR pomi?pid ] @@ -24,6 +25,11 @@ .SH OPCJE .IP -s Pojedynczy strza? - m?wi to programowi, by wy?wietli? tylko jeden \fIpid\fP. +.IP -c +Zwraca tylko identyfikatory proces?w dzia?aj?cych w tym samym katalogu g??wnym. +Ta opcja jest nieprzydatna dla u?ytkownik?w innych ni? root, poniewa? nie b?d? +oni mogli sprawdzi? aktualnego katalogu g??wnego proces?w, kt?rych nie s? +w?a?cicielami. .IP -x Skrypty r?wnie? - to powoduje, ?e program zwraca r?wnie? identyfikatory proces?w pow?ok, pracuj?cych z podanymi skryptami. Index: man-pages-pl.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-pl/devel/man-pages-pl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- man-pages-pl.spec 9 Jan 2006 14:58:47 -0000 1.17 +++ man-pages-pl.spec 9 Jan 2006 15:00:57 -0000 1.18 @@ -6,8 +6,8 @@ License: Distributable Group: Documentation Source: http://ptm.linux.pl/man-PL%{releasedate}.tar.gz -Patch0: man-pages-pl-0.22-roffix.patch -#Patch1: man-pages-pl-0.24-pidof.patch +#Patch0: man-pages-pl-0.22-roffix.patch +Patch1: man-pages-pl-0.24-pidof.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArchitectures: noarch From fedora-cvs-commits at redhat.com Mon Jan 9 15:03:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:03:40 -0500 Subject: rpms/rpm/devel rpm.spec,1.189,1.190 Message-ID: <200601091503.k09F3dT8022220@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22201 Modified Files: rpm.spec Log Message: * Mon Jan 9 2006 Alexander Larsson - 4.4.2-12 - Add mono req/provides support Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- rpm.spec 7 Dec 2005 15:33:10 -0000 1.189 +++ rpm.spec 9 Jan 2006 15:03:37 -0000 1.190 @@ -20,9 +20,11 @@ %define version 4.4.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 11 +Release: 12 Group: System Environment/Base Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz +Source1: mono-find-provides +Source2: mono-find-requires Patch0: rpm-4.4.1-hkp-disable.patch Patch1: rpm-4.4.1-fileconflicts.patch Patch2: rpm-4.4.1-prereq.patch @@ -38,6 +40,8 @@ Patch12: rpm-4.4.2-exclude.patch Patch13: rpm-4.4.2-excluded-size.patch Patch14: rpm-4.4.2-cronpath.patch +Patch15: rpm-4.4.2-mono.patch +Patch16: rpm-4.4.2-file-softmagic.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -164,7 +168,8 @@ %patch12 -p1 -b .exclude %patch13 -p1 -b .excludedsize %patch14 -p1 -b .cronpath - +%patch15 -p1 -b .mono +%patch16 -p1 -b .magic %build @@ -262,6 +267,10 @@ %endif } +# Install mono find-provides/requires +install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/rpm +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/rpm + %clean rm -rf $RPM_BUILD_ROOT @@ -470,6 +479,8 @@ %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 @@ -551,6 +562,9 @@ %{__includedir}/popt.h %changelog +* Mon Jan 9 2006 Alexander Larsson - 4.4.2-12 +- Add mono req/provides support + * Thu Dec 01 2005 Paul Nasrat - 4.4.2-11 - Remove rpm .la files (#174261) - Cron job use paths (#174211) From fedora-cvs-commits at redhat.com Mon Jan 9 15:04:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:04:43 -0500 Subject: rpms/man-pages-pl/devel man-pages-pl.spec,1.18,1.19 Message-ID: <200601091504.k09F4hLg022254@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages-pl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22229 Modified Files: man-pages-pl.spec Log Message: changed source address Index: man-pages-pl.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-pl/devel/man-pages-pl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- man-pages-pl.spec 9 Jan 2006 15:00:57 -0000 1.18 +++ man-pages-pl.spec 9 Jan 2006 15:04:41 -0000 1.19 @@ -5,7 +5,7 @@ Release: 1 License: Distributable Group: Documentation -Source: http://ptm.linux.pl/man-PL%{releasedate}.tar.gz +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 From fedora-cvs-commits at redhat.com Mon Jan 9 15:09:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:09:05 -0500 Subject: rpms/rpm/devel rpm-4.4.2-file-softmagic.patch, NONE, 1.1 rpm-4.4.2-mono.patch, NONE, 1.1 Message-ID: <200601091509.k09F95oc022526@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22510 Added Files: rpm-4.4.2-file-softmagic.patch rpm-4.4.2-mono.patch Log Message: add missing patches rpm-4.4.2-file-softmagic.patch: file.h | 21 +++++++++++-- softmagic.c | 91 +++++++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 77 insertions(+), 35 deletions(-) --- NEW FILE rpm-4.4.2-file-softmagic.patch --- --- rpm-4.4.2/file/src/softmagic.c 2005-07-16 19:14:21.000000000 -0400 +++ rpm/file/src/softmagic.c 2005-11-15 19:06:51.000000000 -0500 @@ -1,3 +1,8 @@ +/*@-compdef@*/ +/*@-evalorder@*/ +/*@-sizeoftype@*/ +/*@-uniondef@*/ +/*@-usereleased@*/ /* * Copyright (c) Ian F. Darwin 1986-1995. * Software written by Ian F. Darwin and others; @@ -39,7 +44,7 @@ #ifndef lint -FILE_RCSID("@(#)$Id: softmagic.c,v 1.73 2005/03/06 05:58:22 christos Exp $") +FILE_RCSID("@(#)$Id: softmagic.c,v 1.76 2005/10/17 19:04:36 christos Exp $") #endif /* lint */ private int match(struct magic_set *ms, struct magic *magic, uint32_t nmagic, @@ -47,10 +52,10 @@ /*@globals fileSystem @*/ /*@modifies ms, magic, fileSystem @*/; private int mget(struct magic_set *ms, union VALUETYPE *p, const unsigned char *s, - struct magic *m, size_t nbytes, int) + struct magic *m, size_t nbytes, unsigned int cont_level) /*@globals fileSystem @*/ /*@modifies ms, p, m, fileSystem @*/; -private int mcheck(struct magic_set *ms, union VALUETYPE *p, struct magic *m) +private int mymcheck(struct magic_set *ms, union VALUETYPE *p, struct magic *m) /*@globals fileSystem @*/ /*@modifies ms, p, m, fileSystem @*/; private int32_t mprint(struct magic_set *ms, union VALUETYPE *p, struct magic *m) @@ -133,7 +138,7 @@ if (flush) { if (magic[magindex].reln == '!') flush = 0; } else { - switch (mcheck(ms, &p, &magic[magindex])) { + switch (mymcheck(ms, &p, &magic[magindex])) { case -1: return -1; case 0: @@ -195,7 +200,7 @@ if (flush && magic[magindex].reln != '!') goto done; - switch (flush ? 1 : mcheck(ms, &p, &magic[magindex])) { + switch (flush ? 1 : mymcheck(ms, &p, &magic[magindex])) { case -1: return -1; case 0: @@ -639,25 +644,26 @@ * (starting at 1), not as bytes-from start-of-file */ char *b, *c, *last = NULL; - if ((p->buf = strdup((const char *)s)) == NULL) { + if ((p->search.buf = strdup((const char *)s)) == NULL) { file_oomem(ms); return -1; } - for (b = p->buf; offset && - ((b = strchr(c = b, '\n')) || (b = strchr(c, '\r'))); + for (b = p->search.buf; offset && + ((b = strchr(c = b, '\n')) != NULL || (b = strchr(c, '\r')) != NULL); offset--, b++) { last = b; if (b[0] == '\r' && b[1] == '\n') b++; } if (last != NULL) *last = '\0'; + p->search.buflen = last - p->search.buf; return 0; } if (indir == 0 && (type == FILE_BESTRING16 || type == FILE_LESTRING16)) { - const char *src = s + offset; - const char *esrc = s + nbytes; + const unsigned char *src = s + offset; + const unsigned char *esrc = s + nbytes; char *dst = p->s, *edst = &p->s[sizeof(p->s) - 1]; if (type == FILE_BESTRING16) @@ -691,13 +697,14 @@ * might even cause problems */ if (nbytes < sizeof(*p)) - (void)memset(((char *)p) + nbytes, '\0', sizeof(*p) - nbytes); + (void)memset(((char *)(void *)p) + nbytes, '\0', + sizeof(*p) - nbytes); return 0; } private int mget(struct magic_set *ms, union VALUETYPE *p, const unsigned char *s, - struct magic *m, size_t nbytes, int cont_level) + struct magic *m, size_t nbytes, unsigned int cont_level) { uint32_t offset = m->offset; @@ -713,7 +720,7 @@ int off = m->in_offset; if (m->in_op & FILE_OPINDIRECT) { const union VALUETYPE *q = - ((const union VALUETYPE *)(s + offset + off)); + ((const void *)(s + offset + off)); switch (m->in_type) { case FILE_BYTE: off = q->b; @@ -1148,12 +1155,18 @@ } if (m->type == FILE_SEARCH) { - p->buf = malloc(m->mask + m->vallen); - if (p->buf == NULL) { + size_t mlen = m->mask + m->vallen; + size_t flen = nbytes - offset; + if (flen < mlen) + mlen = flen; + p->search.buflen = mlen; + p->search.buf = malloc(mlen + 1); + if (p->search.buf == NULL) { file_error(ms, errno, "Cannot allocate search buffer"); return 0; } - (void)memcpy(p->buf, s + offset, m->mask + m->vallen); + (void)memcpy(p->search.buf, s + offset, mlen); + p->search.buf[mlen] = '\0'; } if (!mconvert(ms, p, m)) return 0; @@ -1161,7 +1174,7 @@ } private int -mcheck(struct magic_set *ms, union VALUETYPE *p, struct magic *m) +mymcheck(struct magic_set *ms, union VALUETYPE *p, struct magic *m) { uint32_t l = m->value.l; uint32_t v; @@ -1250,20 +1263,23 @@ regex_t rx; char errmsg[512]; + if (p->search.buf == NULL) + return 0; + rc = regcomp(&rx, m->value.s, REG_EXTENDED|REG_NOSUB|REG_NEWLINE| ((m->mask & STRING_IGNORE_LOWERCASE) ? REG_ICASE : 0)); if (rc) { - free(p->buf); - regerror(rc, &rx, errmsg, sizeof(errmsg)); + free(p->search.buf); + p->search.buf = NULL; + (void) regerror(rc, &rx, errmsg, sizeof(errmsg)); file_error(ms, 0, "regex error %d, (%s)", rc, errmsg); return -1; } else { -/*@-immediatetrans -moduncon -noeffectuncon @*/ /* regfree annotate bogus only @*/ - rc = regexec(&rx, p->buf, 0, 0, 0); - regfree(&rx); -/*@=immediatetrans =moduncon =noeffectuncon @*/ - free(p->buf); +/*@i@*/ rc = regexec(&rx, p->search.buf, 0, 0, 0); +/*@i@*/ regfree(&rx); + free(p->search.buf); + p->search.buf = NULL; return !rc; } } @@ -1273,23 +1289,31 @@ * search for a string in a certain range */ unsigned char *a = (unsigned char*)m->value.s; - unsigned char *b = (unsigned char*)p->buf; - int len = m->vallen; - int range = 0; + unsigned char *b = (unsigned char*)p->search.buf; + size_t len, slen = m->vallen; + size_t range = 0; + if (slen > sizeof(m->value.s)) + slen = sizeof(m->value.s); l = 0; v = 0; + if (b == NULL) + return 0; + len = slen; while (++range <= m->mask) { while (len-- > 0 && (v = *b++ - *a++) == 0) /*@innercontinue@*/ continue; if (!v) { - m->offset += range-1; + m->offset += range - 1; /*@loopbreak@*/ break; } - len = m->vallen; + if (range + slen >= p->search.buflen) + /*@loopbreak@*/ break; + len = slen; a = (unsigned char*)m->value.s; - b = (unsigned char*)p->buf + range; + b = (unsigned char*)p->search.buf + range; } - free(p->buf); + free(p->search.buf); + p->search.buf = NULL; break; } default: @@ -1374,3 +1398,8 @@ return matched; } +/*@=usereleased@*/ +/*@=uniondef@*/ +/*@=sizeoftype@*/ +/*@=evalorder@*/ +/*@=compdef@*/ --- rpm-4.4.2/file/src/file.h 2005-07-16 19:14:21.000000000 -0400 +++ rpm/file/src/file.h 2005-11-15 19:06:51.000000000 -0500 @@ -27,7 +27,7 @@ */ /* * file.h - definitions for file(1) program - * @(#)$Id: file.h,v 1.68 2005/06/25 15:52:14 christos Exp $ + * @(#)$Id: file.h,v 1.72 2005/10/17 15:36:22 christos Exp $ */ #ifndef __file_h__ @@ -39,6 +39,7 @@ #include /* Include that here, to make sure __P gets defined */ #include +#include /* For open and flags */ #ifdef HAVE_STDINT_H #include #endif @@ -194,8 +195,11 @@ uint16_t h; uint32_t l; char s[MAXstring]; + struct { /*@relnull@*/ - char *buf; + char *buf; + size_t buflen; + } search; uint8_t hs[2]; /* 2 bytes of a fixed-endian "short" */ uint8_t hl[4]; /* 4 bytes of a fixed-endian "long" */ } value; /* either number or string */ @@ -240,6 +244,7 @@ size_t len; size_t size; /* Printable buffer */ +/*@only@*/ char *pbuf; size_t psize; } o; @@ -295,9 +300,9 @@ /*@modifies ms @*/; protected void file_oomem(struct magic_set *ms) /*@modifies ms @*/; -protected void file_error(struct magic_set *ms, int, const char *, ...) +protected void file_error(struct magic_set *ms, int, /*@null@*/ const char *, ...) /*@modifies ms @*/; -protected void file_magwarn(struct magic_set *ms, const char *, ...) +protected void file_magwarn(struct magic_set *ms, /*@null@*/ const char *, ...) /*@globals fileSystem @*/ /*@modifies fileSystem @*/; protected void file_mdump(struct magic *m) @@ -323,10 +328,18 @@ #define strtoul(a, b, c) strtol(a, b, c) #endif +#if 0 /* HACK -- we have snprintf and I don't want to plumb the autofoo */ +int snprintf(char *, size_t, const char *, ...); +#endif + #if defined(HAVE_MMAP) && defined(HAVE_SYS_MMAN_H) && !defined(QUICK) #define QUICK #endif +#ifndef O_BINARY +#define O_BINARY 0 +#endif + #define FILE_RCSID(id) \ static const char *rcsid(const char *p) { \ return rcsid(p = id); \ rpm-4.4.2-mono.patch: build/rpmfc.c | 10 ++++++++++ build/rpmfc.h | 1 + macros.in | 3 +++ 3 files changed, 14 insertions(+) --- NEW FILE rpm-4.4.2-mono.patch --- --- rpm-4.4.2/macros.in.mono 2005-11-15 17:45:13.000000000 -0500 +++ rpm-4.4.2/macros.in 2005-11-15 17:45:44.000000000 -0500 @@ -438,6 +438,9 @@ %__python_provides @RPMCONFIGDIR@/pythondeps.sh --provides %__python_requires @RPMCONFIGDIR@/pythondeps.sh --requires +%__mono_provides @RPMCONFIGDIR@/mono-find-provides %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} +%__mono_requires @RPMCONFIGDIR@/mono-find-requires %{_builddir}/%{?buildsubdir} %{buildroot} %{_libdir} + # # fixowner, fixgroup, and fixperms are run at the end of hardcoded setup # These macros are necessary only for legacy compatibility, and have moved --- rpm-4.4.2/build/rpmfc.h.mono 2005-11-15 17:09:26.000000000 -0500 +++ rpm-4.4.2/build/rpmfc.h 2005-11-15 17:10:04.000000000 -0500 @@ -77,6 +77,7 @@ RPMFC_PYTHON = (1 << 26), RPMFC_PHP = (1 << 27), RPMFC_TCL = (1 << 28), + RPMFC_MONO = (1 << 6), RPMFC_WHITE = (1 << 29), RPMFC_INCLUDE = (1 << 30), --- rpm-4.4.2/build/rpmfc.c.mono 2005-11-15 16:04:46.000000000 -0500 +++ rpm-4.4.2/build/rpmfc.c 2005-11-15 17:07:20.000000000 -0500 @@ -458,6 +458,10 @@ /* XXX "python 2.3 byte-compiled" */ { "python ", RPMFC_PYTHON|RPMFC_INCLUDE }, + /* XXX .NET executables and libraries. file(1) cannot differ from win32 + * executables unfortunately :( */ + { "PE executable", RPMFC_MONO|RPMFC_INCLUDE }, + { "current ar archive", RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE }, { "Zip archive data", RPMFC_COMPRESSED|RPMFC_ARCHIVE|RPMFC_INCLUDE }, @@ -731,6 +735,11 @@ #endif xx = rpmfcHelper(fc, 'R', "python"); } + if (fc->fcolor->vals[fc->ix] & RPMFC_MONO) { + xx = rpmfcHelper(fc, 'P', "mono"); + if (is_executable) + xx = rpmfcHelper(fc, 'R', "mono"); + } return 0; } @@ -1059,6 +1068,7 @@ { rpmfcELF, RPMFC_ELF }, { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL) }, { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PYTHON) }, + { rpmfcSCRIPT, RPMFC_MONO }, { NULL, 0 } }; From fedora-cvs-commits at redhat.com Mon Jan 9 15:12:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:12:49 -0500 Subject: rpms/rpm/devel mono-find-provides, NONE, 1.1 mono-find-requires, NONE, 1.1 Message-ID: <200601091512.k09FCnLp022754@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22738 Added Files: mono-find-provides mono-find-requires Log Message: Add missing files --- NEW FILE mono-find-provides --- #!/bin/bash # # mono-find-provides # # Authors: # Ben Maurer (bmaurer at ximian.com) # # (C) 2005 Novell (http://www.novell.com) # # Args: builddir buildroot libdir IFS=$'\n' filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/')) monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$")) # If monodis is in the package being installed, use that one # This is to support building mono build_bindir="$2/usr/bin" build_libdir="$2$3" if [ -x $build_bindir/monodis ]; then monodis="$build_bindir/monodis" export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} elif [ -x /usr/bin/monodis ]; then monodis="/usr/bin/monodis" else exit 0; fi export MONO_SHARED_DIR=$1 for i in "${monolist[@]}"; do ($monodis --assembly $i | awk ' BEGIN { LIBNAME=""; VERSION=""; } /^Version:/ { VERSION=$2 } /^Name:/ { LIBNAME=$2 } END { if (VERSION && LIBNAME) print "mono(" LIBNAME ") = " VERSION } ') 2>/dev/null done --- NEW FILE mono-find-requires --- #!/bin/bash # # mono-find-requires # # Authors: # Ben Maurer (bmaurer at ximian.com) # # (C) 2005 Novell (http://www.novell.com) # # Args: builddir buildroot libdir IFS=$'\n' filelist=($(grep -Ev '/usr/doc/|/usr/share/doc/')) monolist=($(printf "%s\n" "${filelist[@]}" | egrep "\\.(exe|dll)\$")) # If monodis is in the package being installed, use that one # This is to support building mono build_bindir="$2/usr/bin" build_libdir="$2$3" if [ -x $build_bindir/monodis ]; then monodis="$build_bindir/monodis" export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} elif [ -x /usr/bin/monodis ]; then monodis="/usr/bin/monodis" else exit 0; fi export MONO_SHARED_DIR=$1 REQUIRES=$( for i in "${monolist[@]}"; do ($monodis --assemblyref $i | awk ' BEGIN { START=0; LIBNAME=""; VERSION=""; } (START==0) && /^[0-9]+: Version=/ { START=1; sub(/Version=/, "", $2); VERSION=$2 } (START==1) && /^\tName=/ { sub(/Name=/, "", $1); LIBNAME=$1 print "mono(" LIBNAME ") = " VERSION START=0 } ') 2> /dev/null done ) PROVIDES=$( for i in "${monolist[@]}"; do ($monodis --assembly $i | awk ' BEGIN { LIBNAME=""; VERSION=""; } /^Version:/ { VERSION=$2 } /^Name:/ { LIBNAME=$2 } END { if (VERSION && LIBNAME) print "mono(" LIBNAME ") = " VERSION } ') 2>/dev/null done ) # # This is a little magic trick to get all REQUIRES that are not # in PROVIDES. While RPM functions correctly when such deps exist, # they make the metadata a bit bloated. # # Filter out dups from both lists REQUIRES=$(echo "$REQUIRES" | sort | uniq) PROVIDES=$(echo "$PROVIDES" | sort | uniq) # # Get a list of elements that exist in exactly one of PROVIDES or REQUIRES # UNIQ=$(echo "$PROVIDES $REQUIRES" | sort | uniq -u) # # Of those, only chose the ones that are in REQUIRES # echo "$UNIQ $REQUIRES" | sort | uniq -d From fedora-cvs-commits at redhat.com Mon Jan 9 15:36:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:36:48 -0500 Subject: rpms/system-config-cluster/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 system-config-cluster.spec, 1.8, 1.9 Message-ID: <200601091536.k09FamSZ002311@cvs.devel.redhat.com> Author: jparsons Update of /cvs/dist/rpms/system-config-cluster/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2296 Modified Files: .cvsignore sources system-config-cluster.spec Log Message: Various rgmanager refinements and GUI fixups, plus support for FS IDs Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-cluster/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Nov 2005 13:27:01 -0000 1.8 +++ .cvsignore 9 Jan 2006 15:36:46 -0000 1.9 @@ -5,3 +5,4 @@ system-config-cluster-0.9.65.tar.gz system-config-cluster-0.9.69.tar.gz system-config-cluster-1.0.17.tar.gz +system-config-cluster-1.0.24.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-cluster/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Nov 2005 13:27:01 -0000 1.8 +++ sources 9 Jan 2006 15:36:46 -0000 1.9 @@ -1 +1 @@ -38be72fb285956339d1c969ef79f1295 system-config-cluster-1.0.17.tar.gz +e911292da2fd8dc91bafe32130068fc4 system-config-cluster-1.0.24.tar.gz Index: system-config-cluster.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-cluster/devel/system-config-cluster.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- system-config-cluster.spec 9 Dec 2005 22:43:24 -0000 1.8 +++ system-config-cluster.spec 9 Jan 2006 15:36:46 -0000 1.9 @@ -1,8 +1,8 @@ # -*- RPM-SPEC -*- Summary: system-config-cluster is a utility which allows you to manage cluster configuration in a graphical setting. Name: system-config-cluster -Version: 1.0.17 -Release: 1.0.1 +Version: 1.0.24 +Release: 1.0 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL @@ -50,9 +50,20 @@ %config %{_sysconfdir}/security/console.apps/system-config-cluster %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt - +* Mon Jan 09 2006 Jim Parsons 1.0.24-1 + - Build for fedora +* Tue Dec 20 2005 Jim Parsons 1.0.23-1 + - Removed unnecessary fence device field +* Tue Dec 20 2005 Jim Parsons 1.0.22-1 + - Version bump +* Fri Dec 9 2005 Jim Parsons 1.0.21-1 + - Some gui fixups, support for file system IDs, and some exposure of a few additional rgmanager params +* Mon Dec 1 2005 Jim Parsons 1.0.20-1 + - minor cleanup and version bump +* Mon Dec 1 2005 Jim Parsons 1.0.19-1 + - Version Bump +* Mon Dec 1 2005 Jim Parsons 1.0.18-1 + - Fix for Fix for bz159965 and added samba support for bz173527 * Mon Nov 14 2005 Jim Parsons 1.0.17-1 - Fix for bz169139, and Version Bump - Build for Fedora. * Mon Sep 12 2005 Jim Parsons 1.0.16-1 From fedora-cvs-commits at redhat.com Mon Jan 9 15:41:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:41:34 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1826.2.6, 1.1826.2.7 linux-2.6-vm-debug.patch, 1.1, 1.1.2.1 Message-ID: <200601091541.k09FfYBX002451@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2435 Modified Files: Tag: private-fc5-test2-branch kernel-2.6.spec linux-2.6-vm-debug.patch Log Message: Remove BUG() that triggers too easily for test2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.6 retrieving revision 1.1826.2.7 diff -u -r1.1826.2.6 -r1.1826.2.7 --- kernel-2.6.spec 9 Jan 2006 13:47:35 -0000 1.1826.2.6 +++ kernel-2.6.spec 9 Jan 2006 15:41:31 -0000 1.1826.2.7 @@ -1411,6 +1411,10 @@ %endif %changelog +* Mon Jan 9 2006 Dave Jones +- Remove vm debug patch that triggers too easily right now. + (Needs fixing properly post test2). + * Mon Jan 9 2006 David Woodhouse - Fix some usblp problems, add ieee1284_id to sysfs - update bcm43xx driver to version tested in -HEAD linux-2.6-vm-debug.patch: drivers/scsi/st.c | 1 + mm/rmap.c | 7 +++++++ 2 files changed, 8 insertions(+) Index: linux-2.6-vm-debug.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-vm-debug.patch,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -r1.1 -r1.1.2.1 --- linux-2.6-vm-debug.patch 6 Jan 2006 03:15:23 -0000 1.1 +++ linux-2.6-vm-debug.patch 9 Jan 2006 15:41:31 -0000 1.1.2.1 @@ -24,13 +24,4 @@ if (dirtied) SetPageDirty(page); /* FIXME: cache flush missing for rw==READ ---- linux-2.6.15/include/linux/mm.h~ 2006-01-05 22:02:20.000000000 -0500 -+++ linux-2.6.15/include/linux/mm.h 2006-01-05 22:02:48.000000000 -0500 -@@ -299,6 +299,7 @@ struct page { - #define put_page_testzero(p) \ - ({ \ - BUG_ON(page_count(p) == 0); \ -+ BUG_ON(page_count(p) <= page_mapcount(p)); \ - atomic_add_negative(-1, &(p)->_count); \ - }) - + From fedora-cvs-commits at redhat.com Mon Jan 9 15:44:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:44:46 -0500 Subject: rpms/jonas/devel jonas.spec,1.138,1.139 Message-ID: <200601091544.k09Fik30002562@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/jonas/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2548 Modified Files: jonas.spec Log Message: exclude s390 arch Index: jonas.spec =================================================================== RCS file: /cvs/dist/rpms/jonas/devel/jonas.spec,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- jonas.spec 22 Dec 2005 17:18:42 -0000 1.138 +++ jonas.spec 9 Jan 2006 15:44:44 -0000 1.139 @@ -8,9 +8,9 @@ # To specify a date, add '--define "snapshot YYYYMMDD"' as well %define cvs_version %{?snapshot}%{!?snapshot:%(date +%Y%m%d)} %if %{?_with_snapshot:1}%{!?_with_snapshot:0} -%define release 0.%{cvs_version}.1jpp_1rh.1 +%define release 0.%{cvs_version}.1jpp_1rh.1 %else -%define release 1jpp_19fc +%define release 1jpp_20fc %endif %define section free @@ -51,7 +51,7 @@ ExcludeArch: ia64 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=164985 -ExcludeArch: ppc64 s390x +ExcludeArch: ppc64 s390x s390 # Source files @@ -1736,6 +1736,9 @@ # ----------------------------------------------------------------------------- %changelog +* Mon Jan 9 2006 Jesse Keating - 4.3.3-1jpp_20fc +- Exclude s390 from build + * Thu Dec 22 2005 Gary Benson - 4.3.3-1jpp_19fc - Rebuild again for another gcc/gcj bug From fedora-cvs-commits at redhat.com Mon Jan 9 15:46:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:46:30 -0500 Subject: rpms/OpenIPMI/devel ipmitool-1.8.2-fru.patch, NONE, 1.1 ipmitool-1.8.2-kgkey.patch, NONE, 1.1 OpenIPMI.spec, 1.21, 1.22 Message-ID: <200601091546.k09FkU2M013881@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/OpenIPMI/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13271 Modified Files: OpenIPMI.spec Added Files: ipmitool-1.8.2-fru.patch ipmitool-1.8.2-kgkey.patch Log Message: - Included FRU fix for displaying FRUs with ipmitool - Included patch for new option to specify a BMC password for IPMI 2.0 sessions ipmitool-1.8.2-fru.patch: ipmi_fru.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE ipmitool-1.8.2-fru.patch --- --- OpenIPMI-1.4.11/ipmitool-1.8.2/lib/ipmi_fru.c.fru 2005-05-18 02:08:30.000000000 -0500 +++ OpenIPMI-1.4.11/ipmitool-1.8.2/lib/ipmi_fru.c 2005-11-11 17:39:17.000000000 -0600 @@ -197,7 +197,7 @@ req.msg.data = msg_data; req.msg.data_len = 4; - if (fru->access && fru_data_rqst_size > 16) + if (fru_data_rqst_size > 16) fru_data_rqst_size = 16; do { tmp = fru->access ? off >> 1 : off; @@ -216,8 +216,6 @@ break; } if (rsp->ccode > 0) { - lprintf(LOG_NOTICE, "FRU Read failed: %s", - val2str(rsp->ccode, completion_code_vals)); /* if we get C7 or C8 return code then we requested too * many bytes at once so try again with smaller size */ if ((rsp->ccode == 0xc7 || rsp->ccode == 0xc8) && @@ -226,6 +224,8 @@ fru_data_rqst_size); continue; } + lprintf(LOG_NOTICE, "FRU Read failed: %s", + val2str(rsp->ccode, completion_code_vals)); break; } @@ -780,15 +780,15 @@ lprintf(LOG_DEBUG, "fru.header.version: 0x%x", header.version); lprintf(LOG_DEBUG, "fru.header.offset.internal: 0x%x", - header.offset.internal); + header.offset.internal * 8); lprintf(LOG_DEBUG, "fru.header.offset.chassis: 0x%x", - header.offset.chassis); + header.offset.chassis * 8); lprintf(LOG_DEBUG, "fru.header.offset.board: 0x%x", - header.offset.board); + header.offset.board * 8); lprintf(LOG_DEBUG, "fru.header.offset.product: 0x%x", - header.offset.product); + header.offset.product * 8); lprintf(LOG_DEBUG, "fru.header.offset.multi: 0x%x", - header.offset.multi); + header.offset.multi * 8); /* * rather than reading the entire part ipmitool-1.8.2-kgkey.patch: include/ipmitool/ipmi_intf.h | 1 + lib/ipmi_main.c | 15 +++++++++++++-- src/plugins/ipmi_intf.c | 16 ++++++++++++++++ src/plugins/lanplus/lanplus.c | 3 ++- src/plugins/lanplus/lanplus_crypt.c | 8 -------- 5 files changed, 32 insertions(+), 11 deletions(-) --- NEW FILE ipmitool-1.8.2-kgkey.patch --- --- OpenIPMI-1.4.14/ipmitool-1.8.2/lib/ipmi_main.c.kgkey 2006-01-09 16:10:19.000000000 +0100 +++ OpenIPMI-1.4.14/ipmitool-1.8.2/lib/ipmi_main.c 2006-01-09 16:10:43.000000000 +0100 @@ -74,9 +74,9 @@ #endif #ifdef ENABLE_ALL_OPTIONS -# define OPTION_STRING "I:hVvcgsEao:H:P:f:U:p:C:L:A:t:m:S:" +# define OPTION_STRING "I:hVvcgsEao:H:P:f:U:p:k:C:L:A:t:m:S:" #else -# define OPTION_STRING "I:hVvcH:f:U:p:" +# define OPTION_STRING "I:hVvcH:f:U:p:k:" #endif extern int verbose; @@ -236,6 +236,7 @@ lprintf(LOG_NOTICE, " -o oemtype Setup for OEM (use 'list' to see available OEM types)"); lprintf(LOG_NOTICE, " -S sdr Use local file for remote SDR cache"); #endif + lprintf(LOG_NOTICE, " -k key Use KG key for IPMI 2.0 authentication"); lprintf(LOG_NOTICE, ""); ipmi_intf_print(intflist); @@ -274,6 +275,7 @@ char * progname = NULL; char * oemtype = NULL; char * sdrcache = NULL; + char * kgkey = NULL; int port = 0; int cipher_suite_id = 3; /* See table 22-19 of the IPMIv2 spec */ int argflag, i, found; @@ -359,6 +361,13 @@ } } break; + case 'k': + kgkey = strdup(optarg); + if (kgkey == NULL) { + lprintf(LOG_ERR, "%s: malloc failure", progname); + goto out_free; + } + break; case 'U': username = strdup(optarg); if (username == NULL) { @@ -522,6 +531,8 @@ ipmi_intf_session_set_username(intf, username); if (password != NULL) ipmi_intf_session_set_password(intf, password); + if (kgkey != NULL) + ipmi_intf_session_set_kgkey(intf, kgkey); if (port > 0) ipmi_intf_session_set_port(intf, port); if (authtype >= 0) --- OpenIPMI-1.4.14/ipmitool-1.8.2/src/plugins/lanplus/lanplus_crypt.c.kgkey 2006-01-09 16:09:35.000000000 +0100 +++ OpenIPMI-1.4.14/ipmitool-1.8.2/src/plugins/lanplus/lanplus_crypt.c 2006-01-09 16:10:43.000000000 +0100 @@ -527,14 +527,6 @@ if (session->v2_data.kg[0]) { /* We will be hashing with Kg */ - /* - * TODO: Section 13.31 of the IPMI v2 spec describes the SIK creation - * using Kg. It specifies that Kg should not be truncated, but I - * do not know what is meant by that. - */ - lprintf(LOG_ERR, "lanplus_generate_sik: We dont yet support hashing with Kg"); - assert(0); - input_key = session->v2_data.kg; } else --- OpenIPMI-1.4.14/ipmitool-1.8.2/src/plugins/lanplus/lanplus.c.kgkey 2006-01-09 16:09:44.000000000 +0100 +++ OpenIPMI-1.4.14/ipmitool-1.8.2/src/plugins/lanplus/lanplus.c 2006-01-09 16:10:43.000000000 +0100 @@ -3113,8 +3113,9 @@ //session->sol_data.last_received_sequence_number = 0; //session->sol_data.last_received_byte_count = 0; memset(session->v2_data.sik, 0, IPMI_SIK_BUFFER_SIZE); - memset(session->v2_data.kg, 0, IPMI_KG_BUFFER_SIZE); + /* kg key is now set in ipmi_intf */ + //memset(session->v2_data.kg, 0, IPMI_KG_BUFFER_SIZE); /* open port to BMC */ memset(&addr, 0, sizeof(struct sockaddr_in)); --- OpenIPMI-1.4.14/ipmitool-1.8.2/src/plugins/ipmi_intf.c.kgkey 2006-01-09 16:09:56.000000000 +0100 +++ OpenIPMI-1.4.14/ipmitool-1.8.2/src/plugins/ipmi_intf.c 2006-01-09 16:10:43.000000000 +0100 @@ -206,6 +206,22 @@ __min(strlen(password), IPMI_AUTHCODE_BUFFER_SIZE)); } + +void +ipmi_intf_session_set_kgkey(struct ipmi_intf * intf, char * kgkey) +{ + if (intf->session == NULL) + return; + + memset(intf->session->v2_data.kg, 0, IPMI_KG_BUFFER_SIZE); + + if (kgkey == NULL) + return; + + memcpy(intf->session->v2_data.kg, kgkey, + __min(strlen(kgkey), IPMI_KG_BUFFER_SIZE)); +} + void ipmi_intf_session_set_privlvl(struct ipmi_intf * intf, uint8_t level) { --- OpenIPMI-1.4.14/ipmitool-1.8.2/include/ipmitool/ipmi_intf.h.kgkey 2006-01-09 16:10:08.000000000 +0100 +++ OpenIPMI-1.4.14/ipmitool-1.8.2/include/ipmitool/ipmi_intf.h 2006-01-09 16:10:43.000000000 +0100 @@ -190,6 +190,7 @@ void ipmi_intf_session_set_hostname(struct ipmi_intf * intf, char * hostname); void ipmi_intf_session_set_username(struct ipmi_intf * intf, char * username); void ipmi_intf_session_set_password(struct ipmi_intf * intf, char * password); +void ipmi_intf_session_set_kgkey(struct ipmi_intf * intf, char * kgkey); void ipmi_intf_session_set_privlvl(struct ipmi_intf * intf, uint8_t privlvl); void ipmi_intf_session_set_cipher_suite_id(struct ipmi_intf * intf, uint8_t cipher_suite_id); void ipmi_intf_session_set_port(struct ipmi_intf * intf, int port); Index: OpenIPMI.spec =================================================================== RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- OpenIPMI.spec 3 Jan 2006 08:58:00 -0000 1.21 +++ OpenIPMI.spec 9 Jan 2006 15:46:28 -0000 1.22 @@ -14,6 +14,8 @@ Patch2: OpenIPMI-1.4.14-oob.patch Patch3: OpenIPMI-1.4.14-warnings.patch Patch4: OpenIPMI-1.4.14-lanplus-session-privset.patch +Patch20: ipmitool-1.8.2-fru.patch +Patch21: ipmitool-1.8.2-kgkey.patch BuildRoot: /var/tmp/%{name}-%{version}-root BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel openssl-devel @@ -53,6 +55,8 @@ %patch2 -p1 -b .oob %patch3 -p1 -b .warnings %patch4 -p1 -b .lanplus-session-privset +%patch20 -p1 -b .fru +%patch21 -p1 -b .kgkey %build %configure @@ -104,7 +108,10 @@ %{_bindir}/ipmicmd %{_bindir}/ipmilan %{_bindir}/ipmish -%{_mandir}/man[18]/* +%{_mandir}/man1/ipmi_ui* +%{_mandir}/man1/ipmicmd* +%{_mandir}/man1/ipmish* +%{_mandir}/man8/ipmilan* %{_libdir}/perl5/site_perl/*/*-linux-thread-multi/OpenIPMI.pm %dir %{_libdir}/perl5/site_perl/*/*-linux-thread-multi/auto/OpenIPMI %{_libdir}/perl5/site_perl/*/*-linux-thread-multi/auto/OpenIPMI/* @@ -113,6 +120,8 @@ %defattr(-,root,root) %{_datadir}/ipmitool/ %{_bindir}/ipmitool +%{_mandir}/man1/ipmitool* +%{_mandir}/man8/ipmievd* /usr/sbin/ipmievd %files libs @@ -128,6 +137,10 @@ %{_libdir}/*.a %changelog +* Mon Jan 09 2006 Phil Knirsch 1.4.14-15 +- Included FRU fix for displaying FRUs with ipmitool +- Included patch for new option to specify a BMC password for IPMI 2.0 sessions + * Tue Jan 03 2006 Radek Vokal 1.4.14-15 - Rebuilt against new libnetsnmp From fedora-cvs-commits at redhat.com Mon Jan 9 15:47:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:47:06 -0500 Subject: rpms/OpenIPMI/devel OpenIPMI.spec,1.22,1.23 Message-ID: <200601091547.k09Fl6E1013907@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/OpenIPMI/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13894 Modified Files: OpenIPMI.spec Log Message: - Fixed release... Index: OpenIPMI.spec =================================================================== RCS file: /cvs/dist/rpms/OpenIPMI/devel/OpenIPMI.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- OpenIPMI.spec 9 Jan 2006 15:46:28 -0000 1.22 +++ OpenIPMI.spec 9 Jan 2006 15:47:04 -0000 1.23 @@ -2,7 +2,7 @@ Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools Name: OpenIPMI Version: 1.4.14 -Release: 15 +Release: 16 License: GPL Group: System Environment/Base URL: http://sourceforge.net/projects/openipmi/ @@ -137,7 +137,7 @@ %{_libdir}/*.a %changelog -* Mon Jan 09 2006 Phil Knirsch 1.4.14-15 +* Mon Jan 09 2006 Phil Knirsch 1.4.14-16 - Included FRU fix for displaying FRUs with ipmitool - Included patch for new option to specify a BMC password for IPMI 2.0 sessions From fedora-cvs-commits at redhat.com Mon Jan 9 15:51:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:51:25 -0500 Subject: rpms/make/devel make-3.80-memory-1.patch, NONE, 1.1 make.spec, 1.21, 1.22 Message-ID: <200601091551.k09FpPTG014057@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/make/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14041 Modified Files: make.spec Added Files: make-3.80-memory-1.patch Log Message: Applied hongjiu.lu at intel.com's patch. Somehow reduces make's enormous memory consumption. (#175376) make-3.80-memory-1.patch: file.c | 2 implicit.c | 2 main.c | 1 make.h | 5 + misc.c | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- read.c | 6 +- 6 files changed, 165 insertions(+), 6 deletions(-) --- NEW FILE make-3.80-memory-1.patch --- --- make-3.80/file.c.memory 2002-10-03 19:13:42.000000000 -0700 +++ make-3.80/file.c 2005-12-08 15:37:27.000000000 -0800 @@ -434,7 +434,7 @@ snap_deps () if (d->file == 0) d->file = enter_file (d->name); else - free (d->name); + hash_strfree (d->name); d->name = 0; } free (file_slot_0); --- make-3.80/implicit.c.memory 2002-09-04 00:26:19.000000000 -0700 +++ make-3.80/implicit.c 2005-12-08 15:37:27.000000000 -0800 @@ -539,7 +539,7 @@ pattern_search (file, archive, depth, re dep->file = enter_file (dep->name); /* enter_file uses dep->name _if_ we created a new file. */ if (dep->name != dep->file->name) - free (dep->name); + hash_strfree (dep->name); dep->name = 0; dep->file->tried_implicit |= dep->changed; } --- make-3.80/main.c.memory 2002-08-09 18:27:17.000000000 -0700 +++ make-3.80/main.c 2005-12-08 15:37:27.000000000 -0800 @@ -501,6 +501,7 @@ initialize_global_hash_tables () init_hash_files (); hash_init_directories (); hash_init_function_table (); + init_hash_strings (); } static struct file * --- make-3.80/make.h.memory 2002-09-11 09:55:44.000000000 -0700 +++ make-3.80/make.h 2005-12-08 15:37:27.000000000 -0800 @@ -427,6 +427,11 @@ extern char *find_char_unquote PARAMS (( extern char *find_percent PARAMS ((char *)); extern FILE *open_tmpfile PARAMS ((char **, const char *)); +extern void init_hash_strings PARAMS ((void)); +extern char *hash_strdup PARAMS ((const char *)); +extern char *hash_savestring PARAMS ((const char *, unsigned int)); +extern void hash_strfree PARAMS ((char *)); + #ifndef NO_ARCHIVES extern int ar_name PARAMS ((char *)); extern void ar_parse_name PARAMS ((char *, char **, char **)); --- make-3.80/misc.c.memory 2002-09-12 15:15:58.000000000 -0700 +++ make-3.80/misc.c 2005-12-08 15:59:37.000000000 -0800 @@ -18,8 +18,10 @@ along with GNU Make; see the file COPYIN the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include "make.h" #include "dep.h" +#include "hash.h" #include "debug.h" /* Variadic functions. We go through contortions to allow proper function @@ -564,7 +566,7 @@ copy_dep_chain (d) c = (struct dep *) xmalloc (sizeof (struct dep)); bcopy ((char *) d, (char *) c, sizeof (struct dep)); if (c->name != 0) - c->name = xstrdup (c->name); + c->name = hash_strdup (c->name); c->next = 0; if (firstnew == 0) firstnew = lastnew = c; @@ -891,3 +893,154 @@ atomic_readdir(dir) } #endif /* HAVE_BROKEN_RESTART */ + +/* Hash table of duplicated strings. */ + +struct hash_string +{ + char *string; + unsigned int count; +}; + +static unsigned long +string_hash_1 (key) + const void *key; +{ + return_ISTRING_HASH_1 (((const struct hash_string *) key)->string); +} + +static unsigned long +string_hash_2 (key) + const void *key; +{ + return_ISTRING_HASH_2 (((const struct hash_string *) key)->string); +} + +static int +string_hash_cmp (x, y) + const void *x; + const void *y; +{ + return_ISTRING_COMPARE (((const struct hash_string *) x)->string, + ((const struct hash_string *) y)->string); +} + +static struct hash_table strings; + +void +init_hash_strings () +{ + hash_init (&strings, 1000, string_hash_1, string_hash_2, + string_hash_cmp); +} + +/* Keep track duplicated string and return the old one if exists. */ + +char * +hash_strdup (ptr) + const char *ptr; +{ + struct hash_string *h, key; + + if (*ptr == '\0') + return ""; + + key.string = (char *) ptr; + key.count = 0; + h = (struct hash_string *) hash_find_item (&strings, &key); + if (h == NULL) + { + char *result = (char *) malloc (strlen (ptr) + 1); + + if (result == NULL) + fatal (NILF, _("virtual memory exhausted")); + + strcpy (result, ptr); + + h = (struct hash_string *) malloc (sizeof (struct hash_string *)); + if (h == NULL) + fatal (NILF, _("virtual memory exhausted")); + + h->string = result; + h->count = 1; + hash_insert (&strings, h); + } + else + { + h->count++; + assert (h->count != 0); + } + + return h->string; +} + +char * +hash_savestring (str, length) + const char *str; + unsigned int length; +{ + struct hash_string *h, key; + + if (length == 0 || *str == '\0') + return ""; + + key.string = alloca (length + 1); + key.count = 0; + bcopy (str, key.string, length); + key.string [length] = '\0'; + + h = (struct hash_string *) hash_find_item (&strings, &key); + if (h == NULL) + { + char *out = (char *) xmalloc (length + 1); + bcopy (str, out, length); + out[length] = '\0'; + + h = (struct hash_string *) malloc (sizeof (struct hash_string *)); + if (h == NULL) + fatal (NILF, _("virtual memory exhausted")); + + h->string = out; + h->count = 1; + hash_insert (&strings, h); + } + else + { + h->count++; + assert (h->count != 0); + } + + return h->string; +} + +void +hash_strfree (ptr) + char *ptr; +{ + struct hash_string *h, key; + + if (*ptr == '\0') + return; + + key.string = ptr; + key.count = 0; + h = (struct hash_string *) hash_find_item (&strings, &key); + + /* Check if string comes from hash_strdup or hash_savestring. */ + if (h == NULL || h->string != ptr) + { + free (ptr); + return; + } + + h->count--; + if (h->count == 0) + { + struct hash_string *d; + + d = hash_delete (&strings, h); + assert (d == h); + free (h->string); + free (h); + } +} --- make-3.80/read.c.memory 2005-12-07 09:50:43.000000000 -0800 +++ make-3.80/read.c 2005-12-08 15:37:27.000000000 -0800 @@ -1871,8 +1871,8 @@ record_files (filenames, pattern, patter fatal (flocp, _("target `%s' leaves prerequisite pattern empty"), name); - free (d->name); - d->name = savestring (buffer, o - buffer); + hash_strfree (d->name); + d->name = hash_savestring (buffer, o - buffer); } } } @@ -2017,7 +2017,7 @@ record_files (filenames, pattern, patter while (d != 0) { struct dep *nextd = d->next; - free (d->name); + hash_strfree (d->name); free ((char *)d); d = nextd; } Index: make.spec =================================================================== RCS file: /cvs/dist/rpms/make/devel/make.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- make.spec 9 Dec 2005 22:41:54 -0000 1.21 +++ make.spec 9 Jan 2006 15:51:22 -0000 1.22 @@ -2,7 +2,7 @@ Name: make Epoch: 1 Version: 3.80 -Release: 8.1 +Release: 9 License: GPL Group: Development/Tools URL: http://www.gnu.org/software/make/ @@ -13,6 +13,7 @@ Patch4: make-3.80-j8k.patch Patch5: make-3.80-getcwd.patch Patch6: make-3.80-err-reporting.patch +Patch7: make-3.80-memory-1.patch Prereq: /sbin/install-info Prefix: %{_prefix} Buildroot: %{_tmppath}/%{name}-root @@ -36,6 +37,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build #autoreconf -f --install @@ -77,6 +79,10 @@ %{_infodir}/*.info* %changelog +* Mon Jan 09 2006 Petr Machata 3.80-9 +- Applied patch from hongjiu.lu at intel.com. Somehow reduces make's + enormous memory consumption. (#175376) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Mon Jan 9 15:58:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:58:04 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver-0.0.23-use-floaters-by-default.patch, 1.1, 1.2 gnome-screensaver.spec, 1.40, 1.41 Message-ID: <200601091558.k09Fw4RT023817@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23743 Modified Files: gnome-screensaver-0.0.23-use-floaters-by-default.patch gnome-screensaver.spec Log Message: - don't include .desktop part of theme name in gconf schema gnome-screensaver-0.0.23-use-floaters-by-default.patch: gnome-screensaver.schemas.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: gnome-screensaver-0.0.23-use-floaters-by-default.patch =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver-0.0.23-use-floaters-by-default.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-screensaver-0.0.23-use-floaters-by-default.patch 20 Dec 2005 22:36:51 -0000 1.1 +++ gnome-screensaver-0.0.23-use-floaters-by-default.patch 9 Jan 2006 15:58:00 -0000 1.2 @@ -14,7 +14,7 @@ list string - [] -+ [fedoralogo-floaters.desktop] ++ [fedoralogo-floaters] Screensaver themes Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- gnome-screensaver.spec 20 Dec 2005 22:36:51 -0000 1.40 +++ gnome-screensaver.spec 9 Jan 2006 15:58:00 -0000 1.41 @@ -12,7 +12,7 @@ Summary: GNOME Sreensaver Name: gnome-screensaver Version: 0.0.23 -Release: 3 +Release: 4 License: GPL Group: Amusement/Graphics Source0: %{name}-%{version}.tar.bz2 @@ -118,6 +118,9 @@ %{_sysconfdir}/pam.d/* %changelog +* Mon Jan 9 2005 Ray Strode - 0.0.23-4 +- don't include .desktop part of theme name in gconf schema + * Tue Dec 20 2005 Ray Strode - 0.0.23-3 - use fedora floater screensaver by default (bug 176229) From fedora-cvs-commits at redhat.com Mon Jan 9 15:59:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 10:59:24 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.41,1.42 Message-ID: <200601091559.k09FxO2G024408@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24319 Modified Files: gnome-screensaver.spec Log Message: s/2005/2006/ Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- gnome-screensaver.spec 9 Jan 2006 15:58:00 -0000 1.41 +++ gnome-screensaver.spec 9 Jan 2006 15:59:22 -0000 1.42 @@ -118,7 +118,7 @@ %{_sysconfdir}/pam.d/* %changelog -* Mon Jan 9 2005 Ray Strode - 0.0.23-4 +* Mon Jan 9 2006 Ray Strode - 0.0.23-4 - don't include .desktop part of theme name in gconf schema * Tue Dec 20 2005 Ray Strode - 0.0.23-3 From fedora-cvs-commits at redhat.com Mon Jan 9 16:23:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 11:23:54 -0500 Subject: rpms/kernel/devel linux-2.6-kill-blk_attempt_merge.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.1826.2.7, 1.1826.2.8 Message-ID: <200601091623.k09GNsSK011771@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11597 Modified Files: Tag: private-fc5-test2-branch kernel-2.6.spec Added Files: Tag: private-fc5-test2-branch linux-2.6-kill-blk_attempt_merge.patch Log Message: kill blk_attempt_merge which should make things happy again in block layer. linux-2.6-kill-blk_attempt_merge.patch: block/ll_rw_blk.c | 24 ------------------------ drivers/ide/ide-cd.c | 10 ---------- include/linux/blkdev.h | 1 - 3 files changed, 35 deletions(-) --- NEW FILE linux-2.6-kill-blk_attempt_merge.patch --- On Fri, Jan 06 2006, Dave Jones wrote: > Looks like some nice slab poison... > > Dave > > Oops: 0000 [#1] > last sysfs file: > /devices/pci0000:00/0000:00:1d.7/usb1/1-0:1.0/bAlternateSettingModules linked > in: usb_storage ata_piix libata e1000 ohci1394 ieee1394 uhci_hcdsCPU: 0 > EIP: 0060:[] Not tainted VLI > EFLAGS: 00010002 (2.6.15-1.1819_FC5) > EIP is at rb_next+0x9/0x22 > eax: 6b6b6b6b ebx: dfed01f8 ecx: c01bf65a edx: 6b6b6b6b > esi: c1991e98 edi: 00000202 ebp: dfed403c esp: c03c1f14 > ds: 007b es: 007b ss: 0068 > Process swapper (pid: 0, threadinfo=c03c1000 task=c0327ba0) > Stack: c01bf662 c01b5dfa dfed01f8 c01b85dc c040c284 00000004 c1991e98 c023c8ab > c1991e98 00000000 c040c284 00000000 c023d3a4 000194d0 00000000 dfed403c > c1991e98 c040c284 c1991e98 00000000 c0231f2d 000194d0 00000000 000194d0 > Call Trace: > [] cfq_latter_request+0x8/0x14 [] elv_latter_request+07 > [] blk_attempt_remerge+0x1d/0x3c [] cdrom_start_read+0e > [] ide_do_rw_cdrom+0xdd/0x14a [] start_request+0x1b1/01 > [] ide_do_request+0x2a0/0x2fb [] ide_intr+0xf3/0x11b > [] cdrom_read_intr+0x0/0x2a1 [] handle_IRQ_event+0x23/c > [] __do_IRQ+0x7a/0xcd [] do_IRQ+0x5c/0x77 > ======================= > [] common_interrupt+0x1a/0x20 [] mwait_idle+0x1a/0x2e > [] cpu_idle+0x38/0x4d [] start_kernel+0x17a/0x17c > Code: 85 c0 74 0b 8b 50 0c 85 d2 74 04 89 d0 eb f5 c3 8b 00 85 c0 74 0b 8b 50 0 The blk_attempt_remerge() is a bad interface to be honest, and it's hard to get to work reliably because it's done too late. I think the best option is just to kill it, this will cause problems with other io schedulers as well. I've merged this up for 2.6.16-rc inclusion, probably should go to stabel as well. --- [PATCH] Kill blk_attempt_remerge() It's a bad interface, and it's always done too late. Remove it. Signed-off-by: Jens Axboe diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 8e13645..c130519 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -2748,30 +2748,6 @@ static inline int attempt_front_merge(re return 0; } -/** - * blk_attempt_remerge - attempt to remerge active head with next request - * @q: The &request_queue_t belonging to the device - * @rq: The head request (usually) - * - * Description: - * For head-active devices, the queue can easily be unplugged so quickly - * that proper merging is not done on the front request. This may hurt - * performance greatly for some devices. The block layer cannot safely - * do merging on that first request for these queues, but the driver can - * call this function and make it happen any way. Only the driver knows - * when it is safe to do so. - **/ -void blk_attempt_remerge(request_queue_t *q, struct request *rq) -{ - unsigned long flags; - - spin_lock_irqsave(q->queue_lock, flags); - attempt_back_merge(q, rq); - spin_unlock_irqrestore(q->queue_lock, flags); -} - -EXPORT_SYMBOL(blk_attempt_remerge); - static void init_request_from_bio(struct request *req, struct bio *bio) { req->flags |= REQ_CMD; diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index d31117e..e4d55ad 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -1332,8 +1332,6 @@ static ide_startstop_t cdrom_start_read if (cdrom_read_from_buffer(drive)) return ide_stopped; - blk_attempt_remerge(drive->queue, rq); - /* Clear the local sector buffer. */ info->nsectors_buffered = 0; @@ -1874,14 +1872,6 @@ static ide_startstop_t cdrom_start_write return ide_stopped; } - /* - * for dvd-ram and such media, it's a really big deal to get - * big writes all the time. so scour the queue and attempt to - * remerge requests, often the plugging will not have had time - * to do this properly - */ - blk_attempt_remerge(drive->queue, rq); - info->nsectors_buffered = 0; /* use dma, if possible. we don't need to check more, since we diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 804cc4e..02a585f 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -595,7 +595,6 @@ extern void generic_make_request(struct extern void blk_put_request(struct request *); extern void __blk_put_request(request_queue_t *, struct request *); extern void blk_end_sync_rq(struct request *rq, int error); -extern void blk_attempt_remerge(request_queue_t *, struct request *); extern struct request *blk_get_request(request_queue_t *, int, gfp_t); extern void blk_insert_request(request_queue_t *, struct request *, int, void *); extern void blk_requeue_request(request_queue_t *, struct request *); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.7 retrieving revision 1.1826.2.8 diff -u -r1.1826.2.7 -r1.1826.2.8 --- kernel-2.6.spec 9 Jan 2006 15:41:31 -0000 1.1826.2.7 +++ kernel-2.6.spec 9 Jan 2006 16:23:52 -0000 1.1826.2.8 @@ -369,6 +369,7 @@ Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch +Patch1870: linux-2.6-kill-blk_attempt_merge.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -883,6 +884,8 @@ %patch1840 -p1 # Fix posix-cpu-timers sched_time accumulation %patch1860 -p1 +# kill blk_attempt_merge +%patch1870 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1414,6 +1417,7 @@ * Mon Jan 9 2006 Dave Jones - Remove vm debug patch that triggers too easily right now. (Needs fixing properly post test2). +- kill blk_attempt_merge() which was horribly broken. * Mon Jan 9 2006 David Woodhouse - Fix some usblp problems, add ieee1284_id to sysfs From fedora-cvs-commits at redhat.com Mon Jan 9 16:25:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 11:25:33 -0500 Subject: rpms/avahi/devel .cvsignore, 1.4, 1.5 avahi.spec, 1.21, 1.22 sources, 1.4, 1.5 Message-ID: <200601091625.k09GPXqa012154@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12127 Modified Files: .cvsignore avahi.spec sources Log Message: upgrade to upstream version 0.6.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 7 Dec 2005 18:49:56 -0000 1.4 +++ .cvsignore 9 Jan 2006 16:25:30 -0000 1.5 @@ -1,3 +1,4 @@ avahi-0.5.2.tar.gz avahi-0.6.tar.gz avahi-0.6.1.tar.gz +avahi-0.6.3.tar.gz Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- avahi.spec 22 Dec 2005 17:59:55 -0000 1.21 +++ avahi.spec 9 Jan 2006 16:25:30 -0000 1.22 @@ -1,10 +1,10 @@ Name: avahi -Version: 0.6.1 -Release: 3 +Version: 0.6.3 +Release: 1 Summary: Local network service discovery Group: System Environment/Base License: LGPL -URL: http://www.freedesktop.org/Software/Avahi +URL: http://avahi.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python Requires: dbus, libdaemon, expat, python, dbus-python, libcap @@ -90,7 +90,8 @@ #^- this patch now upstream %patch2 -p1 -b .start_after_dbus %patch3 -p1 -b .initscript_status -%patch4 -p1 -b .dbus-0.6 +#%patch4 -p1 -b .dbus-0.6 +#^- this patch now upstream %build # auto* update needed for avahi-0.5.2-fedora.patch @@ -245,6 +246,9 @@ %{_includedir}/avahi-qt3 %changelog +* Mon Jan 09 2006 Jason Vas Dias - 0.6.3-1 +- Upgrade to upstream version 0.6.3 + * Thu Dec 22 2005 Jason Vas Dias - 0.6.1-3 - move initscripts from /etc/init.d to /etc/rc.d/init.d Index: sources =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 7 Dec 2005 18:49:56 -0000 1.4 +++ sources 9 Jan 2006 16:25:30 -0000 1.5 @@ -1 +1 @@ -330613902c59bd597f140a8254e9f4ec avahi-0.6.1.tar.gz +0203f7fdd8d16914594f5c7ab2ec8e71 avahi-0.6.3.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 9 16:25:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 11:25:37 -0500 Subject: rpms/jonas/devel jonas.spec,1.139,1.140 Message-ID: <200601091625.k09GPbWQ012188@cvs.devel.redhat.com> Author: gbenson Update of /cvs/dist/rpms/jonas/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12142 Modified Files: jonas.spec Log Message: Document the s390 exclude Index: jonas.spec =================================================================== RCS file: /cvs/dist/rpms/jonas/devel/jonas.spec,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- jonas.spec 9 Jan 2006 15:44:44 -0000 1.139 +++ jonas.spec 9 Jan 2006 16:25:33 -0000 1.140 @@ -51,7 +51,10 @@ ExcludeArch: ia64 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=164985 -ExcludeArch: ppc64 s390x s390 +ExcludeArch: ppc64 s390x + +# XXX possibly http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13212 +ExcludeArch: s390 # Source files From fedora-cvs-commits at redhat.com Mon Jan 9 16:33:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 11:33:34 -0500 Subject: rpms/kernel/devel linux-2.6-kill-blk_attempt_merge.patch, 1.1.2.1, 1.1.2.2 Message-ID: <200601091633.k09GXYR2014533@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14480 Modified Files: Tag: private-fc5-test2-branch linux-2.6-kill-blk_attempt_merge.patch Log Message: fix rejects linux-2.6-kill-blk_attempt_merge.patch: block/ll_rw_blk.c | 24 ------------------------ drivers/ide/ide-cd.c | 2 -- include/linux/blkdev.h | 1 - 3 files changed, 27 deletions(-) Index: linux-2.6-kill-blk_attempt_merge.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-kill-blk_attempt_merge.patch,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- linux-2.6-kill-blk_attempt_merge.patch 9 Jan 2006 16:23:52 -0000 1.1.2.1 +++ linux-2.6-kill-blk_attempt_merge.patch 9 Jan 2006 16:32:46 -0000 1.1.2.2 @@ -46,11 +46,9 @@ Signed-off-by: Jens Axboe -diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c -index 8e13645..c130519 100644 ---- a/block/ll_rw_blk.c -+++ b/block/ll_rw_blk.c -@@ -2748,30 +2748,6 @@ static inline int attempt_front_merge(re +--- linux-2.6.15/block/ll_rw_blk.c~ 2006-01-09 11:30:20.000000000 -0500 ++++ linux-2.6.15/block/ll_rw_blk.c 2006-01-09 11:30:43.000000000 -0500 +@@ -2609,30 +2609,6 @@ static inline int attempt_front_merge(re return 0; } @@ -78,15 +76,12 @@ - -EXPORT_SYMBOL(blk_attempt_remerge); - - static void init_request_from_bio(struct request *req, struct bio *bio) + static int __make_request(request_queue_t *q, struct bio *bio) { - req->flags |= REQ_CMD; - -diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c -index d31117e..e4d55ad 100644 ---- a/drivers/ide/ide-cd.c -+++ b/drivers/ide/ide-cd.c -@@ -1332,8 +1332,6 @@ static ide_startstop_t cdrom_start_read + struct request *req; +--- linux-2.6.15/drivers/ide/ide-cd.c~ 2006-01-09 11:30:50.000000000 -0500 ++++ linux-2.6.15/drivers/ide/ide-cd.c 2006-01-09 11:30:55.000000000 -0500 +@@ -1338,8 +1338,6 @@ static ide_startstop_t cdrom_start_read if (cdrom_read_from_buffer(drive)) return ide_stopped; @@ -95,32 +90,13 @@ /* Clear the local sector buffer. */ info->nsectors_buffered = 0; -@@ -1874,14 +1872,6 @@ static ide_startstop_t cdrom_start_write - return ide_stopped; - } - -- /* -- * for dvd-ram and such media, it's a really big deal to get -- * big writes all the time. so scour the queue and attempt to -- * remerge requests, often the plugging will not have had time -- * to do this properly -- */ -- blk_attempt_remerge(drive->queue, rq); -- - info->nsectors_buffered = 0; - - /* use dma, if possible. we don't need to check more, since we -diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h -index 804cc4e..02a585f 100644 ---- a/include/linux/blkdev.h -+++ b/include/linux/blkdev.h -@@ -595,7 +595,6 @@ extern void generic_make_request(struct +--- linux-2.6.15/include/linux/blkdev.h~ 2006-01-09 11:31:17.000000000 -0500 ++++ linux-2.6.15/include/linux/blkdev.h 2006-01-09 11:31:20.000000000 -0500 +@@ -559,7 +559,6 @@ extern void register_disk(struct gendisk + extern void generic_make_request(struct bio *bio); extern void blk_put_request(struct request *); - extern void __blk_put_request(request_queue_t *, struct request *); - extern void blk_end_sync_rq(struct request *rq, int error); + extern void blk_end_sync_rq(struct request *rq); -extern void blk_attempt_remerge(request_queue_t *, struct request *); extern struct request *blk_get_request(request_queue_t *, int, gfp_t); extern void blk_insert_request(request_queue_t *, struct request *, int, void *); extern void blk_requeue_request(request_queue_t *, struct request *); - - From fedora-cvs-commits at redhat.com Mon Jan 9 16:35:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 11:35:35 -0500 Subject: rpms/kernel/devel/configs config-generic,1.121.2.2,1.121.2.3 Message-ID: <200601091635.k09GZZLd014991@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv14933/configs Modified Files: Tag: private-fc5-test2-branch config-generic Log Message: disable seccomp Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.121.2.2 retrieving revision 1.121.2.3 diff -u -r1.121.2.2 -r1.121.2.3 --- config-generic 9 Jan 2006 13:47:35 -0000 1.121.2.2 +++ config-generic 9 Jan 2006 16:35:33 -0000 1.121.2.3 @@ -2485,7 +2485,7 @@ # CONFIG_TUX_DEBUG is not set CONFIG_CPUSETS=y -CONFIG_SECCOMP=y +# CONFIG_SECCOMP is not set # CONFIG_PRINTK_TIME is not set CONFIG_DETECT_SOFTLOCKUP=y From fedora-cvs-commits at redhat.com Mon Jan 9 16:40:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 11:40:13 -0500 Subject: rpms/libdaemon/devel libdaemon.spec,1.4,1.5 Message-ID: <200601091640.k09GeD56017210@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/libdaemon/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17078 Modified Files: libdaemon.spec Log Message: rebuild for new gcc / glibc Index: libdaemon.spec =================================================================== RCS file: /cvs/dist/rpms/libdaemon/devel/libdaemon.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libdaemon.spec 17 Dec 2005 01:57:38 -0000 1.4 +++ libdaemon.spec 9 Jan 2006 16:40:09 -0000 1.5 @@ -1,6 +1,6 @@ Name: libdaemon Version: 0.10 -Release: 1.1 +Release: 2 Summary: library for writing UNIX daemons Group: System Environment/Libraries @@ -68,6 +68,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jan 06 2006 Jason Vas Dias - 0.10-2 +- rebuild for new gcc / glibc + * Fri Dec 16 2005 Jesse Keating - 0.10-1.1 - rebuild on new gcc From fedora-cvs-commits at redhat.com Mon Jan 9 16:42:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 11:42:03 -0500 Subject: rpms/dbus/devel dbus.spec,1.62,1.63 Message-ID: <200601091642.k09Gg32k018086@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/dbus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18010 Modified Files: dbus.spec Log Message: * Mon Jan 9 2006 Alexander Larsson - 0.60-2 - Add dbus-sharp sub-package Index: dbus.spec =================================================================== RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- dbus.spec 10 Dec 2005 09:11:20 -0000 1.62 +++ dbus.spec 9 Jan 2006 16:42:00 -0000 1.63 @@ -13,10 +13,16 @@ %define dbus_user_uid 81 +# Mono only availible on these: (s390x disabled for now) +%define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x + +# Just exclusivearch for now: +ExclusiveArch: %mono_archs + Summary: D-BUS message bus Name: dbus Version: 0.60 -Release: 1.1 +Release: 2 URL: http://www.freedesktop.org/software/dbus/ Source0: %{name}-%{version}.tar.gz License: AFL/GPL @@ -34,6 +40,10 @@ BuildRequires: libselinux-devel >= %{libselinux_version} BuildRequires: audit-libs-devel >= 0.9 +%ifarch %mono_archs +BuildRequires: mono-devel gtk-sharp +%endif + Requires: libselinux >= %{libselinux_version} Conflicts: cups < 1:1.1.20-4 @@ -110,6 +120,16 @@ D-BUS python bindings for use with python programs. +%ifarch %mono_archs +%package sharp +Summary: mono bindings for D-BUS +Group: Development/Libraries +Requires: %name = %{version}-%{release} + +%description sharp +D-BUS mono bindings for use with mono programs. +%endif + %prep %setup -q @@ -119,8 +139,11 @@ autoreconf -f -i %build - -COMMON_ARGS="--enable-glib=yes --enable-libaudit --enable-selinux=yes --disable-gtk --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid}" +%ifarch %mono_archs +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} +MONO_ARGS="--enable-mono" +%endif +COMMON_ARGS="--enable-glib=yes --enable-libaudit --enable-selinux=yes --disable-gtk --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid} $MONO_ARGS" if test -d %{_libdir}/qt-%{qt_basever} ; then export QTDIR=%{_libdir}/qt-%{qt_basever} @@ -159,6 +182,13 @@ %install rm -rf %{buildroot} +export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} + +# dbus installs mono files in libdir, not in prefix/lib, fixup: +perl -pi -e 's,/gacdir \$\(libdir\),/gacdir /usr/lib,g' mono/Makefile +perl -pi -e "s,/root \\\$\\(DESTDIR\\)\\\$\(libdir\\),/root $RPM_BUILD_ROOT/usr/lib,g" mono/Makefile +perl -pi -e "s,/usr/lib64,/usr/lib,g" dbus-sharp.pc +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/mono %makeinstall @@ -215,7 +245,8 @@ %{_libdir}/lib*.a %{_libdir}/lib*.so %{_libdir}/dbus-1.0/include -%{_libdir}/pkgconfig/* +%{_libdir}/pkgconfig/dbus-1.pc +%{_libdir}/pkgconfig/dbus-glib-1.pc %{_includedir}/* %files glib @@ -251,7 +282,18 @@ %{_libdir}/python*/site-packages/dbus.pth %{_libdir}/python*/site-packages/dbus/*.py* +%ifarch %mono_archs +%files sharp +%defattr(-,root,root) +%{_prefix}/lib/mono/dbus-sharp +%{_prefix}/lib/mono/gac/dbus-sharp +%{_libdir}/pkgconfig/dbus-sharp.pc +%endif + %changelog +* Mon Jan 9 2006 Alexander Larsson - 0.60-2 +- Add dbus-sharp sub-package + * Fri Dec 09 2005 Jesse Keating - 0.60-1.1 - rebuilt From fedora-cvs-commits at redhat.com Mon Jan 9 16:42:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 11:42:22 -0500 Subject: rpms/kernel/FC-4/configs config-generic,1.47,1.48 Message-ID: <200601091642.k09GgMf5018254@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv18183/configs Modified Files: config-generic Log Message: disable seccomp Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- config-generic 6 Jan 2006 06:18:31 -0000 1.47 +++ config-generic 9 Jan 2006 16:42:20 -0000 1.48 @@ -2607,7 +2607,7 @@ # CONFIG_TUX_DEBUG is not set CONFIG_CPUSETS=y -CONFIG_SECCOMP=y +# CONFIG_SECCOMP is not set # CONFIG_PRINTK_TIME is not set # CONFIG_DETECT_SOFTLOCKUP is not set From fedora-cvs-commits at redhat.com Mon Jan 9 16:44:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 11:44:40 -0500 Subject: rpms/kernel/devel linux-2.6-kill-blk_attempt_merge.patch, 1.1.2.2, 1.1.2.3 Message-ID: <200601091644.k09GieTK019328@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19277 Modified Files: Tag: private-fc5-test2-branch linux-2.6-kill-blk_attempt_merge.patch Log Message: missing hunk linux-2.6-kill-blk_attempt_merge.patch: block/ll_rw_blk.c | 24 ------------------------ drivers/ide/ide-cd.c | 10 ---------- include/linux/blkdev.h | 1 - 3 files changed, 35 deletions(-) Index: linux-2.6-kill-blk_attempt_merge.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-kill-blk_attempt_merge.patch,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- linux-2.6-kill-blk_attempt_merge.patch 9 Jan 2006 16:32:46 -0000 1.1.2.2 +++ linux-2.6-kill-blk_attempt_merge.patch 9 Jan 2006 16:44:36 -0000 1.1.2.3 @@ -100,3 +100,20 @@ extern struct request *blk_get_request(request_queue_t *, int, gfp_t); extern void blk_insert_request(request_queue_t *, struct request *, int, void *); extern void blk_requeue_request(request_queue_t *, struct request *); +--- linux-2.6.15/drivers/ide/ide-cd.c~ 2006-01-09 11:44:09.000000000 -0500 ++++ linux-2.6.15/drivers/ide/ide-cd.c 2006-01-09 11:44:18.000000000 -0500 +@@ -1878,14 +1878,6 @@ static ide_startstop_t cdrom_start_write + return ide_stopped; + } + +- /* +- * for dvd-ram and such media, it's a really big deal to get +- * big writes all the time. so scour the queue and attempt to +- * remerge requests, often the plugging will not have had time +- * to do this properly +- */ +- blk_attempt_remerge(drive->queue, rq); +- + info->nsectors_buffered = 0; + + /* use dma, if possible. we don't need to check more, since we From fedora-cvs-commits at redhat.com Mon Jan 9 16:54:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 11:54:36 -0500 Subject: rpms/xorg-x11-xdm/devel xdm-1.0.1-redhat-xdm-config-fix.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.4, 1.5 xorg-x11-xdm.spec, 1.15, 1.16 xdm-0.99.3-redhat-xdm-config-fix.patch, 1.2, NONE xdm-0.99.3-xdm-app-defaults-in-datadir.patch, 1.1, NONE xdm-0.99.3-xdm-scripts-in-configdir.patch, 1.1, NONE Message-ID: <200601091654.k09Gsav9002825@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2783/devel Modified Files: .cvsignore sources xorg-x11-xdm.spec Added Files: xdm-1.0.1-redhat-xdm-config-fix.patch Removed Files: xdm-0.99.3-redhat-xdm-config-fix.patch xdm-0.99.3-xdm-app-defaults-in-datadir.patch xdm-0.99.3-xdm-scripts-in-configdir.patch Log Message: auto-import xorg-x11-xdm-1.0.1-1 on branch devel from xorg-x11-xdm-1.0.1-1.src.rpm xdm-1.0.1-redhat-xdm-config-fix.patch: xdm-config.cpp | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xdm-1.0.1-redhat-xdm-config-fix.patch --- --- config/xdm-config.cpp.redhat-fix-xdm-config 2006-01-09 11:41:26.000000000 -0500 +++ config/xdm-config.cpp 2006-01-09 11:42:30.000000000 -0500 @@ -18,7 +18,7 @@ DisplayManager.servers: XDMCONFIGDIR/Xservers DisplayManager.accessFile: XDMCONFIGDIR/Xaccess DisplayManager*resources: XDMCONFIGDIR/Xresources -DisplayManager.willing: SU nobody -c XDMSCRIPTDIR/Xwilling +DisplayManager.willing: SU nobody -s /bin/bash XDMSCRIPTDIR/Xwilling ! All displays should use authorization, but we cannot be sure ! X terminals may not be configured that way, so they will require ! individual resource settings. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Nov 2005 07:30:56 -0000 1.5 +++ .cvsignore 9 Jan 2006 16:54:34 -0000 1.6 @@ -1,2 +1 @@ -*.bz2 -clog +xdm-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Nov 2005 00:15:11 -0000 1.4 +++ sources 9 Jan 2006 16:54:34 -0000 1.5 @@ -1 +1 @@ -99d9dbbbcc16726050ce09fd62b5c1e6 xdm-0.99.3.tar.bz2 +883c66b4ce39754b8111fa1e8bc0933c xdm-1.0.1.tar.bz2 Index: xorg-x11-xdm.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xdm/devel/xorg-x11-xdm.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xorg-x11-xdm.spec 24 Nov 2005 16:40:34 -0000 1.15 +++ xorg-x11-xdm.spec 9 Jan 2006 16:54:34 -0000 1.16 @@ -17,14 +17,14 @@ Name: xorg-x11-%{pkgname} # NOTE: Remove Epoch line if/when the package ever gets renamed. Epoch: 1 -Version: 0.99.3 -Release: 6 +Version: 1.0.1 +Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{pkgname}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 Source1: Xsetup_0 Source10: xdm.init Source11: xdm.pamd @@ -37,11 +37,9 @@ Source12: xdm-pre-audit-system.pamd Source13: xserver.pamd -Patch0: xdm-0.99.3-xdm-app-defaults-in-datadir.patch -Patch1: xdm-0.99.3-xdm-scripts-in-configdir.patch # NOTE: Change xdm-config to invoke Xwilling with "-s /bin/bash" instead # of "-c" to fix bug (#86505) -Patch10: xdm-0.99.3-redhat-xdm-config-fix.patch +Patch10: xdm-1.0.1-redhat-xdm-config-fix.patch BuildRequires: pkgconfig BuildRequires: libXaw-devel @@ -93,8 +91,6 @@ %prep %setup -q -n %{pkgname}-%{version} -%patch0 -p0 -b .xdm-app-defaults-in-datadir -%patch1 -p0 -b .xdm-scripts-in-configdir %patch10 -p0 -b .redhat-xdm-config-fix %build @@ -119,6 +115,7 @@ --disable-static \ --disable-xprint \ --with-xdmconfigdir=%{_sysconfdir}/X11/xdm \ + --with-xdmscriptdir=%{_sysconfdir}/X11/xdm \ --with-pixmapdir=%{_datadir}/xdm/pixmaps make %{?_smp_mflags} @@ -217,6 +214,11 @@ %{_mandir}/man1x/*.1x* %changelog +* Mon Jan 9 2006 Mike A. Harris 1:1.0.1-1 +- Updated xdm to version 1.0.1 from X11R7. +- Added --with-xdmscriptdir option to ./configure to put scripts in /etc +- Updated xdm-1.0.1-redhat-xdm-config-fix.patch to work with xdm 1.0.1 + * Thu Nov 24 2005 Mike A. Harris 1:0.99.3-6 - Updated xdm.pamd to work with recent pam changes, and bumped the minimum pam requirement up to 0.78-0 for FC5 builds. (#170661) --- xdm-0.99.3-redhat-xdm-config-fix.patch DELETED --- --- xdm-0.99.3-xdm-app-defaults-in-datadir.patch DELETED --- --- xdm-0.99.3-xdm-scripts-in-configdir.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 16:59:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 11:59:17 -0500 Subject: rpms/hal/devel .cvsignore, 1.34, 1.35 hal.spec, 1.72, 1.73 sources, 1.35, 1.36 Message-ID: <200601091659.k09GxHdV005058@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4961 Modified Files: .cvsignore hal.spec sources Log Message: - Update to new CVS snapshot Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 5 Jan 2006 19:45:23 -0000 1.34 +++ .cvsignore 9 Jan 2006 16:59:13 -0000 1.35 @@ -22,3 +22,4 @@ hal-0.5.4.cvs20051111.tar.gz hal-0.5.5.1.tar.gz hal-0.5.5.1.cvs20060105.tar.gz +hal-0.5.5.1.cvs20060109.tar.gz Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- hal.spec 5 Jan 2006 21:45:33 -0000 1.72 +++ hal.spec 9 Jan 2006 16:59:13 -0000 1.73 @@ -17,8 +17,8 @@ Summary: Hardware Abstraction Layer Name: hal -Version: 0.5.5.1.cvs20060105 -Release: 2 +Version: 0.5.5.1.cvs20060109 +Release: 1 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz Patch0: hal-0.5.4-match-on-capabilities.patch @@ -169,7 +169,10 @@ %{_bindir}/hal-device-manager %changelog -* Thu Jan 05 2006 John (J5) Palmieri - 0.5.5.1.cvs20060105-1 +* Mon Jan 09 2006 John (J5) Palmieri - 0.5.5.1.cvs20060109-1 +- Update to a new CVS snapshot + +* Thu Jan 05 2006 John (J5) Palmieri - 0.5.5.1.cvs20060105-2 - readd the hotplug script * Thu Jan 05 2006 John (J5) Palmieri - 0.5.5.1.cvs20060105-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 5 Jan 2006 19:45:23 -0000 1.35 +++ sources 9 Jan 2006 16:59:13 -0000 1.36 @@ -1 +1 @@ -0e4564f540d6ecb9fd644b7c4c2c9b42 hal-0.5.5.1.cvs20060105.tar.gz +a65bc4e3304831765a2eb8854086d465 hal-0.5.5.1.cvs20060109.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 9 17:01:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 12:01:42 -0500 Subject: rpms/ypserv/devel ypserv-2.13-zero-buffer.patch, NONE, 1.1 ypserv.spec, 1.24, 1.25 Message-ID: <200601091701.k09H1gor005603@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/ypserv/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5554 Modified Files: ypserv.spec Added Files: ypserv-2.13-zero-buffer.patch Log Message: Synced w/ FC-4 ypserv-2.13-zero-buffer.patch: ypxfr.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE ypserv-2.13-zero-buffer.patch --- --- ypserv-2.13/ypxfr/ypxfr.c.zero-buffer 2005-06-23 16:55:09.000000000 -0500 +++ ypserv-2.13/ypxfr/ypxfr.c 2005-06-23 16:55:25.000000000 -0500 @@ -361,7 +361,6 @@ ypxfr (char *map, char *source_host, cha struct hostent *h; int sock, result; - memset(&resp_val, '\0', sizeof(resp_val)); /* Name of the map file */ if (strlen (path_ypdb) + strlen (target_domain) + strlen (map) + 3 < MAXPATHLEN) sprintf (dbName_orig, "%s/%s/%s", path_ypdb, target_domain, map); @@ -420,6 +419,7 @@ ypxfr (char *map, char *source_host, cha server name for the map on the master host. */ req_nokey.domain = source_domain; req_nokey.map = map; + memset (&resp_master, '\0', sizeof (ypresp_master)); if (ypproc_master_2 (&req_nokey, &resp_master, clnt_udp) != RPC_SUCCESS) { log_msg (clnt_sperror (clnt_udp, "ypproc_master_2")); @@ -456,6 +456,7 @@ ypxfr (char *map, char *source_host, cha for the map on the master host. */ req_nokey.domain = source_domain; req_nokey.map = map; + memset (&resp_order, '\0', sizeof (ypresp_order)); if (ypproc_order_2 (&req_nokey, &resp_order, clnt_udp) != RPC_SUCCESS) { log_msg (clnt_sperror (clnt_udp, "ypproc_order_2")); Index: ypserv.spec =================================================================== RCS file: /cvs/dist/rpms/ypserv/devel/ypserv.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- ypserv.spec 4 Jan 2006 18:16:41 -0000 1.24 +++ ypserv.spec 9 Jan 2006 17:01:39 -0000 1.25 @@ -4,7 +4,7 @@ Url: http://www.linux-nis.org/nis/ypserv/index.html Name: ypserv Version: 2.13 -Release: 6.2 +Release: 8 License: GPL Group: System Environment/Daemons Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2 @@ -21,6 +21,7 @@ Patch5: ypserv-2.13-pie.patch Patch6: ypserv-2.13-yplib-memleak.patch Patch7: ypserv-2.13-ypxfr-zeroresp.patch +Patch8: ypserv-2.13-zero-buffer.patch Obsoletes: yppasswd BuildRequires: gdbm-devel Buildroot: %{_tmppath}/%{name}-root @@ -51,6 +52,7 @@ %patch5 -p1 -b .pie %patch6 -p1 -b .memleak %patch7 -p1 -b .respzero +%patch8 -p1 -b .zero-buffer %build cp etc/README etc/README.etc @@ -136,6 +138,9 @@ %{_includedir}/*/* %changelog +* Mon Jan 9 2006 Chris Feist - 2.13-8 +- Fix crash with ypxfr caused by failing to zero out data (bz #161217) + * Wed Jan 4 2006 Jesse Keating - 2.13-6.2 - rebuilt for new gcc From fedora-cvs-commits at redhat.com Mon Jan 9 17:06:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 12:06:50 -0500 Subject: rpms/ypserv/devel ypserv.spec,1.25,1.26 Message-ID: <200601091706.k09H6oOg006202@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/ypserv/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6163 Modified Files: ypserv.spec Log Message: Bumped Rev. Index: ypserv.spec =================================================================== RCS file: /cvs/dist/rpms/ypserv/devel/ypserv.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ypserv.spec 9 Jan 2006 17:01:39 -0000 1.25 +++ ypserv.spec 9 Jan 2006 17:06:47 -0000 1.26 @@ -4,7 +4,7 @@ Url: http://www.linux-nis.org/nis/ypserv/index.html Name: ypserv Version: 2.13 -Release: 8 +Release: 10 License: GPL Group: System Environment/Daemons Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2 @@ -138,7 +138,7 @@ %{_includedir}/*/* %changelog -* Mon Jan 9 2006 Chris Feist - 2.13-8 +* Mon Jan 9 2006 Chris Feist - 2.13-10 - Fix crash with ypxfr caused by failing to zero out data (bz #161217) * Wed Jan 4 2006 Jesse Keating - 2.13-6.2 From fedora-cvs-commits at redhat.com Mon Jan 9 17:07:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 12:07:19 -0500 Subject: rpms/ant/devel ant.spec,1.66,1.67 Message-ID: <200601091707.k09H7Ja0006558@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/ant/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6513 Modified Files: ant.spec Log Message: bump for gcj again Index: ant.spec =================================================================== RCS file: /cvs/dist/rpms/ant/devel/ant.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- ant.spec 21 Dec 2005 21:37:06 -0000 1.66 +++ ant.spec 9 Jan 2006 17:07:15 -0000 1.67 @@ -5,7 +5,7 @@ Name: ant Version: 1.6.5 -Release: %{jpprelease}_2fc +Release: %{jpprelease}_3fc Epoch: 0 Summary: Ant build tool for java Summary(it): Tool per la compilazione di programmi java @@ -749,6 +749,9 @@ # ----------------------------------------------------------------------------- %changelog +* Mon Jan 9 2006 Jesse Keating - 0:1.6.5-1jpp_3fc +- bump again for another gcj fix + * Wed Dec 21 2005 Jesse Keating - 0:1.6.5-1jpp_2fc - rebuilt again From fedora-cvs-commits at redhat.com Mon Jan 9 17:19:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 12:19:14 -0500 Subject: rpms/kernel/devel linux-2.6-audit-git.patch, NONE, 1.1.4.1 kernel-2.6.spec, 1.1826.2.8, 1.1826.2.8.2.1 Message-ID: <200601091719.k09HJEFn023325@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23279 Modified Files: Tag: private-fc5-test2-audit-branch kernel-2.6.spec Added Files: Tag: private-fc5-test2-audit-branch linux-2.6-audit-git.patch Log Message: lspp.5 linux-2.6-audit-git.patch: arch/ia64/kernel/ptrace.c | 10 fs/namei.c | 14 fs/open.c | 8 fs/xattr.c | 11 include/linux/audit.h | 98 ++++- include/linux/fsnotify.h | 14 include/linux/security.h | 33 + ipc/msg.c | 5 ipc/sem.c | 5 ipc/shm.c | 4 ipc/util.c | 2 kernel/Makefile | 2 kernel/audit.c | 142 +++++-- kernel/audit.h | 70 +++ kernel/auditfilter.c | 375 +++++++++++++++++++ kernel/auditsc.c | 786 +++++++++++++++++++++-------------------- security/dummy.c | 14 security/selinux/hooks.c | 98 ++--- security/selinux/nlmsgtab.c | 6 security/selinux/selinuxfs.c | 11 security/selinux/ss/services.c | 15 21 files changed, 1204 insertions(+), 519 deletions(-) --- NEW FILE linux-2.6-audit-git.patch --- diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index 4b19d04..49fd3f6 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c @@ -1663,8 +1663,14 @@ syscall_trace_leave (long arg0, long arg long arg4, long arg5, long arg6, long arg7, struct pt_regs regs) { - if (unlikely(current->audit_context)) - audit_syscall_exit(current, AUDITSC_RESULT(regs.r10), regs.r8); + if (unlikely(current->audit_context)) { + int success = AUDITSC_RESULT(regs.r10); + long result = regs.r8; + + if (success != AUDITSC_SUCCESS) + result = -result; + audit_syscall_exit(current, success, result); + } if (test_thread_flag(TIF_SYSCALL_TRACE) && (current->ptrace & PT_PTRACED)) diff --git a/fs/namei.c b/fs/namei.c index 6dbbd42..55798c3 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1090,8 +1090,7 @@ int fastcall path_lookup(const char *nam current->total_link_count = 0; retval = link_path_walk(name, nd); out: - if (unlikely(current->audit_context - && nd && nd->dentry && nd->dentry->d_inode)) + if (nd && nd->dentry && nd->dentry->d_inode) audit_inode(name, nd->dentry->d_inode, flags); return retval; } @@ -1301,6 +1300,7 @@ static inline int may_delete(struct inod return -ENOENT; BUG_ON(victim->d_parent->d_inode != dir); + audit_inode_child(victim->d_name.name, victim->d_inode, dir->i_ino); error = permission(dir,MAY_WRITE | MAY_EXEC, NULL); if (error) @@ -1420,7 +1420,7 @@ int vfs_create(struct inode *dir, struct DQUOT_INIT(dir); error = dir->i_op->create(dir, dentry, mode, nd); if (!error) - fsnotify_create(dir, dentry->d_name.name); + fsnotify_create(dir, dentry); return error; } @@ -1739,7 +1739,7 @@ int vfs_mknod(struct inode *dir, struct DQUOT_INIT(dir); error = dir->i_op->mknod(dir, dentry, mode, dev); if (!error) - fsnotify_create(dir, dentry->d_name.name); + fsnotify_create(dir, dentry); return error; } @@ -1810,7 +1810,7 @@ int vfs_mkdir(struct inode *dir, struct DQUOT_INIT(dir); error = dir->i_op->mkdir(dir, dentry, mode); if (!error) - fsnotify_mkdir(dir, dentry->d_name.name); + fsnotify_mkdir(dir, dentry); return error; } @@ -2047,7 +2047,7 @@ int vfs_symlink(struct inode *dir, struc DQUOT_INIT(dir); error = dir->i_op->symlink(dir, dentry, oldname); if (!error) - fsnotify_create(dir, dentry->d_name.name); + fsnotify_create(dir, dentry); return error; } @@ -2118,7 +2118,7 @@ int vfs_link(struct dentry *old_dentry, error = dir->i_op->link(old_dentry, dir, new_dentry); up(&old_dentry->d_inode->i_sem); if (!error) - fsnotify_create(dir, new_dentry->d_name.name); + fsnotify_create(dir, new_dentry); return error; } diff --git a/fs/open.c b/fs/open.c index f53a5b9..3231a67 100644 --- a/fs/open.c +++ b/fs/open.c @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -613,6 +614,8 @@ asmlinkage long sys_fchmod(unsigned int dentry = file->f_dentry; inode = dentry->d_inode; + audit_inode(NULL, inode, 0); + err = -EROFS; if (IS_RDONLY(inode)) goto out_putf; @@ -736,7 +739,10 @@ asmlinkage long sys_fchown(unsigned int file = fget(fd); if (file) { - error = chown_common(file->f_dentry, user, group); + struct dentry * dentry; + dentry = file->f_dentry; + audit_inode(NULL, dentry->d_inode, 0); + error = chown_common(dentry, user, group); fput(file); } return error; diff --git a/fs/xattr.c b/fs/xattr.c index bcc2156..8f40edf 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -17,6 +17,7 @@ #include #include #include +#include #include /* @@ -113,12 +114,15 @@ sys_fsetxattr(int fd, char __user *name, size_t size, int flags) { struct file *f; + struct dentry *dentry; int error = -EBADF; f = fget(fd); if (!f) return error; - error = setxattr(f->f_dentry, name, value, size, flags); + dentry = f->f_dentry; + audit_inode(NULL, dentry->d_inode, 0); + error = setxattr(dentry, name, value, size, flags); fput(f); return error; } @@ -365,12 +369,15 @@ asmlinkage long sys_fremovexattr(int fd, char __user *name) { struct file *f; + struct dentry *dentry; int error = -EBADF; f = fget(fd); if (!f) return error; - error = removexattr(f->f_dentry, name); + dentry = f->f_dentry; + audit_inode(NULL, dentry->d_inode, 0); + error = removexattr(dentry, name); fput(f); return error; } diff --git a/include/linux/audit.h b/include/linux/audit.h index da3c019..a485639 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -33,11 +33,20 @@ * 1200 - 1299 messages internal to the audit daemon * 1300 - 1399 audit event messages * 1400 - 1499 SE Linux use - * 1500 - 1999 future use - * 2000 is for otherwise unclassified kernel audit messages + * 1500 - 1599 kernel LSPP events + * 1600 - 1699 kernel crypto events + * 1700 - 1999 future kernel use (maybe integrity labels and related events) + * 2000 is for otherwise unclassified kernel audit messages (legacy) + * 2001 - 2099 unused (kernel) + * 2100 - 2199 user space anomaly records + * 2200 - 2299 user space actions taken in response to anomalies + * 2300 - 2399 user space generated LSPP events + * 2400 - 2499 user space crypto events + * 2500 - 2999 future user space (maybe integrity labels and related events) * - * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user - * space. Anything over that is kernel --> user space communication. + * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are + * exclusively user space. 1300-2099 is kernel --> user space + * communication. */ #define AUDIT_GET 1000 /* Get status */ #define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ @@ -54,6 +63,8 @@ #define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages mostly uninteresting to kernel */ #define AUDIT_USER_AVC 1107 /* We filter this differently */ [...2439 lines suppressed...] - rc = -EOPNOTSUPP; - goto out; - } - - rc = security_sid_to_context(isec->sid, &context, &len); - if (rc) - goto out; - - /* Probe for required buffer size */ - if (!buffer || !size) { - rc = len; - goto out_free; - } - if (size < len) { - rc = -ERANGE; - goto out_free; - } + if (strcmp(name, XATTR_SELINUX_SUFFIX)) + return -EOPNOTSUPP; - if (err > 0) { - if ((len == err) && !(memcmp(context, buffer, len))) { - /* Don't need to canonicalize value */ - rc = err; - goto out_free; - } - memset(buffer, 0, size); - } - memcpy(buffer, context, len); - rc = len; -out_free: - kfree(context); -out: - return rc; + return selinux_getsecurity(isec->sid, buffer, size); } static int selinux_inode_setsecurity(struct inode *inode, const char *name, @@ -4054,6 +4052,13 @@ static int selinux_ipc_permission(struct return ipc_has_perm(ipcp, av); } +static int selinux_ipc_getsecurity(struct kern_ipc_perm *ipcp, void *buffer, size_t size) +{ + struct ipc_security_struct *isec = ipcp->security; + + return selinux_getsecurity(isec->sid, buffer, size); +} + /* module stacking operations */ static int selinux_register_security (const char *name, struct security_operations *ops) { @@ -4095,8 +4100,7 @@ static int selinux_getprocattr(struct ta char *name, void *value, size_t size) { struct task_security_struct *tsec; - u32 sid, len; - char *context; + u32 sid; int error; if (current != p) { @@ -4105,9 +4109,6 @@ static int selinux_getprocattr(struct ta return error; } - if (!size) - return -ERANGE; - tsec = p->security; if (!strcmp(name, "current")) @@ -4124,16 +4125,7 @@ static int selinux_getprocattr(struct ta if (!sid) return 0; - error = security_sid_to_context(sid, &context, &len); - if (error) - return error; - if (len > size) { - kfree(context); - return -ERANGE; - } - memcpy(value, context, len); - kfree(context); - return len; + return selinux_getsecurity(sid, value, size); } static int selinux_setprocattr(struct task_struct *p, @@ -4291,6 +4283,7 @@ static struct security_operations selinu .inode_getxattr = selinux_inode_getxattr, .inode_listxattr = selinux_inode_listxattr, .inode_removexattr = selinux_inode_removexattr, + .inode_xattr_getsuffix = selinux_inode_xattr_getsuffix, .inode_getsecurity = selinux_inode_getsecurity, .inode_setsecurity = selinux_inode_setsecurity, .inode_listsecurity = selinux_inode_listsecurity, @@ -4328,6 +4321,7 @@ static struct security_operations selinu .task_to_inode = selinux_task_to_inode, .ipc_permission = selinux_ipc_permission, + .ipc_getsecurity = selinux_ipc_getsecurity, .msg_msg_alloc_security = selinux_msg_msg_alloc_security, .msg_msg_free_security = selinux_msg_msg_free_security, diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c index 69b9329..d7c0e91 100644 --- a/security/selinux/nlmsgtab.c +++ b/security/selinux/nlmsgtab.c @@ -145,8 +145,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16 break; case SECCLASS_NETLINK_AUDIT_SOCKET: - if (nlmsg_type >= AUDIT_FIRST_USER_MSG && - nlmsg_type <= AUDIT_LAST_USER_MSG) { + if ((nlmsg_type >= AUDIT_FIRST_USER_MSG && + nlmsg_type <= AUDIT_LAST_USER_MSG) || + (nlmsg_type >= AUDIT_FIRST_USER_MSG2 && + nlmsg_type <= AUDIT_LAST_USER_MSG2)) { *perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY; } else { err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms, diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 0e1352a..e64923b 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -126,6 +127,10 @@ static ssize_t sel_write_enforce(struct length = task_has_security(current, SECURITY__SETENFORCE); if (length) goto out; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, + "enforcing=%d old_enforcing=%d auid=%u", new_value, + selinux_enforcing, + audit_get_loginuid(current->audit_context)); selinux_enforcing = new_value; if (selinux_enforcing) avc_ss_reset(0); @@ -176,6 +181,9 @@ static ssize_t sel_write_disable(struct length = selinux_disable(); if (length < 0) goto out; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, + "selinux=0 auid=%u", + audit_get_loginuid(current->audit_context)); } length = count; @@ -261,6 +269,9 @@ static ssize_t sel_write_load(struct fil length = ret; else length = count; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD, + "policy loaded auid=%u", + audit_get_loginuid(current->audit_context)); out: up(&sel_sem); vfree(data); diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 44eb4d7..2311255 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -1758,19 +1758,22 @@ int security_set_bools(int len, int *val goto out; } - printk(KERN_INFO "security: committed booleans { "); for (i = 0; i < len; i++) { + if (!!values[i] != policydb.bool_val_to_struct[i]->state) { + audit_log(current->audit_context, GFP_ATOMIC, + AUDIT_MAC_CONFIG_CHANGE, + "bool=%s val=%d old_val=%d auid=%u", + policydb.p_bool_val_to_name[i], + !!values[i], + policydb.bool_val_to_struct[i]->state, + audit_get_loginuid(current->audit_context)); + } if (values[i]) { policydb.bool_val_to_struct[i]->state = 1; } else { policydb.bool_val_to_struct[i]->state = 0; } - if (i != 0) - printk(", "); - printk("%s:%d", policydb.p_bool_val_to_name[i], - policydb.bool_val_to_struct[i]->state); } - printk(" }\n"); for (cur = policydb.cond_list; cur != NULL; cur = cur->next) { rc = evaluate_cond_node(&policydb, cur); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.8 retrieving revision 1.1826.2.8.2.1 diff -u -r1.1826.2.8 -r1.1826.2.8.2.1 --- kernel-2.6.spec 9 Jan 2006 16:23:52 -0000 1.1826.2.8 +++ kernel-2.6.spec 9 Jan 2006 17:19:10 -0000 1.1826.2.8.2.1 @@ -20,7 +20,7 @@ %define sublevel 15 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) +%define rhbsys .lspp.5 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -403,6 +403,9 @@ Patch10003: linux-2.6-gcc41.patch Patch10004: linux-2.6-compile-fixes.patch + +Patch20000: linux-2.6-audit-git.patch + # END OF PATCH DEFINITIONS BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -939,6 +942,7 @@ %patch10003 -p1 #%patch10004 -p1 +%patch20000 -p1 # END OF PATCH APPLICATIONS From fedora-cvs-commits at redhat.com Mon Jan 9 17:43:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 12:43:00 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.80,1.81 Message-ID: <200601091743.k09Hh0W6019760@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19734 Modified Files: gnome-vfs2.spec Log Message: - Add dependency on gnome-mount - Add configure options for gnome-mount Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- gnome-vfs2.spec 15 Dec 2005 13:57:41 -0000 1.80 +++ gnome-vfs2.spec 9 Jan 2006 17:42:58 -0000 1.81 @@ -9,7 +9,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.13.3 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -18,6 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: gnome-mime-data >= %{gnome_mime_data_version} Requires: shared-mime-info +Requires: gnome-mount BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: GConf2-devel >= %{gconf2_version} BuildRequires: gnome-mime-data >= %{gnome_mime_data_version} @@ -103,7 +104,7 @@ #needed for patch 102 (kerberos fix) autoconf -%configure --enable-gtk-doc --with-gtk=no --enable-hal +%configure --enable-gtk-doc --with-gtk=no --enable-hal --with-hal-mount=/usr/bin/gnome-mount --with-hal-umount=/usr/bin/gnome-umount --with-hal-eject=/usr/bin/gnome-eject export tagname=CC make LIBTOOL=/usr/bin/libtool @@ -172,6 +173,10 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Mon Jan 09 2006 John (J5) Palmieri 2.13.3-2 +- Add dependency on gnome-mount +- Add configure options for gnome-mount + * Thu Dec 15 2005 Matthias Clasen 2.13.3-1 - Update to 2.13.3 - Drop upstreamed patches From fedora-cvs-commits at redhat.com Mon Jan 9 17:59:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 12:59:40 -0500 Subject: rpms/postgresql/devel pgtcl-quote.patch, NONE, 1.1 postgresql.spec, 1.62, 1.63 Message-ID: <200601091759.k09Hxe9V009230@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/postgresql/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9194 Modified Files: postgresql.spec Added Files: pgtcl-quote.patch Log Message: Repair extraneous quote in pgtcl configure script ... odd that bash didn't use to spit up on this. pgtcl-quote.patch: aclocal.m4 | 2 +- tclconfig/tcl.m4 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE pgtcl-quote.patch --- Remove extraneous quotes from pgtcl configure script. bash 3.1 fails on this, though curiously it seems not to bother prior versions. Note we don't bother to patch the configure file itself, since we'll regenerate it during the build. Upstream bug report for this filed as http://gborg.postgresql.org/project/pgtclng/bugs/bugupdate.php?1500 diff -Naur Pgtcl.orig/aclocal.m4 Pgtcl/aclocal.m4 --- Pgtcl.orig/aclocal.m4 2004-02-15 15:15:37.000000000 -0500 +++ Pgtcl/aclocal.m4 2006-01-09 12:21:32.000000000 -0500 @@ -145,7 +145,7 @@ # results, and the version is kept in special file). if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then - system=MP-RAS-`awk '{print $3}' /etc/.relid'` + system=MP-RAS-`awk '{print $3}' /etc/.relid` fi if test "`uname -s`" = "AIX" ; then system=AIX-`uname -v`.`uname -r` diff -Naur Pgtcl.orig/tclconfig/tcl.m4 Pgtcl/tclconfig/tcl.m4 --- Pgtcl.orig/tclconfig/tcl.m4 2004-11-11 21:55:50.000000000 -0500 +++ Pgtcl/tclconfig/tcl.m4 2006-01-09 12:22:08.000000000 -0500 @@ -752,7 +752,7 @@ # results, and the version is kept in special file). if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then - system=MP-RAS-`awk '{print $3}' /etc/.relid'` + system=MP-RAS-`awk '{print $3}' /etc/.relid` fi if test "`uname -s`" = "AIX" ; then system=AIX-`uname -v`.`uname -r` @@ -2012,7 +2012,7 @@ # results, and the version is kept in special file). if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then - system=MP-RAS-`awk '{print $3}' /etc/.relid'` + system=MP-RAS-`awk '{print $3}' /etc/.relid` fi if test "`uname -s`" = "AIX" ; then system=AIX-`uname -v`.`uname -r` Index: postgresql.spec =================================================================== RCS file: /cvs/dist/rpms/postgresql/devel/postgresql.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- postgresql.spec 9 Jan 2006 01:14:36 -0000 1.62 +++ postgresql.spec 9 Jan 2006 17:59:35 -0000 1.63 @@ -109,6 +109,7 @@ Patch4: postgresql-test.patch Patch5: pgtcl-no-rpath.patch Patch6: postgresql-perl-rpath.patch +Patch7: pgtcl-quote.patch Buildrequires: perl glibc-devel bison flex autoconf Prereq: /sbin/ldconfig initscripts @@ -329,6 +330,7 @@ %patch4 -p1 # patch5 is applied later %patch6 -p1 +# patch7 is applied later #call autoconf 2.53 or greater %aconfver @@ -360,6 +362,7 @@ mv $PGTCLDOCDIR Pgtcl-docs %patch5 -p0 +%patch7 -p0 pushd Pgtcl %aconfver popd @@ -816,8 +819,10 @@ %endif %changelog -* Sun Jan 8 2006 Tom Lane 8.1.2-1 +* Mon Jan 9 2006 Tom Lane 8.1.2-1 - Update to PostgreSQL 8.1.2 +- Repair extraneous quote in pgtcl configure script ... odd that bash + didn't use to spit up on this. * Thu Dec 15 2005 Tom Lane 8.1.1-3 - fix pg_config.h for 64-bit and ppc platforms From fedora-cvs-commits at redhat.com Mon Jan 9 18:13:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 13:13:21 -0500 Subject: rpms/notify-daemon/devel notify-daemon.spec,1.3,1.4 Message-ID: <200601091813.k09IDLSb013262@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/notify-daemon/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13234 Modified Files: notify-daemon.spec Log Message: * Mon Jan 9 2006 Christopher Aillon - 0.3.1-3 - Fix positioning of the notification bubble to not draw off-screen Index: notify-daemon.spec =================================================================== RCS file: /cvs/dist/rpms/notify-daemon/devel/notify-daemon.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- notify-daemon.spec 15 Dec 2005 00:35:43 -0000 1.3 +++ notify-daemon.spec 9 Jan 2006 18:13:19 -0000 1.4 @@ -4,19 +4,20 @@ Summary: Notification Daemon Name: notify-daemon Version: 0.3.1 -Release: 2 +Release: 3 URL: http://www.galago-project.org/specs/notification/ -Source0: %{name}-%{version}.tar.gz License: GPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: dbus-devel >= %{dbus_version} - Requires: glib2 >= %{glib2_version} Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_version} +Source0: %{name}-%{version}.tar.gz +Patch0: notify-daemon-0.3.1-position.patch + %description notify-daemon is the server implementation of the freedesktop.org desktop @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p0 %build @@ -50,6 +52,9 @@ %{_datadir}/dbus-1/services/notify-daemon.service %changelog +* Mon Jan 9 2006 Christopher Aillon - 0.3.1-3 +- Fix positioning of the notification bubble to not draw off-screen + * Wed Dec 14 2005 John (J5) Palmieri - 0.3.1-2 - Actuall release of 0.3.1 From fedora-cvs-commits at redhat.com Mon Jan 9 18:14:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 13:14:59 -0500 Subject: rpms/notify-daemon/devel notify-daemon-0.3.1-position.patch, NONE, 1.1 Message-ID: <200601091814.k09IExwV014083@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/notify-daemon/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14052 Added Files: notify-daemon-0.3.1-position.patch Log Message: * Mon Jan 9 2006 Christopher Aillon - 0.3.1-3 - Fix positioning of the notification bubble to not draw off-screen notify-daemon-0.3.1-position.patch: ChangeLog | 20 src/eggnotificationbubblewidget.c | 810 ++++++++++++++++---------------------- src/eggnotificationbubblewidget.h | 19 3 files changed, 384 insertions(+), 465 deletions(-) --- NEW FILE notify-daemon-0.3.1-position.patch --- Index: ChangeLog =================================================================== --- ChangeLog (revision 2389) +++ ChangeLog (revision 2390) @@ -1,3 +1,23 @@ +2006-01-03 John (J5) Palmieri + + * src/eggnotificationbubblewidget.h (struct _DrawingPipeline): + Added intermediate pipeline for graphics rendering + + * src/eggnotificationbubblewidget.c + (_stencil_bubble*): These methods now take care of prerendering + the graphics to the pipeline and calculating the x, y offset of + the arrow + (struct DrawingInstruction): intermediate drawing primitive + (_drawing_instruction_*): New internal methods for manipulating + drawing instructions + (_edge_line_to, _close_path): internal convinience methods for + drawing skewed lines attached by rounded corners (i.e. you can + draw a box and specify the radius of each corner) + (egg_notification_bubble_widget_set_pos): prerender the bubble here + to get arrow offsets + (draw_bubble_widget): Take out all calculations from this expose + handler and simply render the precalculated pipeline + 2005-12-14 John (J5) Palmieri * Release 0.3.1 Index: src/eggnotificationbubblewidget.h =================================================================== --- src/eggnotificationbubblewidget.h (revision 2389) +++ src/eggnotificationbubblewidget.h (revision 2390) @@ -35,6 +35,21 @@ typedef struct _EggNotificationBubbleWidgetClass EggNotificationBubbleWidgetClass; typedef struct _EggNotificationBubbleWidgetData EggNotificationBubbleWidgetData; +struct _DrawingPipeline +{ + gint start_x; + gint start_y; + gint start_corner_radius; + + gint last_x; + gint last_y; + gint last_corner_radius; + + gboolean is_clear; + + GList *pipeline; +}; + struct _EggNotificationBubbleWidget { GtkWindow parent_instance; @@ -51,6 +66,7 @@ PangoLayout *body_layout; gint x, y; + gint offset_x, offset_y; gboolean can_composite; gboolean draw_arrow; @@ -59,6 +75,9 @@ GdkColor bg_start_gradient; GdkColor bg_end_gradient; GdkColor border_color; + + /* drawing instructions */ + struct _DrawingPipeline dp; }; struct _EggNotificationBubbleWidgetClass Index: src/eggnotificationbubblewidget.c =================================================================== --- src/eggnotificationbubblewidget.c (revision 2389) +++ src/eggnotificationbubblewidget.c (revision 2390) @@ -26,11 +26,13 @@ #include "eggnotificationbubblewidget.h" #define BORDER_SIZE 30 -#define CURVE_LENGTH 25 +#define BORDER_LINE_WIDTH 2 +#define CURVE_LENGTH 25 #define TRIANGLE_START 45 #define TRIANGLE_WIDTH 60 #define TEXT_WIDTH_THRESHOLD 100 + static void egg_notification_bubble_widget_class_init (EggNotificationBubbleWidgetClass *klass); static void egg_notification_bubble_widget_init (EggNotificationBubbleWidget *bubble_widget); static void egg_notification_bubble_widget_finalize (GObject *object); @@ -53,20 +55,37 @@ static void _populate_window (EggNotificationBubbleWidget *bubble_widget); static void draw_bubble_widget (EggNotificationBubbleWidget *bubble_widget); +static void _stencil_bubble (EggNotificationBubbleWidget *bw); + static GtkWindowClass *parent_class; #define BEVEL_ALPHA_LIGHT 0.2 #define BEVEL_ALPHA_MEDIUM 0.5 #define BEVEL_ALPHA_DARK 0.8 +enum +{ + DRAW_MOVE = 0, + DRAW_LINE = 1, + DRAW_CAP = 2, + DRAW_CLOSE = 3 +}; +typedef struct _DrawingInstruction +{ + gint type; + + gint end_x, end_y; + gint corner_x, corner_y; +} DrawingInstruction; + enum { - ORIENT_TOP = 0, + ORIENT_TOP = 0, ORIENT_BOTTOM = 1, - ORIENT_LEFT = 2, - ORIENT_RIGHT = 3 + ORIENT_LEFT = 2, + ORIENT_RIGHT = 3 }; enum { @@ -148,6 +167,8 @@ egg_notification_bubble_widget_screen_changed (GTK_WIDGET (bubble_widget), NULL); + bubble_widget->dp.is_clear = TRUE; + bubble_widget->dp.pipeline = NULL; bubble_widget->draw_arrow = FALSE; _populate_window (bubble_widget); @@ -247,6 +268,195 @@ } static void +_drawing_instruction_internal_add (GList **pipeline, + guint type, + gint end_x, gint end_y, + gint corner_x, gint corner_y) +{ + DrawingInstruction *di; + + di = g_new0 (DrawingInstruction, 1); + di->type = type; + di->end_x = end_x; + di->end_y = end_y; + di->corner_x = corner_x; + di->corner_y = corner_y; + + *pipeline = g_list_append (*pipeline, di); +} + +static void +_drawing_instruction_move (GList **pipeline, + gint x, gint y) +{ + _drawing_instruction_internal_add (pipeline, DRAW_MOVE, x, y, 0, 0); +} + +static void +_drawing_instruction_line (GList **pipeline, + gint x, gint y) +{ + _drawing_instruction_internal_add (pipeline, DRAW_LINE, x, y, 0, 0); +} + +static void +_drawing_instruction_cap (GList **pipeline, + gint x, gint y, + gint corner_x, gint corner_y) +{ + _drawing_instruction_internal_add (pipeline, DRAW_CAP, x, y, corner_x, corner_y); +} + +static void +_drawing_instruction_close (GList **pipeline) +{ + _drawing_instruction_internal_add (pipeline, DRAW_CLOSE, 0, 0, 0, 0); +} + +/* given a distance from start point x1, y1 + calculate the point dist units away */ +static GdkPoint +_calc_point_on_line (x1, y1, x2, y2, dist) +{ + GdkPoint result; + gint dx, dy; + gdouble d, vx, vy; + + dx = x2 - x1; + dy = y2 - y1; + + d = sqrt (dx * dx + dy * dy); + vx = dx / d; + vy = dy / d; + + result.x = x1 + dist * vx; + result.y = y1 + dist * vy; + + return result; +} + +static void +_edge_line_to (EggNotificationBubbleWidget *bw, + gint x, gint y, + gint corner_radius) +{ + if (bw->dp.is_clear == TRUE) + { + bw->dp.start_x = x; + bw->dp.start_y = y; + bw->dp.start_corner_radius = corner_radius; + bw->dp.is_clear = FALSE; + } + else + { + GdkPoint start_p; + GdkPoint end_p; + + start_p = _calc_point_on_line (bw->dp.last_x, + bw->dp.last_y, + x, + y, + bw->dp.last_corner_radius); + end_p = _calc_point_on_line (x, + y, + bw->dp.last_x, + bw->dp.last_y, + corner_radius); + + if (bw->dp.last_x == bw->dp.start_x && + bw->dp.last_y == bw->dp.start_y) + _drawing_instruction_move (&bw->dp.pipeline, start_p.x, start_p.y); + else + _drawing_instruction_cap (&bw->dp.pipeline, + start_p.x, + start_p.y, + bw->dp.last_x, + bw->dp.last_y); + + _drawing_instruction_line (&bw->dp.pipeline, end_p.x, end_p.y); + + } + + bw->dp.last_x = x; + bw->dp.last_y = y; + bw->dp.last_corner_radius = corner_radius; +} + +static void +_close_path (EggNotificationBubbleWidget *bw) +{ + GdkPoint start_p; + GdkPoint end_p; + DrawingInstruction *di; + + start_p = _calc_point_on_line (bw->dp.last_x, + bw->dp.last_y, + bw->dp.start_x, + bw->dp.start_y, + bw->dp.last_corner_radius); + + end_p = _calc_point_on_line (bw->dp.start_x, + bw->dp.start_y, + bw->dp.last_x, + bw->dp.last_y, + bw->dp.start_corner_radius); + + + _drawing_instruction_cap (&bw->dp.pipeline, + start_p.x, + start_p.y, + bw->dp.last_x, + bw->dp.last_y); + + _drawing_instruction_line (&bw->dp.pipeline, + end_p.x, + end_p.y); + + di = (DrawingInstruction *) bw->dp.pipeline->data; + _drawing_instruction_cap (&bw->dp.pipeline, + di->end_x, + di->end_y, + bw->dp.start_x, + bw->dp.start_y); + + _drawing_instruction_close (&bw->dp.pipeline); + +} + +static void +_drawing_instruction_draw (DrawingInstruction *di, cairo_t *cr) +{ + switch (di->type) + { + case DRAW_MOVE: + cairo_move_to (cr, di->end_x, di->end_y); + break; + case DRAW_LINE: + cairo_line_to (cr, di->end_x, di->end_y); + break; + case DRAW_CAP: + cairo_curve_to (cr, + di->corner_x, di->corner_y, + di->corner_x, di->corner_y, + di->end_x, di->end_y); + break; + case DRAW_CLOSE: + cairo_close_path (cr); + break; + } +} + +static void +_drawing_pipeline_clear (EggNotificationBubbleWidget *bw) +{ + bw->dp.is_clear = TRUE; + + g_list_foreach (bw->dp.pipeline, (GFunc) g_free, NULL); + g_list_free (bw->dp.pipeline); + bw->dp.pipeline = NULL; +} + +static void _populate_window (EggNotificationBubbleWidget *bubble_widget) { g_return_if_fail (EGG_IS_NOTIFICATION_BUBBLE_WIDGET (bubble_widget)); @@ -441,7 +651,11 @@ else _layout_window (bubble_widget, TRIANGLE_RIGHT); - gtk_window_move (GTK_WINDOW (bubble_widget), x, y); + _stencil_bubble (bubble_widget); + + gtk_window_move (GTK_WINDOW (bubble_widget), + x - bubble_widget->offset_x, + y - bubble_widget->offset_y); } static void @@ -530,114 +744,42 @@ return TRUE; } -static GdkPoint -_stencil_bubble_top_right (cairo_t *cr, - GdkRectangle *rect, - int pos_x, int pos_y) +static void +_stencil_bubble_top_right (EggNotificationBubbleWidget *bw, + GdkRectangle *rect) { GdkPoint triangle[3]; - double d, p1x, p2x, p3x, pdx, pvx, p1y, p2y, p3y, pdy, pvy; - triangle[2].x = rect->x + rect->width - TRIANGLE_START; - triangle[2].y = rect->y; - - triangle[0].x = triangle[2].x - TRIANGLE_WIDTH; triangle[0].y = rect->y; + triangle[0].x = rect->x + rect->width - (TRIANGLE_START + TRIANGLE_WIDTH); + triangle[2].x = triangle[0].x + TRIANGLE_WIDTH; + triangle[2].y = rect->y; triangle[1].x = (triangle[2].x - triangle[0].x) / 2 + triangle[0].x; triangle[1].y = rect->y - BORDER_SIZE + 5; -#if 0 - if (triangle[1].x + (BORDER_SIZE - 5) < pos_x) - triangle[1].x = pos_x - (BORDER_SIZE + 5); -#endif - cairo_move_to (cr, triangle[0].x, triangle[0].y); - cairo_line_to (cr, triangle[1].x, triangle[1].y); - cairo_line_to (cr, triangle[2].x, triangle[2].y); + bw->offset_x = triangle[1].x; + bw->offset_y = triangle[1].y; - cairo_line_to (cr, rect->x + rect->width - CURVE_LENGTH, rect->y); - cairo_curve_to (cr, - rect->x + rect->width, - rect->y, - rect->x + rect->width, - rect->y, - rect->x + rect->width, - rect->y + CURVE_LENGTH); + _edge_line_to (bw, triangle[0].x, triangle[0].y, 0); + _edge_line_to (bw, triangle[1].x, triangle[1].y, 0); + _edge_line_to (bw, triangle[2].x, triangle[2].y, 0); - cairo_line_to (cr, rect->x + rect->width, rect->y + rect->height - CURVE_LENGTH); + _edge_line_to (bw, rect->x + rect->width, rect->y, CURVE_LENGTH); + _edge_line_to (bw, rect->x + rect->width, rect->y + rect->height, CURVE_LENGTH); - p1x = rect->x + rect->width; - p2x = rect->x; - p1y = rect->y + rect->height + (BORDER_SIZE - 5); - p2y = rect->y + rect->height; - - pdx = p1x - p2x; - pdy = p1y - p2y; - - d = sqrt (pdx * pdx + - pdy * pdy); + _edge_line_to (bw, rect->x, rect->y + rect->height + BORDER_SIZE - 5, CURVE_LENGTH); - pvx = (pdx / d); - pvy = (pdy / d); - - p3x = p1x - CURVE_LENGTH * pvx; - p3y = p1y - CURVE_LENGTH * pvy; + _edge_line_to (bw, rect->x, rect->y, CURVE_LENGTH); - cairo_curve_to (cr, - p1x, - p1y, - p1x, - p1y, - p3x, - p3y); - - p3x = p2x + CURVE_LENGTH * pvx; - p3y = p2y + CURVE_LENGTH * pvy; - - cairo_line_to (cr, p3x, p3y); - - cairo_curve_to (cr, - p2x, - p2y, - p2x, - p2y, - p2x, - p2y - CURVE_LENGTH); - - cairo_line_to (cr, rect->x, rect->y + CURVE_LENGTH); - p1x = rect->x + CURVE_LENGTH; - if (p1x < triangle[0].x) - { - cairo_curve_to (cr, - rect->x, - rect->y, - rect->x, - rect->y, - p1x, - rect->y); - cairo_close_path (cr); - } - else - { - cairo_curve_to (cr, - rect->x, - rect->y, - rect->x, - rect->y, - triangle[0].x, - rect->y); - } - - return triangle[1]; + _close_path (bw); } -static GdkPoint -_stencil_bubble_top_left (cairo_t *cr, - GdkRectangle *rect, - int pos_x, int pos_y) +static void +_stencil_bubble_top_left (EggNotificationBubbleWidget *bw, + GdkRectangle *rect) { GdkPoint triangle[3]; - double d, p1x, p2x, p3x, pdx, pvx, p1y, p2y, p3y, pdy, pvy; triangle[0].x = rect->x + TRIANGLE_START; triangle[0].y = rect->y; @@ -646,96 +788,29 @@ triangle[1].x = (triangle[2].x - triangle[0].x) / 2 + triangle[0].x; triangle[1].y = rect->y - BORDER_SIZE + 5; - //if (triangle[1].x - (BORDER_SIZE - 5 ) > pos_x) - // triangle[1].x = pos_x + (BORDER_SIZE + 5); + bw->offset_x = triangle[1].x; + bw->offset_y = triangle[1].y; - cairo_move_to (cr, triangle[0].x, triangle[0].y); - cairo_line_to (cr, triangle[1].x, triangle[1].y); - cairo_line_to (cr, triangle[2].x, triangle[2].y); + _edge_line_to (bw, triangle[0].x, triangle[0].y, 0); + _edge_line_to (bw, triangle[1].x, triangle[1].y, 0); + _edge_line_to (bw, triangle[2].x, triangle[2].y, 0); - cairo_line_to (cr, rect->x + rect->width - CURVE_LENGTH, rect->y); - cairo_curve_to (cr, - rect->x + rect->width, - rect->y, - rect->x + rect->width, - rect->y, - rect->x + rect->width, - rect->y + CURVE_LENGTH); + _edge_line_to (bw, rect->x + rect->width, rect->y, CURVE_LENGTH); + _edge_line_to (bw, rect->x + rect->width, rect->y + rect->height + BORDER_SIZE - 5, CURVE_LENGTH); - cairo_line_to (cr, rect->x + rect->width, rect->y + rect->height - CURVE_LENGTH); + _edge_line_to (bw, rect->x, rect->y + rect->height, CURVE_LENGTH); - p1x = rect->x + rect->width; - p2x = rect->x; - p1y = rect->y + rect->height; - p2y = rect->y + rect->height + (BORDER_SIZE - 5); - - pdx = p1x - p2x; - pdy = p1y - p2y; - - d = sqrt (pdx * pdx + - pdy * pdy); + _edge_line_to (bw, rect->x, rect->y, CURVE_LENGTH); - pvx = (pdx / d); - pvy = (pdy / d); - - p3x = p1x - CURVE_LENGTH * pvx; - p3y = p1y - CURVE_LENGTH * pvy; + _close_path (bw); - cairo_curve_to (cr, - p1x, - p1y, - p1x, - p1y, - p3x, - p3y); - - p3x = p2x + CURVE_LENGTH * pvx; - p3y = p2y + CURVE_LENGTH * pvy; - - cairo_line_to (cr, p3x, p3y); - - cairo_curve_to (cr, - p2x, - p2y, - p2x, - p2y, - p2x, - p2y - CURVE_LENGTH); - - cairo_line_to (cr, rect->x, rect->y + CURVE_LENGTH); - p1x = rect->x + CURVE_LENGTH; - if (p1x < triangle[0].x) - { - cairo_curve_to (cr, - rect->x, - rect->y, - rect->x, - rect->y, - p1x, - rect->y); - cairo_close_path (cr); - } - else - { - cairo_curve_to (cr, - rect->x, - rect->y, - rect->x, - rect->y, - triangle[0].x, - rect->y); - } - - return triangle[1]; } -static GdkPoint -_stencil_bubble_bottom_right (cairo_t *cr, - GdkRectangle *rect, - int pos_x, int pos_y) +static void +_stencil_bubble_bottom_right (EggNotificationBubbleWidget *bw, + GdkRectangle *rect) { GdkPoint triangle[3]; - double d, p1x, p2x, p3x, pdx, pvx, p1y, p2y, p3y, pdy, pvy; triangle[2].x = rect->x + rect->width - TRIANGLE_START; triangle[2].y = rect->y + rect->height; @@ -745,99 +820,27 @@ triangle[1].x = (triangle[2].x - triangle[0].x) / 2 + triangle[0].x; triangle[1].y = rect->y + rect->height + BORDER_SIZE - 5; -#if 0 - if (triangle[1].x + (BORDER_SIZE - 5) < pos_x) - triangle[1].x = pos_x - (BORDER_SIZE + 5); -#endif + bw->offset_x = triangle[1].x; + bw->offset_y = triangle[1].y; - cairo_move_to (cr, triangle[0].x, triangle[0].y); - cairo_line_to (cr, triangle[1].x, triangle[1].y); - cairo_line_to (cr, triangle[2].x, triangle[2].y); + _edge_line_to (bw, triangle[2].x, triangle[2].y, 0); + _edge_line_to (bw, triangle[1].x, triangle[1].y, 0); + _edge_line_to (bw, triangle[0].x, triangle[0].y, 0); - cairo_line_to (cr, rect->x + rect->width - CURVE_LENGTH, rect->y + rect->height); - cairo_curve_to (cr, - rect->x + rect->width, - rect->y + rect->height, - rect->x + rect->width, - rect->y + rect->height, - rect->x + rect->width, - rect->y + rect->height - CURVE_LENGTH); + + _edge_line_to (bw, rect->x, rect->y + rect->height, CURVE_LENGTH); + _edge_line_to (bw, rect->x, rect->y - BORDER_SIZE + 5, CURVE_LENGTH); + _edge_line_to (bw, rect->x + rect->width, rect->y, CURVE_LENGTH); + _edge_line_to (bw, rect->x + rect->width, rect->y + rect->height, CURVE_LENGTH); - cairo_line_to (cr, rect->x + rect->width, rect->y + CURVE_LENGTH); - - p1x = rect->x + rect->width; - p2x = rect->x; - p1y = rect->y - (BORDER_SIZE - 5); - p2y = rect->y; - - pdx = p1x - p2x; - pdy = p1y - p2y; - - d = sqrt (pdx * pdx + - pdy * pdy); - - pvx = (pdx / d); - pvy = (pdy / d); - - p3x = p1x - CURVE_LENGTH * pvx; - p3y = p1y - CURVE_LENGTH * pvy; - - cairo_curve_to (cr, - p1x, - p1y, - p1x, - p1y, - p3x, - p3y); - - p3x = p2x + CURVE_LENGTH * pvx; - p3y = p2y + CURVE_LENGTH * pvy; - - cairo_line_to (cr, p3x, p3y); - - cairo_curve_to (cr, - p2x, - p2y, - p2x, - p2y, - p2x, - p2y + CURVE_LENGTH); - - cairo_line_to (cr, rect->x, rect->y + rect->height - CURVE_LENGTH); - p1x = rect->x + CURVE_LENGTH; - if (p1x < triangle[0].x) - { - cairo_curve_to (cr, - rect->x, - rect->y + rect->height, - rect->x, - rect->y + rect->height, - p1x, - rect->y + rect->height); - cairo_close_path (cr); - } - else - { - cairo_curve_to (cr, - rect->x, - rect->y + rect->height, - rect->x, - rect->y + rect->height, - triangle[0].x, - rect->y + rect->height); - } - - return triangle[1]; - + _close_path (bw); } -static GdkPoint -_stencil_bubble_bottom_left (cairo_t *cr, - GdkRectangle *rect, - int pos_x, int pos_y) +static void +_stencil_bubble_bottom_left (EggNotificationBubbleWidget *bw, + GdkRectangle *rect) { GdkPoint triangle[3]; - double d, p1x, p2x, p3x, pdx, pvx, p1y, p2y, p3y, pdy, pvy; triangle[0].x = rect->x + TRIANGLE_START; triangle[0].y = rect->y + rect->height; @@ -846,138 +849,103 @@ triangle[1].x = (triangle[2].x - triangle[0].x) / 2 + triangle[0].x; triangle[1].y = rect->y + rect->height + BORDER_SIZE - 5; - //if (triangle[1].x - (BORDER_SIZE - 5 ) > pos_x) - // triangle[1].x = pos_x + (BORDER_SIZE + 5); + bw->offset_x = triangle[1].x; + bw->offset_y = triangle[1].y; - cairo_move_to (cr, triangle[0].x, triangle[0].y); - cairo_line_to (cr, triangle[1].x, triangle[1].y); - cairo_line_to (cr, triangle[2].x, triangle[2].y); + _edge_line_to (bw, triangle[2].x, triangle[2].y, 0); + _edge_line_to (bw, triangle[1].x, triangle[1].y, 0); + _edge_line_to (bw, triangle[0].x, triangle[0].y, 0); - cairo_line_to (cr, rect->x + rect->width - CURVE_LENGTH, rect->y + rect->height); - cairo_curve_to (cr, - rect->x + rect->width, - rect->y + rect->height, - rect->x + rect->width, - rect->y + rect->height, - rect->x + rect->width, - rect->y + rect->height - CURVE_LENGTH); + _edge_line_to (bw, rect->x, rect->y + rect->height, CURVE_LENGTH); + _edge_line_to (bw, rect->x, rect->y, CURVE_LENGTH); + _edge_line_to (bw, rect->x + rect->width, rect->y - BORDER_SIZE + 5, CURVE_LENGTH); + _edge_line_to (bw, rect->x + rect->width, rect->y + rect->height, CURVE_LENGTH); - cairo_line_to (cr, rect->x + rect->width, rect->y + CURVE_LENGTH); + _close_path (bw); +} - p1x = rect->x + rect->width; - p2x = rect->x; - p1y = rect->y; - p2y = rect->y - (BORDER_SIZE - 5); - - pdx = p1x - p2x; - pdy = p1y - p2y; - - d = sqrt (pdx * pdx + - pdy * pdy); +static void +_stencil_bubble_no_arrow (EggNotificationBubbleWidget *bw, + GdkRectangle *rect) +{ + bw->offset_x = 0; + bw->offset_y = 0; - pvx = (pdx / d); - pvy = (pdy / d); - - p3x = p1x - CURVE_LENGTH * pvx; - p3y = p1y - CURVE_LENGTH * pvy; + _edge_line_to (bw, rect->x + rect->width, rect->y, CURVE_LENGTH); + _edge_line_to (bw, rect->x + rect->width, rect->y + rect->height, CURVE_LENGTH); - cairo_curve_to (cr, - p1x, - p1y, - p1x, - p1y, - p3x, - p3y); + _edge_line_to (bw, rect->x, rect->y + rect->height, CURVE_LENGTH); - p3x = p2x + CURVE_LENGTH * pvx; - p3y = p2y + CURVE_LENGTH * pvy; - - cairo_line_to (cr, p3x, p3y); + _edge_line_to (bw, rect->x, rect->y, CURVE_LENGTH); - cairo_curve_to (cr, - p2x, - p2y, - p2x, - p2y, - p2x, - p2y + CURVE_LENGTH); + _close_path (bw); - cairo_line_to (cr, rect->x, rect->y + rect->height - CURVE_LENGTH); - p1x = rect->x + CURVE_LENGTH; - if (p1x < triangle[0].x) - { - cairo_curve_to (cr, - rect->x, - rect->y + rect->height, - rect->x, - rect->y + rect->height, - p1x, - rect->y + rect->height); - cairo_close_path (cr); - } - else - { - cairo_curve_to (cr, - rect->x, - rect->y + rect->height, - rect->x, - rect->y + rect->height, - triangle[0].x, - rect->y + rect->height); - } - - return triangle[1]; - } static void -_stencil_bubble_no_arrow (cairo_t *cr, - GdkRectangle *rect) +_stencil_bubble (EggNotificationBubbleWidget *bw) { + GdkRectangle rect; + GtkRequisition req; + gint rect_border; - cairo_move_to (cr, rect->x + CURVE_LENGTH, rect->y + rect->height); + gtk_widget_size_request (GTK_WIDGET (bw), &req); + + if (bw->draw_arrow) + rect_border = BORDER_SIZE - BORDER_LINE_WIDTH; + else + rect_border = BORDER_LINE_WIDTH; - cairo_line_to (cr, rect->x + rect->width - CURVE_LENGTH, rect->y + rect->height); - cairo_curve_to (cr, - rect->x + rect->width, - rect->y + rect->height, - rect->x + rect->width, - rect->y + rect->height, - rect->x + rect->width, - rect->y + rect->height - CURVE_LENGTH); + rect.x = rect_border; + rect.y = rect_border; + rect.width = req.width - (rect_border * 2); + rect.height = req.height - (rect_border * 2); - cairo_line_to (cr, rect->x + rect->width, rect->y + CURVE_LENGTH); + _drawing_pipeline_clear (bw); - cairo_curve_to (cr, - rect->x + rect->width, - rect->y, - rect->x + rect->width, - rect->y, - rect->x + rect->width - CURVE_LENGTH, - rect->y); + if (bw->draw_arrow) + { + GdkScreen *screen; + GdkRectangle monitor; + gint monitor_num; + gint orient; + gint orient_triangle; + gint x, y; - cairo_line_to (cr, rect->x + CURVE_LENGTH, rect->y); + x = bw->x; + y = bw->y; + screen = gtk_window_get_screen (GTK_WINDOW(bw)); + monitor_num = gdk_screen_get_monitor_at_point (screen, x, y); + gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - cairo_curve_to (cr, - rect->x, - rect->y, - rect->x, - rect->y, - rect->x, - rect->y + CURVE_LENGTH); + /* TODO: draw corner cases */ + if (x < (monitor.x + monitor.width) / 2) + orient_triangle = TRIANGLE_LEFT; + else + orient_triangle = TRIANGLE_RIGHT; + + orient = ORIENT_TOP; - cairo_line_to (cr, rect->x, rect->y + rect->height - CURVE_LENGTH); - - cairo_curve_to (cr, - rect->x, - rect->y + rect->height, - rect->x, - rect->y + rect->height, - rect->x + CURVE_LENGTH, - rect->y + rect->height); + if ((y + req.height) > monitor.y + monitor.height) + orient = ORIENT_BOTTOM; - cairo_close_path (cr); - + if (orient == ORIENT_TOP) + { + if (orient_triangle == TRIANGLE_RIGHT) + _stencil_bubble_top_right (bw, &rect); + else if (orient_triangle == TRIANGLE_LEFT) + _stencil_bubble_top_left (bw, &rect); + } + else if (orient == ORIENT_BOTTOM) + { + if (orient_triangle == TRIANGLE_RIGHT) + _stencil_bubble_bottom_right (bw, &rect); + else if (orient_triangle == TRIANGLE_LEFT) + _stencil_bubble_bottom_left (bw, &rect); + } + } + else + _stencil_bubble_no_arrow (bw, &rect); } static GdkColor @@ -1034,18 +1002,11 @@ draw_bubble_widget (EggNotificationBubbleWidget *bubble_widget) { GtkRequisition requisition; - gint x, y, w, h; - GdkScreen *screen; - gint monitor_num; - GdkRectangle monitor; - GdkRectangle rectangle; + gint w, h; cairo_pattern_t *pat; GdkPixmap *mask; GdkPoint arrow_pos; - int orient; - int orient_triangle; - guint rectangle_border; GtkWidget *widget; cairo_t *cairo_context; cairo_t *mask_cr; @@ -1063,102 +1024,21 @@ can_composite = bubble_widget->can_composite; _calculate_colors_from_style (bubble_widget); - - x = bubble_widget->x; - y = bubble_widget->y; - gtk_window_move (GTK_WINDOW (widget), x, y); - - screen = gtk_window_get_screen (GTK_WINDOW(widget)); - monitor_num = gdk_screen_get_monitor_at_window (screen, widget->window); - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); - - if (x < (monitor.x + monitor.width) / 2) - { - orient_triangle = TRIANGLE_LEFT; - } - else - { - orient_triangle = TRIANGLE_RIGHT; - } - gtk_widget_size_request (widget, &requisition); w = requisition.width; h = requisition.height; - g_message ("w %i, h %i", w, h); - if (!can_composite) { mask = gdk_pixmap_new (NULL, w, h, 1); mask_cr = gdk_cairo_create ((GdkDrawable *) mask); } - orient = ORIENT_TOP; + g_list_foreach (bubble_widget->dp.pipeline, (GFunc) _drawing_instruction_draw, cairo_context); + if (!can_composite) + g_list_foreach (bubble_widget->dp.pipeline, (GFunc) _drawing_instruction_draw, mask_cr); - if ((y + h) > monitor.y + monitor.height) - { - y -= (h + 5); - orient = ORIENT_BOTTOM; - } - else - y = y + 5; - - if (bubble_widget->draw_arrow) - rectangle_border = BORDER_SIZE-2; - else - rectangle_border = 2; - - rectangle.x = rectangle_border; - rectangle.y = rectangle_border; - rectangle.width = w - (rectangle_border * 2); - rectangle.height = h - (rectangle_border * 2); - - if (bubble_widget->draw_arrow) - { - if (orient == ORIENT_TOP) - { - if (orient_triangle == TRIANGLE_LEFT) - { - arrow_pos = - _stencil_bubble_top_left (cairo_context, &rectangle, x, y); - if (!can_composite) - _stencil_bubble_top_left (mask_cr, &rectangle, x, y); - } - else - { - arrow_pos = - _stencil_bubble_top_right (cairo_context, &rectangle, x, y); - if (!can_composite) - _stencil_bubble_top_right (mask_cr, &rectangle, x, y); - } - } - else - { - if (orient_triangle == TRIANGLE_LEFT) - { - arrow_pos = - _stencil_bubble_bottom_left (cairo_context, &rectangle, x, y); - if (!can_composite) - _stencil_bubble_bottom_left (mask_cr, &rectangle, x, y); - } - else - { - arrow_pos = - _stencil_bubble_bottom_right (cairo_context, &rectangle, x, y); - if (!can_composite) - _stencil_bubble_bottom_right (mask_cr, &rectangle, x, y); - } - } - } - else /* draw without arrow */ - { - _stencil_bubble_no_arrow (cairo_context, &rectangle); - if (!can_composite) - _stencil_bubble_no_arrow (mask_cr, &rectangle); - } - //cairo_set_source_rgba (cairo_context, 0.43, 0.49, 0.55, 1); - if (can_composite) cairo_set_source_rgba (cairo_context, 1, 1, 1, 0); else From fedora-cvs-commits at redhat.com Mon Jan 9 18:30:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 13:30:47 -0500 Subject: rpms/gstreamer08-plugins/devel gstreamer08-plugins.spec,1.3,1.4 Message-ID: <200601091830.k09IUlBT032347@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer08-plugins/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32306 Modified Files: gstreamer08-plugins.spec Log Message: - requier gstreamer08-plugins-devel not gstreamer-devel - obsolete gstreamer-plugins-devel not gstreamer08-plugins-devel Index: gstreamer08-plugins.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer08-plugins/devel/gstreamer08-plugins.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gstreamer08-plugins.spec 9 Jan 2006 18:06:49 -0000 1.3 +++ gstreamer08-plugins.spec 9 Jan 2006 18:30:29 -0000 1.4 @@ -93,9 +93,9 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gstreamer-devel >= %_gst +Requires: gstreamer08-devel >= %_gst Requires: GConf2-devel -Obsoletes: gstreamer08-plugins-devel +Obsoletes: gstreamer-plugins-devel %description devel GStreamer is a streaming-media framework, based on graphs of filters which @@ -318,6 +318,10 @@ %{_libdir}/*so %changelog +* Mon Jan 9 2006 John (J5) Palmieri - 0.8.11-5 +- requier gstreamer08-plugins-devel not gstreamer-devel +- obsolete gstreamer-plugins-devel not gstreamer08-plugins-devel + * Mon Jan 9 2006 Jeremy Katz - 0.8.11-4 - obsoletes with the -devel subpackage too From fedora-cvs-commits at redhat.com Mon Jan 9 18:33:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 13:33:36 -0500 Subject: rpms/gstreamer08-plugins/devel gstreamer08-plugins.spec,1.4,1.5 Message-ID: <200601091833.k09IXaZD032554@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer08-plugins/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32523 Modified Files: gstreamer08-plugins.spec Log Message: - forgot to up the realease to 5 Index: gstreamer08-plugins.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer08-plugins/devel/gstreamer08-plugins.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gstreamer08-plugins.spec 9 Jan 2006 18:30:29 -0000 1.4 +++ gstreamer08-plugins.spec 9 Jan 2006 18:33:32 -0000 1.5 @@ -8,7 +8,7 @@ Name: %{gstreamer}-plugins Version: 0.8.11 -Release: 4 +Release: 5 Summary: GStreamer Streaming media framework plug-ins Group: Applications/Multimedia From fedora-cvs-commits at redhat.com Mon Jan 9 18:38:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 13:38:48 -0500 Subject: rpms/kernel/FC-4 linux-2.6-squashfs.patch, NONE, 1.1 kernel-2.6.spec, 1.1571, 1.1572 Message-ID: <200601091838.k09Icmst002072@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv2019 Modified Files: kernel-2.6.spec Added Files: linux-2.6-squashfs.patch Log Message: squashfs linux-2.6-squashfs.patch: fs/Kconfig | 63 + fs/Makefile | 1 fs/squashfs/Makefile | 7 fs/squashfs/inode.c | 1803 +++++++++++++++++++++++++++++++++++++++++ include/linux/squashfs_fs.h | 519 +++++++++++ include/linux/squashfs_fs_i.h | 43 include/linux/squashfs_fs_sb.h | 65 + 7 files changed, 2501 insertions(+) --- NEW FILE linux-2.6-squashfs.patch --- diff --new-file -urp linux-2.6.13/fs/Kconfig linux-2.6.13-squashfs2.2-r2/fs/Kconfig --- linux-2.6.13/fs/Kconfig 2005-08-29 00:41:01.000000000 +0100 +++ linux-2.6.13-squashfs2.2-r2/fs/Kconfig 2005-09-09 00:40:06.000000000 +0100 @@ -1155,6 +1155,69 @@ config CRAMFS If unsure, say N. +config SQUASHFS + tristate "SquashFS 2.2 - Squashed file system support" + select ZLIB_INFLATE + help + Saying Y here includes support for SquashFS 2.2 (Compressed Read-Only File + System). Squashfs is a highly compressed read-only filesystem for Linux. + It uses zlib compression to compress both files, inodes and directories. + Inodes in the system are very small and all blocks are packed to minimise + data overhead. Block sizes greater than 4K are supported up to a maximum of 64K. + + Squashfs is intended for general read-only filesystem use, for archival + use (i.e. in cases where a .tar.gz file may be used), and in embedded + systems where low overhead is needed. Further information and filesystem tools + are available from http://squashfs.sourceforge.net. + + If you want to compile this as a module ( = code which can be + inserted in and removed from the running kernel whenever you want), + say M here and read . The module + will be called squashfs. Note that the root file system (the one + containing the directory /) cannot be compiled as a module. + + If unsure, say N. + +config SQUASHFS_EMBEDDED + + bool "Additional options for memory-constrained systems" + depends on SQUASHFS + default n + help + Saying Y here allows you to specify cache sizes and how Squashfs + allocates memory. This is only intended for memory constrained + systems. + + If unsure, say N. + +config SQUASHFS_FRAGMENT_CACHE_SIZE + int "Number of fragments cached" if SQUASHFS_EMBEDDED + depends on SQUASHFS + default "3" + help + By default SquashFS caches the last 3 fragments read from + the filesystem. Increasing this amount may mean SquashFS + has to re-read fragments less often from disk, at the expense + of extra system memory. Decreasing this amount will mean + SquashFS uses less memory at the expense of extra reads from disk. + + Note there must be at least one cached fragment. Anything + much more than three will probably not make much difference. + +config SQUASHFS_VMALLOC + bool "Use Vmalloc rather than Kmalloc" if SQUASHFS_EMBEDDED + depends on SQUASHFS + default n + help + By default SquashFS uses kmalloc to obtain fragment cache memory. + Kmalloc memory is the standard kernel allocator, but it can fail + on memory constrained systems. Because of the way Vmalloc works, + Vmalloc can succeed when kmalloc fails. Specifying this option + will make SquashFS always use Vmalloc to allocate the + fragment cache memory. + + If unsure, say N. + config VXFS_FS tristate "FreeVxFS file system support (VERITAS VxFS(TM) compatible)" help diff --new-file -urp linux-2.6.13/fs/Makefile linux-2.6.13-squashfs2.2-r2/fs/Makefile --- linux-2.6.13/fs/Makefile 2005-08-29 00:41:01.000000000 +0100 +++ linux-2.6.13-squashfs2.2-r2/fs/Makefile 2005-09-09 00:39:17.000000000 +0100 @@ -55,6 +55,7 @@ obj-$(CONFIG_EXT3_FS) += ext3/ # Before obj-$(CONFIG_JBD) += jbd/ obj-$(CONFIG_EXT2_FS) += ext2/ obj-$(CONFIG_CRAMFS) += cramfs/ +obj-$(CONFIG_SQUASHFS) += squashfs/ obj-$(CONFIG_RAMFS) += ramfs/ obj-$(CONFIG_HUGETLBFS) += hugetlbfs/ obj-$(CONFIG_CODA_FS) += coda/ diff --new-file -urp linux-2.6.13/fs/squashfs/inode.c linux-2.6.13-squashfs2.2-r2/fs/squashfs/inode.c --- linux-2.6.13/fs/squashfs/inode.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.13-squashfs2.2-r2/fs/squashfs/inode.c 2005-09-09 00:40:54.000000000 +0100 @@ -0,0 +1,1803 @@ +/* + * Squashfs - a compressed read only filesystem for Linux + * + * Copyright (c) 2002, 2003, 2004, 2005 Phillip Lougher + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2, + * or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * inode.c + */ + +#define SQUASHFS_1_0_COMPATIBILITY + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef SQUASHFS_TRACE +#define TRACE(s, args...) printk(KERN_NOTICE "SQUASHFS: "s, ## args) +#else +#define TRACE(s, args...) {} +#endif + +#define ERROR(s, args...) printk(KERN_ERR "SQUASHFS error: "s, ## args) + +#define SERROR(s, args...) if(!silent) printk(KERN_ERR "SQUASHFS error: "s, ## args) +#define WARNING(s, args...) printk(KERN_WARNING "SQUASHFS: "s, ## args) + +static void squashfs_put_super(struct super_block *); +static int squashfs_statfs(struct super_block *, struct kstatfs *); +static int squashfs_symlink_readpage(struct file *file, struct page *page); +static int squashfs_readpage(struct file *file, struct page *page); +static int squashfs_readpage4K(struct file *file, struct page *page); +static int squashfs_readdir(struct file *, void *, filldir_t); +static struct dentry *squashfs_lookup(struct inode *, struct dentry *, struct nameidata *); +static unsigned int read_data(struct super_block *s, char *buffer, + unsigned int index, unsigned int length, unsigned int *next_index); +static int squashfs_get_cached_block(struct super_block *s, char *buffer, + unsigned int block, unsigned int offset, int length, + unsigned int *next_block, unsigned int *next_offset); +static struct inode *squashfs_iget(struct super_block *s, squashfs_inode inode); +static unsigned int read_blocklist(struct inode *inode, int index, int readahead_blks, + char *block_list, unsigned short **block_p, unsigned int *bsize); +static void squashfs_put_super(struct super_block *s); +static struct super_block *squashfs_get_sb(struct file_system_type *, int, const char *, void *); +static struct inode *squashfs_alloc_inode(struct super_block *sb); +static void squashfs_destroy_inode(struct inode *inode); +static int init_inodecache(void); +static void destroy_inodecache(void); + +#ifdef SQUASHFS_1_0_COMPATIBILITY +static int squashfs_readpage_lessthan4K(struct file *file, struct page *page); +static struct inode *squashfs_iget_1(struct super_block *s, squashfs_inode inode); +static unsigned int read_blocklist_1(struct inode *inode, int index, int readahead_blks, + char *block_list, unsigned short **block_p, unsigned int *bsize); +#endif + +DECLARE_MUTEX(read_data_mutex); + +static z_stream stream; + +static struct file_system_type squashfs_fs_type = { + .owner = THIS_MODULE, + .name = "squashfs", + .get_sb = squashfs_get_sb, + .kill_sb = kill_block_super, + .fs_flags = FS_REQUIRES_DEV + }; + +static unsigned char squashfs_filetype_table[] = { + DT_UNKNOWN, DT_DIR, DT_REG, DT_LNK, DT_BLK, DT_CHR, DT_FIFO, DT_SOCK +}; + +static struct super_operations squashfs_ops = { + .alloc_inode = squashfs_alloc_inode, + .destroy_inode = squashfs_destroy_inode, + .statfs = squashfs_statfs, + .put_super = squashfs_put_super, +}; + +static struct address_space_operations squashfs_symlink_aops = { + .readpage = squashfs_symlink_readpage +}; [...2142 lines suppressed...] + unsigned int mtime; + squashfs_block start_block; + unsigned int file_size:SQUASHFS_MAX_FILE_SIZE_LOG; + unsigned short block_list[0]; +} __attribute__ ((packed)) squashfs_reg_inode_header_1; + +typedef struct { + unsigned int inode_type:4; + unsigned int mode:12; /* protection */ + unsigned int uid:4; /* index into uid table */ + unsigned int guid:4; /* index into guid table */ + unsigned int file_size:19; + unsigned int offset:13; + unsigned int mtime; + unsigned int start_block:24; +} __attribute__ ((packed)) squashfs_dir_inode_header_1; + +#define SQUASHFS_SWAP_BASE_INODE_HEADER_1(s, d, n) {\ + SQUASHFS_MEMSET(s, d, n);\ + SQUASHFS_SWAP((s)->inode_type, d, 0, 4);\ + SQUASHFS_SWAP((s)->mode, d, 4, 12);\ + SQUASHFS_SWAP((s)->uid, d, 16, 4);\ + SQUASHFS_SWAP((s)->guid, d, 20, 4);\ +} + +#define SQUASHFS_SWAP_IPC_INODE_HEADER_1(s, d) {\ + SQUASHFS_SWAP_BASE_INODE_HEADER_1(s, d, sizeof(squashfs_ipc_inode_header_1));\ + SQUASHFS_SWAP((s)->type, d, 24, 4);\ + SQUASHFS_SWAP((s)->offset, d, 28, 4);\ +} + +#define SQUASHFS_SWAP_DEV_INODE_HEADER_1(s, d) {\ + SQUASHFS_SWAP_BASE_INODE_HEADER_1(s, d, sizeof(squashfs_dev_inode_header_1));\ + SQUASHFS_SWAP((s)->rdev, d, 24, 16);\ +} + +#define SQUASHFS_SWAP_SYMLINK_INODE_HEADER_1(s, d) {\ + SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_symlink_inode_header_1));\ + SQUASHFS_SWAP((s)->symlink_size, d, 24, 16);\ +} + +#define SQUASHFS_SWAP_REG_INODE_HEADER_1(s, d) {\ + SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_reg_inode_header_1));\ + SQUASHFS_SWAP((s)->mtime, d, 24, 32);\ + SQUASHFS_SWAP((s)->start_block, d, 56, 32);\ + SQUASHFS_SWAP((s)->file_size, d, 88, SQUASHFS_MAX_FILE_SIZE_LOG);\ +} + +#define SQUASHFS_SWAP_DIR_INODE_HEADER_1(s, d) {\ + SQUASHFS_SWAP_BASE_INODE_HEADER(s, d, sizeof(squashfs_dir_inode_header_1));\ + SQUASHFS_SWAP((s)->file_size, d, 24, 19);\ + SQUASHFS_SWAP((s)->offset, d, 43, 13);\ + SQUASHFS_SWAP((s)->mtime, d, 56, 32);\ + SQUASHFS_SWAP((s)->start_block, d, 88, 24);\ +} +#endif + +#ifdef __KERNEL__ +/* + * macros used to swap each structure entry, taking into account + * bitfields and different bitfield placing conventions on differing architectures + */ +#include +#ifdef __BIG_ENDIAN + /* convert from little endian to big endian */ +#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, tbits, b_pos) +#else + /* convert from big endian to little endian */ +#define SQUASHFS_SWAP(value, p, pos, tbits) _SQUASHFS_SWAP(value, p, pos, tbits, 64 - tbits - b_pos) +#endif + +#define _SQUASHFS_SWAP(value, p, pos, tbits, SHIFT) {\ + int bits;\ + int b_pos = pos % 8;\ + unsigned long long val = 0;\ + unsigned char *s = (unsigned char *)p + (pos / 8);\ + unsigned char *d = ((unsigned char *) &val) + 7;\ + for(bits = 0; bits < (tbits + b_pos); bits += 8) \ + *d-- = *s++;\ + value = (val >> (SHIFT))/* & ((1 << tbits) - 1)*/;\ +} +#define SQUASHFS_MEMSET(s, d, n) memset(s, 0, n); +#endif +#endif diff --new-file -urp linux-2.6.13/include/linux/squashfs_fs_i.h linux-2.6.13-squashfs2.2-r2/include/linux/squashfs_fs_i.h --- linux-2.6.13/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.13-squashfs2.2-r2/include/linux/squashfs_fs_i.h 2005-09-09 00:39:17.000000000 +0100 @@ -0,0 +1,43 @@ +#ifndef SQUASHFS_FS_I +#define SQUASHFS_FS_I +/* + * Squashfs + * + * Copyright (c) 2002, 2003, 2004, 2005 Phillip Lougher + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2, + * or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * squashfs_fs_i.h + */ + +typedef struct squashfs_inode_info { + unsigned int start_block; + unsigned int block_list_start; + unsigned int offset; + union { + struct { + unsigned int fragment_start_block; + unsigned int fragment_size; + unsigned int fragment_offset; + } s1; + struct { + unsigned int directory_index_start; + unsigned int directory_index_offset; + unsigned int directory_index_count; + } s2; + } u; + struct inode vfs_inode; + } squashfs_inode_info; +#endif diff --new-file -urp linux-2.6.13/include/linux/squashfs_fs_sb.h linux-2.6.13-squashfs2.2-r2/include/linux/squashfs_fs_sb.h --- linux-2.6.13/include/linux/squashfs_fs_sb.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.13-squashfs2.2-r2/include/linux/squashfs_fs_sb.h 2005-09-09 00:39:17.000000000 +0100 @@ -0,0 +1,65 @@ +#ifndef SQUASHFS_FS_SB +#define SQUASHFS_FS_SB +/* + * Squashfs + * + * Copyright (c) 2002, 2003, 2004, 2005 Phillip Lougher + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2, + * or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * squashfs_fs_sb.h + */ + +#include + +typedef struct { + unsigned int block; + int length; + unsigned int next_index; + char *data; + } squashfs_cache; + +struct squashfs_fragment_cache { + unsigned int block; + int length; + unsigned int locked; + char *data; + }; + +typedef struct squashfs_sb_info { + squashfs_super_block sBlk; + int devblksize; + int devblksize_log2; + int swap; + squashfs_cache *block_cache; + struct squashfs_fragment_cache *fragment; + int next_cache; + int next_fragment; + squashfs_uid *uid; + squashfs_uid *guid; + squashfs_fragment_index *fragment_index; + unsigned int read_size; + char *read_data; + char *read_page; + struct semaphore read_page_mutex; + struct semaphore block_cache_mutex; + struct semaphore fragment_mutex; + wait_queue_head_t waitq; + wait_queue_head_t fragment_wait_queue; + struct inode *(*iget)(struct super_block *s, squashfs_inode inode); + unsigned int (*read_blocklist)(struct inode *inode, int index, int readahead_blks, + char *block_list, unsigned short **block_p, unsigned int *bsize); + } squashfs_sb_info; +#endif Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1571 retrieving revision 1.1572 diff -u -r1.1571 -r1.1572 --- kernel-2.6.spec 7 Jan 2006 04:20:10 -0000 1.1571 +++ kernel-2.6.spec 9 Jan 2006 18:38:45 -0000 1.1572 @@ -313,6 +313,9 @@ # NIC driver updates Patch1301: linux-2.6-net-sundance-ip100A.patch +# Squashfs +Patch1400: linux-2.6-squashfs.patch + # Netdump and Diskdump bits. Patch1500: linux-2.6-crashdump-common.patch Patch1501: linux-2.6-netdump.patch @@ -718,6 +721,9 @@ # New PCI ID for sundance driver. %patch1301 -p1 +# Squashfs +%patch1400 -p1 + # netdump bits %patch1500 -p1 %patch1501 -p1 @@ -1261,6 +1267,9 @@ %endif %changelog +* Mon Jan 9 2006 Dave Jones +- Reenable Squashfs. + * Fri Jan 6 2006 Dave Jones - Enable nvram driver for x86-64 - Fix posix-cpu-timers sched_time accumulation. From fedora-cvs-commits at redhat.com Mon Jan 9 18:40:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 13:40:22 -0500 Subject: rpms/make/devel make.spec,1.22,1.23 Message-ID: <200601091840.k09IeMLT002768@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/make/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2406 Modified Files: make.spec Log Message: Forcing aclocal/automake/autoconf in hope to build the thing on s390. Index: make.spec =================================================================== RCS file: /cvs/dist/rpms/make/devel/make.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- make.spec 9 Jan 2006 15:51:22 -0000 1.22 +++ make.spec 9 Jan 2006 18:40:17 -0000 1.23 @@ -40,6 +40,12 @@ %patch7 -p1 %build +#aclocal +config/missing --run aclocal -I config +#automake -a +config/missing --run automake --gnu Makefile +#autoconf +config/missing --run autoconf #autoreconf -f --install %configure #touch .deps/remote-stub.Po # Workaround for broken automake files From fedora-cvs-commits at redhat.com Mon Jan 9 18:53:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 13:53:03 -0500 Subject: rpms/kernel/FC-4/configs config-generic, 1.48, 1.48.2.1 config-ia64-generic, 1.6, 1.6.10.1 config-x86-generic, 1.17, 1.17.2.1 config-x86_64-generic, 1.16, 1.16.2.1 Message-ID: <200601091853.k09Ir3SA019836@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv19779/configs Modified Files: Tag: private-linville-jwltest-fc4-29-branch config-generic config-ia64-generic config-x86-generic config-x86_64-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.48 retrieving revision 1.48.2.1 diff -u -r1.48 -r1.48.2.1 --- config-generic 9 Jan 2006 16:42:20 -0000 1.48 +++ config-generic 9 Jan 2006 18:53:01 -0000 1.48.2.1 @@ -1035,6 +1035,8 @@ CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m +CONFIG_SKY2=m +CONFIG_SKY2_EC_A1=y CONFIG_R8169=m CONFIG_R8169_NAPI=y CONFIG_R8169_VLAN=y Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-ia64-generic,v retrieving revision 1.6 retrieving revision 1.6.10.1 diff -u -r1.6 -r1.6.10.1 --- config-ia64-generic 6 Dec 2005 23:12:21 -0000 1.6 +++ config-ia64-generic 9 Jan 2006 18:53:01 -0000 1.6.10.1 @@ -124,6 +124,7 @@ CONFIG_ACPI_SYSTEM=y CONFIG_ACPI_NUMA=y CONFIG_ACPI_BLACKLIST_YEAR=0 +CONFIG_ACPI_INITRD=y CONFIG_SERIAL_SGI_L1_CONSOLE=y CONFIG_PM=y # CONFIG_PM_DEBUG is not set Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -r1.17 -r1.17.2.1 --- config-x86-generic 6 Jan 2006 05:42:19 -0000 1.17 +++ config-x86-generic 9 Jan 2006 18:53:01 -0000 1.17.2.1 @@ -150,6 +150,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=2001 CONFIG_ACPI_VIDEO=m CONFIG_ACPI_IBM=m +CONFIG_ACPI_INITRD=y CONFIG_PNPACPI=y # Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -r1.16 -r1.16.2.1 --- config-x86_64-generic 6 Jan 2006 23:35:07 -0000 1.16 +++ config-x86_64-generic 9 Jan 2006 18:53:01 -0000 1.16.2.1 @@ -78,6 +78,7 @@ CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_VIDEO=m CONFIG_ACPI_IBM=m +CONFIG_ACPI_INITRD=y CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_FAKE is not set From fedora-cvs-commits at redhat.com Mon Jan 9 18:53:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 13:53:04 -0500 Subject: rpms/kernel/FC-4 jwltest-3c59x-2_6_12-1_1456_FC4.patch, NONE, 1.1.6.1 jwltest-acpi-dsdt-initrd.patch, NONE, 1.1.46.1 jwltest-mii-force_media.patch, NONE, 1.1.2.1 jwltest-sky2.patch, NONE, 1.1.14.1 jwltest-tulip-last_irq.patch, NONE, 1.1.4.1 jwltest-via-velocity-tx_csum.patch, NONE, 1.1.12.1 kernel-2.6.spec, 1.1571, 1.1571.2.1 Message-ID: <200601091853.k09Ir4ot019823@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv19779 Modified Files: Tag: private-linville-jwltest-fc4-29-branch kernel-2.6.spec Added Files: Tag: private-linville-jwltest-fc4-29-branch jwltest-3c59x-2_6_12-1_1456_FC4.patch jwltest-acpi-dsdt-initrd.patch jwltest-mii-force_media.patch jwltest-sky2.patch jwltest-tulip-last_irq.patch jwltest-via-velocity-tx_csum.patch Log Message: jwltest-3c59x-2_6_12-1_1456_FC4.patch: 3c59x_old.c | 3368 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 1 2 files changed, 3369 insertions(+) --- NEW FILE jwltest-3c59x-2_6_12-1_1456_FC4.patch --- --- linux-2.6.14/drivers/net/Makefile.orig 2005-12-08 14:00:33.000000000 -0500 +++ linux-2.6.14/drivers/net/Makefile 2005-12-08 14:00:27.000000000 -0500 @@ -37,6 +37,7 @@ obj-$(CONFIG_OAKNET) += oaknet.o 8390.o obj-$(CONFIG_DGRS) += dgrs.o obj-$(CONFIG_VORTEX) += 3c59x.o +obj-$(CONFIG_VORTEX) += 3c59x_old.o obj-$(CONFIG_TYPHOON) += typhoon.o obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o obj-$(CONFIG_PCNET32) += pcnet32.o --- linux-2.6.14/drivers/net/3c59x_old.c.orig 2005-12-08 13:59:58.000000000 -0500 +++ linux-2.6.14/drivers/net/3c59x_old.c 2005-12-08 13:59:55.000000000 -0500 @@ -0,0 +1,3368 @@ +/* EtherLinkXL.c: A 3Com EtherLink PCI III/XL ethernet driver for linux. */ +/* + Written 1996-1999 by Donald Becker. + + This software may be used and distributed according to the terms + of the GNU General Public License, incorporated herein by reference. + + This driver is for the 3Com "Vortex" and "Boomerang" series ethercards. + Members of the series include Fast EtherLink 3c590/3c592/3c595/3c597 + and the EtherLink XL 3c900 and 3c905 cards. + + Problem reports and questions should be directed to + vortex at scyld.com + + The author may be reached as becker at scyld.com, or C/O + Scyld Computing Corporation + 410 Severn Ave., Suite 210 + Annapolis MD 21403 + + Linux Kernel Additions: + + 0.99H+lk0.9 - David S. Miller - softnet, PCI DMA updates + 0.99H+lk1.0 - Jeff Garzik + Remove compatibility defines for kernel versions < 2.2.x. + Update for new 2.3.x module interface + LK1.1.2 (March 19, 2000) + * New PCI interface (jgarzik) + + LK1.1.3 25 April 2000, Andrew Morton + - Merged with 3c575_cb.c + - Don't set RxComplete in boomerang interrupt enable reg + - spinlock in vortex_timer to protect mdio functions + - disable local interrupts around call to vortex_interrupt in + vortex_tx_timeout() (So vortex_interrupt can use spin_lock()) + - Select window 3 in vortex_timer()'s write to Wn3_MAC_Ctrl + - In vortex_start_xmit(), move the lock to _after_ we've altered + vp->cur_tx and vp->tx_full. This defeats the race between + vortex_start_xmit() and vortex_interrupt which was identified + by Bogdan Costescu. + - Merged back support for six new cards from various sources + - Set vortex_have_pci if pci_module_init returns zero (fixes cardbus + insertion oops) + - Tell it that 3c905C has NWAY for 100bT autoneg + - Fix handling of SetStatusEnd in 'Too much work..' code, as + per 2.3.99's 3c575_cb (Dave Hinds). + - Split ISR into two for vortex & boomerang + - Fix MOD_INC/DEC races + - Handle resource allocation failures. + - Fix 3CCFE575CT LED polarity + - Make tx_interrupt_mitigation the default + + LK1.1.4 25 April 2000, Andrew Morton + - Add extra TxReset to vortex_up() to fix 575_cb hotplug initialisation probs. + - Put vortex_info_tbl into __devinitdata + - In the vortex_error StatsFull HACK, disable stats in vp->intr_enable as well + as in the hardware. + - Increased the loop counter in issue_and_wait from 2,000 to 4,000. + + LK1.1.5 28 April 2000, andrewm + - Added powerpc defines (John Daniel said these work...) + - Some extra diagnostics + - In vortex_error(), reset the Tx on maxCollisions. Otherwise most + chips usually get a Tx timeout. + - Added extra_reset module parm + - Replaced some inline timer manip with mod_timer + (Franois romieu ) + - In vortex_up(), don't make Wn3_config initialisation dependent upon has_nway + (this came across from 3c575_cb). + + LK1.1.6 06 Jun 2000, andrewm + - Backed out the PPC defines. + - Use del_timer_sync(), mod_timer(). + - Fix wrapped ulong comparison in boomerang_rx() + - Add IS_TORNADO, use it to suppress 3c905C checksum error msg + (Donald Becker, I Lee Hetherington ) + - Replace union wn3_config with BFINS/BFEXT manipulation for + sparc64 (Pete Zaitcev, Peter Jones) + - In vortex_error, do_tx_reset and vortex_tx_timeout(Vortex): + do a netif_wake_queue() to better recover from errors. (Anders Pedersen, + Donald Becker) + - Print a warning on out-of-memory (rate limited to 1 per 10 secs) + - Added two more Cardbus 575 NICs: 5b57 and 6564 (Paul Wagland) + + LK1.1.7 2 Jul 2000 andrewm + - Better handling of shared IRQs + - Reset the transmitter on a Tx reclaim error + - Fixed crash under OOM during vortex_open() (Mark Hemment) + - Fix Rx cessation problem during OOM (help from Mark Hemment) + - The spinlocks around the mdio access were blocking interrupts for 300uS. + Fix all this to use spin_lock_bh() within mdio_read/write + - Only write to TxFreeThreshold if it's a boomerang - other NICs don't + have one. + - Added 802.3x MAC-layer flow control support + + LK1.1.8 13 Aug 2000 andrewm + - Ignore request_region() return value - already reserved if Cardbus. + - Merged some additional Cardbus flags from Don's 0.99Qk + - Some fixes for 3c556 (Fred Maciel) + - Fix for EISA initialisation (Jan Rekorajski) + - Renamed MII_XCVR_PWR and EEPROM_230 to align with 3c575_cb and D. Becker's drivers + - Fixed MII_XCVR_PWR for 3CCFE575CT + - Added INVERT_LED_PWR, used it. + - Backed out the extra_reset stuff + + LK1.1.9 12 Sep 2000 andrewm + - Backed out the tx_reset_resume flags. It was a no-op. + - In vortex_error, don't reset the Tx on txReclaim errors + - In vortex_error, don't reset the Tx on maxCollisions errors. + Hence backed out all the DownListPtr logic here. + - In vortex_error, give Tornado cards a partial TxReset on + maxCollisions (David Hinds). Defined MAX_COLLISION_RESET for this. + - Redid some driver flags and device names based on pcmcia_cs-3.1.20. + - Fixed a bug where, if vp->tx_full is set when the interface + is downed, it remains set when the interface is upped. Bad + things happen. + + LK1.1.10 17 Sep 2000 andrewm + - Added EEPROM_8BIT for 3c555 (Fred Maciel) + - Added experimental support for the 3c556B Laptop Hurricane (Louis Gerbarg) + - Add HAS_NWAY to "3c900 Cyclone 10Mbps TPO" + + LK1.1.11 13 Nov 2000 andrewm + - Dump MOD_INC/DEC_USE_COUNT, use SET_MODULE_OWNER + + LK1.1.12 1 Jan 2001 andrewm (2.4.0-pre1) + - Call pci_enable_device before we request our IRQ (Tobias Ringstrom) + - Add 3c590 PCI latency timer hack to vortex_probe1 (from 0.99Ra) + - Added extended issue_and_wait for the 3c905CX. + - Look for an MII on PHY index 24 first (3c905CX oddity). + - Add HAS_NWAY to 3cSOHO100-TX (Brett Frankenberger) + - Don't free skbs we don't own on oom path in vortex_open(). + + LK1.1.13 27 Jan 2001 + - Added explicit `medialock' flag so we can truly + lock the media type down with `options'. + - "check ioremap return and some tidbits" (Arnaldo Carvalho de Melo ) + - Added and used EEPROM_NORESET for 3c556B PM resumes. + - Fixed leakage of vp->rx_ring. + - Break out separate HAS_HWCKSM device capability flag. + - Kill vp->tx_full (ANK) + - Merge zerocopy fragment handling (ANK?) + + LK1.1.14 15 Feb 2001 + - Enable WOL. Can be turned on with `enable_wol' module option. + - EISA and PCI initialisation fixes (jgarzik, Manfred Spraul) + - If a device's internalconfig register reports it has NWAY, + use it, even if autoselect is enabled. + + LK1.1.15 6 June 2001 akpm + - Prevent double counting of received bytes (Lars Christensen) + - Add ethtool support (jgarzik) + - Add module parm descriptions (Andrzej M. Krzysztofowicz) + - Implemented alloc_etherdev() API + - Special-case the 'Tx error 82' message. + + LK1.1.16 18 July 2001 akpm + - Make NETIF_F_SG dependent upon nr_free_highpages(), not on CONFIG_HIGHMEM + - Lessen verbosity of bootup messages + - Fix WOL - use new PM API functions. + - Use netif_running() instead of vp->open in suspend/resume. + - Don't reset the interface logic on open/close/rmmod. It upsets + autonegotiation, and hence DHCP (from 0.99T). + - Back out EEPROM_NORESET flag because of the above (we do it for all + NICs). + - Correct 3c982 identification string + - Rename wait_for_completion() to issue_and_wait() to avoid completion.h + clash. + + LK1.1.17 18Dec01 akpm + - PCI ID 9805 is a Python-T, not a dual-port Cyclone. Apparently. + And it has NWAY. + - Mask our advertised modes (vp->advertising) with our capabilities + (MII reg5) when deciding which duplex mode to use. + - Add `global_options' as default for options[]. Ditto global_enable_wol, + global_full_duplex. + + LK1.1.18 01Jul02 akpm + - Fix for undocumented transceiver power-up bit on some 3c566B's + (Donald Becker, Rahul Karnik) + + - See http://www.zip.com.au/~akpm/linux/#3c59x-2.3 for more details. + - Also see Documentation/networking/vortex.txt + + LK1.1.19 10Nov02 Marc Zyngier + - EISA sysfs integration. +*/ [...2982 lines suppressed...] + outw(MDIO_DATA_WRITE1 | MDIO_SHIFT_CLK, mdio_addr); + mdio_delay(); + } +} + +static int mdio_read(struct net_device *dev, int phy_id, int location) +{ + int i; + long ioaddr = dev->base_addr; + int read_cmd = (0xf6 << 10) | (phy_id << 5) | location; + unsigned int retval = 0; + long mdio_addr = ioaddr + Wn4_PhysicalMgmt; + + if (mii_preamble_required) + mdio_sync(ioaddr, 32); + + /* Shift the read command bits out. */ + for (i = 14; i >= 0; i--) { + int dataval = (read_cmd&(1< 0; i--) { + outw(MDIO_ENB_IN, mdio_addr); + mdio_delay(); + retval = (retval << 1) | ((inw(mdio_addr) & MDIO_DATA_READ) ? 1 : 0); + outw(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr); + mdio_delay(); + } + return retval & 0x20000 ? 0xffff : retval>>1 & 0xffff; +} + +static void mdio_write(struct net_device *dev, int phy_id, int location, int value) +{ + long ioaddr = dev->base_addr; + int write_cmd = 0x50020000 | (phy_id << 23) | (location << 18) | value; + long mdio_addr = ioaddr + Wn4_PhysicalMgmt; + int i; + + if (mii_preamble_required) + mdio_sync(ioaddr, 32); + + /* Shift the command bits out. */ + for (i = 31; i >= 0; i--) { + int dataval = (write_cmd&(1<= 0; i--) { + outw(MDIO_ENB_IN, mdio_addr); + mdio_delay(); + outw(MDIO_ENB_IN | MDIO_SHIFT_CLK, mdio_addr); + mdio_delay(); + } + return; +} + +/* ACPI: Advanced Configuration and Power Interface. */ +/* Set Wake-On-LAN mode and put the board into D3 (power-down) state. */ +static void acpi_set_WOL(struct net_device *dev) +{ + struct vortex_private *vp = netdev_priv(dev); + long ioaddr = dev->base_addr; + + if (vp->enable_wol) { + /* Power up on: 1==Downloaded Filter, 2==Magic Packets, 4==Link Status. */ + EL3WINDOW(7); + outw(2, ioaddr + 0x0c); + /* The RxFilter must accept the WOL frames. */ + outw(SetRxFilter|RxStation|RxMulticast|RxBroadcast, ioaddr + EL3_CMD); + outw(RxEnable, ioaddr + EL3_CMD); + + pci_enable_wake(VORTEX_PCI(vp), 0, 1); + + /* Change the power state to D3; RxEnable doesn't take effect. */ + pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot); + } +} + + +static void __devexit vortex_remove_one (struct pci_dev *pdev) +{ + struct net_device *dev = pci_get_drvdata(pdev); + struct vortex_private *vp; + + if (!dev) { + printk("vortex_remove_one called for Compaq device!\n"); + BUG(); + } + + vp = netdev_priv(dev); + + /* AKPM: FIXME: we should have + * if (vp->cb_fn_base) iounmap(vp->cb_fn_base); + * here + */ + unregister_netdev(dev); + + if (VORTEX_PCI(vp)) { + pci_set_power_state(VORTEX_PCI(vp), PCI_D0); /* Go active */ + if (vp->pm_state_valid) + pci_restore_state(VORTEX_PCI(vp)); + pci_disable_device(VORTEX_PCI(vp)); + } + /* Should really use issue_and_wait() here */ + outw(TotalReset | ((vp->drv_flags & EEPROM_RESET) ? 0x04 : 0x14), + dev->base_addr + EL3_CMD); + + pci_free_consistent(pdev, + sizeof(struct boom_rx_desc) * RX_RING_SIZE + + sizeof(struct boom_tx_desc) * TX_RING_SIZE, + vp->rx_ring, + vp->rx_ring_dma); + if (vp->must_free_region) + release_region(dev->base_addr, vp->io_size); + free_netdev(dev); +} + + +static struct pci_driver vortex_driver = { + .name = "3c59x", + .probe = vortex_init_one, + .remove = __devexit_p(vortex_remove_one), + .id_table = vortex_pci_tbl, +#ifdef CONFIG_PM + .suspend = vortex_suspend, + .resume = vortex_resume, +#endif +}; + + +static int vortex_have_pci; +static int vortex_have_eisa; + + +static int __init vortex_init (void) +{ + int pci_rc, eisa_rc; + + pci_rc = pci_module_init(&vortex_driver); + eisa_rc = vortex_eisa_init(); + + if (pci_rc == 0) + vortex_have_pci = 1; + if (eisa_rc > 0) + vortex_have_eisa = 1; + + return (vortex_have_pci + vortex_have_eisa) ? 0 : -ENODEV; +} + + +static void __exit vortex_eisa_cleanup (void) +{ + struct vortex_private *vp; + long ioaddr; + +#ifdef CONFIG_EISA + /* Take care of the EISA devices */ + eisa_driver_unregister (&vortex_eisa_driver); +#endif + + if (compaq_net_device) { + vp = compaq_net_device->priv; + ioaddr = compaq_net_device->base_addr; + + unregister_netdev (compaq_net_device); + outw (TotalReset, ioaddr + EL3_CMD); + release_region (ioaddr, VORTEX_TOTAL_SIZE); + + free_netdev (compaq_net_device); + } +} + + +static void __exit vortex_cleanup (void) +{ + if (vortex_have_pci) + pci_unregister_driver (&vortex_driver); + if (vortex_have_eisa) + vortex_eisa_cleanup (); +} + + +module_init(vortex_init); +module_exit(vortex_cleanup); + + +/* + * Local variables: + * c-indent-level: 4 + * c-basic-offset: 4 + * tab-width: 4 + * End: + */ jwltest-acpi-dsdt-initrd.patch: drivers/acpi/Kconfig | 13 +++++ drivers/acpi/osl.c | 104 +++++++++++++++++++++++++++++++++++++++----- drivers/acpi/tables/tbget.c | 5 ++ init/main.c | 16 +++--- 4 files changed, 120 insertions(+), 18 deletions(-) --- NEW FILE jwltest-acpi-dsdt-initrd.patch --- --- linux-2.6.14/drivers/acpi/Kconfig.orig 2005-11-07 15:45:19.000000000 -0500 +++ linux-2.6.14/drivers/acpi/Kconfig 2005-11-07 15:45:27.000000000 -0500 @@ -341,4 +341,17 @@ config ACPI_HOTPLUG_MEMORY $>modprobe acpi_memhotplug endif # ACPI +config ACPI_INITRD + bool "Read DSDT from initrd or initramfs" + depends on ACPI && BLK_DEV_INITRD && !ACPI_CUSTOM_DSDT + default n + help + The DSDT (Differentiated System Description Table) often needs to be + overridden because of broken BIOS implementations. If you want to use + a customized DSDT, please use the mkinitrd tool (mkinitrd package) to + attach the DSDT to the initrd or initramfs + (see http://gaugusch.at/kernel.shtml for details) + If there is no DSDT found in the initrd, the DSDT from the BIOS is + used. It is save to say yes here. + endmenu --- linux-2.6.14/drivers/acpi/osl.c.orig 2005-11-07 15:45:19.000000000 -0500 +++ linux-2.6.14/drivers/acpi/osl.c 2005-11-07 15:45:27.000000000 -0500 @@ -44,6 +44,10 @@ #include #include +#ifdef CONFIG_ACPI_INITRD +#include +#include +#endif #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("osl") @@ -244,24 +248,104 @@ acpi_os_predefined_override(const struct return AE_OK; } +#ifdef CONFIG_ACPI_INITRD +static char * +acpi_find_dsdt_initrd(void) +{ + static const char signature[] = "INITRDDSDT123DSDT123"; + char *dsdt_start = NULL; + char *dsdt_buffer = NULL; + unsigned long len = 0, len2 = 0; + int fd; + char ramfs_dsdt_name[10] = "/DSDT.aml"; + struct kstat stat; + + /* try to get dsdt from tail of initrd */ + if ((fd = sys_open(ramfs_dsdt_name, O_RDONLY, 0)) < 0) { + if (initrd_start) { + char *data = (char *)initrd_start; + + printk(KERN_INFO PREFIX "Looking for DSDT in initrd..."); + + /* Search for the start signature */ + while (data < (char *)initrd_end - sizeof(signature) - 4) { + if (!memcmp(data, signature, sizeof(signature))) { + data += sizeof(signature); + if (!memcmp(data, "DSDT", 4)) + dsdt_start = data; + break; + } + data++; + } + + if (dsdt_start){ + printk(PREFIX " found at offset %zu", + dsdt_start - (char *)initrd_start); + len = (char*) initrd_end - dsdt_start; + printk(", size: %zu bytes\n", len); + dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1); + memcpy(dsdt_buffer, dsdt_start, len); + *(dsdt_buffer + len + 1)= '\0'; + } + else + printk(" not found!\n"); + } + } + /* get dsdt from initramfs */ + else{ + printk(KERN_INFO PREFIX "Looking for DSDT in initramfs..."); + if (vfs_stat(ramfs_dsdt_name, &stat) < 0){ + printk ("error getting stats for file %s\n", ramfs_dsdt_name); + return NULL; + } + + len = stat.size; + dsdt_buffer = ACPI_MEM_ALLOCATE(len + 1); + if (!dsdt_buffer) { + printk("Could not allocate %lu bytes of memory\n", len); + return NULL; + } + printk (" found %s ...", ramfs_dsdt_name); + + len2 = sys_read (fd, (char __user *) dsdt_buffer, len); + if (len2 < len ){ + printk(PREFIX "\nError trying to read %lu bytes from %s\n", + len, ramfs_dsdt_name); + ACPI_MEM_FREE (dsdt_buffer); + dsdt_buffer = NULL; + } + else{ + printk(" successfully read %lu bytes from %s\n", + len, ramfs_dsdt_name); + *(dsdt_buffer + len + 1) = '\0'; + } + } + if (!dsdt_buffer) + printk(" not found!\n"); + return dsdt_buffer; +} +#endif + acpi_status -acpi_os_table_override(struct acpi_table_header * existing_table, - struct acpi_table_header ** new_table) +acpi_os_table_override (struct acpi_table_header *existing_table, + struct acpi_table_header **new_table) { if (!existing_table || !new_table) return AE_BAD_PARAMETER; - -#ifdef CONFIG_ACPI_CUSTOM_DSDT - if (strncmp(existing_table->signature, "DSDT", 4) == 0) - *new_table = (struct acpi_table_header *)AmlCode; - else - *new_table = NULL; -#else + *new_table = NULL; + if (strncmp(existing_table->signature, "DSDT", 4) == 0) { +#ifdef CONFIG_ACPI_CUSTOM_DSDT + *new_table = (struct acpi_table_header*)AmlCode; +#elif defined(CONFIG_ACPI_INITRD) + *new_table = (struct acpi_table_header*)acpi_find_dsdt_initrd(); #endif + if (*new_table) + printk(KERN_INFO PREFIX "Using customized DSDT\n"); + } return AE_OK; } - + static irqreturn_t acpi_irq(int irq, void *dev_id, struct pt_regs *regs) { return (*acpi_irq_handler) (acpi_irq_context) ? IRQ_HANDLED : IRQ_NONE; --- linux-2.6.14/drivers/acpi/tables/tbget.c.orig 2005-11-07 15:46:15.000000000 -0500 +++ linux-2.6.14/drivers/acpi/tables/tbget.c 2005-11-07 15:46:08.000000000 -0500 @@ -283,6 +283,11 @@ acpi_tb_table_override(struct acpi_table ACPI_REPORT_INFO(("Table [%4.4s] replaced by host OS\n", table_info->pointer->signature)); +#ifdef CONFIG_ACPI_INITRD + if (new_table) + ACPI_MEM_FREE(new_table); +#endif + return_ACPI_STATUS(AE_OK); } --- linux-2.6.14/init/main.c.orig 2005-11-07 15:45:19.000000000 -0500 +++ linux-2.6.14/init/main.c 2005-11-07 15:45:27.000000000 -0500 @@ -540,8 +540,6 @@ asmlinkage void __init start_kernel(void check_bugs(); - acpi_early_init(); /* before LAPIC and SMP init */ - /* Do the rest non-__init'ed, we're now alive */ rest_init(); } @@ -671,6 +669,14 @@ static int init(void * unused) */ child_reaper = current; + /* + * Do this before initcalls, because some drivers want to access + * firmware files. + */ + populate_rootfs(); + + acpi_early_init(); /* before LAPIC and SMP init */ + /* Sets up cpus_possible() */ smp_prepare_cpus(max_cpus); @@ -682,12 +688,6 @@ static int init(void * unused) cpuset_init_smp(); - /* - * Do this before initcalls, because some drivers want to access - * firmware files. - */ - populate_rootfs(); - do_basic_setup(); /* jwltest-mii-force_media.patch: mii.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) --- NEW FILE jwltest-mii-force_media.patch --- --- linux-2.6.15/drivers/net/mii.c.orig 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/drivers/net/mii.c 2006-01-09 13:49:32.000000000 -0500 @@ -266,10 +266,6 @@ unsigned int mii_check_media (struct mii int advertise, lpa, media, duplex; int lpa2 = 0; - /* if forced media, go no further */ - if (mii->force_media) - return 0; /* duplex did not change */ - /* check current and old link status */ old_carrier = netif_carrier_ok(mii->dev) ? 1 : 0; new_carrier = (unsigned int) mii_link_ok(mii); @@ -293,6 +289,13 @@ unsigned int mii_check_media (struct mii */ netif_carrier_on(mii->dev); + /* if forced media, go no further */ + if (mii->force_media) { + if (ok_to_print) + printk(KERN_INFO "%s: link up\n", mii->dev->name); + return 0; /* duplex did not change */ + } + /* get MII advertise and LPA values */ if ((!init_media) && (mii->advertising)) advertise = mii->advertising; jwltest-sky2.patch: Kconfig | 18 Makefile | 1 sky2.c | 3040 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sky2.h | 1910 ++++++++++++++++++++++++++++++++++++ sky2_compat.h | 6 5 files changed, 4975 insertions(+) --- NEW FILE jwltest-sky2.patch --- --- linux-2.6.14/drivers/net/sky2.h.orig 2005-11-14 09:45:48.000000000 -0500 +++ linux-2.6.14/drivers/net/sky2.h 2005-11-14 09:45:56.000000000 -0500 @@ -0,0 +1,1910 @@ +/* + * Definitions for the new Marvell Yukon 2 driver. + */ +#ifndef _SKY2_H +#define _SKY2_H + +/* PCI config registers */ +#define PCI_DEV_REG1 0x40 +#define PCI_DEV_REG2 0x44 +#define PCI_DEV_STATUS 0x7c +#define PCI_OS_PCI_X (1<<26) + +#define PEX_LNK_STAT 0xf2 +#define PEX_UNC_ERR_STAT 0x104 +#define PEX_DEV_CTRL 0xe8 + +/* Yukon-2 */ +enum pci_dev_reg_1 { + PCI_Y2_PIG_ENA = 1<<31, /* Enable Plug-in-Go (YUKON-2) */ + PCI_Y2_DLL_DIS = 1<<30, /* Disable PCI DLL (YUKON-2) */ + PCI_Y2_PHY2_COMA = 1<<29, /* Set PHY 2 to Coma Mode (YUKON-2) */ + PCI_Y2_PHY1_COMA = 1<<28, /* Set PHY 1 to Coma Mode (YUKON-2) */ + PCI_Y2_PHY2_POWD = 1<<27, /* Set PHY 2 to Power Down (YUKON-2) */ + PCI_Y2_PHY1_POWD = 1<<26, /* Set PHY 1 to Power Down (YUKON-2) */ +}; + +enum pci_dev_reg_2 { + PCI_VPD_WR_THR = 0xffL<<24, /* Bit 31..24: VPD Write Threshold */ + PCI_DEV_SEL = 0x7fL<<17, /* Bit 23..17: EEPROM Device Select */ + PCI_VPD_ROM_SZ = 7L<<14, /* Bit 16..14: VPD ROM Size */ + + PCI_PATCH_DIR = 0xfL<<8, /* Bit 11.. 8: Ext Patches dir 3..0 */ + PCI_EXT_PATCHS = 0xfL<<4, /* Bit 7.. 4: Extended Patches 3..0 */ + PCI_EN_DUMMY_RD = 1<<3, /* Enable Dummy Read */ + PCI_REV_DESC = 1<<2, /* Reverse Desc. Bytes */ + + PCI_USEDATA64 = 1<<0, /* Use 64Bit Data bus ext */ +}; + + +#define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \ + PCI_STATUS_SIG_SYSTEM_ERROR | \ + PCI_STATUS_REC_MASTER_ABORT | \ + PCI_STATUS_REC_TARGET_ABORT | \ + PCI_STATUS_PARITY) + +enum pex_dev_ctrl { + PEX_DC_MAX_RRS_MSK = 7<<12, /* Bit 14..12: Max. Read Request Size */ + PEX_DC_EN_NO_SNOOP = 1<<11,/* Enable No Snoop */ + PEX_DC_EN_AUX_POW = 1<<10,/* Enable AUX Power */ + PEX_DC_EN_PHANTOM = 1<<9, /* Enable Phantom Functions */ + PEX_DC_EN_EXT_TAG = 1<<8, /* Enable Extended Tag Field */ + PEX_DC_MAX_PLS_MSK = 7<<5, /* Bit 7.. 5: Max. Payload Size Mask */ + PEX_DC_EN_REL_ORD = 1<<4, /* Enable Relaxed Ordering */ + PEX_DC_EN_UNS_RQ_RP = 1<<3, /* Enable Unsupported Request Reporting */ + PEX_DC_EN_FAT_ER_RP = 1<<2, /* Enable Fatal Error Reporting */ + PEX_DC_EN_NFA_ER_RP = 1<<1, /* Enable Non-Fatal Error Reporting */ + PEX_DC_EN_COR_ER_RP = 1<<0, /* Enable Correctable Error Reporting */ +}; +#define PEX_DC_MAX_RD_RQ_SIZE(x) (((x)<<12) & PEX_DC_MAX_RRS_MSK) + +/* PEX_UNC_ERR_STAT PEX Uncorrectable Errors Status Register (Yukon-2) */ +enum pex_err { + PEX_UNSUP_REQ = 1<<20, /* Unsupported Request Error */ + + PEX_MALFOR_TLP = 1<<18, /* Malformed TLP */ + + PEX_UNEXP_COMP = 1<<16, /* Unexpected Completion */ + + PEX_COMP_TO = 1<<14, /* Completion Timeout */ + PEX_FLOW_CTRL_P = 1<<13, /* Flow Control Protocol Error */ + PEX_POIS_TLP = 1<<12, /* Poisoned TLP */ + + PEX_DATA_LINK_P = 1<<4, /* Data Link Protocol Error */ + PEX_FATAL_ERRORS= (PEX_MALFOR_TLP | PEX_FLOW_CTRL_P | PEX_DATA_LINK_P), +}; + + +enum csr_regs { + B0_RAP = 0x0000, + B0_CTST = 0x0004, + B0_Y2LED = 0x0005, + B0_POWER_CTRL = 0x0007, + B0_ISRC = 0x0008, + B0_IMSK = 0x000c, + B0_HWE_ISRC = 0x0010, + B0_HWE_IMSK = 0x0014, + + /* Special ISR registers (Yukon-2 only) */ + B0_Y2_SP_ISRC2 = 0x001c, + B0_Y2_SP_ISRC3 = 0x0020, + B0_Y2_SP_EISR = 0x0024, + B0_Y2_SP_LISR = 0x0028, + B0_Y2_SP_ICR = 0x002c, + + B2_MAC_1 = 0x0100, + B2_MAC_2 = 0x0108, + B2_MAC_3 = 0x0110, + B2_CONN_TYP = 0x0118, + B2_PMD_TYP = 0x0119, + B2_MAC_CFG = 0x011a, + B2_CHIP_ID = 0x011b, + B2_E_0 = 0x011c, + + B2_Y2_CLK_GATE = 0x011d, + B2_Y2_HW_RES = 0x011e, + B2_E_3 = 0x011f, + B2_Y2_CLK_CTRL = 0x0120, + + B2_TI_INI = 0x0130, + B2_TI_VAL = 0x0134, + B2_TI_CTRL = 0x0138, + B2_TI_TEST = 0x0139, + + B2_TST_CTRL1 = 0x0158, + B2_TST_CTRL2 = 0x0159, + B2_GP_IO = 0x015c, + + B2_I2C_CTRL = 0x0160, + B2_I2C_DATA = 0x0164, + B2_I2C_IRQ = 0x0168, + B2_I2C_SW = 0x016c, + + B3_RAM_ADDR = 0x0180, + B3_RAM_DATA_LO = 0x0184, + B3_RAM_DATA_HI = 0x0188, + +/* RAM Interface Registers */ +/* Yukon-2: use RAM_BUFFER() to access the RAM buffer */ +/* + * The HW-Spec. calls this registers Timeout Value 0..11. But this names are + * not usable in SW. Please notice these are NOT real timeouts, these are + * the number of qWords transferred continuously. + */ +#define RAM_BUFFER(port, reg) (reg | (port <<6)) + + B3_RI_WTO_R1 = 0x0190, + B3_RI_WTO_XA1 = 0x0191, + B3_RI_WTO_XS1 = 0x0192, + B3_RI_RTO_R1 = 0x0193, + B3_RI_RTO_XA1 = 0x0194, + B3_RI_RTO_XS1 = 0x0195, + B3_RI_WTO_R2 = 0x0196, + B3_RI_WTO_XA2 = 0x0197, + B3_RI_WTO_XS2 = 0x0198, + B3_RI_RTO_R2 = 0x0199, + B3_RI_RTO_XA2 = 0x019a, + B3_RI_RTO_XS2 = 0x019b, + B3_RI_TO_VAL = 0x019c, + B3_RI_CTRL = 0x01a0, + B3_RI_TEST = 0x01a2, + B3_MA_TOINI_RX1 = 0x01b0, + B3_MA_TOINI_RX2 = 0x01b1, + B3_MA_TOINI_TX1 = 0x01b2, + B3_MA_TOINI_TX2 = 0x01b3, + B3_MA_TOVAL_RX1 = 0x01b4, + B3_MA_TOVAL_RX2 = 0x01b5, + B3_MA_TOVAL_TX1 = 0x01b6, + B3_MA_TOVAL_TX2 = 0x01b7, + B3_MA_TO_CTRL = 0x01b8, + B3_MA_TO_TEST = 0x01ba, + B3_MA_RCINI_RX1 = 0x01c0, + B3_MA_RCINI_RX2 = 0x01c1, + B3_MA_RCINI_TX1 = 0x01c2, + B3_MA_RCINI_TX2 = 0x01c3, + B3_MA_RCVAL_RX1 = 0x01c4, + B3_MA_RCVAL_RX2 = 0x01c5, + B3_MA_RCVAL_TX1 = 0x01c6, + B3_MA_RCVAL_TX2 = 0x01c7, + B3_MA_RC_CTRL = 0x01c8, + B3_MA_RC_TEST = 0x01ca, + B3_PA_TOINI_RX1 = 0x01d0, + B3_PA_TOINI_RX2 = 0x01d4, + B3_PA_TOINI_TX1 = 0x01d8, + B3_PA_TOINI_TX2 = 0x01dc, + B3_PA_TOVAL_RX1 = 0x01e0, + B3_PA_TOVAL_RX2 = 0x01e4, + B3_PA_TOVAL_TX1 = 0x01e8, + B3_PA_TOVAL_TX2 = 0x01ec, + B3_PA_CTRL = 0x01f0, + B3_PA_TEST = 0x01f2, + + Y2_CFG_SPC = 0x1c00, +}; + +/* B0_CTST 16 bit Control/Status register */ +enum { + Y2_VMAIN_AVAIL = 1<<17,/* VMAIN available (YUKON-2 only) */ + Y2_VAUX_AVAIL = 1<<16,/* VAUX available (YUKON-2 only) */ + Y2_ASF_ENABLE = 1<<13,/* ASF Unit Enable (YUKON-2 only) */ + Y2_ASF_DISABLE = 1<<12,/* ASF Unit Disable (YUKON-2 only) */ + Y2_CLK_RUN_ENA = 1<<11,/* CLK_RUN Enable (YUKON-2 only) */ + Y2_CLK_RUN_DIS = 1<<10,/* CLK_RUN Disable (YUKON-2 only) */ + Y2_LED_STAT_ON = 1<<9, /* Status LED On (YUKON-2 only) */ + Y2_LED_STAT_OFF = 1<<8, /* Status LED Off (YUKON-2 only) */ + [...4603 lines suppressed...] + goto err_out_free_regions; + } + + memset(hw, 0, sizeof(*hw)); + hw->pdev = pdev; + spin_lock_init(&hw->phy_lock); + + hw->regs = ioremap_nocache(pci_resource_start(pdev, 0), 0x4000); + if (!hw->regs) { + printk(KERN_ERR PFX "%s: cannot map device registers\n", + pci_name(pdev)); + goto err_out_free_hw; + } + hw->pm_cap = pm_cap; + + err = sky2_reset(hw); + if (err) + goto err_out_iounmap; + + printk(KERN_INFO PFX "addr 0x%lx irq %d Yukon-%s (0x%x) rev %d\n", + pci_resource_start(pdev, 0), pdev->irq, + yukon_name[hw->chip_id - CHIP_ID_YUKON], + hw->chip_id, hw->chip_rev); + + dev = sky2_init_netdev(hw, 0, using_dac); + if (!dev) + goto err_out_free_pci; + + err = register_netdev(dev); + if (err) { + printk(KERN_ERR PFX "%s: cannot register net device\n", + pci_name(pdev)); + goto err_out_free_netdev; + } + + sky2_show_addr(dev); + + if (hw->ports > 1 && (dev1 = sky2_init_netdev(hw, 1, using_dac))) { + if (register_netdev(dev1) == 0) + sky2_show_addr(dev1); + else { + /* Failure to register second port need not be fatal */ + printk(KERN_WARNING PFX + "register of second port failed\n"); + hw->dev[1] = NULL; + free_netdev(dev1); + } + } + + err = request_irq(pdev->irq, sky2_intr, SA_SHIRQ, DRV_NAME, hw); + if (err) { + printk(KERN_ERR PFX "%s: cannot assign irq %d\n", + pci_name(pdev), pdev->irq); + goto err_out_unregister; + } + + hw->intr_mask = Y2_IS_BASE; + sky2_write32(hw, B0_IMSK, hw->intr_mask); + + pci_set_drvdata(pdev, hw); + + return 0; + +err_out_unregister: + if (dev1) { + unregister_netdev(dev1); + free_netdev(dev1); + } + unregister_netdev(dev); +err_out_free_netdev: + free_netdev(dev); +err_out_free_pci: + sky2_write8(hw, B0_CTST, CS_RST_SET); + pci_free_consistent(hw->pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma); +err_out_iounmap: + iounmap(hw->regs); +err_out_free_hw: + kfree(hw); +err_out_free_regions: + pci_release_regions(pdev); + pci_disable_device(pdev); +err_out: + return err; +} + +static void __devexit sky2_remove(struct pci_dev *pdev) +{ + struct sky2_hw *hw = pci_get_drvdata(pdev); + struct net_device *dev0, *dev1; + + if (!hw) + return; + + dev0 = hw->dev[0]; + dev1 = hw->dev[1]; + if (dev1) + unregister_netdev(dev1); + unregister_netdev(dev0); + + sky2_write32(hw, B0_IMSK, 0); + sky2_set_power_state(hw, PCI_D3hot); + sky2_write16(hw, B0_Y2LED, LED_STAT_OFF); + sky2_write8(hw, B0_CTST, CS_RST_SET); + sky2_read8(hw, B0_CTST); + + free_irq(pdev->irq, hw); + pci_free_consistent(pdev, STATUS_LE_BYTES, hw->st_le, hw->st_dma); + pci_release_regions(pdev); + pci_disable_device(pdev); + + if (dev1) + free_netdev(dev1); + free_netdev(dev0); + iounmap(hw->regs); + kfree(hw); + + pci_set_drvdata(pdev, NULL); +} + +#ifdef CONFIG_PM +static int sky2_suspend(struct pci_dev *pdev, pm_message_t state) +{ + struct sky2_hw *hw = pci_get_drvdata(pdev); + int i; + + for (i = 0; i < 2; i++) { + struct net_device *dev = hw->dev[i]; + + if (dev) { + if (!netif_running(dev)) + continue; + + sky2_down(dev); + netif_device_detach(dev); + } + } + + return sky2_set_power_state(hw, pci_choose_state(pdev, state)); +} + +static int sky2_resume(struct pci_dev *pdev) +{ + struct sky2_hw *hw = pci_get_drvdata(pdev); + int i; + + pci_restore_state(pdev); + pci_enable_wake(pdev, PCI_D0, 0); + sky2_set_power_state(hw, PCI_D0); + + sky2_reset(hw); + + for (i = 0; i < 2; i++) { + struct net_device *dev = hw->dev[i]; + if (dev) { + if (netif_running(dev)) { + netif_device_attach(dev); + sky2_up(dev); + } + } + } + return 0; +} +#endif + +static struct pci_driver sky2_driver = { + .name = DRV_NAME, + .id_table = sky2_id_table, + .probe = sky2_probe, + .remove = __devexit_p(sky2_remove), +#ifdef CONFIG_PM + .suspend = sky2_suspend, + .resume = sky2_resume, +#endif +}; + +static int __init sky2_init_module(void) +{ + return pci_module_init(&sky2_driver); +} + +static void __exit sky2_cleanup_module(void) +{ + pci_unregister_driver(&sky2_driver); +} + +module_init(sky2_init_module); +module_exit(sky2_cleanup_module); + +MODULE_DESCRIPTION("Marvell Yukon 2 Gigabit Ethernet driver"); +MODULE_AUTHOR("Stephen Hemminger "); +MODULE_LICENSE("GPL"); --- linux-2.6.14/drivers/net/sky2_compat.h.orig 2005-11-14 09:56:09.000000000 -0500 +++ linux-2.6.14/drivers/net/sky2_compat.h 2005-11-14 09:56:02.000000000 -0500 @@ -0,0 +1,6 @@ +#ifndef __SKY2_COMPAT_H__ +#define __SKY2_COMPAT_H__ + +#define netif_rx_schedule_test(dev) netif_rx_schedule_prep(dev) + +#endif /* __SKY2_COMPAT_H__ */ jwltest-tulip-last_irq.patch: tulip_core.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE jwltest-tulip-last_irq.patch --- --- linux-2.6.14/drivers/net/tulip/tulip_core.c.orig 2005-12-13 15:31:26.000000000 -0500 +++ linux-2.6.14/drivers/net/tulip/tulip_core.c 2005-12-13 15:31:20.000000000 -0500 @@ -1564,7 +1564,7 @@ static int __devinit tulip_init_one (str dev->dev_addr, 6); } #endif -#if defined(__i386__) /* Patch up x86 BIOS bug. */ +#if defined(__i386__) || defined(__x86_64__) /* Patch up x86 BIOS bug. */ if (last_irq) irq = last_irq; #endif jwltest-via-velocity-tx_csum.patch: via-velocity.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE jwltest-via-velocity-tx_csum.patch --- --- linux-2.6.14/drivers/net/via-velocity.c.orig 2005-11-29 15:41:12.000000000 -0500 +++ linux-2.6.14/drivers/net/via-velocity.c 2005-11-29 15:41:47.000000000 -0500 @@ -792,7 +792,7 @@ static int __devinit velocity_found1(str #endif if (vptr->flags & VELOCITY_FLAGS_TX_CSUM) { - dev->features |= NETIF_F_HW_CSUM; + dev->features |= NETIF_F_IP_CSUM; } ret = register_netdev(dev); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1571 retrieving revision 1.1571.2.1 diff -u -r1.1571 -r1.1571.2.1 --- kernel-2.6.spec 7 Jan 2006 04:20:10 -0000 1.1571 +++ kernel-2.6.spec 9 Jan 2006 18:53:01 -0000 1.1571.2.1 @@ -19,7 +19,8 @@ %define sublevel 15 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) +#%define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) +%define rhbsys .jwltest.29 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC4%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -157,7 +158,8 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 sparc sparc64 +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -230,6 +232,7 @@ Patch305: linux-2.6-powerpc-parport.patch # 400 - 499 ia64 + # 500 - 599 s390(x) # 600 - 699 sparc(64) @@ -312,6 +315,11 @@ # NIC driver updates Patch1301: linux-2.6-net-sundance-ip100A.patch +Patch1302: jwltest-sky2.patch +Patch1303: jwltest-via-velocity-tx_csum.patch +Patch1304: jwltest-3c59x-2_6_12-1_1456_FC4.patch +Patch1305: jwltest-tulip-last_irq.patch +Patch1306: jwltest-mii-force_media.patch # Netdump and Diskdump bits. Patch1500: linux-2.6-crashdump-common.patch @@ -366,6 +374,8 @@ # ACPI patches. Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch +Patch2200: jwltest-acpi-dsdt-initrd.patch + # # 10000 to 20000 is for stuff that has to come last due to the # amount of drivers they touch. But only these should go here. @@ -588,6 +598,10 @@ %patch304 -p1 %patch305 -p1 +# +# ia64 +# + # # Xen # @@ -717,6 +731,16 @@ # NIC driver fixes. # New PCI ID for sundance driver. %patch1301 -p1 +# add sky2 driver from upstream +%patch1302 -p1 +# via-velocity tx_csum only works for IPv4 +%patch1303 -p1 +# include 3c59x from 2.6.12-1.1456_FC4 for some testing +%patch1304 -p1 +# apply bios work-around for tulip to x86_64 as well as i386 +%patch1305 -p1 +# fix link state change bug w/ generic mii +%patch1306 -p1 # netdump bits %patch1500 -p1 @@ -808,6 +832,9 @@ # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. %patch2100 -p1 +# Add DSDT override from initrd +%patch2200 -p1 + # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream From fedora-cvs-commits at redhat.com Mon Jan 9 18:55:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 13:55:17 -0500 Subject: rpms/kernel/devel/configs config-generic,1.125,1.126 Message-ID: <200601091855.k09ItHDq020883@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv20768/configs Modified Files: config-generic Log Message: git5 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- config-generic 8 Jan 2006 01:59:04 -0000 1.125 +++ config-generic 9 Jan 2006 18:55:15 -0000 1.126 @@ -670,6 +670,7 @@ CONFIG_IP_NF_MATCH_DCCP=m CONFIG_IP_NF_MATCH_CONNBYTES=m CONFIG_IP_NF_MATCH_STRING=m +CONFIG_IP_NF_MATCH_POLICY=m CONFIG_IP_NF_TARGET_CONNMARK=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -731,6 +732,7 @@ CONFIG_IP6_NF_MATCH_LENGTH=m CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_PHYSDEV=m +CONFIG_IP6_NF_MATCH_POLICY=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m @@ -1370,12 +1372,13 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_ROCKETPORT=m +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_ROCKETPORT is not set # CONFIG_SYNCLINK is not set # CONFIG_SYNCLINKMP is not set -CONFIG_N_HDLC=m -CONFIG_STALDRV=y +# CONFIG_SYNCLINK_GT is not set +# CONFIG_N_HDLC is not set +# CONFIG_STALDRV is not set # CONFIG_FTAPE is not set # CONFIG_IBM_ASM is not set # CONFIG_TCG_TPM is not set @@ -2501,7 +2504,7 @@ # CONFIG_TUX_DEBUG is not set CONFIG_CPUSETS=y -CONFIG_SECCOMP=y +# CONFIG_SECCOMP is not set # CONFIG_PRINTK_TIME is not set CONFIG_DETECT_SOFTLOCKUP=y From fedora-cvs-commits at redhat.com Mon Jan 9 18:55:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 13:55:18 -0500 Subject: rpms/kernel/devel patch-2.6.15-git5.bz2.sign, NONE, 1.1 .cvsignore, 1.317, 1.318 kernel-2.6.spec, 1.1833, 1.1834 linux-2.6-debug-singlebiterror.patch, 1.1, 1.2 linux-2.6-debug-taint-vm.patch, 1.3, 1.4 linux-2.6-diskdump.patch, 1.4, 1.5 linux-2.6-execshield.patch, 1.5, 1.6 linux-2.6-gcc41.patch, 1.6, 1.7 linux-2.6-tux.patch, 1.8, 1.9 linux-2.6-vm-clear-unreclaimable.patch, 1.1, 1.2 linux-2.6-x86-tune-p4.patch, 1.2, 1.3 sources, 1.259, 1.260 upstream, 1.240, 1.241 linux-2.6-debug-taint-check.patch, 1.2, NONE linux-2.6-debug-taint-proprietary-helpers.patch, 1.1, NONE linux-2.6-vm-debug.patch, 1.1, NONE patch-2.6.15-git3.bz2.sign, 1.1, NONE Message-ID: <200601091855.k09ItIsa020862@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20768 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-debug-singlebiterror.patch linux-2.6-debug-taint-vm.patch linux-2.6-diskdump.patch linux-2.6-execshield.patch linux-2.6-gcc41.patch linux-2.6-tux.patch linux-2.6-vm-clear-unreclaimable.patch linux-2.6-x86-tune-p4.patch sources upstream Added Files: patch-2.6.15-git5.bz2.sign Removed Files: linux-2.6-debug-taint-check.patch linux-2.6-debug-taint-proprietary-helpers.patch linux-2.6-vm-debug.patch patch-2.6.15-git3.bz2.sign Log Message: git5 --- NEW FILE patch-2.6.15-git5.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDwhzCyGugalF9Dw4RAkdqAJ4sXElSzpfYfvRsHvJDTSXkSn4bJwCfcMZo QLJ1m1slwLzAgQae1pqqJrk= =aaG1 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.317 retrieving revision 1.318 diff -u -r1.317 -r1.318 --- .cvsignore 8 Jan 2006 02:04:10 -0000 1.317 +++ .cvsignore 9 Jan 2006 18:55:14 -0000 1.318 @@ -2,6 +2,6 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 -patch-2.6.15-git3.bz2 bcm43xx-20060106.tar.bz2 ieee80211softmac-20060103.tar.bz2 +patch-2.6.15-git5.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1833 retrieving revision 1.1834 diff -u -r1.1833 -r1.1834 --- kernel-2.6.spec 8 Jan 2006 01:59:03 -0000 1.1833 +++ kernel-2.6.spec 9 Jan 2006 18:55:14 -0000 1.1834 @@ -206,7 +206,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git3.bz2 +Patch1: patch-2.6.15-git5.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -284,7 +284,6 @@ Patch1011: linux-2.6-debug-slab-backtrace.patch Patch1012: linux-2.6-debug-list_head.patch Patch1013: linux-2.6-debug-taint-vm.patch -Patch1014: linux-2.6-debug-taint-check.patch Patch1015: linux-2.6-debug-singlebiterror.patch Patch1016: linux-2.6-debug-spinlock-taint.patch Patch1017: linux-2.6-debug-spinlock-panic.patch @@ -293,7 +292,6 @@ Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch Patch1021: linux-2.6-debug-reference-discarded-return-result.patch Patch1022: linux-2.6-debug-panic-stackdump.patch -Patch1023: linux-2.6-debug-taint-proprietary-helpers.patch Patch1024: linux-2.6-debug-dual-line-backtrace.patch Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch Patch1026: linux-2.6-debug-no-quiet.patch @@ -373,8 +371,7 @@ # VM bits. Patch2000: linux-2.6-vm-oomkiller-debugging.patch Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch -Patch2002: linux-2.6-vm-debug.patch -Patch2003: linux-2.6-vm-clear-unreclaimable.patch +Patch2002: linux-2.6-vm-clear-unreclaimable.patch # ACPI patches. Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch @@ -708,7 +705,7 @@ %endif # Fix up the vdso. -%patch812 -p1 +#%patch812 -p1 # Xen vDSO hack %if %{includexen} @@ -738,7 +735,6 @@ %patch1011 -p1 %patch1012 -p1 %patch1013 -p1 -%patch1014 -p1 %patch1015 -p1 %patch1016 -p1 %patch1017 -p1 @@ -747,11 +743,11 @@ %patch1020 -p1 %patch1021 -p1 %patch1022 -p1 -%patch1023 -p1 %patch1024 -p1 %patch1025 -p1 %patch1026 -p1 -%patch1027 -p1 +# Slab leak detector. +#%patch1027 -p1 %patch1028 -p1 #%patch1029 -p1 #%patch1030 -p1 @@ -878,10 +874,8 @@ %patch2000 -p1 # Silence GFP_ATOMIC failures. %patch2001 -p1 -# Try to trace some negative pagecount errors. -%patch2002 -p1 # VM oom killer tweaks. -%patch2003 -p1 +%patch2002 -p1 # ACPI patches. # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. @@ -1392,6 +1386,9 @@ %endif %changelog +* Mon Jan 9 2006 Dave Jones +- 2.6.15-git5 + * Sat Jan 07 2006 Dave Jones - 2.6.15-git3 linux-2.6-debug-singlebiterror.patch: slab.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+) Index: linux-2.6-debug-singlebiterror.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-singlebiterror.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-debug-singlebiterror.patch 8 Aug 2005 21:59:34 -0000 1.1 +++ linux-2.6-debug-singlebiterror.patch 9 Jan 2006 18:55:15 -0000 1.2 @@ -1,18 +1,17 @@ ---- linux-2.6.11/mm/slab.c~ 2005-05-01 00:51:59.000000000 -0400 -+++ linux-2.6.11/mm/slab.c 2005-05-01 01:19:38.000000000 -0400 -@@ -1004,8 +1004,12 @@ static void poison_obj(kmem_cache_t *cac +--- linux-2.6.15/mm/slab.c~ 2006-01-09 13:25:17.000000000 -0500 ++++ linux-2.6.15/mm/slab.c 2006-01-09 13:26:01.000000000 -0500 +@@ -1313,8 +1313,11 @@ static void poison_obj(kmem_cache_t *cac static void dump_line(char *data, int offset, int limit) { int i; + unsigned char total=0; -+ printk(KERN_ERR "%03x:", offset); - for (i=0;iflags &= ~(1 << PG_lru | 1 << PG_private | -diff -urNp --exclude-from=/home/davej/.exclude linux-1740/mm/slab.c linux-2000/mm/slab.c ---- linux-1740/mm/slab.c -+++ linux-2000/mm/slab.c -@@ -1053,8 +1053,8 @@ static void check_poison_obj(kmem_cache_ - /* Mismatch ! */ +--- linux-2.6.15/mm/slab.c~ 2006-01-09 13:19:33.000000000 -0500 ++++ linux-2.6.15/mm/slab.c 2006-01-09 13:19:55.000000000 -0500 +@@ -1371,8 +1371,8 @@ static void check_poison_obj(kmem_cache_ /* Print header */ if (lines == 0) { -- printk(KERN_ERR "Slab corruption: start=%p, len=%d\n", -- realobj, size); -+ printk(KERN_ERR "Slab corruption: (%s) start=%p, len=%d\n", -+ print_tainted(), realobj, size); + printk(KERN_ERR +- "Slab corruption: start=%p, len=%d\n", +- realobj, size); ++ "Slab corruption: (%s) start=%p, len=%d\n", ++ print_tainted(), realobj, size); print_objinfo(cachep, objp, 0); + dump_stack(); } - /* Hexdump the affected line */ linux-2.6-diskdump.patch: drivers/block/Kconfig | 5 drivers/block/Makefile | 1 drivers/block/diskdump.c | 1121 +++++++++++++++++++++++++++++++++++++++++ include/asm-generic/diskdump.h | 13 include/asm-i386/diskdump.h | 55 ++ include/asm-ia64/diskdump.h | 63 ++ include/asm-powerpc/diskdump.h | 55 ++ include/asm-ppc/diskdump.h | 6 include/asm-s390/diskdump.h | 6 include/asm-x86_64/diskdump.h | 44 + include/linux/diskdump.h | 186 ++++++ include/linux/interrupt.h | 4 include/linux/timer.h | 3 include/linux/workqueue.h | 3 kernel/softirq.c | 32 + kernel/timer.c | 43 + kernel/workqueue.c | 34 + 17 files changed, 1670 insertions(+), 4 deletions(-) Index: linux-2.6-diskdump.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-diskdump.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-diskdump.patch 27 Nov 2005 03:21:31 -0000 1.4 +++ linux-2.6-diskdump.patch 9 Jan 2006 18:55:15 -0000 1.5 @@ -1233,11 +1233,10 @@ open_softirq(TASKLET_SOFTIRQ, tasklet_action, NULL); --- linux-2.6.12/kernel/timer.c.diskdump.orig 2005-08-19 16:44:27.502410144 -0400 +++ linux-2.6.12/kernel/timer.c 2005-08-19 16:49:13.988620772 -0400 -@@ -33,6 +33,8 @@ - #include +@@ -34,6 +34,7 @@ #include #include -+#include + #include +#include #include linux-2.6-execshield.patch: linux-2.6.15/fs/proc/base.c | 2 linux-exec-shield-curr.q/arch/i386/kernel/asm-offsets.c | 1 linux-exec-shield-curr.q/arch/i386/kernel/cpu/common.c | 7 linux-exec-shield-curr.q/arch/i386/kernel/entry.S | 8 linux-exec-shield-curr.q/arch/i386/kernel/process.c | 59 +++ linux-exec-shield-curr.q/arch/i386/kernel/signal.c | 4 linux-exec-shield-curr.q/arch/i386/kernel/smp.c | 3 linux-exec-shield-curr.q/arch/i386/kernel/sysenter.c | 65 +++ linux-exec-shield-curr.q/arch/i386/kernel/traps.c | 93 ++++- linux-exec-shield-curr.q/arch/i386/kernel/vsyscall-sysenter.S | 6 linux-exec-shield-curr.q/arch/i386/kernel/vsyscall.lds.S | 4 linux-exec-shield-curr.q/arch/i386/mm/init.c | 6 linux-exec-shield-curr.q/arch/i386/mm/mmap.c | 6 linux-exec-shield-curr.q/arch/ia64/ia32/binfmt_elf32.c | 2 linux-exec-shield-curr.q/arch/x86_64/ia32/ia32_binfmt.c | 4 linux-exec-shield-curr.q/arch/x86_64/kernel/process.c | 6 linux-exec-shield-curr.q/arch/x86_64/kernel/setup64.c | 23 - linux-exec-shield-curr.q/arch/x86_64/mm/Makefile | 2 linux-exec-shield-curr.q/arch/x86_64/mm/fault.c | 2 linux-exec-shield-curr.q/arch/x86_64/mm/mmap.c | 95 +++++ linux-exec-shield-curr.q/drivers/char/random.c | 7 linux-exec-shield-curr.q/fs/binfmt_elf.c | 131 +++++-- linux-exec-shield-curr.q/fs/proc/array.c | 8 linux-exec-shield-curr.q/fs/proc/base.c | 4 linux-exec-shield-curr.q/fs/proc/task_mmu.c | 34 + linux-exec-shield-curr.q/include/asm-i386/desc.h | 14 linux-exec-shield-curr.q/include/asm-i386/elf.h | 49 +- linux-exec-shield-curr.q/include/asm-i386/mmu.h | 6 linux-exec-shield-curr.q/include/asm-i386/page.h | 5 linux-exec-shield-curr.q/include/asm-i386/pgalloc.h | 1 linux-exec-shield-curr.q/include/asm-i386/processor.h | 8 linux-exec-shield-curr.q/include/asm-i386/thread_info.h | 1 linux-exec-shield-curr.q/include/asm-ia64/pgalloc.h | 4 linux-exec-shield-curr.q/include/asm-powerpc/pgalloc.h | 5 linux-exec-shield-curr.q/include/asm-ppc/pgalloc.h | 5 linux-exec-shield-curr.q/include/asm-s390/pgalloc.h | 4 linux-exec-shield-curr.q/include/asm-sparc/pgalloc.h | 4 linux-exec-shield-curr.q/include/asm-sparc64/pgalloc.h | 4 linux-exec-shield-curr.q/include/asm-x86_64/pgalloc.h | 7 linux-exec-shield-curr.q/include/asm-x86_64/pgtable.h | 2 linux-exec-shield-curr.q/include/asm-x86_64/processor.h | 5 linux-exec-shield-curr.q/include/linux/mm.h | 16 linux-exec-shield-curr.q/include/linux/resource.h | 5 linux-exec-shield-curr.q/include/linux/sched.h | 9 linux-exec-shield-curr.q/include/linux/sysctl.h | 3 linux-exec-shield-curr.q/kernel/signal.c | 38 ++ linux-exec-shield-curr.q/kernel/sysctl.c | 47 ++ linux-exec-shield-curr.q/mm/fremap.c | 16 linux-exec-shield-curr.q/mm/mmap.c | 183 +++++++++- linux-exec-shield-curr.q/mm/mprotect.c | 5 linux-exec-shield-curr.q/mm/mremap.c | 4 51 files changed, 902 insertions(+), 130 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-execshield.patch 30 Dec 2005 00:31:33 -0000 1.5 +++ linux-2.6-execshield.patch 9 Jan 2006 18:55:15 -0000 1.6 @@ -1,6 +1,7 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/asm-offsets.c linux-810/arch/i386/kernel/asm-offsets.c ---- linux-804/arch/i386/kernel/asm-offsets.c -+++ linux-810/arch/i386/kernel/asm-offsets.c +Index: linux-exec-shield-curr.q/arch/i386/kernel/asm-offsets.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/kernel/asm-offsets.c ++++ linux-exec-shield-curr.q/arch/i386/kernel/asm-offsets.c @@ -53,6 +53,7 @@ void foo(void) OFFSET(TI_preempt_count, thread_info, preempt_count); OFFSET(TI_addr_limit, thread_info, addr_limit); @@ -9,9 +10,28 @@ BLANK(); OFFSET(EXEC_DOMAIN_handler, exec_domain, handler); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/entry.S linux-810/arch/i386/kernel/entry.S ---- linux-804/arch/i386/kernel/entry.S -+++ linux-810/arch/i386/kernel/entry.S +Index: linux-exec-shield-curr.q/arch/i386/kernel/cpu/common.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/kernel/cpu/common.c ++++ linux-exec-shield-curr.q/arch/i386/kernel/cpu/common.c +@@ -392,6 +392,13 @@ void __devinit identify_cpu(struct cpuin + if (disable_pse) + clear_bit(X86_FEATURE_PSE, c->x86_capability); + ++ if (exec_shield != 0) { ++#ifdef CONFIG_HIGHMEM64G /* NX implies PAE */ ++ if (!test_bit(X86_FEATURE_NX, c->x86_capability)) ++#endif ++ clear_bit(X86_FEATURE_SEP, c->x86_capability); ++ } ++ + /* If the model name is still unset, do table lookup. */ + if ( !c->x86_model_id[0] ) { + char *p; +Index: linux-exec-shield-curr.q/arch/i386/kernel/entry.S +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/kernel/entry.S ++++ linux-exec-shield-curr.q/arch/i386/kernel/entry.S @@ -184,8 +184,12 @@ sysenter_past_esp: pushl %ebp pushfl @@ -27,10 +47,11 @@ /* * Load the potential sixth argument from user stack. * Careful about security. -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/process.c linux-810/arch/i386/kernel/process.c ---- linux-804/arch/i386/kernel/process.c -+++ linux-810/arch/i386/kernel/process.c -@@ -676,6 +676,8 @@ struct task_struct fastcall * __switch_t +Index: linux-exec-shield-curr.q/arch/i386/kernel/process.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/kernel/process.c ++++ linux-exec-shield-curr.q/arch/i386/kernel/process.c +@@ -652,6 +652,8 @@ struct task_struct fastcall * __switch_t /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ __unlazy_fpu(prev_p); @@ -39,7 +60,7 @@ /* * Reload esp0. -@@ -949,3 +951,60 @@ unsigned long arch_align_stack(unsigned +@@ -925,3 +927,60 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() % 8192; return sp & ~0xf; } @@ -100,10 +121,11 @@ + current->mm->brk = new_brk; +} + -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/signal.c linux-810/arch/i386/kernel/signal.c ---- linux-804/arch/i386/kernel/signal.c -+++ linux-810/arch/i386/kernel/signal.c -@@ -380,7 +380,7 @@ static int setup_frame(int sig, struct k +Index: linux-exec-shield-curr.q/arch/i386/kernel/signal.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/kernel/signal.c ++++ linux-exec-shield-curr.q/arch/i386/kernel/signal.c +@@ -384,7 +384,7 @@ static int setup_frame(int sig, struct k goto give_sigsegv; } @@ -112,7 +134,7 @@ if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; -@@ -476,7 +476,7 @@ static int setup_rt_frame(int sig, struc +@@ -480,7 +480,7 @@ static int setup_rt_frame(int sig, struc goto give_sigsegv; /* Set up to return from userspace. */ @@ -121,10 +143,11 @@ if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; err |= __put_user(restorer, &frame->pretcode); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/smp.c linux-810/arch/i386/kernel/smp.c ---- linux-804/arch/i386/kernel/smp.c -+++ linux-810/arch/i386/kernel/smp.c -@@ -24,6 +24,7 @@ +Index: linux-exec-shield-curr.q/arch/i386/kernel/smp.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/kernel/smp.c ++++ linux-exec-shield-curr.q/arch/i386/kernel/smp.c +@@ -23,6 +23,7 @@ #include #include @@ -132,7 +155,7 @@ #include /* -@@ -315,6 +316,8 @@ fastcall void smp_invalidate_interrupt(s +@@ -314,6 +315,8 @@ fastcall void smp_invalidate_interrupt(s unsigned long cpu; cpu = get_cpu(); @@ -141,9 +164,10 @@ if (!cpu_isset(cpu, flush_cpumask)) goto out; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/sysenter.c linux-810/arch/i386/kernel/sysenter.c ---- linux-804/arch/i386/kernel/sysenter.c -+++ linux-810/arch/i386/kernel/sysenter.c +Index: linux-exec-shield-curr.q/arch/i386/kernel/sysenter.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/kernel/sysenter.c ++++ linux-exec-shield-curr.q/arch/i386/kernel/sysenter.c @@ -13,6 +13,7 @@ #include #include @@ -152,79 +176,97 @@ #include #include -@@ -46,11 +47,20 @@ void enable_sep_cpu(void) +@@ -36,7 +37,7 @@ void enable_sep_cpu(void) + wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0); + wrmsr(MSR_IA32_SYSENTER_ESP, tss->esp1, 0); + wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) sysenter_entry, 0); +- put_cpu(); ++ put_cpu(); + } + + /* +@@ -46,11 +47,13 @@ void enable_sep_cpu(void) extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; -+struct page *sysenter_page; ++static struct page *sysenter_pages[2]; + int __init sysenter_setup(void) { void *page = (void *)get_zeroed_page(GFP_ATOMIC); - __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC); -+ /* -+ * We keep this page mapped readonly, even though the executable -+ * portion is randomized into a userspace vma - so that we dont -+ * have to fix up the data within the VDSO page every time we -+ * exec(). -+ */ -+ __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_KERNEL_RO); -+ sysenter_page = virt_to_page(page); ++ sysenter_pages[0] = virt_to_page(page); if (!boot_cpu_has(X86_FEATURE_SEP)) { memcpy(page, -@@ -65,3 +75,46 @@ int __init sysenter_setup(void) +@@ -65,3 +68,61 @@ int __init sysenter_setup(void) return 0; } + +extern void SYSENTER_RETURN_OFFSET; + -+unsigned int vdso_enabled = 0; ++unsigned int vdso_enabled = 1; + -+void map_vsyscall(void) ++/* ++ * This is called from binfmt_elf, we create the special vma for the ++ * vDSO and insert it into the mm struct tree. ++ */ ++int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack) +{ + struct thread_info *ti = current_thread_info(); -+ struct vm_area_struct *vma; -+ unsigned long addr; ++ unsigned long addr, len; ++ int err; + -+ if (unlikely(!vdso_enabled)) { + current->mm->context.vdso = NULL; -+ return; -+ } ++ if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0])) ++ return 0; + + /* + * Map the vDSO (it will be randomized): + */ + down_write(¤t->mm->mmap_sem); -+ addr = do_mmap(NULL, 0, 4096, PROT_READ | PROT_EXEC, MAP_PRIVATE, 0); -+ current->mm->context.vdso = (void *)addr; -+ ti->sysenter_return = (void *)addr + (long)&SYSENTER_RETURN_OFFSET; -+ if (addr != -1) { -+ vma = find_vma(current->mm, addr); -+ if (vma) { -+ pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; -+ get_page(sysenter_page); -+ install_page(current->mm, vma, addr, -+ sysenter_page, vma->vm_page_prot); -+ ++ len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE; ++ addr = get_unmapped_area_prot(NULL, 0, len, 0, ++ MAP_PRIVATE, PROT_READ | PROT_EXEC); ++ if (unlikely(addr & ~PAGE_MASK)) { ++ up_write(¤t->mm->mmap_sem); ++ return addr; + } ++ err = install_special_mapping(current->mm, addr, len, ++ VM_DONTEXPAND | VM_READ | VM_EXEC | ++ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC, ++ PAGE_READONLY_EXEC, ++ sysenter_pages); ++ if (likely(err == 0)) { ++ current->mm->context.vdso = (void *)addr; ++ ti->sysenter_return = &SYSENTER_RETURN_OFFSET + addr; + } + up_write(¤t->mm->mmap_sem); ++ return err; +} + -+static int __init vdso_setup(char *str) ++int in_gate_area_no_task(unsigned long addr) +{ -+ vdso_enabled = simple_strtoul(str, NULL, 0); -+ return 1; ++ return 0; ++} ++ ++int in_gate_area(struct task_struct *task, unsigned long addr) ++{ ++ return 0; +} -+__setup("vdso=", vdso_setup); + -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/traps.c linux-810/arch/i386/kernel/traps.c ---- linux-804/arch/i386/kernel/traps.c -+++ linux-810/arch/i386/kernel/traps.c -@@ -458,13 +458,89 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv ++struct vm_area_struct *get_gate_vma(struct task_struct *tsk) ++{ ++ return NULL; ++} +Index: linux-exec-shield-curr.q/arch/i386/kernel/traps.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/kernel/traps.c ++++ linux-exec-shield-curr.q/arch/i386/kernel/traps.c +@@ -461,7 +461,82 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) DO_ERROR(12, SIGBUS, "stack segment", stack_segment) DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) @@ -262,7 +304,7 @@ + set_user_cs(¤t->mm->context.user_cs, limit); + + desc1 = ¤t->mm->context.user_cs; -+ desc2 = per_cpu(cpu_gdt_table, cpu) + GDT_ENTRY_DEFAULT_USER_CS; ++ desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; + + if (desc1->a != desc2->a || desc1->b != desc2->b) { + /* @@ -308,14 +350,15 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs, long error_code) - { +@@ -469,6 +544,7 @@ fastcall void __kprobes do_general_prote int cpu = get_cpu(); struct tss_struct *tss = &per_cpu(init_tss, cpu); struct thread_struct *thread = ¤t->thread; + int ok; /* -@@ -490,7 +566,6 @@ fastcall void do_general_protection(stru + * Perform the lazy TSS's I/O bitmap copy. If the TSS has an +@@ -495,7 +571,6 @@ fastcall void __kprobes do_general_prote put_cpu(); return; } @@ -323,7 +366,7 @@ current->thread.error_code = error_code; current->thread.trap_no = 13; -@@ -501,17 +576,31 @@ fastcall void do_general_protection(stru +@@ -506,17 +581,31 @@ fastcall void __kprobes do_general_prote if (!user_mode(regs)) goto gp_in_kernel; @@ -355,9 +398,29 @@ if (!fixup_exception(regs)) { if (notify_die(DIE_GPF, "general protection fault", regs, error_code, 13, SIGSEGV) == NOTIFY_STOP) -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/vsyscall.lds.S linux-810/arch/i386/kernel/vsyscall.lds.S ---- linux-804/arch/i386/kernel/vsyscall.lds.S -+++ linux-810/arch/i386/kernel/vsyscall.lds.S +Index: linux-exec-shield-curr.q/arch/i386/kernel/vsyscall-sysenter.S +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/kernel/vsyscall-sysenter.S ++++ linux-exec-shield-curr.q/arch/i386/kernel/vsyscall-sysenter.S +@@ -24,11 +24,11 @@ __kernel_vsyscall: + /* 7: align return point with nop's to make disassembly easier */ + .space 7,0x90 + +- /* 14: System call restart point is here! (SYSENTER_RETURN - 2) */ ++ /* 14: System call restart point is here! (SYSENTER_RETURN_OFFSET-2) */ + jmp .Lenter_kernel + /* 16: System call normal return point is here! */ +- .globl SYSENTER_RETURN /* Symbol used by entry.S. */ +-SYSENTER_RETURN: ++ .globl SYSENTER_RETURN_OFFSET /* Symbol used by sysenter.c */ ++SYSENTER_RETURN_OFFSET: + pop %ebp + .Lpop_ebp: + pop %edx +Index: linux-exec-shield-curr.q/arch/i386/kernel/vsyscall.lds.S +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/kernel/vsyscall.lds.S ++++ linux-exec-shield-curr.q/arch/i386/kernel/vsyscall.lds.S @@ -7,7 +7,7 @@ SECTIONS @@ -376,28 +439,11 @@ .text : { *(.text) } :text =0x90909090 .note : { *(.note.*) } :text :note -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/vsyscall-sysenter.S linux-810/arch/i386/kernel/vsyscall-sysenter.S ---- linux-804/arch/i386/kernel/vsyscall-sysenter.S -+++ linux-810/arch/i386/kernel/vsyscall-sysenter.S -@@ -24,11 +24,11 @@ __kernel_vsyscall: - /* 7: align return point with nop's to make disassembly easier */ - .space 7,0x90 - -- /* 14: System call restart point is here! (SYSENTER_RETURN - 2) */ -+ /* 14: System call restart point is here! (SYSENTER_RETURN_OFFSET-2) */ - jmp .Lenter_kernel - /* 16: System call normal return point is here! */ -- .globl SYSENTER_RETURN /* Symbol used by entry.S. */ --SYSENTER_RETURN: -+ .globl SYSENTER_RETURN_OFFSET /* Symbol used by sysenter.c */ -+SYSENTER_RETURN_OFFSET: - pop %ebp - .Lpop_ebp: - pop %edx -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/mm/init.c linux-810/arch/i386/mm/init.c ---- linux-804/arch/i386/mm/init.c -+++ linux-810/arch/i386/mm/init.c -@@ -401,7 +401,7 @@ u64 __supported_pte_mask = ~_PAGE_NX; +Index: linux-exec-shield-curr.q/arch/i386/mm/init.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/mm/init.c ++++ linux-exec-shield-curr.q/arch/i386/mm/init.c +@@ -432,7 +432,7 @@ u64 __supported_pte_mask __read_mostly = * Control non executable mappings. * * on Enable @@ -406,7 +452,7 @@ */ void __init noexec_setup(const char *str) { -@@ -411,6 +411,7 @@ void __init noexec_setup(const char *str +@@ -442,6 +442,7 @@ void __init noexec_setup(const char *str } else if (!strncmp(str,"off",3)) { disable_nx = 1; __supported_pte_mask &= ~_PAGE_NX; @@ -414,7 +460,7 @@ } } -@@ -475,7 +476,10 @@ void __init paging_init(void) +@@ -506,7 +507,10 @@ void __init paging_init(void) set_nx(); if (nx_enabled) printk("NX (Execute Disable) protection: active\n"); @@ -425,9 +471,10 @@ pagetable_init(); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/mm/mmap.c linux-810/arch/i386/mm/mmap.c ---- linux-804/arch/i386/mm/mmap.c -+++ linux-810/arch/i386/mm/mmap.c +Index: linux-exec-shield-curr.q/arch/i386/mm/mmap.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/i386/mm/mmap.c ++++ linux-exec-shield-curr.q/arch/i386/mm/mmap.c @@ -62,15 +62,17 @@ void arch_pick_mmap_layout(struct mm_str * Fall back to the standard layout if the personality * bit is set, or if the expected stack growth is unlimited: @@ -448,10 +495,11 @@ mm->unmap_area = arch_unmap_area_topdown; } } -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/ia64/ia32/binfmt_elf32.c linux-810/arch/ia64/ia32/binfmt_elf32.c ---- linux-804/arch/ia64/ia32/binfmt_elf32.c -+++ linux-810/arch/ia64/ia32/binfmt_elf32.c -@@ -272,7 +272,7 @@ elf32_set_personality (void) +Index: linux-exec-shield-curr.q/arch/ia64/ia32/binfmt_elf32.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/ia64/ia32/binfmt_elf32.c ++++ linux-exec-shield-curr.q/arch/ia64/ia32/binfmt_elf32.c +@@ -264,7 +264,7 @@ elf32_set_personality (void) } static unsigned long @@ -460,47 +508,91 @@ { unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/ia32/ia32_binfmt.c linux-810/arch/x86_64/ia32/ia32_binfmt.c ---- linux-804/arch/x86_64/ia32/ia32_binfmt.c -+++ linux-810/arch/x86_64/ia32/ia32_binfmt.c -@@ -396,7 +396,7 @@ int setup_arg_pages(struct linux_binprm +Index: linux-exec-shield-curr.q/arch/x86_64/ia32/ia32_binfmt.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/x86_64/ia32/ia32_binfmt.c ++++ linux-exec-shield-curr.q/arch/x86_64/ia32/ia32_binfmt.c +@@ -248,8 +248,6 @@ elf_core_copy_task_xfpregs(struct task_s + #define elf_check_arch(x) \ + ((x)->e_machine == EM_386) + +-extern int force_personality32; +- + #define ELF_EXEC_PAGESIZE PAGE_SIZE + #define ELF_HWCAP (boot_cpu_data.x86_capability[0]) + #define ELF_PLATFORM ("i686") +@@ -263,8 +261,6 @@ do { \ + set_thread_flag(TIF_ABI_PENDING); \ + else \ + clear_thread_flag(TIF_ABI_PENDING); \ +- /* XXX This overwrites the user set personality */ \ +- current->personality |= force_personality32; \ + } while (0) + + /* Override some function names */ +Index: linux-exec-shield-curr.q/arch/x86_64/kernel/process.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/x86_64/kernel/process.c ++++ linux-exec-shield-curr.q/arch/x86_64/kernel/process.c +@@ -631,12 +631,6 @@ void set_personality_64bit(void) + + /* Make sure to be in 64bit mode */ + clear_thread_flag(TIF_IA32); +- +- /* TBD: overwrites user setup. Should have two bits. +- But 64bit processes have always behaved this way, +- so it's not too bad. The main problem is just that +- 32bit childs are affected again. */ +- current->personality &= ~READ_IMPLIES_EXEC; } - static unsigned long --elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type) -+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused) + asmlinkage long sys_fork(struct pt_regs *regs) +Index: linux-exec-shield-curr.q/arch/x86_64/kernel/setup64.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/x86_64/kernel/setup64.c ++++ linux-exec-shield-curr.q/arch/x86_64/kernel/setup64.c +@@ -45,7 +45,7 @@ Control non executable mappings for 64bi + on Enable(default) + off Disable + */ +-int __init nonx_setup(char *str) ++void __init nonx_setup(const char *str) { - unsigned long map_addr; - struct task_struct *me = current; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/kernel/process.c linux-810/arch/x86_64/kernel/process.c ---- linux-804/arch/x86_64/kernel/process.c -+++ linux-810/arch/x86_64/kernel/process.c -@@ -833,10 +833,3 @@ int dump_task_regs(struct task_struct *t - - return 1; - } + if (!strncmp(str, "on", 2)) { + __supported_pte_mask |= _PAGE_NX; +@@ -54,28 +54,7 @@ int __init nonx_setup(char *str) + do_not_nx = 1; + __supported_pte_mask &= ~_PAGE_NX; + } +- return 0; +-} +-__setup("noexec=", nonx_setup); /* parsed early actually */ +- +-int force_personality32 = READ_IMPLIES_EXEC; +- +-/* noexec32=on|off +-Control non executable heap for 32bit processes. +-To control the stack too use noexec=off - --unsigned long arch_align_stack(unsigned long sp) +-on PROT_READ does not imply PROT_EXEC for 32bit processes +-off PROT_READ implies PROT_EXEC (default) +-*/ +-static int __init nonx32_setup(char *str) -{ -- if (randomize_va_space) -- sp -= get_random_int() % 8192; -- return sp & ~0xf; --} -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/mm/fault.c linux-810/arch/x86_64/mm/fault.c ---- linux-804/arch/x86_64/mm/fault.c -+++ linux-810/arch/x86_64/mm/fault.c -@@ -73,7 +73,7 @@ static noinline int is_prefetch(struct p - instr = (unsigned char *)convert_rip_to_linear(current, regs); - max_instr = instr + 15; - -- if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE) -+ if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE64) - return 0; +- if (!strcmp(str, "on")) +- force_personality32 &= ~READ_IMPLIES_EXEC; +- else if (!strcmp(str, "off")) +- force_personality32 |= READ_IMPLIES_EXEC; +- return 0; + } +-__setup("noexec32=", nonx32_setup); - while (scan_more && instr < max_instr) { -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/mm/Makefile linux-810/arch/x86_64/mm/Makefile ---- linux-804/arch/x86_64/mm/Makefile -+++ linux-810/arch/x86_64/mm/Makefile + /* + * Great future plan: +Index: linux-exec-shield-curr.q/arch/x86_64/mm/Makefile +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/x86_64/mm/Makefile ++++ linux-exec-shield-curr.q/arch/x86_64/mm/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux x86_64-specific parts of the memory manager. # @@ -510,9 +602,23 @@ obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_K8_NUMA) += k8topology.o -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/mm/mmap.c linux-810/arch/x86_64/mm/mmap.c ---- linux-804/arch/x86_64/mm/mmap.c -+++ linux-810/arch/x86_64/mm/mmap.c +Index: linux-exec-shield-curr.q/arch/x86_64/mm/fault.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/x86_64/mm/fault.c ++++ linux-exec-shield-curr.q/arch/x86_64/mm/fault.c +@@ -74,7 +74,7 @@ static noinline int is_prefetch(struct p + instr = (unsigned char *)convert_rip_to_linear(current, regs); + max_instr = instr + 15; + +- if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE) ++ if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE64) + return 0; + + while (scan_more && instr < max_instr) { +Index: linux-exec-shield-curr.q/arch/x86_64/mm/mmap.c +=================================================================== +--- /dev/null ++++ linux-exec-shield-curr.q/arch/x86_64/mm/mmap.c @@ -0,0 +1,95 @@ +/* + * linux/arch/x86-64/mm/mmap.c @@ -571,13 +677,13 @@ + */ + if (!test_thread_flag(TIF_IA32)) + return 1; -+ -+ if (current->personality & ADDR_COMPAT_LAYOUT) ++ ++ if (current->personality & ADDR_COMPAT_LAYOUT) + return 1; -+ ++ + if (current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) + return 1; -+ ++ + return sysctl_legacy_va_layout; +} + @@ -609,10 +715,11 @@ + return sp & ~0xf; +} + -diff -urNp --exclude-from=/home/davej/.exclude linux-804/drivers/char/random.c linux-810/drivers/char/random.c ---- linux-804/drivers/char/random.c -+++ linux-810/drivers/char/random.c -@@ -1634,13 +1634,18 @@ EXPORT_SYMBOL(secure_dccp_sequence_numbe +Index: linux-exec-shield-curr.q/drivers/char/random.c +=================================================================== +--- linux-exec-shield-curr.q.orig/drivers/char/random.c ++++ linux-exec-shield-curr.q/drivers/char/random.c +@@ -1632,13 +1632,18 @@ EXPORT_SYMBOL(secure_dccp_sequence_numbe */ unsigned int get_random_int(void) { @@ -632,9 +739,10 @@ } /* -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/binfmt_elf.c linux-810/fs/binfmt_elf.c ---- linux-804/fs/binfmt_elf.c -+++ linux-810/fs/binfmt_elf.c +Index: linux-exec-shield-curr.q/fs/binfmt_elf.c +=================================================================== +--- linux-exec-shield-curr.q.orig/fs/binfmt_elf.c ++++ linux-exec-shield-curr.q/fs/binfmt_elf.c @@ -47,7 +47,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs); @@ -644,7 +752,7 @@ extern int dump_fpu (struct pt_regs *, elf_fpregset_t *); #ifndef elf_addr_t -@@ -285,20 +285,59 @@ create_elf_tables(struct linux_binprm *b +@@ -285,26 +285,65 @@ create_elf_tables(struct linux_binprm *b #ifndef elf_map static unsigned long elf_map(struct file *filep, unsigned long addr, @@ -653,16 +761,26 @@ + unsigned long total_size) { unsigned long map_addr; +- unsigned long pageoffset = ELF_PAGEOFFSET(eppnt->p_vaddr); + unsigned long size = eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr); + unsigned long off = eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr); + + addr = ELF_PAGESTART(addr); + size = ELF_PAGEALIGN(size); - down_write(¤t->mm->mmap_sem); -- map_addr = do_mmap(filep, ELF_PAGESTART(addr), -- eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr), prot, type, -- eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr)); +- down_write(¤t->mm->mmap_sem); + /* mmap() will return -EINVAL if given a zero size, but a + * segment with zero filesize is perfectly valid */ +- if (eppnt->p_filesz + pageoffset) +- map_addr = do_mmap(filep, ELF_PAGESTART(addr), +- eppnt->p_filesz + pageoffset, prot, type, +- eppnt->p_offset - pageoffset); +- else +- map_addr = ELF_PAGESTART(addr); ++ if (!size) ++ return addr; ++ ++ down_write(¤t->mm->mmap_sem); + + /* + * total_size is the size of the ELF (interpreter) image. @@ -679,7 +797,7 @@ + do_munmap(current->mm, map_addr+size, total_size-size); + } else + map_addr = do_mmap(filep, addr, size, prot, type, off); -+ ++ up_write(¤t->mm->mmap_sem); - return(map_addr); + @@ -706,10 +824,11 @@ + ELF_PAGESTART(cmds[first_idx].p_vaddr); +} + ++ /* This is much more generalized than the library routine read function, so we keep this separate. Technically the library read function is only provided so that we can read a.out libraries that have -@@ -306,7 +345,8 @@ static unsigned long elf_map(struct file +@@ -312,7 +351,8 @@ static unsigned long elf_map(struct file static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex, struct file * interpreter, @@ -719,7 +838,7 @@ { struct elf_phdr *elf_phdata; struct elf_phdr *eppnt; -@@ -314,6 +354,7 @@ static unsigned long load_elf_interp(str +@@ -320,6 +360,7 @@ static unsigned long load_elf_interp(str int load_addr_set = 0; unsigned long last_bss = 0, elf_bss = 0; unsigned long error = ~0UL; @@ -727,7 +846,7 @@ int retval, i, size; /* First of all, some simple consistency checks */ -@@ -352,6 +393,10 @@ static unsigned long load_elf_interp(str +@@ -358,6 +399,10 @@ static unsigned long load_elf_interp(str goto out_close; } @@ -738,7 +857,7 @@ eppnt = elf_phdata; for (i=0; ie_phnum; i++, eppnt++) { if (eppnt->p_type == PT_LOAD) { -@@ -366,8 +411,11 @@ static unsigned long load_elf_interp(str +@@ -372,8 +417,11 @@ static unsigned long load_elf_interp(str vaddr = eppnt->p_vaddr; if (interp_elf_ex->e_type == ET_EXEC || load_addr_set) elf_type |= MAP_FIXED; @@ -751,7 +870,7 @@ error = map_addr; if (BAD_ADDR(map_addr)) goto out_close; -@@ -527,7 +575,7 @@ static int load_elf_binary(struct linux_ +@@ -533,7 +581,7 @@ static int load_elf_binary(struct linux_ unsigned long reloc_func_desc = 0; char passed_fileno[6]; struct files_struct *files; @@ -760,7 +879,7 @@ unsigned long def_flags = 0; struct { struct elfhdr elf_ex; -@@ -683,6 +731,8 @@ static int load_elf_binary(struct linux_ +@@ -689,6 +737,8 @@ static int load_elf_binary(struct linux_ } elf_ppnt = elf_phdata; @@ -769,7 +888,7 @@ for (i = 0; i < loc->elf_ex.e_phnum; i++, elf_ppnt++) if (elf_ppnt->p_type == PT_GNU_STACK) { if (elf_ppnt->p_flags & PF_X) -@@ -693,6 +743,11 @@ static int load_elf_binary(struct linux_ +@@ -699,6 +749,11 @@ static int load_elf_binary(struct linux_ } have_pt_gnu_stack = (i < loc->elf_ex.e_phnum); @@ -781,7 +900,7 @@ /* Some simple consistency checks for the interpreter */ if (elf_interpreter) { interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT; -@@ -746,6 +801,15 @@ static int load_elf_binary(struct linux_ +@@ -752,6 +807,15 @@ static int load_elf_binary(struct linux_ if (retval) goto out_free_dentry; @@ -797,7 +916,7 @@ /* Discard our unneeded old files struct */ if (files) { steal_locks(files); -@@ -764,7 +828,8 @@ static int load_elf_binary(struct linux_ +@@ -770,7 +834,8 @@ static int load_elf_binary(struct linux_ /* Do this immediately, since STACK_TOP as used in setup_arg_pages may depend on the personality. */ SET_PERSONALITY(loc->elf_ex, ibcs2_interpreter); @@ -807,7 +926,7 @@ current->personality |= READ_IMPLIES_EXEC; if ( !(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) -@@ -785,10 +850,10 @@ static int load_elf_binary(struct linux_ +@@ -790,10 +855,10 @@ static int load_elf_binary(struct linux_ current->mm->start_stack = bprm->p; @@ -821,7 +940,7 @@ for(i = 0, elf_ppnt = elf_phdata; i < loc->elf_ex.e_phnum; i++, elf_ppnt++) { int elf_prot = 0, elf_flags; -@@ -832,16 +897,16 @@ static int load_elf_binary(struct linux_ +@@ -837,16 +902,16 @@ static int load_elf_binary(struct linux_ elf_flags = MAP_PRIVATE|MAP_DENYWRITE|MAP_EXECUTABLE; vaddr = elf_ppnt->p_vaddr; @@ -845,7 +964,7 @@ if (BAD_ADDR(error)) { send_sig(SIGKILL, current, 0); goto out_free_dentry; -@@ -918,7 +983,8 @@ static int load_elf_binary(struct linux_ +@@ -923,7 +988,8 @@ static int load_elf_binary(struct linux_ else elf_entry = load_elf_interp(&loc->interp_elf_ex, interpreter, @@ -855,22 +974,30 @@ if (BAD_ADDR(elf_entry)) { printk(KERN_ERR "Unable to load interpreter %.128s\n", elf_interpreter); -@@ -950,6 +1016,14 @@ static int load_elf_binary(struct linux_ +@@ -940,8 +1006,6 @@ static int load_elf_binary(struct linux_ + elf_entry = loc->elf_ex.e_entry; + } + +- kfree(elf_phdata); +- + if (interpreter_type != INTERPRETER_AOUT) + sys_close(elf_exec_fileno); + +@@ -951,10 +1015,12 @@ static int load_elf_binary(struct linux_ + retval = arch_setup_additional_pages(bprm, executable_stack); + if (retval < 0) { + send_sig(SIGKILL, current, 0); +- goto out; ++ goto out_free_fh; } #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ -+ /* -+ * Map the vsyscall trampoline. This address is then passed via -+ * AT_SYSINFO. -+ */ -+#ifdef __HAVE_ARCH_VSYSCALL -+ map_vsyscall(); -+#endif ++ kfree(elf_phdata); + compute_creds(bprm); current->flags &= ~PF_FORKNOEXEC; create_elf_tables(bprm, &loc->elf_ex, (interpreter_type == INTERPRETER_AOUT), -@@ -963,6 +1037,10 @@ static int load_elf_binary(struct linux_ +@@ -968,6 +1034,10 @@ static int load_elf_binary(struct linux_ current->mm->end_data = end_data; current->mm->start_stack = bprm->p; @@ -881,10 +1008,21 @@ if (current->personality & MMAP_PAGE_ZERO) { /* Why this, you ask??? Well SVr4 maps page 0 as read-only, and some applications "depend" upon this behavior. -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/proc/array.c linux-810/fs/proc/array.c ---- linux-804/fs/proc/array.c -+++ linux-810/fs/proc/array.c -@@ -385,8 +385,12 @@ static int do_task_stat(struct task_stru +@@ -1153,6 +1223,9 @@ static int maydump(struct vm_area_struct + if (vma->vm_flags & (VM_IO | VM_RESERVED)) + return 0; + ++ if (vma->vm_flags & VM_DONTEXPAND) /* Kludge for vDSO. */ ++ return 1; ++ + /* Dump shared memory only if mapped from an anonymous file. */ + if (vma->vm_flags & VM_SHARED) + return vma->vm_file->f_dentry->d_inode->i_nlink == 0; +Index: linux-exec-shield-curr.q/fs/proc/array.c +=================================================================== +--- linux-exec-shield-curr.q.orig/fs/proc/array.c ++++ linux-exec-shield-curr.q/fs/proc/array.c +@@ -391,8 +391,12 @@ static int do_task_stat(struct task_stru ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0; read_unlock(&tasklist_lock); @@ -899,10 +1037,11 @@ if (!whole) { min_flt = task->min_flt; maj_flt = task->maj_flt; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/proc/base.c linux-810/fs/proc/base.c ---- linux-804/fs/proc/base.c -+++ linux-810/fs/proc/base.c -@@ -181,7 +181,7 @@ static struct pid_entry tgid_base_stuff[ +Index: linux-exec-shield-curr.q/fs/proc/base.c +=================================================================== +--- linux-exec-shield-curr.q.orig/fs/proc/base.c ++++ linux-exec-shield-curr.q/fs/proc/base.c +@@ -188,7 +188,7 @@ static struct pid_entry tgid_base_stuff[ E(PROC_TGID_CMDLINE, "cmdline", S_IFREG|S_IRUGO), E(PROC_TGID_STAT, "stat", S_IFREG|S_IRUGO), E(PROC_TGID_STATM, "statm", S_IFREG|S_IRUGO), @@ -911,7 +1050,7 @@ #ifdef CONFIG_NUMA E(PROC_TGID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO), #endif -@@ -221,7 +221,7 @@ static struct pid_entry tid_base_stuff[] +@@ -230,7 +230,7 @@ static struct pid_entry tid_base_stuff[] E(PROC_TID_CMDLINE, "cmdline", S_IFREG|S_IRUGO), E(PROC_TID_STAT, "stat", S_IFREG|S_IRUGO), E(PROC_TID_STATM, "statm", S_IFREG|S_IRUGO), @@ -920,9 +1059,10 @@ #ifdef CONFIG_NUMA E(PROC_TID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO), #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/proc/task_mmu.c linux-810/fs/proc/task_mmu.c ---- linux-804/fs/proc/task_mmu.c -+++ linux-810/fs/proc/task_mmu.c +Index: linux-exec-shield-curr.q/fs/proc/task_mmu.c +=================================================================== +--- linux-exec-shield-curr.q.orig/fs/proc/task_mmu.c ++++ linux-exec-shield-curr.q/fs/proc/task_mmu.c @@ -43,7 +43,11 @@ char *task_mem(struct mm_struct *mm, cha "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -951,7 +1091,7 @@ return buffer; } -@@ -123,7 +133,13 @@ static int show_map_internal(struct seq_ +@@ -140,7 +150,13 @@ static int show_map_internal(struct seq_ vma->vm_end, flags & VM_READ ? 'r' : '-', flags & VM_WRITE ? 'w' : '-', @@ -966,7 +1106,7 @@ flags & VM_MAYSHARE ? 's' : 'p', vma->vm_pgoff << PAGE_SHIFT, MAJOR(dev), MINOR(dev), ino, &len); -@@ -137,8 +153,7 @@ static int show_map_internal(struct seq_ +@@ -154,18 +170,22 @@ static int show_map_internal(struct seq_ seq_path(m, file->f_vfsmnt, file->f_dentry, "\n"); } else { if (mm) { @@ -975,11 +1115,29 @@ + if (vma->vm_end == mm->brk) { pad_len_spaces(m, len); seq_puts(m, "[heap]"); - } else { -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/desc.h linux-810/include/asm-i386/desc.h ---- linux-804/include/asm-i386/desc.h -+++ linux-810/include/asm-i386/desc.h -@@ -156,6 +156,20 @@ static inline unsigned long get_desc_bas +- } else { +- if (vma->vm_start <= mm->start_stack && ++ } else if (vma->vm_start <= mm->start_stack && + vma->vm_end >= mm->start_stack) { + + pad_len_spaces(m, len); + seq_puts(m, "[stack]"); + } ++#ifdef __i386__ ++ else if (vma->vm_start == ++ (unsigned long)mm->context.vdso) { ++ pad_len_spaces(m, len); ++ seq_puts(m, "[vdso]"); + } ++#endif + } else { + pad_len_spaces(m, len); + seq_puts(m, "[vdso]"); +Index: linux-exec-shield-curr.q/include/asm-i386/desc.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-i386/desc.h ++++ linux-exec-shield-curr.q/include/asm-i386/desc.h +@@ -160,6 +160,20 @@ static inline unsigned long get_desc_bas return base; } @@ -991,7 +1149,7 @@ +} + +#define load_user_cs_desc(cpu, mm) \ -+ per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs ++ get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs + +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); @@ -1000,18 +1158,19 @@ #endif /* !__ASSEMBLY__ */ #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/elf.h linux-810/include/asm-i386/elf.h ---- linux-804/include/asm-i386/elf.h -+++ linux-810/include/asm-i386/elf.h -@@ -9,6 +9,7 @@ - #include +Index: linux-exec-shield-curr.q/include/asm-i386/elf.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-i386/elf.h ++++ linux-exec-shield-curr.q/include/asm-i386/elf.h +@@ -10,6 +10,7 @@ #include #include /* for savesegment */ #include +#include #include -@@ -133,15 +134,22 @@ extern int dump_task_extended_fpu (struc + +@@ -129,17 +130,30 @@ extern int dump_task_extended_fpu (struc #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs) #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs) @@ -1040,8 +1199,16 @@ + } \ } while (0) ++#define ARCH_HAS_SETUP_ADDITIONAL_PAGES ++struct linux_binprm; ++extern int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack); ++ ++#if 0 /* Disabled for exec-shield, where a normal vma holds the vDSO. */ /* -@@ -152,15 +160,15 @@ do { \ + * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out + * extra segments containing the vsyscall DSO contents. Dumping its +@@ -148,15 +162,15 @@ do { \ * Dumping its extra ELF program headers includes all the other information * a debugger needs to easily find how the vsyscall DSO was being used. */ @@ -1061,7 +1228,7 @@ struct elf_phdr phdr = vsyscall_phdrs[i]; \ if (phdr.p_type == PT_LOAD) { \ BUG_ON(ofs != 0); \ -@@ -178,10 +186,10 @@ do { \ +@@ -174,16 +188,23 @@ do { \ #define ELF_CORE_WRITE_EXTRA_DATA \ do { \ const struct elf_phdr *const vsyscall_phdrs = \ @@ -1075,7 +1242,9 @@ if (vsyscall_phdrs[i].p_type == PT_LOAD) \ DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr, \ PAGE_ALIGN(vsyscall_phdrs[i].p_memsz)); \ -@@ -190,4 +198,10 @@ do { \ + } \ + } while (0) ++#endif #endif @@ -1086,9 +1255,10 @@ +extern void map_vsyscall(void); + #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/mmu.h linux-810/include/asm-i386/mmu.h ---- linux-804/include/asm-i386/mmu.h -+++ linux-810/include/asm-i386/mmu.h +Index: linux-exec-shield-curr.q/include/asm-i386/mmu.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-i386/mmu.h ++++ linux-exec-shield-curr.q/include/asm-i386/mmu.h @@ -7,11 +7,17 @@ * we put the segment information here. * @@ -1107,9 +1277,26 @@ } mm_context_t; #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/pgalloc.h linux-810/include/asm-i386/pgalloc.h ---- linux-804/include/asm-i386/pgalloc.h -+++ linux-810/include/asm-i386/pgalloc.h +Index: linux-exec-shield-curr.q/include/asm-i386/page.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-i386/page.h ++++ linux-exec-shield-curr.q/include/asm-i386/page.h +@@ -118,6 +118,11 @@ extern int page_is_ram(unsigned long pag + #endif + #define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START) + ++/* ++ * Under exec-shield we don't use the generic fixmap gate area. ++ * The vDSO ("gate area") has a normal vma found the normal ways. ++ */ ++#define __HAVE_ARCH_GATE_AREA 1 + + #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) + #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) +Index: linux-exec-shield-curr.q/include/asm-i386/pgalloc.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-i386/pgalloc.h ++++ linux-exec-shield-curr.q/include/asm-i386/pgalloc.h @@ -3,6 +3,7 @@ #include @@ -1118,10 +1305,11 @@ #include #include /* for struct page */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/processor.h linux-810/include/asm-i386/processor.h ---- linux-804/include/asm-i386/processor.h -+++ linux-810/include/asm-i386/processor.h -@@ -317,7 +317,10 @@ extern int bootloader_type; +Index: linux-exec-shield-curr.q/include/asm-i386/processor.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-i386/processor.h ++++ linux-exec-shield-curr.q/include/asm-i386/processor.h +@@ -319,7 +319,10 @@ extern int bootloader_type; /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ @@ -1133,7 +1321,7 @@ #define HAVE_ARCH_PICK_MMAP_LAYOUT -@@ -499,6 +502,9 @@ static inline void load_esp0(struct tss_ +@@ -501,6 +504,9 @@ static inline void load_esp0(struct tss_ regs->xcs = __USER_CS; \ regs->eip = new_eip; \ regs->esp = new_esp; \ @@ -1143,9 +1331,10 @@ } while (0) /* -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/thread_info.h linux-810/include/asm-i386/thread_info.h ---- linux-804/include/asm-i386/thread_info.h -+++ linux-810/include/asm-i386/thread_info.h +Index: linux-exec-shield-curr.q/include/asm-i386/thread_info.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-i386/thread_info.h ++++ linux-exec-shield-curr.q/include/asm-i386/thread_info.h @@ -38,6 +38,7 @@ struct thread_info { 0-0xBFFFFFFF for user-thead 0-0xFFFFFFFF for kernel-thread @@ -1154,9 +1343,10 @@ struct restart_block restart_block; unsigned long previous_esp; /* ESP of the previous stack in case -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-ia64/pgalloc.h linux-810/include/asm-ia64/pgalloc.h ---- linux-804/include/asm-ia64/pgalloc.h -+++ linux-810/include/asm-ia64/pgalloc.h +Index: linux-exec-shield-curr.q/include/asm-ia64/pgalloc.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-ia64/pgalloc.h ++++ linux-exec-shield-curr.q/include/asm-ia64/pgalloc.h @@ -1,6 +1,10 @@ #ifndef _ASM_IA64_PGALLOC_H #define _ASM_IA64_PGALLOC_H @@ -1168,9 +1358,26 @@ /* * This file contains the functions and defines necessary to allocate * page tables. -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-ppc/pgalloc.h linux-810/include/asm-ppc/pgalloc.h ---- linux-804/include/asm-ppc/pgalloc.h -+++ linux-810/include/asm-ppc/pgalloc.h +Index: linux-exec-shield-curr.q/include/asm-powerpc/pgalloc.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-powerpc/pgalloc.h ++++ linux-exec-shield-curr.q/include/asm-powerpc/pgalloc.h +@@ -23,6 +23,11 @@ extern kmem_cache_t *pgtable_cache[]; + #define PGD_CACHE_NUM 0 + #endif + ++/* Dummy functions since we don't support execshield on ppc */ ++#define arch_add_exec_range(mm, limit) do { ; } while (0) ++#define arch_flush_exec_range(mm) do { ; } while (0) ++#define arch_remove_exec_range(mm, limit) do { ; } while (0) ++ + /* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License +Index: linux-exec-shield-curr.q/include/asm-ppc/pgalloc.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-ppc/pgalloc.h ++++ linux-exec-shield-curr.q/include/asm-ppc/pgalloc.h @@ -40,5 +40,10 @@ extern void pte_free(struct page *pte); #define check_pgt_cache() do { } while (0) @@ -1182,24 +1389,10 @@ + #endif /* _PPC_PGALLOC_H */ #endif /* __KERNEL__ */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-powerpc/pgalloc.h linux-810/include/asm-powerpc/pgalloc.h ---- linux-804/include/asm-powerpc/pgalloc.h -+++ linux-810/include/asm-powerpc/pgalloc.h -@@ -13,6 +13,11 @@ extern kmem_cache_t *pgtable_cache[]; - #define PUD_CACHE_NUM 1 - #define PGD_CACHE_NUM 0 - -+/* Dummy functions since we don't support execshield on ppc */ -+#define arch_add_exec_range(mm, limit) do { ; } while (0) -+#define arch_flush_exec_range(mm) do { ; } while (0) -+#define arch_remove_exec_range(mm, limit) do { ; } while (0) -+ - /* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-s390/pgalloc.h linux-810/include/asm-s390/pgalloc.h ---- linux-804/include/asm-s390/pgalloc.h -+++ linux-810/include/asm-s390/pgalloc.h +Index: linux-exec-shield-curr.q/include/asm-s390/pgalloc.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-s390/pgalloc.h ++++ linux-exec-shield-curr.q/include/asm-s390/pgalloc.h @@ -18,6 +18,10 @@ #include #include @@ -1211,9 +1404,10 @@ #define check_pgt_cache() do {} while (0) extern void diag10(unsigned long addr); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-sparc/pgalloc.h linux-810/include/asm-sparc/pgalloc.h ---- linux-804/include/asm-sparc/pgalloc.h -+++ linux-810/include/asm-sparc/pgalloc.h +Index: linux-exec-shield-curr.q/include/asm-sparc/pgalloc.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-sparc/pgalloc.h ++++ linux-exec-shield-curr.q/include/asm-sparc/pgalloc.h @@ -66,4 +66,8 @@ BTFIXUPDEF_CALL(void, pte_free, struct p #define pte_free(pte) BTFIXUP_CALL(pte_free)(pte) #define __pte_free_tlb(tlb, pte) pte_free(pte) @@ -1223,10 +1417,11 @@ +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #endif /* _SPARC_PGALLOC_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-sparc64/pgalloc.h linux-810/include/asm-sparc64/pgalloc.h ---- linux-804/include/asm-sparc64/pgalloc.h -+++ linux-810/include/asm-sparc64/pgalloc.h -@@ -180,4 +180,8 @@ static inline void pte_free(struct page +Index: linux-exec-shield-curr.q/include/asm-sparc64/pgalloc.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-sparc64/pgalloc.h ++++ linux-exec-shield-curr.q/include/asm-sparc64/pgalloc.h +@@ -181,4 +181,8 @@ static inline void pte_free(struct page #define pgd_free(pgd) free_pgd_fast(pgd) #define pgd_alloc(mm) get_pgd_fast() @@ -1235,9 +1430,10 @@ +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #endif /* _SPARC64_PGALLOC_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-x86_64/pgalloc.h linux-810/include/asm-x86_64/pgalloc.h ---- linux-804/include/asm-x86_64/pgalloc.h -+++ linux-810/include/asm-x86_64/pgalloc.h +Index: linux-exec-shield-curr.q/include/asm-x86_64/pgalloc.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-x86_64/pgalloc.h ++++ linux-exec-shield-curr.q/include/asm-x86_64/pgalloc.h @@ -6,6 +6,13 @@ #include #include @@ -1252,10 +1448,24 @@ #define pmd_populate_kernel(mm, pmd, pte) \ set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte))) #define pud_populate(mm, pud, pmd) \ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-x86_64/processor.h linux-810/include/asm-x86_64/processor.h ---- linux-804/include/asm-x86_64/processor.h -+++ linux-810/include/asm-x86_64/processor.h -@@ -162,6 +162,11 @@ static inline void clear_in_cr4 (unsigne +Index: linux-exec-shield-curr.q/include/asm-x86_64/pgtable.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-x86_64/pgtable.h ++++ linux-exec-shield-curr.q/include/asm-x86_64/pgtable.h +@@ -21,7 +21,7 @@ extern unsigned long __supported_pte_mas + + #define swapper_pg_dir init_level4_pgt + +-extern int nonx_setup(char *str); ++extern void nonx_setup(const char *str); + extern void paging_init(void); + extern void clear_kernel_mapping(unsigned long addr, unsigned long size); + +Index: linux-exec-shield-curr.q/include/asm-x86_64/processor.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/asm-x86_64/processor.h ++++ linux-exec-shield-curr.q/include/asm-x86_64/processor.h +@@ -164,6 +164,11 @@ static inline void clear_in_cr4 (unsigne */ #define TASK_SIZE64 (0x800000000000UL - 4096) @@ -1267,10 +1477,11 @@ /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/mm.h linux-810/include/linux/mm.h ---- linux-804/include/linux/mm.h -+++ linux-810/include/linux/mm.h -@@ -840,7 +840,14 @@ extern struct vm_area_struct *copy_vma(s +Index: linux-exec-shield-curr.q/include/linux/mm.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/linux/mm.h ++++ linux-exec-shield-curr.q/include/linux/mm.h +@@ -914,7 +914,19 @@ extern struct vm_area_struct *copy_vma(s extern void exit_mmap(struct mm_struct *); extern int may_expand_vm(struct mm_struct *mm, unsigned long npages); @@ -1278,17 +1489,32 @@ +extern unsigned long get_unmapped_area_prot(struct file *, unsigned long, unsigned long, unsigned long, unsigned long, int); + + -+static inline unsigned long get_unmapped_area(struct file * file, unsigned long addr, ++static inline unsigned long get_unmapped_area(struct file * file, unsigned long addr, + unsigned long len, unsigned long pgoff, unsigned long flags) +{ -+ return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); ++ return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); +} ++ ++extern int install_special_mapping(struct mm_struct *mm, ++ unsigned long addr, unsigned long len, ++ unsigned long vm_flags, pgprot_t pgprot, ++ struct page **pages); extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/resource.h linux-810/include/linux/resource.h ---- linux-804/include/linux/resource.h -+++ linux-810/include/linux/resource.h +@@ -966,7 +978,7 @@ unsigned long page_cache_readahead(struc + struct file *filp, + pgoff_t offset, + unsigned long size); +-void handle_ra_miss(struct address_space *mapping, ++void handle_ra_miss(struct address_space *mapping, + struct file_ra_state *ra, pgoff_t offset); + unsigned long max_sane_readahead(unsigned long nr); + +Index: linux-exec-shield-curr.q/include/linux/resource.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/linux/resource.h ++++ linux-exec-shield-curr.q/include/linux/resource.h @@ -52,8 +52,11 @@ struct rlimit { /* * Limit the stack by to some sane default: root can always @@ -1302,11 +1528,12 @@ /* * GPG wants 32kB of mlocked memory, to make sure pass phrases -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/sched.h linux-810/include/linux/sched.h ---- linux-804/include/linux/sched.h -+++ linux-810/include/linux/sched.h -@@ -36,6 +36,8 @@ - #include +Index: linux-exec-shield-curr.q/include/linux/sched.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/linux/sched.h ++++ linux-exec-shield-curr.q/include/linux/sched.h +@@ -39,6 +39,8 @@ + #include /* For AT_VECTOR_SIZE */ struct exec_domain; +extern int exec_shield; @@ -1314,7 +1541,7 @@ /* * cloning flags: -@@ -197,6 +199,10 @@ extern int sysctl_max_map_count; +@@ -243,6 +245,10 @@ extern int sysctl_max_map_count; extern unsigned long arch_get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); @@ -1325,7 +1552,7 @@ extern unsigned long arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, -@@ -218,6 +224,9 @@ struct mm_struct { +@@ -295,6 +301,9 @@ struct mm_struct { unsigned long (*get_unmapped_area) (struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); @@ -1335,9 +1562,10 @@ void (*unmap_area) (struct mm_struct *mm, unsigned long addr); unsigned long mmap_base; /* base of mmap area */ unsigned long cached_hole_size; /* if non-zero, the largest hole below free_area_cache */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/sysctl.h linux-810/include/linux/sysctl.h ---- linux-804/include/linux/sysctl.h -+++ linux-810/include/linux/sysctl.h +Index: linux-exec-shield-curr.q/include/linux/sysctl.h +=================================================================== +--- linux-exec-shield-curr.q.orig/include/linux/sysctl.h ++++ linux-exec-shield-curr.q/include/linux/sysctl.h @@ -92,6 +92,9 @@ enum KERN_CAP_BSET=14, /* int: capability bounding set */ @@ -1348,12 +1576,13 @@ KERN_REALROOTDEV=16, /* real root device to mount after initrd */ KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/kernel/signal.c linux-810/kernel/signal.c ---- linux-804/kernel/signal.c -+++ linux-810/kernel/signal.c -@@ -1209,6 +1209,37 @@ kill_proc_info(int sig, struct siginfo * - return error; - } +Index: linux-exec-shield-curr.q/kernel/signal.c +=================================================================== +--- linux-exec-shield-curr.q.orig/kernel/signal.c ++++ linux-exec-shield-curr.q/kernel/signal.c +@@ -868,6 +868,37 @@ out_set: + #define LEGACY_QUEUE(sigptr, sig) \ + (((sig) < SIGRTMIN) && sigismember(&(sigptr)->signal, (sig))) +int print_fatal_signals = 0; + @@ -1361,7 +1590,7 @@ +{ + printk("%s/%d: potentially unexpected fatal signal %d.\n", + current->comm, current->pid, signr); -+ ++ +#ifdef __i386__ + printk("code at %08lx: ", regs->eip); + { @@ -1373,7 +1602,7 @@ + printk("%02x ", insn); + } + } -+#endif ++#endif + printk("\n"); + show_regs(regs); +} @@ -1387,9 +1616,9 @@ + +__setup("print-fatal-signals=", setup_print_fatal_signals); - /* - * kill_something_info() interprets pid in interesting ways just like kill(2). -@@ -1859,6 +1890,11 @@ relock: + static int + specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) +@@ -1935,6 +1966,11 @@ relock: if (!signr) break; /* will return 0 */ @@ -1401,7 +1630,7 @@ if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) { ptrace_signal_deliver(regs, cookie); -@@ -1954,6 +1990,8 @@ relock: +@@ -2030,6 +2066,8 @@ relock: * Anything else is fatal, maybe with a core dump. */ current->flags |= PF_SIGNALED; @@ -1410,14 +1639,15 @@ if (sig_kernel_coredump(signr)) { /* * If it was able to dump core, this kills all -diff -urNp --exclude-from=/home/davej/.exclude linux-804/kernel/sysctl.c linux-810/kernel/sysctl.c ---- linux-804/kernel/sysctl.c -+++ linux-810/kernel/sysctl.c -@@ -74,6 +74,19 @@ extern int proc_unknown_nmi_panic(ctl_ta +Index: linux-exec-shield-curr.q/kernel/sysctl.c +=================================================================== +--- linux-exec-shield-curr.q.orig/kernel/sysctl.c ++++ linux-exec-shield-curr.q/kernel/sysctl.c +@@ -77,6 +77,19 @@ extern int proc_unknown_nmi_panic(ctl_ta void __user *, size_t *, loff_t *); #endif -+extern unsigned int vdso_enabled; ++extern unsigned int vdso_enabled, vdso_populate; + +int exec_shield = 1; + @@ -1433,7 +1663,7 @@ /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ static int maxolduid = 65535; static int minolduid; -@@ -279,6 +292,32 @@ static ctl_table kern_table[] = { +@@ -280,6 +293,40 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { @@ -1461,14 +1691,24 @@ + .mode = 0644, + .proc_handler = &proc_dointvec, + }, ++ { ++ .ctl_name = KERN_VDSO, ++ .procname = "vdso_populate", ++ .data = &vdso_populate, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = &proc_dointvec, ++ }, +#endif + { .ctl_name = KERN_CORE_USES_PID, .procname = "core_uses_pid", .data = &core_uses_pid, ---- linux-2.6.13/mm/fremap.c~ 2005-10-13 17:34:08.000000000 -0400 -+++ linux-2.6.13/mm/fremap.c 2005-10-13 17:34:58.000000000 -0400 -@@ -83,13 +83,15 @@ int install_page(struct mm_struct *mm, s +Index: linux-exec-shield-curr.q/mm/fremap.c +=================================================================== +--- linux-exec-shield-curr.q.orig/mm/fremap.c ++++ linux-exec-shield-curr.q/mm/fremap.c +@@ -67,13 +67,15 @@ int install_page(struct mm_struct *mm, s * caller about it. */ err = -EINVAL; @@ -1491,9 +1731,10 @@ if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte)) inc_mm_counter(mm, file_rss); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mmap.c linux-810/mm/mmap.c ---- linux-804/mm/mmap.c -+++ linux-810/mm/mmap.c +Index: linux-exec-shield-curr.q/mm/mmap.c +=================================================================== +--- linux-exec-shield-curr.q.orig/mm/mmap.c ++++ linux-exec-shield-curr.q/mm/mmap.c @@ -24,6 +24,7 @@ #include #include @@ -1502,7 +1743,7 @@ #include #include -@@ -342,6 +343,8 @@ static inline void +@@ -341,6 +342,8 @@ static inline void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma, struct vm_area_struct *prev, struct rb_node *rb_parent) { @@ -1511,7 +1752,7 @@ if (prev) { vma->vm_next = prev->vm_next; prev->vm_next = vma; -@@ -446,6 +449,8 @@ __vma_unlink(struct mm_struct *mm, struc +@@ -445,6 +448,8 @@ __vma_unlink(struct mm_struct *mm, struc rb_erase(&vma->vm_rb, &mm->mm_rb); if (mm->mmap_cache == vma) mm->mmap_cache = prev; @@ -1520,7 +1761,7 @@ } /* -@@ -751,6 +756,8 @@ struct vm_area_struct *vma_merge(struct +@@ -750,6 +755,8 @@ struct vm_area_struct *vma_merge(struct } else /* cases 2, 5, 7 */ vma_adjust(prev, prev->vm_start, end, prev->vm_pgoff, NULL); @@ -1529,7 +1770,7 @@ return prev; } -@@ -922,7 +929,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -921,7 +928,7 @@ unsigned long do_mmap_pgoff(struct file /* Obtain the address to map to. we verify (or select) it and ensure * that it represents a valid section of the address space. */ @@ -1538,7 +1779,7 @@ if (addr & ~PAGE_MASK) return addr; -@@ -1328,16 +1335,21 @@ void arch_unmap_area_topdown(struct mm_s +@@ -1327,16 +1334,21 @@ void arch_unmap_area_topdown(struct mm_s mm->free_area_cache = mm->mmap_base; } @@ -1563,7 +1804,7 @@ if (file && file->f_op && file->f_op->get_unmapped_area) get_area = file->f_op->get_unmapped_area; addr = get_area(file, addr, len, pgoff, flags); -@@ -1368,7 +1380,71 @@ get_unmapped_area(struct file *file, uns +@@ -1367,7 +1379,71 @@ get_unmapped_area(struct file *file, uns return addr; } @@ -1636,7 +1877,7 @@ /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */ struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr) -@@ -1443,6 +1519,14 @@ out: +@@ -1442,6 +1518,14 @@ out: return prev ? prev->vm_next : vma; } @@ -1651,7 +1892,7 @@ /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -1458,7 +1542,7 @@ static int acct_stack_growth(struct vm_a +@@ -1457,7 +1541,7 @@ static int acct_stack_growth(struct vm_a return -ENOMEM; /* Stack limit test */ @@ -1660,7 +1901,7 @@ return -ENOMEM; /* mlock limit tests */ -@@ -1740,10 +1824,14 @@ int split_vma(struct mm_struct * mm, str +@@ -1737,10 +1821,14 @@ int split_vma(struct mm_struct * mm, str if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); @@ -1677,7 +1918,7 @@ vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); return 0; -@@ -2048,6 +2048,7 @@ void exit_mmap(struct mm_struct *mm) +@@ -1945,6 +2033,7 @@ void exit_mmap(struct mm_struct *mm) vm_unacct_memory(nr_accounted); free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); tlb_finish_mmu(tlb, 0, end); @@ -1685,9 +1926,92 @@ /* * Walk the list again, actually closing and freeing it, -diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mprotect.c linux-810/mm/mprotect.c ---- linux-804/mm/mprotect.c -+++ linux-810/mm/mprotect.c +@@ -2060,3 +2149,81 @@ int may_expand_vm(struct mm_struct *mm, + return 0; + return 1; + } ++ ++ ++static struct page * ++special_mapping_nopage(struct vm_area_struct *vma, ++ unsigned long address, int *type) ++{ ++ struct page **pages; ++ ++ BUG_ON(address < vma->vm_start || address >= vma->vm_end); ++ ++ address -= vma->vm_start; ++ for (pages = vma->vm_private_data; address > 0 && *pages; ++pages) ++ address -= PAGE_SIZE; ++ ++ if (*pages) { ++ get_page(*pages); ++ return *pages; ++ } ++ ++ return NOPAGE_SIGBUS; ++} ++ ++static struct vm_operations_struct special_mapping_vmops = { ++ .nopage = special_mapping_nopage, ++}; ++ ++unsigned int vdso_populate = 1; ++ ++/* ++ * Insert a new vma covering the given region, with the given flags and ++ * protections. Its pages are supplied by the given null-terminated array. ++ * The region past the last page supplied will always produce SIGBUS. ++ * The array pointer and the pages it points to are assumed to stay alive ++ * for as long as this mapping might exist. ++ */ ++int install_special_mapping(struct mm_struct *mm, ++ unsigned long addr, unsigned long len, ++ unsigned long vm_flags, pgprot_t pgprot, ++ struct page **pages) ++{ ++ struct vm_area_struct *vma; ++ int err; ++ ++ vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); ++ if (unlikely(vma == NULL)) ++ return -ENOMEM; ++ memset(vma, 0, sizeof(*vma)); ++ ++ vma->vm_mm = mm; ++ vma->vm_start = addr; ++ vma->vm_end = addr + len; ++ ++ vma->vm_flags = vm_flags; ++ vma->vm_page_prot = pgprot; ++ ++ vma->vm_ops = &special_mapping_vmops; ++ vma->vm_private_data = pages; ++ ++ insert_vm_struct(mm, vma); ++ mm->total_vm += len >> PAGE_SHIFT; ++ ++ if (!vdso_populate) ++ return 0; ++ ++ err = 0; ++ while (*pages) { ++ struct page *page = *pages++; ++ get_page(page); ++ err = install_page(mm, vma, addr, page, vma->vm_page_prot); ++ if (err) { ++ put_page(page); ++ break; ++ } ++ addr += PAGE_SIZE; ++ } ++ ++ return err; ++} +Index: linux-exec-shield-curr.q/mm/mprotect.c +=================================================================== +--- linux-exec-shield-curr.q.orig/mm/mprotect.c ++++ linux-exec-shield-curr.q/mm/mprotect.c @@ -22,6 +22,7 @@ #include @@ -1696,7 +2020,7 @@ #include #include -@@ -106,7 +107,7 @@ mprotect_fixup(struct vm_area_struct *vm +@@ -105,7 +106,7 @@ mprotect_fixup(struct vm_area_struct *vm struct mm_struct *mm = vma->vm_mm; unsigned long oldflags = vma->vm_flags; long nrpages = (end - start) >> PAGE_SHIFT; @@ -1705,141 +2029,34 @@ pgprot_t newprot; pgoff_t pgoff; int error; -@@ -167,6 +168,8 @@ success: +@@ -166,6 +167,8 @@ success: */ vma->vm_flags = newflags; vma->vm_page_prot = newprot; + if (oldflags & VM_EXEC) + arch_remove_exec_range(current->mm, old_end); change_protection(vma, start, end, newprot); - __vm_stat_account(mm, oldflags, vma->vm_file, -nrpages); - __vm_stat_account(mm, newflags, vma->vm_file, nrpages); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mremap.c linux-810/mm/mremap.c ---- linux-804/mm/mremap.c -+++ linux-810/mm/mremap.c -@@ -407,8 +407,8 @@ unsigned long do_mremap(unsigned long ad + vm_stat_account(mm, oldflags, vma->vm_file, -nrpages); + vm_stat_account(mm, newflags, vma->vm_file, nrpages); +Index: linux-exec-shield-curr.q/mm/mremap.c +=================================================================== +--- linux-exec-shield-curr.q.orig/mm/mremap.c ++++ linux-exec-shield-curr.q/mm/mremap.c +@@ -386,8 +386,8 @@ unsigned long do_mremap(unsigned long ad if (vma->vm_flags & VM_MAYSHARE) map_flags |= MAP_SHARED; - new_addr = get_unmapped_area(vma->vm_file, 0, new_len, - vma->vm_pgoff, map_flags); -+ new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len, ++ new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len, + vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC); ret = new_addr; if (new_addr & ~PAGE_MASK) goto out; -diff -urNp --exclude-from=/home/davej/.exclude linux-812/arch/i386/kernel/cpu/common.c linux-813/arch/i386/kernel/cpu/common.c ---- linux-812/arch/i386/kernel/cpu/common.c -+++ linux-813/arch/i386/kernel/cpu/common.c -@@ -397,6 +397,13 @@ void __devinit identify_cpu(struct cpuin - if (disable_pse) - clear_bit(X86_FEATURE_PSE, c->x86_capability); - -+ if (exec_shield != 0) { -+#ifdef CONFIG_HIGHMEM64G /* NX implies PAE */ -+ if (!test_bit(X86_FEATURE_NX, c->x86_capability)) -+#endif -+ clear_bit(X86_FEATURE_SEP, c->x86_capability); -+ } -+ - /* If the model name is still unset, do table lookup. */ - if ( !c->x86_model_id[0] ) { - char *p; -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.13-a/arch/x86_64/ia32/ia32_binfmt.c ---- linux-2.6.13/arch/x86_64/ia32/ia32_binfmt.c 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/arch/x86_64/ia32/ia32_binfmt.c 2005-10-14 20:56:15.000000000 -0400 -@@ -249,8 +249,6 @@ elf_core_copy_task_xfpregs(struct task_s - #define elf_check_arch(x) \ - ((x)->e_machine == EM_386) - --extern int force_personality32; -- - #define ELF_EXEC_PAGESIZE PAGE_SIZE - #define ELF_HWCAP (boot_cpu_data.x86_capability[0]) - #define ELF_PLATFORM ("i686") -@@ -264,8 +262,6 @@ do { \ - set_thread_flag(TIF_ABI_PENDING); \ - else \ - clear_thread_flag(TIF_ABI_PENDING); \ -- /* XXX This overwrites the user set personality */ \ -- current->personality |= force_personality32; \ - } while (0) - - /* Override some function names */ -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/arch/x86_64/kernel/process.c linux-2.6.13-a/arch/x86_64/kernel/process.c ---- linux-2.6.13/arch/x86_64/kernel/process.c 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/arch/x86_64/kernel/process.c 2005-10-14 20:56:15.000000000 -0400 -@@ -638,12 +638,6 @@ void set_personality_64bit(void) - - /* Make sure to be in 64bit mode */ - clear_thread_flag(TIF_IA32); -- -- /* TBD: overwrites user setup. Should have two bits. -- But 64bit processes have always behaved this way, -- so it's not too bad. The main problem is just that -- 32bit childs are affected again. */ -- current->personality &= ~READ_IMPLIES_EXEC; - } - - asmlinkage long sys_fork(struct pt_regs *regs) -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/arch/x86_64/kernel/setup64.c linux-2.6.13-a/arch/x86_64/kernel/setup64.c ---- linux-2.6.13/arch/x86_64/kernel/setup64.c 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/arch/x86_64/kernel/setup64.c 2005-10-14 20:56:15.000000000 -0400 -@@ -45,7 +45,7 @@ Control non executable mappings for 64bi - on Enable(default) - off Disable - */ --int __init nonx_setup(char *str) -+void __init nonx_setup(const char *str) - { - if (!strncmp(str, "on", 2)) { - __supported_pte_mask |= _PAGE_NX; -@@ -53,29 +53,8 @@ int __init nonx_setup(char *str) - } else if (!strncmp(str, "off", 3)) { - do_not_nx = 1; - __supported_pte_mask &= ~_PAGE_NX; -- } -- return 0; -+ } - } --__setup("noexec=", nonx_setup); /* parsed early actually */ -- --int force_personality32 = READ_IMPLIES_EXEC; -- --/* noexec32=on|off --Control non executable heap for 32bit processes. --To control the stack too use noexec=off -- --on PROT_READ does not imply PROT_EXEC for 32bit processes --off PROT_READ implies PROT_EXEC (default) --*/ --static int __init nonx32_setup(char *str) --{ -- if (!strcmp(str, "on")) -- force_personality32 &= ~READ_IMPLIES_EXEC; -- else if (!strcmp(str, "off")) -- force_personality32 |= READ_IMPLIES_EXEC; -- return 0; --} --__setup("noexec32=", nonx32_setup); - - /* - * Great future plan: -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/include/asm-x86_64/pgtable.h linux-2.6.13-a/include/asm-x86_64/pgtable.h ---- linux-2.6.13/include/asm-x86_64/pgtable.h 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/include/asm-x86_64/pgtable.h 2005-10-14 20:56:15.000000000 -0400 -@@ -20,7 +20,7 @@ extern unsigned long __supported_pte_mas - - #define swapper_pg_dir init_level4_pgt - --extern int nonx_setup(char *str); -+extern void nonx_setup(const char *str); - extern void paging_init(void); - extern void clear_kernel_mapping(unsigned long addr, unsigned long size); - ---- linux-2.6.14/fs/proc/base.c~ 2005-12-29 19:25:42.000000000 -0500 -+++ linux-2.6.14/fs/proc/base.c 2005-12-29 19:26:20.000000000 -0500 -@@ -200,7 +200,7 @@ static struct pid_entry tgid_base_stuff[ + +--- linux-2.6.15/fs/proc/base.c~ 2006-01-09 13:41:33.000000000 -0500 ++++ linux-2.6.15/fs/proc/base.c 2006-01-09 13:41:42.000000000 -0500 +@@ -201,7 +201,7 @@ static struct pid_entry tgid_base_stuff[ E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), #ifdef CONFIG_MMU linux-2.6-gcc41.patch: apic.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6-gcc41.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-gcc41.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-gcc41.patch 8 Jan 2006 01:59:03 -0000 1.6 +++ linux-2.6-gcc41.patch 9 Jan 2006 18:55:15 -0000 1.7 @@ -17,1276 +17,3 @@ static __inline unsigned int apic_read(unsigned long reg) - -Since version 4.1 the gcc is warning about ignored attributes. This patch is -using the equivalent attribute on the struct instead of on each of the -structure or union members. - -GCC Manual: - "Specifying Attributes of Types - - packed - This attribute, attached to struct or union type definition, specifies - that - each member of the structure or union is placed to minimize the memory - required. When attached to an enum definition, it indicates that the - smallest integral type should be used. - - Specifying this attribute for struct and union types is equivalent to - specifying the packed attribute on each of the structure or union - members." - -Signed-off-by: Jan Blunck - ---8JPrznbw0YAQ/KXy -Content-Type: text/plain; charset=us-ascii -Content-Disposition: attachment; filename="eliminate-packed-warnings-2.diff" - - drivers/isdn/hisax/hisax.h | 20 ++--- - drivers/isdn/hisax/hisax_fcpcipnp.h | 18 ++--- - drivers/net/3c527.h | 50 +++++++------- - drivers/net/irda/vlsi_ir.h | 4 - - drivers/net/wan/sdla.c | 6 - - include/linux/atalk.h | 18 ++--- - include/linux/cycx_x25.h | 66 +++++++++--------- - include/linux/if_frad.h | 12 +-- - include/linux/isdnif.h | 70 ++++++++++---------- - include/linux/ncp.h | 126 ++++++++++++++++++------------------ - include/linux/sdla.h | 64 +++++++++--------- - include/linux/wavefront.h | 34 ++++----- - include/net/dn_dev.h | 80 +++++++++++----------- - include/net/dn_nsp.h | 74 ++++++++++----------- - include/sound/wavefront.h | 34 ++++----- - 16 files changed, 340 insertions(+), 340 deletions(-) - -Index: linux-2.6/include/linux/if_frad.h -=================================================================== ---- linux-2.6.orig/include/linux/if_frad.h -+++ linux-2.6/include/linux/if_frad.h -@@ -131,17 +131,17 @@ struct frad_conf - /* these are the fields of an RFC 1490 header */ - struct frhdr - { -- unsigned char control __attribute__((packed)); -+ unsigned char control; - - /* for IP packets, this can be the NLPID */ -- unsigned char pad __attribute__((packed)); -+ unsigned char pad; - -- unsigned char NLPID __attribute__((packed)); -- unsigned char OUI[3] __attribute__((packed)); -- unsigned short PID __attribute__((packed)); -+ unsigned char NLPID; -+ unsigned char OUI[3]; -+ unsigned short PID; - - #define IP_NLPID pad --}; -+} __attribute__((packed)); - - /* see RFC 1490 for the definition of the following */ - #define FRAD_I_UI 0x03 -Index: linux-2.6/include/linux/isdnif.h -=================================================================== ---- linux-2.6.orig/include/linux/isdnif.h -+++ linux-2.6/include/linux/isdnif.h -@@ -282,43 +282,43 @@ typedef struct setup_parm { - - typedef struct T30_s { - /* session parameters */ -- __u8 resolution __attribute__ ((packed)); -- __u8 rate __attribute__ ((packed)); -- __u8 width __attribute__ ((packed)); -- __u8 length __attribute__ ((packed)); -- __u8 compression __attribute__ ((packed)); -- __u8 ecm __attribute__ ((packed)); -- __u8 binary __attribute__ ((packed)); -- __u8 scantime __attribute__ ((packed)); -- __u8 id[FAXIDLEN] __attribute__ ((packed)); -+ __u8 resolution; -+ __u8 rate ; -+ __u8 width ; -+ __u8 length ; -+ __u8 compression ; -+ __u8 ecm ; -+ __u8 binary ; -+ __u8 scantime ; -+ __u8 id[FAXIDLEN] ; - /* additional parameters */ -- __u8 phase __attribute__ ((packed)); -- __u8 direction __attribute__ ((packed)); -- __u8 code __attribute__ ((packed)); -- __u8 badlin __attribute__ ((packed)); -- __u8 badmul __attribute__ ((packed)); -- __u8 bor __attribute__ ((packed)); -- __u8 fet __attribute__ ((packed)); -- __u8 pollid[FAXIDLEN] __attribute__ ((packed)); -- __u8 cq __attribute__ ((packed)); -- __u8 cr __attribute__ ((packed)); -- __u8 ctcrty __attribute__ ((packed)); -- __u8 minsp __attribute__ ((packed)); -- __u8 phcto __attribute__ ((packed)); -- __u8 rel __attribute__ ((packed)); -- __u8 nbc __attribute__ ((packed)); -+ __u8 phase; -+ __u8 direction; -+ __u8 code; -+ __u8 badlin; -+ __u8 badmul; -+ __u8 bor; -+ __u8 fet; -+ __u8 pollid[FAXIDLEN]; -+ __u8 cq; -+ __u8 cr; -+ __u8 ctcrty; -+ __u8 minsp; -+ __u8 phcto; -+ __u8 rel; -+ __u8 nbc; - /* remote station parameters */ -- __u8 r_resolution __attribute__ ((packed)); -- __u8 r_rate __attribute__ ((packed)); -- __u8 r_width __attribute__ ((packed)); -- __u8 r_length __attribute__ ((packed)); -- __u8 r_compression __attribute__ ((packed)); -- __u8 r_ecm __attribute__ ((packed)); -- __u8 r_binary __attribute__ ((packed)); -- __u8 r_scantime __attribute__ ((packed)); -- __u8 r_id[FAXIDLEN] __attribute__ ((packed)); -- __u8 r_code __attribute__ ((packed)); --} T30_s; -+ __u8 r_resolution; -+ __u8 r_rate; -+ __u8 r_width; -+ __u8 r_length; -+ __u8 r_compression; -+ __u8 r_ecm; -+ __u8 r_binary; -+ __u8 r_scantime; -+ __u8 r_id[FAXIDLEN]; -+ __u8 r_code; -+} __attribute__((packed)) T30_s; - - #define ISDN_TTY_FAX_CONN_IN 0 - #define ISDN_TTY_FAX_CONN_OUT 1 -Index: linux-2.6/include/linux/ncp.h -=================================================================== ---- linux-2.6.orig/include/linux/ncp.h -+++ linux-2.6/include/linux/ncp.h -@@ -20,29 +20,29 @@ - #define NCP_DEALLOC_SLOT_REQUEST (0x5555) - - struct ncp_request_header { -- __u16 type __attribute__((packed)); -- __u8 sequence __attribute__((packed)); -- __u8 conn_low __attribute__((packed)); -- __u8 task __attribute__((packed)); -- __u8 conn_high __attribute__((packed)); -- __u8 function __attribute__((packed)); -- __u8 data[0] __attribute__((packed)); --}; -+ __u16 type; -+ __u8 sequence; -+ __u8 conn_low; -+ __u8 task; -+ __u8 conn_high; -+ __u8 function; -+ __u8 data[0]; -+} __attribute__((packed)); - - #define NCP_REPLY (0x3333) - #define NCP_WATCHDOG (0x3E3E) - #define NCP_POSITIVE_ACK (0x9999) - - struct ncp_reply_header { -- __u16 type __attribute__((packed)); -- __u8 sequence __attribute__((packed)); -- __u8 conn_low __attribute__((packed)); -- __u8 task __attribute__((packed)); -- __u8 conn_high __attribute__((packed)); -- __u8 completion_code __attribute__((packed)); -- __u8 connection_state __attribute__((packed)); -- __u8 data[0] __attribute__((packed)); --}; -+ __u16 type; -+ __u8 sequence; -+ __u8 conn_low; -+ __u8 task; -+ __u8 conn_high; -+ __u8 completion_code; -+ __u8 connection_state; -+ __u8 data[0]; -+} __attribute__((packed)); - - #define NCP_VOLNAME_LEN (16) - #define NCP_NUMBER_OF_VOLUMES (256) -@@ -128,37 +128,37 @@ struct nw_nfs_info { - }; - - struct nw_info_struct { -- __u32 spaceAlloc __attribute__((packed)); -- __le32 attributes __attribute__((packed)); -- __u16 flags __attribute__((packed)); -- __le32 dataStreamSize __attribute__((packed)); -- __le32 totalStreamSize __attribute__((packed)); -- __u16 numberOfStreams __attribute__((packed)); -- __le16 creationTime __attribute__((packed)); -- __le16 creationDate __attribute__((packed)); -- __u32 creatorID __attribute__((packed)); -- __le16 modifyTime __attribute__((packed)); -- __le16 modifyDate __attribute__((packed)); -- __u32 modifierID __attribute__((packed)); -- __le16 lastAccessDate __attribute__((packed)); -- __u16 archiveTime __attribute__((packed)); -- __u16 archiveDate __attribute__((packed)); -- __u32 archiverID __attribute__((packed)); -- __u16 inheritedRightsMask __attribute__((packed)); -- __le32 dirEntNum __attribute__((packed)); -- __le32 DosDirNum __attribute__((packed)); -- __u32 volNumber __attribute__((packed)); -- __u32 EADataSize __attribute__((packed)); -- __u32 EAKeyCount __attribute__((packed)); -- __u32 EAKeySize __attribute__((packed)); -- __u32 NSCreator __attribute__((packed)); -- __u8 nameLen __attribute__((packed)); -- __u8 entryName[256] __attribute__((packed)); -+ __u32 spaceAlloc; -+ __le32 attributes; -+ __u16 flags; -+ __le32 dataStreamSize; -+ __le32 totalStreamSize; -+ __u16 numberOfStreams; -+ __le16 creationTime; -+ __le16 creationDate; -+ __u32 creatorID; -+ __le16 modifyTime; -+ __le16 modifyDate; -+ __u32 modifierID; -+ __le16 lastAccessDate; -+ __u16 archiveTime; -+ __u16 archiveDate; -+ __u32 archiverID; -+ __u16 inheritedRightsMask; -+ __le32 dirEntNum; -+ __le32 DosDirNum; -+ __u32 volNumber; -+ __u32 EADataSize; -+ __u32 EAKeyCount; -+ __u32 EAKeySize; -+ __u32 NSCreator; -+ __u8 nameLen; -+ __u8 entryName[256]; - /* libncp may depend on there being nothing after entryName */ - #ifdef __KERNEL__ - struct nw_nfs_info nfs; - #endif --}; -+} __attribute__((packed)); - - /* modify mask - use with MODIFY_DOS_INFO structure */ - #define DM_ATTRIBUTES (cpu_to_le32(0x02)) -@@ -176,26 +176,26 @@ struct nw_info_struct { - #define DM_MAXIMUM_SPACE (cpu_to_le32(0x2000)) - - struct nw_modify_dos_info { -- __le32 attributes __attribute__((packed)); -- __le16 creationDate __attribute__((packed)); -- __le16 creationTime __attribute__((packed)); -- __u32 creatorID __attribute__((packed)); -- __le16 modifyDate __attribute__((packed)); -- __le16 modifyTime __attribute__((packed)); -- __u32 modifierID __attribute__((packed)); -- __u16 archiveDate __attribute__((packed)); -- __u16 archiveTime __attribute__((packed)); -- __u32 archiverID __attribute__((packed)); -- __le16 lastAccessDate __attribute__((packed)); -- __u16 inheritanceGrantMask __attribute__((packed)); -- __u16 inheritanceRevokeMask __attribute__((packed)); -- __u32 maximumSpace __attribute__((packed)); --}; -+ __le32 attributes; -+ __le16 creationDate; -+ __le16 creationTime; -+ __u32 creatorID; -+ __le16 modifyDate; -+ __le16 modifyTime; -+ __u32 modifierID; -+ __u16 archiveDate; -+ __u16 archiveTime; -+ __u32 archiverID; -+ __le16 lastAccessDate; -+ __u16 inheritanceGrantMask; -+ __u16 inheritanceRevokeMask; -+ __u32 maximumSpace; -+} __attribute__((packed)); - - struct nw_search_sequence { -- __u8 volNumber __attribute__((packed)); -- __u32 dirBase __attribute__((packed)); -- __u32 sequence __attribute__((packed)); --}; -+ __u8 volNumber; -+ __u32 dirBase; -+ __u32 sequence; -+} __attribute__((packed)); - - #endif /* _LINUX_NCP_H */ -Index: linux-2.6/drivers/isdn/hisax/hisax.h -=================================================================== ---- linux-2.6.orig/drivers/isdn/hisax/hisax.h -+++ linux-2.6/drivers/isdn/hisax/hisax.h -@@ -396,17 +396,17 @@ struct isar_hw { - - struct hdlc_stat_reg { - #ifdef __BIG_ENDIAN -- u_char fill __attribute__((packed)); -- u_char mode __attribute__((packed)); -- u_char xml __attribute__((packed)); -- u_char cmd __attribute__((packed)); --#else -- u_char cmd __attribute__((packed)); -- u_char xml __attribute__((packed)); -- u_char mode __attribute__((packed)); -- u_char fill __attribute__((packed)); -+ u_char fill; -+ u_char mode; -+ u_char xml; -+ u_char cmd; -+#else -+ u_char cmd; -+ u_char xml; -+ u_char mode; -+ u_char fill; - #endif --}; -+} __attribute__((packed)); - - struct hdlc_hw { - union { -Index: linux-2.6/drivers/isdn/hisax/hisax_fcpcipnp.h -=================================================================== ---- linux-2.6.orig/drivers/isdn/hisax/hisax_fcpcipnp.h -+++ linux-2.6/drivers/isdn/hisax/hisax_fcpcipnp.h -@@ -12,17 +12,17 @@ enum { - - struct hdlc_stat_reg { - #ifdef __BIG_ENDIAN -- u_char fill __attribute__((packed)); -- u_char mode __attribute__((packed)); -- u_char xml __attribute__((packed)); -- u_char cmd __attribute__((packed)); -+ u_char fill; -+ u_char mode; -+ u_char xml; -+ u_char cmd; - #else -- u_char cmd __attribute__((packed)); -- u_char xml __attribute__((packed)); -- u_char mode __attribute__((packed)); -- u_char fill __attribute__((packed)); -+ u_char cmd; -+ u_char xml; -+ u_char mode; -+ u_char fill; - #endif --}; -+} __attribute__((packed)); - - struct fritz_bcs { - struct hisax_b_if b_if; -Index: linux-2.6/drivers/net/3c527.h -=================================================================== ---- linux-2.6.orig/drivers/net/3c527.h -+++ linux-2.6/drivers/net/3c527.h -@@ -32,43 +32,43 @@ - - struct mc32_mailbox - { -- u16 mbox __attribute((packed)); -- u16 data[1] __attribute((packed)); --}; -+ u16 mbox; -+ u16 data[1]; -+} __attribute((packed)); - - struct skb_header - { -- u8 status __attribute((packed)); -- u8 control __attribute((packed)); -- u16 next __attribute((packed)); /* Do not change! */ -- u16 length __attribute((packed)); -- u32 data __attribute((packed)); --}; -+ u8 status; -+ u8 control; -+ u16 next; /* Do not change! */ -+ u16 length; -+ u32 data; -+} __attribute((packed)); - - struct mc32_stats - { - /* RX Errors */ -- u32 rx_crc_errors __attribute((packed)); -- u32 rx_alignment_errors __attribute((packed)); -- u32 rx_overrun_errors __attribute((packed)); -- u32 rx_tooshort_errors __attribute((packed)); -- u32 rx_toolong_errors __attribute((packed)); -- u32 rx_outofresource_errors __attribute((packed)); -+ u32 rx_crc_errors; -+ u32 rx_alignment_errors; -+ u32 rx_overrun_errors; -+ u32 rx_tooshort_errors; -+ u32 rx_toolong_errors; -+ u32 rx_outofresource_errors; - -- u32 rx_discarded __attribute((packed)); /* via card pattern match filter */ -+ u32 rx_discarded; /* via card pattern match filter */ - - /* TX Errors */ -- u32 tx_max_collisions __attribute((packed)); -- u32 tx_carrier_errors __attribute((packed)); -- u32 tx_underrun_errors __attribute((packed)); -- u32 tx_cts_errors __attribute((packed)); -- u32 tx_timeout_errors __attribute((packed)) ; -+ u32 tx_max_collisions; -+ u32 tx_carrier_errors; -+ u32 tx_underrun_errors; -+ u32 tx_cts_errors; -+ u32 tx_timeout_errors; - - /* various cruft */ -- u32 dataA[6] __attribute((packed)); -- u16 dataB[5] __attribute((packed)); -- u32 dataC[14] __attribute((packed)); --}; -+ u32 dataA[6]; -+ u16 dataB[5]; -+ u32 dataC[14]; -+} __attribute((packed)); - - #define STATUS_MASK 0x0F - #define COMPLETED (1<<7) -Index: linux-2.6/drivers/net/irda/vlsi_ir.h -=================================================================== ---- linux-2.6.orig/drivers/net/irda/vlsi_ir.h -+++ linux-2.6/drivers/net/irda/vlsi_ir.h -@@ -577,8 +577,8 @@ struct ring_descr_hw { - struct { - u8 addr_res[3]; - volatile u8 status; /* descriptor status */ -- } rd_s __attribute__((packed)); -- } rd_u __attribute((packed)); -+ } __attribute__((packed)) rd_s; -+ } __attribute((packed)) rd_u; - } __attribute__ ((packed)); - - #define rd_addr rd_u.addr -Index: linux-2.6/include/linux/atalk.h -=================================================================== ---- linux-2.6.orig/include/linux/atalk.h -+++ linux-2.6/include/linux/atalk.h -@@ -155,15 +155,15 @@ struct elapaarp { - #define AARP_REQUEST 1 - #define AARP_REPLY 2 - #define AARP_PROBE 3 -- __u8 hw_src[ETH_ALEN] __attribute__ ((packed)); -- __u8 pa_src_zero __attribute__ ((packed)); -- __be16 pa_src_net __attribute__ ((packed)); -- __u8 pa_src_node __attribute__ ((packed)); -- __u8 hw_dst[ETH_ALEN] __attribute__ ((packed)); -- __u8 pa_dst_zero __attribute__ ((packed)); -- __be16 pa_dst_net __attribute__ ((packed)); -- __u8 pa_dst_node __attribute__ ((packed)); --}; -+ __u8 hw_src[ETH_ALEN]; -+ __u8 pa_src_zero; -+ __be16 pa_src_net; -+ __u8 pa_src_node; -+ __u8 hw_dst[ETH_ALEN]; -+ __u8 pa_dst_zero; -+ __be16 pa_dst_net; -+ __u8 pa_dst_node; -+} __attribute__ ((packed)); - - static __inline__ struct elapaarp *aarp_hdr(struct sk_buff *skb) - { -Index: linux-2.6/include/linux/cycx_x25.h -=================================================================== ---- linux-2.6.orig/include/linux/cycx_x25.h -+++ linux-2.6/include/linux/cycx_x25.h -@@ -38,11 +38,11 @@ extern unsigned int cycx_debug; - /* Data Structures */ - /* X.25 Command Block. */ - struct cycx_x25_cmd { -- u16 command PACKED; -- u16 link PACKED; /* values: 0 or 1 */ -- u16 len PACKED; /* values: 0 thru 0x205 (517) */ -- u32 buf PACKED; --}; -+ u16 command; -+ u16 link; /* values: 0 or 1 */ -+ u16 len; /* values: 0 thru 0x205 (517) */ -+ u32 buf; -+} PACKED; - - /* Defines for the 'command' field. */ - #define X25_CONNECT_REQUEST 0x4401 -@@ -92,34 +92,34 @@ struct cycx_x25_cmd { - * @flags - see dosx25.doc, in portuguese, for details - */ - struct cycx_x25_config { -- u8 link PACKED; -- u8 speed PACKED; -- u8 clock PACKED; -- u8 n2 PACKED; -- u8 n2win PACKED; -- u8 n3win PACKED; -- u8 nvc PACKED; -- u8 pktlen PACKED; -- u8 locaddr PACKED; -- u8 remaddr PACKED; -- u16 t1 PACKED; -- u16 t2 PACKED; -- u8 t21 PACKED; -- u8 npvc PACKED; -- u8 t23 PACKED; -- u8 flags PACKED; --}; -+ u8 link; -+ u8 speed; -+ u8 clock; -+ u8 n2; -+ u8 n2win; -+ u8 n3win; -+ u8 nvc; -+ u8 pktlen; -+ u8 locaddr; -+ u8 remaddr; -+ u16 t1; -+ u16 t2; -+ u8 t21; -+ u8 npvc; -+ u8 t23; -+ u8 flags; -+} PACKED; - - struct cycx_x25_stats { -- u16 rx_crc_errors PACKED; -- u16 rx_over_errors PACKED; -- u16 n2_tx_frames PACKED; -- u16 n2_rx_frames PACKED; -- u16 tx_timeouts PACKED; -- u16 rx_timeouts PACKED; -- u16 n3_tx_packets PACKED; -- u16 n3_rx_packets PACKED; -- u16 tx_aborts PACKED; -- u16 rx_aborts PACKED; --}; -+ u16 rx_crc_errors; -+ u16 rx_over_errors; -+ u16 n2_tx_frames; -+ u16 n2_rx_frames; -+ u16 tx_timeouts; -+ u16 rx_timeouts; -+ u16 n3_tx_packets; -+ u16 n3_rx_packets; -+ u16 tx_aborts; -+ u16 rx_aborts; -+} PACKED; - #endif /* _CYCX_X25_H */ -Index: linux-2.6/include/linux/sdla.h -=================================================================== ---- linux-2.6.orig/include/linux/sdla.h -+++ linux-2.6/include/linux/sdla.h -@@ -293,46 +293,46 @@ void sdla(void *cfg_info, char *dev, str - #define SDLA_S508_INTEN 0x10 - - struct sdla_cmd { -- char opp_flag __attribute__((packed)); -- char cmd __attribute__((packed)); -- short length __attribute__((packed)); -- char retval __attribute__((packed)); -- short dlci __attribute__((packed)); -- char flags __attribute__((packed)); -- short rxlost_int __attribute__((packed)); -- long rxlost_app __attribute__((packed)); -- char reserve[2] __attribute__((packed)); -- char data[SDLA_MAX_DATA] __attribute__((packed)); /* transfer data buffer */ --}; -+ char opp_flag; -+ char cmd; -+ short length; -+ char retval; -+ short dlci; -+ char flags; -+ short rxlost_int; -+ long rxlost_app; -+ char reserve[2]; -+ char data[SDLA_MAX_DATA]; /* transfer data buffer */ -+} __attribute__((packed)); - - struct intr_info { -- char flags __attribute__((packed)); -- short txlen __attribute__((packed)); -- char irq __attribute__((packed)); -- char flags2 __attribute__((packed)); -- short timeout __attribute__((packed)); --}; -+ char flags; -+ short txlen; -+ char irq; -+ char flags2; -+ short timeout; -+} __attribute__((packed)); - - /* found in the 508's control window at RXBUF_INFO */ - struct buf_info { -- unsigned short rse_num __attribute__((packed)); -- unsigned long rse_base __attribute__((packed)); -- unsigned long rse_next __attribute__((packed)); -- unsigned long buf_base __attribute__((packed)); -- unsigned short reserved __attribute__((packed)); -- unsigned long buf_top __attribute__((packed)); --}; -+ unsigned short rse_num; -+ unsigned long rse_base; -+ unsigned long rse_next; -+ unsigned long buf_base; -+ unsigned short reserved; -+ unsigned long buf_top; -+} __attribute__((packed)); - - /* structure pointed to by rse_base in RXBUF_INFO struct */ - struct buf_entry { -- char opp_flag __attribute__((packed)); -- short length __attribute__((packed)); -- short dlci __attribute__((packed)); -- char flags __attribute__((packed)); -- short timestamp __attribute__((packed)); -- short reserved[2] __attribute__((packed)); -- long buf_addr __attribute__((packed)); --}; -+ char opp_flag; -+ short length; -+ short dlci; -+ char flags; -+ short timestamp; -+ short reserved[2]; -+ long buf_addr; -+} __attribute__((packed)); - - #endif - -Index: linux-2.6/include/linux/wavefront.h -=================================================================== ---- linux-2.6.orig/include/linux/wavefront.h -+++ linux-2.6/include/linux/wavefront.h -@@ -434,22 +434,22 @@ typedef struct wf_multisample { - } wavefront_multisample; - - typedef struct wf_alias { -- INT16 OriginalSample __attribute__ ((packed)); -+ INT16 OriginalSample; - -- struct wf_sample_offset sampleStartOffset __attribute__ ((packed)); -- struct wf_sample_offset loopStartOffset __attribute__ ((packed)); -- struct wf_sample_offset sampleEndOffset __attribute__ ((packed)); -- struct wf_sample_offset loopEndOffset __attribute__ ((packed)); -- -- INT16 FrequencyBias __attribute__ ((packed)); -- -- UCHAR8 SampleResolution:2 __attribute__ ((packed)); -- UCHAR8 Unused1:1 __attribute__ ((packed)); -- UCHAR8 Loop:1 __attribute__ ((packed)); -- UCHAR8 Bidirectional:1 __attribute__ ((packed)); -- UCHAR8 Unused2:1 __attribute__ ((packed)); -- UCHAR8 Reverse:1 __attribute__ ((packed)); -- UCHAR8 Unused3:1 __attribute__ ((packed)); -+ struct wf_sample_offset sampleStartOffset; -+ struct wf_sample_offset loopStartOffset; -+ struct wf_sample_offset sampleEndOffset; -+ struct wf_sample_offset loopEndOffset; -+ -+ INT16 FrequencyBias; -+ -+ UCHAR8 SampleResolution:2; -+ UCHAR8 Unused1:1; -+ UCHAR8 Loop:1; -+ UCHAR8 Bidirectional:1; -+ UCHAR8 Unused2:1; -+ UCHAR8 Reverse:1; -+ UCHAR8 Unused3:1; - - /* This structure is meant to be padded only to 16 bits on their - original. Of course, whoever wrote their documentation didn't -@@ -460,8 +460,8 @@ typedef struct wf_alias { - standard 16->32 bit issues. - */ - -- UCHAR8 sixteen_bit_padding __attribute__ ((packed)); --} wavefront_alias; -+ UCHAR8 sixteen_bit_padding; -+} __attribute__((packed)) wavefront_alias; - - typedef struct wf_drum { - UCHAR8 PatchNumber; -Index: linux-2.6/include/net/dn_dev.h -=================================================================== ---- linux-2.6.orig/include/net/dn_dev.h -+++ linux-2.6/include/net/dn_dev.h -@@ -99,57 +99,57 @@ struct dn_dev { - - struct dn_short_packet - { -- unsigned char msgflg __attribute__((packed)); -- unsigned short dstnode __attribute__((packed)); -- unsigned short srcnode __attribute__((packed)); -- unsigned char forward __attribute__((packed)); --}; -+ unsigned char msgflg; -+ unsigned short dstnode; -+ unsigned short srcnode; -+ unsigned char forward; -+} __attribute__((packed)); - - struct dn_long_packet - { -- unsigned char msgflg __attribute__((packed)); -- unsigned char d_area __attribute__((packed)); -- unsigned char d_subarea __attribute__((packed)); -- unsigned char d_id[6] __attribute__((packed)); -- unsigned char s_area __attribute__((packed)); -- unsigned char s_subarea __attribute__((packed)); -- unsigned char s_id[6] __attribute__((packed)); -- unsigned char nl2 __attribute__((packed)); -- unsigned char visit_ct __attribute__((packed)); -- unsigned char s_class __attribute__((packed)); -- unsigned char pt __attribute__((packed)); --}; -+ unsigned char msgflg; -+ unsigned char d_area; -+ unsigned char d_subarea; -+ unsigned char d_id[6]; -+ unsigned char s_area; -+ unsigned char s_subarea; -+ unsigned char s_id[6]; -+ unsigned char nl2; -+ unsigned char visit_ct; -+ unsigned char s_class; -+ unsigned char pt; -+} __attribute__((packed)); - - /*------------------------- DRP - Routing messages ---------------------*/ - - struct endnode_hello_message - { -- unsigned char msgflg __attribute__((packed)); -- unsigned char tiver[3] __attribute__((packed)); -- unsigned char id[6] __attribute__((packed)); -- unsigned char iinfo __attribute__((packed)); -- unsigned short blksize __attribute__((packed)); -- unsigned char area __attribute__((packed)); -- unsigned char seed[8] __attribute__((packed)); -- unsigned char neighbor[6] __attribute__((packed)); -- unsigned short timer __attribute__((packed)); -- unsigned char mpd __attribute__((packed)); -- unsigned char datalen __attribute__((packed)); -- unsigned char data[2] __attribute__((packed)); --}; -+ unsigned char msgflg; -+ unsigned char tiver[3]; -+ unsigned char id[6]; -+ unsigned char iinfo; -+ unsigned short blksize; -+ unsigned char area; -+ unsigned char seed[8]; -+ unsigned char neighbor[6]; -+ unsigned short timer; -+ unsigned char mpd; -+ unsigned char datalen; -+ unsigned char data[2]; -+} __attribute__((packed)); - - struct rtnode_hello_message - { -- unsigned char msgflg __attribute__((packed)); -- unsigned char tiver[3] __attribute__((packed)); -- unsigned char id[6] __attribute__((packed)); -- unsigned char iinfo __attribute__((packed)); -- unsigned short blksize __attribute__((packed)); -- unsigned char priority __attribute__((packed)); -- unsigned char area __attribute__((packed)); -- unsigned short timer __attribute__((packed)); -- unsigned char mpd __attribute__((packed)); --}; -+ unsigned char msgflg; -+ unsigned char tiver[3]; -+ unsigned char id[6]; -+ unsigned char iinfo; -+ unsigned short blksize; -+ unsigned char priority; -+ unsigned char area; -+ unsigned short timer; -+ unsigned char mpd; -+} __attribute__((packed)); - - - extern void dn_dev_init(void); -Index: linux-2.6/drivers/net/wan/sdla.c -=================================================================== ---- linux-2.6.orig/drivers/net/wan/sdla.c -+++ linux-2.6/drivers/net/wan/sdla.c -@@ -329,9 +329,9 @@ static int sdla_cpuspeed(struct net_devi - - struct _dlci_stat - { -- short dlci __attribute__((packed)); -- char flags __attribute__((packed)); --}; -+ short dlci; -+ char flags; -+} __attribute__((packed)); - - struct _frad_stat - { -Index: linux-2.6/include/net/dn_nsp.h -=================================================================== ---- linux-2.6.orig/include/net/dn_nsp.h -+++ linux-2.6/include/net/dn_nsp.h -@@ -72,78 +72,78 @@ extern struct sk_buff *dn_alloc_send_skb - - struct nsp_data_seg_msg - { -- unsigned char msgflg __attribute__((packed)); -- unsigned short dstaddr __attribute__((packed)); -- unsigned short srcaddr __attribute__((packed)); --}; -+ unsigned char msgflg; -+ unsigned short dstaddr; -+ unsigned short srcaddr; -+} __attribute__((packed)); - - struct nsp_data_opt_msg - { -- unsigned short acknum __attribute__((packed)); -- unsigned short segnum __attribute__((packed)); -- unsigned short lsflgs __attribute__((packed)); --}; -+ unsigned short acknum; -+ unsigned short segnum; -+ unsigned short lsflgs; -+} __attribute__((packed)); - - struct nsp_data_opt_msg1 - { -- unsigned short acknum __attribute__((packed)); -- unsigned short segnum __attribute__((packed)); --}; -+ unsigned short acknum; -+ unsigned short segnum; -+} __attribute__((packed)); - - - /* Acknowledgment Message (data/other data) */ - struct nsp_data_ack_msg - { -- unsigned char msgflg __attribute__((packed)); -- unsigned short dstaddr __attribute__((packed)); -- unsigned short srcaddr __attribute__((packed)); -- unsigned short acknum __attribute__((packed)); --}; -+ unsigned char msgflg; -+ unsigned short dstaddr; -+ unsigned short srcaddr; -+ unsigned short acknum; -+} __attribute__((packed)); - - /* Connect Acknowledgment Message */ - struct nsp_conn_ack_msg - { -- unsigned char msgflg __attribute__((packed)); -- unsigned short dstaddr __attribute__((packed)); --}; -+ unsigned char msgflg; -+ unsigned short dstaddr; -+} __attribute__((packed)); - - - /* Connect Initiate/Retransmit Initiate/Connect Confirm */ - struct nsp_conn_init_msg - { -- unsigned char msgflg __attribute__((packed)); -+ unsigned char msgflg; - #define NSP_CI 0x18 /* Connect Initiate */ - #define NSP_RCI 0x68 /* Retrans. Conn Init */ -- unsigned short dstaddr __attribute__((packed)); -- unsigned short srcaddr __attribute__((packed)); -- unsigned char services __attribute__((packed)); -+ unsigned short dstaddr; -+ unsigned short srcaddr; -+ unsigned char services; - #define NSP_FC_NONE 0x00 /* Flow Control None */ - #define NSP_FC_SRC 0x04 /* Seg Req. Count */ - #define NSP_FC_SCMC 0x08 /* Sess. Control Mess */ - #define NSP_FC_MASK 0x0c /* FC type mask */ -- unsigned char info __attribute__((packed)); -- unsigned short segsize __attribute__((packed)); --}; -+ unsigned char info; -+ unsigned short segsize; -+} __attribute__((packed)); - - /* Disconnect Initiate/Disconnect Confirm */ - struct nsp_disconn_init_msg - { -- unsigned char msgflg __attribute__((packed)); -- unsigned short dstaddr __attribute__((packed)); -- unsigned short srcaddr __attribute__((packed)); -- unsigned short reason __attribute__((packed)); --}; -+ unsigned char msgflg; -+ unsigned short dstaddr; -+ unsigned short srcaddr; -+ unsigned short reason; -+} __attribute__((packed)); - - - - struct srcobj_fmt - { -- char format __attribute__((packed)); -- unsigned char task __attribute__((packed)); -- unsigned short grpcode __attribute__((packed)); -- unsigned short usrcode __attribute__((packed)); -- char dlen __attribute__((packed)); --}; -+ char format; -+ unsigned char task; -+ unsigned short grpcode; -+ unsigned short usrcode; -+ char dlen; -+} __attribute__((packed)); - - /* - * A collection of functions for manipulating the sequence -Index: linux-2.6/include/sound/wavefront.h -=================================================================== ---- linux-2.6.orig/include/sound/wavefront.h -+++ linux-2.6/include/sound/wavefront.h -@@ -454,22 +454,22 @@ typedef struct wf_multisample { - } wavefront_multisample; - - typedef struct wf_alias { -- s16 OriginalSample __attribute__ ((packed)); -+ s16 OriginalSample; - -- struct wf_sample_offset sampleStartOffset __attribute__ ((packed)); -- struct wf_sample_offset loopStartOffset __attribute__ ((packed)); -- struct wf_sample_offset sampleEndOffset __attribute__ ((packed)); -- struct wf_sample_offset loopEndOffset __attribute__ ((packed)); -- -- s16 FrequencyBias __attribute__ ((packed)); -- -- u8 SampleResolution:2 __attribute__ ((packed)); -- u8 Unused1:1 __attribute__ ((packed)); -- u8 Loop:1 __attribute__ ((packed)); -- u8 Bidirectional:1 __attribute__ ((packed)); -- u8 Unused2:1 __attribute__ ((packed)); -- u8 Reverse:1 __attribute__ ((packed)); -- u8 Unused3:1 __attribute__ ((packed)); -+ struct wf_sample_offset sampleStartOffset; -+ struct wf_sample_offset loopStartOffset; -+ struct wf_sample_offset sampleEndOffset; -+ struct wf_sample_offset loopEndOffset; -+ -+ s16 FrequencyBias; -+ -+ u8 SampleResolution:2; -+ u8 Unused1:1; -+ u8 Loop:1; -+ u8 Bidirectional:1; -+ u8 Unused2:1; -+ u8 Reverse:1; -+ u8 Unused3:1; - - /* This structure is meant to be padded only to 16 bits on their - original. Of course, whoever wrote their documentation didn't -@@ -480,8 +480,8 @@ typedef struct wf_alias { - standard 16->32 bit issues. - */ - -- u8 sixteen_bit_padding __attribute__ ((packed)); --} wavefront_alias; -+ u8 sixteen_bit_padding; -+} __attribute__((packed)) wavefront_alias; - - typedef struct wf_drum { - u8 PatchNumber; - - -Remove the unnecessary __attribute__ ((packed)) since the enum itself is -packed and not the location of it in the structure. - -Signed-off-by: Jan Blunck - - fs/afs/volume.h | 4 +--- - 1 files changed, 1 insertion(+), 3 deletions(-) - -Index: linux-2.6/fs/afs/volume.h -=================================================================== ---- linux-2.6.orig/fs/afs/volume.h -+++ linux-2.6/fs/afs/volume.h -@@ -18,8 +18,6 @@ - #include "kafsasyncd.h" - #include "cache.h" - --#define __packed __attribute__((packed)) -- - typedef enum { - AFS_VLUPD_SLEEP, /* sleeping waiting for update timer to fire */ - AFS_VLUPD_PENDING, /* on pending queue */ -@@ -115,7 +113,7 @@ struct afs_volume - struct cachefs_cookie *cache; /* caching cookie */ - #endif - afs_volid_t vid; /* volume ID */ -- afs_voltype_t __packed type; /* type of volume */ -+ afs_voltype_t type; /* type of volume */ - char type_force; /* force volume type (suppress R/O -> R/W) */ - unsigned short nservers; /* number of server slots filled */ - unsigned short rjservers; /* number of servers discarded due to -ENOMEDIUM */ - - -The CAPI message structs itself should be packed and not the location of -single fields in the structure. - -Signed-off-by: Jan Blunck - - drivers/isdn/act2000/capi.h | 88 ++++++++++++++++++++++---------------------- - 1 files changed, 44 insertions(+), 44 deletions(-) - -Index: linux-2.6/drivers/isdn/act2000/capi.h -=================================================================== ---- linux-2.6.orig/drivers/isdn/act2000/capi.h -+++ linux-2.6/drivers/isdn/act2000/capi.h -@@ -78,29 +78,29 @@ typedef union actcapi_infoel { - typedef struct actcapi_msn { - __u8 eaz; - __u8 len; /* Length of MSN */ -- __u8 msn[15] __attribute__ ((packed)); --} actcapi_msn; -+ __u8 msn[15]; -+} __attribute__((packed)) actcapi_msn; - - typedef struct actcapi_dlpd { - __u8 len; /* Length of structure */ -- __u16 dlen __attribute__ ((packed)); /* Data Length */ -- __u8 laa __attribute__ ((packed)); /* Link Address A */ -+ __u16 dlen; /* Data Length */ -+ __u8 laa; /* Link Address A */ - __u8 lab; /* Link Address B */ - __u8 modulo; /* Modulo Mode */ - __u8 win; /* Window size */ - __u8 xid[100]; /* XID Information */ --} actcapi_dlpd; -+} __attribute__((packed)) actcapi_dlpd; - - typedef struct actcapi_ncpd { - __u8 len; /* Length of structure */ -- __u16 lic __attribute__ ((packed)); -- __u16 hic __attribute__ ((packed)); -- __u16 ltc __attribute__ ((packed)); -- __u16 htc __attribute__ ((packed)); -- __u16 loc __attribute__ ((packed)); -- __u16 hoc __attribute__ ((packed)); -- __u8 modulo __attribute__ ((packed)); --} actcapi_ncpd; -+ __u16 lic; -+ __u16 hic; -+ __u16 ltc; -+ __u16 htc; -+ __u16 loc; -+ __u16 hoc; -+ __u8 modulo; -+} __attribute__((packed)) actcapi_ncpd; - #define actcapi_ncpi actcapi_ncpd - - /* -@@ -168,19 +168,19 @@ typedef struct actcapi_msg { - __u16 manuf_msg; - __u16 controller; - actcapi_msn msnmap; -- } manufacturer_req_msn; -+ } __attribute ((packed)) manufacturer_req_msn; - /* TODO: TraceInit-req/conf/ind/resp and - * TraceDump-req/conf/ind/resp - */ - struct connect_req { - __u8 controller; - __u8 bchan; -- __u32 infomask __attribute__ ((packed)); -+ __u32 infomask; - __u8 si1; - __u8 si2; - __u8 eaz; - actcapi_addr addr; -- } connect_req; -+ } __attribute__ ((packed)) connect_req; - struct connect_conf { - __u16 plci; - __u16 info; -@@ -192,7 +192,7 @@ typedef struct actcapi_msg { - __u8 si2; - __u8 eaz; - actcapi_addr addr; -- } connect_ind; -+ } __attribute__ ((packed)) connect_ind; - struct connect_resp { - __u16 plci; - __u8 rejectcause; -@@ -200,14 +200,14 @@ typedef struct actcapi_msg { - struct connect_active_ind { - __u16 plci; - actcapi_addr addr; -- } connect_active_ind; -+ } __attribute__ ((packed)) connect_active_ind; - struct connect_active_resp { - __u16 plci; - } connect_active_resp; - struct connect_b3_req { - __u16 plci; - actcapi_ncpi ncpi; -- } connect_b3_req; -+ } __attribute__ ((packed)) connect_b3_req; - struct connect_b3_conf { - __u16 plci; - __u16 ncci; -@@ -217,12 +217,12 @@ typedef struct actcapi_msg { - __u16 ncci; - __u16 plci; - actcapi_ncpi ncpi; -- } connect_b3_ind; -+ } __attribute__ ((packed)) connect_b3_ind; - struct connect_b3_resp { - __u16 ncci; - __u8 rejectcause; -- actcapi_ncpi ncpi __attribute__ ((packed)); -- } connect_b3_resp; -+ actcapi_ncpi ncpi; -+ } __attribute__ ((packed)) connect_b3_resp; - struct disconnect_req { - __u16 plci; - __u8 cause; -@@ -241,14 +241,14 @@ typedef struct actcapi_msg { - struct connect_b3_active_ind { - __u16 ncci; - actcapi_ncpi ncpi; -- } connect_b3_active_ind; -+ } __attribute__ ((packed)) connect_b3_active_ind; - struct connect_b3_active_resp { - __u16 ncci; - } connect_b3_active_resp; - struct disconnect_b3_req { - __u16 ncci; - actcapi_ncpi ncpi; -- } disconnect_b3_req; -+ } __attribute__ ((packed)) disconnect_b3_req; - struct disconnect_b3_conf { - __u16 ncci; - __u16 info; -@@ -257,7 +257,7 @@ typedef struct actcapi_msg { - __u16 ncci; - __u16 info; - actcapi_ncpi ncpi; -- } disconnect_b3_ind; -+ } __attribute__ ((packed)) disconnect_b3_ind; - struct disconnect_b3_resp { - __u16 ncci; - } disconnect_b3_resp; -@@ -265,7 +265,7 @@ typedef struct actcapi_msg { - __u16 plci; - actcapi_infonr nr; - actcapi_infoel el; -- } info_ind; -+ } __attribute__ ((packed)) info_ind; - struct info_resp { - __u16 plci; - } info_resp; -@@ -279,8 +279,8 @@ typedef struct actcapi_msg { - struct select_b2_protocol_req { - __u16 plci; - __u8 protocol; -- actcapi_dlpd dlpd __attribute__ ((packed)); -- } select_b2_protocol_req; -+ actcapi_dlpd dlpd; -+ } __attribute__ ((packed)) select_b2_protocol_req; - struct select_b2_protocol_conf { - __u16 plci; - __u16 info; -@@ -288,47 +288,47 @@ typedef struct actcapi_msg { - struct select_b3_protocol_req { - __u16 plci; - __u8 protocol; -- actcapi_ncpd ncpd __attribute__ ((packed)); -- } select_b3_protocol_req; -+ actcapi_ncpd ncpd; -+ } __attribute__ ((packed)) select_b3_protocol_req; - struct select_b3_protocol_conf { - __u16 plci; - __u16 info; - } select_b3_protocol_conf; - struct listen_req { - __u8 controller; -- __u32 infomask __attribute__ ((packed)); -- __u16 eazmask __attribute__ ((packed)); -- __u16 simask __attribute__ ((packed)); -- } listen_req; -+ __u32 infomask; -+ __u16 eazmask; -+ __u16 simask; -+ } __attribute__ ((packed)) listen_req; - struct listen_conf { - __u8 controller; -- __u16 info __attribute__ ((packed)); -- } listen_conf; -+ __u16 info; -+ } __attribute__ ((packed)) listen_conf; - struct data_b3_req { - __u16 fakencci; - __u16 datalen; - __u32 unused; - __u8 blocknr; -- __u16 flags __attribute__ ((packed)); -- } data_b3_req; -+ __u16 flags; -+ } __attribute ((packed)) data_b3_req; - struct data_b3_ind { - __u16 fakencci; - __u16 datalen; - __u32 unused; - __u8 blocknr; -- __u16 flags __attribute__ ((packed)); -- } data_b3_ind; -+ __u16 flags; -+ } __attribute__ ((packed)) data_b3_ind; - struct data_b3_resp { - __u16 ncci; - __u8 blocknr; -- } data_b3_resp; -+ } __attribute__ ((packed)) data_b3_resp; - struct data_b3_conf { - __u16 ncci; - __u8 blocknr; -- __u16 info __attribute__ ((packed)); -- } data_b3_conf; -+ __u16 info; -+ } __attribute__ ((packed)) data_b3_conf; - } msg; --} actcapi_msg; -+} __attribute__ ((packed)) actcapi_msg; - - extern __inline__ unsigned short - actcapi_nextsmsg(act2000_card *card) - - linux-2.6-tux.patch: arch/alpha/kernel/systbls.S | 8 arch/i386/kernel/syscall_table.S | 10 arch/ia64/kernel/entry.S | 8 arch/ia64/kernel/ia64_ksyms.c | 5 arch/x86_64/ia32/ia32entry.S | 10 fs/dcache.c | 36 fs/exec.c | 2 fs/fcntl.c | 4 fs/namei.c | 18 fs/namespace.c | 2 fs/open.c | 4 fs/pipe.c | 2 fs/read_write.c | 2 include/asm-alpha/fcntl.h | 1 include/asm-generic/fcntl.h | 4 include/asm-i386/unistd.h | 5 include/asm-ia64/unistd.h | 2 include/asm-sparc/fcntl.h | 1 include/asm-sparc64/fcntl.h | 1 include/asm-x86_64/unistd.h | 10 include/linux/buffer_head.h | 1 include/linux/dcache.h | 8 include/linux/errno.h | 3 include/linux/file.h | 2 include/linux/fs.h | 7 include/linux/kmod.h | 2 include/linux/namei.h | 2 include/linux/net.h | 1 include/linux/sched.h | 5 include/linux/skbuff.h | 2 include/linux/socket.h | 5 include/linux/sysctl.h | 50 include/net/sock.h | 8 include/net/tcp.h | 3 include/net/tux.h | 804 ++++++++++++++ include/net/tux_u.h | 163 ++ kernel/exit.c | 7 kernel/fork.c | 1 kernel/kmod.c | 28 kernel/signal.c | 1 mm/filemap.c | 19 mm/truncate.c | 2 net/Kconfig | 1 net/Makefile | 1 net/core/sock.c | 5 net/ipv4/tcp.c | 3 net/ipv4/tcp_input.c | 1 net/ipv4/tcp_output.c | 3 net/socket.c | 197 ++- net/tux/Kconfig | 25 net/tux/Makefile | 12 net/tux/abuf.c | 190 +++ net/tux/accept.c | 863 +++++++++++++++ net/tux/cachemiss.c | 265 ++++ net/tux/cgi.c | 171 +++ net/tux/directory.c | 302 +++++ net/tux/extcgi.c | 329 +++++ net/tux/gzip.c | 40 net/tux/input.c | 641 +++++++++++ net/tux/logger.c | 837 ++++++++++++++ net/tux/main.c | 1417 +++++++++++++++++++++++++ net/tux/mod.c | 262 ++++ net/tux/output.c | 352 ++++++ net/tux/parser.h | 102 + net/tux/postpone.c | 77 + net/tux/proc.c | 1149 ++++++++++++++++++++ net/tux/proto_ftp.c | 1555 +++++++++++++++++++++++++++ net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++++++++ net/tux/redirect.c | 172 +++ net/tux/times.c | 392 ++++++ net/tux/times.h | 26 net/tux/userspace.c | 27 72 files changed, 12775 insertions(+), 98 deletions(-) Index: linux-2.6-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-tux.patch 12 Dec 2005 05:42:39 -0000 1.8 +++ linux-2.6-tux.patch 9 Jan 2006 18:55:15 -0000 1.9 @@ -1,76 +1,3 @@ - arch/alpha/kernel/systbls.S | 8 - arch/i386/kernel/syscall_table.S | 10 - arch/ia64/kernel/entry.S | 8 - arch/ia64/kernel/ia64_ksyms.c | 5 - arch/x86_64/ia32/ia32entry.S | 10 - fs/dcache.c | 36 - fs/exec.c | 2 - fs/fcntl.c | 4 - fs/namei.c | 18 - fs/namespace.c | 2 - fs/open.c | 4 - fs/pipe.c | 2 - fs/read_write.c | 2 - include/asm-alpha/fcntl.h | 1 - include/asm-generic/fcntl.h | 4 - include/asm-i386/unistd.h | 5 - include/asm-ia64/unistd.h | 2 - include/asm-sparc/fcntl.h | 1 - include/asm-sparc64/fcntl.h | 1 - include/asm-x86_64/unistd.h | 10 - include/linux/buffer_head.h | 1 - include/linux/dcache.h | 8 - include/linux/errno.h | 3 - include/linux/file.h | 2 - include/linux/fs.h | 7 - include/linux/kmod.h | 2 - include/linux/namei.h | 2 - include/linux/net.h | 1 - include/linux/sched.h | 5 - include/linux/skbuff.h | 2 - include/linux/socket.h | 5 - include/linux/sysctl.h | 50 - include/net/sock.h | 8 - include/net/tcp.h | 3 - include/net/tux.h | 804 ++++++++++++++ - include/net/tux_u.h | 163 ++ - kernel/exit.c | 7 - kernel/fork.c | 1 - kernel/kmod.c | 28 - kernel/signal.c | 1 - mm/filemap.c | 19 - mm/truncate.c | 2 - net/Kconfig | 1 - net/Makefile | 1 - net/core/sock.c | 5 - net/ipv4/tcp.c | 3 - net/ipv4/tcp_input.c | 1 - net/ipv4/tcp_output.c | 1 - net/socket.c | 197 ++- - net/tux/Kconfig | 25 - net/tux/Makefile | 12 - net/tux/abuf.c | 190 +++ - net/tux/accept.c | 863 +++++++++++++++ - net/tux/cachemiss.c | 265 ++++ - net/tux/cgi.c | 171 +++ - net/tux/directory.c | 302 +++++ - net/tux/extcgi.c | 329 +++++ - net/tux/gzip.c | 40 - net/tux/input.c | 641 +++++++++++ - net/tux/logger.c | 837 ++++++++++++++ - net/tux/main.c | 1417 +++++++++++++++++++++++++ - net/tux/mod.c | 262 ++++ - net/tux/output.c | 352 ++++++ - net/tux/parser.h | 102 + - net/tux/postpone.c | 77 + - net/tux/proc.c | 1149 ++++++++++++++++++++ - net/tux/proto_ftp.c | 1555 +++++++++++++++++++++++++++ - net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++++++++ - net/tux/redirect.c | 172 +++ - net/tux/times.c | 392 ++++++ - net/tux/times.h | 26 - net/tux/userspace.c | 27 - 72 files changed, 12773 insertions(+), 98 deletions(-) Index: linux/arch/alpha/kernel/systbls.S =================================================================== @@ -96,7 +23,7 @@ =================================================================== --- linux.orig/arch/i386/kernel/syscall_table.S +++ linux/arch/i386/kernel/syscall_table.S -@@ -222,7 +222,15 @@ ENTRY(sys_call_table) +@@ -221,7 +221,15 @@ ENTRY(sys_call_table) .long sys_madvise .long sys_getdents64 /* 220 */ .long sys_fcntl64 @@ -137,7 +64,7 @@ =================================================================== --- linux.orig/arch/ia64/kernel/ia64_ksyms.c +++ linux/arch/ia64/kernel/ia64_ksyms.c -@@ -58,6 +58,11 @@ EXPORT_SYMBOL(__strlen_user); +@@ -59,6 +59,11 @@ EXPORT_SYMBOL(__strlen_user); EXPORT_SYMBOL(__strncpy_from_user); EXPORT_SYMBOL(__strnlen_user); @@ -178,11 +105,11 @@ { if (dentry->d_op && dentry->d_op->d_release) dentry->d_op->d_release(dentry); -+ if (dentry->d_extra_attributes) { -+ kfree(dentry->d_extra_attributes); -+ dentry->d_extra_attributes = NULL; -+ } - call_rcu(&dentry->d_rcu, d_callback); ++ if (dentry->d_extra_attributes) { ++ kfree(dentry->d_extra_attributes); ++ dentry->d_extra_attributes = NULL; ++ } + call_rcu(&dentry->d_u.d_rcu, d_callback); } @@ -742,6 +746,7 @@ struct dentry *d_alloc(struct dentry * p @@ -197,18 +124,18 @@ /* Unhash the target: dput() will then get rid of it */ __d_drop(target); -+ /* flush any possible attributes */ -+ if (dentry->d_extra_attributes) { -+ kfree(dentry->d_extra_attributes); -+ dentry->d_extra_attributes = NULL; -+ } -+ if (target->d_extra_attributes) { -+ kfree(target->d_extra_attributes); -+ target->d_extra_attributes = NULL; -+ } -+ - list_del(&dentry->d_child); - list_del(&target->d_child); ++ /* flush any possible attributes */ ++ if (dentry->d_extra_attributes) { ++ kfree(dentry->d_extra_attributes); ++ dentry->d_extra_attributes = NULL; ++ } ++ if (target->d_extra_attributes) { ++ kfree(target->d_extra_attributes); ++ target->d_extra_attributes = NULL; ++ } ++ + list_del(&dentry->d_u.d_child); + list_del(&target->d_u.d_child); @@ -1353,7 +1368,7 @@ already_unhashed: * @@ -256,7 +183,7 @@ =================================================================== --- linux.orig/fs/exec.c +++ linux/fs/exec.c -@@ -1450,6 +1450,8 @@ int do_coredump(long signr, int exit_cod +@@ -1440,6 +1440,8 @@ int do_coredump(long signr, int exit_cod binfmt = current->binfmt; if (!binfmt || !binfmt->core_dump) goto fail; @@ -375,7 +302,7 @@ =================================================================== --- linux.orig/fs/open.c +++ linux/fs/open.c -@@ -542,6 +542,8 @@ out: +@@ -543,6 +543,8 @@ out: return error; } @@ -384,7 +311,7 @@ asmlinkage long sys_fchdir(unsigned int fd) { struct file *file; -@@ -598,6 +600,8 @@ out: +@@ -599,6 +601,8 @@ out: return error; } @@ -410,7 +337,7 @@ =================================================================== --- linux.orig/fs/read_write.c +++ linux/fs/read_write.c -@@ -360,6 +360,8 @@ asmlinkage ssize_t sys_write(unsigned in +@@ -374,6 +374,8 @@ asmlinkage ssize_t sys_write(unsigned in return ret; } @@ -450,15 +377,15 @@ =================================================================== --- linux.orig/include/asm-i386/unistd.h +++ linux/include/asm-i386/unistd.h -@@ -302,6 +302,7 @@ +@@ -303,6 +303,7 @@ - #define NR_syscalls 294 + #define NR_syscalls 295 +#ifndef __KERNEL_SYSCALLS_NO_ERRNO__ /* * user-visible error numbers are in the range -1 - -128: see * -@@ -315,6 +316,10 @@ do { \ +@@ -316,6 +317,10 @@ do { \ return (type) (res); \ } while (0) @@ -531,8 +458,8 @@ =================================================================== --- linux.orig/include/linux/buffer_head.h +++ linux/include/linux/buffer_head.h -@@ -200,6 +200,7 @@ int cont_prepare_write(struct page*, uns - int generic_cont_expand(struct inode *inode, loff_t size) ; +@@ -201,6 +201,7 @@ int generic_cont_expand(struct inode *in + int generic_cont_expand_simple(struct inode *inode, loff_t size); int block_commit_write(struct page *page, unsigned from, unsigned to); int block_sync_page(struct page *); +void flush_inode_pages (struct inode * inode); @@ -543,15 +470,15 @@ =================================================================== --- linux.orig/include/linux/dcache.h +++ linux/include/linux/dcache.h -@@ -102,6 +102,7 @@ struct dentry { +@@ -108,6 +108,7 @@ struct dentry { struct dentry_operations *d_op; struct super_block *d_sb; /* The root of the dentry tree */ void *d_fsdata; /* fs-specific data */ -+ void * d_extra_attributes; /* TUX-specific data */ - struct rcu_head d_rcu; ++ void *d_extra_attributes; /* TUX-specific data */ struct dcookie_struct *d_cookie; /* cookie, if any */ int d_mounted; -@@ -211,6 +212,7 @@ extern void shrink_dcache_sb(struct supe + unsigned char d_iname[DNAME_INLINE_LEN_MIN]; /* small names */ +@@ -216,6 +217,7 @@ extern void shrink_dcache_sb(struct supe extern void shrink_dcache_parent(struct dentry *); extern void shrink_dcache_anon(struct hlist_head *); extern int d_invalidate(struct dentry *); @@ -559,7 +486,7 @@ /* only used at mount-time */ extern struct dentry * d_alloc_root(struct inode *); -@@ -271,8 +273,12 @@ extern struct dentry * __d_lookup(struct +@@ -276,8 +278,12 @@ extern struct dentry * __d_lookup(struct /* validate "insecure" dentry pointer */ extern int d_validate(struct dentry *, struct dentry *); @@ -602,7 +529,7 @@ =================================================================== --- linux.orig/include/linux/fs.h +++ linux/include/linux/fs.h -@@ -1537,7 +1537,7 @@ ssize_t generic_file_write_nolock(struct +@@ -1570,7 +1570,7 @@ ssize_t generic_file_write_nolock(struct extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *); extern void do_generic_mapping_read(struct address_space *mapping, struct file_ra_state *, struct file *, @@ -611,7 +538,7 @@ extern void file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, -@@ -1569,14 +1569,15 @@ static inline int xip_truncate_page(stru +@@ -1602,14 +1602,15 @@ static inline int xip_truncate_page(stru static inline void do_generic_file_read(struct file * filp, loff_t *ppos, read_descriptor_t * desc, @@ -670,7 +597,7 @@ =================================================================== --- linux.orig/include/linux/sched.h +++ linux/include/linux/sched.h -@@ -807,6 +807,11 @@ struct task_struct { +@@ -804,6 +804,11 @@ struct task_struct { int (*notifier)(void *priv); void *notifier_data; sigset_t *notifier_mask; @@ -686,7 +613,7 @@ =================================================================== --- linux.orig/include/linux/skbuff.h +++ linux/include/linux/skbuff.h -@@ -1327,6 +1327,8 @@ static inline unsigned int skb_checksum_ +@@ -1328,6 +1328,8 @@ static inline unsigned int skb_checksum_ __skb_checksum_complete(skb); } @@ -699,7 +626,7 @@ =================================================================== --- linux.orig/include/linux/socket.h +++ linux/include/linux/socket.h -@@ -299,6 +299,11 @@ extern int move_addr_to_user(void *kaddr +@@ -298,6 +298,11 @@ extern int move_addr_to_user(void *kaddr extern int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); @@ -715,7 +642,7 @@ =================================================================== --- linux.orig/include/linux/sysctl.h +++ linux/include/linux/sysctl.h -@@ -205,6 +205,7 @@ enum +@@ -207,6 +207,7 @@ enum NET_SCTP=17, NET_LLC=18, NET_NETFILTER=19, @@ -723,7 +650,7 @@ }; /* /proc/sys/kernel/random */ -@@ -725,6 +726,55 @@ enum { +@@ -731,6 +732,55 @@ enum { NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4, }; @@ -830,7 +757,7 @@ =================================================================== --- linux.orig/include/net/tcp.h +++ linux/include/net/tcp.h -@@ -310,6 +310,8 @@ extern void tcp_shutdown (struct sock +@@ -263,6 +263,8 @@ extern void tcp_shutdown (struct sock extern int tcp_v4_rcv(struct sk_buff *skb); @@ -839,7 +766,7 @@ extern int tcp_v4_remember_stamp(struct sock *sk); extern int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw); -@@ -467,6 +469,7 @@ extern int tcp_send_synack(struct sock +@@ -422,6 +424,7 @@ extern int tcp_send_synack(struct sock extern void tcp_push_one(struct sock *, unsigned int mss_now); extern void tcp_send_ack(struct sock *sk); extern void tcp_send_delayed_ack(struct sock *sk); @@ -1828,7 +1755,7 @@ =================================================================== --- linux.orig/kernel/exit.c +++ linux/kernel/exit.c -@@ -845,6 +845,13 @@ fastcall NORET_TYPE void do_exit(long co +@@ -844,6 +844,13 @@ fastcall NORET_TYPE void do_exit(long co del_timer_sync(&tsk->signal->real_timer); exit_itimers(tsk->signal); acct_process(code); @@ -1846,7 +1773,7 @@ =================================================================== --- linux.orig/kernel/fork.c +++ linux/kernel/fork.c -@@ -896,6 +896,7 @@ static task_t *copy_process(unsigned lon +@@ -901,6 +901,7 @@ static task_t *copy_process(unsigned lon p = dup_task_struct(current); if (!p) goto fork_out; @@ -1912,7 +1839,7 @@ =================================================================== --- linux.orig/kernel/signal.c +++ linux/kernel/signal.c -@@ -430,6 +430,7 @@ flush_signal_handlers(struct task_struct +@@ -440,6 +440,7 @@ flush_signal_handlers(struct task_struct } } @@ -1924,7 +1851,7 @@ =================================================================== --- linux.orig/mm/filemap.c +++ linux/mm/filemap.c -@@ -718,7 +718,8 @@ void do_generic_mapping_read(struct addr +@@ -733,7 +733,8 @@ void do_generic_mapping_read(struct addr struct file *filp, loff_t *ppos, read_descriptor_t *desc, @@ -1934,7 +1861,7 @@ { struct inode *inode = mapping->host; unsigned long index; -@@ -768,11 +769,21 @@ void do_generic_mapping_read(struct addr +@@ -783,11 +784,21 @@ void do_generic_mapping_read(struct addr find_page: page = find_get_page(mapping, index); if (unlikely(page == NULL)) { @@ -1957,7 +1884,7 @@ page_ok: /* If users can be writing to this page using arbitrary -@@ -1028,7 +1039,7 @@ __generic_file_aio_read(struct kiocb *io +@@ -1048,7 +1059,7 @@ __generic_file_aio_read(struct kiocb *io if (desc.count == 0) continue; desc.error = 0; @@ -1966,7 +1893,7 @@ retval += desc.written; if (desc.error) { retval = retval ?: desc.error; -@@ -1102,7 +1113,7 @@ ssize_t generic_file_sendfile(struct fil +@@ -1122,7 +1133,7 @@ ssize_t generic_file_sendfile(struct fil desc.arg.data = target; desc.error = 0; @@ -1979,7 +1906,7 @@ =================================================================== --- linux.orig/mm/truncate.c +++ linux/mm/truncate.c -@@ -224,6 +224,8 @@ unlock: +@@ -253,6 +253,8 @@ unlock: return ret; } @@ -2048,7 +1975,7 @@ { struct tcp_sock *tp = tcp_sk(sk); int time_to_ack = 0; -@@ -2144,3 +2144,4 @@ EXPORT_SYMBOL(tcp_sendpage); +@@ -2142,3 +2142,4 @@ EXPORT_SYMBOL(tcp_sendpage); EXPORT_SYMBOL(tcp_setsockopt); EXPORT_SYMBOL(tcp_shutdown); EXPORT_SYMBOL(tcp_statistics); @@ -2057,7 +1984,7 @@ =================================================================== --- linux.orig/net/ipv4/tcp_input.c +++ linux/net/ipv4/tcp_input.c -@@ -3433,6 +3433,7 @@ static int tcp_prune_queue(struct sock * +@@ -3473,6 +3473,7 @@ static int tcp_prune_queue(struct sock * return -1; } @@ -2069,7 +1996,16 @@ =================================================================== --- linux.orig/net/ipv4/tcp_output.c +++ linux/net/ipv4/tcp_output.c -@@ -1069,6 +1069,7 @@ void __tcp_push_pending_frames(struct so +@@ -791,6 +791,8 @@ unsigned int tcp_current_mss(struct sock + return mss_now; + } + ++EXPORT_SYMBOL_GPL(tcp_current_mss); ++ + /* Congestion window validation. (RFC2861) */ + + static void tcp_cwnd_validate(struct sock *sk, struct tcp_sock *tp) +@@ -1156,6 +1158,7 @@ void __tcp_push_pending_frames(struct so tcp_check_probe_timer(sk, tp); } } @@ -2273,7 +2209,7 @@ /* * In theory you can't get an open on this inode, but /proc provides * a back door. Remember to keep it shut otherwise you'll let the -@@ -1041,6 +1055,8 @@ static int sock_fasync(int fd, struct fi +@@ -1044,6 +1058,8 @@ static int sock_fasync(int fd, struct fi } out: @@ -2282,9 +2218,9 @@ release_sock(sock->sk); return 0; } -@@ -2067,6 +2083,51 @@ void __init sock_init(void) - #endif - } +@@ -2072,6 +2088,51 @@ static int __init sock_init(void) + + core_initcall(sock_init); /* early initcall */ +int tux_Dprintk; +int tux_TDprintk; @@ -13852,13 +13788,4 @@ + * + ****************************************************************/ + ---- linux-2.6.14/net/ipv4/tcp_output.c~ 2005-12-12 00:42:02.000000000 -0500 -+++ linux-2.6.14/net/ipv4/tcp_output.c 2005-12-12 00:42:17.000000000 -0500 -@@ -703,6 +703,7 @@ unsigned int tcp_current_mss(struct sock - - return mss_now; - } -+EXPORT_SYMBOL_GPL(tcp_current_mss); - - /* Congestion window validation. (RFC2861) */ - + linux-2.6-vm-clear-unreclaimable.patch: linux-2.6.14/mm/filemap.c | 7 +++++++ linux-2.6.15/mm/page_alloc.c | 5 +++++ 2 files changed, 12 insertions(+) Index: linux-2.6-vm-clear-unreclaimable.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-vm-clear-unreclaimable.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-vm-clear-unreclaimable.patch 6 Jan 2006 08:08:13 -0000 1.1 +++ linux-2.6-vm-clear-unreclaimable.patch 9 Jan 2006 18:55:15 -0000 1.2 @@ -19,18 +19,17 @@ wake_up_page(page, PG_writeback); } EXPORT_SYMBOL(end_page_writeback); ---- linux-2.6.14/mm/page_alloc.c~ 2005-12-10 01:47:51.000000000 -0500 -+++ linux-2.6.14/mm/page_alloc.c 2005-12-10 01:48:25.000000000 -0500 -@@ -657,6 +657,12 @@ static void fastcall free_hot_cold_page( - pcp->count++; - if (pcp->count >= pcp->high) - pcp->count -= free_pages_bulk(zone, pcp->batch, &pcp->list, 0); -+ else if (zone->all_unreclaimable) { +--- linux-2.6.15/mm/page_alloc.c~ 2006-01-09 13:40:03.000000000 -0500 ++++ linux-2.6.15/mm/page_alloc.c 2006-01-09 13:40:50.000000000 -0500 +@@ -722,6 +722,11 @@ static void fastcall free_hot_cold_page( + if (pcp->count >= pcp->high) { + free_pages_bulk(zone, pcp->batch, &pcp->list, 0); + pcp->count -= pcp->batch; ++ } else if (zone->all_unreclaimable) { + spin_lock(&zone->lock); + zone->all_unreclaimable = 0; + zone->pages_scanned = 0; + spin_unlock(&zone->lock); -+ } + } local_irq_restore(flags); put_cpu(); - } linux-2.6-x86-tune-p4.patch: linux-2.6.12/arch/x86_64/Makefile | 4 +--- linux-2.6.15/arch/i386/Makefile.cpu | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) Index: linux-2.6-x86-tune-p4.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-x86-tune-p4.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-x86-tune-p4.patch 2 Nov 2005 11:29:10 -0000 1.2 +++ linux-2.6-x86-tune-p4.patch 9 Jan 2006 18:55:15 -0000 1.3 @@ -1,10 +1,9 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-1/arch/i386/Makefile linux-212/arch/i386/Makefile ---- linux-2.6.10/arch/i386/Makefile.cpu -+++ linux-2.6.10/arch/i386/Makefile.cpu -@@ -33,7 +33,7 @@ cflags-$(CONFIG_M486) += -march=i486 +--- linux-2.6.15/arch/i386/Makefile.cpu~ 2006-01-09 11:39:04.000000000 -0500 ++++ linux-2.6.15/arch/i386/Makefile.cpu 2006-01-09 11:39:36.000000000 -0500 +@@ -15,7 +15,7 @@ cflags-$(CONFIG_M486) += -march=i486 cflags-$(CONFIG_M586) += -march=i586 cflags-$(CONFIG_M586TSC) += -march=i586 - cflags-$(CONFIG_M586MMX) += $(call cc-option,-march=pentium-mmx,-march=i586) + cflags-$(CONFIG_M586MMX) += -march=pentium-mmx -cflags-$(CONFIG_M686) += -march=i686 +cflags-$(CONFIG_M686) += -march=i686 $(call tune,pentium4) cflags-$(CONFIG_MPENTIUMII) += -march=i686 $(call tune,pentium2) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.259 retrieving revision 1.260 diff -u -r1.259 -r1.260 --- sources 8 Jan 2006 02:04:10 -0000 1.259 +++ sources 9 Jan 2006 18:55:15 -0000 1.260 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -d1eedbc54fa76391548a927b3325d235 patch-2.6.15-git3.bz2 1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2 1eb2bb778090c59fbeba6278d63a9309 ieee80211softmac-20060103.tar.bz2 +f05d69868a2452b980185889f5a14fb4 patch-2.6.15-git5.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.240 retrieving revision 1.241 diff -u -r1.240 -r1.241 --- upstream 8 Jan 2006 01:59:03 -0000 1.240 +++ upstream 9 Jan 2006 18:55:15 -0000 1.241 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 -patch-2.6.15-git3.bz2 +patch-2.6.15-git5.bz2 --- linux-2.6-debug-taint-check.patch DELETED --- --- linux-2.6-debug-taint-proprietary-helpers.patch DELETED --- --- linux-2.6-vm-debug.patch DELETED --- --- patch-2.6.15-git3.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 18:55:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 13:55:42 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1571.2.1, 1.1571.2.2 jwltest-3c59x-2_6_12-1_1456_FC4.patch, 1.1.6.1, NONE Message-ID: <200601091855.k09Itg3q021050@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv21017 Modified Files: Tag: private-linville-jwltest-fc4-29-branch kernel-2.6.spec Removed Files: Tag: private-linville-jwltest-fc4-29-branch jwltest-3c59x-2_6_12-1_1456_FC4.patch Log Message: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1571.2.1 retrieving revision 1.1571.2.2 diff -u -r1.1571.2.1 -r1.1571.2.2 --- kernel-2.6.spec 9 Jan 2006 18:53:01 -0000 1.1571.2.1 +++ kernel-2.6.spec 9 Jan 2006 18:55:39 -0000 1.1571.2.2 @@ -317,9 +317,8 @@ Patch1301: linux-2.6-net-sundance-ip100A.patch Patch1302: jwltest-sky2.patch Patch1303: jwltest-via-velocity-tx_csum.patch -Patch1304: jwltest-3c59x-2_6_12-1_1456_FC4.patch -Patch1305: jwltest-tulip-last_irq.patch -Patch1306: jwltest-mii-force_media.patch +Patch1304: jwltest-tulip-last_irq.patch +Patch1305: jwltest-mii-force_media.patch # Netdump and Diskdump bits. Patch1500: linux-2.6-crashdump-common.patch @@ -735,12 +734,10 @@ %patch1302 -p1 # via-velocity tx_csum only works for IPv4 %patch1303 -p1 -# include 3c59x from 2.6.12-1.1456_FC4 for some testing -%patch1304 -p1 # apply bios work-around for tulip to x86_64 as well as i386 -%patch1305 -p1 +%patch1304 -p1 # fix link state change bug w/ generic mii -%patch1306 -p1 +%patch1305 -p1 # netdump bits %patch1500 -p1 --- jwltest-3c59x-2_6_12-1_1456_FC4.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 19:11:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 14:11:20 -0500 Subject: rpms/kernel/devel linux-2.6-dm-sync-overrun.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.1826.2.8, 1.1826.2.9 Message-ID: <200601091911.k09JBKdW025800@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25691 Modified Files: Tag: private-fc5-test2-branch kernel-2.6.spec Added Files: Tag: private-fc5-test2-branch linux-2.6-dm-sync-overrun.patch Log Message: avoid overrun whilst syncing linux-2.6-dm-sync-overrun.patch: dm-log.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-dm-sync-overrun.patch --- --- linux-2.6.15/drivers/md/dm-log.c~ 2006-01-09 14:09:53.000000000 -0500 +++ linux-2.6.15/drivers/md/dm-log.c 2006-01-09 14:10:03.000000000 -0500 @@ -573,7 +573,7 @@ static int core_get_resync_work(struct d lc->sync_search); lc->sync_search = *region + 1; - if (*region == lc->region_count) + if (*region >= lc->region_count) return 0; } while (log_test_bit(lc->recovering_bits, *region)); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.8 retrieving revision 1.1826.2.9 diff -u -r1.1826.2.8 -r1.1826.2.9 --- kernel-2.6.spec 9 Jan 2006 16:23:52 -0000 1.1826.2.8 +++ kernel-2.6.spec 9 Jan 2006 19:11:18 -0000 1.1826.2.9 @@ -370,6 +370,7 @@ Patch1840: linux-2.6-x86-hp-reboot.patch Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch Patch1870: linux-2.6-kill-blk_attempt_merge.patch +Patch1880: linux-2.6-dm-sync-overrun.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -886,6 +887,8 @@ %patch1860 -p1 # kill blk_attempt_merge %patch1870 -p1 +# dm: avoid ovvrun while syncing. +%patch1880 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1418,6 +1421,7 @@ - Remove vm debug patch that triggers too easily right now. (Needs fixing properly post test2). - kill blk_attempt_merge() which was horribly broken. +- dm: avoid ovvrun while syncing. * Mon Jan 9 2006 David Woodhouse - Fix some usblp problems, add ieee1284_id to sysfs From fedora-cvs-commits at redhat.com Mon Jan 9 19:16:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 14:16:01 -0500 Subject: rpms/dbus/devel dbus.spec,1.63,1.64 Message-ID: <200601091916.k09JG1JN028008@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/dbus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27942 Modified Files: dbus.spec Log Message: Index: dbus.spec =================================================================== RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- dbus.spec 9 Jan 2006 16:42:00 -0000 1.63 +++ dbus.spec 9 Jan 2006 19:15:58 -0000 1.64 @@ -16,13 +16,10 @@ # Mono only availible on these: (s390x disabled for now) %define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x -# Just exclusivearch for now: -ExclusiveArch: %mono_archs - Summary: D-BUS message bus Name: dbus Version: 0.60 -Release: 2 +Release: 3 URL: http://www.freedesktop.org/software/dbus/ Source0: %{name}-%{version}.tar.gz License: AFL/GPL @@ -291,6 +288,9 @@ %endif %changelog +* Mon Jan 9 2006 Alexander Larsson 0.60-3 +- Don't exclude non-mono arches + * Mon Jan 9 2006 Alexander Larsson - 0.60-2 - Add dbus-sharp sub-package From fedora-cvs-commits at redhat.com Mon Jan 9 19:24:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 14:24:10 -0500 Subject: rpms/kernel/devel linux-2.6-execshield-fixes.patch, NONE, 1.1 kernel-2.6.spec, 1.1834, 1.1835 linux-2.6-execshield-vdso.patch, 1.1, 1.2 linux-2.6-execshield.patch, 1.6, 1.7 Message-ID: <200601091924.k09JOArW003807@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28266 Modified Files: kernel-2.6.spec linux-2.6-execshield-vdso.patch linux-2.6-execshield.patch Added Files: linux-2.6-execshield-fixes.patch Log Message: split up the execshield patches again linux-2.6-execshield-fixes.patch: linux-2.6.15/fs/proc/base.c | 2 +- linux-exec-shield-curr.q/arch/i386/kernel/traps.c | 2 +- linux-exec-shield-curr.q/include/asm-i386/desc.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-execshield-fixes.patch --- arch/i386/kernel/traps.c | 2 +- include/asm-i386/desc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: linux-exec-shield-curr.q/arch/i386/kernel/traps.c =================================================================== --- linux-exec-shield-curr.q.orig/arch/i386/kernel/traps.c +++ linux-exec-shield-curr.q/arch/i386/kernel/traps.c @@ -494,7 +494,7 @@ check_lazy_exec_limit(int cpu, struct pt set_user_cs(¤t->mm->context.user_cs, limit); desc1 = ¤t->mm->context.user_cs; - desc2 = per_cpu(cpu_gdt_table, cpu) + GDT_ENTRY_DEFAULT_USER_CS; + desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; if (desc1->a != desc2->a || desc1->b != desc2->b) { /* Index: linux-exec-shield-curr.q/include/asm-i386/desc.h =================================================================== --- linux-exec-shield-curr.q.orig/include/asm-i386/desc.h +++ linux-exec-shield-curr.q/include/asm-i386/desc.h @@ -168,7 +168,7 @@ static inline void set_user_cs(struct de } #define load_user_cs_desc(cpu, mm) \ - per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs + get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); --- linux-2.6.15/fs/proc/base.c~ 2006-01-09 14:23:23.000000000 -0500 +++ linux-2.6.15/fs/proc/base.c 2006-01-09 14:23:34.000000000 -0500 @@ -201,7 +201,7 @@ static struct pid_entry tgid_base_stuff[ E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), #ifdef CONFIG_MMU - E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUGO), + E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUSR), #endif #ifdef CONFIG_SECURITY E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1834 retrieving revision 1.1835 diff -u -r1.1834 -r1.1835 --- kernel-2.6.spec 9 Jan 2006 18:55:14 -0000 1.1834 +++ kernel-2.6.spec 9 Jan 2006 19:24:08 -0000 1.1835 @@ -705,7 +705,7 @@ %endif # Fix up the vdso. -#%patch812 -p1 +%patch812 -p1 # Xen vDSO hack %if %{includexen} linux-2.6-execshield-vdso.patch: arch/i386/kernel/sysenter.c | 69 ++++++++++++++++++++++---------------- fs/binfmt_elf.c | 15 ++------ fs/proc/task_mmu.c | 9 +++-- include/asm-i386/elf.h | 7 +++ include/asm-i386/page.h | 5 ++ include/linux/mm.h | 5 ++ kernel/sysctl.c | 10 +++++ mm/mmap.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 155 insertions(+), 43 deletions(-) Index: linux-2.6-execshield-vdso.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-vdso.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-execshield-vdso.patch 13 Sep 2005 06:56:07 -0000 1.1 +++ linux-2.6-execshield-vdso.patch 9 Jan 2006 19:24:08 -0000 1.2 @@ -1,57 +1,125 @@ ---- linux-2.6.13/include/asm-i386/page.h.vdso -+++ linux-2.6.13/include/asm-i386/page.h -@@ -120,6 +120,11 @@ extern int devmem_is_allowed(unsigned lo - #endif - #define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START) + arch/i386/kernel/sysenter.c | 69 ++++++++++++++++++++++---------------- + fs/binfmt_elf.c | 15 ++------ + fs/proc/task_mmu.c | 9 +++-- + include/asm-i386/elf.h | 7 +++ + include/asm-i386/page.h | 5 ++ + include/linux/mm.h | 5 ++ + kernel/sysctl.c | 10 +++++ + mm/mmap.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 155 insertions(+), 43 deletions(-) + +Index: linux/arch/i386/kernel/sysenter.c +=================================================================== +--- linux.orig/arch/i386/kernel/sysenter.c ++++ linux/arch/i386/kernel/sysenter.c +@@ -47,20 +47,13 @@ void enable_sep_cpu(void) + extern const char vsyscall_int80_start, vsyscall_int80_end; + extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; + +-struct page *sysenter_page; ++static struct page *sysenter_pages[2]; + + int __init sysenter_setup(void) + { + void *page = (void *)get_zeroed_page(GFP_ATOMIC); +- /* +- * We keep this page mapped readonly, even though the executable +- * portion is randomized into a userspace vma - so that we dont +- * have to fix up the data within the VDSO page every time we +- * exec(). +- */ +- __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_KERNEL_RO); +- sysenter_page = virt_to_page(page); ++ sysenter_pages[0] = virt_to_page(page); + + if (!boot_cpu_has(X86_FEATURE_SEP)) { + memcpy(page, +@@ -78,42 +71,58 @@ int __init sysenter_setup(void) + + extern void SYSENTER_RETURN_OFFSET; + +-unsigned int vdso_enabled = 0; ++unsigned int vdso_enabled = 1; + +-void map_vsyscall(void) +/* -+ * Under exec-shield we don't use the generic fixmap gate area. -+ * The vDSO ("gate area") has a normal vma found the normal ways. ++ * This is called from binfmt_elf, we create the special vma for the ++ * vDSO and insert it into the mm struct tree. + */ -+#define __HAVE_ARCH_GATE_AREA 1 - - #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) - #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) ---- linux-2.6.13/include/asm-i386/elf.h.vdso -+++ linux-2.6.13/include/asm-i386/elf.h -@@ -146,6 +146,12 @@ do { \ - } \ - } while (0) ++int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack) + { + struct thread_info *ti = current_thread_info(); +- struct vm_area_struct *vma; +- unsigned long addr; ++ unsigned long addr, len; ++ int err; -+#define ARCH_HAS_SETUP_ADDITIONAL_PAGES -+struct linux_binprm; -+extern int arch_setup_additional_pages(struct linux_binprm *bprm, -+ int executable_stack); -+ -+#if 0 /* Disabled for exec-shield, where a normal vma holds the vDSO. */ - /* - * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out - * extra segments containing the vsyscall DSO contents. Dumping its -@@ -189,6 +195,7 @@ do { \ - PAGE_ALIGN(vsyscall_phdrs[i].p_memsz)); \ - } \ - } while (0) -+#endif +- if (unlikely(!vdso_enabled)) { + current->mm->context.vdso = NULL; +- return; +- } ++ if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0])) ++ return 0; - #endif + /* + * Map the vDSO (it will be randomized): + */ + down_write(¤t->mm->mmap_sem); +- addr = do_mmap(NULL, 0, 4096, PROT_READ | PROT_EXEC, MAP_PRIVATE, 0); +- current->mm->context.vdso = (void *)addr; +- ti->sysenter_return = (void *)addr + (long)&SYSENTER_RETURN_OFFSET; +- if (addr != -1) { +- vma = find_vma(current->mm, addr); +- if (vma) { +- pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; +- get_page(sysenter_page); +- install_page(current->mm, vma, addr, +- sysenter_page, vma->vm_page_prot); ++ len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE; ++ addr = get_unmapped_area_prot(NULL, 0, len, 0, ++ MAP_PRIVATE, PROT_READ | PROT_EXEC); ++ if (unlikely(addr & ~PAGE_MASK)) { ++ up_write(¤t->mm->mmap_sem); ++ return addr; + } ++ err = install_special_mapping(current->mm, addr, len, ++ VM_DONTEXPAND | VM_READ | VM_EXEC | ++ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC, ++ PAGE_READONLY_EXEC, ++ sysenter_pages); ++ if (likely(err == 0)) { ++ current->mm->context.vdso = (void *)addr; ++ ti->sysenter_return = &SYSENTER_RETURN_OFFSET + addr; + } + up_write(¤t->mm->mmap_sem); ++ return err; + } ---- linux-2.6.13/include/linux/mm.h.vdso -+++ linux-2.6.13/include/linux/mm.h -@@ -848,6 +848,11 @@ static inline unsigned long get_unmapped - return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); +-static int __init vdso_setup(char *str) ++int in_gate_area_no_task(unsigned long addr) + { +- vdso_enabled = simple_strtoul(str, NULL, 0); +- return 1; ++ return 0; } +-__setup("vdso=", vdso_setup); -+extern int install_special_mapping(struct mm_struct *mm, -+ unsigned long addr, unsigned long len, -+ unsigned long vm_flags, pgprot_t pgprot, -+ struct page **pages); ++int in_gate_area(struct task_struct *task, unsigned long addr) ++{ ++ return 0; ++} + - extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, - unsigned long len, unsigned long prot, - unsigned long flag, unsigned long pgoff); ---- linux-2.6.13/fs/binfmt_elf.c.vdso -+++ linux-2.6.13/fs/binfmt_elf.c -@@ -1001,8 +1001,6 @@ static int load_elf_binary(struct linux_ ++struct vm_area_struct *get_gate_vma(struct task_struct *tsk) ++{ ++ return NULL; ++} +Index: linux/fs/binfmt_elf.c +=================================================================== +--- linux.orig/fs/binfmt_elf.c ++++ linux/fs/binfmt_elf.c +@@ -1006,8 +1006,6 @@ static int load_elf_binary(struct linux_ elf_entry = loc->elf_ex.e_entry; } @@ -60,7 +128,7 @@ if (interpreter_type != INTERPRETER_AOUT) sys_close(elf_exec_fileno); -@@ -1012,17 +1010,11 @@ static int load_elf_binary(struct linux_ +@@ -1017,17 +1015,11 @@ static int load_elf_binary(struct linux_ retval = arch_setup_additional_pages(bprm, executable_stack); if (retval < 0) { send_sig(SIGKILL, current, 0); @@ -80,7 +148,7 @@ compute_creds(bprm); current->flags &= ~PF_FORKNOEXEC; -@@ -1227,6 +1219,9 @@ static int maydump(struct vm_area_struct +@@ -1231,6 +1223,9 @@ static int maydump(struct vm_area_struct if (vma->vm_flags & (VM_IO | VM_RESERVED)) return 0; @@ -90,9 +158,11 @@ /* Dump shared memory only if mapped from an anonymous file. */ if (vma->vm_flags & VM_SHARED) return vma->vm_file->f_dentry->d_inode->i_nlink == 0; ---- linux-2.6.13/fs/proc/task_mmu.c.vdso -+++ linux-2.6.13/fs/proc/task_mmu.c -@@ -156,14 +156,19 @@ static int show_map_internal(struct seq_ +Index: linux/fs/proc/task_mmu.c +=================================================================== +--- linux.orig/fs/proc/task_mmu.c ++++ linux/fs/proc/task_mmu.c +@@ -173,14 +173,19 @@ static int show_map_internal(struct seq_ if (vma->vm_end == mm->brk) { pad_len_spaces(m, len); seq_puts(m, "[heap]"); @@ -114,9 +184,96 @@ } else { pad_len_spaces(m, len); seq_puts(m, "[vdso]"); ---- linux-2.6.13/mm/mmap.c.vdso -+++ linux-2.6.13/mm/mmap.c -@@ -2155,3 +2155,81 @@ int may_expand_vm(struct mm_struct *mm, +Index: linux/include/asm-i386/elf.h +=================================================================== +--- linux.orig/include/asm-i386/elf.h ++++ linux/include/asm-i386/elf.h +@@ -148,6 +148,12 @@ do { \ + } \ + } while (0) + ++#define ARCH_HAS_SETUP_ADDITIONAL_PAGES ++struct linux_binprm; ++extern int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack); ++ ++#if 0 /* Disabled for exec-shield, where a normal vma holds the vDSO. */ + /* + * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out + * extra segments containing the vsyscall DSO contents. Dumping its +@@ -191,6 +197,7 @@ do { \ + PAGE_ALIGN(vsyscall_phdrs[i].p_memsz)); \ + } \ + } while (0) ++#endif + + #endif + +Index: linux/include/asm-i386/page.h +=================================================================== +--- linux.orig/include/asm-i386/page.h ++++ linux/include/asm-i386/page.h +@@ -118,6 +118,11 @@ extern int page_is_ram(unsigned long pag + #endif + #define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START) + ++/* ++ * Under exec-shield we don't use the generic fixmap gate area. ++ * The vDSO ("gate area") has a normal vma found the normal ways. ++ */ ++#define __HAVE_ARCH_GATE_AREA 1 + + #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) + #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) +Index: linux/include/linux/mm.h +=================================================================== +--- linux.orig/include/linux/mm.h ++++ linux/include/linux/mm.h +@@ -923,6 +923,11 @@ static inline unsigned long get_unmapped + return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); + } + ++extern int install_special_mapping(struct mm_struct *mm, ++ unsigned long addr, unsigned long len, ++ unsigned long vm_flags, pgprot_t pgprot, ++ struct page **pages); ++ + extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, + unsigned long len, unsigned long prot, + unsigned long flag, unsigned long pgoff); +Index: linux/kernel/sysctl.c +=================================================================== +--- linux.orig/kernel/sysctl.c ++++ linux/kernel/sysctl.c +@@ -77,7 +77,7 @@ extern int proc_unknown_nmi_panic(ctl_ta + void __user *, size_t *, loff_t *); + #endif + +-extern unsigned int vdso_enabled; ++extern unsigned int vdso_enabled, vdso_populate; + + int exec_shield = 1; + +@@ -317,6 +317,14 @@ static ctl_table kern_table[] = { + .mode = 0644, + .proc_handler = &proc_dointvec, + }, ++ { ++ .ctl_name = KERN_VDSO, ++ .procname = "vdso_populate", ++ .data = &vdso_populate, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = &proc_dointvec, ++ }, + #endif + { + .ctl_name = KERN_CORE_USES_PID, +Index: linux/mm/mmap.c +=================================================================== +--- linux.orig/mm/mmap.c ++++ linux/mm/mmap.c +@@ -2149,3 +2149,81 @@ int may_expand_vm(struct mm_struct *mm, return 0; return 1; } @@ -198,134 +355,3 @@ + + return err; +} ---- linux-2.6.13/arch/i386/kernel/sysenter.c.vdso -+++ linux-2.6.13/arch/i386/kernel/sysenter.c -@@ -47,20 +47,13 @@ void enable_sep_cpu(void) - extern const char vsyscall_int80_start, vsyscall_int80_end; - extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; - --struct page *sysenter_page; -+static struct page *sysenter_pages[2]; - - int __init sysenter_setup(void) - { - void *page = (void *)get_zeroed_page(GFP_ATOMIC); - -- /* -- * We keep this page mapped readonly, even though the executable -- * portion is randomized into a userspace vma - so that we dont -- * have to fix up the data within the VDSO page every time we -- * exec(). -- */ -- __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_KERNEL_RO); -- sysenter_page = virt_to_page(page); -+ sysenter_pages[0] = virt_to_page(page); - - if (!boot_cpu_has(X86_FEATURE_SEP)) { - memcpy(page, -@@ -78,37 +71,60 @@ int __init sysenter_setup(void) - - extern void SYSENTER_RETURN_OFFSET; - --unsigned int vdso_enabled = 0; -+unsigned int vdso_enabled = 1; - --void map_vsyscall(void) -+/* -+ * This is called from binfmt_elf, we create the special vma for the -+ * vDSO and insert it into the mm struct tree. -+ */ -+int arch_setup_additional_pages(struct linux_binprm *bprm, -+ int executable_stack) - { - struct thread_info *ti = current_thread_info(); -- struct vm_area_struct *vma; -- unsigned long addr; -+ unsigned long addr, len; -+ int err; - -- if (unlikely(!vdso_enabled)) { - current->mm->context.vdso = NULL; -- return; -- } -+ if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0])) -+ return 0; - - /* - * Map the vDSO (it will be randomized): - */ - down_write(¤t->mm->mmap_sem); -- addr = do_mmap(NULL, 0, 4096, PROT_READ | PROT_EXEC, MAP_PRIVATE, 0); -- current->mm->context.vdso = (void *)addr; -- ti->sysenter_return = (void *)addr + (long)&SYSENTER_RETURN_OFFSET; -- if (addr != -1) { -- vma = find_vma(current->mm, addr); -- if (vma) { -- pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; -- get_page(sysenter_page); -- install_page(current->mm, vma, addr, -- sysenter_page, vma->vm_page_prot); -- -+ len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE; -+ addr = get_unmapped_area_prot(NULL, 0, len, 0, -+ MAP_PRIVATE, PROT_READ | PROT_EXEC); -+ if (unlikely(addr & ~PAGE_MASK)) { -+ up_write(¤t->mm->mmap_sem); -+ return addr; - } -+ err = install_special_mapping(current->mm, addr, len, -+ VM_DONTEXPAND | VM_READ | VM_EXEC | -+ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC, -+ PAGE_READONLY_EXEC, -+ sysenter_pages); -+ if (likely(err == 0)) { -+ current->mm->context.vdso = (void *)addr; -+ ti->sysenter_return = &SYSENTER_RETURN_OFFSET + addr; - } - up_write(¤t->mm->mmap_sem); -+ return err; -+} -+ -+int in_gate_area_no_task(unsigned long addr) -+{ -+ return 0; -+} -+ -+int in_gate_area(struct task_struct *task, unsigned long addr) -+{ -+ return 0; -+} -+ -+struct vm_area_struct *get_gate_vma(struct task_struct *tsk) -+{ -+ return NULL; - } - - static int __init vdso_setup(char *str) ---- linux-2.6.13/kernel/sysctl.c -+++ linux-2.6.13/kernel/sysctl.c -@@ -74,7 +74,7 @@ extern int proc_unknown_nmi_panic(ctl_ta - void __user *, size_t *, loff_t *); - #endif - --extern unsigned int vdso_enabled; -+extern unsigned int vdso_enabled, vdso_populate; - - int exec_shield = 1; - -@@ -316,6 +316,14 @@ static ctl_table kern_table[] = { - .mode = 0644, - .proc_handler = &proc_dointvec, - }, -+ { -+ .ctl_name = KERN_VDSO, -+ .procname = "vdso_populate", -+ .data = &vdso_populate, -+ .maxlen = sizeof(int), -+ .mode = 0644, -+ .proc_handler = &proc_dointvec, -+ }, - #endif - { - .ctl_name = KERN_CORE_USES_PID, - linux-2.6-execshield.patch: arch/i386/kernel/asm-offsets.c | 1 arch/i386/kernel/cpu/common.c | 7 + arch/i386/kernel/entry.S | 8 +- arch/i386/kernel/process.c | 59 +++++++++++++++ arch/i386/kernel/signal.c | 4 - arch/i386/kernel/smp.c | 3 arch/i386/kernel/sysenter.c | 56 ++++++++++++++- arch/i386/kernel/traps.c | 93 ++++++++++++++++++++++++- arch/i386/kernel/vsyscall-sysenter.S | 6 - arch/i386/kernel/vsyscall.lds.S | 4 - arch/i386/mm/init.c | 6 + arch/i386/mm/mmap.c | 6 + arch/ia64/ia32/binfmt_elf32.c | 2 arch/x86_64/ia32/ia32_binfmt.c | 4 - arch/x86_64/kernel/process.c | 6 - arch/x86_64/kernel/setup64.c | 23 ------ arch/x86_64/mm/Makefile | 2 arch/x86_64/mm/fault.c | 2 arch/x86_64/mm/mmap.c | 95 +++++++++++++++++++++++++ drivers/char/random.c | 7 + fs/binfmt_elf.c | 130 ++++++++++++++++++++++++++++------- fs/proc/array.c | 8 +- fs/proc/base.c | 4 - fs/proc/task_mmu.c | 25 +++++- include/asm-i386/desc.h | 14 +++ include/asm-i386/elf.h | 42 +++++++---- include/asm-i386/mmu.h | 6 + include/asm-i386/pgalloc.h | 1 include/asm-i386/processor.h | 8 +- include/asm-i386/thread_info.h | 1 include/asm-ia64/pgalloc.h | 4 + include/asm-powerpc/pgalloc.h | 5 + include/asm-ppc/pgalloc.h | 5 + include/asm-s390/pgalloc.h | 4 + include/asm-sparc/pgalloc.h | 4 + include/asm-sparc64/pgalloc.h | 4 + include/asm-x86_64/pgalloc.h | 7 + include/asm-x86_64/pgtable.h | 2 include/asm-x86_64/processor.h | 5 + include/linux/mm.h | 11 ++ include/linux/resource.h | 5 + include/linux/sched.h | 9 ++ include/linux/sysctl.h | 3 kernel/signal.c | 38 ++++++++++ kernel/sysctl.c | 39 ++++++++++ mm/fremap.c | 16 ++-- mm/mmap.c | 105 ++++++++++++++++++++++++++-- mm/mprotect.c | 5 + mm/mremap.c | 4 - 49 files changed, 784 insertions(+), 124 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-execshield.patch 9 Jan 2006 18:55:15 -0000 1.6 +++ linux-2.6-execshield.patch 9 Jan 2006 19:24:08 -0000 1.7 @@ -1,7 +1,58 @@ -Index: linux-exec-shield-curr.q/arch/i386/kernel/asm-offsets.c + arch/i386/kernel/asm-offsets.c | 1 + arch/i386/kernel/cpu/common.c | 7 + + arch/i386/kernel/entry.S | 8 +- + arch/i386/kernel/process.c | 59 +++++++++++++++ + arch/i386/kernel/signal.c | 4 - + arch/i386/kernel/smp.c | 3 + arch/i386/kernel/sysenter.c | 56 ++++++++++++++- + arch/i386/kernel/traps.c | 93 ++++++++++++++++++++++++- + arch/i386/kernel/vsyscall-sysenter.S | 6 - + arch/i386/kernel/vsyscall.lds.S | 4 - + arch/i386/mm/init.c | 6 + + arch/i386/mm/mmap.c | 6 + + arch/ia64/ia32/binfmt_elf32.c | 2 + arch/x86_64/ia32/ia32_binfmt.c | 4 - + arch/x86_64/kernel/process.c | 6 - + arch/x86_64/kernel/setup64.c | 23 ------ + arch/x86_64/mm/Makefile | 2 + arch/x86_64/mm/fault.c | 2 + arch/x86_64/mm/mmap.c | 95 +++++++++++++++++++++++++ + drivers/char/random.c | 7 + + fs/binfmt_elf.c | 130 ++++++++++++++++++++++++++++------- + fs/proc/array.c | 8 +- + fs/proc/base.c | 4 - + fs/proc/task_mmu.c | 25 +++++- + include/asm-i386/desc.h | 14 +++ + include/asm-i386/elf.h | 42 +++++++---- + include/asm-i386/mmu.h | 6 + + include/asm-i386/pgalloc.h | 1 + include/asm-i386/processor.h | 8 +- + include/asm-i386/thread_info.h | 1 + include/asm-ia64/pgalloc.h | 4 + + include/asm-powerpc/pgalloc.h | 5 + + include/asm-ppc/pgalloc.h | 5 + + include/asm-s390/pgalloc.h | 4 + + include/asm-sparc/pgalloc.h | 4 + + include/asm-sparc64/pgalloc.h | 4 + + include/asm-x86_64/pgalloc.h | 7 + + include/asm-x86_64/pgtable.h | 2 + include/asm-x86_64/processor.h | 5 + + include/linux/mm.h | 11 ++ + include/linux/resource.h | 5 + + include/linux/sched.h | 9 ++ + include/linux/sysctl.h | 3 + kernel/signal.c | 38 ++++++++++ + kernel/sysctl.c | 39 ++++++++++ + mm/fremap.c | 16 ++-- + mm/mmap.c | 105 ++++++++++++++++++++++++++-- + mm/mprotect.c | 5 + + mm/mremap.c | 4 - + 49 files changed, 784 insertions(+), 124 deletions(-) + +Index: linux/arch/i386/kernel/asm-offsets.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/kernel/asm-offsets.c -+++ linux-exec-shield-curr.q/arch/i386/kernel/asm-offsets.c +--- linux.orig/arch/i386/kernel/asm-offsets.c ++++ linux/arch/i386/kernel/asm-offsets.c @@ -53,6 +53,7 @@ void foo(void) OFFSET(TI_preempt_count, thread_info, preempt_count); OFFSET(TI_addr_limit, thread_info, addr_limit); @@ -10,10 +61,10 @@ BLANK(); OFFSET(EXEC_DOMAIN_handler, exec_domain, handler); -Index: linux-exec-shield-curr.q/arch/i386/kernel/cpu/common.c +Index: linux/arch/i386/kernel/cpu/common.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/kernel/cpu/common.c -+++ linux-exec-shield-curr.q/arch/i386/kernel/cpu/common.c +--- linux.orig/arch/i386/kernel/cpu/common.c ++++ linux/arch/i386/kernel/cpu/common.c @@ -392,6 +392,13 @@ void __devinit identify_cpu(struct cpuin if (disable_pse) clear_bit(X86_FEATURE_PSE, c->x86_capability); @@ -28,10 +79,10 @@ /* If the model name is still unset, do table lookup. */ if ( !c->x86_model_id[0] ) { char *p; -Index: linux-exec-shield-curr.q/arch/i386/kernel/entry.S +Index: linux/arch/i386/kernel/entry.S =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/kernel/entry.S -+++ linux-exec-shield-curr.q/arch/i386/kernel/entry.S +--- linux.orig/arch/i386/kernel/entry.S ++++ linux/arch/i386/kernel/entry.S @@ -184,8 +184,12 @@ sysenter_past_esp: pushl %ebp pushfl @@ -47,10 +98,10 @@ /* * Load the potential sixth argument from user stack. * Careful about security. -Index: linux-exec-shield-curr.q/arch/i386/kernel/process.c +Index: linux/arch/i386/kernel/process.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/kernel/process.c -+++ linux-exec-shield-curr.q/arch/i386/kernel/process.c +--- linux.orig/arch/i386/kernel/process.c ++++ linux/arch/i386/kernel/process.c @@ -652,6 +652,8 @@ struct task_struct fastcall * __switch_t /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ @@ -121,10 +172,10 @@ + current->mm->brk = new_brk; +} + -Index: linux-exec-shield-curr.q/arch/i386/kernel/signal.c +Index: linux/arch/i386/kernel/signal.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/kernel/signal.c -+++ linux-exec-shield-curr.q/arch/i386/kernel/signal.c +--- linux.orig/arch/i386/kernel/signal.c ++++ linux/arch/i386/kernel/signal.c @@ -384,7 +384,7 @@ static int setup_frame(int sig, struct k goto give_sigsegv; } @@ -143,10 +194,10 @@ if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; err |= __put_user(restorer, &frame->pretcode); -Index: linux-exec-shield-curr.q/arch/i386/kernel/smp.c +Index: linux/arch/i386/kernel/smp.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/kernel/smp.c -+++ linux-exec-shield-curr.q/arch/i386/kernel/smp.c +--- linux.orig/arch/i386/kernel/smp.c ++++ linux/arch/i386/kernel/smp.c @@ -23,6 +23,7 @@ #include @@ -164,10 +215,10 @@ if (!cpu_isset(cpu, flush_cpumask)) goto out; -Index: linux-exec-shield-curr.q/arch/i386/kernel/sysenter.c +Index: linux/arch/i386/kernel/sysenter.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/kernel/sysenter.c -+++ linux-exec-shield-curr.q/arch/i386/kernel/sysenter.c +--- linux.orig/arch/i386/kernel/sysenter.c ++++ linux/arch/i386/kernel/sysenter.c @@ -13,6 +13,7 @@ #include #include @@ -185,87 +236,78 @@ } /* -@@ -46,11 +47,13 @@ void enable_sep_cpu(void) +@@ -46,11 +47,20 @@ void enable_sep_cpu(void) extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; -+static struct page *sysenter_pages[2]; ++struct page *sysenter_page; + int __init sysenter_setup(void) { void *page = (void *)get_zeroed_page(GFP_ATOMIC); - __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_READONLY_EXEC); -+ sysenter_pages[0] = virt_to_page(page); ++ /* ++ * We keep this page mapped readonly, even though the executable ++ * portion is randomized into a userspace vma - so that we dont ++ * have to fix up the data within the VDSO page every time we ++ * exec(). ++ */ ++ __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_KERNEL_RO); ++ sysenter_page = virt_to_page(page); if (!boot_cpu_has(X86_FEATURE_SEP)) { memcpy(page, -@@ -65,3 +68,61 @@ int __init sysenter_setup(void) +@@ -65,3 +75,45 @@ int __init sysenter_setup(void) return 0; } + +extern void SYSENTER_RETURN_OFFSET; + -+unsigned int vdso_enabled = 1; ++unsigned int vdso_enabled = 0; + -+/* -+ * This is called from binfmt_elf, we create the special vma for the -+ * vDSO and insert it into the mm struct tree. -+ */ -+int arch_setup_additional_pages(struct linux_binprm *bprm, -+ int executable_stack) ++void map_vsyscall(void) +{ + struct thread_info *ti = current_thread_info(); -+ unsigned long addr, len; -+ int err; ++ struct vm_area_struct *vma; ++ unsigned long addr; + ++ if (unlikely(!vdso_enabled)) { + current->mm->context.vdso = NULL; -+ if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0])) -+ return 0; ++ return; ++ } + + /* + * Map the vDSO (it will be randomized): + */ + down_write(¤t->mm->mmap_sem); -+ len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE; -+ addr = get_unmapped_area_prot(NULL, 0, len, 0, -+ MAP_PRIVATE, PROT_READ | PROT_EXEC); -+ if (unlikely(addr & ~PAGE_MASK)) { -+ up_write(¤t->mm->mmap_sem); -+ return addr; ++ addr = do_mmap(NULL, 0, 4096, PROT_READ | PROT_EXEC, MAP_PRIVATE, 0); ++ current->mm->context.vdso = (void *)addr; ++ ti->sysenter_return = (void *)addr + (long)&SYSENTER_RETURN_OFFSET; ++ if (addr != -1) { ++ vma = find_vma(current->mm, addr); ++ if (vma) { ++ pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; ++ get_page(sysenter_page); ++ install_page(current->mm, vma, addr, ++ sysenter_page, vma->vm_page_prot); + } -+ err = install_special_mapping(current->mm, addr, len, -+ VM_DONTEXPAND | VM_READ | VM_EXEC | -+ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC, -+ PAGE_READONLY_EXEC, -+ sysenter_pages); -+ if (likely(err == 0)) { -+ current->mm->context.vdso = (void *)addr; -+ ti->sysenter_return = &SYSENTER_RETURN_OFFSET + addr; + } + up_write(¤t->mm->mmap_sem); -+ return err; +} + -+int in_gate_area_no_task(unsigned long addr) ++static int __init vdso_setup(char *str) +{ -+ return 0; -+} -+ -+int in_gate_area(struct task_struct *task, unsigned long addr) -+{ -+ return 0; ++ vdso_enabled = simple_strtoul(str, NULL, 0); ++ return 1; +} ++__setup("vdso=", vdso_setup); + -+struct vm_area_struct *get_gate_vma(struct task_struct *tsk) -+{ -+ return NULL; -+} -Index: linux-exec-shield-curr.q/arch/i386/kernel/traps.c +Index: linux/arch/i386/kernel/traps.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/kernel/traps.c -+++ linux-exec-shield-curr.q/arch/i386/kernel/traps.c +--- linux.orig/arch/i386/kernel/traps.c ++++ linux/arch/i386/kernel/traps.c @@ -461,7 +461,82 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) DO_ERROR(12, SIGBUS, "stack segment", stack_segment) @@ -304,7 +346,7 @@ + set_user_cs(¤t->mm->context.user_cs, limit); + + desc1 = ¤t->mm->context.user_cs; -+ desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; ++ desc2 = per_cpu(cpu_gdt_table, cpu) + GDT_ENTRY_DEFAULT_USER_CS; + + if (desc1->a != desc2->a || desc1->b != desc2->b) { + /* @@ -398,10 +440,10 @@ if (!fixup_exception(regs)) { if (notify_die(DIE_GPF, "general protection fault", regs, error_code, 13, SIGSEGV) == NOTIFY_STOP) -Index: linux-exec-shield-curr.q/arch/i386/kernel/vsyscall-sysenter.S +Index: linux/arch/i386/kernel/vsyscall-sysenter.S =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/kernel/vsyscall-sysenter.S -+++ linux-exec-shield-curr.q/arch/i386/kernel/vsyscall-sysenter.S +--- linux.orig/arch/i386/kernel/vsyscall-sysenter.S ++++ linux/arch/i386/kernel/vsyscall-sysenter.S @@ -24,11 +24,11 @@ __kernel_vsyscall: /* 7: align return point with nop's to make disassembly easier */ .space 7,0x90 @@ -417,10 +459,10 @@ pop %ebp .Lpop_ebp: pop %edx -Index: linux-exec-shield-curr.q/arch/i386/kernel/vsyscall.lds.S +Index: linux/arch/i386/kernel/vsyscall.lds.S =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/kernel/vsyscall.lds.S -+++ linux-exec-shield-curr.q/arch/i386/kernel/vsyscall.lds.S +--- linux.orig/arch/i386/kernel/vsyscall.lds.S ++++ linux/arch/i386/kernel/vsyscall.lds.S @@ -7,7 +7,7 @@ SECTIONS @@ -439,10 +481,10 @@ .text : { *(.text) } :text =0x90909090 .note : { *(.note.*) } :text :note -Index: linux-exec-shield-curr.q/arch/i386/mm/init.c +Index: linux/arch/i386/mm/init.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/mm/init.c -+++ linux-exec-shield-curr.q/arch/i386/mm/init.c +--- linux.orig/arch/i386/mm/init.c ++++ linux/arch/i386/mm/init.c @@ -432,7 +432,7 @@ u64 __supported_pte_mask __read_mostly = * Control non executable mappings. * @@ -471,10 +513,10 @@ pagetable_init(); -Index: linux-exec-shield-curr.q/arch/i386/mm/mmap.c +Index: linux/arch/i386/mm/mmap.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/i386/mm/mmap.c -+++ linux-exec-shield-curr.q/arch/i386/mm/mmap.c +--- linux.orig/arch/i386/mm/mmap.c ++++ linux/arch/i386/mm/mmap.c @@ -62,15 +62,17 @@ void arch_pick_mmap_layout(struct mm_str * Fall back to the standard layout if the personality * bit is set, or if the expected stack growth is unlimited: @@ -495,10 +537,10 @@ mm->unmap_area = arch_unmap_area_topdown; } } -Index: linux-exec-shield-curr.q/arch/ia64/ia32/binfmt_elf32.c +Index: linux/arch/ia64/ia32/binfmt_elf32.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/ia64/ia32/binfmt_elf32.c -+++ linux-exec-shield-curr.q/arch/ia64/ia32/binfmt_elf32.c +--- linux.orig/arch/ia64/ia32/binfmt_elf32.c ++++ linux/arch/ia64/ia32/binfmt_elf32.c @@ -264,7 +264,7 @@ elf32_set_personality (void) } @@ -508,10 +550,10 @@ { unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; -Index: linux-exec-shield-curr.q/arch/x86_64/ia32/ia32_binfmt.c +Index: linux/arch/x86_64/ia32/ia32_binfmt.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/x86_64/ia32/ia32_binfmt.c -+++ linux-exec-shield-curr.q/arch/x86_64/ia32/ia32_binfmt.c +--- linux.orig/arch/x86_64/ia32/ia32_binfmt.c ++++ linux/arch/x86_64/ia32/ia32_binfmt.c @@ -248,8 +248,6 @@ elf_core_copy_task_xfpregs(struct task_s #define elf_check_arch(x) \ ((x)->e_machine == EM_386) @@ -530,10 +572,10 @@ } while (0) /* Override some function names */ -Index: linux-exec-shield-curr.q/arch/x86_64/kernel/process.c +Index: linux/arch/x86_64/kernel/process.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/x86_64/kernel/process.c -+++ linux-exec-shield-curr.q/arch/x86_64/kernel/process.c +--- linux.orig/arch/x86_64/kernel/process.c ++++ linux/arch/x86_64/kernel/process.c @@ -631,12 +631,6 @@ void set_personality_64bit(void) /* Make sure to be in 64bit mode */ @@ -547,10 +589,10 @@ } asmlinkage long sys_fork(struct pt_regs *regs) -Index: linux-exec-shield-curr.q/arch/x86_64/kernel/setup64.c +Index: linux/arch/x86_64/kernel/setup64.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/x86_64/kernel/setup64.c -+++ linux-exec-shield-curr.q/arch/x86_64/kernel/setup64.c +--- linux.orig/arch/x86_64/kernel/setup64.c ++++ linux/arch/x86_64/kernel/setup64.c @@ -45,7 +45,7 @@ Control non executable mappings for 64bi on Enable(default) off Disable @@ -589,10 +631,10 @@ /* * Great future plan: -Index: linux-exec-shield-curr.q/arch/x86_64/mm/Makefile +Index: linux/arch/x86_64/mm/Makefile =================================================================== ---- linux-exec-shield-curr.q.orig/arch/x86_64/mm/Makefile -+++ linux-exec-shield-curr.q/arch/x86_64/mm/Makefile +--- linux.orig/arch/x86_64/mm/Makefile ++++ linux/arch/x86_64/mm/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux x86_64-specific parts of the memory manager. # @@ -602,10 +644,10 @@ obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_K8_NUMA) += k8topology.o -Index: linux-exec-shield-curr.q/arch/x86_64/mm/fault.c +Index: linux/arch/x86_64/mm/fault.c =================================================================== ---- linux-exec-shield-curr.q.orig/arch/x86_64/mm/fault.c -+++ linux-exec-shield-curr.q/arch/x86_64/mm/fault.c +--- linux.orig/arch/x86_64/mm/fault.c ++++ linux/arch/x86_64/mm/fault.c @@ -74,7 +74,7 @@ static noinline int is_prefetch(struct p instr = (unsigned char *)convert_rip_to_linear(current, regs); max_instr = instr + 15; @@ -615,10 +657,10 @@ return 0; while (scan_more && instr < max_instr) { -Index: linux-exec-shield-curr.q/arch/x86_64/mm/mmap.c +Index: linux/arch/x86_64/mm/mmap.c =================================================================== --- /dev/null -+++ linux-exec-shield-curr.q/arch/x86_64/mm/mmap.c ++++ linux/arch/x86_64/mm/mmap.c @@ -0,0 +1,95 @@ +/* + * linux/arch/x86-64/mm/mmap.c @@ -715,10 +757,10 @@ + return sp & ~0xf; +} + -Index: linux-exec-shield-curr.q/drivers/char/random.c +Index: linux/drivers/char/random.c =================================================================== ---- linux-exec-shield-curr.q.orig/drivers/char/random.c -+++ linux-exec-shield-curr.q/drivers/char/random.c +--- linux.orig/drivers/char/random.c ++++ linux/drivers/char/random.c @@ -1632,13 +1632,18 @@ EXPORT_SYMBOL(secure_dccp_sequence_numbe */ unsigned int get_random_int(void) @@ -739,10 +781,10 @@ } /* -Index: linux-exec-shield-curr.q/fs/binfmt_elf.c +Index: linux/fs/binfmt_elf.c =================================================================== ---- linux-exec-shield-curr.q.orig/fs/binfmt_elf.c -+++ linux-exec-shield-curr.q/fs/binfmt_elf.c +--- linux.orig/fs/binfmt_elf.c ++++ linux/fs/binfmt_elf.c @@ -47,7 +47,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs); @@ -974,30 +1016,22 @@ if (BAD_ADDR(elf_entry)) { printk(KERN_ERR "Unable to load interpreter %.128s\n", elf_interpreter); -@@ -940,8 +1006,6 @@ static int load_elf_binary(struct linux_ - elf_entry = loc->elf_ex.e_entry; - } - -- kfree(elf_phdata); -- - if (interpreter_type != INTERPRETER_AOUT) - sys_close(elf_exec_fileno); - -@@ -951,10 +1015,12 @@ static int load_elf_binary(struct linux_ - retval = arch_setup_additional_pages(bprm, executable_stack); - if (retval < 0) { - send_sig(SIGKILL, current, 0); -- goto out; -+ goto out_free_fh; +@@ -955,6 +1021,14 @@ static int load_elf_binary(struct linux_ } #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ -+ kfree(elf_phdata); ++ /* ++ * Map the vsyscall trampoline. This address is then passed via ++ * AT_SYSINFO. ++ */ ++#ifdef __HAVE_ARCH_VSYSCALL ++ map_vsyscall(); ++#endif + compute_creds(bprm); current->flags &= ~PF_FORKNOEXEC; create_elf_tables(bprm, &loc->elf_ex, (interpreter_type == INTERPRETER_AOUT), -@@ -968,6 +1034,10 @@ static int load_elf_binary(struct linux_ +@@ -968,6 +1042,10 @@ static int load_elf_binary(struct linux_ current->mm->end_data = end_data; current->mm->start_stack = bprm->p; @@ -1008,20 +1042,10 @@ if (current->personality & MMAP_PAGE_ZERO) { /* Why this, you ask??? Well SVr4 maps page 0 as read-only, and some applications "depend" upon this behavior. -@@ -1153,6 +1223,9 @@ static int maydump(struct vm_area_struct - if (vma->vm_flags & (VM_IO | VM_RESERVED)) - return 0; - -+ if (vma->vm_flags & VM_DONTEXPAND) /* Kludge for vDSO. */ -+ return 1; -+ - /* Dump shared memory only if mapped from an anonymous file. */ - if (vma->vm_flags & VM_SHARED) - return vma->vm_file->f_dentry->d_inode->i_nlink == 0; -Index: linux-exec-shield-curr.q/fs/proc/array.c +Index: linux/fs/proc/array.c =================================================================== ---- linux-exec-shield-curr.q.orig/fs/proc/array.c -+++ linux-exec-shield-curr.q/fs/proc/array.c +--- linux.orig/fs/proc/array.c ++++ linux/fs/proc/array.c @@ -391,8 +391,12 @@ static int do_task_stat(struct task_stru ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0; read_unlock(&tasklist_lock); @@ -1037,10 +1061,10 @@ if (!whole) { min_flt = task->min_flt; maj_flt = task->maj_flt; -Index: linux-exec-shield-curr.q/fs/proc/base.c +Index: linux/fs/proc/base.c =================================================================== ---- linux-exec-shield-curr.q.orig/fs/proc/base.c -+++ linux-exec-shield-curr.q/fs/proc/base.c +--- linux.orig/fs/proc/base.c ++++ linux/fs/proc/base.c @@ -188,7 +188,7 @@ static struct pid_entry tgid_base_stuff[ E(PROC_TGID_CMDLINE, "cmdline", S_IFREG|S_IRUGO), E(PROC_TGID_STAT, "stat", S_IFREG|S_IRUGO), @@ -1059,10 +1083,10 @@ #ifdef CONFIG_NUMA E(PROC_TID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO), #endif -Index: linux-exec-shield-curr.q/fs/proc/task_mmu.c +Index: linux/fs/proc/task_mmu.c =================================================================== ---- linux-exec-shield-curr.q.orig/fs/proc/task_mmu.c -+++ linux-exec-shield-curr.q/fs/proc/task_mmu.c +--- linux.orig/fs/proc/task_mmu.c ++++ linux/fs/proc/task_mmu.c @@ -43,7 +43,11 @@ char *task_mem(struct mm_struct *mm, cha "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -1106,7 +1130,7 @@ flags & VM_MAYSHARE ? 's' : 'p', vma->vm_pgoff << PAGE_SHIFT, MAJOR(dev), MINOR(dev), ino, &len); -@@ -154,18 +170,22 @@ static int show_map_internal(struct seq_ +@@ -154,8 +170,7 @@ static int show_map_internal(struct seq_ seq_path(m, file->f_vfsmnt, file->f_dentry, "\n"); } else { if (mm) { @@ -1115,28 +1139,11 @@ + if (vma->vm_end == mm->brk) { pad_len_spaces(m, len); seq_puts(m, "[heap]"); -- } else { -- if (vma->vm_start <= mm->start_stack && -+ } else if (vma->vm_start <= mm->start_stack && - vma->vm_end >= mm->start_stack) { - - pad_len_spaces(m, len); - seq_puts(m, "[stack]"); - } -+#ifdef __i386__ -+ else if (vma->vm_start == -+ (unsigned long)mm->context.vdso) { -+ pad_len_spaces(m, len); -+ seq_puts(m, "[vdso]"); - } -+#endif - } else { - pad_len_spaces(m, len); - seq_puts(m, "[vdso]"); -Index: linux-exec-shield-curr.q/include/asm-i386/desc.h + } else { +Index: linux/include/asm-i386/desc.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-i386/desc.h -+++ linux-exec-shield-curr.q/include/asm-i386/desc.h +--- linux.orig/include/asm-i386/desc.h ++++ linux/include/asm-i386/desc.h @@ -160,6 +160,20 @@ static inline unsigned long get_desc_bas return base; } @@ -1149,7 +1156,7 @@ +} + +#define load_user_cs_desc(cpu, mm) \ -+ get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs ++ per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs + +extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); +extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); @@ -1158,10 +1165,10 @@ #endif /* !__ASSEMBLY__ */ #endif -Index: linux-exec-shield-curr.q/include/asm-i386/elf.h +Index: linux/include/asm-i386/elf.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-i386/elf.h -+++ linux-exec-shield-curr.q/include/asm-i386/elf.h +--- linux.orig/include/asm-i386/elf.h ++++ linux/include/asm-i386/elf.h @@ -10,6 +10,7 @@ #include #include /* for savesegment */ @@ -1170,7 +1177,7 @@ #include -@@ -129,17 +130,30 @@ extern int dump_task_extended_fpu (struc +@@ -129,15 +130,22 @@ extern int dump_task_extended_fpu (struc #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs) #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs) @@ -1199,16 +1206,8 @@ + } \ } while (0) -+#define ARCH_HAS_SETUP_ADDITIONAL_PAGES -+struct linux_binprm; -+extern int arch_setup_additional_pages(struct linux_binprm *bprm, -+ int executable_stack); -+ -+#if 0 /* Disabled for exec-shield, where a normal vma holds the vDSO. */ /* - * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out - * extra segments containing the vsyscall DSO contents. Dumping its -@@ -148,15 +162,15 @@ do { \ +@@ -148,15 +156,15 @@ do { \ * Dumping its extra ELF program headers includes all the other information * a debugger needs to easily find how the vsyscall DSO was being used. */ @@ -1228,7 +1227,7 @@ struct elf_phdr phdr = vsyscall_phdrs[i]; \ if (phdr.p_type == PT_LOAD) { \ BUG_ON(ofs != 0); \ -@@ -174,16 +188,23 @@ do { \ +@@ -174,10 +182,10 @@ do { \ #define ELF_CORE_WRITE_EXTRA_DATA \ do { \ const struct elf_phdr *const vsyscall_phdrs = \ @@ -1242,9 +1241,7 @@ if (vsyscall_phdrs[i].p_type == PT_LOAD) \ DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr, \ PAGE_ALIGN(vsyscall_phdrs[i].p_memsz)); \ - } \ - } while (0) -+#endif +@@ -186,4 +194,10 @@ do { \ #endif @@ -1255,10 +1252,10 @@ +extern void map_vsyscall(void); + #endif -Index: linux-exec-shield-curr.q/include/asm-i386/mmu.h +Index: linux/include/asm-i386/mmu.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-i386/mmu.h -+++ linux-exec-shield-curr.q/include/asm-i386/mmu.h +--- linux.orig/include/asm-i386/mmu.h ++++ linux/include/asm-i386/mmu.h @@ -7,11 +7,17 @@ * we put the segment information here. * @@ -1277,26 +1274,10 @@ } mm_context_t; #endif -Index: linux-exec-shield-curr.q/include/asm-i386/page.h -=================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-i386/page.h -+++ linux-exec-shield-curr.q/include/asm-i386/page.h -@@ -118,6 +118,11 @@ extern int page_is_ram(unsigned long pag - #endif - #define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START) - -+/* -+ * Under exec-shield we don't use the generic fixmap gate area. -+ * The vDSO ("gate area") has a normal vma found the normal ways. -+ */ -+#define __HAVE_ARCH_GATE_AREA 1 - - #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) - #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) -Index: linux-exec-shield-curr.q/include/asm-i386/pgalloc.h +Index: linux/include/asm-i386/pgalloc.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-i386/pgalloc.h -+++ linux-exec-shield-curr.q/include/asm-i386/pgalloc.h +--- linux.orig/include/asm-i386/pgalloc.h ++++ linux/include/asm-i386/pgalloc.h @@ -3,6 +3,7 @@ #include @@ -1305,10 +1286,10 @@ #include #include /* for struct page */ -Index: linux-exec-shield-curr.q/include/asm-i386/processor.h +Index: linux/include/asm-i386/processor.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-i386/processor.h -+++ linux-exec-shield-curr.q/include/asm-i386/processor.h +--- linux.orig/include/asm-i386/processor.h ++++ linux/include/asm-i386/processor.h @@ -319,7 +319,10 @@ extern int bootloader_type; /* This decides where the kernel will search for a free chunk of vm * space during mmap's. @@ -1331,10 +1312,10 @@ } while (0) /* -Index: linux-exec-shield-curr.q/include/asm-i386/thread_info.h +Index: linux/include/asm-i386/thread_info.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-i386/thread_info.h -+++ linux-exec-shield-curr.q/include/asm-i386/thread_info.h +--- linux.orig/include/asm-i386/thread_info.h ++++ linux/include/asm-i386/thread_info.h @@ -38,6 +38,7 @@ struct thread_info { 0-0xBFFFFFFF for user-thead 0-0xFFFFFFFF for kernel-thread @@ -1343,10 +1324,10 @@ struct restart_block restart_block; unsigned long previous_esp; /* ESP of the previous stack in case -Index: linux-exec-shield-curr.q/include/asm-ia64/pgalloc.h +Index: linux/include/asm-ia64/pgalloc.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-ia64/pgalloc.h -+++ linux-exec-shield-curr.q/include/asm-ia64/pgalloc.h +--- linux.orig/include/asm-ia64/pgalloc.h ++++ linux/include/asm-ia64/pgalloc.h @@ -1,6 +1,10 @@ #ifndef _ASM_IA64_PGALLOC_H #define _ASM_IA64_PGALLOC_H @@ -1358,10 +1339,10 @@ /* * This file contains the functions and defines necessary to allocate * page tables. -Index: linux-exec-shield-curr.q/include/asm-powerpc/pgalloc.h +Index: linux/include/asm-powerpc/pgalloc.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-powerpc/pgalloc.h -+++ linux-exec-shield-curr.q/include/asm-powerpc/pgalloc.h +--- linux.orig/include/asm-powerpc/pgalloc.h ++++ linux/include/asm-powerpc/pgalloc.h @@ -23,6 +23,11 @@ extern kmem_cache_t *pgtable_cache[]; #define PGD_CACHE_NUM 0 #endif @@ -1374,10 +1355,10 @@ /* * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License -Index: linux-exec-shield-curr.q/include/asm-ppc/pgalloc.h +Index: linux/include/asm-ppc/pgalloc.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-ppc/pgalloc.h -+++ linux-exec-shield-curr.q/include/asm-ppc/pgalloc.h +--- linux.orig/include/asm-ppc/pgalloc.h ++++ linux/include/asm-ppc/pgalloc.h @@ -40,5 +40,10 @@ extern void pte_free(struct page *pte); #define check_pgt_cache() do { } while (0) @@ -1389,10 +1370,10 @@ + #endif /* _PPC_PGALLOC_H */ #endif /* __KERNEL__ */ -Index: linux-exec-shield-curr.q/include/asm-s390/pgalloc.h +Index: linux/include/asm-s390/pgalloc.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-s390/pgalloc.h -+++ linux-exec-shield-curr.q/include/asm-s390/pgalloc.h +--- linux.orig/include/asm-s390/pgalloc.h ++++ linux/include/asm-s390/pgalloc.h @@ -18,6 +18,10 @@ #include #include @@ -1404,10 +1385,10 @@ #define check_pgt_cache() do {} while (0) extern void diag10(unsigned long addr); -Index: linux-exec-shield-curr.q/include/asm-sparc/pgalloc.h +Index: linux/include/asm-sparc/pgalloc.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-sparc/pgalloc.h -+++ linux-exec-shield-curr.q/include/asm-sparc/pgalloc.h +--- linux.orig/include/asm-sparc/pgalloc.h ++++ linux/include/asm-sparc/pgalloc.h @@ -66,4 +66,8 @@ BTFIXUPDEF_CALL(void, pte_free, struct p #define pte_free(pte) BTFIXUP_CALL(pte_free)(pte) #define __pte_free_tlb(tlb, pte) pte_free(pte) @@ -1417,10 +1398,10 @@ +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #endif /* _SPARC_PGALLOC_H */ -Index: linux-exec-shield-curr.q/include/asm-sparc64/pgalloc.h +Index: linux/include/asm-sparc64/pgalloc.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-sparc64/pgalloc.h -+++ linux-exec-shield-curr.q/include/asm-sparc64/pgalloc.h +--- linux.orig/include/asm-sparc64/pgalloc.h ++++ linux/include/asm-sparc64/pgalloc.h @@ -181,4 +181,8 @@ static inline void pte_free(struct page #define pgd_free(pgd) free_pgd_fast(pgd) #define pgd_alloc(mm) get_pgd_fast() @@ -1430,10 +1411,10 @@ +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #endif /* _SPARC64_PGALLOC_H */ -Index: linux-exec-shield-curr.q/include/asm-x86_64/pgalloc.h +Index: linux/include/asm-x86_64/pgalloc.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-x86_64/pgalloc.h -+++ linux-exec-shield-curr.q/include/asm-x86_64/pgalloc.h +--- linux.orig/include/asm-x86_64/pgalloc.h ++++ linux/include/asm-x86_64/pgalloc.h @@ -6,6 +6,13 @@ #include #include @@ -1448,10 +1429,10 @@ #define pmd_populate_kernel(mm, pmd, pte) \ set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte))) #define pud_populate(mm, pud, pmd) \ -Index: linux-exec-shield-curr.q/include/asm-x86_64/pgtable.h +Index: linux/include/asm-x86_64/pgtable.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-x86_64/pgtable.h -+++ linux-exec-shield-curr.q/include/asm-x86_64/pgtable.h +--- linux.orig/include/asm-x86_64/pgtable.h ++++ linux/include/asm-x86_64/pgtable.h @@ -21,7 +21,7 @@ extern unsigned long __supported_pte_mas #define swapper_pg_dir init_level4_pgt @@ -1461,10 +1442,10 @@ extern void paging_init(void); extern void clear_kernel_mapping(unsigned long addr, unsigned long size); -Index: linux-exec-shield-curr.q/include/asm-x86_64/processor.h +Index: linux/include/asm-x86_64/processor.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/asm-x86_64/processor.h -+++ linux-exec-shield-curr.q/include/asm-x86_64/processor.h +--- linux.orig/include/asm-x86_64/processor.h ++++ linux/include/asm-x86_64/processor.h @@ -164,6 +164,11 @@ static inline void clear_in_cr4 (unsigne */ #define TASK_SIZE64 (0x800000000000UL - 4096) @@ -1477,11 +1458,11 @@ /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ -Index: linux-exec-shield-curr.q/include/linux/mm.h +Index: linux/include/linux/mm.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/linux/mm.h -+++ linux-exec-shield-curr.q/include/linux/mm.h -@@ -914,7 +914,19 @@ extern struct vm_area_struct *copy_vma(s +--- linux.orig/include/linux/mm.h ++++ linux/include/linux/mm.h +@@ -914,7 +914,14 @@ extern struct vm_area_struct *copy_vma(s extern void exit_mmap(struct mm_struct *); extern int may_expand_vm(struct mm_struct *mm, unsigned long npages); @@ -1494,15 +1475,10 @@ +{ + return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); +} -+ -+extern int install_special_mapping(struct mm_struct *mm, -+ unsigned long addr, unsigned long len, -+ unsigned long vm_flags, pgprot_t pgprot, -+ struct page **pages); extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, -@@ -966,7 +978,7 @@ unsigned long page_cache_readahead(struc +@@ -966,7 +973,7 @@ unsigned long page_cache_readahead(struc struct file *filp, pgoff_t offset, unsigned long size); @@ -1511,10 +1487,10 @@ struct file_ra_state *ra, pgoff_t offset); unsigned long max_sane_readahead(unsigned long nr); -Index: linux-exec-shield-curr.q/include/linux/resource.h +Index: linux/include/linux/resource.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/linux/resource.h -+++ linux-exec-shield-curr.q/include/linux/resource.h +--- linux.orig/include/linux/resource.h ++++ linux/include/linux/resource.h @@ -52,8 +52,11 @@ struct rlimit { /* * Limit the stack by to some sane default: root can always @@ -1528,10 +1504,10 @@ /* * GPG wants 32kB of mlocked memory, to make sure pass phrases -Index: linux-exec-shield-curr.q/include/linux/sched.h +Index: linux/include/linux/sched.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/linux/sched.h -+++ linux-exec-shield-curr.q/include/linux/sched.h +--- linux.orig/include/linux/sched.h ++++ linux/include/linux/sched.h @@ -39,6 +39,8 @@ #include /* For AT_VECTOR_SIZE */ @@ -1562,10 +1538,10 @@ void (*unmap_area) (struct mm_struct *mm, unsigned long addr); unsigned long mmap_base; /* base of mmap area */ unsigned long cached_hole_size; /* if non-zero, the largest hole below free_area_cache */ -Index: linux-exec-shield-curr.q/include/linux/sysctl.h +Index: linux/include/linux/sysctl.h =================================================================== ---- linux-exec-shield-curr.q.orig/include/linux/sysctl.h -+++ linux-exec-shield-curr.q/include/linux/sysctl.h +--- linux.orig/include/linux/sysctl.h ++++ linux/include/linux/sysctl.h @@ -92,6 +92,9 @@ enum KERN_CAP_BSET=14, /* int: capability bounding set */ @@ -1576,10 +1552,10 @@ KERN_REALROOTDEV=16, /* real root device to mount after initrd */ KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ -Index: linux-exec-shield-curr.q/kernel/signal.c +Index: linux/kernel/signal.c =================================================================== ---- linux-exec-shield-curr.q.orig/kernel/signal.c -+++ linux-exec-shield-curr.q/kernel/signal.c +--- linux.orig/kernel/signal.c ++++ linux/kernel/signal.c @@ -868,6 +868,37 @@ out_set: #define LEGACY_QUEUE(sigptr, sig) \ (((sig) < SIGRTMIN) && sigismember(&(sigptr)->signal, (sig))) @@ -1639,15 +1615,15 @@ if (sig_kernel_coredump(signr)) { /* * If it was able to dump core, this kills all -Index: linux-exec-shield-curr.q/kernel/sysctl.c +Index: linux/kernel/sysctl.c =================================================================== ---- linux-exec-shield-curr.q.orig/kernel/sysctl.c -+++ linux-exec-shield-curr.q/kernel/sysctl.c +--- linux.orig/kernel/sysctl.c ++++ linux/kernel/sysctl.c @@ -77,6 +77,19 @@ extern int proc_unknown_nmi_panic(ctl_ta void __user *, size_t *, loff_t *); #endif -+extern unsigned int vdso_enabled, vdso_populate; ++extern unsigned int vdso_enabled; + +int exec_shield = 1; + @@ -1663,7 +1639,7 @@ /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ static int maxolduid = 65535; static int minolduid; -@@ -280,6 +293,40 @@ static ctl_table kern_table[] = { +@@ -280,6 +293,32 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { @@ -1691,23 +1667,15 @@ + .mode = 0644, + .proc_handler = &proc_dointvec, + }, -+ { -+ .ctl_name = KERN_VDSO, -+ .procname = "vdso_populate", -+ .data = &vdso_populate, -+ .maxlen = sizeof(int), -+ .mode = 0644, -+ .proc_handler = &proc_dointvec, -+ }, +#endif + { .ctl_name = KERN_CORE_USES_PID, .procname = "core_uses_pid", .data = &core_uses_pid, -Index: linux-exec-shield-curr.q/mm/fremap.c +Index: linux/mm/fremap.c =================================================================== ---- linux-exec-shield-curr.q.orig/mm/fremap.c -+++ linux-exec-shield-curr.q/mm/fremap.c +--- linux.orig/mm/fremap.c ++++ linux/mm/fremap.c @@ -67,13 +67,15 @@ int install_page(struct mm_struct *mm, s * caller about it. */ @@ -1731,10 +1699,10 @@ if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte)) inc_mm_counter(mm, file_rss); -Index: linux-exec-shield-curr.q/mm/mmap.c +Index: linux/mm/mmap.c =================================================================== ---- linux-exec-shield-curr.q.orig/mm/mmap.c -+++ linux-exec-shield-curr.q/mm/mmap.c +--- linux.orig/mm/mmap.c ++++ linux/mm/mmap.c @@ -24,6 +24,7 @@ #include #include @@ -1926,92 +1894,10 @@ /* * Walk the list again, actually closing and freeing it, -@@ -2060,3 +2149,81 @@ int may_expand_vm(struct mm_struct *mm, - return 0; - return 1; - } -+ -+ -+static struct page * -+special_mapping_nopage(struct vm_area_struct *vma, -+ unsigned long address, int *type) -+{ -+ struct page **pages; -+ -+ BUG_ON(address < vma->vm_start || address >= vma->vm_end); -+ -+ address -= vma->vm_start; -+ for (pages = vma->vm_private_data; address > 0 && *pages; ++pages) -+ address -= PAGE_SIZE; -+ -+ if (*pages) { -+ get_page(*pages); -+ return *pages; -+ } -+ -+ return NOPAGE_SIGBUS; -+} -+ -+static struct vm_operations_struct special_mapping_vmops = { -+ .nopage = special_mapping_nopage, -+}; -+ -+unsigned int vdso_populate = 1; -+ -+/* -+ * Insert a new vma covering the given region, with the given flags and -+ * protections. Its pages are supplied by the given null-terminated array. -+ * The region past the last page supplied will always produce SIGBUS. -+ * The array pointer and the pages it points to are assumed to stay alive -+ * for as long as this mapping might exist. -+ */ -+int install_special_mapping(struct mm_struct *mm, -+ unsigned long addr, unsigned long len, -+ unsigned long vm_flags, pgprot_t pgprot, -+ struct page **pages) -+{ -+ struct vm_area_struct *vma; -+ int err; -+ -+ vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); -+ if (unlikely(vma == NULL)) -+ return -ENOMEM; -+ memset(vma, 0, sizeof(*vma)); -+ -+ vma->vm_mm = mm; -+ vma->vm_start = addr; -+ vma->vm_end = addr + len; -+ -+ vma->vm_flags = vm_flags; -+ vma->vm_page_prot = pgprot; -+ -+ vma->vm_ops = &special_mapping_vmops; -+ vma->vm_private_data = pages; -+ -+ insert_vm_struct(mm, vma); -+ mm->total_vm += len >> PAGE_SHIFT; -+ -+ if (!vdso_populate) -+ return 0; -+ -+ err = 0; -+ while (*pages) { -+ struct page *page = *pages++; -+ get_page(page); -+ err = install_page(mm, vma, addr, page, vma->vm_page_prot); -+ if (err) { -+ put_page(page); -+ break; -+ } -+ addr += PAGE_SIZE; -+ } -+ -+ return err; -+} -Index: linux-exec-shield-curr.q/mm/mprotect.c +Index: linux/mm/mprotect.c =================================================================== ---- linux-exec-shield-curr.q.orig/mm/mprotect.c -+++ linux-exec-shield-curr.q/mm/mprotect.c +--- linux.orig/mm/mprotect.c ++++ linux/mm/mprotect.c @@ -22,6 +22,7 @@ #include @@ -2038,10 +1924,10 @@ change_protection(vma, start, end, newprot); vm_stat_account(mm, oldflags, vma->vm_file, -nrpages); vm_stat_account(mm, newflags, vma->vm_file, nrpages); -Index: linux-exec-shield-curr.q/mm/mremap.c +Index: linux/mm/mremap.c =================================================================== ---- linux-exec-shield-curr.q.orig/mm/mremap.c -+++ linux-exec-shield-curr.q/mm/mremap.c +--- linux.orig/mm/mremap.c ++++ linux/mm/mremap.c @@ -386,8 +386,8 @@ unsigned long do_mremap(unsigned long ad if (vma->vm_flags & VM_MAYSHARE) map_flags |= MAP_SHARED; @@ -2053,15 +1939,3 @@ ret = new_addr; if (new_addr & ~PAGE_MASK) goto out; - ---- linux-2.6.15/fs/proc/base.c~ 2006-01-09 13:41:33.000000000 -0500 -+++ linux-2.6.15/fs/proc/base.c 2006-01-09 13:41:42.000000000 -0500 -@@ -201,7 +201,7 @@ static struct pid_entry tgid_base_stuff[ - E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), - E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), - #ifdef CONFIG_MMU -- E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUGO), -+ E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUSR), - #endif - #ifdef CONFIG_SECURITY - E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), From fedora-cvs-commits at redhat.com Mon Jan 9 19:24:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 14:24:46 -0500 Subject: rpms/sound-juicer/devel sound-juicer-2.13.1-export-dynamic.patch, NONE, 1.1 sound-juicer.spec, 1.31, 1.32 Message-ID: <200601091924.k09JOkZF004207@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/sound-juicer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4178 Modified Files: sound-juicer.spec Added Files: sound-juicer-2.13.1-export-dynamic.patch Log Message: - Add a patch that adds -Wl,--export-dynamic to the build sound-juicer-2.13.1-export-dynamic.patch: Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE sound-juicer-2.13.1-export-dynamic.patch --- --- sound-juicer-2.13.1/src/Makefile.am.export-dynamic 2005-10-03 12:49:35.000000000 -0400 +++ sound-juicer-2.13.1/src/Makefile.am 2006-01-09 14:14:44.000000000 -0500 @@ -13,8 +13,8 @@ -DPIXMAPDIR=\""$(datadir)/pixmaps"\" \ -DPKGDATADIR=\""$(datadir)/sound-juicer"\" \ @MUSICBRAINZ_CFLAGS@ @GSTREAMER_CFLAGS@ \ - @MEDIA_PROFILES_CFLAGS@ @BURN_CFLAGS@ @UI_CFLAGS@ - + @MEDIA_PROFILES_CFLAGS@ @BURN_CFLAGS@ @UI_CFLAGS@ \ + -Wl,--export-dynamic # We always build Sound Juicer bin_PROGRAMS = sound-juicer Index: sound-juicer.spec =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sound-juicer.spec 5 Jan 2006 23:24:00 -0000 1.31 +++ sound-juicer.spec 9 Jan 2006 19:24:44 -0000 1.32 @@ -13,10 +13,11 @@ Name: sound-juicer Summary: Clean and lean CD ripper Version: 2.13.1 -Release: 3 +Release: 4 License: GPL Group: Applications/Multimedia Source: %{name}-%{version}.tar.bz2 +Patch0: sound-juicer-2.13.1-export-dynamic.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: libmusicbrainz >= %{libmusicbrainz_version} Requires: libgnomeui >= %{libgnomeui_version} @@ -50,8 +51,9 @@ GStreamer-based CD ripping tool. Saves audio CDs to Ogg/vorbis. %prep - %setup -q +%patch0 -p1 -d .export-dynamic +autoreconf %build @@ -91,6 +93,9 @@ %{_datadir}/omf/sound-juicer %changelog +* Mon Jan 09 2006 John (J5) Palmieir 2.13.1-4 +- Add a patch that adds -Wl,--export-dynamic to the build + * Thu Jan 05 2006 John (J5) Palmieir 2.13.1-3 - GStreamer has been split into gstreamer08 and gstreamer (0.10) packages we need gstreamer08 for now From fedora-cvs-commits at redhat.com Mon Jan 9 19:25:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 14:25:59 -0500 Subject: rpms/postgresql/FC-4 .cvsignore, 1.25, 1.26 postgresql.spec, 1.53, 1.54 sources, 1.26, 1.27 Message-ID: <200601091925.k09JPxeY004318@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/postgresql/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv4300 Modified Files: .cvsignore postgresql.spec sources Log Message: Update to PostgreSQL 8.0.6. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/postgresql/FC-4/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 17 Dec 2005 03:41:52 -0000 1.25 +++ .cvsignore 9 Jan 2006 19:25:56 -0000 1.26 @@ -1,4 +1,4 @@ -postgresql-8.0.5.tar.bz2 +postgresql-8.0.6.tar.bz2 PyGreSQL-3.6.2.tgz pgtcl1.5.2.tar.gz pgtcldocs-20041108.zip Index: postgresql.spec =================================================================== RCS file: /cvs/dist/rpms/postgresql/FC-4/postgresql.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- postgresql.spec 17 Dec 2005 03:41:52 -0000 1.53 +++ postgresql.spec 9 Jan 2006 19:25:56 -0000 1.54 @@ -42,7 +42,7 @@ Summary: PostgreSQL client programs and libraries. Name: postgresql -Version: 8.0.5 +Version: 8.0.6 # Conventions for PostgreSQL Global Development Group RPM releases: @@ -829,6 +829,9 @@ %endif %changelog +* Mon Jan 9 2006 Tom Lane 8.0.6-1.FC4.1 +- Update to PostgreSQL 8.0.6 + * Fri Dec 16 2005 Tom Lane 8.0.5-1.FC4.1 - Update to PostgreSQL 8.0.5 and jdbc driver build 314 - Fix PAM config file (must have account not only auth) (bug #167040) Index: sources =================================================================== RCS file: /cvs/dist/rpms/postgresql/FC-4/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 17 Dec 2005 03:41:52 -0000 1.26 +++ sources 9 Jan 2006 19:25:56 -0000 1.27 @@ -1,4 +1,4 @@ -70704954d52cd79d1882807847ed0106 postgresql-8.0.5.tar.bz2 +f3b27b8171267f9a87592f931c09f0ee postgresql-8.0.6.tar.bz2 1f2694ea546c852c5a0ba2b17f7c5ce1 PyGreSQL-3.6.2.tgz d19dfdcb54c334495d32456a043e0232 pgtcl1.5.2.tar.gz 3d504b46231914d61fd49175f67e8715 pgtcldocs-20041108.zip From fedora-cvs-commits at redhat.com Mon Jan 9 19:26:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 14:26:18 -0500 Subject: rpms/sound-juicer/devel sound-juicer.spec,1.32,1.33 Message-ID: <200601091926.k09JQII8004370@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/sound-juicer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4311 Modified Files: sound-juicer.spec Log Message: - fix up patch line typo Index: sound-juicer.spec =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sound-juicer.spec 9 Jan 2006 19:24:44 -0000 1.32 +++ sound-juicer.spec 9 Jan 2006 19:26:16 -0000 1.33 @@ -52,7 +52,7 @@ %prep %setup -q -%patch0 -p1 -d .export-dynamic +%patch0 -p1 -b .export-dynamic autoreconf %build From fedora-cvs-commits at redhat.com Mon Jan 9 19:26:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 14:26:58 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1835,1.1836 Message-ID: <200601091926.k09JQwXh004430@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4416 Modified Files: kernel-2.6.spec Log Message: add es fixes to spec. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1835 retrieving revision 1.1836 diff -u -r1.1835 -r1.1836 --- kernel-2.6.spec 9 Jan 2006 19:24:08 -0000 1.1835 +++ kernel-2.6.spec 9 Jan 2006 19:26:55 -0000 1.1836 @@ -265,6 +265,7 @@ Patch811: linux-2.6-execshield-xen.patch Patch812: linux-2.6-execshield-vdso.patch Patch813: linux-2.6-xen-vdso-note.patch +Patch814: linux-2.6-execshield-fixes.patch # Module signing infrastructure. Patch900: linux-2.6-modsign-core.patch @@ -712,6 +713,9 @@ %patch813 -p1 %endif +# Final small execshield fixes. +%patch814 -p1 + # # GPG signed kernel modules # From fedora-cvs-commits at redhat.com Mon Jan 9 19:27:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 14:27:42 -0500 Subject: rpms/gdm/devel gdm-2.13.0.4-change-defaults.patch, 1.1, 1.2 gdm.spec, 1.109, 1.110 Message-ID: <200601091927.k09JRgpw004474@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4460 Modified Files: gdm-2.13.0.4-change-defaults.patch gdm.spec Log Message: - use xinit Xsession again. gdm-2.13.0.4-change-defaults.patch: gdm.conf.in | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) Index: gdm-2.13.0.4-change-defaults.patch =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.13.0.4-change-defaults.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gdm-2.13.0.4-change-defaults.patch 9 Jan 2006 10:06:50 -0000 1.1 +++ gdm-2.13.0.4-change-defaults.patch 9 Jan 2006 19:27:38 -0000 1.2 @@ -1,5 +1,5 @@ --- gdm-2.13.0.4/config/gdm.conf.in.change-defaults 2005-12-20 21:22:36.000000000 -0500 -+++ gdm-2.13.0.4/config/gdm.conf.in 2006-01-08 23:12:51.000000000 -0500 ++++ gdm-2.13.0.4/config/gdm.conf.in 2006-01-09 14:03:14.000000000 -0500 @@ -59,9 +59,9 @@ TimedLoginDelay=30 # should leave this alone. #Chooser=@EXPANDED_LIBEXECDIR@/gdmchooser @@ -27,7 +27,7 @@ # If you are having trouble with using a single server for a long time and want # GDM to kill/restart the server, turn this on. On Solaris, this value is -@@ -116,8 +116,8 @@ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm +@@ -116,22 +116,22 @@ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing # Reboot, Halt and suspend commands, you can add different commands separated # by a semicolon. GDM will use the first one it can find. @@ -38,7 +38,14 @@ #SuspendCommand=@SUSPEND_COMMAND@ # Probably should not touch the below this is the standard setup. ServAuthDir=@EXPANDED_AUTHDIR@ -@@ -131,7 +131,7 @@ BaseXsession=@EXPANDED_SYSCONFDIR@/gdm/X + # This is our standard startup script. A bit different from a normal X + # session, but it shares a lot of stuff with that. See the provided default + # for more information. +-BaseXsession=@EXPANDED_SYSCONFDIR@/gdm/Xsession ++BaseXsession=/etc/X11/xinit/Xsession + # This is a directory where .desktop files describing the sessions live. It is + # really a PATH style variable since 2.4.4.2 to allow actual interoperability + # with KDM. Note that /dm/Sessions is there for backwards # compatibility reasons with 2.4.4.x. #SessionDesktopDir=/etc/X11/sessions/:@EXPANDED_SYSCONFDIR@/dm/Sessions/:@EXPANDED_DATADIR@/gdm/BuiltInSessions/:@EXPANDED_DATADIR@/xsessions/ # This is the default .desktop session. One of the ones in SessionDesktopDir Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- gdm.spec 9 Jan 2006 10:08:13 -0000 1.109 +++ gdm.spec 9 Jan 2006 19:27:38 -0000 1.110 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager. Name: gdm Version: 2.13.0.4 -Release: 1 +Release: 2 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -153,6 +153,10 @@ # create log dir mkdir -p $RPM_BUILD_ROOT/var/log/gdm +# remove the gdm Xsession as we're using the xdm one +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Xsession +(cd $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm; ln -sf ../xinit/Xsession .) + rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.la @@ -275,6 +279,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Mon Jan 9 2006 Ray Strode - 1:2.13.0.4-2 +- use xinit Xsession again. + * Mon Jan 9 2006 Ray Strode - 1:2.13.0.4-1 - update to 2.13.0.4 From fedora-cvs-commits at redhat.com Mon Jan 9 19:34:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 14:34:55 -0500 Subject: rpms/gnucash/devel .cvsignore, 1.12.2.1, 1.12.2.2 gnucash.spec, 1.18.2.3, 1.18.2.4 sources, 1.12.2.1, 1.12.2.2 Message-ID: <200601091934.k09JYtKm004781@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4765 Modified Files: Tag: gnucash-g2-branch .cvsignore gnucash.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/.cvsignore,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -u -r1.12.2.1 -r1.12.2.2 --- .cvsignore 7 Jan 2006 04:21:21 -0000 1.12.2.1 +++ .cvsignore 9 Jan 2006 19:34:53 -0000 1.12.2.2 @@ -2,3 +2,5 @@ gnucash-docs-1.8.5.tar.gz gnucash-docs-1.9.0.svn12279.tar.gz gnucash-1.9.0.svn12279.tar.gz +gnucash-1.9.0.svn12307.tar.bz2 +gnucash-docs-1.9.0.svn12307.tar.bz2 Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.18.2.3 retrieving revision 1.18.2.4 diff -u -r1.18.2.3 -r1.18.2.4 --- gnucash.spec 7 Jan 2006 05:18:51 -0000 1.18.2.3 +++ gnucash.spec 9 Jan 2006 19:34:53 -0000 1.18.2.4 @@ -1,6 +1,4 @@ -%define docver 1.9.0.svn12279 - -%define svnrev 12279 +%define svnrev 12307 Name: gnucash Summary: GnuCash is an application to keep track of your finances. @@ -10,8 +8,8 @@ Group: Applications/Productivity #Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz #Source1: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-docs-%{docver}.tar.gz -Source: gnucash-%{version}.svn%{svnrev}.tar.gz -Source1: gnucash-docs-%{docver}.tar.gz +Source: gnucash-%{version}.svn%{svnrev}.tar.bz2 +Source1: gnucash-docs-1.9.0.svn%{svnrev}.tar.bz2 Patch3: gnucash-1.8.11-icon.patch Patch4: gnucash-1.8.6-64bit-fixes.patch Patch5: gnucash-1.8.12-aq.patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/sources,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -u -r1.12.2.1 -r1.12.2.2 --- sources 7 Jan 2006 04:21:21 -0000 1.12.2.1 +++ sources 9 Jan 2006 19:34:53 -0000 1.12.2.2 @@ -1,2 +1,2 @@ -d8e816b84ec5c58e4e7b45e8f39d5573 gnucash-docs-1.9.0.svn12279.tar.gz -a585938158130ca5432e05be165982bd gnucash-1.9.0.svn12279.tar.gz +3b2ae4ffe3e02d6eed1bd36a07ee00c6 gnucash-1.9.0.svn12307.tar.bz2 +fc046ff6b7cf5e7906d8210fcdb85bc4 gnucash-docs-1.9.0.svn12307.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 9 19:36:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 14:36:59 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1836,1.1837 Message-ID: <200601091936.k09Jax1j004926@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4868 Modified Files: kernel-2.6.spec Log Message: ppc32 broke include/linux/mm.h:450:2: error: #error SECTIONS_WIDTH+NODES_WIDTH+ZONES_WIDTH > FLAGS_RESERVED Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1836 retrieving revision 1.1837 diff -u -r1.1836 -r1.1837 --- kernel-2.6.spec 9 Jan 2006 19:26:55 -0000 1.1836 +++ kernel-2.6.spec 9 Jan 2006 19:36:56 -0000 1.1837 @@ -155,7 +155,8 @@ License: GPLv2 Version: %{rpmversion} Release: %{release} -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 From fedora-cvs-commits at redhat.com Mon Jan 9 19:54:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 14:54:41 -0500 Subject: rpms/avahi/devel avahi-0.6.3-bz177148.patch, NONE, 1.1 avahi.spec, 1.22, 1.23 Message-ID: <200601091954.k09Jsfj1024748@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24709 Modified Files: avahi.spec Added Files: avahi-0.6.3-bz177148.patch Log Message: Upgrade to 0.6.3; fix bug 177148 avahi-0.6.3-bz177148.patch: avahi-daemon | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE avahi-0.6.3-bz177148.patch --- --- avahi-0.6.3/initscript/fedora/avahi-daemon.bz177148 2006-01-09 11:21:07.834745000 -0500 +++ avahi-0.6.3/initscript/fedora/avahi-daemon 2006-01-09 14:51:54.115520000 -0500 @@ -27,6 +27,11 @@ start() { echo -n $"Starting Avahi daemon... " + if [ -f /var/run/avahi-daemon/pid ] && avpid=`cat /var/run/avahi-daemon/pid` && [ -d /proc/$avpid ] && [ `readlink /proc/$avpid/exe` = '/usr/sbin/avahi-daemon' ]; then + success; + echo; + return 0; + fi; $AVAHI_BIN -D RETVAL=$? [ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup" Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- avahi.spec 9 Jan 2006 16:25:30 -0000 1.22 +++ avahi.spec 9 Jan 2006 19:54:38 -0000 1.23 @@ -14,6 +14,7 @@ Patch2: avahi-0.5.2-start_after_dbus.patch Patch3: avahi-0.6-initscript_status.patch Patch4: avahi-0.6-dbus-0.6.patch +Patch5: avahi-0.6.3-bz177148.patch %description Avahi is a system which facilitates service discovery on @@ -92,6 +93,7 @@ %patch3 -p1 -b .initscript_status #%patch4 -p1 -b .dbus-0.6 #^- this patch now upstream +%patch5 -p1 -b .bz177148 %build # auto* update needed for avahi-0.5.2-fedora.patch @@ -248,7 +250,8 @@ %changelog * Mon Jan 09 2006 Jason Vas Dias - 0.6.3-1 - Upgrade to upstream version 0.6.3 - +- fix bug 177148: initscript start should not fail if avahi-daemon running + * Thu Dec 22 2005 Jason Vas Dias - 0.6.1-3 - move initscripts from /etc/init.d to /etc/rc.d/init.d From fedora-cvs-commits at redhat.com Mon Jan 9 20:01:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:01:26 -0500 Subject: rpms/avahi/devel avahi-0.6.3-bz177148.patch,1.1,1.2 Message-ID: <200601092001.k09K1PTD027363@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27289 Modified Files: avahi-0.6.3-bz177148.patch Log Message: Upgrade to 0.6.3; fix bug 177148 avahi-0.6.3-bz177148.patch: avahi-daemon.in | 5 +++++ 1 files changed, 5 insertions(+) Index: avahi-0.6.3-bz177148.patch =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi-0.6.3-bz177148.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avahi-0.6.3-bz177148.patch 9 Jan 2006 19:54:38 -0000 1.1 +++ avahi-0.6.3-bz177148.patch 9 Jan 2006 20:00:56 -0000 1.2 @@ -1,5 +1,5 @@ ---- avahi-0.6.3/initscript/fedora/avahi-daemon.bz177148 2006-01-09 11:21:07.834745000 -0500 -+++ avahi-0.6.3/initscript/fedora/avahi-daemon 2006-01-09 14:51:54.115520000 -0500 +--- avahi-0.6.3/initscript/fedora/avahi-daemon.in.bz177148 2006-01-09 14:57:41.767520000 -0500 ++++ avahi-0.6.3/initscript/fedora/avahi-daemon.in 2006-01-09 14:59:40.580588000 -0500 @@ -27,6 +27,11 @@ start() { From fedora-cvs-commits at redhat.com Mon Jan 9 20:14:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:14:21 -0500 Subject: rpms/selinux-policy/devel modules-targeted.conf, 1.10, 1.11 policy-20060104.patch, 1.4, 1.5 selinux-policy.spec, 1.77, 1.78 policy-20051208.patch, 1.36, NONE Message-ID: <200601092014.k09KELqG031353@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31318 Modified Files: modules-targeted.conf policy-20060104.patch selinux-policy.spec Removed Files: policy-20051208.patch Log Message: * Mon Jan 9 2006 Dan Walsh 2.1.8-1 - Update to upstream Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- modules-targeted.conf 6 Jan 2006 01:03:59 -0000 1.10 +++ modules-targeted.conf 9 Jan 2006 20:14:17 -0000 1.11 @@ -993,3 +993,11 @@ # logwatch executable # logwatch = base + +# Layer: apps +# Module: wine +# +# wine executable +# +wine = base + policy-20060104.patch: Makefile | 2 policy/modules/admin/amanda.te | 4 policy/modules/admin/consoletype.te | 1 policy/modules/admin/netutils.te | 1 policy/modules/admin/su.if | 2 policy/modules/admin/vpn.te | 7 + policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 +++++ policy/modules/apps/java.te | 25 ++++++ policy/modules/apps/wine.fc | 2 policy/modules/apps/wine.if | 23 +++++ policy/modules/apps/wine.te | 27 ++++++ policy/modules/kernel/corecommands.te | 6 + policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.if | 17 ++++ policy/modules/kernel/kernel.if | 21 +++++ policy/modules/kernel/kernel.te | 5 + policy/modules/kernel/mls.te | 2 policy/modules/services/apache.te | 9 ++ policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 9 +- policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 32 +------ policy/modules/services/cups.te | 6 - policy/modules/services/dovecot.te | 1 policy/modules/services/hal.fc | 1 policy/modules/services/hal.te | 4 policy/modules/services/irqbalance.te | 1 policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 ++++++++++++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 107 +++++++++++++++++++++++++ policy/modules/services/mta.te | 13 +++ policy/modules/services/networkmanager.te | 10 +- policy/modules/services/nscd.te | 1 policy/modules/services/ntp.te | 2 policy/modules/services/portmap.te | 1 policy/modules/services/prelink.fc | 7 + policy/modules/services/prelink.if | 39 +++++++++ policy/modules/services/prelink.te | 64 +++++++++++++++ policy/modules/services/rpc.te | 1 policy/modules/services/samba.if | 2 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.te | 1 policy/modules/system/clock.te | 1 policy/modules/system/fstools.te | 4 policy/modules/system/hostname.te | 38 +-------- policy/modules/system/init.te | 16 --- policy/modules/system/libraries.fc | 125 +++++++++++++++--------------- policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 1 policy/modules/system/logging.te | 4 policy/modules/system/lvm.te | 2 policy/modules/system/mount.te | 4 policy/modules/system/selinuxutil.te | 5 - policy/modules/system/sysnetwork.te | 2 policy/modules/system/unconfined.te | 12 +- policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 66 +++++++++++---- policy/modules/system/userdomain.te | 1 policy/users | 8 + 64 files changed, 673 insertions(+), 175 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.4 -r 1.5 policy-20060104.patch Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- policy-20060104.patch 6 Jan 2006 13:56:31 -0000 1.4 +++ policy-20060104.patch 9 Jan 2006 20:14:17 -0000 1.5 @@ -1,51 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mcs/default_type serefpolicy-2.1.7/config/appconfig-strict-mcs/default_type ---- nsaserefpolicy/config/appconfig-strict-mcs/default_type 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-strict-mcs/default_type 2006-01-05 11:12:20.000000000 -0500 -@@ -1,3 +1,3 @@ --sysadm_r:sysadm_t:s0 --staff_r:staff_t:s0 --user_r:user_t:s0 -+sysadm_r:sysadm_t -+staff_r:staff_t -+user_r:user_t -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/default_type serefpolicy-2.1.7/config/appconfig-strict-mls/default_type ---- nsaserefpolicy/config/appconfig-strict-mls/default_type 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-strict-mls/default_type 2006-01-05 11:12:20.000000000 -0500 -@@ -1,3 +1,4 @@ --sysadm_r:sysadm_t:s0 --staff_r:staff_t:s0 --user_r:user_t:s0 -+sysadm_r:sysadm_t -+secadm_r:secadm_t -+staff_r:staff_t -+user_r:user_t -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-strict-mls/initrc_context serefpolicy-2.1.7/config/appconfig-strict-mls/initrc_context ---- nsaserefpolicy/config/appconfig-strict-mls/initrc_context 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-strict-mls/initrc_context 2006-01-05 11:12:20.000000000 -0500 -@@ -1 +1 @@ --system_u:system_r:initrc_t:s0 -+system_u:system_r:initrc_t:s0-s15:c0.c255 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mcs/default_type serefpolicy-2.1.7/config/appconfig-targeted-mcs/default_type ---- nsaserefpolicy/config/appconfig-targeted-mcs/default_type 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-targeted-mcs/default_type 2006-01-05 11:12:20.000000000 -0500 -@@ -1 +1 @@ --system_r:unconfined_t:s0 -+system_r:unconfined_t -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mls/default_type serefpolicy-2.1.7/config/appconfig-targeted-mls/default_type ---- nsaserefpolicy/config/appconfig-targeted-mls/default_type 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-targeted-mls/default_type 2006-01-05 11:12:20.000000000 -0500 -@@ -1 +1 @@ --system_r:unconfined_t:s0 -+system_r:unconfined_t -diff --exclude-from=exclude -N -u -r nsaserefpolicy/config/appconfig-targeted-mls/initrc_context serefpolicy-2.1.7/config/appconfig-targeted-mls/initrc_context ---- nsaserefpolicy/config/appconfig-targeted-mls/initrc_context 2005-11-14 18:24:05.000000000 -0500 -+++ serefpolicy-2.1.7/config/appconfig-targeted-mls/initrc_context 2006-01-05 11:12:20.000000000 -0500 -@@ -1 +1 @@ --user_u:system_r:unconfined_t:s0 -+user_u:system_r:unconfined_t:s0-s15:c0.c255 -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.7/Makefile +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.8/Makefile --- nsaserefpolicy/Makefile 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/Makefile 2006-01-05 11:12:20.000000000 -0500 ++++ serefpolicy-2.1.8/Makefile 2006-01-09 13:10:33.000000000 -0500 @@ -92,7 +92,7 @@ # enable MLS if requested. @@ -55,1246 +10,9 @@ override CHECKPOLICY += -M override CHECKMODULE += -M endif -diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-2.1.7/man/man8/ftpd_selinux.8 ---- nsaserefpolicy/man/man8/ftpd_selinux.8 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/man/man8/ftpd_selinux.8 2006-01-05 11:12:20.000000000 -0500 -@@ -0,0 +1,56 @@ -+.TH "ftpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "ftpd Selinux Policy documentation" -+.SH "NAME" -+ftpd_selinux \- Security Enhanced Linux Policy for the ftp daemon -+.SH "DESCRIPTION" -+ -+Security-Enhanced Linux secures the ftpd server via flexible mandatory access -+control. -+.SH FILE_CONTEXTS -+SELinux requires files to have an extended attribute to define the file type. -+Policy governs the access daemons have to these files. -+If you want to share files anonymously, you must label the files and directories public_content_t. So if you created a special directory /var/ftp, you would need to label the directory with the chcon tool. -+.TP -+chcon -R -t public_content_t /var/ftp -+.TP -+If you want to setup a directory where you can upload files to you must label the files and directories ftpd_anon_rw_t. So if you created a special directory /var/ftp/incoming, you would need to label the directory with the chcon tool. -+.TP -+chcon -t public_content_rw_t /var/ftp/incoming -+.TP -+You must also turn on the boolean allow_ftp_anon_write. -+.TP -+setsebool -P allow_ftp_anon_write=1 -+.TP -+If you want to make this permanant, i.e. survive a relabel, you must add an entry to the file_contexts.local file. -+.TP -+/etc/selinux/POLICYTYPE/contexts/files/file_contexts.local -+.br -+/var/ftp(/.*)? system_u:object_r:public_content_t -+/var/ftp/incoming(/.*)? system_u:object_r:public_content_rw_t -+ -+.SH BOOLEANS -+SELinux ftp daemon policy is customizable based on least access required. So by -+default SElinux does not allow users to login and read their home directories. -+.br -+If you are setting up this machine as a ftpd server and wish to allow users to access their home -+directorories, you need to set the ftp_home_dir boolean. -+.TP -+setsebool -P ftp_home_dir 1 -+.TP -+ftpd can run either as a standalone daemon or as part of the xinetd domain. If you want to run ftpd as a daemon you must set the ftpd_is_daemon boolean. -+.TP -+setsebool -P ftpd_is_daemon 1 -+.TP -+You can disable SELinux protection for the ftpd daemon by executing: -+.TP -+setsebool -P ftpd_disable_trans 1 -+.br -+service vsftpd restart -+.TP -+system-config-securitylevel is a GUI tool available to customize SELinux policy settings. -+.SH AUTHOR -+This manual page was written by Dan Walsh . -+ -+.SH "SEE ALSO" -+selinux(8), ftpd(8), chcon(1), setsebool(8) -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/httpd_selinux.8 serefpolicy-2.1.7/man/man8/httpd_selinux.8 ---- nsaserefpolicy/man/man8/httpd_selinux.8 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.7/man/man8/httpd_selinux.8 2006-01-05 11:12:20.000000000 -0500 -@@ -0,0 +1,123 @@ -+.TH "httpd_selinux" "8" "17 Jan 2005" "dwalsh at redhat.com" "httpd Selinux Policy documentation" -+.SH "NAME" -+httpd_selinux \- Security Enhanced Linux Policy for the httpd daemon -+.SH "DESCRIPTION" -+ -+Security-Enhanced Linux secures the httpd server via flexible mandatory access -+control. -+.SH FILE_CONTEXTS -+SELinux requires files to have an extended attribute to define the file type. -+Policy governs the access daemons have to these files. -+SELinux httpd policy is very flexible allowing users to setup their web services in as secure a method as possible. -+.TP -+The following file contexts types are defined for httpd: -+.br -+ -+httpd_sys_content_t -+.br -+- Set files with httpd_sys_content_t for content which is available from all httpd scripts and the daemon. -+.br -+ -+httpd_sys_script_exec_t -+.br -+- Set cgi scripts with httpd_sys_script_exec_t to allow them to run with access to all sys types. -+.br -+ -+httpd_sys_script_ro_t -+.br -+- Set files with httpd_sys_script_ro_t if you want httpd_sys_script_exec_t scripts to read the data, and disallow other sys scripts from access. -+.br -+ -+httpd_sys_script_rw_t -+.br -+- Set files with httpd_sys_script_rw_t if you want httpd_sys_script_exec_t scripts to read/write the data, and disallow other non sys scripts from access. -+.br -+ -+httpd_sys_script_ra_t -+.br -+- Set files with httpd_sys_script_ra_t if you want httpd_sys_script_exec_t scripts to read/append to the file, and disallow other non sys scripts from access. -+ -+httpd_unconfined_script_exec_t -+.br -+- Set cgi scripts with httpd_unconfined_script_exec_t to allow them to run without any SELinux protection. This should only be used for a very complex httpd scripts, after exhausting all other options. It is better to use this script rather than turning off SELinux protection for httpd. -+.br -+ -+.SH NOTE -+With certain policies you can define addional file contexts based on roles like user or staff. httpd_user_script_exec_t can be defined where it would only have access to "user" contexts. -+ -+.SH SHARING FILES -+If you want to share files with multiple domains (Apache, FTP, rsync, Samba), you can set a file context of public_content_t and public_content_rw_t. These context allow any of the above domains to read the content. If you want a particular domain to write to the public_content_rw_t domain, you must set the appropriate boolean. allow_DOMAIN_anon_write. So for httpd you would execute: -+ -+setsebool -P allow_httpd_anon_write=1 -+ -+or -+ -+setsebool -P allow_httpd_sys_script_anon_write=1 -+ -+.SH BOOLEANS -+SELinux policy is customizable based on least access required. So by -+default SElinux prevents certain http scripts from working. httpd policy is extremely flexible and has several booleans that allow you to manipulate the policy and run httpd with the tightest access possible. -+.TP -+httpd can be setup to allow cgi scripts to be executed, set httpd_enable_cgi to allow this -+.br -+ -+setsebool -P httpd_enable_cgi 1 -+ -+.TP -+httpd by default is not allowed to access users home directories. If you want to allow access to users home directories you need to set the httpd_enable_homedirs boolean and change the context of the files that you want people to access off the home dir. -+.br -+ -+setsebool -P httpd_enable_homedirs 1 [...3387 lines suppressed...] ---- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-04 17:28:53.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/userdomain.if 2006-01-05 17:30:57.000000000 -0500 -@@ -572,6 +572,7 @@ - corenet_dontaudit_tcp_bind_all_reserved_ports($1_t) - - files_read_etc_files($1_t) -+ files_read_etc_runtime_files($1_t) - files_list_home($1_t) - files_read_usr_files($1_t) - files_exec_usr_files($1_t) -@@ -1885,6 +1886,11 @@ - ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.8/policy/modules/system/userdomain.if +--- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-09 11:32:54.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/userdomain.if 2006-01-09 13:10:33.000000000 -0500 +@@ -1881,19 +1881,16 @@ + ## + # + interface(`userdom_dontaudit_getattr_sysadm_home_dir',` +- ifdef(`targeted_policy',` +- gen_require(` +- type user_home_dir_t; +- ') ++ gen_require(` ++ type sysadm_home_dir_t; ++ ') - dontaudit $1 sysadm_home_dir_t:dir getattr; +- dontaudit $1 user_home_dir_t:dir getattr; +- ', ` +- gen_require(` +- type sysadm_home_dir_t; +- ') ++ dontaudit $1 sysadm_home_dir_t:dir getattr; + +ifdef(`targeted_policy', ` + userdom_dontaudit_getattr_user_home_dirs($1) +') -+ + +- dontaudit $1 sysadm_home_dir_t:dir getattr; +- ') ') ######################################## -@@ -1918,6 +1924,10 @@ +@@ -1922,19 +1919,15 @@ + ## + # + interface(`userdom_dontaudit_search_sysadm_home_dir',` +- ifdef(`targeted_policy',` + gen_require(` +- type user_home_dir_t; ++ type sysadm_home_dir_t; ') - dontaudit $1 sysadm_home_dir_t:dir search_dir_perms; -+ +- dontaudit $1 user_home_dir_t:dir search_dir_perms; +- ',` +- gen_require(` +- type sysadm_home_dir_t; +- ') ++ dontaudit $1 sysadm_home_dir_t:dir search_dir_perms; + +- dontaudit $1 sysadm_home_dir_t:dir search_dir_perms; +- ') +ifdef(`targeted_policy', ` + userdom_dontaudit_search_user_home_dirs($1) +') ') ######################################## -@@ -2057,6 +2067,22 @@ +@@ -2074,6 +2067,22 @@ ######################################## ## @@ -3620,7 +1602,7 @@ ## Read all files in all users home directories. ## ## -@@ -2648,6 +2674,23 @@ +@@ -2665,6 +2674,23 @@ ######################################## ## @@ -3644,66 +1626,10 @@ ## Send general signals to all user domains. ## ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.1.7/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-04 17:28:53.000000000 -0500 -+++ serefpolicy-2.1.7/policy/modules/system/userdomain.te 2006-01-05 11:12:20.000000000 -0500 -@@ -2,7 +2,7 @@ - policy_module(userdomain,1.1.1) - - gen_require(` -- role sysadm_r, staff_r, user_r; -+ role sysadm_r, staff_r, user_r, secadm_r; - ') - - ######################################## -@@ -82,10 +82,14 @@ - # dont need to use the full role_change() - allow sysadm_r system_r; - allow sysadm_r user_r; -+ allow secadm_r system_r; -+ allow secadm_r user_r; - allow user_r system_r; - allow user_r sysadm_r; - allow system_r sysadm_r; - allow system_r sysadm_r; -+ allow user_r secadm_r; -+ allow staff_r secadm_r; - - allow privhome user_home_t:dir manage_dir_perms; - allow privhome user_home_t:file create_file_perms; -@@ -99,8 +103,10 @@ - optional_policy(`samba',` - samba_per_userdomain_template(user) - ') -+ - ',` - admin_user_template(sysadm) -+ admin_user_template(secadm) - unpriv_user_template(staff) - unpriv_user_template(user) - -@@ -111,6 +117,7 @@ - - # only staff_r can change to sysadm_r - role_change(staff, sysadm) -+ role_change(staff, secadm) - - # this should be tunable_policy, but - # currently type_change and RBAC allow -@@ -143,6 +150,12 @@ - domain_ptrace_all_domains(sysadm_t) - ') - -+ mls_process_read_up(sysadm_t) -+ -+ optional_policy(`logging',` -+ logging_read_auditd_log(sysadm_t) -+ ') -+ - optional_policy(`amanda',` - amanda_run_recover(sysadm_t,sysadm_r,admin_terminal) - ') -@@ -192,6 +205,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.1.8/policy/modules/system/userdomain.te +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-09 11:32:54.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/userdomain.te 2006-01-09 13:10:33.000000000 -0500 +@@ -205,6 +205,7 @@ optional_policy(`hostname',` hostname_run(sysadm_t,sysadm_r,admin_terminal) @@ -3711,15 +1637,9 @@ ') optional_policy(`ipsec',` -@@ -315,4 +329,5 @@ - optional_policy(`webalizer',` - webalizer_run(sysadm_t,sysadm_r,admin_terminal) - ') -+ - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.7/policy/users +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.8/policy/users --- nsaserefpolicy/policy/users 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.7/policy/users 2006-01-05 11:12:20.000000000 -0500 ++++ serefpolicy-2.1.8/policy/users 2006-01-09 13:10:33.000000000 -0500 @@ -26,7 +26,9 @@ ifdef(`targeted_policy',` gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) @@ -3742,23 +1662,3 @@ + gen_user(root, sysadm_r staff_r secadm_r , s0, s0 - s15:c0.c255, c0.c255) ') ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Rules.modular serefpolicy-2.1.7/Rules.modular ---- nsaserefpolicy/Rules.modular 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.7/Rules.modular 2006-01-05 11:12:20.000000000 -0500 -@@ -170,6 +170,16 @@ - - ######################################## - # -+# Remove the dontaudit rules from the base.conf -+# -+enableaudit: base.conf -+ @test -d tmp || mkdir -p tmp -+ @echo "Removing dontaudit rules from base.conf" -+ $(QUIET) grep -v dontaudit base.conf > tmp/base.audit -+ $(QUIET) mv tmp/base.audit base.conf -+ -+######################################## -+# - # Appconfig files - # - $(APPDIR)/customizable_types: base.conf Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- selinux-policy.spec 6 Jan 2006 01:04:12 -0000 1.77 +++ selinux-policy.spec 9 Jan 2006 20:14:17 -0000 1.78 @@ -6,8 +6,8 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.1.7 -Release: 3 +Version: 2.1.8 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -262,7 +262,13 @@ %endif %changelog -* Thu Jan 5 2006 Dan Walsh 2.1.7-3 +* Mon Jan 9 2006 Dan Walsh 2.1.8-1 +- Update to upstream + +* Fri Jan 7 2006 Dan Walsh 2.1.7-4 +- Add wine and fix hal problems + +* Thu Jan 6 2006 Dan Walsh 2.1.7-3 - Handle new location of hal scripts * Thu Jan 5 2006 Dan Walsh 2.1.7-2 --- policy-20051208.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 20:18:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:18:01 -0500 Subject: rpms/nfs-utils/devel nfs-utils-1.0.8-rc2-Makefileam.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 nfs-utils-1.0.7-compile.patch, 1.7, 1.8 nfs-utils.spec, 1.73, 1.74 rpcgssd.init, 1.3, 1.4 sources, 1.13, 1.14 gssapi_mech.conf, 1.1, NONE nfs-utils-1.0.6-pie.patch, 1.1, NONE nfs-utils-1.0.7-idmapd-mapinit.patch, 1.1, NONE nfs-utils-1.0.7-post0.patch, 1.1, NONE nfs-utils-1.0.7-post1.patch, 1.2, NONE nfs-utils-1.0.7-post2.patch, 1.2, NONE nfs-utils-1.0.7-post3.patch, 1.1, NONE nfs-utils-1.0.7-post4.patch, 1.1, NONE nfs-utils-1.0.7-post5.patch, 1.1, NONE nfs-utils-1.0.7-post6.patch, 1.1, NONE nfs-utils-1.0.7-strip.patch, 1.1, NONE Message-ID: <200601092018.k09KI1SU011791@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11423 Modified Files: .cvsignore nfs-utils-1.0.7-compile.patch nfs-utils.spec rpcgssd.init sources Added Files: nfs-utils-1.0.8-rc2-Makefileam.patch Removed Files: gssapi_mech.conf nfs-utils-1.0.6-pie.patch nfs-utils-1.0.7-idmapd-mapinit.patch nfs-utils-1.0.7-post0.patch nfs-utils-1.0.7-post1.patch nfs-utils-1.0.7-post2.patch nfs-utils-1.0.7-post3.patch nfs-utils-1.0.7-post4.patch nfs-utils-1.0.7-post5.patch nfs-utils-1.0.7-post6.patch nfs-utils-1.0.7-strip.patch Log Message: - Updated to 1.0.8-rc2 release - Broke out libgssapi into its own rpm - Move librpcsecgss and libnfsidmap in the new nfs-utils-lib rpm - Removed libevent code; Required to be installed. nfs-utils-1.0.8-rc2-Makefileam.patch: Makefile.am | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE nfs-utils-1.0.8-rc2-Makefileam.patch --- --- nfs-utils-1.0.8-rc2/Makefile.am.orig 2005-12-19 23:12:42.000000000 -0500 +++ nfs-utils-1.0.8-rc2/Makefile.am 2006-01-05 21:08:18.161171000 -0500 @@ -40,11 +40,11 @@ EXTRA_DIST = \ aclocal/tcp-wrappers.m4 install-data-hook: - if [ ! -d $(statedir) ]; then mkdir -p $(statedir); fi - touch $(statedir)/xtab; chmod 644 $(statedir)/xtab - touch $(statedir)/etab; chmod 644 $(statedir)/etab - touch $(statedir)/rmtab; chmod 644 $(statedir)/rmtab - mkdir -p $(statedir)/sm $(statedir)/sm.bak - touch $(statedir)/state - chmod go-rwx $(statedir)/sm $(statedir)/sm.bak $(statedir)/state - chown $(statduser) $(statedir)/sm $(statedir)/sm.bak $(statedir)/state + if [ ! -d $(DESTDIR)/$(statedir) ]; then mkdir -p $(DESTDIR)/$(statedir); fi + touch $(DESTDIR)/$(statedir)/xtab; chmod 644 $(DESTDIR)/$(statedir)/xtab + touch $(DESTDIR)/$(statedir)/etab; chmod 644 $(DESTDIR)/$(statedir)/etab + touch $(DESTDIR)/$(statedir)/rmtab; chmod 644 $(DESTDIR)/$(statedir)/rmtab + mkdir -p $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak + touch $(DESTDIR)/$(statedir)/state + chmod go-rwx $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak $(DESTDIR)/$(statedir)/state + chown $(statduser) $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak $(DESTDIR)/$(statedir)/state Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 22 Sep 2005 14:43:09 -0000 1.12 +++ .cvsignore 9 Jan 2006 20:17:59 -0000 1.13 @@ -1,15 +1,5 @@ -libevent-0.9.tar.gz -nfs-utils-1.0.6.tar.gz +nfs-utils-1.0.8-rc2.tar.gz +librpcsecgss-0.7.tar.gz +libgssapi-0.7.tar.gz +libnfsidmap-0.12.tar.gz nfs.doc.tar.gz -nfsidmap-0.1.tar.gz -nfsidmap-0.5.tar.gz -libgssapi-0.1.tar.gz -librpcsecgss-0.1.tar.gz -nfs-utils-1.0.7.tar.gz -libevent-1.0b.tar.gz -nfsidmap-0.10.tar.gz -libevent-1.1a.tar.gz -libgssapi-0.4.tar.gz -librpcsecgss-0.6.tar.gz -libgssapi-0.5.tar.gz -nfsidmap-0.11.tar.gz nfs-utils-1.0.7-compile.patch: kerberos5.m4 | 2 ++ 1 files changed, 2 insertions(+) Index: nfs-utils-1.0.7-compile.patch =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils-1.0.7-compile.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nfs-utils-1.0.7-compile.patch 24 Oct 2005 19:14:49 -0000 1.7 +++ nfs-utils-1.0.7-compile.patch 9 Jan 2006 20:17:59 -0000 1.8 @@ -1,326 +1,11 @@ ---- nfs-utils-1.0.7/support/nfsidmap/Makefile.in.compile 2005-09-21 12:56:29.000000000 -0400 -+++ nfs-utils-1.0.7/support/nfsidmap/Makefile.in 2005-10-23 18:01:47.000000000 -0400 -@@ -264,8 +264,14 @@ clean-libLTLIBRARIES: - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -+ -+predep:: -+depend dep:: predep -+ $(CC) $(CFLAGS) -M $(SOURCES) > .depend -+ - libnfsidmap.la: $(libnfsidmap_la_OBJECTS) $(libnfsidmap_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libnfsidmap_la_LDFLAGS) $(libnfsidmap_la_OBJECTS) $(libnfsidmap_la_LIBADD) $(LIBS) -+ rm -f libnfsidmap.a ; ln -s .libs/libnfsidmap.a || exit 1 - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -@@ -556,7 +562,8 @@ installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done --install: install-am -+install: -+installman: - install-exec: install-exec-am - install-data: install-data-am - uninstall: uninstall-am ---- nfs-utils-1.0.7/support/include/Makefile.compile 2005-10-23 18:00:49.000000000 -0400 -+++ nfs-utils-1.0.7/support/include/Makefile 2005-10-23 18:01:47.000000000 -0400 -@@ -6,13 +6,19 @@ TOP = ../../ - - include $(TOP)rules.mk - --all install:: mount.h -+all install dep:: mount.h event.h nfsidmap.h - @: - - distclean:: -- $(RM) mount.h config.h -+ $(RM) mount.h config.h event.h nfsidmap.h - - mount.h: - $(LN_S) ../export/mount.h . - -+event.h: -+ $(LN_S) ../event/event.h . -+ -+nfsidmap.h: -+ $(LN_S) ../nfsidmap/nfsidmap.h . -+ - # .EXPORT_ALL_VARIABLES: ---- nfs-utils-1.0.7/support/lib/Makefile.compile 2005-10-23 18:00:49.000000000 -0400 -+++ nfs-utils-1.0.7/support/lib/Makefile 2005-10-23 18:01:47.000000000 -0400 -@@ -2,7 +2,8 @@ - TOP = ../../ - include $(TOP)rules.mk - --LIBS = libnfs.a libexport.a libmisc.a librpc.a libgssapi.a -+LIBS = libnfs.a libexport.a libmisc.a libgssapi.a libnfsidmap.a \ -+ libevent.a librpcsecgss.a - - all install:: $(LIBS) - @: -@@ -10,5 +11,14 @@ all install:: $(LIBS) - clean distclean:: - rm -f $(LIBS) - -+libgssapi.a: -+ ln -sf ../gssapi/src/.libs/$@ . -+ -+librpcsecgss.a: -+ ln -sf ../rpcsecgss/src/.libs/$@ . -+ -+libevent.a: -+ ln -sf ../event/.libs/$@ . -+ - lib%.a: - ln -sf ../$*/$@ . ---- nfs-utils-1.0.7/support/event/Makefile.in.compile 2005-06-12 13:59:18.000000000 -0400 -+++ nfs-utils-1.0.7/support/event/Makefile.in 2005-10-23 18:01:47.000000000 -0400 -@@ -206,7 +206,7 @@ sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - AUTOMAKE_OPTIONS = foreign no-dependencies --SUBDIRS = . sample test -+SUBDIRS = . #sample test - EXTRA_DIST = acconfig.h event.h event-internal.h log.h evsignal.h event.3 \ - kqueue.c epoll_sub.c epoll.c select.c rtsig.c poll.c signal.c \ - devpoll.c \ -@@ -271,6 +271,10 @@ $(top_srcdir)/configure: @MAINTAINER_MOD - $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -+predep:: -+depend dep:: predep -+ $(CC) $(CFLAGS) $(INCLUDES) -M $(SOURCES) > .depend -+ - config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ -@@ -674,7 +678,9 @@ installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done --install: install-recursive -+install: #install-recursive -+installman: -+ - install-exec: install-exec-recursive - install-data: install-data-recursive - uninstall: uninstall-recursive ---- nfs-utils-1.0.7/support/rpcsecgss/Makefile.in.compile 2005-06-22 14:58:51.000000000 -0400 -+++ nfs-utils-1.0.7/support/rpcsecgss/Makefile.in 2005-10-23 18:01:47.000000000 -0400 -@@ -81,7 +81,7 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -I../include ../../gssapi/include -I../../include - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ -@@ -498,12 +498,18 @@ distcleancheck: distclean - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -+predep:: -+depend dep:: predep -+ cd ./src ; $(CC) $(CFLAGS) -M *.c > .depend - check-am: all-am - check: check-recursive - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: --install: install-recursive -+#install: install-recursive -+install: -+install: -+installman: - install-exec: install-exec-recursive - install-data: install-data-recursive - uninstall: uninstall-recursive ---- nfs-utils-1.0.7/support/rpcsecgss/configure.compile 2005-03-22 17:27:18.000000000 -0500 -+++ nfs-utils-1.0.7/support/rpcsecgss/configure 2005-10-23 18:01:47.000000000 -0400 -@@ -21267,6 +21267,8 @@ _ACEOF - - if test -f $dir/include/gssapi/gssapi_krb5.h -a \ - \( -f $dir/lib/libgssapi_krb5.a -o \ -+ -f $dir/lib64/libgssapi_krb5.a -o \ -+ -f $dir/lib64/libgssapi_krb5.so -o \ - -f $dir/lib/libgssapi_krb5.so \) ; then - cat >>confdefs.h <<\_ACEOF - #define HAVE_KRB5 1 ---- nfs-utils-1.0.7/support/gssapi/Makefile.in.compile 2005-09-21 13:19:48.000000000 -0400 -+++ nfs-utils-1.0.7/support/gssapi/Makefile.in 2005-10-23 18:01:47.000000000 -0400 -@@ -83,7 +83,7 @@ AUTOMAKE = @AUTOMAKE@ - AWK = @AWK@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -I../include ../../rpcsecgss/include -I../../include - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ -@@ -503,12 +503,17 @@ distcleancheck: distclean - || { echo "ERROR: files left in build directory after distclean:" ; \ - $(distcleancheck_listfiles) ; \ - exit 1; } >&2 -+predep:: -+depend dep:: predep -+ cd ./src ; $(CC) $(CFLAGS) -M *.c > .depend - check-am: all-am - check: check-recursive - all-am: Makefile - installdirs: installdirs-recursive - installdirs-am: --install: install-recursive -+#install: install-recursive -+install: -+installman: - install-exec: install-exec-recursive - install-data: install-data-recursive - uninstall: uninstall-recursive ---- nfs-utils-1.0.7/support/gssapi/configure.compile 2005-08-15 14:56:37.000000000 -0400 -+++ nfs-utils-1.0.7/support/gssapi/configure 2005-10-23 18:01:47.000000000 -0400 -@@ -22927,6 +22927,8 @@ _ACEOF - - if test -f $dir/include/gssapi/gssapi_krb5.h -a \ - \( -f $dir/lib/libgssapi_krb5.a -o \ -+ -f $dir/lib64/libgssapi_krb5.a -o \ -+ -f $dir/lib64/libgssapi_krb5.so -o \ - -f $dir/lib/libgssapi_krb5.so \) ; then - - cat >>confdefs.h <<\_ACEOF ---- nfs-utils-1.0.7/support/Makefile.compile 2005-10-23 18:00:50.000000000 -0400 -+++ nfs-utils-1.0.7/support/Makefile 2005-10-23 18:01:47.000000000 -0400 -@@ -3,7 +3,7 @@ - # - - TOP = ../ --SUBDIRS = include nfs export lib misc -+SUBDIRS = include nfs export lib misc nfsidmap event gssapi rpcsecgss - .DEFAULT: all - - include $(TOP)rules.mk ---- nfs-utils-1.0.7/utils/gssd/Makefile.compile 2005-10-23 18:00:50.000000000 -0400 -+++ nfs-utils-1.0.7/utils/gssd/Makefile 2005-10-23 18:01:47.000000000 -0400 -@@ -12,5 +12,7 @@ MAN8 = gssd - - include $(TOP)rules.mk - --CFLAGS += -DKRB5_VERSION=$(KRB5_VERSION) -I$(TOP)support/rpc/include/ \ -+CFLAGS += -DKRB5_VERSION=$(KRB5_VERSION) -I. \ -+ -I$(TOP)/support/gssapi/include \ -+ -I$(TOP)/support/rpcsecgss/include \ - -I$(KRBDIR)/include ---- nfs-utils-1.0.7/utils/idmapd/Makefile.compile 2005-10-23 18:00:50.000000000 -0400 -+++ nfs-utils-1.0.7/utils/idmapd/Makefile 2005-10-23 18:02:12.000000000 -0400 -@@ -6,7 +6,7 @@ TOP = ../../ - PROGRAM = idmapd - PREFIX = rpc. - OBJS = atomicio.o cfg.o idmapd.o setproctitle.o strlcat.o strlcpy.o --LIBS = -levent -lnfsidmap -lnfs -+LIBS = -levent -lnfsidmap -lnfs -lldap - MAN8 = idmapd - MAN5 = idmapd.conf - ---- nfs-utils-1.0.7/utils/svcgssd/Makefile.compile 2005-10-23 18:00:50.000000000 -0400 -+++ nfs-utils-1.0.7/utils/svcgssd/Makefile 2005-10-23 18:03:25.000000000 -0400 -@@ -7,7 +7,7 @@ PROGRAM = svcgssd - PREFIX = rpc. - OBJS = svcgssd.o svcgssd_main_loop.o svcgssd_proc.o err_util.o gss_util.o \ - gss_oids.o context.o context_heimdal.o cacheio.o svcgssd_mech2file.o --LIBS = -lnfs -lrpcsecgss -lgssapi -lnfsidmap -ldl \ -+LIBS = -lnfs -lrpcsecgss -lgssapi -lnfsidmap -ldl -lldap \ - -Wl,-rpath=$(KRBDIR)/lib $(KRBLIB) - MAN8 = svcgssd - -@@ -28,5 +28,8 @@ distclean :: - - include $(TOP)rules.mk - --CFLAGS += -I../gssd -DKRB5_VERSION=$(KRB5_VERSION) \ -- -I$(TOP)support/rpc/include/ -I$(KRBDIR)/include -+CFLAGS += -DHAVE_KRB5 -DKRB5_VERSION=$(KRB5_VERSION) \ -+ -I../gssd \ -+ -I$(TOP)/support/gssapi/include \ -+ -I$(TOP)/support/rpcsecgss/include \ -+ -I$(KRBDIR)/include ---- nfs-utils-1.0.7/config.mk.in.compile 2005-10-23 18:00:51.000000000 -0400 -+++ nfs-utils-1.0.7/config.mk.in 2005-10-23 18:01:46.000000000 -0400 -@@ -6,9 +6,9 @@ VERSION = nfs-utils @VERSION@ - - prefix = $(install_prefix)@prefix@ - exec_prefix = $(install_prefix)@prefix@ --BINDIR = @bindir@ --SBINDIR = @sbindir@ --MANDIR = @mandir@ -+BINDIR = $(install_prefix)@bindir@ -+SBINDIR = $(install_prefix)@sbindir@ -+MANDIR = $(install_prefix)@mandir@ - STATEDIR = $(install_prefix)@statedir@ - STATDUSER = @statduser@ - ---- nfs-utils-1.0.7/Makefile.compile 2003-09-14 20:06:15.000000000 -0400 -+++ nfs-utils-1.0.7/Makefile 2005-10-23 18:01:46.000000000 -0400 -@@ -33,4 +33,4 @@ install:: installman - mkdir -p $(STATEDIR)/sm $(STATEDIR)/sm.bak - touch $(STATEDIR)/state - chmod go-rwx $(STATEDIR)/sm $(STATEDIR)/sm.bak $(STATEDIR)/state -- chown $(STATDUSER) $(STATEDIR)/sm $(STATEDIR)/sm.bak $(STATEDIR)/state -+ #chown $(STATDUSER) $(STATEDIR)/sm $(STATEDIR)/sm.bak $(STATEDIR)/state ---- nfs-utils-1.0.7/configure.in.compile 2005-10-23 18:00:50.000000000 -0400 -+++ nfs-utils-1.0.7/configure.in 2005-10-23 18:01:47.000000000 -0400 -@@ -117,10 +117,12 @@ AC_CHECK_LIB(socket, main, [LIBSOCKET="- - AC_CHECK_LIB(nsl, main, [LIBNSL="-lnsl"]) - AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"]) - if test "$enable_nfsv4" = yes; then -- AC_CHECK_LIB(event, event_dispatch, [libevent=1], [AC_MSG_ERROR(libevent needed for nfsv4 support)]) -- AC_CHECK_LIB(nfsidmap, nfs4_init_name_mapping, [libnfsidmap=1], [AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)]) -- AC_CHECK_HEADERS(event.h, ,[AC_MSG_ERROR(libevent needed for nfsv4 support)]) -- AC_CHECK_HEADERS(nfsidmap.h, ,[AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)]) -+ #AC_CHECK_LIB(event, event_dispatch, [libevent=1], [AC_MSG_ERROR(libevent needed for nfsv4 support)]) -+ #AC_CHECK_LIB(nfsidmap, nfs4_init_name_mapping, [libnfsidmap=1], [AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)]) -+ #AC_CHECK_HEADERS(event.h, ,[AC_MSG_ERROR(libevent needed for nfsv4 support)]) -+ #AC_CHECK_HEADERS(nfsidmap.h, ,[AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)]) -+ AC_DEFINE(libevent) -+ AC_DEFINE(libnfsidmap) - fi - if test "$knfsd_cv_glibc2" = no; then - AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"]) -@@ -134,8 +136,8 @@ AC_TCP_WRAPPER - AC_SUBST(LIBWRAP) - - if test "$enable_gss" = yes; then -- dnl 'gss' also depends on nfsidmap.h - at least for svcgssd_proc.c -- AC_CHECK_HEADERS(nfsidmap.h, ,[AC_MSG_ERROR(libnfsidmap needed for gss support)]) -+# dnl 'gss' also depends on nfsidmap.h - at least for svcgssd_proc.c -+# AC_CHECK_HEADERS(nfsidmap.h, ,[AC_MSG_ERROR(libnfsidmap needed for gss support)]) - - dnl Checks for Kerberos - dnl NOTE: while we intend to do generic gss-api, currently we -@@ -172,6 +174,8 @@ if test "$enable_gss" = yes; then +--- nfs-utils-1.0.7/aclocal/kerberos5.m4.orig 2005-12-15 17:11:03.694036000 -0500 ++++ nfs-utils-1.0.7/aclocal/kerberos5.m4 2005-12-15 17:11:09.201155000 -0500 +@@ -34,6 +34,8 @@ AC_DEFUN([AC_KERBEROS_V5],[ AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) if test -f $dir/include/gssapi/gssapi_krb5.h -a \ - \( -f $dir/lib/libgssapi_krb5.a -o \ -+ -f $dir/lib64/libgssapi_krb5.a -o \ -+ -f $dir/lib64/libgssapi_krb5.so -o \ - -f $dir/lib/libgssapi_krb5.so \) ; then + \( -f $dir/lib/libgssapi_krb5.a -o \ ++ -f $dir/lib64/libgssapi_krb5.a -o \ ++ -f $dir/lib64/libgssapi_krb5.so -o \ + -f $dir/lib/libgssapi_krb5.so \) ; then AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries]) KRBDIR="$dir" -@@ -225,9 +229,11 @@ if test "$enable_gss" = yes; then - - dnl This is not done until here because we need to have KRBLIB set - dnl "librpcsecgss=1" is so that it doesn't get added to LIBS -- AC_CHECK_LIB(rpcsecgss, authgss_create_default, [librpcsecgss=1], [AC_MSG_ERROR(librpcsecgss needed for nfsv4 support)], $KRBLIB) -- AC_CHECK_LIB(rpcsecgss, authgss_set_debug_level, -- AC_DEFINE(HAVE_AUTHGSS_SET_DEBUG_LEVEL, 1, [Define this if the rpcsec_gss library has the function authgss_set_debug_level]),, $KRBLIB) -+ #AC_CHECK_LIB(rpcsecgss, authgss_create_default, [librpcsecgss=1], [AC_MSG_ERROR(librpcsecgss needed for nfsv4 support)], $KRBLIB) -+ #AC_CHECK_LIB(rpcsecgss, authgss_set_debug_level, -+ # AC_DEFINE(HAVE_AUTHGSS_SET_DEBUG_LEVEL, 1, [Define this if the rpcsec_gss library has the function authgss_set_debug_level]),, $KRBLIB) -+ AC_DEFINE(librpcsecgss) -+ AC_DEFINE(HAVE_AUTHGSS_SET_DEBUG_LEVEL) - - AC_SUBST([KRBDIR]) - AC_SUBST([KRBLIB]) Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- nfs-utils.spec 9 Dec 2005 22:42:22 -0000 1.73 +++ nfs-utils.spec 9 Jan 2006 20:17:59 -0000 1.74 @@ -1,67 +1,29 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils -Version: 1.0.7 -Release: 19.FC5.1 +Version: 1.0.8.rc2 +Release: 1.FC5 # group all 32bit related archs %define all_32bit_archs i386 i686 athlon -Source0: http://unc.dl.sourceforge.net/sourceforge/nfs/nfs-utils-1.0.7.tar.gz +Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.8-rc2.tar.gz Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz -%define idmapvers 0.11 -Source2: http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/nfsidmap-%{idmapvers}.tar.gz -%define eventvers 1.1a -Source3: http://monkey.org/~provos/libevent-%{eventvers}.tar.gz -%define gssapivers 0.5 -Source4: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-%{gssapivers}.tar.gz -%define rpcsecgssvers 0.6 -Source5: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/librpcsecgss-%{rpcsecgssvers}.tar.gz - Source10: nfs.init Source11: nfslock.init Source12: rpcidmapd.init Source13: rpcgssd.init Source14: rpcsvcgssd.init -Source15: gssapi_mech.conf - -# Updstream Patches -# -Patch0: nfs-utils-1.0.7-post0.patch -Patch1: nfs-utils-1.0.7-post1.patch -Patch2: nfs-utils-1.0.7-post2.patch -Patch3: nfs-utils-1.0.7-post3.patch -Patch4: nfs-utils-1.0.7-post4.patch -Patch5: nfs-utils-1.0.7-post5.patch -Patch6: nfs-utils-1.0.7-post6.patch - -# -# CITI Patches -# -Patch20: nfs-utils-1.0.7-037-svcgssd_closeall_lib.dif -Patch21: nfs-utils-1.0.7-040-idmapd_fix_error_reporting.dif -Patch22: nfs-utils-1.0.7-041-svcgssd_error_reporting.dif -Patch23: nfs-utils-1.0.7-042-spkm3_lucid_context.dif -Patch24: nfs-utils-1.0.7-043-svcgssd_continue_init.dif -Patch25: nfs-utils-1.0.7-044-gssd_continue_init.dif -Patch26: nfs-utils-1.0.7-045-gssd_clnt_create_error.dif -Patch27: nfs-utils-1.0.7-046-gssd_error_messages.dif - -# -# Local Patches -# Patch50: nfs-utils-1.0.5-statdpath.patch Patch51: nfs-utils-1.0.6-mountd.patch Patch52: nfs-utils-1.0.6-idmap.conf.patch Patch53: nfs-utils-1.0.7-rquotad-curblocks.patch Patch54: nfs-utils-1.0.7-mountd-stat64.patch Patch55: nfs-utils-1.0.7-nfsd-ctlbits.patch -Patch56: nfs-utils-1.0.7-idmapd-mapinit.patch +Patch56: nfs-utils-1.0.8-rc2-Makefileam.patch -Patch100: nfs-utils-1.0.7-compile.patch -Patch150: nfs-utils-1.0.6-pie.patch -Patch151: nfs-utils-1.0.7-strip.patch +Patch100: nfs-utils-1.0.8-compile.patch Group: System Environment/Daemons Obsoletes: nfs-server @@ -75,12 +37,14 @@ Provides: knfsd-clients Provides: knfsd License: GPL -Buildroot: %{_tmppath}/%{name}-root +Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep Requires: modutils >= 2.4.26-9 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 +BuildRequires: nfs-utils-lib-devel PreReq: shadow-utils >= 4.0.3-25 -Prereq: /sbin/chkconfig /sbin/nologin +PreReq: /sbin/chkconfig /sbin/nologin +PreReq: nfs-utils-lib libevent %description The nfs-utils package provides a daemon for the kernel NFS server and @@ -93,77 +57,43 @@ clients which are mounted on that host. %prep -%setup -q -a1 -a2 -a3 -a4 -a5 -# -# Remove code that no longer used -# -rm -r support/rpc -rm -r support/gssapi - -# -# Set up the support libs -# -mv nfsidmap-%{idmapvers} support/nfsidmap -mv libevent-%{eventvers} support/event -mv librpcsecgss-%{rpcsecgssvers} support/rpcsecgss -mv libgssapi-%{gssapivers} support/gssapi - -# Upstream Patches -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 - -# CITI Patches -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 - -# Local Patches +%setup -q -n nfs-utils-1.0.8-rc2 -a1 %patch50 -p1 -b .statdpath %patch51 -p1 -b .mountd %patch52 -p1 -b .conf %patch53 -p1 -b .curblocks %patch54 -p1 -b .stat64 %patch55 -p1 -b .ctlbits -%patch56 -p1 -b .mapinit - +%patch56 -p1 -b .makeam # Do the magic to get things to compile %patch100 -p1 -b .compile -%patch150 -p1 -b .pie -%patch151 -p1 -b .strip -%ifarch s390 s390x -perl -pi -e 's/-fpie/-fPIE/' */*/Makefile -%endif # Remove .orig files find . -name "*.orig" | xargs rm -f %build -autoconf +%ifarch s390 s390x +PIE="-fPIE" +%else +PIE="-fpie" +%endif +export PIE +sh autogen.sh + +CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`" # # Hack to enable netgroups. If anybody knows the right way to do # this, please help yourself. # ac_cv_func_innetgr=yes \ - CFLAGS="$RPM_OPT_FLAGS" %configure --enable-secure-statd - -cd support/nfsidmap; %configure --prefix=$RPM_BUILD_ROOT -cd ../event; %configure --prefix=$RPM_BUILD_ROOT -cd ../gssapi; %configure --prefix=$RPM_BUILD_ROOT -cd ../rpcsecgss; %configure --prefix=$RPM_BUILD_ROOT -cd ../../ +%configure \ + CFLAGS="$CFLAGS" \ + CPPFLAGS="$DEFINES" \ + LDFLAGS="-pie" \ + --prefix=$RPM_BUILD_ROOT make all @@ -172,14 +102,13 @@ mkdir -p $RPM_BUILD_ROOT{/sbin,/usr/sbin} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man5,man8} mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -make install install_prefix=$RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/sbin install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcidmapd install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcgssd install -m 755 %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcsvcgssd -install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/etc/gssapi_mech.conf install -m 644 utils/idmapd/idmapd.conf \ $RPM_BUILD_ROOT/etc/idmapd.conf @@ -262,7 +191,6 @@ %config /etc/rc.d/init.d/rpcgssd %config /etc/rc.d/init.d/rpcsvcgssd %config(noreplace) /etc/idmapd.conf -%config(noreplace) /etc/gssapi_mech.conf %dir /var/lib/nfs/rpc_pipefs %dir /var/lib/nfs %dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd @@ -287,6 +215,12 @@ %config /etc/rc.d/init.d/nfslock %changelog +* Mon Jan 9 2006 1.0.8-1 +- Updated to 1.0.8-rc2 release +- Broke out libgssapi into its own rpm +- Move librpcsecgss and libnfsidmap in the new nfs-utils-lib rpm +- Removed libevent code; Required to be installed. + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: rpcgssd.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/rpcgssd.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rpcgssd.init 14 Feb 2005 19:29:31 -0000 1.3 +++ rpcgssd.init 9 Jan 2006 20:17:59 -0000 1.4 @@ -31,7 +31,7 @@ # Try to use machine credentials by default -OPTIONS="-m" +OPTIONS="" RETVAL=0 prog="rpc.gssd" Index: sources =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 22 Sep 2005 14:43:09 -0000 1.13 +++ sources 9 Jan 2006 20:17:59 -0000 1.14 @@ -1,8 +1,2 @@ -8f863120261cd572ad320a9152581e11 nfs-utils-1.0.7.tar.gz +d0ce78b60ea88995350c9c3b4e4f9f5f nfs-utils-1.0.8-rc2.tar.gz ae7db9c61c5ad04f83bb99e5caed73da nfs.doc.tar.gz -7f72edd613b8ca30f0dfcc401b0b96a4 nfsidmap-0.10.tar.gz -6cc776458ecaf9247550863702a44d7c libevent-1.1a.tar.gz -ed457ee28c252225d1988d5a580d4b99 libgssapi-0.4.tar.gz -962da89d2f2e7a70b2b90cb125cbceaa librpcsecgss-0.6.tar.gz -64746c8f015ce5f6a57785853425b7ee libgssapi-0.5.tar.gz -b9ee2b726abf2f6500e44a0074dd713a nfsidmap-0.11.tar.gz --- gssapi_mech.conf DELETED --- --- nfs-utils-1.0.6-pie.patch DELETED --- --- nfs-utils-1.0.7-idmapd-mapinit.patch DELETED --- --- nfs-utils-1.0.7-post0.patch DELETED --- --- nfs-utils-1.0.7-post1.patch DELETED --- --- nfs-utils-1.0.7-post2.patch DELETED --- --- nfs-utils-1.0.7-post3.patch DELETED --- --- nfs-utils-1.0.7-post4.patch DELETED --- --- nfs-utils-1.0.7-post5.patch DELETED --- --- nfs-utils-1.0.7-post6.patch DELETED --- --- nfs-utils-1.0.7-strip.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 20:20:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:20:11 -0500 Subject: rpms/selinux-policy/devel .cvsignore,1.20,1.21 sources,1.22,1.23 Message-ID: <200601092020.k09KKBV7012804@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12776 Modified Files: .cvsignore sources Log Message: * Mon Jan 9 2006 Dan Walsh 2.1.8-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 4 Jan 2006 19:02:16 -0000 1.20 +++ .cvsignore 9 Jan 2006 20:20:08 -0000 1.21 @@ -21,3 +21,4 @@ serefpolicy-2.1.5.tgz serefpolicy-2.1.6.tgz serefpolicy-2.1.7.tgz +serefpolicy-2.1.8.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 6 Jan 2006 13:56:31 -0000 1.22 +++ sources 9 Jan 2006 20:20:08 -0000 1.23 @@ -1 +1 @@ -bb6c7f0e43c8cb894daff5a3b31fdef5 serefpolicy-2.1.7.tgz +b9ddc9e25ffbd12bd8711591d0af0a7f serefpolicy-2.1.8.tgz From fedora-cvs-commits at redhat.com Mon Jan 9 20:21:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:21:01 -0500 Subject: rpms/nfs-utils/devel nfs-utils-1.0.7-037-svcgssd_closeall_lib.dif, 1.1, NONE nfs-utils-1.0.7-040-idmapd_fix_error_reporting.dif, 1.1, NONE nfs-utils-1.0.7-041-svcgssd_error_reporting.dif, 1.1, NONE nfs-utils-1.0.7-042-spkm3_lucid_context.dif, 1.1, NONE nfs-utils-1.0.7-043-svcgssd_continue_init.dif, 1.1, NONE nfs-utils-1.0.7-044-gssd_continue_init.dif, 1.1, NONE nfs-utils-1.0.7-045-gssd_clnt_create_error.dif, 1.1, NONE nfs-utils-1.0.7-046-gssd_error_messages.dif, 1.1, NONE Message-ID: <200601092021.k09KL1VA013236@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13104 Removed Files: nfs-utils-1.0.7-037-svcgssd_closeall_lib.dif nfs-utils-1.0.7-040-idmapd_fix_error_reporting.dif nfs-utils-1.0.7-041-svcgssd_error_reporting.dif nfs-utils-1.0.7-042-spkm3_lucid_context.dif nfs-utils-1.0.7-043-svcgssd_continue_init.dif nfs-utils-1.0.7-044-gssd_continue_init.dif nfs-utils-1.0.7-045-gssd_clnt_create_error.dif nfs-utils-1.0.7-046-gssd_error_messages.dif Log Message: Removed no longer needed patches --- nfs-utils-1.0.7-037-svcgssd_closeall_lib.dif DELETED --- --- nfs-utils-1.0.7-040-idmapd_fix_error_reporting.dif DELETED --- --- nfs-utils-1.0.7-041-svcgssd_error_reporting.dif DELETED --- --- nfs-utils-1.0.7-042-spkm3_lucid_context.dif DELETED --- --- nfs-utils-1.0.7-043-svcgssd_continue_init.dif DELETED --- --- nfs-utils-1.0.7-044-gssd_continue_init.dif DELETED --- --- nfs-utils-1.0.7-045-gssd_clnt_create_error.dif DELETED --- --- nfs-utils-1.0.7-046-gssd_error_messages.dif DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 20:22:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:22:18 -0500 Subject: rpms/nfs-utils/devel nfs-utils-1.0.8-compile.patch,NONE,1.1 Message-ID: <200601092022.k09KMIr8013835@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13746 Added Files: nfs-utils-1.0.8-compile.patch Log Message: added nfs-utils-1.0.8-compile.patch nfs-utils-1.0.8-compile.patch: Makefile.am | 1 - aclocal/kerberos5.m4 | 2 ++ configure.in | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE nfs-utils-1.0.8-compile.patch --- --- nfs-utils-1.0.8-rc2/aclocal/kerberos5.m4.orig 2005-12-19 23:12:43.000000000 -0500 +++ nfs-utils-1.0.8-rc2/aclocal/kerberos5.m4 2006-01-06 14:35:59.523950000 -0500 @@ -34,6 +34,8 @@ AC_DEFUN([AC_KERBEROS_V5],[ AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number]) if test -f $dir/include/gssapi/gssapi_krb5.h -a \ \( -f $dir/lib/libgssapi_krb5.a -o \ + -f $dir/lib64/libgssapi_krb5.a -o \ + -f $dir/lib64/libgssapi_krb5.so -o \ -f $dir/lib/libgssapi_krb5.so \) ; then AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries]) KRBDIR="$dir" --- nfs-utils-1.0.8-rc2/Makefile.am.orig 2006-01-06 14:35:35.649376000 -0500 +++ nfs-utils-1.0.8-rc2/Makefile.am 2006-01-06 14:35:59.529951000 -0500 @@ -47,4 +47,3 @@ install-data-hook: mkdir -p $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak touch $(DESTDIR)/$(statedir)/state chmod go-rwx $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak $(DESTDIR)/$(statedir)/state - chown $(statduser) $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak $(DESTDIR)/$(statedir)/state --- nfs-utils-1.0.8-rc2/configure.in.orig 2005-12-20 01:04:18.000000000 -0500 +++ nfs-utils-1.0.8-rc2/configure.in 2006-01-06 14:37:32.827182000 -0500 @@ -110,6 +110,9 @@ AC_ARG_ENABLE(rquotad, # Check whether user wants TCP wrappers support AC_TCP_WRAPPERS +# Arrange for large-file support +AC_SYS_LARGEFILE + AC_CONFIG_SRCDIR([support/include/config.h.in]) AC_CONFIG_HEADERS([support/include/config.h]) From fedora-cvs-commits at redhat.com Mon Jan 9 20:23:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:23:17 -0500 Subject: rpms/nfs-utils/devel nfs-utils-1.0.7-compile.patch,1.8,NONE Message-ID: <200601092023.k09KNHiu014314@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14196 Removed Files: nfs-utils-1.0.7-compile.patch Log Message: deleted nfs-utils-1.0.7-compile.patch --- nfs-utils-1.0.7-compile.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 20:39:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:39:57 -0500 Subject: rpms/firstboot/devel .cvsignore, 1.40, 1.41 firstboot.spec, 1.58, 1.59 sources, 1.55, 1.56 Message-ID: <200601092039.k09KdvI6020428@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/firstboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20374 Modified Files: .cvsignore firstboot.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- .cvsignore 8 Dec 2005 20:28:32 -0000 1.40 +++ .cvsignore 9 Jan 2006 20:39:54 -0000 1.41 @@ -12,3 +12,4 @@ firstboot-1.3.53.tar.bz2 firstboot-1.3.54.tar.bz2 firstboot-1.3.55.tar.bz2 +firstboot-1.3.56.tar.bz2 Index: firstboot.spec =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- firstboot.spec 9 Dec 2005 22:40:25 -0000 1.58 +++ firstboot.spec 9 Jan 2006 20:39:54 -0000 1.59 @@ -1,7 +1,7 @@ Summary: Initial system configuration utility Name: firstboot -Version: 1.3.55 -Release: 1.1 +Version: 1.3.56 +Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -76,6 +76,10 @@ /usr/sbin/firstboot %changelog +* Thu Jan 09 2006 Chris Lumens 1.3.56-1 +- Increase timeout on waiting for X to start (#176782). +- Update translations. + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 8 Dec 2005 20:28:32 -0000 1.55 +++ sources 9 Jan 2006 20:39:54 -0000 1.56 @@ -1 +1 @@ -aefa4af4310f2f18f9eba5c38481f759 firstboot-1.3.55.tar.bz2 +3211ad0ea94a4bc99e2a9d62fedecb1b firstboot-1.3.56.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 9 20:42:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:42:22 -0500 Subject: rpms/kernel-xen/devel/configs config-generic, 1.2, 1.3 config-ia64-generic, 1.2, 1.3 config-powerpc-generic, 1.2, 1.3 config-powerpc64-iseries, 1.2, 1.3 config-x86-generic, 1.3, 1.4 config-x86_64-generic, 1.3, 1.4 Message-ID: <200601092042.k09KgMI5021597@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel-xen/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv20340/configs Modified Files: config-generic config-ia64-generic config-powerpc-generic config-powerpc64-iseries config-x86-generic config-x86_64-generic Log Message: Rebase to: Rawhide kernel kernel-2.6.15-1.1826.2.9 from private-fc5-test2-branch Hypervisor from xen-unstable on 20060106 linux-2.6-merge.hg xen upstream as of changeset 16985 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-generic 21 Dec 2005 11:24:56 -0000 1.2 +++ config-generic 9 Jan 2006 20:42:19 -0000 1.3 @@ -34,7 +34,7 @@ CONFIG_IOSCHED_AS=y CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y -CONFIG_DEFAULT_CFQ=y +CONFIG_DEFAULT_AS=y CONFIG_POSIX_MQUEUE=y # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y @@ -1034,10 +1034,12 @@ # Wireless 802.11b ISA/PCI cards support # CONFIG_IEEE80211=m -# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_DEBUG=y CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +CONFIG_IEEE80211_SOFTMAC_DEBUG=y # CONFIG_IPW2100 is not set # CONFIG_IPW_DEBUG is not set # CONFIG_IPW2200 is not set @@ -1050,6 +1052,7 @@ CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m CONFIG_PRISM54=m +CONFIG_BCM43XX=m # # Wireless 802.11b Pcmcia/Cardbus cards support @@ -1385,6 +1388,7 @@ CONFIG_SERIAL_8250_CS=m # CONFIG_SERIAL_8250_ACPI is not set CONFIG_SERIAL_8250_NR_UARTS=32 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y @@ -1650,6 +1654,7 @@ CONFIG_VIDEO_SAA5249=m CONFIG_VIDEO_SAA6588=m CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7134_DVB_ALL_FRONTENDS=y CONFIG_VIDEO_STRADIS=m @@ -2033,7 +2038,8 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_YEALINK=m +# Has dumb detection, which gets loaded for every hid device. +# CONFIG_USB_YEALINK is not set CONFIG_USB_ZD1201=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_GL620A=m @@ -2383,6 +2389,16 @@ # Turn off these debug options for production kernels. CONFIG_DEBUG_SLAB=y +CONFIG_KMALLOC_ACCOUNTING=y + +# CONFIG_WAKEUP_TIMING is not set +# CONFIG_WAKEUP_LATENCY_HIST is not set +# CONFIG_CRITICAL_PREEMPT_TIMING is not set +# CONFIG_CRITICAL_IRQSOFF_TIMING is not set +# CONFIG_LATENCY_TIMING is not set +# CONFIG_LATENCY_TRACE is not set +# CONFIG_MCOUNT is not set + # # Security options @@ -2469,7 +2485,7 @@ # CONFIG_TUX_DEBUG is not set CONFIG_CPUSETS=y -CONFIG_SECCOMP=y +# CONFIG_SECCOMP is not set # CONFIG_PRINTK_TIME is not set CONFIG_DETECT_SOFTLOCKUP=y @@ -2484,7 +2500,7 @@ CONFIG_IBMASR=m -# CONFIG_PM_LEGACY is not set +CONFIG_PM_LEGACY=y CONFIG_CRASH=m Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-ia64-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-ia64-generic 21 Dec 2005 11:24:56 -0000 1.2 +++ config-ia64-generic 9 Jan 2006 20:42:19 -0000 1.3 @@ -101,9 +101,6 @@ # CONFIG_SCSI_BUSLOGIC is not set # -# Compiler b0rkage and broken driver workarounds -# -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y CONFIG_ACPI_AC=m @@ -112,8 +109,8 @@ CONFIG_ACPI_FAN=y CONFIG_ACPI_PROCESSOR=y CONFIG_ACPI_THERMAL=y -CONFIG_ACPI_ASUS=m -CONFIG_ACPI_TOSHIBA=m +# CONFIG_ACPI_ASUS is not set +# CONFIG_ACPI_TOSHIBA is not set # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_EC=y CONFIG_ACPI_POWER=y Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-powerpc-generic 21 Dec 2005 11:24:56 -0000 1.2 +++ config-powerpc-generic 9 Jan 2006 20:42:19 -0000 1.3 @@ -79,3 +79,4 @@ # CONFIG_ATM_AMBASSADOR is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_BUSLOGIC is not set + Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc64-iseries,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-powerpc64-iseries 21 Dec 2005 11:24:56 -0000 1.2 +++ config-powerpc64-iseries 9 Jan 2006 20:42:19 -0000 1.3 @@ -22,6 +22,7 @@ # CONFIG_FB_OF is not set # CONFIG_BLK_DEV_FD is not set # CONFIG_USB is not set +# CONFIG_BT is not set # CONFIG_INPUT is not set # CONFIG_NET_RADIO is not set # CONFIG_MTD is not set @@ -66,3 +67,8 @@ # CONFIG_ISDN is not set # CONFIG_IEEE80211 is not set +# CONFIG_DVB is not set +# CONFIG_VIDEO_DEV is not set +# CONFIG_SND_FM801_TEA575X is not set +# CONFIG_IEEE1394 is not set + Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86-generic,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-x86-generic 21 Dec 2005 15:04:58 -0000 1.3 +++ config-x86-generic 9 Jan 2006 20:42:19 -0000 1.4 @@ -268,3 +268,8 @@ CONFIG_DELL_RBU=m CONFIG_DCDBAS=m +CONFIG_WAKEUP_TIMING=y +CONFIG_LATENCY_TIMING=y +CONFIG_LATENCY_TRACE=y +CONFIG_MCOUNT=y + Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86_64-generic,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-x86_64-generic 21 Dec 2005 15:04:58 -0000 1.3 +++ config-x86_64-generic 9 Jan 2006 20:42:19 -0000 1.4 @@ -141,3 +141,10 @@ CONFIG_DELL_RBU=m CONFIG_DCDBAS=m +CONFIG_WAKEUP_TIMING=y +CONFIG_LATENCY_TIMING=y +CONFIG_LATENCY_TRACE=y +CONFIG_MCOUNT=y + +CONFIG_NVRAM=m + From fedora-cvs-commits at redhat.com Mon Jan 9 20:42:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:42:22 -0500 Subject: rpms/kernel-xen/devel linux-2.6-bcm43xx-resume.patch, NONE, 1.1 linux-2.6-bcm43xx.patch, NONE, 1.1 linux-2.6-block-reduce-stack.patch, NONE, 1.1 linux-2.6-debug-account-kmalloc.patch, NONE, 1.1 linux-2.6-debug-latency-tracing.patch, NONE, 1.1 linux-2.6-dm-sync-overrun.patch, NONE, 1.1 linux-2.6-edid-check.patch, NONE, 1.1 linux-2.6-ia64-spinlock-size.patch, NONE, 1.1 linux-2.6-kill-blk_attempt_merge.patch, NONE, 1.1 linux-2.6-posix-timers-sched_time-accumulation.patch, NONE, 1.1 linux-2.6-ppc-iseries-input-layer.patch, NONE, 1.1 linux-2.6-pwc-powerup-by-default.patch, NONE, 1.1 linux-2.6-serial-nrports.patch, NONE, 1.1 linux-2.6-smsc-ircc2-pnp.patch, NONE, 1.1 linux-2.6-softcursor-persistent-alloc.patch, NONE, 1.1 linux-2.6-softmac-git.patch, NONE, 1.1 linux-2.6-usbhid-wireless-security-lock.patch, NONE, 1.1 linux-2.6-vm-clear-unreclaimable.patch, NONE, 1.1 linux-2.6-vm-debug.patch, NONE, 1.1 linux-2.6-w1-hush-debug.patch, NONE, 1.1 linux-2.6-x86-hp-reboot.patch, NONE, 1.1 linux-2.6-x86_64-ati-apic-timer.pa! tch, NONE, 1.1 linux-2.6.14-xen-compile-fixes.patch, NONE, 1.1 linux-2.6.15-usb-find-interface.patch, NONE, 1.1 linux-2.6.15-usblp-fixes.patch, NONE, 1.1 linux-2.6.15.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.6, 1.7 kernel-xen.spec, 1.23, 1.24 linux-2.6-acpi-thinkpad-c2c3.patch, 1.2, 1.3 linux-2.6-crash-xen.patch, 1.2, 1.3 linux-2.6-crashdump-common.patch, 1.2, 1.3 linux-2.6-debug-oops-pause.patch, 1.2, 1.3 linux-2.6-debug-spinlock-taint.patch, 1.2, 1.3 linux-2.6-execshield-xen.patch, 1.2, 1.3 linux-2.6-execshield.patch, 1.2, 1.3 linux-2.6-gcc41.patch, 1.2, 1.3 linux-2.6-ub.patch, 1.2, 1.3 linux-2.6-xen-merge.patch, 1.2, 1.3 linux-2.6-xen-no-tls-warn.patch, 1.2, 1.3 linux-2.6-xen-vdso-note.patch, 1.2, 1.3 linux-2.6.14-xen_remap_vma_flags.patch, 1.2, 1.3 sources, 1.6, 1.7 upstream, 1.3, 1.4 linux-2.6-acpi-acpica-20051202.patch, 1.2, NONE linux-2.6-apm-depends-fix.patch, 1.1, NONE linux-2.6-debug-spinlock-symbol.patch, 1.2, NONE linux-2.6-g5-thermal-overload.patch, 1.2, NONE linux-2.6-missing-exports.patch, 1.2, NONE linux-2.6-usb-s! uspend.patch,1.2,NONE linux-2.6.14-kauditd-suspend.patch,1.2,N! ONE linu Message-ID: <200601092042.k09KgM2N021583@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20340 Modified Files: .cvsignore kernel-xen.spec linux-2.6-acpi-thinkpad-c2c3.patch linux-2.6-crash-xen.patch linux-2.6-crashdump-common.patch linux-2.6-debug-oops-pause.patch linux-2.6-debug-spinlock-taint.patch linux-2.6-execshield-xen.patch linux-2.6-execshield.patch linux-2.6-gcc41.patch linux-2.6-ub.patch linux-2.6-xen-merge.patch linux-2.6-xen-no-tls-warn.patch linux-2.6-xen-vdso-note.patch linux-2.6.14-xen_remap_vma_flags.patch sources upstream Added Files: linux-2.6-bcm43xx-resume.patch linux-2.6-bcm43xx.patch linux-2.6-block-reduce-stack.patch linux-2.6-debug-account-kmalloc.patch linux-2.6-debug-latency-tracing.patch linux-2.6-dm-sync-overrun.patch linux-2.6-edid-check.patch linux-2.6-ia64-spinlock-size.patch linux-2.6-kill-blk_attempt_merge.patch linux-2.6-posix-timers-sched_time-accumulation.patch linux-2.6-ppc-iseries-input-layer.patch linux-2.6-pwc-powerup-by-default.patch linux-2.6-serial-nrports.patch linux-2.6-smsc-ircc2-pnp.patch linux-2.6-softcursor-persistent-alloc.patch linux-2.6-softmac-git.patch linux-2.6-usbhid-wireless-security-lock.patch linux-2.6-vm-clear-unreclaimable.patch linux-2.6-vm-debug.patch linux-2.6-w1-hush-debug.patch linux-2.6-x86-hp-reboot.patch linux-2.6-x86_64-ati-apic-timer.patch linux-2.6.14-xen-compile-fixes.patch linux-2.6.15-usb-find-interface.patch linux-2.6.15-usblp-fixes.patch linux-2.6.15.tar.bz2.sign Removed Files: linux-2.6-acpi-acpica-20051202.patch linux-2.6-apm-depends-fix.patch linux-2.6-debug-spinlock-symbol.patch linux-2.6-g5-thermal-overload.patch linux-2.6-missing-exports.patch linux-2.6-usb-suspend.patch linux-2.6.14-kauditd-suspend.patch linux-2.6.14.tar.bz2.sign patch-2.6.15-rc6-git1.bz2.sign patch-2.6.15-rc6.bz2.sign Log Message: Rebase to: Rawhide kernel kernel-2.6.15-1.1826.2.9 from private-fc5-test2-branch Hypervisor from xen-unstable on 20060106 linux-2.6-merge.hg xen upstream as of changeset 16985 linux-2.6-bcm43xx-resume.patch: bcm43xx.h | 11 +++++++++-- bcm43xx_main.c | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-bcm43xx-resume.patch --- --- linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c~ 2006-01-03 22:56:55.000000000 +0000 +++ linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx_main.c 2006-01-03 23:00:15.000000000 +0000 @@ -4583,8 +4583,8 @@ static int bcm43xx_resume(struct pci_dev netif_device_attach(net_dev); /*FIXME: This should be handled by softmac instead. */ - queue_work(bcm->softmac->workqueue, &bcm->softmac->associnfo.work); + schedule_work(&bcm->softmac->associnfo.work); dprintk(KERN_INFO PFX "Device resumed.\n"); --- linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx.h.orig 2006-01-06 05:00:12.000000000 +0000 +++ linux-2.6.15/drivers/net/wireless/bcm43xx/bcm43xx.h 2006-01-06 14:07:38.000000000 +0000 @@ -648,7 +648,8 @@ struct bcm43xx_private { bad_frames_preempt:1, /* Use "Bad Frames Preemption" (default off) */ reg124_set_0x4:1, /* Some variable to keep track of IRQ stuff. */ powersaving:1, /* TRUE if we are in PowerSaving mode. FALSE otherwise. */ - short_preamble:1; /* TRUE, if short preamble is enabled. */ + short_preamble:1, /* TRUE, if short preamble is enabled. */ + firmware_norelease:1; /* Do not release the firmware. Used on suspend. */ struct bcm43xx_stats stats; @@ -728,7 +729,13 @@ struct bcm43xx_private { u16 security_offset; struct bcm43xx_key key[54]; u8 default_key_idx; - + + /* Firmware. */ + const struct firmware *ucode; + const struct firmware *pcm; + const struct firmware *initvals0; + const struct firmware *initvals1; + /* Debugging stuff follows. */ #ifdef BCM43xx_DEBUG struct bcm43xx_dfsentry *dfsentry; linux-2.6-bcm43xx.patch: Kconfig | 8 ++++++++ Makefile | 1 + 2 files changed, 9 insertions(+) --- NEW FILE linux-2.6-bcm43xx.patch --- --- linux-2.6.14/drivers/net/wireless/Kconfig~ 2005-12-30 23:41:54.000000000 +0000 +++ linux-2.6.14/drivers/net/wireless/Kconfig 2005-12-30 23:53:24.000000000 +0000 @@ -477,6 +477,14 @@ config PRISM54 source "drivers/net/wireless/hostap/Kconfig" +config BCM43XX + tristate "Broadcom BCM43xx wireless support" + depends on PCI && IEEE80211 && NET_RADIO && IEEE80211_SOFTMAC && EXPERIMENTAL + select FW_LOADER + ---help--- + This is an experimental driver for the Broadcom 43xx wireless chip, + found in the Apple Airport Extreme and various other devices. + # yes, this works even when no drivers are selected config NET_WIRELESS bool --- linux-2.6.14/drivers/net/wireless/Makefile~ 2005-10-28 01:02:08.000000000 +0100 +++ linux-2.6.14/drivers/net/wireless/Makefile 2005-12-30 23:53:43.000000000 +0000 @@ -35,6 +35,7 @@ obj-$(CONFIG_PCMCIA_ATMEL) += atmel obj-$(CONFIG_PRISM54) += prism54/ obj-$(CONFIG_HOSTAP) += hostap/ +obj-$(CONFIG_BCM43XX) += bcm43xx/ # 16-bit wireless PCMCIA client drivers obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o linux-2.6-block-reduce-stack.patch: ./include/linux/sched.h | 3 ++ 2/block/ll_rw_blk.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-block-reduce-stack.patch --- From: Neil Brown To: device-mapper development Date: Mon, 7 Nov 2005 11:16:48 +1100 Message-ID: <17262.40176.342746.634262 at cse.unsw.edu.au> Cc: Andrew Morton , heiko.carstens at de.ibm.com, linux-kernel at vger.kernel.org, aherrman at de.ibm.com, bunk at stusta.de, cplk at itee.uq.edu.au Subject: Re: [dm-devel] Re: [PATCH resubmit] do_mount: reduce stack consumption For your consideration and testing (it works for me, but I'd like to see it tested a bit more heavily in a variety of configurations). NeilBrown -- Reduce stack usage with stacked block devices When stacked block devices are in-use (e.g. md or dm), the recursive calls to generic_make_request can use up a lot of space, and we would rather they didn't. As generic_make_request is a void function, and as it is generally not expected that it will have any effect immediately, it is safe to delay any call to generic_make_request until there is sufficient stack space available. As ->bi_next is reserved for the driver to use, it can have no valid value when generic_make_request is called, and as __make_request implicitly assumes it will be NULL (ELEVATOR_BACK_MERGE fork of switch) we can be certain that all callers set it to NULL. We can therefore safely use bi_next to link pending requests together, providing we clear it before making the real call. So, we choose to allow each thread to only be active in one generic_make_request at a time. If a subsequent (recursive) call is made, the bio is linked into a per-thread list, and is handled when the active call completes. As the list of pending bios is per-thread, there are no locking issues to worry about. I say above that it is "safe to delay any call...". There are, however, some behaviours of a make_request_fn which would make it unsafe. These include any behaviour that assumes anything will have changed after a recursive call to generic_make_request. These could include: - waiting for that call to finish and call it's bi_end_io function. md use to sometimes do this (marking the superblock dirty before completing a write) but doesn't any more - inspecting the bio for fields that generic_make_request might change, such as bi_sector or bi_bdev. It is hard to see a good reason for this, and I don't think anyone actually does it. - inspecing the queue to see if, e.g. it is 'full' yet. Again, I think this is very unlikely to be useful, or to be done. Signed-off-by: Neil Brown Signed-off-by: Neil Brown ### Diffstat output ./drivers/block/ll_rw_blk.c | 53 +++++++++++++++++++++++++++++++++++++++++++- ./include/linux/sched.h | 3 ++ 2 files changed, 55 insertions(+), 1 deletion(-) diff 1/block/ll_rw_blk.c~current~ 2/drivers/block/ll_rw_blk.c --- 1/block/ll_rw_blk.c~current~ 2005-11-07 10:01:36.000000000 +1100 +++ 2/block/ll_rw_blk.c 2005-11-07 10:33:47.000000000 +1100 @@ -2957,7 +2957,7 @@ static void handle_bad_sector(struct bio * bi_sector for remaps as it sees fit. So the values of these fields * should NOT be depended on after the call to generic_make_request. */ -void generic_make_request(struct bio *bio) +static inline void __generic_make_request(struct bio *bio) { request_queue_t *q; sector_t maxsector; @@ -3038,6 +3038,57 @@ end_io: } while (ret); } +/* + * We only want one ->make_request_fn to be active at a time, + * else stack usage with stacked devices could be a problem. + * So use current->bio_{list,tail} to keep a list of requests + * submited by a make_request_fn function. + * current->bio_tail is also used as a flag to say if + * generic_make_request is currently active in this task or not. + * If it is NULL, then no make_request is active. If it is non-NULL, + * then a make_request is active, and new requests should be added + * at the tail + */ +void generic_make_request(struct bio *bio) +{ + if (current->bio_tail) { + /* make_request is active */ + *(current->bio_tail) = bio; + bio->bi_next = NULL; + current->bio_tail = &bio->bi_next; + return; + } + /* following loop may be a bit non-obvious, and so deserves some + * explantion. + * Before entering the loop, bio->bi_next is NULL (as all callers + * ensure that) so we have a list with a single bio. + * We pretend that we have just taken it off a longer list, so + * we assign bio_list to the next (which is NULL) and bio_tail + * to &bio_list, thus initialising the bio_list of new bios to be + * added. __generic_make_request may indeed add some more bios + * through a recursive call to generic_make_request. If it + * did, we find a non-NULL value in bio_list and re-enter the loop + * from the top. In this case we really did just take the bio + * of the top of the list (no pretending) and so fixup bio_list and + * bio_tail or bi_next, and call into __generic_make_request again. + * + * The loop was structured like this to make only one call to + * __generic_make_request (which is important as it is large and inlined) + * and to keep the structure simple. + */ + BUG_ON(bio->bi_next); + do { + current->bio_list = bio->bi_next; + if (bio->bi_next == NULL) + current->bio_tail = ¤t->bio_list; + else + bio->bi_next = NULL; + __generic_make_request(bio); + bio = current->bio_list; + } while (bio); + current->bio_tail = NULL; /* deactivate */ +} + EXPORT_SYMBOL(generic_make_request); /** diff ./include/linux/sched.h~current~ ./include/linux/sched.h --- ./include/linux/sched.h~current~ 2005-11-07 10:01:36.000000000 +1100 +++ ./include/linux/sched.h 2005-11-07 10:02:23.000000000 +1100 @@ -829,6 +829,9 @@ struct task_struct { /* journalling filesystem info */ void *journal_info; +/* stacked block device info */ + struct bio *bio_list, **bio_tail; + /* VM state */ struct reclaim_state *reclaim_state; linux-2.6-debug-account-kmalloc.patch: linux-2.6.14/include/linux/slab.h | 29 +++++ linux-2.6.14/include/linux/string.h | 2 linux-2.6.14/mm/slab.c | 36 ------- tiny/fs/proc/proc_misc.c | 21 ++++ tiny/include/linux/slab.h | 19 +++ tiny/init/Kconfig | 7 + tiny/mm/Makefile | 1 tiny/mm/kmallocacct.c | 182 ++++++++++++++++++++++++++++++++++++ tiny/mm/slab.c | 8 + 9 files changed, 265 insertions(+), 40 deletions(-) --- NEW FILE linux-2.6-debug-account-kmalloc.patch --- /proc/kmalloc allocation tracing tiny-mpm/fs/proc/proc_misc.c | 21 ++++ tiny-mpm/include/linux/slab.h | 19 ++++ tiny-mpm/init/Kconfig | 7 + tiny-mpm/mm/Makefile | 2 tiny-mpm/mm/kmallocacct.c | 182 ++++++++++++++++++++++++++++++++++++++++++ tiny-mpm/mm/slab.c | 7 + 6 files changed, 237 insertions(+), 1 deletion(-) Index: tiny/init/Kconfig =================================================================== --- tiny.orig/init/Kconfig 2005-10-10 17:41:44.000000000 -0700 +++ tiny/init/Kconfig 2005-10-10 17:41:46.000000000 -0700 @@ -315,6 +315,13 @@ config BUG option for embedded systems with no facilities for reporting errors. Just say Y. +config KMALLOC_ACCOUNTING + default n + bool "Enabled accounting of kmalloc/kfree allocations" + help + This option records kmalloc and kfree activity and reports it via + /proc/kmalloc. + config BASE_FULL default y bool "Enable full-sized data structures for core" if EMBEDDED Index: tiny/mm/slab.c =================================================================== --- tiny.orig/mm/slab.c 2005-10-10 17:32:51.000000000 -0700 +++ tiny/mm/slab.c 2005-10-10 17:41:46.000000000 -0700 @@ -2911,6 +2911,8 @@ EXPORT_SYMBOL(kmalloc_node); void *__kmalloc(size_t size, unsigned int __nocast flags) { kmem_cache_t *cachep; + struct cache_sizes *csizep = malloc_sizes; + void *a; /* If you want to save a few bytes .text space: replace * __ with kmem_. @@ -2920,7 +2921,9 @@ void *__kmalloc(size_t size, unsigned in cachep = __find_general_cachep(size, flags); if (unlikely(cachep == NULL)) return NULL; - return __cache_alloc(cachep, flags); + a = __cache_alloc(cachep, flags); + kmalloc_account(a, cachep->objsize, size); + return a; } EXPORT_SYMBOL(__kmalloc); @@ -3020,6 +3023,8 @@ void kfree(const void *objp) kmem_cache_t *c; unsigned long flags; + kfree_account(objp, ksize(objp)); + if (unlikely(!objp)) return; local_irq_save(flags); Index: tiny/mm/kmallocacct.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ tiny/mm/kmallocacct.c 2005-10-10 17:41:46.000000000 -0700 @@ -0,0 +1,182 @@ +#include +#include +#include + +struct kma_caller { + const void *caller; + int total, net, slack, allocs, frees; +}; + +struct kma_list { + int callerhash; + const void *address; +}; + +#define MAX_CALLER_TABLE 512 +#define MAX_ALLOC_TRACK 4096 + +#define kma_hash(address, size) (((u32)address / (u32)size) % size) + +static struct kma_list kma_alloc[MAX_ALLOC_TRACK]; +static struct kma_caller kma_caller[MAX_CALLER_TABLE]; + +static int kma_callers; +static int kma_lost_callers, kma_lost_allocs, kma_unknown_frees; +static int kma_total, kma_net, kma_slack, kma_allocs, kma_frees; +static spinlock_t kma_lock = SPIN_LOCK_UNLOCKED; + +void __kmalloc_account(const void *caller, const void *addr, int size, int req) +{ + int i, hasha, hashc; + unsigned long flags; + + spin_lock_irqsave(&kma_lock, flags); + if(req >= 0) /* kmalloc */ + { + /* find callers slot */ + hashc = kma_hash(caller, MAX_CALLER_TABLE); + for (i = 0; i < MAX_CALLER_TABLE; i++) { + if (!kma_caller[hashc].caller || + kma_caller[hashc].caller == caller) + break; + hashc = (hashc + 1) % MAX_CALLER_TABLE; + } + + if (!kma_caller[hashc].caller) + kma_callers++; + + if (i < MAX_CALLER_TABLE) { + /* update callers stats */ + kma_caller[hashc].caller = caller; + kma_caller[hashc].total += size; + kma_caller[hashc].net += size; + kma_caller[hashc].slack += size - req; + kma_caller[hashc].allocs++; + + /* add malloc to list */ + hasha = kma_hash(addr, MAX_ALLOC_TRACK); + for (i = 0; i < MAX_ALLOC_TRACK; i++) { + if (!kma_alloc[hasha].callerhash) + break; + hasha = (hasha + 1) % MAX_ALLOC_TRACK; + } + + if(i < MAX_ALLOC_TRACK) { + kma_alloc[hasha].callerhash = hashc; + kma_alloc[hasha].address = addr; + } + else + kma_lost_allocs++; + } + else { + kma_lost_callers++; + kma_lost_allocs++; + } + + kma_total += size; + kma_net += size; + kma_slack += size - req; + kma_allocs++; + } + else { /* kfree */ + hasha = kma_hash(addr, MAX_ALLOC_TRACK); + for (i = 0; i < MAX_ALLOC_TRACK ; i++) { + if (kma_alloc[hasha].address == addr) + break; + hasha = (hasha + 1) % MAX_ALLOC_TRACK; + } + + if (i < MAX_ALLOC_TRACK) { + hashc = kma_alloc[hasha].callerhash; + kma_alloc[hasha].callerhash = 0; + kma_caller[hashc].net -= size; + kma_caller[hashc].frees++; + } + else + kma_unknown_frees++; + + kma_net -= size; + kma_frees++; + } + spin_unlock_irqrestore(&kma_lock, flags); +} + +static void *as_start(struct seq_file *m, loff_t *pos) +{ + int i; + loff_t n = *pos; + + if (!n) { + seq_printf(m, "total bytes allocated: %8d\n", kma_total); + seq_printf(m, "slack bytes allocated: %8d\n", kma_slack); + seq_printf(m, "net bytes allocated: %8d\n", kma_net); + seq_printf(m, "number of allocs: %8d\n", kma_allocs); + seq_printf(m, "number of frees: %8d\n", kma_frees); + seq_printf(m, "number of callers: %8d\n", kma_callers); + seq_printf(m, "lost callers: %8d\n", + kma_lost_callers); + seq_printf(m, "lost allocs: %8d\n", + kma_lost_allocs); + seq_printf(m, "unknown frees: %8d\n", + kma_unknown_frees); + seq_puts(m, "\n total slack net alloc/free caller\n"); + } + + for (i = 0; i < MAX_CALLER_TABLE; i++) { + if(kma_caller[i].caller) + n--; + if(n < 0) + return (void *)(i+1); + } + + return 0; +} + +static void *as_next(struct seq_file *m, void *p, loff_t *pos) +{ + int n = (int)p-1, i; + ++*pos; + + for (i = n + 1; i < MAX_CALLER_TABLE; i++) + if(kma_caller[i].caller) + return (void *)(i+1); + + return 0; +} + +static void as_stop(struct seq_file *m, void *p) +{ +} + +static int as_show(struct seq_file *m, void *p) +{ + int n = (int)p-1; + struct kma_caller *c; +#ifdef CONFIG_KALLSYMS + char *modname; + const char *name; + unsigned long offset = 0, size; + char namebuf[128]; + + c = &kma_caller[n]; + name = kallsyms_lookup((int)c->caller, &size, &offset, &modname, + namebuf); + seq_printf(m, "%8d %8d %8d %5d/%-5d %s+0x%lx\n", + c->total, c->slack, c->net, c->allocs, c->frees, + name, offset); +#else + c = &kma_caller[n]; + seq_printf(m, "%8d %8d %8d %5d/%-5d %p\n", + c->total, c->slack, c->net, c->allocs, c->frees, c->caller); +#endif + + return 0; +} + +struct seq_operations kmalloc_account_op = { + .start = as_start, + .next = as_next, + .stop = as_stop, + .show = as_show, +}; + Index: tiny/mm/Makefile =================================================================== --- tiny.orig/mm/Makefile 2005-10-10 17:30:45.000000000 -0700 +++ tiny/mm/Makefile 2005-10-10 17:41:46.000000000 -0700 @@ -12,6 +12,7 @@ obj-y := bootmem.o filemap.o mempool.o readahead.o slab.o swap.o truncate.o vmscan.o \ prio_tree.o $(mmu-y) +obj-$(CONFIG_KMALLOC_ACCOUNTING) += kmallocacct.o obj-$(CONFIG_SWAP) += page_io.o swap_state.o swapfile.o thrash.o obj-$(CONFIG_HUGETLBFS) += hugetlb.o obj-$(CONFIG_NUMA) += mempolicy.o Index: tiny/include/linux/slab.h =================================================================== --- tiny.orig/include/linux/slab.h 2005-10-10 17:32:41.000000000 -0700 +++ tiny/include/linux/slab.h 2005-10-10 17:41:46.000000000 -0700 @@ -53,6 +53,23 @@ typedef struct kmem_cache_s kmem_cache_t #define SLAB_CTOR_ATOMIC 0x002UL /* tell constructor it can't sleep */ #define SLAB_CTOR_VERIFY 0x004UL /* tell constructor it's a verify call */ +#ifdef CONFIG_KMALLOC_ACCOUNTING +void __kmalloc_account(const void *, const void *, int, int); + +static void inline kmalloc_account(const void *addr, int size, int req) +{ + __kmalloc_account(__builtin_return_address(0), addr, size, req); +} + +static void inline kfree_account(const void *addr, int size) +{ + __kmalloc_account(__builtin_return_address(0), addr, size, -1); +} +#else +#define kmalloc_account(a, b, c) +#define kfree_account(a, b) +#endif + /* prototypes */ extern void __init kmem_cache_init(void); @@ -78,6 +95,7 @@ extern void *__kmalloc(size_t, unsigned static inline void *kmalloc(size_t size, unsigned int __nocast flags) { +#ifndef CONFIG_KMALLOC_ACCOUNTING if (__builtin_constant_p(size)) { int i = 0; #define CACHE(x) \ @@ -96,6 +114,7 @@ found: malloc_sizes[i].cs_dmacachep : malloc_sizes[i].cs_cachep, flags); } +#endif return __kmalloc(size, flags); } Index: tiny/fs/proc/proc_misc.c =================================================================== --- tiny.orig/fs/proc/proc_misc.c 2005-10-10 17:30:45.000000000 -0700 +++ tiny/fs/proc/proc_misc.c 2005-10-10 17:41:46.000000000 -0700 @@ -337,6 +337,24 @@ static struct file_operations proc_slabi .release = seq_release, }; +#ifdef CONFIG_KMALLOC_ACCOUNTING + +extern struct seq_operations kmalloc_account_op; + +static int kmalloc_account_open(struct inode *inode, struct file *file) +{ + return seq_open(file, &kmalloc_account_op); +} + +static struct file_operations proc_kmalloc_account_operations = { + .open = kmalloc_account_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, +}; + +#endif + static int show_stat(struct seq_file *p, void *v) { int i; @@ -601,6 +619,9 @@ void __init proc_misc_init(void) create_seq_entry("stat", 0, &proc_stat_operations); create_seq_entry("interrupts", 0, &proc_interrupts_operations); create_seq_entry("slabinfo",S_IWUSR|S_IRUGO,&proc_slabinfo_operations); +#ifdef CONFIG_KMALLOC_ACCOUNTING + create_seq_entry("kmalloc",S_IRUGO,&proc_kmalloc_account_operations); +#endif create_seq_entry("buddyinfo",S_IRUGO, &fragmentation_file_operations); create_seq_entry("vmstat",S_IRUGO, &proc_vmstat_file_operations); create_seq_entry("zoneinfo",S_IRUGO, &proc_zoneinfo_file_operations); --- linux-2.6.14/mm/slab.c~ 2005-12-28 16:37:04.000000000 -0500 +++ linux-2.6.14/mm/slab.c 2005-12-28 16:37:14.000000000 -0500 @@ -3045,20 +3045,6 @@ void kmem_cache_free(kmem_cache_t *cache EXPORT_SYMBOL(kmem_cache_free); /** - * kzalloc - allocate memory. The memory is set to zero. - * @size: how many bytes of memory are required. - * @flags: the type of memory to allocate. - */ -void *kzalloc(size_t size, gfp_t flags) -{ - void *ret = kmalloc(size, flags); - if (ret) - memset(ret, 0, size); - return ret; -} -EXPORT_SYMBOL(kzalloc); - -/** * kfree - free previously allocated memory * @objp: pointer returned by kmalloc. * --- linux-2.6.14/include/linux/slab.h~ 2005-12-28 16:37:19.000000000 -0500 +++ linux-2.6.14/include/linux/slab.h 2005-12-28 16:38:51.000000000 -0500 @@ -118,7 +118,13 @@ found: return __kmalloc(size, flags); } -extern void *kzalloc(size_t, gfp_t); +static inline void *kzalloc(size_t size, gfp_t flags) +{ + void *ret = kmalloc(size, flags); + if (ret) + memset(ret, 0, size); + return ret; +} /** * kcalloc - allocate memory for an array. The memory is set to zero. --- linux-2.6.14/include/linux/slab.h~ 2005-12-28 19:04:06.000000000 -0500 +++ linux-2.6.14/include/linux/slab.h 2005-12-28 19:04:47.000000000 -0500 @@ -126,6 +126,27 @@ static inline void *kzalloc(size_t size, return ret; } +/* + * kstrdup - allocate space for and copy an existing string + * + * @s: the string to duplicate + * @gfp: the GFP mask used in the kmalloc() call when allocating memory + */ +static inline char *kstrdup(const char *s, gfp_t gfp) +{ + size_t len; + char *buf; + + if (!s) + return NULL; + + len = strlen(s) + 1; + buf = kmalloc(len, gfp); + if (buf) + memcpy(buf, s, len); + return buf; +} + /** * kcalloc - allocate memory for an array. The memory is set to zero. * @n: number of elements. --- linux-2.6.14/mm/slab.c~ 2005-12-28 19:04:54.000000000 -0500 +++ linux-2.6.14/mm/slab.c 2005-12-28 19:04:59.000000000 -0500 @@ -3669,25 +3669,3 @@ unsigned int ksize(const void *objp) return obj_reallen(page_get_cache(virt_to_page(objp))); } - -/* - * kstrdup - allocate space for and copy an existing string - * - * @s: the string to duplicate - * @gfp: the GFP mask used in the kmalloc() call when allocating memory - */ -char *kstrdup(const char *s, gfp_t gfp) -{ - size_t len; - char *buf; - - if (!s) - return NULL; - - len = strlen(s) + 1; - buf = kmalloc(len, gfp); - if (buf) - memcpy(buf, s, len); - return buf; -} -EXPORT_SYMBOL(kstrdup); --- linux-2.6.14/include/linux/string.h~ 2005-12-28 19:12:06.000000000 -0500 +++ linux-2.6.14/include/linux/string.h 2005-12-28 19:12:19.000000000 -0500 @@ -88,8 +88,6 @@ extern int memcmp(const void *,const voi extern void * memchr(const void *,int,__kernel_size_t); #endif -extern char *kstrdup(const char *s, gfp_t gfp); - #ifdef __cplusplus } #endif linux-2.6-debug-latency-tracing.patch: kernel/latency.c | 4 linux-2.6.14/include/asm-x86_64/unistd.h | 1 linux-2.6.14/kernel/latency.c | 2 linux-latency-tracing.q/Makefile | 10 linux-latency-tracing.q/arch/arm/boot/compressed/head.S | 13 linux-latency-tracing.q/arch/arm/kernel/calls.S | 6 linux-latency-tracing.q/arch/arm/kernel/entry-common.S | 111 linux-latency-tracing.q/arch/arm/kernel/fiq.c | 4 linux-latency-tracing.q/arch/arm/kernel/irq.c | 4 linux-latency-tracing.q/arch/arm/kernel/traps.c | 2 linux-latency-tracing.q/arch/arm/mm/copypage-v4mc.c | 4 linux-latency-tracing.q/arch/arm/mm/copypage-xscale.c | 4 linux-latency-tracing.q/arch/arm/mm/fault.c | 14 linux-latency-tracing.q/arch/i386/Kconfig | 2 linux-latency-tracing.q/arch/i386/boot/compressed/misc.c | 8 linux-latency-tracing.q/arch/i386/kernel/Makefile | 1 linux-latency-tracing.q/arch/i386/kernel/entry.S | 41 linux-latency-tracing.q/arch/i386/kernel/irq.c | 8 linux-latency-tracing.q/arch/i386/kernel/mcount-wrapper.S | 27 linux-latency-tracing.q/arch/ppc/boot/Makefile | 9 linux-latency-tracing.q/arch/ppc/kernel/entry.S | 82 linux-latency-tracing.q/arch/x86_64/kernel/entry.S | 48 linux-latency-tracing.q/arch/x86_64/kernel/vsyscall.c | 2 linux-latency-tracing.q/fs/proc/proc_misc.c | 17 linux-latency-tracing.q/include/asm-arm/pgalloc.h | 4 linux-latency-tracing.q/include/asm-arm/timex.h | 10 linux-latency-tracing.q/include/asm-arm/unistd.h | 3 linux-latency-tracing.q/include/asm-i386/system.h | 8 linux-latency-tracing.q/include/linux/interrupt.h | 10 linux-latency-tracing.q/include/linux/latency_hist.h | 32 linux-latency-tracing.q/include/linux/linkage.h | 2 linux-latency-tracing.q/include/linux/preempt.h | 20 linux-latency-tracing.q/include/linux/sched.h | 86 linux-latency-tracing.q/init/main.c | 9 linux-latency-tracing.q/kernel/Makefile | 3 linux-latency-tracing.q/kernel/latency.c | 2390 ++++++++++++++ linux-latency-tracing.q/kernel/latency_hist.c | 267 + linux-latency-tracing.q/kernel/sched.c | 103 linux-latency-tracing.q/kernel/sysctl.c | 77 linux-latency-tracing.q/kernel/time.c | 19 linux-latency-tracing.q/lib/Kconfig.debug | 149 linux/arch/arm/boot/compressed/misc.c | 1 linux/arch/arm26/boot/compressed/misc.c | 1 linux/arch/i386/boot/compressed/misc.c | 1 linux/arch/ppc/boot/lib/Makefile | 48 linux/arch/x86_64/boot/compressed/misc.c | 1 linux/lib/inflate.c | 44 linux/lib/zlib_inflate/inftrees.c | 45 48 files changed, 3655 insertions(+), 102 deletions(-) --- NEW FILE linux-2.6-debug-latency-tracing.patch --- this patch reduces the ~2500+ worst-case stack footprint of zlib to ~500 bytes, by making the largest arrays static and by introducing a spinlock to protect access to them. Signed-off-by: Ingo Molnar arch/arm/boot/compressed/misc.c | 1 arch/arm26/boot/compressed/misc.c | 1 arch/i386/boot/compressed/misc.c | 1 arch/x86_64/boot/compressed/misc.c | 1 lib/inflate.c | 44 +++++++++++++++++++++++++++--------- lib/zlib_inflate/inftrees.c | 45 ++++++++++++++++++++++++++++--------- 6 files changed, 72 insertions(+), 21 deletions(-) Index: linux/arch/arm/boot/compressed/misc.c =================================================================== --- linux.orig/arch/arm/boot/compressed/misc.c +++ linux/arch/arm/boot/compressed/misc.c @@ -199,6 +199,7 @@ static ulg free_mem_ptr_end; #define HEAP_SIZE 0x2000 +#define ZLIB_INFLATE_NO_INFLATE_LOCK #include "../../../../lib/inflate.c" #ifndef STANDALONE_DEBUG Index: linux/arch/arm26/boot/compressed/misc.c =================================================================== --- linux.orig/arch/arm26/boot/compressed/misc.c +++ linux/arch/arm26/boot/compressed/misc.c @@ -184,6 +184,7 @@ static ulg free_mem_ptr_end; #define HEAP_SIZE 0x2000 +#define ZLIB_INFLATE_NO_INFLATE_LOCK #include "../../../../lib/inflate.c" #ifndef STANDALONE_DEBUG Index: linux/arch/i386/boot/compressed/misc.c =================================================================== --- linux.orig/arch/i386/boot/compressed/misc.c +++ linux/arch/i386/boot/compressed/misc.c @@ -125,6 +125,7 @@ static int lines, cols; static void * xquad_portio = NULL; #endif +#define ZLIB_INFLATE_NO_INFLATE_LOCK #include "../../../../lib/inflate.c" static void *malloc(int size) Index: linux/arch/x86_64/boot/compressed/misc.c =================================================================== --- linux.orig/arch/x86_64/boot/compressed/misc.c +++ linux/arch/x86_64/boot/compressed/misc.c @@ -114,6 +114,7 @@ static char *vidmem = (char *)0xb8000; static int vidport; static int lines, cols; +#define ZLIB_INFLATE_NO_INFLATE_LOCK #include "../../../../lib/inflate.c" static void *malloc(int size) Index: linux/lib/inflate.c =================================================================== --- linux.orig/lib/inflate.c +++ linux/lib/inflate.c @@ -141,6 +141,25 @@ struct huft { } v; }; +/* + * turn off the inflate_lock for the bootloader code, it is + * single-threaded and has no need for (nor access to) the + * kernel's locking primitives: + */ +#ifdef ZLIB_INFLATE_NO_INFLATE_LOCK +# undef DEFINE_SPINLOCK +# undef spin_lock +# undef spin_unlock +# define DEFINE_SPINLOCK(x) int x +# define spin_lock(x) (void)(x) +# define spin_unlock(x) (void)(x) +#endif + +/* + * lock protecting static variables of huft_build() and other inflate + * functions, to reduce their insane stack footprint. + */ +static DEFINE_SPINLOCK(inflate_lock); /* Function prototypes */ STATIC int INIT huft_build OF((unsigned *, unsigned, unsigned, @@ -304,7 +323,7 @@ STATIC int INIT huft_build( register struct huft *q; /* points to current table */ struct huft r; /* table entry for structure assignment */ struct huft *u[BMAX]; /* table stack */ - unsigned v[N_MAX]; /* values in order of bit length */ + static unsigned v[N_MAX]; /* values in order of bit length */ register int w; /* bits before this table == (l * h) */ unsigned x[BMAX+1]; /* bit offsets, then code stack */ unsigned *xp; /* pointer into x */ @@ -705,7 +724,7 @@ STATIC int noinline INIT inflate_fixed(v struct huft *td; /* distance code table */ int bl; /* lookup bits for tl */ int bd; /* lookup bits for td */ - unsigned l[288]; /* length list for huft_build */ + static unsigned l[288]; /* length list for huft_build */ DEBG(""); /* bad block type */ - return 2; + return ret; underrun: return 4; /* Input underrun */ Index: linux/lib/zlib_inflate/inftrees.c =================================================================== --- linux.orig/lib/zlib_inflate/inftrees.c +++ linux/lib/zlib_inflate/inftrees.c @@ -4,11 +4,19 @@ */ #include +#include #include "inftrees.h" #include "infutil.h" static const char inflate_copyright[] __attribute_used__ = " inflate 1.1.3 Copyright 1995-1998 Mark Adler "; + +/* + * lock protecting static variables of huft_build() and other inflate + * functions, to reduce their insane stack footprint. + */ +static DEFINE_SPINLOCK(inflate_lock); + /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -107,7 +115,7 @@ static int huft_build( { uInt a; /* counter for codes of length k */ - uInt c[BMAX+1]; /* bit length count table */ + static uInt c[BMAX+1]; /* bit length count table */ uInt f; /* i repeats in table every f entries */ int g; /* maximum code length */ int h; /* table level */ @@ -118,10 +126,10 @@ static int huft_build( uInt mask; /* (1 << w) - 1, to avoid cc -O bug on HP */ register uInt *p; /* pointer into c[], b[], or v[] */ inflate_huft *q; /* points to current table */ - struct inflate_huft_s r; /* table entry for structure assignment */ - inflate_huft *u[BMAX]; /* table stack */ + static struct inflate_huft_s r; /* table entry for structure assignment */ + static inflate_huft *u[BMAX]; /* table stack */ [...4391 lines suppressed...] + depends on PREEMPT + help + This option measures the time spent in preempt-off critical + sections, with microsecond accuracy. + + The default measurement method is a maximum search, which is + disabled by default and can be runtime (re-)started via: + + echo 0 > /proc/sys/kernel/preempt_max_latency + + (Note that kernel size and overhead increases with this option + enabled. This option and the irqs-off timing option can be + used together or separately.) + +config PREEMPT_OFF_HIST + bool "non-preemptible critical section latency histogram" + default n + depends on CRITICAL_PREEMPT_TIMING + help + This option logs all the non-preemptible critical section latency + timing to a big histogram bucket, in the meanwhile, it also + dummies up printk produced by non-preemptible critical section + latency timing. + + The non-preemptible critical section latency timing histogram can + be viewed via: + + cat /proc/latency_hist/preempt_off_latency/CPU* + + (Note: * presents CPU ID.) + +config CRITICAL_IRQSOFF_TIMING + bool "Interrupts-off critical section latency timing" + default n + help + This option measures the time spent in irqs-off critical + sections, with microsecond accuracy. + + The default measurement method is a maximum search, which is + disabled by default and can be runtime (re-)started via: + + echo 0 > /proc/sys/kernel/preempt_max_latency + + (Note that kernel size and overhead increases with this option + enabled. This option and the preempt-off timing option can be + used together or separately.) + +config INTERRUPT_OFF_HIST + bool "interrupts-off critical section latency histogram" + default n + depends on CRITICAL_IRQSOFF_TIMING + help + This option logs all the interrupts-off critical section latency + timing to a big histogram bucket, in the meanwhile, it also + dummies up printk produced by interrupts-off critical section + latency timing. + + The interrupts-off critical section latency timing histogram can + be viewed via: + + cat /proc/latency_hist/interrupt_off_latency/CPU* + + (Note: * presents CPU ID.) + +config CRITICAL_TIMING + bool + default y + depends on CRITICAL_PREEMPT_TIMING || CRITICAL_IRQSOFF_TIMING + +config LATENCY_TIMING + bool + default y + depends on WAKEUP_TIMING || CRITICAL_TIMING + +config CRITICAL_LATENCY_HIST + bool + default y + depends on PREEMPT_OFF_HIST || INTERRUPT_OFF_HIST + +config LATENCY_HIST + bool + default y + depends on WAKEUP_LATENCY_HIST || CRITICAL_LATENCY_HIST + +config LATENCY_TRACE + bool "Latency tracing" + default n + depends on LATENCY_TIMING + help + This option enables a kernel tracing mechanism that will track + precise function-call granularity kernel execution during + wakeup paths or critical sections. When this option is enabled + then the last maximum latency timing event's full trace can be + found in /proc/latency_trace, in a human-readable (or rather as + some would say, in a kernel-developer-readable) form. + + (Note that kernel size and overhead increases noticeably + with this option enabled.) + +config MCOUNT + bool + depends on LATENCY_TRACE + default y + config DEBUG_KOBJECT bool "kobject debugging" depends on DEBUG_KERNEL @@ -176,9 +316,9 @@ config DEBUG_VM If unsure, say N. -config FRAME_POINTER +config USE_FRAME_POINTER bool "Compile the kernel with frame pointers" - depends on DEBUG_KERNEL && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML) + depends on DEBUG_KERNEL && !MCOUNT && (X86 || CRIS || M68K || M68KNOMMU || FRV || UML) default y if DEBUG_INFO && UML help If you say Y here the resulting kernel image will be slightly larger @@ -186,6 +326,11 @@ config FRAME_POINTER some architectures or if you use external debuggers. If you don't debug the kernel, you can say N. +config FRAME_POINTER + bool + depends on USE_FRAME_POINTER || MCOUNT + default y + config RCU_TORTURE_TEST tristate "torture tests for RCU" depends on DEBUG_KERNEL init/main.c | 9 +++++++++ 1 files changed, 9 insertions(+) Index: linux-latency-tracing.q/init/main.c =================================================================== --- linux-latency-tracing.q.orig/init/main.c +++ linux-latency-tracing.q/init/main.c @@ -108,6 +108,8 @@ extern void tc_init(void); enum system_states system_state; EXPORT_SYMBOL(system_state); +extern cycles_t preempt_max_latency; + /* * Boot command-line arguments */ @@ -544,6 +546,13 @@ asmlinkage void __init start_kernel(void acpi_early_init(); /* before LAPIC and SMP init */ +#ifdef CONFIG_LATENCY_TIMING + /* + * Start tracing now - the bootup traces arent too interesting: + */ + preempt_max_latency = 1000; +#endif + /* Do the rest non-__init'ed, we're now alive */ rest_init(); } kernel/latency.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: linux-latency-tracing.q/kernel/latency.c =================================================================== --- linux-latency-tracing.q.orig/kernel/latency.c +++ linux-latency-tracing.q/kernel/latency.c @@ -316,8 +316,8 @@ static void notrace printk_name(unsigned static unsigned long *worst_stack_bp; #endif static DEFINE_RAW_SPINLOCK(worst_stack_lock); -unsigned long worst_stack_left = THREAD_SIZE; -static unsigned long worst_stack_printed = THREAD_SIZE; +unsigned long worst_stack_left = THREAD_SIZE/2; +static unsigned long worst_stack_printed = THREAD_SIZE/2; static char worst_stack_comm[TASK_COMM_LEN+1]; static int worst_stack_pid; static unsigned long worst_stack_sp; --- linux-2.6.14/kernel/latency.c~ 2005-12-29 21:03:11.000000000 -0500 +++ linux-2.6.14/kernel/latency.c 2005-12-29 21:03:51.000000000 -0500 @@ -24,6 +24,8 @@ #include #include #include +#include +#include #ifndef CONFIG_PREEMPT_RT # define DEFINE_RAW_SPINLOCK DEFINE_SPINLOCK --- linux-2.6.14/include/asm-x86_64/unistd.h~ 2005-12-29 21:12:32.000000000 -0500 +++ linux-2.6.14/include/asm-x86_64/unistd.h 2005-12-29 21:13:05.000000000 -0500 @@ -581,6 +581,7 @@ __SYSCALL(__NR_inotify_add_watch, sys_in __SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch) #define __NR_syscall_max __NR_inotify_rm_watch +#define NR_syscalls 256 #ifndef __NO_STUBS /* user-visible error numbers are in the range -1 - -4095 */ linux-2.6-dm-sync-overrun.patch: dm-log.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-dm-sync-overrun.patch --- --- linux-2.6.15/drivers/md/dm-log.c~ 2006-01-09 14:09:53.000000000 -0500 +++ linux-2.6.15/drivers/md/dm-log.c 2006-01-09 14:10:03.000000000 -0500 @@ -573,7 +573,7 @@ static int core_get_resync_work(struct d lc->sync_search); lc->sync_search = *region + 1; - if (*region == lc->region_count) + if (*region >= lc->region_count) return 0; } while (log_test_bit(lc->recovering_bits, *region)); linux-2.6-edid-check.patch: video.S | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-edid-check.patch --- --- linux-2.6.15/arch/i386/boot/video.S~ 2006-01-06 01:26:06.000000000 -0500 +++ linux-2.6.15/arch/i386/boot/video.S 2006-01-06 01:28:40.000000000 -0500 @@ -1951,9 +1951,18 @@ store_edid: stosl movw $0x4f15, %ax # do VBE/DDC - movw $0x01, %bx + movw $0x00, %bx # INSTALLATION CHECK / CAPABILITIES movw $0x00, %cx - movw $0x00, %dx + movw $0x00, %dx + movw $0x140, %di + int $0x10 + cmpb $0x01, %ah + je no_edid + + movw $0x4f15, %ax # do VBE/DDC + movw $0x01, %bx # READ_EDID + movw $0x00, %cx + movw $0x00, %dx movw $0x140, %di int $0x10 --- linux-2.6.15/arch/i386/boot/video.S~ 2006-01-06 02:55:20.000000000 -0500 +++ linux-2.6.15/arch/i386/boot/video.S 2006-01-06 02:55:28.000000000 -0500 @@ -1966,6 +1966,7 @@ store_edid: movw $0x140, %di int $0x10 +no_edid: popw %di # restore all registers popw %dx popw %cx linux-2.6-ia64-spinlock-size.patch: arch/ia64/sn/include/xtalk/hubdev.h | 16 ++++- arch/ia64/sn/kernel/io_init.c | 92 ++++++++++++++++++-------------- arch/ia64/sn/pci/pcibr/pcibr_dma.c | 34 ++++++----- arch/ia64/sn/pci/pcibr/pcibr_provider.c | 20 +++--- include/asm-ia64/sn/sn_sal.h | 3 - 5 files changed, 94 insertions(+), 71 deletions(-) --- NEW FILE linux-2.6-ia64-spinlock-size.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176827 Upstream status: Prarit submitted post 2.6.15 Patch to fix sn_flush_device_kernel & spinlock initialization This patch separates the sn_flush_device_list struct into kernel and common (both kernel and PROM accessible) structures. As it was, if the size of a spinlock_t changed (due to additional CONFIG options, etc.) the sal call which populated the sn_flush_device_list structs would erroneously write data (and cause memory corruption and/or a panic). This patch does the following: 1. Removes sn_flush_device_list and adds sn_flush_device_common and sn_flush_device_kernel. 2. Adds a new SAL call to populate a sn_flush_device_common struct per device, not per widget as previously done. 3. Correctly initializes each device's sn_flush_device_kernel spinlock_t struct (before it was only doing each widget's first device). diff -urNp fedora-orig/arch/ia64/sn/include/xtalk/hubdev.h fedora-work/arch/ia64/sn/include/xtalk/hubdev.h --- fedora-orig/arch/ia64/sn/include/xtalk/hubdev.h 2006-01-03 10:36:41.000000000 -0500 +++ fedora-work/arch/ia64/sn/include/xtalk/hubdev.h 2006-01-03 10:37:21.000000000 -0500 @@ -26,11 +26,14 @@ #define IIO_NUM_ITTES 7 #define HUB_NUM_BIG_WINDOW (IIO_NUM_ITTES - 1) -struct sn_flush_device_list { +/* This struct is shared between the PROM and the kernel. + * Changes to this struct will require corresponding changes to the kernel. + */ +struct sn_flush_device_common { int sfdl_bus; int sfdl_slot; int sfdl_pin; - struct bar_list { + struct common_bar_list { unsigned long start; unsigned long end; } sfdl_bar_list[6]; @@ -40,14 +43,19 @@ struct sn_flush_device_list { uint32_t sfdl_persistent_busnum; uint32_t sfdl_persistent_segment; struct pcibus_info *sfdl_pcibus_info; +}; + +/* This struct is kernel only and is not used by the PROM */ +struct sn_flush_device_kernel { spinlock_t sfdl_flush_lock; + struct sn_flush_device_common *common; }; /* - * **widget_p - Used as an array[wid_num][device] of sn_flush_device_list. + * **widget_p - Used as an array[wid_num][device] of sn_flush_device_kernel. */ struct sn_flush_nasid_entry { - struct sn_flush_device_list **widget_p; /* Used as a array of wid_num */ + struct sn_flush_device_kernel **widget_p; // Used as an array of wid_num uint64_t iio_itte[8]; }; diff -urNp fedora-orig/arch/ia64/sn/kernel/io_init.c fedora-work/arch/ia64/sn/kernel/io_init.c --- fedora-orig/arch/ia64/sn/kernel/io_init.c 2006-01-03 10:36:41.000000000 -0500 +++ fedora-work/arch/ia64/sn/kernel/io_init.c 2006-01-03 10:37:21.000000000 -0500 @@ -76,11 +76,12 @@ static struct sn_pcibus_provider sn_pci_ }; /* - * Retrieve the DMA Flush List given nasid. This list is needed - * to implement the WAR - Flush DMA data on PIO Reads. + * Retrieve the DMA Flush List given nasid, widget, and device. + * This list is needed to implement the WAR - Flush DMA data on PIO Reads. */ -static inline uint64_t -sal_get_widget_dmaflush_list(u64 nasid, u64 widget_num, u64 address) +static inline u64 +sal_get_device_dmaflush_list(u64 nasid, u64 widget_num, u64 device_num, + u64 address) { struct ia64_sal_retval ret_stuff; @@ -88,17 +89,17 @@ sal_get_widget_dmaflush_list(u64 nasid, ret_stuff.v0 = 0; SAL_CALL_NOLOCK(ret_stuff, - (u64) SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST, - (u64) nasid, (u64) widget_num, (u64) address, 0, 0, 0, - 0); - return ret_stuff.v0; + (u64) SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST, + (u64) nasid, (u64) widget_num, + (u64) device_num, (u64) address, 0, 0, 0); + return ret_stuff.status; } /* * Retrieve the hub device info structure for the given nasid. */ -static inline uint64_t sal_get_hubdev_info(u64 handle, u64 address) +static inline u64 sal_get_hubdev_info(u64 handle, u64 address) { struct ia64_sal_retval ret_stuff; @@ -114,7 +115,7 @@ static inline uint64_t sal_get_hubdev_in /* * Retrieve the pci bus information given the bus number. */ -static inline uint64_t sal_get_pcibus_info(u64 segment, u64 busnum, u64 address) +static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64 address) { struct ia64_sal_retval ret_stuff; @@ -130,7 +131,7 @@ static inline uint64_t sal_get_pcibus_in /* * Retrieve the pci device information given the bus and device|function number. */ -static inline uint64_t +static inline u64 sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev, u64 sn_irq_info) { @@ -170,12 +171,12 @@ sn_pcidev_info_get(struct pci_dev *dev) */ static void sn_fixup_ionodes(void) { - - struct sn_flush_device_list *sn_flush_device_list; + struct sn_flush_device_kernel *sn_flush_device_kernel; + struct sn_flush_device_kernel *dev_entry; struct hubdev_info *hubdev; - uint64_t status; - uint64_t nasid; - int i, widget; + u64 status; + u64 nasid; + int i, widget, device; /* * Get SGI Specific HUB chipset information. @@ -186,7 +187,7 @@ static void sn_fixup_ionodes(void) nasid = cnodeid_to_nasid(i); hubdev->max_segment_number = 0xffffffff; hubdev->max_pcibus_number = 0xff; - status = sal_get_hubdev_info(nasid, (uint64_t) __pa(hubdev)); + status = sal_get_hubdev_info(nasid, (u64) __pa(hubdev)); if (status) continue; @@ -213,38 +214,49 @@ static void sn_fixup_ionodes(void) hubdev->hdi_flush_nasid_list.widget_p = kmalloc((HUB_WIDGET_ID_MAX + 1) * - sizeof(struct sn_flush_device_list *), GFP_KERNEL); - + sizeof(struct sn_flush_device_kernel *), + GFP_KERNEL); memset(hubdev->hdi_flush_nasid_list.widget_p, 0x0, (HUB_WIDGET_ID_MAX + 1) * - sizeof(struct sn_flush_device_list *)); + sizeof(struct sn_flush_device_kernel *)); for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) { - sn_flush_device_list = kmalloc(DEV_PER_WIDGET * - sizeof(struct - sn_flush_device_list), - GFP_KERNEL); - memset(sn_flush_device_list, 0x0, + sn_flush_device_kernel = kmalloc(DEV_PER_WIDGET * + sizeof(struct + sn_flush_device_kernel), + GFP_KERNEL); + if (!sn_flush_device_kernel) + BUG(); + memset(sn_flush_device_kernel, 0x0, DEV_PER_WIDGET * - sizeof(struct sn_flush_device_list)); + sizeof(struct sn_flush_device_kernel)); - status = - sal_get_widget_dmaflush_list(nasid, widget, - (uint64_t) - __pa - (sn_flush_device_list)); - if (status) { - kfree(sn_flush_device_list); - continue; - } + dev_entry = sn_flush_device_kernel; + for (device = 0; device < DEV_PER_WIDGET; + device++,dev_entry++) { + dev_entry->common = kmalloc(sizeof(struct + sn_flush_device_common), + GFP_KERNEL); + if (!dev_entry->common) + BUG(); + memset(dev_entry->common, 0x0, sizeof(struct + sn_flush_device_common)); + + status = sal_get_device_dmaflush_list(nasid, + widget, + device, + (u64)(dev_entry->common)); + if (status) + BUG(); - spin_lock_init(&sn_flush_device_list->sfdl_flush_lock); - hubdev->hdi_flush_nasid_list.widget_p[widget] = - sn_flush_device_list; - } + spin_lock_init(&dev_entry->sfdl_flush_lock); + } + if (sn_flush_device_kernel) + hubdev->hdi_flush_nasid_list.widget_p[widget] = + sn_flush_device_kernel; + } } - } /* diff -urNp fedora-orig/arch/ia64/sn/pci/pcibr/pcibr_dma.c fedora-work/arch/ia64/sn/pci/pcibr/pcibr_dma.c --- fedora-orig/arch/ia64/sn/pci/pcibr/pcibr_dma.c 2006-01-03 10:36:41.000000000 -0500 +++ fedora-work/arch/ia64/sn/pci/pcibr/pcibr_dma.c 2006-01-03 10:37:21.000000000 -0500 @@ -218,7 +218,9 @@ void sn_dma_flush(uint64_t addr) uint64_t flags; uint64_t itte; struct hubdev_info *hubinfo; - volatile struct sn_flush_device_list *p; + volatile struct sn_flush_device_kernel *p; + volatile struct sn_flush_device_common *common; + struct sn_flush_nasid_entry *flush_nasid_list; if (!sn_ioif_inited) @@ -268,17 +270,17 @@ void sn_dma_flush(uint64_t addr) p = &flush_nasid_list->widget_p[wid_num][0]; /* find a matching BAR */ - for (i = 0; i < DEV_PER_WIDGET; i++) { + for (i = 0; i < DEV_PER_WIDGET; i++,p++) { + common = p->common; for (j = 0; j < PCI_ROM_RESOURCE; j++) { - if (p->sfdl_bar_list[j].start == 0) + if (common->sfdl_bar_list[j].start == 0) break; - if (addr >= p->sfdl_bar_list[j].start - && addr <= p->sfdl_bar_list[j].end) + if (addr >= common->sfdl_bar_list[j].start + && addr <= common->sfdl_bar_list[j].end) break; } - if (j < PCI_ROM_RESOURCE && p->sfdl_bar_list[j].start != 0) + if (j < PCI_ROM_RESOURCE && common->sfdl_bar_list[j].start != 0) break; - p++; } /* if no matching BAR, return without doing anything. */ @@ -304,24 +306,24 @@ void sn_dma_flush(uint64_t addr) if ((1 << XWIDGET_PART_REV_NUM_REV(revnum)) & PV907516) { return; } else { - pcireg_wrb_flush_get(p->sfdl_pcibus_info, - (p->sfdl_slot - 1)); + pcireg_wrb_flush_get(common->sfdl_pcibus_info, + (common->sfdl_slot - 1)); } } else { - spin_lock_irqsave(&((struct sn_flush_device_list *)p)-> - sfdl_flush_lock, flags); - - *p->sfdl_flush_addr = 0; + spin_lock_irqsave((spinlock_t *)&p->sfdl_flush_lock, + flags); + *common->sfdl_flush_addr = 0; /* force an interrupt. */ - *(volatile uint32_t *)(p->sfdl_force_int_addr) = 1; + *(volatile uint32_t *)(common->sfdl_force_int_addr) = 1; /* wait for the interrupt to come back. */ - while (*(p->sfdl_flush_addr) != 0x10f) + while (*(common->sfdl_flush_addr) != 0x10f) cpu_relax(); /* okay, everything is synched up. */ - spin_unlock_irqrestore((spinlock_t *)&p->sfdl_flush_lock, flags); + spin_unlock_irqrestore((spinlock_t *)&p->sfdl_flush_lock, + flags); } return; } diff -urNp fedora-orig/arch/ia64/sn/pci/pcibr/pcibr_provider.c fedora-work/arch/ia64/sn/pci/pcibr/pcibr_provider.c --- fedora-orig/arch/ia64/sn/pci/pcibr/pcibr_provider.c 2006-01-03 10:36:41.000000000 -0500 +++ fedora-work/arch/ia64/sn/pci/pcibr/pcibr_provider.c 2006-01-03 10:37:21.000000000 -0500 @@ -92,7 +92,8 @@ pcibr_bus_fixup(struct pcibus_bussoft *p cnodeid_t near_cnode; struct hubdev_info *hubdev_info; struct pcibus_info *soft; - struct sn_flush_device_list *sn_flush_device_list; + struct sn_flush_device_kernel *sn_flush_device_kernel; + struct sn_flush_device_common *common; if (! IS_PCI_BRIDGE_ASIC(prom_bussoft->bs_asic_type)) { return NULL; @@ -137,20 +138,19 @@ pcibr_bus_fixup(struct pcibus_bussoft *p hubdev_info = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo); if (hubdev_info->hdi_flush_nasid_list.widget_p) { - sn_flush_device_list = hubdev_info->hdi_flush_nasid_list. + sn_flush_device_kernel = hubdev_info->hdi_flush_nasid_list. widget_p[(int)soft->pbi_buscommon.bs_xid]; - if (sn_flush_device_list) { + if (sn_flush_device_kernel) { for (j = 0; j < DEV_PER_WIDGET; - j++, sn_flush_device_list++) { - if (sn_flush_device_list->sfdl_slot == -1) + j++, sn_flush_device_kernel++) { + common = sn_flush_device_kernel->common; + if (common->sfdl_slot == -1) continue; - if ((sn_flush_device_list-> - sfdl_persistent_segment == + if ((common->sfdl_persistent_segment == soft->pbi_buscommon.bs_persist_segment) && - (sn_flush_device_list-> - sfdl_persistent_busnum == + (common->sfdl_persistent_busnum == soft->pbi_buscommon.bs_persist_busnum)) - sn_flush_device_list->sfdl_pcibus_info = + common->sfdl_pcibus_info = soft; } } diff -urNp fedora-orig/include/asm-ia64/sn/sn_sal.h fedora-work/include/asm-ia64/sn/sn_sal.h --- fedora-orig/include/asm-ia64/sn/sn_sal.h 2006-01-03 10:36:41.000000000 -0500 +++ fedora-work/include/asm-ia64/sn/sn_sal.h 2006-01-03 10:37:21.000000000 -0500 @@ -75,7 +75,8 @@ #define SN_SAL_IOIF_GET_HUBDEV_INFO 0x02000055 #define SN_SAL_IOIF_GET_PCIBUS_INFO 0x02000056 #define SN_SAL_IOIF_GET_PCIDEV_INFO 0x02000057 -#define SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST 0x02000058 +#define SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST 0x02000058 // deprecated +#define SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST 0x0200005a #define SN_SAL_HUB_ERROR_INTERRUPT 0x02000060 #define SN_SAL_BTE_RECOVER 0x02000061 linux-2.6-kill-blk_attempt_merge.patch: block/ll_rw_blk.c | 24 ------------------------ drivers/ide/ide-cd.c | 10 ---------- include/linux/blkdev.h | 1 - 3 files changed, 35 deletions(-) --- NEW FILE linux-2.6-kill-blk_attempt_merge.patch --- On Fri, Jan 06 2006, Dave Jones wrote: > Looks like some nice slab poison... > > Dave > > Oops: 0000 [#1] > last sysfs file: > /devices/pci0000:00/0000:00:1d.7/usb1/1-0:1.0/bAlternateSettingModules linked > in: usb_storage ata_piix libata e1000 ohci1394 ieee1394 uhci_hcdsCPU: 0 > EIP: 0060:[] Not tainted VLI > EFLAGS: 00010002 (2.6.15-1.1819_FC5) > EIP is at rb_next+0x9/0x22 > eax: 6b6b6b6b ebx: dfed01f8 ecx: c01bf65a edx: 6b6b6b6b > esi: c1991e98 edi: 00000202 ebp: dfed403c esp: c03c1f14 > ds: 007b es: 007b ss: 0068 > Process swapper (pid: 0, threadinfo=c03c1000 task=c0327ba0) > Stack: c01bf662 c01b5dfa dfed01f8 c01b85dc c040c284 00000004 c1991e98 c023c8ab > c1991e98 00000000 c040c284 00000000 c023d3a4 000194d0 00000000 dfed403c > c1991e98 c040c284 c1991e98 00000000 c0231f2d 000194d0 00000000 000194d0 > Call Trace: > [] cfq_latter_request+0x8/0x14 [] elv_latter_request+07 > [] blk_attempt_remerge+0x1d/0x3c [] cdrom_start_read+0e > [] ide_do_rw_cdrom+0xdd/0x14a [] start_request+0x1b1/01 > [] ide_do_request+0x2a0/0x2fb [] ide_intr+0xf3/0x11b > [] cdrom_read_intr+0x0/0x2a1 [] handle_IRQ_event+0x23/c > [] __do_IRQ+0x7a/0xcd [] do_IRQ+0x5c/0x77 > ======================= > [] common_interrupt+0x1a/0x20 [] mwait_idle+0x1a/0x2e > [] cpu_idle+0x38/0x4d [] start_kernel+0x17a/0x17c > Code: 85 c0 74 0b 8b 50 0c 85 d2 74 04 89 d0 eb f5 c3 8b 00 85 c0 74 0b 8b 50 0 The blk_attempt_remerge() is a bad interface to be honest, and it's hard to get to work reliably because it's done too late. I think the best option is just to kill it, this will cause problems with other io schedulers as well. I've merged this up for 2.6.16-rc inclusion, probably should go to stabel as well. --- [PATCH] Kill blk_attempt_remerge() It's a bad interface, and it's always done too late. Remove it. Signed-off-by: Jens Axboe --- linux-2.6.15/block/ll_rw_blk.c~ 2006-01-09 11:30:20.000000000 -0500 +++ linux-2.6.15/block/ll_rw_blk.c 2006-01-09 11:30:43.000000000 -0500 @@ -2609,30 +2609,6 @@ static inline int attempt_front_merge(re return 0; } -/** - * blk_attempt_remerge - attempt to remerge active head with next request - * @q: The &request_queue_t belonging to the device - * @rq: The head request (usually) - * - * Description: - * For head-active devices, the queue can easily be unplugged so quickly - * that proper merging is not done on the front request. This may hurt - * performance greatly for some devices. The block layer cannot safely - * do merging on that first request for these queues, but the driver can - * call this function and make it happen any way. Only the driver knows - * when it is safe to do so. - **/ -void blk_attempt_remerge(request_queue_t *q, struct request *rq) -{ - unsigned long flags; - - spin_lock_irqsave(q->queue_lock, flags); - attempt_back_merge(q, rq); - spin_unlock_irqrestore(q->queue_lock, flags); -} - -EXPORT_SYMBOL(blk_attempt_remerge); - static int __make_request(request_queue_t *q, struct bio *bio) { struct request *req; --- linux-2.6.15/drivers/ide/ide-cd.c~ 2006-01-09 11:30:50.000000000 -0500 +++ linux-2.6.15/drivers/ide/ide-cd.c 2006-01-09 11:30:55.000000000 -0500 @@ -1338,8 +1338,6 @@ static ide_startstop_t cdrom_start_read if (cdrom_read_from_buffer(drive)) return ide_stopped; - blk_attempt_remerge(drive->queue, rq); - /* Clear the local sector buffer. */ info->nsectors_buffered = 0; --- linux-2.6.15/include/linux/blkdev.h~ 2006-01-09 11:31:17.000000000 -0500 +++ linux-2.6.15/include/linux/blkdev.h 2006-01-09 11:31:20.000000000 -0500 @@ -559,7 +559,6 @@ extern void register_disk(struct gendisk extern void generic_make_request(struct bio *bio); extern void blk_put_request(struct request *); extern void blk_end_sync_rq(struct request *rq); -extern void blk_attempt_remerge(request_queue_t *, struct request *); extern struct request *blk_get_request(request_queue_t *, int, gfp_t); extern void blk_insert_request(request_queue_t *, struct request *, int, void *); extern void blk_requeue_request(request_queue_t *, struct request *); --- linux-2.6.15/drivers/ide/ide-cd.c~ 2006-01-09 11:44:09.000000000 -0500 +++ linux-2.6.15/drivers/ide/ide-cd.c 2006-01-09 11:44:18.000000000 -0500 @@ -1878,14 +1878,6 @@ static ide_startstop_t cdrom_start_write return ide_stopped; } - /* - * for dvd-ram and such media, it's a really big deal to get - * big writes all the time. so scour the queue and attempt to - * remerge requests, often the plugging will not have had time - * to do this properly - */ - blk_attempt_remerge(drive->queue, rq); - info->nsectors_buffered = 0; /* use dma, if possible. we don't need to check more, since we linux-2.6-posix-timers-sched_time-accumulation.patch: posix-cpu-timers.c | 13 +------------ 1 files changed, 1 insertion(+), 12 deletions(-) --- NEW FILE linux-2.6-posix-timers-sched_time-accumulation.patch --- Message-Id: <20060106.153648.27161028.davem at davemloft.net> To: linux-kernel at vger.kernel.org CC: roland at redhat.com, torvalds at osdl.org Subject: [PATCH]: Fix posix-cpu-timers sched_time accumulation From: "David S. Miller" I've spent the past 3 days digging into a glibc testsuite failure in current CVS, specifically libc/rt/tst-cputimer1.c The thr1 and thr2 timers fire too early in the second pass of this test. The second pass is noteworthy because it makes use of intervals, whereas the first pass does not. All throughout the posix-cpu-timers.c code, the calculation of the process sched_time sum is implemented roughly as: unsigned long long sum; sum = tsk->signal->sched_time; t = tsk; do { sum += t->sched_time; t = next_thread(t); } while (t != tsk); In fact this is the exact scheme used by check_process_timers(). In the case of check_process_timers(), current->sched_time has just been updated (via scheduler_tick(), which is invoked by update_process_times(), which subsequently invokes run_posix_cpu_timers()) So there is no special processing necessary wrt. that. In other contexts, we have to allot for the fact that tsk->sched_time might be a bit out of date if we are current. And the posix-cpu-timers.c code uses current_sched_time() to deal with that. Unfortunately it does so in an erroneous and inconsistent manner in one spot which is what results in the early timer firing. In cpu_clock_sample_group_locked(), it does this: cpu->sched = p->signal->sched_time; /* Add in each other live thread. */ while ((t = next_thread(t)) != p) { cpu->sched += t->sched_time; } if (p->tgid == current->tgid) { /* * We're sampling ourselves, so include the * cycles not yet banked. We still omit * other threads running on other CPUs, * so the total can always be behind as * much as max(nthreads-1,ncpus) * (NSEC_PER_SEC/HZ). */ cpu->sched += current_sched_time(current); } else { cpu->sched += p->sched_time; } The problem is the "p->tgid == current->tgid" test. If "p" is not current, and the tgids are the same, we will add the process t->sched_time twice into cpu->sched and omit "p"'s sched_time which is very very very wrong. posix-cpu-timers.c has a helper function, sched_ns(p) which takes care of this, so my fix is to use that here instead of this special tgid test. The fact that current can be one of the sub-threads of "p" points out that we could make things a little bit more accurate, perhaps by using sched_ns() on every thread we process in these loops. It also points out that we don't use the most accurate value for threads in the group actively running other cpus (and this is mentioned in the comment). But that is a future enhancement, and this fix here definitely makes sense. Signed-off-by: David S. Miller diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c index cae4f57..4c68edf 100644 --- a/kernel/posix-cpu-timers.c +++ b/kernel/posix-cpu-timers.c @@ -238,18 +238,7 @@ static int cpu_clock_sample_group_locked while ((t = next_thread(t)) != p) { cpu->sched += t->sched_time; } - if (p->tgid == current->tgid) { - /* - * We're sampling ourselves, so include the - * cycles not yet banked. We still omit - * other threads running on other CPUs, - * so the total can always be behind as - * much as max(nthreads-1,ncpus) * (NSEC_PER_SEC/HZ). - */ - cpu->sched += current_sched_time(current); - } else { - cpu->sched += p->sched_time; - } + cpu->sched += sched_ns(p); break; } return 0; linux-2.6-ppc-iseries-input-layer.patch: Kconfig | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-ppc-iseries-input-layer.patch --- iSeries has no keyboard, so it's valid to build a kernel with no input layer. It seems a bit absurd to call one of these 'embedded'. Signed-off-by: Dave Jones --- linux-2.6.15/drivers/input/Kconfig~ 2006-01-06 02:27:56.000000000 -0500 +++ linux-2.6.15/drivers/input/Kconfig 2006-01-06 02:28:08.000000000 -0500 @@ -5,7 +5,7 @@ menu "Input device support" config INPUT - tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED + tristate "Generic input layer (needed for keyboard, mouse, ...)" default y ---help--- Say Y here if you have any input device (mouse, keyboard, tablet, linux-2.6-pwc-powerup-by-default.patch: pwc-if.c | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE linux-2.6-pwc-powerup-by-default.patch --- --- linux-2.6.13/drivers/usb/media/pwc/pwc-if.c~ 2005-09-28 18:59:49.000000000 -0400 +++ linux-2.6.13/drivers/usb/media/pwc/pwc-if.c 2005-09-28 19:09:08.000000000 -0400 @@ -1946,6 +1946,12 @@ static int usb_pwc_probe(struct usb_inte if (hint < MAX_DEV_HINTS) device_hint[hint].pdev = pdev; + if (!power_save) { + i = pwc_camera_power(pdev, 1); + if (i < 0) + Info("Failed to power up the camera! (%d)\n", i); + } + Trace(TRACE_PROBE, "probe() function returning struct at 0x%p.\n", pdev); usb_set_intfdata (intf, pdev); return 0; linux-2.6-serial-nrports.patch: Documentation/kernel-parameters.txt | 2 ++ drivers/serial/8250.c | 28 ++++++++++++++++++---------- drivers/serial/Kconfig | 10 ++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) --- NEW FILE linux-2.6-serial-nrports.patch --- Make the number of UARTs registered configurable. Also add a nr_uarts module option to the 8250 code to override this, up to a maximum of CONFIG_SERIAL_8250_NR_UARTS This should appease people who complain about a proliferation of /dev/ttyS & /sysfs nodes whilst at the same time allowing a single kernel image to support the rarer occasions of lots of devices. Signed-off-by: Dave Jones diff -urpN --exclude-from=/home/davej/.exclude vanilla/drivers/serial/8250.c serial/drivers/serial/8250.c --- vanilla/drivers/serial/8250.c 2005-10-27 20:02:08.000000000 -0400 +++ serial/drivers/serial/8250.c 2005-12-07 20:00:16.000000000 -0500 @@ -53,6 +53,8 @@ */ static unsigned int share_irqs = SERIAL8250_SHARE_IRQS; +static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS; + /* * Debugging. */ @@ -2047,7 +2049,7 @@ static void __init serial8250_isa_init_p return; first = 0; - for (i = 0; i < UART_NR; i++) { + for (i = 0; i < nr_uarts; i++) { struct uart_8250_port *up = &serial8250_ports[i]; up->port.line = i; @@ -2066,7 +2068,7 @@ static void __init serial8250_isa_init_p } for (i = 0, up = serial8250_ports; - i < ARRAY_SIZE(old_serial_port) && i < UART_NR; + i < ARRAY_SIZE(old_serial_port) && i < nr_uarts; i++, up++) { up->port.iobase = old_serial_port[i].port; up->port.irq = irq_canonicalize(old_serial_port[i].irq); @@ -2088,7 +2090,7 @@ serial8250_register_ports(struct uart_dr serial8250_isa_init_ports(); - for (i = 0; i < UART_NR; i++) { + for (i = 0; i < nr_uarts; i++) { struct uart_8250_port *up = &serial8250_ports[i]; up->port.dev = dev; @@ -2189,7 +2191,7 @@ static int serial8250_console_setup(stru * if so, search for the first available port that does have * console support. */ - if (co->index >= UART_NR) + if (co->index >= nr_uarts) co->index = 0; port = &serial8250_ports[co->index].port; if (!port->iobase && !port->membase) @@ -2225,7 +2227,7 @@ static int __init find_port(struct uart_ int line; struct uart_port *port; - for (line = 0; line < UART_NR; line++) { + for (line = 0; line < nr_uarts; line++) { port = &serial8250_ports[line].port; if (p->iotype == port->iotype && p->iobase == port->iobase && @@ -2349,7 +2351,7 @@ static int __devexit serial8250_remove(s { int i; - for (i = 0; i < UART_NR; i++) { + for (i = 0; i < nr_uarts; i++) { struct uart_8250_port *up = &serial8250_ports[i]; if (up->port.dev == dev) @@ -2421,7 +2423,7 @@ static struct uart_8250_port *serial8250 /* * First, find a port entry which matches. */ - for (i = 0; i < UART_NR; i++) + for (i = 0; i < nr_uarts; i++) if (uart_match_port(&serial8250_ports[i].port, port)) return &serial8250_ports[i]; @@ -2430,7 +2432,7 @@ static struct uart_8250_port *serial8250 * free entry. We look for one which hasn't been previously * used (indicated by zero iobase). */ - for (i = 0; i < UART_NR; i++) + for (i = 0; i < nr_uarts; i++) if (serial8250_ports[i].port.type == PORT_UNKNOWN && serial8250_ports[i].port.iobase == 0) return &serial8250_ports[i]; @@ -2439,7 +2441,7 @@ static struct uart_8250_port *serial8250 * That also failed. Last resort is to find any entry which * doesn't have a real port associated with it. */ - for (i = 0; i < UART_NR; i++) + for (i = 0; i < nr_uarts; i++) if (serial8250_ports[i].port.type == PORT_UNKNOWN) return &serial8250_ports[i]; @@ -2524,8 +2526,11 @@ static int __init serial8250_init(void) { int ret, i; + if (nr_uarts > UART_NR) + nr_uarts = UART_NR; + printk(KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ " - "%d ports, IRQ sharing %sabled\n", (int) UART_NR, + "%d ports, IRQ sharing %sabled\n", nr_uarts, share_irqs ? "en" : "dis"); for (i = 0; i < NR_IRQS; i++) @@ -2585,6 +2590,9 @@ module_param(share_irqs, uint, 0644); MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices" " (unsafe)"); +module_param(nr_uarts, uint, 0644); +MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")"); + #ifdef CONFIG_SERIAL_8250_RSA module_param_array(probe_rsa, ulong, &probe_rsa_count, 0444); MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA"); diff -urpN --exclude-from=/home/davej/.exclude vanilla/drivers/serial/Kconfig serial/drivers/serial/Kconfig --- vanilla/drivers/serial/Kconfig 2005-10-27 20:02:08.000000000 -0400 +++ serial/drivers/serial/Kconfig 2005-12-07 19:24:11.000000000 -0500 @@ -95,6 +95,16 @@ config SERIAL_8250_NR_UARTS PCI enumeration and any ports that may be added at run-time via hot-plug, or any ISA multi-port serial cards. +config SERIAL_8250_RUNTIME_UARTS + int "Number of 8250/16550 serial ports to register at runtime" + depends on SERIAL_8250 + default "4" + help + Set this to the maximum number of serial ports you want + the kernel to register at boot time. This can be overriden + with the module parameter "nr_uarts", or boot-time parameter + 8250.nr_uarts + config SERIAL_8250_EXTENDED bool "Extended 8250/16550 serial driver options" depends on SERIAL_8250 --- serial/Documentation/kernel-parameters.txt~ 2005-12-07 20:16:18.000000000 -0500 +++ serial/Documentation/kernel-parameters.txt 2005-12-07 20:17:44.000000000 -0500 @@ -982,6 +982,8 @@ running once the system is up. nowb [ARM] + nr_uarts= [SERIAL] maximum number of UARTs to be registered. + opl3= [HW,OSS] Format: linux-2.6-smsc-ircc2-pnp.patch: smsc-ircc2.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+) --- NEW FILE linux-2.6-smsc-ircc2-pnp.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=153970 --- linux-2.6.13/drivers/net/irda/smsc-ircc2.c~ 2005-10-25 00:38:18.000000000 -0400 +++ linux-2.6.13/drivers/net/irda/smsc-ircc2.c 2005-10-25 00:43:03.000000000 -0400 @@ -54,6 +54,7 @@ #include #include #include +#include #include #include @@ -68,6 +69,7 @@ #include "smsc-ircc2.h" #include "smsc-sio.h" +static int pnp_registered_port; MODULE_AUTHOR("Daniele Peri "); MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver"); @@ -325,6 +327,61 @@ static inline void register_bank(int iob } +/* PNP probing */ + +static const struct pnp_device_id smsc_ircc_pnp_table[] = { +{ + .id = "SMCf010", + .driver_data = 0 +}, +{ } +}; + +MODULE_DEVICE_TABLE(pnp, smsc_ircc_pnp_table); + +static int __devinit +smsc_ircc_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id) +{ + unsigned int firbase, sirbase; + u8 dma, irq; + + if (pnp_port_valid(dev, 0) && + !(pnp_port_flags(dev, 0) & IORESOURCE_DISABLED)) + sirbase = pnp_port_start(dev, 0); + else + return -EINVAL; + + if (pnp_port_valid(dev, 1) && + !(pnp_port_flags(dev, 1) & IORESOURCE_DISABLED)) + firbase = pnp_port_start(dev, 1); + else + return -EINVAL; + + if (pnp_irq_valid(dev, 0) && + !(pnp_irq_flags(dev, 0) & IORESOURCE_DISABLED)) + irq = pnp_irq(dev, 0); + else + return -EINVAL; + + if (pnp_dma_valid(dev, 0) && + !(pnp_dma_flags(dev, 0) & IORESOURCE_DISABLED)) + dma = pnp_dma(dev, 0); + else + return -EINVAL; + + if (smsc_ircc_open(firbase, sirbase, dma, irq)) + return -ENODEV; + + return 0; +} + +static struct pnp_driver smsc_ircc_pnp_driver = { + .name = "smsc-ircc2", + .id_table = smsc_ircc_pnp_table, + .probe = smsc_ircc_pnp_probe, +}; + + /******************************************************************************* * * @@ -1741,6 +1798,8 @@ static void __exit smsc_ircc_cleanup(voi IRDA_DEBUG(1, "%s\n", __FUNCTION__); + if (pnp_registered_port) + pnp_unregister_driver(&smsc_ircc_pnp_driver); for (i = 0; i < 2; i++) { if (dev_self[i]) smsc_ircc_close(dev_self[i]); @@ -1998,8 +2057,16 @@ static int __init smsc_ircc_look_for_chi struct smsc_chip_address *address; char *type; unsigned int cfg_base, found; + int r; found = 0; + + r = pnp_register_driver(&smsc_ircc_pnp_driver); + if (r >= 0) { + pnp_registered_port = 1; + found += r; + } + address = possible_addresses; while (address->cfg_base) { linux-2.6-softcursor-persistent-alloc.patch: softcursor.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) --- NEW FILE linux-2.6-softcursor-persistent-alloc.patch --- --- linux-2.6.14/drivers/video/console/softcursor.c~ 2005-12-28 18:40:08.000000000 -0500 +++ linux-2.6.14/drivers/video/console/softcursor.c 2005-12-28 18:45:50.000000000 -0500 @@ -23,7 +23,9 @@ int soft_cursor(struct fb_info *info, st unsigned int buf_align = info->pixmap.buf_align - 1; unsigned int i, size, dsize, s_pitch, d_pitch; struct fb_image *image; - u8 *dst, *src; + u8 *dst; + static u8 *src=NULL; + static int allocsize=0; if (info->state != FBINFO_STATE_RUNNING) return 0; @@ -31,9 +33,15 @@ int soft_cursor(struct fb_info *info, st s_pitch = (cursor->image.width + 7) >> 3; dsize = s_pitch * cursor->image.height; - src = kmalloc(dsize + sizeof(struct fb_image), GFP_ATOMIC); - if (!src) - return -ENOMEM; + if (dsize + sizeof(struct fb_image) != allocsize) { + if (src != NULL) + kfree(src); + allocsize = dsize + sizeof(struct fb_image); + + src = kmalloc(allocsize, GFP_ATOMIC); + if (!src) + return -ENOMEM; + } image = (struct fb_image *) (src + dsize); *image = cursor->image; @@ -61,7 +69,6 @@ int soft_cursor(struct fb_info *info, st fb_pad_aligned_buffer(dst, d_pitch, src, s_pitch, image->height); image->data = dst; info->fbops->fb_imageblit(info, image); - kfree(src); return 0; } linux-2.6-softmac-git.patch: include/net/ieee80211.h | 6 include/net/ieee80211softmac.h | 266 +++++++++++++ include/net/ieee80211softmac_wx.h | 66 +++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/ieee80211_crypt_wep.c | 61 ++- net/ieee80211/ieee80211_module.c | 2 net/ieee80211/ieee80211_rx.c | 4 net/ieee80211/ieee80211_tx.c | 2 net/ieee80211/ieee80211_wx.c | 2 net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 356 ++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 348 +++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 135 ++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 436 ++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 211 ++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 216 ++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 390 +++++++++++++++++++ 20 files changed, 2971 insertions(+), 25 deletions(-) --- NEW FILE linux-2.6-softmac-git.patch --- diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index cde2f4f..df05f46 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -363,8 +363,9 @@ enum ieee80211_reasoncode { #define IEEE80211_OFDM_SHIFT_MASK_A 4 /* NOTE: This data is for statistical purposes; not all hardware provides this - * information for frames received. Not setting these will not cause - * any adverse affects. */ + * information for frames received. + * For ieee80211_rx_mgt, you need to set at least the 'len' parameter. + */ struct ieee80211_rx_stats { u32 mac_time; s8 rssi; @@ -1088,6 +1089,7 @@ extern int ieee80211_tx_frame(struct iee /* ieee80211_rx.c */ extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, struct ieee80211_rx_stats *rx_stats); +/* make sure to set stats->len */ extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, struct ieee80211_hdr_4addr *header, struct ieee80211_rx_stats *stats); diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h new file mode 100644 index 0000000..7264bd8 --- /dev/null +++ b/include/net/ieee80211softmac.h @@ -0,0 +1,266 @@ +#ifndef IEEE80211SOFTMAC_H_ +#define IEEE80211SOFTMAC_H_ + +#include +#include +#include +#include +#include + +/* Once the API is considered more or less stable, + * this should be incremented on API incompatible changes. + */ +#define IEEE80211SOFTMAC_API 0 + +#define IEEE80211SOFTMAC_MAX_RATES_LEN 8 +#define IEEE80211SOFTMAC_MAX_EX_RATES_LEN 255 + +struct ieee80211softmac_ratesinfo { + u8 count; + u8 rates[IEEE80211SOFTMAC_MAX_RATES_LEN + IEEE80211SOFTMAC_MAX_EX_RATES_LEN]; +}; + +/* internal structures */ +struct ieee80211softmac_network; +struct ieee80211softmac_scaninfo; + +struct ieee80211softmac_essid { + u8 len; + char data[IW_ESSID_MAX_SIZE+1]; +}; + +struct ieee80211softmac_wpa { + char *IE; + int IElen; + int IEbuflen; +}; + +/* + * Information about association + * + * Do we need a lock for this? + * We only ever use this structure inlined + * into our global struct. I've used its lock, + * but maybe we need a local one here? + */ +struct ieee80211softmac_assoc_info { + /* + * This is the requested ESSID. It is written + * only by the WX handlers. + * + */ + struct ieee80211softmac_essid req_essid; + /* + * the ESSID of the network we're currently + * associated (or trying) to. This is + * updated to the network's actual ESSID + * even if the requested ESSID was 'ANY' + */ + struct ieee80211softmac_essid associate_essid; + + /* BSSID we're trying to associate to */ + char bssid[ETH_ALEN]; + + /* some flags. + * static_essid is valid if the essid is constant, + * this is for use by the wx handlers only. + * + * associating is true, if the network has been + * auth'ed on and we are in the process of associating. + * + * bssvalid is true if we found a matching network + * and saved it's BSSID into the bssid above. + */ + u8 static_essid:1, + associating:1, + bssvalid:1; + + /* Scan retries remaining */ + int scan_retry; + + struct work_struct work; + struct work_struct timeout; +}; + +enum { + IEEE80211SOFTMAC_AUTH_OPEN_REQUEST = 1, + IEEE80211SOFTMAC_AUTH_OPEN_RESPONSE = 2, +}; + +enum { + IEEE80211SOFTMAC_AUTH_SHARED_REQUEST = 1, + IEEE80211SOFTMAC_AUTH_SHARED_CHALLENGE = 2, + IEEE80211SOFTMAC_AUTH_SHARED_RESPONSE = 3, + IEEE80211SOFTMAC_AUTH_SHARED_PASS = 4, +}; + +/* We should make these tunable + * AUTH_TIMEOUT seems really long, but that's what it is in BSD */ +#define IEEE80211SOFTMAC_AUTH_TIMEOUT (12 * HZ) +#define IEEE80211SOFTMAC_AUTH_RETRY_LIMIT 5 +#define IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT 3 + +struct ieee80211softmac_txrates { + /* The Bit-Rate to be used for multicast frames. */ + u8 mcast_rate; + /* The Bit-Rate to be used for multicast fallback + * (If the device supports fallback and hardware-retry) + */ + u8 mcast_fallback; + /* The Bit-Rate to be used for any other (normal) data packet. */ + u8 default_rate; + /* The Bit-Rate to be used for default fallback + * (If the device supports fallback and hardware-retry) + */ + u8 default_fallback; +}; + +/* Bits for txrates_change callback. */ +#define IEEE80211SOFTMAC_TXRATECHG_DEFAULT (1 << 0) /* default_rate */ +#define IEEE80211SOFTMAC_TXRATECHG_DEFAULT_FBACK (1 << 1) /* default_fallback */ +#define IEEE80211SOFTMAC_TXRATECHG_MCAST (1 << 2) /* mcast_rate */ +#define IEEE80211SOFTMAC_TXRATECHG_MCAST_FBACK (1 << 3) /* mcast_fallback */ + +struct ieee80211softmac_device { + /* 802.11 structure for data stuff */ + struct ieee80211_device *ieee; + struct net_device *dev; + + /* only valid if associated, then holds the Association ID */ + u16 association_id; + + /* the following methods are callbacks that the driver + * using this framework has to assign + */ + + /* always assign these */ + void (*set_bssid_filter)(struct net_device *dev, const u8 *bssid); + void (*set_channel)(struct net_device *dev, u8 channel); + + /* assign if you need it, informational only */ + void (*link_change)(struct net_device *dev); + + /* If the hardware can do scanning, assign _all_ three of these callbacks. + * When the scan finishes, call ieee80211softmac_scan_finished(). + */ + + /* when called, start_scan is guaranteed to not be called again + * until you call ieee80211softmac_scan_finished. + * Return 0 if scanning could start, error otherwise. + * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_start_scan */ + int (*start_scan)(struct net_device *dev); + /* this should block until after ieee80211softmac_scan_finished was called + * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_wait_for_scan */ + void (*wait_for_scan)(struct net_device *dev); + /* stop_scan aborts a scan, but is asynchronous. + * if you want to wait for it too, use wait_for_scan + * SOFTMAC AUTHORS: don't call this, use ieee80211softmac_stop_scan */ + void (*stop_scan)(struct net_device *dev); + + /* we'll need something about beacons here too, for AP or ad-hoc modes */ + + /* Transmission rates to be used by the driver. + * The SoftMAC figures out the best possible rates. + * The driver just needs to read them. + */ + struct ieee80211softmac_txrates txrates; + /* If the driver needs to do stuff on TX rate changes, assign this callback. */ + void (*txrates_change)(struct net_device *dev, + u32 changes, /* see IEEE80211SOFTMAC_TXRATECHG flags */ [...2780 lines suppressed...] + struct iw_request_info *info, + union iwreq_data *data, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); + unsigned long flags; + int err = -EINVAL; + + spin_lock_irqsave(&mac->lock, flags); + switch (mac->txrates.default_rate) { + case IEEE80211_CCK_RATE_1MB: + data->bitrate.value = 1000000; + break; + case IEEE80211_CCK_RATE_2MB: + data->bitrate.value = 2000000; + break; + case IEEE80211_CCK_RATE_5MB: + data->bitrate.value = 5500000; + break; + case IEEE80211_CCK_RATE_11MB: + data->bitrate.value = 11000000; + break; + case IEEE80211_OFDM_RATE_6MB: + data->bitrate.value = 6000000; + break; + case IEEE80211_OFDM_RATE_9MB: + data->bitrate.value = 9000000; + break; + case IEEE80211_OFDM_RATE_12MB: + data->bitrate.value = 12000000; + break; + case IEEE80211_OFDM_RATE_18MB: + data->bitrate.value = 18000000; + break; + case IEEE80211_OFDM_RATE_24MB: + data->bitrate.value = 24000000; + break; + case IEEE80211_OFDM_RATE_36MB: + data->bitrate.value = 36000000; + break; + case IEEE80211_OFDM_RATE_48MB: + data->bitrate.value = 48000000; + break; + case IEEE80211_OFDM_RATE_54MB: + data->bitrate.value = 54000000; + break; + default: + assert(0); + goto out_unlock; + } + err = 0; +out_unlock: + spin_unlock_irqrestore(&mac->lock, flags); + + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_rate); + +int +ieee80211softmac_wx_get_wap(struct net_device *net_dev, + struct iw_request_info *info, + union iwreq_data *data, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); + int err = 0; + unsigned long flags; + + spin_lock_irqsave(&mac->lock, flags); + if (mac->associnfo.bssvalid) + memcpy(data->ap_addr.sa_data, mac->associnfo.bssid, ETH_ALEN); + else + memset(data->ap_addr.sa_data, 0xff, ETH_ALEN); + data->ap_addr.sa_family = ARPHRD_ETHER; + spin_unlock_irqrestore(&mac->lock, flags); + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_wap); + +int +ieee80211softmac_wx_set_wap(struct net_device *net_dev, + struct iw_request_info *info, + union iwreq_data *data, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(net_dev); + static const unsigned char any[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + static const unsigned char off[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + unsigned long flags; + + /* sanity check */ + if (data->ap_addr.sa_family != ARPHRD_ETHER) { + return -EINVAL; + } + + spin_lock_irqsave(&mac->lock, flags); + if (!memcmp(any, data->ap_addr.sa_data, ETH_ALEN) || + !memcmp(off, data->ap_addr.sa_data, ETH_ALEN)) { + schedule_work(&mac->associnfo.work); + goto out; + } else { + if (!memcmp(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN)) { + if (mac->associnfo.associating || mac->associated) { + /* bssid unchanged and associated or associating - just return */ + goto out; + } + } else { + /* copy new value in data->ap_addr.sa_data to bssid */ + memcpy(mac->associnfo.bssid, data->ap_addr.sa_data, ETH_ALEN); + } + /* queue associate if new bssid or (old one again and not associated) */ + schedule_work(&mac->associnfo.work); + } + +out: + spin_unlock_irqrestore(&mac->lock, flags); + return 0; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_wap); + +int +ieee80211softmac_wx_set_genie(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(dev); + unsigned long flags; + int err = 0; + char *buf; + int i; + + spin_lock_irqsave(&mac->lock, flags); + /* bleh. shouldn't be locked for that kmalloc... */ + + if (wrqu->data.length) { + if ((wrqu->data.length < 2) || (extra[1]+2 != wrqu->data.length)) { + /* this is an IE, so the length must be + * correct. Is it possible though that + * more than one IE is passed in? + */ + err = -EINVAL; + goto out; + } + if (mac->wpa.IEbuflen <= wrqu->data.length) { + buf = kmalloc(wrqu->data.length, GFP_ATOMIC); + if (!buf) { + err = -ENOMEM; + goto out; + } + kfree(mac->wpa.IE); + mac->wpa.IE = buf; + mac->wpa.IEbuflen = wrqu->data.length; + } + memcpy(mac->wpa.IE, extra, wrqu->data.length); + dprintk(KERN_INFO PFX "generic IE set to "); + for (i=0;idata.length;i++) + dprintk("%.2x", mac->wpa.IE[i]); + dprintk("\n"); + mac->wpa.IElen = wrqu->data.length; + } else { + kfree(mac->wpa.IE); + mac->wpa.IE = NULL; + mac->wpa.IElen = 0; + mac->wpa.IEbuflen = 0; + } + + out: + spin_unlock_irqrestore(&mac->lock, flags); + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_set_genie); + +int +ieee80211softmac_wx_get_genie(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct ieee80211softmac_device *mac = ieee80211_priv(dev); + unsigned long flags; + int err = 0; + int space = wrqu->data.length; + + spin_lock_irqsave(&mac->lock, flags); + + wrqu->data.length = 0; + + if (mac->wpa.IE && mac->wpa.IElen) { + wrqu->data.length = mac->wpa.IElen; + if (mac->wpa.IElen <= space) + memcpy(extra, mac->wpa.IE, mac->wpa.IElen); + else + err = -E2BIG; + } + spin_unlock_irqrestore(&mac->lock, flags); + return err; +} +EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_genie); + linux-2.6-usbhid-wireless-security-lock.patch: hid-core.c | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE linux-2.6-usbhid-wireless-security-lock.patch --- bugzilla 147479 diff -ur linux-2.6.11.orig/drivers/usb/input/hid-core.c linux-2.6.11/drivers/usb/input/hid-core.c --- linux-2.6.11.orig/drivers/usb/input/hid-core.c 2005-03-02 08:38:10.000000000 +0100 +++ linux-2.6.11/drivers/usb/input/hid-core.c 2005-07-24 19:25:35.000000000 +0200 @@ -1494,6 +1494,9 @@ #define USB_VENDOR_ID_DELORME 0x1163 #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100 +#define USB_VENDOR_ID_CYPRES 0x04b4 +#define USB_DEVICE_ID_SITECOM_WSL 0x7417 + static struct hid_blacklist { __u16 idVendor; __u16 idProduct; @@ -1586,6 +1589,7 @@ { USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_SITECOM_WSL, HID_QUIRK_IGNORE }, { 0, 0 } }; linux-2.6-vm-clear-unreclaimable.patch: filemap.c | 7 +++++++ page_alloc.c | 6 ++++++ 2 files changed, 13 insertions(+) --- NEW FILE linux-2.6-vm-clear-unreclaimable.patch --- --- linux-2.6.14/mm/filemap.c~ 2005-12-10 01:47:15.000000000 -0500 +++ linux-2.6.14/mm/filemap.c 2005-12-10 01:47:46.000000000 -0500 @@ -471,11 +471,18 @@ EXPORT_SYMBOL(unlock_page); */ void end_page_writeback(struct page *page) { + struct zone *zone = page_zone(page); if (!TestClearPageReclaim(page) || rotate_reclaimable_page(page)) { if (!test_clear_page_writeback(page)) BUG(); } smp_mb__after_clear_bit(); + if (zone->all_unreclaimable) { + spin_lock(&zone->lock); + zone->all_unreclaimable = 0; + zone->pages_scanned = 0; + spin_unlock(&zone->lock); + } wake_up_page(page, PG_writeback); } EXPORT_SYMBOL(end_page_writeback); --- linux-2.6.14/mm/page_alloc.c~ 2005-12-10 01:47:51.000000000 -0500 +++ linux-2.6.14/mm/page_alloc.c 2005-12-10 01:48:25.000000000 -0500 @@ -657,6 +657,12 @@ static void fastcall free_hot_cold_page( pcp->count++; if (pcp->count >= pcp->high) pcp->count -= free_pages_bulk(zone, pcp->batch, &pcp->list, 0); + else if (zone->all_unreclaimable) { + spin_lock(&zone->lock); + zone->all_unreclaimable = 0; + zone->pages_scanned = 0; + spin_unlock(&zone->lock); + } local_irq_restore(flags); put_cpu(); } linux-2.6-vm-debug.patch: drivers/scsi/st.c | 1 + mm/rmap.c | 7 +++++++ 2 files changed, 8 insertions(+) --- NEW FILE linux-2.6-vm-debug.patch --- --- linux-2.6.15/mm/rmap.c~ 2006-01-03 08:53:32.000000000 -0500 +++ linux-2.6.15/mm/rmap.c 2006-01-03 08:58:19.000000000 -0500 @@ -484,6 +484,13 @@ void page_remove_rmap(struct page *page) BUG_ON(PageReserved(page)); if (atomic_add_negative(-1, &page->_mapcount)) { + if (page_mapcount(page) < 0) { + printk (KERN_EMERG "Eeek! page_mapcount(page) went negative! (%d)\n", page_mapcount(page)); + printk (KERN_EMERG " page->flags = %lx\n", page->flags); + printk (KERN_EMERG " page->count = %x\n", page_count(page)); + printk (KERN_EMERG " page->mapping = %p\n", page->mapping); + } + BUG_ON(page_mapcount(page) < 0); /* * It would be tidy to reset the PageAnon mapping here, --- linux-2.6.15/drivers/scsi/st.c~ 2006-01-05 21:58:31.000000000 -0500 +++ linux-2.6.15/drivers/scsi/st.c 2006-01-05 21:59:31.000000000 -0500 @@ -4508,6 +4508,7 @@ static int sgl_unmap_user_pages(struct s for (i=0; i < nr_pages; i++) { struct page *page = sgl[i].page; + sgl[i].page = NULL; if (dirtied) SetPageDirty(page); /* FIXME: cache flush missing for rw==READ linux-2.6-w1-hush-debug.patch: w1.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-w1-hush-debug.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=167403 --- linux-2.6.13/drivers/w1/w1.c~ 2005-09-28 06:09:13.000000000 -0400 +++ linux-2.6.13/drivers/w1/w1.c 2005-09-28 06:09:27.000000000 -0400 @@ -593,7 +593,7 @@ void w1_search(struct w1_master *dev, w1 * Return 0 - device(s) present, 1 - no devices present. */ if (w1_reset_bus(dev)) { - dev_dbg(&dev->dev, "No devices present on the wire.\n"); + //dev_dbg(&dev->dev, "No devices present on the wire.\n"); break; } linux-2.6-x86-hp-reboot.patch: reboot.c | 8 ++++++++ 1 files changed, 8 insertions(+) --- NEW FILE linux-2.6-x86-hp-reboot.patch --- --- linux-2.6.14/arch/i386/kernel/reboot.c~ 2005-11-30 00:31:30.000000000 -0500 +++ linux-2.6.14/arch/i386/kernel/reboot.c 2005-11-30 00:32:23.000000000 -0500 @@ -111,6 +111,14 @@ static struct dmi_system_id __initdata r DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"), }, }, + { /* HP laptops have weird reboot issues */ + .callback = set_bios_reboot, + .ident = "HP Laptop", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq"), + }, + }, { } }; linux-2.6-x86_64-ati-apic-timer.patch: io_apic.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-x86_64-ati-apic-timer.patch --- ATI's AMD64 chipsets appear to have the interesting "feature" that every timer tick causes an interrupt from both the APIC and the legacy PIC. The following patch checks if the northbridge matches the affected chipsets, and if so disables APIC pin 1. As an added bonus, it skips the acpi timer override since I haven't found one of these machines where it's needed and it's actively harmful on at least some of them. We've been shipping this patch in Ubuntu with no reported issues. This is kernel bugzilla number 3927. Signed-off-by: Matthew Garrett --- io_apic.c.orig 2005-09-20 21:43:42.000000000 +0100 +++ a/arch/x86_64/kernel/io_apic.c 2005-09-20 22:33:42.000000000 +0100 @@ -258,18 +259,24 @@ void __init check_ioapic(void) for (func = 0; func < 8; func++) { u32 class; u32 vendor; + u16 product; u8 type; class = read_pci_config(num,slot,func, PCI_CLASS_REVISION); + if (class == 0xffffffff) break; - if ((class >> 16) != PCI_CLASS_BRIDGE_PCI) + if ((class >> 16) != PCI_CLASS_BRIDGE_PCI && + (class >> 16) != PCI_CLASS_BRIDGE_HOST) continue; vendor = read_pci_config(num, slot, func, PCI_VENDOR_ID); vendor &= 0xffff; + + product = read_pci_config_16(num, slot, func, + PCI_DEVICE_ID); switch (vendor) { case PCI_VENDOR_ID_VIA: #ifdef CONFIG_GART_IOMMU @@ -292,8 +299,18 @@ void __init check_ioapic(void) #endif /* RED-PEN skip them on mptables too? */ return; - } + case PCI_VENDOR_ID_ATI: + if (product==0x5950 || product==0x5951) { + printk(KERN_INFO "ATI board detected - disabling APIC pin 1\n"); +#ifdef CONFIG_ACPI + /* This seems to be wrong, too */ + acpi_skip_timer_override = 1; +#endif + disable_timer_pin_1 = 1; + } + return; + } /* No multi-function device? */ type = read_pci_config_byte(num,slot,func, PCI_HEADER_TYPE); linux-2.6.14-xen-compile-fixes.patch: netback/xenbus.c | 8 ++++---- xenbus/xenbus_probe.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE linux-2.6.14-xen-compile-fixes.patch --- --- linux-2.6.14/drivers/xen/netback/xenbus.c.~1~ 2006-01-09 10:50:45.000000000 -0500 +++ linux-2.6.14/drivers/xen/netback/xenbus.c 2006-01-09 10:54:58.000000000 -0500 @@ -129,12 +129,12 @@ return err; } else { - add_uevent_var(envp, num_envp, &i, buffer, buffer_size, + add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length, "script=%s", val); kfree(val); } - add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, + add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length, "vif=%s", netif->dev->name); envp[i] = NULL; @@ -181,7 +181,7 @@ return; } - kobject_uevent(&dev->dev.kobj, KOBJ_ONLINE); + kobject_uevent(&dev->dev.kobj, KOBJ_ONLINE, NULL); maybe_connect(be); } @@ -214,7 +214,7 @@ break; case XenbusStateClosed: - kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE); + kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE, NULL); device_unregister(&dev->dev); break; --- linux-2.6.14/drivers/xen/xenbus/xenbus_probe.c.~1~ 2006-01-09 10:50:22.000000000 -0500 +++ linux-2.6.14/drivers/xen/xenbus/xenbus_probe.c 2006-01-09 10:59:20.000000000 -0500 @@ -232,7 +232,7 @@ .bus = { .name = "xen-backend", .match = xenbus_match, - .uevent = xenbus_uevent_backend, + .hotplug = xenbus_uevent_backend, }, .dev = { .bus_id = "xen-backend", @@ -257,13 +257,13 @@ return -ENODEV; /* stuff we want to pass to /sbin/hotplug */ - add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, + add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length, "XENBUS_TYPE=%s", xdev->devicetype); - add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, + add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length, "XENBUS_PATH=%s", xdev->nodename); - add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, + add_hotplug_env_var(envp, num_envp, &i, buffer, buffer_size, &length, "XENBUS_BASE_PATH=%s", xenbus_backend.root); /* terminate, set to next free slot, shrink available space */ linux-2.6.15-usb-find-interface.patch: usb.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) --- NEW FILE linux-2.6.15-usb-find-interface.patch --- --- linux-2.6.15/drivers/usb/core/usb.c.orig 2006-01-03 03:21:10.000000000 +0000 +++ linux-2.6.15/drivers/usb/core/usb.c 2006-01-09 13:40:41.000000000 +0000 @@ -483,20 +483,23 @@ usb_match_id(struct usb_interface *inter return NULL; } +struct find_interface_arg { + int minor; + struct usb_interface *interface; +}; static int __find_interface(struct device * dev, void * data) { - struct usb_interface ** ret = (struct usb_interface **)data; - struct usb_interface * intf = *ret; - int *minor = (int *)data; + struct find_interface_arg *arg = data; + struct usb_interface *intf; /* can't look at usb devices, only interfaces */ if (dev->driver == &usb_generic_driver) return 0; intf = to_usb_interface(dev); - if (intf->minor != -1 && intf->minor == *minor) { - *ret = intf; + if (intf->minor != -1 && intf->minor == arg->minor) { + arg->interface = intf; return 1; } return 0; @@ -513,12 +516,12 @@ static int __find_interface(struct devic */ struct usb_interface *usb_find_interface(struct usb_driver *drv, int minor) { - struct usb_interface *intf = (struct usb_interface *)(long)minor; - int ret; - - ret = driver_for_each_device(&drv->driver, NULL, &intf, __find_interface); + struct find_interface_arg argb; - return ret ? intf : NULL; + argb.minor = minor; + argb.interface = NULL; + driver_for_each_device(&drv->driver, NULL, &argb, __find_interface); + return argb.interface; } static int usb_device_match (struct device *dev, struct device_driver *drv) linux-2.6.15-usblp-fixes.patch: usblp.c | 40 +++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 11 deletions(-) --- NEW FILE linux-2.6.15-usblp-fixes.patch --- diff -u b/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c --- b/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c @@ -438,7 +438,7 @@ | (!usblp->wcomplete ? 0 : POLLOUT | POLLWRNORM); } -static int usblp_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) +static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct usblp *usblp = file->private_data; int length, err, i; @@ -838,7 +838,8 @@ .read = usblp_read, .write = usblp_write, .poll = usblp_poll, - .ioctl = usblp_ioctl, + .unlocked_ioctl = usblp_ioctl, + .compat_ioctl = usblp_ioctl, .open = usblp_open, .release = usblp_release, }; @@ -849,6 +850,20 @@ .minor_base = USBLP_MINOR_BASE, }; +static ssize_t usblp_show_ieee1284_id(struct device *dev, struct device_attribute *attr, char *buf) +{ + struct usb_interface *intf = to_usb_interface(dev); + struct usblp *usblp = usb_get_intfdata (intf); + + if (usblp->device_id_string[0] == 0 && + usblp->device_id_string[1] == 0) + return 0; + + return sprintf(buf, "%s", usblp->device_id_string+2); +} + +static DEVICE_ATTR(ieee1284_id, S_IRUGO, usblp_show_ieee1284_id, NULL); + static int usblp_probe(struct usb_interface *intf, const struct usb_device_id *id) { @@ -933,20 +948,12 @@ /* Retrieve and store the device ID string. */ usblp_cache_device_id_string(usblp); + device_create_file(&intf->dev, &dev_attr_ieee1284_id); #ifdef DEBUG usblp_check_status(usblp, 0); #endif - info("usblp%d: USB %sdirectional printer dev %d " - "if %d alt %d proto %d vid 0x%4.4X pid 0x%4.4X", - usblp->minor, usblp->bidir ? "Bi" : "Uni", dev->devnum, - usblp->ifnum, - usblp->protocol[usblp->current_protocol].alt_setting, - usblp->current_protocol, - le16_to_cpu(usblp->dev->descriptor.idVendor), - le16_to_cpu(usblp->dev->descriptor.idProduct)); - usb_set_intfdata (intf, usblp); usblp->present = 1; @@ -957,11 +964,20 @@ goto abort_intfdata; } usblp->minor = intf->minor; + info("usblp%d: USB %sdirectional printer dev %d " + "if %d alt %d proto %d vid 0x%4.4X pid 0x%4.4X", + usblp->minor, usblp->bidir ? "Bi" : "Uni", dev->devnum, + usblp->ifnum, + usblp->protocol[usblp->current_protocol].alt_setting, + usblp->current_protocol, + le16_to_cpu(usblp->dev->descriptor.idVendor), + le16_to_cpu(usblp->dev->descriptor.idProduct)); return 0; abort_intfdata: usb_set_intfdata (intf, NULL); + device_remove_file(&intf->dev, &dev_attr_ieee1284_id); abort: if (usblp) { if (usblp->writebuf) @@ -1156,6 +1172,8 @@ BUG (); } + device_remove_file(&intf->dev, &dev_attr_ieee1284_id); + down (&usblp_sem); down (&usblp->sem); usblp->present = 0; --- NEW FILE linux-2.6.15.tar.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDuglHyGugalF9Dw4RAiIPAKCT5NvV2+aomkNCE3v8M2P10V7xdQCgjyeh aDrnyZ0H/GvnVRLmUrUUbV8= =lIis -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 21 Dec 2005 15:04:47 -0000 1.6 +++ .cvsignore 9 Jan 2006 20:42:13 -0000 1.7 @@ -1,7 +1,6 @@ kernel-2.6.*.config temp-* -kernel-xen-2.6.14 -linux-2.6.14.tar.bz2 -xen-20051206.tar.bz2 -patch-2.6.15-rc6.bz2 -patch-2.6.15-rc6-git1.bz2 +kernel-xen-2.6.15 +linux-2.6.15.tar.bz2 +xen-20060106.tar.bz2 +bcm43xx-20060106.tar.bz2 Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- kernel-xen.spec 22 Dec 2005 10:42:20 -0000 1.23 +++ kernel-xen.spec 9 Jan 2006 20:42:13 -0000 1.24 @@ -17,7 +17,7 @@ # that the kernel isn't the stock distribution kernel, for example by # adding some text to the end of the version number. # -%define sublevel 14 +%define sublevel 15 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} %define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) @@ -162,7 +162,7 @@ Version: %{rpmversion} Release: %{release} ExclusiveArch: noarch i686 -#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries +#ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -186,12 +186,15 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source1: xen-20051206.tar.bz2 +Source1: xen-20060106.tar.bz2 Source2: Config.mk Source10: COPYING.modules Source11: genkey +%define BCMVER 20060106 +Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2 + Source20: kernel-%{kversion}-i586.config Source21: kernel-%{kversion}-i686.config Source22: kernel-%{kversion}-i686-smp.config @@ -213,8 +216,8 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-rc6.bz2 -Patch2: patch-2.6.15-rc6-git1.bz2 +#Patch1: patch-2.6.16-git1.bz2 +#Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -227,6 +230,8 @@ Patch203: linux-2.6.14-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch Patch205: linux-2.6-x86_64-disable-hotplug-guessing.patch +Patch206: linux-2.6-x86_64-ati-apic-timer.patch +Patch207: linux-2.6-edid-check.patch # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch @@ -245,20 +250,21 @@ Patch314: linux-2.6-ppc-rtas-check.patch Patch315: linux-2.6-powerpc-parport.patch Patch316: linux-2.6-cell-iommu.patch -Patch317: linux-2.6-g5-thermal-overload.patch +Patch317: linux-2.6-ppc-iseries-input-layer.patch # 400 - 499 ia64 +Patch400: linux-2.6-ia64-spinlock-size.patch + # 500 - 599 s390(x) # 600 - 699 sparc(64) # 700 - 799 Xen Patch700: linux-2.6-xen-merge.patch -Patch701: linux-2.6-xen-no-tls-warn.patch -Patch703: linux-2.6-xen-kprobes.patch +Patch701: linux-2.6.14-xen-compile-fixes.patch +Patch702: linux-2.6-xen-no-tls-warn.patch Patch704: linux-2.6.14-xen-guest-enable-char-devices.patch Patch705: linux-2.6.14-xen_net_read_mac_export.patch Patch706: linux-2.6.14-xen_remap_vma_flags.patch -Patch707: linux-2.6.14-xen-license_dual_bsd_gpl.patch # # Patches 800 through 899 are reserved for bugfixes to the core system @@ -271,14 +277,11 @@ # Exec-shield. Patch810: linux-2.6-execshield.patch Patch811: linux-2.6-execshield-vdso.patch -Patch812: linux-2.6-vdso-xen.patch +#Patch812: linux-2.6-vdso-xen.patch Patch813: linux-2.6-execshield-xen.patch Patch814: linux-2.6-xen-vdso-note.patch Patch815: linux-2.6-write-protect-rodata.patch -# kauditd thread prevents sleep -Patch820: linux-2.6.14-kauditd-suspend.patch - # Module signing infrastructure. Patch900: linux-2.6-modsign-core.patch Patch901: linux-2.6-modsign-crypto.patch @@ -311,8 +314,11 @@ Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch Patch1026: linux-2.6-debug-no-quiet.patch Patch1027: linux-2.6-debug-slab-leak-detector.patch -Patch1028: linux-2.6-debug-spinlock-symbol.patch -Patch1029: linux-2.6-debug-oops-pause.patch +Patch1028: linux-2.6-debug-oops-pause.patch +Patch1029: linux-2.6-debug-account-kmalloc.patch +Patch1030: linux-2.6-debug-latency-tracing.patch +Patch1031: linux-2.6.15-usblp-fixes.patch +Patch1032: linux-2.6.15-usb-find-interface.patch # Restrict /dev/mem usage. Patch1050: linux-2.6-devmem.patch @@ -359,22 +365,26 @@ Patch1650: linux-2.6-input-kill-stupid-messages.patch Patch1660: linux-2.6-input-usblegacy.patch Patch1670: linux-2.6-serial-tickle-nmi.patch -Patch1680: linux-2.6-missing-exports.patch +Patch1671: linux-2.6-serial-nrports.patch Patch1690: linux-2.6-radeon-backlight.patch Patch1700: linux-2.6-ide-tune-locking.patch Patch1710: linux-2.6-autofs-pathlookup.patch Patch1720: linux-2.6-selinux-hush.patch Patch1730: linux-2.6-ide-cd-shutup.patch -Patch1740: linux-2.6-apm-depends-fix.patch +Patch1740: linux-2.6-block-reduce-stack.patch Patch1750: linux-2.6-ub.patch Patch1760: linux-2.6-sata-enable-atapi-by-default.patch Patch1770: linux-2.6-valid-ether-addr.patch Patch1780: linux-2.6-firmware-loader-timeout.patch -Patch1790: linux-2.6-usb-suspend.patch - -# ACPI patches. -Patch1800: linux-2.6-acpi-thinkpad-c2c3.patch -Patch1801: linux-2.6-acpi-acpica-20051202.patch +Patch1790: linux-2.6-softcursor-persistent-alloc.patch +Patch1800: linux-2.6-pwc-powerup-by-default.patch +Patch1810: linux-2.6-smsc-ircc2-pnp.patch +Patch1820: linux-2.6-usbhid-wireless-security-lock.patch +Patch1830: linux-2.6-w1-hush-debug.patch +Patch1840: linux-2.6-x86-hp-reboot.patch +Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch +Patch1870: linux-2.6-kill-blk_attempt_merge.patch +Patch1880: linux-2.6-dm-sync-overrun.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -386,6 +396,16 @@ # VM bits. Patch2000: linux-2.6-vm-oomkiller-debugging.patch Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch +Patch2002: linux-2.6-vm-debug.patch +Patch2003: linux-2.6-vm-clear-unreclaimable.patch + +# ACPI patches. +Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch + +# Broadcom wireless driver +Patch5000: linux-2.6-softmac-git.patch +Patch5001: linux-2.6-bcm43xx.patch +Patch5002: linux-2.6-bcm43xx-resume.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -592,14 +612,15 @@ else # We already have a vanilla dir. cd kernel-%{kversion} - rm -rf linux-%{kversion} + mv linux-%{kversion} deleteme + rm -rf deleteme & fi cp -rl vanilla linux-%{kversion} cd linux-%{kversion} # Update to latest upstream. -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 +#%patch2 -p1 # # Patches 10 through 100 are meant for core subsystem upgrades @@ -633,6 +654,10 @@ %patch204 -p1 # Disable guessing of how many hotplug cpus to add. %patch205 -p1 +# ATI timer quirk. +%patch206 -p1 +# Reboot thru bios on HP laptops. +%patch207 -p1 # # ppc64 @@ -669,9 +694,13 @@ %patch315 -p1 # Handle new Cell boards with >512MiB RAM %patch316 -p1 -# Fix thermal overload on liquid-cooled G5s +# No input layer on iseries %patch317 -p1 +# IA64 +# Altix: Fix sn_flush_device_kernel & spinlock initialization +%patch400 -p1 + # # Xen # @@ -679,11 +708,10 @@ # Base Xen patch from linux-2.6-merge.hg %patch700 -p1 %patch701 -p1 -%patch703 -p1 +%patch702 -p1 %patch704 -p1 %patch705 -p1 %patch706 -p1 -%patch707 -p1 %endif # @@ -709,7 +737,7 @@ # Xen exec-shield bits %if %{includexen} -%patch812 -p1 +#%patch812 -p1 %patch813 -p1 %patch814 -p1 %endif @@ -717,9 +745,6 @@ # Write protect rodata %patch815 -p1 -# kauditd thread prevents sleep -%patch820 -p1 - # # GPG signed kernel modules # @@ -758,8 +783,10 @@ %patch1026 -p1 %patch1027 -p1 %patch1028 -p1 -%patch1029 -p1 - +#%patch1029 -p1 +#%patch1030 -p1 +%patch1031 -p1 +%patch1032 -p1 # # Make /dev/mem a need-to-know function # @@ -839,8 +866,8 @@ %patch1660 -p1 # Tickle the NMI whilst doing serial writes. %patch1670 -p1 -# Missing EXPORT_SYMBOL's -%patch1680 -p1 +# Limit number of serial ports registered. +%patch1671 -p1 # Radeon on thinkpad backlight power-management goodness. %patch1690 -p1 # Fix IDE locking bug. @@ -851,7 +878,7 @@ %patch1720 -p1 # Silence noisy CD drive spew %patch1730 -p1 -# Fix APM dependancy +# Reduce stack usage in block layer %patch1740 -p1 # Enable USB storage,UB & libusual magick. %patch1750 -p1 @@ -861,14 +888,24 @@ %patch1770 -p1 # Increase timeout on firmware loader. %patch1780 -p1 -# Fix USB suspend with devices that have no suspend method +# Use persistent allocation in softcursor %patch1790 -p1 - -# ACPI patches. -# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. +# Power up PWC driver by default. %patch1800 -p1 -# ACPICA update -%patch1801 -p1 +# PNP support for smsc-ircc2 +%patch1810 -p1 +# don't mistake security lock as a mouse +%patch1820 -p1 +# Silence debug messages in w1 +%patch1830 -p1 +# Reboot through BIOS on HP laptops. +%patch1840 -p1 +# Fix posix-cpu-timers sched_time accumulation +%patch1860 -p1 +# kill blk_attempt_merge +%patch1870 -p1 +# dm: avoid ovvrun while syncing. +%patch1880 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -883,12 +920,32 @@ %patch2000 -p1 # Silence GFP_ATOMIC failures. %patch2001 -p1 +# Try to trace some negative pagecount errors. +%patch2002 -p1 +# VM oom killer tweaks. +%patch2003 -p1 + +# ACPI patches. +# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. +%patch2100 -p1 # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream # +# Broadcom BCM43xx wireless driver. + +# Extract snapshot tarballs and move them into place. +tar xvfj %{SOURCE13} +mv bcm43xx-%{BCMVER} drivers/net/wireless/bcm43xx + +# Import softmac code from git tree +%patch5000 -p1 +# Patch Kconfig and Makefiles to merge bcm43xx 'properly' +%patch5001 -p1 +# Fix the reassociate on resume code +%patch5002 -p1 # # final stuff @@ -935,8 +992,7 @@ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -prep/" Makefile # get rid of unwanted files resulting from patch fuzz -find . -name "*.orig" -exec rm -fv {} \; >/dev/null -find . -name "*~" -exec rm -fv {} \; >/dev/null +find . -name "*.orig" -o -name "*~" -exec rm -f {} \; >/dev/null & ### ### build @@ -1023,9 +1079,9 @@ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/source mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build (cd $RPM_BUILD_ROOT/lib/modules/$KernelVer ; ln -s build source) - # dirs for additional modules per module-init-tools, kbuild/modules.txt - mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra - mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates + # dirs for additional modules per module-init-tools, kbuild/modules.txt + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra + mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates # first copy everything cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build @@ -1045,8 +1101,6 @@ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include - cp -a drivers/media/dvb/frontends/*.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/dvb/frontends - cp -a drivers/media/dvb/dvb-core/*.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/drivers/media/dvb/dvb-core cd include cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include %if %{buildxen} @@ -1210,7 +1264,7 @@ %post [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release} -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL} +/sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL} %post devel if [ -x /usr/sbin/hardlink ] ; then @@ -1221,7 +1275,7 @@ %post smp [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}smp -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp +/sbin/new-kernel-pkg --package kernel-smp --mkinitrd --depmod --install %{KVERREL}smp %post smp-devel if [ -x /usr/sbin/hardlink ] ; then @@ -1255,7 +1309,7 @@ %post kdump [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-kdump -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump +/sbin/new-kernel-pkg --package kernel-kdump --mkinitrd --depmod --install %{KVERREL}kdump %post kdump-devel if [ -x /usr/sbin/hardlink ] ; then @@ -1266,11 +1320,11 @@ %preun /sbin/modprobe loop 2> /dev/null > /dev/null || : -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL} +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL} %preun smp /sbin/modprobe loop 2> /dev/null > /dev/null || : -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp +/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove %{KVERREL}smp %preun hypervisor /sbin/modprobe loop 2> /dev/null > /dev/null || : @@ -1392,6 +1446,89 @@ %endif %changelog +* Mon Jan 9 2006 Dave Jones +- Remove vm debug patch that triggers too easily right now. + (Needs fixing properly post test2). +- kill blk_attempt_merge() which was horribly broken. +- dm: avoid ovvrun while syncing. + +* Mon Jan 9 2006 David Woodhouse +- Fix some usblp problems, add ieee1284_id to sysfs +- update bcm43xx driver to version tested in -HEAD + +* Sat Jan 7 2006 Dave Jones +- Silence some iseries build warnings. + +* Fri Jan 6 2006 Dave Jones +- Branch CVS for test2. +- Add timer quirk for ATI chipsets. +- Reboot through BIOS on HP laptops. +- Additional check in x86 edid parser. +- power up pwc webcam by default +- don't confuse wireless security lock as a mouse. +- Hush some debug messages in w1 driver. +- Disable input layer on iseries. +- VM OOM killer tweaks. +- Flip IO scheduler to 'AS' by default again. + (CFQ has slab corruption bugs right now). +- Enable nvram driver for x86-64 +- Fix posix-cpu-timers sched_time accumulation. + +* Thu Jan 5 2006 Dave Jones +- Try to debug some negative pagecount errors. + +* Tue Jan 3 2006 Dave Jones +- Silence some gcc4.1 warnings. + +* Tue Jan 3 2006 David Woodhouse +- Make bcm43xx quieter when dropping packets, and make it reassociate on + resume + +* Tue Jan 3 2006 Dave Jones +- Update to 2.6.15 final. +- Altix: Fix sn_flush_device_kernel & spinlock initialization. (#176827) + +* Mon Jan 02 2006 David Woodhouse +- Merge experimental Broadcom wireless driver + +* Sun Jan 01 2006 Dave Jones +- 2.6.15-rc7-git6 + +* Sat Dec 31 2005 Dave Jones +- 2.6.15-rc7-git5 + +* Fri Dec 30 2005 Dave Jones +- 2.6.15-rc7-git4 + +* Thu Dec 29 2005 Dave Jones +- 2.6.15-rc7-git3 +- Further cfq/ub spinlock fixing. + +* Wed Dec 28 2005 Dave Jones +- 2.6.15-rc7-git2 +- Reduce stack usage in block layer. +- Limit number of serial ports registered at boot time. +- Fix spinlock corruption in cfq with ub. + +* Tue Dec 27 2005 Dave Jones +- 2.6.15-rc7-git1 + +* Sun Dec 25 2005 Dave Jones +- 2.6.15-rc7 +- bah humbug. + +* Sat Dec 24 2005 Dave Jones +- Disable dumb yealink driver, which bound to any hid device. + +* Fri Dec 23 2005 Dave Jones +- 2.6.15-rc6-git4 + +* Thu Dec 22 2005 Dave Jones +- 2.6.15-rc6-git3 + +* Wed Dec 21 2005 Dave Jones +- 2.6.15-rc6-git2 + * Wed Dec 21 2005 Juan Quintela - rebase to rawhide 1.7779. linux-2.6-acpi-thinkpad-c2c3.patch: processor_idle.c | 67 +++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 51 insertions(+), 16 deletions(-) Index: linux-2.6-acpi-thinkpad-c2c3.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-acpi-thinkpad-c2c3.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-acpi-thinkpad-c2c3.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-acpi-thinkpad-c2c3.patch 9 Jan 2006 20:42:13 -0000 1.3 @@ -1,16 +1,30 @@ -processor_idle.c vs Lindent resulted in something of a trainwreck -with whitespace all over the place. This diff rearranges teh -processor_power_dmi_table to look like it did before that accident, -and adds two additional BIOS's to the list as encountered by -Fedora users. https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165590 -Signed-off-by: Dave Jones ---- linux-2.6.13/drivers/acpi/processor_idle.c~ 2005-09-09 19:24:25.000000000 -0400 -+++ linux-2.6.13/drivers/acpi/processor_idle.c 2005-09-09 19:33:18.000000000 -0400 -@@ -94,22 +94,27 @@ static int set_max_cstate(struct dmi_sys +From: Thomas Rosner + +This adds all known BIOS versions of IBM R40e Laptops to the C2/C3 +processor state blacklist and thus prevents them from crashing. Fixes Bug +#3549. + +Implementation is probably overly verbose, but DMI_MATCH seems to give us +no choice. + +Signed-off-by: Thomas Rosner +Cc: +Cc: "Brown, Len" +Cc: Dave Jones +Signed-off-by: Andrew Morton +--- + + drivers/acpi/processor_idle.c | 67 ++++++++++++++++++++++++-------- + 1 files changed, 51 insertions(+), 16 deletions(-) + +diff -puN drivers/acpi/processor_idle.c~acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-for-2613-bug-3549 drivers/acpi/processor_idle.c +--- devel/drivers/acpi/processor_idle.c~acpi-disable-c2-c3-for-_all_-ibm-r40e-laptops-for-2613-bug-3549 2006-01-05 22:28:12.000000000 -0800 ++++ devel-akpm/drivers/acpi/processor_idle.c 2006-01-05 22:28:12.000000000 -0800 +@@ -95,22 +95,57 @@ static int set_max_cstate(struct dmi_sys } static struct dmi_system_id __initdata processor_power_dmi_table[] = { @@ -19,35 +33,70 @@ - "IBM"), - DMI_MATCH(DMI_BIOS_VERSION, - "1SET60WW")}, -+ { set_max_cstate, "IBM ThinkPad R40e", { -+ DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION, "1SET60WW")}, - (void *)1}, -+ { set_max_cstate, "IBM ThinkPad R40e", { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW")}, -+ (void*)1}, -+ { set_max_cstate, "IBM ThinkPad R40e", { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, -+ (void*)1}, -+ - {set_max_cstate, "Medion 41700", { +- (void *)1}, +- {set_max_cstate, "Medion 41700", { - DMI_MATCH(DMI_BIOS_VENDOR, - "Phoenix Technologies LTD"), - DMI_MATCH(DMI_BIOS_VERSION, - "R01-A1J")}, (void *)1}, -+ DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), -+ DMI_MATCH(DMI_BIOS_VERSION, "R01-A1J")}, -+ (void *)1}, -+ - {set_max_cstate, "Clevo 5600D", { +- {set_max_cstate, "Clevo 5600D", { - DMI_MATCH(DMI_BIOS_VENDOR, - "Phoenix Technologies LTD"), - DMI_MATCH(DMI_BIOS_VERSION, - "SHE845M0.86C.0013.D.0302131307")}, -+ DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"), -+ DMI_MATCH(DMI_BIOS_VERSION, "SHE845M0.86C.0013.D.0302131307")}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW")}, (void *)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET43WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET45WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET47WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET50WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET52WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET55WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET56WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET59WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET61WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET62WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET64WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET65WW") }, (void*)1}, ++ { set_max_cstate, "IBM ThinkPad R40e", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), ++ DMI_MATCH(DMI_BIOS_VERSION,"1SET68WW") }, (void*)1}, ++ { set_max_cstate, "Medion 41700", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), ++ DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J")}, (void *)1}, ++ { set_max_cstate, "Clevo 5600D", { ++ DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), ++ DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")}, (void *)2}, {}, }; +_ + linux-2.6-crash-xen.patch: init-xen.c | 2 ++ 1 files changed, 2 insertions(+) Index: linux-2.6-crash-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-crash-xen.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-crash-xen.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-crash-xen.patch 9 Jan 2006 20:42:13 -0000 1.3 @@ -6,8 +6,8 @@ diff --git a/arch/i386/xen/mm/init.c b/arch/i386/xen/mm/init.c index 4c8c7ac..caf4afd 100644 ---- a/arch/i386/xen/mm/init.c -+++ b/arch/i386/xen/mm/init.c +--- a/arch/i386/mm/init-xen.c ++++ b/arch/i386/mm/init-xen.c @@ -281,6 +281,8 @@ int page_is_ram(unsigned long pagenr) #endif linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/i386/mm/pgtable.c | 3 linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 32 files changed, 952 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-crashdump-common.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-crashdump-common.patch 9 Jan 2006 20:42:13 -0000 1.3 @@ -1,23 +1,5 @@ --- linux-2.6.12/drivers/char/sysrq.c.orig 2005-08-18 12:40:07.000000000 -0400 +++ linux-2.6.12/drivers/char/sysrq.c 2005-08-18 14:29:25.000000000 -0400 -@@ -125,6 +125,17 @@ - .enable_mask = SYSRQ_ENABLE_BOOT, - }; - -+/* crash sysrq handler */ -+static void sysrq_handle_crash(int key, struct pt_regs *pt_regs, -+ struct tty_struct *tty) { -+ *( (char *) 0) = 0; -+} -+static struct sysrq_key_op sysrq_crash_op = { -+ .handler = sysrq_handle_crash, -+ .help_msg = "Crash", -+ .action_msg = "Crashing the kernel by request", -+}; -+ - static void sysrq_handle_sync(int key, struct pt_regs *pt_regs, - struct tty_struct *tty) - { @@ -289,7 +300,7 @@ it is handled specially on the sparc and will never arrive */ @@ -257,14 +239,15 @@ +#endif /* _ASM_X86_64_CRASHDUMP_H */ --- linux-2.6.12/include/asm-i386/kmap_types.h.orig 2005-06-17 15:48:29.000000000 -0400 +++ linux-2.6.12/include/asm-i386/kmap_types.h 2005-08-18 14:23:59.000000000 -0400 -@@ -23,7 +23,9 @@ +@@ -23,8 +23,10 @@ D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, D(12) KM_SOFTIRQ1, --D(13) KM_TYPE_NR -+D(13) KM_CRASHDUMP, -+D(14) KM_UNUSED, -+D(15) KM_TYPE_NR + D(13) KM_SWIOTLB, +-D(14) KM_TYPE_NR ++D(14) KM_CRASHDUMP, ++D(15) KM_UNUSED, ++D(16) KM_TYPE_NR }; #undef D linux-2.6-debug-oops-pause.patch: traps.c | 9 +++++++++ 1 files changed, 9 insertions(+) Index: linux-2.6-debug-oops-pause.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-oops-pause.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-oops-pause.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-debug-oops-pause.patch 9 Jan 2006 20:42:13 -0000 1.3 @@ -6,9 +6,9 @@ (Wow, I'm really getting desperate for better debug data). ---- linux-2.6.14/arch/i386/kernel/traps.c~ 2005-12-16 03:00:16.000000000 -0500 -+++ linux-2.6.14/arch/i386/kernel/traps.c 2005-12-16 03:07:12.000000000 -0500 -@@ -271,6 +271,15 @@ void show_registers(struct pt_regs *regs +--- vanilla/arch/i386/kernel/traps.c 2006-01-02 22:21:10.000000000 -0500 ++++ linux-2.6.15/arch/i386/kernel/traps.c 2006-01-04 23:42:46.000000000 -0500 +@@ -256,6 +271,15 @@ void show_registers(struct pt_regs *regs } } printk("\n"); @@ -17,7 +17,7 @@ + for (i=120;i>0;i--) { + mdelay(1000); + touch_nmi_watchdog(); -+ printk("Continuing in %d seconds\r", i); ++ printk("Continuing in %d seconds. \r", i); + } + printk("\n"); + } linux-2.6-debug-spinlock-taint.patch: spinlock_debug.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) Index: linux-2.6-debug-spinlock-taint.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-spinlock-taint.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-spinlock-taint.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-debug-spinlock-taint.patch 9 Jan 2006 20:42:13 -0000 1.3 @@ -1,62 +1,64 @@ Print info about tainting in the spinlock debug printks. ---- linux-2.6.13/lib/spinlock_debug.c~ 2005-09-12 20:10:31.000000000 -0400 -+++ linux-2.6.13/lib/spinlock_debug.c 2005-09-12 20:13:57.000000000 -0400 -@@ -19,8 +19,8 @@ static void spin_bug(spinlock_t *lock, c +--- linux-2.6.14/lib/spinlock_debug.c~ 2005-12-21 11:42:59.000000000 -0500 ++++ linux-2.6.14/lib/spinlock_debug.c 2005-12-21 11:44:12.000000000 -0500 +@@ -19,9 +19,9 @@ static void spin_bug(spinlock_t *lock, c if (xchg(&print_once, 0)) { if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT) owner = lock->owner; - printk("BUG: spinlock %s on CPU#%d, %s/%d\n", -- msg, smp_processor_id(), current->comm, current->pid); + printk("BUG: spinlock %s on CPU#%d, %s/%d (%s)\n", -+ msg, smp_processor_id(), current->comm, current->pid, print_tainted()); + msg, raw_smp_processor_id(), +- current->comm, current->pid); ++ current->comm, current->pid, print_tainted()); printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n", lock, lock->magic, owner ? owner->comm : "", -@@ -77,9 +77,9 @@ static void __spin_lock_debug(spinlock_t +@@ -78,9 +78,9 @@ static void __spin_lock_debug(spinlock_t /* lockup suspected: */ if (print_once) { print_once = 0; - printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n", + printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p (%s)\n", - smp_processor_id(), current->comm, current->pid, -- lock); -+ lock, print_tainted()); + raw_smp_processor_id(), current->comm, +- current->pid, lock); ++ current->pid, lock, print_tainted()); dump_stack(); } } -@@ -119,8 +119,8 @@ static void rwlock_bug(rwlock_t *lock, c +@@ -120,9 +120,9 @@ static void rwlock_bug(rwlock_t *lock, c static long print_once = 1; if (xchg(&print_once, 0)) { - printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg, -- smp_processor_id(), current->comm, current->pid, lock); + printk("BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n", msg, -+ smp_processor_id(), current->comm, current->pid, lock, print_tainted()); + raw_smp_processor_id(), current->comm, +- current->pid, lock); ++ current->pid, lock, print_tainted()); dump_stack(); #ifdef CONFIG_SMP /* -@@ -147,9 +147,9 @@ static void __read_lock_debug(rwlock_t * +@@ -149,9 +149,9 @@ static void __read_lock_debug(rwlock_t * /* lockup suspected: */ if (print_once) { print_once = 0; - printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n", + printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p (%s)\n", - smp_processor_id(), current->comm, current->pid, -- lock); -+ lock, print_tainted()); + raw_smp_processor_id(), current->comm, +- current->pid, lock); ++ current->pid, lock, print_tainted()); dump_stack(); } } -@@ -219,9 +219,9 @@ static void __write_lock_debug(rwlock_t +@@ -221,9 +221,9 @@ static void __write_lock_debug(rwlock_t /* lockup suspected: */ if (print_once) { print_once = 0; - printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n", + printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p (%s)\n", - smp_processor_id(), current->comm, current->pid, -- lock); -+ lock, print_tainted()); + raw_smp_processor_id(), current->comm, +- current->pid, lock); ++ current->pid, lock, print_tainted()); dump_stack(); } } linux-2.6-execshield-xen.patch: arch/i386/kernel/entry-xen.S | 8 ++- arch/i386/kernel/process-xen.c | 58 +++++++++++++++++++++ arch/i386/kernel/smp-xen.c | 2 arch/i386/kernel/traps-xen.c | 93 +++++++++++++++++++++++++++++++++-- arch/i386/mm/init-xen.c | 11 +++- linux-2.6.14/include/asm-i386/desc.h | 5 + 6 files changed, 170 insertions(+), 7 deletions(-) Index: linux-2.6-execshield-xen.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-execshield-xen.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-execshield-xen.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-execshield-xen.patch 9 Jan 2006 20:42:13 -0000 1.3 @@ -13,8 +13,8 @@ diff --git a/arch/i386/xen/kernel/entry.S b/arch/i386/xen/kernel/entry.S index 8e71c50..ced2bb8 100644 ---- a/arch/i386/xen/kernel/entry.S -+++ b/arch/i386/xen/kernel/entry.S +--- a/arch/i386/kernel/entry-xen.S ++++ b/arch/i386/kernel/entry-xen.S @@ -233,8 +233,12 @@ sysenter_past_esp: pushl %ebp pushfl @@ -32,8 +32,8 @@ * Careful about security. diff --git a/arch/i386/xen/kernel/process.c b/arch/i386/xen/kernel/process.c index 55be738..dbd41a1 100644 ---- a/arch/i386/xen/kernel/process.c -+++ b/arch/i386/xen/kernel/process.c +--- a/arch/i386/kernel/process-xen.c ++++ b/arch/i386/kernel/process-xen.c @@ -543,6 +543,8 @@ struct task_struct fastcall * __switch_t #if 0 /* lazy fpu sanity check */ else BUG_ON(!(read_cr0() & 8)); @@ -105,8 +105,8 @@ + diff --git a/arch/i386/xen/kernel/smp.c b/arch/i386/xen/kernel/smp.c index 855e088..230200c 100644 ---- a/arch/i386/xen/kernel/smp.c -+++ b/arch/i386/xen/kernel/smp.c +--- a/arch/i386/kernel/smp-xen.c ++++ b/arch/i386/kernel/smp-xen.c @@ -277,6 +277,8 @@ irqreturn_t smp_invalidate_interrupt(int unsigned long cpu; @@ -118,8 +118,8 @@ goto out; diff --git a/arch/i386/xen/kernel/traps.c b/arch/i386/xen/kernel/traps.c index 0f7199b..878c084 100644 ---- a/arch/i386/xen/kernel/traps.c -+++ b/arch/i386/xen/kernel/traps.c +--- a/arch/i386/kernel/traps-xen.c ++++ b/arch/i386/kernel/traps-xen.c @@ -459,11 +459,89 @@ DO_ERROR_INFO(17, SIGBUS, "alignment che #ifdef CONFIG_X86_MCE DO_ERROR(18, SIGBUS, "machine check", machine_check) @@ -238,8 +238,8 @@ goto gp_in_vm86; diff --git a/arch/i386/xen/mm/init.c b/arch/i386/xen/mm/init.c index f243508..4c8c7ac 100644 ---- a/arch/i386/xen/mm/init.c -+++ b/arch/i386/xen/mm/init.c +--- a/arch/i386/mm/init-xen.c ++++ b/arch/i386/mm/init-xen.c @@ -274,7 +274,10 @@ int page_is_ram(unsigned long pagenr) #else /* CONFIG_XEN */ @@ -280,65 +280,19 @@ pagetable_init(); -diff --git a/include/asm-i386/mach-xen/asm/desc.h b/include/asm-i386/mach-xen/asm/desc.h -index 864ace7..019fc22 100644 ---- a/include/asm-i386/mach-xen/asm/desc.h -+++ b/include/asm-i386/mach-xen/asm/desc.h -@@ -159,6 +159,20 @@ static inline unsigned long get_desc_bas - return base; +--- linux-2.6.14/include/asm-i386/desc.h~ 2006-01-06 17:09:44.000000000 -0500 ++++ linux-2.6.14/include/asm-i386/desc.h 2006-01-06 17:22:41.000000000 -0500 +@@ -210,8 +210,13 @@ + desc->b = (limit & 0xf0000) | 0x00c0fb00; } -+static inline void set_user_cs(struct desc_struct *desc, unsigned long limit) -+{ -+ limit = (limit - 1) / PAGE_SIZE; -+ desc->a = limit & 0xffff; -+ desc->b = (limit & 0xf0000) | 0x00c0fb00; -+} -+ ++#ifndef CONFIG_X86_XEN + #define load_user_cs_desc(cpu, mm) \ + per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs ++#else +#define load_user_cs_desc(cpu, mm) \ -+ HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32); -+ -+extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); -+extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); -+extern void arch_flush_exec_range(struct mm_struct *mm); -+ - #endif /* !__ASSEMBLY__ */ ++ HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32); ++#endif - #endif -diff --git a/include/asm-i386/mach-xen/asm/mmu.h b/include/asm-i386/mach-xen/asm/mmu.h -index c646692..b103653 100644 ---- a/include/asm-i386/mach-xen/asm/mmu.h -+++ b/include/asm-i386/mach-xen/asm/mmu.h -@@ -12,6 +12,8 @@ typedef struct { - int size; - struct semaphore sem; - void *ldt; -+ struct desc_struct user_cs; -+ unsigned long exec_limit; - void *vdso; - } mm_context_t; - -diff --git a/include/asm-i386/mach-xen/asm/processor.h b/include/asm-i386/mach-xen/asm/processor.h -index 070ff44..5b7ca04 100644 ---- a/include/asm-i386/mach-xen/asm/processor.h -+++ b/include/asm-i386/mach-xen/asm/processor.h -@@ -332,6 +332,9 @@ extern int bootloader_type; - */ - #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) - -+#define __HAVE_ARCH_ALIGN_STACK -+extern unsigned long arch_align_stack(unsigned long sp); -+ - #define HAVE_ARCH_PICK_MMAP_LAYOUT - - /* -@@ -513,6 +516,9 @@ static inline void load_esp0(struct tss_ - regs->xcs = __USER_CS; \ - regs->eip = new_eip; \ - regs->esp = new_esp; \ -+ preempt_disable(); \ -+ load_user_cs_desc(smp_processor_id(), current->mm); \ -+ preempt_enable(); \ - } while (0) - - /* + extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); + extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); linux-2.6-execshield.patch: linux-2.6.13-a/arch/x86_64/ia32/ia32_binfmt.c | 4 linux-2.6.13-a/arch/x86_64/kernel/process.c | 6 - linux-2.6.13-a/arch/x86_64/kernel/setup64.c | 25 ----- linux-2.6.13-a/include/asm-x86_64/pgtable.h | 2 linux-2.6.13/mm/fremap.c | 16 +-- linux-2.6.14/fs/proc/base.c | 2 linux-810/arch/i386/kernel/asm-offsets.c | 1 linux-810/arch/i386/kernel/entry.S | 8 + linux-810/arch/i386/kernel/process.c | 59 ++++++++++++ linux-810/arch/i386/kernel/signal.c | 4 linux-810/arch/i386/kernel/smp.c | 3 linux-810/arch/i386/kernel/sysenter.c | 55 +++++++++++ linux-810/arch/i386/kernel/traps.c | 93 ++++++++++++++++++- linux-810/arch/i386/kernel/vsyscall-sysenter.S | 6 - linux-810/arch/i386/kernel/vsyscall.lds.S | 4 linux-810/arch/i386/mm/init.c | 6 + linux-810/arch/i386/mm/mmap.c | 6 - linux-810/arch/ia64/ia32/binfmt_elf32.c | 2 linux-810/arch/x86_64/ia32/ia32_binfmt.c | 2 linux-810/arch/x86_64/kernel/process.c | 7 - linux-810/arch/x86_64/mm/Makefile | 2 linux-810/arch/x86_64/mm/fault.c | 2 linux-810/arch/x86_64/mm/mmap.c | 95 +++++++++++++++++++ linux-810/drivers/char/random.c | 7 + linux-810/fs/binfmt_elf.c | 120 ++++++++++++++++++++----- linux-810/fs/proc/array.c | 8 + linux-810/fs/proc/base.c | 4 linux-810/fs/proc/task_mmu.c | 25 ++++- linux-810/include/asm-i386/desc.h | 14 ++ linux-810/include/asm-i386/elf.h | 42 +++++--- linux-810/include/asm-i386/mmu.h | 6 + linux-810/include/asm-i386/pgalloc.h | 1 linux-810/include/asm-i386/processor.h | 8 + linux-810/include/asm-i386/thread_info.h | 1 linux-810/include/asm-ia64/pgalloc.h | 4 linux-810/include/asm-powerpc/pgalloc.h | 5 + linux-810/include/asm-ppc/pgalloc.h | 5 + linux-810/include/asm-s390/pgalloc.h | 4 linux-810/include/asm-sparc/pgalloc.h | 4 linux-810/include/asm-sparc64/pgalloc.h | 4 linux-810/include/asm-x86_64/pgalloc.h | 7 + linux-810/include/asm-x86_64/processor.h | 5 + linux-810/include/linux/mm.h | 9 + linux-810/include/linux/resource.h | 5 - linux-810/include/linux/sched.h | 9 + linux-810/include/linux/sysctl.h | 3 linux-810/kernel/signal.c | 38 +++++++ linux-810/kernel/sysctl.c | 39 ++++++++ linux-810/mm/mmap.c | 105 ++++++++++++++++++++- linux-810/mm/mprotect.c | 5 - linux-810/mm/mremap.c | 4 linux-813/arch/i386/kernel/cpu/common.c | 7 + 52 files changed, 781 insertions(+), 127 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-execshield.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-execshield.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-execshield.patch 9 Jan 2006 20:42:13 -0000 1.3 @@ -1837,3 +1837,14 @@ extern void paging_init(void); extern void clear_kernel_mapping(unsigned long addr, unsigned long size); +--- linux-2.6.14/fs/proc/base.c~ 2005-12-29 19:25:42.000000000 -0500 ++++ linux-2.6.14/fs/proc/base.c 2005-12-29 19:26:20.000000000 -0500 +@@ -200,7 +200,7 @@ static struct pid_entry tgid_base_stuff[ + E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), + E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), + #ifdef CONFIG_MMU +- E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUGO), ++ E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUSR), + #endif + #ifdef CONFIG_SECURITY + E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), linux-2.6-gcc41.patch: linux-2.6.14/include/asm-x86_64/apic.h | 2 linux-2.6.14/include/asm-x86_64/mpspec.h | 2 linux-2.6/drivers/isdn/act2000/capi.h | 88 +++++++++--------- linux-2.6/drivers/isdn/hisax/hisax.h | 20 ++-- linux-2.6/drivers/isdn/hisax/hisax_fcpcipnp.h | 18 +-- linux-2.6/drivers/net/3c527.h | 50 +++++----- linux-2.6/drivers/net/irda/vlsi_ir.h | 4 linux-2.6/drivers/net/wan/sdla.c | 6 - linux-2.6/fs/afs/volume.h | 4 linux-2.6/include/asm-i386/mpspec_def.h | 4 linux-2.6/include/linux/atalk.h | 18 +-- linux-2.6/include/linux/cycx_x25.h | 66 ++++++------- linux-2.6/include/linux/if_frad.h | 12 +- linux-2.6/include/linux/isdnif.h | 70 +++++++------- linux-2.6/include/linux/ncp.h | 126 +++++++++++++------------- linux-2.6/include/linux/sdla.h | 64 ++++++------- linux-2.6/include/linux/wavefront.h | 34 +++---- linux-2.6/include/net/dn_dev.h | 80 ++++++++-------- linux-2.6/include/net/dn_nsp.h | 74 +++++++-------- linux-2.6/include/sound/wavefront.h | 34 +++---- 20 files changed, 387 insertions(+), 389 deletions(-) Index: linux-2.6-gcc41.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-gcc41.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-gcc41.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-gcc41.patch 9 Jan 2006 20:42:13 -0000 1.3 @@ -12,37 +12,7 @@ }; /* List of Bus Type string values, Intel MP Spec. */ ---- linux-2.6.14/include/asm-i386/mpspec_def.h~ 2005-12-06 23:06:23.000000000 -0500 -+++ linux-2.6.14/include/asm-i386/mpspec_def.h 2005-12-06 23:06:29.000000000 -0500 -@@ -75,7 +75,7 @@ struct mpc_config_bus - { - unsigned char mpc_type; - unsigned char mpc_busid; -- unsigned char mpc_bustype[6] __attribute((packed)); -+ unsigned char mpc_bustype[6]; - }; - - /* List of Bus Type string values, Intel MP Spec. */ - -__get_unaligned creates a typeof the var its passed, and writes to it, -which on gcc4.1, spits out the following error: -drivers/char/vc_screen.c: In function 'vcs_write': -drivers/char/vc_screen.c:422: error: assignment of read-only variable 'val' - -Signed-off-by: Dave Jones - ---- linux-2.6.14/drivers/char/vc_screen.c~ 2005-12-06 23:20:03.000000000 -0500 -+++ linux-2.6.14/drivers/char/vc_screen.c 2005-12-06 23:21:35.000000000 -0500 -@@ -419,7 +419,7 @@ vcs_write(struct file *file, const char - while (this_round > 1) { - unsigned short w; - -- w = get_unaligned(((const unsigned short *)con_buf0)); -+ w = get_unaligned(((unsigned short *)con_buf0)); - vcs_scr_writew(vc, w, org++); - con_buf0 += 2; - this_round -= 2; Prevent a zillion 'value computed is not used' warnings. @@ -57,3 +27,1293 @@ } static __inline unsigned int apic_read(unsigned long reg) + + +Since version 4.1 the gcc is warning about ignored attributes. This patch is +using the equivalent attribute on the struct instead of on each of the +structure or union members. + +GCC Manual: + "Specifying Attributes of Types + + packed + This attribute, attached to struct or union type definition, specifies + that + each member of the structure or union is placed to minimize the memory + required. When attached to an enum definition, it indicates that the + smallest integral type should be used. + + Specifying this attribute for struct and union types is equivalent to + specifying the packed attribute on each of the structure or union + members." + +Signed-off-by: Jan Blunck + +--8JPrznbw0YAQ/KXy +Content-Type: text/plain; charset=us-ascii +Content-Disposition: attachment; filename="eliminate-packed-warnings-2.diff" + + drivers/isdn/hisax/hisax.h | 20 ++--- + drivers/isdn/hisax/hisax_fcpcipnp.h | 18 ++--- + drivers/net/3c527.h | 50 +++++++------- + drivers/net/irda/vlsi_ir.h | 4 - + drivers/net/wan/sdla.c | 6 - + include/asm-i386/mpspec_def.h | 4 - + include/linux/atalk.h | 18 ++--- + include/linux/cycx_x25.h | 66 +++++++++--------- + include/linux/if_frad.h | 12 +-- + include/linux/isdnif.h | 70 ++++++++++---------- + include/linux/ncp.h | 126 ++++++++++++++++++------------------ + include/linux/sdla.h | 64 +++++++++--------- + include/linux/wavefront.h | 34 ++++----- + include/net/dn_dev.h | 80 +++++++++++----------- + include/net/dn_nsp.h | 74 ++++++++++----------- + include/sound/wavefront.h | 34 ++++----- + 16 files changed, 340 insertions(+), 340 deletions(-) + +Index: linux-2.6/include/asm-i386/mpspec_def.h +=================================================================== +--- linux-2.6.orig/include/asm-i386/mpspec_def.h ++++ linux-2.6/include/asm-i386/mpspec_def.h +@@ -75,8 +75,8 @@ struct mpc_config_bus + { + unsigned char mpc_type; + unsigned char mpc_busid; +- unsigned char mpc_bustype[6] __attribute((packed)); +-}; ++ unsigned char mpc_bustype[6]; ++} __attribute((packed)); + + /* List of Bus Type string values, Intel MP Spec. */ + #define BUSTYPE_EISA "EISA" +Index: linux-2.6/include/linux/if_frad.h +=================================================================== +--- linux-2.6.orig/include/linux/if_frad.h ++++ linux-2.6/include/linux/if_frad.h +@@ -131,17 +131,17 @@ struct frad_conf + /* these are the fields of an RFC 1490 header */ + struct frhdr + { +- unsigned char control __attribute__((packed)); ++ unsigned char control; + + /* for IP packets, this can be the NLPID */ +- unsigned char pad __attribute__((packed)); ++ unsigned char pad; + +- unsigned char NLPID __attribute__((packed)); +- unsigned char OUI[3] __attribute__((packed)); +- unsigned short PID __attribute__((packed)); ++ unsigned char NLPID; ++ unsigned char OUI[3]; ++ unsigned short PID; + + #define IP_NLPID pad +-}; ++} __attribute__((packed)); + + /* see RFC 1490 for the definition of the following */ + #define FRAD_I_UI 0x03 +Index: linux-2.6/include/linux/isdnif.h +=================================================================== +--- linux-2.6.orig/include/linux/isdnif.h ++++ linux-2.6/include/linux/isdnif.h +@@ -282,43 +282,43 @@ typedef struct setup_parm { + + typedef struct T30_s { + /* session parameters */ +- __u8 resolution __attribute__ ((packed)); +- __u8 rate __attribute__ ((packed)); +- __u8 width __attribute__ ((packed)); +- __u8 length __attribute__ ((packed)); +- __u8 compression __attribute__ ((packed)); +- __u8 ecm __attribute__ ((packed)); +- __u8 binary __attribute__ ((packed)); +- __u8 scantime __attribute__ ((packed)); +- __u8 id[FAXIDLEN] __attribute__ ((packed)); ++ __u8 resolution; ++ __u8 rate ; ++ __u8 width ; ++ __u8 length ; ++ __u8 compression ; ++ __u8 ecm ; ++ __u8 binary ; ++ __u8 scantime ; ++ __u8 id[FAXIDLEN] ; + /* additional parameters */ +- __u8 phase __attribute__ ((packed)); +- __u8 direction __attribute__ ((packed)); +- __u8 code __attribute__ ((packed)); +- __u8 badlin __attribute__ ((packed)); +- __u8 badmul __attribute__ ((packed)); +- __u8 bor __attribute__ ((packed)); +- __u8 fet __attribute__ ((packed)); +- __u8 pollid[FAXIDLEN] __attribute__ ((packed)); +- __u8 cq __attribute__ ((packed)); +- __u8 cr __attribute__ ((packed)); +- __u8 ctcrty __attribute__ ((packed)); +- __u8 minsp __attribute__ ((packed)); +- __u8 phcto __attribute__ ((packed)); +- __u8 rel __attribute__ ((packed)); +- __u8 nbc __attribute__ ((packed)); ++ __u8 phase; ++ __u8 direction; ++ __u8 code; ++ __u8 badlin; ++ __u8 badmul; ++ __u8 bor; ++ __u8 fet; ++ __u8 pollid[FAXIDLEN]; ++ __u8 cq; ++ __u8 cr; ++ __u8 ctcrty; ++ __u8 minsp; ++ __u8 phcto; ++ __u8 rel; ++ __u8 nbc; + /* remote station parameters */ +- __u8 r_resolution __attribute__ ((packed)); +- __u8 r_rate __attribute__ ((packed)); +- __u8 r_width __attribute__ ((packed)); +- __u8 r_length __attribute__ ((packed)); +- __u8 r_compression __attribute__ ((packed)); +- __u8 r_ecm __attribute__ ((packed)); +- __u8 r_binary __attribute__ ((packed)); +- __u8 r_scantime __attribute__ ((packed)); +- __u8 r_id[FAXIDLEN] __attribute__ ((packed)); +- __u8 r_code __attribute__ ((packed)); +-} T30_s; ++ __u8 r_resolution; ++ __u8 r_rate; ++ __u8 r_width; ++ __u8 r_length; ++ __u8 r_compression; ++ __u8 r_ecm; ++ __u8 r_binary; ++ __u8 r_scantime; ++ __u8 r_id[FAXIDLEN]; ++ __u8 r_code; ++} __attribute__((packed)) T30_s; + + #define ISDN_TTY_FAX_CONN_IN 0 + #define ISDN_TTY_FAX_CONN_OUT 1 +Index: linux-2.6/include/linux/ncp.h +=================================================================== +--- linux-2.6.orig/include/linux/ncp.h ++++ linux-2.6/include/linux/ncp.h +@@ -20,29 +20,29 @@ + #define NCP_DEALLOC_SLOT_REQUEST (0x5555) + + struct ncp_request_header { +- __u16 type __attribute__((packed)); +- __u8 sequence __attribute__((packed)); +- __u8 conn_low __attribute__((packed)); +- __u8 task __attribute__((packed)); +- __u8 conn_high __attribute__((packed)); +- __u8 function __attribute__((packed)); +- __u8 data[0] __attribute__((packed)); +-}; ++ __u16 type; ++ __u8 sequence; ++ __u8 conn_low; ++ __u8 task; ++ __u8 conn_high; ++ __u8 function; ++ __u8 data[0]; ++} __attribute__((packed)); + + #define NCP_REPLY (0x3333) + #define NCP_WATCHDOG (0x3E3E) + #define NCP_POSITIVE_ACK (0x9999) + + struct ncp_reply_header { +- __u16 type __attribute__((packed)); +- __u8 sequence __attribute__((packed)); +- __u8 conn_low __attribute__((packed)); +- __u8 task __attribute__((packed)); +- __u8 conn_high __attribute__((packed)); +- __u8 completion_code __attribute__((packed)); +- __u8 connection_state __attribute__((packed)); +- __u8 data[0] __attribute__((packed)); +-}; ++ __u16 type; ++ __u8 sequence; ++ __u8 conn_low; ++ __u8 task; ++ __u8 conn_high; ++ __u8 completion_code; ++ __u8 connection_state; ++ __u8 data[0]; ++} __attribute__((packed)); + + #define NCP_VOLNAME_LEN (16) + #define NCP_NUMBER_OF_VOLUMES (256) +@@ -128,37 +128,37 @@ struct nw_nfs_info { + }; + + struct nw_info_struct { +- __u32 spaceAlloc __attribute__((packed)); +- __le32 attributes __attribute__((packed)); +- __u16 flags __attribute__((packed)); +- __le32 dataStreamSize __attribute__((packed)); +- __le32 totalStreamSize __attribute__((packed)); +- __u16 numberOfStreams __attribute__((packed)); +- __le16 creationTime __attribute__((packed)); +- __le16 creationDate __attribute__((packed)); +- __u32 creatorID __attribute__((packed)); +- __le16 modifyTime __attribute__((packed)); +- __le16 modifyDate __attribute__((packed)); +- __u32 modifierID __attribute__((packed)); +- __le16 lastAccessDate __attribute__((packed)); +- __u16 archiveTime __attribute__((packed)); +- __u16 archiveDate __attribute__((packed)); +- __u32 archiverID __attribute__((packed)); +- __u16 inheritedRightsMask __attribute__((packed)); +- __le32 dirEntNum __attribute__((packed)); +- __le32 DosDirNum __attribute__((packed)); +- __u32 volNumber __attribute__((packed)); +- __u32 EADataSize __attribute__((packed)); +- __u32 EAKeyCount __attribute__((packed)); +- __u32 EAKeySize __attribute__((packed)); +- __u32 NSCreator __attribute__((packed)); +- __u8 nameLen __attribute__((packed)); +- __u8 entryName[256] __attribute__((packed)); ++ __u32 spaceAlloc; ++ __le32 attributes; ++ __u16 flags; ++ __le32 dataStreamSize; ++ __le32 totalStreamSize; ++ __u16 numberOfStreams; ++ __le16 creationTime; ++ __le16 creationDate; ++ __u32 creatorID; ++ __le16 modifyTime; ++ __le16 modifyDate; ++ __u32 modifierID; ++ __le16 lastAccessDate; ++ __u16 archiveTime; ++ __u16 archiveDate; ++ __u32 archiverID; ++ __u16 inheritedRightsMask; ++ __le32 dirEntNum; ++ __le32 DosDirNum; ++ __u32 volNumber; ++ __u32 EADataSize; ++ __u32 EAKeyCount; ++ __u32 EAKeySize; ++ __u32 NSCreator; ++ __u8 nameLen; ++ __u8 entryName[256]; + /* libncp may depend on there being nothing after entryName */ + #ifdef __KERNEL__ + struct nw_nfs_info nfs; + #endif +-}; ++} __attribute__((packed)); + + /* modify mask - use with MODIFY_DOS_INFO structure */ + #define DM_ATTRIBUTES (cpu_to_le32(0x02)) +@@ -176,26 +176,26 @@ struct nw_info_struct { + #define DM_MAXIMUM_SPACE (cpu_to_le32(0x2000)) + + struct nw_modify_dos_info { +- __le32 attributes __attribute__((packed)); +- __le16 creationDate __attribute__((packed)); +- __le16 creationTime __attribute__((packed)); +- __u32 creatorID __attribute__((packed)); +- __le16 modifyDate __attribute__((packed)); +- __le16 modifyTime __attribute__((packed)); +- __u32 modifierID __attribute__((packed)); +- __u16 archiveDate __attribute__((packed)); +- __u16 archiveTime __attribute__((packed)); +- __u32 archiverID __attribute__((packed)); +- __le16 lastAccessDate __attribute__((packed)); +- __u16 inheritanceGrantMask __attribute__((packed)); +- __u16 inheritanceRevokeMask __attribute__((packed)); +- __u32 maximumSpace __attribute__((packed)); +-}; ++ __le32 attributes; ++ __le16 creationDate; ++ __le16 creationTime; ++ __u32 creatorID; ++ __le16 modifyDate; ++ __le16 modifyTime; ++ __u32 modifierID; ++ __u16 archiveDate; ++ __u16 archiveTime; ++ __u32 archiverID; ++ __le16 lastAccessDate; ++ __u16 inheritanceGrantMask; ++ __u16 inheritanceRevokeMask; ++ __u32 maximumSpace; ++} __attribute__((packed)); + + struct nw_search_sequence { +- __u8 volNumber __attribute__((packed)); +- __u32 dirBase __attribute__((packed)); +- __u32 sequence __attribute__((packed)); +-}; ++ __u8 volNumber; ++ __u32 dirBase; ++ __u32 sequence; ++} __attribute__((packed)); + + #endif /* _LINUX_NCP_H */ +Index: linux-2.6/drivers/isdn/hisax/hisax.h +=================================================================== +--- linux-2.6.orig/drivers/isdn/hisax/hisax.h ++++ linux-2.6/drivers/isdn/hisax/hisax.h +@@ -396,17 +396,17 @@ struct isar_hw { + + struct hdlc_stat_reg { + #ifdef __BIG_ENDIAN +- u_char fill __attribute__((packed)); +- u_char mode __attribute__((packed)); +- u_char xml __attribute__((packed)); +- u_char cmd __attribute__((packed)); +-#else +- u_char cmd __attribute__((packed)); +- u_char xml __attribute__((packed)); +- u_char mode __attribute__((packed)); +- u_char fill __attribute__((packed)); ++ u_char fill; ++ u_char mode; ++ u_char xml; ++ u_char cmd; ++#else ++ u_char cmd; ++ u_char xml; ++ u_char mode; ++ u_char fill; + #endif +-}; ++} __attribute__((packed)); + + struct hdlc_hw { + union { +Index: linux-2.6/drivers/isdn/hisax/hisax_fcpcipnp.h +=================================================================== +--- linux-2.6.orig/drivers/isdn/hisax/hisax_fcpcipnp.h ++++ linux-2.6/drivers/isdn/hisax/hisax_fcpcipnp.h +@@ -12,17 +12,17 @@ enum { + + struct hdlc_stat_reg { + #ifdef __BIG_ENDIAN +- u_char fill __attribute__((packed)); +- u_char mode __attribute__((packed)); +- u_char xml __attribute__((packed)); +- u_char cmd __attribute__((packed)); ++ u_char fill; ++ u_char mode; ++ u_char xml; ++ u_char cmd; + #else +- u_char cmd __attribute__((packed)); +- u_char xml __attribute__((packed)); +- u_char mode __attribute__((packed)); +- u_char fill __attribute__((packed)); ++ u_char cmd; ++ u_char xml; ++ u_char mode; ++ u_char fill; + #endif +-}; ++} __attribute__((packed)); + + struct fritz_bcs { + struct hisax_b_if b_if; +Index: linux-2.6/drivers/net/3c527.h +=================================================================== +--- linux-2.6.orig/drivers/net/3c527.h ++++ linux-2.6/drivers/net/3c527.h +@@ -32,43 +32,43 @@ + + struct mc32_mailbox + { +- u16 mbox __attribute((packed)); +- u16 data[1] __attribute((packed)); +-}; ++ u16 mbox; ++ u16 data[1]; ++} __attribute((packed)); + + struct skb_header + { +- u8 status __attribute((packed)); +- u8 control __attribute((packed)); +- u16 next __attribute((packed)); /* Do not change! */ +- u16 length __attribute((packed)); +- u32 data __attribute((packed)); +-}; ++ u8 status; ++ u8 control; ++ u16 next; /* Do not change! */ ++ u16 length; ++ u32 data; ++} __attribute((packed)); + + struct mc32_stats + { + /* RX Errors */ +- u32 rx_crc_errors __attribute((packed)); +- u32 rx_alignment_errors __attribute((packed)); +- u32 rx_overrun_errors __attribute((packed)); +- u32 rx_tooshort_errors __attribute((packed)); +- u32 rx_toolong_errors __attribute((packed)); +- u32 rx_outofresource_errors __attribute((packed)); ++ u32 rx_crc_errors; ++ u32 rx_alignment_errors; ++ u32 rx_overrun_errors; ++ u32 rx_tooshort_errors; ++ u32 rx_toolong_errors; ++ u32 rx_outofresource_errors; + +- u32 rx_discarded __attribute((packed)); /* via card pattern match filter */ ++ u32 rx_discarded; /* via card pattern match filter */ + + /* TX Errors */ +- u32 tx_max_collisions __attribute((packed)); +- u32 tx_carrier_errors __attribute((packed)); +- u32 tx_underrun_errors __attribute((packed)); +- u32 tx_cts_errors __attribute((packed)); +- u32 tx_timeout_errors __attribute((packed)) ; ++ u32 tx_max_collisions; ++ u32 tx_carrier_errors; ++ u32 tx_underrun_errors; ++ u32 tx_cts_errors; ++ u32 tx_timeout_errors; + + /* various cruft */ +- u32 dataA[6] __attribute((packed)); +- u16 dataB[5] __attribute((packed)); +- u32 dataC[14] __attribute((packed)); +-}; ++ u32 dataA[6]; ++ u16 dataB[5]; ++ u32 dataC[14]; ++} __attribute((packed)); + + #define STATUS_MASK 0x0F + #define COMPLETED (1<<7) +Index: linux-2.6/drivers/net/irda/vlsi_ir.h +=================================================================== +--- linux-2.6.orig/drivers/net/irda/vlsi_ir.h ++++ linux-2.6/drivers/net/irda/vlsi_ir.h +@@ -577,8 +577,8 @@ struct ring_descr_hw { + struct { + u8 addr_res[3]; + volatile u8 status; /* descriptor status */ +- } rd_s __attribute__((packed)); +- } rd_u __attribute((packed)); ++ } __attribute__((packed)) rd_s; ++ } __attribute((packed)) rd_u; + } __attribute__ ((packed)); + + #define rd_addr rd_u.addr +Index: linux-2.6/include/linux/atalk.h +=================================================================== +--- linux-2.6.orig/include/linux/atalk.h ++++ linux-2.6/include/linux/atalk.h +@@ -155,15 +155,15 @@ struct elapaarp { + #define AARP_REQUEST 1 + #define AARP_REPLY 2 + #define AARP_PROBE 3 +- __u8 hw_src[ETH_ALEN] __attribute__ ((packed)); +- __u8 pa_src_zero __attribute__ ((packed)); +- __be16 pa_src_net __attribute__ ((packed)); +- __u8 pa_src_node __attribute__ ((packed)); +- __u8 hw_dst[ETH_ALEN] __attribute__ ((packed)); +- __u8 pa_dst_zero __attribute__ ((packed)); +- __be16 pa_dst_net __attribute__ ((packed)); +- __u8 pa_dst_node __attribute__ ((packed)); +-}; ++ __u8 hw_src[ETH_ALEN]; ++ __u8 pa_src_zero; ++ __be16 pa_src_net; ++ __u8 pa_src_node; ++ __u8 hw_dst[ETH_ALEN]; ++ __u8 pa_dst_zero; ++ __be16 pa_dst_net; ++ __u8 pa_dst_node; ++} __attribute__ ((packed)); + + static __inline__ struct elapaarp *aarp_hdr(struct sk_buff *skb) + { +Index: linux-2.6/include/linux/cycx_x25.h +=================================================================== +--- linux-2.6.orig/include/linux/cycx_x25.h ++++ linux-2.6/include/linux/cycx_x25.h +@@ -38,11 +38,11 @@ extern unsigned int cycx_debug; + /* Data Structures */ + /* X.25 Command Block. */ + struct cycx_x25_cmd { +- u16 command PACKED; +- u16 link PACKED; /* values: 0 or 1 */ +- u16 len PACKED; /* values: 0 thru 0x205 (517) */ +- u32 buf PACKED; +-}; ++ u16 command; ++ u16 link; /* values: 0 or 1 */ ++ u16 len; /* values: 0 thru 0x205 (517) */ ++ u32 buf; ++} PACKED; + + /* Defines for the 'command' field. */ + #define X25_CONNECT_REQUEST 0x4401 +@@ -92,34 +92,34 @@ struct cycx_x25_cmd { + * @flags - see dosx25.doc, in portuguese, for details + */ + struct cycx_x25_config { +- u8 link PACKED; +- u8 speed PACKED; +- u8 clock PACKED; +- u8 n2 PACKED; +- u8 n2win PACKED; +- u8 n3win PACKED; +- u8 nvc PACKED; +- u8 pktlen PACKED; +- u8 locaddr PACKED; +- u8 remaddr PACKED; +- u16 t1 PACKED; +- u16 t2 PACKED; +- u8 t21 PACKED; +- u8 npvc PACKED; +- u8 t23 PACKED; +- u8 flags PACKED; +-}; ++ u8 link; ++ u8 speed; ++ u8 clock; ++ u8 n2; ++ u8 n2win; ++ u8 n3win; ++ u8 nvc; ++ u8 pktlen; ++ u8 locaddr; ++ u8 remaddr; ++ u16 t1; ++ u16 t2; ++ u8 t21; ++ u8 npvc; ++ u8 t23; ++ u8 flags; ++} PACKED; + + struct cycx_x25_stats { +- u16 rx_crc_errors PACKED; +- u16 rx_over_errors PACKED; +- u16 n2_tx_frames PACKED; +- u16 n2_rx_frames PACKED; +- u16 tx_timeouts PACKED; +- u16 rx_timeouts PACKED; +- u16 n3_tx_packets PACKED; +- u16 n3_rx_packets PACKED; +- u16 tx_aborts PACKED; +- u16 rx_aborts PACKED; +-}; ++ u16 rx_crc_errors; ++ u16 rx_over_errors; ++ u16 n2_tx_frames; ++ u16 n2_rx_frames; ++ u16 tx_timeouts; ++ u16 rx_timeouts; ++ u16 n3_tx_packets; ++ u16 n3_rx_packets; ++ u16 tx_aborts; ++ u16 rx_aborts; ++} PACKED; + #endif /* _CYCX_X25_H */ +Index: linux-2.6/include/linux/sdla.h +=================================================================== +--- linux-2.6.orig/include/linux/sdla.h ++++ linux-2.6/include/linux/sdla.h +@@ -293,46 +293,46 @@ void sdla(void *cfg_info, char *dev, str + #define SDLA_S508_INTEN 0x10 + + struct sdla_cmd { +- char opp_flag __attribute__((packed)); +- char cmd __attribute__((packed)); +- short length __attribute__((packed)); +- char retval __attribute__((packed)); +- short dlci __attribute__((packed)); +- char flags __attribute__((packed)); +- short rxlost_int __attribute__((packed)); +- long rxlost_app __attribute__((packed)); +- char reserve[2] __attribute__((packed)); +- char data[SDLA_MAX_DATA] __attribute__((packed)); /* transfer data buffer */ +-}; ++ char opp_flag; ++ char cmd; ++ short length; ++ char retval; ++ short dlci; ++ char flags; ++ short rxlost_int; ++ long rxlost_app; ++ char reserve[2]; ++ char data[SDLA_MAX_DATA]; /* transfer data buffer */ ++} __attribute__((packed)); + + struct intr_info { +- char flags __attribute__((packed)); +- short txlen __attribute__((packed)); +- char irq __attribute__((packed)); +- char flags2 __attribute__((packed)); +- short timeout __attribute__((packed)); +-}; ++ char flags; ++ short txlen; ++ char irq; ++ char flags2; ++ short timeout; ++} __attribute__((packed)); + + /* found in the 508's control window at RXBUF_INFO */ + struct buf_info { +- unsigned short rse_num __attribute__((packed)); +- unsigned long rse_base __attribute__((packed)); +- unsigned long rse_next __attribute__((packed)); +- unsigned long buf_base __attribute__((packed)); +- unsigned short reserved __attribute__((packed)); +- unsigned long buf_top __attribute__((packed)); +-}; ++ unsigned short rse_num; ++ unsigned long rse_base; ++ unsigned long rse_next; ++ unsigned long buf_base; ++ unsigned short reserved; ++ unsigned long buf_top; ++} __attribute__((packed)); + + /* structure pointed to by rse_base in RXBUF_INFO struct */ + struct buf_entry { +- char opp_flag __attribute__((packed)); +- short length __attribute__((packed)); +- short dlci __attribute__((packed)); +- char flags __attribute__((packed)); +- short timestamp __attribute__((packed)); +- short reserved[2] __attribute__((packed)); +- long buf_addr __attribute__((packed)); +-}; ++ char opp_flag; ++ short length; ++ short dlci; ++ char flags; ++ short timestamp; ++ short reserved[2]; ++ long buf_addr; ++} __attribute__((packed)); + + #endif + +Index: linux-2.6/include/linux/wavefront.h +=================================================================== +--- linux-2.6.orig/include/linux/wavefront.h ++++ linux-2.6/include/linux/wavefront.h +@@ -434,22 +434,22 @@ typedef struct wf_multisample { + } wavefront_multisample; + + typedef struct wf_alias { +- INT16 OriginalSample __attribute__ ((packed)); ++ INT16 OriginalSample; + +- struct wf_sample_offset sampleStartOffset __attribute__ ((packed)); +- struct wf_sample_offset loopStartOffset __attribute__ ((packed)); +- struct wf_sample_offset sampleEndOffset __attribute__ ((packed)); +- struct wf_sample_offset loopEndOffset __attribute__ ((packed)); +- +- INT16 FrequencyBias __attribute__ ((packed)); +- +- UCHAR8 SampleResolution:2 __attribute__ ((packed)); +- UCHAR8 Unused1:1 __attribute__ ((packed)); +- UCHAR8 Loop:1 __attribute__ ((packed)); +- UCHAR8 Bidirectional:1 __attribute__ ((packed)); +- UCHAR8 Unused2:1 __attribute__ ((packed)); +- UCHAR8 Reverse:1 __attribute__ ((packed)); +- UCHAR8 Unused3:1 __attribute__ ((packed)); ++ struct wf_sample_offset sampleStartOffset; ++ struct wf_sample_offset loopStartOffset; ++ struct wf_sample_offset sampleEndOffset; ++ struct wf_sample_offset loopEndOffset; ++ ++ INT16 FrequencyBias; ++ ++ UCHAR8 SampleResolution:2; ++ UCHAR8 Unused1:1; ++ UCHAR8 Loop:1; ++ UCHAR8 Bidirectional:1; ++ UCHAR8 Unused2:1; ++ UCHAR8 Reverse:1; ++ UCHAR8 Unused3:1; + + /* This structure is meant to be padded only to 16 bits on their + original. Of course, whoever wrote their documentation didn't +@@ -460,8 +460,8 @@ typedef struct wf_alias { + standard 16->32 bit issues. + */ + +- UCHAR8 sixteen_bit_padding __attribute__ ((packed)); +-} wavefront_alias; ++ UCHAR8 sixteen_bit_padding; ++} __attribute__((packed)) wavefront_alias; + + typedef struct wf_drum { + UCHAR8 PatchNumber; +Index: linux-2.6/include/net/dn_dev.h +=================================================================== +--- linux-2.6.orig/include/net/dn_dev.h ++++ linux-2.6/include/net/dn_dev.h +@@ -99,57 +99,57 @@ struct dn_dev { + + struct dn_short_packet + { +- unsigned char msgflg __attribute__((packed)); +- unsigned short dstnode __attribute__((packed)); +- unsigned short srcnode __attribute__((packed)); +- unsigned char forward __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned short dstnode; ++ unsigned short srcnode; ++ unsigned char forward; ++} __attribute__((packed)); + + struct dn_long_packet + { +- unsigned char msgflg __attribute__((packed)); +- unsigned char d_area __attribute__((packed)); +- unsigned char d_subarea __attribute__((packed)); +- unsigned char d_id[6] __attribute__((packed)); +- unsigned char s_area __attribute__((packed)); +- unsigned char s_subarea __attribute__((packed)); +- unsigned char s_id[6] __attribute__((packed)); +- unsigned char nl2 __attribute__((packed)); +- unsigned char visit_ct __attribute__((packed)); +- unsigned char s_class __attribute__((packed)); +- unsigned char pt __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned char d_area; ++ unsigned char d_subarea; ++ unsigned char d_id[6]; ++ unsigned char s_area; ++ unsigned char s_subarea; ++ unsigned char s_id[6]; ++ unsigned char nl2; ++ unsigned char visit_ct; ++ unsigned char s_class; ++ unsigned char pt; ++} __attribute__((packed)); + + /*------------------------- DRP - Routing messages ---------------------*/ + + struct endnode_hello_message + { +- unsigned char msgflg __attribute__((packed)); +- unsigned char tiver[3] __attribute__((packed)); +- unsigned char id[6] __attribute__((packed)); +- unsigned char iinfo __attribute__((packed)); +- unsigned short blksize __attribute__((packed)); +- unsigned char area __attribute__((packed)); +- unsigned char seed[8] __attribute__((packed)); +- unsigned char neighbor[6] __attribute__((packed)); +- unsigned short timer __attribute__((packed)); +- unsigned char mpd __attribute__((packed)); +- unsigned char datalen __attribute__((packed)); +- unsigned char data[2] __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned char tiver[3]; ++ unsigned char id[6]; ++ unsigned char iinfo; ++ unsigned short blksize; ++ unsigned char area; ++ unsigned char seed[8]; ++ unsigned char neighbor[6]; ++ unsigned short timer; ++ unsigned char mpd; ++ unsigned char datalen; ++ unsigned char data[2]; ++} __attribute__((packed)); + + struct rtnode_hello_message + { +- unsigned char msgflg __attribute__((packed)); +- unsigned char tiver[3] __attribute__((packed)); +- unsigned char id[6] __attribute__((packed)); +- unsigned char iinfo __attribute__((packed)); +- unsigned short blksize __attribute__((packed)); +- unsigned char priority __attribute__((packed)); +- unsigned char area __attribute__((packed)); +- unsigned short timer __attribute__((packed)); +- unsigned char mpd __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned char tiver[3]; ++ unsigned char id[6]; ++ unsigned char iinfo; ++ unsigned short blksize; ++ unsigned char priority; ++ unsigned char area; ++ unsigned short timer; ++ unsigned char mpd; ++} __attribute__((packed)); + + + extern void dn_dev_init(void); +Index: linux-2.6/drivers/net/wan/sdla.c +=================================================================== +--- linux-2.6.orig/drivers/net/wan/sdla.c ++++ linux-2.6/drivers/net/wan/sdla.c +@@ -329,9 +329,9 @@ static int sdla_cpuspeed(struct net_devi + + struct _dlci_stat + { +- short dlci __attribute__((packed)); +- char flags __attribute__((packed)); +-}; ++ short dlci; ++ char flags; ++} __attribute__((packed)); + + struct _frad_stat + { +Index: linux-2.6/include/net/dn_nsp.h +=================================================================== +--- linux-2.6.orig/include/net/dn_nsp.h ++++ linux-2.6/include/net/dn_nsp.h +@@ -72,78 +72,78 @@ extern struct sk_buff *dn_alloc_send_skb + + struct nsp_data_seg_msg + { +- unsigned char msgflg __attribute__((packed)); +- unsigned short dstaddr __attribute__((packed)); +- unsigned short srcaddr __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned short dstaddr; ++ unsigned short srcaddr; ++} __attribute__((packed)); + + struct nsp_data_opt_msg + { +- unsigned short acknum __attribute__((packed)); +- unsigned short segnum __attribute__((packed)); +- unsigned short lsflgs __attribute__((packed)); +-}; ++ unsigned short acknum; ++ unsigned short segnum; ++ unsigned short lsflgs; ++} __attribute__((packed)); + + struct nsp_data_opt_msg1 + { +- unsigned short acknum __attribute__((packed)); +- unsigned short segnum __attribute__((packed)); +-}; ++ unsigned short acknum; ++ unsigned short segnum; ++} __attribute__((packed)); + + + /* Acknowledgment Message (data/other data) */ + struct nsp_data_ack_msg + { +- unsigned char msgflg __attribute__((packed)); +- unsigned short dstaddr __attribute__((packed)); +- unsigned short srcaddr __attribute__((packed)); +- unsigned short acknum __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned short dstaddr; ++ unsigned short srcaddr; ++ unsigned short acknum; ++} __attribute__((packed)); + + /* Connect Acknowledgment Message */ + struct nsp_conn_ack_msg + { +- unsigned char msgflg __attribute__((packed)); +- unsigned short dstaddr __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned short dstaddr; ++} __attribute__((packed)); + + + /* Connect Initiate/Retransmit Initiate/Connect Confirm */ + struct nsp_conn_init_msg + { +- unsigned char msgflg __attribute__((packed)); ++ unsigned char msgflg; + #define NSP_CI 0x18 /* Connect Initiate */ + #define NSP_RCI 0x68 /* Retrans. Conn Init */ +- unsigned short dstaddr __attribute__((packed)); +- unsigned short srcaddr __attribute__((packed)); +- unsigned char services __attribute__((packed)); ++ unsigned short dstaddr; ++ unsigned short srcaddr; ++ unsigned char services; + #define NSP_FC_NONE 0x00 /* Flow Control None */ + #define NSP_FC_SRC 0x04 /* Seg Req. Count */ + #define NSP_FC_SCMC 0x08 /* Sess. Control Mess */ + #define NSP_FC_MASK 0x0c /* FC type mask */ +- unsigned char info __attribute__((packed)); +- unsigned short segsize __attribute__((packed)); +-}; ++ unsigned char info; ++ unsigned short segsize; ++} __attribute__((packed)); + + /* Disconnect Initiate/Disconnect Confirm */ + struct nsp_disconn_init_msg + { +- unsigned char msgflg __attribute__((packed)); +- unsigned short dstaddr __attribute__((packed)); +- unsigned short srcaddr __attribute__((packed)); +- unsigned short reason __attribute__((packed)); +-}; ++ unsigned char msgflg; ++ unsigned short dstaddr; ++ unsigned short srcaddr; ++ unsigned short reason; ++} __attribute__((packed)); + + + + struct srcobj_fmt + { +- char format __attribute__((packed)); +- unsigned char task __attribute__((packed)); +- unsigned short grpcode __attribute__((packed)); +- unsigned short usrcode __attribute__((packed)); +- char dlen __attribute__((packed)); +-}; ++ char format; ++ unsigned char task; ++ unsigned short grpcode; ++ unsigned short usrcode; ++ char dlen; ++} __attribute__((packed)); + + /* + * A collection of functions for manipulating the sequence +Index: linux-2.6/include/sound/wavefront.h +=================================================================== +--- linux-2.6.orig/include/sound/wavefront.h ++++ linux-2.6/include/sound/wavefront.h +@@ -454,22 +454,22 @@ typedef struct wf_multisample { + } wavefront_multisample; + + typedef struct wf_alias { +- s16 OriginalSample __attribute__ ((packed)); ++ s16 OriginalSample; + +- struct wf_sample_offset sampleStartOffset __attribute__ ((packed)); +- struct wf_sample_offset loopStartOffset __attribute__ ((packed)); +- struct wf_sample_offset sampleEndOffset __attribute__ ((packed)); +- struct wf_sample_offset loopEndOffset __attribute__ ((packed)); +- +- s16 FrequencyBias __attribute__ ((packed)); +- +- u8 SampleResolution:2 __attribute__ ((packed)); +- u8 Unused1:1 __attribute__ ((packed)); +- u8 Loop:1 __attribute__ ((packed)); +- u8 Bidirectional:1 __attribute__ ((packed)); +- u8 Unused2:1 __attribute__ ((packed)); +- u8 Reverse:1 __attribute__ ((packed)); +- u8 Unused3:1 __attribute__ ((packed)); ++ struct wf_sample_offset sampleStartOffset; ++ struct wf_sample_offset loopStartOffset; ++ struct wf_sample_offset sampleEndOffset; ++ struct wf_sample_offset loopEndOffset; ++ ++ s16 FrequencyBias; ++ ++ u8 SampleResolution:2; ++ u8 Unused1:1; ++ u8 Loop:1; ++ u8 Bidirectional:1; ++ u8 Unused2:1; ++ u8 Reverse:1; ++ u8 Unused3:1; + + /* This structure is meant to be padded only to 16 bits on their + original. Of course, whoever wrote their documentation didn't +@@ -480,8 +480,8 @@ typedef struct wf_alias { + standard 16->32 bit issues. + */ + +- u8 sixteen_bit_padding __attribute__ ((packed)); +-} wavefront_alias; ++ u8 sixteen_bit_padding; ++} __attribute__((packed)) wavefront_alias; + + typedef struct wf_drum { + u8 PatchNumber; + + +Remove the unnecessary __attribute__ ((packed)) since the enum itself is +packed and not the location of it in the structure. + +Signed-off-by: Jan Blunck + + fs/afs/volume.h | 4 +--- + 1 files changed, 1 insertion(+), 3 deletions(-) + +Index: linux-2.6/fs/afs/volume.h +=================================================================== +--- linux-2.6.orig/fs/afs/volume.h ++++ linux-2.6/fs/afs/volume.h +@@ -18,8 +18,6 @@ + #include "kafsasyncd.h" + #include "cache.h" + +-#define __packed __attribute__((packed)) +- + typedef enum { + AFS_VLUPD_SLEEP, /* sleeping waiting for update timer to fire */ + AFS_VLUPD_PENDING, /* on pending queue */ +@@ -115,7 +113,7 @@ struct afs_volume + struct cachefs_cookie *cache; /* caching cookie */ + #endif + afs_volid_t vid; /* volume ID */ +- afs_voltype_t __packed type; /* type of volume */ ++ afs_voltype_t type; /* type of volume */ + char type_force; /* force volume type (suppress R/O -> R/W) */ + unsigned short nservers; /* number of server slots filled */ + unsigned short rjservers; /* number of servers discarded due to -ENOMEDIUM */ + + +The CAPI message structs itself should be packed and not the location of +single fields in the structure. + +Signed-off-by: Jan Blunck + + drivers/isdn/act2000/capi.h | 88 ++++++++++++++++++++++---------------------- + 1 files changed, 44 insertions(+), 44 deletions(-) + +Index: linux-2.6/drivers/isdn/act2000/capi.h +=================================================================== +--- linux-2.6.orig/drivers/isdn/act2000/capi.h ++++ linux-2.6/drivers/isdn/act2000/capi.h +@@ -78,29 +78,29 @@ typedef union actcapi_infoel { + typedef struct actcapi_msn { + __u8 eaz; + __u8 len; /* Length of MSN */ +- __u8 msn[15] __attribute__ ((packed)); +-} actcapi_msn; ++ __u8 msn[15]; ++} __attribute__((packed)) actcapi_msn; + + typedef struct actcapi_dlpd { + __u8 len; /* Length of structure */ +- __u16 dlen __attribute__ ((packed)); /* Data Length */ +- __u8 laa __attribute__ ((packed)); /* Link Address A */ ++ __u16 dlen; /* Data Length */ ++ __u8 laa; /* Link Address A */ + __u8 lab; /* Link Address B */ + __u8 modulo; /* Modulo Mode */ + __u8 win; /* Window size */ + __u8 xid[100]; /* XID Information */ +-} actcapi_dlpd; ++} __attribute__((packed)) actcapi_dlpd; + + typedef struct actcapi_ncpd { + __u8 len; /* Length of structure */ +- __u16 lic __attribute__ ((packed)); +- __u16 hic __attribute__ ((packed)); +- __u16 ltc __attribute__ ((packed)); +- __u16 htc __attribute__ ((packed)); +- __u16 loc __attribute__ ((packed)); +- __u16 hoc __attribute__ ((packed)); +- __u8 modulo __attribute__ ((packed)); +-} actcapi_ncpd; ++ __u16 lic; ++ __u16 hic; ++ __u16 ltc; ++ __u16 htc; ++ __u16 loc; ++ __u16 hoc; ++ __u8 modulo; ++} __attribute__((packed)) actcapi_ncpd; + #define actcapi_ncpi actcapi_ncpd + + /* +@@ -168,19 +168,19 @@ typedef struct actcapi_msg { + __u16 manuf_msg; + __u16 controller; + actcapi_msn msnmap; +- } manufacturer_req_msn; ++ } __attribute ((packed)) manufacturer_req_msn; + /* TODO: TraceInit-req/conf/ind/resp and + * TraceDump-req/conf/ind/resp + */ + struct connect_req { + __u8 controller; + __u8 bchan; +- __u32 infomask __attribute__ ((packed)); ++ __u32 infomask; + __u8 si1; + __u8 si2; + __u8 eaz; + actcapi_addr addr; +- } connect_req; ++ } __attribute__ ((packed)) connect_req; + struct connect_conf { + __u16 plci; + __u16 info; +@@ -192,7 +192,7 @@ typedef struct actcapi_msg { + __u8 si2; + __u8 eaz; + actcapi_addr addr; +- } connect_ind; ++ } __attribute__ ((packed)) connect_ind; + struct connect_resp { + __u16 plci; + __u8 rejectcause; +@@ -200,14 +200,14 @@ typedef struct actcapi_msg { + struct connect_active_ind { + __u16 plci; + actcapi_addr addr; +- } connect_active_ind; ++ } __attribute__ ((packed)) connect_active_ind; + struct connect_active_resp { + __u16 plci; + } connect_active_resp; + struct connect_b3_req { + __u16 plci; + actcapi_ncpi ncpi; +- } connect_b3_req; ++ } __attribute__ ((packed)) connect_b3_req; + struct connect_b3_conf { + __u16 plci; + __u16 ncci; +@@ -217,12 +217,12 @@ typedef struct actcapi_msg { + __u16 ncci; + __u16 plci; + actcapi_ncpi ncpi; +- } connect_b3_ind; ++ } __attribute__ ((packed)) connect_b3_ind; + struct connect_b3_resp { + __u16 ncci; + __u8 rejectcause; +- actcapi_ncpi ncpi __attribute__ ((packed)); +- } connect_b3_resp; ++ actcapi_ncpi ncpi; ++ } __attribute__ ((packed)) connect_b3_resp; + struct disconnect_req { + __u16 plci; + __u8 cause; +@@ -241,14 +241,14 @@ typedef struct actcapi_msg { + struct connect_b3_active_ind { + __u16 ncci; + actcapi_ncpi ncpi; +- } connect_b3_active_ind; ++ } __attribute__ ((packed)) connect_b3_active_ind; + struct connect_b3_active_resp { + __u16 ncci; + } connect_b3_active_resp; + struct disconnect_b3_req { + __u16 ncci; + actcapi_ncpi ncpi; +- } disconnect_b3_req; ++ } __attribute__ ((packed)) disconnect_b3_req; + struct disconnect_b3_conf { + __u16 ncci; + __u16 info; +@@ -257,7 +257,7 @@ typedef struct actcapi_msg { + __u16 ncci; + __u16 info; + actcapi_ncpi ncpi; +- } disconnect_b3_ind; ++ } __attribute__ ((packed)) disconnect_b3_ind; + struct disconnect_b3_resp { + __u16 ncci; + } disconnect_b3_resp; +@@ -265,7 +265,7 @@ typedef struct actcapi_msg { + __u16 plci; + actcapi_infonr nr; + actcapi_infoel el; +- } info_ind; ++ } __attribute__ ((packed)) info_ind; + struct info_resp { + __u16 plci; + } info_resp; +@@ -279,8 +279,8 @@ typedef struct actcapi_msg { + struct select_b2_protocol_req { + __u16 plci; + __u8 protocol; +- actcapi_dlpd dlpd __attribute__ ((packed)); +- } select_b2_protocol_req; ++ actcapi_dlpd dlpd; ++ } __attribute__ ((packed)) select_b2_protocol_req; + struct select_b2_protocol_conf { + __u16 plci; + __u16 info; +@@ -288,47 +288,47 @@ typedef struct actcapi_msg { + struct select_b3_protocol_req { + __u16 plci; + __u8 protocol; +- actcapi_ncpd ncpd __attribute__ ((packed)); +- } select_b3_protocol_req; ++ actcapi_ncpd ncpd; ++ } __attribute__ ((packed)) select_b3_protocol_req; + struct select_b3_protocol_conf { + __u16 plci; + __u16 info; + } select_b3_protocol_conf; + struct listen_req { + __u8 controller; +- __u32 infomask __attribute__ ((packed)); +- __u16 eazmask __attribute__ ((packed)); +- __u16 simask __attribute__ ((packed)); +- } listen_req; ++ __u32 infomask; ++ __u16 eazmask; ++ __u16 simask; ++ } __attribute__ ((packed)) listen_req; + struct listen_conf { + __u8 controller; +- __u16 info __attribute__ ((packed)); +- } listen_conf; ++ __u16 info; ++ } __attribute__ ((packed)) listen_conf; + struct data_b3_req { + __u16 fakencci; + __u16 datalen; + __u32 unused; + __u8 blocknr; +- __u16 flags __attribute__ ((packed)); +- } data_b3_req; ++ __u16 flags; ++ } __attribute ((packed)) data_b3_req; + struct data_b3_ind { + __u16 fakencci; + __u16 datalen; + __u32 unused; + __u8 blocknr; +- __u16 flags __attribute__ ((packed)); +- } data_b3_ind; ++ __u16 flags; ++ } __attribute__ ((packed)) data_b3_ind; + struct data_b3_resp { + __u16 ncci; + __u8 blocknr; +- } data_b3_resp; ++ } __attribute__ ((packed)) data_b3_resp; + struct data_b3_conf { + __u16 ncci; + __u8 blocknr; +- __u16 info __attribute__ ((packed)); +- } data_b3_conf; ++ __u16 info; ++ } __attribute__ ((packed)) data_b3_conf; + } msg; +-} actcapi_msg; ++} __attribute__ ((packed)) actcapi_msg; + + extern __inline__ unsigned short + actcapi_nextsmsg(act2000_card *card) + + linux-2.6-ub.patch: drivers/block/ub.c | 482 +++++++--- linux-2.6.14-1.1674_FC5-ub/drivers/block/Kconfig | 3 linux-2.6.14-1.1674_FC5-ub/drivers/block/ub.c | 23 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/Kconfig | 14 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/Makefile | 4 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/libusual.c | 266 +++++ linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/protocol.h | 14 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/transport.h | 31 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/unusual_devs.h | 24 linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/usb.c | 123 -- linux-2.6.14-1.1674_FC5-ub/drivers/usb/storage/usb.h | 31 linux-2.6.14-1.1674_FC5-ub/include/linux/usb_usual.h | 123 ++ linux-2.6.14/drivers/usb/Makefile | 1 13 files changed, 828 insertions(+), 311 deletions(-) Index: linux-2.6-ub.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-ub.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-ub.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-ub.patch 9 Jan 2006 20:42:13 -0000 1.3 @@ -1633,3 +1633,253 @@ cmd->state = UB_CMDST_DONE; ub_cmdtr_state(sc, cmd); + +On Fri, 9 Dec 2005 13:55:21 -0500, Dave Jones wrote: + +> > > [311578.273186] BUG: spinlock bad magic on CPU#1, pdflush/30788 (Not tainted) +>[...] +> > > [311578.499972] RIP: 0010:[] {spin_bug+138} +> > > [311578.798449] Call Trace:{_raw_spin_lock+25} {cfq_exit_single_io_context+85} +> > > [311578.828782] {cfq_exit_io_context+33} {exit_io_context+137} +> > > [311578.856762] {do_exit+183} {keventd_create_kthread+0} +> > > [311578.883192] {child_rip+15} {keventd_create_kthread+0} +> > > [311578.909852] {kthread+0} {child_rip+0} + +> Hmm, I may have also been experimenting at the time with Pete Zaitcev's +> ub driver. Pete, could ub have been doing something bad here? + +Yes, this is ub's fault. I thought that blk_cleanup_queue frees the queue, +but this is not the case. In recent kernels, it only decrements its refcount. +If CFQ is around, it keeps the queue pinned and uses the queue's spinlock. +But when ub calls blk_init_queue(), it passes a spinlock located in its data +structure (ub_dev), which corresponds to a device. The ub_dev is refcounted +and freed when the device is disconnected or closed. As you can see, this +leaves the queue's spinlock pointer dangling. + +The code was taken from Carmel, and it used to work fine for a long time. +I suspect now that Carmel is vulnerable, if it's hot-removed while open. +Maybe Jeff wants to look into it. + +The usb-storage is immune to this problem, because SCSI passes NULL to +blk_init_queue. + +Schedulers other than CFQ use their own spinlocks, so they do not hit +this problem. + +The attached patch works around this issue by using spinlocks which are +static to the ub module. Thus, it places ub into the same group as floppy. +This is not ideal, in case someone manages to remove the module yet have +queues remaining... But I am reluctant to copy what scsi_request_fn is +doing. After all, ub is supposed to be simpler. + +Any comments before I send this to Greg? + +With Christmas cheers, +-- Pete + +--- linux-2.6.15-rc6-git4-gregkh/drivers/block/ub.c 2005-12-28 13:40:36.000000000 -0800 ++++ linux-2.6.15-rc7-lem/drivers/block/ub.c 2005-12-26 15:02:35.000000000 -0800 +@@ -355,7 +355,7 @@ struct ub_lun { + * The USB device instance. + */ + struct ub_dev { +- spinlock_t lock; ++ spinlock_t *lock; + atomic_t poison; /* The USB device is disconnected */ + int openc; /* protected by ub_lock! */ + /* kref is too implicit for our taste */ +@@ -452,6 +452,10 @@ MODULE_DEVICE_TABLE(usb, ub_usb_ids); + #define UB_MAX_HOSTS 26 + static char ub_hostv[UB_MAX_HOSTS]; + ++#define UB_QLOCK_NUM 5 ++static spinlock_t ub_qlockv[UB_QLOCK_NUM]; ++static int ub_qlock_next = 0; ++ + static DEFINE_SPINLOCK(ub_lock); /* Locks globals and ->openc */ + + /* +@@ -531,7 +535,7 @@ static ssize_t ub_diag_show(struct devic + return 0; + + cnt = 0; +- spin_lock_irqsave(&sc->lock, flags); ++ spin_lock_irqsave(sc->lock, flags); + + cnt += sprintf(page + cnt, + "poison %d reset %d\n", +@@ -579,7 +583,7 @@ static ssize_t ub_diag_show(struct devic + if (++nc == SCMD_TRACE_SZ) nc = 0; + } + +- spin_unlock_irqrestore(&sc->lock, flags); ++ spin_unlock_irqrestore(sc->lock, flags); + return cnt; + } + +@@ -627,6 +631,24 @@ static void ub_id_put(int id) + } + + /* ++ * This is necessitated by the fact that blk_cleanup_queue does not ++ * necesserily destroy the queue. Instead, it may merely decrease q->refcnt. ++ * Since our blk_init_queue() passes a spinlock common with ub_dev, ++ * we have life time issues when ub_cleanup frees ub_dev. ++ */ ++static spinlock_t *ub_next_lock(void) ++{ ++ unsigned long flags; ++ spinlock_t *ret; ++ ++ spin_lock_irqsave(&ub_lock, flags); ++ ret = &ub_qlockv[ub_qlock_next]; ++ ub_qlock_next = (ub_qlock_next + 1) % UB_QLOCK_NUM; ++ spin_unlock_irqrestore(&ub_lock, flags); ++ return ret; ++} ++ ++/* + * Downcount for deallocation. This rides on two assumptions: + * - once something is poisoned, its refcount cannot grow + * - opens cannot happen at this time (del_gendisk was done) +@@ -1083,9 +1105,9 @@ static void ub_urb_timeout(unsigned long + struct ub_dev *sc = (struct ub_dev *) arg; + unsigned long flags; + +- spin_lock_irqsave(&sc->lock, flags); ++ spin_lock_irqsave(sc->lock, flags); + usb_unlink_urb(&sc->work_urb); +- spin_unlock_irqrestore(&sc->lock, flags); ++ spin_unlock_irqrestore(sc->lock, flags); + } + + /* +@@ -1108,10 +1130,10 @@ static void ub_scsi_action(unsigned long + struct ub_dev *sc = (struct ub_dev *) _dev; + unsigned long flags; + +- spin_lock_irqsave(&sc->lock, flags); ++ spin_lock_irqsave(sc->lock, flags); + del_timer(&sc->work_timer); + ub_scsi_dispatch(sc); +- spin_unlock_irqrestore(&sc->lock, flags); ++ spin_unlock_irqrestore(sc->lock, flags); + } + + static void ub_scsi_dispatch(struct ub_dev *sc) +@@ -1754,7 +1776,7 @@ static void ub_reset_task(void *arg) + * queues of resets or anything. We do need a spinlock though, + * to interact with block layer. + */ +- spin_lock_irqsave(&sc->lock, flags); ++ spin_lock_irqsave(sc->lock, flags); + sc->reset = 0; + tasklet_schedule(&sc->tasklet); + list_for_each(p, &sc->luns) { +@@ -1762,7 +1784,7 @@ static void ub_reset_task(void *arg) + blk_start_queue(lun->disk->queue); + } + wake_up(&sc->reset_wait); +- spin_unlock_irqrestore(&sc->lock, flags); ++ spin_unlock_irqrestore(sc->lock, flags); + } + + /* +@@ -1990,11 +2012,11 @@ static int ub_sync_tur(struct ub_dev *sc + cmd->done = ub_probe_done; + cmd->back = &compl; + +- spin_lock_irqsave(&sc->lock, flags); ++ spin_lock_irqsave(sc->lock, flags); + cmd->tag = sc->tagcnt++; + + rc = ub_submit_scsi(sc, cmd); +- spin_unlock_irqrestore(&sc->lock, flags); ++ spin_unlock_irqrestore(sc->lock, flags); + + if (rc != 0) { + printk("ub: testing ready: submit error (%d)\n", rc); /* P3 */ +@@ -2052,11 +2074,11 @@ static int ub_sync_read_cap(struct ub_de + cmd->done = ub_probe_done; + cmd->back = &compl; + +- spin_lock_irqsave(&sc->lock, flags); ++ spin_lock_irqsave(sc->lock, flags); + cmd->tag = sc->tagcnt++; + + rc = ub_submit_scsi(sc, cmd); +- spin_unlock_irqrestore(&sc->lock, flags); ++ spin_unlock_irqrestore(sc->lock, flags); + + if (rc != 0) { + printk("ub: reading capacity: submit error (%d)\n", rc); /* P3 */ +@@ -2333,7 +2355,7 @@ static int ub_probe(struct usb_interface + if ((sc = kmalloc(sizeof(struct ub_dev), GFP_KERNEL)) == NULL) + goto err_core; + memset(sc, 0, sizeof(struct ub_dev)); +- spin_lock_init(&sc->lock); ++ sc->lock = ub_next_lock(); + INIT_LIST_HEAD(&sc->luns); + usb_init_urb(&sc->work_urb); + tasklet_init(&sc->tasklet, ub_scsi_action, (unsigned long)sc); +@@ -2483,7 +2505,7 @@ static int ub_probe_lun(struct ub_dev *s + disk->driverfs_dev = &sc->intf->dev; + + rc = -ENOMEM; +- if ((q = blk_init_queue(ub_request_fn, &sc->lock)) == NULL) ++ if ((q = blk_init_queue(ub_request_fn, sc->lock)) == NULL) + goto err_blkqinit; + + disk->queue = q; +@@ -2554,7 +2576,7 @@ static void ub_disconnect(struct usb_int + * and the whole queue drains. So, we just use this code to + * print warnings. + */ +- spin_lock_irqsave(&sc->lock, flags); ++ spin_lock_irqsave(sc->lock, flags); + { + struct ub_scsi_cmd *cmd; + int cnt = 0; +@@ -2571,7 +2593,7 @@ static void ub_disconnect(struct usb_int + "%d was queued after shutdown\n", sc->name, cnt); + } + } +- spin_unlock_irqrestore(&sc->lock, flags); ++ spin_unlock_irqrestore(sc->lock, flags); + + /* + * Unregister the upper layer. +@@ -2590,19 +2612,15 @@ static void ub_disconnect(struct usb_int + } + + /* +- * Taking a lock on a structure which is about to be freed +- * is very nonsensual. Here it is largely a way to do a debug freeze, +- * and a bracket which shows where the nonsensual code segment ends. +- * + * Testing for -EINPROGRESS is always a bug, so we are bending + * the rules a little. + */ +- spin_lock_irqsave(&sc->lock, flags); ++ spin_lock_irqsave(sc->lock, flags); + if (sc->work_urb.status == -EINPROGRESS) { /* janitors: ignore */ + printk(KERN_WARNING "%s: " + "URB is active after disconnect\n", sc->name); + } +- spin_unlock_irqrestore(&sc->lock, flags); ++ spin_unlock_irqrestore(sc->lock, flags); + + /* + * There is virtually no chance that other CPU runs times so long +@@ -2636,6 +2655,10 @@ static struct usb_driver ub_driver = { + static int __init ub_init(void) + { + int rc; ++ int i; ++ ++ for (i = 0; i < UB_QLOCK_NUM; i++) ++ spin_lock_init(&ub_qlockv[i]); + + if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0) + goto err_regblkdev; + linux-2.6-xen-merge.patch: arch/i386/Kconfig | 76 arch/i386/Makefile | 18 arch/i386/boot-xen/Makefile | 24 arch/i386/kernel/Makefile | 26 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/acpi/boot-xen.c | 1160 ++++++++++ arch/i386/kernel/apic-xen.c | 89 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/common-xen.c | 655 ++++++ arch/i386/kernel/cpu/cpufreq/Kconfig | 2 arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/cpu/mtrr/main-xen.c | 187 + arch/i386/kernel/early_printk-xen.c | 2 arch/i386/kernel/entry-xen.S | 838 +++++++ arch/i386/kernel/fixup.c | 95 arch/i386/kernel/head-xen.S | 169 + arch/i386/kernel/init_task-xen.c | 49 arch/i386/kernel/io_apic-xen.c | 2725 +++++++++++++++++++++++++ arch/i386/kernel/ioport-xen.c | 121 + arch/i386/kernel/irq-xen.c | 306 ++ arch/i386/kernel/ldt-xen.c | 262 ++ arch/i386/kernel/microcode-xen.c | 163 + arch/i386/kernel/mpparse-xen.c | 1167 ++++++++++ arch/i386/kernel/pci-dma-xen.c | 302 ++ arch/i386/kernel/process-xen.c | 839 +++++++ arch/i386/kernel/quirks-xen.c | 49 arch/i386/kernel/setup-xen.c | 1868 +++++++++++++++++ arch/i386/kernel/smp-xen.c | 617 +++++ arch/i386/kernel/smpalts.c | 85 arch/i386/kernel/smpboot.c | 10 arch/i386/kernel/swiotlb.c | 671 ++++++ arch/i386/kernel/time-xen.c | 942 ++++++++ arch/i386/kernel/traps-xen.c | 1063 +++++++++ arch/i386/kernel/vmlinux.lds.S | 7 arch/i386/kernel/vsyscall-note-xen.S | 32 arch/i386/mach-xen/Makefile | 7 arch/i386/mach-xen/setup.c | 37 arch/i386/mm/Makefile | 8 arch/i386/mm/fault-xen.c | 628 +++++ arch/i386/mm/highmem-xen.c | 123 + arch/i386/mm/hypervisor.c | 459 ++++ arch/i386/mm/init-xen.c | 833 +++++++ arch/i386/mm/ioremap-xen.c | 493 ++++ arch/i386/mm/pgtable-xen.c | 597 +++++ arch/i386/pci/Makefile | 5 arch/i386/pci/i386-xen.c | 295 ++ arch/i386/pci/irq-xen.c | 1193 ++++++++++ arch/i386/power/Makefile | 4 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 40 arch/x86_64/Makefile | 16 arch/x86_64/ia32/Makefile | 18 arch/x86_64/ia32/ia32entry-xen.S | 676 ++++++ arch/x86_64/ia32/syscall32-xen.c | 128 + arch/x86_64/ia32/syscall32_syscall-xen.S | 28 arch/x86_64/ia32/vsyscall-int80.S | 57 arch/x86_64/ia32/vsyscall-sigreturn.S | 2 arch/x86_64/kernel/Makefile | 21 arch/x86_64/kernel/acpi/Makefile | 2 arch/x86_64/kernel/apic-xen.c | 198 + arch/x86_64/kernel/e820-xen.c | 721 ++++++ arch/x86_64/kernel/early_printk-xen.c | 308 ++ arch/x86_64/kernel/entry-xen.S | 1135 ++++++++++ arch/x86_64/kernel/genapic-xen.c | 135 + arch/x86_64/kernel/genapic_xen.c | 162 + arch/x86_64/kernel/head-xen.S | 292 ++ arch/x86_64/kernel/head64-xen.c | 127 + arch/x86_64/kernel/io_apic-xen.c | 2115 +++++++++++++++++++ arch/x86_64/kernel/ioport-xen.c | 57 arch/x86_64/kernel/irq-xen.c | 158 + arch/x86_64/kernel/ldt-xen.c | 273 ++ arch/x86_64/kernel/mpparse-xen.c | 1000 +++++++++ arch/x86_64/kernel/pci-dma.c | 4 arch/x86_64/kernel/pci-gart.c | 11 arch/x86_64/kernel/pci-nommu-xen.c | 95 arch/x86_64/kernel/process-xen.c | 775 +++++++ arch/x86_64/kernel/setup-xen.c | 1548 ++++++++++++++ arch/x86_64/kernel/setup64-xen.c | 349 +++ arch/x86_64/kernel/signal-xen.c | 513 ++++ arch/x86_64/kernel/smp-xen.c | 590 +++++ arch/x86_64/kernel/traps-xen.c | 967 ++++++++ arch/x86_64/kernel/vsyscall-xen.c | 241 ++ arch/x86_64/kernel/x8664_ksyms-xen.c | 204 + arch/x86_64/kernel/xen_entry.S | 41 arch/x86_64/mm/Makefile | 10 arch/x86_64/mm/fault-xen.c | 594 +++++ arch/x86_64/mm/init-xen.c | 974 ++++++++ arch/x86_64/mm/pageattr-xen.c | 380 +++ arch/x86_64/pci/Makefile | 8 drivers/Kconfig | 11 drivers/Makefile | 1 drivers/acpi/Kconfig | 2 drivers/acpi/tables.c | 7 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 14 drivers/char/tpm/Makefile | 1 drivers/char/tpm/tpm.c | 48 drivers/char/tpm/tpm.h | 13 drivers/char/tpm/tpm_atmel.c | 102 drivers/char/tpm/tpm_nsc.c | 149 - drivers/char/tpm/tpm_xen.c | 525 ++++ drivers/char/tty_io.c | 7 drivers/firmware/Kconfig | 2 drivers/ide/legacy/hd.c | 2 drivers/pci/Kconfig | 1 drivers/video/fbmon.c | 2 drivers/xen/Kconfig | 175 + drivers/xen/Makefile | 20 drivers/xen/balloon/Makefile | 2 drivers/xen/balloon/balloon.c | 565 +++++ drivers/xen/blkback/Makefile | 2 drivers/xen/blkback/blkback.c | 590 +++++ drivers/xen/blkback/common.h | 131 + drivers/xen/blkback/interface.c | 164 + drivers/xen/blkback/vbd.c | 103 drivers/xen/blkback/xenbus.c | 425 +++ drivers/xen/blkfront/Kconfig | 6 drivers/xen/blkfront/Makefile | 5 drivers/xen/blkfront/blkfront.c | 842 +++++++ drivers/xen/blkfront/block.h | 166 + drivers/xen/blkfront/vbd.c | 323 ++ drivers/xen/blktap/Makefile | 3 drivers/xen/blktap/blktap.c | 910 ++++++++ drivers/xen/blktap/common.h | 118 + drivers/xen/blktap/interface.c | 146 + drivers/xen/blktap/xenbus.c | 234 ++ drivers/xen/char/Makefile | 2 drivers/xen/char/mem.c | 157 + drivers/xen/console/Makefile | 2 drivers/xen/console/console.c | 688 ++++++ drivers/xen/console/xencons_ring.c | 125 + drivers/xen/core/Makefile | 9 drivers/xen/core/evtchn.c | 820 +++++++ drivers/xen/core/gnttab.c | 480 ++++ drivers/xen/core/reboot.c | 436 ++++ drivers/xen/core/skbuff.c | 143 + drivers/xen/core/smpboot.c | 439 ++++ drivers/xen/core/xen_proc.c | 29 drivers/xen/evtchn/Makefile | 2 drivers/xen/evtchn/evtchn.c | 459 ++++ drivers/xen/net_driver_util.c | 67 drivers/xen/netback/Makefile | 2 drivers/xen/netback/common.h | 118 + drivers/xen/netback/interface.c | 320 ++ drivers/xen/netback/loopback.c | 189 + drivers/xen/netback/netback.c | 824 +++++++ drivers/xen/netback/xenbus.c | 327 +++ drivers/xen/netfront/Kconfig | 6 drivers/xen/netfront/Makefile | 4 drivers/xen/netfront/netfront.c | 1492 +++++++++++++ drivers/xen/privcmd/Makefile | 2 drivers/xen/privcmd/privcmd.c | 274 ++ drivers/xen/tpmback/Makefile | 4 drivers/xen/tpmback/common.h | 102 drivers/xen/tpmback/interface.c | 200 + drivers/xen/tpmback/tpmback.c | 1109 ++++++++++ drivers/xen/tpmback/xenbus.c | 329 +++ drivers/xen/tpmfront/Makefile | 2 drivers/xen/tpmfront/tpmfront.c | 732 ++++++ drivers/xen/tpmfront/tpmfront.h | 48 drivers/xen/util.c | 75 drivers/xen/xenbus/Makefile | 8 drivers/xen/xenbus/xenbus_client.c | 243 ++ drivers/xen/xenbus/xenbus_comms.c | 203 + drivers/xen/xenbus/xenbus_comms.h | 50 drivers/xen/xenbus/xenbus_dev.c | 241 ++ drivers/xen/xenbus/xenbus_probe.c | 1014 +++++++++ drivers/xen/xenbus/xenbus_xs.c | 823 +++++++ fs/Kconfig | 1 include/asm-i386/agp.h | 15 include/asm-i386/atomic.h | 7 include/asm-i386/bitops.h | 19 include/asm-i386/desc.h | 57 include/asm-i386/dma-mapping.h | 97 include/asm-i386/fixmap.h | 20 include/asm-i386/floppy.h | 43 include/asm-i386/futex.h | 4 include/asm-i386/highmem.h | 5 include/asm-i386/hw_irq.h | 4 include/asm-i386/hypercall.h | 319 ++ include/asm-i386/hypervisor.h | 180 + include/asm-i386/io.h | 39 include/asm-i386/kmap_types.h | 3 include/asm-i386/mach-default/mach_dma_map.h | 80 include/asm-i386/mach-default/mach_fixmap.h | 15 include/asm-i386/mach-default/mach_io.h | 35 include/asm-i386/mach-default/mach_mmu.h | 18 include/asm-i386/mach-default/mach_mode.h | 7 include/asm-i386/mach-default/mach_page.h | 28 include/asm-i386/mach-default/mach_pgtable.h | 45 include/asm-i386/mach-default/mach_processor.h | 53 include/asm-i386/mach-default/mach_seg.h | 25 include/asm-i386/mach-default/mach_setup.h | 50 include/asm-i386/mach-default/mach_system.h | 74 include/asm-i386/mach-default/mach_tlbflush.h | 59 include/asm-i386/mach-xen/irq_vectors.h | 125 + include/asm-i386/mach-xen/mach_dma_map.h | 47 include/asm-i386/mach-xen/mach_fixmap.h | 15 include/asm-i386/mach-xen/mach_io.h | 50 include/asm-i386/mach-xen/mach_mmu.h | 48 include/asm-i386/mach-xen/mach_mode.h | 7 include/asm-i386/mach-xen/mach_page.h | 154 + include/asm-i386/mach-xen/mach_pgtable.h | 154 + include/asm-i386/mach-xen/mach_processor.h | 61 include/asm-i386/mach-xen/mach_seg.h | 9 include/asm-i386/mach-xen/mach_setup.h | 11 include/asm-i386/mach-xen/mach_system.h | 138 + include/asm-i386/mach-xen/mach_tlbflush.h | 10 include/asm-i386/mach-xen/setup_arch_post.h | 40 include/asm-i386/mach-xen/setup_arch_pre.h | 5 include/asm-i386/mmu.h | 6 include/asm-i386/mmu_context.h | 17 include/asm-i386/page.h | 14 include/asm-i386/pci.h | 31 include/asm-i386/pgalloc.h | 31 include/asm-i386/pgtable-2level.h | 12 include/asm-i386/pgtable-3level.h | 35 include/asm-i386/pgtable.h | 22 include/asm-i386/processor.h | 48 include/asm-i386/ptrace.h | 5 include/asm-i386/rwsem.h | 17 include/asm-i386/scatterlist.h | 9 include/asm-i386/segment.h | 27 include/asm-i386/setup.h | 45 include/asm-i386/smp.h | 5 include/asm-i386/smp_alt.h | 32 include/asm-i386/spinlock.h | 43 include/asm-i386/swiotlb.h | 59 include/asm-i386/synch_bitops.h | 142 + include/asm-i386/system.h | 125 - include/asm-i386/tlbflush.h | 55 include/asm-i386/vga.h | 2 include/asm-um/page.h | 2 include/asm-x86_64/arch_hooks.h | 31 include/asm-x86_64/bootsetup.h | 10 include/asm-x86_64/desc.h | 40 include/asm-x86_64/dma-mapping.h | 106 include/asm-x86_64/fixmap.h | 21 include/asm-x86_64/floppy.h | 45 include/asm-x86_64/hw_irq.h | 14 include/asm-x86_64/hypercall.h | 320 ++ include/asm-x86_64/hypervisor.h | 2 include/asm-x86_64/io.h | 47 include/asm-x86_64/ipi.h | 8 include/asm-x86_64/irq.h | 39 include/asm-x86_64/mach-xen/asm/page.h | 257 ++ include/asm-x86_64/mach-xen/asm/param.h | 23 include/asm-x86_64/mach-xen/asm/pci.h | 177 + include/asm-x86_64/mach-xen/asm/pgalloc.h | 198 + include/asm-x86_64/mach-xen/asm/pgtable.h | 590 +++++ include/asm-x86_64/mach-xen/asm/processor.h | 505 ++++ include/asm-x86_64/mach-xen/asm/ptrace.h | 125 + include/asm-x86_64/mach-xen/asm/segment.h | 46 include/asm-x86_64/mach-xen/asm/smp.h | 150 + include/asm-x86_64/mach-xen/asm/system.h | 411 +++ include/asm-x86_64/mach-xen/asm/timer.h | 67 include/asm-x86_64/mach-xen/asm/tlbflush.h | 104 include/asm-x86_64/mach-xen/asm/vga.h | 20 include/asm-x86_64/mach-xen/asm/xor.h | 328 +++ include/asm-x86_64/mach-xen/mach_time.h | 122 + include/asm-x86_64/mach-xen/mach_timer.h | 48 include/asm-x86_64/mach-xen/setup_arch_post.h | 47 include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 include/asm-x86_64/mmu.h | 13 include/asm-x86_64/mmu_context.h | 102 include/asm-x86_64/swiotlb.h | 18 include/asm-x86_64/synch_bitops.h | 1 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/irq.h | 3 include/linux/mm.h | 10 include/linux/skbuff.h | 13 include/xen/balloon.h | 70 include/xen/driver_util.h | 26 include/xen/evtchn.h | 123 + include/xen/foreign_page.h | 40 include/xen/gnttab.h | 98 include/xen/interface/acm.h | 181 + include/xen/interface/acm_ops.h | 96 include/xen/interface/arch-ia64.h | 279 ++ include/xen/interface/arch-x86_32.h | 152 + include/xen/interface/arch-x86_64.h | 221 ++ include/xen/interface/dom0_ops.h | 482 ++++ include/xen/interface/event_channel.h | 203 + include/xen/interface/grant_table.h | 306 ++ include/xen/interface/hvm/hvm_info_table.h | 24 include/xen/interface/hvm/ioreq.h | 90 include/xen/interface/hvm/vmx_assist.h | 97 include/xen/interface/io/blkif.h | 85 include/xen/interface/io/console.h | 33 include/xen/interface/io/netif.h | 76 include/xen/interface/io/ring.h | 270 ++ include/xen/interface/io/tpmif.h | 56 include/xen/interface/io/vmx_vlapic.h | 58 include/xen/interface/io/vmx_vpic.h | 85 include/xen/interface/io/xenbus.h | 44 include/xen/interface/io/xs_wire.h | 97 include/xen/interface/memory.h | 101 include/xen/interface/physdev.h | 70 include/xen/interface/sched.h | 60 include/xen/interface/sched_ctl.h | 68 include/xen/interface/trace.h | 90 include/xen/interface/vcpu.h | 64 include/xen/interface/version.h | 52 include/xen/interface/xen.h | 441 ++++ include/xen/net_driver_util.h | 56 include/xen/public/evtchn.h | 98 include/xen/public/privcmd.h | 91 include/xen/public/xenstored.h | 89 include/xen/tpmfe.h | 33 include/xen/xen_proc.h | 23 include/xen/xenbus.h | 252 ++ include/xen/xencons.h | 14 kernel/Kconfig.preempt | 1 kernel/irq/manage.c | 84 lib/Kconfig.debug | 2 lib/Makefile | 2 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 118 + mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 50 net/core/skbuff.c | 41 scripts/Makefile.xen | 14 325 files changed, 64267 insertions(+), 717 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 linux-2.6-xen-merge.patch Index: linux-2.6-xen-merge.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-merge.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-xen-merge.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-xen-merge.patch 9 Jan 2006 20:42:13 -0000 1.3 @@ -1,1335 +1,1077 @@ -diff -r 87ac3e73eed6 -r 941223fe6f81 arch/i386/Kconfig ---- a/arch/i386/Kconfig Mon Dec 5 00:09:38 2005 +0800 -+++ b/arch/i386/Kconfig Tue Dec 13 11:17:14 2005 -0500 -@@ -57,6 +57,14 @@ - bool "PC-compatible" - help - Choose this option if your computer is a standard PC or compatible. -+ -+config X86_XEN -+ bool "Xen-compatible" -+ select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST -+ select X86_UP_IOAPIC if !SMP && XEN_PRIVILEGED_GUEST -+ help -+ Choose this option is you plan to run this kernel on top of Xen -+ Hypervisor. - - config X86_ELAN - bool "AMD Elan" -@@ -159,6 +167,7 @@ +--- ./fs/Kconfig.xenmerge 2006-01-06 16:03:15.000000000 -0500 ++++ ./fs/Kconfig 2006-01-06 16:04:34.000000000 -0500 +@@ -811,6 +811,7 @@ + config HUGETLBFS + bool "HugeTLB file system support" + depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN ++ depends !XEN - config HPET_TIMER - bool "HPET Timer Support" -+ depends on !X86_XEN - help - This enables the use of the HPET for the kernel's internal timer. - HPET is the next generation timer replacing legacy 8254s. -@@ -202,6 +211,19 @@ + config HUGETLB_PAGE + def_bool HUGETLBFS +--- ./drivers/char/mem.c.xenmerge 2006-01-06 16:03:14.000000000 -0500 ++++ ./drivers/char/mem.c 2006-01-06 16:04:32.000000000 -0500 +@@ -103,6 +103,7 @@ + } + #endif - If you don't know what to do here, say N. ++#ifndef ARCH_HAS_DEV_MEM + /* + * This funcion reads the *physical* memory. The f_pos points directly to the + * memory location. +@@ -227,6 +228,7 @@ + *ppos += written; + return written; + } ++#endif -+config SMP_ALTERNATIVES -+ bool "SMP alternatives support (EXPERIMENTAL)" -+ depends on SMP && EXPERIMENTAL -+ help -+ Try to reduce the overhead of running an SMP kernel on a uniprocessor -+ host slightly by replacing certain key instruction sequences -+ according to whether we currently have more than one CPU available. -+ This should provide a noticeable boost to performance when -+ running SMP kernels on UP machines, and have negligible impact -+ when running on an true SMP host. -+ -+ If unsure, say N. -+ - config NR_CPUS - int "Maximum number of CPUs (2-255)" - range 2 255 -@@ -218,7 +240,7 @@ + static int mmap_mem(struct file * file, struct vm_area_struct * vma) + { +@@ -758,6 +760,7 @@ + #define open_kmem open_mem + #define open_oldmem open_mem - config SCHED_SMT - bool "SMT (Hyperthreading) scheduler support" -- depends on SMP -+ depends on SMP && !X86_XEN - default off - help - SMT scheduler support improves the CPU scheduler's decision making -@@ -230,7 +252,7 @@ ++#ifndef ARCH_HAS_DEV_MEM + static struct file_operations mem_fops = { + .llseek = memory_lseek, + .read = read_mem, +@@ -765,6 +768,9 @@ + .mmap = mmap_mem, + .open = open_mem, + }; ++#else ++extern struct file_operations mem_fops; ++#endif - config X86_UP_APIC - bool "Local APIC support on uniprocessors" -- depends on !SMP && !(X86_VISWS || X86_VOYAGER) -+ depends on !SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST) - help - A local APIC (Advanced Programmable Interrupt Controller) is an - integrated interrupt controller in the CPU. If you have a single-CPU -@@ -255,22 +277,27 @@ + static struct file_operations kmem_fops = { + .llseek = memory_lseek, +--- ./drivers/char/tpm/tpm_nsc.c.xenmerge 2006-01-06 16:03:14.000000000 -0500 ++++ ./drivers/char/tpm/tpm_nsc.c 2006-01-06 16:04:32.000000000 -0500 +@@ -19,7 +19,6 @@ + * + */ - config X86_LOCAL_APIC - bool -- depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) -+ depends on X86_UP_APIC || ((X86_VISWS || SMP) && !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) - default y +-#include + #include "tpm.h" - config X86_IO_APIC - bool -- depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)) -+ depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) - default y + /* National definitions */ +@@ -245,7 +244,7 @@ + &dev_attr_pcrs.attr, + &dev_attr_caps.attr, + &dev_attr_cancel.attr, +- NULL, ++ 0, + }; - config X86_VISWS_APIC - bool - depends on X86_VISWS -+ default y -+ -+config X86_TSC -+ bool -+ depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ && !X86_XEN - default y + static struct attribute_group nsc_attr_grp = { .attrs = nsc_attrs }; +@@ -262,93 +261,55 @@ + .miscdev = { .fops = &nsc_ops, }, + }; - config X86_MCE - bool "Machine Check Exception" -- depends on !X86_VOYAGER -+ depends on !(X86_VOYAGER || X86_XEN) - ---help--- - Machine Check Exception support allows the processor to notify the - kernel if it detects a problem (e.g. overheating, component failure). -@@ -360,6 +387,7 @@ +-static struct platform_device *pdev = NULL; +- +-static void __devexit tpm_nsc_remove(struct device *dev) +-{ +- struct tpm_chip *chip = dev_get_drvdata(dev); +- if ( chip ) { +- release_region(chip->vendor->base, 2); +- tpm_remove_hardware(chip->dev); +- } +-} +- +-static struct device_driver nsc_drv = { +- .name = "tpm_nsc", +- .bus = &platform_bus_type, +- .owner = THIS_MODULE, +- .suspend = tpm_pm_suspend, +- .resume = tpm_pm_resume, +-}; +- +-static int __init init_nsc(void) ++static int __devinit tpm_nsc_init(struct pci_dev *pci_dev, ++ const struct pci_device_id *pci_id) + { + int rc = 0; + int lo, hi; + int nscAddrBase = TPM_ADDR; - config MICROCODE - tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support" -+ depends on !XEN_UNPRIVILEGED_GUEST - ---help--- - If you say Y here and also to "/dev file system support" in the - 'File systems' section, you will be able to update the microcode on -@@ -377,6 +405,7 @@ [...125541 lines suppressed...] -+ const char **, unsigned int)); ++#define IOCTL_EVTCHN_BIND_UNBOUND_PORT \ ++ _IOC(_IOC_NONE, 'E', 2, sizeof(struct ioctl_evtchn_bind_unbound_port)) ++struct ioctl_evtchn_bind_unbound_port { ++ unsigned int remote_domain; ++}; + ++/* ++ * Unbind previously allocated @port. ++ */ ++#define IOCTL_EVTCHN_UNBIND \ ++ _IOC(_IOC_NONE, 'E', 3, sizeof(struct ioctl_evtchn_unbind)) ++struct ioctl_evtchn_unbind { ++ unsigned int port; ++}; + -+/** -+ * Advertise in the store a change of the given driver to the given new_state. -+ * Perform the change inside the given transaction xbt. xbt may be NULL, in -+ * which case this is performed inside its own transaction. Return 0 on -+ * success, or -errno on error. On error, the device will switch to -+ * XenbusStateClosing, and the error will be saved in the store. ++/* ++ * Unbind previously allocated @port. + */ -+int xenbus_switch_state(struct xenbus_device *dev, -+ struct xenbus_transaction *xbt, -+ XenbusState new_state); ++#define IOCTL_EVTCHN_NOTIFY \ ++ _IOC(_IOC_NONE, 'E', 4, sizeof(struct ioctl_evtchn_notify)) ++struct ioctl_evtchn_notify { ++ unsigned int port; ++}; + ++/* Clear and reinitialise the event buffer. Clear error condition. */ ++#define IOCTL_EVTCHN_RESET \ ++ _IOC(_IOC_NONE, 'E', 5, 0) + -+/** -+ * Grant access to the given ring_mfn to the peer of the given device. Return -+ * 0 on success, or -errno on error. On error, the device will switch to -+ * XenbusStateClosing, and the error will be saved in the store. ++#endif /* __LINUX_PUBLIC_EVTCHN_H__ */ ++ ++/* ++ * Local variables: ++ * c-file-style: "linux" ++ * indent-tabs-mode: t ++ * c-indent-level: 8 ++ * c-basic-offset: 8 ++ * tab-width: 8 ++ * End: ++ */ +--- /dev/null 2006-01-06 04:48:52.917188312 -0500 ++++ ./include/xen/public/privcmd.h 2006-01-06 16:04:35.000000000 -0500 +@@ -0,0 +1,91 @@ ++/****************************************************************************** ++ * privcmd.h ++ * ++ * Interface to /proc/xen/privcmd. ++ * ++ * Copyright (c) 2003-2005, K A Fraser ++ * ++ * This file may be distributed separately from the Linux kernel, or ++ * incorporated into other software packages, subject to the following license: ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a copy ++ * of this source file (the "Software"), to deal in the Software without ++ * restriction, including without limitation the rights to use, copy, modify, ++ * merge, publish, distribute, sublicense, and/or sell copies of the Software, ++ * and to permit persons to whom the Software is furnished to do so, subject to ++ * the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ++ * IN THE SOFTWARE. + */ -+int xenbus_grant_ring(struct xenbus_device *dev, unsigned long ring_mfn); + ++#ifndef __LINUX_PUBLIC_PRIVCMD_H__ ++#define __LINUX_PUBLIC_PRIVCMD_H__ + -+/** -+ * Allocate an event channel for the given xenbus_device, assigning the newly -+ * created local port to *port. Return 0 on success, or -errno on error. On -+ * error, the device will switch to XenbusStateClosing, and the error will be -+ * saved in the store. -+ */ -+int xenbus_alloc_evtchn(struct xenbus_device *dev, int *port); ++#ifndef __user ++#define __user ++#endif + ++typedef struct privcmd_hypercall ++{ ++ unsigned long op; ++ unsigned long arg[5]; ++} privcmd_hypercall_t; + -+/** -+ * Return the state of the driver rooted at the given store path, or -+ * XenbusStateClosed if no state can be read. -+ */ -+XenbusState xenbus_read_driver_state(const char *path); ++typedef struct privcmd_mmap_entry { ++ unsigned long va; ++ unsigned long mfn; ++ unsigned long npages; ++} privcmd_mmap_entry_t; + ++typedef struct privcmd_mmap { ++ int num; ++ domid_t dom; /* target domain */ ++ privcmd_mmap_entry_t __user *entry; ++} privcmd_mmap_t; + -+/*** -+ * Report the given negative errno into the store, along with the given -+ * formatted message. -+ */ -+void xenbus_dev_error(struct xenbus_device *dev, int err, const char *fmt, -+ ...); ++typedef struct privcmd_mmapbatch { ++ int num; /* number of pages to populate */ ++ domid_t dom; /* target domain */ ++ unsigned long addr; /* virtual address */ ++ unsigned long __user *arr; /* array of mfns - top nibble set on err */ ++} privcmd_mmapbatch_t; + ++typedef struct privcmd_blkmsg ++{ ++ unsigned long op; ++ void *buf; ++ int buf_size; ++} privcmd_blkmsg_t; + -+/*** -+ * Equivalent to xenbus_dev_error(dev, err, fmt, args), followed by -+ * xenbus_switch_state(dev, NULL, XenbusStateClosing) to schedule an orderly -+ * closedown of this driver and its peer. ++/* ++ * @cmd: IOCTL_PRIVCMD_HYPERCALL ++ * @arg: &privcmd_hypercall_t ++ * Return: Value returned from execution of the specified hypercall. + */ -+void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt, -+ ...); -+ ++#define IOCTL_PRIVCMD_HYPERCALL \ ++ _IOC(_IOC_NONE, 'P', 0, sizeof(privcmd_hypercall_t)) ++#define IOCTL_PRIVCMD_MMAP \ ++ _IOC(_IOC_NONE, 'P', 2, sizeof(privcmd_mmap_t)) ++#define IOCTL_PRIVCMD_MMAPBATCH \ ++ _IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t)) + -+#endif /* _ASM_XEN_XENBUS_H */ ++#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */ + +/* + * Local variables: @@ -71842,21 +68431,14 @@ + * tab-width: 8 + * End: + */ -diff -r 87ac3e73eed6 -r 941223fe6f81 include/asm-xen/xencons.h ---- /dev/null Thu Jan 1 00:00:00 1970 +0000 -+++ b/include/asm-xen/xencons.h Tue Dec 13 11:17:14 2005 -0500 -@@ -0,0 +1,14 @@ -+#ifndef __ASM_XENCONS_H__ -+#define __ASM_XENCONS_H__ -+ -+void xencons_force_flush(void); -+void xencons_resume(void); -+ -+/* Interrupt work hooks. Receive data, or kick data out. */ -+void xencons_rx(char *buf, unsigned len, struct pt_regs *regs); -+void xencons_tx(void); -+ -+int xencons_ring_init(void); -+int xencons_ring_send(const char *data, unsigned len); -+ -+#endif /* __ASM_XENCONS_H__ */ +--- ./include/asm-um/page.h.xenmerge 2006-01-06 16:03:16.000000000 -0500 ++++ ./include/asm-um/page.h 2006-01-06 16:04:34.000000000 -0500 +@@ -118,7 +118,7 @@ + extern struct page *arch_validate(struct page *page, gfp_t mask, int order); + #define HAVE_ARCH_VALIDATE + +-extern void arch_free_page(struct page *page, int order); ++extern int arch_free_page(struct page *page, int order); + #define HAVE_ARCH_FREE_PAGE + + #include linux-2.6-xen-no-tls-warn.patch: fixup.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6-xen-no-tls-warn.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-no-tls-warn.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-xen-no-tls-warn.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-xen-no-tls-warn.patch 9 Jan 2006 20:42:18 -0000 1.3 @@ -1,7 +1,5 @@ -diff --git a/arch/i386/xen/kernel/fixup.c b/arch/i386/xen/kernel/fixup.c -index ccfb39d..26a5a18 100644 ---- a/arch/i386/xen/kernel/fixup.c -+++ b/arch/i386/xen/kernel/fixup.c +--- linux-2.6.14/arch/i386/kernel/fixup.c~ 2006-01-06 16:10:00.000000000 -0500 ++++ linux-2.6.14/arch/i386/kernel/fixup.c 2006-01-06 16:13:01.000000000 -0500 @@ -39,7 +39,7 @@ fastcall void do_fixup_4gb_segment(struct pt_regs *regs, long error_code) linux-2.6-xen-vdso-note.patch: vsyscall-note-xen.S | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6-xen-vdso-note.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-vdso-note.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-xen-vdso-note.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-xen-vdso-note.patch 9 Jan 2006 20:42:18 -0000 1.3 @@ -1,76 +1,9 @@ -Supply the Xen vdso to user land for "nosegneg" optimisations w/ glibc. - -From: <> - - ---- - - arch/i386/xen/kernel/Makefile | 2 +- - arch/xen/i386/kernel/vsyscall-note.S | 32 ++++++++++++++++++++++++++++++++ - include/asm-i386/mach-xen/asm/page.h | 2 ++ - 3 files changed, 35 insertions(+), 1 deletions(-) - -diff --git a/arch/i386/xen/kernel/Makefile b/arch/i386/xen/kernel/Makefile -index 20c0129..8e0dc81 100644 ---- a/arch/i386/xen/kernel/Makefile -+++ b/arch/i386/xen/kernel/Makefile -@@ -86,7 +86,7 @@ $(obj)/vsyscall-syms.o: $(src)/vsyscall. - $(call if_changed,syscall) +--- linux-2.6.14/arch/i386/kernel/vsyscall-note-xen.S~ 2006-01-06 17:26:37.000000000 -0500 ++++ linux-2.6.14/arch/i386/kernel/vsyscall-note-xen.S 2006-01-06 17:32:11.000000000 -0500 +@@ -28,5 +28,5 @@ + #define NOTE_KERNELCAP_END ASM_ELF_NOTE_END - c-link := --s-link := vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o vsyscall.lds.o -+s-link := vsyscall-int80.o vsyscall-sysenter.o vsyscall-sigreturn.o vsyscall.lds.o vsyscall-note.o - - $(patsubst %.o,$(obj)/%.c,$(c-obj-y) $(c-obj-m) $(c-link)) $(patsubst %.o,$(obj)/%.S,$(s-obj-y) $(s-link)): - @ln -fsn $(srctree)/arch/i386/kernel/$(notdir $@) $@ -diff --git a/arch/xen/i386/kernel/vsyscall-note.S b/arch/xen/i386/kernel/vsyscall-note.S -new file mode 100644 -index 0000000..f404784 ---- /dev/null -+++ b/arch/xen/i386/kernel/vsyscall-note.S -@@ -0,0 +1,32 @@ -+/* -+ * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text. -+ * Here we can supply some information useful to userland. -+ * First we get the vanilla i386 note that supplies the kernel version info. -+ */ -+ -+#include "../../../i386/kernel/vsyscall-note.S" -+ -+/* -+ * Now we add a special note telling glibc's dynamic linker a fake hardware -+ * flavor that it will use to choose the search path for libraries in the -+ * same way it uses real hardware capabilities like "mmx". -+ * We supply "nosegneg" as the fake capability, to indicate that we -+ * do not like negative offsets in instructions using segment overrides, -+ * since we implement those inefficiently. This makes it possible to -+ * install libraries optimized to avoid those access patterns in someplace -+ * like /lib/i686/tls/nosegneg. Note that an /etc/ld.so.conf.d/file -+ * corresponding to the bits here is needed to make ldconfig work right. -+ * It should contain: -+ * hwcap 0 nosegneg -+ * to match the mapping of bit to name that we give here. -+ */ -+#define NOTE_KERNELCAP_BEGIN(ncaps, mask) \ -+ ASM_ELF_NOTE_BEGIN(".note.kernelcap", "a", "GNU", 2) \ -+ .long ncaps, mask -+#define NOTE_KERNELCAP(bit, name) \ -+ .byte bit; .asciz name -+#define NOTE_KERNELCAP_END ASM_ELF_NOTE_END -+ -+NOTE_KERNELCAP_BEGIN(1, 1) + NOTE_KERNELCAP_BEGIN(1, 1) +-NOTE_KERNELCAP(1, "nosegneg") /* Change 1 back to 0 when glibc is fixed! */ +NOTE_KERNELCAP(0, "nosegneg") -+NOTE_KERNELCAP_END -diff --git a/include/asm-i386/mach-xen/asm/page.h b/include/asm-i386/mach-xen/asm/page.h -index 21f8300..9acaa52 100644 ---- a/include/asm-i386/mach-xen/asm/page.h -+++ b/include/asm-i386/mach-xen/asm/page.h -@@ -268,6 +268,8 @@ extern int page_is_ram(unsigned long pag - #define virt_to_mfn(v) (pfn_to_mfn(__pa(v) >> PAGE_SHIFT)) - #define mfn_to_virt(m) (__va(mfn_to_pfn(m) << PAGE_SHIFT)) - -+#define __HAVE_ARCH_GATE_AREA 1 -+ - #endif /* __KERNEL__ */ - - #include + NOTE_KERNELCAP_END linux-2.6.14-xen_remap_vma_flags.patch: ioremap-xen.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6.14-xen_remap_vma_flags.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6.14-xen_remap_vma_flags.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6.14-xen_remap_vma_flags.patch 21 Dec 2005 11:24:55 -0000 1.2 +++ linux-2.6.14-xen_remap_vma_flags.patch 9 Jan 2006 20:42:18 -0000 1.3 @@ -1,6 +1,6 @@ -diff -uNp linux-2.6.14/arch/i386/xen/mm/ioremap.c.orig linux-2.6.14/arch/i386/xen/mm/ioremap.c ---- linux-2.6.14/arch/i386/xen/mm/ioremap.c.orig 2005-12-20 20:08:14.000000000 +0100 -+++ linux-2.6.14/arch/i386/xen/mm/ioremap.c 2005-12-20 20:09:10.000000000 +0100 +diff -uNp linux-2.6.14/arch/i386/mm/ioremap-xen.c.orig linux-2.6.14/arch/i386/mm/ioremap-xen.c +--- linux-2.6.14/arch/i386/mm/ioremap-xen.c.orig 2005-12-20 20:08:14.000000000 +0100 ++++ linux-2.6.14/arch/i386/mm/ioremap-xen.c 2005-12-20 20:09:10.000000000 +0100 @@ -118,7 +118,7 @@ int direct_remap_pfn_range(struct vm_are domid_t domid) { Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 21 Dec 2005 15:04:57 -0000 1.6 +++ sources 9 Jan 2006 20:42:18 -0000 1.7 @@ -1,4 +1,3 @@ -66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 -04385c8abed5541c0710b15393b79020 xen-20051206.tar.bz2 -9c1d46fca842361a84e499e851c7548e patch-2.6.15-rc6.bz2 -69f8999146103a293b1e1c085713f1aa patch-2.6.15-rc6-git1.bz2 +cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 +2f072f3527bb24f37b46f4622a4404fe xen-20060106.tar.bz2 +1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/upstream,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- upstream 21 Dec 2005 15:04:57 -0000 1.3 +++ upstream 9 Jan 2006 20:42:18 -0000 1.4 @@ -1,3 +1 @@ -linux-2.6.14.tar.bz2 -patch-2.6.15-rc6.bz2 -patch-2.6.15-rc6-git1.bz2 +linux-2.6.15.tar.bz2 --- linux-2.6-acpi-acpica-20051202.patch DELETED --- --- linux-2.6-apm-depends-fix.patch DELETED --- --- linux-2.6-debug-spinlock-symbol.patch DELETED --- --- linux-2.6-g5-thermal-overload.patch DELETED --- --- linux-2.6-missing-exports.patch DELETED --- --- linux-2.6-usb-suspend.patch DELETED --- --- linux-2.6.14-kauditd-suspend.patch DELETED --- --- linux-2.6.14.tar.bz2.sign DELETED --- --- patch-2.6.15-rc6-git1.bz2.sign DELETED --- --- patch-2.6.15-rc6.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 20:45:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:45:36 -0500 Subject: rpms/kernel-xen/devel kernel-xen.spec,1.24,1.25 Message-ID: <200601092045.k09KjaS4023695@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23489 Modified Files: kernel-xen.spec Log Message: Update changelog Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- kernel-xen.spec 9 Jan 2006 20:42:13 -0000 1.24 +++ kernel-xen.spec 9 Jan 2006 20:45:32 -0000 1.25 @@ -1446,6 +1446,10 @@ %endif %changelog +* Mon Jan 9 2006 Stephen Tweedie +- Rebase xen to hypervisor from 20060106 +- Rebase xen kernel code to linux-2.6-merge.hg cset 16985 + * Mon Jan 9 2006 Dave Jones - Remove vm debug patch that triggers too easily right now. (Needs fixing properly post test2). From fedora-cvs-commits at redhat.com Mon Jan 9 20:48:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:48:35 -0500 Subject: rpms/pykickstart/devel .cvsignore, 1.12, 1.13 pykickstart.spec, 1.12, 1.13 sources, 1.13, 1.14 Message-ID: <200601092048.k09KmZ9V003200@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3144 Modified Files: .cvsignore pykickstart.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 12 Dec 2005 21:19:55 -0000 1.12 +++ .cvsignore 9 Jan 2006 20:48:33 -0000 1.13 @@ -1,3 +1,4 @@ pykickstart-0.9.tar.gz pykickstart-0.10.tar.gz pykickstart-0.11.tar.gz +pykickstart-0.12.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- pykickstart.spec 12 Dec 2005 21:19:55 -0000 1.12 +++ pykickstart.spec 9 Jan 2006 20:48:33 -0000 1.13 @@ -2,7 +2,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart -Version: 0.11 +Version: 0.12 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -36,6 +36,10 @@ /usr/bin/ksvalidator %changelog +* Mon Jan 09 2006 Chris Lumens 0.12-1 +- Clean up output quoting. +- Finish removing monitor-related stuff from xconfig. + * Mon Dec 12 2005 Chris Lumens 0.11-1 - Deprecate monitor-related options to xconfig. Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 12 Dec 2005 21:19:55 -0000 1.13 +++ sources 9 Jan 2006 20:48:33 -0000 1.14 @@ -1 +1 @@ -7e308f6ef91d5e1723b2c59f6786f6cb pykickstart-0.11.tar.gz +4f806d6bdb3d7aad0f7fb02a810d94c4 pykickstart-0.12.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 9 20:53:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:53:57 -0500 Subject: rpms/nfs-utils/devel nfs-utils.spec,1.74,1.75 Message-ID: <200601092053.k09KrvDi005780@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5620 Modified Files: nfs-utils.spec Log Message: added libevent to BuildRequires: Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- nfs-utils.spec 9 Jan 2006 20:17:59 -0000 1.74 +++ nfs-utils.spec 9 Jan 2006 20:53:54 -0000 1.75 @@ -41,7 +41,7 @@ Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep Requires: modutils >= 2.4.26-9 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 -BuildRequires: nfs-utils-lib-devel +BuildRequires: nfs-utils-lib-devel libevent PreReq: shadow-utils >= 4.0.3-25 PreReq: /sbin/chkconfig /sbin/nologin PreReq: nfs-utils-lib libevent From fedora-cvs-commits at redhat.com Mon Jan 9 20:56:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 15:56:38 -0500 Subject: rpms/nfs-utils/devel nfs-utils.spec,1.75,1.76 Message-ID: <200601092056.k09KucZF007015@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6792 Modified Files: nfs-utils.spec Log Message: Added libevent-devel to BuildRequires: Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- nfs-utils.spec 9 Jan 2006 20:53:54 -0000 1.75 +++ nfs-utils.spec 9 Jan 2006 20:56:35 -0000 1.76 @@ -41,7 +41,7 @@ Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep Requires: modutils >= 2.4.26-9 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 -BuildRequires: nfs-utils-lib-devel libevent +BuildRequires: nfs-utils-lib-devel libevent-devel PreReq: shadow-utils >= 4.0.3-25 PreReq: /sbin/chkconfig /sbin/nologin PreReq: nfs-utils-lib libevent From fedora-cvs-commits at redhat.com Mon Jan 9 21:01:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 16:01:04 -0500 Subject: rpms/nfs-utils/devel nfs-utils.spec,1.76,1.77 Message-ID: <200601092101.k09L14OJ008685@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8642 Modified Files: nfs-utils.spec Log Message: Added BuildPrereq nfs-utils-lib-devel libevent-devel Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- nfs-utils.spec 9 Jan 2006 20:56:35 -0000 1.76 +++ nfs-utils.spec 9 Jan 2006 21:00:46 -0000 1.77 @@ -40,6 +40,7 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep Requires: modutils >= 2.4.26-9 +BuildPrereq: nfs-utils-lib-devel libevent-devel BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 BuildRequires: nfs-utils-lib-devel libevent-devel PreReq: shadow-utils >= 4.0.3-25 From fedora-cvs-commits at redhat.com Mon Jan 9 21:21:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 16:21:13 -0500 Subject: rpms/firstboot/devel firstboot.spec,1.59,1.60 sources,1.56,1.57 Message-ID: <200601092121.k09LLDm4026657@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/firstboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26594 Modified Files: firstboot.spec sources Log Message: Bump build. Index: firstboot.spec =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- firstboot.spec 9 Jan 2006 20:39:54 -0000 1.59 +++ firstboot.spec 9 Jan 2006 21:21:10 -0000 1.60 @@ -1,7 +1,7 @@ Summary: Initial system configuration utility Name: firstboot Version: 1.3.56 -Release: 1 +Release: 2 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -25,7 +25,6 @@ Requires: system-config-soundcard Requires: system-config-securitylevel Requires: system-config-rootpassword -Requires: system-config-packages Requires: system-config-network Requires: system-config-users Requires: authconfig-gtk @@ -76,6 +75,9 @@ /usr/sbin/firstboot %changelog +* Mon Jan 09 2006 Chris Lumens 1.3.56-2 +- Remove dependancy on system-config-packages. + * Thu Jan 09 2006 Chris Lumens 1.3.56-1 - Increase timeout on waiting for X to start (#176782). - Update translations. Index: sources =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 9 Jan 2006 20:39:54 -0000 1.56 +++ sources 9 Jan 2006 21:21:10 -0000 1.57 @@ -1 +1 @@ -3211ad0ea94a4bc99e2a9d62fedecb1b firstboot-1.3.56.tar.bz2 +de4fbef4e3eb2add45d9bd32cff558aa firstboot-1.3.56.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 9 21:21:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 16:21:34 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs-2.13.3-gnome-mount.patch, NONE, 1.1 gnome-vfs2.spec, 1.81, 1.82 Message-ID: <200601092121.k09LLYAW026859@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26736 Modified Files: gnome-vfs2.spec Added Files: gnome-vfs-2.13.3-gnome-mount.patch Log Message: - Add patch so --hal-udi is sent in when mounting and unmounting gnome-vfs-2.13.3-gnome-mount.patch: gnome-vfs-volume-ops.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) --- NEW FILE gnome-vfs-2.13.3-gnome-mount.patch --- --- gnome-vfs-2.13.3/libgnomevfs/gnome-vfs-volume-ops.c.gnome-mount 2006-01-09 15:05:47.000000000 -0500 +++ gnome-vfs-2.13.3/libgnomevfs/gnome-vfs-volume-ops.c 2006-01-09 15:16:10.000000000 -0500 @@ -659,8 +659,9 @@ #if defined(USE_HAL) && defined(HAL_EJECT) if (info->hal_udi != NULL) { argv[0] = HAL_EJECT; - argv[1] = info->device_path; - argv[2] = NULL; + argv[1] = "--hal-udi"; + argv[2] = info->hal_udi; + argv[3] = NULL; if (!g_file_test (argv [0], G_FILE_TEST_IS_EXECUTABLE)) argv[0] = NULL; @@ -759,7 +760,11 @@ # ifdef USE_HAL if (hal_udi != NULL) { +# ifdef HAL_MOUNT + name = hal_udi; +# else name = device_path; +# endif } else name = mount_point; # else @@ -770,9 +775,11 @@ if (should_mount) { #if defined(USE_HAL) && defined(HAL_MOUNT) - if (hal_udi != NULL && g_file_test (HAL_MOUNT, G_FILE_TEST_IS_EXECUTABLE)) + if (hal_udi != NULL && g_file_test (HAL_MOUNT, G_FILE_TEST_IS_EXECUTABLE)) { command = HAL_MOUNT; - else + argument = "--hal-udi"; + + } else command = find_command (MOUNT_COMMAND); #else command = find_command (MOUNT_COMMAND); @@ -785,9 +792,10 @@ if (should_unmount) { gboolean is_in_media = g_str_has_prefix (mount_point, "/media"); #if defined(USE_HAL) && defined(HAL_UMOUNT) - if (hal_udi != NULL && g_file_test (HAL_UMOUNT, G_FILE_TEST_IS_EXECUTABLE)) + if (hal_udi != NULL && g_file_test (HAL_UMOUNT, G_FILE_TEST_IS_EXECUTABLE)) { command = HAL_UMOUNT; - else + argument = "--hal-udi"; + } else command = find_command (is_in_media ? PUMOUNT_COMMAND : UMOUNT_COMMAND); #else command = find_command (is_in_media ? PUMOUNT_COMMAND : UMOUNT_COMMAND); Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- gnome-vfs2.spec 9 Jan 2006 17:42:58 -0000 1.81 +++ gnome-vfs2.spec 9 Jan 2006 21:21:30 -0000 1.82 @@ -9,7 +9,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.13.3 -Release: 2 +Release: 3 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -45,6 +45,8 @@ Patch201: gnome-vfs-2.8.1-console-mount-opt.patch +Patch202: gnome-vfs-2.13.3-gnome-mount.patch + %description GNOME VFS is the GNOME virtual file system. It is the foundation of the Nautilus file manager. It provides a modular architecture and @@ -88,6 +90,7 @@ %patch104 -p1 -b .browser_default %patch201 -p0 -b .console +%patch202 -p1 -b .gnome-mount %build @@ -173,6 +176,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Mon Jan 09 2006 John (J5) Palmieri 2.13.3-3 +- Add patch so --hal-udi is sent in when mounting and unmounting + * Mon Jan 09 2006 John (J5) Palmieri 2.13.3-2 - Add dependency on gnome-mount - Add configure options for gnome-mount From fedora-cvs-commits at redhat.com Mon Jan 9 21:33:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 16:33:24 -0500 Subject: rpms/nautilus/devel nautilus.spec,1.84,1.85 Message-ID: <200601092133.k09LXOCL022592@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/nautilus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22561 Modified Files: nautilus.spec Log Message: * Mon Jan 9 2006 Alexander Larsson - 2.13.3-2 - Buildrequire libbeagle Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- nautilus.spec 13 Dec 2005 17:29:49 -0000 1.84 +++ nautilus.spec 9 Jan 2006 21:33:20 -0000 1.85 @@ -18,7 +18,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME. Version: 2.13.3 -Release: 1 +Release: 2 License: GPL Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2 @@ -66,6 +66,9 @@ BuildRequires: startup-notification-devel >= %{startup_notification_version} BuildRequires: libexif-devel >= %{libexif_version} BuildRequires: gettext +%ifnarch s390 s390x +BuildRequires: libbeagle +%endif # For intltool: BuildRequires: perl-XML-Parser >= 2.31-16 @@ -170,6 +173,9 @@ %{_includedir}/nautilus %changelog +* Mon Jan 9 2006 Alexander Larsson - 2.13.3-2 +- Buildrequire libbeagle + * Tue Dec 13 2005 Alexander Larsson 2.13.3-1 - Update to 2.13.3 From fedora-cvs-commits at redhat.com Mon Jan 9 21:33:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 16:33:25 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.43, 1.44 java-1.4.2-gcj-compat.spec, 1.117, 1.118 sources, 1.47, 1.48 Message-ID: <200601092133.k09LXPfo022602@cvs.devel.redhat.com> Author: ashah Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22552 Modified Files: .cvsignore java-1.4.2-gcj-compat.spec sources Log Message: Import java-gcj-compat 1.0.50. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 6 Jan 2006 19:56:34 -0000 1.43 +++ .cvsignore 9 Jan 2006 21:33:20 -0000 1.44 @@ -1,3 +1,3 @@ -java-gcj-compat-1.0.48.tar.gz +java-gcj-compat-1.0.50.tar.gz bcprov-jdk14-127.tar.gz eclipse-ecj-3.1.0_fc-12.jar Index: java-1.4.2-gcj-compat.spec =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- java-1.4.2-gcj-compat.spec 6 Jan 2006 19:56:34 -0000 1.117 +++ java-1.4.2-gcj-compat.spec 9 Jan 2006 21:33:21 -0000 1.118 @@ -17,11 +17,11 @@ %define buildver 0 # the version-release string for the gcj rpms we require %define gccver 4.0.0-0.42 -%define jgcver 1.0.48 +%define jgcver 1.0.50 %define name java-%{javaver}-%{origin}-compat %define version %{javaver}.%{buildver} -%define release 40jpp_60rh +%define release 40jpp_61rh %define cname java-%{javaver}-%{origin} #%define bcarchivever 127 @@ -542,6 +542,9 @@ %defattr(-,root,root) %changelog +* Mon Jan 9 2006 Archit Shah - 0:1.4.2.0-40jpp_61rh +- Import java-gcj-compat 1.0.50. + * Fri Jan 6 2006 Archit Shah - 0:1.4.2.0-40jpp_60rh - Import java-gcj-compat 1.0.48. Index: sources =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 6 Jan 2006 19:56:34 -0000 1.47 +++ sources 9 Jan 2006 21:33:21 -0000 1.48 @@ -1,3 +1,3 @@ -e1495da454ddaace26db340bd876ada2 java-gcj-compat-1.0.48.tar.gz +0b0f9037d62b6631d0c72d5f62abde7c java-gcj-compat-1.0.50.tar.gz d17b7fa532fc87fdf14d42c2d293ec3f bcprov-jdk14-127.tar.gz 95766e40c6ab6b641341f3a44dcf0b9e eclipse-ecj-3.1.0_fc-12.jar From fedora-cvs-commits at redhat.com Mon Jan 9 21:39:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 16:39:43 -0500 Subject: rpms/nautilus/devel nautilus.spec,1.85,1.86 Message-ID: <200601092139.k09Ldho6022907@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/nautilus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22889 Modified Files: nautilus.spec Log Message: fix buildreq Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- nautilus.spec 9 Jan 2006 21:33:20 -0000 1.85 +++ nautilus.spec 9 Jan 2006 21:39:39 -0000 1.86 @@ -67,7 +67,7 @@ BuildRequires: libexif-devel >= %{libexif_version} BuildRequires: gettext %ifnarch s390 s390x -BuildRequires: libbeagle +BuildRequires: libbeagle-devel %endif # For intltool: BuildRequires: perl-XML-Parser >= 2.31-16 From fedora-cvs-commits at redhat.com Mon Jan 9 21:41:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 16:41:45 -0500 Subject: rpms/libnl/devel libnl-64bit.patch,1.1,1.2 libnl.spec,1.7,1.8 Message-ID: <200601092141.k09LfjRG023062@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/libnl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23047 Modified Files: libnl-64bit.patch libnl.spec Log Message: * Mon Jan 9 2006 Christopher Aillon 1.0-0.6.pre5 - Correctly install the pkgconfig file libnl-64bit.patch: Makefile.opts.in | 1 + lib/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) Index: libnl-64bit.patch =================================================================== RCS file: /cvs/dist/rpms/libnl/devel/libnl-64bit.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libnl-64bit.patch 2 Nov 2005 22:41:27 -0000 1.1 +++ libnl-64bit.patch 9 Jan 2006 21:41:42 -0000 1.2 @@ -1,3 +1,5 @@ +Use $(libdir) instead of $(prefix)/lib for 64bit awesomeness. + diff -ru libnl-1.0-pre5-64bit-issues/lib/Makefile libnl-1.0-pre5/lib/Makefile --- libnl-1.0-pre5-64bit-issues/lib/Makefile 2005-11-02 12:29:06.000000000 -0500 +++ libnl-1.0-pre5/lib/Makefile 2005-11-02 17:07:47.000000000 -0500 Index: libnl.spec =================================================================== RCS file: /cvs/dist/rpms/libnl/devel/libnl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libnl.spec 9 Dec 2005 22:41:39 -0000 1.7 +++ libnl.spec 9 Jan 2006 21:41:42 -0000 1.8 @@ -5,7 +5,7 @@ License: LGPL Name: libnl Version: 1.0 -Release: 0.5.%{preversion}.1 +Release: 0.6.%{preversion} URL: http://people.suug.ch/~tgr/libnl/ Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}-%{preversion}.tar.gz Source1: %{name}-1.pc @@ -40,7 +40,7 @@ make install DESTDIR=$RPM_BUILD_ROOT %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ -%{__cp} %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ +%{__install} -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -61,6 +61,9 @@ %{_libdir}/pkgconfig/%{name}-1.pc %changelog +* Mon Jan 9 2006 Christopher Aillon 1.0-0.6.pre5 +- Correctly install the pkgconfig file + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Mon Jan 9 21:44:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 16:44:03 -0500 Subject: rpms/postgresql/FC-3 rpm-multilib-7.4.11.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 postgresql.spec, 1.43, 1.44 sources, 1.22, 1.23 rpm-multilib-7.4.8.patch, 1.1, NONE Message-ID: <200601092144.k09Li39R023144@cvs.devel.redhat.com> Author: tgl Update of /cvs/dist/rpms/postgresql/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv23128 Modified Files: .cvsignore postgresql.spec sources Added Files: rpm-multilib-7.4.11.patch Removed Files: rpm-multilib-7.4.8.patch Log Message: Update to PostgreSQL 7.4.11; fix some old bugs already fixed in FC4. rpm-multilib-7.4.11.patch: config/python.m4 | 10 +++++++--- configure.in | 33 ++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 18 deletions(-) --- NEW FILE rpm-multilib-7.4.11.patch --- diff -Naur postgresql-7.4.1.orig/config/python.m4 postgresql-7.4.1/config/python.m4 --- postgresql-7.4.1.orig/config/python.m4 2003-09-02 02:01:48.000000000 +0300 +++ postgresql-7.4.1/config/python.m4 2003-11-18 21:29:47.000000000 +0200 @@ -25,7 +25,11 @@ python_version=`${PYTHON} -c "import sys; print sys.version[[:3]]"` python_prefix=`${PYTHON} -c "import sys; print sys.prefix"` python_execprefix=`${PYTHON} -c "import sys; print sys.exec_prefix"` -python_configdir="${python_execprefix}/lib/python${python_version}/config" +python_path=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]]"` +python_libpath=`${PYTHON} -c "from distutils import sysconfig; print sysconfig.get_config_vars('LIBDEST')[[0]][[5:]]"` +python_configdir="${python_path}/config" +python_moduledir="${python_path}/site-packages" +python_moduleexecdir="${python_execprefix}/${python_libpath}/site-packages" python_includespec="-I${python_prefix}/include/python${python_version}" if test "$python_prefix" != "$python_execprefix"; then python_includespec="-I${python_execprefix}/include/python${python_version} $python_includespec" @@ -37,9 +41,9 @@ AC_SUBST(python_includespec)[]dnl # This should be enough of a message. if test "$python_prefix" != "$python_execprefix"; then - AC_MSG_RESULT([$python_prefix/lib/python${python_version} and $python_execprefix/lib/python${python_version}]) + AC_MSG_RESULT([$python_prefix/${python_libpath} and $python_execprefix/${python_libpath}]) else - AC_MSG_RESULT([$python_prefix/lib/python${python_version}]) + AC_MSG_RESULT([$python_prefix/${python_libpath}]) fi ])# _PGAC_CHECK_PYTHON_DIRS diff -Naur postgresql-7.4.1.orig/configure.in postgresql-7.4.1/configure.in --- postgresql-7.4.1.orig/configure.in 2003-11-16 23:33:50.000000000 +0200 +++ postgresql-7.4.1/configure.in 2003-11-18 21:31:09.000000000 +0200 @@ -19,12 +19,11 @@ dnl dnl The GNU folks apparently haven't heard that some people don't use dnl Texinfo. Use this sorcery to use "docdir" instead of "infodir". -m4_define([info], [doc]) -m4_define([infodir], [docdir]) +dnl +dnl Now use both docdir and infodir to work properly with RPM macros +dnl (courtesy, Elliott Lee ) +dnl - Andrew Overholt 10 December 2002 AC_INIT([PostgreSQL], [7.4.11], [pgsql-bugs at postgresql.org]) -m4_undefine([infodir]) -m4_undefine([info]) -AC_SUBST(docdir) AC_PREREQ(2.53) AC_COPYRIGHT([Copyright 2003 PostgreSQL Global Development Group]) @@ -40,6 +39,10 @@ template= AC_MSG_CHECKING([which template to use]) +AC_ARG_WITH(docdir, [location for non-info documentation], , with_docdir=${datadir}/doc) +docdir="$with_docdir" +AC_SUBST(docdir) + PGAC_ARG_REQ(with, template, [], [ case $withval in @@ -442,8 +445,8 @@ if test -d "$krb4_prefix/include"; then INCLUDES="$INCLUDES -I$krb4_prefix/include" fi - if test -d "$krb4_prefix/lib"; then - LIBDIRS="$LIBDIRS -L$krb4_prefix/lib" + if test -d "$krb4_prefix/$LIBNAME"; then + LIBDIRS="$LIBDIRS -L$krb4_prefix/$LIBNAME" fi krb_srvtab="/etc/srvtab" @@ -452,7 +455,7 @@ AC_SUBST(with_krb4) - +test -z "$LIBNAME" && LIBNAME=lib # # Kerberos 5 # @@ -467,8 +470,8 @@ if test -d "$krb5_prefix/include"; then INCLUDES="$INCLUDES -I$krb5_prefix/include" fi - if test -d "$krb5_prefix/lib"; then - LIBDIRS="$LIBDIRS -L$krb5_prefix/lib" + if test -d "$krb5_prefix/$LIBNAME"; then + LIBDIRS="$LIBDIRS -L$krb5_prefix/$LIBNAME" fi krb_srvtab="FILE:\$(sysconfdir)/krb5.keytab" @@ -485,7 +488,7 @@ AC_SUBST(krb_srvtab) - +test -z "$LIBNAME" && LIBNAME=lib # # Kerberos configuration parameters # @@ -496,7 +499,7 @@ AC_DEFINE_UNQUOTED([PG_KRB_SRVNAM], ["$with_krb_srvnam"], [Define to the name of the PostgreSQL service principal in Kerberos. (--with-krb-srvnam=NAME)]) - +test -z "$LIBNAME" && LIBNAME=lib # # PAM # @@ -533,8 +536,8 @@ if test -d "${openssl_prefix}/include" ; then INCLUDES="$INCLUDES -I${openssl_prefix}/include" fi - if test -d "${openssl_prefix}/lib" ; then - LIBDIRS="$LIBDIRS -L${openssl_prefix}/lib" + if test -d "${openssl_prefix}/$LIBNAME" ; then + LIBDIRS="$LIBDIRS -L${openssl_prefix}/$LIBNAME" fi ]) @@ -597,7 +600,7 @@ case $host_os in sysv5*) AC_CACHE_CHECK([whether ld -R works], [pgac_cv_prog_ld_R], [ - pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/lib" + pgac_save_LDFLAGS=$LDFLAGS; LDFLAGS="$LDFLAGS -Wl,-R/usr/$LIBNAME" AC_TRY_LINK([], [], [pgac_cv_prog_ld_R=yes], [pgac_cv_prog_ld_R=no]) LDFLAGS=$pgac_save_LDFLAGS ]) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/postgresql/FC-3/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 10 May 2005 17:02:35 -0000 1.21 +++ .cvsignore 9 Jan 2006 21:44:01 -0000 1.22 @@ -1,2 +1,2 @@ -postgresql-7.4.8.tar.bz2 +postgresql-7.4.11.tar.bz2 PyGreSQL-3.6.1.tgz Index: postgresql.spec =================================================================== RCS file: /cvs/dist/rpms/postgresql/FC-3/postgresql.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- postgresql.spec 4 Oct 2005 19:53:05 -0000 1.43 +++ postgresql.spec 9 Jan 2006 21:44:01 -0000 1.44 @@ -40,12 +40,11 @@ # Python major version. %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} -%{expand: %%define pynextver %(python -c 'import sys;print(float(sys.version[0:3])+0.1)')} Summary: PostgreSQL client programs and libraries. Name: postgresql -Version: 7.4.8 +Version: 7.4.11 # Conventions for PostgreSQL Global Development Group RPM releases: @@ -90,7 +89,7 @@ Patch8: postgresql-7.4-com_err.patch Patch10: postgresql-7.4-selinux.patch Patch11: postgresql-7.4-strerror.patch -Buildrequires: perl glibc-devel bison flex +Buildrequires: perl glibc-devel bison flex autoconf Prereq: /sbin/ldconfig initscripts %if %python BuildPrereq: python-devel @@ -288,7 +287,6 @@ Group: Applications/Databases Requires: libpq.so Requires: python mx -Conflicts: python < %pyver, python >= %pynextver Obsoletes: rh-postgresql-python %description python @@ -815,6 +813,11 @@ %endif %changelog +* Mon Jan 9 2006 Tom Lane 7.4.11-1.FC3.1 +- Update to PostgreSQL 7.4.11 +- Add rpath to plperl.so (bug #162198) +- Remove obsolete Conflicts: against other python versions (bug #166754) + * Tue May 10 2005 Tom Lane 7.4.8-1.FC3.1 - Update to PostgreSQL 7.4.8 (includes security and data-loss fixes; see bz#156727, CAN-2005-1409, CAN-2005-1410) Index: sources =================================================================== RCS file: /cvs/dist/rpms/postgresql/FC-3/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 10 May 2005 17:02:35 -0000 1.22 +++ sources 9 Jan 2006 21:44:01 -0000 1.23 @@ -1,2 +1,2 @@ -b79761ec3735b5851db44429e97bee88 postgresql-7.4.8.tar.bz2 +e56cded48379b80de577db15e4ed5a68 postgresql-7.4.11.tar.bz2 057c2d93f333ff2ed2177a8b87e19c0c PyGreSQL-3.6.1.tgz --- rpm-multilib-7.4.8.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 9 21:44:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 16:44:58 -0500 Subject: rpms/nautilus/devel nautilus.spec,1.86,1.87 Message-ID: <200601092144.k09LiwPc023270@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/nautilus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23257 Modified Files: nautilus.spec Log Message: no beagle on ppc64 either Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- nautilus.spec 9 Jan 2006 21:39:39 -0000 1.86 +++ nautilus.spec 9 Jan 2006 21:44:56 -0000 1.87 @@ -66,7 +66,7 @@ BuildRequires: startup-notification-devel >= %{startup_notification_version} BuildRequires: libexif-devel >= %{libexif_version} BuildRequires: gettext -%ifnarch s390 s390x +%ifnarch s390 s390x ppc64 BuildRequires: libbeagle-devel %endif # For intltool: From fedora-cvs-commits at redhat.com Mon Jan 9 21:56:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 16:56:15 -0500 Subject: rpms/evolution-data-server/devel evolution-data-server-1.5.4-make_imap4_optional.patch, NONE, 1.1 evolution-data-server.spec, 1.77, 1.78 Message-ID: <200601092156.k09LuF8F011267@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11111 Modified Files: evolution-data-server.spec Added Files: evolution-data-server-1.5.4-make_imap4_optional.patch Log Message: * Mon Jan 9 2006 David Malcolm - 1.5.4-3 - added patch to make the "imap4"/"IMAP4rev1" backend optional; disable it in our packages; re-run automake since we have touched various Makefile.am files; rerun intltoolize to avoid incompatibilities between tarball copy of intltool-merge.in and intltool.m4 in intltool package (@EXPANDED_LIBDIR@ renamed to @INTLTOOL_LIBDIR@) (#167574) - explicitly list the camel providers and e-d-s extension files in the spec file evolution-data-server-1.5.4-make_imap4_optional.patch: camel/providers/Makefile.am | 6 +++++- configure.in | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) --- NEW FILE evolution-data-server-1.5.4-make_imap4_optional.patch --- --- evolution-data-server-1.5.4/configure.in.make_imap4_optional 2006-01-09 14:25:43.000000000 -0500 +++ evolution-data-server-1.5.4/configure.in 2006-01-09 14:28:32.000000000 -0500 @@ -807,6 +807,16 @@ dnl ************************************************** dnl New IMAP code support. dnl ************************************************** +AC_ARG_ENABLE(imap4, +[ --enable-imap4=[no/yes] Attempt to compile imap4 provider],,enable_imap4=no) +if test "x$enable_imap4" = "xyes"; then + AC_DEFINE(ENABLE_IMAP4,1,[Build imap4 camel provider]) + msg_imap4=yes +else + msg_imap4=no +fi +AM_CONDITIONAL(ENABLE_IMAP4, test x$enable_imap4 = xyes) + AC_ARG_ENABLE(imapp, [ --enable-imapp=[no/yes] Attempt to compile alternative, incomplete, very unsupported IMAPv4r1 code],,enable_imapp=no) if test "x$enable_imapp" = "xyes"; then --- evolution-data-server-1.5.4/camel/providers/Makefile.am.make_imap4_optional 2006-01-09 14:23:30.000000000 -0500 +++ evolution-data-server-1.5.4/camel/providers/Makefile.am 2006-01-09 14:24:01.000000000 -0500 @@ -1,5 +1,9 @@ ## Process this file with automake to produce Makefile.in +if ENABLE_IMAP4 +IMAP4_DIR=imap4 +endif + if ENABLE_NNTP NNTP_DIR=nntp endif @@ -13,6 +17,6 @@ SENDMAIL_DIR=sendmail endif -SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap imap4 $(NNTP_DIR) local $(IMAPP_DIR) groupwise hula +SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise hula Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- evolution-data-server.spec 5 Jan 2006 20:50:40 -0000 1.77 +++ evolution-data-server.spec 9 Jan 2006 21:56:12 -0000 1.78 @@ -17,10 +17,15 @@ %define use_gtk_doc 1 %endif +%define support_imap4_provider 0 + +%define camel_provider_dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers +%define eds_extensions_dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions + Summary: Backend data server for evolution Name: evolution-data-server Version: 1.5.4 -Release: 2 +Release: 3 License: LGPL Group: System Environment/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 @@ -42,6 +47,8 @@ Patch200: gb-309079-attach-48376.patch Patch201: gb-309079-attach-48377.patch +Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch + BuildRoot: %{_tmppath}/%{name}-root Requires: libsoup >= %{soup_version} Requires: ORBit2 >= %{orbit2_version} @@ -115,6 +122,7 @@ %patch103 -p1 -b .validatehelo %patch200 -p0 -b .fix-uid-leak %patch201 -p0 -b .fix-comp-ref-leak +%patch300 -p1 -b .make-imap4-optional mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -158,6 +166,12 @@ fi %endif +%if %{support_imap4_provider} +%define imap4_flags --enable-imap4=yes +%else +%define imap4_flags --enable-imap4=no +%endif + CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"; export CFLAGS %if ! %{use_nss} @@ -173,13 +187,21 @@ %define gtkdoc_flags --enable-gtk-doc=no %endif +# Rerun automake since we patched some Makefile.am files: +aclocal +autoheader +automake +libtoolize +intltoolize --force + # Rerun autoconf since we patched configure.in: autoconf + %configure \ %gtkdoc_flags \ --enable-file-locking=fcntl --enable-dot-locking=no \ - %ldap_flags %krb5_flags %nntp_flags %ssl_flags + %ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags export tagname=CC make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration" @@ -215,11 +237,49 @@ %{_datadir}/idl/evolution-data-server-%{eds_api_version} %{_datadir}/pixmaps/evolution-data-server-%{eds_base_version} %dir %{_libdir}/evolution-data-server-%{eds_api_version} -%dir %{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/ -%dir %{_libdir}/evolution-data-server-%{eds_api_version}/extensions/ -%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.so -%{_libdir}/evolution-data-server-%{eds_api_version}/camel-providers/*.urls -%{_libdir}/evolution-data-server-%{eds_api_version}/extensions/*.so +%dir %{camel_provider_dir} +%dir %{eds_extensions_dir} + +# Camel providers: +%{camel_provider_dir}/libcamelgroupwise.so +%{camel_provider_dir}/libcamelgroupwise.urls + +%{camel_provider_dir}/libcamelhula.so +%{camel_provider_dir}/libcamelhula.urls + +%{camel_provider_dir}/libcamelimap.so +%{camel_provider_dir}/libcamelimap.urls + +%if %{support_imap4_provider} +%{camel_provider_dir}/libcamelimap4.so +%{camel_provider_dir}/libcamelimap4.urls +%endif + +%{camel_provider_dir}/libcamellocal.so +%{camel_provider_dir}/libcamellocal.urls + +%{camel_provider_dir}/libcamelnntp.so +%{camel_provider_dir}/libcamelnntp.urls + +%{camel_provider_dir}/libcamelpop3.so +%{camel_provider_dir}/libcamelpop3.urls + +%{camel_provider_dir}/libcamelsendmail.so +%{camel_provider_dir}/libcamelsendmail.urls + +%{camel_provider_dir}/libcamelsmtp.so +%{camel_provider_dir}/libcamelsmtp.urls + +# e-d-s extensions: +%{eds_extensions_dir}/libebookbackendfile.so +%{eds_extensions_dir}/libebookbackendgroupwise.so +%{eds_extensions_dir}/libebookbackendldap.so +%{eds_extensions_dir}/libebookbackendvcf.so +%{eds_extensions_dir}/libecalbackendcontacts.so +%{eds_extensions_dir}/libecalbackendfile.so +%{eds_extensions_dir}/libecalbackendgroupwise.so +%{eds_extensions_dir}/libecalbackendhttp.so +%{eds_extensions_dir}/libecalbackendweather.so %files devel %defattr(-,root,root,-) @@ -230,6 +290,14 @@ %changelog +* Mon Jan 9 2006 David Malcolm - 1.5.4-3 +- added patch to make the "imap4"/"IMAP4rev1" backend optional; disable it in + our packages; re-run automake since we have touched various Makefile.am + files; rerun intltoolize to avoid incompatibilities between tarball copy of + intltool-merge.in and intltool.m4 in intltool package (@EXPANDED_LIBDIR@ + renamed to @INTLTOOL_LIBDIR@) (#167574) +- explicitly list the camel providers and e-d-s extension files in the spec file + * Thu Jan 5 2006 David Malcolm - 1.5.4-2 - added patch from David Woodhouse to validate reverse DNS domain before using in SMTP greeting (patch 103, #151121) From fedora-cvs-commits at redhat.com Mon Jan 9 21:58:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 16:58:00 -0500 Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-dm.patch,1.2,1.3 Message-ID: <200601092158.k09Lw0j3012122@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/e2fsprogs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12032 Modified Files: e2fsprogs-1.38-dm.patch Log Message: - fix missing dm_task_destroy() cases. e2fsprogs-1.38-dm.patch: e2fsck/Makefile.in | 2 lib/blkid/Makefile.in | 22 +++---- lib/blkid/blkidP.h | 1 lib/blkid/devname.c | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 166 insertions(+), 12 deletions(-) Index: e2fsprogs-1.38-dm.patch =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs-1.38-dm.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- e2fsprogs-1.38-dm.patch 4 Jan 2006 21:30:35 -0000 1.2 +++ e2fsprogs-1.38-dm.patch 9 Jan 2006 21:57:57 -0000 1.3 @@ -1,5 +1,5 @@ --- e2fsprogs-1.38/e2fsck/Makefile.in.dm 2005-06-29 13:42:20.000000000 -0400 -+++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-01-04 15:51:47.000000000 -0500 ++++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-01-04 16:19:18.000000000 -0500 @@ -20,7 +20,7 @@ DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID) @@ -10,7 +10,7 @@ $(DEPSTATIC_LIBUUID) --- e2fsprogs-1.38/lib/blkid/blkidP.h.dm 2005-05-07 14:16:09.000000000 -0400 -+++ e2fsprogs-1.38/lib/blkid/blkidP.h 2006-01-04 15:51:47.000000000 -0500 ++++ e2fsprogs-1.38/lib/blkid/blkidP.h 2006-01-04 16:19:18.000000000 -0500 @@ -118,6 +118,7 @@ /* * Priority settings for different types of devices @@ -20,7 +20,7 @@ #define BLKID_PRI_LVM 20 #define BLKID_PRI_MD 10 --- e2fsprogs-1.38/lib/blkid/devname.c.dm 2005-05-07 15:26:03.000000000 -0400 -+++ e2fsprogs-1.38/lib/blkid/devname.c 2006-01-04 16:15:01.000000000 -0500 ++++ e2fsprogs-1.38/lib/blkid/devname.c 2006-01-09 16:55:31.000000000 -0500 @@ -11,6 +11,8 @@ * %End-Header% */ @@ -48,7 +48,7 @@ if (tmp->bid_devno == devno) { if (only_if_new) return; -@@ -137,6 +143,146 @@ +@@ -137,6 +143,152 @@ return; } @@ -106,8 +106,10 @@ + + dm_task_run(task); + names = dm_task_get_names(task); -+ if (!names || !names->dev) ++ if (!names || !names->dev) { ++ dm_task_destroy(task); + return 1; ++ } + + n = 0; + do { @@ -138,8 +140,10 @@ + dm_task_run(task); + dm_task_get_info(task, &info); + -+ if (!info.exists) ++ if (!info.exists) { ++ dm_task_destroy(task); + return ret; ++ } + + ret = makedev(info.major, info.minor); + @@ -161,8 +165,10 @@ + + dm_task_run(task); + names = dm_task_get_names(task); -+ if (!names || !names->dev) ++ if (!names || !names->dev) { ++ dm_task_destroy(task); + return; ++ } + + n = 0; + do { @@ -195,7 +201,7 @@ #define PROC_PARTITIONS "/proc/partitions" #define VG_DIR "/proc/lvm/VGs" -@@ -290,6 +436,7 @@ +@@ -290,6 +442,7 @@ return 0; blkid_read_cache(cache); @@ -204,7 +210,7 @@ #ifdef VG_DIR lvm_probe_all(cache, only_if_new); --- e2fsprogs-1.38/lib/blkid/Makefile.in.dm 2005-06-29 13:39:54.000000000 -0400 -+++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-01-04 16:18:38.000000000 -0500 ++++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-01-04 16:19:18.000000000 -0500 @@ -37,7 +37,7 @@ ELF_IMAGE = libblkid ELF_MYDIR = blkid From fedora-cvs-commits at redhat.com Mon Jan 9 22:01:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 17:01:47 -0500 Subject: rpms/openhpi/devel openhpi.spec,1.26,1.27 Message-ID: <200601092201.k09M1lck013156@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/openhpi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13125 Modified Files: openhpi.spec Log Message: use -fno-strict-aliasing Index: openhpi.spec =================================================================== RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- openhpi.spec 4 Jan 2006 09:46:29 -0000 1.26 +++ openhpi.spec 9 Jan 2006 22:01:43 -0000 1.27 @@ -1,7 +1,7 @@ Summary: openhpi Hardware Platform Interface (HPI) library and tools Name: openhpi Version: 2.2.1 -Release: 2 +Release: 3 License: BSD Group: System Environment/Base Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz @@ -46,6 +46,7 @@ %patch4 -p1 -b .gcc4 %build +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --disable-dummy --disable-ipmi make @@ -90,6 +91,9 @@ %changelog +* Mon Jan 06 2006 Jesse Keating 2.2.1-3 +- Fix to not use stict-aliasing. + * Wed Jan 04 2006 Radek Vokal 2.2.1-2 - Rebuilt against new libnetsnmp From fedora-cvs-commits at redhat.com Mon Jan 9 22:02:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 17:02:17 -0500 Subject: rpms/kernel-xen/devel/configs config-xen-xen0,1.2,1.3 Message-ID: <200601092202.k09M2HZo013203@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel-xen/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv13091/configs Modified Files: config-xen-xen0 Log Message: Disable power management bits that don't work in Xen Index: config-xen-xen0 =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-xen-xen0,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-xen-xen0 21 Dec 2005 11:24:56 -0000 1.2 +++ config-xen-xen0 9 Jan 2006 22:02:01 -0000 1.3 @@ -65,3 +65,9 @@ # # CONFIG_XEN_TPMDEV_BACKEND is not set # CONFIG_XEN_TPMDEV_FRONTEND is not set + +# +# Power management bits that don't work in Xen: +# +# CONFIG_X86_POWERNOW_K7 is not set +# CONFIG_X86_P4_CLOCKMOD is not set From fedora-cvs-commits at redhat.com Mon Jan 9 22:02:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 17:02:13 -0500 Subject: rpms/kernel-xen/devel kernel-xen.spec,1.25,1.26 Message-ID: <200601092202.k09M2D5v013176@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13091 Modified Files: kernel-xen.spec Log Message: Disable power management bits that don't work in Xen Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- kernel-xen.spec 9 Jan 2006 20:45:32 -0000 1.25 +++ kernel-xen.spec 9 Jan 2006 22:01:42 -0000 1.26 @@ -1449,6 +1449,7 @@ * Mon Jan 9 2006 Stephen Tweedie - Rebase xen to hypervisor from 20060106 - Rebase xen kernel code to linux-2.6-merge.hg cset 16985 +- Disable power management bits that don't work in Xen * Mon Jan 9 2006 Dave Jones - Remove vm debug patch that triggers too easily right now. From fedora-cvs-commits at redhat.com Mon Jan 9 22:07:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 17:07:08 -0500 Subject: rpms/xerces-j2/devel xerces-j2.spec,1.37,1.38 Message-ID: <200601092207.k09M78sq013756@cvs.devel.redhat.com> Author: ashah Update of /cvs/dist/rpms/xerces-j2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13485 Modified Files: xerces-j2.spec Log Message: - rebuilt for new gcj Index: xerces-j2.spec =================================================================== RCS file: /cvs/dist/rpms/xerces-j2/devel/xerces-j2.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- xerces-j2.spec 22 Dec 2005 02:11:48 -0000 1.37 +++ xerces-j2.spec 9 Jan 2006 22:07:06 -0000 1.38 @@ -1,7 +1,7 @@ %define name xerces-j2 %define version 2.6.2 %define cvs_version 2_6_2 -%define release 6jpp_1fc +%define release 6jpp_2fc %define section free Name: %{name} @@ -280,6 +280,9 @@ %changelog +* Mon Jan 9 2006 Archit Shah 0:2.6.2-6jpp_2fc +- rebuilt for new gcj + * Wed Dec 21 2005 Jesse Keating 0:2.6.2-6jpp_1fc - rebuilt for new gcj From fedora-cvs-commits at redhat.com Mon Jan 9 22:19:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 17:19:29 -0500 Subject: rpms/glibc/devel .cvsignore, 1.131, 1.132 glibc-fedora.patch, 1.124, 1.125 glibc.spec, 1.208, 1.209 sources, 1.153, 1.154 Message-ID: <200601092219.k09MJTV0030529@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30494/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Log Message: auto-import glibc-2.3.90-30 on branch devel from glibc-2.3.90-30.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- .cvsignore 6 Jan 2006 22:17:50 -0000 1.131 +++ .cvsignore 9 Jan 2006 22:19:27 -0000 1.132 @@ -1,2 +1,2 @@ -glibc-20060106T2148.tar.bz2 -glibc-fedora-20060106T2148.tar.bz2 +glibc-20060109T2152.tar.bz2 +glibc-fedora-20060109T2152.tar.bz2 glibc-fedora.patch: ChangeLog | 58 ++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 +++ csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 38 ++ elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 ++- include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 + libio/stdio.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 ++ localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 +- malloc/mtrace.c | 20 + nptl/ChangeLog | 19 + nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 + nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - nscd/selinux.c | 2 posix/Makefile | 19 - posix/getconf.speclist.h | 15 + sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------------------- sysdeps/ia64/libgcc-compat.c | 84 ++++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 ++ sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/tcsetattr.c | 32 ++ 47 files changed, 769 insertions(+), 448 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- glibc-fedora.patch 6 Jan 2006 23:08:27 -0000 1.124 +++ glibc-fedora.patch 9 Jan 2006 22:19:27 -0000 1.125 @@ -1,6 +1,6 @@ ---- glibc-20060106T2148/ChangeLog 6 Jan 2006 19:15:13 -0000 1.9872 -+++ glibc-20060106T2148-fedora/ChangeLog 6 Jan 2006 21:55:54 -0000 1.8782.2.149 -@@ -529,6 +529,10 @@ +--- glibc-20060109T2152/ChangeLog 9 Jan 2006 21:40:30 -0000 1.9888 ++++ glibc-20060109T2152-fedora/ChangeLog 9 Jan 2006 21:54:57 -0000 1.8782.2.150 +@@ -891,6 +891,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -11,7 +11,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -812,6 +816,26 @@ +@@ -1174,6 +1178,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -38,7 +38,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -3930,6 +3954,11 @@ +@@ -4292,6 +4316,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -50,7 +50,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -4924,6 +4953,12 @@ +@@ -5286,6 +5315,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -63,7 +63,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -5048,6 +5083,17 @@ +@@ -5410,6 +5445,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -81,7 +81,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -8108,6 +8154,18 @@ +@@ -8470,6 +8516,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -100,8 +100,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060106T2148/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060106T2148-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060109T2152/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060109T2152-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -151,8 +151,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20060106T2148/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060106T2148-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060109T2152/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060109T2152-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -179,8 +179,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060106T2148/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060106T2148-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060109T2152/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060109T2152-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -261,8 +261,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060106T2148/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060106T2148-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060109T2152/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060109T2152-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -287,8 +287,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060106T2148/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060106T2148-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060109T2152/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060109T2152-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -317,8 +317,8 @@ # define O 0 #else # define O 1 ---- glibc-20060106T2148/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 -+++ glibc-20060106T2148-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 +--- glibc-20060109T2152/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 ++++ glibc-20060109T2152-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr #endif !is_hwcap_platform (direntry->d_name))) @@ -420,8 +420,8 @@ } search_dirs (); ---- glibc-20060106T2148/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060106T2148-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060109T2152/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060109T2152-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -446,8 +446,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060106T2148/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060106T2148-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060109T2152/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060109T2152-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -524,8 +524,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060106T2148/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 -+++ glibc-20060106T2148-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 +--- glibc-20060109T2152/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 ++++ glibc-20060109T2152-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 @@ -275,7 +275,13 @@ #endif @@ -541,8 +541,8 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060106T2148/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060106T2148-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060109T2152/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060109T2152-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -552,8 +552,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060106T2148/libio/stdio.h 5 Jan 2006 12:25:35 -0000 1.84 -+++ glibc-20060106T2148-fedora/libio/stdio.h 6 Jan 2006 09:23:23 -0000 1.78.2.7 +--- glibc-20060109T2152/libio/stdio.h 5 Jan 2006 12:25:35 -0000 1.84 ++++ glibc-20060109T2152-fedora/libio/stdio.h 6 Jan 2006 09:23:23 -0000 1.78.2.7 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -567,8 +567,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060106T2148/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060106T2148-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060109T2152/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060109T2152-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -599,8 +599,8 @@ #endif ---- glibc-20060106T2148/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20060106T2148-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060109T2152/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060109T2152-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -692,8 +692,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060106T2148/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060106T2148-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060109T2152/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060109T2152-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -737,8 +737,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060106T2148/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20060106T2148-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060109T2152/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060109T2152-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -747,8 +747,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060106T2148/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20060106T2148-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060109T2152/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060109T2152-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -790,8 +790,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060106T2148/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060106T2148-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060109T2152/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060109T2152-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -806,8 +806,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060106T2148/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060106T2148-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060109T2152/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060109T2152-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -819,8 +819,8 @@ date_fmt "/ / " ---- glibc-20060106T2148/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T2148-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060109T2152/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060109T2152-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -891,8 +891,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060106T2148/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060106T2148-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060109T2152/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060109T2152-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -920,8 +920,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060106T2148/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060106T2148-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060109T2152/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060109T2152-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -997,8 +997,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060106T2148/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060106T2148-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060109T2152/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060109T2152-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1054,9 +1054,9 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060106T2148/nptl/ChangeLog 6 Jan 2006 21:47:59 -0000 1.840 -+++ glibc-20060106T2148-fedora/nptl/ChangeLog 6 Jan 2006 21:55:55 -0000 1.706.2.73 -@@ -413,6 +413,15 @@ +--- glibc-20060109T2152/nptl/ChangeLog 9 Jan 2006 21:28:07 -0000 1.848 ++++ glibc-20060109T2152-fedora/nptl/ChangeLog 9 Jan 2006 21:54:58 -0000 1.706.2.74 +@@ -443,6 +443,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1072,7 +1072,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1149,6 +1158,11 @@ +@@ -1179,6 +1188,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1084,7 +1084,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3223,6 +3237,11 @@ +@@ -3253,6 +3267,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1096,8 +1096,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060106T2148/nptl/Makefile 5 Jan 2006 08:16:20 -0000 1.175 -+++ glibc-20060106T2148-fedora/nptl/Makefile 6 Jan 2006 09:23:24 -0000 1.157.2.16 +--- glibc-20060109T2152/nptl/Makefile 5 Jan 2006 08:16:20 -0000 1.175 ++++ glibc-20060109T2152-fedora/nptl/Makefile 6 Jan 2006 09:23:24 -0000 1.157.2.16 @@ -507,15 +507,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1120,19 +1120,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060106T2148/nptl/descr.h 6 Jan 2006 21:42:24 -0000 1.29 -+++ glibc-20060106T2148-fedora/nptl/descr.h 6 Jan 2006 23:04:24 -0000 1.23.2.9 -@@ -165,7 +165,7 @@ struct pthread - } while (0) - # define DEQUEUE_MUTEX(mutex) \ - do { \ -- struct pthread_mutex_s *runp = THREAD_GETMEM (THREAD_SELF, robust_list); \ -+ struct __pthread_mutex_s *runp = THREAD_GETMEM (THREAD_SELF, robust_list);\ - if (runp == &mutex->__data) \ - THREAD_SETMEM (THREAD_SELF, robust_list, runp->__next); \ - else \ ---- glibc-20060106T2148/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060106T2148-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060109T2152/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060109T2152-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1157,8 +1146,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060106T2148/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T2148-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060109T2152/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060109T2152-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1166,8 +1155,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060106T2148/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 -+++ glibc-20060106T2148-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 +--- glibc-20060109T2152/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 ++++ glibc-20060109T2152-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void) exit (4); } @@ -1187,8 +1176,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060106T2148/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 -+++ glibc-20060106T2148-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +--- glibc-20060109T2152/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060109T2152-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1207,8 +1196,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060106T2148/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20060106T2148-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060109T2152/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060109T2152-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 @@ -32,8 +32,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1220,8 +1209,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060106T2148/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060106T2148-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060109T2152/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060109T2152-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1262,8 +1251,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060106T2148/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 -+++ glibc-20060106T2148-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 +--- glibc-20060109T2152/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 ++++ glibc-20060109T2152-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 @@ -147,7 +147,7 @@ audit_init (void) if (audit_fd < 0 /* If kernel doesn't support audit, bail out */ @@ -1273,9 +1262,9 @@ } #endif /* HAVE_LIBAUDIT */ ---- glibc-20060106T2148/posix/Makefile 2 Jan 2006 20:39:39 -0000 1.187 -+++ glibc-20060106T2148-fedora/posix/Makefile 2 Jan 2006 21:28:09 -0000 1.171.2.15 -@@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re +--- glibc-20060109T2152/posix/Makefile 8 Jan 2006 09:39:15 -0000 1.188 ++++ glibc-20060109T2152-fedora/posix/Makefile 9 Jan 2006 21:55:00 -0000 1.171.2.16 +@@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ tst-pcre-mem tst-pcre.mtrace tst-boost-mem tst-boost.mtrace \ @@ -1285,7 +1274,7 @@ include ../Rules -@@ -279,12 +280,16 @@ bug-glob2-ENV = MALLOC_TRACE=$(objpfx)bu +@@ -280,12 +281,16 @@ bug-glob2-ENV = MALLOC_TRACE=$(objpfx)bu $(objpfx)bug-glob2-mem: $(objpfx)bug-glob2.out $(common-objpfx)malloc/mtrace $(objpfx)bug-glob2.mtrace > $@ @@ -1308,8 +1297,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060106T2148/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T2148-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060109T2152/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060109T2152-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1326,8 +1315,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060106T2148/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060106T2148-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060109T2152/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060109T2152-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1343,8 +1332,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20060106T2148/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060106T2148-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060109T2152/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060109T2152-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1356,8 +1345,8 @@ endif endif ---- glibc-20060106T2148/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060106T2148-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060109T2152/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060109T2152-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1709,8 +1698,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20060106T2148/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T2148-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060109T2152/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060109T2152-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1796,8 +1785,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060106T2148/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060106T2148-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060109T2152/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060109T2152-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -1812,8 +1801,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060106T2148/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 -+++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 +--- glibc-20060109T2152/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 ++++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -1822,7 +1811,7 @@ #include #include #include - #include "kernel-features.h" + #include #include #include +#include @@ -1862,8 +1851,8 @@ + ret ^= stk; return ret; } ---- glibc-20060106T2148/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060109T2152/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -1873,8 +1862,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060106T2148/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060109T2152/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -1920,8 +1909,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060106T2148/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060109T2152/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -1982,8 +1971,8 @@ + } while (0) + +#include_next ---- glibc-20060106T2148/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060109T2152/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2016,36 +2005,24 @@ + } while (0) + #include_next ---- glibc-20060106T2148/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060109T2152/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060106T2148/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060109T2152/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060106T2148/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060109T2152/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-20060106T2148/sysdeps/unix/sysv/linux/ia64/sysdep.h 20 Dec 2005 06:53:38 -0000 1.24 -+++ glibc-20060106T2148-fedora/sysdeps/unix/sysv/linux/ia64/sysdep.h 6 Jan 2006 22:24:17 -0000 1.22.2.3 -@@ -205,7 +205,8 @@ - register long _r8 __asm ("r8"); \ - register long _r10 __asm ("r10"); \ - register long _r15 __asm ("r15") = name; \ -- register void *_b7 __asm ("b7") = ((tcbhead_t *) __thread_self)->private; \ -+ register void *_b7 __asm ("b7") \ -+ = ((tcbhead_t *) __thread_self)->__private; \ - long _retval; \ - LOAD_REGS_##nr \ - /* \ Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- glibc.spec 6 Jan 2006 22:17:50 -0000 1.208 +++ glibc.spec 9 Jan 2006 22:19:27 -0000 1.209 @@ -1,9 +1,9 @@ -%define glibcdate 20060106T2148 +%define glibcdate 20060109T2152 %define glibcname glibc -%define glibcsrcdir glibc-20060106T2148 +%define glibcsrcdir glibc-20060109T2152 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 29 +%define glibcrelease 30 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -47,7 +47,7 @@ # This is for building auxiliary programs like memusage, nscd # For initial glibc bootstraps it can be commented out BuildPreReq: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.17.10-1 -BuildPreReq: sed >= 3.95 +BuildPreReq: audit-libs-devel >= 1.1.3, sed >= 3.95 %ifarch %{prelinkarches} BuildPreReq: prelink >= 0.2.0-5 %endif @@ -171,7 +171,7 @@ Summary: A Name Service Caching Daemon (nscd). Group: System Environment/Daemons Conflicts: kernel < 2.2.0 -Requires: libselinux >= 1.17.10-1 +Requires: libselinux >= 1.17.10-1, audit-libs >= 1.1.3 Conflicts: selinux-policy-targeted < 1.17.30-2.2 Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils Autoreq: true @@ -413,6 +413,11 @@ #ifndef __NR_waitid #define __NR_waitid 279 #endif +#ifndef __NR_stat64 +#define __NR_fstat64 63 +#define __NR_lstat64 132 +#define __NR_stat64 139 +#endif %endif %ifarch x86_64 #ifndef __NR_mq_open @@ -1133,6 +1138,12 @@ %endif %changelog +* Mon Jan 9 2006 Jakub Jelinek 2.3.90-30 +- update from CVS + - initializer fixes for -std=c{8,9}9 on 32-bit + arches + - + * Fri Jan 6 2006 Jakub Jelinek 2.3.90-29 - update from CVS - make pthread_mutex_t an unnamed union again, as it affects Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- sources 6 Jan 2006 22:17:50 -0000 1.153 +++ sources 9 Jan 2006 22:19:27 -0000 1.154 @@ -1,2 +1,2 @@ -a525e450e3f692d432811e9f6c9381ea glibc-20060106T2148.tar.bz2 -9f1c2990fba476a115239d1272d22db4 glibc-fedora-20060106T2148.tar.bz2 +55117a80457a52c3005499570e38aa10 glibc-20060109T2152.tar.bz2 +a333fca94866e9a67589aa48c6caaeba glibc-fedora-20060109T2152.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 9 22:31:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 17:31:44 -0500 Subject: rpms/evolution-data-server/devel evolution-data-server-1.5.4-make_imap4_optional.patch, 1.1, 1.2 evolution-data-server.spec, 1.78, 1.79 Message-ID: <200601092231.k09MVipW003148@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3089 Modified Files: evolution-data-server-1.5.4-make_imap4_optional.patch evolution-data-server.spec Log Message: * Mon Jan 9 2006 David Malcolm - 1.5.4-4 - updated patch 300 to remove usage of GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools) evolution-data-server-1.5.4-make_imap4_optional.patch: camel/providers/Makefile.am | 6 +++++- configure.in | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) Index: evolution-data-server-1.5.4-make_imap4_optional.patch =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.5.4-make_imap4_optional.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-data-server-1.5.4-make_imap4_optional.patch 9 Jan 2006 21:56:12 -0000 1.1 +++ evolution-data-server-1.5.4-make_imap4_optional.patch 9 Jan 2006 22:31:25 -0000 1.2 @@ -1,5 +1,5 @@ ---- evolution-data-server-1.5.4/configure.in.make_imap4_optional 2006-01-09 14:25:43.000000000 -0500 -+++ evolution-data-server-1.5.4/configure.in 2006-01-09 14:28:32.000000000 -0500 +--- evolution-data-server-1.5.4/configure.in.make_imap4_optional 2006-01-09 17:24:10.000000000 -0500 ++++ evolution-data-server-1.5.4/configure.in 2006-01-09 17:24:12.000000000 -0500 @@ -807,6 +807,16 @@ dnl ************************************************** dnl New IMAP code support. @@ -17,8 +17,17 @@ AC_ARG_ENABLE(imapp, [ --enable-imapp=[no/yes] Attempt to compile alternative, incomplete, very unsupported IMAPv4r1 code],,enable_imapp=no) if test "x$enable_imapp" = "xyes"; then ---- evolution-data-server-1.5.4/camel/providers/Makefile.am.make_imap4_optional 2006-01-09 14:23:30.000000000 -0500 -+++ evolution-data-server-1.5.4/camel/providers/Makefile.am 2006-01-09 14:24:01.000000000 -0500 +@@ -1093,8 +1103,6 @@ + dnl CFLAGS and LIBS and stuff + dnl ************************* + +-GNOME_COMPILE_WARNINGS(yes) +-CFLAGS="$CFLAGS $WARN_CFLAGS" + case $CFLAGS in + *-Wall*) + # Turn off the annoying "comparison between signed and unsigned" +--- evolution-data-server-1.5.4/camel/providers/Makefile.am.make_imap4_optional 2005-12-08 02:54:16.000000000 -0500 ++++ evolution-data-server-1.5.4/camel/providers/Makefile.am 2006-01-09 17:24:12.000000000 -0500 @@ -1,5 +1,9 @@ ## Process this file with automake to produce Makefile.in Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- evolution-data-server.spec 9 Jan 2006 21:56:12 -0000 1.78 +++ evolution-data-server.spec 9 Jan 2006 22:31:25 -0000 1.79 @@ -25,7 +25,7 @@ Summary: Backend data server for evolution Name: evolution-data-server Version: 1.5.4 -Release: 3 +Release: 4 License: LGPL Group: System Environment/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 @@ -122,7 +122,7 @@ %patch103 -p1 -b .validatehelo %patch200 -p0 -b .fix-uid-leak %patch201 -p0 -b .fix-comp-ref-leak -%patch300 -p1 -b .make-imap4-optional +%patch300 -p1 -b .make_imap4_optional mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -290,6 +290,10 @@ %changelog +* Mon Jan 9 2006 David Malcolm - 1.5.4-4 +- updated patch 300 to remove usage of GNOME_COMPILE_WARNINGS from configure.in + (since gnome-common might not be available when we rerun the autotools) + * Mon Jan 9 2006 David Malcolm - 1.5.4-3 - added patch to make the "imap4"/"IMAP4rev1" backend optional; disable it in our packages; re-run automake since we have touched various Makefile.am From fedora-cvs-commits at redhat.com Mon Jan 9 22:33:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 17:33:40 -0500 Subject: rpms/glibc/devel glibc.spec,1.209,1.210 Message-ID: <200601092233.k09MXeEE003340@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3311 Modified Files: glibc.spec Log Message: 2.3.90-30 Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- glibc.spec 9 Jan 2006 22:19:27 -0000 1.209 +++ glibc.spec 9 Jan 2006 22:33:25 -0000 1.210 @@ -31,8 +31,7 @@ %endif Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2 Patch0: %{glibcname}-fedora.patch -Patch1: %{name}-ppc-assume.patch -Patch2: %{name}-ia64-lib64.patch +Patch1: %{name}-ia64-lib64.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -234,10 +233,9 @@ %prep %setup -q -n %{glibcsrcdir} %{glibc_release_unpack} -a3 %patch0 -E -p1 -%patch1 -p1 %ifarch ia64 %if "%{_lib}" == "lib64" -%patch2 -p1 +%patch1 -p1 %endif %endif From fedora-cvs-commits at redhat.com Mon Jan 9 22:43:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 17:43:22 -0500 Subject: rpms/e2fsprogs/devel e2fsprogs.spec,1.42,1.43 Message-ID: <200601092243.k09MhMgs007512@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/e2fsprogs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7361 Modified Files: e2fsprogs.spec Log Message: - update dm patch - bump release to -5 Index: e2fsprogs.spec =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- e2fsprogs.spec 4 Jan 2006 21:30:35 -0000 1.42 +++ e2fsprogs.spec 9 Jan 2006 22:43:20 -0000 1.43 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.38 -Release: 4 +Release: 5 License: GPL Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz @@ -293,6 +293,9 @@ %{_mandir}/man3/uuid_unparse.3* %changelog +* Mon Jan 9 2006 Peter Jones 1.38-5 +- fix some more minor logic errors in dm probing + * Wed Jan 4 2006 Peter Jones 1.38-4 - fix a logic error in dm probing - add priority group for dm devices, so they'll be preferred From fedora-cvs-commits at redhat.com Mon Jan 9 22:50:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 17:50:59 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch, 1.5, 1.6 selinux-policy.spec, 1.78, 1.79 Message-ID: <200601092250.k09Moxis022236@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22202 Modified Files: policy-20060104.patch selinux-policy.spec Log Message: * Mon Jan 9 2006 Dan Walsh 2.1.8-2 - Fixes for hal and readahead policy-20060104.patch: Makefile | 2 policy/modules/admin/amanda.te | 4 policy/modules/admin/consoletype.te | 1 policy/modules/admin/netutils.te | 1 policy/modules/admin/readahead.te | 2 policy/modules/admin/su.if | 2 policy/modules/admin/vpn.te | 7 + policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 +++++ policy/modules/apps/java.te | 25 ++++++ policy/modules/apps/wine.fc | 2 policy/modules/apps/wine.if | 23 +++++ policy/modules/apps/wine.te | 27 ++++++ policy/modules/kernel/corecommands.te | 6 + policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.if | 17 ++++ policy/modules/kernel/kernel.if | 21 +++++ policy/modules/kernel/kernel.te | 5 + policy/modules/kernel/mls.te | 2 policy/modules/services/apache.te | 9 ++ policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 9 +- policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 32 +------ policy/modules/services/cups.te | 6 - policy/modules/services/dovecot.te | 1 policy/modules/services/hal.fc | 1 policy/modules/services/hal.te | 10 ++ policy/modules/services/irqbalance.te | 1 policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 ++++++++++++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 107 +++++++++++++++++++++++++ policy/modules/services/mta.te | 13 +++ policy/modules/services/networkmanager.te | 10 +- policy/modules/services/nscd.te | 1 policy/modules/services/ntp.te | 2 policy/modules/services/portmap.te | 1 policy/modules/services/prelink.fc | 7 + policy/modules/services/prelink.if | 39 +++++++++ policy/modules/services/prelink.te | 64 +++++++++++++++ policy/modules/services/rpc.te | 1 policy/modules/services/samba.if | 2 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.te | 1 policy/modules/system/clock.te | 1 policy/modules/system/fstools.te | 4 policy/modules/system/hostname.te | 38 +-------- policy/modules/system/init.te | 16 --- policy/modules/system/libraries.fc | 125 +++++++++++++++--------------- policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 1 policy/modules/system/logging.te | 4 policy/modules/system/lvm.te | 2 policy/modules/system/mount.te | 4 policy/modules/system/selinuxutil.te | 5 - policy/modules/system/sysnetwork.te | 2 policy/modules/system/unconfined.if | 1 policy/modules/system/unconfined.te | 12 +- policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 66 +++++++++++---- policy/modules/system/userdomain.te | 1 policy/users | 8 + 66 files changed, 682 insertions(+), 175 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- policy-20060104.patch 9 Jan 2006 20:14:17 -0000 1.5 +++ policy-20060104.patch 9 Jan 2006 22:50:57 -0000 1.6 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.8/Makefile --- nsaserefpolicy/Makefile 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/Makefile 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/Makefile 2006-01-09 14:37:14.000000000 -0500 @@ -92,7 +92,7 @@ # enable MLS if requested. @@ -12,7 +12,7 @@ endif diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.1.8/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/amanda.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/admin/amanda.te 2006-01-09 14:37:14.000000000 -0500 @@ -165,6 +165,10 @@ sysnet_read_config(amanda_t) @@ -26,7 +26,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.1.8/policy/modules/admin/consoletype.te --- nsaserefpolicy/policy/modules/admin/consoletype.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/consoletype.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/admin/consoletype.te 2006-01-09 14:37:14.000000000 -0500 @@ -38,6 +38,7 @@ kernel_use_fd(consoletype_t) @@ -37,7 +37,7 @@ fs_search_auto_mountpoints(consoletype_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.1.8/policy/modules/admin/netutils.te --- nsaserefpolicy/policy/modules/admin/netutils.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/netutils.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/admin/netutils.te 2006-01-09 14:37:14.000000000 -0500 @@ -42,6 +42,7 @@ files_create_tmp_files(netutils_t, netutils_tmp_t, { file dir }) @@ -46,9 +46,28 @@ corenet_tcp_sendrecv_all_if(netutils_t) corenet_raw_sendrecv_all_if(netutils_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.1.8/policy/modules/admin/readahead.te +--- nsaserefpolicy/policy/modules/admin/readahead.te 2006-01-04 16:55:14.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/admin/readahead.te 2006-01-09 17:39:19.000000000 -0500 +@@ -27,6 +27,7 @@ + + kernel_read_kernel_sysctl(readahead_t) + kernel_read_system_state(readahead_t) ++kernel_getattr_core(readahead_t) + + dev_read_sysfs(readahead_t) + dev_getattr_generic_chr_file(readahead_t) +@@ -50,6 +51,7 @@ + + init_use_fd(readahead_t) + init_use_script_pty(readahead_t) ++init_getattr_initctl(readahead_t) + + libs_use_ld_so(readahead_t) + libs_use_shared_libs(readahead_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.1.8/policy/modules/admin/su.if --- nsaserefpolicy/policy/modules/admin/su.if 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/su.if 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/admin/su.if 2006-01-09 14:37:14.000000000 -0500 @@ -193,7 +193,9 @@ domain_use_wide_inherit_fd($1_su_t) @@ -61,7 +80,7 @@ # Write to utmp. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.1.8/policy/modules/admin/vpn.te --- nsaserefpolicy/policy/modules/admin/vpn.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/vpn.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/admin/vpn.te 2006-01-09 14:37:14.000000000 -0500 @@ -24,6 +24,7 @@ # @@ -89,7 +108,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.1.8/policy/modules/apps/java.fc --- nsaserefpolicy/policy/modules/apps/java.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/java.fc 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/apps/java.fc 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,4 @@ + +/usr/.*/java -- gen_context(system_u:object_r:java_exec_t,s0) @@ -97,7 +116,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.1.8/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/java.if 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/apps/java.if 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,23 @@ +## Load keyboard mappings. + @@ -124,7 +143,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.1.8/policy/modules/apps/java.te --- nsaserefpolicy/policy/modules/apps/java.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/java.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/apps/java.te 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,25 @@ +policy_module(java,1.0.0) + @@ -153,13 +172,13 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.8/policy/modules/apps/wine.fc --- nsaserefpolicy/policy/modules/apps/wine.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/wine.fc 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/apps/wine.fc 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,2 @@ +/usr/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.8/policy/modules/apps/wine.if --- nsaserefpolicy/policy/modules/apps/wine.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/wine.if 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/apps/wine.if 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,23 @@ +## Load keyboard mappings. + @@ -186,7 +205,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.8/policy/modules/apps/wine.te --- nsaserefpolicy/policy/modules/apps/wine.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/wine.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/apps/wine.te 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,27 @@ +policy_module(wine,1.0.0) + @@ -217,7 +236,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.te serefpolicy-2.1.8/policy/modules/kernel/corecommands.te --- nsaserefpolicy/policy/modules/kernel/corecommands.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/corecommands.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/kernel/corecommands.te 2006-01-09 14:37:14.000000000 -0500 @@ -35,3 +35,9 @@ type chroot_exec_t; @@ -230,7 +249,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.1.8/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2005-12-12 15:35:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/domain.if 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/kernel/domain.if 2006-01-09 17:23:08.000000000 -0500 @@ -501,6 +501,7 @@ ') @@ -241,7 +260,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.1.8/policy/modules/kernel/domain.te --- nsaserefpolicy/policy/modules/kernel/domain.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/domain.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/kernel/domain.te 2006-01-09 14:37:14.000000000 -0500 @@ -67,3 +67,7 @@ # cjp: also need to except correctly for SEFramework neverallow { domain unlabeled_t } file_type:process *; @@ -253,7 +272,7 @@ \ No newline at end of file diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.1.8/policy/modules/kernel/files.if --- nsaserefpolicy/policy/modules/kernel/files.if 2006-01-04 17:28:52.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/files.if 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/kernel/files.if 2006-01-09 14:37:14.000000000 -0500 @@ -3183,3 +3183,20 @@ ') ') @@ -278,7 +297,7 @@ \ No newline at end of file diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.1.8/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/kernel.if 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/kernel/kernel.if 2006-01-09 14:37:14.000000000 -0500 @@ -662,6 +662,27 @@ allow $1 proc_mdstat_t:file rw_file_perms; ') @@ -309,7 +328,7 @@ ## Allows caller to get attribues of core kernel interface. diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.1.8/policy/modules/kernel/kernel.te --- nsaserefpolicy/policy/modules/kernel/kernel.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/kernel.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/kernel/kernel.te 2006-01-09 14:37:14.000000000 -0500 @@ -72,6 +72,9 @@ type proc_mdstat_t, proc_type; genfscon proc /mdstat gen_context(system_u:object_r:proc_mdstat_t,s0) @@ -331,7 +350,7 @@ allow kernel_t sysctl_t:dir r_dir_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.8/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/mls.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/kernel/mls.te 2006-01-09 14:37:14.000000000 -0500 @@ -82,9 +82,11 @@ # these might be targeted_policy only range_transition unconfined_t su_exec_t s0 - s0:c0.c255; @@ -346,7 +365,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.1.8/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2005-12-12 23:05:35.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/apache.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/apache.te 2006-01-09 14:37:14.000000000 -0500 @@ -391,6 +391,10 @@ userdom_dontaudit_use_sysadm_terms(httpd_t) ') @@ -369,7 +388,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.1.8/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/apm.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/apm.te 2006-01-09 14:37:14.000000000 -0500 @@ -196,6 +196,7 @@ ') @@ -380,7 +399,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.1.8/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/automount.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/automount.te 2006-01-09 14:37:14.000000000 -0500 @@ -28,7 +28,7 @@ # Local policy # @@ -414,7 +433,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.1.8/policy/modules/services/bluetooth.te --- nsaserefpolicy/policy/modules/services/bluetooth.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/bluetooth.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/bluetooth.te 2006-01-09 14:37:14.000000000 -0500 @@ -86,6 +86,7 @@ kernel_read_kernel_sysctl(bluetooth_t) @@ -425,7 +444,7 @@ corenet_udp_sendrecv_all_if(bluetooth_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.1.8/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/cron.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/cron.te 2006-01-09 14:37:14.000000000 -0500 @@ -407,43 +407,21 @@ sysstat_manage_log(system_crond_t) ') @@ -477,7 +496,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.1.8/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/cups.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/cups.te 2006-01-09 14:37:14.000000000 -0500 @@ -201,8 +201,7 @@ ') @@ -500,7 +519,7 @@ optional_policy(`dbus',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.8/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/dovecot.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/dovecot.te 2006-01-09 14:37:14.000000000 -0500 @@ -95,6 +95,7 @@ files_read_etc_files(dovecot_t) files_search_spool(dovecot_t) @@ -511,7 +530,7 @@ init_use_fd(dovecot_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.1.8/policy/modules/services/hal.fc --- nsaserefpolicy/policy/modules/services/hal.fc 2005-11-14 18:24:07.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/hal.fc 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/hal.fc 2006-01-09 14:37:14.000000000 -0500 @@ -7,3 +7,4 @@ /usr/sbin/hald -- gen_context(system_u:object_r:hald_exec_t,s0) @@ -519,12 +538,13 @@ +/usr/share/hal/scripts(/.*)? gen_context(system_u:object_r:bin_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.8/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/hal.te 2006-01-09 13:10:33.000000000 -0500 -@@ -47,8 +47,11 @@ ++++ serefpolicy-2.1.8/policy/modules/services/hal.te 2006-01-09 17:37:17.000000000 -0500 +@@ -47,8 +47,12 @@ kernel_read_system_state(hald_t) kernel_read_network_state(hald_t) kernel_read_kernel_sysctl(hald_t) +kernel_read_fs_sysctl(hald_t) ++ kernel_write_proc_file(hald_t) +mls_file_read_up(hald_t) @@ -532,7 +552,7 @@ corecmd_exec_bin(hald_t) corecmd_exec_sbin(hald_t) -@@ -74,6 +77,7 @@ +@@ -74,6 +78,7 @@ dev_manage_generic_chr_file(hald_t) # hal is now execing pm-suspend dev_rw_sysfs(hald_t) @@ -540,9 +560,28 @@ domain_use_wide_inherit_fd(hald_t) domain_exec_all_entry_files(hald_t) +@@ -82,6 +87,7 @@ + files_read_etc_files(hald_t) + files_rw_etc_runtime_files(hald_t) + files_search_mnt(hald_t) ++files_manage_mnt_dirs(hald_t) + files_search_var_lib(hald_t) + files_read_usr_files(hald_t) + # hal is now execing pm-suspend +@@ -145,6 +151,10 @@ + clock_domtrans(hald_t) + ') + ++optional_policy(`rpc',` ++ rpc_search_nfs_state_data(hald_t) ++') ++ + optional_policy(`cups',` + cups_domtrans_config(hald_t) + cups_signal_config(hald_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.1.8/policy/modules/services/irqbalance.te --- nsaserefpolicy/policy/modules/services/irqbalance.te 2005-11-28 17:23:58.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/irqbalance.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/irqbalance.te 2006-01-09 14:37:14.000000000 -0500 @@ -28,6 +28,7 @@ kernel_read_system_state(irqbalance_t) kernel_read_kernel_sysctl(irqbalance_t) @@ -553,7 +592,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.fc serefpolicy-2.1.8/policy/modules/services/locate.fc --- nsaserefpolicy/policy/modules/services/locate.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/locate.fc 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/locate.fc 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,4 @@ +# locate - file locater +/usr/bin/updatedb -- gen_context(system_u:object_r:locate_exec_t, s0) @@ -561,12 +600,12 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.if serefpolicy-2.1.8/policy/modules/services/locate.if --- nsaserefpolicy/policy/modules/services/locate.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/locate.if 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/locate.if 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1 @@ +## Update database for mlocate diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.te serefpolicy-2.1.8/policy/modules/services/locate.te --- nsaserefpolicy/policy/modules/services/locate.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/locate.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/locate.te 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,50 @@ +policy_module(locate,1.0.0) + @@ -620,19 +659,19 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/logwatch.fc serefpolicy-2.1.8/policy/modules/services/logwatch.fc --- nsaserefpolicy/policy/modules/services/logwatch.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/logwatch.fc 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/logwatch.fc 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,3 @@ +# logwatch - file logwatchr +/usr/share/logwatch/scripts/logwatch.pl -- gen_context(system_u:object_r:logwatch_exec_t, s0) +/var/cache/logwatch(/.*)? gen_context(system_u:object_r:logwatch_cache_t, s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/logwatch.if serefpolicy-2.1.8/policy/modules/services/logwatch.if --- nsaserefpolicy/policy/modules/services/logwatch.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/logwatch.if 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/logwatch.if 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1 @@ +## Update database for mlogwatch diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/logwatch.te serefpolicy-2.1.8/policy/modules/services/logwatch.te --- nsaserefpolicy/policy/modules/services/logwatch.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/logwatch.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/logwatch.te 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,107 @@ +policy_module(logwatch,1.0.0) + @@ -743,7 +782,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.1.8/policy/modules/services/mta.te --- nsaserefpolicy/policy/modules/services/mta.te 2006-01-04 17:28:52.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/mta.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/mta.te 2006-01-09 14:37:14.000000000 -0500 @@ -47,6 +47,9 @@ allow system_mail_t etc_mail_t:dir { getattr search }; allow system_mail_t etc_mail_t:file r_file_perms; @@ -777,7 +816,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.1.8/policy/modules/services/networkmanager.te --- nsaserefpolicy/policy/modules/services/networkmanager.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/networkmanager.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/networkmanager.te 2006-01-09 14:37:14.000000000 -0500 @@ -28,8 +28,6 @@ allow NetworkManager_t self:tcp_socket create_stream_socket_perms; allow NetworkManager_t self:udp_socket create_socket_perms; @@ -811,7 +850,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.1.8/policy/modules/services/nscd.te --- nsaserefpolicy/policy/modules/services/nscd.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/nscd.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/nscd.te 2006-01-09 14:37:14.000000000 -0500 @@ -128,7 +128,6 @@ optional_policy(`samba',` @@ -822,7 +861,7 @@ optional_policy(`udev',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.1.8/policy/modules/services/ntp.te --- nsaserefpolicy/policy/modules/services/ntp.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/ntp.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/ntp.te 2006-01-09 14:37:14.000000000 -0500 @@ -148,8 +148,6 @@ ') @@ -834,7 +873,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portmap.te serefpolicy-2.1.8/policy/modules/services/portmap.te --- nsaserefpolicy/policy/modules/services/portmap.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/portmap.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/portmap.te 2006-01-09 14:37:14.000000000 -0500 @@ -47,6 +47,7 @@ kernel_read_proc_symlinks(portmap_t) kernel_udp_sendfrom(portmap_t) @@ -845,7 +884,7 @@ corenet_udp_sendrecv_all_if(portmap_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.fc serefpolicy-2.1.8/policy/modules/services/prelink.fc --- nsaserefpolicy/policy/modules/services/prelink.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/prelink.fc 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/prelink.fc 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,7 @@ +# prelink - prelink ELF shared libraries and binaries to speed up startup time +/usr/sbin/prelink -- gen_context(system_u:object_r:prelink_exec_t,s0) @@ -856,7 +895,7 @@ +/etc/prelink\.cache -- gen_context(system_u:object_r:prelink_cache_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.if serefpolicy-2.1.8/policy/modules/services/prelink.if --- nsaserefpolicy/policy/modules/services/prelink.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/prelink.if 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/prelink.if 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,39 @@ +## Prelink mappings. + @@ -899,7 +938,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.te serefpolicy-2.1.8/policy/modules/services/prelink.te --- nsaserefpolicy/policy/modules/services/prelink.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/prelink.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/prelink.te 2006-01-09 14:37:14.000000000 -0500 @@ -0,0 +1,64 @@ +policy_module(prelink,1.0.0) + @@ -967,7 +1006,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.1.8/policy/modules/services/rpc.te --- nsaserefpolicy/policy/modules/services/rpc.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/rpc.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/rpc.te 2006-01-09 14:37:14.000000000 -0500 @@ -48,6 +48,7 @@ kernel_search_network_state(rpcd_t) # for rpc.rquotad @@ -978,7 +1017,7 @@ corenet_udp_bind_reserved_port(rpcd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.1.8/policy/modules/services/samba.if --- nsaserefpolicy/policy/modules/services/samba.if 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/samba.if 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/samba.if 2006-01-09 14:37:14.000000000 -0500 @@ -342,7 +342,9 @@ ') @@ -991,7 +1030,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xdm.te serefpolicy-2.1.8/policy/modules/services/xdm.te --- nsaserefpolicy/policy/modules/services/xdm.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/xdm.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/xdm.te 2006-01-09 14:37:14.000000000 -0500 @@ -319,6 +319,10 @@ allow xdm_xserver_t xkb_var_lib_t:lnk_file read; can_exec(xdm_xserver_t, xkb_var_lib_t) @@ -1005,7 +1044,7 @@ allow xdm_xserver_t sysctl_modprobe_t:file { getattr read }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.1.8/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/authlogin.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/authlogin.te 2006-01-09 14:37:14.000000000 -0500 @@ -157,6 +157,7 @@ kernel_use_fd(pam_console_t) # Read /proc/meminfo @@ -1016,7 +1055,7 @@ dev_getattr_apm_bios(pam_console_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/clock.te serefpolicy-2.1.8/policy/modules/system/clock.te --- nsaserefpolicy/policy/modules/system/clock.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/clock.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/clock.te 2006-01-09 14:37:14.000000000 -0500 @@ -33,6 +33,7 @@ kernel_read_kernel_sysctl(hwclock_t) kernel_list_proc(hwclock_t) @@ -1027,7 +1066,7 @@ dev_rw_realtime_clock(hwclock_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.1.8/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/fstools.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/fstools.te 2006-01-09 14:37:14.000000000 -0500 @@ -56,6 +56,8 @@ # Access to /initrd devices kernel_rw_unlabeled_dir(fsadm_t) @@ -1048,7 +1087,7 @@ fs_getattr_xattr_fs(fsadm_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.1.8/policy/modules/system/hostname.te --- nsaserefpolicy/policy/modules/system/hostname.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/hostname.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/hostname.te 2006-01-09 14:37:14.000000000 -0500 @@ -7,8 +7,10 @@ # @@ -1109,7 +1148,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.1.8/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/init.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/init.te 2006-01-09 14:37:14.000000000 -0500 @@ -449,7 +449,6 @@ # readahead asks for these @@ -1156,7 +1195,7 @@ ') dnl end TODO diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.1.8/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/libraries.fc 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/libraries.fc 2006-01-09 14:37:14.000000000 -0500 @@ -11,6 +11,9 @@ /emul/ia32-linux/lib(/.*)? gen_context(system_u:object_r:lib_t,s0) /emul/ia32-linux/lib/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0) @@ -1336,7 +1375,7 @@ # diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.1.8/policy/modules/system/libraries.te --- nsaserefpolicy/policy/modules/system/libraries.te 2005-12-12 15:35:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/libraries.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/libraries.te 2006-01-09 14:37:14.000000000 -0500 @@ -94,6 +94,10 @@ unconfined_domain_template(ldconfig_t) ') @@ -1350,7 +1389,7 @@ apache_dontaudit_search_modules(ldconfig_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.1.8/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/locallogin.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/locallogin.te 2006-01-09 14:37:14.000000000 -0500 @@ -165,6 +165,7 @@ userdom_signal_all_users(local_login_t) userdom_search_all_users_home(local_login_t) @@ -1361,7 +1400,7 @@ mta_getattr_spool(local_login_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.1.8/policy/modules/system/logging.te --- nsaserefpolicy/policy/modules/system/logging.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/logging.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/logging.te 2006-01-09 14:37:14.000000000 -0500 @@ -70,6 +70,7 @@ kernel_read_kernel_sysctl(auditctl_t) @@ -1396,7 +1435,7 @@ dev_read_sysfs(syslogd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.1.8/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/lvm.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/lvm.te 2006-01-09 14:37:14.000000000 -0500 @@ -155,6 +155,8 @@ allow lvm_t lvm_etc_t:file r_file_perms; @@ -1408,7 +1447,7 @@ allow lvm_t lvm_metadata_t:file create_file_perms; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.1.8/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2005-12-12 23:05:35.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/mount.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/mount.te 2006-01-09 14:37:14.000000000 -0500 @@ -26,12 +26,14 @@ files_create_tmp_files(mount_t,mount_tmp_t,{ file dir }) @@ -1435,7 +1474,7 @@ corecmd_exec_sbin(mount_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.8/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/selinuxutil.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/selinuxutil.te 2006-01-09 14:37:14.000000000 -0500 @@ -324,6 +324,7 @@ kernel_use_fd(restorecon_t) kernel_rw_pipe(restorecon_t) @@ -1459,7 +1498,7 @@ # the failed access to the current directory diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.1.8/policy/modules/system/sysnetwork.te --- nsaserefpolicy/policy/modules/system/sysnetwork.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/sysnetwork.te 2006-01-09 13:10:59.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/sysnetwork.te 2006-01-09 14:37:14.000000000 -0500 @@ -90,6 +90,7 @@ kernel_read_network_state(dhcpc_t) kernel_read_kernel_sysctl(dhcpc_t) @@ -1476,9 +1515,20 @@ corenet_use_tun_tap_device(ifconfig_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.1.8/policy/modules/system/unconfined.if +--- nsaserefpolicy/policy/modules/system/unconfined.if 2005-12-13 15:51:50.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/unconfined.if 2006-01-09 17:22:51.000000000 -0500 +@@ -33,6 +33,7 @@ + corenet_unconfined($1) + dev_unconfined($1) + domain_unconfined($1) ++ domain_dontaudit_read_all_domains_state($1) + files_unconfined($1) + fs_unconfined($1) + selinux_unconfined($1) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.1.8/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/unconfined.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/unconfined.te 2006-01-09 14:37:14.000000000 -0500 @@ -57,6 +57,10 @@ bluetooth_domtrans_helper(unconfined_t) ') @@ -1514,7 +1564,7 @@ rw_dir_create_file(sysadm_su_t, home_dir_type) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-2.1.8/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2005-11-15 09:13:40.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/userdomain.fc 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/userdomain.fc 2006-01-09 14:37:14.000000000 -0500 @@ -4,6 +4,6 @@ HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0) HOME_DIR/.+ gen_context(system_u:object_r:user_home_t,s0) @@ -1525,7 +1575,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.8/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/userdomain.if 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/userdomain.if 2006-01-09 14:37:14.000000000 -0500 @@ -1881,19 +1881,16 @@ ## # @@ -1628,7 +1678,7 @@ ## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.1.8/policy/modules/system/userdomain.te --- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/userdomain.te 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/userdomain.te 2006-01-09 14:37:14.000000000 -0500 @@ -205,6 +205,7 @@ optional_policy(`hostname',` @@ -1639,7 +1689,7 @@ optional_policy(`ipsec',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.8/policy/users --- nsaserefpolicy/policy/users 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.8/policy/users 2006-01-09 13:10:33.000000000 -0500 ++++ serefpolicy-2.1.8/policy/users 2006-01-09 14:37:14.000000000 -0500 @@ -26,7 +26,9 @@ ifdef(`targeted_policy',` gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- selinux-policy.spec 9 Jan 2006 20:14:17 -0000 1.78 +++ selinux-policy.spec 9 Jan 2006 22:50:57 -0000 1.79 @@ -7,7 +7,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.1.8 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -262,9 +262,12 @@ %endif %changelog +* Mon Jan 9 2006 Dan Walsh 2.1.8-2 +- Fixes for hal and readahead + * Mon Jan 9 2006 Dan Walsh 2.1.8-1 - Update to upstream - +- Apply * Fri Jan 7 2006 Dan Walsh 2.1.7-4 - Add wine and fix hal problems From fedora-cvs-commits at redhat.com Mon Jan 9 23:06:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 18:06:38 -0500 Subject: rpms/nfs-utils/devel nfs-utils.spec,1.77,1.78 Message-ID: <200601092306.k09N6cXc026883@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26727 Modified Files: nfs-utils.spec Log Message: Added libgssapi-devel to PreReq: BuildRequires: BuildPrereq Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- nfs-utils.spec 9 Jan 2006 21:00:46 -0000 1.77 +++ nfs-utils.spec 9 Jan 2006 23:06:31 -0000 1.78 @@ -40,12 +40,12 @@ Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep Requires: modutils >= 2.4.26-9 -BuildPrereq: nfs-utils-lib-devel libevent-devel +BuildPrereq: nfs-utils-lib-devel libevent-devel libgssapi-devel BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 -BuildRequires: nfs-utils-lib-devel libevent-devel +BuildRequires: nfs-utils-lib-devel libevent-devel libgssapi-devel PreReq: shadow-utils >= 4.0.3-25 PreReq: /sbin/chkconfig /sbin/nologin -PreReq: nfs-utils-lib libevent +PreReq: nfs-utils-lib libevent libgssapi %description The nfs-utils package provides a daemon for the kernel NFS server and From fedora-cvs-commits at redhat.com Mon Jan 9 23:28:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 18:28:12 -0500 Subject: rpms/glibc/devel glibc-rodata.patch, NONE, 1.1 glibc.spec, 1.210, 1.211 Message-ID: <200601092328.k09NSC03006879@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6863 Modified Files: glibc.spec Added Files: glibc-rodata.patch Log Message: 2.3.90-30 glibc-rodata.patch: dbl-64/e_exp2.c | 8 +++----- flt-32/e_exp2f.c | 13 +++---------- flt-32/e_expf.c | 13 +++---------- flt-32/s_expm1f.c | 11 ++--------- 4 files changed, 11 insertions(+), 34 deletions(-) --- NEW FILE glibc-rodata.patch --- 2006-01-09 Ulrich Drepper * sysdeps/ieee754/dbl-64/e_exp2.c: Remove section attribute from const variables, gas produces garbage. * sysdeps/ieee754/flt-32/e_exp2f.c: Likewise. * sysdeps/ieee754/flt-32/e_expf.c: Likewise. * sysdeps/ieee754/flt-32/s_expm1f.c: Likewise. --- libc/sysdeps/ieee754/dbl-64/e_exp2.c 21 Dec 2005 18:22:21 -0000 1.6 +++ libc/sysdeps/ieee754/dbl-64/e_exp2.c 9 Jan 2006 23:22:26 -0000 1.7 @@ -1,5 +1,5 @@ /* Double-precision floating point 2^x. - Copyright (C) 1997, 1998, 2000, 2001, 2005 Free Software Foundation, Inc. + Copyright (C) 1997,1998,2000,2001,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Geoffrey Keating @@ -42,10 +42,8 @@ constants in the .data section. Ideally the constant is placed in .rodata.cst8 so that it can be merged, but gcc sucks, it ICEs when we try to force this section on it. --drepper */ -static const volatile double TWO1023 __attribute__ ((section (".rodata"))) - = 8.988465674311579539e+307; -static const volatile double TWOM1000 __attribute__ ((section (".rodata"))) - = 9.3326361850321887899e-302; +static const volatile double TWO1023 = 8.988465674311579539e+307; +static const volatile double TWOM1000 = 9.3326361850321887899e-302; double __ieee754_exp2 (double x) --- libc/sysdeps/ieee754/flt-32/e_exp2f.c 21 Dec 2005 18:24:24 -0000 1.6 +++ libc/sysdeps/ieee754/flt-32/e_exp2f.c 9 Jan 2006 23:20:48 -0000 1.7 @@ -1,5 +1,5 @@ /* Single-precision floating point 2^x. - Copyright (C) 1997, 1998, 2000, 2001, 2005 Free Software Foundation, Inc. + Copyright (C) 1997,1998,2000,2001,2005,2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Geoffrey Keating @@ -38,15 +38,8 @@ #include "t_exp2f.h" -/* XXX I know the assembler generates a warning about incorrect section - attributes. But without the attribute here the compiler places the - constants in the .data section. Ideally the constant is placed in - .rodata.cst4 so that it can be merged, but gcc sucks, it ICEs when - we try to force this section on it. --drepper */ -static const volatile float TWOM100 __attribute__ ((section (".rodata"))) - = 7.88860905e-31; -static const volatile float TWO127 __attribute__ ((section (".rodata"))) - = 1.7014118346e+38; +static const volatile float TWOM100 = 7.88860905e-31; +static const volatile float TWO127 = 1.7014118346e+38; float __ieee754_exp2f (float x) --- libc/sysdeps/ieee754/flt-32/e_expf.c 21 Dec 2005 18:25:23 -0000 1.5 +++ libc/sysdeps/ieee754/flt-32/e_expf.c 9 Jan 2006 23:19:22 -0000 1.6 @@ -1,5 +1,5 @@ /* Single-precision floating point e^x. - Copyright (C) 1997, 1998, 2005 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Geoffrey Keating @@ -60,15 +60,8 @@ extern const float __exp_deltatable[178]; extern const double __exp_atable[355] /* __attribute__((mode(DF))) */; -/* XXX I know the assembler generates a warning about incorrect section - attributes. But without the attribute here the compiler places the - constants in the .data section. Ideally the constant is placed in - .rodata.cst4 so that it can be merged, but gcc sucks, it ICEs when - we try to force this section on it. --drepper */ -static const volatile float TWOM100 __attribute__ ((section (".rodata"))) - = 7.88860905e-31; -static const volatile float TWO127 __attribute__ ((section (".rodata"))) - = 1.7014118346e+38; +static const volatile float TWOM100 = 7.88860905e-31; +static const volatile float TWO127 = 1.7014118346e+38; float __ieee754_expf (float x) --- libc/sysdeps/ieee754/flt-32/s_expm1f.c 21 Dec 2005 18:49:09 -0000 1.2 +++ libc/sysdeps/ieee754/flt-32/s_expm1f.c 9 Jan 2006 23:18:21 -0000 1.3 @@ -20,15 +20,8 @@ static char rcsid[] = "$NetBSD: s_expm1f #include "math.h" #include "math_private.h" -/* XXX I know the assembler generates a warning about incorrect section - attributes. But without the attribute here the compiler places the - constants in the .data section. Ideally the constant is placed in - .rodata.cst4 so that it can be merged, but gcc sucks, it ICEs when - we try to force this section on it. --drepper */ -static const volatile float huge __attribute__ ((section (".rodata"))) - = 1.0e+30; -static const volatile float tiny __attribute__ ((section (".rodata"))) - = 1.0e-30; +static const volatile float huge = 1.0e+30; +static const volatile float tiny = 1.0e-30; #ifdef __STDC__ static const float Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.210 retrieving revision 1.211 diff -u -r1.210 -r1.211 --- glibc.spec 9 Jan 2006 22:33:25 -0000 1.210 +++ glibc.spec 9 Jan 2006 23:28:07 -0000 1.211 @@ -32,6 +32,7 @@ Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2 Patch0: %{glibcname}-fedora.patch Patch1: %{name}-ia64-lib64.patch +Patch2: glibc-rodata.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -238,6 +239,7 @@ %patch1 -p1 %endif %endif +%patch2 -p1 # Hack till glibc-kernheaders get updated, argh mkdir -p override_headers/linux @@ -1140,7 +1142,7 @@ - update from CVS - initializer fixes for -std=c{8,9}9 on 32-bit arches - - +- avoid writable .rodata (#177121) * Fri Jan 6 2006 Jakub Jelinek 2.3.90-29 - update from CVS From fedora-cvs-commits at redhat.com Mon Jan 9 23:31:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 18:31:03 -0500 Subject: rpms/kernel/devel linux-2.6-execshield-fixes.patch,1.1,1.2 Message-ID: <200601092331.k09NV18r006989@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6972 Modified Files: linux-2.6-execshield-fixes.patch Log Message: fix x86-64 linux-2.6-execshield-fixes.patch: arch/i386/kernel/traps.c | 2 +- arch/x86_64/ia32/ia32_binfmt.c | 2 +- fs/proc/base.c | 2 +- include/asm-i386/desc.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Index: linux-2.6-execshield-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-execshield-fixes.patch 9 Jan 2006 19:24:08 -0000 1.1 +++ linux-2.6-execshield-fixes.patch 9 Jan 2006 23:30:57 -0000 1.2 @@ -1,6 +1,8 @@ - arch/i386/kernel/traps.c | 2 +- - include/asm-i386/desc.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + arch/i386/kernel/traps.c | 2 +- + arch/x86_64/ia32/ia32_binfmt.c | 2 +- + fs/proc/base.c | 2 +- + include/asm-i386/desc.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) Index: linux-exec-shield-curr.q/arch/i386/kernel/traps.c =================================================================== @@ -15,6 +17,32 @@ if (desc1->a != desc2->a || desc1->b != desc2->b) { /* +Index: linux-exec-shield-curr.q/arch/x86_64/ia32/ia32_binfmt.c +=================================================================== +--- linux-exec-shield-curr.q.orig/arch/x86_64/ia32/ia32_binfmt.c ++++ linux-exec-shield-curr.q/arch/x86_64/ia32/ia32_binfmt.c +@@ -388,7 +388,7 @@ int ia32_setup_arg_pages(struct linux_bi + EXPORT_SYMBOL(ia32_setup_arg_pages); + + static unsigned long +-elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type) ++elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused) + { + unsigned long map_addr; + struct task_struct *me = current; +Index: linux-exec-shield-curr.q/fs/proc/base.c +=================================================================== +--- linux-exec-shield-curr.q.orig/fs/proc/base.c ++++ linux-exec-shield-curr.q/fs/proc/base.c +@@ -201,7 +201,7 @@ static struct pid_entry tgid_base_stuff[ + E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), + E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), + #ifdef CONFIG_MMU +- E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUGO), ++ E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUSR), + #endif + #ifdef CONFIG_SECURITY + E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), Index: linux-exec-shield-curr.q/include/asm-i386/desc.h =================================================================== --- linux-exec-shield-curr.q.orig/include/asm-i386/desc.h @@ -28,14 +56,3 @@ extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit); extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit); ---- linux-2.6.15/fs/proc/base.c~ 2006-01-09 14:23:23.000000000 -0500 -+++ linux-2.6.15/fs/proc/base.c 2006-01-09 14:23:34.000000000 -0500 -@@ -201,7 +201,7 @@ static struct pid_entry tgid_base_stuff[ - E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), - E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), - #ifdef CONFIG_MMU -- E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUGO), -+ E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUSR), - #endif - #ifdef CONFIG_SECURITY - E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), From fedora-cvs-commits at redhat.com Mon Jan 9 23:34:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 18:34:59 -0500 Subject: rpms/system-config-date/devel .cvsignore, 1.33, 1.34 sources, 1.36, 1.37 system-config-date.spec, 1.41, 1.42 Message-ID: <200601092334.k09NYxNm007278@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/system-config-date/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7210 Modified Files: .cvsignore sources system-config-date.spec Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 4 Jan 2006 16:58:56 -0000 1.33 +++ .cvsignore 9 Jan 2006 23:34:55 -0000 1.34 @@ -1 +1,2 @@ system-config-date-1.7.99.12.tar.bz2 +system-config-date-1.7.99.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 4 Jan 2006 16:58:56 -0000 1.36 +++ sources 9 Jan 2006 23:34:55 -0000 1.37 @@ -1 +1 @@ -471ccd1c7f036b69edf9864c3ddee806 system-config-date-1.7.99.12.tar.bz2 +92f145b8d291945697ca009f024de303 system-config-date-1.7.99.13.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- system-config-date.spec 4 Jan 2006 16:58:56 -0000 1.41 +++ system-config-date.spec 9 Jan 2006 23:34:55 -0000 1.42 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.7.99.12 +Version: 1.7.99.13 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -93,6 +93,9 @@ %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template %changelog +* Mon Jan 09 2006 Chris Lumens 1.7.99.13-1 +- Rename mainWindow to scdMainWindow to avoid import problems in firstboot. + * Wed Jan 04 2006 Nils Philippsen 1.7.99.12 - show actually chosen region, not just something that's in the vicinity From fedora-cvs-commits at redhat.com Mon Jan 9 23:37:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 18:37:50 -0500 Subject: rpms/firstboot/devel .cvsignore, 1.41, 1.42 firstboot.spec, 1.60, 1.61 sources, 1.57, 1.58 Message-ID: <200601092337.k09NboIY007422@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/firstboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7412 Modified Files: .cvsignore firstboot.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 9 Jan 2006 20:39:54 -0000 1.41 +++ .cvsignore 9 Jan 2006 23:37:35 -0000 1.42 @@ -13,3 +13,4 @@ firstboot-1.3.54.tar.bz2 firstboot-1.3.55.tar.bz2 firstboot-1.3.56.tar.bz2 +firstboot-1.3.57.tar.bz2 Index: firstboot.spec =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- firstboot.spec 9 Jan 2006 21:21:10 -0000 1.60 +++ firstboot.spec 9 Jan 2006 23:37:35 -0000 1.61 @@ -1,7 +1,7 @@ Summary: Initial system configuration utility Name: firstboot -Version: 1.3.56 -Release: 2 +Version: 1.3.57 +Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -75,6 +75,10 @@ /usr/sbin/firstboot %changelog +* Mon Jan 09 2006 Chris Lumens 1.3.57-1 +- Use scdMainWindow instead of mainWindow to fix random python import + tracebacks. + * Mon Jan 09 2006 Chris Lumens 1.3.56-2 - Remove dependancy on system-config-packages. Index: sources =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 9 Jan 2006 21:21:10 -0000 1.57 +++ sources 9 Jan 2006 23:37:35 -0000 1.58 @@ -1 +1 @@ -de4fbef4e3eb2add45d9bd32cff558aa firstboot-1.3.56.tar.bz2 +3b55d62ca631035e45cfb04aab202cbe firstboot-1.3.57.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 9 23:47:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 18:47:25 -0500 Subject: rpms/kernel-xen/devel kernel-xen.spec,1.26,1.27 Message-ID: <200601092347.k09NlPe1018805@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18793 Modified Files: kernel-xen.spec Log Message: Don't include include/asm-xen in the install process, it's not used on newer reorganised linux-2.6-merge.hg trees. Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- kernel-xen.spec 9 Jan 2006 22:01:42 -0000 1.26 +++ kernel-xen.spec 9 Jan 2006 23:47:19 -0000 1.27 @@ -1103,9 +1103,6 @@ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cd include cp -a acpi config linux math-emu media net pcmcia rxrpc scsi sound video asm asm-generic $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include -%if %{buildxen} - cp -a asm-xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include -%endif cp -a `readlink asm` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include if [ "$Arch" = "x86_64" ]; then cp -a asm-i386 $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include @@ -1450,6 +1447,7 @@ - Rebase xen to hypervisor from 20060106 - Rebase xen kernel code to linux-2.6-merge.hg cset 16985 - Disable power management bits that don't work in Xen +- Remove include/asm-xen from rpm * Mon Jan 9 2006 Dave Jones - Remove vm debug patch that triggers too easily right now. From fedora-cvs-commits at redhat.com Tue Jan 10 00:32:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 19:32:55 -0500 Subject: rpms/hal/devel hal-fix-mount-options.patch, NONE, 1.1 hal.spec, 1.73, 1.74 Message-ID: <200601100032.k0A0WtSo017793@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17719 Modified Files: hal.spec Added Files: hal-fix-mount-options.patch Log Message: - Add patch to escape mount options hal-fix-mount-options.patch: hal-system-storage-mount | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE hal-fix-mount-options.patch --- Index: tools/hal-system-storage-mount =================================================================== RCS file: /cvs/hal/hal/tools/hal-system-storage-mount,v retrieving revision 1.9 diff -u -r1.9 hal-system-storage-mount --- tools/hal-system-storage-mount 8 Jan 2006 22:27:03 -0000 1.9 +++ tools/hal-system-storage-mount 10 Jan 2006 00:12:50 -0000 @@ -106,10 +106,10 @@ fi fi - # make sure the part after the '=' don't contain any commas otherwise an attacker may - # pass e.g. umask=0600,suid,dev and this will get merged into $MOUNTOPTIONS - just replace - # ',' with '_' - MODIFIED_OPTION=${OPTION//,/_} + # Only allow ^a-zA-Z0-9_= in the string because otherwise an attacker may + # pass e.g. umask=0600,suid,dev or umask=`/bin/evil` and this will get merged + # into $MOUNTOPTIONS - Simply replace illegal characters with an underscore + MODIFIED_OPTION=${OPTION//[^a-zA-Z0-9_=]/_} MOUNTOPTIONS="$MOUNTOPTIONS,$MODIFIED_OPTION" OPTION_WAS_OK="1" fi Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- hal.spec 9 Jan 2006 16:59:13 -0000 1.73 +++ hal.spec 10 Jan 2006 00:32:49 -0000 1.74 @@ -18,10 +18,11 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.5.1.cvs20060109 -Release: 1 +Release: 2 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz Patch0: hal-0.5.4-match-on-capabilities.patch +Patch1: hal-fix-mount-options.patch License: AFL/GPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root @@ -81,6 +82,7 @@ %prep %setup -q %patch0 -p1 -b .match-on-capabilities +%patch1 -p0 -b .mount-options %build %configure --disable-docbook-docs --with-os-type=redhat --enable-pcmcia-support --with-stab-file=/var/lib/pcmcia/stab @@ -169,6 +171,9 @@ %{_bindir}/hal-device-manager %changelog +* Mon Jan 09 2006 John (J5) Palmieri - 0.5.5.1.cvs20060109-2 +- Add patch to escape mount options + * Mon Jan 09 2006 John (J5) Palmieri - 0.5.5.1.cvs20060109-1 - Update to a new CVS snapshot From fedora-cvs-commits at redhat.com Tue Jan 10 00:56:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 19:56:40 -0500 Subject: rpms/openhpi/devel openhpi-2.2.1-nowerror.patch, NONE, 1.1 openhpi.spec, 1.27, 1.28 Message-ID: <200601100056.k0A0ueJw004552@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/openhpi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4476 Modified Files: openhpi.spec Added Files: openhpi-2.2.1-nowerror.patch Log Message: - remove -Werror openhpi-2.2.1-nowerror.patch: configure | 6 ++---- configure.ac | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) --- NEW FILE openhpi-2.2.1-nowerror.patch --- --- openhpi-2.2.1/configure.ac.nowerror 2006-01-09 19:52:30.000000000 -0500 +++ openhpi-2.2.1/configure.ac 2006-01-09 19:53:05.000000000 -0500 @@ -547,8 +547,7 @@ -Wformat-nonliteral \ -Wno-format-y2k \ -Wcast-qual \ - -Wcast-align \ - -Werror " + -Wcast-align " CXX_WARNINGS="\ -Wall \ @@ -560,8 +559,7 @@ -Wcast-align \ -Wshadow \ -Wwrite-strings \ - -Wredundant-decls \ - -Werror " + -Wredundant-decls " dnl remerge the warnings into the FLAGS CXXFLAGS="$CFLAGS $CXX_WARNINGS" --- openhpi-2.2.1/configure.nowerror 2006-01-09 19:52:21.000000000 -0500 +++ openhpi-2.2.1/configure 2006-01-09 19:52:58.000000000 -0500 @@ -22673,8 +22673,7 @@ -Wformat-nonliteral \ -Wno-format-y2k \ -Wcast-qual \ - -Wcast-align \ - -Werror " + -Wcast-align " CXX_WARNINGS="\ -Wall \ @@ -22686,8 +22685,7 @@ -Wcast-align \ -Wshadow \ -Wwrite-strings \ - -Wredundant-decls \ - -Werror " + -Wredundant-decls " CXXFLAGS="$CFLAGS $CXX_WARNINGS" CFLAGS="$CFLAGS $CC_WARNINGS" Index: openhpi.spec =================================================================== RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- openhpi.spec 9 Jan 2006 22:01:43 -0000 1.27 +++ openhpi.spec 10 Jan 2006 00:56:35 -0000 1.28 @@ -1,7 +1,7 @@ Summary: openhpi Hardware Platform Interface (HPI) library and tools Name: openhpi Version: 2.2.1 -Release: 3 +Release: 4 License: BSD Group: System Environment/Base Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz @@ -10,6 +10,7 @@ Patch2: openhpi-1.9.2-overflow.patch Patch3: openhpi-1.9.2-werror.patch Patch4: openhpi-2.2.1-gcc4.patch +Patch5: openhpi-2.2.1-nowerror.patch BuildRoot: /var/tmp/%{name}-root BuildRequires: sysfsutils-devel, net-snmp-devel, OpenIPMI-devel BuildRequires: elfutils-devel, rpm-devel, libtool-ltdl-devel, bzip2-devel @@ -44,6 +45,7 @@ %patch2 -p1 -b .overflow %patch3 -p1 -b .werror %patch4 -p1 -b .gcc4 +%patch5 -p1 -b .nowerror %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -91,6 +93,9 @@ %changelog +* Mon Jan 9 2006 Peter Jones 2.2.1-4 +- Don't use -Werror, it doesn't build with that on ppc64 currently. + * Mon Jan 06 2006 Jesse Keating 2.2.1-3 - Fix to not use stict-aliasing. From fedora-cvs-commits at redhat.com Tue Jan 10 01:17:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 20:17:33 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.197, 1.198 anaconda.spec, 1.316, 1.317 sources, 1.316, 1.317 Message-ID: <200601100117.k0A1HXx4021900@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21859/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.91.0-1 on branch devel from anaconda-10.91.0-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- .cvsignore 7 Jan 2006 04:36:02 -0000 1.197 +++ .cvsignore 10 Jan 2006 01:17:30 -0000 1.198 @@ -1 +1 @@ -anaconda-10.90.25.tar.bz2 +anaconda-10.91.0.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- anaconda.spec 7 Jan 2006 04:36:02 -0000 1.316 +++ anaconda.spec 10 Jan 2006 01:17:30 -0000 1.317 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.90.25 +Version: 10.91.0 Release: 1 License: GPL Summary: Graphical system installer @@ -78,6 +78,14 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Jan 9 2006 Jeremy Katz - 10.91.0-1 +- tweaked selection stuff a little to be the same code as pirut +- tweak exception window to have an image and be better sized (dcantrell) +- write out RAID device name (clumens) +- scroll group list properly (dcantrell) +- fix ppc rescue image (jkeating) +- dmraid detection fix (pjones) + * Fri Jan 6 2006 Jeremy Katz - 10.90.25-1 - no sr at Latn yet since the po files haven't been added Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- sources 7 Jan 2006 04:45:57 -0000 1.316 +++ sources 10 Jan 2006 01:17:30 -0000 1.317 @@ -1 +1 @@ -acf5fbe4349ba00992f2075407006f35 anaconda-10.90.25.tar.bz2 +0d20696042fdc013862bd1920b8ea7db anaconda-10.91.0.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 10 01:46:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 20:46:06 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.126, 1.127 config-powerpc-generic, 1.8, 1.9 config-powerpc64, 1.8, 1.9 Message-ID: <200601100146.k0A1k69F025608@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv24751/configs Modified Files: config-generic config-powerpc-generic config-powerpc64 Log Message: PowerPC update from git tree Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- config-generic 9 Jan 2006 18:55:15 -0000 1.126 +++ config-generic 10 Jan 2006 01:46:00 -0000 1.127 @@ -1631,6 +1631,7 @@ # Multimedia devices # CONFIG_VIDEO_DEV=m +# CONFIG_VIDEO_ADV_DEBUG is not set # # Video For Linux @@ -1650,6 +1651,7 @@ CONFIG_VIDEO_CX88=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y +CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_DECODER=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_EM28XX=m @@ -1746,6 +1748,7 @@ # CONFIG_DVB_USB_DEBUG is not set CONFIG_DVB_USB_A800=m CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set CONFIG_DVB_USB_DIBUSB_MC=m CONFIG_DVB_USB_UMT_010=m CONFIG_DVB_USB_DIGITV=m @@ -2018,7 +2021,12 @@ # CONFIG_USB_KBD is not set # CONFIG_USB_MOUSE is not set CONFIG_USB_AIPTEK=m -CONFIG_USB_WACOM=m + +# WACOM disabled 2006-01-10 dwmw2: +# drivers/usb/input/wacom.c:98: error: redeclaration of enumerator ???G4??? +# include/asm/cputable.h:37: error: previous definition of ???G4??? was here +# CONFIG_USB_WACOM is not set + CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m CONFIG_USB_XPAD=m Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- config-powerpc-generic 30 Dec 2005 05:09:24 -0000 1.8 +++ config-powerpc-generic 10 Jan 2006 01:46:00 -0000 1.9 @@ -1,4 +1,5 @@ # Most PowerPC kernels we build are SMP +# CONFIG_CRASH_DUMP is not set CONFIG_SMP=y CONFIG_IRQ_ALL_CPUS=y CONFIG_PPC=y @@ -79,4 +80,3 @@ # CONFIG_ATM_AMBASSADOR is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_BUSLOGIC is not set - Index: config-powerpc64 =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- config-powerpc64 14 Dec 2005 14:36:31 -0000 1.8 +++ config-powerpc64 10 Jan 2006 01:46:00 -0000 1.9 @@ -1,11 +1,13 @@ CONFIG_WINDFARM_PM81=y CONFIG_WINDFARM_PM91=y CONFIG_PPC_PMAC64=y -CONFIG_PPC_MAPLE=y +# CONFIG_PPC_MAPLE is not set CONFIG_PPC_CELL=y # CONFIG_PPC_ISERIES is not set CONFIG_PPC_PSERIES=y CONFIG_PPC_PMAC=y +CONFIG_IBMEBUS=y +CONFIG_SPU_FS=m CONFIG_RTAS_FLASH=y CONFIG_PPC_SPLPAR=y CONFIG_SCANLOG=y From fedora-cvs-commits at redhat.com Tue Jan 10 01:46:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 20:46:06 -0500 Subject: rpms/kernel/devel linux-2.6.15-spufs-compile.patch, NONE, 1.1 .cvsignore, 1.318, 1.319 kernel-2.6.spec, 1.1837, 1.1838 linux-2.6-hvc-console.patch, 1.2, 1.3 linux-2.6-softmac-git.patch, 1.1, 1.2 sources, 1.260, 1.261 linux-2.6-cell-idle-pmgt.patch, 1.3, NONE linux-2.6-cell-iommu.patch, 1.1, NONE linux-2.6-cell-no-legacy-io.patch, 1.1, NONE linux-2.6-cell-nvram-kmalloc.patch, 1.1, NONE linux-2.6-cell-platform-detect.patch, 1.1, NONE linux-2.6-serial-nrports.patch, 1.1, NONE linux-2.6-serial-of.patch, 1.4, NONE linux-2.6.15-rc1-ppc64-syscallpath.patch, 1.3, NONE Message-ID: <200601100146.k0A1k6Kc025599@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24751 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-hvc-console.patch linux-2.6-softmac-git.patch sources Added Files: linux-2.6.15-spufs-compile.patch Removed Files: linux-2.6-cell-idle-pmgt.patch linux-2.6-cell-iommu.patch linux-2.6-cell-no-legacy-io.patch linux-2.6-cell-nvram-kmalloc.patch linux-2.6-cell-platform-detect.patch linux-2.6-serial-nrports.patch linux-2.6-serial-of.patch linux-2.6.15-rc1-ppc64-syscallpath.patch Log Message: PowerPC update from git tree linux-2.6.15-spufs-compile.patch: inode.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6.15-spufs-compile.patch --- --- linux-2.6.15/arch/powerpc/platforms/cell/spufs/inode.c~ 2006-01-10 01:00:29.000000000 +0000 +++ linux-2.6.15/arch/powerpc/platforms/cell/spufs/inode.c 2006-01-10 01:06:10.000000000 +0000 @@ -138,7 +138,7 @@ static void spufs_prune_dir(struct dentr { struct dentry *dentry, *tmp; down(&dir->d_inode->i_sem); - list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_child) { + list_for_each_entry_safe(dentry, tmp, &dir->d_subdirs, d_u.d_child) { spin_lock(&dcache_lock); spin_lock(&dentry->d_lock); if (!(d_unhashed(dentry)) && dentry->d_inode) { Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.318 retrieving revision 1.319 diff -u -r1.318 -r1.319 --- .cvsignore 9 Jan 2006 18:55:14 -0000 1.318 +++ .cvsignore 10 Jan 2006 01:45:59 -0000 1.319 @@ -3,5 +3,4 @@ kernel-2.6.15 linux-2.6.15.tar.bz2 bcm43xx-20060106.tar.bz2 -ieee80211softmac-20060103.tar.bz2 -patch-2.6.15-git5.bz2 +patch-2.6.15-git5a.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1837 retrieving revision 1.1838 diff -u -r1.1837 -r1.1838 --- kernel-2.6.spec 9 Jan 2006 19:36:56 -0000 1.1837 +++ kernel-2.6.spec 10 Jan 2006 01:45:59 -0000 1.1838 @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git5.bz2 +Patch1: patch-2.6.15-git5a.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -226,20 +226,14 @@ # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch -Patch302: linux-2.6-serial-of.patch -Patch303: linux-2.6.15-rc1-ppc64-syscallpath.patch +Patch301: linux-2.6.15-spufs-compile.patch Patch304: linux-2.6.15-mv643xx-fixes.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch -Patch307: linux-2.6-cell-platform-detect.patch -Patch308: linux-2.6-cell-idle-pmgt.patch -Patch309: linux-2.6-cell-nvram-kmalloc.patch Patch310: linux-2.6-cell-spiderpic-no-devtree.patch -Patch312: linux-2.6-cell-no-legacy-io.patch Patch313: linux-2.6-hvc-rtas-console.patch Patch314: linux-2.6-ppc-rtas-check.patch Patch315: linux-2.6-powerpc-parport.patch -Patch316: linux-2.6-cell-iommu.patch Patch317: linux-2.6-ppc-iseries-input-layer.patch # 400 - 499 ia64 @@ -345,7 +339,6 @@ Patch1650: linux-2.6-input-kill-stupid-messages.patch Patch1660: linux-2.6-input-usblegacy.patch Patch1670: linux-2.6-serial-tickle-nmi.patch -Patch1671: linux-2.6-serial-nrports.patch Patch1690: linux-2.6-radeon-backlight.patch Patch1700: linux-2.6-ide-tune-locking.patch Patch1710: linux-2.6-autofs-pathlookup.patch @@ -637,36 +630,24 @@ # # ppc64 # - +# Default to ARCH=powerpc %patch300 -p1 -# Don't probe serial ports if they don't exist -%patch302 -p1 -# Updated ppc/ppc64 system call entry/exit path -%patch303 -p1 +# Fix spufs build +%patch301 -p1 # Fix the MV643xx Gigabit Ethernet driver %patch304 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. %patch305 -p1 # Make HVC console generic; support simulator console device using it. %patch306 -p1 -# Detect Cell platforms appropriately -%patch307 -p1 -# Use PAUSE_ZERO on Cell as appropriate -%patch308 -p1 -# Fix nvram driver to not kmalloc the entire size of a read() call -%patch309 -p1 # Hardcode PIC addresses for Cell spiderpic %patch310 -p1 -# Cell has no legacy I/O -%patch312 -p1 # RTAS console support %patch313 -p1 # Check properly for successful RTAS instantiation %patch314 -p1 # Check before using legacy I/O ports which might crash the machine %patch315 -p1 -# Handle new Cell boards with >512MiB RAM -%patch316 -p1 # No input layer on iseries %patch317 -p1 @@ -831,8 +812,6 @@ %patch1660 -p1 # Tickle the NMI whilst doing serial writes. %patch1670 -p1 -# Limit number of serial ports registered. -%patch1671 -p1 # Radeon on thinkpad backlight power-management goodness. %patch1690 -p1 # Fix IDE locking bug. @@ -1391,6 +1370,9 @@ %endif %changelog +* Tue Jan 10 2006 David Woodhouse +- 2.6.15-git5a (1fd5a46dd6bbca3a1275465120caf4748872c2a7) + * Mon Jan 9 2006 Dave Jones - 2.6.15-git5 linux-2.6-hvc-console.patch: drivers/char/Kconfig | 13 +++ drivers/char/Makefile | 6 + drivers/char/hvc_console.c | 25 ------ drivers/char/hvc_console.h | 83 ++++++++++++++++++++++ drivers/char/hvc_fss.c | 149 ++++++++++++++++++++++++++++++++++++++++ drivers/char/hvc_vio.c | 1 include/asm-powerpc/hvconsole.h | 21 ----- 7 files changed, 252 insertions(+), 46 deletions(-) Index: linux-2.6-hvc-console.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-hvc-console.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-hvc-console.patch 8 Dec 2005 23:23:53 -0000 1.2 +++ linux-2.6-hvc-console.patch 10 Jan 2006 01:45:59 -0000 1.3 @@ -1,31 +1,3 @@ -diff -uNr --exclude '*.orig' linux-2.6.14.cons/arch/powerpc/kernel/setup-common.c linux-2.6.14/arch/powerpc/kernel/setup-common.c ---- linux-2.6.14.cons/arch/powerpc/kernel/setup-common.c 2005-12-07 16:33:31.000000000 +0100 -+++ linux-2.6.14/arch/powerpc/kernel/setup-common.c 2005-12-07 16:34:00.000000000 +0100 -@@ -304,6 +304,15 @@ - - DBG(" -> set_preferred_console()\n"); - -+#ifdef CONFIG_HVC_FSS -+ /* if we're on the full system simulator just circumvent the whole -+ * picking process because there is no device tree in which we'll -+ * find the console device. */ -+ if(__onsim()) { -+ DBG("Found hvc_fss console\n"); -+ return add_preferred_console("hvc", 0, NULL); -+ } -+#endif - /* The user has requested a console so this is already set up. */ - if (strstr(saved_command_line, "console=")) { - DBG(" console was specified !\n"); -@@ -385,7 +393,7 @@ - } else { - /* pSeries LPAR virtual console */ - of_node_put(prom_stdout); -- DBG("Found hvc console\n"); -+ DBG("Found hvc_vio console\n"); - return add_preferred_console("hvc", 0, NULL); - } - } diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_console.c linux-2.6.14/drivers/char/hvc_console.c --- linux-2.6.14.cons/drivers/char/hvc_console.c 2005-12-07 16:33:35.000000000 +0100 +++ linux-2.6.14/drivers/char/hvc_console.c 2005-12-07 16:33:56.000000000 +0100 @@ -382,9 +354,10 @@ diff -uNr --exclude '*.orig' linux-2.6.14.cons/include/asm-powerpc/hvconsole.h linux-2.6.14/include/asm-powerpc/hvconsole.h --- linux-2.6.14.cons/include/asm-powerpc/hvconsole.h 2005-12-07 16:33:35.000000000 +0100 +++ linux-2.6.14/include/asm-powerpc/hvconsole.h 2005-12-07 16:33:56.000000000 +0100 -@@ -22,28 +22,7 @@ +@@ -22,30 +22,9 @@ #ifndef _PPC64_HVCONSOLE_H #define _PPC64_HVCONSOLE_H + #ifdef __KERNEL__ -/* - * This is the max number of console adapters that can/will be found as @@ -410,6 +383,7 @@ - struct hv_ops *ops); -/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */ -extern int __devexit hvc_remove(struct hvc_struct *hp); + #endif /* __KERNEL__ */ #endif /* _PPC64_HVCONSOLE_H */ --- linux-2.6.14/drivers/char/hvc_vio.c~ 2005-12-07 17:46:48.000000000 +0100 +++ linux-2.6.14/drivers/char/hvc_vio.c 2005-12-07 18:03:23.000000000 +0100 linux-2.6-softmac-git.patch: include/net/ieee80211.h | 6 include/net/ieee80211softmac.h | 266 +++++++++++++ include/net/ieee80211softmac_wx.h | 66 +++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/ieee80211_module.c | 2 net/ieee80211/ieee80211_rx.c | 4 net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 356 ++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 350 +++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 135 ++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 425 +++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 211 ++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 216 ++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 390 +++++++++++++++++++ 17 files changed, 2917 insertions(+), 5 deletions(-) Index: linux-2.6-softmac-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-softmac-git.patch 6 Jan 2006 15:01:57 -0000 1.1 +++ linux-2.6-softmac-git.patch 10 Jan 2006 01:45:59 -0000 1.2 @@ -384,99 +384,6 @@ ieee80211_geo.o +obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/ -diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c -index 073aebd..f8dca31 100644 ---- a/net/ieee80211/ieee80211_crypt_wep.c -+++ b/net/ieee80211/ieee80211_crypt_wep.c -@@ -75,22 +75,14 @@ static void prism2_wep_deinit(void *priv - kfree(priv); - } - --/* Perform WEP encryption on given skb that has at least 4 bytes of headroom -- * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted, -- * so the payload length increases with 8 bytes. -- * -- * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data)) -- */ --static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) -+/* Add WEP IV/key info to a frame that has at least 4 bytes of headroom */ -+static int prism2_wep_build_iv(struct sk_buff *skb, int hdr_len, void *priv) - { - struct prism2_wep_data *wep = priv; -- u32 crc, klen, len; -- u8 key[WEP_KEY_LEN + 3]; -- u8 *pos, *icv; -- struct scatterlist sg; -- -- if (skb_headroom(skb) < 4 || skb_tailroom(skb) < 4 || -- skb->len < hdr_len) -+ u32 klen, len; -+ u8 *pos; -+ -+ if (skb_headroom(skb) < 4 || skb->len < hdr_len) - return -1; - - len = skb->len - hdr_len; -@@ -112,15 +104,47 @@ static int prism2_wep_encrypt(struct sk_ - } - - /* Prepend 24-bit IV to RC4 key and TX frame */ -- *pos++ = key[0] = (wep->iv >> 16) & 0xff; -- *pos++ = key[1] = (wep->iv >> 8) & 0xff; -- *pos++ = key[2] = wep->iv & 0xff; -+ *pos++ = (wep->iv >> 16) & 0xff; -+ *pos++ = (wep->iv >> 8) & 0xff; -+ *pos++ = wep->iv & 0xff; - *pos++ = wep->key_idx << 6; - -+ return 0; -+} -+ -+/* Perform WEP encryption on given skb that has at least 4 bytes of headroom -+ * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted, -+ * so the payload length increases with 8 bytes. -+ * -+ * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data)) -+ */ -+static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) -+{ -+ struct prism2_wep_data *wep = priv; -+ u32 crc, klen, len; -+ u8 *pos, *icv; -+ struct scatterlist sg; -+ u8 key[WEP_KEY_LEN + 3]; -+ -+ /* other checks are in prism2_wep_build_iv */ -+ if (skb_tailroom(skb) < 4) -+ return -1; -+ -+ /* add the IV to the frame */ -+ if (prism2_wep_build_iv(skb, hdr_len, priv)) -+ return -1; -+ -+ /* Copy the IV into the first 3 bytes of the key */ -+ memcpy(key, skb->data + hdr_len, 3); -+ - /* Copy rest of the WEP key (the secret part) */ - memcpy(key + 3, wep->key, wep->key_len); -+ -+ len = skb->len - hdr_len - 4; -+ pos = skb->data + hdr_len + 4; -+ klen = 3 + wep->key_len; - -- /* Append little-endian CRC32 and encrypt it to produce ICV */ -+ /* Append little-endian CRC32 over only the data and encrypt it to produce ICV */ - crc = ~crc32_le(~0, pos, len); - icv = skb_put(skb, 4); - icv[0] = crc; -@@ -231,6 +255,7 @@ static struct ieee80211_crypto_ops ieee8 - .name = "WEP", - .init = prism2_wep_init, - .deinit = prism2_wep_deinit, -+ .build_iv = prism2_wep_build_iv, - .encrypt_mpdu = prism2_wep_encrypt, - .decrypt_mpdu = prism2_wep_decrypt, - .encrypt_msdu = NULL, diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c index 321287b..22abfca 100644 --- a/net/ieee80211/ieee80211_module.c @@ -506,32 +413,6 @@ } static inline void ieee80211_process_probe_response(struct ieee80211_device -diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c -index 445f206..e5b33c8 100644 ---- a/net/ieee80211/ieee80211_tx.c -+++ b/net/ieee80211/ieee80211_tx.c -@@ -288,7 +288,7 @@ int ieee80211_xmit(struct sk_buff *skb, - /* Determine total amount of storage required for TXB packets */ - bytes = skb->len + SNAP_SIZE + sizeof(u16); - -- if (host_encrypt) -+ if (host_encrypt || host_build_iv) - fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA | - IEEE80211_FCTL_PROTECTED; - else -diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c -index 181755f..406d5b9 100644 ---- a/net/ieee80211/ieee80211_wx.c -+++ b/net/ieee80211/ieee80211_wx.c -@@ -284,7 +284,7 @@ int ieee80211_wx_set_encode(struct ieee8 - }; - int i, key, key_provided, len; - struct ieee80211_crypt_data **crypt; -- int host_crypto = ieee->host_encrypt || ieee->host_decrypt; -+ int host_crypto = ieee->host_encrypt || ieee->host_decrypt || ieee->host_build_iv; - - IEEE80211_DEBUG_WX("SET_ENCODE\n"); - diff --git a/net/ieee80211/softmac/Kconfig b/net/ieee80211/softmac/Kconfig new file mode 100644 index 0000000..6cd9f34 @@ -565,7 +446,7 @@ + ieee80211softmac_event.o diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c new file mode 100644 -index 0000000..9848744 +index 0000000..085022f --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c @@ -0,0 +1,356 @@ @@ -839,7 +720,7 @@ + if (mac->set_bssid_filter) + mac->set_bssid_filter(mac->dev, net->bssid); + memcpy(mac->ieee->bssid, net->bssid, ETH_ALEN); -+ mac->dev->flags |= IFF_RUNNING; ++ netif_carrier_on(mac->dev); + + mac->association_id = le16_to_cpup(&resp->aid); +} @@ -917,7 +798,7 @@ + struct ieee80211softmac_device *mac = ieee80211_priv(dev); + unsigned long flags; + dprintk(KERN_INFO PFX "got disassoc frame\n"); -+ ++ netif_carrier_off(dev); + spin_lock_irqsave(&mac->lock, flags); + mac->associnfo.bssvalid = 0; + mac->associated = 0; @@ -927,10 +808,10 @@ +} diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c new file mode 100644 -index 0000000..5a77352 +index 0000000..6eab2be --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_auth.c -@@ -0,0 +1,348 @@ +@@ -0,0 +1,350 @@ +#include "ieee80211softmac_priv.h" + +static void ieee80211softmac_auth_queue(void *data); @@ -1211,6 +1092,8 @@ + kfree(net->challenge); + kfree(net); + ++ /* can't transmit data right now... */ ++ netif_carrier_off(mac->dev); + /* let's try to re-associate */ + schedule_work(&mac->associnfo.work); + spin_unlock_irqrestore(&mac->lock, flags); @@ -1902,10 +1785,10 @@ +} diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c new file mode 100644 -index 0000000..79ef959 +index 0000000..ea4a19e --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_module.c -@@ -0,0 +1,436 @@ +@@ -0,0 +1,425 @@ +#include "ieee80211softmac_priv.h" +#include + @@ -1948,21 +1831,10 @@ + softmac->txrates.default_rate = IEEE80211_CCK_RATE_1MB; + softmac->txrates.default_fallback = IEEE80211_CCK_RATE_1MB; + -+ /* should we also assign softmac->mgmt_xmit here so -+ * that it is always valid? If so, we probably want -+ * to define a new function for that which just -+ * wraps ieee80211_tx_frame -+ */ ++ /* to start with, we can't send anything ... */ ++ netif_carrier_off(dev); + -+ /* until associated, we're not ready */ -+ dev->flags &= ~IFF_RUNNING; -+ + return dev; -+ -+err_free_ieee80211: -+ free_ieee80211(dev); -+ -+ return NULL; +} + +/* Clears the pending work queue items, stops all scans, etc. */ Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.260 retrieving revision 1.261 diff -u -r1.260 -r1.261 --- sources 9 Jan 2006 18:55:15 -0000 1.260 +++ sources 10 Jan 2006 01:45:59 -0000 1.261 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2 1eb2bb778090c59fbeba6278d63a9309 ieee80211softmac-20060103.tar.bz2 -f05d69868a2452b980185889f5a14fb4 patch-2.6.15-git5.bz2 +82d5bf398cb12769fb2431964045982f patch-2.6.15-git5a.bz2 --- linux-2.6-cell-idle-pmgt.patch DELETED --- --- linux-2.6-cell-iommu.patch DELETED --- --- linux-2.6-cell-no-legacy-io.patch DELETED --- --- linux-2.6-cell-nvram-kmalloc.patch DELETED --- --- linux-2.6-cell-platform-detect.patch DELETED --- --- linux-2.6-serial-nrports.patch DELETED --- --- linux-2.6-serial-of.patch DELETED --- --- linux-2.6.15-rc1-ppc64-syscallpath.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 10 02:53:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 21:53:32 -0500 Subject: rpms/kernel/devel linux-2.6-ppc-compile.patch, NONE, 1.1 kernel-2.6.spec, 1.1838, 1.1839 Message-ID: <200601100253.k0A2rWjP006539@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6488 Modified Files: kernel-2.6.spec Added Files: linux-2.6-ppc-compile.patch Log Message: I want my P-P-C linux-2.6-ppc-compile.patch: arch/powerpc/kernel/ppc_ksyms.c | 1 - drivers/ide/pci/via82cxxx.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) --- NEW FILE linux-2.6-ppc-compile.patch --- --- linux-2.6.15/drivers/ide/pci/via82cxxx.c~ 2006-01-03 03:21:10.000000000 +0000 +++ linux-2.6.15/drivers/ide/pci/via82cxxx.c 2006-01-10 02:33:10.000000000 +0000 @@ -439,7 +439,7 @@ static void __devinit init_hwif_via82cxx hwif->speedproc = &via_set_drive; -#if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_PPC32) +#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32) if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) { hwif->irq = hwif->channel ? 15 : 14; } --- linux-2.6.15/arch/powerpc/kernel/ppc_ksyms.c~ 2006-01-10 02:21:45.000000000 +0000 +++ linux-2.6.15/arch/powerpc/kernel/ppc_ksyms.c 2006-01-10 02:33:37.000000000 +0000 @@ -244,7 +244,6 @@ EXPORT_SYMBOL(set_context); extern long mol_trampoline; EXPORT_SYMBOL(mol_trampoline); /* For MOL */ EXPORT_SYMBOL(flush_hash_pages); /* For MOL */ -EXPORT_SYMBOL_GPL(__handle_mm_fault); /* For MOL */ #ifdef CONFIG_SMP extern int mmu_hash_lock; EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1838 retrieving revision 1.1839 diff -u -r1.1838 -r1.1839 --- kernel-2.6.spec 10 Jan 2006 01:45:59 -0000 1.1838 +++ kernel-2.6.spec 10 Jan 2006 02:53:27 -0000 1.1839 @@ -156,7 +156,7 @@ Version: %{rpmversion} Release: %{release} #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -ExclusiveArch: noarch %{all_x86} x86_64 ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -227,6 +227,7 @@ # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch Patch301: linux-2.6.15-spufs-compile.patch +Patch302: linux-2.6-ppc-compile.patch Patch304: linux-2.6.15-mv643xx-fixes.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch @@ -634,6 +635,8 @@ %patch300 -p1 # Fix spufs build %patch301 -p1 +# Fix ppc32 build +%patch302 -p1 # Fix the MV643xx Gigabit Ethernet driver %patch304 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. From fedora-cvs-commits at redhat.com Tue Jan 10 02:53:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 21:53:32 -0500 Subject: rpms/kernel/devel/configs config-powerpc-generic, 1.9, 1.10 config-powerpc32-generic, 1.7, 1.8 Message-ID: <200601100253.k0A2rWhG006545@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv6488/configs Modified Files: config-powerpc-generic config-powerpc32-generic Log Message: I want my P-P-C Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- config-powerpc-generic 10 Jan 2006 01:46:00 -0000 1.9 +++ config-powerpc-generic 10 Jan 2006 02:53:29 -0000 1.10 @@ -41,7 +41,7 @@ CONFIG_ADB=y CONFIG_ADB_PMU=y CONFIG_WINDFARM=y -CONFIG_I2C_KEYWEST=y +CONFIG_I2C_POWERMAC=y CONFIG_APPLE_AIRPORT=m CONFIG_SERIAL_PMACZILOG=m CONFIG_AGP_UNINORTH=y Index: config-powerpc32-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc32-generic,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config-powerpc32-generic 19 Dec 2005 00:58:54 -0000 1.7 +++ config-powerpc32-generic 10 Jan 2006 02:53:29 -0000 1.8 @@ -6,7 +6,7 @@ # CONFIG_HOTPLUG_PCI is not set CONFIG_CPU_FREQ_PMAC=y CONFIG_PPC_MULTIPLATFORM=y -CONFIG_PPC_CHRP=y +# CONFIG_PPC_CHRP is not set CONFIG_PPC_PMAC=y # CONFIG_PPC_PREP is not set From fedora-cvs-commits at redhat.com Tue Jan 10 03:15:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 9 Jan 2006 22:15:30 -0500 Subject: rpms/kernel/devel linux-2.6-ppc-compile.patch,1.1,1.2 Message-ID: <200601100315.k0A3FUEd012899@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12861 Modified Files: linux-2.6-ppc-compile.patch Log Message: And smp build linux-2.6-ppc-compile.patch: arch/powerpc/Kconfig | 2 +- arch/powerpc/kernel/ppc_ksyms.c | 1 - drivers/ide/pci/via82cxxx.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) Index: linux-2.6-ppc-compile.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-ppc-compile.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-ppc-compile.patch 10 Jan 2006 02:53:28 -0000 1.1 +++ linux-2.6-ppc-compile.patch 10 Jan 2006 03:15:24 -0000 1.2 @@ -19,3 +19,14 @@ #ifdef CONFIG_SMP extern int mmu_hash_lock; EXPORT_SYMBOL(mmu_hash_lock); /* For MOL */ +--- linux-2.6.15/arch/powerpc/Kconfig~ 2006-01-10 03:14:45.000000000 +0000 ++++ linux-2.6.15/arch/powerpc/Kconfig 2006-01-10 03:14:09.000000000 +0000 +@@ -424,7 +424,7 @@ config PPC_MPC106 + + config GENERIC_TBSYNC + bool +- default y if CONFIG_PPC32 && CONFIG_SMP ++ default y if PPC32 && SMP + default n + + source "drivers/cpufreq/Kconfig" From fedora-cvs-commits at redhat.com Tue Jan 10 05:29:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 00:29:41 -0500 Subject: rpms/eclipse-cdt/devel eclipse-cdt.spec,1.30,1.31 Message-ID: <200601100529.k0A5TfqA013475@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse-cdt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13444 Modified Files: eclipse-cdt.spec Log Message: - Rebuild against latest gcc. Index: eclipse-cdt.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-cdt/devel/eclipse-cdt.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- eclipse-cdt.spec 30 Dec 2005 23:04:32 -0000 1.30 +++ eclipse-cdt.spec 10 Jan 2006 05:29:37 -0000 1.31 @@ -21,7 +21,7 @@ Summary: %{pkg_summary} Name: %{eclipse_name}-cdt Version: %{majmin}.%{micro} -Release: 1jpp_3fc +Release: 1jpp_4fc License: Eclipse Public License - v 1.0 (EPL) Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/cdt @@ -231,6 +231,9 @@ %changelog +* Tue Jan 10 2006 Andrew Overholt 3.0.1-1jpp_4fc +- Rebuild against latest gcc. + * Fri Dec 30 2005 Andrew Overholt 3.0.1-1jpp_3fc - Fix %%files section to not be x86-specific. From fedora-cvs-commits at redhat.com Tue Jan 10 06:10:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 01:10:38 -0500 Subject: rpms/xorg-x11-fonts/devel xorg-x11-fonts.spec,1.7,1.8 Message-ID: <200601100610.k0A6AcTB030100@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/xorg-x11-fonts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30087 Modified Files: xorg-x11-fonts.spec Log Message: fix obsoletes of fonts-xorg-ISO8859-X-{75,100}dpi packages (#177377) Index: xorg-x11-fonts.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xorg-x11-fonts.spec 16 Dec 2005 16:03:23 -0000 1.7 +++ xorg-x11-fonts.spec 10 Jan 2006 06:10:36 -0000 1.8 @@ -30,7 +30,7 @@ Summary: X.Org X11 fonts Name: xorg-x11-fonts Version: 1.0.0 -Release: 1 +Release: 2 License: Various licenses Group: User Interface/X URL: http://www.x.org @@ -276,7 +276,7 @@ Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-2-75dpi-fonts Obsoletes: xorg-x11-ISO8859-2-75dpi-fonts -Obsoletes: fonts-xorg-ISO8859-2-75dpi-fonts +Obsoletes: fonts-xorg-ISO8859-2-75dpi %description ISO8859-2-75dpi Contains a set of 75dpi fonts for Central European languages. @@ -288,7 +288,7 @@ Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-2-100dpi-fonts Obsoletes: xorg-x11-ISO8859-2-100dpi-fonts -Obsoletes: fonts-xorg-ISO8859-2-100dpi-fonts +Obsoletes: fonts-xorg-ISO8859-2-100dpi %description ISO8859-2-100dpi Contains a set of 100dpi fonts for Central European languages. @@ -300,7 +300,7 @@ Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-9-75dpi-fonts Obsoletes: xorg-x11-ISO8859-9-75dpi-fonts -Obsoletes: fonts-xorg-ISO8859-9-75dpi-fonts +Obsoletes: fonts-xorg-ISO8859-9-75dpi %description ISO8859-9-75dpi Contains a set of 75dpi fonts for the Turkish language. @@ -312,7 +312,7 @@ Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-9-100dpi-fonts Obsoletes: xorg-x11-ISO8859-9-100dpi-fonts -Obsoletes: fonts-xorg-ISO8859-9-100dpi-fonts +Obsoletes: fonts-xorg-ISO8859-9-100dpi %description ISO8859-9-100dpi Contains a set of 100dpi fonts for the Turkish language. @@ -324,7 +324,7 @@ Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-14-75dpi-fonts Obsoletes: xorg-x11-ISO8859-14-75dpi-fonts -Obsoletes: fonts-xorg-ISO8859-14-75dpi-fonts +Obsoletes: fonts-xorg-ISO8859-14-75dpi %description ISO8859-14-75dpi Contains a set of 75dpi fonts in the ISO8859-14 encoding which @@ -337,7 +337,7 @@ Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-14-100dpi-fonts Obsoletes: xorg-x11-ISO8859-14-100dpi-fonts -Obsoletes: fonts-xorg-ISO8859-14-100dpi-fonts +Obsoletes: fonts-xorg-ISO8859-14-100dpi %description ISO8859-14-100dpi Contains a set of 100dpi fonts in the ISO8859-14 encoding which @@ -350,7 +350,7 @@ Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-15-75dpi-fonts Obsoletes: xorg-x11-ISO8859-15-75dpi-fonts -Obsoletes: fonts-xorg-ISO8859-15-75dpi-fonts +Obsoletes: fonts-xorg-ISO8859-15-75dpi %description ISO8859-15-75dpi Contains a set of 75dpi fonts in the ISO8859-15 encoding which @@ -363,7 +363,7 @@ Requires(postun): mkfontdir Obsoletes: XFree86-ISO8859-15-100dpi-fonts Obsoletes: xorg-x11-ISO8859-15-100dpi-fonts -Obsoletes: fonts-xorg-ISO8859-15-100dpi-fonts +Obsoletes: fonts-xorg-ISO8859-15-100dpi %description ISO8859-15-100dpi Contains a set of 100dpi fonts in the ISO8859-15 encoding which @@ -1494,6 +1494,9 @@ %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-* %changelog +* Tue Jan 10 2006 Bill Nottingham 1.0.0-2 +- fix obsoletes (#177377) + * Thu Dec 15 2005 Mike A. Harris 1.0.0-1 - Updated all font packages to X11R7 RC4 versions. - Added perl hack to build section to massage all of the configure.ac files From fedora-cvs-commits at redhat.com Tue Jan 10 09:12:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 04:12:37 -0500 Subject: rpms/man-pages-fr/devel man-pages-fr.spec,1.12,1.13 Message-ID: <200601100912.k0A9CaVP027610@cvs.devel.redhat.com> Author: bgroh Update of /cvs/dist/rpms/man-pages-fr/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27569 Modified Files: man-pages-fr.spec Log Message: added rm for man-pages conflicting with shadow-utils Index: man-pages-fr.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-fr/devel/man-pages-fr.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- man-pages-fr.spec 9 Dec 2005 22:41:56 -0000 1.12 +++ man-pages-fr.spec 10 Jan 2006 09:12:33 -0000 1.13 @@ -1,7 +1,7 @@ Summary: French man pages from the Linux Documentation Project. Name: man-pages-fr Version: 0.9.7 -Release: 11.1 +Release: 12 License: Distributable Group: Documentation Source: ftp://ftp.lip6.fr/pub/linux/french/docs/man-fr-0.9.tar.gz @@ -52,11 +52,11 @@ install -m 644 $i/* $RPM_BUILD_ROOT%{_mandir}/fr/$i; done -# remove these since they conflict with the cups package -rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{backend.1,filter.1,lp.1,lpoptions.1,lppasswd.1,lpstat.1,chage.1,gpasswd.1,xawtv.1,lpq.1,lpr.1,lprm.1,apropos.1,man.1,whatis.1}* -rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/cups-config.3* -rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{classes.conf.5,cupsd.conf.5,mime.convs.5,mime.types.5,printers.conf.5,faillog.5,shadow.5,man.config.5}* -rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{accept.8,cups-lpd.8,cups-polld.8,cupsaddsmb.8,cupsd.8,enable.8,lpadmin.8,lpc.8,lpinfo.8,lpmove.8,reject.8,adduser.8,chpasswd.8,useradd.8,userdel.8,usermod.8}* +# remove these since they conflict with cups and shadow-utils packages +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man1/{backend.1,filter.1,lp.1,lpoptions.1,lppasswd.1,lpstat.1,chage.1,gpasswd.1,xawtv.1,lpq.1,lpr.1,lprm.1,apropos.1,man.1,whatis.1,newgrp.1,sg.1}* +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man3/{cups-config.3,getspnam.3,shadow.3}* +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man5/{classes.conf.5,cupsd.conf.5,mime.convs.5,mime.types.5,printers.conf.5,faillog.5,shadow.5,man.config.5,gshadow.5,login.defs.5}* +rm -f $RPM_BUILD_ROOT%{_mandir}/fr/man8/{accept.8,cups-lpd.8,cups-polld.8,cupsaddsmb.8,cupsd.8,enable.8,lpadmin.8,lpc.8,lpinfo.8,lpmove.8,reject.8,adduser.8,chpasswd.8,useradd.8,userdel.8,usermod.8,faillog.8,groupadd.8,groupdel.8,groupmod.8,grpck.8,grpconv.8,grpunconv.8,lastlog.8,newusers.8,pwck.8,pwconv.8,pwunconv.8}* %clean rm -fr $RPM_BUILD_ROOT @@ -68,6 +68,9 @@ %{_mandir}/fr/* %changelog +* Tue Jan 10 2006 Bernd Groh +- remove pages that conflict with shadow-utils + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 10 09:53:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 04:53:54 -0500 Subject: rpms/elinks/devel elinks-0.11.0-getaddrinfo.patch, NONE, 1.1 elinks-0.11.0-ssl-noegd.patch, NONE, 1.1 elinks-0.11.0-sysname.patch, NONE, 1.1 elinks-0.11.0-union.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 elinks.spec, 1.27, 1.28 sources, 1.15, 1.16 elinks-0.10.3-union.patch, 1.1, NONE elinks-0.4.2-getaddrinfo.patch, 1.1, NONE elinks-noegd.patch, 1.1, NONE elinks-sysname.patch, 1.1, NONE Message-ID: <200601100953.k0A9rsNp026199@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/elinks/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26185 Modified Files: .cvsignore elinks.spec sources Added Files: elinks-0.11.0-getaddrinfo.patch elinks-0.11.0-ssl-noegd.patch elinks-0.11.0-sysname.patch elinks-0.11.0-union.patch Removed Files: elinks-0.10.3-union.patch elinks-0.4.2-getaddrinfo.patch elinks-noegd.patch elinks-sysname.patch Log Message: new upstream 0.11.0 elinks-0.11.0-getaddrinfo.patch: dns.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletion(-) --- NEW FILE elinks-0.11.0-getaddrinfo.patch --- --- elinks-0.11.0/src/network/dns.c.getaddrinfo 2006-01-01 17:39:36.000000000 +0100 +++ elinks-0.11.0/src/network/dns.c 2006-01-10 09:30:56.000000000 +0100 @@ -156,9 +156,21 @@ * But we duplicate the code terribly here :|. */ /* hostent = getipnodebyname(name, AF_INET6, AI_ALL | AI_ADDRCONFIG, NULL); */ memset(&hint, 0, sizeof(hint)); + hint.ai_flags = AI_ADDRCONFIG; hint.ai_family = AF_UNSPEC; hint.ai_socktype = SOCK_STREAM; - if (getaddrinfo(name, NULL, &hint, &ai) != 0) return -1; + switch (getaddrinfo(name, NULL, &hint, &ai)) + { + case 0: + break; + case EAI_BADFLAGS: + hint.ai_flags = 0; + if (getaddrinfo(name, NULL, &hint, &ai) == 0) + break; + /* fall through */ + default: + return -1; + } #else /* Seems there are problems on Mac, so we first need to try elinks-0.11.0-ssl-noegd.patch: ssl.c | 12 ------------ 1 files changed, 12 deletions(-) --- NEW FILE elinks-0.11.0-ssl-noegd.patch --- --- elinks-0.11.0/src/network/ssl/ssl.c.noegd 2006-01-10 09:24:50.000000000 +0100 +++ elinks-0.11.0/src/network/ssl/ssl.c 2006-01-10 09:25:01.000000000 +0100 @@ -43,18 +43,6 @@ static void init_openssl(struct module *module) { - unsigned char f_randfile[PATH_MAX]; - - /* In a nutshell, on OS's without a /dev/urandom, the OpenSSL library - * cannot initialize the PRNG and so every attempt to use SSL fails. - * It's actually an OpenSSL FAQ, and according to them, it's up to the - * application coders to seed the RNG. -- William Yodlowsky */ - if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) { - /* Not an EGD, so read and write to it */ - if (RAND_load_file(f_randfile, -1)) - RAND_write_file(f_randfile); - } - SSLeay_add_ssl_algorithms(); context = SSL_CTX_new(SSLv23_client_method()); SSL_CTX_set_options(context, SSL_OP_ALL); elinks-0.11.0-sysname.patch: sysname.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE elinks-0.11.0-sysname.patch --- --- elinks-0.11.0/src/osdep/sysname.c.sysname 2006-01-01 17:39:36.000000000 +0100 +++ elinks-0.11.0/src/osdep/sysname.c 2006-01-10 09:34:14.000000000 +0100 @@ -26,7 +26,7 @@ FILE *f; unsigned char *p; - f = popen("uname -srm", "r"); + f = popen("uname -s", "r"); if (!f) return 0; if (fread(system_name, 1, sizeof(system_name) - 1, f) <= 0) { @@ -58,7 +58,7 @@ if (!uname(&name)) { snprintf(system_name, sizeof(system_name), - "%s %s %s", name.sysname, name.release, name.machine); + "%s", name.sysname); return; } #endif elinks-0.11.0-union.patch: options.c | 2 +- options.h | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) --- NEW FILE elinks-0.11.0-union.patch --- --- elinks-0.11.0/src/config/options.h.union 2006-01-10 09:40:54.000000000 +0100 +++ elinks-0.11.0/src/config/options.h 2006-01-10 09:48:16.000000000 +0100 @@ -131,7 +131,7 @@ }; #define INIT_OPTION(name, flags, type, min, max, value, desc, capt) \ - { NULL_LIST_HEAD, INIT_OBJECT("option"), name, flags, type, min, max, { (struct list_head *) (value) }, desc, capt } + { NULL_LIST_HEAD, INIT_OBJECT("option"), name, flags, type, min, max, { value }, desc, capt } extern struct option *config_options; extern struct option *cmdline_options; @@ -292,40 +292,42 @@ extern void unregister_options(struct option_info info[], struct option *tree); #define NULL_OPTION_INFO \ - { INIT_OPTION(NULL, 0, 0, 0, 0, NULL, NULL, NULL), NULL } + { INIT_OPTION(NULL, 0, 0, 0, 0, .tree = NULL, NULL, NULL), NULL } #define INIT_OPT_BOOL(path, capt, name, flags, def, desc) \ - { INIT_OPTION(name, flags, OPT_BOOL, 0, 1, def, DESC(desc), capt), path } + { INIT_OPTION(name, flags, OPT_BOOL, 0, 1, .number = def, DESC(desc), capt), path } #define INIT_OPT_INT(path, capt, name, flags, min, max, def, desc) \ - { INIT_OPTION(name, flags, OPT_INT, min, max, def, DESC(desc), capt), path } + { INIT_OPTION(name, flags, OPT_INT, min, max, .number = def, DESC(desc), capt), path } #define INIT_OPT_LONG(path, capt, name, flags, min, max, def, desc) \ - { INIT_OPTION(name, flags, OPT_LONG, min, max, def, DESC(desc), capt), path } + { INIT_OPTION(name, flags, OPT_LONG, min, max, .big_number = def, DESC(desc), capt), path } #define INIT_OPT_STRING(path, capt, name, flags, def, desc) \ - { INIT_OPTION(name, flags, OPT_STRING, 0, MAX_STR_LEN, def, DESC(desc), capt), path } + { INIT_OPTION(name, flags, OPT_STRING, 0, MAX_STR_LEN, .string = def, DESC(desc), capt), path } +/* .number initialized in register_options */ #define INIT_OPT_CODEPAGE(path, capt, name, flags, def, desc) \ - { INIT_OPTION(name, flags, OPT_CODEPAGE, 0, 0, def, DESC(desc), capt), path } + { INIT_OPTION(name, flags, OPT_CODEPAGE, 0, 0, .string = def, DESC(desc), capt), path } +/* .color initialized in register_options */ #define INIT_OPT_COLOR(path, capt, name, flags, def, desc) \ - { INIT_OPTION(name, flags, OPT_COLOR, 0, 0, def, DESC(desc), capt), path } + { INIT_OPTION(name, flags, OPT_COLOR, 0, 0, .string = def, DESC(desc), capt), path } #define INIT_OPT_LANGUAGE(path, capt, name, flags, desc) \ - { INIT_OPTION(name, flags, OPT_LANGUAGE, 0, 0, 0, DESC(desc), capt), path } + { INIT_OPTION(name, flags, OPT_LANGUAGE, 0, 0, .number = 0, DESC(desc), capt), path } #define INIT_OPT_COMMAND(path, capt, name, flags, cmd, desc) \ - { INIT_OPTION(name, flags, OPT_COMMAND, 0, 0, cmd, DESC(desc), capt), path } + { INIT_OPTION(name, flags, OPT_COMMAND, 0, 0, .command = cmd, DESC(desc), capt), path } #define INIT_OPT_CMDALIAS(path, capt, name, flags, def, desc) \ - { INIT_OPTION(name, flags, OPT_ALIAS, 0, sizeof(def) - 1, def, DESC(desc), capt), path } + { INIT_OPTION(name, flags, OPT_ALIAS, 0, sizeof(def) - 1, .string = def, DESC(desc), capt), path } #define INIT_OPT_ALIAS(path, name, flags, def) \ - { INIT_OPTION(name, flags, OPT_ALIAS, 0, sizeof(def) - 1, def, NULL, NULL), path } + { INIT_OPTION(name, flags, OPT_ALIAS, 0, sizeof(def) - 1, .string = def, NULL, NULL), path } #define INIT_OPT_TREE(path, capt, name, flags, desc) \ - { INIT_OPTION(name, flags, OPT_TREE, 0, 0, NULL, DESC(desc), capt), path } + { INIT_OPTION(name, flags, OPT_TREE, 0, 0, .tree = NULL, DESC(desc), capt), path } /* TODO: We need to do *something* with this ;). */ --- elinks-0.11.0/src/config/options.c.union 2006-01-10 09:38:31.000000000 +0100 +++ elinks-0.11.0/src/config/options.c 2006-01-10 09:39:59.000000000 +0100 @@ -59,7 +59,7 @@ /* flags: */ 0, /* type: */ OPT_TREE, /* min, max: */ 0, 0, - /* value: */ &options_root_tree, + /* value: */ .tree = &options_root_tree, /* desc: */ "", /* capt: */ NULL ); Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/elinks/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 29 Sep 2005 08:19:34 -0000 1.15 +++ .cvsignore 10 Jan 2006 09:53:49 -0000 1.16 @@ -1,2 +1,2 @@ -elinks-0.10.6.tar.bz2 +elinks-0.11.0.tar.bz2 manual-0.82-en.tar.bz2 Index: elinks.spec =================================================================== RCS file: /cvs/dist/rpms/elinks/devel/elinks.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- elinks.spec 9 Dec 2005 22:40:18 -0000 1.27 +++ elinks.spec 10 Jan 2006 09:53:49 -0000 1.28 @@ -1,17 +1,10 @@ %define rescue %{nil} Name: elinks Summary: A text-mode Web browser. -Version: 0.10.6 -Release: 2.1 +Version: 0.11.0 +Release: 1 Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2 Source1: http://links.sourceforge.net/download/docs/manual-0.82-en.tar.bz2 -Patch0: elinks-noegd.patch -Patch1: elinks-0.10.1-utf_8_io-default.patch -Patch2: elinks-0.10.1-pkgconfig.patch -Patch3: elinks-0.4.2-getaddrinfo.patch -Patch4: elinks-sysname.patch -Patch5: elinks-0.10.1-xterm.patch -Patch6: elinks-0.10.3-union.patch Group: Applications/Internet URL: http://elinks.or.cz/ BuildRoot: %{_tmppath}/%{name}-buildroot @@ -21,6 +14,14 @@ Obsoletes: links Provides: links +Patch0: elinks-0.11.0-ssl-noegd.patch +Patch1: elinks-0.10.1-utf_8_io-default.patch +Patch2: elinks-0.10.1-pkgconfig.patch +Patch3: elinks-0.11.0-getaddrinfo.patch +Patch4: elinks-0.11.0-sysname.patch +Patch5: elinks-0.10.1-xterm.patch +Patch6: elinks-0.11.0-union.patch + %description Links is a text-based Web browser. Links does not display any images, but it does support frames, tables and most other HTML tags. Links' @@ -45,9 +46,10 @@ %patch6 -p1 -b .union %build -aclocal -automake -a -autoconf +#aclocal +#automake -a +#autoconf +./autogen.sh export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS)" %configure %{?rescue:--without-gpm} --without-x @@ -77,7 +79,15 @@ %{_mandir}/man5/* %changelog -* Fri Dec 09 2005 Jesse Keating +* Tue Jan 10 2006 Karel Zak 0.11.0-1 +- update to new upstream version +- regenerate patches: + elinks-0.11.0-getaddrinfo.patch, + elinks-0.11.0-ssl-noegd.patch, + elinks-0.11.0-sysname.patch, + elinks-0.11.0-union.patch + +* Fri Dec 09 2005 Jesse Keating 0.10.6-2.1 - rebuilt * Wed Nov 9 2005 Karel Zak 0.10.6-2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/elinks/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 29 Sep 2005 08:19:34 -0000 1.15 +++ sources 10 Jan 2006 09:53:49 -0000 1.16 @@ -1,2 +1,2 @@ -f539c07a7b0e19e8f1c6f35f7d406841 elinks-0.10.6.tar.bz2 +9154f493f544af31ae31ec1dd203d315 elinks-0.11.0.tar.bz2 947950d4974c25f95f1a3988bf88cb21 manual-0.82-en.tar.bz2 --- elinks-0.10.3-union.patch DELETED --- --- elinks-0.4.2-getaddrinfo.patch DELETED --- --- elinks-noegd.patch DELETED --- --- elinks-sysname.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 10 10:05:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 05:05:25 -0500 Subject: rpms/dump/devel .cvsignore, 1.14, 1.15 dump.spec, 1.31, 1.32 sources, 1.14, 1.15 dump-0.4b40-fixacl.patch, 1.1, NONE Message-ID: <200601101005.k0AA5Pil026386@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/dump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26371 Modified Files: .cvsignore dump.spec sources Removed Files: dump-0.4b40-fixacl.patch Log Message: * Tue Jan 10 2006 Jindrich Novy 0.4b41-1 - update to 0.4b41 - drop .fixacl patch, now applied in the new upstream release Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dump/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 3 May 2005 13:18:07 -0000 1.14 +++ .cvsignore 10 Jan 2006 10:05:18 -0000 1.15 @@ -2,3 +2,4 @@ dump-0.4b38.tar.bz2 dump-0.4b39.tar.bz2 dump-0.4b40.tar.bz2 +dump-0.4b41.tar.bz2 Index: dump.spec =================================================================== RCS file: /cvs/dist/rpms/dump/devel/dump.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- dump.spec 9 Dec 2005 22:40:16 -0000 1.31 +++ dump.spec 10 Jan 2006 10:05:18 -0000 1.32 @@ -2,13 +2,12 @@ Summary: Programs for backing up and restoring ext2/ext3 filesystems Name: dump -Version: 0.4b40 -Release: 5.1 +Version: 0.4b41 +Release: 1 License: BSD Group: Applications/Archiving URL: http://dump.sourceforge.net/ Source: dump-%{version}.tar.bz2 -Patch0: dump-0.4b40-fixacl.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 BuildRequires: libtermcap-devel, zlib-devel, bzip2-devel, ncurses-devel @@ -42,7 +41,6 @@ %prep %setup -q -%patch0 -p0 -b .fixacl %build # XXX --enable-kerberos needs krcmd @@ -113,6 +111,10 @@ %{_mandir}/man8/rmt.8* %changelog +* Tue Jan 10 2006 Jindrich Novy 0.4b41-1 +- update to 0.4b41 +- drop .fixacl patch, now applied in the new upstream release + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/dump/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 3 May 2005 13:18:07 -0000 1.14 +++ sources 10 Jan 2006 10:05:18 -0000 1.15 @@ -1 +1 @@ -ea42e689489e08cfeab48c25b1dc5435 dump-0.4b40.tar.bz2 +9c52564af86becfc0973b16b20e61219 dump-0.4b41.tar.bz2 --- dump-0.4b40-fixacl.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 10 10:20:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 05:20:32 -0500 Subject: rpms/mailman/devel .cvsignore, 1.13, 1.14 mailman-2.1-multimail.patch, 1.3, 1.4 mailman-2.1.5-date_overflows.patch, 1.1, 1.2 mailman.spec, 1.51, 1.52 sources, 1.13, 1.14 Message-ID: <200601101020.k0AAKWZV005321@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/mailman/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5305 Modified Files: .cvsignore mailman-2.1-multimail.patch mailman-2.1.5-date_overflows.patch mailman.spec sources Log Message: version 2.1.7 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mailman/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 8 Jun 2005 20:06:10 -0000 1.13 +++ .cvsignore 10 Jan 2006 10:20:28 -0000 1.14 @@ -1 +1 @@ -mailman-2.1.6.tgz +mailman-2.1.7.tgz mailman-2.1-multimail.patch: configure.in | 139 +++++++++++++++++++++++++++++++++++++++++++---------- src/Makefile.in | 4 - src/cgi-wrapper.c | 6 +- src/common.c | 61 +++++++++++++++-------- src/common.h | 4 - src/mail-wrapper.c | 6 +- 6 files changed, 165 insertions(+), 55 deletions(-) Index: mailman-2.1-multimail.patch =================================================================== RCS file: /cvs/dist/rpms/mailman/devel/mailman-2.1-multimail.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mailman-2.1-multimail.patch 9 Sep 2004 08:15:21 -0000 1.3 +++ mailman-2.1-multimail.patch 10 Jan 2006 10:20:28 -0000 1.4 @@ -1,36 +1,5 @@ -Mailman security is in part enforced by requiring it execute -SGID. When the mail process or the web server attempts to execute a -mailman script a C program is invoked to verify the group -permission. Mailman as it is shipped only allows one group to be -specified at build time. For users who build and install on their own -machine this is not a limitation. However, when making a binary -package to be installed on an arbitrary machine it is hard to predict -the correct group to use for that installation. Therefore this patch -allows us to specify at build time a list of groups that will be -iterated over, if the mailman process is executing as any of one of -the group in the set of groups then the permission check passes. Since -the groups we build with are limited to a small number of safe groups -this does not lower the security much while at the same time provides -a much more friendly way to package a binary installation that will -run in a wider range of installations. - -It was necessary to add the macro MM_FIND_GROUP_LIST to the -configure.in file replacing the original use of MM_FIND_GROUP_NAME, -the former operates on a list of group names while the later on a -single name. MM_FIND_GROUP_LIST includes a filter parameter that was -added with the notion of supporting the with-permcheck option. If -filter is true then only group names that exist on the build machine -are permitted in the list, otherwise all names are permitted. However, -note that whenever MM_FIND_GROUP_LIST is invoked it is currently -hardcoded to disable filtering and is not tied to with-permcheck, this -was done because of the observation that if one is passing a list of -groups it is likely one is doing so to support installations that have -a group not present on the build machine, but one might still want to -take advantage of the other with-permcheck functionality. - -diff -u mailman-2.1.2/configure.in.orig mailman-2.1.2/configure.in ---- mailman-2.1.2/configure.in.orig 2003-04-21 23:34:51.000000000 -0400 -+++ mailman-2.1.2/configure.in 2003-05-02 16:32:45.000000000 -0400 +--- mailman-2.1.7/configure.in.multimail 2005-08-27 03:40:15.000000000 +0200 ++++ mailman-2.1.7/configure.in 2006-01-10 10:53:14.000000000 +0100 @@ -208,26 +208,101 @@ fi @@ -243,9 +212,42 @@ if test -z "$CGI_GROUP" then if test "$with_permcheck" = "yes" -diff -u mailman-2.1.2/src/cgi-wrapper.c.orig mailman-2.1.2/src/cgi-wrapper.c ---- mailman-2.1.2/src/cgi-wrapper.c.orig 2002-08-23 16:39:47.000000000 -0400 -+++ mailman-2.1.2/src/cgi-wrapper.c 2003-05-02 16:28:11.000000000 -0400 +--- mailman-2.1.7/src/Makefile.in.multimail 2005-08-27 03:40:17.000000000 +0200 ++++ mailman-2.1.7/src/Makefile.in 2006-01-10 10:53:14.000000000 +0100 +@@ -49,9 +49,9 @@ + + SHELL= /bin/sh + +-MAIL_FLAGS= -DMAIL_GROUP="\"$(MAIL_GROUP)\"" ++MAIL_FLAGS= -DMAIL_GROUP='$(MAIL_GROUP)' + +-CGI_FLAGS= -DCGI_GROUP="\"$(CGI_GROUP)\"" ++CGI_FLAGS= -DCGI_GROUP='$(CGI_GROUP)' + + HELPFUL= -DHELPFUL + +--- mailman-2.1.7/src/common.h.multimail 2005-08-27 03:40:17.000000000 +0200 ++++ mailman-2.1.7/src/common.h 2006-01-10 10:53:14.000000000 +0100 +@@ -33,7 +33,7 @@ + #define GID_T GETGROUPS_T + + extern void fatal(const char*, int, char*, ...); +-extern void check_caller(const char*, const char*); ++extern void check_caller(const char* ident, const char**, size_t); + extern int run_script(const char*, int, char**, char**); + + /* Global variable used as a flag. */ +@@ -51,7 +51,7 @@ + #define MAIL_USAGE_ERROR 5 + #define MAIL_ILLEGAL_COMMAND 6 + #define ADDALIAS_USAGE_ERROR 7 +-#define GROUP_NAME_NOT_FOUND 8 ++#define GROUP_ID_NOT_FOUND 8 + + + /* +--- mailman-2.1.7/src/cgi-wrapper.c.multimail 2005-08-27 03:40:17.000000000 +0200 ++++ mailman-2.1.7/src/cgi-wrapper.c 2006-01-10 10:53:14.000000000 +0100 @@ -28,11 +28,11 @@ /* Group name that CGI scripts run as. See your web server's documentation * for details. @@ -269,10 +271,9 @@ /* For these CGI programs, we can ignore argc and argv since they * don't contain anything useful. `script' will always be the driver -diff -u mailman-2.1.2/src/common.c.orig mailman-2.1.2/src/common.c ---- mailman-2.1.2/src/common.c.orig 2002-09-04 21:29:57.000000000 -0400 -+++ mailman-2.1.2/src/common.c 2003-05-02 16:28:11.000000000 -0400 -@@ -116,13 +116,14 @@ +--- mailman-2.1.7/src/common.c.multimail 2005-12-30 19:50:08.000000000 +0100 ++++ mailman-2.1.7/src/common.c 2006-01-10 11:01:43.000000000 +0100 +@@ -117,13 +117,14 @@ /* Is the parent process allowed to call us? */ void @@ -280,23 +281,30 @@ +check_caller(const char* ident, const char** parentgroups, size_t numgroups) { GID_T mygid = getgid(); - struct group *mygroup = getgrgid(mygid); - char* option; - char* server; - char* wrapper; + struct group *mygroup = getgrgid(mygid); + char* option; + char* server; + char* wrapper; + int i; - if (running_as_cgi) { - option = "--with-cgi-gid"; -@@ -136,22 +137,45 @@ - } - - if (!mygroup) -- fatal(ident, GROUP_NAME_NOT_FOUND, -- "Failure to find group name %s. Try adding this group\n" -- "to your system, or re-run configure, providing an\n" -- "existing group name with the command line option %s.", -- parentgroup, option); + if (running_as_cgi) { + option = "--with-cgi-gid"; +@@ -136,28 +137,46 @@ + wrapper = "mail"; + } + +- if (!mygroup) +- fatal(ident, GROUP_NAME_NOT_FOUND, +- "Failure to find group name for GID %d. Mailman\n" +- "expected the %s wrapper to be executed as group\n" +- "\"%s\", but the system's %s server executed the\n" +- "wrapper as GID %d for which the name could not be\n" +- "found. Try adding GID %d to your system as \"%s\",\n" +- "or tweak your %s server to run the wrapper as group\n" +- "\"%s\".", +- mygid, wrapper, parentgroup, server, mygid, mygid, +- parentgroup, server, parentgroup); ++ if (!mygroup) + fatal(ident, GROUP_ID_NOT_FOUND, + "Failure to lookup via getgrgid() the group info for group id %d that this Mailman %s wrapper is executing under.\n" + "This is probably due to an incorrectly configured system and is not a Mailman problem", @@ -326,14 +334,14 @@ - if (strcmp(parentgroup, mygroup->gr_name)) fatal(ident, GROUP_MISMATCH, -- "Group mismatch error. Mailman expected the %s\n" -- "wrapper script to be executed as group \"%s\", but\n" -- "the system's %s server executed the %s script as\n" -- "group \"%s\". Try tweaking the %s server to run the\n" -- "script as group \"%s\", or re-run configure, \n" -- "providing the command line option `%s=%s'.", -- wrapper, parentgroup, server, wrapper, mygroup->gr_name, -- server, parentgroup, option, mygroup->gr_name); +- "Group mismatch error. Mailman expected the %s\n" +- "wrapper script to be executed as group \"%s\", but\n" +- "the system's %s server executed the %s script as\n" +- "group \"%s\". Try tweaking the %s server to run the\n" +- "script as group \"%s\", or re-run configure, \n" +- "providing the command line option `%s=%s'.", +- wrapper, parentgroup, server, wrapper, mygroup->gr_name, +- server, parentgroup, option, mygroup->gr_name); + "Group mismatch error. Mailman expected the %s wrapper script to be\n" + "executed as one of the following groups:\n" + "[%s],\n" @@ -348,30 +356,8 @@ } -diff -u mailman-2.1.2/src/common.h.orig mailman-2.1.2/src/common.h ---- mailman-2.1.2/src/common.h.orig 2002-10-21 14:48:03.000000000 -0400 -+++ mailman-2.1.2/src/common.h 2003-05-02 16:28:11.000000000 -0400 -@@ -33,7 +33,7 @@ - #define GID_T GETGROUPS_T - - extern void fatal(const char*, int, char*, ...); --extern void check_caller(const char*, const char*); -+extern void check_caller(const char* ident, const char**, size_t); - extern int run_script(const char*, int, char**, char**); - - /* Global variable used as a flag. */ -@@ -51,7 +51,7 @@ - #define MAIL_USAGE_ERROR 5 - #define MAIL_ILLEGAL_COMMAND 6 - #define ADDALIAS_USAGE_ERROR 7 --#define GROUP_NAME_NOT_FOUND 8 -+#define GROUP_ID_NOT_FOUND 8 - - - /* -diff -u mailman-2.1.2/src/mail-wrapper.c.orig mailman-2.1.2/src/mail-wrapper.c ---- mailman-2.1.2/src/mail-wrapper.c.orig 2002-08-23 16:40:27.000000000 -0400 -+++ mailman-2.1.2/src/mail-wrapper.c 2003-05-02 16:28:11.000000000 -0400 +--- mailman-2.1.7/src/mail-wrapper.c.multimail 2005-08-27 03:40:17.000000000 +0200 ++++ mailman-2.1.7/src/mail-wrapper.c 2006-01-10 10:53:14.000000000 +0100 @@ -23,9 +23,9 @@ /* Group name that your mail programs run as. See your mail server's * documentation for details. @@ -393,18 +379,3 @@ /* If we got here, everything must be OK */ status = run_script(argv[1], argc, argv, env); -diff -u mailman-2.1.2/src/Makefile.in.orig mailman-2.1.2/src/Makefile.in ---- mailman-2.1.2/src/Makefile.in.orig 2003-03-31 14:27:14.000000000 -0500 -+++ mailman-2.1.2/src/Makefile.in 2003-05-02 16:28:11.000000000 -0400 -@@ -49,9 +49,9 @@ - - SHELL= /bin/sh - --MAIL_FLAGS= -DMAIL_GROUP="\"$(MAIL_GROUP)\"" -+MAIL_FLAGS= -DMAIL_GROUP='$(MAIL_GROUP)' - --CGI_FLAGS= -DCGI_GROUP="\"$(CGI_GROUP)\"" -+CGI_FLAGS= -DCGI_GROUP='$(CGI_GROUP)' - - HELPFUL= -DHELPFUL - mailman-2.1.5-date_overflows.patch: Handlers/Scrubber.py | 2 +- Queue/ArchRunner.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: mailman-2.1.5-date_overflows.patch =================================================================== RCS file: /cvs/dist/rpms/mailman/devel/mailman-2.1.5-date_overflows.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mailman-2.1.5-date_overflows.patch 14 Dec 2005 16:16:01 -0000 1.1 +++ mailman-2.1.5-date_overflows.patch 10 Jan 2006 10:20:28 -0000 1.2 @@ -11,15 +11,6 @@ # Date: Tue, 18 Jun 0102 05:12:09 +0500 --- mailman-2.1.5/Mailman/Handlers/Scrubber.py.date_overflows 2005-12-12 14:19:56.000000000 +0100 +++ mailman-2.1.5/Mailman/Handlers/Scrubber.py 2005-12-12 14:25:37.000000000 +0100 -@@ -113,7 +113,7 @@ - def safe_strftime(fmt, floatsecs): - try: - return time.strftime(fmt, floatsecs) -- except (TypeError, ValueError): -+ except (OverflowError, TypeError, ValueError): - return None - - @@ -142,7 +142,7 @@ }.get(parts[3], 0) day = int(parts[4]) Index: mailman.spec =================================================================== RCS file: /cvs/dist/rpms/mailman/devel/mailman.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- mailman.spec 16 Dec 2005 23:21:35 -0000 1.51 +++ mailman.spec 10 Jan 2006 10:20:28 -0000 1.52 @@ -1,7 +1,7 @@ Summary: Mailing list manager with built in Web access. Name: mailman -Version: 2.1.6 -Release: 3.1 +Version: 2.1.7 +Release: 1 Epoch: 3 Group: Applications/Internet #Source0: ftp://ftp.gnu.org/pub/gnu/mailman/mailman-%{version}.tgz @@ -328,6 +328,9 @@ %attr(0644,root,%{mmgroup}) %config(noreplace) %{mmdir}/cron/crontab.in %changelog +* Tue Jan 10 2006 Harald Hoyer - 3:2.1.7-1 +- version 2.1.7 + * Fri Dec 16 2005 Jesse Keating - rebuilt for new gcj Index: sources =================================================================== RCS file: /cvs/dist/rpms/mailman/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Jun 2005 20:06:10 -0000 1.13 +++ sources 10 Jan 2006 10:20:28 -0000 1.14 @@ -1 +1 @@ -4e0f9d09c1553bd1a0a5327052179ca2 mailman-2.1.6.tgz +81ea139ecd24fbd2a85a9185a37df402 mailman-2.1.7.tgz From fedora-cvs-commits at redhat.com Tue Jan 10 10:36:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 05:36:39 -0500 Subject: rpms/valgrind/devel valgrind-3.1.0-amd64-highbase.patch, NONE, 1.1 valgrind-3.1.0-amd64-speedup.patch, NONE, 1.1 valgrind-3.1.0-valgrind_h.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 valgrind.spec, 1.24, 1.25 valgrind-3.0.1-amd64-highbase.patch, 1.1, NONE valgrind-3.0.1-amd64-speedup.patch, 1.1, NONE valgrind-3.0.1-amd64-syscalls.patch, 1.1, NONE valgrind-3.0.1-biarch-hack.patch, 1.1, NONE valgrind-3.0.1-valgrind_h.patch, 1.1, NONE Message-ID: <200601101036.k0AAad2U017251@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/valgrind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17209/devel Modified Files: .cvsignore sources valgrind.spec Added Files: valgrind-3.1.0-amd64-highbase.patch valgrind-3.1.0-amd64-speedup.patch valgrind-3.1.0-valgrind_h.patch Removed Files: valgrind-3.0.1-amd64-highbase.patch valgrind-3.0.1-amd64-speedup.patch valgrind-3.0.1-amd64-syscalls.patch valgrind-3.0.1-biarch-hack.patch valgrind-3.0.1-valgrind_h.patch Log Message: auto-import valgrind-3.1.0-1 on branch devel from valgrind-3.1.0-1.src.rpm valgrind-3.1.0-amd64-highbase.patch: Makefile.am | 2 +- Makefile.flags.am | 2 +- Makefile.in | 2 +- Makefile.tool.am | 2 +- addrcheck/Makefile.in | 4 ++-- auxprogs/Makefile.in | 2 +- cachegrind/Makefile.in | 4 ++-- configure | 11 ++++++----- configure.in | 11 ++++++----- coregrind/Makefile.am | 4 ++-- coregrind/Makefile.in | 6 +++--- coregrind/m_main.c | 2 +- helgrind/Makefile.am | 2 +- helgrind/Makefile.in | 6 +++--- lackey/Makefile.in | 4 ++-- massif/Makefile.am | 2 +- massif/Makefile.in | 6 +++--- memcheck/Makefile.am | 2 +- memcheck/Makefile.in | 6 +++--- none/Makefile.in | 4 ++-- 20 files changed, 43 insertions(+), 41 deletions(-) --- NEW FILE valgrind-3.1.0-amd64-highbase.patch --- --- valgrind-3.1.0/configure.in.jj 2005-11-26 08:35:39.000000000 -0500 +++ valgrind-3.1.0/configure.in 2006-01-09 11:40:50.000000000 -0500 @@ -124,11 +124,12 @@ case "${host_cpu}" in x86_64) AC_MSG_RESULT([ok (${host_cpu})]) VG_ARCH="amd64" - # XXX: relocations under amd64's "small model" are 32-bit signed - # quantities; therefore going above 0x7fffffff doesn't work... this is - # a problem. - valt_load_address_normal="0x70000000" - valt_load_address_inner="0x60000000" + valt_load_address_normal="0x60b0000000" + valt_load_address_inner="0x60a0000000" + mkdir -p pie_crtfiles + cp -a `$CC -print-file-name=crtbeginS.o` pie_crtfiles/crtbegin.o + cp -a `$CC -print-file-name=crtendS.o` pie_crtfiles/crtend.o + cp -a `$CC -print-file-name=Scrt1.o` pie_crtfiles/crt1.o ;; powerpc*) --- valgrind-3.1.0/coregrind/m_main.c.jj 2005-11-25 07:36:21.000000000 -0500 +++ valgrind-3.1.0/coregrind/m_main.c 2006-01-09 11:50:24.000000000 -0500 @@ -2810,7 +2810,7 @@ asm("\n" "\t.type _start, at function\n" "_start:\n" /* set up the new stack in %rdi */ - "\tmovq $vgPlain_interim_stack, %rdi\n" + "\tleaq vgPlain_interim_stack(%rip), %rdi\n" "\taddq $"VG_STRINGIFY(VG_STACK_GUARD_SZB)", %rdi\n" "\taddq $"VG_STRINGIFY(VG_STACK_ACTIVE_SZB)", %rdi\n" "\tandq $~15, %rdi\n" --- valgrind-3.1.0/Makefile.tool.am.jj 2005-11-25 07:36:22.000000000 -0500 +++ valgrind-3.1.0/Makefile.tool.am 2006-01-09 11:40:50.000000000 -0500 @@ -53,7 +53,7 @@ TOOL_LDFLAGS_X86_LINUX = \ TOOL_LDADD_AMD64_LINUX = $(COREGRIND_LIBS_AMD64_LINUX) $(TOOL_LDADD_COMMON) TOOL_LDFLAGS_AMD64_LINUX = \ - $(TOOL_LDFLAGS_COMMON) -m64 \ + $(TOOL_LDFLAGS_COMMON) -m64 -B$(top_builddir)/pie_crtfiles/ \ -Wl,-T,$(top_builddir)/valt_load_address_amd64_linux.lds TOOL_LDADD_PPC32_LINUX = $(COREGRIND_LIBS_PPC32_LINUX) $(TOOL_LDADD_COMMON) --- valgrind-3.1.0/Makefile.flags.am.jj 2005-11-25 07:36:22.000000000 -0500 +++ valgrind-3.1.0/Makefile.flags.am 2006-01-09 11:40:50.000000000 -0500 @@ -8,7 +8,7 @@ AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M3 AM_CCASFLAGS_X86_LINUX = $(add_includes_x86_linux) @FLAG_M32@ -g AM_CPPFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) +AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer -fpie @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -m64 -g AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) --- valgrind-3.1.0/Makefile.am.jj 2005-11-25 07:36:22.000000000 -0500 +++ valgrind-3.1.0/Makefile.am 2006-01-09 12:04:55.000000000 -0500 @@ -178,7 +178,7 @@ valt_load_address_x86_linux.lds: Makefil $(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | sed \ -e '1,/^=====\+$$/d' \ -e '/^=====\+$$/d' \ - -e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \ + -e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/(valt_load_address \& 0xffffffff)/g' > $@ \ || rm -f $@ valt_load_address_amd64_linux.lds: Makefile --- valgrind-3.1.0/coregrind/Makefile.am.jj 2006-01-09 12:03:01.000000000 -0500 +++ valgrind-3.1.0/coregrind/Makefile.am 2006-01-09 12:04:55.000000000 -0500 @@ -213,7 +213,7 @@ libreplacemalloc_toolpreload_x86_linux_a libreplacemalloc_toolpreload_amd64_linux_a_SOURCES = m_replacemalloc/vg_replace_malloc.c libreplacemalloc_toolpreload_amd64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -libreplacemalloc_toolpreload_amd64_linux_a_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fpic -fno-omit-frame-pointer +libreplacemalloc_toolpreload_amd64_linux_a_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fno-pie -fpic -fno-omit-frame-pointer libreplacemalloc_toolpreload_ppc32_linux_a_SOURCES = m_replacemalloc/vg_replace_malloc.c libreplacemalloc_toolpreload_ppc32_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) @@ -239,7 +239,7 @@ vgpreload_core_x86_linux_so_LDFLAGS = $( vgpreload_core_amd64_linux_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) vgpreload_core_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_core_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) +vgpreload_core_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fno-pie $(AM_CFLAGS_PIC) vgpreload_core_amd64_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_AMD64_LINUX) vgpreload_core_ppc32_linux_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) --- valgrind-3.1.0/massif/Makefile.am.jj 2006-01-09 12:03:01.000000000 -0500 +++ valgrind-3.1.0/massif/Makefile.am 2006-01-09 12:04:55.000000000 -0500 @@ -23,7 +23,7 @@ vgpreload_massif_x86_linux_so_LDFLAGS vgpreload_massif_amd64_linux_so_SOURCES = vgpreload_massif_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_massif_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) +vgpreload_massif_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fno-pie $(AM_CFLAGS_PIC) vgpreload_massif_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) vgpreload_massif_amd64_linux_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_AMD64_LINUX) \ --- valgrind-3.1.0/memcheck/Makefile.am.jj 2006-01-09 12:03:01.000000000 -0500 +++ valgrind-3.1.0/memcheck/Makefile.am 2006-01-09 12:04:55.000000000 -0500 @@ -24,7 +24,7 @@ vgpreload_memcheck_x86_linux_so_LDFLAGS vgpreload_memcheck_amd64_linux_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) vgpreload_memcheck_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_memcheck_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) -O2 +vgpreload_memcheck_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fno-pie $(AM_CFLAGS_PIC) -O2 vgpreload_memcheck_amd64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) vgpreload_memcheck_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) vgpreload_memcheck_amd64_linux_so_LDFLAGS = \ --- valgrind-3.1.0/helgrind/Makefile.am.jj 2006-01-09 12:03:01.000000000 -0500 +++ valgrind-3.1.0/helgrind/Makefile.am 2006-01-09 12:04:55.000000000 -0500 @@ -21,7 +21,7 @@ vgpreload_helgrind_x86_linux_so_LDFLAGS vgpreload_helgrind_amd64_linux_so_SOURCES = vgpreload_helgrind_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_helgrind_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) +vgpreload_helgrind_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fno-pie $(AM_CFLAGS_PIC) vgpreload_helgrind_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) vgpreload_helgrind_amd64_linux_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_AMD64_LINUX) \ --- valgrind-3.1.0/addrcheck/Makefile.in.jj 2005-11-26 08:39:53.000000000 -0500 +++ valgrind-3.1.0/addrcheck/Makefile.in 2006-01-09 12:05:12.000000000 -0500 @@ -235,7 +235,7 @@ AM_CPPFLAGS_X86_LINUX = $(add_includes_x AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_X86_LINUX = $(add_includes_x86_linux) @FLAG_M32@ -g AM_CPPFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) +AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer -fpie @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -m64 -g AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) AM_CFLAGS_PPC32_LINUX = $(WERROR) $(AM_CFLAGS_BASE) @@ -276,7 +276,7 @@ TOOL_LDFLAGS_X86_LINUX = \ TOOL_LDADD_AMD64_LINUX = $(COREGRIND_LIBS_AMD64_LINUX) $(TOOL_LDADD_COMMON) TOOL_LDFLAGS_AMD64_LINUX = \ - $(TOOL_LDFLAGS_COMMON) -m64 \ + $(TOOL_LDFLAGS_COMMON) -m64 -B$(top_builddir)/pie_crtfiles/ \ -Wl,-T,$(top_builddir)/valt_load_address_amd64_linux.lds TOOL_LDADD_PPC32_LINUX = $(COREGRIND_LIBS_PPC32_LINUX) $(TOOL_LDADD_COMMON) --- valgrind-3.1.0/lackey/Makefile.in.jj 2005-11-26 08:40:05.000000000 -0500 +++ valgrind-3.1.0/lackey/Makefile.in 2006-01-09 12:05:12.000000000 -0500 @@ -256,7 +256,7 @@ AM_CPPFLAGS_X86_LINUX = $(add_includes_x AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_X86_LINUX = $(add_includes_x86_linux) @FLAG_M32@ -g AM_CPPFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) +AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer -fpie @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -m64 -g AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) AM_CFLAGS_PPC32_LINUX = $(WERROR) $(AM_CFLAGS_BASE) @@ -297,7 +297,7 @@ TOOL_LDFLAGS_X86_LINUX = \ TOOL_LDADD_AMD64_LINUX = $(COREGRIND_LIBS_AMD64_LINUX) $(TOOL_LDADD_COMMON) TOOL_LDFLAGS_AMD64_LINUX = \ - $(TOOL_LDFLAGS_COMMON) -m64 \ + $(TOOL_LDFLAGS_COMMON) -m64 -B$(top_builddir)/pie_crtfiles/ \ -Wl,-T,$(top_builddir)/valt_load_address_amd64_linux.lds TOOL_LDADD_PPC32_LINUX = $(COREGRIND_LIBS_PPC32_LINUX) $(TOOL_LDADD_COMMON) --- valgrind-3.1.0/coregrind/Makefile.in.jj 2005-11-26 08:40:02.000000000 -0500 +++ valgrind-3.1.0/coregrind/Makefile.in 2006-01-09 12:05:12.000000000 -0500 @@ -501,7 +501,7 @@ AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M3 AM_CCASFLAGS_X86_LINUX = $(add_includes_x86_linux) @FLAG_M32@ -g AM_CPPFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) \ -DVG_LIBDIR="\"$(valdir)"\" -AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) +AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer -fpie @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -m64 -g AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) \ -DVG_LIBDIR="\"$(valdir)"\" @@ -683,7 +683,7 @@ libreplacemalloc_toolpreload_x86_linux_a libreplacemalloc_toolpreload_x86_linux_a_CFLAGS = $(AM_CFLAGS_X86_LINUX) -fpic -fno-omit-frame-pointer libreplacemalloc_toolpreload_amd64_linux_a_SOURCES = m_replacemalloc/vg_replace_malloc.c libreplacemalloc_toolpreload_amd64_linux_a_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -libreplacemalloc_toolpreload_amd64_linux_a_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fpic -fno-omit-frame-pointer +libreplacemalloc_toolpreload_amd64_linux_a_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fno-pie -fpic -fno-omit-frame-pointer libreplacemalloc_toolpreload_ppc32_linux_a_SOURCES = m_replacemalloc/vg_replace_malloc.c libreplacemalloc_toolpreload_ppc32_linux_a_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) libreplacemalloc_toolpreload_ppc32_linux_a_CFLAGS = $(AM_CFLAGS_PPC32_LINUX) -fpic -fno-omit-frame-pointer @@ -694,7 +694,7 @@ vgpreload_core_x86_linux_so_CFLAGS = $(A vgpreload_core_x86_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_X86_LINUX) vgpreload_core_amd64_linux_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) vgpreload_core_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_core_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) +vgpreload_core_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fno-pie $(AM_CFLAGS_PIC) vgpreload_core_amd64_linux_so_LDFLAGS = $(PRELOAD_LDFLAGS_AMD64_LINUX) vgpreload_core_ppc32_linux_so_SOURCES = $(VGPRELOAD_CORE_SOURCES_COMMON) vgpreload_core_ppc32_linux_so_CPPFLAGS = $(AM_CPPFLAGS_PPC32_LINUX) --- valgrind-3.1.0/none/Makefile.in.jj 2005-11-26 08:40:12.000000000 -0500 +++ valgrind-3.1.0/none/Makefile.in 2006-01-09 12:05:12.000000000 -0500 @@ -256,7 +256,7 @@ AM_CPPFLAGS_X86_LINUX = $(add_includes_x AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_X86_LINUX = $(add_includes_x86_linux) @FLAG_M32@ -g AM_CPPFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) +AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer -fpie @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -m64 -g AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) AM_CFLAGS_PPC32_LINUX = $(WERROR) $(AM_CFLAGS_BASE) @@ -297,7 +297,7 @@ TOOL_LDFLAGS_X86_LINUX = \ TOOL_LDADD_AMD64_LINUX = $(COREGRIND_LIBS_AMD64_LINUX) $(TOOL_LDADD_COMMON) TOOL_LDFLAGS_AMD64_LINUX = \ - $(TOOL_LDFLAGS_COMMON) -m64 \ + $(TOOL_LDFLAGS_COMMON) -m64 -B$(top_builddir)/pie_crtfiles/ \ -Wl,-T,$(top_builddir)/valt_load_address_amd64_linux.lds TOOL_LDADD_PPC32_LINUX = $(COREGRIND_LIBS_PPC32_LINUX) $(TOOL_LDADD_COMMON) --- valgrind-3.1.0/configure.jj 2005-11-26 08:40:17.000000000 -0500 +++ valgrind-3.1.0/configure 2006-01-09 11:40:50.000000000 -0500 @@ -3996,11 +3996,12 @@ echo "${ECHO_T}ok (${host_cpu})" >&6 echo "$as_me:$LINENO: result: ok (${host_cpu})" >&5 echo "${ECHO_T}ok (${host_cpu})" >&6 VG_ARCH="amd64" - # XXX: relocations under amd64's "small model" are 32-bit signed - # quantities; therefore going above 0x7fffffff doesn't work... this is - # a problem. - valt_load_address_normal="0x70000000" - valt_load_address_inner="0x60000000" + valt_load_address_normal="0x60b0000000" + valt_load_address_inner="0x60a0000000" + mkdir -p pie_crtfiles + cp -a `$CC -print-file-name=crtbeginS.o` pie_crtfiles/crtbegin.o + cp -a `$CC -print-file-name=crtendS.o` pie_crtfiles/crtend.o + cp -a `$CC -print-file-name=Scrt1.o` pie_crtfiles/crt1.o ;; powerpc*) --- valgrind-3.1.0/massif/Makefile.in.jj 2005-11-26 08:40:07.000000000 -0500 +++ valgrind-3.1.0/massif/Makefile.in 2006-01-09 12:05:12.000000000 -0500 @@ -277,7 +277,7 @@ AM_CPPFLAGS_X86_LINUX = $(add_includes_x AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_X86_LINUX = $(add_includes_x86_linux) @FLAG_M32@ -g AM_CPPFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) +AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer -fpie @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -m64 -g AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) AM_CFLAGS_PPC32_LINUX = $(WERROR) $(AM_CFLAGS_BASE) @@ -318,7 +318,7 @@ TOOL_LDFLAGS_X86_LINUX = \ TOOL_LDADD_AMD64_LINUX = $(COREGRIND_LIBS_AMD64_LINUX) $(TOOL_LDADD_COMMON) TOOL_LDFLAGS_AMD64_LINUX = \ - $(TOOL_LDFLAGS_COMMON) -m64 \ + $(TOOL_LDFLAGS_COMMON) -m64 -B$(top_builddir)/pie_crtfiles/ \ -Wl,-T,$(top_builddir)/valt_load_address_amd64_linux.lds TOOL_LDADD_PPC32_LINUX = $(COREGRIND_LIBS_PPC32_LINUX) $(TOOL_LDADD_COMMON) @@ -355,7 +355,7 @@ vgpreload_massif_x86_linux_so_LDFLAGS = vgpreload_massif_amd64_linux_so_SOURCES = vgpreload_massif_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_massif_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) +vgpreload_massif_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fno-pie $(AM_CFLAGS_PIC) vgpreload_massif_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) vgpreload_massif_amd64_linux_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_AMD64_LINUX) \ --- valgrind-3.1.0/memcheck/Makefile.in.jj 2005-11-26 08:40:08.000000000 -0500 +++ valgrind-3.1.0/memcheck/Makefile.in 2006-01-09 12:05:12.000000000 -0500 @@ -304,7 +304,7 @@ AM_CPPFLAGS_X86_LINUX = $(add_includes_x AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_X86_LINUX = $(add_includes_x86_linux) @FLAG_M32@ -g AM_CPPFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) +AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer -fpie @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -m64 -g AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) AM_CFLAGS_PPC32_LINUX = $(WERROR) $(AM_CFLAGS_BASE) @@ -345,7 +345,7 @@ TOOL_LDFLAGS_X86_LINUX = \ TOOL_LDADD_AMD64_LINUX = $(COREGRIND_LIBS_AMD64_LINUX) $(TOOL_LDADD_COMMON) TOOL_LDFLAGS_AMD64_LINUX = \ - $(TOOL_LDFLAGS_COMMON) -m64 \ + $(TOOL_LDFLAGS_COMMON) -m64 -B$(top_builddir)/pie_crtfiles/ \ -Wl,-T,$(top_builddir)/valt_load_address_amd64_linux.lds TOOL_LDADD_PPC32_LINUX = $(COREGRIND_LIBS_PPC32_LINUX) $(TOOL_LDADD_COMMON) @@ -384,7 +384,7 @@ vgpreload_memcheck_x86_linux_so_LDFLAGS vgpreload_memcheck_amd64_linux_so_SOURCES = $(VGPRELOAD_MEMCHECK_SOURCES_COMMON) vgpreload_memcheck_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_memcheck_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) -O2 +vgpreload_memcheck_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fno-pie $(AM_CFLAGS_PIC) -O2 vgpreload_memcheck_amd64_linux_so_CCASFLAGS = $(AM_CCASFLAGS_AMD64_LINUX) vgpreload_memcheck_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) vgpreload_memcheck_amd64_linux_so_LDFLAGS = \ --- valgrind-3.1.0/cachegrind/Makefile.in.jj 2005-11-26 08:39:56.000000000 -0500 +++ valgrind-3.1.0/cachegrind/Makefile.in 2006-01-09 12:05:12.000000000 -0500 @@ -268,7 +268,7 @@ AM_CPPFLAGS_X86_LINUX = $(add_includes_x AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_X86_LINUX = $(add_includes_x86_linux) @FLAG_M32@ -g AM_CPPFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) +AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer -fpie @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -m64 -g AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) AM_CFLAGS_PPC32_LINUX = $(WERROR) $(AM_CFLAGS_BASE) @@ -309,7 +309,7 @@ TOOL_LDFLAGS_X86_LINUX = \ TOOL_LDADD_AMD64_LINUX = $(COREGRIND_LIBS_AMD64_LINUX) $(TOOL_LDADD_COMMON) TOOL_LDFLAGS_AMD64_LINUX = \ - $(TOOL_LDFLAGS_COMMON) -m64 \ + $(TOOL_LDFLAGS_COMMON) -m64 -B$(top_builddir)/pie_crtfiles/ \ -Wl,-T,$(top_builddir)/valt_load_address_amd64_linux.lds TOOL_LDADD_PPC32_LINUX = $(COREGRIND_LIBS_PPC32_LINUX) $(TOOL_LDADD_COMMON) --- valgrind-3.1.0/helgrind/Makefile.in.jj 2005-11-26 08:40:04.000000000 -0500 +++ valgrind-3.1.0/helgrind/Makefile.in 2006-01-09 12:05:12.000000000 -0500 @@ -288,7 +288,7 @@ AM_CPPFLAGS_X86_LINUX = $(add_includes_x AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_X86_LINUX = $(add_includes_x86_linux) @FLAG_M32@ -g AM_CPPFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) +AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer -fpie @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -m64 -g AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) AM_CFLAGS_PPC32_LINUX = $(WERROR) $(AM_CFLAGS_BASE) @@ -329,7 +329,7 @@ TOOL_LDFLAGS_X86_LINUX = \ TOOL_LDADD_AMD64_LINUX = $(COREGRIND_LIBS_AMD64_LINUX) $(TOOL_LDADD_COMMON) TOOL_LDFLAGS_AMD64_LINUX = \ - $(TOOL_LDFLAGS_COMMON) -m64 \ + $(TOOL_LDFLAGS_COMMON) -m64 -B$(top_builddir)/pie_crtfiles/ \ -Wl,-T,$(top_builddir)/valt_load_address_amd64_linux.lds TOOL_LDADD_PPC32_LINUX = $(COREGRIND_LIBS_PPC32_LINUX) $(TOOL_LDADD_COMMON) @@ -366,7 +366,7 @@ vgpreload_helgrind_x86_linux_so_LDFLAGS vgpreload_helgrind_amd64_linux_so_SOURCES = vgpreload_helgrind_amd64_linux_so_CPPFLAGS = $(AM_CPPFLAGS_AMD64_LINUX) -vgpreload_helgrind_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) $(AM_CFLAGS_PIC) +vgpreload_helgrind_amd64_linux_so_CFLAGS = $(AM_CFLAGS_AMD64_LINUX) -fno-pie $(AM_CFLAGS_PIC) vgpreload_helgrind_amd64_linux_so_DEPENDENCIES = $(LIBREPLACEMALLOC_AMD64_LINUX) vgpreload_helgrind_amd64_linux_so_LDFLAGS = \ $(PRELOAD_LDFLAGS_AMD64_LINUX) \ --- valgrind-3.1.0/Makefile.in.jj 2005-11-26 08:40:16.000000000 -0500 +++ valgrind-3.1.0/Makefile.in 2006-01-09 12:05:12.000000000 -0500 @@ -869,7 +869,7 @@ valt_load_address_x86_linux.lds: Makefil $(CC) @FLAG_M32@ -Wl,--verbose -nostdlib 2>&1 | sed \ -e '1,/^=====\+$$/d' \ -e '/^=====\+$$/d' \ - -e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/valt_load_address/g' > $@ \ + -e '/\. = 0x[0-9A-Fa-f]\+ + SIZEOF_HEADERS/s/0x[0-9A-Fa-f]\+/(valt_load_address \& 0xffffffff)/g' > $@ \ || rm -f $@ valt_load_address_amd64_linux.lds: Makefile --- valgrind-3.1.0/auxprogs/Makefile.in.jj 2005-11-26 08:39:55.000000000 -0500 +++ valgrind-3.1.0/auxprogs/Makefile.in 2006-01-09 12:05:12.000000000 -0500 @@ -230,7 +230,7 @@ AM_CPPFLAGS_X86_LINUX = $(add_includes_x AM_CFLAGS_X86_LINUX = $(WERROR) @FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_X86_LINUX = $(add_includes_x86_linux) @FLAG_M32@ -g AM_CPPFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) +AM_CFLAGS_AMD64_LINUX = $(WERROR) -m64 -fomit-frame-pointer -fpie @PREFERRED_STACK_BOUNDARY@ $(AM_CFLAGS_BASE) AM_CCASFLAGS_AMD64_LINUX = $(add_includes_amd64_linux) -m64 -g AM_CPPFLAGS_PPC32_LINUX = $(add_includes_ppc32_linux) AM_CFLAGS_PPC32_LINUX = $(WERROR) $(AM_CFLAGS_BASE) valgrind-3.1.0-amd64-speedup.patch: toIR.c | 385 ++++++++++++++++++++++++++++++++--------------------------------- 1 files changed, 193 insertions(+), 192 deletions(-) --- NEW FILE valgrind-3.1.0-amd64-speedup.patch --- Replaces 188 insn[0] == 0x0F tests with just one, allows for insn[0] != 0x0F to quickly skip all the 188 if clauses. I haven't analyzed if the compiler could possibly figure this out itself, certainly it would be hard. --- valgrind-3.1.0/VEX/priv/guest-amd64/toIR.c.jj 2005-08-12 20:08:15.000000000 +0200 +++ valgrind-3.1.0/VEX/priv/guest-amd64/toIR.c 2005-08-12 20:26:31.000000000 +0200 @@ -8055,13 +8055,14 @@ DisResult disInstr_AMD64_WRK ( insn = (UChar*)&guest_code[delta]; + if (insn[0] == 0x0F) { //.. /* Treat fxsave specially. It should be doable even on an SSE0 //.. (Pentium-II class) CPU. Hence be prepared to handle it on //.. any subarchitecture variant. //.. */ //.. //.. /* 0F AE /0 = FXSAVE m512 -- write x87 and SSE state to memory */ -//.. if (sz == 4 && insn[0] == 0x0F && insn[1] == 0xAE +//.. if (sz == 4 /* && insn[0] == 0x0F */ && insn[1] == 0xAE //.. && !epartIsReg(insn[2]) && gregOfRM(insn[2]) == 0) { //.. modrm = getUChar(delta+2); //.. vassert(sz == 4); @@ -8141,42 +8142,42 @@ DisResult disInstr_AMD64_WRK ( /* 0F 58 = ADDPS -- add 32Fx4 from R/M to R */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x58) { + /* && insn[0] == 0x0F */ && insn[1] == 0x58) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "addps", Iop_Add32Fx4 ); goto decode_success; } /* F3 0F 58 = ADDSS -- add 32F0x4 from R/M to R */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x58) { + /* && insn[0] == 0x0F */ && insn[1] == 0x58) { delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "addss", Iop_Add32F0x4 ); goto decode_success; } /* 0F 55 = ANDNPS -- G = (not G) and E */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x55) { + /* && insn[0] == 0x0F */ && insn[1] == 0x55) { delta = dis_SSE_E_to_G_all_invG( pfx, delta+2, "andnps", Iop_AndV128 ); goto decode_success; } /* 0F 54 = ANDPS -- G = G and E */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x54) { + /* && insn[0] == 0x0F */ && insn[1] == 0x54) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "andps", Iop_AndV128 ); goto decode_success; } /* 0F C2 = CMPPS -- 32Fx4 comparison from R/M to R */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xC2) { + /* && insn[0] == 0x0F */ && insn[1] == 0xC2) { delta = dis_SSEcmp_E_to_G( pfx, delta+2, "cmpps", True, 4 ); goto decode_success; } /* F3 0F C2 = CMPSS -- 32F0x4 comparison from R/M to R */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xC2) { + /* && insn[0] == 0x0F */ && insn[1] == 0xC2) { delta = dis_SSEcmp_E_to_G( pfx, delta+2, "cmpss", False, 4 ); goto decode_success; } @@ -8184,7 +8185,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 2F = COMISS -- 32F0x4 comparison G,E, and set ZCP */ /* 0F 2E = UCOMISS -- 32F0x4 comparison G,E, and set ZCP */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && (insn[1] == 0x2F || insn[1] == 0x2E)) { + /* && insn[0] == 0x0F */ && (insn[1] == 0x2F || insn[1] == 0x2E)) { IRTemp argL = newTemp(Ity_F32); IRTemp argR = newTemp(Ity_F32); modrm = getUChar(delta+2); @@ -8224,7 +8225,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 2A = CVTPI2PS -- convert 2 x I32 in mem/mmx to 2 x F32 in low half xmm */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x2A) { + /* && insn[0] == 0x0F */ && insn[1] == 0x2A) { IRTemp arg64 = newTemp(Ity_I64); IRTemp rmode = newTemp(Ity_I32); @@ -8266,7 +8267,7 @@ DisResult disInstr_AMD64_WRK ( -- sz==4: convert I32 in mem/ireg to F32 in low quarter xmm -- sz==8: convert I64 in mem/ireg to F32 in low quarter xmm */ if (haveF3no66noF2(pfx) && (sz == 4 || sz == 8) - && insn[0] == 0x0F && insn[1] == 0x2A) { + /* && insn[0] == 0x0F */ && insn[1] == 0x2A) { IRTemp rmode = newTemp(Ity_I32); assign( rmode, get_sse_roundingmode() ); @@ -8321,7 +8322,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 2C = CVTTPS2PI -- convert 2 x F32 in mem/low half xmm to 2 x I32 in mmx, rounding towards zero */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && (insn[1] == 0x2D || insn[1] == 0x2C)) { + /* && insn[0] == 0x0F */ && (insn[1] == 0x2D || insn[1] == 0x2C)) { IRTemp dst64 = newTemp(Ity_I64); IRTemp rmode = newTemp(Ity_I32); IRTemp f32lo = newTemp(Ity_F32); @@ -8385,7 +8386,7 @@ DisResult disInstr_AMD64_WRK ( truncating towards zero */ if (haveF3no66noF2(pfx) - && insn[0] == 0x0F + /* && insn[0] == 0x0F */ && (insn[1] == 0x2D || insn[1] == 0x2C)) { IRTemp rmode = newTemp(Ity_I32); IRTemp f32lo = newTemp(Ity_F32); @@ -8431,20 +8432,20 @@ DisResult disInstr_AMD64_WRK ( /* 0F 5E = DIVPS -- div 32Fx4 from R/M to R */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5E) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5E) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "divps", Iop_Div32Fx4 ); goto decode_success; } /* F3 0F 5E = DIVSS -- div 32F0x4 from R/M to R */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5E) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5E) { delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "divss", Iop_Div32F0x4 ); goto decode_success; } /* 0F AE /2 = LDMXCSR m32 -- load %mxcsr */ - if (insn[0] == 0x0F && insn[1] == 0xAE + if (/* insn[0] == 0x0F && */ insn[1] == 0xAE && haveNo66noF2noF3(pfx) && !epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 2) { @@ -8494,28 +8495,28 @@ DisResult disInstr_AMD64_WRK ( /* 0F 5F = MAXPS -- max 32Fx4 from R/M to R */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5F) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5F) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "maxps", Iop_Max32Fx4 ); goto decode_success; } /* F3 0F 5F = MAXSS -- max 32F0x4 from R/M to R */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5F) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5F) { delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "maxss", Iop_Max32F0x4 ); goto decode_success; } /* 0F 5D = MINPS -- min 32Fx4 from R/M to R */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5D) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5D) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "minps", Iop_Min32Fx4 ); goto decode_success; } /* F3 0F 5D = MINSS -- min 32F0x4 from R/M to R */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5D) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5D) { delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "minss", Iop_Min32F0x4 ); goto decode_success; } @@ -8523,7 +8524,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 28 = MOVAPS -- move from E (mem or xmm) to G (xmm). */ /* 0F 10 = MOVUPS -- move from E (mem or xmm) to G (xmm). */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && (insn[1] == 0x28 || insn[1] == 0x10)) { + /* && insn[0] == 0x0F */ && (insn[1] == 0x28 || insn[1] == 0x10)) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { putXMMReg( gregOfRexRM(pfx,modrm), @@ -8545,7 +8546,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 29 = MOVAPS -- move from G (xmm) to E (mem or xmm). */ /* 0F 11 = MOVUPS -- move from G (xmm) to E (mem or xmm). */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && (insn[1] == 0x29 || insn[1] == 0x11)) { + /* && insn[0] == 0x0F */ && (insn[1] == 0x29 || insn[1] == 0x11)) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { /* fall through; awaiting test case */ @@ -8562,7 +8563,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 16 = MOVHPS -- move from mem to high half of XMM. */ /* 0F 16 = MOVLHPS -- move from lo half to hi half of XMM. */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x16) { + /* && insn[0] == 0x0F */ && insn[1] == 0x16) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { delta += 2+1; @@ -8583,7 +8584,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 17 = MOVHPS -- move from high half of XMM to mem. */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x17) { + /* && insn[0] == 0x0F */ && insn[1] == 0x17) { if (!epartIsReg(insn[2])) { delta += 2; addr = disAMode ( &alen, pfx, delta, dis_buf, 0 ); @@ -8601,7 +8602,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 12 = MOVLPS -- move from mem to low half of XMM. */ /* OF 12 = MOVHLPS -- from from hi half to lo half of XMM. */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x12) { + /* && insn[0] == 0x0F */ && insn[1] == 0x12) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { delta += 2+1; @@ -8623,7 +8624,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 13 = MOVLPS -- move from low half of XMM to mem. */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x13) { + /* && insn[0] == 0x0F */ && insn[1] == 0x13) { if (!epartIsReg(insn[2])) { delta += 2; addr = disAMode ( &alen, pfx, delta, dis_buf, 0 ); @@ -8641,7 +8642,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 50 = MOVMSKPS - move 4 sign bits from 4 x F32 in xmm(E) to 4 lowest bits of ireg(G) */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x50) { + /* && insn[0] == 0x0F */ && insn[1] == 0x50) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { Int src; @@ -8681,7 +8682,7 @@ DisResult disInstr_AMD64_WRK ( if ( ( (haveNo66noF2noF3(pfx) && sz == 4) || (have66noF2noF3(pfx) && sz == 2) ) - && insn[0] == 0x0F && insn[1] == 0x2B) { + /* && insn[0] == 0x0F */ && insn[1] == 0x2B) { modrm = getUChar(delta+2); if (!epartIsReg(modrm)) { addr = disAMode ( &alen, pfx, delta+2, dis_buf, 0 ); @@ -8702,7 +8703,7 @@ DisResult disInstr_AMD64_WRK ( So we just leave them alone. */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xE7) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE7) { modrm = getUChar(delta+2); if (!epartIsReg(modrm)) { /* do_MMX_preamble(); Intel docs don't specify this */ @@ -8719,7 +8720,7 @@ DisResult disInstr_AMD64_WRK ( /* F3 0F 10 = MOVSS -- move 32 bits from E (mem or lo 1/4 xmm) to G (lo 1/4 xmm). If E is mem, upper 3/4 of G is zeroed out. */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x10) { + /* && insn[0] == 0x0F */ && insn[1] == 0x10) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { putXMMRegLane32( gregOfRexRM(pfx,modrm), 0, @@ -8742,7 +8743,7 @@ DisResult disInstr_AMD64_WRK ( /* F3 0F 11 = MOVSS -- move 32 bits from G (lo 1/4 xmm) to E (mem or lo 1/4 xmm). */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x11) { + /* && insn[0] == 0x0F */ && insn[1] == 0x11) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { /* fall through, we don't yet have a test case */ @@ -8759,21 +8760,21 @@ DisResult disInstr_AMD64_WRK ( /* 0F 59 = MULPS -- mul 32Fx4 from R/M to R */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x59) { + /* && insn[0] == 0x0F */ && insn[1] == 0x59) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "mulps", Iop_Mul32Fx4 ); goto decode_success; } /* F3 0F 59 = MULSS -- mul 32F0x4 from R/M to R */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x59) { + /* && insn[0] == 0x0F */ && insn[1] == 0x59) { delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "mulss", Iop_Mul32F0x4 ); goto decode_success; } /* 0F 56 = ORPS -- G = G and E */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x56) { + /* && insn[0] == 0x0F */ && insn[1] == 0x56) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "orps", Iop_OrV128 ); goto decode_success; } @@ -8781,7 +8782,7 @@ DisResult disInstr_AMD64_WRK ( /* ***--- this is an MMX class insn introduced in SSE1 ---*** */ /* 0F E0 = PAVGB -- 8x8 unsigned Packed Average, with rounding */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xE0) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE0) { do_MMX_preamble(); delta = dis_MMXop_regmem_to_reg ( pfx, delta+2, insn[1], "pavgb", False ); @@ -8791,7 +8792,7 @@ DisResult disInstr_AMD64_WRK ( /* ***--- this is an MMX class insn introduced in SSE1 ---*** */ /* 0F E3 = PAVGW -- 16x4 unsigned Packed Average, with rounding */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xE3) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE3) { do_MMX_preamble(); delta = dis_MMXop_regmem_to_reg ( pfx, delta+2, insn[1], "pavgw", False ); @@ -8802,7 +8803,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F C5 = PEXTRW -- extract 16-bit field from mmx(E) and put zero-extend of it in ireg(G). */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xC5) { + /* && insn[0] == 0x0F */ && insn[1] == 0xC5) { modrm = insn[2]; if (epartIsReg(modrm)) { IRTemp sV = newTemp(Ity_I64); @@ -8834,7 +8835,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F C4 = PINSRW -- get 16 bits from E(mem or low half ireg) and put it into the specified lane of mmx(G). */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xC4) { + /* && insn[0] == 0x0F */ && insn[1] == 0xC4) { /* Use t0 .. t3 to hold the 4 original 16-bit lanes of the mmx reg. t4 is the new lane value. t5 is the original mmx value. t6 is the new mmx value. */ @@ -8879,7 +8880,7 @@ DisResult disInstr_AMD64_WRK ( /* ***--- this is an MMX class insn introduced in SSE1 ---*** */ /* 0F EE = PMAXSW -- 16x4 signed max */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xEE) { + /* && insn[0] == 0x0F */ && insn[1] == 0xEE) { do_MMX_preamble(); delta = dis_MMXop_regmem_to_reg ( pfx, delta+2, insn[1], "pmaxsw", False ); @@ -8889,7 +8890,7 @@ DisResult disInstr_AMD64_WRK ( /* ***--- this is an MMX class insn introduced in SSE1 ---*** */ /* 0F DE = PMAXUB -- 8x8 unsigned max */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xDE) { + /* && insn[0] == 0x0F */ && insn[1] == 0xDE) { do_MMX_preamble(); delta = dis_MMXop_regmem_to_reg ( pfx, delta+2, insn[1], "pmaxub", False ); @@ -8899,7 +8900,7 @@ DisResult disInstr_AMD64_WRK ( /* ***--- this is an MMX class insn introduced in SSE1 ---*** */ /* 0F EA = PMINSW -- 16x4 signed min */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xEA) { + /* && insn[0] == 0x0F */ && insn[1] == 0xEA) { do_MMX_preamble(); delta = dis_MMXop_regmem_to_reg ( pfx, delta+2, insn[1], "pminsw", False ); @@ -8909,7 +8910,7 @@ DisResult disInstr_AMD64_WRK ( /* ***--- this is an MMX class insn introduced in SSE1 ---*** */ /* 0F DA = PMINUB -- 8x8 unsigned min */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xDA) { + /* && insn[0] == 0x0F */ && insn[1] == 0xDA) { do_MMX_preamble(); delta = dis_MMXop_regmem_to_reg ( pfx, delta+2, insn[1], "pminub", False ); @@ -8921,7 +8922,7 @@ DisResult disInstr_AMD64_WRK ( mmx(G), turn them into a byte, and put zero-extend of it in ireg(G). */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xD7) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD7) { modrm = insn[2]; if (epartIsReg(modrm)) { do_MMX_preamble(); @@ -8945,7 +8946,7 @@ DisResult disInstr_AMD64_WRK ( /* ***--- this is an MMX class insn introduced in SSE1 ---*** */ /* 0F E4 = PMULUH -- 16x4 hi-half of unsigned widening multiply */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xE4) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE4) { do_MMX_preamble(); delta = dis_MMXop_regmem_to_reg ( pfx, delta+2, insn[1], "pmuluh", False ); @@ -8956,7 +8957,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 18 /1 = PREFETCH0 -- with various different hints */ /* 0F 18 /2 = PREFETCH1 */ /* 0F 18 /3 = PREFETCH2 */ - if (insn[0] == 0x0F && insn[1] == 0x18 + if (/* insn[0] == 0x0F && */ insn[1] == 0x18 && haveNo66noF2noF3(pfx) && !epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) >= 0 && gregLO3ofRM(insn[2]) <= 3) { @@ -8983,7 +8984,7 @@ DisResult disInstr_AMD64_WRK ( /* ***--- this is an MMX class insn introduced in SSE1 ---*** */ /* 0F F6 = PSADBW -- sum of 8Ux8 absolute differences */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xF6) { + /* && insn[0] == 0x0F */ && insn[1] == 0xF6) { do_MMX_preamble(); delta = dis_MMXop_regmem_to_reg ( pfx, delta+2, insn[1], "psadbw", False ); @@ -8993,7 +8994,7 @@ DisResult disInstr_AMD64_WRK ( /* ***--- this is an MMX class insn introduced in SSE1 ---*** */ /* 0F 70 = PSHUFW -- rearrange 4x16 from E(mmx or mem) to G(mmx) */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x70) { + /* && insn[0] == 0x0F */ && insn[1] == 0x70) { Int order; IRTemp sV, dV, s3, s2, s1, s0; s3 = s2 = s1 = s0 = IRTemp_INVALID; @@ -9032,7 +9033,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 53 = RCPPS -- approx reciprocal 32Fx4 from R/M to R */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x53) { + /* && insn[0] == 0x0F */ && insn[1] == 0x53) { delta = dis_SSE_E_to_G_unary_all( pfx, delta+2, "rcpps", Iop_Recip32Fx4 ); goto decode_success; @@ -9040,7 +9041,7 @@ DisResult disInstr_AMD64_WRK ( /* F3 0F 53 = RCPSS -- approx reciprocal 32F0x4 from R/M to R */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x53) { + /* && insn[0] == 0x0F */ && insn[1] == 0x53) { delta = dis_SSE_E_to_G_unary_lo32( pfx, delta+2, "rcpss", Iop_Recip32F0x4 ); goto decode_success; @@ -9048,7 +9049,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 52 = RSQRTPS -- approx reciprocal sqrt 32Fx4 from R/M to R */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x52) { + /* && insn[0] == 0x0F */ && insn[1] == 0x52) { delta = dis_SSE_E_to_G_unary_all( pfx, delta+2, "rsqrtps", Iop_RSqrt32Fx4 ); goto decode_success; @@ -9056,7 +9057,7 @@ DisResult disInstr_AMD64_WRK ( /* F3 0F 52 = RSQRTSS -- approx reciprocal sqrt 32F0x4 from R/M to R */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x52) { + /* && insn[0] == 0x0F */ && insn[1] == 0x52) { delta = dis_SSE_E_to_G_unary_lo32( pfx, delta+2, "rsqrtss", Iop_RSqrt32F0x4 ); goto decode_success; @@ -9064,7 +9065,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F AE /7 = SFENCE -- flush pending operations to memory */ if (haveNo66noF2noF3(pfx) - && insn[0] == 0x0F && insn[1] == 0xAE + /* && insn[0] == 0x0F */ && insn[1] == 0xAE && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 7 && sz == 4) { delta += 3; @@ -9077,7 +9078,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F C6 /r ib = SHUFPS -- shuffle packed F32s */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xC6) { + /* && insn[0] == 0x0F */ && insn[1] == 0xC6) { Int select; IRTemp sV, dV; IRTemp s3, s2, s1, s0, d3, d2, d1, d0; @@ -9125,7 +9126,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 51 = SQRTPS -- approx sqrt 32Fx4 from R/M to R */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x51) { + /* && insn[0] == 0x0F */ && insn[1] == 0x51) { delta = dis_SSE_E_to_G_unary_all( pfx, delta+2, "sqrtps", Iop_Sqrt32Fx4 ); goto decode_success; @@ -9133,14 +9134,14 @@ DisResult disInstr_AMD64_WRK ( /* F3 0F 51 = SQRTSS -- approx sqrt 32F0x4 from R/M to R */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x51) { + /* && insn[0] == 0x0F */ && insn[1] == 0x51) { delta = dis_SSE_E_to_G_unary_lo32( pfx, delta+2, "sqrtss", Iop_Sqrt32F0x4 ); goto decode_success; } /* 0F AE /3 = STMXCSR m32 -- store %mxcsr */ - if (insn[0] == 0x0F && insn[1] == 0xAE + if (/* insn[0] == 0x0F && */ insn[1] == 0xAE && haveNo66noF2noF3(pfx) && !epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 3) { @@ -9168,14 +9169,14 @@ DisResult disInstr_AMD64_WRK ( /* 0F 5C = SUBPS -- sub 32Fx4 from R/M to R */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5C) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5C) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "subps", Iop_Sub32Fx4 ); goto decode_success; } /* F3 0F 5C = SUBSS -- sub 32F0x4 from R/M to R */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5C) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5C) { delta = dis_SSE_E_to_G_lo32( pfx, delta+2, "subss", Iop_Sub32F0x4 ); goto decode_success; } @@ -9184,7 +9185,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 14 = UNPCKLPS -- unpack and interleave low part F32s */ /* These just appear to be special cases of SHUFPS */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && (insn[1] == 0x15 || insn[1] == 0x14)) { + /* && insn[0] == 0x0F */ && (insn[1] == 0x15 || insn[1] == 0x14)) { IRTemp sV, dV; IRTemp s3, s2, s1, s0, d3, d2, d1, d0; Bool hi = toBool(insn[1] == 0x15); @@ -9223,7 +9224,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 57 = XORPS -- G = G and E */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x57) { + /* && insn[0] == 0x0F */ && insn[1] == 0x57) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "xorps", Iop_XorV128 ); goto decode_success; } @@ -9238,13 +9239,13 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 58 = ADDPD -- add 32Fx4 from R/M to R */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x58) { + /* && insn[0] == 0x0F */ && insn[1] == 0x58) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "addpd", Iop_Add64Fx2 ); goto decode_success; } /* F2 0F 58 = ADDSD -- add 64F0x2 from R/M to R */ - if (haveF2no66noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x58) { + if (haveF2no66noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x58) { vassert(sz == 4); delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "addsd", Iop_Add64F0x2 ); goto decode_success; @@ -9252,28 +9253,28 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 55 = ANDNPD -- G = (not G) and E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x55) { + /* && insn[0] == 0x0F */ && insn[1] == 0x55) { delta = dis_SSE_E_to_G_all_invG( pfx, delta+2, "andnpd", Iop_AndV128 ); goto decode_success; } /* 66 0F 54 = ANDPD -- G = G and E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x54) { + /* && insn[0] == 0x0F */ && insn[1] == 0x54) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "andpd", Iop_AndV128 ); goto decode_success; } /* 66 0F C2 = CMPPD -- 64Fx2 comparison from R/M to R */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xC2) { + /* && insn[0] == 0x0F */ && insn[1] == 0xC2) { delta = dis_SSEcmp_E_to_G( pfx, delta+2, "cmppd", True, 8 ); goto decode_success; } /* F2 0F C2 = CMPSD -- 64F0x2 comparison from R/M to R */ if (haveF2no66noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xC2) { + /* && insn[0] == 0x0F */ && insn[1] == 0xC2) { delta = dis_SSEcmp_E_to_G( pfx, delta+2, "cmpsd", False, 8 ); goto decode_success; } @@ -9281,7 +9282,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 2F = COMISD -- 64F0x2 comparison G,E, and set ZCP */ /* 66 0F 2E = UCOMISD -- 64F0x2 comparison G,E, and set ZCP */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && (insn[1] == 0x2F || insn[1] == 0x2E)) { + /* && insn[0] == 0x0F */ && (insn[1] == 0x2F || insn[1] == 0x2E)) { IRTemp argL = newTemp(Ity_F64); IRTemp argR = newTemp(Ity_F64); modrm = getUChar(delta+2); @@ -9318,7 +9319,7 @@ DisResult disInstr_AMD64_WRK ( /* F3 0F E6 = CVTDQ2PD -- convert 2 x I32 in mem/lo half xmm to 2 x F64 in xmm(G) */ - if (haveF3no66noF2(pfx) && insn[0] == 0x0F && insn[1] == 0xE6) { + if (haveF3no66noF2(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0xE6) { IRTemp arg64 = newTemp(Ity_I64); if (sz != 4) goto decode_failure; @@ -9352,7 +9353,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 5B = CVTDQ2PS -- convert 4 x I32 in mem/xmm to 4 x F32 in xmm(G) */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5B) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5B) { IRTemp argV = newTemp(Ity_V128); IRTemp rmode = newTemp(Ity_I32); @@ -9395,7 +9396,7 @@ DisResult disInstr_AMD64_WRK ( if ( ( (haveF2no66noF3(pfx) && sz == 4) || (have66noF2noF3(pfx) && sz == 2) ) - && insn[0] == 0x0F && insn[1] == 0xE6) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE6) { IRTemp argV = newTemp(Ity_V128); IRTemp rmode = newTemp(Ity_I32); Bool r2zero = toBool(sz == 2); @@ -9448,7 +9449,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 2C = CVTTPD2PI -- convert 2 x F64 in mem/xmm to 2 x I32 in mmx, rounding towards zero */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && (insn[1] == 0x2D || insn[1] == 0x2C)) { + /* && insn[0] == 0x0F */ && (insn[1] == 0x2D || insn[1] == 0x2C)) { IRTemp dst64 = newTemp(Ity_I64); IRTemp rmode = newTemp(Ity_I32); IRTemp f64lo = newTemp(Ity_F64); @@ -9502,7 +9503,7 @@ DisResult disInstr_AMD64_WRK ( been nicer to merge them together, but the insn[] offsets differ by one. */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x5A) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5A) { IRTemp argV = newTemp(Ity_V128); IRTemp rmode = newTemp(Ity_I32); @@ -9545,7 +9546,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 2A = CVTPI2PD -- convert 2 x I32 in mem/mmx to 2 x F64 in xmm(G) */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x2A) { + /* && insn[0] == 0x0F */ && insn[1] == 0x2A) { IRTemp arg64 = newTemp(Ity_I64); modrm = getUChar(delta+2); @@ -9583,7 +9584,7 @@ DisResult disInstr_AMD64_WRK ( if ( ( (have66noF2noF3(pfx) && sz == 2) || (haveF3no66noF2(pfx) && sz == 4) ) - && insn[0] == 0x0F && insn[1] == 0x5B) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5B) { IRTemp argV = newTemp(Ity_V128); IRTemp rmode = newTemp(Ity_I32); Bool r2zero = toBool(sz == 4); @@ -9631,7 +9632,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F 5A = CVTPS2PD -- convert 2 x F32 in low half mem/xmm to 2 x F64 in xmm(G). */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5A) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5A) { IRTemp f32lo = newTemp(Ity_F32); IRTemp f32hi = newTemp(Ity_F32); @@ -9673,7 +9674,7 @@ DisResult disInstr_AMD64_WRK ( truncating towards zero */ if (haveF2no66noF3(pfx) - && insn[0] == 0x0F + /* && insn[0] == 0x0F */ && (insn[1] == 0x2D || insn[1] == 0x2C)) { IRTemp rmode = newTemp(Ity_I32); IRTemp f64lo = newTemp(Ity_F64); @@ -9716,7 +9717,7 @@ DisResult disInstr_AMD64_WRK ( /* F2 0F 5A = CVTSD2SS -- convert F64 in mem/low half xmm to F32 in low 1/4 xmm(G), according to prevailing SSE rounding mode */ if (haveF2no66noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5A) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5A) { IRTemp rmode = newTemp(Ity_I32); IRTemp f64lo = newTemp(Ity_F64); vassert(sz == 4); @@ -9749,7 +9750,7 @@ DisResult disInstr_AMD64_WRK ( when sz==8 -- convert I64 in mem/ireg to F64 in low half xmm */ if (haveF2no66noF3(pfx) && (sz == 4 || sz == 8) - && insn[0] == 0x0F && insn[1] == 0x2A) { + /* && insn[0] == 0x0F */ && insn[1] == 0x2A) { modrm = getUChar(delta+2); if (sz == 4) { @@ -9801,7 +9802,7 @@ DisResult disInstr_AMD64_WRK ( /* F3 0F 5A = CVTSS2SD -- convert F32 in mem/low 1/4 xmm to F64 in low half xmm(G) */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5A) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5A) { IRTemp f32lo = newTemp(Ity_F32); modrm = getUChar(delta+2); @@ -9826,13 +9827,13 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 5E = DIVPD -- div 64Fx2 from R/M to R */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x5E) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5E) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "divpd", Iop_Div64Fx2 ); goto decode_success; } /* F2 0F 5E = DIVSD -- div 64F0x2 from R/M to R */ - if (haveF2no66noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x5E) { + if (haveF2no66noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x5E) { vassert(sz == 4); delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "divsd", Iop_Div64F0x2 ); goto decode_success; @@ -9841,7 +9842,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F AE /5 = LFENCE -- flush pending operations to memory */ /* 0F AE /6 = MFENCE -- flush pending operations to memory */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xAE + /* && insn[0] == 0x0F */ && insn[1] == 0xAE && epartIsReg(insn[2]) && (gregLO3ofRM(insn[2]) == 5 || gregLO3ofRM(insn[2]) == 6)) { delta += 3; @@ -9854,28 +9855,28 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 5F = MAXPD -- max 64Fx2 from R/M to R */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x5F) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5F) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "maxpd", Iop_Max64Fx2 ); goto decode_success; } /* F2 0F 5F = MAXSD -- max 64F0x2 from R/M to R */ if (haveF2no66noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5F) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5F) { delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "maxsd", Iop_Max64F0x2 ); goto decode_success; } /* 66 0F 5D = MINPD -- min 64Fx2 from R/M to R */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x5D) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5D) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "minpd", Iop_Min64Fx2 ); goto decode_success; } /* F2 0F 5D = MINSD -- min 64F0x2 from R/M to R */ if (haveF2no66noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x5D) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5D) { delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "minsd", Iop_Min64F0x2 ); goto decode_success; } @@ -9884,7 +9885,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 10 = MOVUPD -- move from E (mem or xmm) to G (xmm). */ /* 66 0F 6F = MOVDQA -- move from E (mem or xmm) to G (xmm). */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F + /* && insn[0] == 0x0F */ && (insn[1] == 0x28 || insn[1] == 0x10 || insn[1] == 0x6F)) { HChar* wot = insn[1]==0x28 ? "apd" : insn[1]==0x10 ? "upd" : "dqa"; @@ -9908,7 +9909,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 29 = MOVAPD -- move from G (xmm) to E (mem or xmm). */ /* 66 0F 11 = MOVUPD -- move from G (xmm) to E (mem or xmm). */ - if (have66noF2noF3(pfx) && insn[0] == 0x0F + if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && (insn[1] == 0x29 || insn[1] == 0x11)) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { @@ -9925,7 +9926,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 6E = MOVD from ireg32/m32 to xmm lo 1/4, zeroing high 3/4 of xmm. */ /* or from ireg64/m64 to xmm lo 1/2, zeroing high 1/2 of xmm. */ - if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x6E) { + if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x6E) { vassert(sz == 2 || sz == 8); if (sz == 2) sz = 4; modrm = getUChar(delta+2); @@ -9963,7 +9964,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 7E = MOVD from xmm low 1/4 to ireg32 or m32. */ /* or from xmm low 1/2 to ireg64 or m64. */ - if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x7E) { + if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x7E) { if (sz == 2) sz = 4; vassert(sz == 4 || sz == 8); modrm = getUChar(delta+2); @@ -9995,7 +9996,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 7F = MOVDQA -- move from G (xmm) to E (mem or xmm). */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x7F) { + /* && insn[0] == 0x0F */ && insn[1] == 0x7F) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { delta += 2+1; @@ -10014,7 +10015,7 @@ DisResult disInstr_AMD64_WRK ( /* F3 0F 6F = MOVDQU -- move from E (mem or xmm) to G (xmm). */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x6F) { + /* && insn[0] == 0x0F */ && insn[1] == 0x6F) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { putXMMReg( gregOfRexRM(pfx,modrm), @@ -10035,7 +10036,7 @@ DisResult disInstr_AMD64_WRK ( /* F3 0F 7F = MOVDQU -- move from G (xmm) to E (mem or xmm). */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x7F) { + /* && insn[0] == 0x0F */ && insn[1] == 0x7F) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { goto decode_failure; /* awaiting test case */ @@ -10055,7 +10056,7 @@ DisResult disInstr_AMD64_WRK ( /* F2 0F D6 = MOVDQ2Q -- move from E (lo half xmm, not mem) to G (mmx). */ if (haveF2no66noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xD6) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD6) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { do_MMX_preamble(); @@ -10074,7 +10075,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 16 = MOVHPD -- move from mem to high half of XMM. */ /* These seems identical to MOVHPS. This instruction encoding is completely crazy. */ - if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x16) { + if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x16) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { /* fall through; apparently reg-reg is not possible */ @@ -10091,7 +10092,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 17 = MOVHPD -- move from high half of XMM to mem. */ /* Again, this seems identical to MOVHPS. */ - if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x17) { + if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x17) { if (!epartIsReg(insn[2])) { delta += 2; addr = disAMode ( &alen, pfx, delta, dis_buf, 0 ); @@ -10108,7 +10109,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 12 = MOVLPD -- move from mem to low half of XMM. */ /* Identical to MOVLPS ? */ - if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x12) { + if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x12) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { /* fall through; apparently reg-reg is not possible */ @@ -10126,7 +10127,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 13 = MOVLPD -- move from low half of XMM to mem. */ /* Identical to MOVLPS ? */ - if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x13) { + if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x13) { modrm = getUChar(delta+2); if (!epartIsReg(modrm)) { addr = disAMode ( &alen, pfx, delta+2, dis_buf, 0 ); @@ -10144,7 +10145,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 50 = MOVMSKPD - move 2 sign bits from 2 x F64 in xmm(E) to 2 lowest bits of ireg(G) */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x50) { + /* && insn[0] == 0x0F */ && insn[1] == 0x50) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { Int src; @@ -10171,7 +10172,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F E7 = MOVNTDQ -- for us, just a plain SSE store. */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xE7) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE7) { modrm = getUChar(delta+2); if (!epartIsReg(modrm)) { addr = disAMode ( &alen, pfx, delta+2, dis_buf, 0 ); @@ -10187,7 +10188,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F C3 = MOVNTI -- for us, just a plain ireg store. */ if (haveNo66noF2noF3(pfx) && - insn[0] == 0x0F && insn[1] == 0xC3) { + /* insn[0] == 0x0F && */ insn[1] == 0xC3) { vassert(sz == 4 || sz == 8); modrm = getUChar(delta+2); if (!epartIsReg(modrm)) { @@ -10203,7 +10204,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F D6 = MOVQ -- move 64 bits from G (lo half xmm) to E (mem or lo half xmm). */ - if (have66noF2noF3(pfx) && insn[0] == 0x0F && insn[1] == 0xD6) { + if (have66noF2noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0xD6) { vassert(sz == 2); modrm = getUChar(delta+2); if (epartIsReg(modrm)) { @@ -10222,7 +10223,7 @@ DisResult disInstr_AMD64_WRK ( /* F3 0F D6 = MOVQ2DQ -- move from E (mmx) to G (lo half xmm, zero hi half). */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xD6) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD6) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { do_MMX_preamble(); @@ -10244,10 +10245,10 @@ DisResult disInstr_AMD64_WRK ( G (lo half xmm). If E is mem, upper half of G is zeroed out. If E is reg, upper half of G is unchanged. */ if ( (haveF2no66noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x10) + /* && insn[0] == 0x0F */ && insn[1] == 0x10) || (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x7E) + /* && insn[0] == 0x0F */ && insn[1] == 0x7E) ) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { @@ -10275,7 +10276,7 @@ DisResult disInstr_AMD64_WRK ( /* F2 0F 11 = MOVSD -- move 64 bits from G (lo half xmm) to E (mem or lo half xmm). */ if (haveF2no66noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x11) { + /* && insn[0] == 0x0F */ && insn[1] == 0x11) { modrm = getUChar(delta+2); if (epartIsReg(modrm)) { /* fall through, we don't yet have a test case */ @@ -10292,28 +10293,28 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 59 = MULPD -- mul 64Fx2 from R/M to R */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x59) { + /* && insn[0] == 0x0F */ && insn[1] == 0x59) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "mulpd", Iop_Mul64Fx2 ); goto decode_success; } /* F2 0F 59 = MULSD -- mul 64F0x2 from R/M to R */ if (haveF2no66noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x59) { + /* && insn[0] == 0x0F */ && insn[1] == 0x59) { delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "mulsd", Iop_Mul64F0x2 ); goto decode_success; } /* 66 0F 56 = ORPD -- G = G and E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x56) { + /* && insn[0] == 0x0F */ && insn[1] == 0x56) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "orpd", Iop_OrV128 ); goto decode_success; } /* 66 0F C6 /r ib = SHUFPD -- shuffle packed F64s */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xC6) { + /* && insn[0] == 0x0F */ && insn[1] == 0xC6) { Int select; IRTemp sV = newTemp(Ity_V128); IRTemp dV = newTemp(Ity_V128); @@ -10363,14 +10364,14 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 51 = SQRTPD -- approx sqrt 64Fx2 from R/M to R */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x51) { + /* && insn[0] == 0x0F */ && insn[1] == 0x51) { delta = dis_SSE_E_to_G_unary_all( pfx, delta+2, "sqrtpd", Iop_Sqrt64Fx2 ); goto decode_success; } /* F2 0F 51 = SQRTSD -- approx sqrt 64F0x2 from R/M to R */ - if (haveF2no66noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x51) { + if (haveF2no66noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x51) { vassert(sz == 4); delta = dis_SSE_E_to_G_unary_lo64( pfx, delta+2, "sqrtsd", Iop_Sqrt64F0x2 ); @@ -10379,13 +10380,13 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 5C = SUBPD -- sub 64Fx2 from R/M to R */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x5C) { + /* && insn[0] == 0x0F */ && insn[1] == 0x5C) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "subpd", Iop_Sub64Fx2 ); goto decode_success; } /* F2 0F 5C = SUBSD -- sub 64F0x2 from R/M to R */ - if (haveF2no66noF3(pfx) && insn[0] == 0x0F && insn[1] == 0x5C) { + if (haveF2no66noF3(pfx) /* && insn[0] == 0x0F */ && insn[1] == 0x5C) { vassert(sz == 4); delta = dis_SSE_E_to_G_lo64( pfx, delta+2, "subsd", Iop_Sub64F0x2 ); goto decode_success; @@ -10396,7 +10397,7 @@ DisResult disInstr_AMD64_WRK ( /* These just appear to be special cases of SHUFPS */ if (have66noF2noF3(pfx) && sz == 2 /* could be 8 if rex also present */ - && insn[0] == 0x0F && (insn[1] == 0x15 || insn[1] == 0x14)) { + /* && insn[0] == 0x0F */ && (insn[1] == 0x15 || insn[1] == 0x14)) { IRTemp s1 = newTemp(Ity_I64); IRTemp s0 = newTemp(Ity_I64); IRTemp d1 = newTemp(Ity_I64); @@ -10441,14 +10442,14 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 57 = XORPD -- G = G xor E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x57) { + /* && insn[0] == 0x0F */ && insn[1] == 0x57) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "xorpd", Iop_XorV128 ); goto decode_success; } /* 66 0F 6B = PACKSSDW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x6B) { + /* && insn[0] == 0x0F */ && insn[1] == 0x6B) { delta = dis_SSEint_E_to_G( pfx, delta+2, "packssdw", Iop_QNarrow32Sx4, True ); goto decode_success; @@ -10456,7 +10457,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 63 = PACKSSWB */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x63) { + /* && insn[0] == 0x0F */ && insn[1] == 0x63) { delta = dis_SSEint_E_to_G( pfx, delta+2, "packsswb", Iop_QNarrow16Sx8, True ); goto decode_success; @@ -10464,7 +10465,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 67 = PACKUSWB */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x67) { + /* && insn[0] == 0x0F */ && insn[1] == 0x67) { delta = dis_SSEint_E_to_G( pfx, delta+2, "packuswb", Iop_QNarrow16Ux8, True ); goto decode_success; @@ -10472,7 +10473,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F FC = PADDB */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xFC) { + /* && insn[0] == 0x0F */ && insn[1] == 0xFC) { delta = dis_SSEint_E_to_G( pfx, delta+2, "paddb", Iop_Add8x16, False ); goto decode_success; @@ -10480,7 +10481,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F FE = PADDD */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xFE) { + /* && insn[0] == 0x0F */ && insn[1] == 0xFE) { delta = dis_SSEint_E_to_G( pfx, delta+2, "paddd", Iop_Add32x4, False ); goto decode_success; @@ -10489,7 +10490,7 @@ DisResult disInstr_AMD64_WRK ( /* ***--- this is an MMX class insn introduced in SSE2 ---*** */ /* 0F D4 = PADDQ -- add 64x1 */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xD4) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD4) { do_MMX_preamble(); delta = dis_MMXop_regmem_to_reg ( pfx, delta+2, insn[1], "paddq", False ); @@ -10498,7 +10499,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F D4 = PADDQ */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xD4) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD4) { delta = dis_SSEint_E_to_G( pfx, delta+2, "paddq", Iop_Add64x2, False ); goto decode_success; @@ -10506,7 +10507,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F FD = PADDW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xFD) { + /* && insn[0] == 0x0F */ && insn[1] == 0xFD) { delta = dis_SSEint_E_to_G( pfx, delta+2, "paddw", Iop_Add16x8, False ); goto decode_success; @@ -10514,7 +10515,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F EC = PADDSB */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xEC) { + /* && insn[0] == 0x0F */ && insn[1] == 0xEC) { delta = dis_SSEint_E_to_G( pfx, delta+2, "paddsb", Iop_QAdd8Sx16, False ); goto decode_success; @@ -10522,7 +10523,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F ED = PADDSW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xED) { + /* && insn[0] == 0x0F */ && insn[1] == 0xED) { delta = dis_SSEint_E_to_G( pfx, delta+2, "paddsw", Iop_QAdd16Sx8, False ); goto decode_success; @@ -10530,7 +10531,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F DC = PADDUSB */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xDC) { + /* && insn[0] == 0x0F */ && insn[1] == 0xDC) { delta = dis_SSEint_E_to_G( pfx, delta+2, "paddusb", Iop_QAdd8Ux16, False ); goto decode_success; @@ -10538,7 +10539,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F DD = PADDUSW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xDD) { + /* && insn[0] == 0x0F */ && insn[1] == 0xDD) { delta = dis_SSEint_E_to_G( pfx, delta+2, "paddusw", Iop_QAdd16Ux8, False ); goto decode_success; @@ -10546,21 +10547,21 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F DB = PAND */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xDB) { + /* && insn[0] == 0x0F */ && insn[1] == 0xDB) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "pand", Iop_AndV128 ); goto decode_success; } /* 66 0F DF = PANDN */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xDF) { + /* && insn[0] == 0x0F */ && insn[1] == 0xDF) { delta = dis_SSE_E_to_G_all_invG( pfx, delta+2, "pandn", Iop_AndV128 ); goto decode_success; } /* 66 0F E0 = PAVGB */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xE0) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE0) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pavgb", Iop_Avg8Ux16, False ); goto decode_success; @@ -10568,7 +10569,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F E3 = PAVGW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xE3) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE3) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pavgw", Iop_Avg16Ux8, False ); goto decode_success; @@ -10576,7 +10577,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 74 = PCMPEQB */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x74) { + /* && insn[0] == 0x0F */ && insn[1] == 0x74) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pcmpeqb", Iop_CmpEQ8x16, False ); goto decode_success; @@ -10584,7 +10585,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 76 = PCMPEQD */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x76) { + /* && insn[0] == 0x0F */ && insn[1] == 0x76) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pcmpeqd", Iop_CmpEQ32x4, False ); goto decode_success; @@ -10592,7 +10593,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 75 = PCMPEQW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x75) { + /* && insn[0] == 0x0F */ && insn[1] == 0x75) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pcmpeqw", Iop_CmpEQ16x8, False ); goto decode_success; @@ -10600,7 +10601,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 64 = PCMPGTB */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x64) { + /* && insn[0] == 0x0F */ && insn[1] == 0x64) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pcmpgtb", Iop_CmpGT8Sx16, False ); goto decode_success; @@ -10608,7 +10609,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 66 = PCMPGTD */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x66) { + /* && insn[0] == 0x0F */ && insn[1] == 0x66) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pcmpgtd", Iop_CmpGT32Sx4, False ); goto decode_success; @@ -10616,7 +10617,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 65 = PCMPGTW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x65) { + /* && insn[0] == 0x0F */ && insn[1] == 0x65) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pcmpgtw", Iop_CmpGT16Sx8, False ); goto decode_success; @@ -10625,7 +10626,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F C5 = PEXTRW -- extract 16-bit field from xmm(E) and put zero-extend of it in ireg(G). */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xC5) { + /* && insn[0] == 0x0F */ && insn[1] == 0xC5) { modrm = insn[2]; if (epartIsReg(modrm)) { t5 = newTemp(Ity_V128); @@ -10658,7 +10659,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F C4 = PINSRW -- get 16 bits from E(mem or low half ireg) and put it into the specified lane of xmm(G). */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xC4) { + /* && insn[0] == 0x0F */ && insn[1] == 0xC4) { Int lane; t4 = newTemp(Ity_I16); modrm = insn[2]; @@ -10687,7 +10688,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F EE = PMAXSW -- 16x8 signed max */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xEE) { + /* && insn[0] == 0x0F */ && insn[1] == 0xEE) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pmaxsw", Iop_Max16Sx8, False ); goto decode_success; @@ -10695,7 +10696,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F DE = PMAXUB -- 8x16 unsigned max */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xDE) { + /* && insn[0] == 0x0F */ && insn[1] == 0xDE) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pmaxub", Iop_Max8Ux16, False ); goto decode_success; @@ -10703,7 +10704,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F EA = PMINSW -- 16x8 signed min */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xEA) { + /* && insn[0] == 0x0F */ && insn[1] == 0xEA) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pminsw", Iop_Min16Sx8, False ); goto decode_success; @@ -10711,7 +10712,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F DA = PMINUB -- 8x16 unsigned min */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xDA) { + /* && insn[0] == 0x0F */ && insn[1] == 0xDA) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pminub", Iop_Min8Ux16, False ); goto decode_success; @@ -10723,7 +10724,7 @@ DisResult disInstr_AMD64_WRK ( therefore and call a helper. */ /* UInt x86g_calculate_sse_pmovmskb ( ULong w64hi, ULong w64lo ); */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xD7) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD7) { modrm = insn[2]; if (epartIsReg(modrm)) { t0 = newTemp(Ity_I64); @@ -10747,7 +10748,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F E4 = PMULHUW -- 16x8 hi-half of unsigned widening multiply */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xE4) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE4) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pmulhuw", Iop_MulHi16Ux8, False ); goto decode_success; @@ -10755,7 +10756,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F E5 = PMULHW -- 16x8 hi-half of signed widening multiply */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xE5) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE5) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pmulhw", Iop_MulHi16Sx8, False ); goto decode_success; @@ -10763,7 +10764,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F D5 = PMULHL -- 16x8 multiply */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xD5) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD5) { delta = dis_SSEint_E_to_G( pfx, delta+2, "pmullw", Iop_Mul16x8, False ); goto decode_success; @@ -10773,7 +10774,7 @@ DisResult disInstr_AMD64_WRK ( /* 0F F4 = PMULUDQ -- unsigned widening multiply of 32-lanes 0 x 0 to form 64-bit result */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xF4) { + /* && insn[0] == 0x0F */ && insn[1] == 0xF4) { IRTemp sV = newTemp(Ity_I64); IRTemp dV = newTemp(Ity_I64); t1 = newTemp(Ity_I32); @@ -10809,7 +10810,7 @@ DisResult disInstr_AMD64_WRK ( /* This is a really poor translation -- could be improved if performance critical */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xF4) { + /* && insn[0] == 0x0F */ && insn[1] == 0xF4) { IRTemp sV, dV; IRTemp s3, s2, s1, s0, d3, d2, d1, d0; sV = newTemp(Ity_V128); @@ -10845,14 +10846,14 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F EB = POR */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xEB) { + /* && insn[0] == 0x0F */ && insn[1] == 0xEB) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "por", Iop_OrV128 ); goto decode_success; } /* 66 0F 70 = PSHUFD -- rearrange 4x32 from E(xmm or mem) to G(xmm) */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x70) { + /* && insn[0] == 0x0F */ && insn[1] == 0x70) { Int order; IRTemp sV, dV, s3, s2, s1, s0; s3 = s2 = s1 = s0 = IRTemp_INVALID; @@ -10892,7 +10893,7 @@ DisResult disInstr_AMD64_WRK ( /* F3 0F 70 = PSHUFHW -- rearrange upper half 4x16 from E(xmm or mem) to G(xmm), and copy lower half */ if (haveF3no66noF2(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x70) { + /* && insn[0] == 0x0F */ && insn[1] == 0x70) { Int order; IRTemp sVhi, dVhi, sV, dV, s3, s2, s1, s0; s3 = s2 = s1 = s0 = IRTemp_INVALID; @@ -10938,7 +10939,7 @@ DisResult disInstr_AMD64_WRK ( /* F2 0F 70 = PSHUFLW -- rearrange lower half 4x16 from E(xmm or mem) to G(xmm), and copy upper half */ if (haveF2no66noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0x70) { + /* && insn[0] == 0x0F */ && insn[1] == 0x70) { Int order; IRTemp sVlo, dVlo, sV, dV, s3, s2, s1, s0; s3 = s2 = s1 = s0 = IRTemp_INVALID; @@ -10983,7 +10984,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 72 /6 ib = PSLLD by immediate */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x72 + /* && insn[0] == 0x0F */ && insn[1] == 0x72 && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 6) { delta = dis_SSE_shiftE_imm( pfx, delta+2, "pslld", Iop_ShlN32x4 ); @@ -10992,7 +10993,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F F2 = PSLLD by E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xF2) { + /* && insn[0] == 0x0F */ && insn[1] == 0xF2) { delta = dis_SSE_shiftG_byE( pfx, delta+2, "pslld", Iop_ShlN32x4 ); goto decode_success; } @@ -11000,7 +11001,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 73 /7 ib = PSLLDQ by immediate */ /* note, if mem case ever filled in, 1 byte after amode */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x73 + /* && insn[0] == 0x0F */ && insn[1] == 0x73 && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 7) { IRTemp sV, dV, hi64, lo64, hi64r, lo64r; @@ -11061,7 +11062,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 73 /6 ib = PSLLQ by immediate */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x73 + /* && insn[0] == 0x0F */ && insn[1] == 0x73 && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 6) { delta = dis_SSE_shiftE_imm( pfx, delta+2, "psllq", Iop_ShlN64x2 ); @@ -11070,14 +11071,14 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F F3 = PSLLQ by E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xF3) { + /* && insn[0] == 0x0F */ && insn[1] == 0xF3) { delta = dis_SSE_shiftG_byE( pfx, delta+2, "psllq", Iop_ShlN64x2 ); goto decode_success; } /* 66 0F 71 /6 ib = PSLLW by immediate */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x71 + /* && insn[0] == 0x0F */ && insn[1] == 0x71 && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 6) { delta = dis_SSE_shiftE_imm( pfx, delta+2, "psllw", Iop_ShlN16x8 ); @@ -11086,14 +11087,14 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F F1 = PSLLW by E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xF1) { + /* && insn[0] == 0x0F */ && insn[1] == 0xF1) { delta = dis_SSE_shiftG_byE( pfx, delta+2, "psllw", Iop_ShlN16x8 ); goto decode_success; } /* 66 0F 72 /4 ib = PSRAD by immediate */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x72 + /* && insn[0] == 0x0F */ && insn[1] == 0x72 && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 4) { delta = dis_SSE_shiftE_imm( pfx, delta+2, "psrad", Iop_SarN32x4 ); @@ -11102,14 +11103,14 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F E2 = PSRAD by E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xE2) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE2) { delta = dis_SSE_shiftG_byE( pfx, delta+2, "psrad", Iop_SarN32x4 ); goto decode_success; } /* 66 0F 71 /4 ib = PSRAW by immediate */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x71 + /* && insn[0] == 0x0F */ && insn[1] == 0x71 && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 4) { delta = dis_SSE_shiftE_imm( pfx, delta+2, "psraw", Iop_SarN16x8 ); @@ -11118,14 +11119,14 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F E1 = PSRAW by E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xE1) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE1) { delta = dis_SSE_shiftG_byE( pfx, delta+2, "psraw", Iop_SarN16x8 ); goto decode_success; } /* 66 0F 72 /2 ib = PSRLD by immediate */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x72 + /* && insn[0] == 0x0F */ && insn[1] == 0x72 && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 2) { delta = dis_SSE_shiftE_imm( pfx, delta+2, "psrld", Iop_ShrN32x4 ); @@ -11134,7 +11135,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F D2 = PSRLD by E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xD2) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD2) { delta = dis_SSE_shiftG_byE( pfx, delta+2, "psrld", Iop_ShrN32x4 ); goto decode_success; } @@ -11142,7 +11143,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 73 /3 ib = PSRLDQ by immediate */ /* note, if mem case ever filled in, 1 byte after amode */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x73 + /* && insn[0] == 0x0F */ && insn[1] == 0x73 && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 3) { IRTemp sV, dV, hi64, lo64, hi64r, lo64r; @@ -11204,7 +11205,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 73 /2 ib = PSRLQ by immediate */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x73 + /* && insn[0] == 0x0F */ && insn[1] == 0x73 && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 2) { delta = dis_SSE_shiftE_imm( pfx, delta+2, "psrlq", Iop_ShrN64x2 ); @@ -11213,14 +11214,14 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F D3 = PSRLQ by E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xD3) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD3) { delta = dis_SSE_shiftG_byE( pfx, delta+2, "psrlq", Iop_ShrN64x2 ); goto decode_success; } /* 66 0F 71 /2 ib = PSRLW by immediate */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x71 + /* && insn[0] == 0x0F */ && insn[1] == 0x71 && epartIsReg(insn[2]) && gregLO3ofRM(insn[2]) == 2) { delta = dis_SSE_shiftE_imm( pfx, delta+2, "psrlw", Iop_ShrN16x8 ); @@ -11229,14 +11230,14 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F D1 = PSRLW by E */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xD1) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD1) { delta = dis_SSE_shiftG_byE( pfx, delta+2, "psrlw", Iop_ShrN16x8 ); goto decode_success; } /* 66 0F F8 = PSUBB */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xF8) { + /* && insn[0] == 0x0F */ && insn[1] == 0xF8) { delta = dis_SSEint_E_to_G( pfx, delta+2, "psubb", Iop_Sub8x16, False ); goto decode_success; @@ -11244,7 +11245,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F FA = PSUBD */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xFA) { + /* && insn[0] == 0x0F */ && insn[1] == 0xFA) { delta = dis_SSEint_E_to_G( pfx, delta+2, "psubd", Iop_Sub32x4, False ); goto decode_success; @@ -11253,7 +11254,7 @@ DisResult disInstr_AMD64_WRK ( /* ***--- this is an MMX class insn introduced in SSE2 ---*** */ /* 0F FB = PSUBQ -- sub 64x1 */ if (haveNo66noF2noF3(pfx) && sz == 4 - && insn[0] == 0x0F && insn[1] == 0xFB) { + /* && insn[0] == 0x0F */ && insn[1] == 0xFB) { do_MMX_preamble(); delta = dis_MMXop_regmem_to_reg ( pfx, delta+2, insn[1], "psubq", False ); @@ -11262,7 +11263,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F FB = PSUBQ */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xFB) { + /* && insn[0] == 0x0F */ && insn[1] == 0xFB) { delta = dis_SSEint_E_to_G( pfx, delta+2, "psubq", Iop_Sub64x2, False ); goto decode_success; @@ -11270,7 +11271,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F F9 = PSUBW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xF9) { + /* && insn[0] == 0x0F */ && insn[1] == 0xF9) { delta = dis_SSEint_E_to_G( pfx, delta+2, "psubw", Iop_Sub16x8, False ); goto decode_success; @@ -11278,7 +11279,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F E8 = PSUBSB */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xE8) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE8) { delta = dis_SSEint_E_to_G( pfx, delta+2, "psubsb", Iop_QSub8Sx16, False ); goto decode_success; @@ -11286,7 +11287,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F E9 = PSUBSW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xE9) { + /* && insn[0] == 0x0F */ && insn[1] == 0xE9) { delta = dis_SSEint_E_to_G( pfx, delta+2, "psubsw", Iop_QSub16Sx8, False ); goto decode_success; @@ -11294,7 +11295,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F D8 = PSUBSB */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xD8) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD8) { delta = dis_SSEint_E_to_G( pfx, delta+2, "psubusb", Iop_QSub8Ux16, False ); goto decode_success; @@ -11302,7 +11303,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F D9 = PSUBSW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xD9) { + /* && insn[0] == 0x0F */ && insn[1] == 0xD9) { delta = dis_SSEint_E_to_G( pfx, delta+2, "psubusw", Iop_QSub16Ux8, False ); goto decode_success; @@ -11310,7 +11311,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 68 = PUNPCKHBW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x68) { + /* && insn[0] == 0x0F */ && insn[1] == 0x68) { delta = dis_SSEint_E_to_G( pfx, delta+2, "punpckhbw", Iop_InterleaveHI8x16, True ); @@ -11319,7 +11320,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 6A = PUNPCKHDQ */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x6A) { + /* && insn[0] == 0x0F */ && insn[1] == 0x6A) { delta = dis_SSEint_E_to_G( pfx, delta+2, "punpckhdq", Iop_InterleaveHI32x4, True ); @@ -11328,7 +11329,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 6D = PUNPCKHQDQ */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x6D) { + /* && insn[0] == 0x0F */ && insn[1] == 0x6D) { delta = dis_SSEint_E_to_G( pfx, delta+2, "punpckhqdq", Iop_InterleaveHI64x2, True ); @@ -11337,7 +11338,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 69 = PUNPCKHWD */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x69) { + /* && insn[0] == 0x0F */ && insn[1] == 0x69) { delta = dis_SSEint_E_to_G( pfx, delta+2, "punpckhwd", Iop_InterleaveHI16x8, True ); @@ -11346,7 +11347,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 60 = PUNPCKLBW */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x60) { + /* && insn[0] == 0x0F */ && insn[1] == 0x60) { delta = dis_SSEint_E_to_G( pfx, delta+2, "punpcklbw", Iop_InterleaveLO8x16, True ); @@ -11355,7 +11356,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 62 = PUNPCKLDQ */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x62) { + /* && insn[0] == 0x0F */ && insn[1] == 0x62) { delta = dis_SSEint_E_to_G( pfx, delta+2, "punpckldq", Iop_InterleaveLO32x4, True ); @@ -11364,7 +11365,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 6C = PUNPCKLQDQ */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x6C) { + /* && insn[0] == 0x0F */ && insn[1] == 0x6C) { delta = dis_SSEint_E_to_G( pfx, delta+2, "punpcklqdq", Iop_InterleaveLO64x2, True ); @@ -11373,7 +11374,7 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F 61 = PUNPCKLWD */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0x61) { + /* && insn[0] == 0x0F */ && insn[1] == 0x61) { delta = dis_SSEint_E_to_G( pfx, delta+2, "punpcklwd", Iop_InterleaveLO16x8, True ); @@ -11382,13 +11383,13 @@ DisResult disInstr_AMD64_WRK ( /* 66 0F EF = PXOR */ if (have66noF2noF3(pfx) && sz == 2 - && insn[0] == 0x0F && insn[1] == 0xEF) { + /* && insn[0] == 0x0F */ && insn[1] == 0xEF) { delta = dis_SSE_E_to_G_all( pfx, delta+2, "pxor", Iop_XorV128 ); goto decode_success; } //.. //-- /* FXSAVE/FXRSTOR m32 -- load/store the FPU/MMX/SSE state. */ -//.. //-- if (insn[0] == 0x0F && insn[1] == 0xAE +//.. //-- if (/* insn[0] == 0x0F && */ insn[1] == 0xAE //.. //-- && (!epartIsReg(insn[2])) //.. //-- && (gregOfRM(insn[2]) == 1 || gregOfRM(insn[2]) == 0) ) { //.. //-- Bool store = gregOfRM(insn[2]) == 0; @@ -11405,7 +11406,7 @@ DisResult disInstr_AMD64_WRK ( //.. //-- } //.. //-- //.. //-- /* CLFLUSH -- flush cache line */ -//.. //-- if (insn[0] == 0x0F && insn[1] == 0xAE +//.. //-- if (/* insn[0] == 0x0F && */ insn[1] == 0xAE //.. //-- && (!epartIsReg(insn[2])) //.. //-- && (gregOfRM(insn[2]) == 7)) //.. //-- { @@ -11420,7 +11421,7 @@ DisResult disInstr_AMD64_WRK ( //.. //-- DIP("clflush %s\n", dis_buf); //.. //-- goto decode_success; //.. //-- } - + } /* ---------------------------------------------------- */ /* --- end of the SSE/SSE2 decoder. --- */ valgrind-3.1.0-valgrind_h.patch: valgrind.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE valgrind-3.1.0-valgrind_h.patch --- --- valgrind-3.1.0/include/valgrind.h.jj 2005-03-11 01:28:13.000000000 -0500 +++ valgrind-3.1.0/include/valgrind.h 2005-03-29 16:42:31.000000000 -0500 @@ -215,10 +215,11 @@ typedef #else /* NVALGRIND */ -int VALGRIND_PRINTF(const char *format, ...) - __attribute__((format(__printf__, 1, 2))); -__attribute__((weak)) -int +/* Modern GCC will optimize the static routine out if unused, + and unused attribute will shut down warnings about it. */ +static int VALGRIND_PRINTF(const char *format, ...) + __attribute__((format(__printf__, 1, 2), __unused__)); +static int VALGRIND_PRINTF(const char *format, ...) { unsigned long _qzz_res; @@ -230,10 +231,9 @@ VALGRIND_PRINTF(const char *format, ...) return (int)_qzz_res; } -int VALGRIND_PRINTF_BACKTRACE(const char *format, ...) - __attribute__((format(__printf__, 1, 2))); -__attribute__((weak)) -int +static int VALGRIND_PRINTF_BACKTRACE(const char *format, ...) + __attribute__((format(__printf__, 1, 2), __unused__)); +static int VALGRIND_PRINTF_BACKTRACE(const char *format, ...) { unsigned long _qzz_res; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/valgrind/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 11 Sep 2005 19:44:18 -0000 1.7 +++ .cvsignore 10 Jan 2006 10:36:37 -0000 1.8 @@ -1 +1 @@ -valgrind-3.0.1.tar.bz2 +valgrind-3.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/valgrind/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 11 Sep 2005 19:44:18 -0000 1.7 +++ sources 10 Jan 2006 10:36:37 -0000 1.8 @@ -1 +1 @@ -c29efdb7d1a93440f5644a6769054681 valgrind-3.0.1.tar.bz2 +d92156e9172dc6097e56c69ea9c88013 valgrind-3.1.0.tar.bz2 Index: valgrind.spec =================================================================== RCS file: /cvs/dist/rpms/valgrind/devel/valgrind.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- valgrind.spec 9 Dec 2005 22:43:44 -0000 1.24 +++ valgrind.spec 10 Jan 2006 10:36:37 -0000 1.25 @@ -1,19 +1,17 @@ Summary: Tool for finding memory management bugs in programs Name: valgrind -Version: 3.0.1 -Release: 2.1 +Version: 3.1.0 +Release: 1 Epoch: 1 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2 -Patch1: valgrind-3.0.1-valgrind_h.patch -Patch2: valgrind-3.0.1-amd64-highbase.patch -Patch3: valgrind-3.0.1-biarch-hack.patch -Patch4: valgrind-3.0.1-amd64-speedup.patch -Patch5: valgrind-3.0.1-amd64-syscalls.patch +Patch1: valgrind-3.1.0-valgrind_h.patch +Patch2: valgrind-3.1.0-amd64-highbase.patch +Patch3: valgrind-3.1.0-amd64-speedup.patch License: GPL URL: http://www.valgrind.org/ Group: Development/Debuggers BuildRoot: %{_tmppath}/%{name}-root -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: %{ix86} x86_64 ppc # Disable build root strip policy %define __spec_install_post /usr/lib/rpm/brp-compress || : @@ -33,20 +31,23 @@ %setup -q %patch1 -p1 %ifarch x86_64 -%patch2 -p1 +#%patch2 -p1 %endif %patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build +%ifarch x86_64 +# Ugly hack - libgcc 32-bit package might not be installed +mkdir -p libgcc/32 +touch libgcc/32/libgcc_s.a +%configure CC="gcc -B `pwd`/libgcc/" +%else %configure - -cp -a glibc-2.3.supp glibc-2.4.supp +%endif # Force a specific set of default suppressions echo -n > default.supp -for file in glibc-2.3.supp xfree-4.supp ; do +for file in glibc-2.4.supp xfree-4.supp ; do cat $file >> default.supp done @@ -70,6 +71,13 @@ EOF gcc $RPM_OPT_FLAGS -o close_fds close_fds.c +for i in `find . -type f \( -name *-amd64-linux -o -name *-x86-linux -o -name *-ppc-linux \)`; do + case "`file $i`" in + *ELF*executable*statically\ linked*) + objcopy -R .debug_loc -R .debug_frame -R .debug_ranges $i + esac +done + # test make check || : echo ===============TESTING=================== @@ -80,12 +88,15 @@ rm -rf $RPM_BUILD_ROOT %makeinstall -cp -a $RPM_BUILD_ROOT%{_bindir}/valgrind \ - $RPM_BUILD_ROOT%{_libdir}/valgrind/valgrind mkdir docs.installed mv $RPM_BUILD_ROOT%{_datadir}/doc/valgrind/* docs.installed/ rm -f docs.installed/*.ps +%ifarch x86_64 +rm -rf $RPM_BUILD_ROOT%{_libdir}/valgrind/x86-linux +ln -sf ../../lib/valgrind/x86-linux $RPM_BUILD_ROOT%{_libdir}/valgrind/x86-linux +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -100,8 +111,9 @@ %{_mandir}/man1/valgrind* %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Mon Jan 9 2006 Jakub Jelinek 3.1.0-1 +- upgrade to 3.1.0 (#174582) + - many bugfixes, ppc32 support * Thu Oct 13 2005 Jakub Jelinek 3.0.1-2 - remove Obsoletes for valgrind-callgrind, as it has been --- valgrind-3.0.1-amd64-highbase.patch DELETED --- --- valgrind-3.0.1-amd64-speedup.patch DELETED --- --- valgrind-3.0.1-amd64-syscalls.patch DELETED --- --- valgrind-3.0.1-biarch-hack.patch DELETED --- --- valgrind-3.0.1-valgrind_h.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 10 12:03:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 07:03:29 -0500 Subject: rpms/bash/devel bash31-002, NONE, 1.1 bash31-003, NONE, 1.1 bash31-004, NONE, 1.1 bash31-005, NONE, 1.1 bash-ulimit.patch, 1.5, 1.6 bash.spec, 1.99, 1.100 bash-arrays.patch, 1.1, NONE Message-ID: <200601101203.k0AC3Tx8008294@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8282 Modified Files: bash-ulimit.patch bash.spec Added Files: bash31-002 bash31-003 bash31-004 bash31-005 Removed Files: bash-arrays.patch Log Message: * Tue Jan 10 2006 Tim Waugh - Patchlevel 5. --- NEW FILE bash31-002 --- BASH PATCH REPORT ================= Bash-Release: 3.1 Patch-ID: bash31-002 Bug-Reported-by: vapier at gentoo.org Bug-Reference-ID: <20051210223218.GD3324 at toucan.gentoo.org> Bug-Reference-URL:http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00021.html Bug-Description: This corrects several omissions in the bash documentation: It adds the new options to `ulimit', the exact expansions for `case' patterns, clarification of the language concerning the return value of `[[', and updated version information. Patch: *** ../bash-3.1/doc/bash.1 Wed Oct 12 11:40:52 2005 --- doc/bash.1 Wed Dec 28 19:58:54 2005 *************** *** 7,16 **** .\" chet at po.cwru.edu .\" ! .\" Last Change: Sat Aug 27 13:28:44 EDT 2005 .\" .\" bash_builtins, strip all but Built-Ins section .if \n(zZ=1 .ig zZ .if \n(zY=1 .ig zY ! .TH BASH 1 "2005 Aug 27" "GNU Bash-3.1-beta1" .\" .\" There's some problem with having a `@' --- 7,16 ---- .\" chet at po.cwru.edu .\" ! .\" Last Change: Wed Dec 28 19:58:45 EST 2005 .\" .\" bash_builtins, strip all but Built-Ins section .if \n(zZ=1 .ig zZ .if \n(zY=1 .ig zY ! .TH BASH 1 "2005 Dec 28" "GNU Bash-3.1" .\" .\" There's some problem with having a `@' *************** *** 678,683 **** is enabled, the match is performed without regard to the case of alphabetic characters. ! The return value is 0 if the string matches or does not match ! the pattern, respectively, and 1 otherwise. Any part of the pattern may be quoted to force it to be matched as a string. --- 678,683 ---- is enabled, the match is performed without regard to the case of alphabetic characters. ! The return value is 0 if the string matches (\fB==\fP) or does not match ! (\fB!=\fP) the pattern, and 1 otherwise. Any part of the pattern may be quoted to force it to be matched as a string. *************** *** 808,811 **** --- 808,817 ---- .B Pathname Expansion below). + The \fIword\fP is expanded using tilde + expansion, parameter and variable expansion, arithmetic substituion, + command substitution, process substitution and quote removal. + Each \fIpattern\fP examined is expanded using tilde + expansion, parameter and variable expansion, arithmetic substituion, + command substitution, and process substitution. If the shell option .B nocasematch *************** *** 8485,8489 **** none are found. .TP ! \fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]] Provides control over the resources available to the shell and to processes started by it, on systems that allow such control. --- 8485,8489 ---- none are found. .TP ! \fBulimit\fP [\fB\-SHacdfilmnpqstuvx\fP [\fIlimit\fP]] Provides control over the resources available to the shell and to processes started by it, on systems that allow such control. *************** *** 8524,8527 **** --- 8524,8530 ---- The maximum size of files created by the shell .TP + .B \-i + The maximum number of pending signals + .TP .B \-l The maximum size that may be locked into memory *************** *** 8537,8540 **** --- 8540,8546 ---- The pipe size in 512-byte blocks (this may not be set) .TP + .B \-q + The maximum number of bytes in POSIX message queues + .TP .B \-s The maximum stack size *************** *** 8548,8551 **** --- 8554,8560 ---- .B \-v The maximum amount of virtual memory available to the shell + .TP + .B \-x + The maximum number of file locks .PD .PP *** ../bash-3.1/doc/bashref.texi Mon Oct 3 15:07:21 2005 --- doc/bashref.texi Fri Dec 30 10:50:39 2005 *************** *** 962,967 **** is enabled, the match is performed without regard to the case of alphabetic characters. ! The return value is 0 if the string matches or does not match ! the pattern, respectively, and 1 otherwise. Any part of the pattern may be quoted to force it to be matched as a string. --- 962,967 ---- is enabled, the match is performed without regard to the case of alphabetic characters. ! The return value is 0 if the string matches (@samp{==}) or does not ! match (@samp{!=})the pattern, and 1 otherwise. Any part of the pattern may be quoted to force it to be matched as a string. *************** *** 2599,2603 **** or inconvenient to obtain with separate utilities. ! This section briefly the builtins which Bash inherits from the Bourne Shell, as well as the builtin commands which are unique to or have been extended in Bash. --- 2597,2601 ---- or inconvenient to obtain with separate utilities. ! This section briefly describes the builtins which Bash inherits from the Bourne Shell, as well as the builtin commands which are unique to or have been extended in Bash. *************** *** 3834,3838 **** @btindex ulimit @example ! ulimit [-acdflmnpstuvSH] [@var{limit}] @end example @code{ulimit} provides control over the resources available to processes --- 3834,3838 ---- @btindex ulimit @example ! ulimit [-acdfilmnpqstuvxSH] [@var{limit}] @end example @code{ulimit} provides control over the resources available to processes *************** *** 3858,3861 **** --- 3858,3864 ---- The maximum size of files created by the shell. + @item -i + The maximum number of pending signals. + @item -l The maximum size that may be locked into memory. *************** *** 3870,3873 **** --- 3873,3879 ---- The pipe buffer size. + @item -q + The maximum number of bytes in POSIX message queues. + @item -s The maximum stack size. *************** *** 3882,3885 **** --- 3888,3894 ---- The maximum amount of virtual memory available to the process. + @item -x + The maximum number of file locks. + @end table *************** *** 4090,4095 **** @item -x ! Print a trace of simple commands, \fBfor\fP commands, \fBcase\fP ! commands, \fBselect\fP commands, and arithmetic \fBfor\fP commands and their arguments or associated word lists after they are expanded and before they are executed. The value of the @env{PS4} --- 4103,4108 ---- @item -x ! Print a trace of simple commands, @code{for} commands, @code{case} ! commands, @code{select} commands, and arithmetic @code{for} commands and their arguments or associated word lists after they are expanded and before they are executed. The value of the @env{PS4} *** ../bash-3.1/doc/version.texi Tue Sep 20 14:52:56 2005 --- doc/version.texi Fri Dec 30 10:50:58 2005 *************** *** 3,10 **** @end ignore ! @set LASTCHANGE Mon Sep 5 11:47:04 EDT 2005 ! @set EDITION 3.1-beta1 ! @set VERSION 3.1-beta1 ! @set UPDATED 5 September 2005 ! @set UPDATED-MONTH September 2005 --- 3,10 ---- @end ignore ! @set LASTCHANGE Fri Dec 30 10:50:51 EST 2005 ! @set EDITION 3.1 ! @set VERSION 3.1 ! @set UPDATED 30 December 2005 ! @set UPDATED-MONTH December 2005 *** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 --- patchlevel.h Wed Dec 7 13:48:42 2005 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 1 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 2 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash31-003 --- BASH PATCH REPORT ================= Bash-Release: 3.1 Patch-ID: bash31-003 Bug-Reported-by: Adam Buraczewski Bug-Reference-ID: <200512210950.jBL9o4C2008608 at localhost.localdomain> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00055.html Bug-Description: A missing #define guard causes bash to not compile when readline is not configured in, either as the result of explicit disabling or when the `--enable-minimal-config' option is given to configure. Patch: *** ../bash-3.1/variables.c Sat Nov 12 21:22:37 2005 --- variables.c Mon Dec 26 13:34:03 2005 *************** *** 861,867 **** --- 863,871 ---- char val[INT_STRLEN_BOUND(int) + 1], *v; + #if defined (READLINE) /* If we are currently assigning to LINES or COLUMNS, don't do anything. */ if (winsize_assignment) return; + #endif v = inttostr (lines, val, sizeof (val)); *** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 --- patchlevel.h Wed Dec 7 13:48:42 2005 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 2 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 3 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash31-004 --- BASH PATCH REPORT ================= Bash-Release: 3.1 Patch-ID: bash31-004 Bug-Reported-by: Mike Frysinger Bug-Reference-ID: <20051223172359.GF14579 at toucan.gentoo.org> Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2005-12/msg00062.html Bug-Description: A local array variable declared at function scope that shadows a variable of the same name declared in a previous scope did not create a separate variable instance, but used the previous one. Patch: *** ../bash-3.1/subst.c Mon Oct 24 09:51:13 2005 --- subst.c Fri Dec 30 12:11:53 2005 *************** *** 2188,2192 **** { v = find_variable (name); ! if (v == 0 || array_p (v) == 0) v = make_local_array_variable (name); v = assign_array_var_from_string (v, value, flags); --- 2188,2192 ---- { v = find_variable (name); ! if (v == 0 || array_p (v) == 0 || v->context != variable_context) v = make_local_array_variable (name); v = assign_array_var_from_string (v, value, flags); *** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 --- patchlevel.h Wed Dec 7 13:48:42 2005 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 3 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 4 #endif /* _PATCHLEVEL_H_ */ --- NEW FILE bash31-005 --- BASH PATCH REPORT ================= Bash-Release: 3.1 Patch-ID: bash31-005 Bug-Reported-by: Bug-Reference-ID: Bug-Reference-URL: Bug-Description: When tilde expansion fails, POSIX leaves it unspecified whether or not the word undergoes the additional word expansions. Bash-3.1 as distributed skipped the rest of the expansions; this patch restores the bash-3.0 behavior. This means that something like USER=ratbert echo ~$USER will echo `~ratbert' rather than `~$USER'. Patch: *** ../bash-3.1/subst.c Mon Oct 24 09:51:13 2005 --- subst.c Fri Dec 30 12:11:53 2005 *************** *** 6796,6799 **** --- 6823,6832 ---- { temp1 = bash_tilde_expand (temp, tflag); + if (temp1 && *temp1 == '~' && STREQ (temp, temp1)) + { + FREE (temp); + FREE (temp1); + goto add_character; /* tilde expansion failed */ + } free (temp); temp = temp1; *** ../bash-3.1/patchlevel.h Wed Jul 20 13:58:20 2005 --- patchlevel.h Wed Dec 7 13:48:42 2005 *************** *** 26,30 **** looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 4 #endif /* _PATCHLEVEL_H_ */ --- 26,30 ---- looks for to find the patch level (for the sccs version string). */ ! #define PATCHLEVEL 5 #endif /* _PATCHLEVEL_H_ */ bash-ulimit.patch: builtins/ulimit.def | 11 +++++++++++ doc/bash.1 | 8 +++++++- doc/bashref.texi | 11 ++++++++++- 3 files changed, 28 insertions(+), 2 deletions(-) Index: bash-ulimit.patch =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash-ulimit.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bash-ulimit.patch 2 Jan 2006 11:02:47 -0000 1.5 +++ bash-ulimit.patch 10 Jan 2006 12:03:16 -0000 1.6 @@ -1,5 +1,5 @@ --- bash-3.1/builtins/ulimit.def.ulimit 2005-08-04 13:39:04.000000000 +0100 -+++ bash-3.1/builtins/ulimit.def 2005-12-23 16:06:56.000000000 +0000 ++++ bash-3.1/builtins/ulimit.def 2006-01-10 11:21:49.000000000 +0000 @@ -34,6 +34,7 @@ -a all current limits are reported -c the maximum size of core files created @@ -46,18 +46,18 @@ { -1, -1, -1, (char *)NULL, (char *)NULL } }; #define NCMDS (sizeof(limits) / sizeof(limits[0])) ---- bash-3.1/doc/bashref.texi.ulimit 2005-12-23 16:04:31.000000000 +0000 -+++ bash-3.1/doc/bashref.texi 2005-12-23 16:04:31.000000000 +0000 +--- bash-3.1/doc/bashref.texi.ulimit 2006-01-10 11:21:49.000000000 +0000 ++++ bash-3.1/doc/bashref.texi 2006-01-10 11:25:06.000000000 +0000 @@ -3833,7 +3833,7 @@ @item ulimit @btindex ulimit @example --ulimit [-acdflmnpstuvSH] [@var{limit}] -+ulimit [-acdeflmnpqrstuvxSH] [@var{limit}] +-ulimit [-acdfilmnpqstuvxSH] [@var{limit}] ++ulimit [-acdefilmnpqrstuvxSH] [@var{limit}] @end example @code{ulimit} provides control over the resources available to processes started by the shell, on systems that allow such control. If an -@@ -3854,9 +3854,15 @@ +@@ -3854,6 +3854,9 @@ @item -d The maximum size of a process's data segment. @@ -67,28 +67,19 @@ @item -f The maximum size of files created by the shell. -+ at item -i -+The maximum number of pending signals. -+ - @item -l - The maximum size that may be locked into memory. - -@@ -3869,6 +3875,12 @@ - @item -p - The pipe buffer size. +@@ -3875,6 +3878,9 @@ + @item -q + The maximum number of bytes in POSIX message queues. -+ at item -q -+The maximum number of bytes in POSIX message queues. -+ + at item -r +The maximum RT priority. + @item -s The maximum stack size. -@@ -3881,6 +3893,9 @@ - @item -v - The maximum amount of virtual memory available to the process. +@@ -3890,6 +3896,9 @@ + @item -x + The maximum number of file locks. + at item -x +The maximum amount of file locks. @@ -96,18 +87,18 @@ @end table If @var{limit} is given, it is the new value of the specified resource; ---- bash-3.1/doc/bash.1.ulimit 2005-12-23 16:04:31.000000000 +0000 -+++ bash-3.1/doc/bash.1 2005-12-23 16:04:31.000000000 +0000 -@@ -8490,7 +8490,7 @@ +--- bash-3.1/doc/bash.1.ulimit 2006-01-10 11:21:49.000000000 +0000 ++++ bash-3.1/doc/bash.1 2006-01-10 11:24:43.000000000 +0000 +@@ -8496,7 +8496,7 @@ returns true if any of the arguments are found, false if none are found. .TP --\fBulimit\fP [\fB\-SHacdflmnpstuv\fP [\fIlimit\fP]] +-\fBulimit\fP [\fB\-SHacdfilmnpqstuvx\fP [\fIlimit\fP]] +\fBulimit\fP [\fB\-SHacdefilmnpqrstuvx\fP [\fIlimit\fP]] Provides control over the resources available to the shell and to processes started by it, on systems that allow such control. The \fB\-H\fP and \fB\-S\fP options specify that the hard or soft limit is -@@ -8526,9 +8526,15 @@ +@@ -8532,6 +8532,9 @@ .B \-d The maximum size of a process's data segment .TP @@ -117,32 +108,13 @@ .B \-f The maximum size of files created by the shell .TP -+.B \-i -+The maximum number of pending signals -+.TP - .B \-l - The maximum size that may be locked into memory - .TP -@@ -8542,6 +8548,12 @@ - .B \-p - The pipe size in 512-byte blocks (this may not be set) +@@ -8554,6 +8557,9 @@ + .B \-q + The maximum number of bytes in POSIX message queues .TP -+.B \-q -+The maximum number of bytes in POSIX message queues -+.TP +.B \-r +The maximum rt priority +.TP .B \-s The maximum stack size .TP -@@ -8553,6 +8565,9 @@ - .TP - .B \-v - The maximum amount of virtual memory available to the shell -+.TP -+.B \-x -+The maximum number of file locks - .PD - .PP - If Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- bash.spec 6 Jan 2006 17:29:17 -0000 1.99 +++ bash.spec 10 Jan 2006 12:03:16 -0000 1.100 @@ -11,8 +11,11 @@ Source4: dot-bash_profile Source5: dot-bash_logout # Official upstream patches -Patch1: bash31-001 -Patch2: bash-arrays.patch +Patch1: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-001 +Patch2: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-002 +Patch3: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-003 +Patch4: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-004 +Patch5: ftp://ftp.gnu.org/gnu/bash/bash-3.1-patches/bash31-005 # Other patches Patch100: bash-2.03-paths.patch Patch101: bash-2.02-security.patch @@ -54,7 +57,10 @@ %setup -q -a 2 # Official upstream patches %patch1 -p0 -b .001 -%patch2 -p0 -b .arrays +%patch2 -p0 -b .002 +%patch3 -p0 -b .003 +%patch4 -p0 -b .004 +%patch5 -p0 -b .005 # Other patches %patch100 -p1 -b .paths @@ -205,6 +211,9 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Tue Jan 10 2006 Tim Waugh +- Patchlevel 5. + * Fri Jan 6 2006 Tim Waugh 3.1-2 - No longer need loadables, mbinc or shellfunc patches. - Use literal single-quote in bash man page where appropriate (bug #177051). --- bash-arrays.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 10 12:03:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 07:03:53 -0500 Subject: rpms/bash/devel bash.spec,1.100,1.101 Message-ID: <200601101203.k0AC3r5N008326@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8312 Modified Files: bash.spec Log Message: 3.1-3 Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- bash.spec 10 Jan 2006 12:03:16 -0000 1.100 +++ bash.spec 10 Jan 2006 12:03:50 -0000 1.101 @@ -1,7 +1,7 @@ Version: 3.1 Name: bash Summary: The GNU Bourne Again shell (bash) version %{version}. -Release: 2 +Release: 3 Group: System Environment/Shells License: GPL Url: http://www.gnu.org/software/bash @@ -211,7 +211,7 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog -* Tue Jan 10 2006 Tim Waugh +* Tue Jan 10 2006 Tim Waugh 3.1-3 - Patchlevel 5. * Fri Jan 6 2006 Tim Waugh 3.1-2 From fedora-cvs-commits at redhat.com Tue Jan 10 13:01:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 08:01:18 -0500 Subject: rpms/xpdf/FC-4 xpdf-3.01-CAN-2005-3193.patch, NONE, 1.1 xpdf.spec, 1.56, 1.57 Message-ID: <200601101301.k0AD1Ixa020891@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/xpdf/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv20841 Modified Files: xpdf.spec Added Files: xpdf-3.01-CAN-2005-3193.patch Log Message: - fix CAN-2005-3193 xpdf-3.01-CAN-2005-3193.patch: goo/gmem.c | 5 +++-- xpdf/JBIG2Stream.cc | 6 ++++++ xpdf/Stream.cc | 13 ++++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-) --- NEW FILE xpdf-3.01-CAN-2005-3193.patch --- diff -urN xpdf-3.01_old/goo/gmem.c xpdf-3.01_new/goo/gmem.c --- xpdf-3.01_old/goo/gmem.c 2006-01-10 12:56:54.000000000 +0100 +++ xpdf-3.01_new/goo/gmem.c 2006-01-10 13:01:13.000000000 +0100 @@ -11,6 +11,7 @@ #include #include #include +#include #include "gmem.h" #ifdef DEBUG_MEM @@ -141,7 +142,7 @@ int n; n = nObjs * objSize; - if (objSize == 0 || n / objSize != nObjs) { + if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { fprintf(stderr, "Bogus memory allocation size\n"); exit(1); } @@ -152,7 +153,7 @@ int n; n = nObjs * objSize; - if (objSize == 0 || n / objSize != nObjs) { + if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { fprintf(stderr, "Bogus memory allocation size\n"); exit(1); } diff -urN xpdf-3.01_old/xpdf/JBIG2Stream.cc xpdf-3.01_new/xpdf/JBIG2Stream.cc --- xpdf-3.01_old/xpdf/JBIG2Stream.cc 2006-01-10 12:56:54.000000000 +0100 +++ xpdf-3.01_new/xpdf/JBIG2Stream.cc 2006-01-10 13:08:26.000000000 +0100 @@ -684,6 +684,7 @@ line = (wA + 7) >> 3; if (h < 0 || line <= 0 || h >= INT_MAX / line) { + error(-1, "invalid width/height"); data = NULL; } else { @@ -701,6 +702,7 @@ line = bitmap->line; if (h < 0 || line <= 0 || h >= INT_MAX / line) { + error(-1, "invalid width/height"); data = NULL; return; } @@ -734,6 +736,9 @@ void JBIG2Bitmap::expand(int newH, Guint pixel) { if (newH <= h || line <= 0 || newH >= INT_MAX / line) { + error(-1, "invalid width/height"); + gfree(data); + data = NULL; return; } // need to allocate one extra guard byte for use in combine() @@ -2959,6 +2964,7 @@ int x, y, pix; if (w < 0 || h <= 0 || w >= INT_MAX / h) + error(-1, "invalid width/height"); return NULL; bitmap = new JBIG2Bitmap(0, w, h); diff -urN xpdf-3.01_old/xpdf/Stream.cc xpdf-3.01_new/xpdf/Stream.cc --- xpdf-3.01_old/xpdf/Stream.cc 2006-01-10 12:56:54.000000000 +0100 +++ xpdf-3.01_new/xpdf/Stream.cc 2006-01-10 13:22:48.000000000 +0100 @@ -1276,8 +1276,10 @@ endOfLine = endOfLineA; byteAlign = byteAlignA; columns = columnsA; - if (columns + 3 < 1 || columns + 4 < 1 || columns < 1) { - columns = 1; + if (columns < 1 || columns + 2 < 0 || columns + 3 < 0 || + (columns + 2) >= INT_MAX / sizeof(short) || (columns + 3) >= INT_MAX / sizeof(short)) { + error(-1, "invalid number of columns"); + exit(1); } rows = rowsA; endOfBlock = endOfBlockA; @@ -2920,6 +2922,7 @@ width = read16(); numComps = str->getChar(); if (numComps <= 0 || numComps > 4) { + numComps = 0; error(getPos(), "Bad number of components in DCT stream", prec); return gFalse; } @@ -2950,6 +2953,7 @@ width = read16(); numComps = str->getChar(); if (numComps <= 0 || numComps > 4) { + numComps = 0; error(getPos(), "Bad number of components in DCT stream", prec); return gFalse; } @@ -2976,6 +2980,7 @@ length = read16() - 2; scanInfo.numComps = str->getChar(); if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { + scanInfo.numComps = 0; error(getPos(), "Bad number of components in DCT stream"); return gFalse; } @@ -3186,9 +3191,11 @@ do { do { c = str->getChar(); - } while (c != 0xff && c != EOF); + if(c == EOF) return EOF; + } while (c != 0xff); do { c = str->getChar(); + if(c == EOF) return EOF; } while (c == 0xff); } while (c == 0x00); return c; Index: xpdf.spec =================================================================== RCS file: /cvs/dist/rpms/xpdf/FC-4/xpdf.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- xpdf.spec 14 Dec 2005 21:22:02 -0000 1.56 +++ xpdf.spec 10 Jan 2006 13:00:43 -0000 1.57 @@ -5,7 +5,7 @@ Summary: A PDF file viewer for the X Window System. Name: xpdf Version: 3.01 -Release: 0.FC4.5 +Release: 0.FC4.6 License: GPL Epoch: 1 Url: http://www.foolabs.com/xpdf/ @@ -31,6 +31,7 @@ Patch12: xpdf-3.00-64bit.patch Patch13: xpdf-3.01-resize.patch Patch15: xpdf-3.01-CVE-2005-3191.patch +Patch16: xpdf-3.01-CAN-2005-3193.patch Requires: urw-fonts Requires: htmlview @@ -116,6 +117,7 @@ %patch12 -p1 -b .alloc %patch13 -p1 -b .resize %patch15 -p1 -b .CVE-2005-3191 +%patch16 -p1 -b .CVE-2005-3193 %build find -name "*orig" | xargs rm -f @@ -203,6 +205,9 @@ %lang(ko) %{_datadir}/xpdf/korean %changelog +* Tue Jan 10 2006 Karsten Hopp 3.01-0.FC4.6 +- fix CAN-2005-3193 + * Wed Dec 14 2005 Kristian H?gsberg 1:3.01-0.FC4.5 - Bump release. - Update sources file and drop t1lib support entirely. From fedora-cvs-commits at redhat.com Tue Jan 10 13:12:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 08:12:32 -0500 Subject: rpms/xpdf/devel xpdf-3.01-CAN-2005-3193.patch, NONE, 1.1 xpdf-3.01-CVE-2005-3191.patch, NONE, 1.1 xpdf.spec, 1.65, 1.66 Message-ID: <200601101312.k0ADCWYq023829@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/xpdf/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23786 Modified Files: xpdf.spec Added Files: xpdf-3.01-CAN-2005-3193.patch xpdf-3.01-CVE-2005-3191.patch Log Message: - add patches to fix CVE-2005-3191 and CAN-2005-3193 xpdf-3.01-CAN-2005-3193.patch: goo/gmem.c | 5 +++-- xpdf/JBIG2Stream.cc | 6 ++++++ xpdf/Stream.cc | 13 ++++++++++--- 3 files changed, 19 insertions(+), 5 deletions(-) --- NEW FILE xpdf-3.01-CAN-2005-3193.patch --- diff -urN xpdf-3.01_old/goo/gmem.c xpdf-3.01_new/goo/gmem.c --- xpdf-3.01_old/goo/gmem.c 2006-01-10 12:56:54.000000000 +0100 +++ xpdf-3.01_new/goo/gmem.c 2006-01-10 13:01:13.000000000 +0100 @@ -11,6 +11,7 @@ #include #include #include +#include #include "gmem.h" #ifdef DEBUG_MEM @@ -141,7 +142,7 @@ int n; n = nObjs * objSize; - if (objSize == 0 || n / objSize != nObjs) { + if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { fprintf(stderr, "Bogus memory allocation size\n"); exit(1); } @@ -152,7 +153,7 @@ int n; n = nObjs * objSize; - if (objSize == 0 || n / objSize != nObjs) { + if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { fprintf(stderr, "Bogus memory allocation size\n"); exit(1); } diff -urN xpdf-3.01_old/xpdf/JBIG2Stream.cc xpdf-3.01_new/xpdf/JBIG2Stream.cc --- xpdf-3.01_old/xpdf/JBIG2Stream.cc 2006-01-10 12:56:54.000000000 +0100 +++ xpdf-3.01_new/xpdf/JBIG2Stream.cc 2006-01-10 13:08:26.000000000 +0100 @@ -684,6 +684,7 @@ line = (wA + 7) >> 3; if (h < 0 || line <= 0 || h >= INT_MAX / line) { + error(-1, "invalid width/height"); data = NULL; } else { @@ -701,6 +702,7 @@ line = bitmap->line; if (h < 0 || line <= 0 || h >= INT_MAX / line) { + error(-1, "invalid width/height"); data = NULL; return; } @@ -734,6 +736,9 @@ void JBIG2Bitmap::expand(int newH, Guint pixel) { if (newH <= h || line <= 0 || newH >= INT_MAX / line) { + error(-1, "invalid width/height"); + gfree(data); + data = NULL; return; } // need to allocate one extra guard byte for use in combine() @@ -2959,6 +2964,7 @@ int x, y, pix; if (w < 0 || h <= 0 || w >= INT_MAX / h) + error(-1, "invalid width/height"); return NULL; bitmap = new JBIG2Bitmap(0, w, h); diff -urN xpdf-3.01_old/xpdf/Stream.cc xpdf-3.01_new/xpdf/Stream.cc --- xpdf-3.01_old/xpdf/Stream.cc 2006-01-10 12:56:54.000000000 +0100 +++ xpdf-3.01_new/xpdf/Stream.cc 2006-01-10 13:22:48.000000000 +0100 @@ -1276,8 +1276,10 @@ endOfLine = endOfLineA; byteAlign = byteAlignA; columns = columnsA; - if (columns + 3 < 1 || columns + 4 < 1 || columns < 1) { - columns = 1; + if (columns < 1 || columns + 2 < 0 || columns + 3 < 0 || + (columns + 2) >= INT_MAX / sizeof(short) || (columns + 3) >= INT_MAX / sizeof(short)) { + error(-1, "invalid number of columns"); + exit(1); } rows = rowsA; endOfBlock = endOfBlockA; @@ -2920,6 +2922,7 @@ width = read16(); numComps = str->getChar(); if (numComps <= 0 || numComps > 4) { + numComps = 0; error(getPos(), "Bad number of components in DCT stream", prec); return gFalse; } @@ -2950,6 +2953,7 @@ width = read16(); numComps = str->getChar(); if (numComps <= 0 || numComps > 4) { + numComps = 0; error(getPos(), "Bad number of components in DCT stream", prec); return gFalse; } @@ -2976,6 +2980,7 @@ length = read16() - 2; scanInfo.numComps = str->getChar(); if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { + scanInfo.numComps = 0; error(getPos(), "Bad number of components in DCT stream"); return gFalse; } @@ -3186,9 +3191,11 @@ do { do { c = str->getChar(); - } while (c != 0xff && c != EOF); + if(c == EOF) return EOF; + } while (c != 0xff); do { c = str->getChar(); + if(c == EOF) return EOF; } while (c == 0xff); } while (c == 0x00); return c; xpdf-3.01-CVE-2005-3191.patch: JPXStream.cc | 14 ++++++++--- Stream.cc | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++------ Stream.h | 3 ++ 3 files changed, 82 insertions(+), 10 deletions(-) --- NEW FILE xpdf-3.01-CVE-2005-3191.patch --- --- xpdf-3.00.orig/xpdf/JPXStream.cc +++ xpdf-3.00/xpdf/JPXStream.cc @@ -7,6 +7,7 @@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@ -666,7 +667,7 @@ int segType; GBool haveSIZ, haveCOD, haveQCD, haveSOT; Guint precinctSize, style; - Guint segLen, capabilities, comp, i, j, r; + Guint segLen, capabilities, nTiles, comp, i, j, r; //----- main header haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; @@ -701,8 +702,15 @@ / img.xTileSize; img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) / img.yTileSize; - img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles, - sizeof(JPXTile)); + // check for overflow before allocating memory + if (img.nXTiles <= 0 || img.nYTiles <= 0 || + img.nXTiles >= INT_MAX/img.nYTiles) { + error(getPos(), "Bad tile count in JPX SIZ marker segment"); + return gFalse; + } + nTiles = img.nXTiles * img.nYTiles; + img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile)); + for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps * sizeof(JPXTileComp)); only in patch2: unchanged: --- xpdf-3.00.orig/xpdf/Stream.h +++ xpdf-3.00/xpdf/Stream.h @@ -233,6 +233,8 @@ ~StreamPredictor(); + GBool isOk() { return ok; } + int lookChar(); int getChar(); @@ -250,6 +252,7 @@ int rowBytes; // bytes per line Guchar *predLine; // line buffer int predIdx; // current index in predLine + GBool ok; }; //------------------------------------------------------------------------ only in patch2: unchanged: --- xpdf-3.00.orig/xpdf/Stream.cc +++ xpdf-3.00/xpdf/Stream.cc @@ -15,6 +15,7 @@ #include #include #include +#include #ifndef WIN32 #include #endif @@ -412,13 +413,28 @@ width = widthA; nComps = nCompsA; nBits = nBitsA; + predLine = NULL; + ok = gFalse; + if (width <= 0 || nComps <= 0 || nBits <= 0 || + nComps >= INT_MAX/nBits || + width >= INT_MAX/nComps/nBits) { + return; + } nVals = width * nComps; + if (nVals * nBits + 7 <= 0) { + return; + } pixBytes = (nComps * nBits + 7) >> 3; rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; + if (rowBytes < 0) { + return; + } predLine = (Guchar *)gmalloc(rowBytes); memset(predLine, 0, rowBytes); predIdx = rowBytes; + + ok = gTrue; } StreamPredictor::~StreamPredictor() { @@ -1012,6 +1028,10 @@ FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if (!pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } @@ -2897,6 +2917,10 @@ height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + error(getPos(), "Bad number of components in DCT stream", prec); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@ -2923,6 +2947,10 @@ height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + error(getPos(), "Bad number of components in DCT stream", prec); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@ -2945,6 +2973,10 @@ length = read16() - 2; scanInfo.numComps = str->getChar(); + if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } --length; if (length != 2 * scanInfo.numComps + 3) { error(getPos(), "Bad DCT scan info block"); @@ -3255,6 +3287,10 @@ FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if (!pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } --- xpdf-3.00/xpdf/JBIG2Stream.cc (revision 488119) +++ xpdf-3.00/xpdf/JBIG2Stream.cc (working copy) @@ -7,6 +7,7 @@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@ -681,9 +682,15 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = wA; h = hA; line = (wA + 7) >> 3; - // need to allocate one extra guard byte for use in combine() - data = (Guchar *)gmalloc(h * line + 1); - data[h * line] = 0; + + if (h < 0 || line <= 0 || h >= INT_MAX / line) { + data = NULL; + } + else { + // need to allocate one extra guard byte for use in combine() + data = (Guchar *)gmalloc(h * line + 1); + data[h * line] = 0; + } } JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap): @@ -692,6 +699,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = bitmap->w; h = bitmap->h; line = bitmap->line; + + if (h < 0 || line <= 0 || h >= INT_MAX / line) { + data = NULL; + return; + } + // need to allocate one extra guard byte for use in combine() data = (Guchar *)gmalloc(h * line + 1); memcpy(data, bitmap->data, h * line); @@ -720,7 +733,7 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint } void JBIG2Bitmap::expand(int newH, Guint pixel) { - if (newH <= h) { + if (newH <= h || line <= 0 || newH >= INT_MAX / line) { return; } // need to allocate one extra guard byte for use in combine() @@ -2305,6 +2318,15 @@ void JBIG2Stream::readHalftoneRegionSeg( error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } + if (gridH == 0 || gridW >= INT_MAX / gridH) { + error(getPos(), "Bad size in JBIG2 halftone segment"); + return; + } + if (w == 0 || h >= INT_MAX / w) { + error(getPos(), "Bad size in JBIG2 bitmap segment"); + return; + } + patternDict = (JBIG2PatternDict *)seg; bpp = 0; i = 1; @@ -2936,6 +2958,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2; int x, y, pix; + if (w < 0 || h <= 0 || w >= INT_MAX / h) + return NULL; + bitmap = new JBIG2Bitmap(0, w, h); bitmap->clearToZero(); --- xpdf-3.00/xpdf/Stream.cc (revision 488119) +++ xpdf-3.00/xpdf/Stream.cc (working copy) @@ -1277,7 +1277,7 @@ CCITTFaxStream::CCITTFaxStream(Stream *s endOfLine = endOfLineA; byteAlign = byteAlignA; columns = columnsA; - if (columns < 1) { + if (columns + 3 < 1 || columns + 4 < 1 || columns < 1) { columns = 1; } rows = rowsA; @@ -3066,12 +3066,12 @@ GBool DCTStream::readHuffmanTables() { while (length > 0) { index = str->getChar(); --length; - if ((index & 0x0f) >= 4) { + if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) { error(getPos(), "Bad DCT Huffman table"); return gFalse; } if (index & 0x10) { - index &= 0x0f; + index &= 0x03; if (index >= numACHuffTables) numACHuffTables = index+1; tbl = &acHuffTables[index]; Index: xpdf.spec =================================================================== RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- xpdf.spec 12 Dec 2005 11:19:03 -0000 1.65 +++ xpdf.spec 10 Jan 2006 13:12:29 -0000 1.66 @@ -7,7 +7,7 @@ Summary: A PDF file viewer for the X Window System. Name: xpdf Version: 3.01 -Release: 6 +Release: 7 License: GPL Epoch: 1 Url: http://www.foolabs.com/xpdf/ @@ -34,6 +34,8 @@ Patch12: xpdf-3.00-64bit.patch Patch13: xpdf-3.01-resize.patch Patch14: xpdf-3.01-freetype-internals.patch +Patch15: xpdf-3.01-CVE-2005-3191.patch +Patch16: xpdf-3.01-CAN-2005-3193.patch Requires: urw-fonts Requires: htmlview @@ -118,6 +120,8 @@ %patch12 -p1 -b .alloc %patch13 -p1 -b .resize %patch14 -p1 -b .freetype-internals +%patch15 -p1 -b .CVE-2005-3191.patch +%patch16 -p1 -b .CAN-2005-3193.patch %build find -name "*orig" | xargs rm -f @@ -217,6 +221,9 @@ %lang(ko) %{_datadir}/xpdf/korean %changelog +* Tue Jan 10 2006 Karsten Hopp 3.01-7 +- add patches to fix CVE-2005-3191 and CAN-2005-3193 + * Mon Dec 12 2005 Than Ngo 3.01-6 - rebuilt against new openmotif-2.3 From fedora-cvs-commits at redhat.com Tue Jan 10 13:27:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 08:27:56 -0500 Subject: rpms/foomatic/devel foomatic.spec,1.124,1.125 Message-ID: <200601101327.k0ADRuTu009734@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9688 Modified Files: foomatic.spec Log Message: * Tue Jan 10 2006 Tim Waugh - Don't remove the cache directory, only its contents (bug #177266). Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.124 retrieving revision 1.125 diff -u -r1.124 -r1.125 --- foomatic.spec 3 Jan 2006 13:08:39 -0000 1.124 +++ foomatic.spec 10 Jan 2006 13:27:54 -0000 1.125 @@ -228,9 +228,7 @@ find $RPM_BUILD_ROOT -name .packlist -o -name '*.xml.*' | xargs rm -f %post -if [ -d /var/cache/foomatic ] ; then - /bin/rm -rf /var/cache/foomatic -fi +/bin/rm -f /var/cache/foomatic/* # Try to rebuild the printconf data if [ -x /usr/share/printconf/util/updateconf.py ] ; then @@ -265,6 +263,9 @@ %{_var}/cache/foomatic %changelog +* Tue Jan 10 2006 Tim Waugh +- Don't remove the cache directory, only its contents (bug #177266). + * Tue Jan 3 2006 Tim Waugh 3.0.2-30 - Updated db to 3.0-20060103. From fedora-cvs-commits at redhat.com Tue Jan 10 13:42:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 08:42:26 -0500 Subject: rpms/system-config-printer/devel .cvsignore, 1.53, 1.54 printconf.spec, 1.56, 1.57 sources, 1.55, 1.56 Message-ID: <200601101342.k0ADgQmJ014357@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/system-config-printer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14320 Modified Files: .cvsignore printconf.spec sources Log Message: * Tue Jan 10 2006 Tim Waugh 0.6.148-1 - Don't remove the cache directory, only its contents (bug #177266). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 5 Jan 2006 13:25:53 -0000 1.53 +++ .cvsignore 10 Jan 2006 13:42:23 -0000 1.54 @@ -33,3 +33,4 @@ printconf-0.6.145.tar.bz2 printconf-0.6.146.tar.bz2 printconf-0.6.147.tar.bz2 +printconf-0.6.148.tar.bz2 Index: printconf.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/printconf.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- printconf.spec 5 Jan 2006 13:25:53 -0000 1.56 +++ printconf.spec 10 Jan 2006 13:42:23 -0000 1.57 @@ -1,6 +1,6 @@ Summary: A printer configuration backend/frontend combination. Name: system-config-printer -Version: 0.6.147 +Version: 0.6.148 Release: 1 License: GPL Group: System Environment/Daemons @@ -93,9 +93,7 @@ rm -rf $RPM_BUILD_ROOT %post -if [ -d /var/cache/foomatic ] ; then - /bin/rm -rf /var/cache/foomatic -fi +/bin/rm -rf /var/cache/foomatic/* # The gimp-print driver changed its name, so update the configuration. %{_datadir}/printconf/util/updateconf.py @@ -176,6 +174,9 @@ %changelog +* Tue Jan 10 2006 Tim Waugh 0.6.148-1 +- Don't remove the cache directory, only its contents (bug #177266). + * Thu Jan 5 2006 Tim Waugh 0.6.147-1 - 0.6.147: - Don't alter page margins (bug #176906). Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- sources 5 Jan 2006 13:25:54 -0000 1.55 +++ sources 10 Jan 2006 13:42:23 -0000 1.56 @@ -1 +1 @@ -e3060f9affbd0c3eacb8975d32605010 printconf-0.6.147.tar.bz2 +d6b099d3611b7fd52ec9086fbc1f7ef3 printconf-0.6.148.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 10 13:48:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 08:48:08 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.79, 1.80 libsepol.spec, 1.102, 1.103 sources, 1.80, 1.81 Message-ID: <200601101348.k0ADm8pc028206@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28168 Modified Files: .cvsignore libsepol.spec sources Log Message: * Tue Jan 10 2006 Dan Walsh 1.11.8-1 - Upgrade to latest from NSA * Merged 2nd const in APIs patch from Ivan Gyurdiev. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- .cvsignore 6 Jan 2006 15:35:55 -0000 1.79 +++ .cvsignore 10 Jan 2006 13:48:05 -0000 1.80 @@ -76,3 +76,4 @@ libsepol-1.11.4.tgz libsepol-1.11.5.tgz libsepol-1.11.7.tgz +libsepol-1.11.8.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- libsepol.spec 6 Jan 2006 15:35:55 -0000 1.102 +++ libsepol.spec 10 Jan 2006 13:48:05 -0000 1.103 @@ -1,6 +1,6 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.11.7 +Version: 1.11.8 Release: 1 License: GPL Group: System Environment/Libraries @@ -80,6 +80,10 @@ %{_includedir}/sepol/policydb/*.h %changelog +* Tue Jan 10 2006 Dan Walsh 1.11.8-1 +- Upgrade to latest from NSA + * Merged 2nd const in APIs patch from Ivan Gyurdiev. + * Fri Jan 7 2006 Dan Walsh 1.11.7-1 - Upgrade to latest from NSA * Merged const in APIs patch from Ivan Gyurdiev. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- sources 6 Jan 2006 15:35:55 -0000 1.80 +++ sources 10 Jan 2006 13:48:05 -0000 1.81 @@ -1 +1 @@ -a40cc63ab70ee3d2f35650750056a0d9 libsepol-1.11.7.tgz +80daa3d1bee59dfc06934394cd7304f9 libsepol-1.11.8.tgz From fedora-cvs-commits at redhat.com Tue Jan 10 14:48:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 09:48:59 -0500 Subject: rpms/elinks/devel elinks-0.11.0-srcdir.patch, NONE, 1.1 elinks.spec, 1.28, 1.29 Message-ID: <200601101448.k0AEmx3g030485@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/elinks/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30441 Modified Files: elinks.spec Added Files: elinks-0.11.0-srcdir.patch Log Message: fix build system elinks-0.11.0-srcdir.patch: Makefile | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE elinks-0.11.0-srcdir.patch --- --- elinks-0.11.0/src/intl/gettext/Makefile.srcdir 2006-01-10 15:36:46.000000000 +0100 +++ elinks-0.11.0/src/intl/gettext/Makefile 2006-01-10 15:38:25.000000000 +0100 @@ -25,9 +25,9 @@ textdomain.o -# $(builddir)/charset.alias: $(srcdir)/config.charset -$(builddir)/charset.alias: $(srcdir)config.charset - $(SHELL) $(srcdir)/config.charset '$(host)' > $@.new +# $(builddir)/charset.alias: $(builddir)/config.charset +$(builddir)/charset.alias: $(builddir)/config.charset + $(SHELL) $(builddir)/config.charset '$(host)' > $@.new mv $@.new $@ # FIXME: Building plural.c from plural.y on the fly doesn't work @@ -61,7 +61,7 @@ $(MKINSTALLDIRS) $(DESTDIR)$(localedir); \ test -f $(DESTDIR)$(localedir)/locale.alias \ && orig=$(DESTDIR)$(localedir)/locale.alias \ - || orig=$(srcdir)/locale.alias; \ + || orig=$(builddir)/locale.alias; \ temp=$(DESTDIR)$(localedir)/t-locale.alias; \ dest=$(DESTDIR)$(localedir)/locale.alias; \ sed -f ref-add.sed $$orig > $$temp; \ Index: elinks.spec =================================================================== RCS file: /cvs/dist/rpms/elinks/devel/elinks.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- elinks.spec 10 Jan 2006 09:53:49 -0000 1.28 +++ elinks.spec 10 Jan 2006 14:48:56 -0000 1.29 @@ -22,6 +22,8 @@ Patch5: elinks-0.10.1-xterm.patch Patch6: elinks-0.11.0-union.patch +Patch7: elinks-0.11.0-srcdir.patch + %description Links is a text-based Web browser. Links does not display any images, but it does support frames, tables and most other HTML tags. Links' @@ -44,6 +46,8 @@ %patch5 -p1 -b .xterm # Fix #157300 - Strange behavior on ppc64 %patch6 -p1 -b .union +# Fix build system +%patch7 -p1 -b .srcdir %build #aclocal @@ -81,6 +85,7 @@ %changelog * Tue Jan 10 2006 Karel Zak 0.11.0-1 - update to new upstream version +- fix 0.11.0 build system (srcdir.patch) - regenerate patches: elinks-0.11.0-getaddrinfo.patch, elinks-0.11.0-ssl-noegd.patch, From fedora-cvs-commits at redhat.com Tue Jan 10 14:51:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 09:51:37 -0500 Subject: rpms/gimp/devel gimp.spec,1.85,1.86 Message-ID: <200601101451.k0AEpbcZ031738@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/gimp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31676 Modified Files: gimp.spec Log Message: rebuild with lcms Index: gimp.spec =================================================================== RCS file: /cvs/dist/rpms/gimp/devel/gimp.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- gimp.spec 29 Dec 2005 10:02:31 -0000 1.85 +++ gimp.spec 10 Jan 2006 14:51:34 -0000 1.86 @@ -4,6 +4,10 @@ %define _enable_static %{?enable_static:%{enable_static}}%{?!enable_static:1} %define _enable_print %{?enable_print:%{enable_print}}%{?!enable_print:0} %define _enable_convenience %{?enable_convenience:%{enable_convenience}}%{?!enable_convenience:1} +%define _with_lcms %{?with_lcms:%{with_lcms}}%{?!with_lcms:1} + +# +# Summary: The GNU Image Manipulation Program Name: gimp @@ -15,7 +19,7 @@ %define minorver 200 %define microver %(ver=%{version}; echo ${ver##*.*.}) #define prever pre2 -Release: %{?prever:0.0.%{prever}.}1 +Release: %{?prever:0.0.%{prever}.}2 Epoch: 2 License: GPL, LGPL Group: Applications/Multimedia @@ -52,6 +56,9 @@ BuildRequires: libwmf-devel >= 0.2.8 BuildRequires: intltool BuildRequires: findutils +%if %_with_lcms +BuildRequires: lcms-devel +%endif Requires: desktop-file-utils >= 0.9 Requires: glib2 >= 2.4.8 Requires: gtk2 >= 2.4.14 @@ -129,6 +136,11 @@ %else --disable-print \ %endif +%if %_with_lcms + --with-lcms \ +%else + --without-lcms \ +%endif ; make %{?_smp_mflags} @@ -336,6 +348,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Jan 10 2006 Nils Philippsen +- rebuild with lcms + * Thu Dec 29 2005 Nils Philippsen - 2.2.10 - version 2.2.10 From fedora-cvs-commits at redhat.com Tue Jan 10 15:12:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 10:12:42 -0500 Subject: rpms/f-spot/devel f-spot.spec,1.8,1.9 Message-ID: <200601101512.k0AFCgod006286@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/f-spot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6207/devel Modified Files: f-spot.spec Log Message: * Tue Jan 10 2006 Alexander Larsson - 0.1.5-2 - Add lcms depencency Index: f-spot.spec =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- f-spot.spec 9 Jan 2006 20:41:17 -0000 1.8 +++ f-spot.spec 10 Jan 2006 15:12:40 -0000 1.9 @@ -1,6 +1,6 @@ Name: f-spot Version: 0.1.5 -Release: 1 +Release: 2 Summary: Photo management application Group: Applications/Multimedia @@ -12,7 +12,7 @@ BuildRequires: mono-devel mono-web mono-data mono-data-sqlite lcms-devel BuildRequires: libexif-devel gtk-sharp2 gphoto2-devel >= 2.1.4 dbus-sharp -Requires: sqlite2 +Requires: sqlite2 lcms # Mono only availible on these: (s390x disabled for now) ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x @@ -62,6 +62,9 @@ %{_prefix}/bin/f-spot %changelog +* Tue Jan 10 2006 Alexander Larsson - 0.1.5-2 +- Add lcms depencency + * Mon Jan 9 2006 Alexander Larsson - 0.1.5-1 - Update to 0.1.5 From fedora-cvs-commits at redhat.com Tue Jan 10 15:21:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 10:21:41 -0500 Subject: rpms/system-config-bind/devel system-config-bind.spec, 1.47, 1.48 sources, 1.39, 1.40 .cvsignore, 1.22, 1.23 Message-ID: <200601101521.k0AFLf4P021589@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21561 Modified Files: system-config-bind.spec sources .cvsignore Log Message: fix Serbian translations; fix save of str widget (TXT records) Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/system-config-bind.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- system-config-bind.spec 21 Dec 2005 22:53:28 -0000 1.47 +++ system-config-bind.spec 10 Jan 2006 15:21:38 -0000 1.48 @@ -1,7 +1,7 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.0 -Release: 34_FC5 +Release: 36_FC5 License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind @@ -90,6 +90,10 @@ fi %changelog +* Tue Jan 10 2006 Jason Vas Dias - 4.0.0-36 +- fix bug 176142 (final!) : ship the Serbian translations +- fix str widget save (TXT records) + * Wed Dec 21 2005 Jason Vas Dias - 4.0.0-34 - fix bug 170617: don't use pam_stack in pam configuration file Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 21 Dec 2005 22:53:56 -0000 1.39 +++ sources 10 Jan 2006 15:21:38 -0000 1.40 @@ -1 +1 @@ -4d299a258a3807e3d715d70d1d4d2526 system-config-bind-4.0.0-34_FC5.tar.gz +38c6f2c7a6bb00270b837b44ab6427a6 system-config-bind-4.0.0-36_FC5.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 21 Dec 2005 22:53:56 -0000 1.22 +++ .cvsignore 10 Jan 2006 15:21:38 -0000 1.23 @@ -19,3 +19,4 @@ system-config-bind-4.0.0-32_FC5.tar.gz system-config-bind-4.0.0-33_FC5.tar.gz system-config-bind-4.0.0-34_FC5.tar.gz +system-config-bind-4.0.0-36_FC5.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 10 15:50:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 10:50:35 -0500 Subject: rpms/system-config-bind/FC-4 system-config-bind.spec, 1.48, 1.49 sources, 1.37, 1.38 .cvsignore, 1.21, 1.22 Message-ID: <200601101550.k0AFoZFx011535@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv11502 Modified Files: system-config-bind.spec sources .cvsignore Log Message: fix bug 176142: Serbian translations; fix str widget (TXT record) saves Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-4/system-config-bind.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- system-config-bind.spec 20 Dec 2005 01:45:20 -0000 1.48 +++ system-config-bind.spec 10 Jan 2006 15:50:32 -0000 1.49 @@ -1,7 +1,7 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.0 -Release: 33_FC4 +Release: 36_FC4 License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind @@ -90,10 +90,20 @@ fi %changelog +* Tue Jan 10 2006 Jason Vas Dias - 4.0.0-36 +- fix bug 176142 (final!) : ship the Serbian translations +- fix str widget save (TXT records) + +* Wed Dec 21 2005 Jason Vas Dias - 4.0.0-34 +- fix bug 170617: don't use pam_stack in pam configuration file + * Mon Dec 19 2005 Jason Vas Dias - 4.0.0-33 - fix bug 175420: traceback when named.conf included a nonexistent file - fix bug 176142: ship updated Serbian translation +* Fri Dec 09 2005 Jesse Keating +- rebuilt + * Mon Nov 28 2005 Jason Vas Dias - 4.0.0-32 - fix bug 174284: Lookup.py failed when hostname matches IP address regexps and has no DNS record Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-4/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 20 Dec 2005 01:45:20 -0000 1.37 +++ sources 10 Jan 2006 15:50:32 -0000 1.38 @@ -1 +1 @@ -0623170a37826bf3ba4a9b3be31cb365 system-config-bind-4.0.0-33_FC4.tar.gz +38c6f2c7a6bb00270b837b44ab6427a6 system-config-bind-4.0.0-36_FC4.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-4/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 20 Dec 2005 01:45:20 -0000 1.21 +++ .cvsignore 10 Jan 2006 15:50:32 -0000 1.22 @@ -19,3 +19,4 @@ system-config-bind-4.0.0-31_FC4.tar.gz system-config-bind-4.0.0-32_FC4.tar.gz system-config-bind-4.0.0-33_FC4.tar.gz +system-config-bind-4.0.0-36_FC4.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 10 16:08:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 11:08:04 -0500 Subject: rpms/system-config-bind/FC-3 system-config-bind.spec, 1.30, 1.31 sources, 1.24, 1.25 .cvsignore, 1.17, 1.18 Message-ID: <200601101608.k0AG84Rv005703@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-bind/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv5688 Modified Files: system-config-bind.spec sources .cvsignore Log Message: fix bug 176142: Serbian translations; fix str widget (TXT record) saves Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-3/system-config-bind.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- system-config-bind.spec 20 Dec 2005 01:52:03 -0000 1.30 +++ system-config-bind.spec 10 Jan 2006 16:08:02 -0000 1.31 @@ -1,7 +1,7 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.0 -Release: 33 +Release: 36 License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind @@ -90,6 +90,13 @@ fi %changelog +* Tue Jan 10 2006 Jason Vas Dias - 4.0.0-36 +- fix bug 176142 (final!) : ship the Serbian translations +- fix str widget save (TXT records) + +* Wed Dec 21 2005 Jason Vas Dias - 4.0.0-34 +- fix bug 170617: don't use pam_stack in pam configuration file + * Mon Dec 19 2005 Jason Vas Dias - 4.0.0-33 - fix bug 175420: traceback when named.conf included a nonexistent file - fix bug 176142: ship updated Serbian translation Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-3/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 20 Dec 2005 01:52:24 -0000 1.24 +++ sources 10 Jan 2006 16:08:02 -0000 1.25 @@ -1 +1 @@ -ba4b671ef89335651a3302aa95a41e75 system-config-bind-4.0.0-33.tar.gz +012f777b49ee806d9c007a37eb5373da system-config-bind-4.0.0-36.tar.gz Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-3/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 20 Dec 2005 01:52:03 -0000 1.17 +++ .cvsignore 10 Jan 2006 16:08:02 -0000 1.18 @@ -13,3 +13,4 @@ system-config-bind-4.0.0-30.tar.gz system-config-bind-4.0.0-31.tar.gz system-config-bind-4.0.0-33.tar.gz +system-config-bind-4.0.0-36.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 10 16:24:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 11:24:18 -0500 Subject: rpms/perl-XML-Grove/devel perl-XML-Grove.spec,1.12,1.13 Message-ID: <200601101624.k0AGOIYF023038@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-XML-Grove/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19190 Modified Files: perl-XML-Grove.spec Log Message: fix bug 176889 Index: perl-XML-Grove.spec =================================================================== RCS file: /cvs/dist/rpms/perl-XML-Grove/devel/perl-XML-Grove.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-XML-Grove.spec 17 Dec 2005 02:16:23 -0000 1.12 +++ perl-XML-Grove.spec 10 Jan 2006 16:24:15 -0000 1.13 @@ -1,20 +1,17 @@ -%define _use_internal_dependency_generator 0 - -%define module XML-Grove - -Summary: A Perl module providing simple access to the information set of parsed XML, HTML, or SGML instances. -Name: perl-%{module} -Version: 0.46alpha -Release: 28.1.1 -License: distributable -Group: System Environment/Libraries -Source0: %{module}-%{version}.tar.bz2 -Url: http://www.cpan.org -BuildRoot: %{_tmppath}/%{name}-buildroot/ -Requires: perl >= 5.6.0 -BuildRequires: perl-libxml-perl - -BuildArch: noarch +Name: perl-XML-Grove +Version: 0.46alpha +Release: 29 +Summary: Simple access to infoset of parsed XML, HTML, or SGML instances + +Group: Development/Libraries +License: Artistic +URL: http://search.cpan.org/dist/XML-Grove/ +Source0: http://www.cpan.org/authors/id/K/KM/KMACLEOD/XML-Grove-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: perl-libxml-perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description XML::Grove is a tree-based object model for accessing the information @@ -22,38 +19,44 @@ objects are Perl hashes and arrays where you access the properties of the objects using normal Perl syntax. + %prep -%setup -q -n %{module}-%{version} +%setup -q -n XML-Grove-%{version} + %build -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor -make -make test || /bin/true +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} -%clean -rm -rf $RPM_BUILD_ROOT %install rm -rf $RPM_BUILD_ROOT -make install +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w $RPM_BUILD_ROOT/* + + +%check +make test || : + + +%clean +rm -rf $RPM_BUILD_ROOT -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" > XML-Grove-%{version}-filelist -if [ "$(cat XML-Grove-%{version}-filelist)X" = "X" ] ; then - echo "ERROR: EMPTY FILE LIST" - exit -1 -fi - -%files -f XML-Grove-%{version}-filelist -%defattr(-,root,root) -%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/XML -%dir /usr/lib/perl5/vendor_perl/%(perl -MConfig -e 'print $Config{version}')/XML/Grove +%files +%defattr(-,root,root,-) +%doc ChangeLog Changes COPYING DOM* README examples/ +%{perl_vendorlib}/XML/* +%{_mandir}/man3/*.3* + %changelog +* Fri Jan 6 2006 Ville Skytt?? - 0.46alpha-29 +- Rewrite specfile using fedora-rpmdevtools' spec template, fixes #176889. +- Fix License, include docs. + * Fri Dec 16 2005 Jesse Keating - rebuilt for new gcc @@ -86,4 +89,3 @@ * Mon Jun 18 2001 Till Kamppeter 0.46alpha-1mdk - Newly introduced for Foomatic. - From fedora-cvs-commits at redhat.com Tue Jan 10 16:37:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 11:37:42 -0500 Subject: rpms/elinks/devel elinks-0.11.0-srcdir.patch, 1.1, 1.2 elinks.spec, 1.29, 1.30 Message-ID: <200601101637.k0AGbgQD029125@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/elinks/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29057 Modified Files: elinks-0.11.0-srcdir.patch elinks.spec Log Message: upstream version of srcdir patch elinks-0.11.0-srcdir.patch: po/Makefile | 2 +- src/intl/gettext/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Index: elinks-0.11.0-srcdir.patch =================================================================== RCS file: /cvs/dist/rpms/elinks/devel/elinks-0.11.0-srcdir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- elinks-0.11.0-srcdir.patch 10 Jan 2006 14:48:56 -0000 1.1 +++ elinks-0.11.0-srcdir.patch 10 Jan 2006 16:37:38 -0000 1.2 @@ -1,15 +1,14 @@ ---- elinks-0.11.0/src/intl/gettext/Makefile.srcdir 2006-01-10 15:36:46.000000000 +0100 -+++ elinks-0.11.0/src/intl/gettext/Makefile 2006-01-10 15:38:25.000000000 +0100 +--- elinks-0.11.0/src/intl/gettext/Makefile.srcdir 2006-01-01 17:39:36.000000000 +0100 ++++ elinks-0.11.0/src/intl/gettext/Makefile 2006-01-10 17:03:25.000000000 +0100 @@ -25,9 +25,9 @@ textdomain.o -# $(builddir)/charset.alias: $(srcdir)/config.charset --$(builddir)/charset.alias: $(srcdir)config.charset ++# $(builddir)/charset.alias: $(srcdir)config.charset + $(builddir)/charset.alias: $(srcdir)config.charset - $(SHELL) $(srcdir)/config.charset '$(host)' > $@.new -+# $(builddir)/charset.alias: $(builddir)/config.charset -+$(builddir)/charset.alias: $(builddir)/config.charset -+ $(SHELL) $(builddir)/config.charset '$(host)' > $@.new ++ $(SHELL) $(srcdir)config.charset '$(host)' > $@.new mv $@.new $@ # FIXME: Building plural.c from plural.y on the fly doesn't work @@ -18,7 +17,18 @@ test -f $(DESTDIR)$(localedir)/locale.alias \ && orig=$(DESTDIR)$(localedir)/locale.alias \ - || orig=$(srcdir)/locale.alias; \ -+ || orig=$(builddir)/locale.alias; \ ++ || orig=$(srcdir)locale.alias; \ temp=$(DESTDIR)$(localedir)/t-locale.alias; \ dest=$(DESTDIR)$(localedir)/locale.alias; \ sed -f ref-add.sed $$orig > $$temp; \ +--- elinks-0.11.0/po/Makefile.srcdir 2006-01-01 17:39:36.000000000 +0100 ++++ elinks-0.11.0/po/Makefile 2006-01-10 17:04:47.000000000 +0100 +@@ -67,7 +67,7 @@ + # either or .po when calling make. Example: make update-po PO=is + + update-po: Makefile $(srcdir)/$(PACKAGE).pot +- @cd $(srcdir) ++ @test -z "$(srcdir)" || cd $(srcdir) + @$(foreach lang,$(basename $(if $(strip $(PO)),$(PO),$(GMOFILES))), \ + echo -n "$(lang): "; \ + if $(MSGMERGE) $(srcdir)/$(lang).po $(srcdir)/$(PACKAGE).pot -o $(lang).new.po; then \ Index: elinks.spec =================================================================== RCS file: /cvs/dist/rpms/elinks/devel/elinks.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- elinks.spec 10 Jan 2006 14:48:56 -0000 1.29 +++ elinks.spec 10 Jan 2006 16:37:38 -0000 1.30 @@ -2,7 +2,7 @@ Name: elinks Summary: A text-mode Web browser. Version: 0.11.0 -Release: 1 +Release: 2 Source: http://elinks.or.cz/download/elinks-%{version}.tar.bz2 Source1: http://links.sourceforge.net/download/docs/manual-0.82-en.tar.bz2 Group: Applications/Internet @@ -83,6 +83,9 @@ %{_mandir}/man5/* %changelog +* Tue Jan 10 2006 Karel Zak 0.11.0-2 +- use upstream version of srcdir.patch + * Tue Jan 10 2006 Karel Zak 0.11.0-1 - update to new upstream version - fix 0.11.0 build system (srcdir.patch) From fedora-cvs-commits at redhat.com Tue Jan 10 16:39:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 11:39:49 -0500 Subject: rpms/perl-RPM-Specfile/devel .cvsignore, 1.4, 1.5 perl-RPM-Specfile.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200601101639.k0AGdnXu030204@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-RPM-Specfile/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30171 Modified Files: .cvsignore perl-RPM-Specfile.spec sources Log Message: fix bugs 176888, 176721 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl-RPM-Specfile/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 10:15:34 -0000 1.4 +++ .cvsignore 10 Jan 2006 16:39:47 -0000 1.5 @@ -1 +1,2 @@ RPM-Specfile-1.17.tar.gz +RPM-Specfile-1.19.tar.gz Index: perl-RPM-Specfile.spec =================================================================== RCS file: /cvs/dist/rpms/perl-RPM-Specfile/devel/perl-RPM-Specfile.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-RPM-Specfile.spec 17 Dec 2005 02:14:33 -0000 1.8 +++ perl-RPM-Specfile.spec 10 Jan 2006 16:39:47 -0000 1.9 @@ -1,52 +1,60 @@ -Summary: RPM-Specfile Perl module -Name: perl-RPM-Specfile -Version: 1.17 -Release: 3.1.1 -License: GPL or Artistic -Group: Development/Libraries -URL: http://search.cpan.org/dist/RPM-Specfile/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch -BuildRequires: perl >= 2:5.8.0 -Requires: %(perl -MConfig -le 'if (defined $Config{useithreads}) { print "perl(:WITH_ITHREADS)" } else { print "perl(:WITHOUT_ITHREADS)" }') -Requires: %(perl -MConfig -le 'if (defined $Config{usethreads}) { print "perl(:WITH_THREADS)" } else { print "perl(:WITHOUT_THREADS)" }') -Requires: %(perl -MConfig -le 'if (defined $Config{uselargefiles}) { print "perl(:WITH_LARGEFILES)" } else { print "perl(:WITHOUT_LARGEFILES)" }') -Requires: rpm-build -Source0: RPM-Specfile-1.17.tar.gz +Name: perl-RPM-Specfile +Version: 1.19 +Release: 1 +Summary: Perl extension for creating RPM specfiles + +Group: Development/Libraries +License: GPL or Artistic +URL: http://search.cpan.org/dist/RPM-Specfile/ +Source0: http://www.cpan.org/authors/id/C/CH/CHIPT/RPM-Specfile-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildArch: noarch +BuildRequires: perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. + %prep %setup -q -n RPM-Specfile-%{version} + %build -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT%{_prefix} INSTALLDIRS=vendor < /dev/null -make OPTIMIZE="$RPM_OPT_FLAGS" -make test +%{__perl} Makefile.PL INSTALLDIRS=vendor +make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT -eval `perl '-V:installarchlib'` -mkdir -p $RPM_BUILD_ROOT$installarchlib -%makeinstall -rm -f `find $RPM_BUILD_ROOT -type f -name perllocal.pod -o -name .packlist` - -find $RPM_BUILD_ROOT%{_prefix} -type f -print | \ - sed "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-%{release}-filelist -if [ "$(cat %{name}-%{version}-%{release}-filelist)X" = "X" ] ; then - echo "ERROR: EMPTY FILE LIST" - exit 1 -fi +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w $RPM_BUILD_ROOT/* + + +%check +make test + %clean rm -rf $RPM_BUILD_ROOT -%files -f %{name}-%{version}-%{release}-filelist + +%files %defattr(-,root,root,-) -%doc Changes README +%doc Changes +%{_bindir}/cpanflute2 +%{perl_vendorlib}/RPM/* +%{_mandir}/man3/RPM::Specfile.3* + %changelog +* Fri Jan 6 2006 Ville Skytt?? - 1.19-1 +- 1.19 (#176721). +- Rewrite specfile using fedora-rpmdevtools' spec template, fixes #176888. + * Fri Dec 16 2005 Jesse Keating - rebuilt for new gcc @@ -67,4 +75,3 @@ * Fri Feb 27 2004 Chip Turner - 1.15-7 - Specfile autogenerated. - Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl-RPM-Specfile/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Sep 2004 10:15:34 -0000 1.4 +++ sources 10 Jan 2006 16:39:47 -0000 1.5 @@ -1 +1 @@ -84e35c834944ef170fb7555304460516 RPM-Specfile-1.17.tar.gz +55e05321f3c436a8493352b1a8541e5c RPM-Specfile-1.19.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 10 17:10:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 12:10:47 -0500 Subject: rpms/perl-HTML-Tagset/devel .cvsignore, 1.4, 1.5 perl-HTML-Tagset.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200601101710.k0AHAlUb020743@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-HTML-Tagset/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20717 Modified Files: .cvsignore perl-HTML-Tagset.spec sources Log Message: fix bug 176720: upgrade to 3.10; make .spec file conform to fedora-rpmdevtools perl .spec template Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl-HTML-Tagset/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Mar 2005 19:27:50 -0000 1.4 +++ .cvsignore 10 Jan 2006 17:10:44 -0000 1.5 @@ -1,2 +1,3 @@ HTML-Tagset-3.03.tar.gz HTML-Tagset-3.04.tar.gz +HTML-Tagset-3.10.tar.gz Index: perl-HTML-Tagset.spec =================================================================== RCS file: /cvs/dist/rpms/perl-HTML-Tagset/devel/perl-HTML-Tagset.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-HTML-Tagset.spec 17 Dec 2005 02:12:33 -0000 1.10 +++ perl-HTML-Tagset.spec 10 Jan 2006 17:10:44 -0000 1.11 @@ -1,15 +1,17 @@ -Summary: HTML::Tagset - data tables useful in parsing HTML. -Name: perl-HTML-Tagset -Version: 3.04 -Release: 2.1.1 -License: Artistic or GPL -Group: Development/Libraries -Source0: http://search.cpan.org/CPAN/authors/id/S/SB/SBURKE/HTML-Tagset-%{version}.tar.gz -URL: http://search.cpan.org/dist/HTML-Tagset/ -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: perl >= 0:5.00503 -Requires: perl >= 0:5.00503 -BuildArch: noarch +Name: perl-HTML-Tagset +Version: 3.10 +Release: 1 +Summary: HTML::Tagset - data tables useful in parsing HTML. + +Group: Development/Libraries +License: Artistic or GPL +URL: http://search.cpan.org/dist/HTML-Tagset/ +Source0: http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/HTML-Tagset-%{version}.tar.gz + +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: perl +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module contains several data tables useful in various kinds of @@ -19,26 +21,32 @@ %setup -q -n HTML-Tagset-%{version} %build -CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL PREFIX=$RPM_BUILD_ROOT/usr INSTALLDIRS=vendor -make +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +make %{?_smp_mflags} make test %install rm -rf $RPM_BUILD_ROOT -make install - -find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -fv {} \; +make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root) -%doc ChangeLog README -%{perl_vendorlib}/HTML/*.pm -%{_mandir}/man?/HTML::Tagset*.gz +%defattr(-,root,root,-) +%doc Changes README +%{perl_vendorlib}/HTML/* +%{_mandir}/man?/HTML::Tagset* %changelog +* Tue Jan 10 2006 Jason Vas Dias - 3.10-1 +- fix bug 176720: upgrade to 3.10 +- make .spec file conform to fedora-rpmdevtools spectemplate-perl.spec + * Fri Dec 16 2005 Jesse Keating - rebuilt for new gcc Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl-HTML-Tagset/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Mar 2005 19:27:50 -0000 1.4 +++ sources 10 Jan 2006 17:10:44 -0000 1.5 @@ -1 +1 @@ -b82e0f08c1ececefe98b891f30dd56a6 HTML-Tagset-3.04.tar.gz +89bdd351272ccd285fa61c5b2ce451ab HTML-Tagset-3.10.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 10 17:13:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 12:13:03 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.142, 1.143 policycoreutils.spec, 1.211, 1.212 Message-ID: <200601101713.k0AHD3Kh021812@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21772 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue Jan 10 2006 Dan Walsh 1.29.5-2 - Update semanage and split out seobject - Fix labeleing of home_root policycoreutils-rhat.patch: scripts/genhomedircon | 6 semanage/Makefile | 4 semanage/semanage | 376 ++------------------------ semanage/seobject.py | 722 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 761 insertions(+), 347 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.142 retrieving revision 1.143 diff -u -r1.142 -r1.143 --- policycoreutils-rhat.patch 5 Jan 2006 21:39:11 -0000 1.142 +++ policycoreutils-rhat.patch 10 Jan 2006 17:12:58 -0000 1.143 @@ -1,201 +1,381 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.4/semanage/semanage +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.5/scripts/genhomedircon +--- nsapolicycoreutils/scripts/genhomedircon 2006-01-05 10:35:49.000000000 -0500 ++++ policycoreutils-1.29.5/scripts/genhomedircon 2006-01-10 12:11:48.000000000 -0500 +@@ -144,7 +144,7 @@ + for i in fd.read().split('\n'): + if i.find("HOME_ROOT") == 0: + i=i.replace("HOME_ROOT", homedir) +- ret = i+"\n" ++ ret += i+"\n" + fd.close() + if ret=="": + errorExit("No Home Root Context Found") +@@ -240,7 +240,7 @@ + i=i.replace("HOME_DIR", home) + i=i.replace("ROLE", role) + i=i.replace("system_u", user) +- ret = ret+i+"\n" ++ ret += i+"\n" + fd.close() + return ret + +@@ -252,7 +252,7 @@ + i=i.replace("USER", user) + i=i.replace("ROLE", role) + i=i.replace("system_u", sel_user) +- ret=ret+i+"\n" ++ ret = i+"\n" + fd.close() + return ret + +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/Makefile policycoreutils-1.29.5/semanage/Makefile +--- nsapolicycoreutils/semanage/Makefile 2005-11-29 10:55:01.000000000 -0500 ++++ policycoreutils-1.29.5/semanage/Makefile 2006-01-06 14:34:47.000000000 -0500 +@@ -2,6 +2,8 @@ + PREFIX ?= ${DESTDIR}/usr + SBINDIR ?= $(PREFIX)/sbin + MANDIR = $(PREFIX)/share/man ++PYLIBVER ?= python2.4 ++PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) + + TARGETS=semanage + +@@ -12,6 +14,8 @@ + -mkdir -p $(SBINDIR) + install -m 755 semanage $(SBINDIR) + install -m 644 semanage.8 $(MANDIR)/man8 ++ test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages ++ install -m 755 seobject.py $(PYTHONLIBDIR)/site-packages + + clean: + +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.5/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2006-01-05 10:35:49.000000000 -0500 -+++ policycoreutils-1.29.4/semanage/semanage 2006-01-05 16:27:42.000000000 -0500 -@@ -20,15 +20,20 @@ ++++ policycoreutils-1.29.5/semanage/semanage 2006-01-06 14:41:04.000000000 -0500 +@@ -20,345 +20,9 @@ # 02111-1307 USA # # -+ - import commands, sys, os, pwd, string, getopt, pwd - from semanage import *; +-import commands, sys, os, pwd, string, getopt, pwd +-from semanage import *; -class loginRecords: -+class semanageRecords: - def __init__(self): - self.sh = semanage_handle_create() - self.semanaged = semanage_is_managed(self.sh) - if self.semanaged: - semanage_connect(self.sh) - -+class loginRecords(semanageRecords): -+ def __init__(self): -+ semanageRecords.__init__(self) -+ - def add(self, name, sename, serange): - if serange == "": - serange = "s0" -@@ -80,7 +85,7 @@ - if sename != "": - semanage_seuser_set_sename(self.sh, u, sename) - semanage_begin_transaction(self.sh) +- def __init__(self): +- self.sh = semanage_handle_create() +- self.semanaged = semanage_is_managed(self.sh) +- if self.semanaged: +- semanage_connect(self.sh) +- +- def add(self, name, sename, serange): +- if serange == "": +- serange = "s0" +- if sename == "": +- sename = "user_u" +- +- (rc,k) = semanage_seuser_key_create(self.sh, name) +- if rc < 0: +- raise ValueError("Could not create a key for %s" % name) +- +- (rc,exists) = semanage_seuser_exists(self.sh, k) +- if exists: +- raise ValueError("SELinux User %s mapping already defined" % name) +- try: +- pwd.getpwnam(name) +- except: +- raise ValueError("Linux User %s does not exist" % name) +- +- (rc,u) = semanage_seuser_create(self.sh) +- if rc < 0: +- raise ValueError("Could not create seuser for %s" % name) +- +- semanage_seuser_set_name(self.sh, u, name) +- semanage_seuser_set_mlsrange(self.sh, u, serange) +- semanage_seuser_set_sename(self.sh, u, sename) +- semanage_begin_transaction(self.sh) +- semanage_seuser_add(self.sh, k, u) +- if semanage_commit(self.sh) < 0: +- raise ValueError("Failed to add SELinux user mapping") +- +- def modify(self, name, sename = "", serange = ""): +- (rc,k) = semanage_seuser_key_create(self.sh, name) +- if rc < 0: +- raise ValueError("Could not create a key for %s" % name) +- +- if sename == "" and serange == "": +- raise ValueError("Requires, seuser or serange") +- +- (rc,exists) = semanage_seuser_exists(self.sh, k) +- if exists: +- (rc,u) = semanage_seuser_query(self.sh, k) +- if rc < 0: +- raise ValueError("Could not query seuser for %s" % name) +- else: +- raise ValueError("SELinux user %s mapping is not defined." % name) +- +- if serange != "": +- semanage_seuser_set_mlsrange(self.sh, u, serange) +- if sename != "": +- semanage_seuser_set_sename(self.sh, u, sename) +- semanage_begin_transaction(self.sh) - semanage_seuser_modify(self.sh, k, u) -+ semanage_seuser_modify_local(self.sh, k, u) - if semanage_commit(self.sh) < 0: - raise ValueError("Failed to modify SELinux user mapping") - -@@ -107,13 +112,9 @@ - name = semanage_seuser_get_name(u) - print "%-25s %-25s %-25s" % (name, semanage_seuser_get_sename(u), semanage_seuser_get_mlsrange(u)) - +- if semanage_commit(self.sh) < 0: +- raise ValueError("Failed to modify SELinux user mapping") +- +- +- def delete(self, name): +- (rc,k) = semanage_seuser_key_create(self.sh, name) +- if rc < 0: +- raise ValueError("Could not create a key for %s" % name) +- +- (rc,exists) = semanage_seuser_exists(self.sh, k) +- if not exists: +- raise ValueError("SELinux user %s mapping is not defined." % name) +- semanage_begin_transaction(self.sh) +- semanage_seuser_del(self.sh, k) +- if semanage_commit(self.sh) < 0: +- raise ValueError("SELinux User %s mapping not defined" % name) +- +- def list(self,heading=1): +- if heading: +- print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range") +- (status, self.ulist, self.usize) = semanage_seuser_list(self.sh) +- for idx in range(self.usize): +- u = semanage_seuser_by_idx(self.ulist, idx) +- name = semanage_seuser_get_name(u) +- print "%-25s %-25s %-25s" % (name, semanage_seuser_get_sename(u), semanage_seuser_get_mlsrange(u)) +- -class seluserRecords: -+class seluserRecords(semanageRecords): - def __init__(self): +- def __init__(self): - roles = [] - self.sh = semanage_handle_create() - self.semanaged = semanage_is_managed(self.sh) - if self.semanaged: - semanage_connect(self.sh) -+ semanageRecords.__init__(self) - - def add(self, name, roles, selevel, serange): - if serange == "": -@@ -125,11 +126,9 @@ - if rc < 0: - raise ValueError("Could not create a key for %s" % name) - +- +- def add(self, name, roles, selevel, serange): +- if serange == "": +- serange = "s0" +- if selevel == "": +- selevel = "s0" +- +- (rc,k) = semanage_user_key_create(self.sh, name) +- if rc < 0: +- raise ValueError("Could not create a key for %s" % name) +- - (rc,exists) = semanage_user_exists_local(self.sh, k) -+ (rc,exists) = semanage_user_exists(self.sh, k) - if not exists: +- if not exists: - (rc,exists) = semanage_user_exists(self.sh, k) - if not exists: - raise ValueError("SELinux user %s is already defined." % name) -+ raise ValueError("SELinux user %s is already defined." % name) - - (rc,u) = semanage_user_create(self.sh) - if rc < 0: -@@ -157,15 +156,11 @@ - if rc < 0: - raise ValueError("Could not create a key for %s" % name) - +- +- (rc,u) = semanage_user_create(self.sh) +- if rc < 0: +- raise ValueError("Could not create login mapping for %s" % name) +- +- semanage_user_set_name(self.sh, u, name) +- for r in roles: +- semanage_user_add_role(self.sh, u, r) +- semanage_user_set_mlsrange(self.sh, u, serange) +- semanage_user_set_mlslevel(self.sh, u, selevel) +- (rc,key) = semanage_user_key_extract(self.sh,u) +- if rc < 0: +- raise ValueError("Could not extract key for %s" % name) +- +- semanage_begin_transaction(self.sh) +- semanage_user_add_local(self.sh, k, u) +- if semanage_commit(self.sh) < 0: +- raise ValueError("Failed to add SELinux user") +- +- def modify(self, name, roles = [], selevel = "", serange = ""): +- if len(roles) == 0 and serange == "" and selevel == "": +- raise ValueError("Requires, roles, level or range") +- +- (rc,k) = semanage_user_key_create(self.sh, name) +- if rc < 0: +- raise ValueError("Could not create a key for %s" % name) +- - (rc,exists) = semanage_user_exists_local(self.sh, k) -+ (rc,exists) = semanage_user_exists(self.sh, k) - if exists: +- if exists: - (rc,u) = semanage_user_query_local(self.sh, k) -+ (rc,u) = semanage_user_query(self.sh, k) - else: +- else: - (rc,exists) = semanage_user_exists(self.sh, k) - if exists: - (rc,u) = semanage_user_query(self.sh, k) - else: - raise ValueError("SELinux user %s mapping is not defined." % name) -+ raise ValueError("SELinux user %s mapping is not defined locally." % name) - if rc < 0: - raise ValueError("Could not query user for %s" % name) - -@@ -185,10 +180,14 @@ - (rc,k) = semanage_user_key_create(self.sh, name) - if rc < 0: - raise ValueError("Could not crpppeate a key for %s" % name) +- if rc < 0: +- raise ValueError("Could not query user for %s" % name) +- +- if serange != "": +- semanage_user_set_mlsrange(self.sh, u, serange) +- if selevel != "": +- semanage_user_set_mlslevel(self.sh, u, selevel) +- if len(roles) < 0: +- for r in roles: +- semanage_user_add_role(self.sh, u, r) +- semanage_begin_transaction(self.sh) +- semanage_user_modify_local(self.sh, k, u) +- if semanage_commit(self.sh) < 0: +- raise ValueError("Failed to modify SELinux user") +- +- def delete(self, name): +- (rc,k) = semanage_user_key_create(self.sh, name) +- if rc < 0: +- raise ValueError("Could not crpppeate a key for %s" % name) - - (rc,exists) = semanage_user_exists_local(self.sh, k) -+ (rc,exists) = semanage_user_exists(self.sh, k) - if not exists: - raise ValueError("user %s is not defined" % name) -+ else: -+ (rc,exists) = semanage_user_exists_local(self.sh, k) -+ if not exists: -+ raise ValueError("user %s is not defined locally, can not delete " % name) -+ - semanage_begin_transaction(self.sh) - semanage_user_del_local(self.sh, k) - if semanage_commit(self.sh) < 0: -@@ -211,12 +210,9 @@ - roles += " " + char_by_idx(rlist, ridx) - print "%-15s %-10s %-15s %s" % (semanage_user_get_name(u), semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) - +- if not exists: +- raise ValueError("user %s is not defined" % name) +- semanage_begin_transaction(self.sh) +- semanage_user_del_local(self.sh, k) +- if semanage_commit(self.sh) < 0: +- raise ValueError("Login User %s not defined" % name) +- +- def list(self, heading=1): +- if heading: +- print "\n%-15s %-10s %-20s" % ("", "MLS/", "MLS/") +- print "%-15s %-10s %-15s %-20s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") +- (status, self.ulist, self.usize) = semanage_user_list(self.sh) +- for idx in range(self.usize): +- u = semanage_user_by_idx(self.ulist, idx) +- name = semanage_user_get_name(u) +- (status, rlist, rlist_size) = semanage_user_get_roles(self.sh, u) +- roles = "" +- +- if rlist_size: +- roles += char_by_idx(rlist, 0) +- for ridx in range (1,rlist_size): +- roles += " " + char_by_idx(rlist, ridx) +- print "%-15s %-10s %-15s %s" % (semanage_user_get_name(u), semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) +- -class portRecords: -+class portRecords(semanageRecords): - def __init__(self): +- def __init__(self): - self.sh = semanage_handle_create() - self.semanaged = semanage_is_managed(self.sh) - if self.semanaged: - semanage_connect(self.sh) -+ semanageRecords.__init__(self) - - def __genkey(self, port, proto): - if proto == "tcp": -@@ -236,7 +232,7 @@ - else: - low=string.atoi(ports[0]) - high=string.atoi(ports[1]) +- +- def __genkey(self, port, proto): +- if proto == "tcp": +- proto_d=SEMANAGE_PROTO_TCP +- else: +- if proto == "udp": +- proto_d=SEMANAGE_PROTO_UDP +- else: +- raise ValueError("Protocol udp or tcp is required") +- if port == "": +- raise ValueError("Port is required") - -+ - (rc,k) = semanage_port_key_create(self.sh, low, high, proto_d) - if rc < 0: - raise ValueError("Could not create a key for %s/%s" % (proto, port)) -@@ -255,10 +251,6 @@ - if exists: - raise ValueError("Port %s/%s already defined" % (proto, port)) - +- ports=port.split("-") +- if len(ports) == 1: +- low=string.atoi(ports[0]) +- high=string.atoi(ports[0]) +- else: +- low=string.atoi(ports[0]) +- high=string.atoi(ports[1]) +- +- (rc,k) = semanage_port_key_create(self.sh, low, high, proto_d) +- if rc < 0: +- raise ValueError("Could not create a key for %s/%s" % (proto, port)) +- return ( k, proto_d, low, high ) +- +- def add(self, port, proto, serange, type): +- if serange == "": +- serange="s0" +- +- if type == "": +- raise ValueError("Type is required") +- +- ( k, proto_d, low, high ) = self.__genkey(port, proto) +- +- (rc,exists) = semanage_port_exists(self.sh, k) +- if exists: +- raise ValueError("Port %s/%s already defined" % (proto, port)) +- - (rc,exists) = semanage_port_exists_local(self.sh, k) - if exists: - raise ValueError("Port %s/%s already defined locally" % (proto, port)) - - (rc,p) = semanage_port_create(self.sh) - if rc < 0: - raise ValueError("Could not create port for %s/%s" % (proto, port)) -@@ -273,8 +265,8 @@ - semanage_context_set_role(self.sh, con, "object_r") - semanage_context_set_type(self.sh, con, type) - semanage_context_set_mls(self.sh, con, serange) +- (rc,p) = semanage_port_create(self.sh) +- if rc < 0: +- raise ValueError("Could not create port for %s/%s" % (proto, port)) +- +- semanage_port_set_proto(p, proto_d) +- semanage_port_set_range(p, low, high) +- (rc, con) = semanage_context_create(self.sh) +- if rc < 0: +- raise ValueError("Could not create context for %s/%s" % (proto, port)) +- +- semanage_context_set_user(self.sh, con, "system_u") +- semanage_context_set_role(self.sh, con, "object_r") +- semanage_context_set_type(self.sh, con, type) +- semanage_context_set_mls(self.sh, con, serange) - semanage_port_set_con(p, con) - semanage_begin_transaction(self.sh) -+ semanage_port_set_con(p, con) - semanage_port_add_local(self.sh, k, p) - if semanage_commit(self.sh) < 0: - raise ValueError("Failed to add port") -@@ -285,25 +277,23 @@ - - ( k, proto_d, low, high ) = self.__genkey(port, proto) - +- semanage_begin_transaction(self.sh) +- semanage_port_add_local(self.sh, k, p) +- if semanage_commit(self.sh) < 0: +- raise ValueError("Failed to add port") +- +- def modify(self, port, proto, serange, setype): +- if serange == "" and setype == "": +- raise ValueError("Requires, setype or serange") +- +- ( k, proto_d, low, high ) = self.__genkey(port, proto) +- - (rc,exists) = semanage_port_exists_local(self.sh, k) -+ (rc,exists) = semanage_port_exists(self.sh, k) - if exists: +- if exists: - (rc,p) = semanage_port_query_local(self.sh, k) - (rc,exists) = semanage_port_exists(self.sh, k) - if exists: - (rc,p) = semanage_port_query(self.sh, k) - else: - raise ValueError("port %s/%s is not defined." % (proto,port)) -+ (rc,p) = semanage_port_query(self.sh, k) -+ else: -+ raise ValueError("port %s/%s is not defined." % (proto,port)) ++import sys, getopt ++import seobject - if rc < 0: - raise ValueError("Could not query port for %s/%s" % (proto, port)) - - con = semanage_port_get_con(p) +- if rc < 0: +- raise ValueError("Could not query port for %s/%s" % (proto, port)) +- +- con = semanage_port_get_con(p) - semanage_context_set_mls(self.sh, con, serange) -+ if rc < 0: -+ raise ValueError("Could not get port context for %s/%s" % (proto, port)) -+ - if serange != "": - semanage_context_set_mls(self.sh, con, serange) - if setype != "": - semanage_context_set_type(self.sh, con, setype) +- if serange != "": +- semanage_context_set_mls(self.sh, con, serange) +- if setype != "": +- semanage_context_set_type(self.sh, con, setype) - semanage_port_set_con(p, con) - semanage_begin_transaction(self.sh) - semanage_port_modify_local(self.sh, k, p) - if semanage_commit(self.sh) < 0: -@@ -311,9 +301,13 @@ - - def delete(self, port, proto): - ( k, proto_d, low, high ) = self.__genkey(port, proto) +- semanage_begin_transaction(self.sh) +- semanage_port_modify_local(self.sh, k, p) +- if semanage_commit(self.sh) < 0: +- raise ValueError("Failed to add port") +- +- def delete(self, port, proto): +- ( k, proto_d, low, high ) = self.__genkey(port, proto) - (rc,exists) = semanage_port_exists_local(self.sh, k) -+ (rc,exists) = semanage_port_exists(self.sh, k) - if not exists: +- if not exists: - raise ValueError("port %s/%s is not defined localy." % (proto,port)) -+ raise ValueError("port %s/%s is not defined." % (proto,port)) -+ else: -+ (rc,exists) = semanage_port_exists_local(self.sh, k) -+ if not exists: -+ raise ValueError("port %s/%s is not defined localy, can not be deleted." % (proto,port)) - - semanage_begin_transaction(self.sh) - semanage_port_del_local(self.sh, k) -@@ -338,27 +332,116 @@ - dict[(name,proto)].append("%d" % low) - else: - dict[(name,proto)].append("%d-%d" % (low, high)) +- +- semanage_begin_transaction(self.sh) +- semanage_port_del_local(self.sh, k) +- if semanage_commit(self.sh) < 0: +- raise ValueError("Port %s/%s not defined" % (proto,port)) +- +- def list(self, heading=1): +- (status, self.plist, self.psize) = semanage_port_list(self.sh) +- if heading: +- print "%-30s %-8s %s\n" % ("SELinux Port Name", "Proto", "Port Number") +- dict={} +- for idx in range(self.psize): +- u = semanage_port_by_idx(self.plist, idx) +- con = semanage_port_get_con(u) +- name = semanage_context_get_type(con) +- proto=semanage_port_get_proto_str(u) +- low=semanage_port_get_low(u) +- high = semanage_port_get_high(u) +- if (name, proto) not in dict.keys(): +- dict[(name,proto)]=[] +- if low == high: +- dict[(name,proto)].append("%d" % low) +- else: +- dict[(name,proto)].append("%d-%d" % (low, high)) - (status, self.plist, self.psize) = semanage_port_list_local(self.sh) - for idx in range(self.psize): - u = semanage_port_by_idx(self.plist, idx) @@ -211,15 +391,483 @@ - else: - dict[(name,proto)].append("%d-%d" % (low, high)) - for i in dict.keys(): +- rec = "%-30s %-8s " % i +- rec += "%s" % dict[i][0] +- for p in dict[i][1:]: +- rec += ", %s" % p +- print rec +- + if __name__ == '__main__': + + def usage(message = ""): +@@ -366,8 +30,11 @@ + semanage user [-admsRrh] SELINUX_USER\n\ + semanage login [-admsrh] LOGIN_NAME\n\ + semanage port [-admth] PORT | PORTRANGE\n\ ++semanage interface [-admth] INTERFACE\n\ ++semanage fcontext [-admhfst] INTERFACE\n\ + -a, --add Add a OBJECT record NAME\n\ + -d, --delete Delete a OBJECT record NAME\n\ ++ -f, --ftype File Type of OBJECT \n\ + -h, --help display this message\n\ + -l, --list List the OBJECTS\n\ + -n, --noheading Do not print heading when listing OBJECTS\n\ +@@ -391,7 +58,7 @@ + # + # + try: +- objectlist = ("login", "user", "port") ++ objectlist = ("login", "user", "port", "interface", "fcontext") + input = sys.stdin + output = sys.stdout + serange = "" +@@ -399,6 +66,7 @@ + proto = "" + selevel = "" + setype = "" ++ ftype = "" + roles = "" + seuser = "" + heading=1 +@@ -416,9 +84,10 @@ + + args = sys.argv[2:] + gopts, cmds = getopt.getopt(args, +- 'adlhmnp:P:s:R:r:t:v', ++ 'adf:lhmnp:P:s:R:r:t:v', + ['add', + 'delete', ++ 'ftype=', + 'help', + 'list', + 'modify', +@@ -441,6 +110,8 @@ + if modify or add: + usage() + delete = 1 ++ if o == "-f" or o == "--ftype": ++ ftype=a + if o == "-h" or o == "--help": + usage() + +@@ -474,13 +145,19 @@ + verbose = 1 + + if object == "login": +- OBJECT = loginRecords() ++ OBJECT = seobject.loginRecords() + + if object == "user": +- OBJECT = seluserRecords() ++ OBJECT = seobject.seluserRecords() + + if object == "port": +- OBJECT = portRecords() ++ OBJECT = seobject.portRecords() ++ ++ if object == "interface": ++ OBJECT = seobject.interfaceRecords() ++ ++ if object == "fcontext": ++ OBJECT = seobject.fcontextRecords() + + if list: + OBJECT.list(heading) +@@ -504,6 +181,11 @@ + if object == "port": + OBJECT.add(target, proto, serange, setype) + ++ if object == "interface": ++ OBJECT.add(target, serange, setype) ++ ++ if object == "fcontext": ++ OBJECT.add(target, setype, ftype, serange, seuser) + sys.exit(0); + + if modify: +@@ -516,7 +198,13 @@ + + if object == "port": + OBJECT.modify(target, proto, serange, setype) +- sys.exit(0); ++ ++ if object == "interface": ++ OBJECT.modify(target, serange, setype) ++ ++ if object == "fcontext": ++ OBJECT.modify(target, setype, ftype, serange, seuser) ++ + sys.exit(0); + + if delete: +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.5/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 1969-12-31 19:00:00.000000000 -0500 ++++ policycoreutils-1.29.5/semanage/seobject.py 2006-01-06 14:30:39.000000000 -0500 +@@ -0,0 +1,722 @@ ++#! /usr/bin/env python ++# Copyright (C) 2005 Red Hat ++# see file 'COPYING' for use and warranty information ++# ++# semanage is a tool for managing SELinux configuration files ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++# 02111-1307 USA ++# ++# ++ ++import pwd, string ++from semanage import *; ++class semanageRecords: ++ def __init__(self): ++ self.sh = semanage_handle_create() ++ self.semanaged = semanage_is_managed(self.sh) ++ if self.semanaged: ++ semanage_connect(self.sh) ++ ++class loginRecords(semanageRecords): ++ def __init__(self): ++ semanageRecords.__init__(self) ++ ++ def add(self, name, sename, serange): ++ if serange == "": ++ serange = "s0" ++ if sename == "": ++ sename = "user_u" ++ ++ (rc,k) = semanage_seuser_key_create(self.sh, name) ++ if rc < 0: ++ raise ValueError("Could not create a key for %s" % name) ++ ++ (rc,exists) = semanage_seuser_exists(self.sh, k) ++ if exists: ++ raise ValueError("SELinux User %s mapping already defined" % name) ++ try: ++ pwd.getpwnam(name) ++ except: ++ raise ValueError("Linux User %s does not exist" % name) ++ ++ (rc,u) = semanage_seuser_create(self.sh) ++ if rc < 0: ++ raise ValueError("Could not create seuser for %s" % name) ++ ++ semanage_seuser_set_name(self.sh, u, name) ++ semanage_seuser_set_mlsrange(self.sh, u, serange) ++ semanage_seuser_set_sename(self.sh, u, sename) ++ semanage_begin_transaction(self.sh) ++ semanage_seuser_add(self.sh, k, u) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Failed to add SELinux user mapping") ++ ++ def modify(self, name, sename = "", serange = ""): ++ (rc,k) = semanage_seuser_key_create(self.sh, name) ++ if rc < 0: ++ raise ValueError("Could not create a key for %s" % name) ++ ++ if sename == "" and serange == "": ++ raise ValueError("Requires, seuser or serange") ++ ++ (rc,exists) = semanage_seuser_exists(self.sh, k) ++ if exists: ++ (rc,u) = semanage_seuser_query(self.sh, k) ++ if rc < 0: ++ raise ValueError("Could not query seuser for %s" % name) ++ else: ++ raise ValueError("SELinux user %s mapping is not defined." % name) ++ ++ if serange != "": ++ semanage_seuser_set_mlsrange(self.sh, u, serange) ++ if sename != "": ++ semanage_seuser_set_sename(self.sh, u, sename) ++ semanage_begin_transaction(self.sh) ++ semanage_seuser_modify_local(self.sh, k, u) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Failed to modify SELinux user mapping") ++ def delete(self, name): ++ (rc,k) = semanage_seuser_key_create(self.sh, name) ++ if rc < 0: ++ raise ValueError("Could not create a key for %s" % name) ++ ++ (rc,exists) = semanage_seuser_exists(self.sh, k) ++ if not exists: ++ raise ValueError("SELinux user %s mapping is not defined." % name) ++ semanage_begin_transaction(self.sh) ++ semanage_seuser_del(self.sh, k) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("SELinux User %s mapping not defined" % name) ++ ++ def get_all(self): ++ dict={} ++ (status, self.ulist, self.usize) = semanage_seuser_list(self.sh) ++ for idx in range(self.usize): ++ u = semanage_seuser_by_idx(self.ulist, idx) ++ name = semanage_seuser_get_name(u) ++ dict[name]=(semanage_seuser_get_sename(u), semanage_seuser_get_mlsrange(u)) ++ return dict ++ ++ def list(self,heading=1): ++ if heading: ++ print "\n%-25s %-25s %-25s\n" % ("Login Name", "SELinux User", "MLS/MCS Range") ++ dict=self.get_all() ++ keys=dict.keys() ++ keys.sort() ++ for k in keys: ++ print "%-25s %-25s %-25s" % (k, dict[k][0], dict[k][1]) ++ ++class seluserRecords(semanageRecords): ++ def __init__(self): ++ semanageRecords.__init__(self) ++ ++ def add(self, name, roles, selevel, serange): ++ if serange == "": ++ serange = "s0" ++ if selevel == "": ++ selevel = "s0" ++ ++ (rc,k) = semanage_user_key_create(self.sh, name) ++ if rc < 0: ++ raise ValueError("Could not create a key for %s" % name) ++ ++ (rc,exists) = semanage_user_exists(self.sh, k) ++ if not exists: ++ raise ValueError("SELinux user %s is already defined." % name) ++ ++ (rc,u) = semanage_user_create(self.sh) ++ if rc < 0: ++ raise ValueError("Could not create login mapping for %s" % name) ++ ++ semanage_user_set_name(self.sh, u, name) ++ for r in roles: ++ semanage_user_add_role(self.sh, u, r) ++ semanage_user_set_mlsrange(self.sh, u, serange) ++ semanage_user_set_mlslevel(self.sh, u, selevel) ++ (rc,key) = semanage_user_key_extract(self.sh,u) ++ if rc < 0: ++ raise ValueError("Could not extract key for %s" % name) ++ ++ semanage_begin_transaction(self.sh) ++ semanage_user_add_local(self.sh, k, u) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Failed to add SELinux user") ++ ++ def modify(self, name, roles = [], selevel = "", serange = ""): ++ if len(roles) == 0 and serange == "" and selevel == "": ++ raise ValueError("Requires, roles, level or range") ++ ++ (rc,k) = semanage_user_key_create(self.sh, name) ++ if rc < 0: ++ raise ValueError("Could not create a key for %s" % name) ++ ++ (rc,exists) = semanage_user_exists(self.sh, k) ++ if exists: ++ (rc,u) = semanage_user_query(self.sh, k) ++ else: ++ raise ValueError("SELinux user %s mapping is not defined locally." % name) ++ if rc < 0: ++ raise ValueError("Could not query user for %s" % name) ++ ++ if serange != "": ++ semanage_user_set_mlsrange(self.sh, u, serange) ++ if selevel != "": ++ semanage_user_set_mlslevel(self.sh, u, selevel) ++ if len(roles) != 0: ++ for r in roles: ++ semanage_user_add_role(self.sh, u, r) ++ semanage_begin_transaction(self.sh) ++ semanage_user_modify_local(self.sh, k, u) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Failed to modify SELinux user") ++ ++ def delete(self, name): ++ (rc,k) = semanage_user_key_create(self.sh, name) ++ if rc < 0: ++ raise ValueError("Could not crpppeate a key for %s" % name) ++ (rc,exists) = semanage_user_exists(self.sh, k) ++ if not exists: ++ raise ValueError("user %s is not defined" % name) ++ else: ++ (rc,exists) = semanage_user_exists_local(self.sh, k) ++ if not exists: ++ raise ValueError("user %s is not defined locally, can not delete " % name) ++ ++ semanage_begin_transaction(self.sh) ++ semanage_user_del_local(self.sh, k) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Login User %s not defined" % name) ++ ++ def get_all(self): ++ dict={} ++ (status, self.ulist, self.usize) = semanage_user_list(self.sh) ++ for idx in range(self.usize): ++ u = semanage_user_by_idx(self.ulist, idx) ++ name = semanage_user_get_name(u) ++ (status, rlist, rlist_size) = semanage_user_get_roles(self.sh, u) ++ roles = "" ++ ++ if rlist_size: ++ roles += char_by_idx(rlist, 0) ++ for ridx in range (1,rlist_size): ++ roles += " " + char_by_idx(rlist, ridx) ++ dict[semanage_user_get_name(u)] = (semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) ++ ++ return dict ++ ++ def list(self, heading=1): ++ if heading: ++ print "\n%-15s %-10s %-20s" % ("", "MLS/", "MLS/") ++ print "%-15s %-10s %-15s %-20s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") ++ dict=self.get_all() ++ keys=dict.keys() ++ keys.sort() ++ for k in keys: ++ print "%-15s %-10s %-15s %s" % (k, dict[k][0], dict[k][1], dict[k][2]) ++ ++class portRecords(semanageRecords): ++ def __init__(self): ++ semanageRecords.__init__(self) ++ ++ def __genkey(self, port, proto): ++ if proto == "tcp": ++ proto_d=SEMANAGE_PROTO_TCP ++ else: ++ if proto == "udp": ++ proto_d=SEMANAGE_PROTO_UDP ++ else: ++ raise ValueError("Protocol udp or tcp is required") ++ if port == "": ++ raise ValueError("Port is required") ++ ++ ports=port.split("-") ++ if len(ports) == 1: ++ low=string.atoi(ports[0]) ++ high=string.atoi(ports[0]) ++ else: ++ low=string.atoi(ports[0]) ++ high=string.atoi(ports[1]) ++ ++ (rc,k) = semanage_port_key_create(self.sh, low, high, proto_d) ++ if rc < 0: ++ raise ValueError("Could not create a key for %s/%s" % (proto, port)) ++ return ( k, proto_d, low, high ) ++ ++ def add(self, port, proto, serange, type): ++ if serange == "": ++ serange="s0" ++ ++ if type == "": ++ raise ValueError("Type is required") ++ ++ ( k, proto_d, low, high ) = self.__genkey(port, proto) ++ ++ (rc,exists) = semanage_port_exists(self.sh, k) ++ if exists: ++ raise ValueError("Port %s/%s already defined" % (proto, port)) ++ ++ (rc,p) = semanage_port_create(self.sh) ++ if rc < 0: ++ raise ValueError("Could not create port for %s/%s" % (proto, port)) ++ ++ semanage_port_set_proto(p, proto_d) ++ semanage_port_set_range(p, low, high) ++ (rc, con) = semanage_context_create(self.sh) ++ if rc < 0: ++ raise ValueError("Could not create context for %s/%s" % (proto, port)) ++ ++ semanage_context_set_user(self.sh, con, "system_u") ++ semanage_context_set_role(self.sh, con, "object_r") ++ semanage_context_set_type(self.sh, con, type) ++ semanage_context_set_mls(self.sh, con, serange) ++ semanage_begin_transaction(self.sh) ++ semanage_port_set_con(p, con) ++ semanage_port_add_local(self.sh, k, p) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Failed to add port") ++ ++ def modify(self, port, proto, serange, setype): ++ if serange == "" and setype == "": ++ raise ValueError("Requires, setype or serange") ++ ++ ( k, proto_d, low, high ) = self.__genkey(port, proto) ++ ++ (rc,exists) = semanage_port_exists(self.sh, k) ++ if exists: ++ (rc,p) = semanage_port_query(self.sh, k) ++ else: ++ raise ValueError("port %s/%s is not defined." % (proto,port)) ++ ++ if rc < 0: ++ raise ValueError("Could not query port for %s/%s" % (proto, port)) ++ ++ con = semanage_port_get_con(p) ++ if rc < 0: ++ raise ValueError("Could not get port context for %s/%s" % (proto, port)) ++ ++ if serange != "": ++ semanage_context_set_mls(self.sh, con, serange) ++ if setype != "": ++ semanage_context_set_type(self.sh, con, setype) ++ semanage_begin_transaction(self.sh) ++ semanage_port_modify_local(self.sh, k, p) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Failed to add port") ++ ++ def delete(self, port, proto): ++ ( k, proto_d, low, high ) = self.__genkey(port, proto) ++ (rc,exists) = semanage_port_exists(self.sh, k) ++ if not exists: ++ raise ValueError("port %s/%s is not defined." % (proto,port)) ++ else: ++ (rc,exists) = semanage_port_exists_local(self.sh, k) ++ if not exists: ++ raise ValueError("port %s/%s is not defined localy, can not be deleted." % (proto,port)) ++ ++ semanage_begin_transaction(self.sh) ++ semanage_port_del_local(self.sh, k) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Port %s/%s not defined" % (proto,port)) ++ ++ def get_all(self): ++ dict={} ++ (status, self.plist, self.psize) = semanage_port_list(self.sh) ++ for idx in range(self.psize): ++ u = semanage_port_by_idx(self.plist, idx) ++ con = semanage_port_get_con(u) ++ name = semanage_context_get_type(con) ++ proto=semanage_port_get_proto_str(u) ++ low=semanage_port_get_low(u) ++ high = semanage_port_get_high(u) ++ if (name, proto) not in dict.keys(): ++ dict[(name,proto)]=[] ++ if low == high: ++ dict[(name,proto)].append("%d" % low) ++ else: ++ dict[(name,proto)].append("%d-%d" % (low, high)) ++ return dict ++ ++ def list(self, heading=1): ++ if heading: ++ print "%-30s %-8s %s\n" % ("SELinux Port Name", "Proto", "Port Number") ++ dict=self.get_all() + keys=dict.keys() + keys.sort() + for i in keys: - rec = "%-30s %-8s " % i - rec += "%s" % dict[i][0] - for p in dict[i][1:]: - rec += ", %s" % p - print rec - ++ rec = "%-30s %-8s " % i ++ rec += "%s" % dict[i][0] ++ for p in dict[i][1:]: ++ rec += ", %s" % p ++ print rec ++ +class interfaceRecords(semanageRecords): + def __init__(self): + semanageRecords.__init__(self) @@ -229,7 +877,7 @@ + serange="s0" + + if type == "": -+ raise ValueError("Type is required") ++ raise ValueError("SELinux Type is required") + + (rc,k) = semanage_iface_key_create(self.sh, interface) + if rc < 0: @@ -305,71 +953,276 @@ + if semanage_commit(self.sh) < 0: + raise ValueError("Interface %s not defined" % interface) + -+ def list(self, heading=1): ++ def get_all(self): ++ dict={} + (status, self.plist, self.psize) = semanage_iface_list(self.sh) + if status < 0: + raise ValueError("Unable to list interfaces") ++ for idx in range(self.psize): ++ interface = semanage_iface_by_idx(self.plist, idx) ++ con = semanage_iface_get_ifcon(interface) ++ dict[semanage_iface_get_name(interface)]=(semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con)) ++ ++ return dict + ++ def list(self, heading=1): + if heading: + print "%-30s %s\n" % ("SELinux Interface", "Context") ++ dict=self.get_all() ++ keys=dict.keys() ++ keys.sort() ++ for k in keys: ++ print "%-30s %s:%s:%s:%s " % (k,dict[k][0], dict[k][1],dict[k][2], dict[k][3]) ++ ++class fcontextRecords(semanageRecords): ++ def __init__(self): ++ semanageRecords.__init__(self) ++ self.file_types={} ++ self.file_types[""] = SEMANAGE_FCONTEXT_ALL; ++ self.file_types["all files"] = SEMANAGE_FCONTEXT_ALL; ++ self.file_types["--"] = SEMANAGE_FCONTEXT_REG; ++ self.file_types["regular file"] = SEMANAGE_FCONTEXT_REG; ++ self.file_types["-d"] = SEMANAGE_FCONTEXT_DIR; ++ self.file_types["directory"] = SEMANAGE_FCONTEXT_DIR; ++ self.file_types["-c"] = SEMANAGE_FCONTEXT_CHAR; ++ self.file_types["character device"] = SEMANAGE_FCONTEXT_CHAR; ++ self.file_types["-b"] = SEMANAGE_FCONTEXT_BLOCK; ++ self.file_types["block device"] = SEMANAGE_FCONTEXT_BLOCK; ++ self.file_types["-s"] = SEMANAGE_FCONTEXT_SOCK; ++ self.file_types["socket"] = SEMANAGE_FCONTEXT_SOCK; ++ self.file_types["symbolic link"] = SEMANAGE_FCONTEXT_LINK; ++ self.file_types["-p"] = SEMANAGE_FCONTEXT_PIPE; ++ self.file_types["named pipe"] = SEMANAGE_FCONTEXT_PIPE; ++ ++ ++ def add(self, target, type, ftype="", serange="s0", seuser="system_u"): ++ if seuser == "": ++ seuser="system_u" ++ ++ if serange == "": ++ serange="s0" ++ ++ if type == "": ++ raise ValueError("SELinux Type is required") ++ ++ (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) ++ if rc < 0: ++ raise ValueError("Can't create key for %s" % target) ++ (rc,exists) = semanage_fcontext_exists(self.sh, k) ++ print (rc, exists, target) ++ if exists: ++ raise ValueError("fcontext %s already defined" % target) ++ (rc,fcontext) = semanage_fcontext_create(self.sh) ++ if rc < 0: ++ raise ValueError("Could not create fcontext for %s" % target) ++ ++ rc = semanage_fcontext_set_expr(self.sh, fcontext, target) ++ (rc, con) = semanage_context_create(self.sh) ++ if rc < 0: ++ raise ValueError("Could not create context for %s" % target) ++ ++ semanage_context_set_user(self.sh, con, seuser) ++ semanage_context_set_role(self.sh, con, "object_r") ++ semanage_context_set_type(self.sh, con, type) ++ semanage_context_set_mls(self.sh, con, serange) ++ semanage_fcontext_set_type(fcontext, self.file_types[ftype]) ++ semanage_begin_transaction(self.sh) ++ semanage_fcontext_set_con(fcontext, con) ++ semanage_fcontext_add_local(self.sh, k, fcontext) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Failed to add fcontext") ++ ++ def modify(self, target, setype, ftype, serange, seuser): ++ if serange == "" and setype == "" and seuser == "": ++ raise ValueError("Requires, setype, serange or seuser") ++ ++ (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) ++ if rc < 0: ++ raise ValueError("Can't creater key for %s" % target) ++ (rc,exists) = semanage_fcontext_exists(self.sh, k) ++ if exists: ++ (rc,p) = semanage_fcontext_query(self.sh, k) ++ else: ++ raise ValueError("fcontext %s is not defined." % target) ++ if rc < 0: ++ raise ValueError("Could not query fcontext for %s" % target) ++ con = semanage_fcontext_get_con(p) ++ if rc < 0: ++ raise ValueError("Could not get fcontext context for %s" % target) ++ ++ if serange != "": ++ semanage_context_set_mls(self.sh, con, serange) ++ if seuser != "": ++ semanage_context_set_user(self.sh, con, seuser) ++ if setype != "": ++ semanage_context_set_type(self.sh, con, setype) ++ ++ semanage_begin_transaction(self.sh) ++ semanage_fcontext_modify_local(self.sh, k, p) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Failed to add fcontext") ++ ++ def delete(self, target): ++ (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) ++ if rc < 0: ++ raise ValueError("Can't create key for %s" % target) ++ (rc,exists) = semanage_fcontext_exists(self.sh, k) ++ if not exists: ++ raise ValueError("fcontext %s is not defined." % target) ++ else: ++ (rc,exists) = semanage_fcontext_exists_local(self.sh, k) ++ if not exists: ++ raise ValueError("fcontext %s is not defined localy, can not be deleted." % target) ++ ++ semanage_begin_transaction(self.sh) ++ semanage_fcontext_del_local(self.sh, k) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("fcontext %s not defined" % target) ++ ++ def get_all(self): + dict={} ++ (status, self.plist, self.psize) = semanage_fcontext_list(self.sh) ++ if status < 0: ++ raise ValueError("Unable to list fcontexts") ++ + for idx in range(self.psize): -+ iface = semanage_iface_by_idx(self.plist, idx) -+ name = semanage_iface_get_name(iface) -+ con = semanage_iface_get_ifcon(iface) ++ fcontext = semanage_fcontext_by_idx(self.plist, idx) ++ expr=semanage_fcontext_get_expr(fcontext) ++ ftype=semanage_fcontext_get_type_str(fcontext) ++ con = semanage_fcontext_get_con(fcontext) ++ if con: ++ dict[expr, ftype]=(semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con)) ++ else: ++ dict[expr, ftype]=con + ++ return dict ++ ++ def list(self, heading=1): ++ if heading: ++ print "%-50s %-18s %s\n" % ("SELinux fcontext", "type", "Context") ++ dict=self.get_all() ++ keys=dict.keys() ++ for k in keys: ++ if dict[k]: ++ print "%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], dict[k][0], dict[k][1],dict[k][2], dict[k][3]) ++ else: ++ print "%-50s %-18s <>" % (k[0], k[1]) ++ ++class booleanRecords(semanageRecords): ++ def __init__(self): ++ semanageRecords.__init__(self) ++ ++ def add(self, target, type, ftype="", serange="s0", seuser="system_u"): ++ if seuser == "": ++ seuser="system_u" ++ ++ if serange == "": ++ serange="s0" ++ ++ if type == "": ++ raise ValueError("SELinux Type is required") ++ ++ (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) ++ if rc < 0: ++ raise ValueError("Can't create key for %s" % target) ++ (rc,exists) = semanage_fcontext_exists(self.sh, k) ++ print (rc, exists, target) ++ if exists: ++ raise ValueError("fcontext %s already defined" % target) ++ (rc,fcontext) = semanage_fcontext_create(self.sh) ++ if rc < 0: ++ raise ValueError("Could not create fcontext for %s" % target) ++ ++ rc = semanage_fcontext_set_expr(self.sh, fcontext, target) ++ (rc, con) = semanage_context_create(self.sh) ++ if rc < 0: ++ raise ValueError("Could not create context for %s" % target) ++ ++ semanage_context_set_user(self.sh, con, seuser) ++ semanage_context_set_role(self.sh, con, "object_r") ++ semanage_context_set_type(self.sh, con, type) ++ semanage_context_set_mls(self.sh, con, serange) ++ semanage_fcontext_set_type(fcontext, self.file_types[ftype]) ++ semanage_begin_transaction(self.sh) ++ semanage_fcontext_set_con(fcontext, con) ++ semanage_fcontext_add_local(self.sh, k, fcontext) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Failed to add fcontext") ++ ++ def modify(self, target, setype, ftype, serange, seuser): ++ if serange == "" and setype == "" and seuser == "": ++ raise ValueError("Requires, setype, serange or seuser") + -+ print "%-30s %s:%s:%s:%s " % (name,semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con)) ++ (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) ++ if rc < 0: ++ raise ValueError("Can't creater key for %s" % target) ++ (rc,exists) = semanage_fcontext_exists(self.sh, k) ++ if exists: ++ (rc,p) = semanage_fcontext_query(self.sh, k) ++ else: ++ raise ValueError("fcontext %s is not defined." % target) ++ if rc < 0: ++ raise ValueError("Could not query fcontext for %s" % target) ++ con = semanage_fcontext_get_con(p) ++ if rc < 0: ++ raise ValueError("Could not get fcontext context for %s" % target) + - if __name__ == '__main__': - - def usage(message = ""): -@@ -366,6 +449,7 @@ - semanage user [-admsRrh] SELINUX_USER\n\ - semanage login [-admsrh] LOGIN_NAME\n\ - semanage port [-admth] PORT | PORTRANGE\n\ -+semanage interface [-admth] INTERFACE\n\ - -a, --add Add a OBJECT record NAME\n\ - -d, --delete Delete a OBJECT record NAME\n\ - -h, --help display this message\n\ -@@ -391,7 +475,7 @@ - # - # - try: -- objectlist = ("login", "user", "port") -+ objectlist = ("login", "user", "port", "interface") - input = sys.stdin - output = sys.stdout - serange = "" -@@ -482,6 +566,9 @@ - if object == "port": - OBJECT = portRecords() - -+ if object == "interface": -+ OBJECT = interfaceRecords() ++ if serange != "": ++ semanage_context_set_mls(self.sh, con, serange) ++ if seuser != "": ++ semanage_context_set_user(self.sh, con, seuser) ++ if setype != "": ++ semanage_context_set_type(self.sh, con, setype) ++ ++ semanage_begin_transaction(self.sh) ++ semanage_fcontext_modify_local(self.sh, k, p) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("Failed to add fcontext") + - if list: - OBJECT.list(heading) - sys.exit(0); -@@ -504,6 +591,9 @@ - if object == "port": - OBJECT.add(target, proto, serange, setype) - -+ if object == "interface": -+ OBJECT.add(target, serange, setype) ++ def delete(self, target): ++ (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) ++ if rc < 0: ++ raise ValueError("Can't create key for %s" % target) ++ (rc,exists) = semanage_fcontext_exists(self.sh, k) ++ if not exists: ++ raise ValueError("fcontext %s is not defined." % target) ++ else: ++ (rc,exists) = semanage_fcontext_exists_local(self.sh, k) ++ if not exists: ++ raise ValueError("fcontext %s is not defined localy, can not be deleted." % target) + - sys.exit(0); - - if modify: -@@ -516,7 +606,10 @@ - - if object == "port": - OBJECT.modify(target, proto, serange, setype) -- sys.exit(0); ++ semanage_begin_transaction(self.sh) ++ semanage_fcontext_del_local(self.sh, k) ++ if semanage_commit(self.sh) < 0: ++ raise ValueError("fcontext %s not defined" % target) ++ ++ def get_all(self): ++ dict={} ++ (status, self.plist, self.psize) = semanage_fcontext_list(self.sh) ++ if status < 0: ++ raise ValueError("Unable to list fcontexts") + -+ if object == "interface": -+ OBJECT.modify(target, serange, setype) ++ for idx in range(self.psize): ++ fcontext = semanage_fcontext_by_idx(self.plist, idx) ++ expr=semanage_fcontext_get_expr(fcontext) ++ ftype=semanage_fcontext_get_type_str(fcontext) ++ con = semanage_fcontext_get_con(fcontext) ++ if con: ++ dict[expr, ftype]=(semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con)) ++ else: ++ dict[expr, ftype]=con + - sys.exit(0); - - if delete: ++ return dict ++ ++ def list(self, heading=1): ++ if heading: ++ print "%-50s %-18s %s\n" % ("SELinux fcontext", "type", "Context") ++ dict=self.get_all() ++ keys=dict.keys() ++ for k in keys: ++ if dict[k]: ++ print "%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], dict[k][0], dict[k][1],dict[k][2], dict[k][3]) ++ else: ++ print "%-50s %-18s <>" % (k[0], k[1]) ++ ++ Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.211 retrieving revision 1.212 diff -u -r1.211 -r1.212 --- policycoreutils.spec 5 Jan 2006 21:52:31 -0000 1.211 +++ policycoreutils.spec 10 Jan 2006 17:12:58 -0000 1.212 @@ -4,7 +4,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.5 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -47,7 +47,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d -make DESTDIR="${RPM_BUILD_ROOT}" install +make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" install %find_lang %{name} @@ -94,8 +94,13 @@ %config %{_sysconfdir}/pam.d/newrole %config %{_sysconfdir}/pam.d/run_init %config(noreplace) %{_sysconfdir}/sestatus.conf +%{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Tue Jan 10 2006 Dan Walsh 1.29.5-2 +- Update semanage and split out seobject +- Fix labeleing of home_root + * Thu Jan 5 2006 Dan Walsh 1.29.5-1 - Update to match NSA * Added filename to semodule error reporting. From fedora-cvs-commits at redhat.com Tue Jan 10 17:19:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 12:19:03 -0500 Subject: rpms/perl-Devel-Symdump/devel .cvsignore, 1.3, 1.4 perl-Devel-Symdump.spec, 1.10, 1.11 sources, 1.3, 1.4 Message-ID: <200601101719.k0AHJ3He003315@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-Devel-Symdump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3286 Modified Files: .cvsignore perl-Devel-Symdump.spec sources Log Message: fix bug 176718: Upgrade to 2.05 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl-Devel-Symdump/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Sep 2004 10:08:30 -0000 1.3 +++ .cvsignore 10 Jan 2006 17:18:59 -0000 1.4 @@ -1 +1,2 @@ Devel-Symdump-2.03.tar.gz +Devel-Symdump-2.05.tar.gz Index: perl-Devel-Symdump.spec =================================================================== RCS file: /cvs/dist/rpms/perl-Devel-Symdump/devel/perl-Devel-Symdump.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Devel-Symdump.spec 17 Dec 2005 02:11:11 -0000 1.10 +++ perl-Devel-Symdump.spec 10 Jan 2006 17:18:59 -0000 1.11 @@ -1,6 +1,6 @@ Name: perl-Devel-Symdump -Version: 2.03 -Release: 20.1.1 +Version: 2.05 +Release: 1 Summary: A Perl module for inspecting Perl's symbol table Group: Development/Libraries @@ -11,7 +11,7 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The perl module Devel::Symdump provides a convenient way to inspect @@ -29,6 +29,7 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -42,11 +43,14 @@ %files %defattr(-,root,root,-) %doc ChangeLog README -%{perl_vendorlib}/Devel/ +%{perl_vendorlib}/Devel/* %{_mandir}/man3/*.3* %changelog +* Tue Jan 10 2006 Jason Vas Dias - 2.05-1 +- fix bug 176718: Upgrade to 2.05 + * Fri Dec 16 2005 Jesse Keating - rebuilt for new gcc Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl-Devel-Symdump/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Sep 2004 10:08:30 -0000 1.3 +++ sources 10 Jan 2006 17:18:59 -0000 1.4 @@ -1 +1 @@ -ea5230185f1188b70ad9c3e431d981c5 Devel-Symdump-2.03.tar.gz +ac5602fd74cb4c8f749e97f51933b7d3 Devel-Symdump-2.05.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 10 17:27:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 12:27:10 -0500 Subject: rpms/perl-File-MMagic/devel .cvsignore, 1.7, 1.8 perl-File-MMagic.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200601101727.k0AHRAxZ007092@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-File-MMagic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7064 Modified Files: .cvsignore perl-File-MMagic.spec sources Log Message: fix bug 176717: upgrade to 1.25 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl-File-MMagic/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 26 Dec 2004 05:22:26 -0000 1.7 +++ .cvsignore 10 Jan 2006 17:27:06 -0000 1.8 @@ -1,2 +1,3 @@ File-MMagic-1.21.tar.gz File-MMagic-1.22.tar.gz +File-MMagic-1.25.tar.gz Index: perl-File-MMagic.spec =================================================================== RCS file: /cvs/dist/rpms/perl-File-MMagic/devel/perl-File-MMagic.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-File-MMagic.spec 17 Dec 2005 02:11:48 -0000 1.11 +++ perl-File-MMagic.spec 10 Jan 2006 17:27:06 -0000 1.12 @@ -1,17 +1,17 @@ Name: perl-File-MMagic -Version: 1.22 -Release: 1.1 +Version: 1.25 +Release: 1 Summary: A Perl module emulating the file(1) command Group: Development/Libraries -License: Distributable +License: GPL or Artistic URL: http://search.cpan.org/dist/File-MMagic/ -Source0: http://www.cpan.org/authors/id/K/KN/KNOK/File-MMagic-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/K/KN/KNOK/File-MMagic-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module attempts to guess file type from its contents like file(1) @@ -47,6 +47,9 @@ %changelog +* Tue Jan 10 2006 Jason Vas Dias - 1.25-1 +- fix bug 176717: upgrade to 1.25 + * Fri Dec 16 2005 Jesse Keating - rebuilt for new gcc Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl-File-MMagic/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 26 Dec 2004 05:22:26 -0000 1.7 +++ sources 10 Jan 2006 17:27:06 -0000 1.8 @@ -1 +1 @@ -de4fc586de7629483196bea11c898bfc File-MMagic-1.22.tar.gz +519e9668cff76e3debe34be0f0909f9f File-MMagic-1.25.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 10 17:36:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 12:36:17 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch, 1.6, 1.7 selinux-policy.spec, 1.79, 1.80 Message-ID: <200601101736.k0AHaHtJ009656@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9620 Modified Files: policy-20060104.patch selinux-policy.spec Log Message: * Tue Jan 10 2006 Dan Walsh 2.1.8-3 - More Fixes for hal and readahead policy-20060104.patch: Makefile | 2 policy/modules/admin/amanda.te | 4 policy/modules/admin/consoletype.te | 1 policy/modules/admin/netutils.te | 1 policy/modules/admin/readahead.te | 5 + policy/modules/admin/su.if | 2 policy/modules/admin/vpn.te | 7 + policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 +++++ policy/modules/apps/java.te | 25 +++++ policy/modules/apps/wine.fc | 2 policy/modules/apps/wine.if | 23 +++++ policy/modules/apps/wine.te | 27 ++++++ policy/modules/kernel/corecommands.te | 6 + policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.if | 17 ++++ policy/modules/kernel/kernel.if | 21 ++++ policy/modules/kernel/kernel.te | 5 + policy/modules/kernel/mls.te | 2 policy/modules/services/apache.te | 9 ++ policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 9 +- policy/modules/services/bluetooth.te | 1 policy/modules/services/cron.te | 32 +------ policy/modules/services/cups.te | 6 - policy/modules/services/dovecot.te | 1 policy/modules/services/hal.fc | 1 policy/modules/services/hal.te | 16 ++- policy/modules/services/irqbalance.te | 1 policy/modules/services/kerberos.te | 5 - policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++++++++++ policy/modules/services/logwatch.fc | 3 policy/modules/services/logwatch.if | 1 policy/modules/services/logwatch.te | 107 +++++++++++++++++++++++++ policy/modules/services/mta.te | 13 +++ policy/modules/services/networkmanager.te | 5 - policy/modules/services/nscd.te | 1 policy/modules/services/ntp.te | 2 policy/modules/services/portmap.te | 1 policy/modules/services/prelink.fc | 7 + policy/modules/services/prelink.if | 39 +++++++++ policy/modules/services/prelink.te | 64 +++++++++++++++ policy/modules/services/rpc.te | 1 policy/modules/services/samba.if | 2 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.te | 1 policy/modules/system/clock.te | 1 policy/modules/system/fstools.te | 4 policy/modules/system/hostname.te | 38 +------- policy/modules/system/init.te | 16 --- policy/modules/system/libraries.fc | 127 +++++++++++++++--------------- policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 1 policy/modules/system/logging.te | 4 policy/modules/system/lvm.te | 2 policy/modules/system/mount.te | 4 policy/modules/system/selinuxutil.te | 5 - policy/modules/system/sysnetwork.te | 2 policy/modules/system/unconfined.if | 1 policy/modules/system/unconfined.te | 12 +- policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 66 ++++++++++----- policy/modules/system/userdomain.te | 1 policy/users | 8 + 67 files changed, 684 insertions(+), 184 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- policy-20060104.patch 9 Jan 2006 22:50:57 -0000 1.6 +++ policy-20060104.patch 10 Jan 2006 17:36:14 -0000 1.7 @@ -48,7 +48,7 @@ corenet_raw_sendrecv_all_if(netutils_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.1.8/policy/modules/admin/readahead.te --- nsaserefpolicy/policy/modules/admin/readahead.te 2006-01-04 16:55:14.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/readahead.te 2006-01-09 17:39:19.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/admin/readahead.te 2006-01-10 11:39:08.000000000 -0500 @@ -27,6 +27,7 @@ kernel_read_kernel_sysctl(readahead_t) @@ -57,7 +57,17 @@ dev_read_sysfs(readahead_t) dev_getattr_generic_chr_file(readahead_t) -@@ -50,6 +51,7 @@ +@@ -43,6 +44,9 @@ + + fs_getattr_all_fs(readahead_t) + fs_search_auto_mountpoints(readahead_t) ++fs_getattr_all_pipes(readahead_t) ++fs_getattr_all_files(readahead_t) ++fs_search_ramfs(readahead_t) + + term_dontaudit_use_console(readahead_t) + +@@ -50,6 +54,7 @@ init_use_fd(readahead_t) init_use_script_pty(readahead_t) @@ -538,8 +548,8 @@ +/usr/share/hal/scripts(/.*)? gen_context(system_u:object_r:bin_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.8/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/hal.te 2006-01-09 17:37:17.000000000 -0500 -@@ -47,8 +47,12 @@ ++++ serefpolicy-2.1.8/policy/modules/services/hal.te 2006-01-10 12:17:49.000000000 -0500 +@@ -47,8 +47,14 @@ kernel_read_system_state(hald_t) kernel_read_network_state(hald_t) kernel_read_kernel_sysctl(hald_t) @@ -549,26 +559,22 @@ +mls_file_read_up(hald_t) + ++bootloader_getattr_boot_dir(hald_t) ++ corecmd_exec_bin(hald_t) corecmd_exec_sbin(hald_t) -@@ -74,6 +78,7 @@ - dev_manage_generic_chr_file(hald_t) - # hal is now execing pm-suspend - dev_rw_sysfs(hald_t) -+dev_read_raw_memory(hald_t) - - domain_use_wide_inherit_fd(hald_t) - domain_exec_all_entry_files(hald_t) -@@ -82,6 +87,7 @@ +@@ -81,7 +87,8 @@ + files_exec_etc_files(hald_t) files_read_etc_files(hald_t) files_rw_etc_runtime_files(hald_t) - files_search_mnt(hald_t) +-files_search_mnt(hald_t) +files_manage_mnt_dirs(hald_t) ++files_manage_mnt_files(hald_t) files_search_var_lib(hald_t) files_read_usr_files(hald_t) # hal is now execing pm-suspend -@@ -145,6 +151,10 @@ +@@ -145,6 +152,10 @@ clock_domtrans(hald_t) ') @@ -579,6 +585,13 @@ optional_policy(`cups',` cups_domtrans_config(hald_t) cups_signal_config(hald_t) +@@ -205,6 +216,3 @@ + vbetool_domtrans(hald_t) + ') + +-ifdef(`TODO',` +-allow hald_t device_t:dir create_dir_perms; +-') dnl end TODO diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.1.8/policy/modules/services/irqbalance.te --- nsaserefpolicy/policy/modules/services/irqbalance.te 2005-11-28 17:23:58.000000000 -0500 +++ serefpolicy-2.1.8/policy/modules/services/irqbalance.te 2006-01-09 14:37:14.000000000 -0500 @@ -590,6 +603,18 @@ dev_read_sysfs(irqbalance_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-2.1.8/policy/modules/services/kerberos.te +--- nsaserefpolicy/policy/modules/services/kerberos.te 2005-12-09 23:35:05.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/kerberos.te 2006-01-10 08:56:50.000000000 -0500 +@@ -249,8 +249,3 @@ + udev_read_db(krb5kdc_t) + ') + +-ifdef(`TODO',` +-# Allow user programs to talk to KDC +-allow krb5kdc_t userdomain:udp_socket recvfrom; +-allow userdomain krb5kdc_t:udp_socket recvfrom; +-') dnl end TODO diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.fc serefpolicy-2.1.8/policy/modules/services/locate.fc --- nsaserefpolicy/policy/modules/services/locate.fc 1969-12-31 19:00:00.000000000 -0500 +++ serefpolicy-2.1.8/policy/modules/services/locate.fc 2006-01-09 14:37:14.000000000 -0500 @@ -816,7 +841,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.1.8/policy/modules/services/networkmanager.te --- nsaserefpolicy/policy/modules/services/networkmanager.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/networkmanager.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/services/networkmanager.te 2006-01-10 09:08:19.000000000 -0500 @@ -28,8 +28,6 @@ allow NetworkManager_t self:tcp_socket create_stream_socket_perms; allow NetworkManager_t self:udp_socket create_socket_perms; @@ -835,15 +860,8 @@ dev_read_sysfs(NetworkManager_t) dev_read_rand(NetworkManager_t) -@@ -168,6 +164,12 @@ - udev_read_db(NetworkManager_t) - ') +@@ -170,4 +166,5 @@ -+# allow vpnc connections -+# allow NetworkManager_t self:rawip_socket create_socket_perms; -+# vpn connections -+# corenet_use_tun_tap_device(NetworkManager_t) -+ optional_policy(`vpn',` vpn_domtrans(NetworkManager_t) + allow NetworkManager_t vpnc_t:process signal; @@ -1195,7 +1213,7 @@ ') dnl end TODO diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.1.8/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/libraries.fc 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.8/policy/modules/system/libraries.fc 2006-01-10 11:55:40.000000000 -0500 @@ -11,6 +11,9 @@ /emul/ia32-linux/lib(/.*)? gen_context(system_u:object_r:lib_t,s0) /emul/ia32-linux/lib/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0) @@ -1215,16 +1233,19 @@ /usr/lib/win32/.* -- gen_context(system_u:object_r:shlib_t,s0) -@@ -76,7 +79,7 @@ +@@ -75,8 +78,10 @@ + /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib(64)?/libmono\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++ ifdef(`distro_redhat',` -/usr/lib/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) +/usr/lib(64)?/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) /usr/share/rhn/rhn_applet/eggtrayiconmodule\.so -- gen_context(system_u:object_r:shlib_t,s0) # The following are libraries with text relocations in need of execmod permissions -@@ -84,32 +87,32 @@ +@@ -84,32 +89,32 @@ # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv # HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php @@ -1280,7 +1301,7 @@ /usr/lib(64)?/.*/program/librecentfile\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/.*/program/libsvx680li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -@@ -122,48 +125,48 @@ +@@ -122,48 +127,48 @@ /usr/lib(64)?/thunderbird.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) # Fedora Extras packages: ladspa, imlib2, ocaml @@ -1364,7 +1385,7 @@ # Java, Sun Microsystems (JPackage SRPM) /usr/.*/jre/lib/i386/libdeploy.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -@@ -175,7 +178,7 @@ +@@ -175,7 +180,7 @@ ') dnl end distro_redhat ifdef(`distro_suse',` Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- selinux-policy.spec 9 Jan 2006 22:50:57 -0000 1.79 +++ selinux-policy.spec 10 Jan 2006 17:36:14 -0000 1.80 @@ -7,7 +7,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.1.8 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -262,6 +262,9 @@ %endif %changelog +* Tue Jan 10 2006 Dan Walsh 2.1.8-3 +- More Fixes for hal and readahead + * Mon Jan 9 2006 Dan Walsh 2.1.8-2 - Fixes for hal and readahead From fedora-cvs-commits at redhat.com Tue Jan 10 17:51:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 12:51:40 -0500 Subject: rpms/gpdf/FC-3 gpdf-2.8.2-CVE-2005-3193.CVE-2005-3624.patch, NONE, 1.1 gpdf.spec, 1.21, 1.22 gpdf-2.8.2-CVE-2005-3193.patch, 1.2, NONE Message-ID: <200601101751.k0AHpefA027883@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gpdf/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv27788 Modified Files: gpdf.spec Added Files: gpdf-2.8.2-CVE-2005-3193.CVE-2005-3624.patch Removed Files: gpdf-2.8.2-CVE-2005-3193.patch Log Message: - Apply fix for CVE-2005-3624 (also covers CVE-2005-3193) (bug 176866) gpdf-2.8.2-CVE-2005-3193.CVE-2005-3624.patch: JBIG2Stream.cc | 45 +++++++++++++++++++++++++++++++++++++++++---- JPXStream.cc | 18 +++++++++++++++--- Stream.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- Stream.h | 3 +++ 4 files changed, 106 insertions(+), 9 deletions(-) --- NEW FILE gpdf-2.8.2-CVE-2005-3193.CVE-2005-3624.patch --- --- gpdf-2.8.2/xpdf/Stream.h.CVE-2005-3193.CVE-2005-3624 2004-05-17 12:37:57.000000000 -0700 +++ gpdf-2.8.2/xpdf/Stream.h 2006-01-06 14:57:22.000000000 -0800 @@ -233,6 +233,8 @@ public: ~StreamPredictor(); + GBool isOk() { return ok; } + int lookChar(); int getChar(); @@ -250,6 +252,7 @@ private: int rowBytes; // bytes per line Guchar *predLine; // line buffer int predIdx; // current index in predLine + GBool ok; }; //------------------------------------------------------------------------ --- gpdf-2.8.2/xpdf/JPXStream.cc.CVE-2005-3193.CVE-2005-3624 2004-05-17 11:11:49.000000000 -0700 +++ gpdf-2.8.2/xpdf/JPXStream.cc 2006-01-06 14:57:22.000000000 -0800 @@ -7,6 +7,7 @@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@ -666,7 +667,7 @@ GBool JPXStream::readCodestream(Guint le int segType; GBool haveSIZ, haveCOD, haveQCD, haveSOT; Guint precinctSize, style; - Guint segLen, capabilities, comp, i, j, r; + Guint segLen, capabilities, nTiles, comp, i, j, r; //----- main header haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; @@ -701,8 +702,19 @@ GBool JPXStream::readCodestream(Guint le / img.xTileSize; img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) / img.yTileSize; - img.tiles = (JPXTile *)gmalloc(img.nXTiles * img.nYTiles * - sizeof(JPXTile)); + // check for overflow before allocating memory + if (img.nXTiles <= 0 || img.nYTiles <= 0 || + img.nXTiles >= INT_MAX/img.nYTiles) { + error(getPos(), "Bad tile count in JPX SIZ marker segment"); + return gFalse; + } + nTiles = img.nXTiles * img.nYTiles; + if (nTiles >= INT_MAX/sizeof(JPXTile)) { + error(getPos(), "Bad tile count in JPX SIZ marker segment"); + return gFalse; + } + img.tiles = (JPXTile *)gmalloc(nTiles * sizeof(JPXTile)); + for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps * sizeof(JPXTileComp)); --- gpdf-2.8.2/xpdf/Stream.cc.CVE-2005-3193.CVE-2005-3624 2004-05-17 12:37:57.000000000 -0700 +++ gpdf-2.8.2/xpdf/Stream.cc 2006-01-06 14:57:22.000000000 -0800 @@ -15,6 +15,7 @@ #include #include #include +#include #ifndef WIN32 #include #endif @@ -412,13 +413,28 @@ StreamPredictor::StreamPredictor(Stream width = widthA; nComps = nCompsA; nBits = nBitsA; + predLine = NULL; + ok = gFalse; + if (width <= 0 || nComps <= 0 || nBits <= 0 || + nComps >= INT_MAX/nBits || + width >= INT_MAX/nComps/nBits) { + return; + } nVals = width * nComps; + if (nVals * nBits + 7 <= 0) { + return; + } pixBytes = (nComps * nBits + 7) >> 3; rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; + if (rowBytes < 0) { + return; + } predLine = (Guchar *)gmalloc(rowBytes); memset(predLine, 0, rowBytes); predIdx = rowBytes; + + ok = gTrue; } StreamPredictor::~StreamPredictor() { @@ -1012,6 +1028,10 @@ LZWStream::LZWStream(Stream *strA, int p FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if (!pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } @@ -1260,6 +1280,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s endOfLine = endOfLineA; byteAlign = byteAlignA; columns = columnsA; + if (columns < 1 || columns >= INT_MAX / sizeof(short)) { + error(-1, "invalid number of columns: %d", columns); + exit(1); + } rows = rowsA; endOfBlock = endOfBlockA; black = blackA; @@ -2897,6 +2921,11 @@ GBool DCTStream::readBaselineSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@ -2923,6 +2952,11 @@ GBool DCTStream::readProgressiveSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@ -2945,6 +2979,11 @@ GBool DCTStream::readScanInfo() { length = read16() - 2; scanInfo.numComps = str->getChar(); + if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { + scanInfo.numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } --length; if (length != 2 * scanInfo.numComps + 3) { error(getPos(), "Bad DCT scan info block"); @@ -3019,12 +3058,12 @@ GBool DCTStream::readHuffmanTables() { while (length > 0) { index = str->getChar(); --length; - if ((index & 0x0f) >= 4) { + if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) { error(getPos(), "Bad DCT Huffman table"); return gFalse; } if (index & 0x10) { - index &= 0x0f; + index &= 0x03; if (index >= numACHuffTables) numACHuffTables = index+1; tbl = &acHuffTables[index]; @@ -3142,9 +3181,11 @@ int DCTStream::readMarker() { do { do { c = str->getChar(); + if(c == EOF) return EOF; } while (c != 0xff); do { c = str->getChar(); + if(c == EOF) return EOF; } while (c == 0xff); } while (c == 0x00); return c; @@ -3255,6 +3296,10 @@ FlateStream::FlateStream(Stream *strA, i FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if (!pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } --- gpdf-2.8.2/xpdf/JBIG2Stream.cc.CVE-2005-3193.CVE-2005-3624 2004-05-17 11:11:43.000000000 -0700 +++ gpdf-2.8.2/xpdf/JBIG2Stream.cc 2006-01-06 14:57:22.000000000 -0800 @@ -7,6 +7,7 @@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@ -681,7 +682,16 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = wA; h = hA; line = (wA + 7) >> 3; - data = (Guchar *)gmalloc(h * line); + + if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { + error(-1, "invalid width/height"); + data = NULL; + return; + } + + // need to allocate one extra guard byte for use in combine() + data = (Guchar *)gmalloc(h * line + 1); + data[h * line] = 0; } JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap): @@ -690,8 +700,17 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = bitmap->w; h = bitmap->h; line = bitmap->line; - data = (Guchar *)gmalloc(h * line); + + if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { + error(-1, "invalid width/height"); + data = NULL; + return; + } + + // need to allocate one extra guard byte for use in combine() + data = (Guchar *)gmalloc(h * line + 1); memcpy(data, bitmap->data, h * line); + data[h * line] = 0; } JBIG2Bitmap::~JBIG2Bitmap() { @@ -716,10 +735,14 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint } void JBIG2Bitmap::expand(int newH, Guint pixel) { - if (newH <= h) { + if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) { + error(-1, "invalid width/height"); + gfree(data); + data = NULL; return; } - data = (Guchar *)grealloc(data, newH * line); + // need to allocate one extra guard byte for use in combine() + data = (Guchar *)grealloc(data, newH * line + 1); if (pixel) { memset(data + h * line, 0xff, (newH - h) * line); } else { @@ -2256,6 +2279,15 @@ void JBIG2Stream::readHalftoneRegionSeg( error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } + if (gridH == 0 || gridW >= INT_MAX / gridH) { + error(getPos(), "Bad size in JBIG2 halftone segment"); + return; + } + if (w == 0 || h >= INT_MAX / w) { + error(getPos(), "Bad size in JBIG2 bitmap segment"); + return; + } + patternDict = (JBIG2PatternDict *)seg; bpp = 0; i = 1; @@ -2887,6 +2919,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2; int x, y, pix; + if (w < 0 || h <= 0 || w >= INT_MAX / h) { + error(-1, "invalid width/height"); + return NULL; + } + bitmap = new JBIG2Bitmap(0, w, h); bitmap->clearToZero(); Index: gpdf.spec =================================================================== RCS file: /cvs/dist/rpms/gpdf/FC-3/gpdf.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gpdf.spec 14 Dec 2005 22:54:45 -0000 1.21 +++ gpdf.spec 10 Jan 2006 17:51:37 -0000 1.22 @@ -3,7 +3,7 @@ Name: gpdf Summary: viewer for Portable Document Format (PDF) files for GNOME Version: 2.8.2 -Release: 6.2 +Release: 7.2 Group: Applications/Publishing License: GPL Source: gpdf-%{version}.tar.bz2 @@ -11,7 +11,7 @@ Patch1: gpdf-2.8.2-CAN-2005-0064.patch Patch2: gpdf-2.8.2-overflow-fix.patch -Patch3: gpdf-2.8.2-CVE-2005-3193.patch +Patch3: gpdf-2.8.2-CVE-2005-3193.CVE-2005-3624.patch PreReq: desktop-file-utils >= %{desktop_file_utils_version} @@ -39,7 +39,7 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 -b .CVE-2005-3193 +%patch3 -p1 -b .CVE-2005-3193.CVE-2005-3624 %build %configure @@ -95,6 +95,10 @@ %{_sysconfdir}/gconf/schemas/gpdf.schemas %changelog +* Tue Jan 10 2006 Ray Strode 2.8.2-7.2 +- Apply fix for CVE-2005-3624 (also covers CVE-2005-3193) + (bug 176866) + * Tue Dec 6 2005 Ray Strode 2.8.2-6.2 - apply updated patch for CVE-2005-3193 (bug 175102) --- gpdf-2.8.2-CVE-2005-3193.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 10 17:54:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 12:54:43 -0500 Subject: rpms/cups/devel cups.spec,1.128,1.129 Message-ID: <200601101754.k0AHsh13022102@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22089 Modified Files: cups.spec Log Message: * Tue Jan 10 2006 Tim Waugh 1:1.1.23-29 - Apply dest-cache-v2 patch (bug #175847). Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- cups.spec 4 Jan 2006 14:55:18 -0000 1.128 +++ cups.spec 10 Jan 2006 17:54:41 -0000 1.129 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.23 -Release: 28 +Release: 29 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2 @@ -42,6 +42,7 @@ Patch19: cups-gcc34.patch Patch20: cups-gcc4.patch Patch21: cups-slow.patch +Patch22: cups-dest-cache-v2.patch Patch24: cups-maxlogsize.patch Patch25: cups-enabledisable.patch Patch28: cups-no-propagate-ipp-port.patch @@ -148,6 +149,7 @@ %patch19 -p1 -b .gcc34 %patch20 -p1 -b .gcc4 %patch21 -p1 -b .slow +%patch22 -p1 -b .dest-cache-v2 %patch24 -p1 -b .maxlogsize %patch25 -p1 -b .enabledisable %patch28 -p1 -b .no-propagate-ipp-port @@ -429,6 +431,9 @@ %{_libdir}/cups/daemon/cups-lpd %changelog +* Tue Jan 10 2006 Tim Waugh 1:1.1.23-29 +- Apply dest-cache-v2 patch (bug #175847). + * Wed Jan 4 2006 Tim Waugh 1:1.1.23-28 - Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627 (bug #176868). From fedora-cvs-commits at redhat.com Tue Jan 10 18:53:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 13:53:03 -0500 Subject: rpms/cups/devel cups-dest-cache-v2.patch,NONE,1.1 Message-ID: <200601101853.k0AIr3iw032118@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32083 Added Files: cups-dest-cache-v2.patch Log Message: Add the patch. cups-dest-cache-v2.patch: dest.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 183 insertions(+), 1 deletion(-) --- NEW FILE cups-dest-cache-v2.patch --- --- cups-1.1.23/cups/dest.c.dest-cache-v2 2005-01-03 19:29:45.000000000 +0000 +++ cups-1.1.23/cups/dest.c 2006-01-10 17:52:39.000000000 +0000 @@ -45,7 +45,10 @@ #include "string.h" #include #include - +#include +#include +#include +#include /* * Local functions... @@ -204,6 +207,146 @@ /* + * cupsGetDestsCache() - get cached dests list + * return -1 on errors + */ + +int /* O - Number of destinations */ +cupsGetDestsCache(cups_dest_t **dests, /* O - Destinations */ + char *cache, /* I - Cache file name */ + off_t size) /* I - Cache file size */ +{ + int i,j; /* looping variables */ + int fd; /* file descriptor */ + int c; /* characters written */ + int offset=0; /* offset into cache file size */ + char *buf; /* cache buffer */ + char word[4096]; /* buffer for 'words' which need copied */ + int num_dests=0; /* number of destinations */ + + if ((buf = malloc((size_t)size+1)) == NULL) + return 0; + memset((void *)buf, 0, (size_t)size+1); + if ((fd = open(cache,O_RDONLY)) > 0) + { + + /* read the cache */ + if ((c = read(fd,(void *)buf,(size_t)size)) < size) + { + close(fd); + free(buf); + return(-1); + } + + /* find the number of destinations in the cache and set up structure */ + strcpy(word,buf); + offset += strlen(word) + 1; + num_dests = atoi(word); + if (((*dests) = (cups_dest_t *)malloc(sizeof(cups_dest_t) * num_dests)) == NULL) + { + free(buf); + close(fd); + return(-1); + } + + /* populate the destinations structure */ + for (i=0; i < num_dests; i++) + { + if (((*dests)[i].name = malloc(strlen(&buf[offset])+1)) == NULL) + return(-1); + strcpy((*dests)[i].name, &buf[offset]); + offset += strlen((*dests)[i].name) +1; + + if (((*dests)[i].instance = malloc(strlen(&buf[offset])+1)) == NULL) + return(-1); + strcpy((*dests)[i].instance, &buf[offset]); + offset += strlen((*dests)[i].instance) +1; + + /* get number of options */ + strcpy(word, &buf[offset]); + offset += strlen(word)+1; + (*dests)[i].is_default = atoi(word); + + + /* get number of options */ + strcpy(word, &buf[offset]); + offset += strlen(word)+1; + (*dests)[i].num_options = atoi(word); + + if (((*dests)[i].options = malloc(sizeof(cups_option_t) * (*dests)[i].num_options)) == NULL) + { + free(buf); + free(dests); + close(fd); + return(-1); + } + + /* fill options structure */ + for (j=0; j < (*dests)[i].num_options; j++) + { + if (((*dests)[i].options[j].name = malloc(strlen(&buf[offset])+1)) == NULL) + return(-1); + strcpy((*dests)[i].options[j].name, &buf[offset]); + offset += strlen((*dests)[i].options[j].name) +1; + + if (((*dests)[i].options[j].value = malloc(strlen(&buf[offset])+1)) == NULL) + return(-1); + strcpy((*dests)[i].options[j].value, &buf[offset]); + offset += strlen((*dests)[i].options[j].value) +1; + } + } + close(fd); + free(buf); + } + return(num_dests); +} + + +void +cupsSaveDests(int num_dests, /* I - Number of destinations */ + cups_dest_t **dests, /* I - Destinations */ + char *cache) /* I - Cache file name */ +{ + int i,j; /* looping variables */ + int fd; /* file descriptor */ + char buf[4096]; /* string buffer */ + char tmpfn[4096]; /* temporary name to write new cache to */ + int c; + sprintf(tmpfn,"%s-%l",cache,random()); + + if ((fd = open(cache,O_WRONLY|O_CREAT|O_TRUNC)) > 0) + { + sprintf(buf, "%d",num_dests); + c = write(fd, (void *)buf, strlen(buf)+1); + for (i=0; i < num_dests; i++) + { + c = write(fd, (void *)(*dests)[i].name, strlen((*dests)[i].name)+1); + if ((*dests)[i].instance != NULL) + { + write(fd, (void *)(*dests)[i].instance, strlen((*dests)[i].instance)); + } + else + { + write(fd, (void *)"\0", 1); + } + sprintf(buf, "%d",(*dests)[i].is_default); + write(fd, (void *)buf, strlen(buf)+1); + sprintf(buf, "%d",(*dests)[i].num_options); + write(fd, (void *)buf, strlen(buf)+1); + for (j=0; j < (*dests)[i].num_options; j++) + { + write(fd, (void *)(*dests)[i].options[j].name, strlen((*dests)[i].options[j].name)+1); + write(fd, (void *)(*dests)[i].options[j].value, strlen((*dests)[i].options[j].value)+1); + } + } + close(fd); + rename(tmpfn,cache); + } +} + + + +/* * 'cupsGetDests()' - Get the list of destinations. */ @@ -211,8 +354,44 @@ cupsGetDests(cups_dest_t **dests) /* O - Destinations */ { int num_dests; /* Number of destinations */ + int use_cache; /* whether to use local cacheing */ + int cache_timeout=0; /* timeout for cache */ http_t *http; /* HTTP connection */ + struct timeb cur_time; /* current time */ + struct stat cache_stats; /* buffer for local cache of dests */ + char *cups_server; /* cups_server name */ + char cache_filename[4096]; /* file name for dest cache */ + + /* + * Check for local cache file, if it exists and is upt to date, use + * it in preference to generating a new query to the CUPS server + * General strategy is to fail silently on problems with the cache + * and fall back to normal lookups. + */ + if (getenv("CUPS_DESTCACHE") != NULL) + { + cache_timeout = atoi(getenv("CUPS_DESTCACHE")); + /* check to make sure .cups dir exists in users home directory */ + sprintf(cache_filename,"%s/.cups",getenv("HOME")); + mkdir(cache_filename, S_IRWXU | S_IRWXG | S_IROTH); + sprintf(cache_filename,"%s/%s-%s",getenv("HOME"),".cups/dest-cache", cupsServer()); + if ((cache_timeout) && + (!stat(cache_filename, &cache_stats))) + { + ftime(&cur_time); + if (cur_time.time - cache_stats.st_mtime <= cache_timeout) + { + num_dests = cupsGetDestsCache(dests, cache_filename, cache_stats.st_size); + /* + * if we have destinations, there were no errors, else fall + * back to old server check + */ + if (num_dests > 0) + return (num_dests); + } + } + } /* * Connect to the CUPS server and get the destination list and options... @@ -225,6 +404,9 @@ if (http) httpClose(http); + if (cache_timeout) + cupsSaveDests(num_dests, dests, cache_filename); + return (num_dests); } From fedora-cvs-commits at redhat.com Tue Jan 10 19:13:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 14:13:19 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.143, 1.144 policycoreutils.spec, 1.212, 1.213 Message-ID: <200601101913.k0AJDJ2P006017@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5984 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Tue Jan 10 2006 Dan Walsh 1.29.5-3 - Fixes for mls policy policycoreutils-rhat.patch: scripts/genhomedircon | 9 semanage/Makefile | 4 semanage/semanage | 376 ++------------------------ semanage/seobject.py | 722 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 763 insertions(+), 348 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- policycoreutils-rhat.patch 10 Jan 2006 17:12:58 -0000 1.143 +++ policycoreutils-rhat.patch 10 Jan 2006 19:13:15 -0000 1.144 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.5/scripts/genhomedircon --- nsapolicycoreutils/scripts/genhomedircon 2006-01-05 10:35:49.000000000 -0500 -+++ policycoreutils-1.29.5/scripts/genhomedircon 2006-01-10 12:11:48.000000000 -0500 ++++ policycoreutils-1.29.5/scripts/genhomedircon 2006-01-10 14:10:21.000000000 -0500 @@ -144,7 +144,7 @@ for i in fd.read().split('\n'): if i.find("HOME_ROOT") == 0: @@ -10,24 +10,20 @@ fd.close() if ret=="": errorExit("No Home Root Context Found") -@@ -240,7 +240,7 @@ - i=i.replace("HOME_DIR", home) - i=i.replace("ROLE", role) - i=i.replace("system_u", user) -- ret = ret+i+"\n" -+ ret += i+"\n" - fd.close() - return ret - -@@ -252,7 +252,7 @@ - i=i.replace("USER", user) - i=i.replace("ROLE", role) - i=i.replace("system_u", sel_user) -- ret=ret+i+"\n" -+ ret = i+"\n" - fd.close() - return ret - +@@ -162,9 +162,10 @@ + for idx in range(self.usize): + user = semanage_user_by_idx(self.ulist, idx) + if semanage_user_get_name(user) == name: +- #role=semanage_user_get_defrole(user) +- #return role +- return "user_r" ++ if name == "staff_u" or name == "root" and self.type != "targeted": ++ return "staff_r" ++ else: ++ return "user_r" + return name + def getOldRole(self, role): + rc=findval(self.selinuxdir+self.type+"/users/system.users", 'grep "^user %s"' % role, "=") diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/Makefile policycoreutils-1.29.5/semanage/Makefile --- nsapolicycoreutils/semanage/Makefile 2005-11-29 10:55:01.000000000 -0500 +++ policycoreutils-1.29.5/semanage/Makefile 2006-01-06 14:34:47.000000000 -0500 Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.212 retrieving revision 1.213 diff -u -r1.212 -r1.213 --- policycoreutils.spec 10 Jan 2006 17:12:58 -0000 1.212 +++ policycoreutils.spec 10 Jan 2006 19:13:15 -0000 1.213 @@ -4,7 +4,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.5 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -97,6 +97,9 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Tue Jan 10 2006 Dan Walsh 1.29.5-3 +- Fixes for mls policy + * Tue Jan 10 2006 Dan Walsh 1.29.5-2 - Update semanage and split out seobject - Fix labeleing of home_root From fedora-cvs-commits at redhat.com Tue Jan 10 20:07:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 15:07:23 -0500 Subject: rpms/xen/devel .cvsignore, 1.9, 1.10 sources, 1.24, 1.25 xen.spec, 1.70, 1.71 Message-ID: <200601102007.k0AK7N4b005568@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5549 Modified Files: .cvsignore sources xen.spec Log Message: Rebase to current xen tools Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xen/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 6 Dec 2005 20:05:30 -0000 1.9 +++ .cvsignore 10 Jan 2006 20:07:21 -0000 1.10 @@ -1,2 +1 @@ -xen-unstable-src.tar.gz -xen-3.0.0-20051206.tar.bz2 +xen-3.0.0-20060110.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xen/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 6 Dec 2005 20:01:49 -0000 1.24 +++ sources 10 Jan 2006 20:07:21 -0000 1.25 @@ -1 +1 @@ -09ad6d42ca7783eac861dcbe03acb7a0 xen-3.0.0-20051206.tar.bz2 +d3aca23f36c287cc528b7fe8552ad2b3 xen-3.0.0-20060110.tar.bz2 Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- xen.spec 23 Dec 2005 03:24:19 -0000 1.70 +++ xen.spec 10 Jan 2006 20:07:21 -0000 1.71 @@ -3,11 +3,11 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0 -Release: 0.20051206.fc5.2 +Release: 0.20060110.fc5.1 Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html -Source0: xen-3.0.0-20051206.tar.bz2 +Source0: xen-3.0.0-20060110.tar.bz2 Patch0: xen-misc-fixes.patch Patch1: xen-initscript.patch Patch3: xen-dom0-minmem.patch @@ -99,6 +99,7 @@ %{_includedir}/*.h %{_includedir}/xen/*.h %{_includedir}/xen/io/*.h +%{_includedir}/xen/linux/*.h %{python_sitearch}/%{name} %{python_sitearch}/grub %{_libdir}/%{name} @@ -118,6 +119,9 @@ %dir %{_localstatedir}/run/xenstored %changelog +* Tue Jan 10 2006 - 3.0-0.20060110.fc5.1 +- Update to xen-unstable from 20060110 (cset 8526) + * Thu Dec 22 2005 Jesse Keating - 3.0-0.20051206.fc5.2 - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 10 20:10:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 15:10:10 -0500 Subject: rpms/openldap/devel .cvsignore, 1.20, 1.21 openldap.spec, 1.48, 1.49 sources, 1.21, 1.22 Message-ID: <200601102010.k0AKAAeC005699@cvs.devel.redhat.com> Author: fenlason Update of /cvs/dist/rpms/openldap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5684 Modified Files: .cvsignore openldap.spec sources Log Message: 2.3.16 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 11 Nov 2005 03:39:40 -0000 1.20 +++ .cvsignore 10 Jan 2006 20:10:08 -0000 1.21 @@ -1,3 +1,4 @@ openldap-2.2.29.tgz openldap-2.3.11.tgz MigrationTools-46.tar.gz +openldap-2.3.16.tgz Index: openldap.spec =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- openldap.spec 9 Dec 2005 22:42:34 -0000 1.48 +++ openldap.spec 10 Jan 2006 20:10:08 -0000 1.49 @@ -2,7 +2,7 @@ %define db_version 4.3.27 %define ldbm_backend berkeley %define version_22 2.2.29 -%define version_23 2.3.11 +%define version_23 2.3.16 %define evolution_connector_prefix %{_libdir}/evolution-openldap %define evolution_connector_includedir %{evolution_connector_prefix}/include %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib} @@ -13,7 +13,7 @@ Summary: The configuration files, libraries, and documentation for OpenLDAP. Name: openldap Version: %{version_23} -Release: 3.1 +Release: 2 License: OpenLDAP Group: System Environment/Daemons Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz @@ -650,6 +650,9 @@ %attr(0644,root,root) %{evolution_connector_libdir}/*.a %changelog +* Tue Jan 10 2006 Jay Fenlason 2.3.16-2 +- Upgrade to 2.3.16, which upstream will consider stable soon + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 11 Nov 2005 03:39:40 -0000 1.21 +++ sources 10 Jan 2006 20:10:08 -0000 1.22 @@ -2,5 +2,5 @@ 0faee50993f7e4fe00f4b921b640b84d automake-1.4a.tar.gz fcc481d52c3b80e20a328f8c0cb042bd db-4.3.27.tar.gz 6c4c72a1336aa45b463e738034c078d6 openldap-2.2.29.tgz -fbde128a8421b8d2ea587a25057a281e openldap-2.3.11.tgz dc80548f76d6aeba2b51b15751e08b21 MigrationTools-46.tar.gz +adb793bea93db1a56840e5c0c7a647f2 openldap-2.3.16.tgz From fedora-cvs-commits at redhat.com Tue Jan 10 20:32:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 15:32:08 -0500 Subject: rpms/fontconfig/devel fontconfig.spec,1.57,1.58 Message-ID: <200601102032.k0AKW8Ej027771@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/fontconfig/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27713 Modified Files: fontconfig.spec Log Message: add prereq due to mkdir/touch being used in %post Index: fontconfig.spec =================================================================== RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- fontconfig.spec 22 Dec 2005 00:30:11 -0000 1.57 +++ fontconfig.spec 10 Jan 2006 20:31:37 -0000 1.58 @@ -3,7 +3,7 @@ Summary: Font configuration and customization library Name: fontconfig Version: 2.3.93 -Release: 2 +Release: 3 License: MIT Group: System Environment/Libraries Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz @@ -21,7 +21,7 @@ BuildRequires: docbook-utils-pdf >= 0.6.14 BuildRequires: elinks >= 0.10.3 -PreReq: freetype >= %{freetype_version} +PreReq: freetype >= %{freetype_version}, coreutils # Hebrew fonts referenced in fonts.conf changed names in fonts-hebrew-0.100 Conflicts: fonts-hebrew < 0.100 # Conflict with pre-modular X fonts, because they moved and we @@ -134,6 +134,9 @@ %{_mandir}/man3/* %changelog +* Tue Jan 10 2006 Bill Nottingham - 2.3.93-3 +- prereq coreutils for mkdir/touch in %%post + * Wed Dec 21 2005 Carl Worth - 2.3.93-2 - Fix to create /var/cache/fontconfig/stamp in the post install stage. From fedora-cvs-commits at redhat.com Tue Jan 10 20:36:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 15:36:48 -0500 Subject: rpms/gstreamer08/devel gstreamer08.spec,1.5,1.6 Message-ID: <200601102036.k0AKamjP029035@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gstreamer08/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28984 Modified Files: gstreamer08.spec Log Message: env is in coreutils Index: gstreamer08.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer08/devel/gstreamer08.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gstreamer08.spec 5 Jan 2006 06:26:32 -0000 1.5 +++ gstreamer08.spec 10 Jan 2006 20:36:46 -0000 1.6 @@ -38,6 +38,7 @@ BuildRequires: cvs BuildRequires: flex BuildRequires: ghostscript +Requires(pre): coreutils Requires(post): /sbin/ldconfig ### documentation requirements From fedora-cvs-commits at redhat.com Tue Jan 10 20:38:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 15:38:19 -0500 Subject: rpms/gstreamer08/devel gstreamer08.spec,1.6,1.7 Message-ID: <200601102038.k0AKcJ1S029739@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gstreamer08/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29697 Modified Files: gstreamer08.spec Log Message: add changelog Index: gstreamer08.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer08/devel/gstreamer08.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gstreamer08.spec 10 Jan 2006 20:36:46 -0000 1.6 +++ gstreamer08.spec 10 Jan 2006 20:38:16 -0000 1.7 @@ -10,7 +10,7 @@ Name: %{gstreamer} Version: 0.8.11 -Release: 2 +Release: 3 Summary: GStreamer streaming media framework runtime. Group: Applications/Multimedia @@ -168,6 +168,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Tue Jan 10 2006 Bill Nottingham 0.8.11-3 +- requires(pre) coreutils, since we call env + * Wed Jan 04 2006 Warren Togami 0.8.11-2 - explicitly list archs to remove for gst-register - attempt to workaround openjade problem From fedora-cvs-commits at redhat.com Tue Jan 10 20:40:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 15:40:23 -0500 Subject: rpms/xen/devel xen.spec,1.71,1.72 Message-ID: <200601102040.k0AKeNRV030757@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30724 Modified Files: xen.spec Log Message: Fix to build rpm correctly as non-root Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- xen.spec 10 Jan 2006 20:07:21 -0000 1.71 +++ xen.spec 10 Jan 2006 20:40:20 -0000 1.72 @@ -59,18 +59,18 @@ # xs.h and xs_lib.h requires xen/io/xs_wire.h mkdir -p %{buildroot}%{_includedir}/xen/io -install -o root -g root -m 644 tools/libxc/xen/xen.h %{buildroot}%{_includedir}/xen -install -o root -g root -m 644 tools/libxc/xen/dom0_ops.h %{buildroot}%{_includedir}/xen -install -o root -g root -m 644 tools/libxc/xen/version.h %{buildroot}%{_includedir}/xen -install -o root -g root -m 644 tools/libxc/xen/event_channel.h %{buildroot}%{_includedir}/xen -install -o root -g root -m 644 tools/libxc/xen/sched.h %{buildroot}%{_includedir}/xen -install -o root -g root -m 644 tools/libxc/xen/sched_ctl.h %{buildroot}%{_includedir}/xen -install -o root -g root -m 644 tools/libxc/xen/memory.h %{buildroot}%{_includedir}/xen -install -o root -g root -m 644 tools/libxc/xen/acm.h %{buildroot}%{_includedir}/xen -install -o root -g root -m 644 tools/libxc/xen/arch-x86_32.h %{buildroot}%{_includedir}/xen -install -o root -g root -m 644 tools/libxc/xen/arch-x86_64.h %{buildroot}%{_includedir}/xen -install -o root -g root -m 644 tools/libxc/xen/arch-ia64.h %{buildroot}%{_includedir}/xen -install -o root -g root -m 644 xen/include/public/io/xs_wire.h %{buildroot}%{_includedir}/xen/io +install -m 644 tools/libxc/xen/xen.h %{buildroot}%{_includedir}/xen +install -m 644 tools/libxc/xen/dom0_ops.h %{buildroot}%{_includedir}/xen +install -m 644 tools/libxc/xen/version.h %{buildroot}%{_includedir}/xen +install -m 644 tools/libxc/xen/event_channel.h %{buildroot}%{_includedir}/xen +install -m 644 tools/libxc/xen/sched.h %{buildroot}%{_includedir}/xen +install -m 644 tools/libxc/xen/sched_ctl.h %{buildroot}%{_includedir}/xen +install -m 644 tools/libxc/xen/memory.h %{buildroot}%{_includedir}/xen +install -m 644 tools/libxc/xen/acm.h %{buildroot}%{_includedir}/xen +install -m 644 tools/libxc/xen/arch-x86_32.h %{buildroot}%{_includedir}/xen +install -m 644 tools/libxc/xen/arch-x86_64.h %{buildroot}%{_includedir}/xen +install -m 644 tools/libxc/xen/arch-ia64.h %{buildroot}%{_includedir}/xen +install -m 644 xen/include/public/io/xs_wire.h %{buildroot}%{_includedir}/xen/io ### fixing start-script dir mkdir -p %{buildroot}/etc/rc.d From fedora-cvs-commits at redhat.com Tue Jan 10 20:40:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 15:40:51 -0500 Subject: rpms/vte/devel vte.spec,1.55,1.56 Message-ID: <200601102040.k0AKepjm031023@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/vte/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30899 Modified Files: vte.spec Log Message: prereq initscripts, as it creates the utmp group Index: vte.spec =================================================================== RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- vte.spec 15 Dec 2005 14:11:04 -0000 1.55 +++ vte.spec 10 Jan 2006 20:40:49 -0000 1.56 @@ -1,6 +1,6 @@ Name: vte Version: 0.11.16 -Release: 1.fc5.1 +Release: 2.fc5.1 Summary: An experimental terminal emulator. License: LGPL Group: User Interface/X @@ -9,6 +9,8 @@ BuildRequires: gtk2-devel, pygtk2-devel, python-devel, ncurses-devel BuildRequires: gettext Requires: bitmap-fonts +# initscripts creates the utmp group +Prereq: initscripts %description VTE is an experimental terminal emulator widget for use with GTK+ 2.0. @@ -96,6 +98,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Jan 10 2006 Bill Nottingham 0.11.16-2 +- prereq initscripts as it creates the utmp group + * Thu Dec 15 2005 Matthias Clasen 0.11.16-1 - Update to 0.11.16 From fedora-cvs-commits at redhat.com Tue Jan 10 20:41:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 15:41:18 -0500 Subject: rpms/xen/devel xen.spec,1.72,1.73 Message-ID: <200601102041.k0AKfIqF031272@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31245 Modified Files: xen.spec Log Message: Bump version for rebuild Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- xen.spec 10 Jan 2006 20:40:20 -0000 1.72 +++ xen.spec 10 Jan 2006 20:41:15 -0000 1.73 @@ -3,7 +3,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0 -Release: 0.20060110.fc5.1 +Release: 0.20060110.fc5.2 Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html From fedora-cvs-commits at redhat.com Tue Jan 10 20:48:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 15:48:41 -0500 Subject: rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.9,1.10 Message-ID: <200601102048.k0AKmfmX013430@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/xorg-x11-xfs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13305 Modified Files: xorg-x11-xfs.spec Log Message: fix %post noise (#176009, ) Index: xorg-x11-xfs.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-xfs.spec 16 Dec 2005 16:26:15 -0000 1.9 +++ xorg-x11-xfs.spec 10 Jan 2006 20:48:38 -0000 1.10 @@ -8,7 +8,7 @@ Summary: X.Org X11 xfs font server Name: xorg-x11-%{pkgname} Version: 1.0.0 -Release: 1 +Release: 2 # FIXME: Remove Epoch line if package gets renamed Epoch: 1 License: MIT/X11 @@ -215,7 +215,7 @@ if [ -f $XFSCONFIG ] ; then # Remove Speedo font directories from xfs config if present to avoid # bug reports about xfs complaining about empty directories in syslog. - perl -p -i -e '\#^.*/.*/Speedo.*#d' $XFSCONFIG + perl -p -i -e 's#^.*/.*/Speedo.*\n##' $XFSCONFIG # On upgrades, remove /usr/X11R6 font path elements from the XFS config file if grep -q "/usr/X11R6/lib/X11/fonts" $XFSCONFIG &> /dev/null ; then @@ -288,6 +288,9 @@ %{_mandir}/man1/xfsinfo.1x* %changelog +* Tue Jan 10 2006 Bill Nottingham 1:1.0.0-2 +- fix %post script (#176009, ) + * Fri Dec 16 2005 Mike A. Harris 1:1.0.0-1 - Updated all tarballs to version 1.0.0 from X11R7 RC4. - Get default X font directory with font-utils package 'fontdir' pkgconfig From fedora-cvs-commits at redhat.com Tue Jan 10 20:51:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 15:51:15 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.198, 1.199 anaconda.spec, 1.317, 1.318 sources, 1.317, 1.318 Message-ID: <200601102051.k0AKpFSU014671@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14631/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.91.1-1 on branch devel from anaconda-10.91.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- .cvsignore 10 Jan 2006 01:17:30 -0000 1.198 +++ .cvsignore 10 Jan 2006 20:51:12 -0000 1.199 @@ -1 +1 @@ -anaconda-10.91.0.tar.bz2 +anaconda-10.91.1.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.317 retrieving revision 1.318 diff -u -r1.317 -r1.318 --- anaconda.spec 10 Jan 2006 01:17:30 -0000 1.317 +++ anaconda.spec 10 Jan 2006 20:51:12 -0000 1.318 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.91.0 +Version: 10.91.1 Release: 1 License: GPL Summary: Graphical system installer @@ -78,6 +78,10 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Jan 10 2006 Jeremy Katz - 10.91.1-1 +- more ppc rescue image (jkeating) +- actually commit the dmraid fix (pjones) + * Mon Jan 9 2006 Jeremy Katz - 10.91.0-1 - tweaked selection stuff a little to be the same code as pirut - tweak exception window to have an image and be better sized (dcantrell) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.317 retrieving revision 1.318 diff -u -r1.317 -r1.318 --- sources 10 Jan 2006 01:17:30 -0000 1.317 +++ sources 10 Jan 2006 20:51:12 -0000 1.318 @@ -1 +1 @@ -0d20696042fdc013862bd1920b8ea7db anaconda-10.91.0.tar.bz2 +23de4a1294b66ed3bc19b50d5114faff anaconda-10.91.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 10 21:03:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 16:03:53 -0500 Subject: rpms/kudzu/devel .cvsignore, 1.95, 1.96 kudzu.spec, 1.107, 1.108 sources, 1.104, 1.105 Message-ID: <200601102103.k0AL3r8c018855@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18836 Modified Files: .cvsignore kudzu.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- .cvsignore 1 Jan 2006 07:06:03 -0000 1.95 +++ .cvsignore 10 Jan 2006 21:03:38 -0000 1.96 @@ -1 +1 @@ -kudzu-1.2.17.tar.gz +kudzu-1.2.18.tar.gz Index: kudzu.spec =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- kudzu.spec 1 Jan 2006 07:06:03 -0000 1.107 +++ kudzu.spec 10 Jan 2006 21:03:39 -0000 1.108 @@ -1,5 +1,5 @@ Name: kudzu -Version: 1.2.17 +Version: 1.2.18 Release: 1 License: GPL Summary: The Red Hat Linux hardware probing tool. @@ -79,6 +79,9 @@ %{_includedir}/kudzu %changelog +* Tue Jan 10 2006 Bill Nottingham - 1.2.18-1 +- add missing fchdir in pcmcia code + * Sun Jan 1 2006 Bill Nottingham - 1.2.17-1 - handle pcilib string returns (#176490, #176724) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- sources 1 Jan 2006 07:06:03 -0000 1.104 +++ sources 10 Jan 2006 21:03:39 -0000 1.105 @@ -1 +1 @@ -9ab178467b9cf764d1d3812f9430d81c kudzu-1.2.17.tar.gz +b28dd7f3a7cdc156ca39a5882026b648 kudzu-1.2.18.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 10 21:45:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 16:45:32 -0500 Subject: rpms/kudzu/devel kudzu.spec,1.108,1.109 sources,1.105,1.106 Message-ID: <200601102145.k0ALjWs0012866@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12837 Modified Files: kudzu.spec sources Log Message: update Index: kudzu.spec =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- kudzu.spec 10 Jan 2006 21:03:39 -0000 1.108 +++ kudzu.spec 10 Jan 2006 21:45:29 -0000 1.109 @@ -81,6 +81,8 @@ %changelog * Tue Jan 10 2006 Bill Nottingham - 1.2.18-1 - add missing fchdir in pcmcia code +- fix segfault if pcmcia network devices are found before their drivers + are loaded (#174341) * Sun Jan 1 2006 Bill Nottingham - 1.2.17-1 - handle pcilib string returns (#176490, #176724) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- sources 10 Jan 2006 21:03:39 -0000 1.105 +++ sources 10 Jan 2006 21:45:29 -0000 1.106 @@ -1 +1 @@ -b28dd7f3a7cdc156ca39a5882026b648 kudzu-1.2.18.tar.gz +c5b98ee40705482edac7844d4db028f8 kudzu-1.2.18.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 10 21:49:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 16:49:16 -0500 Subject: rpms/gtk-engines/devel gtk-engines-0.12-handles.patch, NONE, 1.1 gtk-engines.spec, 1.17, 1.18 Message-ID: <200601102149.k0ALnGCp025514@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gtk-engines/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25422 Modified Files: gtk-engines.spec Added Files: gtk-engines-0.12-handles.patch Log Message: - fix gnome-panel and f-spot handle rendering gtk-engines-0.12-handles.patch: clearlooks_style.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) --- NEW FILE gtk-engines-0.12-handles.patch --- --- gtk-engines-0.12/src/clearlooks_style.c 5 Jan 2006 22:46:55 -0000 1.44 +++ gtk-engines-0.12/src/clearlooks_style.c 10 Jan 2006 21:37:59 -0000 @@ -269,7 +269,12 @@ draw_handle (DRAW_ARGS, GtkOrientation o clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); handle.type = CL_HANDLE_TOOLBAR; - handle.horizontal = FALSE; + + /* we ignore the given orientation and figure it out from heuristics + * if we aren't drawing a splitter, because some applications + * pass the wrong orientation + */ + handle.horizontal = width > height; if (GTK_IS_TOOLBAR (widget) && shadow_type != GTK_SHADOW_NONE) { @@ -301,7 +306,12 @@ draw_handle (DRAW_ARGS, GtkOrientation o clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); handle.type = CL_HANDLE_TOOLBAR; - handle.horizontal = FALSE; + + /* we ignore the given orientation and figure it out from heuristics + * if we aren't drawing a splitter, because some applications + * pass the wrong orientation + */ + handle.horizontal = width > height; if (GTK_IS_TOOLBAR (widget) && shadow_type != GTK_SHADOW_NONE) { Index: gtk-engines.spec =================================================================== RCS file: /cvs/dist/rpms/gtk-engines/devel/gtk-engines.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gtk-engines.spec 9 Dec 2005 22:40:50 -0000 1.17 +++ gtk-engines.spec 10 Jan 2006 21:49:12 -0000 1.18 @@ -3,7 +3,7 @@ Summary: Theme engines for GTK+. Name: gtk-engines Version: 0.12 -Release: 7.1 +Release: 8 Epoch: 1 License: GPL Group: System Environment/Libraries @@ -14,6 +14,7 @@ # Fixes pixmap resource leak Patch1: gtk-engines-0.11-memleak.patch Patch2: gtk-engines-0.12-static.patch +Patch3: gtk-engines-0.12-handles.patch # Some extra themes from gtk.themes.org Source4: Basic.tar.gz @@ -51,6 +52,7 @@ %setup -q -a 2 -a 3 -a 4 -a 5 -a 6 -a 15 %patch1 -p1 -b .memleak %patch2 -p1 -b .static +%patch3 -p1 -b .handles %build rm acinclude.m4 @@ -127,6 +129,9 @@ %{_datadir}/themes/* %changelog +* Tue Jan 10 2005 Ray Strode 1:0.12-8 +- fix gnome-panel and f-spot handle rendering + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 10 21:50:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 16:50:51 -0500 Subject: rpms/gtk-engines/devel gtk-engines.spec,1.18,1.19 Message-ID: <200601102150.k0ALopVv026196@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gtk-engines/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26070 Modified Files: gtk-engines.spec Log Message: - change %%makeinstall to make install DESTDIR=... Index: gtk-engines.spec =================================================================== RCS file: /cvs/dist/rpms/gtk-engines/devel/gtk-engines.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gtk-engines.spec 10 Jan 2006 21:49:12 -0000 1.18 +++ gtk-engines.spec 10 Jan 2006 21:50:48 -0000 1.19 @@ -79,11 +79,11 @@ # # makefile is broken, sets exec_prefix explicitely. # -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT for I in `echo %{extra_builds}`; do cd $I - %makeinstall + make install DESTDIR=$RPM_BUILD_ROOT cd .. done @@ -129,8 +129,9 @@ %{_datadir}/themes/* %changelog -* Tue Jan 10 2005 Ray Strode 1:0.12-8 +* Tue Jan 10 2006 Ray Strode 1:0.12-8 - fix gnome-panel and f-spot handle rendering +- change %%makeinstall to make install DESTDIR=... * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 10 22:04:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 17:04:06 -0500 Subject: rpms/gtk-engines/devel gtk-engines.spec, 1.19, 1.20 gtk-engines-0.12-handles.patch, 1.1, NONE Message-ID: <200601102204.k0AM46GE022057@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gtk-engines/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22043 Modified Files: gtk-engines.spec Removed Files: gtk-engines-0.12-handles.patch Log Message: revert previous changes which are destined for gtk2-engines Index: gtk-engines.spec =================================================================== RCS file: /cvs/dist/rpms/gtk-engines/devel/gtk-engines.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gtk-engines.spec 10 Jan 2006 21:50:48 -0000 1.19 +++ gtk-engines.spec 10 Jan 2006 22:04:04 -0000 1.20 @@ -3,7 +3,7 @@ Summary: Theme engines for GTK+. Name: gtk-engines Version: 0.12 -Release: 8 +Release: 7.1 Epoch: 1 License: GPL Group: System Environment/Libraries @@ -14,7 +14,6 @@ # Fixes pixmap resource leak Patch1: gtk-engines-0.11-memleak.patch Patch2: gtk-engines-0.12-static.patch -Patch3: gtk-engines-0.12-handles.patch # Some extra themes from gtk.themes.org Source4: Basic.tar.gz @@ -52,7 +51,6 @@ %setup -q -a 2 -a 3 -a 4 -a 5 -a 6 -a 15 %patch1 -p1 -b .memleak %patch2 -p1 -b .static -%patch3 -p1 -b .handles %build rm acinclude.m4 @@ -79,11 +77,11 @@ # # makefile is broken, sets exec_prefix explicitely. # -make install DESTDIR=$RPM_BUILD_ROOT +%makeinstall for I in `echo %{extra_builds}`; do cd $I - make install DESTDIR=$RPM_BUILD_ROOT + %makeinstall cd .. done @@ -129,10 +127,6 @@ %{_datadir}/themes/* %changelog -* Tue Jan 10 2006 Ray Strode 1:0.12-8 -- fix gnome-panel and f-spot handle rendering -- change %%makeinstall to make install DESTDIR=... - * Fri Dec 09 2005 Jesse Keating - rebuilt --- gtk-engines-0.12-handles.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 10 22:17:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 17:17:59 -0500 Subject: rpms/gtk2-engines/devel gtk-engines-2.7.2-handles.patch, NONE, 1.1 gtk2-engines.spec, 1.30, 1.31 Message-ID: <200601102217.k0AMHwUs001237@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gtk2-engines/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv852 Modified Files: gtk2-engines.spec Added Files: gtk-engines-2.7.2-handles.patch Log Message: - fix handle drawing bugs from F-Spot and gnome-panel - change %%makeinstall to make install DESTDIR=... gtk-engines-2.7.2-handles.patch: clearlooks_style.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) --- NEW FILE gtk-engines-2.7.2-handles.patch --- --- gtk-engines-2.7.2/engines/clearlooks/src/clearlooks_style.c.handles 2006-01-02 17:07:36.000000000 -0500 +++ gtk-engines-2.7.2/engines/clearlooks/src/clearlooks_style.c 2006-01-10 17:16:41.000000000 -0500 @@ -269,8 +269,13 @@ clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); handle.type = CL_HANDLE_TOOLBAR; - handle.horizontal = FALSE; - + + /* we ignore the given orientation and figure it out from heuristics + * if we aren't drawing a splitter, because some applications + * pass the wrong orientation + */ + handle.horizontal = width > height; + if (GTK_IS_TOOLBAR (widget) && shadow_type != GTK_SHADOW_NONE) { cairo_save (cr); @@ -301,8 +306,13 @@ clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); handle.type = CL_HANDLE_TOOLBAR; - handle.horizontal = FALSE; - + + /* we ignore the given orientation and figure it out from heuristics + * if we aren't drawing a splitter, because some applications + * pass the wrong orientation + */ + handle.horizontal = width > height; + if (GTK_IS_TOOLBAR (widget) && shadow_type != GTK_SHADOW_NONE) { cairo_save (cr); Index: gtk2-engines.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gtk2-engines.spec 3 Jan 2006 14:45:49 -0000 1.30 +++ gtk2-engines.spec 10 Jan 2006 22:17:52 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Theme engines for GTK+ 2.0 Name: gtk2-engines Version: 2.7.2 -Release: 1 +Release: 2 License: GPL Group: System Environment/Libraries Source: gtk-engines-%{version}.tar.bz2 @@ -14,6 +14,8 @@ URL: ftp://ftp.gnome.org/pub/GNOME/sources/gtk-engines BuildRoot: /var/tmp/%{name}-%{version}-root +Patch0: gtk-engines-2.7.2-handles.patch + %description The gtk2-engines package contains shared objects and configuration files that implement a number of GTK+ theme engines. Theme engines @@ -24,6 +26,8 @@ %prep %setup -q -n gtk-engines-%{version} +%patch0 -p1 -b .handles + %build %configure make @@ -31,7 +35,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT # no .la, please find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs rm @@ -60,6 +64,10 @@ %{_datadir}/themes %changelog +* Tue Jan 10 2006 Ray Strode 2.7.2-2 +- fix handle drawing bugs from F-Spot and gnome-panel +- change %%makeinstall to make install DESTDIR=... + * Tue Jan 03 2006 Matthias Clasen 2.7.2-1 - Update to 2.7.2 From fedora-cvs-commits at redhat.com Tue Jan 10 22:24:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 17:24:15 -0500 Subject: rpms/kudzu/devel sources,1.106,1.107 Message-ID: <200601102224.k0AMOEoo001362@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1349 Modified Files: sources Log Message: update Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- sources 10 Jan 2006 21:45:29 -0000 1.106 +++ sources 10 Jan 2006 22:24:12 -0000 1.107 @@ -1 +1 @@ -c5b98ee40705482edac7844d4db028f8 kudzu-1.2.18.tar.gz +ccdff346d139186e464dfc69ef532386 kudzu-1.2.18.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 10 23:13:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 18:13:42 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.125,1.126 Message-ID: <200601102313.k0ANDgkT005605@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5576 Modified Files: cman-kernel.spec Log Message: bump for new kernel Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- cman-kernel.spec 31 Dec 2005 00:04:48 -0000 1.125 +++ cman-kernel.spec 10 Jan 2006 23:13:39 -0000 1.126 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.14.1 -Release: 20051219.162641.FC5.6 +Release: 20051219.162641.FC5.7 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules @@ -225,6 +225,9 @@ %{_includedir}/cluster/* %changelog +* Tue Jan 10 2005 Jesse Keating +- rebuilt again + * Fri Dec 30 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 10 23:15:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 18:15:17 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.126,1.127 Message-ID: <200601102315.k0ANFHxd006394@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6363 Modified Files: cman-kernel.spec Log Message: bump for new kernel Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- cman-kernel.spec 10 Jan 2006 23:13:39 -0000 1.126 +++ cman-kernel.spec 10 Jan 2006 23:15:15 -0000 1.127 @@ -225,7 +225,7 @@ %{_includedir}/cluster/* %changelog -* Tue Jan 10 2005 Jesse Keating +* Tue Jan 10 2006 Jesse Keating - rebuilt again * Fri Dec 30 2005 Jesse Keating From fedora-cvs-commits at redhat.com Tue Jan 10 23:16:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 18:16:35 -0500 Subject: rpms/vixie-cron/devel vixie-cron-4.1-_48-security.patch,NONE,1.1 Message-ID: <200601102316.k0ANGZSs016526@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/vixie-cron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16312 Added Files: vixie-cron-4.1-_48-security.patch Log Message: fix bug 177476: make mailer/minder process run as job user with user context; reorganize SELinux and PAM security code vixie-cron-4.1-_48-security.patch: Makefile | 6 - crontab.c | 15 +-- do_command.c | 165 +++-------------------------------- funcs.h | 22 ++++ popen.c | 27 ----- security.c | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ user.c | 107 +--------------------- 7 files changed, 334 insertions(+), 286 deletions(-) --- NEW FILE vixie-cron-4.1-_48-security.patch --- --- vixie-cron-4.1/popen.c.security 2006-01-10 13:56:39.000000000 -0500 +++ vixie-cron-4.1/popen.c 2006-01-10 16:56:48.000000000 -0500 @@ -91,33 +91,6 @@ return (NULL); /* NOTREACHED */ case 0: /* child */ - if (pw) { -#ifdef LOGIN_CAP - if (setusercontext(0, pw, pw->pw_uid, LOGIN_SETALL) < 0) { - fprintf(stderr, - "setusercontext failed for %s\n", - pw->pw_name); - _exit(ERROR_EXIT); - } -#else - if (setgid(pw->pw_gid) < 0 || - initgroups(pw->pw_name, pw->pw_gid) < 0) { - fprintf(stderr, - "unable to set groups for %s\n", - pw->pw_name); - _exit(1); - } -#if (defined(BSD)) && (BSD >= 199103) - setlogin(pw->pw_name); -#endif /* BSD */ - if (setuid(pw->pw_uid)) { - fprintf(stderr, - "unable to set uid for %s\n", - pw->pw_name); - _exit(1); - } -#endif /* LOGIN_CAP */ - } if (*type == 'r') { if (pdes[1] != STDOUT) { dup2(pdes[1], STDOUT); --- vixie-cron-4.1/do_command.c.security 2006-01-10 13:56:40.000000000 -0500 +++ vixie-cron-4.1/do_command.c 2006-01-10 18:12:20.000000000 -0500 @@ -25,48 +25,9 @@ #include "cron.h" -#ifdef WITH_PAM -static pam_handle_t *pamh = NULL; -static const struct pam_conv conv = { - NULL -}; -#define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \ - fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \ - syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \ - pam_close_session(pamh, PAM_SILENT); \ - pam_end(pamh, retcode); exit(1); \ - } -#endif - static void child_process(entry *, user *); static int safe_p(const char *, const char *); -/* Build up the job environment from the PAM environment plus the - crontab environment */ -static char ** build_env(char **cronenv) -{ - char **jobenv = cronenv; -#if defined(WITH_PAM) - char **pamenv = pam_getenvlist(pamh); - char *cronvar; - int count = 0; - - jobenv = env_copy(pamenv); - - /* Now add the cron environment variables. Since env_set() - overwrites existing variables, this will let cron's - environment settings override pam's */ - - while ((cronvar = cronenv[count++])) { - if (!(jobenv = env_set(jobenv, cronvar))) { - syslog(LOG_ERR, "Setting Cron environment variable %s failed", cronvar); - return NULL; - } - } -#endif - return jobenv; -} - void do_command(entry *e, user *u) { Debug(DPROC, ("[%ld] do_command(%s, (%s,%ld,%ld))\n", @@ -104,10 +65,15 @@ int stdin_pipe[2], stdout_pipe[2]; char *input_data, *usernm, *mailto; int children = 0; -#if defined(WITH_PAM) - int retcode = 0; -#endif + char **jobenv=0L; + /* Set up the Red Hat security context for both mail/minder and job processes: + */ + if ( cron_set_job_security_context( e, u, &jobenv ) != 0 ) + { + syslog(LOG_INFO, "CRON (%s) ERROR: cannot set security context", e->pwd->pw_name); + exit(ERROR_EXIT); + } Debug(DPROC, ("[%ld] child_process('%s')\n", (long)getpid(), e->cmd)) @@ -126,7 +92,7 @@ /* discover some useful and important environment settings */ usernm = e->pwd->pw_name; - mailto = env_get("MAILTO", e->envp); + mailto = env_get("MAILTO", jobenv); /* our parent is watching for our death by catching SIGCHLD. we * do not care to watch for our children's deaths this way -- we @@ -186,31 +152,13 @@ *p = '\0'; } -#if defined(WITH_PAM) - retcode = pam_start("crond", usernm, &conv, &pamh); - PAM_FAIL_CHECK; - retcode = pam_set_item(pamh, PAM_TTY, "cron"); - PAM_FAIL_CHECK; - retcode = pam_acct_mgmt(pamh, PAM_SILENT); - PAM_FAIL_CHECK; - retcode = pam_open_session(pamh, PAM_SILENT); - PAM_FAIL_CHECK; - retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); - PAM_FAIL_CHECK; - build_env(e->envp); - log_close(); /* PAM has now re-opened our log to auth.info ! */ -#endif /* fork again, this time so we can exec the user's command. */ switch (fork()) { case -1: log_it("CRON", getpid(), "error", "can't fork"); -#ifdef WITH_PAM - pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); - pam_close_session(pamh, PAM_SILENT); - pam_end(pamh, PAM_ABORT); -#endif + cron_close_security_session(); exit(ERROR_EXIT); /*NOTREACHED*/ case 0: @@ -266,78 +214,12 @@ */ (void) signal(SIGCHLD, SIG_DFL); - /* set our directory, uid and gid. Set gid first, since once - * we set uid, we've lost root privledges. - */ -#ifdef LOGIN_CAP - { -#ifdef BSD_AUTH - auth_session_t *as; -#endif - login_cap_t *lc; - char **p; - extern char **environ; - - if ((lc = login_getclass(e->pwd->pw_class)) == NULL) { - fprintf(stderr, - "unable to get login class for %s\n", - e->pwd->pw_name); - _exit(ERROR_EXIT); - } - if (setusercontext(lc, e->pwd, e->pwd->pw_uid, LOGIN_SETALL) < 0) { - fprintf(stderr, - "setusercontext failed for %s\n", - e->pwd->pw_name); - _exit(ERROR_EXIT); - } -#ifdef BSD_AUTH - as = auth_open(); - if (as == NULL || auth_setpwd(as, e->pwd) != 0) { - fprintf(stderr, "can't malloc\n"); - _exit(ERROR_EXIT); - } - if (auth_approval(as, lc, usernm, "cron") <= 0) { - fprintf(stderr, "approval failed for %s\n", - e->pwd->pw_name); - _exit(ERROR_EXIT); - } - auth_close(as); -#endif /* BSD_AUTH */ - login_close(lc); - - /* If no PATH specified in crontab file but - * we just added one via login.conf, add it to - * the crontab environment. - */ - if (env_get("PATH", e->envp) == NULL && environ != NULL) { - for (p = environ; *p; p++) { - if (strncmp(*p, "PATH=", 5) == 0) { - e->envp = env_set(e->envp, *p); - break; - } - } - } - } -#else - setgid(e->pwd->pw_gid); - initgroups(usernm, e->pwd->pw_gid); -#if (defined(BSD)) && (BSD >= 199103) - setlogin(usernm); -#endif /* BSD */ - setuid(e->pwd->pw_uid); /* we aren't root after this... */ - -#endif /* LOGIN_CAP */ - if ( chdir(env_get("HOME", e->envp)) == -1 ) - { - log_it("CRON", getpid(), "chdir(HOME) failed:", strerror(errno)); - _exit(ERROR_EXIT); - } /* * Exec the command. */ { - char *shell = env_get("SHELL", e->envp); + char *shell = env_get("SHELL", jobenv); # if DEBUGGING if (DebugFlags & DTEST) { @@ -349,20 +231,7 @@ } # endif /*DEBUGGING*/ -#ifdef WITH_SELINUX - if ((is_selinux_enabled() >0) && (u->scontext != 0L)) { - if (setexeccon(u->scontext) < 0) { - if (security_getenforce() > 0) { - fprintf(stderr, - "Could not set exec context to %s for user %s\n", - u->scontext,u->name); - _exit(ERROR_EXIT); - } - } - } -#endif - - execle(shell, shell, "-c", e->cmd, (char *)0, e->envp); + execle(shell, shell, "-c", e->cmd, (char *)0, jobenv); fprintf(stderr, "execl: couldn't exec `%s'\n", shell); perror("execl"); _exit(ERROR_EXIT); @@ -535,7 +404,7 @@ fprintf(mail, "Date: %s\n", arpadate(&StartTime)); #endif /*MAIL_DATE*/ - for (env = e->envp; *env; env++) + for (env = jobenv; *env; env++) fprintf(mail, "X-Cron-Env: <%s>\n", *env); fprintf(mail, "\n"); @@ -616,12 +485,8 @@ Debug(DPROC, (", dumped core")) Debug(DPROC, ("\n")) } - -#if defined(WITH_PAM) - pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); - retcode = pam_close_session(pamh, PAM_SILENT); - pam_end(pamh, retcode); -#endif + cron_close_security_session(); + env_free(jobenv); } static int --- vixie-cron-4.1/security.c.security 2006-01-10 18:04:21.000000000 -0500 +++ vixie-cron-4.1/security.c 2006-01-10 17:35:33.000000000 -0500 @@ -0,0 +1,278 @@ +/* security.c + * + * Implement Red Hat crond security context transitions + * + * Jason Vas Dias January 2006 + * + * Copyright(C) Red Hat Inc., 2006 + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include "cron.h" + +#ifdef WITH_SELINUX +#include +#include +#include +#include +#endif + +static char ** build_env(char **cronenv); + +int cron_set_job_security_context( entry *e, user *u, char ***jobenv ) +{ + if ( cron_open_security_session( e->pwd ) != 0 ) + { + syslog(LOG_INFO, "CRON (%s) ERROR: failed to open PAM security session: %s", + e->pwd->pw_name, strerror(errno) + ); + return -1; + } + + if ( cron_change_user( e->pwd ) != 0 ) + { + syslog(LOG_INFO, "CRON (%s) ERROR: failed to open PAM security session: %s", + e->pwd->pw_name, strerror(errno) + ); + return -1; + } + + if ( cron_change_selinux_context( u ) != 0 ) + { + syslog(LOG_INFO,"CRON (%s) ERROR: failed to change SELinux context", + e->pwd->pw_name); + return -1; + } + + *jobenv = build_env( e->envp ); + + if ( chdir(env_get("HOME", *jobenv)) == -1 ) + { + log_it("CRON", getpid(), "chdir(HOME) failed:", strerror(errno)); + return -1; + } + + return 0; +} + +#ifdef WITH_PAM +static pam_handle_t *pamh = NULL; +static const struct pam_conv conv = { + NULL +}; +#define PAM_FAIL_CHECK if (retcode != PAM_SUCCESS) { \ + fprintf(stderr,"\n%s\n",pam_strerror(pamh, retcode)); \ + syslog(LOG_ERR,"%s",pam_strerror(pamh, retcode)); \ + pam_close_session(pamh, PAM_SILENT); \ + pam_end(pamh, retcode); \ + return(retcode); \ + } +#endif + +int cron_open_security_session( struct passwd *pw ) +{ + int retcode = 0; + +#if defined(WITH_PAM) + retcode = pam_start("crond", pw->pw_name, &conv, &pamh); + PAM_FAIL_CHECK; + retcode = pam_set_item(pamh, PAM_TTY, "cron"); + PAM_FAIL_CHECK; + retcode = pam_acct_mgmt(pamh, PAM_SILENT); + PAM_FAIL_CHECK; + retcode = pam_open_session(pamh, PAM_SILENT); + PAM_FAIL_CHECK; + retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); + PAM_FAIL_CHECK; + log_close(); /* PAM has now re-opened our log to auth.info ! */ +#endif + + return retcode; +} + +void cron_close_security_session( void ) +{ +#if defined(WITH_PAM) + pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); + pam_close_session(pamh, PAM_SILENT); + pam_end(pamh, PAM_ABORT); +#endif +} + +int cron_change_user( struct passwd *pw ) +{ + /* set our directory, uid and gid. Set gid first, since once + * we set uid, we've lost root privledges. + */ + if ( setgid( pw->pw_gid ) != 0 ) + { + log_it("CRON", getpid(), "setgid failed:", strerror(errno)); + return -1; + } + + if ( initgroups( pw->pw_name, pw->pw_gid ) != 0 ) + { + log_it("CRON", getpid(), "initgroups failed:", strerror(errno)); + return -1; + } + + if ( setuid( pw->pw_uid ) != 0 ) + { + log_it("CRON", getpid(), "setuid failed:", strerror(errno)); + return -1; + } + + return 0; +} + +int cron_change_selinux_context( user *u ) +{ +#ifdef WITH_SELINUX + if ((is_selinux_enabled() >0) && (u->scontext != 0L)) { + if (setexeccon(u->scontext) < 0) { + if (security_getenforce() > 0) { + syslog(LOG_INFO, + "CRON (%s) ERROR:" + "Could not set exec context to %s for user\n", + u->name, u->scontext + ); + return -1; + } + } + } +#endif + return 0; +} + +int get_security_context( const char *name, + int crontab_fd, + security_context_t *rcontext, + const char *tabname) { + security_context_t scontext=NULL; + security_context_t file_context=NULL; + struct av_decision avd; + int retval=0; + char *seuser=NULL; + char *level=NULL; + + *rcontext = NULL; + +#ifdef WITH_SELINUX + + if (is_selinux_enabled() <= 0) + return 0; + + if (getseuserbyname(name, &seuser, &level) == 0) { + retval=get_default_context_with_level(seuser, level, NULL, &scontext); + free(seuser); + free(level); + if (retval) { + if (security_getenforce() > 0) { + log_it(name, getpid(), "No SELinux security context",tabname); + return -1; + } else { + log_it(name, getpid(), "No security context but SELinux in permissive mode, continuing",tabname); + return 0; + } + } + } else { + log_it(name, getpid(), "getseusername FAILED", name); + return (security_getenforce() > 0); + } + + if (fgetfilecon(crontab_fd, &file_context) < OK) { + if (security_getenforce() > 0) { + log_it(name, getpid(), "getfilecon FAILED", tabname); + freecon(scontext); + return -1; + } else { + log_it(name, getpid(), "getfilecon FAILED but SELinux in permissive mode, continuing", tabname); + *rcontext=scontext; + return 0; + } + } + + /* + * Since crontab files are not directly executed, + * crond must ensure that the crontab file has + * a context that is appropriate for the context of + * the user cron job. It performs an entrypoint + * permission check for this purpose. + */ + retval = security_compute_av(scontext, + file_context, + SECCLASS_FILE, + FILE__ENTRYPOINT, + &avd); + freecon(file_context); + if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) { + if (security_getenforce() > 0) { + log_it(name, getpid(), "ENTRYPOINT FAILED", tabname); + freecon(scontext); + return -1; + } else { + log_it(name, getpid(), "ENTRYPOINT FAILED but SELinux in permissive mode, continuing", tabname); + } + } + *rcontext=scontext; +#endif + return 0; +} + +void free_security_context( security_context_t *scontext ) +{ +#ifdef WITH_SELINUX + if( *scontext != NULL ) + { + freecon(*scontext); + *scontext=0L; + } +#endif +} + +int crontab_security_access(void) +{ +#ifdef WITH_SELINUX + if (is_selinux_enabled() > 0) + if (selinux_check_passwd_access(PASSWD__CRONTAB)!=0) + return -1; +#endif + return 0; +} + +/* Build up the job environment from the PAM environment plus the + crontab environment */ +static char ** build_env(char **cronenv) +{ + char **jobenv = cronenv; + + char **pamenv = pam_getenvlist(pamh); + char *cronvar; + int count = 0; + + jobenv = env_copy(pamenv); + + /* Now add the cron environment variables. Since env_set() + overwrites existing variables, this will let cron's + environment settings override pam's */ + + while ((cronvar = cronenv[count++])) { + if (!(jobenv = env_set(jobenv, cronvar))) { + syslog(LOG_ERR, "Setting Cron environment variable %s failed", cronvar); + return NULL; + } + } + + return jobenv; +} --- vixie-cron-4.1/user.c.security 2006-01-10 13:56:40.000000000 -0500 +++ vixie-cron-4.1/user.c 2006-01-10 17:35:14.000000000 -0500 @@ -26,85 +26,8 @@ /* vix 26jan87 [log is in RCS file] */ -#ifdef WITH_SELINUX -#include -#include -#include -#include -#endif - #include "cron.h" -#ifdef WITH_SELINUX -static int get_security_context(const char *name, - int crontab_fd, - security_context_t *rcontext, - const char *tabname) { - security_context_t scontext=NULL; - security_context_t file_context=NULL; - struct av_decision avd; - int retval=0; - char *seuser=NULL; - char *level=NULL; - *rcontext = NULL; - - if (getseuserbyname(name, &seuser, &level) == 0) { - retval=get_default_context_with_level(seuser, level, NULL, &scontext); - free(seuser); - free(level); - if (retval) { - if (security_getenforce() > 0) { - log_it(name, getpid(), "No SELinux security context",tabname); - return -1; - } else { - log_it(name, getpid(), "No security context but SELinux in permissive mode, continuing",tabname); - return 0; - } - } - } else { - log_it(name, getpid(), "getseusername FAILED", name); - return (security_getenforce() > 0); - } - - if (fgetfilecon(crontab_fd, &file_context) < OK) { - if (security_getenforce() > 0) { - log_it(name, getpid(), "getfilecon FAILED", tabname); - freecon(scontext); - return -1; - } else { - log_it(name, getpid(), "getfilecon FAILED but SELinux in permissive mode, continuing", tabname); - *rcontext=scontext; - return 0; - } - } - - /* - * Since crontab files are not directly executed, - * crond must ensure that the crontab file has - * a context that is appropriate for the context of - * the user cron job. It performs an entrypoint - * permission check for this purpose. - */ - retval = security_compute_av(scontext, - file_context, - SECCLASS_FILE, - FILE__ENTRYPOINT, - &avd); - freecon(file_context); - if (retval || ((FILE__ENTRYPOINT & avd.allowed) != FILE__ENTRYPOINT)) { - if (security_getenforce() > 0) { - log_it(name, getpid(), "ENTRYPOINT FAILED", tabname); - freecon(scontext); - return -1; - } else { - log_it(name, getpid(), "ENTRYPOINT FAILED but SELinux in permissive mode, continuing", tabname); - } - } - *rcontext=scontext; - return 0; -} -#endif - void free_user(user *u) { entry *e, *ne; @@ -115,10 +38,7 @@ ne = e->next; free_entry(e); } -#ifdef WITH_SELINUX - if( u->scontext != NULL ) - freecon(u->scontext); -#endif + free_security_context(&(u->scontext)); free(u); } @@ -164,23 +84,14 @@ return (NULL); } -#ifdef WITH_SELINUX - if (is_selinux_enabled() > 0) { - const char *sname=uname; - if (pw==NULL) { - sname="system_u"; - } - - if (get_security_context(sname, crontab_fd, - &u->scontext, tabname) != 0) { - free_user(u); - u = NULL; - goto done; - } - }else - u->scontext = NULL; -#endif - + if (get_security_context(pw == NULL ? "system_u" : uname, + crontab_fd, + &u->scontext, tabname) != 0) { + free_user(u); + u = NULL; + goto done; + } + /* load the crontab */ while ((status = load_env(envstr, file)) >= OK) { --- vixie-cron-4.1/funcs.h.security 2006-01-10 13:56:39.000000000 -0500 +++ vixie-cron-4.1/funcs.h 2006-01-10 17:35:00.000000000 -0500 @@ -77,3 +77,25 @@ #ifndef HAVE_TM_GMTOFF long get_gmtoff(time_t *, struct tm *); #endif + +/* Red Hat security stuff (security.c): + */ +int cron_set_job_security_context( entry *e, user *u, char ***jobenvp ); + +int cron_open_security_session( struct passwd *pw ); + +void cron_close_security_session( void ); + +int cron_change_user( struct passwd *pw ); + +int cron_change_selinux_context( user *u ); + +int get_security_context(const char *name, + int crontab_fd, + security_context_t *rcontext, + const char *tabname + ); + +void free_security_context( security_context_t *scontext ); + +int crontab_security_access(void); --- vixie-cron-4.1/crontab.c.security 2006-01-10 13:56:40.000000000 -0500 +++ vixie-cron-4.1/crontab.c 2006-01-10 17:26:58.000000000 -0500 @@ -163,15 +163,14 @@ "must be privileged to use -u\n"); exit(ERROR_EXIT); } -#ifdef WITH_SELINUX - if (is_selinux_enabled() > 0) { - if (selinux_check_passwd_access(PASSWD__CRONTAB)!=0) { - fprintf(stderr, - "Access denied by SELinux, must be privileged to use -u\n"); - exit(ERROR_EXIT); - } + + if( crontab_security_access() != 0 ) + { + fprintf(stderr, + "Access denied by SELinux, must be privileged to use -u\n"); + exit(ERROR_EXIT); } -#endif + if (!(pw = getpwnam(optarg))) { fprintf(stderr, "%s: user `%s' unknown\n", ProgramName, optarg); --- vixie-cron-4.1/Makefile.security 2006-01-10 13:56:40.000000000 -0500 +++ vixie-cron-4.1/Makefile 2006-01-10 17:31:13.000000000 -0500 @@ -88,14 +88,14 @@ HEADERS = bitstring.h cron.h config.h pathnames.h externs.h \ macros.h structs.h funcs.h globals.h SOURCES = cron.c crontab.c database.c do_command.c entry.c \ - env.c job.c user.c popen.c misc.c pw_dup.c + env.c job.c user.c popen.c misc.c pw_dup.c security.c SHAR_SOURCE = $(INFOS) $(MANPAGES) Makefile $(HEADERS) $(SOURCES) LINT_CRON = cron.c database.c user.c entry.c \ misc.c job.c do_command.c env.c popen.c pw_dup.c LINT_CRONTAB = crontab.c misc.c entry.c env.c CRON_OBJ = cron.o database.o user.o entry.o job.o do_command.o \ - misc.o env.o popen.o pw_dup.o -CRONTAB_OBJ = crontab.o misc.o entry.o env.o pw_dup.o + misc.o env.o popen.o pw_dup.o security.o +CRONTAB_OBJ = crontab.o misc.o entry.o env.o pw_dup.o security.o all : cron crontab From fedora-cvs-commits at redhat.com Tue Jan 10 23:18:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 18:18:13 -0500 Subject: rpms/poppler/FC-4 .cvsignore, 1.9, 1.10 poppler.spec, 1.13, 1.14 sources, 1.9, 1.10 poppler-0.4.3-CVE-2005-3191.patch, 1.1, NONE Message-ID: <200601102318.k0ANID08018973@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/poppler/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18940 Modified Files: .cvsignore poppler.spec sources Removed Files: poppler-0.4.3-CVE-2005-3191.patch Log Message: * Tue Jan 10 2006 Kristian H??gsberg 0.4.4-1.1 - Update to 0.4.4 release and drop poppler-0.4.3-CVE-2005-3191.patch. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/poppler/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 13 Dec 2005 01:38:22 -0000 1.9 +++ .cvsignore 10 Jan 2006 23:18:11 -0000 1.10 @@ -1 +1 @@ -poppler-0.4.3.tar.gz +poppler-0.4.4.tar.gz Index: poppler.spec =================================================================== RCS file: /cvs/dist/rpms/poppler/FC-4/poppler.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- poppler.spec 16 Dec 2005 21:24:21 -0000 1.13 +++ poppler.spec 10 Jan 2006 23:18:11 -0000 1.14 @@ -1,7 +1,7 @@ Summary: PDF rendering library Name: poppler -Version: 0.4.3 -Release: 1.3 +Version: 0.4.4 +Release: 1.1 License: GPL Group: Development/Libraries Source0: %{name}-%{version}.tar.gz @@ -9,8 +9,6 @@ BuildRequires: gtk2-devel freetype-devel fontconfig-devel Requires: gtk2 -Patch0: poppler-0.4.3-CVE-2005-3191.patch - %description Poppler, a PDF rendering library, it's a fork of the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. @@ -30,8 +28,6 @@ %prep %setup -q -%patch0 -p0 -b .CVE-2005-3191 - %build %configure --disable-cairo-output make @@ -56,6 +52,9 @@ %{_includedir}/poppler %changelog +* Tue Jan 10 2006 Kristian H??gsberg 0.4.4-1.1 +- Update to 0.4.4 release and drop poppler-0.4.3-CVE-2005-3191.patch. + * Fri Dec 16 2005 Kristian H??gsberg 0.4.3-1.3 - Add remaining bits of CVS-2005-3191 fix. Index: sources =================================================================== RCS file: /cvs/dist/rpms/poppler/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 13 Dec 2005 01:38:22 -0000 1.9 +++ sources 10 Jan 2006 23:18:11 -0000 1.10 @@ -1 +1 @@ -791dc78d8366eb05580183fe85174555 poppler-0.4.3.tar.gz +e081bca749a3373b2d95e696b7dddb9b poppler-0.4.4.tar.gz --- poppler-0.4.3-CVE-2005-3191.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 10 23:18:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 18:18:32 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.127,1.128 Message-ID: <200601102318.k0ANIW0F019139@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19110 Modified Files: cman-kernel.spec Log Message: bump for new kernel Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- cman-kernel.spec 10 Jan 2006 23:15:15 -0000 1.127 +++ cman-kernel.spec 10 Jan 2006 23:18:29 -0000 1.128 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.14-1.1805_FC5 +%define kernel_version 2.6.14-1.1826.2.9_FC5 %define subversion 20051219.162641.FC5 %ifnarch i686 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.14.1 -Release: 20051219.162641.FC5.7 +Release: 20051219.162641.FC5.8 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Tue Jan 10 23:21:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 18:21:35 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.128,1.129 Message-ID: <200601102321.k0ANLZDA020615@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20579 Modified Files: cman-kernel.spec Log Message: bump for new kernel Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- cman-kernel.spec 10 Jan 2006 23:18:29 -0000 1.128 +++ cman-kernel.spec 10 Jan 2006 23:21:32 -0000 1.129 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.14-1.1826.2.9_FC5 +%define kernel_version 2.6.15-1.1826.2.9_FC5 %define subversion 20051219.162641.FC5 %ifnarch i686 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.14.1 -Release: 20051219.162641.FC5.8 +Release: 20051219.162641.FC5.9 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Tue Jan 10 23:21:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 18:21:43 -0500 Subject: rpms/system-config-display/devel .cvsignore, 1.22, 1.23 sources, 1.24, 1.25 system-config-display.spec, 1.28, 1.29 Message-ID: <200601102321.k0ANLhlV020702@cvs.devel.redhat.com> Author: sandmann Update of /cvs/dist/rpms/system-config-display/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20597 Modified Files: .cvsignore sources system-config-display.spec Log Message: * Tue Jan 10 2006 Soren Sandmann - 1.0.34-1 - Some s/rhpl/rhpxl/ type changes Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 14 Nov 2005 17:57:11 -0000 1.22 +++ .cvsignore 10 Jan 2006 23:21:41 -0000 1.23 @@ -1 +1,2 @@ system-config-display-1.0.33.tar.bz2 +system-config-display-1.0.34.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 14 Nov 2005 17:57:11 -0000 1.24 +++ sources 10 Jan 2006 23:21:41 -0000 1.25 @@ -1 +1 @@ -6b362c8fea70230fc8e94ef1b3eaa405 system-config-display-1.0.33.tar.bz2 +c30bf10052c0fba467247aca34df732b system-config-display-1.0.34.tar.bz2 Index: system-config-display.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- system-config-display.spec 9 Dec 2005 22:43:25 -0000 1.28 +++ system-config-display.spec 10 Jan 2006 23:21:41 -0000 1.29 @@ -1,7 +1,7 @@ Summary: A graphical interface for configuring the X Window System display Name: system-config-display -Version: 1.0.33 -Release: 1.1 +Version: 1.0.34 +Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -79,8 +79,8 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Tue Jan 10 2006 Soren Sandmann - 1.0.34-1 +- Some s/rhpl/rhpxl/ type changes * Mon Nov 14 2005 Jeremy Katz - 1.0.33-1 - minor changes needed for modular X From fedora-cvs-commits at redhat.com Tue Jan 10 23:25:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 18:25:07 -0500 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.103,1.104 Message-ID: <200601102325.k0ANP7hj022283@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22253 Modified Files: dlm-kernel.spec Log Message: bump for new kernel Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- dlm-kernel.spec 31 Dec 2005 00:06:43 -0000 1.103 +++ dlm-kernel.spec 10 Jan 2006 23:25:04 -0000 1.104 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.14-1.1805_FC5 +%define kernel_version 2.6.15-1.1826.2.9_FC5 %define subversion 20051219.162641.FC5 %ifnarch i686 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.14.1 -Release: 20051219.162641.FC5.6 +Release: 20051219.162641.FC5.7 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. @@ -233,6 +233,9 @@ %{_includedir}/cluster/* %changelog +* Tue Jan 10 2006 Jesse Keating +- rebuilt + * Fri Dec 30 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 10 23:25:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 18:25:21 -0500 Subject: rpms/vixie-cron/devel vixie-cron.spec,1.61,1.62 Message-ID: <200601102325.k0ANPLai022441@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/vixie-cron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22410 Modified Files: vixie-cron.spec Log Message: fix bug 177476: make mailer/minder process run as job user with user context; reorganize SELinux and PAM security code Index: vixie-cron.spec =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- vixie-cron.spec 15 Dec 2005 20:34:34 -0000 1.61 +++ vixie-cron.spec 10 Jan 2006 23:25:19 -0000 1.62 @@ -7,7 +7,7 @@ Summary: The Vixie cron daemon for executing specified programs at set times. Name: vixie-cron Version: 4.1 -Release: 42.FC5 +Release: 44.FC5 Epoch: 4 License: distributable Group: System Environment/Base @@ -62,6 +62,7 @@ Patch45: vixie-cron-4.1-_45-warnings.patch Patch46: vixie-cron-4.1-_46-audit.patch Patch47: vixie-cron-4.1-_47-m_option.patch +Patch48: vixie-cron-4.1-_48-security.patch Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: syslog, bash >= 2.0 Conflicts: sysklogd < 1.4.1 @@ -140,6 +141,7 @@ %patch45 -p1 -b .warnings %patch46 -p1 -b .audit_deny %patch47 -p1 -b .-m_option +%patch48 -p1 -b .security %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" @@ -197,6 +199,10 @@ %config(noreplace) /etc/sysconfig/crond %changelog +* Tue Jan 10 2006 Jason Vas Dias +- fix bug 177476: make minder/mailer process run as job user + with user context; re-organize PAM and SELinux code + * Thu Dec 15 2005 Jason Vas Dias - fix bug 172885: Replace Requires:sysklogd with Requires:syslog From fedora-cvs-commits at redhat.com Wed Jan 11 00:01:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 19:01:49 -0500 Subject: rpms/kernel/devel/configs config-generic,1.127,1.128 Message-ID: <200601110001.k0B01nIU005486@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv5428/configs Modified Files: config-generic Log Message: Update from Linus' tree again Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- config-generic 10 Jan 2006 01:46:00 -0000 1.127 +++ config-generic 11 Jan 2006 00:01:31 -0000 1.128 @@ -2415,6 +2415,7 @@ # Turn off these debug options for production kernels. CONFIG_DEBUG_SLAB=y +CONFIG_DEBUG_MUTEXES=y CONFIG_KMALLOC_ACCOUNTING=y # CONFIG_WAKEUP_TIMING is not set From fedora-cvs-commits at redhat.com Wed Jan 11 00:01:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 19:01:46 -0500 Subject: rpms/kernel/devel .cvsignore, 1.319, 1.320 kernel-2.6.spec, 1.1839, 1.1840 linux-2.6-crashdump-common.patch, 1.6, 1.7 linux-2.6-debug-spinlock-taint.patch, 1.4, 1.5 linux-2.6-sleepon.patch, 1.1, 1.2 sources, 1.261, 1.262 linux-2.6-build-reference-discarded-opd.patch, 1.1, NONE linux-2.6-kdump-needs-not-embedded.patch, 1.1, NONE linux-2.6-ppc-compile.patch, 1.2, NONE linux-2.6-proc-vmcore-needs-not-embedded.patch, 1.1, NONE linux-2.6.15-spufs-compile.patch, 1.1, NONE Message-ID: <200601110001.k0B01k0d005473@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5428 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-crashdump-common.patch linux-2.6-debug-spinlock-taint.patch linux-2.6-sleepon.patch sources Removed Files: linux-2.6-build-reference-discarded-opd.patch linux-2.6-kdump-needs-not-embedded.patch linux-2.6-ppc-compile.patch linux-2.6-proc-vmcore-needs-not-embedded.patch linux-2.6.15-spufs-compile.patch Log Message: Update from Linus' tree again Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.319 retrieving revision 1.320 diff -u -r1.319 -r1.320 --- .cvsignore 10 Jan 2006 01:45:59 -0000 1.319 +++ .cvsignore 11 Jan 2006 00:01:10 -0000 1.320 @@ -3,4 +3,4 @@ kernel-2.6.15 linux-2.6.15.tar.bz2 bcm43xx-20060106.tar.bz2 -patch-2.6.15-git5a.bz2 +patch-2.6.15-git6a.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1839 retrieving revision 1.1840 diff -u -r1.1839 -r1.1840 --- kernel-2.6.spec 10 Jan 2006 02:53:27 -0000 1.1839 +++ kernel-2.6.spec 11 Jan 2006 00:01:11 -0000 1.1840 @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git5a.bz2 +Patch1: patch-2.6.15-git6a.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -226,8 +226,6 @@ # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch -Patch301: linux-2.6.15-spufs-compile.patch -Patch302: linux-2.6-ppc-compile.patch Patch304: linux-2.6.15-mv643xx-fixes.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch @@ -254,7 +252,6 @@ # Patch800: linux-2.6-build-nonintconfig.patch Patch801: linux-2.6-build-userspace-headers-warning.patch -Patch802: linux-2.6-build-reference-discarded-opd.patch # Exec-shield. Patch810: linux-2.6-execshield.patch @@ -383,8 +380,6 @@ # Not patches you're too lazy for to put in the proper place. # -Patch10001: linux-2.6-kdump-needs-not-embedded.patch -Patch10002: linux-2.6-proc-vmcore-needs-not-embedded.patch Patch10003: linux-2.6-gcc41.patch Patch10004: linux-2.6-compile-fixes.patch @@ -633,10 +628,6 @@ # # Default to ARCH=powerpc %patch300 -p1 -# Fix spufs build -%patch301 -p1 -# Fix ppc32 build -%patch302 -p1 # Fix the MV643xx Gigabit Ethernet driver %patch304 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. @@ -679,8 +670,6 @@ %patch800 -p1 # Warn if someone tries to build userspace using kernel headers %patch801 -p1 -# reference_discarded additions. -%patch802 -p1 # Exec shield %patch810 -p1 @@ -777,7 +766,7 @@ # # Various upstream NFS/NFSD fixes. # -%patch1200 -p1 +#%patch1200 -p1 # kNFSD: fixed '-p port' arg to rpc.nfsd and enables the defining proto versions and transports %patch1201 -p1 # Fix badness. @@ -893,8 +882,6 @@ # # misc small stuff to make things compile or otherwise improve performance # -%patch10001 -p1 -%patch10002 -p1 %patch10003 -p1 %patch10004 -p1 @@ -1373,6 +1360,9 @@ %endif %changelog +* Wed Jan 11 2006 David Woodhouse +- 2.6.15-git6a (49cd619c69d643b30a24029e40eb5364c7a26b2e) + * Tue Jan 10 2006 David Woodhouse - 2.6.15-git5a (1fd5a46dd6bbca3a1275465120caf4748872c2a7) linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/i386/mm/pgtable.c | 3 linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 32 files changed, 952 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-crashdump-common.patch 30 Dec 2005 05:22:33 -0000 1.6 +++ linux-2.6-crashdump-common.patch 11 Jan 2006 00:01:28 -0000 1.7 @@ -779,14 +779,14 @@ --- linux-2.6.12/kernel/Makefile.orig 2005-08-18 12:41:10.000000000 -0400 +++ linux-2.6.12/kernel/Makefile 2005-08-18 14:23:59.000000000 -0400 @@ -7,7 +7,7 @@ - sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o pid.o \ rcupdate.o intermodule.o extable.o params.o posix-timers.o \ -- kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o -+ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o dump.o + kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \ +- hrtimer.o ++ hrtimer.o dump.o + obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o obj-$(CONFIG_FUTEX) += futex.o - obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o --- linux-2.6.12/kernel/sched.c.orig 2005-08-18 12:41:14.000000000 -0400 +++ linux-2.6.12/kernel/sched.c 2005-08-18 14:32:27.000000000 -0400 @@ -4177,6 +4177,8 @@ linux-2.6-debug-spinlock-taint.patch: spinlock_debug.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) Index: linux-2.6-debug-spinlock-taint.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-spinlock-taint.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-debug-spinlock-taint.patch 30 Dec 2005 21:10:37 -0000 1.4 +++ linux-2.6-debug-spinlock-taint.patch 11 Jan 2006 00:01:29 -0000 1.5 @@ -1,61 +1,59 @@ -Print info about tainting in the spinlock debug printks. - ---- linux-2.6.14/lib/spinlock_debug.c~ 2005-12-21 11:42:59.000000000 -0500 -+++ linux-2.6.14/lib/spinlock_debug.c 2005-12-21 11:44:12.000000000 -0500 +--- linux-2.6.15/lib/spinlock_debug.c~ 2006-01-10 20:46:43.000000000 +0000 ++++ linux-2.6.15/lib/spinlock_debug.c 2006-01-10 20:52:49.000000000 +0000 @@ -19,9 +19,9 @@ static void spin_bug(spinlock_t *lock, c if (xchg(&print_once, 0)) { if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT) owner = lock->owner; -- printk("BUG: spinlock %s on CPU#%d, %s/%d\n", -+ printk("BUG: spinlock %s on CPU#%d, %s/%d (%s)\n", +- printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n", ++ printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d (%s)\n", msg, raw_smp_processor_id(), - current->comm, current->pid); -+ current->comm, current->pid, print_tainted()); - printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n", ++ current->comm, current->pid, print_tainted()); + printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, " + ".owner_cpu: %d\n", lock, lock->magic, - owner ? owner->comm : "", -@@ -78,9 +78,9 @@ static void __spin_lock_debug(spinlock_t - /* lockup suspected: */ +@@ -80,9 +80,9 @@ static void __spin_lock_debug(spinlock_t if (print_once) { print_once = 0; -- printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n", -+ printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p (%s)\n", + printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, " +- "%s/%d, %p\n", ++ "%s/%d, %p (%s)\n", raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); dump_stack(); } } -@@ -120,9 +120,9 @@ static void rwlock_bug(rwlock_t *lock, c +@@ -122,9 +122,9 @@ static void rwlock_bug(rwlock_t *lock, c static long print_once = 1; if (xchg(&print_once, 0)) { -- printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg, -+ printk("BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n", msg, - raw_smp_processor_id(), current->comm, +- printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n", ++ printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n", + msg, raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); dump_stack(); #ifdef CONFIG_SMP /* -@@ -149,9 +149,9 @@ static void __read_lock_debug(rwlock_t * - /* lockup suspected: */ +@@ -152,9 +152,9 @@ static void __read_lock_debug(rwlock_t * if (print_once) { print_once = 0; -- printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n", -+ printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p (%s)\n", + printk(KERN_EMERG "BUG: read-lock lockup on CPU#%d, " +- "%s/%d, %p\n", ++ "%s/%d, %p (%s)\n", raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); dump_stack(); } } -@@ -221,9 +221,9 @@ static void __write_lock_debug(rwlock_t - /* lockup suspected: */ +@@ -225,9 +225,9 @@ static void __write_lock_debug(rwlock_t if (print_once) { print_once = 0; -- printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n", -+ printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p (%s)\n", + printk(KERN_EMERG "BUG: write-lock lockup on CPU#%d, " +- "%s/%d, %p\n", ++ "%s/%d, %p (%s)\n", raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); linux-2.6-sleepon.patch: drivers/block/DAC960.c | 12 +++++++++++- drivers/net/tokenring/ibmtr.c | 9 ++++++++- include/linux/wait.h | 6 +++--- kernel/sched.c | 28 +++++++++++++++------------- 4 files changed, 37 insertions(+), 18 deletions(-) Index: linux-2.6-sleepon.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-sleepon.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-sleepon.patch 15 Oct 2005 01:13:22 -0000 1.1 +++ linux-2.6-sleepon.patch 11 Jan 2006 00:01:30 -0000 1.2 @@ -140,32 +140,3 @@ current->state = TASK_UNINTERRUPTIBLE; SLEEP_ON_HEAD -diff -urNp --exclude-from=/home/davej/.exclude linux-1060/net/sunrpc/clnt.c linux-1070/net/sunrpc/clnt.c ---- linux-1060/net/sunrpc/clnt.c -+++ linux-1070/net/sunrpc/clnt.c -@@ -223,17 +223,24 @@ out_no_clnt: - int - rpc_shutdown_client(struct rpc_clnt *clnt) - { -+ wait_queue_t __wait; -+ init_waitqueue_entry(&__wait, current); - dprintk("RPC: shutting down %s client for %s, tasks=%d\n", - clnt->cl_protname, clnt->cl_server, - atomic_read(&clnt->cl_users)); - -+ add_wait_queue(&destroy_wait, &__wait); -+ set_current_state(TASK_UNINTERRUPTIBLE); - while (atomic_read(&clnt->cl_users) > 0) { - /* Don't let rpc_release_client destroy us */ - clnt->cl_oneshot = 0; - clnt->cl_dead = 0; - rpc_killall_tasks(clnt); -- sleep_on_timeout(&destroy_wait, 1*HZ); -+ schedule_timeout(1*HZ); -+ set_current_state(TASK_UNINTERRUPTIBLE); - } -+ current->state = TASK_RUNNING; -+ remove_wait_queue(&destroy_wait, &__wait); - - if (atomic_read(&clnt->cl_users) < 0) { - printk(KERN_ERR "RPC: rpc_shutdown_client clnt %p tasks=%d\n", Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.261 retrieving revision 1.262 diff -u -r1.261 -r1.262 --- sources 10 Jan 2006 01:45:59 -0000 1.261 +++ sources 11 Jan 2006 00:01:30 -0000 1.262 @@ -1,4 +1,3 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2 -1eb2bb778090c59fbeba6278d63a9309 ieee80211softmac-20060103.tar.bz2 -82d5bf398cb12769fb2431964045982f patch-2.6.15-git5a.bz2 +0ec61ec3ed52b5aa640cacd23338e0ea patch-2.6.15-git6a.bz2 --- linux-2.6-build-reference-discarded-opd.patch DELETED --- --- linux-2.6-kdump-needs-not-embedded.patch DELETED --- --- linux-2.6-ppc-compile.patch DELETED --- --- linux-2.6-proc-vmcore-needs-not-embedded.patch DELETED --- --- linux-2.6.15-spufs-compile.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 11 00:13:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 19:13:08 -0500 Subject: rpms/kernel/devel/configs config-x86-generic,1.27,1.28 Message-ID: <200601110013.k0B0D8NQ005743@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv5730 Modified Files: config-x86-generic Log Message: Enable CS5535 gpio Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- config-x86-generic 30 Dec 2005 05:09:24 -0000 1.27 +++ config-x86-generic 11 Jan 2006 00:13:06 -0000 1.28 @@ -272,4 +272,4 @@ CONFIG_LATENCY_TIMING=y CONFIG_LATENCY_TRACE=y CONFIG_MCOUNT=y - +CONFIG_CS5535_GPIO=m From fedora-cvs-commits at redhat.com Wed Jan 11 00:19:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 19:19:06 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.128, 1.129 config-powerpc-generic, 1.10, 1.11 config-x86-generic, 1.28, 1.29 Message-ID: <200601110019.k0B0J6CP017052@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv17037 Modified Files: config-generic config-powerpc-generic config-x86-generic Log Message: Turn crash dump off everywhere Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- config-generic 11 Jan 2006 00:01:31 -0000 1.128 +++ config-generic 11 Jan 2006 00:19:04 -0000 1.129 @@ -5,7 +5,7 @@ CONFIG_SMP=y CONFIG_HOTPLUG_CPU=y CONFIG_LOCALVERSION="" - +# CONFIG_CRASH_DUMP is not set # # Code maturity level options # Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- config-powerpc-generic 10 Jan 2006 02:53:29 -0000 1.10 +++ config-powerpc-generic 11 Jan 2006 00:19:04 -0000 1.11 @@ -1,5 +1,4 @@ # Most PowerPC kernels we build are SMP -# CONFIG_CRASH_DUMP is not set CONFIG_SMP=y CONFIG_IRQ_ALL_CPUS=y CONFIG_PPC=y Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- config-x86-generic 11 Jan 2006 00:13:06 -0000 1.28 +++ config-x86-generic 11 Jan 2006 00:19:04 -0000 1.29 @@ -263,7 +263,6 @@ # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_PHYSICAL_START=0x100000 -# CONFIG_CRASH_DUMP is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m From fedora-cvs-commits at redhat.com Wed Jan 11 00:35:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 19:35:08 -0500 Subject: rpms/kernel/devel linux-2.6-compile-fixes.patch,1.44,1.45 Message-ID: <200601110035.k0B0Z8xQ028185@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28152 Modified Files: linux-2.6-compile-fixes.patch Log Message: s390 build again linux-2.6-compile-fixes.patch: arch/s390/kernel/setup.c | 2 ++ drivers/net/spider_net.c | 1 + include/asm-generic/signal.h | 1 + 3 files changed, 4 insertions(+) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- linux-2.6-compile-fixes.patch 6 Jan 2006 16:40:20 -0000 1.44 +++ linux-2.6-compile-fixes.patch 11 Jan 2006 00:35:05 -0000 1.45 @@ -18,3 +18,14 @@ #include "spider_net.h" +--- linux-2.6.15/arch/s390/kernel/setup.c~ 2006-01-10 23:43:32.000000000 +0000 ++++ linux-2.6.15/arch/s390/kernel/setup.c 2006-01-11 00:34:18.000000000 +0000 +@@ -319,6 +319,8 @@ void machine_power_off(void) + _machine_power_off(); + } + ++void (*pm_power_off)(void) = machine_power_off; ++ + static void __init + add_memory_hole(unsigned long start, unsigned long end) + { From fedora-cvs-commits at redhat.com Wed Jan 11 00:39:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 19:39:40 -0500 Subject: rpms/kernel/devel linux-2.6-tux.patch,1.9,1.10 Message-ID: <200601110039.k0B0de5C030264@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30203 Modified Files: linux-2.6-tux.patch Log Message: Mutexes linux-2.6-tux.patch: arch/alpha/kernel/systbls.S | 8 arch/i386/kernel/syscall_table.S | 10 arch/ia64/kernel/entry.S | 8 arch/ia64/kernel/ia64_ksyms.c | 5 arch/x86_64/ia32/ia32entry.S | 10 fs/dcache.c | 36 fs/exec.c | 2 fs/fcntl.c | 4 fs/namei.c | 18 fs/namespace.c | 2 fs/open.c | 4 fs/pipe.c | 2 fs/read_write.c | 2 include/asm-alpha/fcntl.h | 1 include/asm-generic/fcntl.h | 4 include/asm-i386/unistd.h | 5 include/asm-ia64/unistd.h | 2 include/asm-sparc/fcntl.h | 1 include/asm-sparc64/fcntl.h | 1 include/asm-x86_64/unistd.h | 10 include/linux/buffer_head.h | 1 include/linux/dcache.h | 8 include/linux/errno.h | 3 include/linux/file.h | 2 include/linux/fs.h | 7 include/linux/kmod.h | 2 include/linux/namei.h | 2 include/linux/net.h | 1 include/linux/sched.h | 5 include/linux/skbuff.h | 2 include/linux/socket.h | 5 include/linux/sysctl.h | 50 include/net/sock.h | 8 include/net/tcp.h | 3 include/net/tux.h | 804 ++++++++++++++ include/net/tux_u.h | 163 ++ kernel/exit.c | 7 kernel/fork.c | 1 kernel/kmod.c | 28 kernel/signal.c | 1 mm/filemap.c | 19 mm/truncate.c | 2 net/Kconfig | 1 net/Makefile | 1 net/core/sock.c | 5 net/ipv4/tcp.c | 3 net/ipv4/tcp_input.c | 1 net/ipv4/tcp_output.c | 3 net/socket.c | 197 ++- net/tux/Kconfig | 25 net/tux/Makefile | 12 net/tux/abuf.c | 190 +++ net/tux/accept.c | 863 +++++++++++++++ net/tux/cachemiss.c | 265 ++++ net/tux/cgi.c | 171 +++ net/tux/directory.c | 302 +++++ net/tux/extcgi.c | 329 +++++ net/tux/gzip.c | 40 net/tux/input.c | 641 +++++++++++ net/tux/logger.c | 837 ++++++++++++++ net/tux/main.c | 1417 +++++++++++++++++++++++++ net/tux/mod.c | 262 ++++ net/tux/output.c | 352 ++++++ net/tux/parser.h | 102 + net/tux/postpone.c | 77 + net/tux/proc.c | 1149 ++++++++++++++++++++ net/tux/proto_ftp.c | 1555 +++++++++++++++++++++++++++ net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++++++++ net/tux/redirect.c | 172 +++ net/tux/times.c | 392 ++++++ net/tux/times.h | 26 net/tux/userspace.c | 27 72 files changed, 12775 insertions(+), 98 deletions(-) Index: linux-2.6-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-tux.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linux-2.6-tux.patch 9 Jan 2006 18:55:15 -0000 1.9 +++ linux-2.6-tux.patch 11 Jan 2006 00:39:36 -0000 1.10 @@ -5872,7 +5872,7 @@ + inode = log_filp->f_dentry->d_inode; + mapping = inode->i_mapping; + if (mapping->nrpages > 256) { /* batch stuff up */ -+ down(&inode->i_sem); ++ mutex_lock(&inode->i_mutex); + filemap_fdatawrite(inode->i_mapping); + + /* @@ -5882,7 +5882,7 @@ + */ + invalidate_mapping_pages(mapping, 0, log_filp_last_index); + log_filp_last_index = log_filp->f_pos >> PAGE_CACHE_SHIFT; -+ up(&inode->i_sem); ++ mutex_unlock(&inode->i_mutex); + } + +out_lock: From fedora-cvs-commits at redhat.com Wed Jan 11 01:03:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 20:03:46 -0500 Subject: rpms/kernel/devel linux-2.6-execshield.patch,1.7,1.8 Message-ID: <200601110103.k0B13k5I018567@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18552 Modified Files: linux-2.6-execshield.patch Log Message: don't duplicate arch_align_stack() on x86_64 linux-2.6-execshield.patch: arch/i386/kernel/asm-offsets.c | 1 arch/i386/kernel/cpu/common.c | 7 + arch/i386/kernel/entry.S | 8 +- arch/i386/kernel/process.c | 59 +++++++++++++++ arch/i386/kernel/signal.c | 4 - arch/i386/kernel/smp.c | 3 arch/i386/kernel/sysenter.c | 56 ++++++++++++++- arch/i386/kernel/traps.c | 93 ++++++++++++++++++++++++- arch/i386/kernel/vsyscall-sysenter.S | 6 - arch/i386/kernel/vsyscall.lds.S | 4 - arch/i386/mm/init.c | 6 + arch/i386/mm/mmap.c | 6 + arch/ia64/ia32/binfmt_elf32.c | 2 arch/x86_64/ia32/ia32_binfmt.c | 4 - arch/x86_64/kernel/process.c | 6 - arch/x86_64/kernel/setup64.c | 23 ------ arch/x86_64/mm/Makefile | 2 arch/x86_64/mm/fault.c | 2 arch/x86_64/mm/mmap.c | 87 +++++++++++++++++++++++ drivers/char/random.c | 7 + fs/binfmt_elf.c | 130 ++++++++++++++++++++++++++++------- fs/proc/array.c | 8 +- fs/proc/base.c | 4 - fs/proc/task_mmu.c | 25 +++++- include/asm-i386/desc.h | 14 +++ include/asm-i386/elf.h | 42 +++++++---- include/asm-i386/mmu.h | 6 + include/asm-i386/pgalloc.h | 1 include/asm-i386/processor.h | 7 + include/asm-i386/thread_info.h | 1 include/asm-ia64/pgalloc.h | 4 + include/asm-powerpc/pgalloc.h | 5 + include/asm-ppc/pgalloc.h | 5 + include/asm-s390/pgalloc.h | 4 + include/asm-sparc/pgalloc.h | 4 + include/asm-sparc64/pgalloc.h | 4 + include/asm-x86_64/pgalloc.h | 7 + include/asm-x86_64/pgtable.h | 2 include/asm-x86_64/processor.h | 4 + include/linux/mm.h | 11 ++ include/linux/resource.h | 5 + include/linux/sched.h | 9 ++ include/linux/sysctl.h | 3 kernel/signal.c | 38 ++++++++++ kernel/sysctl.c | 39 ++++++++++ mm/fremap.c | 16 ++-- mm/mmap.c | 105 ++++++++++++++++++++++++++-- mm/mprotect.c | 5 + mm/mremap.c | 4 - 49 files changed, 774 insertions(+), 124 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6-execshield.patch 9 Jan 2006 19:24:08 -0000 1.7 +++ linux-2.6-execshield.patch 11 Jan 2006 01:03:33 -0000 1.8 @@ -661,7 +661,7 @@ =================================================================== --- /dev/null +++ linux/arch/x86_64/mm/mmap.c -@@ -0,0 +1,95 @@ +@@ -0,0 +1,87 @@ +/* + * linux/arch/x86-64/mm/mmap.c + * @@ -749,14 +749,6 @@ + mm->unmap_area = arch_unmap_area_topdown; + } +} -+ -+unsigned long arch_align_stack(unsigned long sp) -+{ -+ if (current->flags & PF_RANDOMIZE) -+ sp -= get_random_int() % 8192; -+ return sp & ~0xf; -+} -+ Index: linux/drivers/char/random.c =================================================================== --- linux.orig/drivers/char/random.c @@ -1290,7 +1282,7 @@ =================================================================== --- linux.orig/include/asm-i386/processor.h +++ linux/include/asm-i386/processor.h -@@ -319,7 +319,10 @@ extern int bootloader_type; +@@ -319,7 +319,9 @@ extern int bootloader_type; /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ @@ -1298,7 +1290,6 @@ +#define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE/3) + +#define __HAVE_ARCH_ALIGN_STACK -+extern unsigned long arch_align_stack(unsigned long sp); #define HAVE_ARCH_PICK_MMAP_LAYOUT @@ -1446,12 +1437,11 @@ =================================================================== --- linux.orig/include/asm-x86_64/processor.h +++ linux/include/asm-x86_64/processor.h -@@ -164,6 +164,11 @@ static inline void clear_in_cr4 (unsigne +@@ -164,6 +164,10 @@ static inline void clear_in_cr4 (unsigne */ #define TASK_SIZE64 (0x800000000000UL - 4096) +#define __HAVE_ARCH_ALIGN_STACK -+extern unsigned long arch_align_stack(unsigned long sp); + +#define HAVE_ARCH_PICK_MMAP_LAYOUT + From fedora-cvs-commits at redhat.com Wed Jan 11 01:24:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 20:24:25 -0500 Subject: rpms/kernel/devel/configs config-powerpc64-iseries,1.7,1.8 Message-ID: <200601110124.k0B1OPXb004151@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv4127 Modified Files: config-powerpc64-iseries Log Message: fix iseries build by turning off its console Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- config-powerpc64-iseries 6 Jan 2006 21:08:39 -0000 1.7 +++ config-powerpc64-iseries 11 Jan 2006 01:24:22 -0000 1.8 @@ -8,7 +8,9 @@ # iSeries device drivers # CONFIG_ISERIES_VETH=m -CONFIG_VIOCONS=y +# drivers/char/viocons.c: In function 'vioHandleData': +# drivers/char/viocons.c:1003: error: 'struct tty_struct' has no member named 'flip' +# CONFIG_VIOCONS is not set CONFIG_VIODASD=m CONFIG_VIOCD=m CONFIG_VIOTAPE=m From fedora-cvs-commits at redhat.com Wed Jan 11 01:36:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 20:36:08 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.199, 1.200 anaconda.spec, 1.318, 1.319 sources, 1.318, 1.319 Message-ID: <200601110136.k0B1a8Oi007172@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7133/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.91.2-1 on branch devel from anaconda-10.91.2-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- .cvsignore 10 Jan 2006 20:51:12 -0000 1.199 +++ .cvsignore 11 Jan 2006 01:36:06 -0000 1.200 @@ -1 +1 @@ -anaconda-10.91.1.tar.bz2 +anaconda-10.91.2.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.318 retrieving revision 1.319 diff -u -r1.318 -r1.319 --- anaconda.spec 10 Jan 2006 20:51:12 -0000 1.318 +++ anaconda.spec 11 Jan 2006 01:36:06 -0000 1.319 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.91.1 +Version: 10.91.2 Release: 1 License: GPL Summary: Graphical system installer @@ -78,6 +78,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Tue Jan 10 2006 Jeremy Katz - 10.91.2-1 +- fix hard drive installs (pjones) + * Tue Jan 10 2006 Jeremy Katz - 10.91.1-1 - more ppc rescue image (jkeating) - actually commit the dmraid fix (pjones) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.318 retrieving revision 1.319 diff -u -r1.318 -r1.319 --- sources 10 Jan 2006 20:51:12 -0000 1.318 +++ sources 11 Jan 2006 01:36:06 -0000 1.319 @@ -1 +1 @@ -23de4a1294b66ed3bc19b50d5114faff anaconda-10.91.1.tar.bz2 +d2bfdae21e7c3cbb4688f3d7639e7116 anaconda-10.91.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 11 01:39:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 20:39:50 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1840,1.1841 Message-ID: <200601110139.k0B1do49008625@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8580 Modified Files: kernel-2.6.spec Log Message: disable s390 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1840 retrieving revision 1.1841 diff -u -r1.1840 -r1.1841 --- kernel-2.6.spec 11 Jan 2006 00:01:11 -0000 1.1840 +++ kernel-2.6.spec 11 Jan 2006 01:39:47 -0000 1.1841 @@ -156,7 +156,7 @@ Version: %{rpmversion} Release: %{release} #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x -ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries s390 s390x +ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ia64 sparc sparc64 ppc64iseries ExclusiveOS: Linux Provides: kernel = %{version} Provides: kernel-drm = 4.3.0 @@ -271,6 +271,9 @@ # Tux http accelerator. Patch910: linux-2.6-tux.patch +# Pselect/ppoll system calls +Patch920: linux-2.6-pselect.patch + # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems # @@ -703,6 +706,9 @@ # Tux %patch910 -p1 +# Pselect/ppoll +%patch920 -p1 + # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems # @@ -1362,6 +1368,7 @@ %changelog * Wed Jan 11 2006 David Woodhouse - 2.6.15-git6a (49cd619c69d643b30a24029e40eb5364c7a26b2e) +- Disable S390 * Tue Jan 10 2006 David Woodhouse - 2.6.15-git5a (1fd5a46dd6bbca3a1275465120caf4748872c2a7) From fedora-cvs-commits at redhat.com Wed Jan 11 01:40:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 20:40:21 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1841,1.1842 Message-ID: <200601110140.k0B1eLWm008855@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8818 Modified Files: kernel-2.6.spec Log Message: OOps. Didn't want pselect Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1841 retrieving revision 1.1842 diff -u -r1.1841 -r1.1842 --- kernel-2.6.spec 11 Jan 2006 01:39:47 -0000 1.1841 +++ kernel-2.6.spec 11 Jan 2006 01:40:18 -0000 1.1842 @@ -271,9 +271,6 @@ # Tux http accelerator. Patch910: linux-2.6-tux.patch -# Pselect/ppoll system calls -Patch920: linux-2.6-pselect.patch - # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems # @@ -706,9 +703,6 @@ # Tux %patch910 -p1 -# Pselect/ppoll -%patch920 -p1 - # # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems # From fedora-cvs-commits at redhat.com Wed Jan 11 03:35:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 22:35:37 -0500 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.119,1.120 Message-ID: <200601110335.k0B3ZbFF023411@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23380 Modified Files: GFS-kernel.spec Log Message: bump for kernel Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- GFS-kernel.spec 31 Dec 2005 00:07:46 -0000 1.119 +++ GFS-kernel.spec 11 Jan 2006 03:35:34 -0000 1.120 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.14-1.1805_FC5 +%define kernel_version 2.6.15-1.1826.2.9_FC5 %define subversion 20051219.162641.FC5 %ifnarch i686 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.14.1 -Release: 20051219.162641.FC5.7 +Release: 20051219.162641.FC5.8 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules @@ -249,6 +249,9 @@ %{_includedir}/linux/* %changelog +* Tue Jan 10 2006 Jesse Keating +- rebuilt + * Fri Dec 30 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 11 03:38:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 22:38:27 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.107,1.108 Message-ID: <200601110338.k0B3cRGK024757@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24726 Modified Files: gnbd-kernel.spec Log Message: bump for kernel Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- gnbd-kernel.spec 31 Dec 2005 00:08:40 -0000 1.107 +++ gnbd-kernel.spec 11 Jan 2006 03:38:24 -0000 1.108 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.14-1.1805_FC5 +%define kernel_version 2.6.15-1.1826.2.9_FC5 %define subversion 20051108.134753.FC5 %ifnarch i686 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.14.0 -Release: 20051108.134753.FC5.12.30 +Release: 20051108.134753.FC5.1.10.06 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device @@ -217,6 +217,9 @@ %{_includedir}/linux/gnbd.h %changelog +* Tue Jan 10 2005 Jesse Keating +- rebuilt + * Fri Dec 30 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 11 03:39:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 22:39:31 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.108,1.109 Message-ID: <200601110339.k0B3dVpY025263@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25234 Modified Files: gnbd-kernel.spec Log Message: bump for kernel Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- gnbd-kernel.spec 11 Jan 2006 03:38:24 -0000 1.108 +++ gnbd-kernel.spec 11 Jan 2006 03:39:28 -0000 1.109 @@ -217,7 +217,7 @@ %{_includedir}/linux/gnbd.h %changelog -* Tue Jan 10 2005 Jesse Keating +* Tue Jan 10 2006 Jesse Keating - rebuilt * Fri Dec 30 2005 Jesse Keating From fedora-cvs-commits at redhat.com Wed Jan 11 03:59:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 10 Jan 2006 22:59:39 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.109,1.110 Message-ID: <200601110359.k0B3xdJm002584@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2571 Modified Files: gnbd-kernel.spec Log Message: fix release number Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- gnbd-kernel.spec 11 Jan 2006 03:39:28 -0000 1.109 +++ gnbd-kernel.spec 11 Jan 2006 03:59:37 -0000 1.110 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.14.0 -Release: 20051108.134753.FC5.1.10.06 +Release: 20051108.134753.FC5.13 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Wed Jan 11 05:57:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 00:57:18 -0500 Subject: rpms/evolution/devel evolution-2.5.4-fix-conduit-dir.patch, NONE, 1.1 evolution-2.5.4-fix-conduits.patch, NONE, 1.1 evolution.spec, 1.109, 1.110 evolution-2.2.2-fix-conduit-dir.patch, 1.1, NONE evolution-2.5.2-fix-conduits.patch, 1.1, NONE Message-ID: <200601110557.k0B5vICW021901@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21711 Modified Files: evolution.spec Added Files: evolution-2.5.4-fix-conduit-dir.patch evolution-2.5.4-fix-conduits.patch Removed Files: evolution-2.2.2-fix-conduit-dir.patch evolution-2.5.2-fix-conduits.patch Log Message: * Tue Jan 10 2006 David Malcolm - 2.5.4-3 - updated patch 800 to include patch for memo conduit (untested at this stage); renaming from evolution-2.5.2-fix-conduits.patch to evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the memo conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to evolution-2.5.4-fix-conduit-dir.patch; re-enable conduits in build (#175160) - switch the build-time dep for the audio-inline plugin from gstreamer-devel to gstreamer08-devel to better reflect the test in the tarball's configure.in evolution-2.5.4-fix-conduit-dir.patch: addressbook/conduit/Makefile.am | 2 +- calendar/conduits/calendar/Makefile.am | 2 +- calendar/conduits/memo/Makefile.am | 2 +- calendar/conduits/todo/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE evolution-2.5.4-fix-conduit-dir.patch --- --- evolution-2.5.4/addressbook/conduit/Makefile.am.fix-conduit-dir 2004-12-02 22:39:53.000000000 -0500 +++ evolution-2.5.4/addressbook/conduit/Makefile.am 2006-01-11 00:21:25.000000000 -0500 @@ -28,7 +28,7 @@ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ conduit_DATA = e-address-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) --- evolution-2.5.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2005-06-26 20:43:06.000000000 -0400 +++ evolution-2.5.4/calendar/conduits/calendar/Makefile.am 2006-01-11 00:21:25.000000000 -0500 @@ -24,7 +24,7 @@ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ conduit_DATA = e-calendar-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) --- evolution-2.5.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2005-06-26 20:43:07.000000000 -0400 +++ evolution-2.5.4/calendar/conduits/todo/Makefile.am 2006-01-11 00:21:25.000000000 -0500 @@ -24,7 +24,7 @@ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ conduit_DATA = e-todo-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) --- evolution-2.5.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2006-01-11 00:22:26.000000000 -0500 +++ evolution-2.5.4/calendar/conduits/memo/Makefile.am 2006-01-11 00:22:39.000000000 -0500 @@ -24,7 +24,7 @@ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ conduit_DATA = e-memo-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) evolution-2.5.4-fix-conduits.patch: addressbook/conduit/address-conduit.c | 48 +++++++++++++++++------- calendar/conduits/calendar/calendar-conduit.c | 51 ++++++++++++++++++-------- calendar/conduits/memo/memo-conduit.c | 44 +++++++++++++++------- calendar/conduits/todo/todo-conduit.c | 45 ++++++++++++++++------ 4 files changed, 136 insertions(+), 52 deletions(-) --- NEW FILE evolution-2.5.4-fix-conduits.patch --- --- evolution-2.5.4/addressbook/conduit/address-conduit.c.fix-conduits 2005-12-08 03:15:02.000000000 -0500 +++ evolution-2.5.4/addressbook/conduit/address-conduit.c 2006-01-10 19:33:44.000000000 -0500 @@ -462,14 +462,19 @@ { static char buff[ 4096 ]; struct Address addr; + pi_buffer_t piBuf; if (remote == NULL) { sprintf (buff, "[NULL]"); return buff; } + piBuf.data = remote->record; + piBuf.allocated = remote->length; + piBuf.used = remote->length; + memset (&addr, 0, sizeof (struct Address)); - unpack_Address (&addr, remote->record, remote->length); + unpack_Address (&addr, &piBuf, address_v1); g_snprintf (buff, 4096, "['%s' '%s' '%s']", addr.entry[entryLastname] ? @@ -791,7 +796,8 @@ EAddrConduitContext *ctxt) { GnomePilotRecord p; - static char record[0xffff]; + static unsigned char record[0xffff]; + pi_buffer_t piBuf; g_assert (local->addr != NULL ); @@ -803,9 +809,17 @@ p.archived = local->local.archived; p.secret = local->local.secret; + memset (&piBuf, 0, sizeof (piBuf)); + memset (record, 0, sizeof (record)); + pack_Address (local->addr, &piBuf, address_v1); + /* Generate pilot record structure */ + if (piBuf.used > 0) + memcpy (record, piBuf.data, piBuf.used); p.record = record; - p.length = pack_Address (local->addr, p.record, 0xffff); + p.length = piBuf.used; + if (piBuf.data) + free (piBuf.data); return p; } @@ -834,16 +848,16 @@ */ if (local->local.ID != 0) { struct Address addr; - char record[0xffff]; + pi_buffer_t *buffer = pi_buffer_new (0xffff); int cat = 0; if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, ctxt->dbi->db_handle, - local->local.ID, &record, - NULL, NULL, NULL, &cat) > 0) { + local->local.ID, buffer, + NULL, NULL, &cat) > 0) { local->local.category = cat; memset (&addr, 0, sizeof (struct Address)); - unpack_Address (&addr, record, 0xffff); + unpack_Address (&addr, buffer, address_v1); for (i = 0; i < 5; i++) { if (addr.entry[entryPhone1 + i]) local->addr->entry[entryPhone1 + i] = @@ -858,6 +872,8 @@ } free_Address (&addr); } + + pi_buffer_free (buffer); } local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME)); @@ -1019,10 +1035,16 @@ EContactField next_mail, next_home, next_work, next_fax; EContactField next_other, next_main, next_pager, next_mobile; int i; + pi_buffer_t piBuf; g_return_val_if_fail(remote!=NULL,NULL); memset (&address, 0, sizeof (struct Address)); - unpack_Address (&address, remote->record, remote->length); + + piBuf.data = remote->record; + piBuf.allocated = remote->length; + piBuf.used = remote->length; + + unpack_Address (&address, &piBuf, address_v1); if (in_contact == NULL) contact = e_contact_new (); @@ -1212,7 +1234,7 @@ EBookQuery *query; GList *l; int len; - unsigned char *buf; + pi_buffer_t *buffer; char *filename; char *change_id; char *auth; @@ -1302,9 +1324,9 @@ gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records); gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records); - buf = (unsigned char*)g_malloc (0xffff); + buffer = pi_buffer_new (0xffff); len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, - (unsigned char *)buf, 0xffff); + -1, buffer); if (len < 0) { WARN (_("Could not read pilot's Address application block")); @@ -1313,8 +1335,8 @@ _("Could not read pilot's Address application block")); return -1; } - unpack_AddressAppInfo (&(ctxt->ai), buf, len); - g_free (buf); + unpack_AddressAppInfo (&(ctxt->ai), buffer->data, len); + pi_buffer_free (buffer); check_for_slow_setting (conduit, ctxt); if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot --- evolution-2.5.4/calendar/conduits/calendar/calendar-conduit.c.fix-conduits 2006-01-02 06:38:57.000000000 -0500 +++ evolution-2.5.4/calendar/conduits/calendar/calendar-conduit.c 2006-01-10 19:33:44.000000000 -0500 @@ -413,14 +413,20 @@ { static char buff[ 4096 ]; struct Appointment appt; + pi_buffer_t piBuf; if (remote == NULL) { sprintf (buff, "[NULL]"); return buff; } + + piBuf.data = remote->record; + piBuf.allocated = remote->length; + piBuf.used = remote->length; + memset (&appt, 0, sizeof (struct Appointment)); - unpack_Appointment (&appt, remote->record, remote->length); + unpack_Appointment (&appt, &piBuf, datebook_v1); g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']", mktime (&appt.begin), @@ -818,7 +824,8 @@ ECalConduitContext *ctxt) { GnomePilotRecord p; - static char record[0xffff]; + static unsigned char record[0xffff]; + pi_buffer_t piBuf; g_assert (local->comp != NULL); g_assert (local->appt != NULL ); @@ -829,9 +836,17 @@ p.archived = local->local.archived; p.secret = local->local.secret; + memset (&piBuf, 0, sizeof (piBuf)); + memset (record, 0, sizeof (record)); + pack_Appointment (local->appt, &piBuf, datebook_v1); + /* Generate pilot record structure */ + if (piBuf.used > 0) + memcpy (record, piBuf.data, piBuf.used); p.record = record; - p.length = pack_Appointment (local->appt, p.record, 0xffff); + p.length = piBuf.used; + if (piBuf.data) + free (piBuf.data); return p; } @@ -867,22 +882,24 @@ * we don't overwrite them */ if (local->local.ID != 0) { - struct Appointment appt; - char record[0xffff]; + struct Appointment appt; + pi_buffer_t *buffer = pi_buffer_new (0xffff); int cat = 0; if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, ctxt->dbi->db_handle, - local->local.ID, &record, - NULL, NULL, NULL, &cat) > 0) { + local->local.ID, buffer, + NULL, NULL, &cat) > 0) { local->local.category = cat; memset (&appt, 0, sizeof (struct Appointment)); - unpack_Appointment (&appt, record, 0xffff); + unpack_Appointment (&appt, buffer, datebook_v1); local->appt->alarm = appt.alarm; local->appt->advance = appt.advance; local->appt->advanceUnits = appt.advanceUnits; free_Appointment (&appt); } + + pi_buffer_free (buffer); } /* STOP: don't replace these with g_strdup, since free_Appointment @@ -1140,11 +1157,17 @@ GSList *edl = NULL; char *txt; int pos, i; + pi_buffer_t piBuf; g_return_val_if_fail (remote != NULL, NULL); + + piBuf.data = remote->record; + piBuf.allocated = remote->length; + piBuf.used = remote->length; + memset (&appt, 0, sizeof (struct Appointment)); - unpack_Appointment (&appt, remote->record, remote->length); + unpack_Appointment (&appt, &piBuf, datebook_v1); if (in_comp == NULL) { comp = e_cal_component_new (); @@ -1409,7 +1432,7 @@ GnomePilotConduitSyncAbs *abs_conduit; GList *removed = NULL, *added = NULL, *l; int len; - unsigned char *buf; + pi_buffer_t *buffer; char *filename, *change_id; icalcomponent *icalcomp; gint num_records, add_records = 0, mod_records = 0, del_records = 0; @@ -1521,9 +1544,9 @@ gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records); gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records); - buf = (unsigned char*)g_malloc (0xffff); + buffer = pi_buffer_new (0xffff); len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, - (unsigned char *)buf, 0xffff); + -1, buffer); if (len < 0) { WARN (_("Could not read pilot's Calendar application block")); @@ -1532,8 +1555,8 @@ _("Could not read pilot's Calendar application block")); return -1; } - unpack_AppointmentAppInfo (&(ctxt->ai), buf, len); - g_free (buf); + unpack_AppointmentAppInfo (&(ctxt->ai), buffer->data, len); + pi_buffer_free (buffer); check_for_slow_setting (conduit, ctxt); if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot --- evolution-2.5.4/calendar/conduits/todo/todo-conduit.c.fix-conduits 2005-12-08 03:15:03.000000000 -0500 +++ evolution-2.5.4/calendar/conduits/todo/todo-conduit.c 2006-01-10 19:33:44.000000000 -0500 @@ -402,14 +402,19 @@ { static char buff[ 4096 ]; struct ToDo todo; + pi_buffer_t piBuf; if (remote == NULL) { sprintf (buff, "[NULL]"); return buff; } + piBuf.data = remote->record; + piBuf.allocated = remote->length; + piBuf.used = remote->length; + memset (&todo, 0, sizeof (struct ToDo)); - unpack_ToDo (&todo, remote->record, remote->length); + unpack_ToDo (&todo, &piBuf, todo_v1); g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]", todo.indefinite, @@ -594,7 +599,8 @@ EToDoConduitContext *ctxt) { GnomePilotRecord p; - static char record[0xffff]; + static unsigned char record[0xffff]; + pi_buffer_t piBuf; g_assert (local->comp != NULL); g_assert (local->todo != NULL ); @@ -607,9 +613,17 @@ p.archived = local->local.archived; p.secret = local->local.secret; + memset (&piBuf, 0, sizeof (piBuf)); + memset (record, 0, sizeof (record)); + pack_ToDo (local->todo, &piBuf, todo_v1); + /* Generate pilot record structure */ + if (piBuf.used > 0) + memcpy (record, piBuf.data, piBuf.used); p.record = record; - p.length = pack_ToDo (local->todo, p.record, 0xffff); + p.length = piBuf.used; + if (piBuf.data) + free (piBuf.data); return p; } @@ -696,15 +710,17 @@ /* Don't overwrite the category */ if (local->local.ID != 0) { - char record[0xffff]; + pi_buffer_t *buffer = pi_buffer_new (0xffff); int cat = 0; if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, ctxt->dbi->db_handle, - local->local.ID, &record, - NULL, NULL, NULL, &cat) > 0) { + local->local.ID, buffer, + NULL, NULL, &cat) > 0) { local->local.category = cat; } + + pi_buffer_free (buffer); } /* @@ -859,12 +875,17 @@ icaltimezone *utc_zone; int priority; char *txt; + pi_buffer_t piBuf; char *category; g_return_val_if_fail (remote != NULL, NULL); + piBuf.data = remote->record; + piBuf.allocated = remote->length; + piBuf.used = remote->length; + memset (&todo, 0, sizeof (struct ToDo)); - unpack_ToDo (&todo, remote->record, remote->length); + unpack_ToDo (&todo, &piBuf, todo_v1); utc_zone = icaltimezone_get_utc_timezone (); now = icaltime_from_timet_with_zone (time (NULL), FALSE, @@ -1014,7 +1035,7 @@ GnomePilotConduitSyncAbs *abs_conduit; GList *l; int len; - unsigned char *buf; + pi_buffer_t *buffer; char *filename, *change_id; icalcomponent *icalcomp; gint num_records, add_records = 0, mod_records = 0, del_records = 0; @@ -1104,9 +1125,9 @@ g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n", num_records, add_records, mod_records, del_records); - buf = (unsigned char*)g_malloc (0xffff); + buffer = pi_buffer_new (0xffff); len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, - (unsigned char *)buf, 0xffff); + -1, buffer); if (len < 0) { WARN (_("Could not read pilot's ToDo application block")); @@ -1115,8 +1136,8 @@ _("Could not read pilot's ToDo application block")); return -1; } - unpack_ToDoAppInfo (&(ctxt->ai), buf, len); - g_free (buf); + unpack_ToDoAppInfo (&(ctxt->ai), buffer->data, len); + pi_buffer_free (buffer); lastDesktopUniqueID = 128; --- evolution-2.5.4/calendar/conduits/memo/memo-conduit.c.fix-conduits 2006-01-10 22:52:28.000000000 -0500 +++ evolution-2.5.4/calendar/conduits/memo/memo-conduit.c 2006-01-10 23:11:47.000000000 -0500 @@ -331,14 +331,19 @@ { static char buff[ 64 ]; struct Memo memo; + pi_buffer_t piBuf; if (remote == NULL) { sprintf (buff, "[NULL]"); return buff; } + piBuf.data = remote->record; + piBuf.allocated = remote->length; + piBuf.used = remote->length; + memset (&memo, 0, sizeof (struct Memo)); - unpack_Memo (&memo, remote->record, remote->length); + unpack_Memo (&memo, &piBuf, memo_v1); g_snprintf (buff, 64, "['%s']", memo.text ? @@ -451,7 +456,8 @@ EMemoConduitContext *ctxt) { GnomePilotRecord p; - static char record[0xffff]; + static unsigned char record[0xffff]; + pi_buffer_t piBuf; g_assert (local->comp != NULL); g_assert (local->memo != NULL ); @@ -466,8 +472,14 @@ /* Generate pilot record structure */ p.record = record; - p.length = pack_Memo (local->memo, p.record, 0xffff); - + memset (&piBuf, 0, sizeof (piBuf)); + memset (record, 0, sizeof (record)); + p.length = pack_Memo (local->memo, &piBuf, memo_v1); + if (piBuf.used > 0) + memcpy (record, piBuf.data, piBuf.used); + p.length = piBuf.used; + if (piBuf.data) + free (piBuf.data); return p; } @@ -568,16 +580,17 @@ /* Don't overwrite the category */ if (local->local.ID != 0) { - char record[0xffff]; + pi_buffer_t *buffer = pi_buffer_new (0xffff); int cat = 0; LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n")); if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, ctxt->dbi->db_handle, - local->local.ID, &record, - NULL, NULL, NULL, &cat) > 0) { + local->local.ID, buffer, + NULL, NULL, &cat) > 0) { local->local.category = cat; } + pi_buffer_free (buffer); LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n")); } @@ -699,6 +712,7 @@ { ECalComponent *comp; struct Memo memo; + pi_buffer_t piBuf; struct icaltimetype now; icaltimezone *utc_zone; char *txt, *txt2, *txt3; @@ -707,8 +721,12 @@ g_return_val_if_fail (remote != NULL, NULL); + piBuf.data = remote->record; + piBuf.allocated = remote->length; + piBuf.used = remote->length; + memset (&memo, 0, sizeof (struct Memo)); - unpack_Memo (&memo, remote->record, remote->length); + unpack_Memo (&memo, &piBuf, memo_v1); utc_zone = icaltimezone_get_utc_timezone (); now = icaltime_from_timet_with_zone (time (NULL), FALSE, @@ -836,7 +854,7 @@ GnomePilotConduitSyncAbs *abs_conduit; GList *l; int len; - unsigned char *buf; + pi_buffer_t *buffer; char *filename, *change_id; icalcomponent *icalcomp; gint num_records, add_records = 0, mod_records = 0, del_records = 0; @@ -929,9 +947,9 @@ g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n", num_records, add_records, mod_records, del_records); - buf = (unsigned char*)g_malloc (0xffff); + buffer = pi_buffer_new (0xffff); len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, - (unsigned char *)buf, 0xffff); + -1, buffer); if (len < 0) { WARN (_("Could not read pilot's Memo application block")); @@ -940,8 +958,8 @@ _("Could not read pilot's Memo application block")); return -1; } - unpack_MemoAppInfo (&(ctxt->ai), buf, len); - g_free (buf); + unpack_MemoAppInfo (&(ctxt->ai), buffer->data, len); + pi_buffer_free (buffer); lastDesktopUniqueID = 128; Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- evolution.spec 4 Jan 2006 19:49:28 -0000 1.109 +++ evolution.spec 11 Jan 2006 05:57:14 -0000 1.110 @@ -19,7 +19,7 @@ %ifarch s390 s390x %define pilot_support 0 %else -%define pilot_support 0 +%define pilot_support 1 %endif # note that nntp is non-functional in evo 1.3.x %define nntp_support 1 @@ -32,7 +32,7 @@ Name: evolution Version: 2.5.4 -Release: 2 +Release: 3 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -81,10 +81,10 @@ #Patch700: evolution-1.5.9.1-filechooser.patch # Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams): -Patch800: evolution-2.5.2-fix-conduits.patch +Patch800: evolution-2.5.4-fix-conduits.patch # Move .conduit files from share to lib (for the sake of multilib) -Patch802: evolution-2.2.2-fix-conduit-dir.patch +Patch802: evolution-2.5.4-fix-conduit-dir.patch # Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools): Patch803: evolution-2.5.2-no-gnome-common.patch @@ -144,7 +144,7 @@ BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version} # audio-inline plugin requires gstreamer to build: -BuildRequires: gstreamer-devel +BuildRequires: gstreamer08-devel %if %{ldap_support} BuildRequires: openldap-devel >= 2.0.11 @@ -499,6 +499,15 @@ %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Tue Jan 10 2006 David Malcolm - 2.5.4-3 +- updated patch 800 to include patch for memo conduit (untested at this stage); + renaming from evolution-2.5.2-fix-conduits.patch to + evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the memo + conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to + evolution-2.5.4-fix-conduit-dir.patch; re-enable conduits in build (#175160) +- switch the build-time dep for the audio-inline plugin from gstreamer-devel to + gstreamer08-devel to better reflect the test in the tarball's configure.in + * Wed Jan 4 2006 David Malcolm - 2.5.4-2 - added optional build-time requirement on NetworkManager-glib-devel - update patch 805 to cover a missing declaration in Network Manager support --- evolution-2.2.2-fix-conduit-dir.patch DELETED --- --- evolution-2.5.2-fix-conduits.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 11 08:22:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 03:22:35 -0500 Subject: rpms/groff/devel groff-1.18.1.1-bigendian.patch, NONE, 1.1 groff.spec, 1.31, 1.32 Message-ID: <200601110822.k0B8MZVV010254@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10239 Modified Files: groff.spec Added Files: groff-1.18.1.1-bigendian.patch Log Message: fix segfault in grotty on 64-bit big endian machines groff-1.18.1.1-bigendian.patch: input.cc | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE groff-1.18.1.1-bigendian.patch --- --- groff-1.18.1.1/src/libs/libdriver/input.cc.orig 2006-01-10 11:11:36.000000000 +0100 +++ groff-1.18.1.1/src/libs/libdriver/input.cc 2006-01-10 11:11:52.000000000 +0100 @@ -1786,7 +1786,7 @@ if (npages <= 0) fatal_command(command); char *str_arg = get_string_arg(); - size_t i = 0; + int i = 0; while ((c = str_arg[i++]) != '\0') { EnvInt w; #ifdef ENABLE_MULTIBYTE Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- groff.spec 6 Jan 2006 19:36:42 -0000 1.31 +++ groff.spec 11 Jan 2006 08:22:33 -0000 1.32 @@ -3,7 +3,7 @@ Summary: A document formatting system. Name: groff Version: 1.18.1.1 -Release: 7 +Release: 8 License: GPL Group: Applications/Publishing Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz @@ -29,6 +29,7 @@ Patch19: groff-1.18.1.1-grn.patch Patch20: groff-1.18.1.1-tempfile.patch Patch21: groff-1.18.1.1-gcc41.patch +Patch22: groff-1.18.1.1-bigendian.patch URL: ftp://ftp.gnu.org/gnu/groff/ Requires: mktemp @@ -94,6 +95,7 @@ %patch19 -p1 -b .grn %patch20 -p1 -b .tempfile %patch21 -p1 -b .gcc41 +%patch22 -p1 -b .bigendian for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \ src/devices/grolbp/grolbp.man; do @@ -205,6 +207,9 @@ %endif %changelog +* Fri Jan 10 2006 Miroslav Lichvar - 1.18.1.1-8 +- fix segfault in grotty on 64-bit big endian machines (#176904) + * Fri Jan 06 2006 Jindrich Novy - 1.18.1.1-7 - require X dependencies only for gxditview (#177118) - work if bash's noclobber is on (#127492) From fedora-cvs-commits at redhat.com Wed Jan 11 08:51:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 03:51:43 -0500 Subject: rpms/evolution-sharp/devel evolution-sharp-0.10.2-evolibdir.patch, NONE, 1.1 evolution-sharp-evo26.patch, 1.1, 1.2 evolution-sharp.spec, 1.6, 1.7 Message-ID: <200601110851.k0B8phaP007669@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/evolution-sharp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7386 Modified Files: evolution-sharp-evo26.patch evolution-sharp.spec Added Files: evolution-sharp-0.10.2-evolibdir.patch Log Message: * Tue Jan 10 2006 Alexander Larsson - 0.10.2-3 - Fix evo 2.6 patch - Add evolibdir pkg-config variable patch from cvs (modified for evo 2.6) evolution-sharp-0.10.2-evolibdir.patch: configure.in | 3 +++ evolution-sharp.pc.in | 2 ++ 2 files changed, 5 insertions(+) --- NEW FILE evolution-sharp-0.10.2-evolibdir.patch --- Index: configure.in =================================================================== RCS file: /cvs/gnome/evolution-sharp/configure.in,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- configure.in 12 Sep 2005 21:00:26 -0000 1.28 +++ configure.in 6 Dec 2005 20:36:00 -0000 1.29 @@ -111,6 +111,9 @@ PKG_CHECK_MODULES(EVO_SHELL, "evolution- AC_SUBST(EVO_SHELL_CFLAGS) AC_SUBST(EVO_SHELL_LIBS) +EVO_SHELL_LIBDIR=`$PKG_CONFIG --variable=privlibdir evolution-shell-2.6` +AC_SUBST(EVO_SHELL_LIBDIR) + API_VERSION=2.0.0.0 AC_SUBST(API_VERSION) Index: evolution-sharp.pc.in =================================================================== RCS file: /cvs/gnome/evolution-sharp/evolution-sharp.pc.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -p -r1.3 -r1.4 --- evolution-sharp.pc.in 2 Jun 2004 00:59:26 -0000 1.3 +++ evolution-sharp.pc.in 6 Dec 2005 20:36:00 -0000 1.4 @@ -1,6 +1,8 @@ prefix=@prefix@ libdir=${prefix}/lib +evolibdir=@EVO_SHELL_LIBDIR@ + Name: Evolution# Description: Evolution# - Evolution .NET Binding Version: @VERSION@ evolution-sharp-evo26.patch: configure.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: evolution-sharp-evo26.patch =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp-evo26.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-sharp-evo26.patch 9 Jan 2006 19:06:04 -0000 1.1 +++ evolution-sharp-evo26.patch 11 Jan 2006 08:51:39 -0000 1.2 @@ -1,5 +1,14 @@ --- evolution-sharp-0.10.2/configure.in- 2005-09-12 16:55:58.000000000 -0400 +++ evolution-sharp-0.10.2/configure.in 2005-10-29 15:10:16.000000000 -0400 +@@ -15,7 +15,7 @@ + PKG_CHECK_MODULES(BASE_DEPENDENCIES, evolution-data-server-1.2 >= 1.3.5, eds13=yes, eds13=no) + if test "x$eds13" = "xyes"; then + EDS_VERSION=-1.2 +- EDS_SOVERSION=4 ++ EDS_SOVERSION=6 + EBOOK_SOVERSION=5 + ECAL_SOVERSION=3 + else @@ -107,7 +107,7 @@ AC_MSG_RESULT($IDL_INCLUDES) AC_SUBST(IDL_INCLUDES) Index: evolution-sharp.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- evolution-sharp.spec 9 Jan 2006 19:06:04 -0000 1.6 +++ evolution-sharp.spec 11 Jan 2006 08:51:39 -0000 1.7 @@ -1,14 +1,15 @@ Name: evolution-sharp Version: 0.10.2 -Release: 2 +Release: 3 Summary: Evolution Data Server Mono Bindings Group: System Environment/Libraries License: LGPL URL: http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/0.10/ Source0: evolution-sharp-%{version}.tar.bz2 -Patch1: evolution-sharp-mono-lib.patch +Patch1: evolution-sharp-mono-lib.patch Patch2: evolution-sharp-evo26.patch +Patch3: evolution-sharp-0.10.2-evolibdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: evolution-data-server-devel mono-devel gtk-sharp2-gapi @@ -26,6 +27,7 @@ %setup -q %patch1 -p0 -b .libs %patch2 -p1 -b .evo26 +%patch3 -p0 -b .evolibdir %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -55,6 +57,10 @@ %{_prefix}/share/gapi-2.0/* %changelog +* Tue Jan 10 2006 Alexander Larsson - 0.10.2-3 +- Fix evo 2.6 patch +- Add evolibdir pkg-config variable patch from cvs (modified for evo 2.6) + * Mon Jan 9 2006 Alexander Larsson - 0.10.2-2 - Add s390 arch - Build with evo 2.6 From fedora-cvs-commits at redhat.com Wed Jan 11 09:10:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 04:10:13 -0500 Subject: rpms/beagle/devel beagle.spec,1.13,1.14 Message-ID: <200601110910.k0B9AD3T013858@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13751 Modified Files: beagle.spec Log Message: * Wed Jan 11 2006 Alexander Larsson - 0.1.4-3 - Rebuild with fixed evolution-sharp Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- beagle.spec 9 Jan 2006 21:22:50 -0000 1.13 +++ beagle.spec 11 Jan 2006 09:10:10 -0000 1.14 @@ -1,6 +1,6 @@ Name: beagle Version: 0.1.4 -Release: 2 +Release: 3 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -13,7 +13,8 @@ BuildRequires: mono-devel mono-data mono-data-sqlite gmime-sharp gecko-sharp2 BuildRequires: gtk-sharp2-gapi sqlite2-devel mono-web zip libexif-devel -BuildRequires: mozilla-devel evolution-sharp gsf-sharp +BuildRequires: mozilla-devel gsf-sharp +BuildRequires: evolution-sharp >= 0.10.2-3 Requires: sqlite2 xpdf zip mono-core # Mono only availible on these: (s390x disabled for now) @@ -143,6 +144,9 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Wed Jan 11 2006 Alexander Larsson - 0.1.4-3 +- Rebuild with fixed evolution-sharp + * Mon Jan 9 2006 Alexander Larsson - 0.1.4-2 - Don't package libbeagle twice From fedora-cvs-commits at redhat.com Wed Jan 11 10:04:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 05:04:08 -0500 Subject: rpms/libgdiplus/devel libgdiplus.spec,1.6,1.7 Message-ID: <200601111004.k0BA48sn013790@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/libgdiplus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13780 Modified Files: libgdiplus.spec Log Message: Don't package debug info Index: libgdiplus.spec =================================================================== RCS file: /cvs/dist/rpms/libgdiplus/devel/libgdiplus.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libgdiplus.spec 9 Jan 2006 13:57:25 -0000 1.6 +++ libgdiplus.spec 11 Jan 2006 10:03:56 -0000 1.7 @@ -1,6 +1,6 @@ Name: libgdiplus Version: 1.1.11 -Release: 1 +Release: 2 Summary: libgdiplus: An Open Source implementation of the GDI+ API Group: System Environment/Libraries @@ -38,17 +38,19 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.a rm $RPM_BUILD_ROOT%{_libdir}/*.la - %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%{_libdir}/* +%{_libdir}/lib* %{_libdir}/pkgconfig/* %changelog +* Wed Jan 11 2006 Alexander Larsson 1.1.11-2 +- Don't package debug info + * Mon Jan 9 2006 Alexander Larsson - 1.1.11-1 - Update to 1.1.11 From fedora-cvs-commits at redhat.com Wed Jan 11 12:04:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 07:04:13 -0500 Subject: rpms/groff/devel groff-1.18.1-gzext.patch,1.3,1.4 Message-ID: <200601111204.k0BC4Dl0028501@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28481 Modified Files: groff-1.18.1-gzext.patch Log Message: fix assertion failure in abort message (#141912) groff-1.18.1-gzext.patch: input.cc | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) Index: groff-1.18.1-gzext.patch =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff-1.18.1-gzext.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- groff-1.18.1-gzext.patch 5 Jan 2006 14:49:14 -0000 1.3 +++ groff-1.18.1-gzext.patch 11 Jan 2006 12:04:00 -0000 1.4 @@ -15,7 +15,7 @@ + else if ((path = realpath(nm.contents(), pbuf)) == NULL && + (path = realpath(tmp, pbuf)) == NULL) + { -+ error("realpath on `%1' failed: %3", nm.contents(), strerror(errno)); ++ error("realpath on `%1' failed: %2", nm.contents(), strerror(errno)); + } else if (safer_flag && strncmp(cwd, path, strlen(cwd))) error("won't source `%1' outside of `%2' without -U flag", path, cwd); else if (stat(path, &st) < 0) From fedora-cvs-commits at redhat.com Wed Jan 11 12:11:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 07:11:27 -0500 Subject: rpms/udev/devel start_udev, 1.48, 1.49 udev-078-redhat.patch, 1.2, 1.3 udev.nodes, 1.1, 1.2 udev.spec, 1.136, 1.137 Message-ID: <200601111211.k0BCBRca028573@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28557 Modified Files: start_udev udev-078-redhat.patch udev.nodes udev.spec Log Message: - removed group "video" from the rules - fixed specfile - load nvram, floppy, parport and lp modules in /etc/sysconfig/modules/udev-stw.modules until there is a better solution - fixed more floppy module loading Index: start_udev =================================================================== RCS file: /cvs/dist/rpms/udev/devel/start_udev,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- start_udev 21 Dec 2005 11:36:19 -0000 1.48 +++ start_udev 11 Jan 2006 12:11:24 -0000 1.49 @@ -100,40 +100,6 @@ done } -# we cannot use /usr/bin/find here -find_d () { - where=$1 - what=$2 - found="" - for f in $where/*; do - if [ -d "$f" -a ! -L "$f" ]; then - if [ "$f" != "${f%%$what}" ];then - # make sure we are at the path end - # we have no dirname and basename - rest="${f#*$what}" - [ "${rest##*/}" = "$rest" ] && found="$found $f" - fi - found="$found $(find_d $f $what)" - fi - done - echo "$found" -} - -# we cannot use /usr/bin/find here -find_f () { - where=$1 - what=$2 - found="" - for f in $where/*; do - if [ -d "$f" -a ! -L "$f" ]; then - found="$found $(find_f $f $what)" - elif [ -e "$f" ]; then - [ "$where/" = "${f%$what}" ] && found="$found $f" - fi - done - [ -n "$found" ] && echo "$found" -} - kill_udevd() { if [ -x /sbin/pidof ]; then pid=`/sbin/pidof -x udevd` @@ -142,54 +108,6 @@ } -# call hotplug with the scsi devices -scsi_replay () { - HOTPLUG="/sbin/udevsend" - - scsi_hosts=$(find_d /sys/devices host\*) - - for host in $scsi_hosts;do - [ -d $host ] || continue - devs=$(find_f $host type) - for dev in $devs;do - [ -f $dev ] || continue - DEVPATH=${dev%/type} - DEVPATH=${DEVPATH#/sys} - /bin/env -i DEVPATH="$DEVPATH" SUBSYSTEM=scsi_device ACTION=add $HOTPLUG scsi_device - /bin/env -i DEVPATH="$DEVPATH" ACTION=add SUBSYSTEM=scsi $HOTPLUG scsi - done - done - return 0 -} - -ide_scan() { - if [ ! -d /proc/ide ]; then - return 1 - fi - for i in /proc/ide/*/media; do - read media < "$i" - case "$media" in - disk) - module=ide-disk - ;; - cdrom) - module=ide-cd - ;; - tape) - module=ide-tape - ;; - floppy) - module=ide-floppy - ;; - *) - module=ide-generic - ;; - esac - /sbin/modprobe $module - done - return 0 -} - wait_for_queue() { loop=20 while test ! -d /dev/.udev/queue; do udev-078-redhat.patch: etc/udev/redhat/udev.rules | 99 +++++++++++---------- extras/check-cdrom.sh | 39 ++++++++ extras/floppy/create_floppy_devices.c | 6 + extras/ide-media.sh | 7 + extras/load_floppy_module.sh | 35 +++++++ extras/run_directory/MAKEDEV.dev | 38 ++++++++ extras/run_directory/dev.d/default/pam_console.dev | 18 --- extras/udevpermconv.sh | 94 +++++++++++++++++++ 8 files changed, 277 insertions(+), 59 deletions(-) Index: udev-078-redhat.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-078-redhat.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- udev-078-redhat.patch 23 Dec 2005 12:41:33 -0000 1.2 +++ udev-078-redhat.patch 11 Jan 2006 12:11:24 -0000 1.3 @@ -1,5 +1,5 @@ --- udev-078/etc/udev/redhat/udev.rules.redhat 2005-12-17 16:40:29.000000000 +0100 -+++ udev-078/etc/udev/redhat/udev.rules 2005-12-23 13:35:57.000000000 +0100 ++++ udev-078/etc/udev/redhat/udev.rules 2006-01-11 12:53:26.000000000 +0100 @@ -3,6 +3,11 @@ # # default is OWNER="root" GROUP="root", MODE="0600" @@ -103,6 +103,15 @@ # audio devices KERNEL=="dsp*", MODE="0660" +@@ -209,7 +224,7 @@ + KERNEL=="fd[0-9]*", SYMLINK+="floppy%e" + KERNEL=="nst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660" + KERNEL=="nosst[0-9]", BUS=="scsi", SYMLINK+="tape%e", MODE="0660" +-KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="6", SYMLINK+="scanner%e", MODE="0660" ++KERNEL=="sg[0-9]*", BUS="scsi", SYSFS{type}=="[36]", SYMLINK+="scanner%e", MODE="0660" + + KERNEL=="umad*", NAME="infiniband/%k" + KERNEL=="issm*", NAME="infiniband/%k" @@ -224,24 +239,25 @@ BUS=="scsi", KERNEL=="sg[0-9]*", SYSFS{type}=="6", NAME="%k", SYMLINK="scanner%e", MODE="0660" @@ -133,19 +142,40 @@ -KERNEL=="dvb*", PROGRAM=="/lib/udev/dvb.sh %k", NAME="%c" +# dvb -+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video" ++SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c" ####################################### # Persistent block device stuff - begin -@@ -331,3 +347,6 @@ +@@ -301,19 +317,11 @@ + + + # Perhaps this should just be for all subsystems? ++ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias" + +-ACTION=="add", SUBSYSTEM=="pci", MODALIAS=="*", \ +- RUN+="/sbin/modprobe $modalias" +-ACTION=="add", SUBSYSTEM=="usb", MODALIAS=="*", \ +- RUN+="/sbin/modprobe $modalias" +-ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \ +- RUN+="/sbin/modprobe $modalias" + ACTION=="add", SUBSYSTEM=="pcmcia", MODALIAS=="*", \ + RUN+="/bin/sh -c 'echo 1 > /sys/$DEVPATH/allow_func_id_match'" + +-ACTION=="add", SUBSYSTEM=="ieee1394", MODALIAS=="*", \ +- RUN+="/sbin/modprobe $modalias" +- + ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \ + RUN+="/sbin/modprobe sd_mod" + ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \ +@@ -331,3 +339,6 @@ ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \ RUN+="/sbin/firmware_helper" + +RUN+="socket:/org/kernel/udev/monitor" + ---- /dev/null 2005-12-16 16:12:26.451912136 +0100 -+++ udev-078/extras/ide-media.sh 2005-12-23 08:34:06.000000000 +0100 +--- /dev/null 2006-01-06 12:23:50.344776400 +0100 ++++ udev-078/extras/ide-media.sh 2006-01-11 12:53:26.000000000 +0100 @@ -0,0 +1,7 @@ +#!/bin/bash +i=0 @@ -154,8 +184,8 @@ + i=$[i+1]; +done +/bin/cat /proc/ide/$1/media ---- /dev/null 2005-12-16 16:12:26.451912136 +0100 -+++ udev-078/extras/run_directory/MAKEDEV.dev 2005-12-23 08:34:06.000000000 +0100 +--- /dev/null 2006-01-06 12:23:50.344776400 +0100 ++++ udev-078/extras/run_directory/MAKEDEV.dev 2006-01-11 12:53:26.000000000 +0100 @@ -0,0 +1,38 @@ +#!/bin/sh + @@ -196,7 +226,7 @@ + /sbin/pam_console_apply $DEVNAME* +fi --- udev-078/extras/run_directory/dev.d/default/pam_console.dev.redhat 2005-12-17 16:40:29.000000000 +0100 -+++ udev-078/extras/run_directory/dev.d/default/pam_console.dev 2005-12-23 08:34:06.000000000 +0100 ++++ udev-078/extras/run_directory/dev.d/default/pam_console.dev 2006-01-11 12:53:26.000000000 +0100 @@ -1,16 +1,11 @@ #!/bin/sh @@ -238,8 +268,8 @@ + debug_mesg "Restoring console permissions for $DEVNAME $DEVLINKS" + /sbin/pam_console_apply "$DEVNAME" $DEVLINKS fi ---- /dev/null 2005-12-16 16:12:26.451912136 +0100 -+++ udev-078/extras/check-cdrom.sh 2005-12-23 08:34:06.000000000 +0100 +--- /dev/null 2006-01-06 12:23:50.344776400 +0100 ++++ udev-078/extras/check-cdrom.sh 2006-01-11 12:53:26.000000000 +0100 @@ -0,0 +1,39 @@ +#!/bin/bash + @@ -280,8 +310,8 @@ + done + exit 1 +} ---- /dev/null 2005-12-16 16:12:26.451912136 +0100 -+++ udev-078/extras/udevpermconv.sh 2005-12-23 08:34:06.000000000 +0100 +--- /dev/null 2006-01-06 12:23:50.344776400 +0100 ++++ udev-078/extras/udevpermconv.sh 2006-01-11 12:53:26.000000000 +0100 @@ -0,0 +1,94 @@ +#!/bin/bash +# @@ -377,8 +407,8 @@ + +processInput +exit 0 ---- /dev/null 2005-12-16 16:12:26.451912136 +0100 -+++ udev-078/extras/load_floppy_modules.sh 2005-12-23 08:34:06.000000000 +0100 +--- /dev/null 2006-01-06 12:23:50.344776400 +0100 ++++ udev-078/extras/load_floppy_module.sh 2006-01-11 12:53:26.000000000 +0100 @@ -0,0 +1,35 @@ +#!/bin/sh +######################################################################## @@ -409,9 +439,25 @@ +floppy_devices=$(cat $PROC | sed -n '/Floppy.*\..*/p') + +if [ -n "$floppy_devices" ]; then -+ /sbin/modprobe block-major-2 ++ /sbin/modprobe block-major-2- +else + /bin/true +fi + +exit $? +--- udev-078/extras/floppy/create_floppy_devices.c.redhat 2006-01-11 12:53:29.000000000 +0100 ++++ udev-078/extras/floppy/create_floppy_devices.c 2006-01-11 12:53:11.000000000 +0100 +@@ -116,8 +116,12 @@ + minor = (table_sup[type][i] << 2) + fdnum; + if (print_nodes) + printf("%s b %d %d %d\n", node, mode, major, minor); +- if (create_nodes) ++ if (create_nodes) { ++ char buffer[2048]; buffer[2047]='\000'; + mknod(node, S_IFBLK | mode, makedev(major,minor)); ++ snprintf(buffer, 2047, "/sbin/restorecon \"%s\" ;/sbin/pam_console_apply \"%s\" ; ", node, node); ++ system(buffer); ++ } + i++; + } + Index: udev.nodes =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.nodes,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- udev.nodes 18 Feb 2005 13:07:41 -0000 1.1 +++ udev.nodes 11 Jan 2006 12:11:24 -0000 1.2 @@ -13,10 +13,6 @@ loop5 loop6 loop7 -lp0 -lp1 -lp2 -lp3 parport0 parport1 parport2 Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- udev.spec 23 Dec 2005 12:48:26 -0000 1.136 +++ udev.spec 11 Jan 2006 12:11:24 -0000 1.137 @@ -5,7 +5,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 078 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -28,22 +28,16 @@ Prereq: /bin/sh fileutils hotplug Prereq: MAKEDEV >= 0:3.11 BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel -Requires: libselinux >= 0:1.17.9-2 MAKEDEV +BuildRequires: pam-devel glib2-devel bison +Requires: libselinux >= 0:1.17.9-2 MAKEDEV sed pam Conflicts: kernel < 0:2.6 mkinitrd <= 0:4.1.11-1 initscripts < 7.84 Obsoletes: dev Provides: dev = 0:3.12-1 -BuildRequires: pam-devel glib2-devel bison -Requires: pam - %description The udev package contains an implementation of devfs in userspace using sysfs and netlink. -Requires: sed - -%define add %{nil} - %prep %setup -q %patch1 -p1 -b .redhat @@ -159,7 +153,7 @@ install -m 0644 extras/run_directory/dev.d/default/pam_console.dev $RPM_BUILD_ROOT%{udev_scriptdir} ln -s %{udev_scriptdir}/pam_console.dev $RPM_BUILD_ROOT%{_sysconfdir}/dev.d/default/05-pam_console.dev -for i in load_floppy_modules.sh check-cdrom.sh ide-media.sh udevpermconv.sh; do +for i in load_floppy_module.sh check-cdrom.sh ide-media.sh udevpermconv.sh; do install -m 0755 extras/$i $RPM_BUILD_ROOT%{udev_scriptdir} done @@ -174,6 +168,16 @@ mkdir -p -m 0755 $RPM_BUILD_ROOT/lib/firmware +# short-term workaround +mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/modules +cat >$RPM_BUILD_ROOT/etc/sysconfig/modules/udev-stw.modules </dev/null 2>&1 +done +EOF + + %preun if [ $1 = 0 -a -f %{_initrddir}/udev ]; then /sbin/chkconfig --del udev @@ -252,7 +256,7 @@ %attr(0755,root,root) %{udev_scriptdir}/ide-media.sh %attr(0755,root,root) %{udev_scriptdir}/udevpermconv.sh %attr(0755,root,root) %{udev_scriptdir}/create_floppy_devices -%attr(0755,root,root) %{udev_scriptdir}/load_floppy_modules.sh +%attr(0755,root,root) %{udev_scriptdir}/load_floppy_module.sh %config %attr(0644,root,root) %{_sysconfdir}/udev/udev.conf @@ -263,6 +267,8 @@ #%config(missingok) %{_sysconfdir}/hotplug.d/default/10-udev.hotplug %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/scsi_id.config +%config %attr(0755,root,root)/etc/sysconfig/modules/udev-stw.modules + %dir %attr(0755,root,root) /lib/firmware %attr(0644,root,root) %{_mandir}/man8/udev*.8* %attr(0644,root,root) %{_mandir}/man8/scsi_id*.8* @@ -271,6 +277,14 @@ %attr(0644,root,root) %{_mandir}/man8/vol_id*.8* %changelog +* Tue Jan 11 2006 Harald Hoyer - 078-4 +- removed group "video" from the rules +- fixed specfile +- load nvram, floppy, parport and lp modules in + /etc/sysconfig/modules/udev-stw.modules until there + is a better solution +- fixed more floppy module loading + * Fri Dec 23 2005 Harald Hoyer - 078-3 - fixed floppy module loading - added monitor socket From fedora-cvs-commits at redhat.com Wed Jan 11 13:04:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 08:04:33 -0500 Subject: rpms/kernel/devel/configs config-generic,1.129,1.130 Message-ID: <200601111304.k0BD4XbX008890@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv8828/configs Modified Files: config-generic Log Message: Update to a proper snapshot now it's a slower-moving target Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- config-generic 11 Jan 2006 00:19:04 -0000 1.129 +++ config-generic 11 Jan 2006 13:04:31 -0000 1.130 @@ -2415,7 +2415,7 @@ # Turn off these debug options for production kernels. CONFIG_DEBUG_SLAB=y -CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_MUTEXES is not set CONFIG_KMALLOC_ACCOUNTING=y # CONFIG_WAKEUP_TIMING is not set From fedora-cvs-commits at redhat.com Wed Jan 11 13:04:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 08:04:33 -0500 Subject: rpms/kernel/devel .cvsignore, 1.320, 1.321 kernel-2.6.spec, 1.1842, 1.1843 linux-2.6-softmac-git.patch, 1.2, 1.3 sources, 1.262, 1.263 linux-2.6-bcm43xx-resume.patch, 1.2, NONE Message-ID: <200601111304.k0BD4XKv008883@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8828 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-softmac-git.patch sources Removed Files: linux-2.6-bcm43xx-resume.patch Log Message: Update to a proper snapshot now it's a slower-moving target Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.320 retrieving revision 1.321 diff -u -r1.320 -r1.321 --- .cvsignore 11 Jan 2006 00:01:10 -0000 1.320 +++ .cvsignore 11 Jan 2006 13:04:20 -0000 1.321 @@ -2,5 +2,5 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 -bcm43xx-20060106.tar.bz2 -patch-2.6.15-git6a.bz2 +bcm43xx-20060111.tar.bz2 +patch-2.6.15-git7.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1842 retrieving revision 1.1843 diff -u -r1.1842 -r1.1843 --- kernel-2.6.spec 11 Jan 2006 01:40:18 -0000 1.1842 +++ kernel-2.6.spec 11 Jan 2006 13:04:20 -0000 1.1843 @@ -183,7 +183,7 @@ Source10: COPYING.modules Source11: genkey -%define BCMVER 20060106 +%define BCMVER 20060111 Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2 Source20: kernel-%{kversion}-i586.config @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git6a.bz2 +Patch1: patch-2.6.15-git7.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -372,7 +372,6 @@ # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx.patch -Patch5002: linux-2.6-bcm43xx-resume.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -872,8 +871,6 @@ %patch5000 -p1 # Patch Kconfig and Makefiles to merge bcm43xx 'properly' %patch5001 -p1 -# Fix the reassociate on resume code -%patch5002 -p1 # # final stuff @@ -1361,6 +1358,11 @@ %changelog * Wed Jan 11 2006 David Woodhouse +- 2.6.15-git7 +- Turn off CONFIG_DEBUG_MUTEXES since it makes the G5 not boot +- Update bcm43xx and softmac + +* Wed Jan 11 2006 David Woodhouse - 2.6.15-git6a (49cd619c69d643b30a24029e40eb5364c7a26b2e) - Disable S390 linux-2.6-softmac-git.patch: include/net/ieee80211.h | 6 include/net/ieee80211softmac.h | 266 +++++++++++++ include/net/ieee80211softmac_wx.h | 66 +++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/ieee80211_module.c | 2 net/ieee80211/ieee80211_rx.c | 4 net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 366 ++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 350 +++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 135 ++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 425 +++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 211 ++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 216 ++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 390 +++++++++++++++++++ 17 files changed, 2927 insertions(+), 5 deletions(-) Index: linux-2.6-softmac-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-softmac-git.patch 10 Jan 2006 01:45:59 -0000 1.2 +++ linux-2.6-softmac-git.patch 11 Jan 2006 13:04:21 -0000 1.3 @@ -446,10 +446,10 @@ + ieee80211softmac_event.o diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c new file mode 100644 -index 0000000..085022f +index 0000000..aef018f --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c -@@ -0,0 +1,356 @@ +@@ -0,0 +1,366 @@ +#include "ieee80211softmac_priv.h" + +/* @@ -616,9 +616,14 @@ + if (mac->associnfo.bssvalid) + found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid); + -+ /* Search the ieee80211 networks for this network if we didn't find it */ -+ if (!found) ++ /* Search the ieee80211 networks for this network if we didn't find it by bssid, ++ * but only if we've scanned at least once (to get a better list of networks to ++ * select from). If we have not scanned before, the !found logic below will be ++ * invoked and will scan. */ ++ if (!found && (mac->associnfo.scan_retry < IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT)) + { ++ s8 rssi = -128; /* if I don't initialise, gcc emits an invalid warning ++ because it cannot follow the best pointer logic. */ + spin_lock_irqsave(&mac->ieee->lock, flags); + list_for_each_entry(net, &mac->ieee->network_list, list) { + /* we're supposed to find the network with @@ -626,7 +631,7 @@ + * any network with a specific ESSID, and many + * different ones could have that. + * -+ * I'll for now implement just finding one at all ++ * I'll for now just go with the reported rssi. + * + * We also should take into account the rateset + * here to find the best BSSID to try. @@ -634,15 +639,17 @@ + if (network_matches_request(mac, net)) { + if (!best) { + best = net; ++ rssi = best->stats.rssi; + continue; + } + /* we already had a matching network, so + * compare their properties to get the + * better of the two ... (see above) + */ -+ /* TODO */ -+ /* for now, just */ -+ break; ++ if (rssi < net->stats.rssi) { ++ best = net; ++ rssi = best->stats.rssi; ++ } + } + } + /* if we unlock here, we might get interrupted and the `best' @@ -666,12 +673,10 @@ + * NB: this also happens if we had no memory to copy the network info... + * Maybe we can hope to have more memory after scanning finishes ;) + */ -+ dprintk(KERN_INFO PFX "Associate: Network not known, trying to initiate scan: "); ++ dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n"); + ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify, NULL); + if (ieee80211softmac_start_scan(mac)) -+ dprintk("failed.\n"); -+ else -+ dprintk("ok.\n"); ++ dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n"); + return; + } + else { @@ -680,7 +685,7 @@ + mac->associated = 0; + spin_unlock_irqrestore(&mac->lock, flags); + -+ dprintk(KERN_INFO PFX "Unable to find network after scan!\n"); ++ dprintk(KERN_INFO PFX "Unable to find matching network after scan!\n"); + ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND, NULL); + return; + } @@ -797,11 +802,16 @@ +{ + struct ieee80211softmac_device *mac = ieee80211_priv(dev); + unsigned long flags; ++ if (memcmp(disassoc->header.addr2, mac->associnfo.bssid, ETH_ALEN)) ++ return 0; ++ if (memcmp(disassoc->header.addr1, mac->dev->dev_addr, ETH_ALEN)) ++ return 0; + dprintk(KERN_INFO PFX "got disassoc frame\n"); + netif_carrier_off(dev); + spin_lock_irqsave(&mac->lock, flags); + mac->associnfo.bssvalid = 0; + mac->associated = 0; ++ schedule_work(&mac->associnfo.work); + spin_unlock_irqrestore(&mac->lock, flags); + + return 0; @@ -1305,7 +1315,7 @@ +} diff --git a/net/ieee80211/softmac/ieee80211softmac_io.c b/net/ieee80211/softmac/ieee80211softmac_io.c new file mode 100644 -index 0000000..a142dae +index 0000000..febc51d --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_io.c @@ -0,0 +1,474 @@ @@ -1619,7 +1629,7 @@ +{ + /* Allocate Packet */ + (*pkt) = (struct ieee80211_disassoc *)ieee80211softmac_alloc_mgt(2); -+ if (unlikely(pkt == NULL)) ++ if (unlikely((*pkt) == NULL)) + return 0; + ieee80211softmac_hdr_3addr(mac, &((*pkt)->header), type, net->bssid, net->bssid); + /* Reason */ Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.262 retrieving revision 1.263 diff -u -r1.262 -r1.263 --- sources 11 Jan 2006 00:01:30 -0000 1.262 +++ sources 11 Jan 2006 13:04:21 -0000 1.263 @@ -1,3 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2 -0ec61ec3ed52b5aa640cacd23338e0ea patch-2.6.15-git6a.bz2 +e7291436e5d71b575dea034883cb42e5 bcm43xx-20060111.tar.bz2 +9bf813fab546b5a25cb9b59ce086c4b7 patch-2.6.15-git7.bz2 + --- linux-2.6-bcm43xx-resume.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 11 13:24:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 08:24:47 -0500 Subject: rpms/dump/devel dump-dmfix.patch,NONE,1.1 dump.spec,1.32,1.33 Message-ID: <200601111324.k0BDOlcm028464@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/dump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28387 Modified Files: dump.spec Added Files: dump-dmfix.patch Log Message: - link against device-mapper dump-dmfix.patch: configure | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE dump-dmfix.patch --- --- dump-0.4b41/configure.dmfix 2005-05-02 17:10:44.000000000 +0200 +++ dump-0.4b41/configure 2006-01-11 11:33:19.000000000 +0100 @@ -4317,7 +4317,7 @@ #define HAVE_BLKID 1 _ACEOF - BLKID="-lblkid -luuid" + BLKID="-lblkid -luuid -ldevmapper -lselinux -lsepol" fi Index: dump.spec =================================================================== RCS file: /cvs/dist/rpms/dump/devel/dump.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- dump.spec 10 Jan 2006 10:05:18 -0000 1.32 +++ dump.spec 11 Jan 2006 13:24:44 -0000 1.33 @@ -8,9 +8,11 @@ Group: Applications/Archiving URL: http://dump.sourceforge.net/ Source: dump-%{version}.tar.bz2 +Patch: dump-dmfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: e2fsprogs-devel >= 1.18, readline-devel >= 4.2 BuildRequires: libtermcap-devel, zlib-devel, bzip2-devel, ncurses-devel +BuildRequires: device-mapper, libselinux-devel, libsepol-devel # This Requires is now mandatory because we only ship static binaries, and # need to ensure the "disk" group is created before installation (#60461) Requires: setup @@ -41,6 +43,7 @@ %prep %setup -q +%patch -p1 -b .dmfix %build # XXX --enable-kerberos needs krcmd @@ -111,9 +114,10 @@ %{_mandir}/man8/rmt.8* %changelog -* Tue Jan 10 2006 Jindrich Novy 0.4b41-1 +* Tue Jan 11 2006 Jindrich Novy 0.4b41-1 - update to 0.4b41 - drop .fixacl patch, now applied in the new upstream release +- link against device-mapper * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 11 14:41:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 09:41:36 -0500 Subject: rpms/tetex/devel tetex-3.0-CVE-2005-3193.patch, 1.2, 1.3 tetex-3.0-texmfcnf.patch, 1.3, 1.4 tetex.spec, 1.78, 1.79 Message-ID: <200601111441.k0BEfaBK003839@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/tetex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3640 Modified Files: tetex-3.0-CVE-2005-3193.patch tetex-3.0-texmfcnf.patch tetex.spec Log Message: * Mon Jan 11 2006 Jindrich Novy 3.0-14 - apply additional patch to fix xpdf flaws from Ludwig Nussel (CVE-2005-3191, CVE-2005-3192 and CVE-2005-3193) (#177128) - /usr/share/texmf/doc is now owned by tetex package (#177065) - update searching order for kpathsea (local texmf tree is searched first) tetex-3.0-CVE-2005-3193.patch: JBIG2Stream.cc | 45 +++++++++++++++++++++++++++++++++++++++++---- JPXStream.cc | 18 +++++++++++++++--- Stream.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- Stream.h | 3 +++ 4 files changed, 106 insertions(+), 9 deletions(-) Index: tetex-3.0-CVE-2005-3193.patch =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/tetex-3.0-CVE-2005-3193.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tetex-3.0-CVE-2005-3193.patch 20 Dec 2005 10:12:04 -0000 1.2 +++ tetex-3.0-CVE-2005-3193.patch 11 Jan 2006 14:41:32 -0000 1.3 @@ -1,5 +1,5 @@ ---- tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc.CVE-2005-3193 -+++ tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc +--- tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc 2006-01-09 15:15:27.000000000 +0100 @@ -7,6 +7,7 @@ //======================================================================== @@ -8,7 +8,7 @@ #ifdef USE_GCC_PRAGMAS #pragma implementation -@@ -666,7 +667,7 @@ +@@ -666,7 +667,7 @@ GBool JPXStream::readCodestream(Guint le int segType; GBool haveSIZ, haveCOD, haveQCD, haveSOT; Guint precinctSize, style; @@ -17,7 +17,7 @@ //----- main header haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; -@@ -701,8 +702,19 @@ +@@ -701,8 +702,19 @@ GBool JPXStream::readCodestream(Guint le / img.xTileSize; img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) / img.yTileSize; @@ -39,11 +39,9 @@ for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps * sizeof(JPXTileComp)); -only in patch2: -unchanged: ---- tetex-src-3.0/libs/xpdf/xpdf/Stream.h.CVE-2005-3193 -+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.h -@@ -233,6 +233,8 @@ +--- tetex-src-3.0/libs/xpdf/xpdf/Stream.h.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/Stream.h 2006-01-09 15:15:27.000000000 +0100 +@@ -233,6 +233,8 @@ public: ~StreamPredictor(); @@ -52,7 +50,7 @@ int lookChar(); int getChar(); -@@ -250,6 +252,7 @@ +@@ -250,6 +252,7 @@ private: int rowBytes; // bytes per line Guchar *predLine; // line buffer int predIdx; // current index in predLine @@ -60,10 +58,8 @@ }; //------------------------------------------------------------------------ -only in patch2: -unchanged: ---- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc.CVE-2005-3193 -+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc +--- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc 2006-01-09 15:15:27.000000000 +0100 @@ -15,6 +15,7 @@ #include #include @@ -72,7 +68,7 @@ #ifndef WIN32 #include #endif -@@ -412,13 +413,28 @@ +@@ -412,13 +413,28 @@ StreamPredictor::StreamPredictor(Stream width = widthA; nComps = nCompsA; nBits = nBitsA; @@ -101,7 +97,7 @@ } StreamPredictor::~StreamPredictor() { -@@ -1012,6 +1028,10 @@ +@@ -1012,6 +1028,10 @@ LZWStream::LZWStream(Stream *strA, int p FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); @@ -112,40 +108,81 @@ } else { pred = NULL; } -@@ -2897,6 +2917,10 @@ +@@ -1260,6 +1280,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s + endOfLine = endOfLineA; + byteAlign = byteAlignA; + columns = columnsA; ++ if (columns < 1 || columns >= INT_MAX / sizeof(short)) { ++ error(-1, "invalid number of columns: %d", columns); ++ exit(1); ++ } + rows = rowsA; + endOfBlock = endOfBlockA; + black = blackA; +@@ -2897,6 +2921,11 @@ GBool DCTStream::readBaselineSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream", prec); ++ numComps = 0; ++ error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; -@@ -2923,6 +2947,10 @@ +@@ -2923,6 +2952,11 @@ GBool DCTStream::readProgressiveSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream", prec); ++ numComps = 0; ++ error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; -@@ -2945,6 +2973,10 @@ +@@ -2945,6 +2979,11 @@ GBool DCTStream::readScanInfo() { length = read16() - 2; scanInfo.numComps = str->getChar(); + if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { ++ scanInfo.numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } --length; if (length != 2 * scanInfo.numComps + 3) { error(getPos(), "Bad DCT scan info block"); -@@ -3255,6 +3287,10 @@ +@@ -3019,12 +3058,12 @@ GBool DCTStream::readHuffmanTables() { + while (length > 0) { + index = str->getChar(); + --length; +- if ((index & 0x0f) >= 4) { ++ if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) { + error(getPos(), "Bad DCT Huffman table"); + return gFalse; + } + if (index & 0x10) { +- index &= 0x0f; ++ index &= 0x03; + if (index >= numACHuffTables) + numACHuffTables = index+1; + tbl = &acHuffTables[index]; +@@ -3142,9 +3181,11 @@ int DCTStream::readMarker() { + do { + do { + c = str->getChar(); ++ if(c == EOF) return EOF; + } while (c != 0xff); + do { + c = str->getChar(); ++ if(c == EOF) return EOF; + } while (c == 0xff); + } while (c == 0x00); + return c; +@@ -3255,6 +3296,10 @@ FlateStream::FlateStream(Stream *strA, i FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); @@ -156,8 +193,8 @@ } else { pred = NULL; } ---- tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc.CVE-2005-3193 -+++ tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc +--- tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc 2006-01-09 15:15:27.000000000 +0100 @@ -7,6 +7,7 @@ //======================================================================== @@ -166,45 +203,61 @@ #ifdef USE_GCC_PRAGMAS #pragma implementation -@@ -681,7 +682,15 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, +@@ -681,7 +682,16 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = wA; h = hA; line = (wA + 7) >> 3; - data = (Guchar *)gmalloc(h * line); + -+ if (h < 0 || line <= 0 || h >= INT_MAX / line) { ++ if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ++ error(-1, "invalid width/height"); + data = NULL; ++ return; + } -+ else { -+ // need to allocate one extra guard byte for use in combine() -+ data = (Guchar *)gmalloc(h * line + 1); -+ data[h * line] = 0; -+ } ++ ++ // need to allocate one extra guard byte for use in combine() ++ data = (Guchar *)gmalloc(h * line + 1); ++ data[h * line] = 0; } JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap): -@@ -692,5 +699,11 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, +@@ -690,8 +700,17 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = bitmap->w; h = bitmap->h; line = bitmap->line; +- data = (Guchar *)gmalloc(h * line); + -+ if (h < 0 || line <= 0 || h >= INT_MAX / line) { ++ if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ++ error(-1, "invalid width/height"); + data = NULL; + return; + } -+ - data = (Guchar *)gmalloc(h * line); ++ ++ // need to allocate one extra guard byte for use in combine() ++ data = (Guchar *)gmalloc(h * line + 1); memcpy(data, bitmap->data, h * line); -@@ -720,7 +733,7 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint ++ data[h * line] = 0; + } + + JBIG2Bitmap::~JBIG2Bitmap() { +@@ -716,10 +735,14 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint } void JBIG2Bitmap::expand(int newH, Guint pixel) { - if (newH <= h) { -+ if (newH <= h || line <= 0 || newH >= INT_MAX / line) { ++ if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) { ++ error(-1, "invalid width/height"); ++ gfree(data); ++ data = NULL; return; } - // need to allocate one extra guard byte for use in combine() -@@ -2305,6 +2318,15 @@ void JBIG2Stream::readHalftoneRegionSeg( +- data = (Guchar *)grealloc(data, newH * line); ++ // need to allocate one extra guard byte for use in combine() ++ data = (Guchar *)grealloc(data, newH * line + 1); + if (pixel) { + memset(data + h * line, 0xff, (newH - h) * line); + } else { +@@ -2256,6 +2279,15 @@ void JBIG2Stream::readHalftoneRegionSeg( error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } @@ -220,38 +273,15 @@ patternDict = (JBIG2PatternDict *)seg; bpp = 0; i = 1; -@@ -2936,6 +2958,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef +@@ -2887,6 +2919,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2; int x, y, pix; -+ if (w < 0 || h <= 0 || w >= INT_MAX / h) ++ if (w < 0 || h <= 0 || w >= INT_MAX / h) { ++ error(-1, "invalid width/height"); + return NULL; ++ } + bitmap = new JBIG2Bitmap(0, w, h); bitmap->clearToZero(); ---- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc.CVE-2005-3193 -+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc -@@ -1277,4 +1277,7 @@ CCITTFaxStream::CCITTFaxStream(Stream *s - endOfLine = endOfLineA; - byteAlign = byteAlignA; - columns = columnsA; -+ if (columns + 3 < 1 || columns + 4 < 1 || columns < 1) { -+ columns = 1; -+ } - rows = rowsA; -@@ -3066,12 +3066,12 @@ GBool DCTStream::readHuffmanTables() { - while (length > 0) { - index = str->getChar(); - --length; -- if ((index & 0x0f) >= 4) { -+ if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) { - error(getPos(), "Bad DCT Huffman table"); - return gFalse; - } - if (index & 0x10) { -- index &= 0x0f; -+ index &= 0x03; - if (index >= numACHuffTables) - numACHuffTables = index+1; - tbl = &acHuffTables[index]; tetex-3.0-texmfcnf.patch: texmf.in-teTeX | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) Index: tetex-3.0-texmfcnf.patch =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/tetex-3.0-texmfcnf.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tetex-3.0-texmfcnf.patch 22 Nov 2005 14:50:04 -0000 1.3 +++ tetex-3.0-texmfcnf.patch 11 Jan 2006 14:41:32 -0000 1.4 @@ -1,5 +1,5 @@ ---- tetex-src-3.0/texk/kpathsea/texmf.in-teTeX.texmfcnf 2005-02-06 09:04:35.000000000 +0900 -+++ tetex-src-3.0/texk/kpathsea/texmf.in-teTeX 2005-02-08 18:27:28.232751576 +0900 +--- tetex-src-3.0/texk/kpathsea/texmf.in-teTeX.texmfcnf 2005-02-06 01:04:35.000000000 +0100 ++++ tetex-src-3.0/texk/kpathsea/texmf.in-teTeX 2006-01-11 15:28:24.000000000 +0100 @@ -64,7 +64,7 @@ % A place for local additions to a "standard" texmf tree. % This tree is not used for local configuration maintained by @@ -9,6 +9,15 @@ % TEXMFSYSVAR, where texconfig-sys stores variable runtime data. % With teTeX-3.0 or later, this must be set. +@@ -111,7 +111,7 @@ + % + % For texconfig to work properly, TEXMFCONGIG and TEXMFVAR should be named + % explicitly and before all other trees. +-TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} ++TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFMAIN,!!$TEXMFDIST} + + % The system trees. These are the trees that are shared by all the users. + SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST @@ -208,6 +208,10 @@ TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// Index: tetex.spec =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- tetex.spec 29 Dec 2005 16:30:52 -0000 1.78 +++ tetex.spec 11 Jan 2006 14:41:32 -0000 1.79 @@ -11,7 +11,7 @@ Summary: The TeX text formatting system. Name: tetex Version: 3.0 -Release: 13 +Release: 14 License: distributable Group: Applications/Publishing Requires: tmpwatch, dialog, ed @@ -640,13 +640,14 @@ grep -v "/doc/" filelist.full | grep afm > filelist.afm grep "/doc/" filelist.full > filelist.doc -echo "%attr(-,root,root) %dir %{_datadir}/texmf/doc" >> filelist.doc # now files listed only once are in the tex package cat filelist.full filelist.latex filelist.xdvi filelist.dvips \ filelist.afm filelist.fonts filelist.doc | \ sort | uniq -u > filelist.tex +echo "%attr(-,root,root) %dir %{_datadir}/texmf/doc" >> filelist.tex + # desktop entry things cat > xdvi.desktop < 3.0-14 +- apply additional patch to fix xpdf flaws from Ludwig Nussel + (CVE-2005-3191, CVE-2005-3192 and CVE-2005-3193) (#177128) +- /usr/share/texmf/doc is now owned by tetex package (#177065) +- update searching order for kpathsea (local texmf tree is + searched first) + * Thu Dec 29 2005 Jindrich Novy 3.0-13 - update package descriptions - don't use obsolete bindings in texdoc From fedora-cvs-commits at redhat.com Wed Jan 11 15:07:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 10:07:55 -0500 Subject: rpms/tetex/FC-4 tetex-3.0-CVE-2005-3193.patch, 1.2, 1.3 tetex-3.0-texdoc-defaults.patch, 1.1, 1.2 tetex-3.0-texmfcnf.patch, 1.1, 1.2 tetex.spec, 1.69, 1.70 Message-ID: <200601111507.k0BF7tEj024368@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/tetex/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv24187 Modified Files: tetex-3.0-CVE-2005-3193.patch tetex-3.0-texdoc-defaults.patch tetex-3.0-texmfcnf.patch tetex.spec Log Message: * Wed Jan 11 2006 Jindrich Novy 3.0-9.FC4 - apply additional patch to fix xpdf flaws from Ludwig Nussel (CVE-2005-3191, CVE-2005-3192 and CVE-2005-3193) (#177128) - /usr/share/texmf/doc is now owned by tetex package (#177065) - update searching order for kpathsea (local texmf tree is searched first) - don't use obsolete bindings in texdoc tetex-3.0-CVE-2005-3193.patch: JBIG2Stream.cc | 45 +++++++++++++++++++++++++++++++++++++++++---- JPXStream.cc | 18 +++++++++++++++--- Stream.cc | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- Stream.h | 3 +++ 4 files changed, 106 insertions(+), 9 deletions(-) Index: tetex-3.0-CVE-2005-3193.patch =================================================================== RCS file: /cvs/dist/rpms/tetex/FC-4/tetex-3.0-CVE-2005-3193.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tetex-3.0-CVE-2005-3193.patch 19 Dec 2005 10:26:36 -0000 1.2 +++ tetex-3.0-CVE-2005-3193.patch 11 Jan 2006 15:07:52 -0000 1.3 @@ -1,5 +1,5 @@ ---- tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc.CVE-2005-3193 -+++ tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc +--- tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc 2006-01-09 15:15:27.000000000 +0100 @@ -7,6 +7,7 @@ //======================================================================== @@ -8,7 +8,7 @@ #ifdef USE_GCC_PRAGMAS #pragma implementation -@@ -666,7 +667,7 @@ +@@ -666,7 +667,7 @@ GBool JPXStream::readCodestream(Guint le int segType; GBool haveSIZ, haveCOD, haveQCD, haveSOT; Guint precinctSize, style; @@ -17,7 +17,7 @@ //----- main header haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; -@@ -701,8 +702,19 @@ +@@ -701,8 +702,19 @@ GBool JPXStream::readCodestream(Guint le / img.xTileSize; img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) / img.yTileSize; @@ -39,11 +39,9 @@ for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps * sizeof(JPXTileComp)); -only in patch2: -unchanged: ---- tetex-src-3.0/libs/xpdf/xpdf/Stream.h.CVE-2005-3193 -+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.h -@@ -233,6 +233,8 @@ +--- tetex-src-3.0/libs/xpdf/xpdf/Stream.h.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/Stream.h 2006-01-09 15:15:27.000000000 +0100 +@@ -233,6 +233,8 @@ public: ~StreamPredictor(); @@ -52,7 +50,7 @@ int lookChar(); int getChar(); -@@ -250,6 +252,7 @@ +@@ -250,6 +252,7 @@ private: int rowBytes; // bytes per line Guchar *predLine; // line buffer int predIdx; // current index in predLine @@ -60,10 +58,8 @@ }; //------------------------------------------------------------------------ -only in patch2: -unchanged: ---- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc.CVE-2005-3193 -+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc +--- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc 2006-01-09 15:15:27.000000000 +0100 @@ -15,6 +15,7 @@ #include #include @@ -72,7 +68,7 @@ #ifndef WIN32 #include #endif -@@ -412,13 +413,28 @@ +@@ -412,13 +413,28 @@ StreamPredictor::StreamPredictor(Stream width = widthA; nComps = nCompsA; nBits = nBitsA; @@ -101,7 +97,7 @@ } StreamPredictor::~StreamPredictor() { -@@ -1012,6 +1028,10 @@ +@@ -1012,6 +1028,10 @@ LZWStream::LZWStream(Stream *strA, int p FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); @@ -112,40 +108,81 @@ } else { pred = NULL; } -@@ -2897,6 +2917,10 @@ +@@ -1260,6 +1280,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s + endOfLine = endOfLineA; + byteAlign = byteAlignA; + columns = columnsA; ++ if (columns < 1 || columns >= INT_MAX / sizeof(short)) { ++ error(-1, "invalid number of columns: %d", columns); ++ exit(1); ++ } + rows = rowsA; + endOfBlock = endOfBlockA; + black = blackA; +@@ -2897,6 +2921,11 @@ GBool DCTStream::readBaselineSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream", prec); ++ numComps = 0; ++ error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; -@@ -2923,6 +2947,10 @@ +@@ -2923,6 +2952,11 @@ GBool DCTStream::readProgressiveSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream", prec); ++ numComps = 0; ++ error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; -@@ -2945,6 +2973,10 @@ +@@ -2945,6 +2979,11 @@ GBool DCTStream::readScanInfo() { length = read16() - 2; scanInfo.numComps = str->getChar(); + if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { ++ scanInfo.numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } --length; if (length != 2 * scanInfo.numComps + 3) { error(getPos(), "Bad DCT scan info block"); -@@ -3255,6 +3287,10 @@ +@@ -3019,12 +3058,12 @@ GBool DCTStream::readHuffmanTables() { + while (length > 0) { + index = str->getChar(); + --length; +- if ((index & 0x0f) >= 4) { ++ if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) { + error(getPos(), "Bad DCT Huffman table"); + return gFalse; + } + if (index & 0x10) { +- index &= 0x0f; ++ index &= 0x03; + if (index >= numACHuffTables) + numACHuffTables = index+1; + tbl = &acHuffTables[index]; +@@ -3142,9 +3181,11 @@ int DCTStream::readMarker() { + do { + do { + c = str->getChar(); ++ if(c == EOF) return EOF; + } while (c != 0xff); + do { + c = str->getChar(); ++ if(c == EOF) return EOF; + } while (c == 0xff); + } while (c == 0x00); + return c; +@@ -3255,6 +3296,10 @@ FlateStream::FlateStream(Stream *strA, i FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); @@ -156,8 +193,8 @@ } else { pred = NULL; } ---- tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc.CVE-2005-3193 -+++ tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc +--- tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc 2006-01-09 15:15:27.000000000 +0100 @@ -7,6 +7,7 @@ //======================================================================== @@ -166,45 +203,61 @@ #ifdef USE_GCC_PRAGMAS #pragma implementation -@@ -681,7 +682,15 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, +@@ -681,7 +682,16 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = wA; h = hA; line = (wA + 7) >> 3; - data = (Guchar *)gmalloc(h * line); + -+ if (h < 0 || line <= 0 || h >= INT_MAX / line) { ++ if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ++ error(-1, "invalid width/height"); + data = NULL; ++ return; + } -+ else { -+ // need to allocate one extra guard byte for use in combine() -+ data = (Guchar *)gmalloc(h * line + 1); -+ data[h * line] = 0; -+ } ++ ++ // need to allocate one extra guard byte for use in combine() ++ data = (Guchar *)gmalloc(h * line + 1); ++ data[h * line] = 0; } JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap): -@@ -692,5 +699,11 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, +@@ -690,8 +700,17 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = bitmap->w; h = bitmap->h; line = bitmap->line; +- data = (Guchar *)gmalloc(h * line); + -+ if (h < 0 || line <= 0 || h >= INT_MAX / line) { ++ if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ++ error(-1, "invalid width/height"); + data = NULL; + return; + } -+ - data = (Guchar *)gmalloc(h * line); ++ ++ // need to allocate one extra guard byte for use in combine() ++ data = (Guchar *)gmalloc(h * line + 1); memcpy(data, bitmap->data, h * line); -@@ -720,7 +733,7 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint ++ data[h * line] = 0; + } + + JBIG2Bitmap::~JBIG2Bitmap() { +@@ -716,10 +735,14 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint } void JBIG2Bitmap::expand(int newH, Guint pixel) { - if (newH <= h) { -+ if (newH <= h || line <= 0 || newH >= INT_MAX / line) { ++ if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) { ++ error(-1, "invalid width/height"); ++ gfree(data); ++ data = NULL; return; } - // need to allocate one extra guard byte for use in combine() -@@ -2305,6 +2318,15 @@ void JBIG2Stream::readHalftoneRegionSeg( +- data = (Guchar *)grealloc(data, newH * line); ++ // need to allocate one extra guard byte for use in combine() ++ data = (Guchar *)grealloc(data, newH * line + 1); + if (pixel) { + memset(data + h * line, 0xff, (newH - h) * line); + } else { +@@ -2256,6 +2279,15 @@ void JBIG2Stream::readHalftoneRegionSeg( error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } @@ -220,38 +273,15 @@ patternDict = (JBIG2PatternDict *)seg; bpp = 0; i = 1; -@@ -2936,6 +2958,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef +@@ -2887,6 +2919,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2; int x, y, pix; -+ if (w < 0 || h <= 0 || w >= INT_MAX / h) ++ if (w < 0 || h <= 0 || w >= INT_MAX / h) { ++ error(-1, "invalid width/height"); + return NULL; ++ } + bitmap = new JBIG2Bitmap(0, w, h); bitmap->clearToZero(); ---- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc.CVE-2005-3193 -+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc -@@ -1277,4 +1277,7 @@ CCITTFaxStream::CCITTFaxStream(Stream *s - endOfLine = endOfLineA; - byteAlign = byteAlignA; - columns = columnsA; -+ if (columns + 3 < 1 || columns + 4 < 1 || columns < 1) { -+ columns = 1; -+ } - rows = rowsA; -@@ -3066,12 +3066,12 @@ GBool DCTStream::readHuffmanTables() { - while (length > 0) { - index = str->getChar(); - --length; -- if ((index & 0x0f) >= 4) { -+ if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) { - error(getPos(), "Bad DCT Huffman table"); - return gFalse; - } - if (index & 0x10) { -- index &= 0x0f; -+ index &= 0x03; - if (index >= numACHuffTables) - numACHuffTables = index+1; - tbl = &acHuffTables[index]; tetex-3.0-texdoc-defaults.patch: texdoc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Index: tetex-3.0-texdoc-defaults.patch =================================================================== RCS file: /cvs/dist/rpms/tetex/FC-4/tetex-3.0-texdoc-defaults.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-3.0-texdoc-defaults.patch 10 Feb 2005 20:29:52 -0000 1.1 +++ tetex-3.0-texdoc-defaults.patch 11 Jan 2006 15:07:52 -0000 1.2 @@ -1,13 +1,14 @@ ---- tetex-src-3.0/texk/tetex/texdoc.texdoc-defaults 2004-12-02 23:31:00.000000000 +0900 -+++ tetex-src-3.0/texk/tetex/texdoc 2005-02-07 15:22:31.840490047 +0900 -@@ -90,9 +90,9 @@ +--- tetex-src-3.0/texk/tetex/texdoc.texdoc-defaults 2004-12-02 15:31:00.000000000 +0100 ++++ tetex-src-3.0/texk/tetex/texdoc 2005-12-29 17:17:07.000000000 +0100 +@@ -90,9 +90,9 @@ case `(uname -s) 2>/dev/null` in ;; *) : ${TEXDOCVIEW_dvi='(xdvi %s) &'} - : ${TEXDOCVIEW_pdf='(acroread %s) &'} -+ : ${TEXDOCVIEW_pdf='(xpdf %s) &'} - : ${TEXDOCVIEW_ps='(gv %s) &'} +- : ${TEXDOCVIEW_ps='(gv %s) &'} - : ${TEXDOCVIEW_html='mozilla -remote openURL'"'(%s)'"' 2>/dev/null || mozilla %s &'} ++ : ${TEXDOCVIEW_pdf='(evince %s) &'} ++ : ${TEXDOCVIEW_ps='(evince %s) &'} + : ${TEXDOCVIEW_html='(htmlview %s) 2>/dev/null || firefox %s &'} : ${TEXDOCVIEW_txt="${PAGER-more} %s"} : ${TEXDOCVIEW_="${PAGER-more} %s"} # no extension, default to pager tetex-3.0-texmfcnf.patch: texmf.in-teTeX | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) Index: tetex-3.0-texmfcnf.patch =================================================================== RCS file: /cvs/dist/rpms/tetex/FC-4/tetex-3.0-texmfcnf.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-3.0-texmfcnf.patch 10 Feb 2005 20:29:52 -0000 1.1 +++ tetex-3.0-texmfcnf.patch 11 Jan 2006 15:07:52 -0000 1.2 @@ -1,5 +1,5 @@ ---- tetex-src-3.0/texk/kpathsea/texmf.in-teTeX.texmfcnf 2005-02-06 09:04:35.000000000 +0900 -+++ tetex-src-3.0/texk/kpathsea/texmf.in-teTeX 2005-02-08 18:27:28.232751576 +0900 +--- tetex-src-3.0/texk/kpathsea/texmf.in-teTeX.texmfcnf 2005-02-06 01:04:35.000000000 +0100 ++++ tetex-src-3.0/texk/kpathsea/texmf.in-teTeX 2006-01-11 15:28:24.000000000 +0100 @@ -64,7 +64,7 @@ % A place for local additions to a "standard" texmf tree. % This tree is not used for local configuration maintained by @@ -9,6 +9,15 @@ % TEXMFSYSVAR, where texconfig-sys stores variable runtime data. % With teTeX-3.0 or later, this must be set. +@@ -111,7 +111,7 @@ + % + % For texconfig to work properly, TEXMFCONGIG and TEXMFVAR should be named + % explicitly and before all other trees. +-TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST} ++TEXMF = {!!$TEXMFCONFIG,!!$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFMAIN,!!$TEXMFDIST} + + % The system trees. These are the trees that are shared by all the users. + SYSTEXMF = $TEXMFLOCAL;$TEXMFMAIN;$TEXMFDIST @@ -208,6 +208,10 @@ TEXINPUTS.pdftexinfo = .;$TEXMF/tex/{texinfo,plain,generic,}// TEXINPUTS.pdfamstex = .;$TEXMF/tex/{amstex,plain,generic,}// Index: tetex.spec =================================================================== RCS file: /cvs/dist/rpms/tetex/FC-4/tetex.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- tetex.spec 19 Dec 2005 10:26:37 -0000 1.69 +++ tetex.spec 11 Jan 2006 15:07:52 -0000 1.70 @@ -10,7 +10,7 @@ Summary: The TeX text formatting system. Name: tetex Version: 3.0 -Release: 8.FC4 +Release: 9.FC4 License: distributable Group: Applications/Publishing Requires: tmpwatch, dialog, ed @@ -791,6 +791,14 @@ %defattr(-,root,root) %changelog +* Wed Jan 11 2006 Jindrich Novy 3.0-9.FC4 +- apply additional patch to fix xpdf flaws from Ludwig Nussel + (CVE-2005-3191, CVE-2005-3192 and CVE-2005-3193) (#177128) +- /usr/share/texmf/doc is now owned by tetex package (#177065) +- update searching order for kpathsea (local texmf tree is + searched first) +- don't use obsolete bindings in texdoc + * Mon Dec 19 2005 Jindrich Novy 3.0-8.FC4 - apply more complete fix for CVE-2005-3193 (#175110) suggested by security response team, taken from xpdf From fedora-cvs-commits at redhat.com Wed Jan 11 15:14:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 10:14:54 -0500 Subject: rpms/tetex/FC-3 tetex-2.0.2-CVE-2005-3193.patch, 1.2, 1.3 tetex.spec, 1.52, 1.53 Message-ID: <200601111514.k0BFEs8d027523@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/tetex/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv27334 Modified Files: tetex-2.0.2-CVE-2005-3193.patch tetex.spec Log Message: * Wed Jan 11 2006 Jindrich Novy 2.0.2-21.7.FC3 - apply additional patch to fix xpdf flaws from Ludwig Nussel (CVE-2005-3191, CVE-2005-3192 and CVE-2005-3193) (#177128) tetex-2.0.2-CVE-2005-3193.patch: JBIG2Stream.cc | 45 +++++++++++++++++++++++++++++++++++++++++---- Stream.cc | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- Stream.h | 3 +++ 3 files changed, 90 insertions(+), 6 deletions(-) Index: tetex-2.0.2-CVE-2005-3193.patch =================================================================== RCS file: /cvs/dist/rpms/tetex/FC-3/tetex-2.0.2-CVE-2005-3193.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tetex-2.0.2-CVE-2005-3193.patch 19 Dec 2005 10:25:22 -0000 1.2 +++ tetex-2.0.2-CVE-2005-3193.patch 11 Jan 2006 15:14:51 -0000 1.3 @@ -1,14 +1,15 @@ --- tetex-src-2.0.2/libs/xpdf/xpdf/Stream.h.CVE-2005-3193 2002-11-03 23:15:37.000000000 +0100 -+++ tetex-src-2.0.2/libs/xpdf/xpdf/Stream.h 2005-12-19 10:38:11.000000000 +0100 -@@ -227,6 +227,7 @@ public: ++++ tetex-src-2.0.2/libs/xpdf/xpdf/Stream.h 2006-01-09 15:31:46.000000000 +0100 +@@ -225,6 +225,8 @@ public: + ~StreamPredictor(); + ++ GBool isOk() { return ok; } ++ int lookChar(); int getChar(); -+ GBool isOk() { return ok; } - private: - -@@ -242,6 +243,7 @@ private: +@@ -242,6 +244,7 @@ private: int rowBytes; // bytes per line Guchar *predLine; // line buffer int predIdx; // current index in predLine @@ -17,7 +18,7 @@ //------------------------------------------------------------------------ --- tetex-src-2.0.2/libs/xpdf/xpdf/Stream.cc.CVE-2005-3193 2002-12-06 00:44:33.000000000 +0100 -+++ tetex-src-2.0.2/libs/xpdf/xpdf/Stream.cc 2005-12-19 10:38:11.000000000 +0100 ++++ tetex-src-2.0.2/libs/xpdf/xpdf/Stream.cc 2006-01-09 15:31:46.000000000 +0100 @@ -15,6 +15,7 @@ #include #include @@ -32,21 +33,21 @@ nBits = nBitsA; + predLine = NULL; + ok = gFalse; -+ + + if (width <= 0 || nComps <= 0 || nBits <= 0 || -+ nComps >= INT_MAX / nBits || -+ width >= INT_MAX / nComps / nBits) ++ nComps >= INT_MAX/nBits || ++ width >= INT_MAX/nComps/nBits) { + return; - ++ } nVals = width * nComps; -+ if (nVals + 7 <= 0) ++ if (nVals * nBits + 7 <= 0) { + return; -+ ++ } pixBytes = (nComps * nBits + 7) >> 3; rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; -+ if (rowBytes < 0) ++ if (rowBytes < 0) { + return; -+ ++ } predLine = (Guchar *)gmalloc(rowBytes); memset(predLine, 0, rowBytes); predIdx = rowBytes; @@ -59,62 +60,60 @@ FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if ( !pred->isOk()) { -+ delete pred; -+ pred = NULL; ++ if (!pred->isOk()) { ++ delete pred; ++ pred = NULL; + } } else { pred = NULL; } -@@ -1226,6 +1246,11 @@ CCITTFaxStream::CCITTFaxStream(Stream *s +@@ -1226,6 +1246,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s endOfLine = endOfLineA; byteAlign = byteAlignA; columns = columnsA; -+ if (columns < 1 || columns + 2 < 0 || columns + 3 < 0 || -+ (columns + 2) >= INT_MAX / sizeof(short) || (columns + 3) >= INT_MAX / sizeof(short)) { ++ if (columns < 1 || columns >= INT_MAX / sizeof(short)) { + error(-1, "invalid number of columns"); + exit(1); + } rows = rowsA; endOfBlock = endOfBlockA; black = blackA; -@@ -2860,6 +2885,11 @@ GBool DCTStream::readBaselineSOF() { +@@ -2860,6 +2884,11 @@ GBool DCTStream::readBaselineSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { -+ numComps = 0; -+ error(getPos(), "Bad number of components in DCT stream"); -+ return gFalse; ++ numComps = 0; ++ error(getPos(), "Bad number of components in DCT stream"); ++ return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; -@@ -2886,6 +2916,11 @@ GBool DCTStream::readProgressiveSOF() { +@@ -2886,6 +2915,11 @@ GBool DCTStream::readProgressiveSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { -+ numComps = 0; -+ error(getPos(), "Bad number of components in DCT stream"); -+ return gFalse; ++ numComps = 0; ++ error(getPos(), "Bad number of components in DCT stream"); ++ return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; -@@ -2908,6 +2943,11 @@ GBool DCTStream::readScanInfo() { +@@ -2908,6 +2942,10 @@ GBool DCTStream::readScanInfo() { length = read16() - 2; scanInfo.numComps = str->getChar(); + if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { -+ scanInfo.numComps = 0; -+ error(getPos(), "Bad number of components in DCT stream"); -+ return gFalse; ++ error(getPos(), "Bad number of components in DCT stream"); ++ return gFalse; + } --length; if (length != 2 * scanInfo.numComps + 3) { error(getPos(), "Bad DCT scan info block"); -@@ -2975,12 +3015,12 @@ GBool DCTStream::readHuffmanTables() { +@@ -2975,12 +3013,12 @@ GBool DCTStream::readHuffmanTables() { while (length > 0) { index = str->getChar(); --length; @@ -129,7 +128,7 @@ if (index >= numACHuffTables) numACHuffTables = index+1; tbl = &acHuffTables[index]; -@@ -3068,9 +3108,11 @@ int DCTStream::readMarker() { +@@ -3068,9 +3106,11 @@ int DCTStream::readMarker() { do { do { c = str->getChar(); @@ -141,19 +140,19 @@ } while (c == 0xff); } while (c == 0x00); return c; -@@ -3178,6 +3220,10 @@ FlateStream::FlateStream(Stream *strA, i +@@ -3178,6 +3218,10 @@ FlateStream::FlateStream(Stream *strA, i FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if ( !pred->isOk()) { -+ delete pred; -+ pred = NULL; ++ if (!pred->isOk()) { ++ delete pred; ++ pred = NULL; + } } else { pred = NULL; } --- tetex-src-2.0.2/libs/xpdf/xpdf/JBIG2Stream.cc.CVE-2005-3193 2002-11-16 16:02:19.000000000 +0100 -+++ tetex-src-2.0.2/libs/xpdf/xpdf/JBIG2Stream.cc 2005-12-19 10:38:11.000000000 +0100 ++++ tetex-src-2.0.2/libs/xpdf/xpdf/JBIG2Stream.cc 2006-01-09 15:31:46.000000000 +0100 @@ -7,6 +7,7 @@ //======================================================================== @@ -162,47 +161,61 @@ #ifdef USE_GCC_PRAGMAS #pragma implementation -@@ -977,6 +978,13 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, +@@ -977,7 +978,16 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = wA; h = hA; line = (wA + 7) >> 3; +- data = (Guchar *)gmalloc(h * line); + -+ if (h < 0 || line <= 0 || h >= INT_MAX / line) { ++ if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { + error(-1, "invalid width/height"); + data = NULL; + return; + } + - data = (Guchar *)gmalloc(h * line); ++ // need to allocate one extra guard byte for use in combine() ++ data = (Guchar *)gmalloc(h * line + 1); ++ data[h * line] = 0; } -@@ -986,6 +994,13 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, + JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap): +@@ -986,8 +996,17 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = bitmap->w; h = bitmap->h; line = bitmap->line; +- data = (Guchar *)gmalloc(h * line); + -+ if (h < 0 || line <= 0 || h >= INT_MAX / line) { ++ if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { + error(-1, "invalid width/height"); + data = NULL; + return; + } + - data = (Guchar *)gmalloc(h * line); ++ // need to allocate one extra guard byte for use in combine() ++ data = (Guchar *)gmalloc(h * line + 1); memcpy(data, bitmap->data, h * line); ++ data[h * line] = 0; } -@@ -1012,7 +1027,10 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint + + JBIG2Bitmap::~JBIG2Bitmap() { +@@ -1012,10 +1031,14 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint } void JBIG2Bitmap::expand(int newH, Guint pixel) { - if (newH <= h) { -+ if (newH <= h || line <= 0 || newH >= INT_MAX / line) { ++ if (newH <= h || line <= 0 || newH >= (INT_MAX - 1)/ line) { + error(-1, "invalid width/height"); + gfree(data); + data = NULL; return; } - data = (Guchar *)grealloc(data, newH * line); -@@ -2505,6 +2523,15 @@ void JBIG2Stream::readHalftoneRegionSeg( +- data = (Guchar *)grealloc(data, newH * line); ++ // need to allocate one extra guard byte for use in combine() ++ data = (Guchar *)grealloc(data, newH * line + 1); + if (pixel) { + memset(data + h * line, 0xff, (newH - h) * line); + } else { +@@ -2505,6 +2528,15 @@ void JBIG2Stream::readHalftoneRegionSeg( error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } @@ -218,7 +231,7 @@ patternDict = (JBIG2PatternDict *)seg; bpp = 0; i = 1; -@@ -3078,6 +3105,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef +@@ -3078,6 +3110,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef Guint ltpCX, cx, cx0, cx2, cx3, cx4, tpgrCX0, tpgrCX1, tpgrCX2; int x, y, pix; Index: tetex.spec =================================================================== RCS file: /cvs/dist/rpms/tetex/FC-3/tetex.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- tetex.spec 19 Dec 2005 10:25:22 -0000 1.52 +++ tetex.spec 11 Jan 2006 15:14:51 -0000 1.53 @@ -9,7 +9,7 @@ Summary: The TeX text formatting system. Name: tetex Version: 2.0.2 -Release: 21.6 +Release: 21.7.FC3 License: distributable Group: Applications/Publishing Requires: tmpwatch, dialog, ed @@ -892,6 +892,10 @@ %defattr(-,root,root) %changelog +* Wed Jan 11 2006 Jindrich Novy 2.0.2-21.7.FC3 +- apply additional patch to fix xpdf flaws from Ludwig Nussel + (CVE-2005-3191, CVE-2005-3192 and CVE-2005-3193) (#177128) + * Mon Dec 19 2005 Jindrich Novy 2.0.2-21.6 - apply more complete fix for CVE-2005-3193 (#175110) suggested by security response team, taken from xpdf From fedora-cvs-commits at redhat.com Wed Jan 11 15:21:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 10:21:04 -0500 Subject: rpms/device-mapper/devel device-mapper-1.02.02-pkg-config.patch, NONE, 1.1 device-mapper-1.02.02-selinux.patch, NONE, 1.1 device-mapper.spec, 1.24, 1.25 device-mapper-selinux.patch, 1.1, NONE Message-ID: <200601111521.k0BFL4Pj009221@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/device-mapper/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9182 Modified Files: device-mapper.spec Added Files: device-mapper-1.02.02-pkg-config.patch device-mapper-1.02.02-selinux.patch Removed Files: device-mapper-selinux.patch Log Message: cleanup selinux patch, add pkg-config support device-mapper-1.02.02-pkg-config.patch: configure.in | 2 ++ dmeventd/Makefile.in | 2 ++ dmeventd/devmapper-event.pc.in | 12 ++++++++++++ lib/Makefile.in | 4 ++-- lib/devmapper.pc.in | 12 ++++++++++++ make.tmpl.in | 1 + 6 files changed, 31 insertions(+), 2 deletions(-) --- NEW FILE device-mapper-1.02.02-pkg-config.patch --- --- device-mapper.1.02.02/make.tmpl.in.pkg-config 2005-10-16 16:33:22.000000000 +0200 +++ device-mapper.1.02.02/make.tmpl.in 2006-01-11 13:04:39.000000000 +0100 @@ -37,6 +37,7 @@ bindir = $(DESTDIR)@bindir@ includedir = $(DESTDIR)@includedir@ libdir = $(DESTDIR)@libdir@ +usrlibdir = $(DESTDIR)$(prefix)@libdir@ sbindir = $(DESTDIR)@sbindir@ infodir = $(DESTDIR)@infodir@ mandir = $(DESTDIR)@mandir@ --- /dev/null 2006-01-03 10:30:41.192875500 +0100 +++ device-mapper.1.02.02/lib/devmapper.pc.in 2006-01-11 13:06:11.000000000 +0100 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: devmapper +Description: device-mapper library +Version: @DM_LIB_VERSION@ +Requires: +Cflags: -I${includedir} +Libs: -L${libdir} -ldevmapper +Libs.private: -lselinux -lsepol --- device-mapper.1.02.02/lib/Makefile.in.pkg-config 2005-12-02 16:39:16.000000000 +0100 +++ device-mapper.1.02.02/lib/Makefile.in 2006-01-11 13:04:39.000000000 +0100 @@ -58,11 +58,11 @@ $(libdir)/libdevmapper.$(LIB_SUFFIX) $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \ $(includedir)/libdevmapper.h + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 devmapper.pc \ + $(usrlibdir)/pkgconfig/devmapper.pc install_static: install_ at interface@_static $(LN_S) -f libdevmapper.a.$(LIB_VERSION) $(libdir)/libdevmapper.a - $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper.h \ - $(includedir)/libdevmapper.h install_fs: fs/libdevmapper.$(LIB_SUFFIX) $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ --- device-mapper.1.02.02/configure.in.pkg-config 2006-01-11 13:04:39.000000000 +0100 +++ device-mapper.1.02.02/configure.in 2006-01-11 13:04:39.000000000 +0100 @@ -367,7 +367,9 @@ dmsetup/Makefile \ lib/Makefile \ lib/libdm-common.h \ +lib/devmapper.pc \ dmeventd/Makefile \ +dmeventd/devmapper-event.pc \ kernel/Makefile \ man/Makefile \ po/Makefile \ --- /dev/null 2006-01-03 10:30:41.192875500 +0100 +++ device-mapper.1.02.02/dmeventd/devmapper-event.pc.in 2006-01-11 13:06:32.000000000 +0100 @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: devmapper-event +Description: device-mapper event library +Version: @DM_LIB_VERSION@ +Requires: devmapper +Cflags: -I${includedir} +Libs: -L${libdir} -ldevmapper-event +Libs.private: -lpthread -ldl --- device-mapper.1.02.02/dmeventd/Makefile.in.pkg-config 2006-01-11 13:04:39.000000000 +0100 +++ device-mapper.1.02.02/dmeventd/Makefile.in 2006-01-11 13:04:39.000000000 +0100 @@ -47,6 +47,8 @@ $(libdir)/libdevmapper-event.$(LIB_SUFFIX) $(INSTALL) -D $(OWNER) $(GROUP) -m 444 libdevmapper-event.h \ $(includedir)/libdevmapper-event.h + $(INSTALL) -D $(OWNER) $(GROUP) -m 444 devmapper-event.pc \ + $(usrlibdir)/pkgconfig/devmapper-event.pc install_static: libdevmapper-event.a $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \ device-mapper-1.02.02-selinux.patch: configure.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE device-mapper-1.02.02-selinux.patch --- --- device-mapper.1.02.02/configure.in.selinux 2006-01-11 12:40:58.000000000 +0100 +++ device-mapper.1.02.02/configure.in 2006-01-11 12:41:12.000000000 +0100 @@ -204,7 +204,7 @@ if test x$HAVE_SELINUX = xyes; then CFLAGS="$CFLAGS -DHAVE_SELINUX" - LIBS="-lselinux $LIBS" + LIBS="-lselinux -lsepol $LIBS" else AC_MSG_WARN(Disabling selinux) fi Index: device-mapper.spec =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- device-mapper.spec 9 Dec 2005 22:40:11 -0000 1.24 +++ device-mapper.spec 11 Jan 2006 15:21:02 -0000 1.25 @@ -1,13 +1,14 @@ Summary: device mapper library Name: device-mapper Version: 1.02.02 -Release: 2.1 +Release: 3 License: GPL Group: System Environment/Base URL: http://sources.redhat.com/dm Source0: %{name}.%{version}.tgz -Patch0: device-mapper-selinux.patch +Patch0: device-mapper-1.02.02-selinux.patch Patch1: device-mapper-1.02.02-libpaths.patch +Patch2: device-mapper-1.02.02-pkg-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libselinux-devel, libsepol-devel @@ -21,8 +22,10 @@ %setup -q -n %{name}.%{version} %patch0 -p1 -b .selinux %patch1 -p1 -b .libpaths +%patch2 -p1 -b .pkg-config %build +autoconf %configure --enable-static_link --with-user= --with-group= --with-device-uid=0 --with-device-gid=6 --with-device-mode=0660 --enable-dmeventd make @@ -49,10 +52,15 @@ %{_mandir}/*/* %{_includedir}/libdevmapper.h %{_includedir}/libdevmapper-event.h +/usr/lib/pkgconfig/*.pc %changelog -* Fri Dec 09 2005 Jesse Keating +* Wed Jan 11 2006 Karel Zak - 1.02.02-3 +- cleanup selinux patch +- add pkg-config support + +* Fri Dec 09 2005 Jesse Keating - - 1.02.02-2.1 - rebuilt * Sun Dec 3 2005 Peter Jones - 1.02.02-2 --- device-mapper-selinux.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 11 15:35:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 10:35:00 -0500 Subject: rpms/device-mapper/devel device-mapper.spec,1.25,1.26 Message-ID: <200601111535.k0BFZ0E7013863@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/device-mapper/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13832 Modified Files: device-mapper.spec Log Message: fix path Index: device-mapper.spec =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- device-mapper.spec 11 Jan 2006 15:21:02 -0000 1.25 +++ device-mapper.spec 11 Jan 2006 15:34:57 -0000 1.26 @@ -52,7 +52,7 @@ %{_mandir}/*/* %{_includedir}/libdevmapper.h %{_includedir}/libdevmapper-event.h -/usr/lib/pkgconfig/*.pc +/usr/%{_lib}/pkgconfig/*.pc %changelog From fedora-cvs-commits at redhat.com Wed Jan 11 15:40:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 10:40:00 -0500 Subject: rpms/libsetrans/devel .cvsignore, 1.16, 1.17 libsetrans.spec, 1.24, 1.25 sources, 1.20, 1.21 Message-ID: <200601111540.k0BFe0Q3016015@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsetrans/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15986 Modified Files: .cvsignore libsetrans.spec sources Log Message: * Wed Jan 11 2006 Dan Walsh 0.1.16-1 - Fix memory corruption error Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 4 Jan 2006 14:45:01 -0000 1.16 +++ .cvsignore 11 Jan 2006 15:39:57 -0000 1.17 @@ -14,3 +14,4 @@ libsetrans-0.1.13.tgz libsetrans-0.1.14.tgz libsetrans-0.1.15.tgz +libsetrans-0.1.16.tgz Index: libsetrans.spec =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/libsetrans.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- libsetrans.spec 4 Jan 2006 14:45:01 -0000 1.24 +++ libsetrans.spec 11 Jan 2006 15:39:57 -0000 1.25 @@ -1,6 +1,6 @@ Summary: SELinux Translation library Name: libsetrans -Version: 0.1.15 +Version: 0.1.16 Release: 1 License: LGPL Group: System Environment/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man8/mcs.8.gz %changelog +* Wed Jan 11 2006 Dan Walsh 0.1.16-1 +- Fix memory corruption error + * Wed Jan 4 2006 Dan Walsh 0.1.15-1 - Eliminate a couple of checks after strdupa, fix return on all paths Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 4 Jan 2006 14:45:01 -0000 1.20 +++ sources 11 Jan 2006 15:39:57 -0000 1.21 @@ -1 +1 @@ -1a02900ecc31a4c8d1ecb0b34fa5897a libsetrans-0.1.15.tgz +760496cb1fae233b2583bf59d604c8bb libsetrans-0.1.16.tgz From fedora-cvs-commits at redhat.com Wed Jan 11 15:41:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 10:41:39 -0500 Subject: rpms/e2fsprogs/devel e2fsprogs-1.38-blkid-devmapper.patch, NONE, 1.1 e2fsprogs.spec, 1.43, 1.44 e2fsprogs-1.38-dm.patch, 1.3, NONE Message-ID: <200601111541.k0BFfdbA016758@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/e2fsprogs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16715 Modified Files: e2fsprogs.spec Added Files: e2fsprogs-1.38-blkid-devmapper.patch Removed Files: e2fsprogs-1.38-dm.patch Log Message: improve devmapper patch e2fsprogs-1.38-blkid-devmapper.patch: MCONFIG.in | 3 configure.in | 30 +++++++++ e2fsck/Makefile.in | 2 lib/blkid/Makefile.in | 4 - lib/blkid/blkid.pc.in | 2 lib/blkid/blkidP.h | 1 lib/blkid/devname.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 204 insertions(+), 4 deletions(-) --- NEW FILE e2fsprogs-1.38-blkid-devmapper.patch --- --- e2fsprogs-1.38/configure.in.dm 2005-04-06 20:44:15.000000000 +0200 +++ e2fsprogs-1.38/configure.in 2006-01-11 14:50:39.000000000 +0100 @@ -480,6 +480,36 @@ ) AC_SUBST(E2INITRD_PROG) AC_SUBST(E2INITRD_MAN) +dnl handle --enable-blkid-devmapper +dnl +AC_ARG_ENABLE([blkid-devmapper], +[ --enable-blkid-devmapper build with device-mapper support], +[if test "$enableval" = "no" +then + echo "Disabling device-mapper support" + DEVMAPPER_REQ='' + DEVMAPPER_LIBS='' + STATIC_DEVMAPPER_LIBS='' +else + AC_DEFINE(HAVE_DEVMAPPER) + echo "Enabling device-mapper support" + + PKG_PROG_PKG_CONFIG() + + AC_CHECK_LIB(devmapper, dm_tree_create, + [DEVMAPPER_LIBS=`$PKG_CONFIG --libs devmapper`; + STATIC_DEVMAPPER_LIBS=`$PKG_CONFIG --static --libs devmapper`; + DEVMAPPER_REQ="devmapper"], + [AC_MSG_ERROR([device-mapper library not found])], + [$DEVMAPPER_LIBS]) +fi] +, +echo "Disabling device-mapper support by default" +) +AC_SUBST(DEVMAPPER_REQ) +AC_SUBST(DEVMAPPER_LIBS) +AC_SUBST(STATIC_DEVMAPPER_LIBS) +dnl dnl dnl MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library --- e2fsprogs-1.38/MCONFIG.in.dm 2006-01-11 14:02:41.000000000 +0100 +++ e2fsprogs-1.38/MCONFIG.in 2006-01-11 14:03:18.000000000 +0100 @@ -74,6 +74,9 @@ LIBINTL = @LIBINTL@ DEPLIBUUID = $(LIB)/libuuid at LIB_EXT@ +DEVMAPPER_LIBS = @DEVMAPPER_LIBS@ +STATIC_DEVMAPPER_LIBS = @STATIC_DEVMAPPER_LIBS@ + STATIC_LIBSS = $(LIB)/libss at STATIC_LIB_EXT@ STATIC_LIBCOM_ERR = $(LIB)/libcom_err at STATIC_LIB_EXT@ STATIC_LIBE2P = $(LIB)/libe2p at STATIC_LIB_EXT@ --- e2fsprogs-1.38/lib/blkid/blkid.pc.in.dm 2006-01-11 13:25:32.000000000 +0100 +++ e2fsprogs-1.38/lib/blkid/blkid.pc.in 2006-01-11 14:48:57.000000000 +0100 @@ -6,6 +6,6 @@ Name: blkid Description: Block device id library Version: @E2FSPROGS_VERSION@ -Requires: uuid +Requires: uuid @DEVMAPPER_REQ@ Cflags: -I${includedir} Libs: -L${libdir} -lblkid --- e2fsprogs-1.38/lib/blkid/Makefile.in.dm 2005-06-29 19:39:54.000000000 +0200 +++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-01-11 14:10:44.000000000 +0100 @@ -37,7 +37,7 @@ ELF_IMAGE = libblkid ELF_MYDIR = blkid ELF_INSTALL_DIR = $(root_libdir) -ELF_OTHER_LIBS = -L../.. -luuid +ELF_OTHER_LIBS = -L../.. -luuid $(DEVMAPPER_LIBS) BSDLIB_VERSION = 2.0 BSDLIB_IMAGE = libblkid @@ -50,7 +50,7 @@ @MAKEFILE_PROFILE@ @MAKEFILE_CHECKER@ -LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_LIBUUID) +LIBS_BLKID= $(STATIC_LIBBLKID) $(STATIC_LIBUUID) $(DEVMAPPER_LIBS) DEPLIBS_BLKID= $(DEPSTATIC_LIBBLKID) $(DEPSTATIC_LIBUUID) .c.o: --- e2fsprogs-1.38/lib/blkid/devname.c.dm 2005-05-07 21:26:03.000000000 +0200 +++ e2fsprogs-1.38/lib/blkid/devname.c 2006-01-11 14:29:47.000000000 +0100 @@ -11,6 +11,8 @@ * %End-Header% */ +#define _GNU_SOURCE 1 + #include #include #if HAVE_UNISTD_H @@ -35,6 +37,10 @@ #include "blkidP.h" +#ifdef HAVE_DEVMAPPER +#include +#endif + /* * Find a dev struct in the cache by device name, if available. * @@ -75,6 +81,10 @@ return dev; } +#ifdef HAVE_DEVMAPPER +static int dm_device_is_leaf(const dev_t dev); +#endif + /* * Probe a single block device to add to the device cache. */ @@ -90,6 +100,10 @@ list_for_each(p, &cache->bic_devs) { blkid_dev tmp = list_entry(p, struct blkid_struct_dev, bid_devs); +#ifdef HAVE_DEVMAPPER + if (!dm_device_is_leaf(devno)) + continue; +#endif if (tmp->bid_devno == devno) { if (only_if_new) return; @@ -137,6 +151,155 @@ return; } +#ifdef HAVE_DEVMAPPER +/* + * device-mapper support + */ +static int dm_device_has_dep(const dev_t dev, const char *name) +{ + struct dm_task *task; + struct dm_deps *deps; + struct dm_info info; + int i; + + task = dm_task_create(DM_DEVICE_DEPS); + if (!task) + return 0; + + dm_task_set_name(task, name); + dm_task_run(task); + dm_task_get_info(task, &info); + + if (!info.exists) { + dm_task_destroy(task); + return 0; + } + + deps = dm_task_get_deps(task); + if (!deps || deps->count == 0) { + dm_task_destroy(task); + return 0; + } + + for (i = 0; i < deps->count; i++) { + dev_t dep_dev = deps->device[i]; + + if (dev == dep_dev) { + dm_task_destroy(task); + return 1; + } + } + + dm_task_destroy(task); + return 0; +} + +static int dm_device_is_leaf(const dev_t dev) +{ + struct dm_task *task; + struct dm_names *names; + unsigned int next = 0; + int n, ret = 1; + + task = dm_task_create(DM_DEVICE_LIST); + if (!task) + return 1; + + dm_task_run(task); + names = dm_task_get_names(task); + if (!names || !names->dev) { + dm_task_destroy(task); + return 1; + } + + n = 0; + do { + names = (void *)names + next; + + if (dm_device_has_dep(dev, names->name)) + ret = 0; + + next = names->next; + } while (next); + + dm_task_destroy(task); + + return ret; +} + +static dev_t dm_get_devno(const char *name) +{ + struct dm_task *task; + struct dm_info info; + dev_t ret = 0; + + task = dm_task_create(DM_DEVICE_INFO); + if (!task) + return ret; + + dm_task_set_name(task, name); + dm_task_run(task); + dm_task_get_info(task, &info); + + if (!info.exists) { + dm_task_destroy(task); + return ret; + } + + ret = makedev(info.major, info.minor); + + dm_task_destroy(task); + + return ret; +} + +static void dm_probe_all(blkid_cache cache, int only_if_new) +{ + struct dm_task *task; + struct dm_names *names; + unsigned int next = 0; + int n; + + task = dm_task_create(DM_DEVICE_LIST); + if (!task) + return; + + dm_task_run(task); + names = dm_task_get_names(task); + if (!names || !names->dev) { + dm_task_destroy(task); + return; + } + + n = 0; + do { + int rc; + char *device = NULL; + dev_t dev = 0; + + names = (void *)names + next; + + rc = asprintf(&device, "/dev/mapper/%s", names->name); + if (rc < 0) + goto try_next; + + dev = dm_get_devno(names->name); + if (dev == 0) + goto try_next; + + if (!dm_device_is_leaf(dev)) + goto try_next; + + probe_one(cache, device, dev, BLKID_PRI_DM, only_if_new); + +try_next: + next = names->next; + } while (next); + + dm_task_destroy(task); +} +#endif /* HAVE_DEVMAPPER */ + #define PROC_PARTITIONS "/proc/partitions" #define VG_DIR "/proc/lvm/VGs" @@ -290,6 +453,9 @@ return 0; blkid_read_cache(cache); +#ifdef HAVE_DEVMAPPER + dm_probe_all(cache, only_if_new); +#endif evms_probe_all(cache, only_if_new); #ifdef VG_DIR lvm_probe_all(cache, only_if_new); --- e2fsprogs-1.38/lib/blkid/blkidP.h.dm 2005-05-07 20:16:09.000000000 +0200 +++ e2fsprogs-1.38/lib/blkid/blkidP.h 2006-01-11 13:24:54.000000000 +0100 @@ -118,6 +118,7 @@ /* * Priority settings for different types of devices */ +#define BLKID_PRI_DM 40 #define BLKID_PRI_EVMS 30 #define BLKID_PRI_LVM 20 #define BLKID_PRI_MD 10 --- e2fsprogs-1.38/e2fsck/Makefile.in.dm 2005-06-29 19:42:20.000000000 +0200 +++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-01-11 14:04:35.000000000 +0100 @@ -20,7 +20,7 @@ DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID) STATIC_LIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \ - $(STATIC_LIBUUID) $(LIBINTL) + $(STATIC_LIBUUID) $(LIBINTL) $(STATIC_DEVMAPPER_LIBS) STATIC_DEPLIBS= $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) $(STATIC_LIBBLKID) \ $(DEPSTATIC_LIBUUID) Index: e2fsprogs.spec =================================================================== RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- e2fsprogs.spec 9 Jan 2006 22:43:20 -0000 1.43 +++ e2fsprogs.spec 11 Jan 2006 15:41:36 -0000 1.44 @@ -4,7 +4,7 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.38 -Release: 5 +Release: 6 License: GPL Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz @@ -26,11 +26,12 @@ Patch31: e2fsprogs-1.38-man_no_ext2resize.patch Patch32: e2fsprogs-1.38-no_pottcdate.patch Patch33: e2fsprogs-1.38-lost+found.patch -Patch34: e2fsprogs-1.38-dm.patch +Patch34: e2fsprogs-1.38-blkid-devmapper.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-root Requires: e2fsprogs-libs = %{version}-%{release}, device-mapper -BuildRequires: gettext, texinfo, autoconf, automake, device-mapper, libselinux-devel, libsepol-devel +BuildRequires: gettext, texinfo, autoconf, automake, libselinux-devel, libsepol-devel +BuildRequires: device-mapper >= 1.02.02-3 %define ext2resize_basever 1.1.17 %define ext2resize_name ext2resize-%{ext2resize_basever} @@ -119,7 +120,9 @@ %patch34 -p1 -b .dm %build -%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper +aclocal +autoconf +%configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper --enable-blkid-devmapper # --enable-dynamic-e2fsck make -C po update-po make @@ -293,6 +296,10 @@ %{_mandir}/man3/uuid_unparse.3* %changelog +* Wed Jan 11 2006 Karel Zak 1.38-6 +- cleanup device-mapper patch +- use pkg-config for device-mapper + * Mon Jan 9 2006 Peter Jones 1.38-5 - fix some more minor logic errors in dm probing --- e2fsprogs-1.38-dm.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 11 16:01:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 11:01:03 -0500 Subject: rpms/foomatic/FC-4 foomatic-db-consistency.patch, NONE, 1.1 foomatic.spec, 1.94, 1.95 Message-ID: <200601111601.k0BG13KI026373@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26324 Modified Files: foomatic.spec Added Files: foomatic-db-consistency.patch Log Message: * Wed Jan 11 2006 Tim Waugh - Make sure printers and drivers match up consistently (bug #177064). foomatic-db-consistency.patch: driver/Postscript.xml | 15 +++++++++++++++ printer/HP-DeskJet.xml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) --- NEW FILE foomatic-db-consistency.patch --- --- foomatic-db-20050310/db/source/driver/Postscript.xml.consistency 2006-01-11 15:49:22.000000000 +0000 +++ foomatic-db-20050310/db/source/driver/Postscript.xml 2006-01-11 15:51:43.000000000 +0000 @@ -557,12 +557,21 @@ printer/HP-LaserJet_4350 + printer/HP-LaserJet_4_Plus + + printer/HP-LaserJet_4M printer/HP-LaserJet_4ML + printer/HP-LaserJet_4Si + + + printer/HP-LaserJet_4V + + printer/HP-LaserJet_5000 @@ -575,6 +584,9 @@ printer/HP-LaserJet_5MP + printer/HP-LaserJet_5Si + + printer/HP-LaserJet_6MP @@ -601,6 +613,9 @@ printer/HP-LaserJet_9050_MFP + + printer/HP-LaserJet_9100 + printer/HP-Mopier_240 --- foomatic-db-20050310/db/source/printer/HP-DeskJet.xml.consistency 2006-01-11 15:56:18.000000000 +0000 +++ foomatic-db-20050310/db/source/printer/HP-DeskJet.xml 2006-01-11 15:56:35.000000000 +0000 @@ -21,7 +21,7 @@ A - hpijs + pcl3 Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/FC-4/foomatic.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- foomatic.spec 8 Jan 2006 10:36:39 -0000 1.94 +++ foomatic.spec 11 Jan 2006 16:01:00 -0000 1.95 @@ -71,6 +71,9 @@ # Fix Postscript driver (bug #151645). Patch17: foomatic-postscript.patch +# Make sure printers and drivers match up consistently (bug #177064). +Patch18: foomatic-db-consistency.patch + Url: http://www.linuxprinting.org BuildRequires: perl >= 3:5.8.1 BuildRequires: libxml2-devel @@ -139,6 +142,7 @@ %patch8 -p1 -b .hplj5 %patch16 -p1 -b .ieee1284 %patch17 -p1 -b .postscript +%patch18 -p1 -b .consistency %if %with_omni # Omni printers @@ -289,6 +293,9 @@ %{_mandir}/*/* %changelog +* Wed Jan 11 2006 Tim Waugh +- Make sure printers and drivers match up consistently (bug #177064). + * Sun Jan 8 2006 Tim Waugh 3.0.2-19.1 - Fix hpijs conflict (bug #177230). From fedora-cvs-commits at redhat.com Wed Jan 11 16:01:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 11:01:16 -0500 Subject: rpms/libsetrans/devel sources,1.21,1.22 Message-ID: <200601111601.k0BG1GhP026382@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsetrans/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26345 Modified Files: sources Log Message: * Wed Jan 11 2006 Dan Walsh 0.1.16-1 - Fix memory corruption error Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 11 Jan 2006 15:39:57 -0000 1.21 +++ sources 11 Jan 2006 16:01:02 -0000 1.22 @@ -1 +1 @@ -760496cb1fae233b2583bf59d604c8bb libsetrans-0.1.16.tgz +0022991ffbcd5ec5f96b0e454295fcb0 libsetrans-0.1.16.tgz From fedora-cvs-commits at redhat.com Wed Jan 11 16:54:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 11:54:52 -0500 Subject: rpms/foomatic/FC-4 foomatic-db-consistency.patch,1.1,1.2 Message-ID: <200601111654.k0BGsqcO002530@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv2500 Modified Files: foomatic-db-consistency.patch Log Message: Fixed patch. foomatic-db-consistency.patch: driver/Postscript.xml | 18 ++++++++++++++++++ printer/HP-DeskJet.xml | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) Index: foomatic-db-consistency.patch =================================================================== RCS file: /cvs/dist/rpms/foomatic/FC-4/foomatic-db-consistency.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- foomatic-db-consistency.patch 11 Jan 2006 16:01:00 -0000 1.1 +++ foomatic-db-consistency.patch 11 Jan 2006 16:54:49 -0000 1.2 @@ -1,6 +1,16 @@ ---- foomatic-db-20050310/db/source/driver/Postscript.xml.consistency 2006-01-11 15:49:22.000000000 +0000 -+++ foomatic-db-20050310/db/source/driver/Postscript.xml 2006-01-11 15:51:43.000000000 +0000 -@@ -557,12 +557,21 @@ +--- foomatic-db-20050310/db/source/driver/Postscript.xml.consistency 2006-01-11 16:02:14.000000000 +0000 ++++ foomatic-db-20050310/db/source/driver/Postscript.xml 2006-01-11 16:50:32.000000000 +0000 +@@ -482,6 +482,9 @@ + printer/HP-LaserJet_1320 + + ++ printer/HP-LaserJet_2100 ++ ++ + printer/HP-LaserJet_2100M + + +@@ -557,12 +560,21 @@ printer/HP-LaserJet_4350 @@ -22,7 +32,7 @@ printer/HP-LaserJet_5000 -@@ -575,6 +584,9 @@ +@@ -575,6 +587,9 @@ printer/HP-LaserJet_5MP @@ -32,18 +42,18 @@ printer/HP-LaserJet_6MP -@@ -601,6 +613,9 @@ +@@ -601,6 +616,9 @@ printer/HP-LaserJet_9050_MFP + -+ printer/HP-LaserJet_9100 ++ printer/HP-OfficeJet_9100 + printer/HP-Mopier_240 ---- foomatic-db-20050310/db/source/printer/HP-DeskJet.xml.consistency 2006-01-11 15:56:18.000000000 +0000 -+++ foomatic-db-20050310/db/source/printer/HP-DeskJet.xml 2006-01-11 15:56:35.000000000 +0000 +--- foomatic-db-20050310/db/source/printer/HP-DeskJet.xml.consistency 2004-06-18 18:08:50.000000000 +0100 ++++ foomatic-db-20050310/db/source/printer/HP-DeskJet.xml 2006-01-11 16:02:19.000000000 +0000 @@ -21,7 +21,7 @@ From fedora-cvs-commits at redhat.com Wed Jan 11 16:56:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 11:56:12 -0500 Subject: rpms/foomatic/FC-4 foomatic.spec,1.95,1.96 Message-ID: <200601111656.k0BGuCXp003086@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv3043 Modified Files: foomatic.spec Log Message: 3.0.2-19.2 Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/FC-4/foomatic.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- foomatic.spec 11 Jan 2006 16:01:00 -0000 1.95 +++ foomatic.spec 11 Jan 2006 16:56:10 -0000 1.96 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 19.1 +Release: 19.2 License: GPL Group: System Environment/Libraries @@ -293,7 +293,7 @@ %{_mandir}/*/* %changelog -* Wed Jan 11 2006 Tim Waugh +* Wed Jan 11 2006 Tim Waugh 3.0.2-19.2 - Make sure printers and drivers match up consistently (bug #177064). * Sun Jan 8 2006 Tim Waugh 3.0.2-19.1 From fedora-cvs-commits at redhat.com Wed Jan 11 18:52:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 13:52:44 -0500 Subject: rpms/libdrm/devel libdrm.spec,1.7,1.8 Message-ID: <200601111852.k0BIqi0w032119@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/libdrm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32107 Modified Files: libdrm.spec Log Message: * Wed Jan 11 2006 Mike A. Harris 2.0-2 - Replaced the temporary tongue-in-cheek humourous package summary and description with the proper package descriptions, as many people didn't get the joke, while others felt it was getting old. Ah well, I had my fun for a while anyway. ;o) Index: libdrm.spec =================================================================== RCS file: /cvs/dist/rpms/libdrm/devel/libdrm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libdrm.spec 1 Dec 2005 03:19:30 -0000 1.7 +++ libdrm.spec 11 Jan 2006 18:52:41 -0000 1.8 @@ -1,7 +1,7 @@ -Summary: Digital Rights Managment library +Summary: libdrm Direct Rendering Manager runtime library Name: libdrm Version: 2.0 -Release: 1 +Release: 2 License: MIT/X11 Group: System Environment/Libraries URL: http://dri.sourceforge.net @@ -18,7 +18,7 @@ Obsoletes: XFree86-libs, xorg-x11-libs %description -Digital Rights Management runtime library +libdrm Direct Rendering Manager runtime library %package devel Summary: libdrm-devel @@ -28,7 +28,7 @@ Obsoletes: XFree86-devel, xorg-x11-devel %description devel -Digital Rights Management development package +libdrm Direct Rendering Manager development package %prep %setup -q @@ -87,6 +87,12 @@ %{_libdir}/pkgconfig/libdrm.pc %changelog +* Wed Jan 11 2006 Mike A. Harris 2.0-2 +- Replaced the temporary tongue-in-cheek humourous package summary and + description with the proper package descriptions, as many people didn't get + the joke, while others felt it was getting old. Ah well, I had my fun for + a while anyway. ;o) + * Wed Nov 30 2005 Mike A. Harris 2.0-1 - Updated libdrm to version 2.0 from dri.sf.net. This is an ABI incompatible release, meaning everything linked to it needs to be recompiled. From fedora-cvs-commits at redhat.com Wed Jan 11 19:03:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 14:03:32 -0500 Subject: rpms/libsetrans/devel .cvsignore, 1.17, 1.18 libsetrans.spec, 1.25, 1.26 sources, 1.22, 1.23 Message-ID: <200601111903.k0BJ3WJc010613@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsetrans/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10589 Modified Files: .cvsignore libsetrans.spec sources Log Message: * Wed Jan 11 2006 Dan Walsh 0.1.17-1 - Fix range translations Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 11 Jan 2006 15:39:57 -0000 1.17 +++ .cvsignore 11 Jan 2006 19:03:19 -0000 1.18 @@ -15,3 +15,4 @@ libsetrans-0.1.14.tgz libsetrans-0.1.15.tgz libsetrans-0.1.16.tgz +libsetrans-0.1.17.tgz Index: libsetrans.spec =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/libsetrans.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libsetrans.spec 11 Jan 2006 15:39:57 -0000 1.25 +++ libsetrans.spec 11 Jan 2006 19:03:19 -0000 1.26 @@ -1,6 +1,6 @@ Summary: SELinux Translation library Name: libsetrans -Version: 0.1.16 +Version: 0.1.17 Release: 1 License: LGPL Group: System Environment/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man8/mcs.8.gz %changelog +* Wed Jan 11 2006 Dan Walsh 0.1.17-1 +- Fix range translations + * Wed Jan 11 2006 Dan Walsh 0.1.16-1 - Fix memory corruption error Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 11 Jan 2006 16:01:02 -0000 1.22 +++ sources 11 Jan 2006 19:03:19 -0000 1.23 @@ -1 +1 @@ -0022991ffbcd5ec5f96b0e454295fcb0 libsetrans-0.1.16.tgz +5e22e2129d450a4bd53a88fecd7ec521 libsetrans-0.1.17.tgz From fedora-cvs-commits at redhat.com Wed Jan 11 19:20:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 14:20:59 -0500 Subject: rpms/rhpxl/devel .cvsignore, 1.12, 1.13 rhpxl.spec, 1.14, 1.15 sources, 1.14, 1.15 Message-ID: <200601111920.k0BJKxtl026683@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/rhpxl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26640 Modified Files: .cvsignore rhpxl.spec sources Log Message: update to 0.10 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 21 Dec 2005 21:44:13 -0000 1.12 +++ .cvsignore 11 Jan 2006 19:20:56 -0000 1.13 @@ -1,3 +1 @@ -rhpxl-0.7.tar.gz -rhpxl-0.8.tar.gz -rhpxl-0.9.tar.gz +rhpxl-0.10.tar.gz Index: rhpxl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- rhpxl.spec 21 Dec 2005 21:44:13 -0000 1.14 +++ rhpxl.spec 11 Jan 2006 19:20:56 -0000 1.15 @@ -2,7 +2,7 @@ Summary: Python library for configuring and running X. Name: rhpxl -Version: 0.9 +Version: 0.10 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -43,6 +43,10 @@ %{_sbindir}/ddcprobe %changelog +* Wed Jan 11 2006 Peter Jones 0.10-1 +- If we're on a Mac and can't get DDC/EDID, and our resolution is tiny, + force 1024x768. + * Wed Dec 21 2005 Chris Lumens 0.9-1 - Don't use rhpl.log anymore. Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 21 Dec 2005 21:44:13 -0000 1.14 +++ sources 11 Jan 2006 19:20:56 -0000 1.15 @@ -1 +1 @@ -113853abbc5c0bb777c0c1fa612f5624 rhpxl-0.9.tar.gz +39e89c60e1b97621e9ca17e901d157d9 rhpxl-0.10.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 11 19:37:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 14:37:07 -0500 Subject: rpms/poppler/devel .cvsignore, 1.11, 1.12 poppler.spec, 1.16, 1.17 sources, 1.11, 1.12 Message-ID: <200601111937.k0BJb794031744@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/poppler/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31709 Modified Files: .cvsignore poppler.spec sources Log Message: * Wed Jan 11 2006 Kristian H??gsberg - 0.5.0-2.0 - Update to 0.5.0 and add poppler-utils subpackage. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/poppler/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 4 Sep 2005 18:37:55 -0000 1.11 +++ .cvsignore 11 Jan 2006 19:37:03 -0000 1.12 @@ -1 +1 @@ -poppler-0.4.2.tar.gz +poppler-0.5.0.tar.gz Index: poppler.spec =================================================================== RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- poppler.spec 9 Dec 2005 22:42:45 -0000 1.16 +++ poppler.spec 11 Jan 2006 19:37:03 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Pdf rendering library Name: poppler -Version: 0.4.2 -Release: 1.1 +Version: 0.5.0 +Release: 2.0 License: GPL Group: Development/Libraries Source0: %{name}-%{version}.tar.gz @@ -26,11 +26,23 @@ You should install the poppler-devel package if you would like to compile applications based on poppler. +%package utils +Summary: Command line utilities for converting PDF files. +Group: Applications/Text +Requires: %name = %{version} + +%description utils +Poppler, a PDF rendering library, it's a fork of the xpdf PDF +viewer developed by Derek Noonburg of Glyph and Cog, LLC. + +This utils package installs a number of command line tools for +converting PDF files to a number of other formats. + %prep %setup -q %build -%configure --enable-cairo-output +%configure --enable-cairo-output --disable-splash-output make %install @@ -52,7 +64,14 @@ %{_libdir}/lib*.a %{_includedir}/poppler +%files utils +%defattr(-, root, root) +%{_bindir}/* + %changelog +* Wed Jan 11 2006 Kristian H??gsberg - 0.5.0-2.0 +- Update to 0.5.0 and add poppler-utils subpackage. + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/poppler/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 4 Sep 2005 18:37:55 -0000 1.11 +++ sources 11 Jan 2006 19:37:03 -0000 1.12 @@ -1 +1 @@ -beb1eea135a3c5b679a7a22d01a500c0 poppler-0.4.2.tar.gz +c84c1be19f43e4a84872ff08234c1960 poppler-0.5.0.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 11 19:49:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 14:49:35 -0500 Subject: rpms/kernel-xen/devel kernel-xen.spec, 1.27, 1.28 linux-2.6.14-xen-compile-fixes.patch, 1.1, 1.2 Message-ID: <200601111949.k0BJnZdG014464@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14436 Modified Files: kernel-xen.spec linux-2.6.14-xen-compile-fixes.patch Log Message: Fix up kevent usage for xen net backend Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- kernel-xen.spec 9 Jan 2006 23:47:19 -0000 1.27 +++ kernel-xen.spec 11 Jan 2006 19:49:30 -0000 1.28 @@ -1443,6 +1443,9 @@ %endif %changelog +* Wed Jan 11 2006 +- Fix up kevent usage for xen net backend + * Mon Jan 9 2006 Stephen Tweedie - Rebase xen to hypervisor from 20060106 - Rebase xen kernel code to linux-2.6-merge.hg cset 16985 linux-2.6.14-xen-compile-fixes.patch: netback/xenbus.c | 8 ++++---- xenbus/xenbus_probe.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) Index: linux-2.6.14-xen-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6.14-xen-compile-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.14-xen-compile-fixes.patch 9 Jan 2006 20:42:18 -0000 1.1 +++ linux-2.6.14-xen-compile-fixes.patch 11 Jan 2006 19:49:30 -0000 1.2 @@ -20,7 +20,7 @@ } - kobject_uevent(&dev->dev.kobj, KOBJ_ONLINE); -+ kobject_uevent(&dev->dev.kobj, KOBJ_ONLINE, NULL); ++ kobject_hotplug(&dev->dev.kobj, KOBJ_ONLINE); maybe_connect(be); } @@ -29,7 +29,7 @@ case XenbusStateClosed: - kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE); -+ kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE, NULL); ++ kobject_hotplug(&dev->dev.kobj, KOBJ_OFFLINE); device_unregister(&dev->dev); break; From fedora-cvs-commits at redhat.com Wed Jan 11 20:05:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 15:05:18 -0500 Subject: rpms/kernel-xen/devel kernel-xen.spec,1.28,1.29 Message-ID: <200601112005.k0BK5IU6019904@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19884 Modified Files: kernel-xen.spec Log Message: Fix %post to create mkinitrd for domU Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- kernel-xen.spec 11 Jan 2006 19:49:30 -0000 1.28 +++ kernel-xen.spec 11 Jan 2006 20:05:14 -0000 1.29 @@ -1283,7 +1283,7 @@ %post hypervisor [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-hypervisor -[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-hypervisor --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor +[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-hypervisor --mkinitrd --depmod --install --multiboot=/boot/xen.gz-%{KVERREL} %{KVERREL}hypervisor [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X %post hypervisor-devel @@ -1295,6 +1295,7 @@ %post guest [ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}-guest +[ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --package kernel-xen-guest --mkinitrd --depmod --install %{KVERREL}guest [ ! -x /sbin/ldconfig ] || /sbin/ldconfig -X %post guest-devel @@ -1445,6 +1446,7 @@ %changelog * Wed Jan 11 2006 - Fix up kevent usage for xen net backend +- Fix %post to create mkinitrd for domU * Mon Jan 9 2006 Stephen Tweedie - Rebase xen to hypervisor from 20060106 From fedora-cvs-commits at redhat.com Wed Jan 11 20:23:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 15:23:21 -0500 Subject: rpms/poppler/devel poppler.spec,1.17,1.18 Message-ID: <200601112023.k0BKNLHM004216@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/poppler/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4185 Modified Files: poppler.spec Log Message: - Flesh out poppler-utils subpackage. Index: poppler.spec =================================================================== RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- poppler.spec 11 Jan 2006 19:37:03 -0000 1.17 +++ poppler.spec 11 Jan 2006 20:23:18 -0000 1.18 @@ -30,6 +30,7 @@ Summary: Command line utilities for converting PDF files. Group: Applications/Text Requires: %name = %{version} +Conflicts: xpdf %description utils Poppler, a PDF rendering library, it's a fork of the xpdf PDF @@ -63,14 +64,17 @@ %{_libdir}/pkgconfig/* %{_libdir}/lib*.a %{_includedir}/poppler +%{_datadir}/gtk-doc/html/poppler %files utils %defattr(-, root, root) %{_bindir}/* +%{_mandir}/man1/* %changelog * Wed Jan 11 2006 Kristian H??gsberg - 0.5.0-2.0 - Update to 0.5.0 and add poppler-utils subpackage. +- Flesh out poppler-utils subpackage. * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 11 20:46:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 15:46:15 -0500 Subject: rpms/device-mapper/devel device-mapper-1.02.02-pkg-config.patch, 1.1, 1.2 Message-ID: <200601112046.k0BKkFSd005519@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/device-mapper/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4041 Modified Files: device-mapper-1.02.02-pkg-config.patch Log Message: remove extra "prefix" since exec_prefix already includes it device-mapper-1.02.02-pkg-config.patch: configure.in | 2 ++ dmeventd/Makefile.in | 2 ++ dmeventd/devmapper-event.pc.in | 12 ++++++++++++ lib/Makefile.in | 4 ++-- lib/devmapper.pc.in | 12 ++++++++++++ make.tmpl.in | 1 + 6 files changed, 31 insertions(+), 2 deletions(-) Index: device-mapper-1.02.02-pkg-config.patch =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper-1.02.02-pkg-config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- device-mapper-1.02.02-pkg-config.patch 11 Jan 2006 15:21:02 -0000 1.1 +++ device-mapper-1.02.02-pkg-config.patch 11 Jan 2006 20:46:04 -0000 1.2 @@ -4,7 +4,7 @@ bindir = $(DESTDIR)@bindir@ includedir = $(DESTDIR)@includedir@ libdir = $(DESTDIR)@libdir@ -+usrlibdir = $(DESTDIR)$(prefix)@libdir@ ++usrlibdir = $(DESTDIR)@libdir@ sbindir = $(DESTDIR)@sbindir@ infodir = $(DESTDIR)@infodir@ mandir = $(DESTDIR)@mandir@ From fedora-cvs-commits at redhat.com Wed Jan 11 20:49:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 15:49:41 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.200, 1.201 anaconda.spec, 1.319, 1.320 sources, 1.319, 1.320 Message-ID: <200601112049.k0BKnfBB015512@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15488/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.91.3-1 on branch devel from anaconda-10.91.3-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.200 retrieving revision 1.201 diff -u -r1.200 -r1.201 --- .cvsignore 11 Jan 2006 01:36:06 -0000 1.200 +++ .cvsignore 11 Jan 2006 20:49:39 -0000 1.201 @@ -1 +1 @@ -anaconda-10.91.2.tar.bz2 +anaconda-10.91.3.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.319 retrieving revision 1.320 diff -u -r1.319 -r1.320 --- anaconda.spec 11 Jan 2006 01:36:06 -0000 1.319 +++ anaconda.spec 11 Jan 2006 20:49:39 -0000 1.320 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.91.2 +Version: 10.91.3 Release: 1 License: GPL Summary: Graphical system installer @@ -78,6 +78,11 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Jan 11 2006 Jeremy Katz - 10.91.3-1 +- remove some unneeded bits from the ppc boot.iso to make it smaller +- fix some text display (notting, #177537) +- Misc kickstart fixes (clumens) + * Tue Jan 10 2006 Jeremy Katz - 10.91.2-1 - fix hard drive installs (pjones) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.319 retrieving revision 1.320 diff -u -r1.319 -r1.320 --- sources 11 Jan 2006 01:36:06 -0000 1.319 +++ sources 11 Jan 2006 20:49:39 -0000 1.320 @@ -1 +1 @@ -d2bfdae21e7c3cbb4688f3d7639e7116 anaconda-10.91.2.tar.bz2 +d644e9a0b4289307a02793d5cc5a1642 anaconda-10.91.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 11 20:56:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 15:56:27 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.201, 1.202 anaconda.spec, 1.320, 1.321 sources, 1.320, 1.321 Message-ID: <200601112056.k0BKuRqT015999@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15977/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.91.4-1 on branch devel from anaconda-10.91.4-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.201 retrieving revision 1.202 diff -u -r1.201 -r1.202 --- .cvsignore 11 Jan 2006 20:49:39 -0000 1.201 +++ .cvsignore 11 Jan 2006 20:56:25 -0000 1.202 @@ -1 +1 @@ -anaconda-10.91.3.tar.bz2 +anaconda-10.91.4.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.320 retrieving revision 1.321 diff -u -r1.320 -r1.321 --- anaconda.spec 11 Jan 2006 20:49:39 -0000 1.320 +++ anaconda.spec 11 Jan 2006 20:56:25 -0000 1.321 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.91.3 +Version: 10.91.4 Release: 1 License: GPL Summary: Graphical system installer @@ -78,6 +78,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Jan 11 2006 Jeremy Katz - 10.91.4-1 +- Add xen kernels + * Wed Jan 11 2006 Jeremy Katz - 10.91.3-1 - remove some unneeded bits from the ppc boot.iso to make it smaller - fix some text display (notting, #177537) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.320 retrieving revision 1.321 diff -u -r1.320 -r1.321 --- sources 11 Jan 2006 20:49:39 -0000 1.320 +++ sources 11 Jan 2006 20:56:25 -0000 1.321 @@ -1 +1 @@ -d644e9a0b4289307a02793d5cc5a1642 anaconda-10.91.3.tar.bz2 +64c2336649b282e471aa0ab01430ab7c anaconda-10.91.4.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 11 21:07:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 16:07:00 -0500 Subject: rpms/device-mapper/devel device-mapper-1.02.02-pkg-config.patch, 1.2, 1.3 Message-ID: <200601112107.k0BL70B3016293@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/device-mapper/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16272 Modified Files: device-mapper-1.02.02-pkg-config.patch Log Message: - actually put that back, that's where DESTDIR _really_ comes from in this case. device-mapper-1.02.02-pkg-config.patch: configure.in | 2 ++ dmeventd/Makefile.in | 2 ++ dmeventd/devmapper-event.pc.in | 12 ++++++++++++ lib/Makefile.in | 4 ++-- lib/devmapper.pc.in | 12 ++++++++++++ make.tmpl.in | 1 + 6 files changed, 31 insertions(+), 2 deletions(-) Index: device-mapper-1.02.02-pkg-config.patch =================================================================== RCS file: /cvs/dist/rpms/device-mapper/devel/device-mapper-1.02.02-pkg-config.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- device-mapper-1.02.02-pkg-config.patch 11 Jan 2006 20:46:04 -0000 1.2 +++ device-mapper-1.02.02-pkg-config.patch 11 Jan 2006 21:06:55 -0000 1.3 @@ -4,7 +4,7 @@ bindir = $(DESTDIR)@bindir@ includedir = $(DESTDIR)@includedir@ libdir = $(DESTDIR)@libdir@ -+usrlibdir = $(DESTDIR)@libdir@ ++usrlibdir = $(DESTDIR)$(prefix)@libdir@ sbindir = $(DESTDIR)@sbindir@ infodir = $(DESTDIR)@infodir@ mandir = $(DESTDIR)@mandir@ From fedora-cvs-commits at redhat.com Wed Jan 11 21:55:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 16:55:53 -0500 Subject: rpms/nfs-utils/devel nfs-utils.spec, 1.78, 1.79 rpcgssd.init, 1.4, 1.5 rpcidmapd.init, 1.4, 1.5 rpcsvcgssd.init, 1.3, 1.4 Message-ID: <200601112155.k0BLtr4i024648@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24517 Modified Files: nfs-utils.spec rpcgssd.init rpcidmapd.init rpcsvcgssd.init Log Message: fix init scripts so rc will see to shut things down Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- nfs-utils.spec 9 Jan 2006 23:06:31 -0000 1.78 +++ nfs-utils.spec 11 Jan 2006 21:55:50 -0000 1.79 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.8.rc2 -Release: 1.FC5 +Release: 2.FC5 # group all 32bit related archs %define all_32bit_archs i386 i686 athlon @@ -216,7 +216,10 @@ %config /etc/rc.d/init.d/nfslock %changelog -* Mon Jan 9 2006 1.0.8-1 +* Wed Jan 11 2006 Peter Jones 1.0.8.rc2-2.FC5 +- Fix lockfile naming in the initscripts so they're stopped correctly. + +* Mon Jan 9 2006 Steve Dickson 1.0.8.rc2-1.FC5 - Updated to 1.0.8-rc2 release - Broke out libgssapi into its own rpm - Move librpcsecgss and libnfsidmap in the new nfs-utils-lib rpm Index: rpcgssd.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/rpcgssd.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpcgssd.init 9 Jan 2006 20:17:59 -0000 1.4 +++ rpcgssd.init 11 Jan 2006 21:55:51 -0000 1.5 @@ -33,6 +33,7 @@ # Try to use machine credentials by default OPTIONS="" RETVAL=0 +LOCKFILE=/var/lock/subsys/rpcgssd prog="rpc.gssd" case "$1" in @@ -41,7 +42,7 @@ if status $prog > /dev/null ; then exit 0 fi - rm -f /var/lock/subsys/$prog + rm -f $LOCKFILE echo -n $"Starting RPC gssd: " @@ -70,7 +71,7 @@ daemon $prog ${OPTIONS} RETVAL=$? echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.gssd + [ $RETVAL -eq 0 ] && touch $LOCKFILE ;; stop) # Stop daemon. @@ -78,7 +79,7 @@ killproc $prog RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.gssd + [ $RETVAL -eq 0 ] && rm -f $LOCKFILE ;; status) status rpc.gssd @@ -90,7 +91,7 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/rpc.gssd ]; then + if [ -f $LOCKFILE ]; then $0 restart RETVAL=$? fi Index: rpcidmapd.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/rpcidmapd.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpcidmapd.init 8 Sep 2005 14:27:06 -0000 1.4 +++ rpcidmapd.init 11 Jan 2006 21:55:51 -0000 1.5 @@ -24,6 +24,7 @@ OPTIONS="" RETVAL=0 +LOCKFILE=/var/lock/subsys/rpcidmapd prog="rpc.idmapd" case "$1" in @@ -33,7 +34,7 @@ killproc $prog "-SIGHUP" > /dev/null exit 0 } - rm -f /var/lock/subsys/$prog + rm -f $LOCKFILE echo -n $"Starting RPC idmapd: " @@ -56,7 +57,7 @@ daemon $prog ${OPTIONS} RETVAL=$? echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.idmapd + [ $RETVAL -eq 0 ] && touch $LOCKFILE ;; stop) # Stop daemon. @@ -64,7 +65,7 @@ killproc $prog RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.idmapd + [ $RETVAL -eq 0 ] && rm -f $LOCKFILE ;; status) status rpc.idmapd @@ -76,7 +77,7 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/rpc.idmapd ]; then + if [ -f $LOCKFILE ]; then $0 restart RETVAL=$? fi Index: rpcsvcgssd.init =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/rpcsvcgssd.init,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rpcsvcgssd.init 14 Feb 2005 19:29:31 -0000 1.3 +++ rpcsvcgssd.init 11 Jan 2006 21:55:51 -0000 1.4 @@ -31,6 +31,7 @@ OPTIONS="" RETVAL=0 +LOCKFILE=/var/lock/subsys/rpcsvcgssd prog="rpc.svcgssd" case "$1" in @@ -39,7 +40,7 @@ if status $prog > /dev/null ; then exit 0 fi - rm -f /var/lock/subsys/$prog + rm -f $LOCKFILE echo -n $"Starting RPC svcgssd: " @@ -69,7 +70,7 @@ daemon $prog ${OPTIONS} RETVAL=$? echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/rpc.svcgssd + [ $RETVAL -eq 0 ] && touch $LOCKFILE ;; stop) # Stop daemon. @@ -77,7 +78,7 @@ killproc $prog RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/rpc.svcgssd + [ $RETVAL -eq 0 ] && rm -f $LOCKFILE ;; status) status rpc.svcgssd @@ -89,7 +90,7 @@ RETVAL=$? ;; condrestart) - if [ -f /var/lock/subsys/rpc.svcgssd ]; then + if [ -f $LOCKFILE ]; then $0 restart RETVAL=$? fi From fedora-cvs-commits at redhat.com Wed Jan 11 21:59:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 16:59:14 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1843, 1.1844 linux-2.6-x86_64-ati-apic-timer.patch, 1.1, NONE Message-ID: <200601112159.k0BLxDB2025898@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25836 Modified Files: kernel-2.6.spec Removed Files: linux-2.6-x86_64-ati-apic-timer.patch Log Message: Fix ATI regression Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1843 retrieving revision 1.1844 diff -u -r1.1843 -r1.1844 --- kernel-2.6.spec 11 Jan 2006 13:04:20 -0000 1.1843 +++ kernel-2.6.spec 11 Jan 2006 21:59:09 -0000 1.1844 @@ -221,8 +221,7 @@ Patch203: linux-2.6.14-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch Patch205: linux-2.6-x86_64-disable-hotplug-guessing.patch -Patch206: linux-2.6-x86_64-ati-apic-timer.patch -Patch207: linux-2.6-edid-check.patch +Patch206: linux-2.6-edid-check.patch # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch @@ -617,10 +616,8 @@ %patch204 -p1 # Disable guessing of how many hotplug cpus to add. %patch205 -p1 -# ATI timer quirk. -%patch206 -p1 # Reboot thru bios on HP laptops. -%patch207 -p1 +%patch206 -p1 # # ppc64 @@ -1357,6 +1354,9 @@ %endif %changelog +* Wed Jan 11 2006 Dave Jones +- Make ATI chipset based x86-64 machines boot again. + * Wed Jan 11 2006 David Woodhouse - 2.6.15-git7 - Turn off CONFIG_DEBUG_MUTEXES since it makes the G5 not boot --- linux-2.6-x86_64-ati-apic-timer.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 11 22:03:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 17:03:10 -0500 Subject: rpms/anacron/devel anacron.init,1.4,1.5 anacron.spec,1.14,1.15 Message-ID: <200601112203.k0BM3As9026860@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/anacron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26789 Modified Files: anacron.init anacron.spec Log Message: add initscript subsys locking Index: anacron.init =================================================================== RCS file: /cvs/dist/rpms/anacron/devel/anacron.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- anacron.init 9 Sep 2004 03:00:12 -0000 1.4 +++ anacron.init 11 Jan 2006 22:03:07 -0000 1.5 @@ -10,11 +10,13 @@ [ -f /usr/sbin/anacron ] || exit 0 prog="anacron" +LOCKFILE=/var/lock/subsys/$prog start() { echo -n $"Starting $prog: " daemon +19 anacron -s RETVAL=$? + touch $LOCKFILE echo return $RETVAL } @@ -26,6 +28,7 @@ echo fi RETVAL=$? + rm -f $LOCKFILE return $RETVAL } @@ -46,7 +49,7 @@ start ;; condrestart) - if test "x`pidof anacron`" != x; then + if [ -f $LOCKFILE ]; then stop start fi Index: anacron.spec =================================================================== RCS file: /cvs/dist/rpms/anacron/devel/anacron.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- anacron.spec 9 Dec 2005 22:39:33 -0000 1.14 +++ anacron.spec 11 Jan 2006 22:03:07 -0000 1.15 @@ -1,7 +1,7 @@ Summary: A cron-like program that can run jobs lost during downtime. Name: anacron Version: 2.3 -Release: 34.1 +Release: 35 License: GPL Group: System Environment/Base Source: ftp://ftp.debian.org/debian/pool/main/a/anacron/%{name}_%{version}.orig.tar.gz @@ -110,6 +110,9 @@ %config /etc/cron.weekly/0anacron %changelog +* Wed Jan 11 2006 Peter Jones 2.3-35 +- Fix initscript so changing runlevel shuts it down correctly + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 11 22:07:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 17:07:13 -0500 Subject: rpms/nfs-utils/devel nfs-utils.spec,1.79,1.80 Message-ID: <200601112207.k0BM7DaP027711@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27495 Modified Files: nfs-utils.spec Log Message: move the lockfiles for the currently running daemons in %pre Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- nfs-utils.spec 11 Jan 2006 21:55:50 -0000 1.79 +++ nfs-utils.spec 11 Jan 2006 22:07:07 -0000 1.80 @@ -130,6 +130,13 @@ rm -rf $RPM_BUILD_ROOT %pre +# move files so the running service will have this applied as well +for x in gssd svcgssd idmapd ; do + if [ -f /var/lock/subsys/rpc.$x ]; then + mv /var/lock/subsys/rpc.$x /var/lock/subsys/rpc$x + fi +done + /usr/sbin/useradd -l -c "RPC Service User" -r \ -s /sbin/nologin -u 29 -d /var/lib/nfs rpcuser 2>/dev/null || : # Define the correct unsigned uid value for 32 or 64 bit archs From fedora-cvs-commits at redhat.com Wed Jan 11 22:13:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 17:13:39 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1826.2.9, 1.1826.2.10 linux-2.6-x86_64-ati-apic-timer.patch, 1.1, NONE Message-ID: <200601112213.k0BMDduZ029515@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29452 Modified Files: Tag: private-fc5-test2-branch kernel-2.6.spec Removed Files: Tag: private-fc5-test2-branch linux-2.6-x86_64-ati-apic-timer.patch Log Message: fix ati regression Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.9 retrieving revision 1.1826.2.10 diff -u -r1.1826.2.9 -r1.1826.2.10 --- kernel-2.6.spec 9 Jan 2006 19:11:18 -0000 1.1826.2.9 +++ kernel-2.6.spec 11 Jan 2006 22:13:27 -0000 1.1826.2.10 @@ -220,7 +220,6 @@ Patch203: linux-2.6.14-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch Patch205: linux-2.6-x86_64-disable-hotplug-guessing.patch -Patch206: linux-2.6-x86_64-ati-apic-timer.patch Patch207: linux-2.6-edid-check.patch # 300 - 399 ppc(64) @@ -639,8 +638,6 @@ %patch204 -p1 # Disable guessing of how many hotplug cpus to add. %patch205 -p1 -# ATI timer quirk. -%patch206 -p1 # Reboot thru bios on HP laptops. %patch207 -p1 @@ -1417,6 +1414,9 @@ %endif %changelog +* Wed Jan 11 2006 Dave Jones +- Fix booting issue on x86-64 ATI systems. + * Mon Jan 9 2006 Dave Jones - Remove vm debug patch that triggers too easily right now. (Needs fixing properly post test2). --- linux-2.6-x86_64-ati-apic-timer.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 11 22:14:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 17:14:41 -0500 Subject: rpms/evolution/devel evolution-2.5.4-port-to-new-libnotify-api.patch, NONE, 1.1 evolution.spec, 1.110, 1.111 Message-ID: <200601112214.k0BMEf0D029997@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29368 Modified Files: evolution.spec Added Files: evolution-2.5.4-port-to-new-libnotify-api.patch Log Message: * Wed Jan 11 2006 David Malcolm - 2.5.4-4 - ported alarm notification code to the new libnotify API (patch 806, #177546) - added libnotify_support macro - added explicit notify-daemon requirement as a workaround for bug #177535 evolution-2.5.4-port-to-new-libnotify-api.patch: alarm-queue.c | 39 ++++++++++++++------------------------- 1 files changed, 14 insertions(+), 25 deletions(-) --- NEW FILE evolution-2.5.4-port-to-new-libnotify-api.patch --- --- evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api 2006-01-11 14:21:50.000000000 -0500 +++ evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c 2006-01-11 14:36:01.000000000 -0500 @@ -1457,12 +1457,12 @@ const char *summary, *location; GtkTooltips *tooltips; ECalComponentText text; - char *str, *start_str, *end_str, *alarm_str, *time_str; + char *start_str, *end_str, *alarm_str, *time_str; icaltimezone *current_zone; ECalComponentOrganizer organiser; - NotifyIcon *icon; - char *filename; + char *icon_filename; char *body; + NotifyNotification *notification; comp = cqa->alarms->comp; qa = lookup_queued_alarm (cqa, alarm_id); @@ -1470,9 +1470,7 @@ return; if (!notify_is_initted ()) notify_init("Evolution Alarm Notify"); - filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG); - icon = notify_icon_new_from_uri (filename); - g_free (filename); + icon_filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG); /* get a sensible description for the event */ e_cal_component_get_summary (comp, &text); @@ -1495,9 +1493,6 @@ end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone); time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end); - str = g_strdup_printf ("%s %s", - start_str, time_str); - if (organiser.cn) { if (location) body = g_strdup_printf ("%s\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str); @@ -1508,28 +1503,22 @@ if (location) body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str); else - body = g_strdup_printf ("%s %s", start_str, time_str); -} + body = g_strdup_printf ("%s %s", start_str, time_str); + } - if (!notify_send_notification ( - NULL, "device", NOTIFY_URGENCY_NORMAL, - summary, - body, /* body text */ - icon, /* icon */ - TRUE, 0, /* expiry, server default */ - NULL, /* hints */ - NULL, /* no user_data */ - 0)) /* no actions */ - g_warning ("Could not send notification to daemon\n"); + notification = notify_notification_new (summary, + body, + icon_filename, + NULL); + if (!notify_notification_show_and_forget (notification, NULL)) + g_warning ("Error showing notification\n"); - /* create the private structure */ + g_free (icon_filename); + g_free (body); g_free (start_str); g_free (end_str); g_free (alarm_str); g_free (time_str); - g_free (str); - - } #endif Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- evolution.spec 11 Jan 2006 05:57:14 -0000 1.110 +++ evolution.spec 11 Jan 2006 22:14:37 -0000 1.111 @@ -25,6 +25,7 @@ %define nntp_support 1 %define exchange_support 1 %define nm_support 1 +%define libnotify_support 1 %define redhat_menus_version 5.0.4 @@ -32,7 +33,7 @@ Name: evolution Version: 2.5.4 -Release: 3 +Release: 4 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -91,6 +92,7 @@ Patch804: evolution-2.4.1-fix-missing-declarations.patch Patch805: evolution-2.5.4-fix-missing-declarations.patch +Patch806: evolution-2.5.4-port-to-new-libnotify-api.patch Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -111,6 +113,11 @@ Requires: libgnomeprint22 >= %{libgnomeprint22_version} Requires: gnome-vfs2 >= %{gnomevfs2_version} +%if %{libnotify_support} +Requires: libnotify +Requires: notify-daemon +%endif + Obsoletes: libgal2 <= %{last_libgal2_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} @@ -169,6 +176,11 @@ BuildRequires: NetworkManager-glib-devel %endif +%if %{libnotify_support} +BuildRequires: libnotify +#ought to eventually be libnotify-devel, see bug 177484 +%endif + %description Evolution is the GNOME mailer, calendar, contact manager and communications tool. The tools which make up Evolution will @@ -223,6 +235,7 @@ %patch803 -p1 -b .no-gnome-common %patch804 -p1 -b .fix-missing-declarations %patch805 -p1 -b .fix-missing-declarations-2-5-4 +%patch806 -p1 -b .port-to-new-libnotify-api mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -499,6 +512,11 @@ %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Wed Jan 11 2006 David Malcolm - 2.5.4-4 +- ported alarm notification code to the new libnotify API (patch 806, #177546) +- added libnotify_support macro +- added explicit notify-daemon requirement as a workaround for bug #177535 + * Tue Jan 10 2006 David Malcolm - 2.5.4-3 - updated patch 800 to include patch for memo conduit (untested at this stage); renaming from evolution-2.5.2-fix-conduits.patch to From fedora-cvs-commits at redhat.com Wed Jan 11 22:25:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 17:25:10 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.21, 1.22 modules-mls.conf, 1.7, 1.8 policy-20060104.patch, 1.7, 1.8 selinux-policy.spec, 1.80, 1.81 sources, 1.23, 1.24 Message-ID: <200601112225.k0BMPAi4012656@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12627 Modified Files: .cvsignore modules-mls.conf policy-20060104.patch selinux-policy.spec sources Log Message: * Tue Jan 10 2006 Dan Walsh 2.1.9-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 9 Jan 2006 20:20:08 -0000 1.21 +++ .cvsignore 11 Jan 2006 22:25:06 -0000 1.22 @@ -22,3 +22,4 @@ serefpolicy-2.1.6.tgz serefpolicy-2.1.7.tgz serefpolicy-2.1.8.tgz +serefpolicy-2.1.9.tgz Index: modules-mls.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-mls.conf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- modules-mls.conf 30 Dec 2005 16:08:00 -0000 1.7 +++ modules-mls.conf 11 Jan 2006 22:25:06 -0000 1.8 @@ -114,6 +114,20 @@ rpm = base # Layer: admin +# Module: readahead +# +# Readahead, read files into page cache for improved performance +# +readahead = base + +# Layer: apps +# Module: alsa +# +# alsa - Configure sound +# +alsa = base + +# Layer: admin # Module: kudzu # # Hardware detection and configuration tools policy-20060104.patch: Makefile | 2 policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 1 policy/modules/admin/readahead.te | 6 + policy/modules/admin/su.if | 2 policy/modules/admin/vpn.te | 7 + policy/modules/apps/alsa.fc | 3 policy/modules/apps/alsa.if | 21 ++++ policy/modules/apps/alsa.te | 34 ++++++++ policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 +++++ policy/modules/apps/java.te | 25 +++++ policy/modules/apps/wine.fc | 2 policy/modules/apps/wine.if | 23 +++++ policy/modules/apps/wine.te | 27 ++++++ policy/modules/kernel/corecommands.te | 6 + policy/modules/kernel/devices.if | 16 +++ policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.if | 17 ++++ policy/modules/kernel/mls.te | 2 policy/modules/services/apache.te | 9 ++ policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 10 ++ policy/modules/services/bind.if | 19 ++++ policy/modules/services/cron.te | 34 +------- policy/modules/services/cups.te | 6 - policy/modules/services/dovecot.te | 1 policy/modules/services/finger.te | 1 policy/modules/services/hal.fc | 1 policy/modules/services/hal.te | 20 +++- policy/modules/services/kerberos.te | 5 - policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++++++++++ policy/modules/services/mta.te | 10 ++ policy/modules/services/networkmanager.te | 5 - policy/modules/services/ntp.te | 2 policy/modules/services/prelink.fc | 7 + policy/modules/services/prelink.if | 39 +++++++++ policy/modules/services/prelink.te | 64 +++++++++++++++ policy/modules/services/samba.if | 2 policy/modules/services/sendmail.te | 2 policy/modules/services/ssh.if | 4 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 14 +++ policy/modules/system/authlogin.te | 12 -- policy/modules/system/fstools.te | 2 policy/modules/system/hostname.te | 37 +------- policy/modules/system/init.if | 3 policy/modules/system/init.te | 20 +--- policy/modules/system/iptables.te | 1 policy/modules/system/libraries.fc | 127 +++++++++++++++--------------- policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.te | 9 -- policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.te | 1 policy/modules/system/unconfined.if | 1 policy/modules/system/unconfined.te | 12 +- policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 67 +++++++++++---- policy/modules/system/userdomain.te | 1 policy/users | 8 + 64 files changed, 656 insertions(+), 200 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- policy-20060104.patch 10 Jan 2006 17:36:14 -0000 1.7 +++ policy-20060104.patch 11 Jan 2006 22:25:06 -0000 1.8 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.8/Makefile ---- nsaserefpolicy/Makefile 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/Makefile 2006-01-09 14:37:14.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.9/Makefile +--- nsaserefpolicy/Makefile 2006-01-11 14:31:29.000000000 -0500 ++++ serefpolicy-2.1.9/Makefile 2006-01-11 17:13:44.000000000 -0500 @@ -92,7 +92,7 @@ # enable MLS if requested. @@ -10,9 +10,9 @@ override CHECKPOLICY += -M override CHECKMODULE += -M endif -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.1.8/policy/modules/admin/amanda.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.1.9/policy/modules/admin/amanda.te --- nsaserefpolicy/policy/modules/admin/amanda.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/amanda.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/admin/amanda.te 2006-01-11 17:13:44.000000000 -0500 @@ -165,6 +165,10 @@ sysnet_read_config(amanda_t) @@ -24,40 +24,37 @@ optional_policy(`authlogin',` auth_read_shadow(amanda_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/consoletype.te serefpolicy-2.1.8/policy/modules/admin/consoletype.te ---- nsaserefpolicy/policy/modules/admin/consoletype.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/consoletype.te 2006-01-09 14:37:14.000000000 -0500 -@@ -38,6 +38,7 @@ - - kernel_use_fd(consoletype_t) - kernel_dontaudit_read_system_state(consoletype_t) -+kernel_read_proc_devices(consoletype_t) - - fs_getattr_all_fs(consoletype_t) - fs_search_auto_mountpoints(consoletype_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/netutils.te serefpolicy-2.1.8/policy/modules/admin/netutils.te ---- nsaserefpolicy/policy/modules/admin/netutils.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/netutils.te 2006-01-09 14:37:14.000000000 -0500 -@@ -42,6 +42,7 @@ - files_create_tmp_files(netutils_t, netutils_tmp_t, { file dir }) - - kernel_search_proc(netutils_t) -+kernel_read_proc_devices(netutils_t) - - corenet_tcp_sendrecv_all_if(netutils_t) - corenet_raw_sendrecv_all_if(netutils_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.1.8/policy/modules/admin/readahead.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.1.9/policy/modules/admin/kudzu.te +--- nsaserefpolicy/policy/modules/admin/kudzu.te 2006-01-09 11:32:53.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/admin/kudzu.te 2006-01-11 17:13:44.000000000 -0500 +@@ -63,6 +63,7 @@ + fs_write_ramfs_socket(kudzu_t) + + mls_file_read_up(kudzu_t) ++mls_file_write_down(kudzu_t) + + modutils_read_mods_deps(kudzu_t) + modutils_read_module_conf(kudzu_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.1.9/policy/modules/admin/readahead.te --- nsaserefpolicy/policy/modules/admin/readahead.te 2006-01-04 16:55:14.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/readahead.te 2006-01-10 11:39:08.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/admin/readahead.te 2006-01-11 17:13:44.000000000 -0500 @@ -27,6 +27,7 @@ kernel_read_kernel_sysctl(readahead_t) kernel_read_system_state(readahead_t) -+kernel_getattr_core(readahead_t) ++kernel_dontaudit_getattr_core(readahead_t) dev_read_sysfs(readahead_t) dev_getattr_generic_chr_file(readahead_t) -@@ -43,6 +44,9 @@ +@@ -34,6 +35,7 @@ + dev_getattr_all_chr_files(readahead_t) + dev_getattr_all_blk_files(readahead_t) + dev_dontaudit_read_all_blk_files(readahead_t) ++dev_dontaudit_getattr_memory_device(readahead_t) + + domain_use_wide_inherit_fd(readahead_t) + +@@ -43,6 +45,9 @@ fs_getattr_all_fs(readahead_t) fs_search_auto_mountpoints(readahead_t) @@ -67,7 +64,7 @@ term_dontaudit_use_console(readahead_t) -@@ -50,6 +54,7 @@ +@@ -50,6 +55,7 @@ init_use_fd(readahead_t) init_use_script_pty(readahead_t) @@ -75,9 +72,9 @@ libs_use_ld_so(readahead_t) libs_use_shared_libs(readahead_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.1.8/policy/modules/admin/su.if ---- nsaserefpolicy/policy/modules/admin/su.if 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/su.if 2006-01-09 14:37:14.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.1.9/policy/modules/admin/su.if +--- nsaserefpolicy/policy/modules/admin/su.if 2006-01-11 14:31:30.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/admin/su.if 2006-01-11 17:13:44.000000000 -0500 @@ -193,7 +193,9 @@ domain_use_wide_inherit_fd($1_su_t) @@ -88,9 +85,9 @@ init_dontaudit_use_fd($1_su_t) # Write to utmp. -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.1.8/policy/modules/admin/vpn.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.1.9/policy/modules/admin/vpn.te --- nsaserefpolicy/policy/modules/admin/vpn.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/admin/vpn.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/admin/vpn.te 2006-01-11 17:13:44.000000000 -0500 @@ -24,6 +24,7 @@ # @@ -116,17 +113,87 @@ +optional_policy(`dbus',` + dbus_system_bus_client_template(vpnc,vpnc_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.1.8/policy/modules/apps/java.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/alsa.fc serefpolicy-2.1.9/policy/modules/apps/alsa.fc +--- nsaserefpolicy/policy/modules/apps/alsa.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/apps/alsa.fc 2006-01-11 17:13:44.000000000 -0500 +@@ -0,0 +1,3 @@ ++#DESC ainit - configuration tool for ALSA ++/usr/bin/ainit -- gen_context(system_u:object_r:alsa_exec_t, s0) ++/etc/alsa/pcm(/.*)? gen_context(system_u:object_r:alsa_etc_rw_t, s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/alsa.if serefpolicy-2.1.9/policy/modules/apps/alsa.if +--- nsaserefpolicy/policy/modules/apps/alsa.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/apps/alsa.if 2006-01-11 17:13:44.000000000 -0500 +@@ -0,0 +1,21 @@ ++## configuration tool for ALSA. ++######################################## ++## ++## Execute alsa in the alsa domain. ++## ++## ++## The type of the process performing this action. ++## ++# ++interface(`alsa_domtrans',` ++ gen_require(` ++ type alsa_t, alsa_exec_t; ++ ') ++ ++ domain_auto_trans($1,alsa_exec_t,alsa_t) ++ ++ allow $1 alsa_t:fd use; ++ allow alsa_t $1:fd use; ++ allow alsa_t $1:fifo_file rw_file_perms; ++ allow alsa_t $1:process sigchld; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/alsa.te serefpolicy-2.1.9/policy/modules/apps/alsa.te +--- nsaserefpolicy/policy/modules/apps/alsa.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/apps/alsa.te 2006-01-11 17:13:44.000000000 -0500 +@@ -0,0 +1,34 @@ ++policy_module(alsa,1.0.0) ++type alsa_t; ++domain_type(alsa_t) ++ ++type alsa_exec_t; ++domain_entry_file(alsa_t,alsa_exec_t) ++role system_r types alsa_t; ++ ++type alsa_etc_rw_t; ++files_type(alsa_etc_rw_t) ++ ++allow alsa_t self:capability { setgid setuid ipc_owner }; ++dontaudit alsa_t self:capability sys_admin; ++ ++files_read_etc_files(alsa_t) ++ ++logging_send_syslog_msg(alsa_t) ++ ++libs_use_ld_so(alsa_t) ++libs_use_shared_libs(alsa_t) ++ ++miscfiles_read_localization(alsa_t) ++ ++allow alsa_t { unpriv_userdomain self }:sem create_sem_perms; ++allow alsa_t { unpriv_userdomain self }:shm create_shm_perms; ++allow alsa_t self:unix_stream_socket create_stream_socket_perms; ++allow alsa_t self:unix_dgram_socket create_socket_perms; ++allow unpriv_userdomain alsa_t:sem { unix_read unix_write associate read write }; ++allow unpriv_userdomain alsa_t:shm { unix_read unix_write create_shm_perms }; ++ ++allow alsa_t alsa_etc_rw_t:dir rw_dir_perms; ++allow alsa_t alsa_etc_rw_t:file create_file_perms; ++ ++allow alsa_t devpts_t:chr_file { read write }; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.1.9/policy/modules/apps/java.fc --- nsaserefpolicy/policy/modules/apps/java.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/java.fc 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/apps/java.fc 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1,4 @@ + +/usr/.*/java -- gen_context(system_u:object_r:java_exec_t,s0) +/usr/bin/gij -- gen_context(system_u:object_r:java_exec_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.1.8/policy/modules/apps/java.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.1.9/policy/modules/apps/java.if --- nsaserefpolicy/policy/modules/apps/java.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/java.if 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/apps/java.if 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1,23 @@ +## Load keyboard mappings. + @@ -151,9 +218,9 @@ + allow java_t $1:fifo_file rw_file_perms; + allow java_t $1:process sigchld; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.1.8/policy/modules/apps/java.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.1.9/policy/modules/apps/java.te --- nsaserefpolicy/policy/modules/apps/java.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/java.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/apps/java.te 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1,25 @@ +policy_module(java,1.0.0) + @@ -180,15 +247,15 @@ + unconfined_domtrans(java_t) + role system_r types java_t; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.8/policy/modules/apps/wine.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.9/policy/modules/apps/wine.fc --- nsaserefpolicy/policy/modules/apps/wine.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/wine.fc 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/apps/wine.fc 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1,2 @@ +/usr/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.8/policy/modules/apps/wine.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.9/policy/modules/apps/wine.if --- nsaserefpolicy/policy/modules/apps/wine.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/wine.if 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/apps/wine.if 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1,23 @@ +## Load keyboard mappings. + @@ -213,9 +280,9 @@ + allow wine_t $1:fifo_file rw_file_perms; + allow wine_t $1:process sigchld; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.8/policy/modules/apps/wine.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.9/policy/modules/apps/wine.te --- nsaserefpolicy/policy/modules/apps/wine.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/apps/wine.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/apps/wine.te 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1,27 @@ +policy_module(wine,1.0.0) + @@ -244,9 +311,9 @@ + allow wine_t file_type:file execmod; + +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.te serefpolicy-2.1.8/policy/modules/kernel/corecommands.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.te serefpolicy-2.1.9/policy/modules/kernel/corecommands.te --- nsaserefpolicy/policy/modules/kernel/corecommands.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/corecommands.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/kernel/corecommands.te 2006-01-11 17:13:44.000000000 -0500 @@ -35,3 +35,9 @@ type chroot_exec_t; @@ -257,9 +324,32 @@ +') + + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.1.8/policy/modules/kernel/domain.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.1.9/policy/modules/kernel/devices.if +--- nsaserefpolicy/policy/modules/kernel/devices.if 2005-12-05 22:35:02.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/kernel/devices.if 2006-01-11 17:13:44.000000000 -0500 +@@ -2248,3 +2248,19 @@ + typeattribute $1 memory_raw_write, memory_raw_read; + ') + ++######################################## ++## ++## dontaudit getattr raw memory devices (e.g. /dev/mem). ++## ++## ++## Domain allowed access. ++## ++# ++interface(`dev_dontaudit_getattr_memory_device',` ++ gen_require(` ++ type memory_device_t; ++ ') ++ ++ dontaudit $1 memory_device_t:chr_file getattr; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.1.9/policy/modules/kernel/domain.if --- nsaserefpolicy/policy/modules/kernel/domain.if 2005-12-12 15:35:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/domain.if 2006-01-09 17:23:08.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/kernel/domain.if 2006-01-11 17:13:44.000000000 -0500 @@ -501,6 +501,7 @@ ') @@ -268,9 +358,9 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.1.8/policy/modules/kernel/domain.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.1.9/policy/modules/kernel/domain.te --- nsaserefpolicy/policy/modules/kernel/domain.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/domain.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/kernel/domain.te 2006-01-11 17:13:44.000000000 -0500 @@ -67,3 +67,7 @@ # cjp: also need to except correctly for SEFramework neverallow { domain unlabeled_t } file_type:process *; @@ -280,10 +370,10 @@ + prelink_relabel(entry_type) +') \ No newline at end of file -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.1.8/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-01-04 17:28:52.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/files.if 2006-01-09 14:37:14.000000000 -0500 -@@ -3183,3 +3183,20 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.1.9/policy/modules/kernel/files.if +--- nsaserefpolicy/policy/modules/kernel/files.if 2006-01-11 14:31:30.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/kernel/files.if 2006-01-11 17:13:44.000000000 -0500 +@@ -3241,3 +3241,20 @@ ') ') ') @@ -305,62 +395,9 @@ + allow $1 file_type:dir write; +') \ No newline at end of file -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.1.8/policy/modules/kernel/kernel.if ---- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/kernel.if 2006-01-09 14:37:14.000000000 -0500 -@@ -662,6 +662,27 @@ - allow $1 proc_mdstat_t:file rw_file_perms; - ') - -+####################################### -+## -+## Allow caller to read the state information for device node numbers. -+## -+## -+## The process type reading device number state. -+## -+# -+interface(`kernel_read_proc_devices',` -+ gen_require(` -+ type proc_t, proc_devices_t; -+ class dir r_dir_perms; -+ class file r_file_perms; -+ ') -+ -+ allow $1 kernel_t:fd use; -+ allow $1 device_t:chr_file getattr; -+ allow $1 proc_t:dir r_dir_perms; -+ allow $1 proc_devices_t:file r_file_perms; -+') -+ - ######################################## - ## - ## Allows caller to get attribues of core kernel interface. -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.te serefpolicy-2.1.8/policy/modules/kernel/kernel.te ---- nsaserefpolicy/policy/modules/kernel/kernel.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/kernel.te 2006-01-09 14:37:14.000000000 -0500 -@@ -72,6 +72,9 @@ - type proc_mdstat_t, proc_type; - genfscon proc /mdstat gen_context(system_u:object_r:proc_mdstat_t,s0) - -+type proc_devices_t, proc_type; -+genfscon proc /devices gen_context(system_u:object_r:proc_devices_t,s0) -+ - type proc_net_t, proc_type; - genfscon proc /net gen_context(system_u:object_r:proc_net_t,s0) - -@@ -184,6 +187,8 @@ - allow kernel_t proc_net_t:dir r_dir_perms; - allow kernel_t proc_net_t:file r_file_perms; - allow kernel_t proc_mdstat_t:file r_file_perms; -+allow kernel_t proc_devices_t:file r_file_perms; -+allow kernel_t proc_devices_t:file { read }; - allow kernel_t proc_kcore_t:file getattr; - allow kernel_t proc_kmsg_t:file getattr; - allow kernel_t sysctl_t:dir r_dir_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.8/policy/modules/kernel/mls.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.9/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/kernel/mls.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/kernel/mls.te 2006-01-11 17:13:44.000000000 -0500 @@ -82,9 +82,11 @@ # these might be targeted_policy only range_transition unconfined_t su_exec_t s0 - s0:c0.c255; @@ -373,9 +410,9 @@ range_transition kernel_t init_exec_t s0 - s15:c0.c255; +range_transition initrc_t auditd_exec_t s15:c0.c255; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.1.8/policy/modules/services/apache.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.1.9/policy/modules/services/apache.te --- nsaserefpolicy/policy/modules/services/apache.te 2005-12-12 23:05:35.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/apache.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/apache.te 2006-01-11 17:13:44.000000000 -0500 @@ -391,6 +391,10 @@ userdom_dontaudit_use_sysadm_terms(httpd_t) ') @@ -396,9 +433,9 @@ + cron_system_entry(httpd_t, httpd_exec_t) +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.1.8/policy/modules/services/apm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.1.9/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/apm.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/apm.te 2006-01-11 17:13:44.000000000 -0500 @@ -196,6 +196,7 @@ ') @@ -407,9 +444,9 @@ cron_domtrans_anacron_system_job(apmd_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.1.8/policy/modules/services/automount.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.1.9/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/automount.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/automount.te 2006-01-11 17:13:44.000000000 -0500 @@ -28,7 +28,7 @@ # Local policy # @@ -429,32 +466,68 @@ corenet_dontaudit_tcp_connect_all_reserved_ports(automount_t) dev_read_sysfs(automount_t) -@@ -143,6 +145,11 @@ +@@ -107,6 +109,7 @@ + fs_manage_auto_mountpoints(automount_t) + + term_dontaudit_use_console(automount_t) ++term_dontaudit_getattr_pty_dir(lvm_t) + + init_use_fd(automount_t) + init_use_script_pty(automount_t) +@@ -143,6 +146,10 @@ fstools_domtrans(automount_t) ') +optional_policy(`bind',` -+ allow automount_t named_conf_t:dir search; -+ allow automount_t named_zone_t:dir search; ++ bind_search_mounts(automount_t) +') + optional_policy(`nis',` nis_use_ypbind(automount_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bluetooth.te serefpolicy-2.1.8/policy/modules/services/bluetooth.te ---- nsaserefpolicy/policy/modules/services/bluetooth.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/bluetooth.te 2006-01-09 14:37:14.000000000 -0500 -@@ -86,6 +86,7 @@ - - kernel_read_kernel_sysctl(bluetooth_t) - kernel_read_system_state(bluetooth_t) -+kernel_read_proc_devices(bluetooth_t) - - corenet_tcp_sendrecv_all_if(bluetooth_t) - corenet_udp_sendrecv_all_if(bluetooth_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.1.8/policy/modules/services/cron.te +@@ -158,3 +165,4 @@ + optional_policy(`udev',` + udev_read_db(automount_t) + ') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-2.1.9/policy/modules/services/bind.if +--- nsaserefpolicy/policy/modules/services/bind.if 2006-01-09 11:32:53.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/bind.if 2006-01-11 17:13:44.000000000 -0500 +@@ -207,3 +207,22 @@ + allow $1 named_zone_t:file r_file_perms; + ') + ++######################################## ++## ++## Read BIND search for mount points ++## ++## ++## Domain allowed access. ++## ++# ++interface(`bind_search_mounts',` ++ gen_require(` ++ type named_zone_t; ++ type named_conf_t; ++ ') ++ ++ files_search_var($1) ++ allow $1 named_zone_t:dir search_dir_perms; ++ allow $1 named_conf_t:dir search_dir_perms; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.1.9/policy/modules/services/cron.te --- nsaserefpolicy/policy/modules/services/cron.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/cron.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/cron.te 2006-01-11 17:13:44.000000000 -0500 +@@ -120,7 +120,7 @@ + + init_use_fd(crond_t) + init_use_script_pty(crond_t) +-init_read_script_pid(crond_t) ++init_rw_script_pid(crond_t) + + libs_use_ld_so(crond_t) + libs_use_shared_libs(crond_t) @@ -407,43 +407,21 @@ sysstat_manage_log(system_crond_t) ') @@ -504,9 +577,9 @@ allow mta_user_agent system_crond_t:fd use; r_dir_file(system_mail_t, crond_tmp_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.1.8/policy/modules/services/cups.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.1.9/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/cups.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/cups.te 2006-01-11 17:13:44.000000000 -0500 @@ -201,8 +201,7 @@ ') @@ -527,9 +600,9 @@ ') optional_policy(`dbus',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.8/policy/modules/services/dovecot.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.9/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/dovecot.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/dovecot.te 2006-01-11 17:13:44.000000000 -0500 @@ -95,6 +95,7 @@ files_read_etc_files(dovecot_t) files_search_spool(dovecot_t) @@ -538,17 +611,28 @@ files_dontaudit_list_default(dovecot_t) init_use_fd(dovecot_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.1.8/policy/modules/services/hal.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/finger.te serefpolicy-2.1.9/policy/modules/services/finger.te +--- nsaserefpolicy/policy/modules/services/finger.te 2006-01-11 14:31:32.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/finger.te 2006-01-11 17:13:44.000000000 -0500 +@@ -65,6 +65,7 @@ + fs_getattr_all_fs(fingerd_t) + fs_search_auto_mountpoints(fingerd_t) + ++term_search_ptys(fingerd_t) + term_dontaudit_use_console(fingerd_t) + term_getattr_all_user_ttys(fingerd_t) + term_getattr_all_user_ptys(fingerd_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.1.9/policy/modules/services/hal.fc --- nsaserefpolicy/policy/modules/services/hal.fc 2005-11-14 18:24:07.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/hal.fc 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/hal.fc 2006-01-11 17:13:44.000000000 -0500 @@ -7,3 +7,4 @@ /usr/sbin/hald -- gen_context(system_u:object_r:hald_exec_t,s0) /usr/share/hal/device-manager/hal-device-manager -- gen_context(system_u:object_r:bin_t,s0) +/usr/share/hal/scripts(/.*)? gen_context(system_u:object_r:bin_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.8/policy/modules/services/hal.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.9/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/hal.te 2006-01-10 12:17:49.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/hal.te 2006-01-11 17:13:44.000000000 -0500 @@ -47,8 +47,14 @@ kernel_read_system_state(hald_t) kernel_read_network_state(hald_t) @@ -585,27 +669,27 @@ optional_policy(`cups',` cups_domtrans_config(hald_t) cups_signal_config(hald_t) -@@ -205,6 +216,3 @@ +@@ -154,6 +165,7 @@ + dbus_system_bus_client_template(hald,hald_t) + dbus_send_system_bus_msg(hald_t) + dbus_connect_system_bus(hald_t) ++ allow hald_t self:dbus send_msg; + + init_dbus_chat_script(hald_t) + +@@ -205,6 +217,6 @@ vbetool_domtrans(hald_t) ') -ifdef(`TODO',` -allow hald_t device_t:dir create_dir_perms; -') dnl end TODO -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.1.8/policy/modules/services/irqbalance.te ---- nsaserefpolicy/policy/modules/services/irqbalance.te 2005-11-28 17:23:58.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/irqbalance.te 2006-01-09 14:37:14.000000000 -0500 -@@ -28,6 +28,7 @@ - kernel_read_system_state(irqbalance_t) - kernel_read_kernel_sysctl(irqbalance_t) - kernel_rw_irq_sysctl(irqbalance_t) -+kernel_read_proc_devices(irqbalance_t) - - dev_read_sysfs(irqbalance_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-2.1.8/policy/modules/services/kerberos.te ++optional_policy(`bind',` ++ bind_search_mounts(hald_t) ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-2.1.9/policy/modules/services/kerberos.te --- nsaserefpolicy/policy/modules/services/kerberos.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/kerberos.te 2006-01-10 08:56:50.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/kerberos.te 2006-01-11 17:13:44.000000000 -0500 @@ -249,8 +249,3 @@ udev_read_db(krb5kdc_t) ') @@ -615,22 +699,22 @@ -allow krb5kdc_t userdomain:udp_socket recvfrom; -allow userdomain krb5kdc_t:udp_socket recvfrom; -') dnl end TODO -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.fc serefpolicy-2.1.8/policy/modules/services/locate.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.fc serefpolicy-2.1.9/policy/modules/services/locate.fc --- nsaserefpolicy/policy/modules/services/locate.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/locate.fc 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/locate.fc 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1,4 @@ +# locate - file locater +/usr/bin/updatedb -- gen_context(system_u:object_r:locate_exec_t, s0) +/var/lib/[sm]locate(/.*)? gen_context(system_u:object_r:locate_var_lib_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.if serefpolicy-2.1.8/policy/modules/services/locate.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.if serefpolicy-2.1.9/policy/modules/services/locate.if --- nsaserefpolicy/policy/modules/services/locate.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/locate.if 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/locate.if 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1 @@ +## Update database for mlocate -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.te serefpolicy-2.1.8/policy/modules/services/locate.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.te serefpolicy-2.1.9/policy/modules/services/locate.te --- nsaserefpolicy/policy/modules/services/locate.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/locate.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/locate.te 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1,50 @@ +policy_module(locate,1.0.0) + @@ -682,144 +766,11 @@ + allow system_crond_t locate_log_t:dir rw_dir_perms; + allow system_crond_t locate_log_t:file { create append getattr }; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/logwatch.fc serefpolicy-2.1.8/policy/modules/services/logwatch.fc ---- nsaserefpolicy/policy/modules/services/logwatch.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/logwatch.fc 2006-01-09 14:37:14.000000000 -0500 -@@ -0,0 +1,3 @@ -+# logwatch - file logwatchr -+/usr/share/logwatch/scripts/logwatch.pl -- gen_context(system_u:object_r:logwatch_exec_t, s0) -+/var/cache/logwatch(/.*)? gen_context(system_u:object_r:logwatch_cache_t, s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/logwatch.if serefpolicy-2.1.8/policy/modules/services/logwatch.if ---- nsaserefpolicy/policy/modules/services/logwatch.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/logwatch.if 2006-01-09 14:37:14.000000000 -0500 -@@ -0,0 +1 @@ -+## Update database for mlogwatch -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/logwatch.te serefpolicy-2.1.8/policy/modules/services/logwatch.te ---- nsaserefpolicy/policy/modules/services/logwatch.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/logwatch.te 2006-01-09 14:37:14.000000000 -0500 -@@ -0,0 +1,107 @@ -+policy_module(logwatch,1.0.0) -+ -+#DESC LOGWATCH - system log analyzer and reporter -+# -+# Author: Dan Walsh -+# -+ -+################################# -+# -+# Rules for the logwatch_t domain. -+# -+# logwatch_exec_t is the type of the logwatch executable. -+# -+type logwatch_t; -+domain_type(logwatch_t) -+role system_r types logwatch_t; -+ -+type logwatch_exec_t; -+domain_entry_file(logwatch_t,logwatch_exec_t) -+ -+type logwatch_cache_t; -+files_type(logwatch_cache_t) -+ -+type logwatch_tmp_t; -+files_tmp_file(logwatch_tmp_t) -+ -+allow logwatch_t self:capability setgid; -+allow logwatch_t self:fifo_file rw_file_perms; -+allow logwatch_t self:unix_stream_socket create_stream_socket_perms; -+ -+allow logwatch_t logwatch_tmp_t:dir create_dir_perms; -+allow logwatch_t logwatch_tmp_t:file create_file_perms; -+files_create_tmp_files(logwatch_t, logwatch_tmp_t, { file dir }) -+ -+allow logwatch_t logwatch_cache_t:dir create_dir_perms; -+allow logwatch_t logwatch_cache_t:file create_file_perms; -+ -+auth_dontaudit_read_shadow(logwatch_t) -+ -+corecmd_read_sbin_file(logwatch_t) -+corecmd_exec_bin(logwatch_t) -+corecmd_exec_shell(logwatch_t) -+ -+dev_read_urand(logwatch_t) -+ -+fs_getattr_all_fs(logwatch_t) -+ -+kernel_read_fs_sysctl(logwatch_t) -+kernel_read_kernel_sysctl(logwatch_t) -+ -+files_read_etc_files(logwatch_t) -+files_read_etc_runtime_files(logwatch_t) -+files_read_usr_files(logwatch_t) -+files_search_spool(logwatch_t) -+files_dontaudit_search_home(logwatch_t) -+ -+kernel_read_system_state(logwatch_t) -+ -+libs_use_ld_so(logwatch_t) -+libs_use_shared_libs(logwatch_t) -+libs_read_lib(logwatch_t) -+ -+logging_read_all_logs(logwatch_t) -+ -+miscfiles_read_localization(logwatch_t) -+ -+nscd_use_socket(logwatch_t) -+ -+rpc_search_nfs_state_data(logwatch_t) -+ -+term_dontaudit_getattr_pty_dir(logwatch_t) -+term_dontaudit_list_ptys(logwatch_t) -+ -+userdom_dontaudit_search_sysadm_home_dir(logwatch_t) -+userdom_dontaudit_getattr_sysadm_home_dir(logwatch_t) -+ -+# Read /proc/PID directories for all domains. -+domain_read_all_domains_state(logwatch_t) -+ -+mta_send_mail(logwatch_t) -+ -+optional_policy(`cron',` -+ cron_system_entry(logwatch_t, logwatch_exec_t) -+') -+ -+optional_policy(`samba',` -+ samba_read_log(logwatch_t) -+') -+ -+optional_policy(`bind',` -+ bind_read_config(logwatch_t) -+ bind_read_zone(logwatch_t) -+') -+ -+optional_policy(`mta',` -+ mta_getattr_spool(logwatch_t) -+ allow system_mail_t logwatch_tmp_t:file r_file_perms; -+') -+ -+optional_policy(`apache',` -+ apache_read_log(logwatch_t) -+') -+ -+optional_policy(`ntp',` -+ allow logwatch_t ntpd_exec_t:file getattr; -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.1.8/policy/modules/services/mta.te ---- nsaserefpolicy/policy/modules/services/mta.te 2006-01-04 17:28:52.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/mta.te 2006-01-09 14:37:14.000000000 -0500 -@@ -47,6 +47,9 @@ - allow system_mail_t etc_mail_t:dir { getattr search }; - allow system_mail_t etc_mail_t:file r_file_perms; - -+allow initrc_t etc_mail_t:dir r_dir_perms; -+allow initrc_t etc_mail_t:file r_file_perms; -+ - kernel_read_system_state(system_mail_t) - kernel_read_network_state(system_mail_t) - -@@ -124,6 +127,10 @@ - logrotate_read_tmp_files(system_mail_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.1.9/policy/modules/services/mta.te +--- nsaserefpolicy/policy/modules/services/mta.te 2006-01-11 14:31:32.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/mta.te 2006-01-11 17:20:33.000000000 -0500 +@@ -128,6 +128,10 @@ + logwatch_read_tmp_files(system_mail_t) ') +optional_policy(`sendmail',` @@ -829,7 +780,7 @@ optional_policy(`postfix',` allow system_mail_t etc_aliases_t:dir create_dir_perms; allow system_mail_t etc_aliases_t:file create_file_perms; -@@ -174,3 +181,9 @@ +@@ -178,3 +182,9 @@ cron_read_system_job_tmp_files(mta_user_agent) ') ') @@ -839,9 +790,9 @@ +allow initrc_t etc_mail_t:dir rw_dir_perms; +allow initrc_t etc_mail_t:file create_file_perms; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.1.8/policy/modules/services/networkmanager.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.1.9/policy/modules/services/networkmanager.te --- nsaserefpolicy/policy/modules/services/networkmanager.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/networkmanager.te 2006-01-10 09:08:19.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/networkmanager.te 2006-01-11 17:13:44.000000000 -0500 @@ -28,8 +28,6 @@ allow NetworkManager_t self:tcp_socket create_stream_socket_perms; allow NetworkManager_t self:udp_socket create_socket_perms; @@ -866,20 +817,9 @@ vpn_domtrans(NetworkManager_t) + allow NetworkManager_t vpnc_t:process signal; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/nscd.te serefpolicy-2.1.8/policy/modules/services/nscd.te ---- nsaserefpolicy/policy/modules/services/nscd.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/nscd.te 2006-01-09 14:37:14.000000000 -0500 -@@ -128,7 +128,6 @@ - - optional_policy(`samba',` - samba_connect_winbind(nscd_t) -- samba_search_var(nscd_t) - ') - - optional_policy(`udev',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.1.8/policy/modules/services/ntp.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.1.9/policy/modules/services/ntp.te --- nsaserefpolicy/policy/modules/services/ntp.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/ntp.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/ntp.te 2006-01-11 17:13:44.000000000 -0500 @@ -148,8 +148,6 @@ ') @@ -889,20 +829,9 @@ samba_connect_winbind(ntpd_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/portmap.te serefpolicy-2.1.8/policy/modules/services/portmap.te ---- nsaserefpolicy/policy/modules/services/portmap.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/portmap.te 2006-01-09 14:37:14.000000000 -0500 -@@ -47,6 +47,7 @@ - kernel_read_proc_symlinks(portmap_t) - kernel_udp_sendfrom(portmap_t) - kernel_tcp_recvfrom(portmap_t) -+kernel_read_proc_devices(portmap_t) - - corenet_tcp_sendrecv_all_if(portmap_t) - corenet_udp_sendrecv_all_if(portmap_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.fc serefpolicy-2.1.8/policy/modules/services/prelink.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.fc serefpolicy-2.1.9/policy/modules/services/prelink.fc --- nsaserefpolicy/policy/modules/services/prelink.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/prelink.fc 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/prelink.fc 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1,7 @@ +# prelink - prelink ELF shared libraries and binaries to speed up startup time +/usr/sbin/prelink -- gen_context(system_u:object_r:prelink_exec_t,s0) @@ -911,9 +840,9 @@ +') +/var/log/prelink\.log -- gen_context(system_u:object_r:prelink_log_t,s0) +/etc/prelink\.cache -- gen_context(system_u:object_r:prelink_cache_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.if serefpolicy-2.1.8/policy/modules/services/prelink.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.if serefpolicy-2.1.9/policy/modules/services/prelink.if --- nsaserefpolicy/policy/modules/services/prelink.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/prelink.if 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/prelink.if 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1,39 @@ +## Prelink mappings. + @@ -954,9 +883,9 @@ + ') + allow prelink_t $1:file { create_file_perms execute relabelto relabelfrom }; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.te serefpolicy-2.1.8/policy/modules/services/prelink.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.te serefpolicy-2.1.9/policy/modules/services/prelink.te --- nsaserefpolicy/policy/modules/services/prelink.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/prelink.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/prelink.te 2006-01-11 17:13:44.000000000 -0500 @@ -0,0 +1,64 @@ +policy_module(prelink,1.0.0) + @@ -1022,20 +951,9 @@ +') + + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.1.8/policy/modules/services/rpc.te ---- nsaserefpolicy/policy/modules/services/rpc.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/rpc.te 2006-01-09 14:37:14.000000000 -0500 -@@ -48,6 +48,7 @@ - kernel_search_network_state(rpcd_t) - # for rpc.rquotad - kernel_read_sysctl(rpcd_t) -+kernel_read_proc_devices(rpcd_t) - - corenet_udp_bind_generic_port(rpcd_t) - corenet_udp_bind_reserved_port(rpcd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.1.8/policy/modules/services/samba.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.1.9/policy/modules/services/samba.if --- nsaserefpolicy/policy/modules/services/samba.if 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/samba.if 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/samba.if 2006-01-11 17:13:44.000000000 -0500 @@ -342,7 +342,9 @@ ') @@ -1046,9 +964,42 @@ allow $1 winbind_t:unix_stream_socket connectto; ') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xdm.te serefpolicy-2.1.8/policy/modules/services/xdm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.1.9/policy/modules/services/sendmail.te +--- nsaserefpolicy/policy/modules/services/sendmail.te 2006-01-09 11:32:54.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/sendmail.te 2006-01-11 17:13:44.000000000 -0500 +@@ -17,6 +17,7 @@ + + type sendmail_t; + mta_sendmail_mailserver(sendmail_t) ++mta_read_config(sendmail_t) + mta_mailserver_delivery(sendmail_t) + mta_mailserver_sender(sendmail_t) + +@@ -53,6 +54,7 @@ + corenet_udp_bind_all_nodes(sendmail_t) + corenet_tcp_bind_smtp_port(sendmail_t) + corenet_tcp_connect_all_ports(sendmail_t) ++allow sendmail_t self:udp_socket create_socket_perms; + + dev_read_urand(sendmail_t) + dev_read_sysfs(sendmail_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.1.9/policy/modules/services/ssh.if +--- nsaserefpolicy/policy/modules/services/ssh.if 2005-12-06 19:49:51.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/ssh.if 2006-01-11 17:13:44.000000000 -0500 +@@ -58,6 +58,10 @@ + domain_entry_file($1_ssh_keysign_t,ssh_keysign_exec_t) + role $3 types $1_ssh_keysign_t; + ++ allow $1_ssh_t $1_devpts_t:chr_file { rw_file_perms setattr getattr relabelfrom }; ++ term_create_pty($1_ssh_t,$1_devpts_t) ++ ++ + ############################## + # + # $1_ssh_t local policy +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xdm.te serefpolicy-2.1.9/policy/modules/services/xdm.te --- nsaserefpolicy/policy/modules/services/xdm.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/services/xdm.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/services/xdm.te 2006-01-11 17:13:44.000000000 -0500 @@ -319,6 +319,10 @@ allow xdm_xserver_t xkb_var_lib_t:lnk_file read; can_exec(xdm_xserver_t, xkb_var_lib_t) @@ -1060,41 +1011,63 @@ # Insert video drivers. allow xdm_xserver_t self:capability mknod; allow xdm_xserver_t sysctl_modprobe_t:file { getattr read }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.1.8/policy/modules/system/authlogin.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.1.9/policy/modules/system/authlogin.if +--- nsaserefpolicy/policy/modules/system/authlogin.if 2006-01-09 11:32:54.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/authlogin.if 2006-01-11 17:13:44.000000000 -0500 +@@ -977,6 +977,20 @@ + + ####################################### + # ++# auth_setattr_login_records(domain) ++# ++interface(`auth_setattr_login_records',` ++ gen_require(` ++ type wtmp_t; ++ class file setattr; ++ ') ++ ++ allow $1 wtmp_t:file setattr; ++ logging_search_logs($1) ++') ++ ++####################################### ++# + # auth_create_login_records(domain) + # + interface(`auth_create_login_records',` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.1.9/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/authlogin.te 2006-01-09 14:37:14.000000000 -0500 -@@ -157,6 +157,7 @@ - kernel_use_fd(pam_console_t) - # Read /proc/meminfo - kernel_read_system_state(pam_console_t) -+kernel_read_proc_devices(pam_console_t) - - dev_read_sysfs(pam_console_t) - dev_getattr_apm_bios(pam_console_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/clock.te serefpolicy-2.1.8/policy/modules/system/clock.te ---- nsaserefpolicy/policy/modules/system/clock.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/clock.te 2006-01-09 14:37:14.000000000 -0500 -@@ -33,6 +33,7 @@ - kernel_read_kernel_sysctl(hwclock_t) - kernel_list_proc(hwclock_t) - kernel_read_proc_symlinks(hwclock_t) -+kernel_read_proc_devices(hwclock_t) - - dev_read_sysfs(hwclock_t) - dev_rw_realtime_clock(hwclock_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.1.8/policy/modules/system/fstools.te ++++ serefpolicy-2.1.9/policy/modules/system/authlogin.te 2006-01-11 17:13:44.000000000 -0500 +@@ -129,14 +129,6 @@ + nscd_use_socket(pam_t) + ') + +-ifdef(`TODO',` +-ifdef(`gnome-pty-helper.te', `allow pam_t gphdomain:fd use;') +-# Supress xdm denial +-ifdef(`xdm.te', ` +-dontaudit pam_t xdm_t:fd use; +-') dnl ifdef +-') dnl endif TODO +- + ######################################## + # + # PAM console local policy +@@ -223,6 +215,10 @@ + userdom_dontaudit_use_sysadm_terms(pam_console_t) + ') + ++optional_policy(`alsa',` ++ alsa_domtrans(pam_console_t) ++') ++ + ifdef(`targeted_policy', ` + term_dontaudit_use_unallocated_tty(pam_console_t) + term_dontaudit_use_generic_pty(pam_console_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.1.9/policy/modules/system/fstools.te --- nsaserefpolicy/policy/modules/system/fstools.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/fstools.te 2006-01-09 14:37:14.000000000 -0500 -@@ -56,6 +56,8 @@ - # Access to /initrd devices - kernel_rw_unlabeled_dir(fsadm_t) - kernel_use_unlabeled_blk_dev(fsadm_t) -+# Access to /proc/devices -+kernel_read_proc_devices(fsadm_t) - - dev_getattr_all_chr_files(fsadm_t) - # mkreiserfs and other programs need this for UUID -@@ -69,6 +71,8 @@ ++++ serefpolicy-2.1.9/policy/modules/system/fstools.te 2006-01-11 17:13:44.000000000 -0500 +@@ -69,6 +69,8 @@ dev_read_sysfs(fsadm_t) # Access to /initrd devices dev_getattr_usbfs_dir(fsadm_t) @@ -1103,9 +1076,9 @@ fs_search_auto_mountpoints(fsadm_t) fs_getattr_xattr_fs(fsadm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.1.8/policy/modules/system/hostname.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.1.9/policy/modules/system/hostname.te --- nsaserefpolicy/policy/modules/system/hostname.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/hostname.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/hostname.te 2006-01-11 17:13:44.000000000 -0500 @@ -7,8 +7,10 @@ # @@ -1118,15 +1091,7 @@ role system_r types hostname_t; ######################################## -@@ -24,6 +26,7 @@ - - kernel_list_proc(hostname_t) - kernel_read_proc_symlinks(hostname_t) -+kernel_read_proc_devices(hostname_t) - - dev_read_sysfs(hostname_t) - -@@ -55,35 +58,6 @@ +@@ -55,35 +57,6 @@ sysnet_read_config(hostname_t) sysnet_dns_name_resolve(hostname_t) @@ -1164,10 +1129,31 @@ -') + + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.1.8/policy/modules/system/init.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.1.9/policy/modules/system/init.if +--- nsaserefpolicy/policy/modules/system/init.if 2006-01-11 14:31:32.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/init.if 2006-01-11 17:13:44.000000000 -0500 +@@ -345,6 +345,9 @@ + interface(`init_domtrans_script',` + gen_require(` + type initrc_t, initrc_exec_t; ++ class process sigchld; ++ class fd use; ++ class fifo_file rw_file_perms; + ') + + files_list_etc($1) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.1.9/policy/modules/system/init.te --- nsaserefpolicy/policy/modules/system/init.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/init.te 2006-01-09 14:37:14.000000000 -0500 -@@ -449,7 +449,6 @@ ++++ serefpolicy-2.1.9/policy/modules/system/init.te 2006-01-11 17:14:12.000000000 -0500 +@@ -298,6 +298,7 @@ + term_reset_tty_labels(initrc_t) + + auth_rw_login_records(initrc_t) ++auth_setattr_login_records(initrc_t) + auth_rw_lastlog(initrc_t) + auth_read_pam_pid(initrc_t) + auth_delete_pam_pid(initrc_t) +@@ -449,7 +450,6 @@ # readahead asks for these auth_dontaudit_read_shadow(initrc_t) @@ -1175,6 +1161,16 @@ optional_policy(`bind',` bind_manage_config_dir(initrc_t) +@@ -575,8 +575,7 @@ + ') + + optional_policy(`lvm',` +- #allow initrc_t lvm_control_t:chr_file unlink; +- ++ lvm_read_config(initrc_t) + dev_read_lvm_control(initrc_t) + dev_create_generic_chr_file(initrc_t) + ') @@ -687,6 +686,10 @@ zebra_read_config(initrc_t) ') @@ -1211,9 +1207,20 @@ - ') ') ') dnl end TODO -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.1.8/policy/modules/system/libraries.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.1.9/policy/modules/system/iptables.te +--- nsaserefpolicy/policy/modules/system/iptables.te 2006-01-11 14:31:32.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/iptables.te 2006-01-11 17:13:44.000000000 -0500 +@@ -87,6 +87,7 @@ + ') + + optional_policy(`modutils',` ++ corecmd_search_sbin(iptables_t) + modutils_domtrans_insmod(iptables_t) + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.1.9/policy/modules/system/libraries.fc --- nsaserefpolicy/policy/modules/system/libraries.fc 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/libraries.fc 2006-01-10 11:55:40.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/libraries.fc 2006-01-11 17:13:44.000000000 -0500 @@ -11,6 +11,9 @@ /emul/ia32-linux/lib(/.*)? gen_context(system_u:object_r:lib_t,s0) /emul/ia32-linux/lib/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0) @@ -1394,9 +1401,9 @@ ') # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.1.8/policy/modules/system/libraries.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.1.9/policy/modules/system/libraries.te --- nsaserefpolicy/policy/modules/system/libraries.te 2005-12-12 15:35:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/libraries.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/libraries.te 2006-01-11 17:13:44.000000000 -0500 @@ -94,6 +94,10 @@ unconfined_domain_template(ldconfig_t) ') @@ -1408,9 +1415,9 @@ optional_policy(`apache',` # dontaudit access to /usr/lib/apache, normal programs cannot read these libs anyway apache_dontaudit_search_modules(ldconfig_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.1.8/policy/modules/system/locallogin.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.1.9/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/locallogin.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/locallogin.te 2006-01-11 17:13:44.000000000 -0500 @@ -165,6 +165,7 @@ userdom_signal_all_users(local_login_t) userdom_search_all_users_home(local_login_t) @@ -1419,64 +1426,40 @@ # Search for mail spool file. mta_getattr_spool(local_login_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.1.8/policy/modules/system/logging.te ---- nsaserefpolicy/policy/modules/system/logging.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/logging.te 2006-01-09 14:37:14.000000000 -0500 -@@ -70,6 +70,7 @@ - - kernel_read_kernel_sysctl(auditctl_t) - kernel_read_proc_symlinks(auditctl_t) -+kernel_read_proc_devices(auditctl_t) - - domain_read_all_domains_state(auditctl_t) - domain_use_wide_inherit_fd(auditctl_t) -@@ -128,6 +129,7 @@ - kernel_read_kernel_sysctl(auditd_t) - kernel_list_proc(auditd_t) - kernel_read_proc_symlinks(auditd_t) -+kernel_read_proc_devices(auditd_t) - - dev_read_sysfs(auditd_t) - -@@ -203,6 +205,7 @@ - # Control syslog and console logging - kernel_clear_ring_buffer(klogd_t) - kernel_change_ring_buffer_level(klogd_t) -+kernel_read_proc_devices(klogd_t) - - bootloader_read_kernel_symbol_table(klogd_t) - -@@ -298,6 +301,7 @@ - kernel_read_messages(syslogd_t) - kernel_clear_ring_buffer(syslogd_t) - kernel_change_ring_buffer_level(syslogd_t) -+kernel_read_proc_devices(syslogd_t) - - dev_create_dev_node(syslogd_t,devlog_t,sock_file) - dev_read_sysfs(syslogd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.1.8/policy/modules/system/lvm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.1.9/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/lvm.te 2006-01-09 14:37:14.000000000 -0500 -@@ -155,6 +155,8 @@ ++++ serefpolicy-2.1.9/policy/modules/system/lvm.te 2006-01-11 17:15:14.000000000 -0500 +@@ -155,6 +155,7 @@ allow lvm_t lvm_etc_t:file r_file_perms; allow lvm_t lvm_etc_t:lnk_file r_file_perms; -+allow initrc_t lvm_etc_t:file r_file_perms; + # Write to /etc/lvm, /etc/lvmtab, /etc/lvmtab.d allow lvm_t lvm_etc_t:dir rw_dir_perms; allow lvm_t lvm_metadata_t:file create_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.1.8/policy/modules/system/mount.te ---- nsaserefpolicy/policy/modules/system/mount.te 2005-12-12 23:05:35.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/mount.te 2006-01-09 14:37:14.000000000 -0500 -@@ -26,12 +26,14 @@ - files_create_tmp_files(mount_t,mount_tmp_t,{ file dir }) +@@ -209,6 +210,7 @@ + storage_manage_fixed_disk(lvm_t) - kernel_read_system_state(mount_t) -+kernel_read_proc_devices(mount_t) + term_dontaudit_getattr_all_user_ttys(lvm_t) ++term_dontaudit_getattr_pty_dir(lvm_t) - corenet_dontaudit_tcp_bind_all_reserved_ports(mount_t) - corenet_dontaudit_udp_bind_all_reserved_ports(mount_t) + corecmd_search_sbin(lvm_t) + corecmd_dontaudit_getattr_sbin_file(lvm_t) +@@ -260,10 +262,3 @@ + udev_read_db(lvm_t) + ') + +-ifdef(`TODO',` +-# it has no reason to need this +-allow lvm_t var_t:dir { search getattr }; +-allow lvm_t ramfs_t:filesystem unmount; +- +-dontaudit lvm_t xconsole_device_t:fifo_file getattr; +-') dnl end TODO +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.1.9/policy/modules/system/mount.te +--- nsaserefpolicy/policy/modules/system/mount.te 2005-12-12 23:05:35.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/mount.te 2006-01-11 17:13:44.000000000 -0500 +@@ -32,6 +32,7 @@ dev_getattr_all_blk_files(mount_t) dev_list_all_dev_nodes(mount_t) @@ -1484,7 +1467,7 @@ storage_raw_read_fixed_disk(mount_t) storage_raw_write_fixed_disk(mount_t) -@@ -46,7 +48,7 @@ +@@ -46,7 +47,7 @@ fs_search_auto_mountpoints(mount_t) fs_use_tmpfs_chr_dev(mount_t) @@ -1493,52 +1476,20 @@ # required for mount.smbfs corecmd_exec_sbin(mount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.8/policy/modules/system/selinuxutil.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.9/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/selinuxutil.te 2006-01-09 14:37:14.000000000 -0500 -@@ -324,6 +324,7 @@ - kernel_use_fd(restorecon_t) - kernel_rw_pipe(restorecon_t) - kernel_read_system_state(restorecon_t) -+kernel_read_proc_devices(restorecon_t) - - # cjp: why is this needed? - dev_rw_generic_file(restorecon_t) -@@ -412,9 +413,11 @@ - ifdef(`targeted_policy',`',` - allow run_init_t self:process setexec; ++++ serefpolicy-2.1.9/policy/modules/system/selinuxutil.te 2006-01-11 17:22:44.000000000 -0500 +@@ -414,6 +414,7 @@ allow run_init_t self:capability setuid; -- allow run_init_t self:fifo_file rw_file_perms; + allow run_init_t self:fifo_file rw_file_perms; allow run_init_t self:netlink_audit_socket { create bind write nlmsg_read read }; - -+ allow run_init_t self:fifo_file rw_file_perms; + domain_auto_trans(run_init_t,initrc_exec_t,initrc_t) -+ + # often the administrator runs such programs from a directory that is owned # by a different user or has restrictive SE permissions, do not want to audit - # the failed access to the current directory -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/sysnetwork.te serefpolicy-2.1.8/policy/modules/system/sysnetwork.te ---- nsaserefpolicy/policy/modules/system/sysnetwork.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/sysnetwork.te 2006-01-09 14:37:14.000000000 -0500 -@@ -90,6 +90,7 @@ - kernel_read_network_state(dhcpc_t) - kernel_read_kernel_sysctl(dhcpc_t) - kernel_use_fd(dhcpc_t) -+kernel_read_proc_devices(dhcpc_t) - - corenet_tcp_sendrecv_all_if(dhcpc_t) - corenet_raw_sendrecv_all_if(dhcpc_t) -@@ -281,6 +282,7 @@ - kernel_read_system_state(ifconfig_t) - kernel_read_network_state(ifconfig_t) - kernel_search_network_sysctl(ifconfig_t) -+kernel_read_proc_devices(ifconfig_t) - - corenet_use_tun_tap_device(ifconfig_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.1.8/policy/modules/system/unconfined.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.1.9/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2005-12-13 15:51:50.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/unconfined.if 2006-01-09 17:22:51.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/unconfined.if 2006-01-11 17:13:44.000000000 -0500 @@ -33,6 +33,7 @@ corenet_unconfined($1) dev_unconfined($1) @@ -1547,9 +1498,9 @@ files_unconfined($1) fs_unconfined($1) selinux_unconfined($1) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.1.8/policy/modules/system/unconfined.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.1.9/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/unconfined.te 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/unconfined.te 2006-01-11 17:13:44.000000000 -0500 @@ -57,6 +57,10 @@ bluetooth_domtrans_helper(unconfined_t) ') @@ -1583,9 +1534,9 @@ ifdef(`TODO',` ifdef(`use_mcs',` rw_dir_create_file(sysadm_su_t, home_dir_type) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-2.1.8/policy/modules/system/userdomain.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-2.1.9/policy/modules/system/userdomain.fc --- nsaserefpolicy/policy/modules/system/userdomain.fc 2005-11-15 09:13:40.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/userdomain.fc 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/userdomain.fc 2006-01-11 17:13:44.000000000 -0500 @@ -4,6 +4,6 @@ HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0) HOME_DIR/.+ gen_context(system_u:object_r:user_home_t,s0) @@ -1594,10 +1545,18 @@ +HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0-s15:c0.c255) HOME_DIR/.+ gen_context(system_u:object_r:ROLE_home_t,s0) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.8/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/userdomain.if 2006-01-09 14:37:14.000000000 -0500 -@@ -1881,19 +1881,16 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.9/policy/modules/system/userdomain.if +--- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-11 14:31:32.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/userdomain.if 2006-01-11 17:13:44.000000000 -0500 +@@ -103,6 +103,7 @@ + # execute files in the home directory + can_exec($1_t,$1_home_t) + ++ allow $1_t home_root_t:dir { getattr search }; + # full control of the home directory + allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto }; + allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto }; +@@ -1880,19 +1881,16 @@ ## # interface(`userdom_dontaudit_getattr_sysadm_home_dir',` @@ -1625,7 +1584,7 @@ ') ######################################## -@@ -1922,19 +1919,15 @@ +@@ -1921,19 +1919,15 @@ ## # interface(`userdom_dontaudit_search_sysadm_home_dir',` @@ -1650,7 +1609,7 @@ ') ######################################## -@@ -2074,6 +2067,22 @@ +@@ -2073,6 +2067,22 @@ ######################################## ## @@ -1673,7 +1632,7 @@ ## Read all files in all users home directories. ## ## -@@ -2665,6 +2674,23 @@ +@@ -2664,6 +2674,23 @@ ######################################## ## @@ -1697,9 +1656,9 @@ ## Send general signals to all user domains. ## ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.1.8/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.8/policy/modules/system/userdomain.te 2006-01-09 14:37:14.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.1.9/policy/modules/system/userdomain.te +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-11 14:31:32.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/system/userdomain.te 2006-01-11 17:13:44.000000000 -0500 @@ -205,6 +205,7 @@ optional_policy(`hostname',` @@ -1708,9 +1667,9 @@ ') optional_policy(`ipsec',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.8/policy/users +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.9/policy/users --- nsaserefpolicy/policy/users 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.8/policy/users 2006-01-09 14:37:14.000000000 -0500 ++++ serefpolicy-2.1.9/policy/users 2006-01-11 17:13:44.000000000 -0500 @@ -26,7 +26,9 @@ ifdef(`targeted_policy',` gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- selinux-policy.spec 10 Jan 2006 17:36:14 -0000 1.80 +++ selinux-policy.spec 11 Jan 2006 22:25:06 -0000 1.81 @@ -6,8 +6,8 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.1.8 -Release: 3 +Version: 2.1.9 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -262,6 +262,9 @@ %endif %changelog +* Tue Jan 10 2006 Dan Walsh 2.1.9-1 +- Update to upstream + * Tue Jan 10 2006 Dan Walsh 2.1.8-3 - More Fixes for hal and readahead Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 9 Jan 2006 20:20:08 -0000 1.23 +++ sources 11 Jan 2006 22:25:06 -0000 1.24 @@ -1 +1 @@ -b9ddc9e25ffbd12bd8711591d0af0a7f serefpolicy-2.1.8.tgz +ff669d0d686714cd3a4e57047277e539 serefpolicy-2.1.9.tgz From fedora-cvs-commits at redhat.com Wed Jan 11 22:32:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 17:32:20 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch,1.8,1.9 Message-ID: <200601112232.k0BMWKGT015084@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15054 Modified Files: policy-20060104.patch Log Message: * Tue Jan 10 2006 Dan Walsh 2.1.9-1 - Update to upstream policy-20060104.patch: Makefile | 2 policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 1 policy/modules/admin/readahead.te | 6 + policy/modules/admin/su.if | 2 policy/modules/admin/vpn.te | 7 + policy/modules/apps/alsa.fc | 3 policy/modules/apps/alsa.if | 21 ++++ policy/modules/apps/alsa.te | 34 ++++++++ policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 +++++ policy/modules/apps/java.te | 25 +++++ policy/modules/apps/wine.fc | 2 policy/modules/apps/wine.if | 23 +++++ policy/modules/apps/wine.te | 27 ++++++ policy/modules/kernel/corecommands.te | 6 + policy/modules/kernel/devices.if | 16 +++ policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.if | 17 ++++ policy/modules/kernel/mls.te | 2 policy/modules/services/apache.te | 9 ++ policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 10 ++ policy/modules/services/bind.if | 19 ++++ policy/modules/services/cron.te | 34 +------- policy/modules/services/cups.te | 6 - policy/modules/services/dovecot.te | 1 policy/modules/services/finger.te | 1 policy/modules/services/hal.fc | 1 policy/modules/services/hal.te | 20 +++- policy/modules/services/kerberos.te | 5 - policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++++++++++ policy/modules/services/mta.te | 10 ++ policy/modules/services/networkmanager.te | 5 - policy/modules/services/ntp.te | 2 policy/modules/services/prelink.fc | 7 + policy/modules/services/prelink.if | 39 +++++++++ policy/modules/services/prelink.te | 64 +++++++++++++++ policy/modules/services/samba.if | 2 policy/modules/services/sendmail.te | 2 policy/modules/services/ssh.if | 4 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 14 +++ policy/modules/system/authlogin.te | 12 -- policy/modules/system/fstools.te | 2 policy/modules/system/hostname.te | 37 +------- policy/modules/system/init.if | 3 policy/modules/system/init.te | 20 +--- policy/modules/system/iptables.te | 1 policy/modules/system/libraries.fc | 127 +++++++++++++++--------------- policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.te | 9 -- policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.te | 1 policy/modules/system/unconfined.if | 1 policy/modules/system/unconfined.te | 12 +- policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 67 +++++++++++---- policy/modules/system/userdomain.te | 1 policy/users | 8 + 64 files changed, 656 insertions(+), 200 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- policy-20060104.patch 11 Jan 2006 22:25:06 -0000 1.8 +++ policy-20060104.patch 11 Jan 2006 22:32:04 -0000 1.9 @@ -470,7 +470,7 @@ fs_manage_auto_mountpoints(automount_t) term_dontaudit_use_console(automount_t) -+term_dontaudit_getattr_pty_dir(lvm_t) ++term_dontaudit_getattr_pty_dir(automount_t) init_use_fd(automount_t) init_use_script_pty(automount_t) From fedora-cvs-commits at redhat.com Thu Jan 12 00:54:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 19:54:21 -0500 Subject: rpms/pup/devel .cvsignore, 1.16, 1.17 pup.spec, 1.18, 1.19 sources, 1.18, 1.19 Message-ID: <200601120054.k0C0sLEV008553@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/pup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8512/devel Modified Files: .cvsignore pup.spec sources Log Message: auto-import pup-0.9.3-1 on branch devel from pup-0.9.3-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pup/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 6 Jan 2006 17:01:16 -0000 1.16 +++ .cvsignore 12 Jan 2006 00:54:18 -0000 1.17 @@ -1 +1 @@ -pup-0.9.2.tar.bz2 +pup-0.9.3.tar.bz2 Index: pup.spec =================================================================== RCS file: /cvs/dist/rpms/pup/devel/pup.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- pup.spec 6 Jan 2006 17:01:16 -0000 1.18 +++ pup.spec 12 Jan 2006 00:54:18 -0000 1.19 @@ -1,6 +1,6 @@ Summary: Graphical package updater Name: pup -Version: 0.9.2 +Version: 0.9.3 Release: 1 License: GPL Group: System Environment/Base @@ -42,6 +42,12 @@ %attr(0644,root,root) %config /etc/pam.d/pup %changelog +* Wed Jan 11 2006 Jeremy Katz - 0.9.3-1 +- Fix traceback on update (#177579) +- Fix key importing +- Give an error message on errors downloading (#177552) +- Fix ts checking on second run + * Fri Jan 6 2006 Jeremy Katz - 0.9.2-1 - add a scrollbar to the details text buffer Index: sources =================================================================== RCS file: /cvs/dist/rpms/pup/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 6 Jan 2006 17:01:17 -0000 1.18 +++ sources 12 Jan 2006 00:54:18 -0000 1.19 @@ -1 +1 @@ -cad0ce7611ec80ed37f9c1fd19860ae9 pup-0.9.2.tar.bz2 +fe78604a6b1bf1ca87d34fe3b59a81a0 pup-0.9.3.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 12 00:58:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 19:58:13 -0500 Subject: rpms/desktop-printing/devel eggcups-dbus-send-null-crash.patch, NONE, 1.1 desktop-printing-0.19-dbus-api.patch, 1.1, 1.2 desktop-printing.spec, 1.48, 1.49 Message-ID: <200601120058.k0C0wD3B010289@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/desktop-printing/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10208 Modified Files: desktop-printing-0.19-dbus-api.patch desktop-printing.spec Added Files: eggcups-dbus-send-null-crash.patch Log Message: - Add patch for fixing a crasher when plugging in a printer eggcups-dbus-send-null-crash.patch: ec-driver-prompt.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) --- NEW FILE eggcups-dbus-send-null-crash.patch --- Index: ec-driver-prompt.c =================================================================== RCS file: /cvs/gnome/eggcups/ec-driver-prompt.c,v retrieving revision 1.15 diff -u -r1.15 ec-driver-prompt.c --- ec-driver-prompt.c 25 Feb 2005 05:02:35 -0000 1.15 +++ ec-driver-prompt.c 12 Jan 2006 00:44:23 -0000 @@ -214,6 +214,7 @@ const gchar *make, *model, *printer_udi, *printer_name; gchar *return_make, *return_model; DBusMessage *return_message; + gboolean has_user_drivers; rb_debug ("Getting user driver..."); @@ -229,22 +230,25 @@ return; } - find_user_driver (make, model, &return_make, &return_model); + has_user_drivers = find_user_driver (make, model, &return_make, &return_model); return_message = dbus_message_new_method_return (message); - if (return_message != NULL) { + if (return_message == NULL) + goto out; + + if (has_user_drivers) { DBusMessageIter iter; dbus_message_iter_init_append (return_message, &iter); dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &return_make); dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &return_model); - } else { - dbus_connection_send (connection, return_message, NULL); - dbus_connection_flush (connection); - dbus_message_unref (return_message); } + + dbus_connection_send (connection, return_message, NULL); + dbus_message_unref (return_message); +out: g_free (return_make); g_free (return_model); } desktop-printing-0.19-dbus-api.patch: main.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: desktop-printing-0.19-dbus-api.patch =================================================================== RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing-0.19-dbus-api.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- desktop-printing-0.19-dbus-api.patch 1 Dec 2005 23:02:54 -0000 1.1 +++ desktop-printing-0.19-dbus-api.patch 12 Jan 2006 00:58:11 -0000 1.2 @@ -1,5 +1,5 @@ ---- desktop-printing-0.19/eggcups-0.19/main.c.dbus-api 2005-12-01 17:59:29.000000000 -0500 -+++ desktop-printing-0.19/eggcups-0.19/main.c 2005-12-01 17:59:40.000000000 -0500 +--- eggcups-0.19/main.c.dbus-api 2005-12-01 17:59:29.000000000 -0500 ++++ eggcups-0.19/main.c 2005-12-01 17:59:40.000000000 -0500 @@ -154,7 +154,7 @@ } acquisition_result = dbus_bus_request_name (dbus, Index: desktop-printing.spec =================================================================== RCS file: /cvs/dist/rpms/desktop-printing/devel/desktop-printing.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- desktop-printing.spec 10 Dec 2005 09:11:19 -0000 1.48 +++ desktop-printing.spec 12 Jan 2006 00:58:11 -0000 1.49 @@ -5,13 +5,14 @@ Summary: Desktop print icon Name: desktop-printing Version: 0.19 -Release: 4.1 +Release: 5 License: GPL Group: Applications/File # total lie Source0: http://web.verbum.org/eggcups/eggcups-%{version}.tar.bz2 Source1: gnome-default-printer.png Patch0: desktop-printing-0.19-dbus-api.patch +Patch1: eggcups-dbus-send-null-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: redhat-menus @@ -32,7 +33,10 @@ %prep %setup -q -c +pushd eggcups-%{version} %patch0 -p1 -b .dbus-api +%patch1 -p0 -b .dbus-null-crash +popd %build pushd eggcups-%{version} @@ -83,6 +87,9 @@ %{_sysconfdir}/gconf/* %changelog +* Wed Jan 11 2006 John (J5) Palmieri - 0.19-5 +- Add patch for fixing a crasher when plugging in a printer + * Fri Dec 09 2005 Jesse Keating - 0.19-4.1 - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 12 01:22:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 20:22:04 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.129,1.130 Message-ID: <200601120122.k0C1M4qF028601@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28577 Modified Files: cman-kernel.spec Log Message: bump again for another new kernel Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- cman-kernel.spec 10 Jan 2006 23:21:32 -0000 1.129 +++ cman-kernel.spec 12 Jan 2006 01:22:00 -0000 1.130 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.1826.2.9_FC5 +%define kernel_version 2.6.15-1.1826.2.10_FC5 %define subversion 20051219.162641.FC5 %ifnarch i686 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.14.1 -Release: 20051219.162641.FC5.9 +Release: 20051219.162641.FC5.10 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules @@ -225,6 +225,9 @@ %{_includedir}/cluster/* %changelog +* Wed Jan 11 2006 Jesse Keating +- and again + * Tue Jan 10 2006 Jesse Keating - rebuilt again From fedora-cvs-commits at redhat.com Thu Jan 12 01:23:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 20:23:49 -0500 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.104,1.105 Message-ID: <200601120123.k0C1Nn9J029339@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29313 Modified Files: dlm-kernel.spec Log Message: bump again for another new kernel Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- dlm-kernel.spec 10 Jan 2006 23:25:04 -0000 1.104 +++ dlm-kernel.spec 12 Jan 2006 01:23:45 -0000 1.105 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.1826.2.9_FC5 +%define kernel_version 2.6.15-1.1826.2.10_FC5 %define subversion 20051219.162641.FC5 %ifnarch i686 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.14.1 -Release: 20051219.162641.FC5.7 +Release: 20051219.162641.FC5.8 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. @@ -233,6 +233,9 @@ %{_includedir}/cluster/* %changelog +* Wed Jan 11 2006 Jesse Keating +- rebuilt again + * Tue Jan 10 2006 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 12 01:24:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 20:24:57 -0500 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.120,1.121 Message-ID: <200601120124.k0C1OvSX029806@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29780 Modified Files: GFS-kernel.spec Log Message: bump again for another new kernel Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- GFS-kernel.spec 11 Jan 2006 03:35:34 -0000 1.120 +++ GFS-kernel.spec 12 Jan 2006 01:24:54 -0000 1.121 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.1826.2.9_FC5 +%define kernel_version 2.6.15-1.1826.2.10_FC5 %define subversion 20051219.162641.FC5 %ifnarch i686 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.14.1 -Release: 20051219.162641.FC5.8 +Release: 20051219.162641.FC5.9 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules @@ -249,6 +249,9 @@ %{_includedir}/linux/* %changelog +* Wed Jan 11 2006 Jesse Keating +- rebuilt again + * Tue Jan 10 2006 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 12 01:25:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 20:25:43 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.110,1.111 Message-ID: <200601120125.k0C1PhH0030114@cvs.devel.redhat.com> Author: jkeating Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30088 Modified Files: gnbd-kernel.spec Log Message: bump again for another new kernel Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- gnbd-kernel.spec 11 Jan 2006 03:59:37 -0000 1.110 +++ gnbd-kernel.spec 12 Jan 2006 01:25:39 -0000 1.111 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.15-1.1826.2.9_FC5 +%define kernel_version 2.6.15-1.1826.2.10_FC5 %define subversion 20051108.134753.FC5 %ifnarch i686 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.14.0 -Release: 20051108.134753.FC5.13 +Release: 20051108.134753.FC5.14 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device @@ -217,6 +217,9 @@ %{_includedir}/linux/gnbd.h %changelog +* Wed Jan 11 2006 Jesse Keating +- rebuilt again + * Tue Jan 10 2006 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 12 01:27:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 20:27:09 -0500 Subject: rpms/kernel/devel linux-2.6-tcp6-null-sk.patch, NONE, 1.1 .cvsignore, 1.321, 1.322 kernel-2.6.spec, 1.1844, 1.1845 sources, 1.263, 1.264 linux-2.6-powerpc-parport.patch, 1.2, NONE Message-ID: <200601120127.k0C1R9gV030657@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30618 Modified Files: .cvsignore kernel-2.6.spec sources Added Files: linux-2.6-tcp6-null-sk.patch Removed Files: linux-2.6-powerpc-parport.patch Log Message: another interim linus update linux-2.6-tcp6-null-sk.patch: tcp_ipv6.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-tcp6-null-sk.patch --- --- linux-2.6.15/net/ipv6/tcp_ipv6.c~ 2006-01-11 17:43:09.000000000 +0000 +++ linux-2.6.15/net/ipv6/tcp_ipv6.c 2006-01-11 18:18:33.000000000 +0000 @@ -67,6 +67,9 @@ #include #include +/* Socket used for sending RSTs */ +static struct socket *tcp6_socket; + static void tcp_v6_send_reset(struct sk_buff *skb); static void tcp_v6_reqsk_send_ack(struct sk_buff *skb, struct request_sock *req); static void tcp_v6_send_check(struct sock *sk, int len, @@ -611,7 +614,7 @@ static void tcp_v6_send_reset(struct sk_ if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) { if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) { - ip6_xmit(NULL, buff, &fl, NULL, 0); + ip6_xmit(tcp6_socket->sk, buff, &fl, NULL, 0); TCP_INC_STATS_BH(TCP_MIB_OUTSEGS); TCP_INC_STATS_BH(TCP_MIB_OUTRSTS); return; @@ -675,7 +678,7 @@ static void tcp_v6_send_ack(struct sk_bu if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) { if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) { - ip6_xmit(NULL, buff, &fl, NULL, 0); + ip6_xmit(tcp6_socket->sk, buff, &fl, NULL, 0); TCP_INC_STATS_BH(TCP_MIB_OUTSEGS); return; } @@ -1600,8 +1603,21 @@ static struct inet_protosw tcpv6_protosw void __init tcpv6_init(void) { + int err; + /* register inet6 protocol */ if (inet6_add_protocol(&tcpv6_protocol, IPPROTO_TCP) < 0) printk(KERN_ERR "tcpv6_init: Could not register protocol\n"); inet6_register_protosw(&tcpv6_protosw); + + err = sock_create_kern(PF_INET6, SOCK_RAW, IPPROTO_TCP, &tcp6_socket); + if (err < 0) + panic("Failed to create the TCPv6 control socket.\n"); + tcp6_socket->sk->sk_allocation = GFP_ATOMIC; + + /* Unhash it so that IP input processing does not even + * see it, we do not wish this socket to see incoming + * packets. + */ + tcp6_socket->sk->sk_prot->unhash(tcp6_socket->sk); } Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.321 retrieving revision 1.322 diff -u -r1.321 -r1.322 --- .cvsignore 11 Jan 2006 13:04:20 -0000 1.321 +++ .cvsignore 12 Jan 2006 01:27:06 -0000 1.322 @@ -3,4 +3,4 @@ kernel-2.6.15 linux-2.6.15.tar.bz2 bcm43xx-20060111.tar.bz2 -patch-2.6.15-git7.bz2 +patch-2.6.15-git7a.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1844 retrieving revision 1.1845 diff -u -r1.1844 -r1.1845 --- kernel-2.6.spec 11 Jan 2006 21:59:09 -0000 1.1844 +++ kernel-2.6.spec 12 Jan 2006 01:27:06 -0000 1.1845 @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git7.bz2 +Patch1: patch-2.6.15-git7a.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -231,7 +231,6 @@ Patch310: linux-2.6-cell-spiderpic-no-devtree.patch Patch313: linux-2.6-hvc-rtas-console.patch Patch314: linux-2.6-ppc-rtas-check.patch -Patch315: linux-2.6-powerpc-parport.patch Patch317: linux-2.6-ppc-iseries-input-layer.patch # 400 - 499 ia64 @@ -368,6 +367,9 @@ # ACPI patches. Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch +# TCPv6 oops fix +Patch2200: linux-2.6-tcp6-null-sk.patch + # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx.patch @@ -636,8 +638,6 @@ %patch313 -p1 # Check properly for successful RTAS instantiation %patch314 -p1 -# Check before using legacy I/O ports which might crash the machine -%patch315 -p1 # No input layer on iseries %patch317 -p1 @@ -853,6 +853,8 @@ # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. %patch2100 -p1 +%patch2200 -p1 + # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream @@ -1354,6 +1356,11 @@ %endif %changelog +* Thu Jan 12 2006 David Woodhouse +- 2.6.15-git7a -- another interim snapshot because stuff we care about + got fixed today +- Fix TCPv6 oops when sending RST or ACK packets + * Wed Jan 11 2006 Dave Jones - Make ATI chipset based x86-64 machines boot again. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.263 retrieving revision 1.264 diff -u -r1.263 -r1.264 --- sources 11 Jan 2006 13:04:21 -0000 1.263 +++ sources 12 Jan 2006 01:27:06 -0000 1.264 @@ -1,4 +1,3 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 e7291436e5d71b575dea034883cb42e5 bcm43xx-20060111.tar.bz2 -9bf813fab546b5a25cb9b59ce086c4b7 patch-2.6.15-git7.bz2 - +f791ce18c0e962f30dce760274f6be07 patch-2.6.15-git7a.bz2 --- linux-2.6-powerpc-parport.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 12 01:27:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 20:27:09 -0500 Subject: rpms/kernel/devel/configs config-powerpc64-iseries,1.8,1.9 Message-ID: <200601120127.k0C1R9LG030668@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv30618/configs Modified Files: config-powerpc64-iseries Log Message: another interim linus update Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- config-powerpc64-iseries 11 Jan 2006 01:24:22 -0000 1.8 +++ config-powerpc64-iseries 12 Jan 2006 01:27:06 -0000 1.9 @@ -8,9 +8,7 @@ # iSeries device drivers # CONFIG_ISERIES_VETH=m -# drivers/char/viocons.c: In function 'vioHandleData': -# drivers/char/viocons.c:1003: error: 'struct tty_struct' has no member named 'flip' -# CONFIG_VIOCONS is not set +CONFIG_VIOCONS=y CONFIG_VIODASD=m CONFIG_VIOCD=m CONFIG_VIOTAPE=m From fedora-cvs-commits at redhat.com Thu Jan 12 01:56:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 20:56:32 -0500 Subject: rpms/kernel/devel/configs config-powerpc32-generic,1.8,1.9 Message-ID: <200601120156.k0C1uW0Y014678@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv14653 Modified Files: config-powerpc32-generic Log Message: CPU type Index: config-powerpc32-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc32-generic,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- config-powerpc32-generic 10 Jan 2006 02:53:29 -0000 1.8 +++ config-powerpc32-generic 12 Jan 2006 01:56:27 -0000 1.9 @@ -4,6 +4,7 @@ # CONFIG_RTAS_PROC is not set # CONFIG_PCMCIA_M8XX is not set # CONFIG_HOTPLUG_PCI is not set +CONFIG_CLASSIC32=y CONFIG_CPU_FREQ_PMAC=y CONFIG_PPC_MULTIPLATFORM=y # CONFIG_PPC_CHRP is not set From fedora-cvs-commits at redhat.com Thu Jan 12 02:36:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 21:36:33 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch, 1.9, 1.10 selinux-policy.spec, 1.81, 1.82 Message-ID: <200601120236.k0C2aX06004219@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4176 Modified Files: policy-20060104.patch selinux-policy.spec Log Message: * Wed Jan 11 2006 Jeremy Katz - 2.1.9-2 - fix pup transitions (#177262) - fix xen disks (#177599) policy-20060104.patch: Makefile | 2 policy/modules/admin/amanda.te | 4 policy/modules/admin/kudzu.te | 1 policy/modules/admin/readahead.te | 6 + policy/modules/admin/rpm.fc | 2 policy/modules/admin/su.if | 2 policy/modules/admin/vpn.te | 7 + policy/modules/apps/alsa.fc | 3 policy/modules/apps/alsa.if | 21 ++++ policy/modules/apps/alsa.te | 34 ++++++++ policy/modules/apps/java.fc | 4 policy/modules/apps/java.if | 23 +++++ policy/modules/apps/java.te | 25 +++++ policy/modules/apps/wine.fc | 2 policy/modules/apps/wine.if | 23 +++++ policy/modules/apps/wine.te | 27 ++++++ policy/modules/kernel/corecommands.te | 6 + policy/modules/kernel/devices.if | 16 +++ policy/modules/kernel/domain.if | 1 policy/modules/kernel/domain.te | 4 policy/modules/kernel/files.if | 17 ++++ policy/modules/kernel/mls.te | 2 policy/modules/kernel/storage.fc | 1 policy/modules/services/apache.te | 9 ++ policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 10 ++ policy/modules/services/bind.if | 19 ++++ policy/modules/services/cron.te | 34 +------- policy/modules/services/cups.te | 6 - policy/modules/services/dovecot.te | 1 policy/modules/services/finger.te | 1 policy/modules/services/hal.fc | 1 policy/modules/services/hal.te | 20 +++- policy/modules/services/kerberos.te | 5 - policy/modules/services/locate.fc | 4 policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++++++++++ policy/modules/services/mta.te | 10 ++ policy/modules/services/networkmanager.te | 5 - policy/modules/services/ntp.te | 2 policy/modules/services/prelink.fc | 7 + policy/modules/services/prelink.if | 39 +++++++++ policy/modules/services/prelink.te | 64 +++++++++++++++ policy/modules/services/samba.if | 2 policy/modules/services/sendmail.te | 2 policy/modules/services/ssh.if | 4 policy/modules/services/xdm.te | 4 policy/modules/system/authlogin.if | 14 +++ policy/modules/system/authlogin.te | 12 -- policy/modules/system/fstools.te | 2 policy/modules/system/hostname.te | 37 +------- policy/modules/system/init.if | 3 policy/modules/system/init.te | 20 +--- policy/modules/system/iptables.te | 1 policy/modules/system/libraries.fc | 127 +++++++++++++++--------------- policy/modules/system/libraries.te | 4 policy/modules/system/locallogin.te | 1 policy/modules/system/lvm.te | 9 -- policy/modules/system/mount.te | 3 policy/modules/system/selinuxutil.te | 1 policy/modules/system/unconfined.if | 1 policy/modules/system/unconfined.te | 12 +- policy/modules/system/userdomain.fc | 2 policy/modules/system/userdomain.if | 67 +++++++++++---- policy/modules/system/userdomain.te | 1 policy/users | 8 + 66 files changed, 659 insertions(+), 200 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- policy-20060104.patch 11 Jan 2006 22:32:04 -0000 1.9 +++ policy-20060104.patch 12 Jan 2006 02:36:17 -0000 1.10 @@ -1692,3 +1692,24 @@ + gen_user(root, sysadm_r staff_r secadm_r , s0, s0 - s15:c0.c255, c0.c255) ') ') +--- serefpolicy-2.1.9/policy/modules/admin/rpm.fc.pirut 2006-01-11 18:59:28.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/admin/rpm.fc 2006-01-11 18:59:31.000000000 -0500 +@@ -15,6 +15,8 @@ + ifdef(`distro_redhat', ` + /usr/sbin/up2date -- gen_context(system_u:object_r:rpm_exec_t,s0) + /usr/sbin/rhn_check -- gen_context(system_u:object_r:rpm_exec_t,s0) ++/usr/sbin/pup -- gen_context(system_u:object_r:rpm_exec_t,s0) ++/usr/sbin/pirut -- gen_context(system_u:object_r:rpm_exec_t,s0) + ') + + /var/lib/alternatives(/.*)? gen_context(system_u:object_r:rpm_var_lib_t,s0) +--- serefpolicy-2.1.9/policy/modules/kernel/storage.fc.xen 2006-01-11 21:31:15.000000000 -0500 ++++ serefpolicy-2.1.9/policy/modules/kernel/storage.fc 2006-01-11 21:31:48.000000000 -0500 +@@ -12,6 +12,7 @@ + /dev/cm20.* -b gen_context(system_u:object_r:removable_device_t,s0) + /dev/dasd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) + /dev/dm-[0-9]+ -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) ++/dev/xvd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) + /dev/fd[^/]+ -b gen_context(system_u:object_r:removable_device_t,s0) + /dev/flash[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) + /dev/gscd -b gen_context(system_u:object_r:removable_device_t,s0) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- selinux-policy.spec 11 Jan 2006 22:25:06 -0000 1.81 +++ selinux-policy.spec 12 Jan 2006 02:36:17 -0000 1.82 @@ -7,7 +7,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.1.9 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -262,6 +262,10 @@ %endif %changelog +* Wed Jan 11 2006 Jeremy Katz - 2.1.9-2 +- fix pup transitions (#177262) +- fix xen disks (#177599) + * Tue Jan 10 2006 Dan Walsh 2.1.9-1 - Update to upstream From fedora-cvs-commits at redhat.com Thu Jan 12 03:11:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 22:11:58 -0500 Subject: rpms/thunderbird/devel thunderbird-1.5-bug304720.patch, NONE, 1.1 thunderbird.spec, 1.58, 1.59 Message-ID: <200601120311.k0C3Bwxo025858@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25804 Modified Files: thunderbird.spec Added Files: thunderbird-1.5-bug304720.patch Log Message: * Wed Jan 11 2006 Christopher Aillon - 1.5-0.5.6.rc1 - Fix crash when deleting highlighted text while composing mail within plaintext editor with spellcheck enabled. thunderbird-1.5-bug304720.patch: nsTextServicesDocument.cpp | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE thunderbird-1.5-bug304720.patch --- Index: mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp =================================================================== RCS file: /cvsroot/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp,v retrieving revision 1.59 diff -u -w -r1.59 nsTextServicesDocument.cpp --- mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp 22 Aug 2005 03:00:03 -0000 1.59 +++ mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp 21 Nov 2005 23:37:13 -0000 @@ -2494,6 +2494,8 @@ nsresult nsTextServicesDocument::DeleteNode(nsIDOMNode *aChild) { + NS_ENSURE_TRUE(mIterator, NS_ERROR_FAILURE); + //**** KDEBUG **** // printf("** DeleteNode: 0x%.8x\n", aChild); // fflush(stdout); Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- thunderbird.spec 3 Jan 2006 16:46:12 -0000 1.58 +++ thunderbird.spec 12 Jan 2006 03:11:45 -0000 1.59 @@ -8,7 +8,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 1.5 -Release: 0.5.5.rc1 +Release: 0.5.6.rc1 Epoch: 0 URL: http://www.mozilla.org/projects/thunderbird/ License: MPL @@ -49,6 +49,7 @@ # patches from upstream (Patch100+) Patch100: firefox-bug305970.patch +Patch101: thunderbird-1.5-bug304720.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -99,6 +100,7 @@ %patch81 -p1 %patch100 -p1 +%patch101 -p1 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -185,6 +187,10 @@ #=============================================================================== %changelog +* Wed Jan 11 2006 Christopher Aillon - 1.5-0.5.6.rc1 +- Fix crash when deleting highlighted text while composing mail within + plaintext editor with spellcheck enabled. + * Tue Jan 3 2006 Christopher Aillon - 1.5-0.5.5.rc1 - Looks like we can build on ppc64 again. From fedora-cvs-commits at redhat.com Thu Jan 12 04:01:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 23:01:44 -0500 Subject: rpms/gnome-pilot-conduits/devel gnome-pilot-conduits-2.0.13-port-to-pilot-link-0.12.patch, NONE, 1.1 gnome-pilot-conduits.spec, 1.13, 1.14 gnome-pilot-conduits-2.0.12-port-to-pilot-link-0.12.patch, 1.1, NONE Message-ID: <200601120401.k0C41hrl021301@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/gnome-pilot-conduits/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21265 Modified Files: gnome-pilot-conduits.spec Added Files: gnome-pilot-conduits-2.0.13-port-to-pilot-link-0.12.patch Removed Files: gnome-pilot-conduits-2.0.12-port-to-pilot-link-0.12.patch Log Message: * Wed Jan 11 2006 David Malcolm - 2.0.13-3.FC5 - extend patch 2 to handle a missing fix in the email conduit, renaming it from gnome-pilot-conduits-2.0.12-port-to-pilot-link-0.12.patch to gnome-pilot-conduits-2.0.13-port-to-pilot-link-0.12.patch in the process (#159165) gnome-pilot-conduits-2.0.13-port-to-pilot-link-0.12.patch: email/email_conduit.c | 61 ++++++++++++----------- expense/expense_conduit.c | 19 ++++--- mal-conduit/mal/client/unix/malsync.c | 88 +++++++++++++++++----------------- memo_file/memo_file_conduit.c | 12 ++-- 4 files changed, 96 insertions(+), 84 deletions(-) --- NEW FILE gnome-pilot-conduits-2.0.13-port-to-pilot-link-0.12.patch --- --- gnome-pilot-conduits-2.0.13/mal-conduit/mal/client/unix/malsync.c.port-to-pilot-link-0.12 2002-09-16 13:16:23.000000000 -0400 +++ gnome-pilot-conduits-2.0.13/mal-conduit/mal/client/unix/malsync.c 2006-01-11 22:45:22.000000000 -0500 @@ -107,8 +107,7 @@ int pilot_rHandle; int pilot_RecIndex; recordid_t id; - uint8 *pilot_buffer; - int pilot_buffer_size; + pi_buffer_t *pi_buf; /* Secure Network Library Stuff */ AGBool hasseclib; @@ -270,8 +269,8 @@ if (NULL != pInfo->userConfig) AGUserConfigFree(pInfo->userConfig); - if (NULL != pInfo->pilot_buffer) - free(pInfo->pilot_buffer); + if (NULL != pInfo->pi_buf) + pi_buffer_free (pInfo->pi_buf); if (NULL != pInfo->commandProcessor) AGCommandProcessorFree(pInfo->commandProcessor); @@ -294,9 +293,8 @@ bzero(pInfo, sizeof(PalmSyncInfo)); - pInfo->pilot_buffer_size = pbs; - pInfo->pilot_buffer = (uint8 *)malloc(pbs); - if (NULL == pInfo->pilot_buffer) + pInfo->pi_buf = pi_buffer_new (pbs); + if (NULL == pInfo->pi_buf) goto fail; /* Allocate the platform calls record. */ @@ -345,8 +343,7 @@ /*---------------------------------------------------------------------------*/ static void readAndUseDeviceInfoDatabase(AGDeviceInfo * devInfo, - uint8 *dev_db_info_buffer, - uint32 dev_db_info_buffer_size) + pi_buffer_t *pi_buf) { int database_id = 0; long result; @@ -373,13 +370,13 @@ int rc; rc = dlp_ReadRecordByIndex(sd, database_id, 0, - (void *)dev_db_info_buffer, - &id, &dev_db_info_buffer_size, + pi_buf, + &id, &attr, &cat); if (rc >= 0) { - uint8 *p = dev_db_info_buffer; + uint8 *p = pi_buf->data; int16 dev_db_info_version = readInt16(p); p+=sizeof(int16); devInfo->colorDepth = readInt32(p); @@ -472,8 +469,7 @@ } readAndUseDeviceInfoDatabase(devInfo, - pInfo->pilot_buffer, - pInfo->pilot_buffer_size); + pInfo->pi_buf); /* Override the color depth if the user wants low res images. */ if (lowres) { @@ -664,31 +660,36 @@ readDeviceUserConfig32(int userConfigDBHandle, AGUserConfig **deviceUserConfig) { recordid_t id; - int bufferSize = BUFFERSIZE; + pi_buffer_t *pi_buf; int attr = 0; int cat = 0; int rc; - uint8 buffer[BUFFERSIZE]; AGBufferReader * r = NULL; - rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, - &id, &bufferSize, &attr, &cat); + pi_buf = pi_buffer_new (BUFFERSIZE); + + rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, pi_buf, + &id, &attr, &cat); if (rc < 0) { if (verbose) printf("readDeviceUserConfig: dlp_ReadRecordByIndex , err = %d\n", rc); + pi_buffer_free (pi_buf); return 0; } - r = AGBufferReaderNew(buffer); + r = AGBufferReaderNew(pi_buf->data); if (r) { *deviceUserConfig = AGUserConfigNew(); AGUserConfigReadData(*deviceUserConfig, (AGReader*)r); AGBufferReaderFree(r); + pi_buffer_free (pi_buf); return id; - } else + } else { + pi_buffer_free (pi_buf); return 0; + } } #define BUFFERSIZE 0xFFFF /*---------------------------------------------------------------------------*/ @@ -696,31 +697,36 @@ AGUserConfig **deviceUserConfig) { recordid_t id; - int bufferSize = BUFFERSIZE; int attr = 0; int cat = 0; int rc; - uint8 buffer[BUFFERSIZE]; + pi_buffer_t *pi_buf; AGBufferReader * r = NULL; - rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, - &id, &bufferSize, &attr, &cat); + pi_buf = pi_buffer_new (BUFFERSIZE); + + rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, pi_buf, + &id, &attr, &cat); if (rc < 0) { if (verbose) printf("readDeviceUserConfig: dlp_ReadRecordByIndex , err = %d\n", rc); + pi_buffer_free (pi_buf); return 0; } - r = AGBufferReaderNew(buffer); + r = AGBufferReaderNew(pi_buf->data); if (r) { *deviceUserConfig = AGUserConfigNew(); MAL31ReadUserData(*deviceUserConfig, (AGReader*)r); AGBufferReaderFree(r); + pi_buffer_free (pi_buf); return id; - } else + } else { + pi_buffer_free (pi_buf); return 0; + } } /*---------------------------------------------------------------------------*/ static int32 readDeviceUserConfig(int userConfigDBHandle, @@ -741,14 +747,16 @@ { recordid_t id; - int bufferSize = BUFFERSIZE; int attr = 0; int cat = 0; - uint8 buffer[BUFFERSIZE]; AGBufferWriter * w = NULL; + w = AGBufferWriterNew(0); if (w) { long result; + pi_buffer_t *pi_buf; + + pi_buf = pi_buffer_new (BUFFERSIZE); if (threeone) { MAL31WriteUserData(deviceUserConfig, (AGWriter*)w); @@ -756,8 +764,8 @@ AGUserConfigWriteData(deviceUserConfig, (AGWriter*)w); } - result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, - &id, &bufferSize, &attr, &cat); + result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, pi_buf, + &id, &attr, &cat); if (result < 0) id = 0; @@ -767,7 +775,7 @@ AGBufferWriterGetBufferSize(w), &id); AGBufferWriterFree(w); - + pi_buffer_free (pi_buf); } } @@ -1055,17 +1063,17 @@ int32 result; int att = 0; int cat = 0; - int size = pInfo->pilot_buffer_size; + //int size = pInfo->pi_buf->allocated; int idx = pInfo->pilot_RecIndex++; result = (modonly) ? - dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pilot_buffer, + dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pi_buf, &pInfo->id, &idx, - &size, &att, &cat) + &att, &cat) : dlp_ReadRecordByIndex(sd, pInfo->pilot_rHandle, idx, - pInfo->pilot_buffer, &pInfo->id, - &size, &att, &cat); + pInfo->pi_buf, &pInfo->id, + &att, &cat); if (result < 0) { closeDatabase(pInfo); @@ -1081,7 +1089,7 @@ } pInfo->record = AGRecordInit(pInfo->record, pInfo->id, AGPalmPilotAttribsToMALMod((uint8)att), - size, pInfo->pilot_buffer, 0, NULL); + pInfo->pi_buf->used, pInfo->pi_buf->data, 0, NULL); *record = pInfo->record; return AGCLIENT_CONTINUE; @@ -1397,7 +1405,6 @@ static void Connect(PalmSyncInfo *pi) { - struct pi_sockaddr addr; int ret; if (sd != 0) @@ -1414,10 +1421,7 @@ exit(1); } - addr.pi_family = PI_AF_PILOT; - strcpy(addr.pi_device, device); - - ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr)); + ret = pi_bind(sd, device); if(ret == -1) { fprintf(stderr, "Unable to bind to port '%s'.\n", device); exit(1); --- gnome-pilot-conduits-2.0.13/expense/expense_conduit.c.port-to-pilot-link-0.12 2003-01-26 18:04:09.000000000 -0500 +++ gnome-pilot-conduits-2.0.13/expense/expense_conduit.c 2006-01-11 22:45:22.000000000 -0500 @@ -238,8 +238,7 @@ static gint copy_from_pilot( GnomePilotConduit *c, GnomePilotDBInfo *dbi ) { int dbHandle; - guchar buffer[0xffff]; - + pi_buffer_t *pi_buf; struct ExpenseAppInfo *tai; struct ExpensePref *tp; @@ -263,8 +262,10 @@ g_warning("Unable to open ExpenseDB"); return -1; } + + pi_buf = pi_buffer_new (0xffff); - unpack_ExpensePref(tp, buffer, 0xffff); + unpack_ExpensePref(tp, pi_buf->data, 0xffff); #ifdef EC_DEBUG fprintf(stderr, "Orig prefs, %d bytes:\n", ret); @@ -280,9 +281,9 @@ fprintf(stderr, "\n"); #endif /* EC_DEBUG */ - ret = dlp_ReadAppBlock(dbi->pilot_socket, dbHandle, 0, buffer, 0xffff); + ret = dlp_ReadAppBlock(dbi->pilot_socket, dbHandle, 0, 0xffff, pi_buf); - unpack_ExpenseAppInfo(tai, buffer, 0xffff); + unpack_ExpenseAppInfo(tai, pi_buf->data, 0xffff); #ifdef EC_DEBUG fprintf(stderr, "Orig length %d, new length %d, orig data:\n", ret, i); @@ -323,7 +324,7 @@ struct Expense t; int attr, category, len; - len = dlp_ReadRecordByIndex(dbi->pilot_socket, dbHandle, i, buffer, 0, 0, &attr, &category); + len = dlp_ReadRecordByIndex(dbi->pilot_socket, dbHandle, i, pi_buf, 0, &attr, &category); /* at the end of all the records? */ if(len < 0) @@ -332,7 +333,7 @@ if((attr & dlpRecAttrDeleted) || (attr & dlpRecAttrArchived)) continue; - unpack_Expense(&t, buffer, len); + unpack_Expense(&t, pi_buf->data, len); writeout_record(filehandle[category], &t, c); free_Expense(&t); } @@ -348,6 +349,10 @@ /* Close the database */ dlp_CloseDB(dbi->pilot_socket, dbHandle); + + if (pi_buf) { + pi_buffer_free (pi_buf); + } return( result ); } --- gnome-pilot-conduits-2.0.13/email/email_conduit.c.port-to-pilot-link-0.12 2003-01-26 17:29:20.000000000 -0500 +++ gnome-pilot-conduits-2.0.13/email/email_conduit.c 2006-01-11 22:55:22.000000000 -0500 @@ -301,7 +301,7 @@ static gint synchronize( GnomePilotConduit *c, GnomePilotDBInfo *dbi ) { int dbHandle; - guchar buffer[0xffff]; + pi_buffer_t *pi_buf; struct MailAppInfo tai; struct MailSyncPref pref; struct MailSignaturePref sig; @@ -319,9 +319,11 @@ fprintf( stderr, "Unable to open mail database\n" ); return( -1 ); } + + pi_buf = pi_buffer_new (0xffff); - dlp_ReadAppBlock( dbi->pilot_socket, dbHandle, 0, buffer, 0xffff ); - unpack_MailAppInfo( &tai, buffer, 0xffff ); + dlp_ReadAppBlock( dbi->pilot_socket, dbHandle, 0, 0xffff, pi_buf); + unpack_MailAppInfo( &tai, pi_buf->data, 0xffff ); pref.syncType = 0; pref.getHigh = 0; @@ -333,33 +335,32 @@ if ( pi_version( dbi->pilot_socket ) > 0x0100 ) { if ( dlp_ReadAppPreference( dbi->pilot_socket, makelong("mail"), 1, 1, - 0xffff, buffer, 0, 0 ) >= 0 ) { - unpack_MailSyncPref( &pref, buffer, 0xffff ); + 0xffff, pi_buf, 0, 0 ) >= 0 ) { + unpack_MailSyncPref( &pref, pi_buf->data, 0xffff ); } else { if ( dlp_ReadAppPreference( dbi->pilot_socket, makelong("mail"), 1, - 1, 0xffff, buffer, 0, 0 ) >= 0 ) { - unpack_MailSyncPref( &pref, buffer, 0xffff ); + 1, 0xffff, pi_buf, 0, 0 ) >= 0 ) { + unpack_MailSyncPref( &pref, pi_buf->data, 0xffff ); } else { LOG("Couldn't get any mail preferences.\n",0); } } if ( dlp_ReadAppPreference( dbi->pilot_socket, makelong("mail"), 3, 1, - 0xffff, buffer, 0, 0 ) > 0 ) { - unpack_MailSignaturePref( &sig, buffer, 0xffff ); + 0xffff, pi_buf->data, 0, 0 ) > 0 ) { + unpack_MailSignaturePref( &sig, pi_buf->data, 0xffff ); } } for ( i = 0; ; i++ ) { struct Mail t; int attr; - int size; recordid_t recID; int length; FILE * sendf; length = dlp_ReadNextRecInCategory( dbi->pilot_socket, dbHandle, 1, - buffer, &recID, 0, &size, &attr ); + pi_buf, &recID, 0, &attr ); if ( length < 0 ) { break; @@ -369,7 +370,7 @@ continue; } - unpack_Mail( &t, buffer, length ); + unpack_Mail( &t, pi_buf->data, length ); sendf = popen( GET_CONFIG(c)->sendmail, "w" ); if ( sendf == NULL ) { @@ -451,7 +452,7 @@ } else if ( !strcmp( GET_CONFIG(c)->sendAction, "file" ) ) { dlp_WriteRecord( dbi->pilot_socket, dbHandle, attr, recID, 3, - buffer, size, 0); + pi_buf->data, pi_buf->used, 0); } free_Mail( &t ); } @@ -463,13 +464,13 @@ if ( strcmp( GET_CONFIG(c)->receiveAction, "copy" ) == 0 || strcmp( GET_CONFIG(c)->receiveAction, "mirror" ) == 0 ) { for ( i = 0; ; i++ ) { - int attr, length, size; + int attr, length; recordid_t recID; MailDBRecord *record; /* iterate through records in category 0 (Inbox) ... */ length = dlp_ReadNextRecInCategory( dbi->pilot_socket, dbHandle, 0, - buffer, &recID, 0, &size, &attr); + pi_buf, &recID, 0, &attr); if ( length < 0 ) { break; } @@ -479,7 +480,7 @@ record->recID = recID; record->size = length; record->buffer = ((guchar *) record) + sizeof(*record); - memcpy(record->buffer, buffer, length); + memcpy(record->buffer, pi_buf->data, length); inbox_list = g_list_append(inbox_list, record); LOG("storing record %d", recID); } @@ -523,19 +524,19 @@ #endif len = 0; - while ( ( len < sizeof(buffer) ) && - ( ( l = read( mhmsg, (char *)(buffer+len), - sizeof(buffer)-len ) ) > 0 ) ) { + while ( ( len < pi_buf->allocated ) && + ( ( l = read( mhmsg, (char *)(pi_buf->data+len), + pi_buf->allocated-len ) ) > 0 ) ) { len += l; } - buffer[len] = 0; + pi_buf->data[len] = 0; if ( l < 0 ) { fprintf( stderr, "Error processing message %d\n", i ); break; } - if (write_message_to_pilot (c, dbi, dbHandle, buffer, i)) { + if (write_message_to_pilot (c, dbi, dbHandle, pi_buf->data, i)) { rec++; if ( strcmp( GET_CONFIG(c)->receiveAction, "delete" ) == 0 ) { char filename[1000]; @@ -563,9 +564,9 @@ if (f) { - fgets (buffer, sizeof (buffer) - 1, f); - while (!feof (f) && strncmp (buffer, "From ", 5)) { - fgets (buffer, sizeof (buffer) - 1, f); + fgets (pi_buf->data, pi_buf->allocated - 1, f); + while (!feof (f) && strncmp (pi_buf->data, "From ", 5)) { + fgets (pi_buf->data, pi_buf->allocated - 1, f); } for( i = 1; !feof (f); i++ ) { int len; @@ -573,9 +574,9 @@ LOG( "Processing message %d", i ); len = 0; - while ( ( len < sizeof(buffer) ) && - ( ( p = fgets ( (char *)(buffer+len), - sizeof(buffer)-len, f ) ) != 0 ) ) { + while ( ( len < pi_buf->allocated ) && + ( ( p = fgets ( (char *)(pi_buf->data+len), + pi_buf->allocated-len, f ) ) != 0 ) ) { if (!strncmp (p, "From ", 5)) { break; } else { @@ -583,7 +584,7 @@ } } - buffer[len] = 0; + pi_buf->data[len] = 0; len = 0; if ( len < 0 ) { @@ -591,7 +592,7 @@ break; } - write_message_to_pilot (c, dbi, dbHandle, buffer, i); + write_message_to_pilot (c, dbi, dbHandle, pi_buf->data, i); } fclose (f); if ( strcmp( GET_CONFIG(c)->receiveAction, "delete" ) == 0 ) { @@ -621,6 +622,8 @@ dlp_ResetLastSyncPC( dbi->pilot_socket ); dlp_CloseDB( dbi->pilot_socket, dbHandle ); + pi_buffer_free (pi_buf); + return( 0 ); } --- gnome-pilot-conduits-2.0.13/memo_file/memo_file_conduit.c.port-to-pilot-link-0.12 2004-08-04 13:42:27.000000000 -0400 +++ gnome-pilot-conduits-2.0.13/memo_file/memo_file_conduit.c 2006-01-11 22:45:22.000000000 -0500 @@ -868,7 +868,7 @@ pre_sync (GnomePilotConduit *c, GnomePilotDBInfo *dbi) { int l; - unsigned char *buf; + pi_buffer_t *pi_buf; g_message ("MemoFile Conduit v %s", CONDUIT_VERSION); @@ -876,14 +876,14 @@ GET_CONDUIT_DATA (c)->dbi=dbi; - buf = (unsigned char*)g_malloc (0xffff); - if ((l=dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,(unsigned char *)buf, 0xffff))<0) { + pi_buf = pi_buffer_new (0xffff); + if ((l=dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0,0xffff, pi_buf))<0) { LOG ("dlp_ReadAppBlock (...) failed"); - g_free (buf); + pi_buffer_free (pi_buf); return -1; } - unpack_MemoAppInfo (&(GET_CONDUIT_DATA (c)->ai), buf, l); - g_free (buf); + unpack_MemoAppInfo (&(GET_CONDUIT_DATA (c)->ai), pi_buf->data, l); + pi_buffer_free (pi_buf); if (GET_CONDUIT_CFG (c)->dir==NULL || *(GET_CONDUIT_CFG (c)->dir) == '\0') { return -1; Index: gnome-pilot-conduits.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-pilot-conduits/devel/gnome-pilot-conduits.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gnome-pilot-conduits.spec 9 Dec 2005 22:40:41 -0000 1.13 +++ gnome-pilot-conduits.spec 12 Jan 2006 04:01:25 -0000 1.14 @@ -5,12 +5,12 @@ Summary: Additional conduits for gnome-pilot Name: gnome-pilot-conduits Version: 2.0.13 -Release: 2.FC5.1 +Release: 3.FC5 License: LGPL Group: Applications/Communications Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/2.0/%{name}-%{version}.tar.bz2 Patch0: gnome-pilot-conduits-2.0.10-lib64.patch -Patch2: gnome-pilot-conduits-2.0.12-port-to-pilot-link-0.12.patch +Patch2: gnome-pilot-conduits-2.0.13-port-to-pilot-link-0.12.patch BuildRoot: %{_tmppath}/%{name}-%{version} Prereq: /sbin/install-info Requires: gnome-pilot >= %{gnome_pilot_version} @@ -63,6 +63,12 @@ %{_libdir}/gnome-pilot/conduits/*.so %changelog +* Wed Jan 11 2006 David Malcolm - 2.0.13-3.FC5 +- extend patch 2 to handle a missing fix in the email conduit, renaming it from + gnome-pilot-conduits-2.0.12-port-to-pilot-link-0.12.patch to + gnome-pilot-conduits-2.0.13-port-to-pilot-link-0.12.patch in the process + (#159165) + * Fri Dec 09 2005 Jesse Keating - rebuilt --- gnome-pilot-conduits-2.0.12-port-to-pilot-link-0.12.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 12 04:13:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 23:13:34 -0500 Subject: rpms/hal/devel .cvsignore, 1.35, 1.36 hal.spec, 1.74, 1.75 sources, 1.36, 1.37 hal-fix-mount-options.patch, 1.1, NONE Message-ID: <200601120413.k0C4DYoF022350@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22330 Modified Files: .cvsignore hal.spec sources Removed Files: hal-fix-mount-options.patch Log Message: * Wed Jan 11 2006 Christopher Aillon - 0.5.5.1.cvs20060111-1 - Update to an even newer CVS snapshot, to fix privelege escalation issue - Remove mount options patch (upstreamed already) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 9 Jan 2006 16:59:13 -0000 1.35 +++ .cvsignore 12 Jan 2006 04:13:31 -0000 1.36 @@ -23,3 +23,4 @@ hal-0.5.5.1.tar.gz hal-0.5.5.1.cvs20060105.tar.gz hal-0.5.5.1.cvs20060109.tar.gz +hal-0.5.5.1.cvs20060111.tar.gz Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- hal.spec 10 Jan 2006 00:32:49 -0000 1.74 +++ hal.spec 12 Jan 2006 04:13:31 -0000 1.75 @@ -17,12 +17,11 @@ Summary: Hardware Abstraction Layer Name: hal -Version: 0.5.5.1.cvs20060109 -Release: 2 +Version: 0.5.5.1.cvs20060111 +Release: 1 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz Patch0: hal-0.5.4-match-on-capabilities.patch -Patch1: hal-fix-mount-options.patch License: AFL/GPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root @@ -82,7 +81,6 @@ %prep %setup -q %patch0 -p1 -b .match-on-capabilities -%patch1 -p0 -b .mount-options %build %configure --disable-docbook-docs --with-os-type=redhat --enable-pcmcia-support --with-stab-file=/var/lib/pcmcia/stab @@ -171,6 +169,10 @@ %{_bindir}/hal-device-manager %changelog +* Wed Jan 11 2006 Christopher Aillon - 0.5.5.1.cvs20060111-1 +- Update to an even newer CVS snapshot, to fix privelege escalation issue +- Remove mount options patch (upstreamed already) + * Mon Jan 09 2006 John (J5) Palmieri - 0.5.5.1.cvs20060109-2 - Add patch to escape mount options Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 9 Jan 2006 16:59:13 -0000 1.36 +++ sources 12 Jan 2006 04:13:31 -0000 1.37 @@ -1 +1 @@ -a65bc4e3304831765a2eb8854086d465 hal-0.5.5.1.cvs20060109.tar.gz +5c124f3b0459da726c977ba65daaaab9 hal-0.5.5.1.cvs20060111.tar.gz --- hal-fix-mount-options.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 12 04:16:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 23:16:48 -0500 Subject: rpms/kernel/FC-4/configs config-generic, 1.44, 1.44.6.1 config-x86-generic, 1.16, 1.16.4.1 config-x86_64-generic, 1.14, 1.14.10.1 Message-ID: <200601120416.k0C4Gmhb028647@cvs.devel.redhat.com> Author: linville Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv24414/configs Modified Files: Tag: private-linville-netdev-fc4-8-branch config-generic config-x86-generic config-x86_64-generic Log Message: Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.44 retrieving revision 1.44.6.1 diff -u -r1.44 -r1.44.6.1 --- config-generic 14 Dec 2005 02:22:28 -0000 1.44 +++ config-generic 12 Jan 2006 04:16:45 -0000 1.44.6.1 @@ -726,6 +726,7 @@ CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_POLICY=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_NETBIOS_NS=m CONFIG_IP_NF_PPTP=m @@ -749,6 +750,7 @@ CONFIG_IP6_NF_MATCH_LENGTH=m CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_PHYSDEV=m +CONFIG_IP6_NF_MATCH_POLICY=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m @@ -1035,6 +1037,7 @@ CONFIG_R8169_VLAN=y CONFIG_SK98LIN=m CONFIG_SKGE=m +CONFIG_SKY2=m CONFIG_TIGON3=m # @@ -1058,6 +1061,7 @@ CONFIG_PPP_ASYNC=m CONFIG_PPP_SYNC_TTY=m CONFIG_PPP_DEFLATE=m +CONFIG_PPP_MPPE=m CONFIG_IPPP_FILTER=y # CONFIG_PPP_BSDCOMP is not set CONFIG_PPPOE=m @@ -1093,11 +1097,14 @@ CONFIG_IEEE80211_CRYPT_WEP=m CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +CONFIG_IEEE80211_SOFTMAC_DEBUG=y # CONFIG_IPW2100 is not set -# CONFIG_IPW_DEBUG is not set +# CONFIG_IPW2100_DEBUG is not set # CONFIG_IPW2100_PROMISC is not set # CONFIG_IPW2100_LEGACY_FW_LOAD is not set # CONFIG_IPW2200 is not set +# CONFIG_IPW2200_DEBUG is not set CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1107,6 +1114,7 @@ CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m CONFIG_PRISM54=m +CONFIG_BCM43XX=m # # Wireless 802.11b Pcmcia/Cardbus cards support Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.16 retrieving revision 1.16.4.1 diff -u -r1.16 -r1.16.4.1 --- config-x86-generic 2 Jan 2006 02:02:31 -0000 1.16 +++ config-x86-generic 12 Jan 2006 04:16:46 -0000 1.16.4.1 @@ -238,11 +238,12 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IPW2100=m -# CONFIG_IPW_DEBUG is not set +CONFIG_IPW2100_DEBUG=y CONFIG_IPW2100_PROMISC=y # CONFIG_IPW2100_LEGACY_FW_LOAD is not set CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m +CONFIG_IPW2200_DEBUG=y CONFIG_BLK_DEV_AMD74XX=y Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86_64-generic,v retrieving revision 1.14 retrieving revision 1.14.10.1 diff -u -r1.14 -r1.14.10.1 --- config-x86_64-generic 6 Dec 2005 23:34:14 -0000 1.14 +++ config-x86_64-generic 12 Jan 2006 04:16:46 -0000 1.14.10.1 @@ -108,11 +108,12 @@ CONFIG_IEEE80211_CRYPT_CCMP=m CONFIG_IEEE80211_CRYPT_TKIP=m CONFIG_IPW2100=m -# CONFIG_IPW_DEBUG is not set +CONFIG_IPW2100_DEBUG=y CONFIG_IPW2100_PROMISC=y # CONFIG_IPW2100_LEGACY_FW_LOAD is not set CONFIG_IPW2100_MONITOR=y CONFIG_IPW2200=m +CONFIG_IPW2200_DEBUG=y CONFIG_PNP=y CONFIG_PNPACPI=y From fedora-cvs-commits at redhat.com Thu Jan 12 04:18:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 23:18:49 -0500 Subject: rpms/gnome-mount/devel .cvsignore, 1.2, 1.3 gnome-mount.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200601120418.k0C4InKh001472@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/gnome-mount/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1459 Modified Files: .cvsignore gnome-mount.spec sources Log Message: * Wed Jan 11 2006 Christopher Aillon - 0.3-1 - Update to 0.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-mount/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jan 2006 17:07:24 -0000 1.2 +++ .cvsignore 12 Jan 2006 04:18:45 -0000 1.3 @@ -1 +1,2 @@ gnome-mount-0.2.tar.gz +gnome-mount-0.3.tar.gz Index: gnome-mount.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gnome-mount.spec 9 Jan 2006 17:07:24 -0000 1.1 +++ gnome-mount.spec 12 Jan 2006 04:18:45 -0000 1.2 @@ -1,6 +1,6 @@ Summary: Mount replacement which uses HAL to do the mounting Name: gnome-mount -Version: 0.2 +Version: 0.3 Release: 1 License: GPL Group: Applications/System @@ -41,5 +41,8 @@ %changelog +* Wed Jan 11 2006 Christopher Aillon - 0.3-1 +- Update to 0.3 + * Mon Jan 09 2006 John (J5) Palmieri - 0.2-1 - initial import Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-mount/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jan 2006 17:07:24 -0000 1.2 +++ sources 12 Jan 2006 04:18:45 -0000 1.3 @@ -1 +1 @@ -1f9c8338d1370814564eef2553a8db59 gnome-mount-0.2.tar.gz +2bf5649b21e98378c49e44bbd42bf89d gnome-mount-0.3.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 12 04:46:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 11 Jan 2006 23:46:36 -0500 Subject: rpms/libnotify/devel libnotify.spec,1.3,1.4 Message-ID: <200601120446.k0C4kaUK022297@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/libnotify/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22060 Modified Files: libnotify.spec Log Message: * Wed Jan 11 2006 Christopher Aillon - 0.3.0-3 - Let there be libnotify-devel... Index: libnotify.spec =================================================================== RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libnotify.spec 15 Dec 2005 00:12:47 -0000 1.3 +++ libnotify.spec 12 Jan 2006 04:46:30 -0000 1.4 @@ -3,7 +3,7 @@ Summary: libnotify notification library Name: libnotify Version: 0.3.0 -Release: 2 +Release: 3 URL: http://www.galago-project.org/specs/notification/ Source0: %{name}-%{version}.tar.gz License: LGPL @@ -18,24 +18,35 @@ libnotify is an implementation of the freedesktop.org desktop notification specification. +%package devel +Summary: Files for development using %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: glib2-devel >= %{glib2_version} + +%description devel + +This package contains the headers and pkg-config file for +development of programs using %{name}. + %prep %setup -q %build -%configure -make +%configure +%{__make} %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT %makeinstall -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.a %clean -rm -rf %{buildroot} +%{__rm} -rf $RPM_BUILD_ROOT %post /sbin/ldconfig @@ -48,11 +59,18 @@ %doc COPYING ChangeLog NEWS %{_bindir}/notify-send -%{_includedir}/* %{_libdir}/lib*.so* + +%files devel +%defattr(-,root,root) +%{_includedir}/* %{_libdir}/pkgconfig/libnotify.pc + %changelog +* Wed Jan 11 2006 Christopher Aillon - 0.3.0-3 +- Let there be libnotify-devel... + * Tue Nov 15 2005 John (J5) Palmieri - 0.3.0-2 - Actual release of the 0.3.x series From fedora-cvs-commits at redhat.com Thu Jan 12 05:04:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 00:04:19 -0500 Subject: rpms/evolution/devel evolution.spec,1.111,1.112 Message-ID: <200601120504.k0C54IBv001293@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1254 Modified Files: evolution.spec Log Message: * Thu Jan 12 2006 Christopher Aillon - 2.5.4-5 - Update BR to libnotify-devel Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- evolution.spec 11 Jan 2006 22:14:37 -0000 1.111 +++ evolution.spec 12 Jan 2006 05:03:59 -0000 1.112 @@ -33,7 +33,7 @@ Name: evolution Version: 2.5.4 -Release: 4 +Release: 5 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -177,8 +177,7 @@ %endif %if %{libnotify_support} -BuildRequires: libnotify -#ought to eventually be libnotify-devel, see bug 177484 +BuildRequires: libnotify-devel %endif %description @@ -512,6 +511,9 @@ %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Thu Jan 12 2006 Christopher Aillon - 2.5.4-5 +- Update BR to libnotify-devel + * Wed Jan 11 2006 David Malcolm - 2.5.4-4 - ported alarm notification code to the new libnotify API (patch 806, #177546) - added libnotify_support macro From fedora-cvs-commits at redhat.com Thu Jan 12 06:53:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 01:53:08 -0500 Subject: rpms/findutils/devel findutils-selinux.patch, 1.10, 1.11 findutils.spec, 1.39, 1.40 findutils-arg_max.patch, 1.2, NONE Message-ID: <200601120653.k0C6r8LG027428@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/findutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27414 Modified Files: findutils-selinux.patch findutils.spec Removed Files: findutils-arg_max.patch Log Message: * Thu Jan 12 2006 Miloslav Trmac - 1:4.2.27-2 - Don't use uninitialized memory in -printf %%Z (#174485) - Ship more documentation files - Clean up the spec file a bit findutils-selinux.patch: Makefile.am | 3 + defs.h | 14 +++++++ find.1 | 5 ++ find.c | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- parser.c | 43 +++++++++++++++++++++++ pred.c | 59 +++++++++++++++++++++++++++++++- util.c | 3 + 7 files changed, 233 insertions(+), 3 deletions(-) Index: findutils-selinux.patch =================================================================== RCS file: /cvs/dist/rpms/findutils/devel/findutils-selinux.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- findutils-selinux.patch 11 Oct 2005 21:41:28 -0000 1.10 +++ findutils-selinux.patch 12 Jan 2006 06:53:05 -0000 1.11 @@ -1,18 +1,5 @@ ---- findutils-4.2.25/find/Makefile.am.selinux 2005-07-03 12:07:16.000000000 -0400 -+++ findutils-4.2.25/find/Makefile.am 2005-10-11 17:03:51.000000000 -0400 -@@ -5,8 +5,9 @@ - # regexprops_SOURCES = regexprops.c - find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c - EXTRA_DIST = defs.h $(man_MANS) -+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX - INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\" --LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -+LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -lselinux - man_MANS = find.1 - SUBDIRS = testsuite - ---- findutils-4.2.25/find/parser.c.selinux 2005-07-31 17:01:54.000000000 -0400 -+++ findutils-4.2.25/find/parser.c 2005-10-11 17:38:06.000000000 -0400 +--- findutils-4.2.27/find/parser.c.selinux 2005-12-04 03:07:52.000000000 +0100 ++++ findutils-4.2.27/find/parser.c 2006-01-12 07:36:36.000000000 +0100 @@ -47,6 +47,10 @@ /* We need for isatty(). */ #include @@ -54,7 +41,7 @@ puts (_("\ actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\ -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\ -@@ -1712,6 +1725,29 @@ +@@ -1727,6 +1740,29 @@ exit (0); } @@ -84,7 +71,7 @@ static boolean parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) { -@@ -1949,7 +1985,11 @@ +@@ -1964,7 +2000,11 @@ if (*scan2 == '.') for (scan2++; ISDIGIT (*scan2); scan2++) /* Do nothing. */ ; @@ -96,41 +83,76 @@ { segmentp = make_segment (segmentp, format, scan2 - format, (int) *scan2); ---- findutils-4.2.25/find/Makefile.in.selinux 2005-09-03 07:17:59.000000000 -0400 -+++ findutils-4.2.25/find/Makefile.in 2005-10-11 17:04:12.000000000 -0400 -@@ -175,7 +175,7 @@ - CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@ - CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@ - CYGPATH_W = @CYGPATH_W@ --DEFS = @DEFS@ -+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX - DEPDIR = @DEPDIR@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -270,7 +270,7 @@ +@@ -2046,6 +2086,9 @@ + case 'H': /* ARGV element file was found under */ + case 'p': /* pathname */ + case 'P': /* pathname with ARGV element stripped */ ++#ifdef WITH_SELINUX ++ case 'Z': /* SELinux security context */ ++#endif /* WITH_SELINUX */ + *fmt++ = 's'; + break; + +--- findutils-4.2.27/find/defs.h.selinux 2005-09-04 19:59:34.000000000 +0200 ++++ findutils-4.2.27/find/defs.h 2006-01-12 07:36:19.000000000 +0100 +@@ -131,6 +131,10 @@ + #define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW) + #define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX) + ++#ifdef WITH_SELINUX ++#include ++#endif /*WITH_SELINUX*/ ++ + #if 1 + #include + typedef bool boolean; +@@ -320,6 +324,9 @@ + struct dir_id fileid; /* samefile */ + mode_t type; /* type */ + FILE *stream; /* ls fls fprint0 */ ++#ifdef WITH_SELINUX ++ security_context_t scontext; /* scontext */ ++#endif /*WITH_SELINUX*/ + struct format_val printf_vec; /* printf fprintf fprint */ + } args; + +@@ -479,6 +486,9 @@ + boolean pred_used PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); + boolean pred_user PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); + boolean pred_xtype PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); ++#ifdef WITH_SELINUX ++boolean pred_scontext PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); ++#endif /* WITH_SELINUX */ + + + +@@ -568,6 +578,10 @@ + * can be changed with the positional option, -regextype. + */ + int regex_options; ++ ++#ifdef WITH_SELINUX ++ int (*x_getfilecon) (); ++#endif /* WITH_SELINUX */ + }; + extern struct options options; + +--- findutils-4.2.27/find/Makefile.am.selinux 2005-07-03 18:07:08.000000000 +0200 ++++ findutils-4.2.27/find/Makefile.am 2006-01-12 07:36:19.000000000 +0100 +@@ -5,8 +5,9 @@ # regexprops_SOURCES = regexprops.c find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c EXTRA_DIST = defs.h $(man_MANS) ++DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX + INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\" -LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ +LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -lselinux man_MANS = find.1 SUBDIRS = testsuite - all: all-recursive -@@ -286,9 +286,9 @@ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits find/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu find/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnits find/Makefile -+ $(AUTOMAKE) --gnu find/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ ---- findutils-4.2.25/find/find.1.selinux 2005-09-02 16:46:48.000000000 -0400 -+++ findutils-4.2.25/find/find.1 2005-10-11 17:03:51.000000000 -0400 -@@ -455,6 +455,9 @@ + +--- findutils-4.2.27/find/find.1.selinux 2005-12-05 18:05:02.000000000 +0100 ++++ findutils-4.2.27/find/find.1 2006-01-12 07:36:19.000000000 +0100 +@@ -483,6 +483,9 @@ link to a file of type \fIc\fR; if the \-L option has been given, true if \fIc\fR is `l'. In other words, for symbolic links, \-xtype checks the type of the file that \-type does not check. @@ -140,7 +162,7 @@ .SS ACTIONS .IP "\-delete\fR" -@@ -753,6 +756,8 @@ +@@ -785,6 +788,8 @@ File's type (like in ls \-l), U=unknown type (shouldn't happen) .IP %Y File's type (like %y), plus follow symlinks: L=loop, N=nonexistent @@ -149,8 +171,8 @@ .PP A `%' character followed by any other character is discarded (but the other character is printed). ---- findutils-4.2.25/find/find.c.selinux 2005-08-30 03:40:03.000000000 -0400 -+++ findutils-4.2.25/find/find.c 2005-10-11 17:14:28.000000000 -0400 +--- findutils-4.2.27/find/find.c.selinux 2005-11-11 08:41:37.000000000 +0100 ++++ findutils-4.2.27/find/find.c 2006-01-12 07:36:19.000000000 +0100 @@ -244,6 +244,93 @@ { return lstat(name, p); @@ -281,9 +303,9 @@ + int is_selinux_enabled_flag = is_selinux_enabled()>0; +#endif /* WITH_SELINUX */ int i; + const struct parser_table *entry_close, *entry_print, *entry_open; const struct parser_table *parse_entry; /* Pointer to the parsing table entry for this expression. */ - struct predicate *cur_pred; -@@ -537,6 +636,14 @@ +@@ -538,6 +637,14 @@ if (strchr ("-!(),", argv[i][0]) == NULL) usage (_("paths must precede expression")); predicate_name = argv[i]; @@ -298,7 +320,7 @@ parse_entry = find_parser (predicate_name); if (parse_entry == NULL) { -@@ -1802,7 +1909,7 @@ +@@ -1807,7 +1914,7 @@ static void process_dir (char *pathname, char *name, int pathlen, struct stat *statp, char *parent) { @@ -307,8 +329,20 @@ boolean subdirs_unreliable; /* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */ int idx; /* Which entry are we on? */ struct stat stat_buf; ---- findutils-4.2.25/find/pred.c.selinux 2005-09-01 16:57:49.000000000 -0400 -+++ findutils-4.2.25/find/pred.c 2005-10-11 17:03:51.000000000 -0400 +--- findutils-4.2.27/find/util.c.selinux 2005-07-01 23:45:18.000000000 +0200 ++++ findutils-4.2.27/find/util.c 2006-01-12 07:36:19.000000000 +0100 +@@ -78,6 +78,9 @@ + last_pred->need_stat = true; + last_pred->need_type = true; + last_pred->args.str = NULL; ++#ifdef WITH_SELINUX ++ last_pred->args.scontext = NULL; ++#endif + last_pred->pred_next = NULL; + last_pred->pred_left = NULL; + last_pred->pred_right = NULL; +--- findutils-4.2.27/find/pred.c.selinux 2005-11-30 07:17:15.000000000 +0100 ++++ findutils-4.2.27/find/pred.c 2006-01-12 07:36:28.000000000 +0100 @@ -38,6 +38,14 @@ #include "buildcmd.h" #include "yesno.h" @@ -342,7 +376,7 @@ {0, "none "} }; -@@ -903,6 +913,26 @@ +@@ -903,6 +913,25 @@ mode_to_filetype(stat_buf->st_mode & S_IFMT)); } break; @@ -359,7 +393,6 @@ + (void) fflush(stderr); + } + else { -+ segment->text[segment->text_len] = 's'; + (void) fprintf (fp, segment->text, scontext); + freecon(scontext); + } @@ -369,7 +402,7 @@ } } return true; -@@ -1480,6 +1510,34 @@ +@@ -1493,6 +1522,34 @@ */ return (pred_type (pathname, &sbuf, pred_ptr)); } @@ -404,59 +437,3 @@ /* 1) fork to get a child; parent remembers the child pid 2) child execs the command requested ---- findutils-4.2.25/find/util.c.selinux 2005-06-19 16:01:58.000000000 -0400 -+++ findutils-4.2.25/find/util.c 2005-10-11 17:03:51.000000000 -0400 -@@ -78,6 +78,9 @@ - last_pred->need_stat = true; - last_pred->need_type = true; - last_pred->args.str = NULL; -+#ifdef WITH_SELINUX -+ last_pred->args.scontext = NULL; -+#endif - last_pred->pred_next = NULL; - last_pred->pred_left = NULL; - last_pred->pred_right = NULL; ---- findutils-4.2.25/find/defs.h.selinux 2005-08-30 03:36:24.000000000 -0400 -+++ findutils-4.2.25/find/defs.h 2005-10-11 17:03:51.000000000 -0400 -@@ -131,6 +131,10 @@ - #define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW) - #define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX) - -+#ifdef WITH_SELINUX -+#include -+#endif /*WITH_SELINUX*/ -+ - #if 1 - #include - typedef bool boolean; -@@ -320,6 +324,9 @@ - struct dir_id fileid; /* samefile */ - mode_t type; /* type */ - FILE *stream; /* ls fls fprint0 */ -+#ifdef WITH_SELINUX -+ security_context_t scontext; /* scontext */ -+#endif /*WITH_SELINUX*/ - struct format_val printf_vec; /* printf fprintf fprint */ - } args; - -@@ -479,6 +486,9 @@ - boolean pred_used PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); - boolean pred_user PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); - boolean pred_xtype PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); -+#ifdef WITH_SELINUX -+boolean pred_scontext PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); -+#endif /* WITH_SELINUX */ - - - -@@ -568,6 +578,10 @@ - * can be changed with the positional option, -regextype. - */ - int regex_options; -+ -+#ifdef WITH_SELINUX -+ int (*x_getfilecon) (); -+#endif /* WITH_SELINUX */ - }; - extern struct options options; - Index: findutils.spec =================================================================== RCS file: /cvs/dist/rpms/findutils/devel/findutils.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- findutils.spec 9 Dec 2005 22:40:25 -0000 1.39 +++ findutils.spec 12 Jan 2006 06:53:05 -0000 1.40 @@ -1,11 +1,11 @@ -%define WITH_SELINUX 1 Summary: The GNU versions of find utilities (find and xargs). Name: findutils Version: 4.2.27 -Release: 1.1 +Release: 2 Epoch: 1 License: GPL Group: Applications/File +URL: http://www.gnu.org/software/findutils/ Source0: ftp://ftp.gnu.org/gnu/findutils/%{name}-%{version}.tar.gz Patch1: findutils-no-locate.patch Patch2: findutils-selinux.patch @@ -44,22 +44,7 @@ %install rm -rf %{buildroot} -%makeinstall - -( cd %{buildroot} - gzip -9fn .%{_infodir}/find.info* -) - -rm -f $RPM_BUILD_ROOT%{_bindir}/locate \ - $RPM_BUILD_ROOT%{_bindir}/updatedb \ - $RPM_BUILD_ROOT%{_libexecdir}/bigram \ - $RPM_BUILD_ROOT%{_libexecdir}/code \ - $RPM_BUILD_ROOT%{_libexecdir}/frcode \ - $RPM_BUILD_ROOT%{_mandir}/man1/locate.1* \ - $RPM_BUILD_ROOT%{_mandir}/man1/updatedb.1* \ - $RPM_BUILD_ROOT%{_mandir}/man5/locatedb.5* - -rm -f $RPM_BUILD_ROOT%{_infodir}/dir +make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} @@ -76,7 +61,7 @@ %files -f %{name}.lang %defattr(-,root,root) -%doc NEWS README +%doc AUTHORS COPYING NEWS README THANKS TODO %{_bindir}/find %{_bindir}/xargs %{_mandir}/man1/find.1* @@ -84,6 +69,11 @@ %{_infodir}/find.info* %changelog +* Thu Jan 12 2006 Miloslav Trmac - 1:4.2.27-2 +- Don't use uninitialized memory in -printf %%Z (#174485) +- Ship more documentation files +- Clean up the spec file a bit + * Fri Dec 09 2005 Jesse Keating - rebuilt --- findutils-arg_max.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 12 07:02:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 02:02:43 -0500 Subject: rpms/findutils/devel findutils.spec,1.40,1.41 Message-ID: <200601120702.k0C72hNJ005725@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/findutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5677 Modified Files: findutils.spec Log Message: Undo overzealous cleanup Index: findutils.spec =================================================================== RCS file: /cvs/dist/rpms/findutils/devel/findutils.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- findutils.spec 12 Jan 2006 06:53:05 -0000 1.40 +++ findutils.spec 12 Jan 2006 07:02:32 -0000 1.41 @@ -59,6 +59,8 @@ %clean rm -rf %{buildroot} +rm -f $RPM_BUILD_ROOT%{_infodir}/dir + %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS COPYING NEWS README THANKS TODO From fedora-cvs-commits at redhat.com Thu Jan 12 07:10:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 02:10:16 -0500 Subject: rpms/findutils/devel findutils.spec,1.41,1.42 Message-ID: <200601120710.k0C7AGur007357@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/findutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7214 Modified Files: findutils.spec Log Message: Fix overzealous cleanup, take 2 Index: findutils.spec =================================================================== RCS file: /cvs/dist/rpms/findutils/devel/findutils.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- findutils.spec 12 Jan 2006 07:02:32 -0000 1.41 +++ findutils.spec 12 Jan 2006 07:10:14 -0000 1.42 @@ -46,6 +46,8 @@ rm -rf %{buildroot} make install DESTDIR=$RPM_BUILD_ROOT +rm -f $RPM_BUILD_ROOT%{_infodir}/dir + %find_lang %{name} %post @@ -59,8 +61,6 @@ %clean rm -rf %{buildroot} -rm -f $RPM_BUILD_ROOT%{_infodir}/dir - %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS COPYING NEWS README THANKS TODO From fedora-cvs-commits at redhat.com Thu Jan 12 07:33:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 02:33:25 -0500 Subject: rpms/gnome-session/devel gnome-session-2.12.0-shaped.patch, 1.2, 1.3 gnome-session.spec, 1.45, 1.46 Message-ID: <200601120733.k0C7XOK2026375@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26314 Modified Files: gnome-session-2.12.0-shaped.patch gnome-session.spec Log Message: - Fix screen corruption around splash screen shape (bug 177502) gnome-session-2.12.0-shaped.patch: splash-widget.c | 62 +++++++++++++++++++++++++------------------------------- splash-widget.h | 7 ++---- 2 files changed, 31 insertions(+), 38 deletions(-) Index: gnome-session-2.12.0-shaped.patch =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session-2.12.0-shaped.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-session-2.12.0-shaped.patch 20 Dec 2005 21:30:22 -0000 1.2 +++ gnome-session-2.12.0-shaped.patch 12 Jan 2006 07:33:16 -0000 1.3 @@ -1,100 +1,14 @@ ---- gnome-session-2.12.0/gnome-session/splash-widget.c.shaped 2005-12-20 15:45:53.000000000 -0500 -+++ gnome-session-2.12.0/gnome-session/splash-widget.c 2005-12-20 16:23:55.000000000 -0500 -@@ -138,7 +138,7 @@ - return FALSE; - - if (gdk_rectangle_intersect ( -- &event->area, &sw->image_bounds, &exposed)) -+ &event->area, &sw->image_bounds, &exposed)) { - gdk_draw_drawable ( - GDK_DRAWABLE (widget->window), - widget->style->black_gc, -@@ -147,6 +147,15 @@ - exposed.x, exposed.y, - exposed.width, exposed.height); - -+ if (sw->bg_mask) -+ gdk_window_shape_combine_mask ( -+ widget->window, -+ sw->bg_mask, -+ 0, -+ 0); -+ -+ } -+ - for (l = sw->icons; l; l = l->next) { - SplashIcon *si = l->data; - -@@ -228,7 +237,9 @@ - - if (sw->background && widget->window) { - int width, height; -- -+ GdkPixmap *mask; -+ mask = NULL; -+ - width = gdk_pixbuf_get_width (sw->background); - height = gdk_pixbuf_get_height (sw->background); - -@@ -237,6 +248,11 @@ - width, height, - gdk_drawable_get_visual (widget->window)->depth); - -+ mask = gdk_pixmap_new ( -+ widget->window, -+ width, height, -+ 1); -+ - if (pm) { - gdk_pixbuf_render_to_drawable ( - sw->background, GDK_DRAWABLE (pm), -@@ -247,6 +263,22 @@ - - gdk_window_set_back_pixmap ( - widget->window, pm, FALSE); -+ -+ if (mask) { -+ gdk_pixbuf_render_threshold_alpha ( -+ sw->background, (GdkBitmap *) mask, -+ 0, 0, 0, 0, width, height, -+ 125); -+ -+ gdk_window_shape_combine_mask ( -+ widget->window, -+ (GdkBitmap *) mask, -+ 0, -+ 0); -+ -+ } -+ -+ sw->bg_mask = (GdkBitmap *) mask; - sw->bg_pixmap = pm; - } - } -@@ -262,6 +294,12 @@ - sw->bg_pixmap = NULL; - } - -+ if (sw->bg_mask) { -+ g_object_unref (sw->bg_mask); -+ sw->bg_mask = NULL; -+ } -+ -+ - GNOME_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget)); - } - ---- gnome-session-2.12.0/gnome-session/splash-widget.h.shaped 2005-12-20 16:10:05.000000000 -0500 -+++ gnome-session-2.12.0/gnome-session/splash-widget.h 2005-12-20 16:18:02.000000000 -0500 -@@ -37,6 +37,7 @@ +--- gnome-session-2.12.0/gnome-session/splash-widget.h.shaped 2005-08-08 03:35:13.000000000 -0400 ++++ gnome-session-2.12.0/gnome-session/splash-widget.h 2006-01-12 02:19:59.000000000 -0500 +@@ -36,7 +36,6 @@ + GnomeIconTheme *icon_theme; GdkPixbuf *background; - GdkPixmap *bg_pixmap; -+ GdkBitmap *bg_mask; +- GdkPixmap *bg_pixmap; GList *icons; PangoLayout *layout; PangoAttribute *font_size_attr; -@@ -66,13 +67,13 @@ +@@ -66,13 +65,13 @@ #define SPLASH_BASE_HEIGHT 220 /* offset from bottom of label & font */ @@ -111,3 +25,96 @@ #define SPLASH_BASE_ICON_SIZE 36 #define SPLASH_BASE_ICON_ROWS 1 +--- gnome-session-2.12.0/gnome-session/splash-widget.c.shaped 2006-01-12 02:19:59.000000000 -0500 ++++ gnome-session-2.12.0/gnome-session/splash-widget.c 2006-01-12 02:22:28.000000000 -0500 +@@ -137,16 +137,6 @@ + if (!GTK_WIDGET_DRAWABLE (widget)) + return FALSE; + +- if (gdk_rectangle_intersect ( +- &event->area, &sw->image_bounds, &exposed)) +- gdk_draw_drawable ( +- GDK_DRAWABLE (widget->window), +- widget->style->black_gc, +- GDK_DRAWABLE (sw->bg_pixmap), +- exposed.x, exposed.y, +- exposed.x, exposed.y, +- exposed.width, exposed.height); +- + for (l = sw->icons; l; l = l->next) { + SplashIcon *si = l->data; + +@@ -221,33 +211,42 @@ + static void + splash_widget_realize (GtkWidget *widget) + { +- GdkPixmap *pm; + SplashWidget *sw = (SplashWidget *) widget; + + GNOME_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget)); + + if (sw->background && widget->window) { +- int width, height; ++ GdkPixmap *pixmap; ++ GdkBitmap *mask; ++ GdkColormap *colormap; + +- width = gdk_pixbuf_get_width (sw->background); +- height = gdk_pixbuf_get_height (sw->background); ++ pixmap = NULL; ++ mask = NULL; + +- pm = gdk_pixmap_new ( +- widget->window, +- width, height, +- gdk_drawable_get_visual (widget->window)->depth); ++ colormap = gtk_widget_get_colormap (widget); ++ gdk_pixbuf_render_pixmap_and_mask_for_colormap (sw->background, ++ colormap, ++ &pixmap, &mask, ++ 125); + +- if (pm) { +- gdk_pixbuf_render_to_drawable ( +- sw->background, GDK_DRAWABLE (pm), +- widget->style->black_gc, +- 0, 0, 0, 0, width, height, +- GDK_RGB_DITHER_MAX, +- 0, 0); +- +- gdk_window_set_back_pixmap ( +- widget->window, pm, FALSE); +- sw->bg_pixmap = pm; ++ if (pixmap) { ++ GtkStyle *style; ++ ++ style = gtk_style_copy (widget->style); ++ style->bg_pixmap[GTK_STATE_NORMAL] = pixmap; ++ ++ gtk_widget_set_style (widget, style); ++ g_object_unref (style); ++ ++ if (mask) { ++ gdk_window_shape_combine_mask (widget->window, ++ mask, 0, 0); ++ ++ g_object_unref (mask); ++ } ++ ++ gtk_style_set_background (widget->style, widget->window, ++ GTK_STATE_NORMAL); + } + } + } +@@ -257,11 +256,6 @@ + { + SplashWidget *sw = (SplashWidget *) widget; + +- if (sw->bg_pixmap) { +- g_object_unref (sw->bg_pixmap); +- sw->bg_pixmap = NULL; +- } +- + GNOME_CALL_PARENT (GTK_WIDGET_CLASS, unrealize, (widget)); + } + Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gnome-session.spec 20 Dec 2005 21:39:11 -0000 1.45 +++ gnome-session.spec 12 Jan 2006 07:33:16 -0000 1.46 @@ -13,7 +13,7 @@ Summary: GNOME session manager Name: gnome-session Version: 2.12.0 -Release: 5 +Release: 6 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -148,6 +148,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Thu Jan 12 2005 Ray Strode - 2.12.0-6 +- Fix screen corruption around splash screen shape (bug 177502) + * Tue Dec 20 2005 John (J5) Palmieri - 2.12.0-5 - Handle shaped window for splash screen From fedora-cvs-commits at redhat.com Thu Jan 12 07:34:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 02:34:44 -0500 Subject: rpms/gnome-session/devel gnome-session.spec,1.46,1.47 Message-ID: <200601120734.k0C7YiJj026657@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26589 Modified Files: gnome-session.spec Log Message: - Fix screen corruption around splash screen shape (bug 177502) Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gnome-session.spec 12 Jan 2006 07:33:16 -0000 1.46 +++ gnome-session.spec 12 Jan 2006 07:34:40 -0000 1.47 @@ -148,7 +148,7 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog -* Thu Jan 12 2005 Ray Strode - 2.12.0-6 +* Thu Jan 12 2006 Ray Strode - 2.12.0-6 - Fix screen corruption around splash screen shape (bug 177502) * Tue Dec 20 2005 John (J5) Palmieri - 2.12.0-5 From fedora-cvs-commits at redhat.com Thu Jan 12 08:57:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 03:57:19 -0500 Subject: rpms/thunderbird/devel .cvsignore, 1.8, 1.9 sources, 1.11, 1.12 thunderbird.spec, 1.59, 1.60 Message-ID: <200601120857.k0C8vJLG018559@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18522 Modified Files: .cvsignore sources thunderbird.spec Log Message: * Thu Jan 12 2006 Christopher Aillon - 1.5-1 - Official 1.5 release is out Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 5 Nov 2005 15:39:35 -0000 1.8 +++ .cvsignore 12 Jan 2006 08:57:15 -0000 1.9 @@ -6,3 +6,4 @@ thunderbird-1.5b1-source.tar.bz2 thunderbird-1.5b2-source.tar.bz2 thunderbird-1.5rc1-source.tar.bz2 +thunderbird-1.5-source.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 5 Nov 2005 15:39:35 -0000 1.11 +++ sources 12 Jan 2006 08:57:15 -0000 1.12 @@ -1 +1 @@ -0df70073cc6ac9f6772f82bc9e024543 thunderbird-1.5rc1-source.tar.bz2 +781c1cd1a01583d9b666d8c2fe4288e6 thunderbird-1.5-source.tar.bz2 Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- thunderbird.spec 12 Jan 2006 03:11:45 -0000 1.59 +++ thunderbird.spec 12 Jan 2006 08:57:15 -0000 1.60 @@ -3,12 +3,12 @@ %define nss_version 3.10 %define cairo_version 1.0 -%define official_branding 0 +%define official_branding 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 1.5 -Release: 0.5.6.rc1 +Release: 1 Epoch: 0 URL: http://www.mozilla.org/projects/thunderbird/ License: MPL @@ -187,6 +187,9 @@ #=============================================================================== %changelog +* Thu Jan 12 2006 Christopher Aillon - 1.5-1 +- Official 1.5 release is out + * Wed Jan 11 2006 Christopher Aillon - 1.5-0.5.6.rc1 - Fix crash when deleting highlighted text while composing mail within plaintext editor with spellcheck enabled. From fedora-cvs-commits at redhat.com Thu Jan 12 10:05:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 05:05:19 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-1.2.14-desktop.patch, NONE, 1.1 system-config-soundcard.spec, 1.21, 1.22 Message-ID: <200601121005.k0CA5JCb030405@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30348 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-1.2.14-desktop.patch Log Message: added patch for menu entries (#177479) system-config-soundcard-1.2.14-desktop.patch: Makefile | 6 +++++- system-config-soundcard.desktop.in | 9 +++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) --- NEW FILE system-config-soundcard-1.2.14-desktop.patch --- --- system-config-soundcard-1.2.14/Makefile.old 2004-07-30 14:37:07.000000000 +0200 +++ system-config-soundcard-1.2.14/Makefile 2006-01-12 10:45:06.000000000 +0100 @@ -20,7 +20,7 @@ subdirs: for d in $(SUBDIRS); do make -C $$d; [ $$? = 0 ] || exit 1; done -install: +install:${PKGNAME}.desktop mkdir -p $(INSTROOT)/usr/bin mkdir -p $(INSTROOT)$(PKGDATADIR) mkdir -p $(INSTROOT)$(PAMD_DIR) @@ -68,6 +68,10 @@ clean: @rm -fv *~ @rm -fv *.pyc + @rm -fv ${PKGNAME}.desktop + +%.desktop: %.desktop.in + @intltool-merge -d -u po/ $< $@ --- /dev/null 2006-01-12 10:50:22.000000000 +0100 +++ system-config-soundcard-1.2.14/system-config-soundcard.desktop.in 2006-01-12 10:36:08.000000000 +0100 @@ -0,0 +1,9 @@ +[Desktop Entry] +_Name=Soundcard Detection +_Comment=Auto-detect and configure soundcard +Icon=system-config-soundcard.png +Categories=Application;SystemSetup; +Exec=/usr/bin/system-config-soundcard +Type=Application +StartupNotify=true +Terminal=false Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- system-config-soundcard.spec 9 Dec 2005 22:43:29 -0000 1.21 +++ system-config-soundcard.spec 12 Jan 2006 10:04:59 -0000 1.22 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard Version: 1.2.14 -Release: 1.1 +Release: 2 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html License: GPL ExclusiveOS: Linux @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 +Patch1: system-config-soundcard-1.2.14-desktop.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -28,11 +29,14 @@ %prep %setup -q +%patch1 -p1 %build make %install +rm -f system-config-soundcard.desktop + make INSTROOT=$RPM_BUILD_ROOT install desktop-file-install --vendor system --delete-original \ @@ -79,6 +83,9 @@ %ghost /root/scsound.log %changelog +* Thu Jan 12 2005 Martin Stransky 1.2.14-2 +- added patch for menu entries (#177479) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 12 10:06:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 05:06:40 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard.spec, 1.22, 1.23 Message-ID: <200601121006.k0CA6eJC030747@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30722 Modified Files: system-config-soundcard.spec Log Message: 2006 Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- system-config-soundcard.spec 12 Jan 2006 10:04:59 -0000 1.22 +++ system-config-soundcard.spec 12 Jan 2006 10:06:37 -0000 1.23 @@ -83,7 +83,7 @@ %ghost /root/scsound.log %changelog -* Thu Jan 12 2005 Martin Stransky 1.2.14-2 +* Thu Jan 12 2006 Martin Stransky 1.2.14-2 - added patch for menu entries (#177479) * Fri Dec 09 2005 Jesse Keating From fedora-cvs-commits at redhat.com Thu Jan 12 10:32:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 05:32:40 -0500 Subject: rpms/bash/devel bash-sighandler.patch, 1.7, 1.8 bash.spec, 1.101, 1.102 Message-ID: <200601121032.k0CAWeNM017934@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17860 Modified Files: bash-sighandler.patch bash.spec Log Message: * Thu Jan 12 2006 Tim Waugh 3.1-4 - Fix sighandler patch bug (bug #177545). bash-sighandler.patch: builtins/read.def | 1 + execute_cmd.c | 1 + input.c | 2 ++ jobs.c | 2 ++ lib/readline/input.c | 7 +++++++ lib/sh/zread.c | 9 ++++++++- sig.c | 11 +++++++++-- sig.h | 11 +++++++++++ 8 files changed, 41 insertions(+), 3 deletions(-) Index: bash-sighandler.patch =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash-sighandler.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bash-sighandler.patch 2 Jan 2006 11:02:47 -0000 1.7 +++ bash-sighandler.patch 12 Jan 2006 10:32:27 -0000 1.8 @@ -1,5 +1,5 @@ --- bash-3.1/builtins/read.def.sighandler 2005-08-21 02:46:19.000000000 +0100 -+++ bash-3.1/builtins/read.def 2005-12-23 16:16:24.000000000 +0000 ++++ bash-3.1/builtins/read.def 2006-01-12 10:07:49.000000000 +0000 @@ -471,6 +471,7 @@ #if 1 if (retval < 0) @@ -9,7 +9,7 @@ return (EXECUTION_FAILURE); } --- bash-3.1/lib/readline/input.c.sighandler 2005-07-05 03:30:24.000000000 +0100 -+++ bash-3.1/lib/readline/input.c 2005-12-23 16:16:24.000000000 +0000 ++++ bash-3.1/lib/readline/input.c 2006-01-12 10:17:30.000000000 +0000 @@ -435,6 +435,10 @@ return (c); } @@ -21,48 +21,50 @@ int rl_getc (stream) FILE *stream; -@@ -458,6 +462,9 @@ - if (result == 0) - return (EOF); +@@ -450,6 +454,9 @@ + #endif + result = read (fileno (stream), &c, sizeof (unsigned char)); + if (need_termination_unwind_protect) + do_termination_unwind_protect (need_termination_unwind_protect); + - #if defined (__BEOS__) - if (errno == EINTR) - continue; + if (result == sizeof (unsigned char)) + return (c); + --- bash-3.1/lib/sh/zread.c.sighandler 2005-03-10 03:17:05.000000000 +0000 -+++ bash-3.1/lib/sh/zread.c 2005-12-23 16:16:24.000000000 +0000 -@@ -34,6 +34,9 @@ ++++ bash-3.1/lib/sh/zread.c 2006-01-12 10:07:49.000000000 +0000 +@@ -34,6 +34,10 @@ # define SEEK_CUR 1 #endif +/* From bash */ +extern int need_termination_unwind_protect; ++extern void do_termination_unwind_protect (int); + /* Read LEN bytes from FD into BUF. Retry the read on EINTR. Any other error causes the loop to break. */ ssize_t -@@ -45,7 +48,7 @@ +@@ -45,7 +49,8 @@ ssize_t r; while ((r = read (fd, buf, len)) < 0 && errno == EINTR) - ; -+ if (need_termination_unwind_protect) break; ++ if (need_termination_unwind_protect) ++ do_termination_unwind_protect (need_termination_unwind_protect); return r; } -@@ -73,7 +76,7 @@ +@@ -73,6 +78,8 @@ return r; if (r == -1 && errno == EINTR) { -- if (++nintr > NUM_INTR) -+ if (need_termination_unwind_protect || ++nintr > NUM_INTR) ++ if (need_termination_unwind_protect) ++ do_termination_unwind_protect (need_termination_unwind_protect); + if (++nintr > NUM_INTR) return -1; continue; - } --- bash-3.1/sig.c.sighandler 2005-10-22 22:04:03.000000000 +0100 -+++ bash-3.1/sig.c 2005-12-23 16:17:16.000000000 +0000 ++++ bash-3.1/sig.c 2006-01-12 10:07:49.000000000 +0000 @@ -58,6 +58,8 @@ extern int loop_level, continuing, breaking; extern int parse_and_execute_level, shell_initialized; @@ -95,9 +97,9 @@ } /* What we really do when SIGINT occurs. */ ---- bash-3.1/sig.h.sighandler 2005-12-23 16:16:24.000000000 +0000 -+++ bash-3.1/sig.h 2005-12-23 16:16:24.000000000 +0000 -@@ -112,8 +112,12 @@ +--- bash-3.1/sig.h.sighandler 2005-10-18 21:43:31.000000000 +0100 ++++ bash-3.1/sig.h 2006-01-12 10:07:49.000000000 +0000 +@@ -111,8 +111,12 @@ /* Extern variables */ extern volatile int sigwinch_received; @@ -110,7 +112,7 @@ extern sighandler sigint_sighandler __P((int)); extern void initialize_signals __P((int)); extern void initialize_terminating_signals __P((void)); -@@ -130,4 +134,11 @@ +@@ -129,4 +133,11 @@ extern SigHandler *trap_to_sighandler __P((int)); extern sighandler trap_handler __P((int)); @@ -123,7 +125,7 @@ + #endif /* _SIG_H_ */ --- bash-3.1/input.c.sighandler 2005-07-14 13:29:08.000000000 +0100 -+++ bash-3.1/input.c 2005-12-23 16:16:24.000000000 +0000 ++++ bash-3.1/input.c 2006-01-12 10:07:49.000000000 +0000 @@ -41,6 +41,7 @@ #include "input.h" #include "error.h" @@ -140,9 +142,9 @@ local_bufused = read (fileno (stream), localbuf, sizeof(localbuf)); if (local_bufused > 0) break; ---- bash-3.1/jobs.c.sighandler 2005-12-23 16:16:24.000000000 +0000 -+++ bash-3.1/jobs.c 2005-12-23 16:30:30.000000000 +0000 -@@ -2884,6 +2884,7 @@ +--- bash-3.1/jobs.c.sighandler 2005-11-12 04:13:27.000000000 +0000 ++++ bash-3.1/jobs.c 2006-01-12 10:07:49.000000000 +0000 +@@ -2865,6 +2865,7 @@ : 0; if (sigchld || block == 0) waitpid_flags |= WNOHANG; @@ -150,7 +152,7 @@ pid = WAITPID (-1, &status, waitpid_flags); /* WCONTINUED may be rejected by waitpid as invalid even when defined */ -@@ -2910,6 +2911,7 @@ +@@ -2891,6 +2892,7 @@ /* If waitpid returns 0, there are running children. If it returns -1, the only other error POSIX says it can return is EINTR. */ @@ -158,8 +160,8 @@ if (pid <= 0) continue; /* jumps right to the test */ ---- bash-3.1/execute_cmd.c.sighandler 2005-12-23 16:16:24.000000000 +0000 -+++ bash-3.1/execute_cmd.c 2005-12-23 16:16:24.000000000 +0000 +--- bash-3.1/execute_cmd.c.sighandler 2006-01-12 10:07:48.000000000 +0000 ++++ bash-3.1/execute_cmd.c 2006-01-12 10:07:49.000000000 +0000 @@ -363,6 +363,7 @@ unlink_fifo_list (); #endif /* PROCESS_SUBSTITUTION */ Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- bash.spec 10 Jan 2006 12:03:50 -0000 1.101 +++ bash.spec 12 Jan 2006 10:32:28 -0000 1.102 @@ -1,7 +1,7 @@ Version: 3.1 Name: bash Summary: The GNU Bourne Again shell (bash) version %{version}. -Release: 3 +Release: 4 Group: System Environment/Shells License: GPL Url: http://www.gnu.org/software/bash @@ -211,6 +211,9 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Thu Jan 12 2006 Tim Waugh 3.1-4 +- Fix sighandler patch bug (bug #177545). + * Tue Jan 10 2006 Tim Waugh 3.1-3 - Patchlevel 5. From fedora-cvs-commits at redhat.com Thu Jan 12 10:40:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 05:40:04 -0500 Subject: rpms/ftp/devel netkit-ftp-0.17-multihome.patch, NONE, 1.1 ftp.spec, 1.23, 1.24 Message-ID: <200601121040.k0CAe4aa012705@cvs.devel.redhat.com> Author: praszyk Update of /cvs/dist/rpms/ftp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12689 Modified Files: ftp.spec Added Files: netkit-ftp-0.17-multihome.patch Log Message: Support for multi-homed clients, see #171621 netkit-ftp-0.17-multihome.patch: ftp.1 | 4 ++++ ftp.c | 16 ++++++++++++++-- ftp_var.h | 1 + main.c | 6 ++++++ 4 files changed, 25 insertions(+), 2 deletions(-) --- NEW FILE netkit-ftp-0.17-multihome.patch --- --- netkit-ftp-0.17/ftp/ftp_var.h.rasold 2006-01-12 11:23:16.000000000 +0100 +++ netkit-ftp-0.17/ftp/ftp_var.h 2006-01-12 11:24:06.000000000 +0100 @@ -69,6 +69,7 @@ Extern int bell; /* ring bell on cmd completion */ Extern int doglob; /* glob local file names */ Extern int autologin; /* establish user account on connection */ +Extern int multihome; /* multi homed host, use same interface for cmd and data channels */ Extern int proxy; /* proxy server connection active */ Extern int proxflag; /* proxy connection exists */ Extern int sunique; /* store files on server with unique name */ --- netkit-ftp-0.17/ftp/ftp.c.rasold 2006-01-12 11:14:55.000000000 +0100 +++ netkit-ftp-0.17/ftp/ftp.c 2006-01-12 11:22:42.000000000 +0100 @@ -132,6 +132,7 @@ static sigjmp_buf ptabort; static int ptabflg = 0; static int abrtflag = 0; +struct sockaddr_in source; void lostpeer(int); extern int connected; @@ -153,7 +154,7 @@ char * hookup(const char *host, const char *port) { - int s, tos, error; + int s, tos, error, alen; socklen_t len; static char hostnamebuf[256]; struct addrinfo hints, *res, *res0; @@ -278,7 +279,11 @@ } if (verbose) printf("Connected to %s (%s).\n", hostname, hbuf); - if (getreply(0) > 2) { /* read startup message from server */ + alen = sizeof(source); + getsockname(s,(struct sockaddr*)&source, &alen); + source.sin_port = 0; /* We just want the addr, not the port */ + + if (getreply(0) > 2) { /* read startup message from server */ if (cin) (void) fclose(cin); if (cout) @@ -1254,6 +1259,13 @@ perror("ftp: socket"); return(1); } + if((multihome) && + bind(data, (struct sockaddr*)&source, sizeof(source)) == -1) { + close(data); + data = -1; + perror("ftp multihome bind"); + return(1); + } if (options & SO_DEBUG && setsockopt(data, SOL_SOCKET, SO_DEBUG, (char *)&on, sizeof (on)) < 0) --- netkit-ftp-0.17/ftp/main.c.rasold 2006-01-12 11:24:27.000000000 +0100 +++ netkit-ftp-0.17/ftp/main.c 2006-01-12 11:27:20.000000000 +0100 @@ -93,6 +93,7 @@ printf("\t -n: inhibit auto-login\n"); printf("\t -e: disable readline support, if present\n"); printf("\t -g: disable filename globbing\n"); + printf("\t -m: don't force data channel interface to the same as control channel\n"); printf("\t -v: verbose mode\n"); printf("\t -t: enable packet tracing [nonfunctional]\n"); printf("\t -d: enable debugging\n"); @@ -120,6 +121,7 @@ doglob = 1; interactive = 1; autologin = 1; + multihome = 1; passivemode = 1; cp = strrchr(argv[0], '/'); @@ -172,6 +174,10 @@ rl_inhibit = 1; break; + case 'm': + multihome = 0; + break; + case 'h': usage(); exit(0); --- netkit-ftp-0.17/ftp/ftp.1.rasold 2006-01-12 11:14:09.000000000 +0100 +++ netkit-ftp-0.17/ftp/ftp.1 2006-01-12 11:15:48.000000000 +0100 @@ -92,6 +92,10 @@ executable. Otherwise, does nothing. .It Fl g Disables file name globbing. +.It Fl m +The default requires that ftp explicitly binds to the same interface for the data +channel as the control channel in passive mode. Useful on multi-homed +clients. This option disables this behavior. .It Fl v Verbose option forces .Nm ftp Index: ftp.spec =================================================================== RCS file: /cvs/dist/rpms/ftp/devel/ftp.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- ftp.spec 9 Dec 2005 22:40:30 -0000 1.23 +++ ftp.spec 12 Jan 2006 10:39:59 -0000 1.24 @@ -1,7 +1,7 @@ Summary: The standard UNIX FTP (File Transfer Protocol) client. Name: ftp Version: 0.17 -Release: 31.1 +Release: 32.1 License: BSD Group: Applications/Internet Source0: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-ftp-%{version}.tar.bz2 @@ -17,6 +17,7 @@ Patch10: netkit-ftp-0.17-vsftp165083.patch Patch11: netkit-ftp-0.17-C-Frame121.patch Patch12: netkit-ftp-0.17-data.patch +Patch13: netkit-ftp-0.17-multihome.patch BuildRoot: /var/tmp/%{name}-root BuildRequires: gcc, glibc-devel, readline-devel, ncurses-devel, perl @@ -42,6 +43,7 @@ %patch10 -p1 -b .vsftp165083 %patch11 -p1 -b .C-Frame121 %patch12 -p1 -b .data +%patch13 -p1 -b .multihome %build sh configure --with-c-compiler=gcc --enable-ipv6 @@ -75,6 +77,10 @@ %{_mandir}/man5/netrc.* %changelog +* Thu Jan 12 2006 Petr Raszyk - 0.17-32 +- support for multi-homed clients + See #171621, netkit-ftp-0.17-multihome.patch + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 12 10:46:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 05:46:13 -0500 Subject: rpms/vsftpd/devel .cvsignore, 1.10, 1.11 sources, 1.10, 1.11 vsftpd.spec, 1.39, 1.40 vsftpd-2.0.1-tzfix.diff, 1.1, NONE Message-ID: <200601121046.k0CAkDmE016950@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/vsftpd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16071 Modified Files: .cvsignore sources vsftpd.spec Removed Files: vsftpd-2.0.1-tzfix.diff Log Message: - upgrade to 2.0.4 - vsftpd now lock files for simultanous up/downloads (#162511) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/vsftpd/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 23 Mar 2005 08:21:35 -0000 1.10 +++ .cvsignore 12 Jan 2006 10:46:09 -0000 1.11 @@ -1 +1 @@ -vsftpd-2.0.3.tar.gz +vsftpd-2.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/vsftpd/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 23 Mar 2005 08:21:35 -0000 1.10 +++ sources 12 Jan 2006 10:46:09 -0000 1.11 @@ -1 +1 @@ -74936cbd8e8251deb1cd99c5fb18b6f8 vsftpd-2.0.3.tar.gz +c0bf8c7b8e15ab15827172786fc56115 vsftpd-2.0.4.tar.gz Index: vsftpd.spec =================================================================== RCS file: /cvs/dist/rpms/vsftpd/devel/vsftpd.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- vsftpd.spec 9 Dec 2005 22:43:47 -0000 1.39 +++ vsftpd.spec 12 Jan 2006 10:46:10 -0000 1.40 @@ -2,8 +2,8 @@ Summary: vsftpd - Very Secure Ftp Daemon Name: vsftpd -Version: 2.0.3 -Release: 12.1 +Version: 2.0.4 +Release: 1 License: GPL Group: System Environment/Daemons URL: http://vsftpd.beasts.org/ @@ -25,7 +25,6 @@ Patch9: vsftpd-2.0.1-dir.patch Patch10: vsftpd-2.0.1-use_localtime.patch Patch11: vsftpd-1.2.1-nonrootconf.patch -Patch12: vsftpd-2.0.1-tzfix.diff Patch13: vsftpd-2.0.3-background.patch Patch14: vsftpd-2.0.3-daemonize_fds.patch Patch15: vsftpd-2.0.1-kickline.patch @@ -71,7 +70,6 @@ %patch9 -p1 -b .dir %patch10 -p1 -b .use_localtime %patch11 -p1 -b .nonrootconf -%patch12 -p1 -b .tzfix %patch13 -p1 -b .background %patch14 -p1 -b .fds %patch15 -p1 -b .kickline @@ -136,6 +134,10 @@ /var/ftp %changelog +* Thu Jan 12 2006 Radek Vokal 2.0.4-1 +- upgrade to 2.0.4 +- vsftpd now lock files for simultanous up/downloads (#162511) + * Fri Dec 09 2005 Jesse Keating - rebuilt --- vsftpd-2.0.1-tzfix.diff DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 12 13:01:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 08:01:06 -0500 Subject: rpms/rpm/devel rpm-4.4.2-no-large-mmap.patch, NONE, 1.1 rpm.spec, 1.190, 1.191 Message-ID: <200601121301.k0CD16Pp016215@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16159 Modified Files: rpm.spec Added Files: rpm-4.4.2-no-large-mmap.patch Log Message: Don't mmap large files rpm-4.4.2-no-large-mmap.patch: legacy.c | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE rpm-4.4.2-no-large-mmap.patch --- --- rpm-4.4.2/rpmdb/legacy.c.no_large_mmap 2006-01-10 11:25:28.000000000 +0000 +++ rpm-4.4.2/rpmdb/legacy.c 2006-01-10 11:25:31.000000000 +0000 @@ -167,6 +167,11 @@ goto exit; } + /* file to large (32 MB), do not mmap file */ + if (fsize > (size_t) 32*1024*1024) + if (ut == URL_IS_PATH || ut == URL_IS_UNKNOWN) + ut = URL_IS_DASH; /* force fd io */ + switch(ut) { case URL_IS_PATH: case URL_IS_UNKNOWN: Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.190 retrieving revision 1.191 diff -u -r1.190 -r1.191 --- rpm.spec 9 Jan 2006 15:03:37 -0000 1.190 +++ rpm.spec 12 Jan 2006 13:01:01 -0000 1.191 @@ -20,7 +20,7 @@ %define version 4.4.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 12 +Release: 13 Group: System Environment/Base Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz Source1: mono-find-provides @@ -42,6 +42,7 @@ Patch14: rpm-4.4.2-cronpath.patch Patch15: rpm-4.4.2-mono.patch Patch16: rpm-4.4.2-file-softmagic.patch +Patch17: rpm-4.4.2-no-large-mmap.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -170,6 +171,7 @@ %patch14 -p1 -b .cronpath %patch15 -p1 -b .mono %patch16 -p1 -b .magic +%patch17 -p1 -b .no_large_mmap %build @@ -562,6 +564,9 @@ %{__includedir}/popt.h %changelog +* Wed Jan 11 2006 Paul Nasrat - 4.4.2-13 +- Don't mmap large files + * Mon Jan 9 2006 Alexander Larsson - 4.4.2-12 - Add mono req/provides support From fedora-cvs-commits at redhat.com Thu Jan 12 13:18:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 08:18:57 -0500 Subject: rpms/gtk2/devel .cvsignore, 1.42, 1.43 gtk2.spec, 1.105, 1.106 sources, 1.45, 1.46 Message-ID: <200601121318.k0CDIvK8031795@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31166 Modified Files: .cvsignore gtk2.spec sources Log Message: 2.8.10 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 10 Dec 2005 20:57:31 -0000 1.42 +++ .cvsignore 12 Jan 2006 13:18:52 -0000 1.43 @@ -25,3 +25,4 @@ gtk+-2.8.7.tar.bz2 gtk+-2.8.8.tar.bz2 gtk+-2.8.9.tar.bz2 +gtk+-2.8.10.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- gtk2.spec 10 Dec 2005 20:57:31 -0000 1.105 +++ gtk2.spec 12 Jan 2006 13:18:52 -0000 1.106 @@ -10,13 +10,13 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.8.9 +%define base_version 2.8.10 %define bin_version 2.4.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. Name: gtk2 Version: %{base_version} -Release: 1.1 +Release: 1 License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 @@ -256,6 +256,9 @@ %doc tmpdocs/examples %changelog +* Thu Jan 12 2006 Matthias Clasen 2.8.10-1 +- Update to 2.8.10 + * Sat Dec 10 2005 Matthias Clasen 2.8.9-1 - Update to 2.8.9 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/sources,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- sources 10 Dec 2005 20:57:31 -0000 1.45 +++ sources 12 Jan 2006 13:18:52 -0000 1.46 @@ -1,2 +1,2 @@ d8c012f67a8f23fa9aa495fca5331784 update-scripts.tar.gz -e7a94132ae6353106c80cd4a1106a368 gtk+-2.8.9.tar.bz2 +c2c0318d4dcd64315486850907b8e78d gtk+-2.8.10.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 12 13:27:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 08:27:01 -0500 Subject: rpms/openoffice.org/FC-4 openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch, NONE, 1.1 openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch, NONE, 1.1 openoffice.org-1.9.114.ooo51718.rpath.patch, 1.3, 1.4 openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch, 1.6, 1.7 openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch, 1.2, 1.3 openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch, 1.1, 1.2 openoffice.org.spec, 1.234, 1.235 openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch, 1.1, NONE Message-ID: <200601121327.k0CDR18K003219@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv3187 Modified Files: openoffice.org-1.9.114.ooo51718.rpath.patch openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch openoffice.org.spec Added Files: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch Removed Files: openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch Log Message: try and get rid of -mtune openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch: framework/source/helper/statusindicatorfactory.cxx | 2 ++ framework/source/loadenv/loadenv.cxx | 3 ++- framework/source/services/frame.cxx | 2 ++ source/helper/statusindicatorfactory.cxx | 0 source/loadenv/loadenv.cxx | 0 source/services/frame.cxx | 0 6 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch --- Index: source/helper/statusindicatorfactory.cxx =================================================================== RCS file: /cvs/framework/framework/source/helper/statusindicatorfactory.cxx,v retrieving revision 1.21 diff -u -p -u -r1.21 statusindicatorfactory.cxx --- openoffice.org.orig/framework/source/helper/statusindicatorfactory.cxx 23 Sep 2005 15:41:23 -0000 1.21 +++ openoffice.org/framework/source/helper/statusindicatorfactory.cxx 4 Jan 2006 21:41:06 -0000 @@ -496,9 +496,11 @@ void StatusIndicatorFactory::implts_make if (xParentWindow.is()) xParentWindow->setVisible(sal_True); +#if 0 css::uno::Reference< css::awt::XTopWindow > xParentWindowTop(xParentWindow, css::uno::UNO_QUERY); if (xParentWindowTop.is()) xParentWindowTop->toFront(); +#endif } //----------------------------------------------- Index: source/loadenv/loadenv.cxx =================================================================== RCS file: /cvs/framework/framework/source/loadenv/loadenv.cxx,v retrieving revision 1.21 diff -u -p -u -r1.21 loadenv.cxx --- openoffice.org.orig/framework/source/loadenv/loadenv.cxx 11 Nov 2005 12:06:12 -0000 1.21 +++ openoffice.org/framework/source/loadenv/loadenv.cxx 4 Jan 2006 21:41:08 -0000 @@ -1774,9 +1774,10 @@ void LoadEnv::impl_makeFrameWindowVisibl if (xWindow.is()) xWindow->setVisible(sal_True); - +#if 0 if (xTopWindow.is()) xTopWindow->toFront(); +#endif /* #i19976# We tried to prevent a toFront() call in case the user putted the Index: source/services/frame.cxx =================================================================== RCS file: /cvs/framework/framework/source/services/frame.cxx,v retrieving revision 1.88 diff -u -p -u -r1.88 frame.cxx --- openoffice.org.orig/framework/source/services/frame.cxx 11 Nov 2005 12:06:59 -0000 1.88 +++ openoffice.org/framework/source/services/frame.cxx 4 Jan 2006 21:41:09 -0000 @@ -1563,6 +1563,7 @@ sal_Bool SAL_CALL Frame::setComponent( if (bIsConnected && !bWasConnected) implts_sendFrameActionEvent( css::frame::FrameAction_COMPONENT_ATTACHED ); +#if 0 //_____________________________________________________________________________________________________ // A new component window doesn't know anything about current active/focus states. // Set this information on it! @@ -1573,6 +1574,7 @@ sal_Bool SAL_CALL Frame::setComponent( { xComponentWindow->setFocus(); } +#endif // If it was a new component window - we must resize it to fill out // our container window. openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch: unx/gtk/gdi/salnativewidgets-gtk.cxx | 0 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch --- Index: unx/gtk/gdi/salnativewidgets-gtk.cxx =================================================================== RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v retrieving revision 1.18 diff -u -r1.18 salnativewidgets-gtk.cxx --- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 1 Nov 2005 10:35:31 -0000 1.18 +++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 21 Dec 2005 15:31:52 -0000 @@ -1138,8 +1138,8 @@ // GTK enforces radio groups, so that if we don't have 2 buttons in the group, // the single button will always be active. So we have to have 2 buttons. if (!isChecked) - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gRadioWidgetSibling), TRUE ); - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gRadioWidget), isChecked ); + GTK_TOGGLE_BUTTON(gRadioWidgetSibling)->active = TRUE; + GTK_TOGGLE_BUTTON(gRadioWidget)->active = isChecked; for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it ) { @@ -1185,7 +1185,7 @@ // Set the shadow based on if checked or not so we get a checkmark. shadowType = isChecked ? GTK_SHADOW_IN : GTK_SHADOW_OUT; NWSetWidgetState( gCheckWidget, nState, stateType ); - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(gCheckWidget), isChecked ); + GTK_TOGGLE_BUTTON(gCheckWidget)->active = isChecked; for( clipList::const_iterator it = rClipList.begin(); it != rClipList.end(); ++it ) { openoffice.org-1.9.114.ooo51718.rpath.patch: makefile.mk | 7 +++++++ 1 files changed, 7 insertions(+) Index: openoffice.org-1.9.114.ooo51718.rpath.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.114.ooo51718.rpath.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openoffice.org-1.9.114.ooo51718.rpath.patch 22 Dec 2005 08:18:42 -0000 1.3 +++ openoffice.org-1.9.114.ooo51718.rpath.patch 12 Jan 2006 13:26:56 -0000 1.4 @@ -19,23 +19,3 @@ CONFIGURE_DIR=out #relative to CONFIGURE_DIR CONFIGURE_ACTION=..$/dist$/configure -Index: source/xmerge/build.xml -=================================================================== -RCS file: /cvs/xml/xmerge/source/xmerge/build.xml,v -retrieving revision 1.2 -diff -u -r1.2 build.xml ---- openoffice.org.orig/xmerge/source/xmerge/build.xml 24 Oct 2005 17:57:33 -0000 1.2 -+++ openoffice.org/xmerge/source/xmerge/build.xml 22 Dec 2005 08:41:41 -0000 -@@ -58,9 +58,9 @@ - - - -- -- -- -+ -+ -+ - - - openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch: config_office/configure.in | 20 ++ config_office/set_soenv.in | 1 source/cxxhelp/provider/makefile.mk | 0 source/cxxhelp/provider/urlparameter.cxx | 0 util/makefile.mk | 0 xmlhelp/source/cxxhelp/provider/makefile.mk | 6 xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 220 +++++++++++++++++++---- xmlhelp/util/makefile.mk | 13 + 8 files changed, 222 insertions(+), 38 deletions(-) Index: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 21 Dec 2005 18:59:50 -0000 1.6 +++ openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 12 Jan 2006 13:26:56 -0000 1.7 @@ -44,14 +44,14 @@ diff -u config_office.orig/set_soenv.in config_office/set_soenv.in --- openoffice.org.orig/config_office/set_soenv.in 2005-08-30 15:45:40.000000000 +0100 +++ openoffice.org/config_office/set_soenv.in 2005-08-30 15:50:51.000000000 +0100 -@@ -1765,6 +1765,7 @@ - ToFile( "DB_JAR", "@DB_JAR@", "e" ); +@@ -1767,6 +1767,7 @@ + ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" ); + ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" ); + ToFile( "BSH_JAR", "@BSH_JAR@", "e" ); ++ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" ); ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" ); ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" ); -+ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" ); ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" ); - ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" ); - ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" ); Index: source/cxxhelp/provider/makefile.mk =================================================================== RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/makefile.mk,v openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch: desktop/menus/writer.desktop | 0 sysui/desktop/menus/writer.desktop | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) Index: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch 4 Jan 2006 09:57:12 -0000 1.2 +++ openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch 12 Jan 2006 13:26:56 -0000 1.3 @@ -11,5 +11,5 @@ Exec=openoffice -writer %U -MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/vnd.wordperfect;application/wordperfect +MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect - Name=%PRODUCTNAME Writer + Name=Word Processor Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch: unx/gtk/gdi/salnativewidgets-gtk.cxx | 0 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 11 +++++++++++ 2 files changed, 11 insertions(+) Index: openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch 21 Dec 2005 17:26:30 -0000 1.1 +++ openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch 12 Jan 2006 13:26:56 -0000 1.2 @@ -2,10 +2,22 @@ =================================================================== RCS file: /cvs/gsl/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx,v retrieving revision 1.18 -diff -u -p -u -r1.18 salnativewidgets-gtk.cxx +diff -u -r1.18 salnativewidgets-gtk.cxx --- openoffice.org.orig/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 1 Nov 2005 10:35:31 -0000 1.18 -+++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 9 Dec 2005 13:15:13 -0000 -@@ -3262,6 +3267,12 @@ static void NWEnsureGTKCombo( void ) ++++ openoffice.org/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 4 Jan 2006 17:21:19 -0000 +@@ -3229,6 +3229,11 @@ + { + GtkAdjustment *adj = GTK_ADJUSTMENT( gtk_adjustment_new(0, 0, 2, 1, 1, 1) ); + gSpinButtonWidget = gtk_spin_button_new( adj, 1, 2 ); ++ ++ //Setting non-editable means it doesn't blink, so there's no timeouts ++ //running around to nobble us ++ gtk_editable_set_editable(GTK_EDITABLE(gSpinButtonWidget), false); ++ + NWAddWidgetToCacheWindow( gSpinButtonWidget ); + } + } +@@ -3262,6 +3267,12 @@ if ( !gComboWidget ) { gComboWidget = gtk_combo_new(); Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v retrieving revision 1.234 retrieving revision 1.235 diff -u -r1.234 -r1.235 --- openoffice.org.spec 4 Jan 2006 09:48:41 -0000 1.234 +++ openoffice.org.spec 12 Jan 2006 13:26:56 -0000 1.235 @@ -1,6 +1,6 @@ %define oootag OOA680 %define ooomilestone 1 -%define rh_rpm_release 4 +%define rh_rpm_release 5 %define build_fc5 0 %define build_fc4 1 @@ -211,10 +211,11 @@ Patch45: openoffice.org-2.0.1.ooo59129.vcl.readonlyentry.patch Patch46: workspace.systemagg.patch Patch47: openoffice.org-2.0.1.gcc25199.bitfieldaccess.patch -Patch48: openoffice.org-2.0.1.oooXXXXX.config_office.nss.patch -Patch49: openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch +Patch48: openoffice.org-2.0.1.ooo59537.config_office.nss.patch +Patch49: openoffice.org-2.0.1.ooo59666.vcl.animatedtheme.patch Patch50: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch +Patch52: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -844,7 +845,7 @@ %patch20 -p1 -b .ooo52428.execshield.bridges.patch %if ! %{internaljavabits} %patch21 -p1 -b .ooo52974.systemhsqldbbeanshell.patch -# %patch22 -p1 -b .ooo54692.fasterhelpcontent2.patch +%patch22 -p1 -b .ooo54692.fasterhelpcontent2.patch %patch23 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch %patch24 -p1 -b .oooXXXXX.systemxalan.patch %else @@ -863,7 +864,7 @@ %patch34 -p1 -b .workspace.atkbridge.patch %patch35 -p1 -b .workspace.cmcfixes20.patch %patch36 -p1 -b .ooo56651.sw.rtfcrash.patch -# %patch37 -p1 -b .workspace.jaxpapi.patch +%patch37 -p1 -b .workspace.jaxpapi.patch %patch38 -p1 -b .workspace.cmcfixes22.patch %patch39 -p1 -b .workspace.cmcfixes23.patch %patch40 -p1 -b .ooo58663.vcl.missingglyph.patch @@ -878,12 +879,11 @@ %if %{build_fc4} %patch47 -p1 -b .gcc25199.bitfieldaccess.patch %endif -%if %{build_fc5} -%patch48 -p1 -b .oooXXXXX.config_office.nss.patch -%endif -%patch49 -p1 -b .oooXXXXX.vcl.animatedtheme.patch +%patch48 -p1 -b .ooo59537.config_office.nss.patch +%patch49 -p1 -b .ooo59666.vcl.animatedtheme.patch %patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch %patch51 -p1 -b .ooo59997.sw.defaultbullets.patch +%patch52 -p1 -b .ooo19976.framework.nofocussteal.patch %if %{includingexternals} #start ludicrous workaround @@ -961,7 +961,7 @@ #use the RPM_OPT_FLAGS but remove the OOo overridden ones for i in $RPM_OPT_FLAGS; do case "$i" in - -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables) continue;; + -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables|-mtune=pentium4) continue;; esac ARCH_FLAGS="$ARCH_FLAGS $i" done @@ -974,7 +974,7 @@ export TRUEJAVACOMPILER=$JAVACOMPILER export JAVACOMPILER=`pwd`/solenv/bin/gcj -# rm -rf external/common/jaxp.jar external/common/parser.jar +rm -rf external/common/jaxp.jar external/common/parser.jar %if ! %{internaljavabits} export XML_CLASSPATH=/usr/share/java/xalan-j2.jar:/usr/share/java/xerces-j2.jar @@ -3342,12 +3342,22 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Wed Jan 04 2006 Caolan McNamara - 1:2.0.1.1-5 +- spinbutton factory needs to be uneditable as well as combobox +- add openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch for jrb +- rebuild without -mtune + * Thu Dec 22 2005 Caolan McNamara - 1:2.0.1.1-4 - add openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch for rh#176779# + +* Thu Dec 22 2005 Caolan McNamara - 1:2.0.1.1-3 +- gcc#25426# fixed + + reenabled workspace.jaxpapi.patch + + reenabled fasterhelpcontent2.patch - add openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch for rh#176259# +- gcc#19870# still busted, accesser hack returns * Wed Dec 21 2005 Caolan McNamara - 1:2.0.1.1-2 -- 2.0.1 - add openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch for animated theme problem --- openoffice.org-2.0.1.oooXXXXX.vcl.animatedtheme.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 12 13:29:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 08:29:36 -0500 Subject: rpms/openoffice.org/FC-4 openoffice.org-2.0.1.ooo59537.config_office.nss.patch, NONE, 1.1 Message-ID: <200601121329.k0CDTaiB004270@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv4244 Added Files: openoffice.org-2.0.1.ooo59537.config_office.nss.patch Log Message: another one openoffice.org-2.0.1.ooo59537.config_office.nss.patch: configure.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE openoffice.org-2.0.1.ooo59537.config_office.nss.patch --- diff -ru SRC680_m145/config_office/configure.in SRC680_m145/config_office/configure.in --- SRC680_m145.orig/config_office/configure.in 2005-12-16 08:06:49.000000000 +0000 +++ SRC680_m145/config_office/configure.in 2005-12-16 08:07:40.000000000 +0000 @@ -2916,7 +2916,7 @@ PKG_CHECK_MODULES( MOZ_NSPR, mozilla-nspr ) fi - PKG_CHECK_MODULES( MOZ_NSS, $moz_flavour-nss ) + PKG_CHECK_MODULES( MOZ_NSS, nss ) save_CPPFLAGS="$CPPFLAGS" save_LDFLAGS="$LDFLAGS" save_LIBS="$LIBS" From fedora-cvs-commits at redhat.com Thu Jan 12 13:39:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 08:39:45 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.603,1.604 Message-ID: <200601121339.k0CDdjVr006694@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6657 Modified Files: openoffice.org.spec Log Message: little cleanup Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.603 retrieving revision 1.604 diff -u -r1.603 -r1.604 --- openoffice.org.spec 4 Jan 2006 21:51:32 -0000 1.603 +++ openoffice.org.spec 12 Jan 2006 13:39:38 -0000 1.604 @@ -965,8 +965,12 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done +%if build_fc4 # gcc#25199# +ARCH_FLAGS=${ARCH_FLAGS/-mtune=pentium4/-mtune=pentiumpro} +%endif export ARCH_FLAGS + # gcc#19870# gcj access problems, monsterous hack to force all java through # a sed script which replaces private and protected with public, shudder! cp %{SOURCE8} solenv/bin/gcj @@ -979,7 +983,7 @@ %if ! %{internaljavabits} export XML_CLASSPATH=/usr/share/java/xalan-j2.jar:/usr/share/java/xerces-j2.jar export SYSTEM_XALAN="YES" -export BUILD_TYPE=`echo $BUILD_TYPE | sed -e "s/XALAN//"` +export BUILD_TYPE=${BUILD_TYPE/XALAN} %else export BUILD_TYPE="$BUILD_TYPE xalan" export ARCH_FLAGS="$ARCH_FLAGS -fno-strict-aliasing" @@ -1029,8 +1033,7 @@ #start of jakub based suggestion on prelink optimization cd desktop/source/app -sed -e "s/OBJ/SLO/" makefile.mk > makefile.mk.prelink -mv -f makefile.mk.prelink makefile.mk +sed -i -e "s/OBJ/SLO/" makefile.mk dmake cd ../../util `(cat ../$OUTPATH.pro/misc/soffice.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs` @@ -1052,15 +1055,11 @@ $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE5} # rh#163147# convert non AMT to AMT fonts -sed -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded -mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu -sed -e "s/Albany /Albany AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded -mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu -sed -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded -mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu +sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu +sed -i -e "s/Albany /Albany AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu +sed -i -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu %if %{build_fc4} -sed -e "s/Times New Roman/Times New Roman;Nimbus Roman No9 L/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded -mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu +sed -i -e "s/Times New Roman/Times New Roman;Nimbus Roman No9 L/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu %endif #rh#158977# clear execstack requirement From fedora-cvs-commits at redhat.com Thu Jan 12 13:42:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 08:42:48 -0500 Subject: rpms/openoffice.org/FC-4 openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch, 1.7, 1.8 openoffice.org.spec, 1.235, 1.236 Message-ID: <200601121342.k0CDgmuV007901@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv7870 Modified Files: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch openoffice.org.spec Log Message: try again openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch: config_office/configure.in | 20 ++ config_office/set_soenv.in | 1 source/cxxhelp/provider/makefile.mk | 0 source/cxxhelp/provider/urlparameter.cxx | 0 util/makefile.mk | 0 xmlhelp/source/cxxhelp/provider/makefile.mk | 6 xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 220 +++++++++++++++++++---- xmlhelp/util/makefile.mk | 13 + 8 files changed, 222 insertions(+), 38 deletions(-) Index: openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 12 Jan 2006 13:26:56 -0000 1.7 +++ openoffice.org-1.9.126.ooo30380.uselibxslt.xmlhelp.patch 12 Jan 2006 13:42:45 -0000 1.8 @@ -44,14 +44,14 @@ diff -u config_office.orig/set_soenv.in config_office/set_soenv.in --- openoffice.org.orig/config_office/set_soenv.in 2005-08-30 15:45:40.000000000 +0100 +++ openoffice.org/config_office/set_soenv.in 2005-08-30 15:50:51.000000000 +0100 -@@ -1767,6 +1767,7 @@ - ToFile( "HSQLDB_JAR", "@HSQLDB_JAR@", "e" ); - ToFile( "SYSTEM_BSH", "@SYSTEM_BSH@", "e" ); - ToFile( "BSH_JAR", "@BSH_JAR@", "e" ); -+ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" ); +@@ -1765,6 +1765,7 @@ + ToFile( "DB_JAR", "@DB_JAR@", "e" ); ToFile( "SYSTEM_SABLOT", "@SYSTEM_SABLOT@", "e" ); ToFile( "SABLOT_LIBS", "@SABLOT_LIBS@", "e" ); ++ToFile( "SYSTEM_LIBXSLT", "@SYSTEM_LIBXSLT@", "e" ); ToFile( "SYSTEM_ODBC_HEADERS","@SYSTEM_ODBC_HEADERS@","e" ); + ToFile( "SYSTEM_SANE_HEADER","@SYSTEM_SANE_HEADER@","e" ); + ToFile( "SYSTEM_XRENDER_HEADERS","@SYSTEM_XRENDER_HEADERS@","e" ); Index: source/cxxhelp/provider/makefile.mk =================================================================== RCS file: /cvs/util/xmlhelp/source/cxxhelp/provider/makefile.mk,v Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v retrieving revision 1.235 retrieving revision 1.236 diff -u -r1.235 -r1.236 --- openoffice.org.spec 12 Jan 2006 13:26:56 -0000 1.235 +++ openoffice.org.spec 12 Jan 2006 13:42:45 -0000 1.236 @@ -961,12 +961,16 @@ #use the RPM_OPT_FLAGS but remove the OOo overridden ones for i in $RPM_OPT_FLAGS; do case "$i" in - -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables|-mtune=pentium4) continue;; + -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables) continue;; esac ARCH_FLAGS="$ARCH_FLAGS $i" done +%if build_fc4 # gcc#25199# +ARCH_FLAGS=${ARCH_FLAGS/-mtune=pentium4/-mtune=pentiumpro} +%endif export ARCH_FLAGS + # gcc#19870# gcj access problems, monsterous hack to force all java through # a sed script which replaces private and protected with public, shudder! cp %{SOURCE8} solenv/bin/gcj @@ -979,7 +983,7 @@ %if ! %{internaljavabits} export XML_CLASSPATH=/usr/share/java/xalan-j2.jar:/usr/share/java/xerces-j2.jar export SYSTEM_XALAN="YES" -export BUILD_TYPE=`echo $BUILD_TYPE | sed -e "s/XALAN//"` +export BUILD_TYPE=${BUILD_TYPE/XALAN} %else export BUILD_TYPE="$BUILD_TYPE xalan" export ARCH_FLAGS="$ARCH_FLAGS -fno-strict-aliasing" @@ -1029,8 +1033,7 @@ #start of jakub based suggestion on prelink optimization cd desktop/source/app -sed -e "s/OBJ/SLO/" makefile.mk > makefile.mk.prelink -mv -f makefile.mk.prelink makefile.mk +sed -i -e "s/OBJ/SLO/" makefile.mk dmake cd ../../util `(cat ../$OUTPATH.pro/misc/soffice.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs` @@ -1052,15 +1055,11 @@ $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE5} # rh#163147# convert non AMT to AMT fonts -sed -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded -mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu -sed -e "s/Albany /Albany AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded -mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu -sed -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded -mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu +sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu +sed -i -e "s/Albany /Albany AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu +sed -i -e "s/Cumberland/Cumberland AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu %if %{build_fc4} -sed -e "s/Times New Roman/Times New Roman;Nimbus Roman No9 L/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu > sedded -mv -f sedded $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu +sed -i -e "s/Times New Roman/Times New Roman;Nimbus Roman No9 L/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu %endif #rh#158977# clear execstack requirement @@ -3345,7 +3344,7 @@ * Wed Jan 04 2006 Caolan McNamara - 1:2.0.1.1-5 - spinbutton factory needs to be uneditable as well as combobox - add openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch for jrb -- rebuild without -mtune +- retry -mtune workaround * Thu Dec 22 2005 Caolan McNamara - 1:2.0.1.1-4 - add openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch for rh#176779# From fedora-cvs-commits at redhat.com Thu Jan 12 13:51:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 08:51:11 -0500 Subject: rpms/openoffice.org/FC-4 openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch, 1.3, 1.4 Message-ID: <200601121351.k0CDpB5S022188@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22157 Modified Files: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch Log Message: sigh openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch: desktop/menus/writer.desktop | 0 sysui/desktop/menus/writer.desktop | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) Index: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch 12 Jan 2006 13:26:56 -0000 1.3 +++ openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch 12 Jan 2006 13:51:06 -0000 1.4 @@ -11,5 +11,5 @@ Exec=openoffice -writer %U -MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/vnd.wordperfect;application/wordperfect +MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;application/vnd.wordperfect;application/wordperfect - Name=Word Processor + Name=%PRODUCTNAME Writer Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer. From fedora-cvs-commits at redhat.com Thu Jan 12 13:52:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 08:52:06 -0500 Subject: rpms/openoffice.org/FC-4 openoffice.org.spec,1.236,1.237 Message-ID: <200601121352.k0CDq6HF022601@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22577 Modified Files: openoffice.org.spec Log Message: foo Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- openoffice.org.spec 12 Jan 2006 13:42:45 -0000 1.236 +++ openoffice.org.spec 12 Jan 2006 13:52:03 -0000 1.237 @@ -965,7 +965,7 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done -%if build_fc4 # gcc#25199# +%if %{build_fc4} # gcc#25199# ARCH_FLAGS=${ARCH_FLAGS/-mtune=pentium4/-mtune=pentiumpro} %endif export ARCH_FLAGS From fedora-cvs-commits at redhat.com Thu Jan 12 13:52:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 08:52:35 -0500 Subject: rpms/openoffice.org/FC-4 openoffice.org.spec,1.237,1.238 Message-ID: <200601121352.k0CDqZNk022836@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22805 Modified Files: openoffice.org.spec Log Message: foo Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v retrieving revision 1.237 retrieving revision 1.238 diff -u -r1.237 -r1.238 --- openoffice.org.spec 12 Jan 2006 13:52:03 -0000 1.237 +++ openoffice.org.spec 12 Jan 2006 13:52:32 -0000 1.238 @@ -965,7 +965,8 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done -%if %{build_fc4} # gcc#25199# +# gcc#25199# +%if %{build_fc4} ARCH_FLAGS=${ARCH_FLAGS/-mtune=pentium4/-mtune=pentiumpro} %endif export ARCH_FLAGS From fedora-cvs-commits at redhat.com Thu Jan 12 13:52:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 08:52:59 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.604,1.605 Message-ID: <200601121352.k0CDqxVh023035@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23009 Modified Files: openoffice.org.spec Log Message: cleanup Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.604 retrieving revision 1.605 diff -u -r1.604 -r1.605 --- openoffice.org.spec 12 Jan 2006 13:39:38 -0000 1.604 +++ openoffice.org.spec 12 Jan 2006 13:52:56 -0000 1.605 @@ -965,7 +965,8 @@ esac ARCH_FLAGS="$ARCH_FLAGS $i" done -%if build_fc4 # gcc#25199# +# gcc#25199# +%if %{build_fc4} ARCH_FLAGS=${ARCH_FLAGS/-mtune=pentium4/-mtune=pentiumpro} %endif export ARCH_FLAGS From fedora-cvs-commits at redhat.com Thu Jan 12 14:00:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 09:00:55 -0500 Subject: rpms/openoffice.org/FC-4 openoffice.org.spec, 1.238, 1.239 openoffice.org-2.0.1.oooXXXXX.config_office.nss.patch, 1.1, NONE Message-ID: <200601121400.k0CE0tlD026156@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26133 Modified Files: openoffice.org.spec Removed Files: openoffice.org-2.0.1.oooXXXXX.config_office.nss.patch Log Message: build_fc4 not using nss, mozilla-nss Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org.spec,v retrieving revision 1.238 retrieving revision 1.239 diff -u -r1.238 -r1.239 --- openoffice.org.spec 12 Jan 2006 13:52:32 -0000 1.238 +++ openoffice.org.spec 12 Jan 2006 14:00:51 -0000 1.239 @@ -879,7 +879,9 @@ %if %{build_fc4} %patch47 -p1 -b .gcc25199.bitfieldaccess.patch %endif +%if %{build_fc5} %patch48 -p1 -b .ooo59537.config_office.nss.patch +%endif %patch49 -p1 -b .ooo59666.vcl.animatedtheme.patch %patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch %patch51 -p1 -b .ooo59997.sw.defaultbullets.patch --- openoffice.org-2.0.1.oooXXXXX.config_office.nss.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 12 14:05:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 09:05:25 -0500 Subject: rpms/alsa-lib/devel .cvsignore, 1.18, 1.19 alsa-lib.spec, 1.38, 1.39 sources, 1.20, 1.21 Message-ID: <200601121405.k0CE5Pub026925@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-lib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26892 Modified Files: .cvsignore alsa-lib.spec sources Log Message: new upstream version Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 24 Nov 2005 14:45:56 -0000 1.18 +++ .cvsignore 12 Jan 2006 14:05:21 -0000 1.19 @@ -5,3 +5,4 @@ alsa-lib-1.0.10rc1.tar.bz2 ainit-0.6.tar.gz alsa-lib-1.0.10.tar.bz2 +alsa-lib-1.0.11rc2.tar.bz2 Index: alsa-lib.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- alsa-lib.spec 3 Jan 2006 20:20:15 -0000 1.38 +++ alsa-lib.spec 12 Jan 2006 14:05:22 -0000 1.39 @@ -1,11 +1,11 @@ -%define version_main 1.0.10 -%define version_app rf +%define prever rc2 +%define version_main 1.0.11 %define version_ainit 0.6 Summary: The Advanced Linux Sound Architecture (ALSA) library. Name: alsa-lib -Version: %{version_main}%{?version_app} -Release: 4 +Version: %{version_main} +Release: 1.rc2 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2 @@ -143,6 +143,9 @@ %{_datadir}/aclocal/alsa.m4 %changelog +* Tue Jan 12 2006 Martin Stransky 1.0.11-1.rc2 +- new upstream version + * Tue Jan 3 2006 Jesse Keating 1.0.10rf-4 - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 24 Nov 2005 14:45:56 -0000 1.20 +++ sources 12 Jan 2006 14:05:22 -0000 1.21 @@ -1,2 +1,2 @@ 16bbe521dfc466200399d59f274b4001 ainit-0.6.tar.gz -b1a4e15c9ff81798507de470a92fcc43 alsa-lib-1.0.10.tar.bz2 +4e73229d7f88a6610993470011d39ee6 alsa-lib-1.0.11rc2.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 12 14:17:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 09:17:36 -0500 Subject: rpms/alsa-utils/devel .cvsignore, 1.13, 1.14 alsa-utils.spec, 1.28, 1.29 sources, 1.14, 1.15 Message-ID: <200601121417.k0CEHaR6002545@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2350 Modified Files: .cvsignore alsa-utils.spec sources Log Message: new upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 24 Nov 2005 13:47:29 -0000 1.13 +++ .cvsignore 12 Jan 2006 14:17:30 -0000 1.14 @@ -6,3 +6,4 @@ alsa-utils-1.0.9a.tar.bz2 alsa-utils-1.0.10rc1.tar.bz2 alsa-utils-1.0.10.tar.bz2 +alsa-utils-1.0.11rc2.tar.bz2 Index: alsa-utils.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/alsa-utils.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- alsa-utils.spec 9 Dec 2005 22:39:33 -0000 1.28 +++ alsa-utils.spec 12 Jan 2006 14:17:30 -0000 1.29 @@ -1,14 +1,13 @@ -%define version_tar 1.0.10 -%define version_pack 1.0.10rf +%define prever rc2 Summary: Advanced Linux Sound Architecture (ALSA) utilities Name: alsa-utils -Version: %{version_pack} -Release: 1.1 +Version: 1.0.11 +Release: 1.rc2 License: GPL Group: Applications/Multimedia URL: http://www.alsa-project.org/ -Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version_tar}%{?prever}.tar.bz2 +Source: ftp://ftp.alsa-project.org/pub/utils/alsa-utils-%{version}%{?prever}.tar.bz2 Source2: salsa.c Source3: alsacard.c Source4: alsaunmute.c @@ -25,7 +24,7 @@ Architecture (ALSA). %prep -%setup -q -n %{name}-%{version_tar}%{?prever} +%setup -q -n %{name}-%{version}%{?prever} %build autoreconf -f -i @@ -70,6 +69,9 @@ /usr/share/locale/* %changelog +* Thu Jan 12 2006 Martin Stransky 1.0.11-1.rc2 +- new upstream + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 24 Nov 2005 13:47:29 -0000 1.14 +++ sources 12 Jan 2006 14:17:30 -0000 1.15 @@ -1 +1,2 @@ 94bdec65e9c3fd02f7ef8ceb8f918afe alsa-utils-1.0.10.tar.bz2 +290762029ea7d2d323f362bbf6cc340b alsa-utils-1.0.11rc2.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 12 14:20:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 09:20:30 -0500 Subject: rpms/groff/devel groff-1.18.1.1-spacefix.patch, NONE, 1.1 groff.spec, 1.32, 1.33 Message-ID: <200601121420.k0CEKULe007483@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6800 Modified Files: groff.spec Added Files: groff-1.18.1.1-spacefix.patch Log Message: attempt to fix a space problem with several european languages (#137728) groff-1.18.1.1-spacefix.patch: env.cc | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE groff-1.18.1.1-spacefix.patch --- --- ./src/roff/troff/env.cc.orig 2006-01-12 14:43:05.000000000 +0100 +++ ./src/roff/troff/env.cc 2006-01-12 14:45:55.000000000 +0100 @@ -300,7 +300,7 @@ * This code is based on jgroff * about kerning between ASCII and EUC-JP */ - if (!ci->get_wchar_code()) { + if (!ci->get_wchar_code() || wchar_code(ci->get_wchar_code()) < 0x590) { /* * This node is a ASCII character node. */ Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/devel/groff.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- groff.spec 11 Jan 2006 08:22:33 -0000 1.32 +++ groff.spec 12 Jan 2006 14:20:27 -0000 1.33 @@ -30,6 +30,7 @@ Patch20: groff-1.18.1.1-tempfile.patch Patch21: groff-1.18.1.1-gcc41.patch Patch22: groff-1.18.1.1-bigendian.patch +Patch23: groff-1.18.1.1-spacefix.patch URL: ftp://ftp.gnu.org/gnu/groff/ Requires: mktemp @@ -96,6 +97,7 @@ %patch20 -p1 -b .tempfile %patch21 -p1 -b .gcc41 %patch22 -p1 -b .bigendian +%patch23 -p1 -b .spacefix for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \ src/devices/grolbp/grolbp.man; do @@ -207,8 +209,10 @@ %endif %changelog -* Fri Jan 10 2006 Miroslav Lichvar - 1.18.1.1-8 +* Fri Jan 12 2006 Miroslav Lichvar - 1.18.1.1-8 - fix segfault in grotty on 64-bit big endian machines (#176904) +- fix assertion failure on abort message (#141912) +- attempt to fix a space problem with several european languages (#137728) * Fri Jan 06 2006 Jindrich Novy - 1.18.1.1-7 - require X dependencies only for gxditview (#177118) From fedora-cvs-commits at redhat.com Thu Jan 12 15:24:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 10:24:47 -0500 Subject: rpms/hicolor-icon-theme/devel .cvsignore, 1.7, 1.8 hicolor-icon-theme.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200601121524.k0CFOlDv008237@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/hicolor-icon-theme/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6800 Modified Files: .cvsignore hicolor-icon-theme.spec sources Log Message: * Thu Jan 12 2006 Alexander Larsson 0.9-1 - Update to 0.9, fixes scalable icons picked before bitmap icons Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hicolor-icon-theme/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 14 Apr 2005 21:23:06 -0000 1.7 +++ .cvsignore 12 Jan 2006 15:24:44 -0000 1.8 @@ -1 +1 @@ -hicolor-icon-theme-0.8.tar.gz +hicolor-icon-theme-0.9.tar.gz Index: hicolor-icon-theme.spec =================================================================== RCS file: /cvs/dist/rpms/hicolor-icon-theme/devel/hicolor-icon-theme.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- hicolor-icon-theme.spec 9 Dec 2005 22:40:55 -0000 1.14 +++ hicolor-icon-theme.spec 12 Jan 2006 15:24:44 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Basic requirement for icon themes Name: hicolor-icon-theme -Version: 0.8 -Release: 3.1 +Version: 0.9 +Release: 1 License: GPL Group: User Interface/Desktops URL: http://freedesktop.org/Software/icon-theme @@ -48,6 +48,9 @@ %{_datadir}/icons/hicolor %changelog +* Thu Jan 12 2006 Alexander Larsson 0.9-1 +- Update to 0.9, fixes scalable icons picked before bitmap icons + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/hicolor-icon-theme/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 14 Apr 2005 21:23:06 -0000 1.7 +++ sources 12 Jan 2006 15:24:44 -0000 1.8 @@ -1 +1 @@ -b854ed36d523d5d72902b04c18f4b499 hicolor-icon-theme-0.8.tar.gz +1d0821cb80d394eac30bd8cec5b0b60c hicolor-icon-theme-0.9.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 12 16:12:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 11:12:11 -0500 Subject: rpms/tzdata/devel .cvsignore, 1.17, 1.18 sources, 1.19, 1.20 tzdata.spec, 1.23, 1.24 Message-ID: <200601121612.k0CGCBCP000910@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv821 Modified Files: .cvsignore sources tzdata.spec Log Message: Meta-package changes: Renaming tzdata.tar.bz2 file to tzdata$ver-base, so that it won't clash across updates. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 6 Jan 2006 09:19:18 -0000 1.17 +++ .cvsignore 12 Jan 2006 16:12:07 -0000 1.18 @@ -1,3 +1,3 @@ -tzdata.tar.bz2 +tzdata2005r-base.tar.bz2 tzdata2005r.tar.gz tzcode2005r.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 6 Jan 2006 09:19:18 -0000 1.19 +++ sources 12 Jan 2006 16:12:07 -0000 1.20 @@ -1,3 +1,3 @@ -325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 +325dba39b9741b63b94e4c05a3fefd5c tzdata2005r-base.tar.bz2 b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz 063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/devel/tzdata.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- tzdata.spec 6 Jan 2006 09:19:18 -0000 1.23 +++ tzdata.spec 12 Jan 2006 16:12:07 -0000 1.24 @@ -1,10 +1,10 @@ Summary: Timezone data Name: tzdata Version: 2005r -Release: 2 +Release: 3 License: GPL Group: System Environment/Base -Source0: %{name}.tar.bz2 +Source0: %{name}%{version}-base.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz Buildroot: /var/tmp/tzdata-root @@ -46,6 +46,11 @@ %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Mon Jan 12 2006 Petr Machata 2005r-3 +- 2005r-3 + - Meta changes. Renaming tzdata.tar.bz2 file to tzdata$ver-base, + so that it won't clash across updates. + * Thu Jan 5 2006 Petr Machata 2005r-2 - 2005r - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to From fedora-cvs-commits at redhat.com Thu Jan 12 16:26:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 11:26:40 -0500 Subject: rpms/tzdata/FC-3 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 tzdata.spec, 1.9, 1.10 Message-ID: <200601121626.k0CGQeHd017359@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv17259 Modified Files: .cvsignore sources tzdata.spec Log Message: Meta changes. Renaming tzdata.tar.bz2 file to tzdata$ver-base, so that it won't clash across updates Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 6 Jan 2006 19:48:36 -0000 1.9 +++ .cvsignore 12 Jan 2006 16:26:37 -0000 1.10 @@ -1,3 +1,3 @@ -tzdata.tar.bz2 +tzdata2005r-base.tar.bz2 tzdata2005r.tar.gz tzcode2005r.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 6 Jan 2006 19:48:36 -0000 1.9 +++ sources 12 Jan 2006 16:26:37 -0000 1.10 @@ -1,3 +1,3 @@ -325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 +325dba39b9741b63b94e4c05a3fefd5c tzdata2005r-base.tar.bz2 b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz 063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-3/tzdata.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tzdata.spec 6 Jan 2006 19:48:36 -0000 1.9 +++ tzdata.spec 12 Jan 2006 16:26:37 -0000 1.10 @@ -1,10 +1,10 @@ Summary: Timezone data Name: tzdata Version: 2005r -Release: 1.fc3 +Release: 3.fc3 License: GPL Group: System Environment/Base -Source0: %{name}.tar.bz2 +Source0: %{name}%{version}-base.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz Buildroot: /var/tmp/tzdata-root @@ -46,6 +46,11 @@ %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Mon Jan 12 2006 Petr Machata 2005r-3.fc3 +- 2005r-3 + - Meta changes. Renaming tzdata.tar.bz2 file to tzdata$ver-base, + so that it won't clash across updates. + * Thu Jan 5 2006 Petr Machata 2005r-1.fc3 - 2005r - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to @@ -58,6 +63,17 @@ - Fixes in zdump.c (abbrok): conditions are chained, and the string is checked for emptiness. +* Sat Dec 17 2005 Jakub Jelinek 2005q-2 +- 2005q + - changes for Georgia, Azerbaijan, Jordan, Palestine, Cuba, Nicaragua + - SystemV timezone changes + +* Wed Nov 2 2005 Jakub Jelinek 2005n-2 +- 2005n + - changes for Kyrgyzstan and Uruguay +- fix a typo in the Makefile (used TZDATA env var instead of TZDIR during + make check), update tst-timezone.c from glibc CVS (#172102) + * Tue Sep 6 2005 Jakub Jelinek 2005m-1.fc3 - 2005m - changes for USA (extending DST by 4 weeks since 2007), Tunisia, From fedora-cvs-commits at redhat.com Thu Jan 12 16:32:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 11:32:51 -0500 Subject: rpms/libnotify/devel libnotify.spec,1.4,1.5 Message-ID: <200601121632.k0CGWpvR019326@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/libnotify/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19295 Modified Files: libnotify.spec Log Message: * Thu Jan 12 2006 Christopher Aillon - 0.3.0-4 - Require a desktop-notification-daemon to be present. Currently, this is notify-daemon, but libnotify doesn't specifically require that one. Require 'desktop-notification-daemon' which daemons providing compatible functionality are now expected to provide. Index: libnotify.spec =================================================================== RCS file: /cvs/dist/rpms/libnotify/devel/libnotify.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libnotify.spec 12 Jan 2006 04:46:30 -0000 1.4 +++ libnotify.spec 12 Jan 2006 16:32:47 -0000 1.5 @@ -3,7 +3,7 @@ Summary: libnotify notification library Name: libnotify Version: 0.3.0 -Release: 3 +Release: 4 URL: http://www.galago-project.org/specs/notification/ Source0: %{name}-%{version}.tar.gz License: LGPL @@ -12,6 +12,7 @@ BuildPreReq: libtool BuildRequires: glib2-devel >= %{glib2_version} Requires: glib2 >= %{glib2_version} +Requires: desktop-notification-daemon %description @@ -68,6 +69,12 @@ %changelog +* Thu Jan 12 2006 Christopher Aillon - 0.3.0-4 +- Require a desktop-notification-daemon to be present. Currently, + this is notify-daemon, but libnotify doesn't specifically require + that one. Require 'desktop-notification-daemon' which daemons + providing compatible functionality are now expected to provide. + * Wed Jan 11 2006 Christopher Aillon - 0.3.0-3 - Let there be libnotify-devel... From fedora-cvs-commits at redhat.com Thu Jan 12 16:32:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 11:32:51 -0500 Subject: rpms/notify-daemon/devel notify-daemon.spec,1.4,1.5 Message-ID: <200601121632.k0CGWpuh019323@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/notify-daemon/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19296 Modified Files: notify-daemon.spec Log Message: * Thu Jan 12 2006 Christopher Aillon - 0.3.1-4 - Provide desktop-notification-daemon, since libnotify requires a notification deamon, but not this specific one. Other notification daemons can exist on the system so long as they meet the provides (and the API of course). Index: notify-daemon.spec =================================================================== RCS file: /cvs/dist/rpms/notify-daemon/devel/notify-daemon.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- notify-daemon.spec 9 Jan 2006 18:13:19 -0000 1.4 +++ notify-daemon.spec 12 Jan 2006 16:32:47 -0000 1.5 @@ -4,10 +4,11 @@ Summary: Notification Daemon Name: notify-daemon Version: 0.3.1 -Release: 3 +Release: 4 URL: http://www.galago-project.org/specs/notification/ License: GPL Group: System Environment/Libraries +Provides: desktop-notification-daemon BuildRoot: %{_tmppath}/%{name}-root BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: dbus-devel >= %{dbus_version} @@ -52,6 +53,12 @@ %{_datadir}/dbus-1/services/notify-daemon.service %changelog +* Thu Jan 12 2006 Christopher Aillon - 0.3.1-4 +- Provide desktop-notification-daemon, since libnotify requires a + notification deamon, but not this specific one. Other notification + daemons can exist on the system so long as they meet the provides + (and the API of course). + * Mon Jan 9 2006 Christopher Aillon - 0.3.1-3 - Fix positioning of the notification bubble to not draw off-screen From fedora-cvs-commits at redhat.com Thu Jan 12 16:36:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 11:36:00 -0500 Subject: rpms/tzdata/FC-2 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tzdata.spec, 1.11, 1.12 Message-ID: <200601121636.k0CGa0fK019984@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/tzdata/FC-2 In directory cvs.devel.redhat.com:/tmp/cvs-serv19947 Modified Files: .cvsignore sources tzdata.spec Log Message: Meta changes. Renaming tzdata.tar.bz2 file to tzdata$ver-base, so that it won't clash across updates. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-2/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Jan 2006 20:17:14 -0000 1.8 +++ .cvsignore 12 Jan 2006 16:35:55 -0000 1.9 @@ -1,3 +1,3 @@ -tzdata.tar.bz2 +tzdata2005r-base.tar.bz2 tzdata2005r.tar.gz tzcode2005r.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-2/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Jan 2006 20:17:17 -0000 1.8 +++ sources 12 Jan 2006 16:35:55 -0000 1.9 @@ -1,3 +1,3 @@ -325dba39b9741b63b94e4c05a3fefd5c tzdata.tar.bz2 +325dba39b9741b63b94e4c05a3fefd5c tzdata2005r-base.tar.bz2 b692c04a6a41080e214add0d3f58c700 tzdata2005r.tar.gz 063ea36d9257eb6779b1df847b04d8ab tzcode2005r.tar.gz Index: tzdata.spec =================================================================== RCS file: /cvs/dist/rpms/tzdata/FC-2/tzdata.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- tzdata.spec 6 Jan 2006 20:52:11 -0000 1.11 +++ tzdata.spec 12 Jan 2006 16:35:55 -0000 1.12 @@ -1,10 +1,10 @@ Summary: Timezone data Name: tzdata Version: 2005r -Release: 2.fc2 +Release: 3.fc2 License: GPL Group: System Environment/Base -Source0: %{name}.tar.bz2 +Source0: %{name}%{version}-base.tar.bz2 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz Buildroot: /var/tmp/tzdata-root @@ -46,6 +46,11 @@ %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html %changelog +* Mon Jan 12 2006 Petr Machata 2005r-3.fc2 +- 2005r-3 + - Meta changes. Renaming tzdata.tar.bz2 file to tzdata$ver-base, + so that it won't clash across updates. + * Thu Jan 5 2006 Petr Machata 2005r-1.fc2 - 2005r - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to From fedora-cvs-commits at redhat.com Thu Jan 12 16:43:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 11:43:53 -0500 Subject: rpms/evolution/devel evolution.spec,1.112,1.113 Message-ID: <200601121643.k0CGhqN8022278@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22256 Modified Files: evolution.spec Log Message: * Thu Jan 12 2006 Christopher Aillon - 2.5.4-6 - Remove unneeded Requires: notify-daemon Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- evolution.spec 12 Jan 2006 05:03:59 -0000 1.112 +++ evolution.spec 12 Jan 2006 16:43:48 -0000 1.113 @@ -33,7 +33,7 @@ Name: evolution Version: 2.5.4 -Release: 5 +Release: 6 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -115,7 +115,6 @@ %if %{libnotify_support} Requires: libnotify -Requires: notify-daemon %endif Obsoletes: libgal2 <= %{last_libgal2_version} @@ -511,6 +510,9 @@ %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Thu Jan 12 2006 Christopher Aillon - 2.5.4-6 +- Remove unneeded Requires: notify-daemon + * Thu Jan 12 2006 Christopher Aillon - 2.5.4-5 - Update BR to libnotify-devel From fedora-cvs-commits at redhat.com Thu Jan 12 16:47:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 11:47:16 -0500 Subject: rpms/system-config-bind/FC-4 .cvsignore, 1.22, 1.23 sources, 1.38, 1.39 system-config-bind.spec, 1.49, 1.50 Message-ID: <200601121647.k0CGlGd2031719@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/system-config-bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv31548 Modified Files: .cvsignore sources system-config-bind.spec Log Message: fix bug 177602 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-4/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 10 Jan 2006 15:50:32 -0000 1.22 +++ .cvsignore 12 Jan 2006 16:47:13 -0000 1.23 @@ -20,3 +20,4 @@ system-config-bind-4.0.0-32_FC4.tar.gz system-config-bind-4.0.0-33_FC4.tar.gz system-config-bind-4.0.0-36_FC4.tar.gz +system-config-bind-4.0.0-38_FC4.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-4/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 10 Jan 2006 15:50:32 -0000 1.38 +++ sources 12 Jan 2006 16:47:13 -0000 1.39 @@ -1 +1 @@ -38c6f2c7a6bb00270b837b44ab6427a6 system-config-bind-4.0.0-36_FC4.tar.gz +bc31b0ac45d6c3d4f0a1052cb743ea2c system-config-bind-4.0.0-38_FC4.tar.gz Index: system-config-bind.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-bind/FC-4/system-config-bind.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- system-config-bind.spec 10 Jan 2006 15:50:32 -0000 1.49 +++ system-config-bind.spec 12 Jan 2006 16:47:13 -0000 1.50 @@ -1,7 +1,7 @@ Summary: The Red Hat BIND DNS Configuration Tool. Name: system-config-bind Version: 4.0.0 -Release: 36_FC4 +Release: 38_FC4 License: GPL Group: Applications/System URL: http://people.redhat.com/~jvdias/system-config-bind @@ -90,6 +90,9 @@ fi %changelog +* Thu Jan 12 2006 Jason Vas Dias - 4.0.0-38 +- fix bug 177602: restore pre-FC5 pam configuration file + * Tue Jan 10 2006 Jason Vas Dias - 4.0.0-36 - fix bug 176142 (final!) : ship the Serbian translations - fix str widget save (TXT records) From fedora-cvs-commits at redhat.com Thu Jan 12 18:14:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 13:14:40 -0500 Subject: rpms/vixie-cron/devel vixie-cron-4.1-60_seconds.patch,NONE,1.1 Message-ID: <200601121814.k0CIEed6008172@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/vixie-cron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7341 Added Files: vixie-cron-4.1-60_seconds.patch Log Message: DO NOT APPLY THIS PATCH! This is checked in just to record the work done to ensure that at least 60 seconds elapse between job runs, which it turns out is not required - the important thing is that the same job cannot be run twice in the same minute, not that 60 seconds must elapse between job runs. The mechanism to communicate the actual job run time to the crond main process may be of some use in the future... vixie-cron-4.1-60_seconds.patch: cron.c | 43 ++++++++++++++++++++++++++++++++- do_command.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 115 insertions(+), 3 deletions(-) --- NEW FILE vixie-cron-4.1-60_seconds.patch --- --- vixie-cron-4.1/cron.c.60_seconds 2006-01-11 15:16:47.000000000 -0500 +++ vixie-cron-4.1/cron.c 2006-01-11 20:02:08.000000000 -0500 @@ -37,12 +37,14 @@ sigchld_handler(int), sighup_handler(int), sigchld_reaper(void), + sigusr1_handler(int), quit(int), parse_args(int c, char *v[]); static volatile sig_atomic_t got_sighup, got_sigchld; -static int timeRunning, virtualTime, clockTime; +static int timeRunning, virtualTime, clockTime, drift; static long GMToff; +static struct timeval time_last_job_run_tv={0,0}; static void usage(void) { @@ -86,6 +88,8 @@ sact.sa_handler = quit; (void) sigaction(SIGINT, &sact, NULL); (void) sigaction(SIGTERM, &sact, NULL); + sact.sa_handler = sigusr1_handler; + (void) sigaction(SIGUSR1, &sact, NULL); acquire_daemonlock(0); set_cron_uid(); @@ -137,6 +141,7 @@ set_time(TRUE); run_reboot_jobs(&database); timeRunning = virtualTime = clockTime; + drift = 0; /* * Too many clocks, not enough time (Al. Einstein) @@ -151,6 +156,9 @@ while (TRUE) { int timeDiff; enum timejump wakeupKind; + struct timeval tv; + struct timezone tz={0,0}; + struct timespec ts; /* ... wait for the time (in minutes) to change ... */ do { @@ -159,6 +167,31 @@ } while (clockTime == timeRunning); timeRunning = clockTime; + /* Ensure at least 60 seconds have elapsed between successive job runs. + */ + drift = 0; + if ( time_last_job_run_tv.tv_sec > 0 ) + { + gettimeofday(&tv,&tz); + double time_since_last_job = + ( (((double)tv.tv_sec) + (((double)tv.tv_usec)/1000000.0)) + -( ((double)time_last_job_run_tv.tv_sec) + +(((double)time_last_job_run_tv.tv_usec)/1000000.0) + ) + ); + memset(&time_last_job_run_tv,0,sizeof(struct timeval)); + if( time_since_last_job < 60.0 ) + { + double delay = (60.0 - time_since_last_job) + + (tv.tv_usec ? (((double)(1000000 - tv.tv_usec))/1000000.0) : 0); + ts.tv_sec = delay ; + drift = ts.tv_sec ; + ts.tv_nsec = ( delay - (double)ts.tv_sec ) * 1000000000; + Debug(DSCH,("DELAY: %lu %lu\n",ts.tv_sec,ts.tv_nsec)); + nanosleep(&ts,0L); + } + } + /* * Calculate how the current time differs from our virtual * clock. Classify the change into one of 4 cases. @@ -362,7 +395,7 @@ int seconds_to_wait; t1 = time(NULL) + GMToff; - seconds_to_wait = (int)(target * SECONDS_PER_MINUTE - t1) + 1; + seconds_to_wait = (int)(target * SECONDS_PER_MINUTE - t1) + 1 + drift; Debug(DSCH, ("[%ld] Target time=%ld, sec-to-wait=%d\n", (long)getpid(), (long)target*SECONDS_PER_MINUTE, seconds_to_wait)) @@ -399,6 +432,12 @@ } static void +sigusr1_handler(int x) { + struct timezone tz={0,0}; /* UTC */ + gettimeofday(&time_last_job_run_tv,&tz); +} + +static void quit(int x) { (void) unlink(_PATH_CRON_PID); _exit(0); --- vixie-cron-4.1/do_command.c.60_seconds 2006-01-11 15:16:47.000000000 -0500 +++ vixie-cron-4.1/do_command.c 2006-01-11 18:57:44.000000000 -0500 @@ -25,15 +25,38 @@ #include "cron.h" +/* Allow the job user process the 'CAP_KILL' capability to signal the time of + job execution to the main cron process - need capability includes: +*/ +#include +#include +#include +#ifndef SYS_capset +#ifndef __NR_capset +#error __NR_capset and SYS_capset undefined +#else +#define SYS_capset __NR_capset +#endif +#endif +#ifndef SYS_capget +#ifndef __NR_capget +#error __NR_capget and SYS_capget undefined +#else +#define SYS_capset __NR_capget +#endif +#endif + static void child_process(entry *, user *); static int safe_p(const char *, const char *); +static pid_t crond_pid; void do_command(entry *e, user *u) { Debug(DPROC, ("[%ld] do_command(%s, (%s,%ld,%ld))\n", (long)getpid(), e->cmd, u->name, (long)e->pwd->pw_uid, (long)e->pwd->pw_gid)) - + + crond_pid = getpid(); /* fork to become asynchronous -- parent process is done immediately, * and continues to run the normal cron code, which means return to * tick(). the child and grandchild don't leave this function, alive. @@ -67,6 +90,28 @@ int children = 0; char **jobenv=0L; + struct __user_cap_header_struct caphead; + struct __user_cap_data_struct cap; + + /* Before we set the security context, allow the job user to inherit the CAP_KILL capability: */ + + memset(&caphead, 0, sizeof(caphead)); + memset(&cap, 0, sizeof(cap)); + caphead.version = _LINUX_CAPABILITY_VERSION; + caphead.pid = 0; + + if ( syscall(SYS_capget, &caphead, &cap) < 0) + syslog(LOG_INFO, "CRON (%s) ERROR: cannot get process capabilities:", strerror(errno)); + + cap.inheritable |= CAP_KILL ; + + if ( syscall(SYS_capset, &caphead, &cap) < 0) + syslog(LOG_INFO, "CRON (%s) ERROR: cannot set process capabilities:", strerror(errno)); + + if ( prctl(PR_SET_KEEPCAPS,1,0,0,0) < 0 ) + syslog(LOG_INFO, "CRON (%s) ERROR: cannot prctl(PR_SET_KEEPCAPS..):", strerror(errno)); + + /* Set up the Red Hat security context for both mail/minder and job processes: */ if ( cron_set_job_security_context( e, u, &jobenv ) != 0 ) @@ -75,6 +120,17 @@ exit(ERROR_EXIT); } + /* Now we are the job user, running in user context with non-root capabilities. + * Add the CAP_KILL capability to our effective capability set: + */ + if ( syscall(SYS_capget, &caphead, &cap) < 0) + syslog(LOG_INFO, "CRON (%s) ERROR: cannot get process capabilities:", strerror(errno)); + + cap.effective = cap.permitted ; + + if ( syscall(SYS_capset, &caphead, &cap) < 0) + syslog(LOG_INFO, "CRON (%s) ERROR: cannot set process capabilities:", strerror(errno)); + Debug(DPROC, ("[%ld] child_process('%s')\n", (long)getpid(), e->cmd)) #ifdef CAPITALIZE_FOR_PS @@ -230,8 +286,25 @@ _exit(OK_EXIT); } # endif /*DEBUGGING*/ + /* tell crond main process we are running the job */ + if( kill(crond_pid, SIGUSR1) == -1 ) + syslog(LOG_INFO, "CRON (%s) ERROR: kill failed: %s", e->pwd->pw_name, strerror(errno)); + + /* drop capabilities */ + cap.permitted = 0; + cap.effective = 0; + cap.inheritable=0; + if( syscall(SYS_capset, &caphead, &cap) < 0 ) + syslog(LOG_INFO, "CRON (%s) ERROR: capset (DROP) failed: %s", e->pwd->pw_name, + strerror(errno)); + if( prctl(PR_SET_KEEPCAPS,0,0,0,0) < 0 ) + syslog(LOG_INFO, "CRON (%s) ERROR: prctl clear KEEPCAPS failed: %s", e->pwd->pw_name, + strerror(errno)); + /*** RUN THE COMMAND ***/ + execle(shell, shell, "-c", e->cmd, (char *)0, jobenv); + fprintf(stderr, "execl: couldn't exec `%s'\n", shell); perror("execl"); _exit(ERROR_EXIT); From fedora-cvs-commits at redhat.com Thu Jan 12 18:45:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 13:45:30 -0500 Subject: rpms/system-config-display/devel .cvsignore, 1.23, 1.24 sources, 1.25, 1.26 system-config-display.spec, 1.29, 1.30 Message-ID: <200601121845.k0CIjU3Z029316@cvs.devel.redhat.com> Author: sandmann Update of /cvs/dist/rpms/system-config-display/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29276 Modified Files: .cvsignore sources system-config-display.spec Log Message: %changelog * Thu Jan 12 2006 Soren Sandmann - 1.0.35-1 - Rebuild Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 10 Jan 2006 23:21:41 -0000 1.23 +++ .cvsignore 12 Jan 2006 18:45:26 -0000 1.24 @@ -1,2 +1,3 @@ system-config-display-1.0.33.tar.bz2 system-config-display-1.0.34.tar.bz2 +system-config-display-1.0.35.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 10 Jan 2006 23:21:41 -0000 1.25 +++ sources 12 Jan 2006 18:45:26 -0000 1.26 @@ -1 +1,2 @@ c30bf10052c0fba467247aca34df732b system-config-display-1.0.34.tar.bz2 +504d385f7ebe2ed13ba0ae6267439170 system-config-display-1.0.35.tar.bz2 Index: system-config-display.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- system-config-display.spec 10 Jan 2006 23:21:41 -0000 1.29 +++ system-config-display.spec 12 Jan 2006 18:45:26 -0000 1.30 @@ -1,6 +1,6 @@ Summary: A graphical interface for configuring the X Window System display Name: system-config-display -Version: 1.0.34 +Version: 1.0.35 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -79,6 +79,9 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png %changelog +* Thu Jan 12 2006 Soren Sandmann - 1.0.35-1 +- Rebuild + * Tue Jan 10 2006 Soren Sandmann - 1.0.34-1 - Some s/rhpl/rhpxl/ type changes From fedora-cvs-commits at redhat.com Thu Jan 12 18:47:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 13:47:48 -0500 Subject: rpms/system-config-display/devel sources,1.26,1.27 Message-ID: <200601121847.k0CIlm3O005234@cvs.devel.redhat.com> Author: sandmann Update of /cvs/dist/rpms/system-config-display/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5106 Modified Files: sources Log Message: Remove 1.0.34 from sources Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 12 Jan 2006 18:45:26 -0000 1.26 +++ sources 12 Jan 2006 18:47:43 -0000 1.27 @@ -1,2 +1 @@ -c30bf10052c0fba467247aca34df732b system-config-display-1.0.34.tar.bz2 504d385f7ebe2ed13ba0ae6267439170 system-config-display-1.0.35.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 12 18:50:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 13:50:19 -0500 Subject: rpms/eclipse-cdt/devel how-to-generate-the-cdt-tarball.txt, NONE, 1.1 Message-ID: <200601121850.k0CIoJZn009415@cvs.devel.redhat.com> Author: bkonrath Update of /cvs/dist/rpms/eclipse-cdt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9267 Added Files: how-to-generate-the-cdt-tarball.txt Log Message: * add file to explain how to generate the cdt tarball --- NEW FILE how-to-generate-the-cdt-tarball.txt --- Generating the cdt tarball ========================== % mkdir -p temp/home && cd temp % cvs -d :pserver:anonymous at dev.eclipse.org:/home/tools co \ -r CDT_3_0_1 org.eclipse.cdt-releng/org.eclipse.cdt.releng % cd org.eclipse.cdt-releng/org.eclipse.cdt.releng % sed --in-place 's/@cdtTag@/CDT_3_0_1/' maps/cdt.map % java -cp /usr/share/eclipse/startup.jar \ -Duser.home=../../home \ org.eclipse.core.launcher.Main \ -application org.eclipse.ant.core.antRunner \ -buildfile build.xml \ -DbaseLocation=/user/share/eclipse \ -DdontUnzip=true fetch % cd .. && tar zcf eclipse-cdt-fetched-src-3.0.1.tar.gz org.eclipse.cdt.releng From fedora-cvs-commits at redhat.com Thu Jan 12 20:35:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 15:35:57 -0500 Subject: rpms/hal-cups-utils/devel .cvsignore, 1.7, 1.8 hal-cups-utils.spec, 1.21, 1.22 sources, 1.7, 1.8 Message-ID: <200601122035.k0CKZvQs001065@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/hal-cups-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1024 Modified Files: .cvsignore hal-cups-utils.spec sources Log Message: * Thu Jan 12 2006 Christopher Aillon - 0.5.5-1 - New version, which makes sure we build the daemon with PIE Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 29 Nov 2005 20:15:32 -0000 1.7 +++ .cvsignore 12 Jan 2006 20:35:50 -0000 1.8 @@ -1,3 +1,4 @@ hal-cups-utils-0.5.2.tar.bz2 hal-cups-utils-0.5.3.tar.bz2 hal-cups-utils-0.5.4.tar.gz +hal-cups-utils-0.5.5.tar.gz Index: hal-cups-utils.spec =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/hal-cups-utils.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- hal-cups-utils.spec 10 Dec 2005 16:38:55 -0000 1.21 +++ hal-cups-utils.spec 12 Jan 2006 20:35:50 -0000 1.22 @@ -1,7 +1,7 @@ Summary: Halified CUPS utilities Name: hal-cups-utils -Version: 0.5.4 -Release: 2.1 +Version: 0.5.5 +Release: 1 License: GPL Group: Applications/System Source: %{name}-%{version}.tar.gz @@ -70,6 +70,9 @@ %{_sysconfdir}/rc.d/init.d/cups-config-daemon %changelog +* Thu Jan 12 2006 Christopher Aillon - 0.5.5-1 +- New version, which makes sure we build the daemon with PIE + * Fri Dec 09 2005 Jesse Keating - 0.5.4-2.1 - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal-cups-utils/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 29 Nov 2005 20:15:32 -0000 1.7 +++ sources 12 Jan 2006 20:35:50 -0000 1.8 @@ -1 +1 @@ -84cd1849492d7c4b0402af89162bb0f2 hal-cups-utils-0.5.4.tar.gz +681d6e7caa0db4874e06b30a87f2d5b4 hal-cups-utils-0.5.5.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 12 20:49:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 15:49:56 -0500 Subject: rpms/kernel/FC-4 linux-2.6-kill-blk_attempt_merge.patch, NONE, 1.1 kernel-2.6.spec, 1.1572, 1.1573 linux-2.6-vm-debug.patch, 1.3, 1.4 linux-2.6-x86_64-ati-apic-timer.patch, 1.2, NONE Message-ID: <200601122049.k0CKnuC7016791@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16749 Modified Files: kernel-2.6.spec linux-2.6-vm-debug.patch Added Files: linux-2.6-kill-blk_attempt_merge.patch Removed Files: linux-2.6-x86_64-ati-apic-timer.patch Log Message: - Remove broken vm debug patch. - kill blk_attempt_merge() which was horribly broken. - Fix booting issue on x86-64 ATI systems. linux-2.6-kill-blk_attempt_merge.patch: block/ll_rw_blk.c | 24 ------------------------ drivers/ide/ide-cd.c | 10 ---------- include/linux/blkdev.h | 1 - 3 files changed, 35 deletions(-) --- NEW FILE linux-2.6-kill-blk_attempt_merge.patch --- On Fri, Jan 06 2006, Dave Jones wrote: > Looks like some nice slab poison... > > Dave > > Oops: 0000 [#1] > last sysfs file: > /devices/pci0000:00/0000:00:1d.7/usb1/1-0:1.0/bAlternateSettingModules linked > in: usb_storage ata_piix libata e1000 ohci1394 ieee1394 uhci_hcdsCPU: 0 > EIP: 0060:[] Not tainted VLI > EFLAGS: 00010002 (2.6.15-1.1819_FC5) > EIP is at rb_next+0x9/0x22 > eax: 6b6b6b6b ebx: dfed01f8 ecx: c01bf65a edx: 6b6b6b6b > esi: c1991e98 edi: 00000202 ebp: dfed403c esp: c03c1f14 > ds: 007b es: 007b ss: 0068 > Process swapper (pid: 0, threadinfo=c03c1000 task=c0327ba0) > Stack: c01bf662 c01b5dfa dfed01f8 c01b85dc c040c284 00000004 c1991e98 c023c8ab > c1991e98 00000000 c040c284 00000000 c023d3a4 000194d0 00000000 dfed403c > c1991e98 c040c284 c1991e98 00000000 c0231f2d 000194d0 00000000 000194d0 > Call Trace: > [] cfq_latter_request+0x8/0x14 [] elv_latter_request+07 > [] blk_attempt_remerge+0x1d/0x3c [] cdrom_start_read+0e > [] ide_do_rw_cdrom+0xdd/0x14a [] start_request+0x1b1/01 > [] ide_do_request+0x2a0/0x2fb [] ide_intr+0xf3/0x11b > [] cdrom_read_intr+0x0/0x2a1 [] handle_IRQ_event+0x23/c > [] __do_IRQ+0x7a/0xcd [] do_IRQ+0x5c/0x77 > ======================= > [] common_interrupt+0x1a/0x20 [] mwait_idle+0x1a/0x2e > [] cpu_idle+0x38/0x4d [] start_kernel+0x17a/0x17c > Code: 85 c0 74 0b 8b 50 0c 85 d2 74 04 89 d0 eb f5 c3 8b 00 85 c0 74 0b 8b 50 0 The blk_attempt_remerge() is a bad interface to be honest, and it's hard to get to work reliably because it's done too late. I think the best option is just to kill it, this will cause problems with other io schedulers as well. I've merged this up for 2.6.16-rc inclusion, probably should go to stabel as well. --- [PATCH] Kill blk_attempt_remerge() It's a bad interface, and it's always done too late. Remove it. Signed-off-by: Jens Axboe --- linux-2.6.15/block/ll_rw_blk.c~ 2006-01-09 11:30:20.000000000 -0500 +++ linux-2.6.15/block/ll_rw_blk.c 2006-01-09 11:30:43.000000000 -0500 @@ -2609,30 +2609,6 @@ static inline int attempt_front_merge(re return 0; } -/** - * blk_attempt_remerge - attempt to remerge active head with next request - * @q: The &request_queue_t belonging to the device - * @rq: The head request (usually) - * - * Description: - * For head-active devices, the queue can easily be unplugged so quickly - * that proper merging is not done on the front request. This may hurt - * performance greatly for some devices. The block layer cannot safely - * do merging on that first request for these queues, but the driver can - * call this function and make it happen any way. Only the driver knows - * when it is safe to do so. - **/ -void blk_attempt_remerge(request_queue_t *q, struct request *rq) -{ - unsigned long flags; - - spin_lock_irqsave(q->queue_lock, flags); - attempt_back_merge(q, rq); - spin_unlock_irqrestore(q->queue_lock, flags); -} - -EXPORT_SYMBOL(blk_attempt_remerge); - static int __make_request(request_queue_t *q, struct bio *bio) { struct request *req; --- linux-2.6.15/drivers/ide/ide-cd.c~ 2006-01-09 11:30:50.000000000 -0500 +++ linux-2.6.15/drivers/ide/ide-cd.c 2006-01-09 11:30:55.000000000 -0500 @@ -1338,8 +1338,6 @@ static ide_startstop_t cdrom_start_read if (cdrom_read_from_buffer(drive)) return ide_stopped; - blk_attempt_remerge(drive->queue, rq); - /* Clear the local sector buffer. */ info->nsectors_buffered = 0; --- linux-2.6.15/include/linux/blkdev.h~ 2006-01-09 11:31:17.000000000 -0500 +++ linux-2.6.15/include/linux/blkdev.h 2006-01-09 11:31:20.000000000 -0500 @@ -559,7 +559,6 @@ extern void register_disk(struct gendisk extern void generic_make_request(struct bio *bio); extern void blk_put_request(struct request *); extern void blk_end_sync_rq(struct request *rq); -extern void blk_attempt_remerge(request_queue_t *, struct request *); extern struct request *blk_get_request(request_queue_t *, int, gfp_t); extern void blk_insert_request(request_queue_t *, struct request *, int, void *); extern void blk_requeue_request(request_queue_t *, struct request *); --- linux-2.6.15/drivers/ide/ide-cd.c~ 2006-01-09 11:44:09.000000000 -0500 +++ linux-2.6.15/drivers/ide/ide-cd.c 2006-01-09 11:44:18.000000000 -0500 @@ -1878,14 +1878,6 @@ static ide_startstop_t cdrom_start_write return ide_stopped; } - /* - * for dvd-ram and such media, it's a really big deal to get - * big writes all the time. so scour the queue and attempt to - * remerge requests, often the plugging will not have had time - * to do this properly - */ - blk_attempt_remerge(drive->queue, rq); - info->nsectors_buffered = 0; /* use dma, if possible. we don't need to check more, since we Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1572 retrieving revision 1.1573 diff -u -r1.1572 -r1.1573 --- kernel-2.6.spec 9 Jan 2006 18:38:45 -0000 1.1572 +++ kernel-2.6.spec 12 Jan 2006 20:49:50 -0000 1.1573 @@ -219,7 +219,6 @@ Patch203: linux-2.6.14-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch Patch205: linux-2.6-x86_64-disable-hotplug-guessing.patch -Patch206: linux-2.6-x86_64-ati-apic-timer.patch # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch @@ -352,6 +351,7 @@ Patch1820: linux-2.6-net-acenic-use-after-free.patch Patch1830: linux-2.6-smsc-ircc2-pnp.patch Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch +Patch1870: linux-2.6-kill-blk_attempt_merge.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -577,8 +577,6 @@ %patch204 -p1 # Disable guessing of how many hotplug cpus to add. %patch205 -p1 -# ATI timer quirk. -%patch206 -p1 # # ppc64 @@ -791,6 +789,8 @@ %patch1830 -p1 # Fix posix-cpu-timers sched_time accumulation %patch1860 -p1 +# kill blk_attempt_merge +%patch1870 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1267,6 +1267,11 @@ %endif %changelog +* Thu Jan 12 2006 Dave Jones +- Remove broken vm debug patch. +- kill blk_attempt_merge() which was horribly broken. +- Fix booting issue on x86-64 ATI systems. + * Mon Jan 9 2006 Dave Jones - Reenable Squashfs. linux-2.6-vm-debug.patch: rmap.c | 7 +++++++ 1 files changed, 7 insertions(+) Index: linux-2.6-vm-debug.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-vm-debug.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-vm-debug.patch 6 Jan 2006 05:42:17 -0000 1.3 +++ linux-2.6-vm-debug.patch 12 Jan 2006 20:49:51 -0000 1.4 @@ -14,23 +14,4 @@ BUG_ON(page_mapcount(page) < 0); /* * It would be tidy to reset the PageAnon mapping here, ---- linux-2.6.15/drivers/scsi/st.c~ 2006-01-05 21:58:31.000000000 -0500 -+++ linux-2.6.15/drivers/scsi/st.c 2006-01-05 21:59:31.000000000 -0500 -@@ -4508,6 +4508,7 @@ static int sgl_unmap_user_pages(struct s - for (i=0; i < nr_pages; i++) { - struct page *page = sgl[i].page; - -+ sgl[i].page = NULL; - if (dirtied) - SetPageDirty(page); - /* FIXME: cache flush missing for rw==READ ---- linux-2.6.15/include/linux/mm.h~ 2006-01-05 22:02:20.000000000 -0500 -+++ linux-2.6.15/include/linux/mm.h 2006-01-05 22:02:48.000000000 -0500 -@@ -299,6 +299,7 @@ struct page { - #define put_page_testzero(p) \ - ({ \ - BUG_ON(page_count(p) == 0); \ -+ BUG_ON(page_count(p) <= page_mapcount(p)); \ - atomic_add_negative(-1, &(p)->_count); \ - }) - + --- linux-2.6-x86_64-ati-apic-timer.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 12 20:50:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 15:50:56 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1573,1.1574 Message-ID: <200601122050.k0CKoux8017186@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv17149 Modified Files: kernel-2.6.spec Log Message: bump Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1573 retrieving revision 1.1574 diff -u -r1.1573 -r1.1574 --- kernel-2.6.spec 12 Jan 2006 20:49:50 -0000 1.1573 +++ kernel-2.6.spec 12 Jan 2006 20:50:54 -0000 1.1574 @@ -1267,7 +1267,7 @@ %endif %changelog -* Thu Jan 12 2006 Dave Jones +* Thu Jan 12 2006 Dave Jones [2.6.15-1.1824_FC4] - Remove broken vm debug patch. - kill blk_attempt_merge() which was horribly broken. - Fix booting issue on x86-64 ATI systems. From fedora-cvs-commits at redhat.com Thu Jan 12 20:53:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 15:53:35 -0500 Subject: rpms/avahi/devel avahi.spec,1.23,1.24 Message-ID: <200601122053.k0CKrZfR018215@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18184 Modified Files: avahi.spec Log Message: fix bugs 177610, 177609 Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- avahi.spec 9 Jan 2006 19:54:38 -0000 1.23 +++ avahi.spec 12 Jan 2006 20:53:31 -0000 1.24 @@ -1,12 +1,12 @@ Name: avahi Version: 0.6.3 -Release: 1 +Release: 2 Summary: Local network service discovery Group: System Environment/Base License: LGPL URL: http://avahi.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python +BuildRequires: doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, gdbm-devel, mono-devel Requires: dbus, libdaemon, expat, python, dbus-python, libcap Obsoletes: howl, howl-libs Source0: %{name}-%{version}.tar.gz @@ -28,7 +28,7 @@ %package tools Summary: Tools for mDNS browsing and publishing Group: System Environment/Base -Requires: %{name} = %{version}, gtk2, pygtk2, libglade2, pygtk2-libglade +Requires: %{name} = %{version}, gtk2, pygtk2, libglade2, pygtk2-libglade, gdbm %description tools Tools that use avahi to browse and publish mDNS services and hosts. @@ -70,9 +70,19 @@ Requires: qt-devel %description qt3-devel -The avahi-devel package contains the header files and libraries +The avahi-qt3-devel package contains the header files and libraries necessary for developing programs using avahi with Qt3. +%package sharp +Summary: Mono language bindings for avahi mono development +Group: Development/Libraries +Requires: %{name}-devel = %{version} +Requires: mono-core >= 1.1.12 + +%description sharp +The avahi-sharp package contains the files needed to develop +mono programs that use avahi. + %package devel Summary: Libraries and header files for avahi development Group: Development/Libraries @@ -102,10 +112,9 @@ automake-1.9 --add-missing autoconf -%configure --with-distro=fedora --disable-qt4 --disable-mono --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --enable-compat-libdns_sd +%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --enable-compat-libdns_sd make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -247,7 +256,17 @@ %attr(755,root,root) %{_libdir}/libavahi-qt3.so %{_includedir}/avahi-qt3 +%files sharp +%defattr(0644, root, root, 0755) +/usr/lib/mono/avahi-sharp +/usr/lib/mono/gac/avahi-sharp +/usr/lib/pkgconfig/avahi-sharp.pc + %changelog +* Thu Jan 12 2006 Jason Vas Dias - 0.6.3-2 +- fix bug 177610: Enable mono support with new avahi-sharp package +- fix bug 177609: add gdbm / gdbm-devel Requires for avahi-browse + * Mon Jan 09 2006 Jason Vas Dias - 0.6.3-1 - Upgrade to upstream version 0.6.3 - fix bug 177148: initscript start should not fail if avahi-daemon running From fedora-cvs-commits at redhat.com Thu Jan 12 22:24:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 17:24:41 -0500 Subject: rpms/glib-java/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200601122224.k0CMOfV2005083@cvs.devel.redhat.com> Author: cagney Update of /cvs/dist/rpms/glib-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5063 Modified Files: .cvsignore sources Log Message: zap out-of-date source files Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glib-java/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Dec 2005 21:39:18 -0000 1.5 +++ .cvsignore 12 Jan 2006 22:24:36 -0000 1.6 @@ -1,2 +1 @@ -glib-java-0.2.1.tar.gz glib-java-0.2.2.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/glib-java/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Dec 2005 21:39:18 -0000 1.5 +++ sources 12 Jan 2006 22:24:36 -0000 1.6 @@ -1,2 +1 @@ -7d332e917db28e4489022927cb67dd5b glib-java-0.2.1.tar.gz 46052b2c2aed6698275c54b7bd51cb38 glib-java-0.2.2.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 12 22:34:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 17:34:33 -0500 Subject: rpms/avahi/devel avahi.spec,1.24,1.25 Message-ID: <200601122234.k0CMYXJi005404@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5390 Modified Files: avahi.spec Log Message: fix bugs 177610, 177609 Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- avahi.spec 12 Jan 2006 20:53:31 -0000 1.24 +++ avahi.spec 12 Jan 2006 22:34:31 -0000 1.25 @@ -113,6 +113,8 @@ autoconf %configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --enable-compat-libdns_sd +# enable mono's mcs to work in beehive buildroot: +export MONO_SHARED_DIR=. make %{?_smp_mflags} %install From fedora-cvs-commits at redhat.com Thu Jan 12 22:49:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 17:49:23 -0500 Subject: rpms/avahi/devel avahi-0.6.3-MONO_SHARED_DIR.patch,NONE,1.1 Message-ID: <200601122249.k0CMnN1T016872@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16856 Added Files: avahi-0.6.3-MONO_SHARED_DIR.patch Log Message: Allow mono mcs to work in buildroot avahi-0.6.3-MONO_SHARED_DIR.patch: Makefile.am | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE avahi-0.6.3-MONO_SHARED_DIR.patch --- --- avahi-0.6.3/avahi-sharp/Makefile.am.MONO_SHARED_DIR 2005-12-22 07:36:22.000000000 -0500 +++ avahi-0.6.3/avahi-sharp/Makefile.am 2006-01-12 17:41:11.000000000 -0500 @@ -48,7 +48,7 @@ $(srcdir)/gencfg.sh $(ASSEMBLY): $(AVAHISOURCES) - mcs -keyfile:$(srcdir)/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -r:Mono.Posix + MONO_SHARED_DIR=. mcs -keyfile:$(srcdir)/avahi.snk -target:library -out:$@ -debug $(AVAHISOURCES) -r:Mono.Posix $(ASSEMBLY).config: $(ASSEMBLY).config.in From fedora-cvs-commits at redhat.com Thu Jan 12 22:49:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 17:49:34 -0500 Subject: rpms/avahi/devel avahi.spec,1.25,1.26 Message-ID: <200601122249.k0CMnYfK016895@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16882 Modified Files: avahi.spec Log Message: fix bugs 177610, 177609 Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- avahi.spec 12 Jan 2006 22:34:31 -0000 1.25 +++ avahi.spec 12 Jan 2006 22:49:32 -0000 1.26 @@ -15,6 +15,8 @@ Patch3: avahi-0.6-initscript_status.patch Patch4: avahi-0.6-dbus-0.6.patch Patch5: avahi-0.6.3-bz177148.patch +# enable mono's mcs to work in beehive buildroot: +Patch6: avahi-0.6.3-MONO_SHARED_DIR.patch %description Avahi is a system which facilitates service discovery on @@ -104,6 +106,7 @@ #%patch4 -p1 -b .dbus-0.6 #^- this patch now upstream %patch5 -p1 -b .bz177148 +%patch6 -p1 -b .MONO_SHARED_DIR %build # auto* update needed for avahi-0.5.2-fedora.patch @@ -113,8 +116,6 @@ autoconf %configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --enable-compat-libdns_sd -# enable mono's mcs to work in beehive buildroot: -export MONO_SHARED_DIR=. make %{?_smp_mflags} %install From fedora-cvs-commits at redhat.com Thu Jan 12 23:34:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 18:34:52 -0500 Subject: rpms/evolution/devel evolution-2.5.4-port-to-new-libnotify-api.patch, 1.1, 1.2 evolution.spec, 1.113, 1.114 Message-ID: <200601122334.k0CNYqNx016393@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16309 Modified Files: evolution-2.5.4-port-to-new-libnotify-api.patch evolution.spec Log Message: * Thu Jan 12 2006 David Malcolm - 2.5.4-7 - updated alarm notification patch(patch 806, #177546, #177666, #177667, #177670) evolution-2.5.4-port-to-new-libnotify-api.patch: alarm-queue.c | 75 ++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 50 insertions(+), 25 deletions(-) Index: evolution-2.5.4-port-to-new-libnotify-api.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.4-port-to-new-libnotify-api.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-2.5.4-port-to-new-libnotify-api.patch 11 Jan 2006 22:14:37 -0000 1.1 +++ evolution-2.5.4-port-to-new-libnotify-api.patch 12 Jan 2006 23:34:45 -0000 1.2 @@ -1,6 +1,27 @@ ---- evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api 2006-01-11 14:21:50.000000000 -0500 -+++ evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c 2006-01-11 14:36:01.000000000 -0500 -@@ -1457,12 +1457,12 @@ +--- evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api 2006-01-02 06:38:57.000000000 -0500 ++++ evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c 2006-01-12 18:31:17.000000000 -0500 +@@ -1448,31 +1448,42 @@ + } + + #ifdef HAVE_LIBNOTIFY ++static void ++notify_cb_open_component (NotifyNotification *notification, gchar *user_data) ++{ ++ ECal *cal = E_CAL (g_object_get_data( G_OBJECT(notification), "cal")); ++ ECalComponent *comp = E_CAL_COMPONENT (g_object_get_data( G_OBJECT(notification), "comp")); ++ ++ edit_component (cal, comp); ++ ++ notify_notification_close (notification, NULL); ++} ++ + static void + popup_notification (time_t trigger, CompQueuedAlarms *cqa, + gpointer alarm_id, gboolean use_description) + { + QueuedAlarm *qa; ++ ECal *cal; + ECalComponent *comp; const char *summary, *location; GtkTooltips *tooltips; ECalComponentText text; @@ -10,24 +31,25 @@ ECalComponentOrganizer organiser; - NotifyIcon *icon; - char *filename; -+ char *icon_filename; ++ GdkPixbuf *icon; char *body; + NotifyNotification *notification; ++ cal = cqa->parent_client->client; comp = cqa->alarms->comp; qa = lookup_queued_alarm (cqa, alarm_id); -@@ -1470,9 +1470,7 @@ + if (!qa) return; if (!notify_is_initted ()) notify_init("Evolution Alarm Notify"); - filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG); - icon = notify_icon_new_from_uri (filename); - g_free (filename); -+ icon_filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG); ++ icon = e_icon_factory_get_icon("stock_appointment-reminder", E_ICON_SIZE_DIALOG); /* get a sensible description for the event */ e_cal_component_get_summary (comp, &text); -@@ -1495,9 +1493,6 @@ +@@ -1495,9 +1506,6 @@ end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone); time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end); @@ -37,7 +59,7 @@ if (organiser.cn) { if (location) body = g_strdup_printf ("%s\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str); -@@ -1508,28 +1503,22 @@ +@@ -1508,28 +1516,45 @@ if (location) body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str); else @@ -45,6 +67,8 @@ -} + body = g_strdup_printf ("%s %s", start_str, time_str); + } ++ ++ notification = notify_notification_new (summary, body, "", tray_event_box); - if (!notify_send_notification ( - NULL, "device", NOTIFY_URGENCY_NORMAL, @@ -56,15 +80,36 @@ - NULL, /* no user_data */ - 0)) /* no actions */ - g_warning ("Could not send notification to daemon\n"); -+ notification = notify_notification_new (summary, -+ body, -+ icon_filename, -+ NULL); -+ if (!notify_notification_show_and_forget (notification, NULL)) -+ g_warning ("Error showing notification\n"); ++ if (icon) { ++ notify_notification_set_icon_data_from_pixbuf (notification, icon); ++ g_object_unref (G_OBJECT(icon)); ++ } ++ ++ /* Notifications don't timeout, require explicit user action: */ ++ notify_notification_set_timeout (notification, NOTIFY_TIMEOUT_NEVER); ++ ++ ++ g_object_ref (G_OBJECT(comp)); ++ g_object_set_data_full ( G_OBJECT(notification), ++ "comp", ++ comp, ++ g_object_unref); ++ ++ g_object_ref (G_OBJECT(cal)); ++ g_object_set_data_full ( G_OBJECT(notification), ++ "cal", ++ cal, ++ g_object_unref); - /* create the private structure */ -+ g_free (icon_filename); ++ notify_notification_add_action (notification, ++ "open", ++ _("Open"), ++ notify_cb_open_component); ++ ++ if (!notify_notification_show_and_forget (notification, NULL)) ++ g_warning ("Error showing notification\n"); ++ + g_free (body); g_free (start_str); g_free (end_str); Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- evolution.spec 12 Jan 2006 16:43:48 -0000 1.113 +++ evolution.spec 12 Jan 2006 23:34:45 -0000 1.114 @@ -33,7 +33,7 @@ Name: evolution Version: 2.5.4 -Release: 6 +Release: 7 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -510,6 +510,10 @@ %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Thu Jan 12 2006 David Malcolm - 2.5.4-7 +- updated alarm notification patch(patch 806, #177546, #177666, #177667, + #177670) + * Thu Jan 12 2006 Christopher Aillon - 2.5.4-6 - Remove unneeded Requires: notify-daemon From fedora-cvs-commits at redhat.com Thu Jan 12 23:52:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 18:52:54 -0500 Subject: rpms/kernel/devel patch-2.6.15-git8.bz2.sign, NONE, 1.1 .cvsignore, 1.322, 1.323 kernel-2.6.spec, 1.1845, 1.1846 linux-2.6-debug-sysfs-crash-debugging.patch, 1.2, 1.3 linux-2.6-debug-taint-vm.patch, 1.4, 1.5 linux-2.6-vm-silence-atomic-alloc-failures.patch, 1.1, 1.2 sources, 1.264, 1.265 upstream, 1.241, 1.242 linux-2.6-gcc41.patch, 1.7, NONE linux-2.6-tcp6-null-sk.patch, 1.1, NONE linux-2.6-x86_64-disable-hotplug-guessing.patch, 1.2, NONE patch-2.6.15-git5.bz2.sign, 1.1, NONE Message-ID: <200601122352.k0CNqsd9000998@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv953 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-debug-sysfs-crash-debugging.patch linux-2.6-debug-taint-vm.patch linux-2.6-vm-silence-atomic-alloc-failures.patch sources upstream Added Files: patch-2.6.15-git8.bz2.sign Removed Files: linux-2.6-gcc41.patch linux-2.6-tcp6-null-sk.patch linux-2.6-x86_64-disable-hotplug-guessing.patch patch-2.6.15-git5.bz2.sign Log Message: git8 --- NEW FILE patch-2.6.15-git8.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDxhAayGugalF9Dw4RAmcxAJ9k75DuZDYD/bgby6IG2L2NL30BmQCgg+Hb 5qpKRs04tIYHd0aqCP1SAL4= =rTv/ -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.322 retrieving revision 1.323 diff -u -r1.322 -r1.323 --- .cvsignore 12 Jan 2006 01:27:06 -0000 1.322 +++ .cvsignore 12 Jan 2006 23:52:50 -0000 1.323 @@ -4,3 +4,4 @@ linux-2.6.15.tar.bz2 bcm43xx-20060111.tar.bz2 patch-2.6.15-git7a.bz2 +patch-2.6.15-git8.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1845 retrieving revision 1.1846 diff -u -r1.1845 -r1.1846 --- kernel-2.6.spec 12 Jan 2006 01:27:06 -0000 1.1845 +++ kernel-2.6.spec 12 Jan 2006 23:52:50 -0000 1.1846 @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git7a.bz2 +Patch1: patch-2.6.15-git8.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -220,8 +220,7 @@ Patch202: linux-2.6-x86-vga-vidfail.patch Patch203: linux-2.6.14-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch -Patch205: linux-2.6-x86_64-disable-hotplug-guessing.patch -Patch206: linux-2.6-edid-check.patch +Patch205: linux-2.6-edid-check.patch # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch @@ -367,9 +366,6 @@ # ACPI patches. Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch -# TCPv6 oops fix -Patch2200: linux-2.6-tcp6-null-sk.patch - # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx.patch @@ -380,8 +376,7 @@ # Not patches you're too lazy for to put in the proper place. # -Patch10003: linux-2.6-gcc41.patch -Patch10004: linux-2.6-compile-fixes.patch +Patch10000: linux-2.6-compile-fixes.patch # END OF PATCH DEFINITIONS @@ -616,10 +611,8 @@ %patch203 -p1 # Suppress APIC errors on UP x86-64. %patch204 -p1 -# Disable guessing of how many hotplug cpus to add. -%patch205 -p1 # Reboot thru bios on HP laptops. -%patch206 -p1 +%patch205 -p1 # # ppc64 @@ -853,8 +846,6 @@ # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. %patch2100 -p1 -%patch2200 -p1 - # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream @@ -878,8 +869,7 @@ # # misc small stuff to make things compile or otherwise improve performance # -%patch10003 -p1 -%patch10004 -p1 +%patch10000 -p1 # END OF PATCH APPLICATIONS @@ -1356,6 +1346,9 @@ %endif %changelog +* Thu Jan 12 2006 Dave Jones +- 2.6.15-git8 + * Thu Jan 12 2006 David Woodhouse - 2.6.15-git7a -- another interim snapshot because stuff we care about got fixed today linux-2.6-debug-sysfs-crash-debugging.patch: devel-akpm/arch/i386/kernel/traps.c | 5 +++++ devel-akpm/fs/sysfs/file.c | 8 ++++++++ linux-2.6.14/arch/x86_64/kernel/traps.c | 5 +++++ 3 files changed, 18 insertions(+) Index: linux-2.6-debug-sysfs-crash-debugging.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-sysfs-crash-debugging.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-sysfs-crash-debugging.patch 2 Dec 2005 23:39:39 -0000 1.2 +++ linux-2.6-debug-sysfs-crash-debugging.patch 12 Jan 2006 23:52:50 -0000 1.3 @@ -75,13 +75,13 @@ int register_die_notifier(struct notifier_block *nb) { int err = 0; -@@ -385,6 +387,9 @@ void __die(const char * str, struct pt_r +@@ -416,6 +416,9 @@ void __die(const char * str, struct pt_r printk("DEBUG_PAGEALLOC"); #endif printk("\n"); +#ifdef CONFIG_SYSFS + printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file); +#endif - notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV); + notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV); show_registers(regs); /* Executive summary in case the oops scrolled away */ linux-2.6-debug-taint-vm.patch: linux-2.6.11/include/asm-generic/bug.h | 8 ++++++-- linux-2.6.15/mm/page_alloc.c | 4 ++-- linux-2.6.15/mm/slab.c | 4 ++-- linux-2000/kernel/panic.c | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-debug-taint-vm.patch 9 Jan 2006 18:55:15 -0000 1.4 +++ linux-2.6-debug-taint-vm.patch 12 Jan 2006 23:52:50 -0000 1.5 @@ -38,14 +38,14 @@ { --- linux-2.6.15/mm/page_alloc.c~ 2006-01-07 20:48:33.000000000 -0500 +++ linux-2.6.15/mm/page_alloc.c 2006-01-07 20:49:24.000000000 -0500 -@@ -136,12 +136,12 @@ static inline int bad_range(struct zone +@@ -137,12 +137,12 @@ static inline int bad_range(struct zone static void bad_page(struct page *page) { printk(KERN_EMERG "Bad page state in process '%s'\n" -- "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n" -+ "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n" - "Trying to fix it up, but a reboot is needed\n" - "Backtrace:\n", +- KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n" ++ KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n" + KERN_EMERG "Trying to fix it up, but a reboot is needed\n" + KERN_EMERG "Backtrace:\n", current->comm, page, (int)(2*sizeof(unsigned long)), (unsigned long)page->flags, page->mapping, - page_mapcount(page), page_count(page)); linux-2.6-vm-silence-atomic-alloc-failures.patch: gfp.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6-vm-silence-atomic-alloc-failures.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-vm-silence-atomic-alloc-failures.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-vm-silence-atomic-alloc-failures.patch 18 Aug 2005 18:28:13 -0000 1.1 +++ linux-2.6-vm-silence-atomic-alloc-failures.patch 12 Jan 2006 23:52:50 -0000 1.2 @@ -1,12 +1,11 @@ Atomic failures aren't too interesting. -diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/gfp.h linux-10000/include/linux/gfp.h ---- linux-3022/include/linux/gfp.h -+++ linux-10000/include/linux/gfp.h -@@ -47,7 +47,7 @@ struct vm_area_struct; - __GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \ - __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP) +--- linux-2.6.15/include/linux/gfp.h~ 2006-01-12 18:48:46.000000000 -0500 ++++ linux-2.6.15/include/linux/gfp.h 2006-01-12 18:48:57.000000000 -0500 +@@ -58,7 +58,7 @@ struct vm_area_struct; + __GFP_NOMEMALLOC|__GFP_HARDWALL) + /* GFP_ATOMIC means both !wait (__GFP_WAIT not set) and use emergency pool */ -#define GFP_ATOMIC (__GFP_HIGH) +#define GFP_ATOMIC (__GFP_HIGH | __GFP_NOWARN) #define GFP_NOIO (__GFP_WAIT) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- sources 12 Jan 2006 01:27:06 -0000 1.264 +++ sources 12 Jan 2006 23:52:50 -0000 1.265 @@ -1,3 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 e7291436e5d71b575dea034883cb42e5 bcm43xx-20060111.tar.bz2 f791ce18c0e962f30dce760274f6be07 patch-2.6.15-git7a.bz2 +17649f28b91b319cb916a89f46eb37c3 patch-2.6.15-git8.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- upstream 9 Jan 2006 18:55:15 -0000 1.241 +++ upstream 12 Jan 2006 23:52:50 -0000 1.242 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 -patch-2.6.15-git5.bz2 +patch-2.6.15-git8.bz2 --- linux-2.6-gcc41.patch DELETED --- --- linux-2.6-tcp6-null-sk.patch DELETED --- --- linux-2.6-x86_64-disable-hotplug-guessing.patch DELETED --- --- patch-2.6.15-git5.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 13 00:22:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 19:22:47 -0500 Subject: rpms/kernel/devel linux-2.6.15-cell-numa-init.patch, NONE, 1.1 kernel-2.6.spec, 1.1846, 1.1847 Message-ID: <200601130022.k0D0MlpO021329@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21293 Modified Files: kernel-2.6.spec Added Files: linux-2.6.15-cell-numa-init.patch Log Message: Fix cell boot linux-2.6.15-cell-numa-init.patch: setup.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6.15-cell-numa-init.patch --- --- linux-2.6.15/arch/powerpc/platforms/cell/setup.c~ 2006-01-12 20:23:46.000000000 +0000 +++ linux-2.6.15/arch/powerpc/platforms/cell/setup.c 2006-01-13 00:17:51.000000000 +0000 @@ -126,6 +126,7 @@ static void __init cell_spuprop_present( static void __init cell_spumem_init(int early) { struct device_node *node; + return; for (node = of_find_node_by_type(NULL, "spe"); node; node = of_find_node_by_type(node, "spe")) { cell_spuprop_present(node, "local-store", early); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1846 retrieving revision 1.1847 diff -u -r1.1846 -r1.1847 --- kernel-2.6.spec 12 Jan 2006 23:52:50 -0000 1.1846 +++ kernel-2.6.spec 13 Jan 2006 00:22:43 -0000 1.1847 @@ -224,6 +224,7 @@ # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch +Patch301: linux-2.6.15-cell-numa-init.patch Patch304: linux-2.6.15-mv643xx-fixes.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch @@ -619,6 +620,8 @@ # # Default to ARCH=powerpc %patch300 -p1 +# Arnd says don't call cell_spumem_init() till he fixes it. +%patch301 -p1 # Fix the MV643xx Gigabit Ethernet driver %patch304 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. @@ -1346,6 +1349,9 @@ %endif %changelog +* Fri Jan 13 2006 David Woodhouse +- Fix oops on Cell Broadband Engine with NUMA enabled. + * Thu Jan 12 2006 Dave Jones - 2.6.15-git8 From fedora-cvs-commits at redhat.com Fri Jan 13 00:40:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 19:40:17 -0500 Subject: rpms/kernel/devel/configs config-generic,1.130,1.131 Message-ID: <200601130040.k0D0eHob026595@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv26547/configs Modified Files: config-generic Log Message: turn on mutex debug Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- config-generic 11 Jan 2006 13:04:31 -0000 1.130 +++ config-generic 13 Jan 2006 00:40:12 -0000 1.131 @@ -2415,7 +2415,7 @@ # Turn off these debug options for production kernels. CONFIG_DEBUG_SLAB=y -# CONFIG_DEBUG_MUTEXES is not set +CONFIG_DEBUG_MUTEXES=y CONFIG_KMALLOC_ACCOUNTING=y # CONFIG_WAKEUP_TIMING is not set From fedora-cvs-commits at redhat.com Fri Jan 13 03:02:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 22:02:25 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1847,1.1848 Message-ID: <200601130302.k0D32PUw018854@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18726 Modified Files: kernel-2.6.spec Log Message: yet more iseries pruning. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1847 retrieving revision 1.1848 diff -u -r1.1847 -r1.1848 --- kernel-2.6.spec 13 Jan 2006 00:22:43 -0000 1.1847 +++ kernel-2.6.spec 13 Jan 2006 03:02:07 -0000 1.1848 @@ -1349,6 +1349,9 @@ %endif %changelog +* Fri Jan 13 2006 Dave Jones +- Disable more cruft from iseries config. + * Fri Jan 13 2006 David Woodhouse - Fix oops on Cell Broadband Engine with NUMA enabled. From fedora-cvs-commits at redhat.com Fri Jan 13 03:02:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 22:02:26 -0500 Subject: rpms/kernel/devel/configs config-powerpc64-iseries,1.9,1.10 Message-ID: <200601130302.k0D32Qs7018862@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv18726/configs Modified Files: config-powerpc64-iseries Log Message: yet more iseries pruning. Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc64-iseries,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- config-powerpc64-iseries 12 Jan 2006 01:27:06 -0000 1.9 +++ config-powerpc64-iseries 13 Jan 2006 03:02:22 -0000 1.10 @@ -47,13 +47,6 @@ # CONFIG_SCHED_SMT is not set # CONFIG_XMON is not set # CONFIG_ROCKETPORT is not set - -# Disabled due to compile failure 2005-09-21 (dwmw2) -# drivers/infiniband/hw/mthca/mthca_cmd.c: In function 'mthca_cmd_poll': -# drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: syntax error before 'do' -# drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: called object '"i"' is not a function -# CONFIG_INFINIBAND_MTHCA is not set - # CONFIG_WINDFARM is not set CONFIG_LPARCFG=y CONFIG_HOTPLUG_PCI=y @@ -66,7 +59,30 @@ CONFIG_SERIAL_ICOM=m # CONFIG_ISDN is not set # CONFIG_IEEE80211 is not set - # CONFIG_DVB is not set # CONFIG_VIDEO_DEV is not set +# CONFIG_SND is not set +# CONFIG_IRDA is not set +# CONFIG_IEEE1394 is not set +# CONFIG_CPU_FREQ is not set +# CONFIG_PCCARD is not set +# CONFIG_CARDBUS is not set +# CONFIG_HOTPLUG_PCI is not set +# CONFIG_ATM is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set +# CONFIG_I2C is not set +# CONFIG_W1 is not set +# CONFIG_HWMON is not set +# CONFIG_SOUND is not set +# CONFIG_MMC is not set +# CONFIG_INFINIBAND is not set From fedora-cvs-commits at redhat.com Fri Jan 13 03:40:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 22:40:42 -0500 Subject: rpms/stardict/devel stardict-2.4.5-invalid-cplusplus.patch, NONE, 1.1 stardict.spec, 1.13, 1.14 Message-ID: <200601130340.k0D3egYw026199@cvs.devel.redhat.com> Author: llch Update of /cvs/dist/rpms/stardict/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26185 Modified Files: stardict.spec Added Files: stardict-2.4.5-invalid-cplusplus.patch Log Message: * Fri Jan 13 2006 Leon Ho 2.4.5-2 - added in patch to fix #176890 stardict-2.4.5-invalid-cplusplus.patch: skin.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE stardict-2.4.5-invalid-cplusplus.patch --- --- src/skin.h.orig 2006-01-09 17:03:39.000000000 +1000 +++ src/skin.h 2006-01-09 17:04:07.000000000 +1000 @@ -8,8 +8,8 @@ { public: GdkCursor *cursor; - _Skin_cursor::_Skin_cursor(); - _Skin_cursor::~_Skin_cursor(); + _Skin_cursor(); + ~_Skin_cursor(); }; struct _Skin_pixbuf_1 Index: stardict.spec =================================================================== RCS file: /cvs/dist/rpms/stardict/devel/stardict.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- stardict.spec 9 Dec 2005 22:43:18 -0000 1.13 +++ stardict.spec 13 Jan 2006 03:40:38 -0000 1.14 @@ -1,11 +1,12 @@ Name: stardict Summary: A powerful dictionary platform written in GTK+2 Version: 2.4.5 -Release: 1.1 +Release: 2 Group: Applications/System License: GPL URL: http://stardict.sourceforge.net Source0: %{name}-%{version}.tar.bz2 +Patch0: stardict-2.4.5-invalid-cplusplus.patch BuildRoot: %{_builddir}/%{name}-%{version}-root Requires: libgnome >= 2.2.0 @@ -21,6 +22,7 @@ %prep %setup +%patch0 -p 0 %build @@ -58,6 +60,9 @@ if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi %changelog +* Fri Jan 13 2006 Leon Ho 2.4.5-2 +- added in patch to fix #176890 + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Fri Jan 13 03:50:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 12 Jan 2006 22:50:13 -0500 Subject: rpms/redhat-lsb/devel lsb-release-2.0-disable-etc-lsb-release.patch, NONE, 1.1 lsb-release-2.0.tar.gz, NONE, 1.1 .cvsignore, 1.4, 1.5 redhat-lsb.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200601130350.k0D3oDv8005255@cvs.devel.redhat.com> Author: llch Update of /cvs/dist/rpms/redhat-lsb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5243 Modified Files: .cvsignore redhat-lsb.spec sources Added Files: lsb-release-2.0-disable-etc-lsb-release.patch lsb-release-2.0.tar.gz Log Message: Migrate to rawhide lsb-release-2.0-disable-etc-lsb-release.patch: lsb_release | 10 ---------- 1 files changed, 10 deletions(-) --- NEW FILE lsb-release-2.0-disable-etc-lsb-release.patch --- --- lsb-release-2.0.orig/lsb_release 2004-07-01 03:30:34.000000000 +1000 +++ lsb-release-2.0/lsb_release 2005-08-03 23:31:58.000000000 +1000 @@ -188,15 +188,6 @@ # Get/Init LSB infos (maybe Distrib infos too) GetLSBInfo() { - if [ -f "$INFO_ROOT/$INFO_LSB_FILE" ] - then - # should init at least LSB_VERSION - . "$INFO_ROOT/$INFO_LSB_FILE" - fi - if [ -z "$LSB_VERSION" ] - then - LSB_VERSION=$MSG_NA - else # if we found LSB_VERSION, continue to look in directory if [ -d "$INFO_ROOT/$INFO_LSB_DIR" ] then @@ -205,7 +196,6 @@ LSB_VERSION=$LSB_VERSION:`basename $tag` done fi - fi } # Get the whole distrib information string (from ARG $1 file) --- NEW FILE lsb-release-2.0.tar.gz --- ? I??#H I? ?? g??Ln?8??G?;??M???????2??????;??)O??7X?!:m?eth?????(???-l?G?H????=i?v?A?t8??u`?V?Z+?????8????z[?2???uA;???(-???`????$?N??q??f????????]:/?r?_?,?me??w??SQ?E?3?;-????,?Y????? ?5?W?K?S?#??4KS??$??M?m????????^???"?P??Y4XG?;?2??Sg;??MA??? ?q?N???~I??,j?/ ?>?&u???h?d?? |?R?E-? ^?5?R;???a|4.?J?$??yz?????????K?oR???v??-kgV???YT?:?,k%7?,KC?Z?Y???????Rx"a??]?";?d???<*H+%9n? ?????;?S??6?+?|a?*?X???t?fi??8D;?D?Q?????"'?M??K2_? ?o1E???8???k{?CVkCn??W?2?3??`#>?W?Rg??[???V ,Wr#M??/?w???????????SX???$:?&?5o ?*?xW1?+-?W ??9f%??j????2[??>=???$i?+u??:?8?????L????N!T?????Y??9?Y??.?E????O??X??yLu???????1??????? ???7z?w?X??g?? @*Ol? ?y??K?B;>???$(b?A?8????? N??^??? & x?Y????G ?????????????JL?r??:?? ???$r??wCE(6?+* hWp[??j?$??W?cj?; ???]?3?rMN??s??'[a??????7_?{???s?Z??w??pU71]dS??????r_ ????b?!???? ?.??#?d??;W?~{?.a ??s???W>?u.FUJX ????5??)MR?I*j??p` ?KZ??/ ?[> ?????C????0j?o?w?W????Af??B?!???Oa?4??L? X?xI?P???? /F?5Q???? ?NN??????Ra????+?F(???F ;(??p.?n?/??Q( ?A??k??????????e ??}c?mR?4?"?Dv?Y??C?H??Y*?Aft?]q?M?????????`??a9@?TN?Y????B??????e?Sz???k?YXd?;?Ku??$???? ?p?,?@K.???wm+??%?sB?)Q??;|?????b??v^???qcuT?C.??w?????0??r?\?-??"1???E?&s?"??s??ney???  !???k\_NW|???c???8??Z)m?TvYm?2??-?o??b2|?L?Tz?Tg????t+7?????_D\??d {?C?eqZ???-?LB'l????????????e ???? O?????k????;???VO_??2~??K?0?2??u?2&??yMh?<G??)????W$?!?,07??J????3?????>?On?u/b?6??????QIA?U?d+???w??VX?K?n???,EE.?l???2?#z?$?w #??W??o?|??a1zA^??8%??a%????????:??sr???????LB)1???E,?5?? z?L?l?+E???????'?????'6???!m???(???,b??uu???;^??o???????)??9 ?0:???N???????????Zr+cR}?F??:????(?? ??????? _#X?`?????-rO?? ?.?EK??G?k???ITu?????39?.??\????;?????'????r???wmcz?????b]??-,?8????,??_?lw?I??7??c? q?4?[??(qQ?v???r????9l???7_n)??Hd???W X??!G??i?% ?F????s^?)B?U6??7?j???]???? A,?b?`??r?v???1?cq? ???eb??|??B-???rD}G???CD&??9?@??n??N???2????D??ul???BB???3???/?(??PhKL??}????H???a8#??O???m?=????h>??\_^?//<\z?????,??_????q?v????????G?) ?G?X<6??&?Ho?Uc?$R?C?D??_L?L ?A??x????? ?`.8b7????Q?????????5??????t*??$Vz???>|?=?.?????????S??%-?Fj??????FH?.2?m??1H? ????[ 2Q?8??????C~~i??d$??E8 ??X?k???LE??8????2??g&?mj??O0 Ws? A??????T+???yC?Ffew_?????}??????4?:???DW???ZE??? ?D??????/??l??8??u?Q0?? u?c/?Kr?n8E?????{??G???Z ? { ????o??? ???? ?.?.?? ?Bd???X?4P7?txT!??V???Z?~?????[gN?|"?f??X?l?TCC\?Aa{? ?d?"H?D??YR???~/TxF????U0??n??????=-???w(????)??$*?0!? ??&????d?hJ?TL?7 +n?Y4???????N(__?C}N6U??J??~,????tr-??3???o&I?????|k???U?W?.N:>??FR??????Z?Pc???s?! E??-?l??? | ??Z?kE-n??????z?r]?I:{????o< ??N Q????0 q?~MG????wv_?7?}????^?C.?b?????????G7???????|??]Z???x?c.?'?q ?v??? ??|k?X2:??&?yt???mC?xO?`c>`W?p???G??* ????)??i1)?R???k???/??7?}?[?!o#?3????????X?????G?G?-????x?V?l ????s?Y????i?"??1?.??2?????`?K ?? ??$? kx?XC?_?q~? /?????????0?tg?H?? ?qXN??e? {? ?????.? ~ ??>9?K0??#???|*JK???5=?n???v?????????V??!V??? ?8?i??m???a??)???H? ??.??DF???????D?"?%?D?lUD|?U]o? ??P?q?Z??WV??,!Y(e[+CL ?7???n?S???8?? 1"a???????2h{?z?ww?+n?K???[??/??'  ??By?btur?)? 5????????j??XH! ?9k??h?A??4L????0??5/> C????Et?75?;???pq?\+??????Z=z? ?i>?2`??,?A? ?='??1?h0?%R???h?? %??%4y"I??B???????t? ??gP??i?I?Y?TJ?2??4 ??????{??CtEC??,?N ??-?Z??????-????{?I;????5&TO????4?F?_?]Qr????&??aR?`5|?W?@$?b?P??Q^%r$?k???1? ??x? 5#v?????)(?d?????ZzH??d??~?????=??eB?V??6w)??$r8???????????k?$b>??|???s??*h????V?W?%?N???u??Q4???~{? O??C??G?TvZ?a+$?7q????o?/_?b???hx? ?]??+?@Z???!??:??*??k(???0?k?e??b??B?9??*??W?Ec????&D ??qr???Z???U.?U??j^??????*???ha78?????V???a?'Fm?ea????:_????]h^Q?,F ?=3V??hi?f `s?JQ????%f?h?V9/@ Q??C #[?????!?`?~? =KPH????d?0????cR?????+???L.???B????????$?]T%?57?6M*?z?????%????????)?" ?x#??????Hw??v??W?{??G?z??????o?K???p?NJ?????9?`_?(?cW cr?q;????*0??I???r?nLYz{?+??s??7?}\???@?????y?.s?? ?5?,?}vt?"???P:??<?Iop??&(????T?'?Q??D????(??Ol'??M1???X?LqM?]j????e????????????????aZ q? ? ?b@?????D?2?b|?wC?H%??U?S%?H??#+T?????x??a???G??_n/????)m??R?tR,????D6Y?o?E???S$?????7:??S?pR?[@?/?r2b&?Ww?4???????&?=%?8? ??h?x"??NB?s:??????!p{?????q?tY??.?n ?? ???9???]?) 9?:??\v??7??X$?n/??5??0???W?2???=????`tq??P??T?=??0? ???0B??}?K?OI >?S???$ ??^'T!^???Oc?:??????ar? ????.0a9???O?S??? ?5v??F?n?w????O???k?=??-?[}i)????????K??"/+aZNf1 lI??@?@i/??K??Bs ?E?^Q? ??#B9???$`???????J{o? ?H?????#B~w;B?E?7??(j ??:!?E?a?cg?MN (7&?UC??????#dE??Xg?K9(????F1??w*??? ?:wn{?K?~ ?ATp????E???]?5???/??lOR??? ?y?M$ztK?6+??6<,8w???+? ????*?Ee??????;6Y^2?????????m?? ?S ?Kw?}?L?f???y;?[??v???0?%?2vR?r8??7???2Y????M??Crk?9??'t? ??'???????k???6?Jy?At?3V)e?U??tG??!???Xf??V?Y???B?m???=?g????3{f???=?g????3{f???=?g????3{f???=?g????3{f???=?g????3{f???=???? ?h? Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/redhat-lsb/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Sep 2004 11:27:09 -0000 1.4 +++ .cvsignore 13 Jan 2006 03:50:11 -0000 1.5 @@ -1,2 +1,3 @@ lsb-release-1.4.tar.gz redhat-lsb-1.3.tar.bz2 +redhat-lsb-3.0-1.tar.bz2 Index: redhat-lsb.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-lsb/devel/redhat-lsb.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- redhat-lsb.spec 9 Dec 2005 22:42:58 -0000 1.13 +++ redhat-lsb.spec 13 Jan 2006 03:50:11 -0000 1.14 @@ -1,5 +1,5 @@ # Define this to link to which library version -%define lsbsover 1 2 +%define lsbsover 3 %ifarch %{ix86} %define ldso ld-linux.so.2 @@ -42,48 +42,49 @@ %define qual %{nil} %endif -%define lsbrelver 1.4 +%define lsbrelver 2.0 +%define srcrelease 1 Summary: LSB support for Red Hat Linux Name: redhat-lsb -Version: 1.3 -Release: 10.1 +Version: 3.0 +Release: 9 URL: http://www.linuxbase.org/ -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}-%{srcrelease}.tar.bz2 Source1: http://prdownloads.sourceforge.net/lsb/lsb-release-%{lsbrelver}.tar.gz +Patch0: lsb-release-2.0-disable-etc-lsb-release.patch License: GPL Group: System Environment/Base BuildRoot: %{_tmppath}/%{name}-root # dependency for primary LSB application for v1.3 Provides: lsb = %{version} -# dependency for primary LSB application for v2.0 +# dependency for primary LSB application for v2.0 and v3.0 %ifarch %{ix86} -Provides: lsb-core-ia32 = %{version} +%define archname ia32 %endif %ifarch ia64 -Provides: lsb-core-ia64 = %{version} +%define archname ia64 %endif %ifarch ppc -Provides: lsb-core-ppc32 = %{version} +%define archname ppc32 %endif %ifarch ppc64 -Provides: lsb-core-ppc64 = %{version} +%define archname ppc64 %endif %ifarch s390 -Provides: lsb-core-s390 = %{version} +%define archname s390 %endif %ifarch s390x -Provides: lsb-core-s390x = %{version} +%define archname s390x %endif %ifarch x86_64 -Provides: lsb-core-amd64 = %{version} +%define archname amd64 %endif +Provides: lsb-core-%{archname} = %{version} +Provides: lsb-graphics-%{archname} = %{version} +Provides: lsb-core-noarch = %{version} +Provides: lsb-graphics-noarch = %{version} -%ifarch ia64 ppc64 s390x x86_64 -%define qual ()(64bit) -%else -%define qual %{nil} -%endif ExclusiveArch: i386 ia64 x86_64 ppc ppc64 s390 s390x %ifarch %{ix86} @@ -91,6 +92,7 @@ Requires: libcrypt.so.1 Requires: libc.so.6 Requires: libdl.so.2 +Requires: libgcc_s.so.1 Requires: libm.so.6 Requires: libpthread.so.0 %endif @@ -100,6 +102,7 @@ Requires: libcrypt.so.1()(64bit) Requires: libc.so.6.1()(64bit) Requires: libdl.so.2()(64bit) +Requires: libgcc_s.so.1()(64bit) Requires: libm.so.6.1()(64bit) Requires: libpthread.so.0()(64bit) %endif @@ -109,6 +112,7 @@ Requires: libcrypt.so.1 Requires: libc.so.6 Requires: libdl.so.2 +Requires: libgcc_s.so.1 Requires: libm.so.6 Requires: libpthread.so.0 %endif @@ -118,6 +122,7 @@ Requires: libcrypt.so.1()(64bit) Requires: libc.so.6()(64bit) Requires: libdl.so.2()(64bit) +Requires: libgcc_s.so.1()(64bit) Requires: libm.so.6()(64bit) Requires: libpthread.so.0()(64bit) %endif @@ -127,6 +132,7 @@ Requires: libcrypt.so.1 Requires: libc.so.6 Requires: libdl.so.2 +Requires: libgcc_s.so.1 Requires: libm.so.6 Requires: libpthread.so.0 %endif @@ -136,15 +142,17 @@ Requires: libcrypt.so.1()(64bit) Requires: libc.so.6()(64bit) Requires: libdl.so.2()(64bit) +Requires: libgcc_s.so.1()(64bit) Requires: libm.so.6()(64bit) Requires: libpthread.so.0()(64bit) %endif %ifarch x86_64 -# archLSB X86-64 Base Libraries +# archLSB AMD64 Base Libraries Requires: libcrypt.so.1()(64bit) Requires: libc.so.6()(64bit) Requires: libdl.so.2()(64bit) +Requires: libgcc_s.so.1()(64bit) Requires: libm.so.6()(64bit) Requires: libpthread.so.0()(64bit) %endif @@ -153,9 +161,13 @@ Requires: libpthread.so.0%{qual} Requires: libgcc_s.so.1%{qual} Requires: libdl.so.2%{qual} +Requires: librt.so.1%{qual} Requires: libcrypt.so.1%{qual} Requires: libpam.so.0%{qual} +# LSB Base C++ +Requires: libstdc++.so.6%{qual} + # gLSB Utility Libraries Requires: libz.so.1%{qual} Requires: libncurses.so.5%{qual} @@ -163,14 +175,14 @@ # gLSB Graphics Libraries Requires: libX11.so.6%{qual} -Requires: libXext.so.6%{qual} Requires: libSM.so.6%{qual} Requires: libICE.so.6%{qual} Requires: libXt.so.6%{qual} +Requires: libXext.so.6%{qual} +Requires: libXi.so.6%{qual} Requires: libGL.so.1%{qual} # gLSB Command and Utilities -Requires: /bin/awk Requires: /bin/basename Requires: /bin/cat Requires: /bin/chgrp @@ -178,24 +190,21 @@ Requires: /bin/chown Requires: /bin/cp Requires: /bin/cpio -Requires: /bin/cut Requires: /bin/date Requires: /bin/dd Requires: /bin/df Requires: /bin/dmesg Requires: /bin/echo +Requires: /bin/ed Requires: /bin/egrep -Requires: /bin/env Requires: /bin/false Requires: /bin/fgrep -Requires: /bin/gettext Requires: /bin/grep -Requires: /bin/gunzip -Requires: /bin/gzip Requires: /bin/hostname -Requires: /bin/kill Requires: /bin/ln Requires: /bin/ls +#Requires: /bin/mailx +Requires: mailx Requires: /bin/mkdir Requires: /bin/mknod Requires: /bin/mktemp @@ -225,6 +234,7 @@ Requires: /usr/bin/[ Requires: /usr/bin/ar Requires: /usr/bin/at +Requires: /usr/bin/awk Requires: /usr/bin/batch Requires: /usr/bin/bc Requires: /usr/bin/chfn @@ -235,9 +245,11 @@ Requires: /usr/bin/comm Requires: /usr/bin/crontab Requires: /usr/bin/csplit +Requires: /usr/bin/cut Requires: /usr/bin/diff Requires: /usr/bin/dirname Requires: /usr/bin/du +Requires: /usr/bin/env Requires: /usr/bin/expand Requires: /usr/bin/expr Requires: /usr/bin/file @@ -245,7 +257,10 @@ Requires: /usr/bin/fold Requires: /usr/bin/gencat Requires: /usr/bin/getconf +Requires: /usr/bin/gettext Requires: /usr/bin/groups +Requires: /usr/bin/gunzip +Requires: /usr/bin/gzip Requires: /usr/bin/head Requires: /usr/bin/iconv Requires: /usr/bin/id @@ -253,10 +268,13 @@ Requires: /usr/bin/ipcrm Requires: /usr/bin/ipcs Requires: /usr/bin/join +Requires: /usr/bin/kill Requires: /usr/bin/killall Requires: /usr/bin/locale Requires: /usr/bin/localedef +Requires: /usr/bin/logger Requires: /usr/bin/logname +Requires: /usr/bin/lp Requires: /usr/bin/lpr Requires: /usr/bin/m4 Requires: /usr/bin/make @@ -272,13 +290,12 @@ Requires: /usr/bin/paste Requires: /usr/bin/patch Requires: /usr/bin/pathchk +Requires: /usr/bin/pax Requires: /usr/bin/pr Requires: /usr/bin/printf Requires: /usr/bin/renice -Requires: /usr/bin/rsync Requires: /usr/bin/split Requires: /usr/bin/strip -Requires: /usr/bin/sum Requires: /usr/bin/tail Requires: /usr/bin/tee Requires: /usr/bin/test @@ -310,6 +327,7 @@ %prep %setup -q -a 1 +%patch0 -p 0 %build cd lsb-release-%{lsbrelver} @@ -318,59 +336,102 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc $RPM_BUILD_ROOT/%{_lib} $RPM_BUILD_ROOT/%{_mandir} \ - $RPM_BUILD_ROOT/%{_bindir} $RPM_BUILD_ROOT/usr/lib/lsb + $RPM_BUILD_ROOT/%{_bindir} $RPM_BUILD_ROOT/usr/lib/lsb \ + $RPM_BUILD_ROOT/etc/lsb-release.d/ $RPM_BUILD_ROOT/usr/sbin/ make DESTDIR=$RPM_BUILD_ROOT install cd lsb-release-%{lsbrelver} make mandir=$RPM_BUILD_ROOT/%{_mandir} prefix=$RPM_BUILD_ROOT/%{_prefix} install cd .. -cat > $RPM_BUILD_ROOT/etc/lsb-release < -- rebuilt +* Fri Jan 13 2006 Leon Ho 3.0-9 +- Migrated back to rawhide -* Thu Mar 17 2005 Leon Ho 1.3-10 +* Wed Aug 3 2005 Leon Ho 3.0-8.EL +- Added libstdc++.so.6/libGL.so.1 requirement (RH#154605) + +* Wed Aug 3 2005 Leon Ho 3.0-7.EL +- Fixed multilib problem on lsb_release not to read /etc/lsb-release and solely + depends on /etc/lsb-release.d/ (Advised by LSB committee) +- Removed /etc/lsb-release (Advised by LSB committee) + +* Mon Aug 1 2005 Leon Ho 3.0-6.EL +- Made the /etc/lsb-release useful (RH#154605) +- Added redhat_lsb_trigger to fix RH#160585 (Jakub Jelinek) +- Fixed AMD64 base libraries requirement parsing (RH#154605) + +* Fri Jul 29 2005 Leon Ho 3.0-5.EL +- Fixed redhat-lsb's mkredhat-lsb on fetching lib and cmd requirements (RH#154605) +- Changed explicit mailx command requirement to package requirements (RH#164124) +- Added mailx symlink to /bin/mail (RH#164124) +- Added lsb-core-noarch and lsb-graphics-noarch and lsb-graphics-{arch} requirements (RH#164468) +- Added requirements from lsb_release command on lsb-release.d and deps. (RH#164468) + +* Mon Jul 18 2005 Leon Ho 3.0-4.EL +- Rebuilt + +* Tue Jul 05 2005 Leon Ho 3.0-3.EL +- Disabled support for LSB 1.3 and 2.0 + +* Mon Jun 20 2005 Leon Ho 3.0-2.EL +- Upgraded to lsb-release 2.0 + +* Thu Jun 09 2005 Leon Ho 3.0-1.EL +- Moved to LSB 3.0 + +* Wed Apr 13 2005 Leon Ho 1.3-10 +- Fixed ix86 package with ia32 emul support * Tue Feb 01 2005 Leon Ho 1.3-9 - Sync what we have changed on the branches @@ -423,4 +484,3 @@ * Thu Jan 24 2002 Matt Wilson - Initial build. - Index: sources =================================================================== RCS file: /cvs/dist/rpms/redhat-lsb/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Sep 2004 11:28:17 -0000 1.6 +++ sources 13 Jan 2006 03:50:11 -0000 1.7 @@ -1,2 +1,3 @@ 30537ef5a01e0ca94b7b8eb6a36bb1e4 lsb-release-1.4.tar.gz f535414957ea3f7810b098f4ac7e4c50 redhat-lsb-1.3.tar.bz2 +6dc78435cc0837d9d75f7298587787bc redhat-lsb-3.0-1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 13 05:05:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 00:05:13 -0500 Subject: rpms/evolution/devel evolution-2.5.4-fix-nm-multiple-init.patch, NONE, 1.1 evolution.spec, 1.114, 1.115 Message-ID: <200601130505.k0D55Dhh026072@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25982 Modified Files: evolution.spec Added Files: evolution-2.5.4-fix-nm-multiple-init.patch Log Message: * Thu Jan 12 2006 David Malcolm - 2.5.4-8 - avoid multiple initialization of NetworkManager connections (patch 807, gnome bug #326875) evolution-2.5.4-fix-nm-multiple-init.patch: e-shell-nm-glib.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) --- NEW FILE evolution-2.5.4-fix-nm-multiple-init.patch --- --- evolution-2.5.4/shell/e-shell-nm-glib.c.fix-nm-multiple-init 2006-01-12 23:16:25.000000000 -0500 +++ evolution-2.5.4/shell/e-shell-nm-glib.c 2006-01-12 23:19:28.000000000 -0500 @@ -30,6 +30,7 @@ #include #include +static libnm_glib_ctx *nm_ctx = NULL; static void e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_data) { @@ -59,17 +60,18 @@ int e_shell_nm_glib_initialise (EShellWindow *window ) { - libnm_glib_ctx *ctx; guint id; - ctx = libnm_glib_init (); - if (!ctx) - { - fprintf (stderr, "Could not initialize libnm.\n"); - return FALSE; + if (!nm_ctx) { + nm_ctx = libnm_glib_init (); + if (!nm_ctx) + { + fprintf (stderr, "Could not initialize libnm.\n"); + return FALSE; + } } - id = libnm_glib_register_callback (ctx, e_shell_glib_network_monitor, window, NULL); + id = libnm_glib_register_callback (nm_ctx, e_shell_glib_network_monitor, window, NULL); return TRUE; } Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- evolution.spec 12 Jan 2006 23:34:45 -0000 1.114 +++ evolution.spec 13 Jan 2006 05:05:05 -0000 1.115 @@ -33,7 +33,7 @@ Name: evolution Version: 2.5.4 -Release: 7 +Release: 8 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -93,6 +93,7 @@ Patch804: evolution-2.4.1-fix-missing-declarations.patch Patch805: evolution-2.5.4-fix-missing-declarations.patch Patch806: evolution-2.5.4-port-to-new-libnotify-api.patch +Patch807: evolution-2.5.4-fix-nm-multiple-init.patch Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -234,6 +235,7 @@ %patch804 -p1 -b .fix-missing-declarations %patch805 -p1 -b .fix-missing-declarations-2-5-4 %patch806 -p1 -b .port-to-new-libnotify-api +%patch807 -p1 -b .fix-nm-multiple-init mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -510,6 +512,10 @@ %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Thu Jan 12 2006 David Malcolm - 2.5.4-8 +- avoid multiple initialization of NetworkManager connections (patch 807, + gnome bug #326875) + * Thu Jan 12 2006 David Malcolm - 2.5.4-7 - updated alarm notification patch(patch 806, #177546, #177666, #177667, #177670) From fedora-cvs-commits at redhat.com Fri Jan 13 05:14:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 00:14:05 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1848,1.1849 Message-ID: <200601130514.k0D5E5WW027627@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27594 Modified Files: kernel-2.6.spec Log Message: Use arch-specific build dir so we can have more than one built kernel lying around in our work directories Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1848 retrieving revision 1.1849 diff -u -r1.1848 -r1.1849 --- kernel-2.6.spec 13 Jan 2006 03:02:07 -0000 1.1848 +++ kernel-2.6.spec 13 Jan 2006 05:13:53 -0000 1.1849 @@ -572,11 +572,13 @@ else # We already have a vanilla dir. cd kernel-%{kversion} - mv linux-%{kversion} deleteme - rm -rf deleteme & + if [ -d linux-%{kversion}.%{_arch} ]; then + mv linux-%{kversion}.%{_arch} deleteme + rm -rf deleteme & + fi fi -cp -rl vanilla linux-%{kversion} -cd linux-%{kversion} +cp -rl vanilla linux-%{kversion}.%{_arch} +cd linux-%{kversion}.%{_arch} # Update to latest upstream. %patch1 -p1 @@ -919,10 +921,10 @@ gpg --homedir . --batch --gen-key %{SOURCE11} gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub -make linux-%{kversion}/scripts/bin2c -linux-%{kversion}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}/crypto/signature/key.h +make linux-%{kversion}.%{_arch}/scripts/bin2c +linux-%{kversion}.%{_arch}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_arch}/crypto/signature/key.h -cd linux-%{kversion} +cd linux-%{kversion}.%{_arch} @@ -1120,7 +1122,7 @@ %install -cd linux-%{kversion} +cd linux-%{kversion}.%{_arch} %if %{buildxen} mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d From fedora-cvs-commits at redhat.com Fri Jan 13 06:09:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 01:09:10 -0500 Subject: rpms/kernel/devel linux-2.6-queue-stall.patch, NONE, 1.1 linux-2.6.15-tif-restore-sigmask.patch, NONE, 1.1 kernel-2.6.spec, 1.1849, 1.1850 Message-ID: <200601130609.k0D69AmN019839@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19828 Modified Files: kernel-2.6.spec Added Files: linux-2.6-queue-stall.patch linux-2.6.15-tif-restore-sigmask.patch Log Message: Fix I/O queue stalls, test TIF_RESTORE_SIGMASK patch linux-2.6-queue-stall.patch: elevator.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) --- NEW FILE linux-2.6-queue-stall.patch --- >From git-commits-head-owner at vger.kernel.org Thu Jan 12 18:14:30 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Thu, 12 Jan 2006 18:14:30 +0000 Received: from canuck.infradead.org ([2001:8b0:10b:4::1]) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ex6xx-0007fr-LB for dwmw2 at baythorne.infradead.org; Thu, 12 Jan 2006 18:14:30 +0000 Received: from vger.kernel.org ([209.132.176.167]) by canuck.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id 1Ex6xu-0001wk-St for dwmw2 at lists.infradead.org; Thu, 12 Jan 2006 13:14:27 -0500 Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand id S932549AbWALSOY (ORCPT ); Thu, 12 Jan 2006 13:14:24 -0500 Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1751359AbWALSOY (ORCPT ); Thu, 12 Jan 2006 13:14:24 -0500 Received: from hera.kernel.org ([140.211.167.34]:16267 "EHLO hera.kernel.org") by vger.kernel.org with ESMTP id S1751205AbWALSOX (ORCPT ); Thu, 12 Jan 2006 13:14:23 -0500 Received: from hera.kernel.org (localhost [127.0.0.1]) by hera.kernel.org (8.13.1/8.13.1) with ESMTP id k0CIEMSS023522 for ; Thu, 12 Jan 2006 10:14:22 -0800 Received: (from dwmw2 at localhost) by hera.kernel.org (8.13.1/8.13.1/Submit) id k0CIEMgW023521 for git-commits-head at vger.kernel.org; Thu, 12 Jan 2006 10:14:22 -0800 Date: Thu, 12 Jan 2006 10:14:22 -0800 Message-Id: <200601121814.k0CIEMgW023521 at hera.kernel.org> From: Linux Kernel Mailing List To: git-commits-head at vger.kernel.org Subject: [PATCH] fix queue stalling while barrier sequencing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Git-Commit: 1bc691d357c646700b9523d2aeca02847d3fb3f4 X-Git-Parent: 593195f9b2309693f27b402f34573f7920b82c3e X-Virus-Scanned: ClamAV version 0.85, clamav-milter version 0.85 on localhost X-Virus-Status: Clean Sender: git-commits-head-owner at vger.kernel.org Precedence: bulk X-Mailing-List: git-commits-head at vger.kernel.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit tree 430e13982f894c44e4a33dee188b3c718ec989ed parent 593195f9b2309693f27b402f34573f7920b82c3e author Tejun Heo Thu, 12 Jan 2006 15:39:26 +0100 committer Linus Torvalds Fri, 13 Jan 2006 01:05:39 -0800 [PATCH] fix queue stalling while barrier sequencing If ordered tag isn't supported, request ordering for barrier sequencing is performed by queue draining, which basically hangs the request queue until elv_completed_request() reports completion of all previous fs requests. The condition check in elv_completed_request() was only performed for fs requests. If a special request is queued between the last to-be-drained request and the barrier sequence, draining is never completed and the queue is stalled forever. This patch moves the end-of-draining condition check such that it's performed for all requests. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds block/elevator.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/block/elevator.c b/block/elevator.c index 99a4d7b..1d07591 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -610,23 +610,23 @@ void elv_completed_request(request_queue * request is released from the driver, io must be done */ if (blk_account_rq(rq)) { - struct request *first_rq = list_entry_rq(q->queue_head.next); - q->in_flight--; + if (blk_sorted_rq(rq) && e->ops->elevator_completed_req_fn) + e->ops->elevator_completed_req_fn(q, rq); + } - /* - * Check if the queue is waiting for fs requests to be - * drained for flush sequence. - */ - if (q->ordseq && q->in_flight == 0 && + /* + * Check if the queue is waiting for fs requests to be + * drained for flush sequence. + */ + if (unlikely(q->ordseq)) { + struct request *first_rq = list_entry_rq(q->queue_head.next); + if (q->in_flight == 0 && blk_ordered_cur_seq(q) == QUEUE_ORDSEQ_DRAIN && blk_ordered_req_seq(first_rq) > QUEUE_ORDSEQ_DRAIN) { blk_ordered_complete_seq(q, QUEUE_ORDSEQ_DRAIN, 0); q->request_fn(q); } - - if (blk_sorted_rq(rq) && e->ops->elevator_completed_req_fn) - e->ops->elevator_completed_req_fn(q, rq); } } - 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 linux-2.6.15-tif-restore-sigmask.patch: arch/frv/kernel/signal.c | 120 +++++++++++++------------------------- arch/i386/kernel/signal.c | 109 +++++++++++++++------------------- arch/powerpc/kernel/entry_32.S | 8 +- arch/powerpc/kernel/entry_64.S | 2 arch/powerpc/kernel/signal_32.c | 76 ++++++------------------ arch/powerpc/kernel/signal_64.c | 56 +++++------------ include/asm-frv/thread_info.h | 2 include/asm-frv/unistd.h | 1 include/asm-i386/signal.h | 1 include/asm-i386/thread_info.h | 2 include/asm-i386/unistd.h | 1 include/asm-powerpc/thread_info.h | 5 + include/asm-powerpc/unistd.h | 2 include/linux/sched.h | 1 kernel/compat.c | 28 ++++++++ kernel/signal.c | 26 ++++++++ 16 files changed, 202 insertions(+), 238 deletions(-) --- NEW FILE linux-2.6.15-tif-restore-sigmask.patch --- diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index 5b7146f..679c1d5 100644 --- a/arch/frv/kernel/signal.c +++ b/arch/frv/kernel/signal.c @@ -35,74 +35,22 @@ struct fdpic_func_descriptor { unsigned long GOT; }; -static int do_signal(sigset_t *oldset); - /* * Atomically swap in the new signal mask, and wait for a signal. */ asmlinkage int sys_sigsuspend(int history0, int history1, old_sigset_t mask) { - sigset_t saveset; - mask &= _BLOCKABLE; spin_lock_irq(¤t->sighand->siglock); - saveset = current->blocked; + current->saved_sigmask = current->blocked; siginitset(¤t->blocked, mask); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); - __frame->gr8 = -EINTR; - while (1) { - current->state = TASK_INTERRUPTIBLE; - schedule(); - if (do_signal(&saveset)) - /* return the signal number as the return value of this function - * - this is an utterly evil hack. syscalls should not invoke do_signal() - * as entry.S sets regs->gr8 to the return value of the system call - * - we can't just use sigpending() as we'd have to discard SIG_IGN signals - * and call waitpid() if SIGCHLD needed discarding - * - this only works on the i386 because it passes arguments to the signal - * handler on the stack, and the return value in EAX is effectively - * discarded - */ - return __frame->gr8; - } -} - -asmlinkage int sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize) -{ - sigset_t saveset, newset; - - /* XXX: Don't preclude handling different sized sigset_t's. */ - if (sigsetsize != sizeof(sigset_t)) - return -EINVAL; - - if (copy_from_user(&newset, unewset, sizeof(newset))) - return -EFAULT; - sigdelsetmask(&newset, ~_BLOCKABLE); - - spin_lock_irq(¤t->sighand->siglock); - saveset = current->blocked; - current->blocked = newset; - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); - - __frame->gr8 = -EINTR; - while (1) { - current->state = TASK_INTERRUPTIBLE; - schedule(); - if (do_signal(&saveset)) - /* return the signal number as the return value of this function - * - this is an utterly evil hack. syscalls should not invoke do_signal() - * as entry.S sets regs->gr8 to the return value of the system call - * - we can't just use sigpending() as we'd have to discard SIG_IGN signals - * and call waitpid() if SIGCHLD needed discarding - * - this only works on the i386 because it passes arguments to the signal - * handler on the stack, and the return value in EAX is effectively - * discarded - */ - return __frame->gr8; - } + current->state = TASK_INTERRUPTIBLE; + schedule(); + set_thread_flag(TIF_RESTORE_SIGMASK); + return -ERESTARTNOHAND; } asmlinkage int sys_sigaction(int sig, @@ -372,11 +320,11 @@ static int setup_frame(int sig, struct k frame->pretcode); #endif - return 1; + return 0; give_sigsegv: force_sig(SIGSEGV, current); - return 0; + return -EFAULT; } /* end setup_frame() */ @@ -471,11 +419,11 @@ static int setup_rt_frame(int sig, struc frame->pretcode); #endif - return 1; + return 0; give_sigsegv: force_sig(SIGSEGV, current); - return 0; + return -EFAULT; } /* end setup_rt_frame() */ @@ -516,7 +464,7 @@ static int handle_signal(unsigned long s else ret = setup_frame(sig, ka, oldset); - if (ret) { + if (ret == 0) { spin_lock_irq(¤t->sighand->siglock); sigorsets(¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); @@ -536,10 +484,11 @@ static int handle_signal(unsigned long s * want to handle. Thus you cannot kill init even with a SIGKILL even by * mistake. */ -static int do_signal(sigset_t *oldset) +static void do_signal(void) { struct k_sigaction ka; siginfo_t info; + sigset_t *oldset; int signr; /* @@ -549,43 +498,62 @@ static int do_signal(sigset_t *oldset) * if so. */ if (!user_mode(__frame)) - return 1; + return; if (try_to_freeze()) goto no_signal; - if (!oldset) + if (test_thread_flag(TIF_RESTORE_SIGMASK)) + oldset = ¤t->saved_sigmask; + else oldset = ¤t->blocked; signr = get_signal_to_deliver(&info, &ka, __frame, NULL); - if (signr > 0) - return handle_signal(signr, &info, &ka, oldset); + if (signr > 0) { + if (handle_signal(signr, &info, &ka, oldset) == 0) { + /* a signal was successfully delivered; the saved + * sigmask will have been stored in the signal frame, + * and will be restored by sigreturn, so we can simply + * clear the TIF_RESTORE_SIGMASK flag */ + if (test_thread_flag(TIF_RESTORE_SIGMASK)) + clear_thread_flag(TIF_RESTORE_SIGMASK); + } + + return; + } no_signal: /* Did we come from a system call? */ if (__frame->syscallno >= 0) { /* Restart the system call - no handlers present */ - if (__frame->gr8 == -ERESTARTNOHAND || - __frame->gr8 == -ERESTARTSYS || - __frame->gr8 == -ERESTARTNOINTR) { + switch (__frame->gr8) { + case -ERESTARTNOHAND: + case -ERESTARTSYS: + case -ERESTARTNOINTR: __frame->gr8 = __frame->orig_gr8; __frame->pc -= 4; - } + break; - if (__frame->gr8 == -ERESTART_RESTARTBLOCK){ + case -ERESTART_RESTARTBLOCK: __frame->gr8 = __NR_restart_syscall; __frame->pc -= 4; + break; } } - return 0; + /* if there's no signal to deliver, we just put the saved sigmask + * back */ + if (test_thread_flag(TIF_RESTORE_SIGMASK)) { + clear_thread_flag(TIF_RESTORE_SIGMASK); + sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL); + } } /* end do_signal() */ /*****************************************************************************/ /* * notification of userspace execution resumption - * - triggered by current->work.notify_resume + * - triggered by the TIF_WORK_MASK flags */ asmlinkage void do_notify_resume(__u32 thread_info_flags) { @@ -594,7 +562,7 @@ asmlinkage void do_notify_resume(__u32 t clear_thread_flag(TIF_SINGLESTEP); /* deal with pending signal delivery */ - if (thread_info_flags & _TIF_SIGPENDING) - do_signal(NULL); + if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) + do_signal(); } /* end do_notify_resume() */ diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c index adcd069..963616d 100644 --- a/arch/i386/kernel/signal.c +++ b/arch/i386/kernel/signal.c @@ -37,51 +37,17 @@ asmlinkage int sys_sigsuspend(int history0, int history1, old_sigset_t mask) { - struct pt_regs * regs = (struct pt_regs *) &history0; - sigset_t saveset; - mask &= _BLOCKABLE; spin_lock_irq(¤t->sighand->siglock); - saveset = current->blocked; + current->saved_sigmask = current->blocked; siginitset(¤t->blocked, mask); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); - regs->eax = -EINTR; - while (1) { - current->state = TASK_INTERRUPTIBLE; - schedule(); - if (do_signal(regs, &saveset)) - return -EINTR; - } -} - -asmlinkage int -sys_rt_sigsuspend(struct pt_regs regs) -{ - sigset_t saveset, newset; - - /* XXX: Don't preclude handling different sized sigset_t's. */ - if (regs.ecx != sizeof(sigset_t)) - return -EINVAL; - - if (copy_from_user(&newset, (sigset_t __user *)regs.ebx, sizeof(newset))) - return -EFAULT; - sigdelsetmask(&newset, ~_BLOCKABLE); - - spin_lock_irq(¤t->sighand->siglock); - saveset = current->blocked; - current->blocked = newset; - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); - - regs.eax = -EINTR; - while (1) { - current->state = TASK_INTERRUPTIBLE; - schedule(); - if (do_signal(®s, &saveset)) - return -EINTR; - } + current->state = TASK_INTERRUPTIBLE; + schedule(); + set_thread_flag(TIF_RESTORE_SIGMASK); + return -ERESTARTNOHAND; } asmlinkage int @@ -433,11 +399,11 @@ static int setup_frame(int sig, struct k current->comm, current->pid, frame, regs->eip, frame->pretcode); #endif - return 1; + return 0; give_sigsegv: force_sigsegv(sig, current); - return 0; + return -EFAULT; } static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, @@ -527,11 +493,11 @@ static int setup_rt_frame(int sig, struc current->comm, current->pid, frame, regs->eip, frame->pretcode); #endif - return 1; + return 0; give_sigsegv: force_sigsegv(sig, current); - return 0; + return -EFAULT; } /* @@ -581,7 +547,7 @@ handle_signal(unsigned long sig, siginfo else ret = setup_frame(sig, ka, oldset, regs); - if (ret) { + if (ret == 0) { spin_lock_irq(¤t->sighand->siglock); sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); if (!(ka->sa.sa_flags & SA_NODEFER)) @@ -598,11 +564,12 @@ handle_signal(unsigned long sig, siginfo * want to handle. Thus you cannot kill init even with a SIGKILL even by * mistake. */ -int fastcall do_signal(struct pt_regs *regs, sigset_t *oldset) +static void fastcall do_signal(struct pt_regs *regs) { siginfo_t info; int signr; struct k_sigaction ka; + sigset_t *oldset; /* * We want the common case to go fast, which @@ -613,12 +580,14 @@ int fastcall do_signal(struct pt_regs *r * CS suffices. */ if (!user_mode(regs)) - return 1; + return; if (try_to_freeze()) goto no_signal; - if (!oldset) + if (test_thread_flag(TIF_RESTORE_SIGMASK)) + oldset = ¤t->saved_sigmask; + else oldset = ¤t->blocked; signr = get_signal_to_deliver(&info, &ka, regs, NULL); @@ -628,38 +597,55 @@ int fastcall do_signal(struct pt_regs *r * have been cleared if the watchpoint triggered * inside the kernel. */ - if (unlikely(current->thread.debugreg[7])) { + if (unlikely(current->thread.debugreg[7])) set_debugreg(current->thread.debugreg[7], 7); - } /* Whee! Actually deliver the signal. */ - return handle_signal(signr, &info, &ka, oldset, regs); + if (handle_signal(signr, &info, &ka, oldset, regs) == 0) { + /* a signal was successfully delivered; the saved + * sigmask will have been stored in the signal frame, + * and will be restored by sigreturn, so we can simply + * clear the TIF_RESTORE_SIGMASK flag */ + if (test_thread_flag(TIF_RESTORE_SIGMASK)) + clear_thread_flag(TIF_RESTORE_SIGMASK); + } + + return; } - no_signal: +no_signal: /* Did we come from a system call? */ if (regs->orig_eax >= 0) { /* Restart the system call - no handlers present */ - if (regs->eax == -ERESTARTNOHAND || - regs->eax == -ERESTARTSYS || - regs->eax == -ERESTARTNOINTR) { + switch (regs->eax) { + case -ERESTARTNOHAND: + case -ERESTARTSYS: + case -ERESTARTNOINTR: regs->eax = regs->orig_eax; regs->eip -= 2; - } - if (regs->eax == -ERESTART_RESTARTBLOCK){ + break; + + case -ERESTART_RESTARTBLOCK: regs->eax = __NR_restart_syscall; regs->eip -= 2; + break; } } - return 0; + + /* if there's no signal to deliver, we just put the saved sigmask + * back */ + if (test_thread_flag(TIF_RESTORE_SIGMASK)) { + clear_thread_flag(TIF_RESTORE_SIGMASK); + sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL); + } } /* * notification of userspace execution resumption - * - triggered by current->work.notify_resume + * - triggered by the TIF_WORK_MASK flags */ __attribute__((regparm(3))) -void do_notify_resume(struct pt_regs *regs, sigset_t *oldset, +void do_notify_resume(struct pt_regs *regs, void *_unused, __u32 thread_info_flags) { /* Pending single-step? */ @@ -667,9 +653,10 @@ void do_notify_resume(struct pt_regs *re regs->eflags |= TF_MASK; clear_thread_flag(TIF_SINGLESTEP); } + /* deal with pending signal delivery */ - if (thread_info_flags & _TIF_SIGPENDING) - do_signal(regs,oldset); + if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) + do_signal(regs); clear_thread_flag(TIF_IRET); } diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 036b71d..6aa7386 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -227,7 +227,7 @@ ret_from_syscall: MTMSRD(r10) lwz r9,TI_FLAGS(r12) li r8,-_LAST_ERRNO - andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_RESTOREALL) + andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_RESTOREALL|_TIF_RESTORE_SIGMASK) bne- syscall_exit_work cmplw 0,r3,r8 blt+ syscall_exit_cont @@ -357,7 +357,7 @@ save_user_nvgprs_cont: lwz r5,_MSR(r1) andi. r5,r5,MSR_PR beq ret_from_except - andi. r0,r9,_TIF_SIGPENDING + andi. r0,r9,_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK beq ret_from_except b do_user_signal 8: @@ -683,7 +683,7 @@ user_exc_return: /* r10 contains MSR_KE /* Check current_thread_info()->flags */ rlwinm r9,r1,0,0,(31-THREAD_SHIFT) lwz r9,TI_FLAGS(r9) - andi. r0,r9,(_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_RESTOREALL) + andi. r0,r9,(_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_RESTOREALL|_TIF_RESTORE_SIGMASK) bne do_work restore_user: @@ -917,7 +917,7 @@ recheck: lwz r9,TI_FLAGS(r9) andi. r0,r9,_TIF_NEED_RESCHED bne- do_resched - andi. r0,r9,_TIF_SIGPENDING + andi. r0,r9,_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK beq restore_user do_user_signal: /* r10 contains MSR_KERNEL here */ ori r10,r10,MSR_EE diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index aacebb3..b267045 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -160,7 +160,7 @@ syscall_exit: mtmsrd r10,1 ld r9,TI_FLAGS(r12) li r11,-_LAST_ERRNO - andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP|_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_RESTOREALL|_TIF_SAVE_NVGPRS|_TIF_NOERROR) + andi. r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SINGLESTEP|_TIF_SIGPENDING|_TIF_NEED_RESCHED|_TIF_RESTOREALL|_TIF_SAVE_NVGPRS|_TIF_NOERROR|_TIF_RESTORE_SIGMASK) bne- syscall_exit_work cmpld r3,r11 ld r5,_CCR(r1) diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index d3f0b6d..a12d0a5 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c @@ -252,8 +252,7 @@ int do_signal(sigset_t *oldset, struct p /* * Atomically swap in the new signal mask, and wait for a signal. */ -long sys_sigsuspend(old_sigset_t mask, int p2, int p3, int p4, int p6, int p7, - struct pt_regs *regs) +long sys_sigsuspend(old_sigset_t mask) { sigset_t saveset; @@ -264,55 +263,10 @@ long sys_sigsuspend(old_sigset_t mask, i recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); - regs->result = -EINTR; - regs->gpr[3] = EINTR; - regs->ccr |= 0x10000000; - while (1) { - current->state = TASK_INTERRUPTIBLE; - schedule(); - if (do_signal(&saveset, regs)) { - set_thread_flag(TIF_RESTOREALL); - return 0; - } - } -} - -long sys_rt_sigsuspend( -#ifdef CONFIG_PPC64 - compat_sigset_t __user *unewset, -#else - sigset_t __user *unewset, -#endif - size_t sigsetsize, int p3, int p4, - int p6, int p7, struct pt_regs *regs) -{ - sigset_t saveset, newset; - - /* XXX: Don't preclude handling different sized sigset_t's. */ - if (sigsetsize != sizeof(sigset_t)) - return -EINVAL; - - if (get_sigset_t(&newset, unewset)) - return -EFAULT; - sigdelsetmask(&newset, ~_BLOCKABLE); - - spin_lock_irq(¤t->sighand->siglock); - saveset = current->blocked; - current->blocked = newset; - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); - - regs->result = -EINTR; - regs->gpr[3] = EINTR; - regs->ccr |= 0x10000000; - while (1) { - current->state = TASK_INTERRUPTIBLE; - schedule(); - if (do_signal(&saveset, regs)) { - set_thread_flag(TIF_RESTOREALL); - return 0; - } - } + current->state = TASK_INTERRUPTIBLE; + schedule(); + set_thread_flag(TIF_RESTORE_SIGMASK); + return -ERESTARTNOHAND; } #ifdef CONFIG_PPC32 @@ -1177,7 +1131,7 @@ int do_signal(sigset_t *oldset, struct p { siginfo_t info; struct k_sigaction ka; - unsigned int frame, newsp; + unsigned int newsp; int signr, ret; #ifdef CONFIG_PPC32 @@ -1188,11 +1142,11 @@ int do_signal(sigset_t *oldset, struct p } #endif - if (!oldset) + if (test_thread_flag(TIF_RESTORE_SIGMASK)) + oldset = ¤t->saved_sigmask; + else if (!oldset) oldset = ¤t->blocked; - newsp = frame = 0; - signr = get_signal_to_deliver(&info, &ka, regs, NULL); #ifdef CONFIG_PPC32 no_signal: @@ -1222,8 +1176,14 @@ no_signal: } } - if (signr == 0) + if (signr == 0) { + /* No signal to deliver -- put the saved sigmask back */ + if (test_thread_flag(TIF_RESTORE_SIGMASK)) { + clear_thread_flag(TIF_RESTORE_SIGMASK); + sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL); + } return 0; /* no signals delivered */ + } if ((ka.sa.sa_flags & SA_ONSTACK) && current->sas_ss_size && !on_sig_stack(regs->gpr[1])) @@ -1256,6 +1216,10 @@ no_signal: sigaddset(¤t->blocked, signr); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); + /* A signal was successfully delivered; the saved sigmask is in + its frame, and we can clear the TIF_RESTORE_SIGMASK flag */ + if (test_thread_flag(TIF_RESTORE_SIGMASK)) + clear_thread_flag(TIF_RESTORE_SIGMASK); } return ret; diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index 5462bef..7a6f0f7 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c @@ -67,42 +67,6 @@ struct rt_sigframe { char abigap[288]; } __attribute__ ((aligned (16))); - -/* - * Atomically swap in the new signal mask, and wait for a signal. - */ -long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, int p3, int p4, - int p6, int p7, struct pt_regs *regs) -{ - sigset_t saveset, newset; - - /* XXX: Don't preclude handling different sized sigset_t's. */ - if (sigsetsize != sizeof(sigset_t)) - return -EINVAL; - - if (copy_from_user(&newset, unewset, sizeof(newset))) - return -EFAULT; - sigdelsetmask(&newset, ~_BLOCKABLE); - - spin_lock_irq(¤t->sighand->siglock); - saveset = current->blocked; - current->blocked = newset; - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); - - regs->result = -EINTR; - regs->gpr[3] = EINTR; - regs->ccr |= 0x10000000; - while (1) { - current->state = TASK_INTERRUPTIBLE; - schedule(); - if (do_signal(&saveset, regs)) { - set_thread_flag(TIF_RESTOREALL); - return 0; - } - } -} - long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, unsigned long r5, unsigned long r6, unsigned long r7, unsigned long r8, struct pt_regs *regs) @@ -554,11 +518,15 @@ int do_signal(sigset_t *oldset, struct p if (test_thread_flag(TIF_32BIT)) return do_signal32(oldset, regs); - if (!oldset) + if (test_thread_flag(TIF_RESTORE_SIGMASK)) + oldset = ¤t->saved_sigmask; + else if (!oldset) oldset = ¤t->blocked; signr = get_signal_to_deliver(&info, &ka, regs, NULL); if (signr > 0) { + int ret; + /* Whee! Actually deliver the signal. */ if (TRAP(regs) == 0x0C00) syscall_restart(regs, &ka); @@ -571,7 +539,14 @@ int do_signal(sigset_t *oldset, struct p if (current->thread.dabr) set_dabr(current->thread.dabr); - return handle_signal(signr, &ka, &info, oldset, regs); + ret = handle_signal(signr, &ka, &info, oldset, regs); + + /* If a signal was successfully delivered, the saved sigmask is in + its frame, and we can clear the TIF_RESTORE_SIGMASK flag */ + if (ret && test_thread_flag(TIF_RESTORE_SIGMASK)) + clear_thread_flag(TIF_RESTORE_SIGMASK); + + return ret; } if (TRAP(regs) == 0x0C00) { /* System Call! */ @@ -587,6 +562,11 @@ int do_signal(sigset_t *oldset, struct p regs->result = 0; } } + /* No signal to deliver -- put the saved sigmask back */ + if (test_thread_flag(TIF_RESTORE_SIGMASK)) { + clear_thread_flag(TIF_RESTORE_SIGMASK); + sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL); + } return 0; } diff --git a/include/asm-frv/thread_info.h b/include/asm-frv/thread_info.h index 60f6b2a..0429ca7 100644 --- a/include/asm-frv/thread_info.h +++ b/include/asm-frv/thread_info.h @@ -131,6 +131,7 @@ register struct thread_info *__current_t #define TIF_NEED_RESCHED 3 /* rescheduling necessary */ #define TIF_SINGLESTEP 4 /* restore singlestep on return to user mode */ #define TIF_IRET 5 /* return with iret */ +#define TIF_RESTORE_SIGMASK 6 /* restore signal mask in do_signal() */ #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ #define TIF_MEMDIE 17 /* OOM killer killed process */ @@ -140,6 +141,7 @@ register struct thread_info *__current_t #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) #define _TIF_SINGLESTEP (1 << TIF_SINGLESTEP) #define _TIF_IRET (1 << TIF_IRET) +#define _TIF_RESTORE_SIGMASK (1 << TIF_RESTORE_SIGMASK) #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG) #define _TIF_WORK_MASK 0x0000FFFE /* work to do on interrupt/exception return */ diff --git a/include/asm-frv/unistd.h b/include/asm-frv/unistd.h index cde376a..4d994d2 100644 --- a/include/asm-frv/unistd.h +++ b/include/asm-frv/unistd.h @@ -486,6 +486,7 @@ static inline pid_t wait(int * wait_stat /* #define __ARCH_WANT_SYS_SIGPENDING */ #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION +#define __ARCH_WANT_SYS_RT_SIGSUSPEND #endif /* diff --git a/include/asm-i386/signal.h b/include/asm-i386/signal.h index 76524b4..026fd23 100644 --- a/include/asm-i386/signal.h +++ b/include/asm-i386/signal.h @@ -218,7 +218,6 @@ static __inline__ int sigfindinword(unsi } struct pt_regs; -extern int FASTCALL(do_signal(struct pt_regs *regs, sigset_t *oldset)); #define ptrace_signal_deliver(regs, cookie) \ do { \ diff --git a/include/asm-i386/thread_info.h b/include/asm-i386/thread_info.h index 8fbf791..d080eea 100644 --- a/include/asm-i386/thread_info.h +++ b/include/asm-i386/thread_info.h @@ -142,6 +142,7 @@ register unsigned long current_stack_poi #define TIF_SYSCALL_EMU 6 /* syscall emulation active */ #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ #define TIF_SECCOMP 8 /* secure computing */ +#define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */ #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ #define TIF_MEMDIE 17 @@ -154,6 +155,7 @@ register unsigned long current_stack_poi #define _TIF_SYSCALL_EMU (1<sighand->siglock); + current->saved_sigmask = current->blocked; + current->blocked = newset; + recalc_sigpending(); + spin_unlock_irq(¤t->sighand->siglock); + + current->state = TASK_INTERRUPTIBLE; + schedule(); + set_thread_flag(TIF_RESTORE_SIGMASK); + return -ERESTARTNOHAND; +} +#endif /* __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND */ diff --git a/kernel/signal.c b/kernel/signal.c index 08aa5b2..f859761 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -2720,6 +2720,32 @@ sys_pause(void) #endif +#ifdef __ARCH_WANT_SYS_RT_SIGSUSPEND +long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize) +{ + sigset_t newset; + + /* XXX: Don't preclude handling different sized sigset_t's. */ + if (sigsetsize != sizeof(sigset_t)) + return -EINVAL; + + if (copy_from_user(&newset, unewset, sizeof(newset))) + return -EFAULT; + sigdelsetmask(&newset, sigmask(SIGKILL)|sigmask(SIGSTOP)); + + spin_lock_irq(¤t->sighand->siglock); + current->saved_sigmask = current->blocked; + current->blocked = newset; + recalc_sigpending(); + spin_unlock_irq(¤t->sighand->siglock); + + current->state = TASK_INTERRUPTIBLE; + schedule(); + set_thread_flag(TIF_RESTORE_SIGMASK); + return -ERESTARTNOHAND; +} +#endif /* __ARCH_WANT_SYS_RT_SIGSUSPEND */ + void __init signals_init(void) { sigqueue_cachep = Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1849 retrieving revision 1.1850 diff -u -r1.1849 -r1.1850 --- kernel-2.6.spec 13 Jan 2006 05:13:53 -0000 1.1849 +++ kernel-2.6.spec 13 Jan 2006 06:08:49 -0000 1.1850 @@ -351,6 +351,7 @@ Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch Patch1850: linux-2.6-mv643xx-compile-fix.patch +Patch1860: linux-2.6-queue-stall.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -367,6 +368,9 @@ # ACPI patches. Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch +# TIF_RESTORE_SIGMASK (for pselect) +Patch2200: linux-2.6.15-tif-restore-sigmask.patch + # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx.patch @@ -830,7 +834,8 @@ %patch1840 -p1 # Fix compilation for MV643xx Ethernet %patch1850 -p1 - +# Fix disk I/O queue stalls +%patch1860 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 %patch1901 -p1 @@ -851,6 +856,9 @@ # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. %patch2100 -p1 +# TIF_RESTORE_SIGMASK +%patch2200 -p1 + # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream @@ -1351,6 +1359,10 @@ %endif %changelog +* Fri Jan 13 2006 David Woodhouse +- Add TIF_RESTORE_SIGMASK patches. +- Fix I/O queue stalls + * Fri Jan 13 2006 Dave Jones - Disable more cruft from iseries config. From fedora-cvs-commits at redhat.com Fri Jan 13 08:26:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 03:26:56 -0500 Subject: rpms/kernel/devel linux-2.6.15-tif-restore-sigmask.patch,1.1,1.2 Message-ID: <200601130826.k0D8Qu9r012840@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12829 Modified Files: linux-2.6.15-tif-restore-sigmask.patch Log Message: Fix i386 sigsuspend linux-2.6.15-tif-restore-sigmask.patch: arch/frv/kernel/signal.c | 120 +++++++++++++------------------------- arch/i386/kernel/signal.c | 109 +++++++++++++++------------------- arch/powerpc/kernel/entry_32.S | 8 +- arch/powerpc/kernel/entry_64.S | 2 arch/powerpc/kernel/signal_32.c | 76 ++++++------------------ arch/powerpc/kernel/signal_64.c | 56 +++++------------ include/asm-frv/thread_info.h | 2 include/asm-frv/unistd.h | 1 include/asm-i386/signal.h | 1 include/asm-i386/thread_info.h | 2 include/asm-i386/unistd.h | 1 include/asm-powerpc/thread_info.h | 5 + include/asm-powerpc/unistd.h | 2 include/linux/sched.h | 1 kernel/compat.c | 28 ++++++++ kernel/signal.c | 26 ++++++++ 16 files changed, 202 insertions(+), 238 deletions(-) Index: linux-2.6.15-tif-restore-sigmask.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.15-tif-restore-sigmask.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6.15-tif-restore-sigmask.patch 13 Jan 2006 06:08:50 -0000 1.1 +++ linux-2.6.15-tif-restore-sigmask.patch 13 Jan 2006 08:26:52 -0000 1.2 @@ -838,7 +838,7 @@ #endif /* __ARCH_WANT_COMPAT_SYS_TIME */ + +#ifdef __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND -+long compat_sys_rt_sigsuspend(compat_sigset_t __user *unewset, compat_size_t sigsetsize) ++asmlinkage long compat_sys_rt_sigsuspend(compat_sigset_t __user *unewset, compat_size_t sigsetsize) +{ + sigset_t newset; + compat_sigset_t newset32; @@ -873,7 +873,7 @@ #endif +#ifdef __ARCH_WANT_SYS_RT_SIGSUSPEND -+long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize) ++asmlinkage long sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize) +{ + sigset_t newset; + From fedora-cvs-commits at redhat.com Fri Jan 13 08:27:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 03:27:37 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1850,1.1851 Message-ID: <200601130827.k0D8RbqC012883@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12866 Modified Files: kernel-2.6.spec Log Message: bump From fedora-cvs-commits at redhat.com Fri Jan 13 08:37:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 03:37:56 -0500 Subject: rpms/readahead/devel readahead-gen, NONE, 1.1 readahead.early.files.in, 1.4, 1.5 readahead.files.in, 1.4, 1.5 readahead.spec, 1.20, 1.21 Message-ID: <200601130837.k0D8bttZ013049@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/readahead/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13037 Modified Files: readahead.early.files.in readahead.files.in readahead.spec Added Files: readahead-gen Log Message: cleanup ***** Error reading new file: [Errno 2] No such file or directory: 'readahead-gen' Index: readahead.early.files.in =================================================================== RCS file: /cvs/dist/rpms/readahead/devel/readahead.early.files.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- readahead.early.files.in 21 Dec 2005 09:28:40 -0000 1.4 +++ readahead.early.files.in 13 Jan 2006 08:37:50 -0000 1.5 @@ -72,8 +72,8 @@ /etc/fstab /etc/group /etc/gtk-2.0/gtkrc -/etc/gtk-2.0/##ARCH##-redhat-linux-gnu/gdk-pixbuf.loaders -/etc/gtk-2.0/##ARCH##-redhat-linux-gnu/gtk.immodules +/etc/gtk-2.0/%{_arch}-redhat-linux-gnu/gdk-pixbuf.loaders +/etc/gtk-2.0/%{_arch}-redhat-linux-gnu/gtk.immodules /etc/hesiod.conf /etc/host.conf /etc/hosts @@ -129,6 +129,7 @@ /etc/makedev.d/v4l /etc/modprobe.conf /etc/modprobe.conf.dist +/etc/modprobe.d/modprobe.conf.dist /etc/motd /etc/mtab /etc/nsswitch.conf @@ -137,7 +138,7 @@ /etc/pam.d/login /etc/pam.d/other /etc/pam.d/system-auth -/etc/pango/##ARCH##-redhat-linux-gnu/pango.modules +/etc/pango/%{_arch}-redhat-linux-gnu/pango.modules /etc/passwd /etc/pcmcia/config /etc/printcap @@ -276,10 +277,10 @@ /etc/termcap /etc/udev/rules.d/10-wacom.rules /etc/udev/rules.d/50-udev.rules -/etc/udev/scripts/check-cdrom.sh -/etc/udev/scripts/ide-media.sh -/etc/udev/scripts/MAKEDEV.dev -/etc/udev/scripts/pam_console.dev +/lib/udev/check-cdrom.sh +/lib/udev/ide-media.sh +/lib/udev/MAKEDEV.dev +/lib/udev/pam_console.dev /etc/udev/udev.conf /etc/X11/fs/config /etc/X11/gdm/gdm.conf @@ -288,50 +289,50 @@ /etc/X11/xdm/Xsetup_0 /etc/X11/xorg.conf /etc/X11/Xresources -/etc/X11/xserver/SecurityPolicy -##LIBDIR##iptables/libipt_icmp.so -##LIBDIR##iptables/libipt_REJECT.so -##LIBDIR##iptables/libipt_standard.so -##LIBDIR##iptables/libipt_state.so -##LIBDIR##iptables/libipt_tcp.so -##LIBDIR##iptables/libipt_udp.so -##LIBDIR##ld-linux-x86-64.so.2 -##LIBDIR##libacl.so.1 -##LIBDIR##libasound.so.2 -##LIBDIR##libattr.so.1 -##LIBDIR##libaudit.so.0 -##LIBDIR##libblkid.so.1 -##LIBDIR##libcom_err.so.2 -##LIBDIR##libcrypto.so.5 -##LIBDIR##libcrypt.so.1 -##LIBDIR##libc.so.6 -##LIBDIR##libdl.so.2 -##LIBDIR##libiw.so.28 -##LIBDIR##libm.so.6 -##LIBDIR##libnsl.so.1 -##LIBDIR##libnss_dns.so.2 -##LIBDIR##libnss_files.so.2 -##LIBDIR##libnss_hesiod.so.2 -##LIBDIR##libpam_misc.so.0 -##LIBDIR##libpam.so.0 -##LIBDIR##libpcre.so.0 -##LIBDIR##libproc-3.2.5.so -##LIBDIR##libpthread.so.0 -##LIBDIR##libresolv.so.2 -##LIBDIR##librt.so.1 -##LIBDIR##libselinux.so.1 -##LIBDIR##libssl.so.5 -##LIBDIR##libtermcap.so.2 -##LIBDIR##libutil.so.1 -##LIBDIR##libuuid.so.1 -##LIBDIR##security/pam_console.so -##LIBDIR##security/pam_deny.so -##LIBDIR##security/pam_env.so -##LIBDIR##security/pam_nologin.so -##LIBDIR##security/pam_securetty.so -##LIBDIR##security/pam_selinux.so -##LIBDIR##security/pam_stack.so -##LIBDIR##tls/libdb-4.3.so +/usr/lib/xserver/SecurityPolicy +/%{_lib}/iptables/libipt_icmp.so +/%{_lib}/iptables/libipt_REJECT.so +/%{_lib}/iptables/libipt_standard.so +/%{_lib}/iptables/libipt_state.so +/%{_lib}/iptables/libipt_tcp.so +/%{_lib}/iptables/libipt_udp.so +/%{_lib}/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}/libcom_err.so.2 +/%{_lib}/libcrypto.so.6 +/%{_lib}/libcrypt.so.1 +/%{_lib}/libc.so.6 +/%{_lib}/libdl.so.2 +/%{_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_misc.so.0 +/%{_lib}/libpam.so.0 +/%{_lib}/libpcre.so.0 +/%{_lib}/libproc-3.2.6.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/pam_console.so +/%{_lib}/security/pam_deny.so +/%{_lib}/security/pam_env.so +/%{_lib}/security/pam_nologin.so +/%{_lib}/security/pam_securetty.so +/%{_lib}/security/pam_selinux.so +/%{_lib}/security/pam_stack.so +/%{_lib}/libdb-4.3.so /lib/kbd/keymaps/amiga/amiga-de.map.gz /lib/kbd/keymaps/amiga/amiga-us.map.gz /lib/kbd/keymaps/atari/atari-de.map.gz @@ -345,14 +346,14 @@ /lib/kbd/keymaps/i386/qwerty/../include/linux-with-alt-and-altgr.inc /lib/kbd/keymaps/i386/qwerty/../include/qwerty-layout.inc /lib/kbd/keymaps/i386/qwerty/us.map.gz -/lib/security/../..##LIBDIR##security/pam_cracklib.so -/lib/security/../..##LIBDIR##security/pam_deny.so -/lib/security/../..##LIBDIR##security/pam_env.so -/lib/security/../..##LIBDIR##security/pam_krb5.so -/lib/security/../..##LIBDIR##security/pam_limits.so -/lib/security/../..##LIBDIR##security/pam_permit.so -/lib/security/../..##LIBDIR##security/pam_succeed_if.so -/lib/security/../..##LIBDIR##security/pam_unix.so +/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 /sbin/alsactl /sbin/arping /sbin/auditctl @@ -406,11 +407,11 @@ /usr/bin/dircolors /usr/bin/fc-cache /usr/bin/find -/usr/bin/gdm -/usr/bin/gdm-binary -/usr/bin/gdmchooser -/usr/bin/gdmgreeter -/usr/bin/gdmlogin +/usr/sbin/gdm +/usr/sbin/gdm-binary +/usr/libexec/gdmchooser +/usr/libexec/gdmgreeter +/usr/libexec/gdmlogin /usr/bin/gnome-session /usr/bin/id /usr/bin/lesspipe.sh @@ -425,202 +426,198 @@ /usr/bin/tee /usr/bin/udevinfo /usr/bin/uniq -/usr/bin/X11/setxkbmap -/usr/bin/X11/X -/usr##LIBDIR##autofs/lookup_ldap.so -/usr##LIBDIR##autofs/mount_bind.so -/usr##LIBDIR##autofs/mount_nfs.so -/usr##LIBDIR##autofs/parse_sun.so -/usr##LIBDIR##cups/backend/hal -/usr##LIBDIR##cups/backend/http -/usr##LIBDIR##cups/backend/ipp -/usr##LIBDIR##cups/backend/lpd -/usr##LIBDIR##cups/backend/ncp -/usr##LIBDIR##cups/backend/parallel -/usr##LIBDIR##cups/backend/scsi -/usr##LIBDIR##cups/backend/serial -/usr##LIBDIR##cups/backend/smb -/usr##LIBDIR##cups/backend/socket -/usr##LIBDIR##cups/backend/usb -/usr##LIBDIR##cups/filter/hpgltops -/usr##LIBDIR##cups/filter/imagetops -/usr##LIBDIR##cups/filter/imagetoraster -/usr##LIBDIR##cups/filter/pdftops -/usr##LIBDIR##cups/filter/pstops -/usr##LIBDIR##cups/filter/pstoraster -/usr##LIBDIR##cups/filter/texttops -/usr##LIBDIR##gconv/gconv-modules.cache -/usr##LIBDIR##gconv/ISO8859-1.so -/usr##LIBDIR##gtk-2.0/2.4.0/engines/libclearlooks.so -/usr##LIBDIR##gtk-2.0/2.4.0/loaders/libpixbufloader-png.so -/usr##LIBDIR##libalchemist.so.0 -/usr##LIBDIR##libart_lgpl_2.so.2 -/usr##LIBDIR##libatk-1.0.so.0 -/usr##LIBDIR##libbluetooth.so.1 -/usr##LIBDIR##libbonobo-2.so.0 -/usr##LIBDIR##libbonobo-activation.so.4 -/usr##LIBDIR##libbz2.so.1 -/usr##LIBDIR##libcrack.so.2 -/usr##LIBDIR##libcroco-0.6.so.3 -/usr##LIBDIR##libcups.so.2 -/usr##LIBDIR##libdbus-1.so.1 -/usr##LIBDIR##libdbus-glib-1.so.1 -/usr##LIBDIR##libdes425.so.3 -/usr##LIBDIR##libexpat.so.0 -/usr##LIBDIR##libfontconfig.so.1 -/usr##LIBDIR##libfreetype.so.6 -/usr##LIBDIR##libgconf-2.so.4 -/usr##LIBDIR##libgdk_pixbuf-2.0.so.0 -/usr##LIBDIR##libgdk-x11-2.0.so.0 -/usr##LIBDIR##libglib-2.0.so.0 -/usr##LIBDIR##libgmodule-2.0.so.0 -/usr##LIBDIR##libgnomecanvas-2.so.0 -/usr##LIBDIR##libgnomevfs-2.so.0 -/usr##LIBDIR##libgobject-2.0.so.0 -/usr##LIBDIR##libgsf-1.so.1 -/usr##LIBDIR##libgssapi_krb5.so.2 -/usr##LIBDIR##libgthread-2.0.so.0 -/usr##LIBDIR##libgtk-x11-2.0.so.0 -/usr##LIBDIR##libhal.so.1 -/usr##LIBDIR##libhal-storage.so.1 -/usr##LIBDIR##libhesiod.so.0 -/usr##LIBDIR##libhowl.so.0 -/usr##LIBDIR##libk5crypto.so.3 -/usr##LIBDIR##libkrb4.so.2 -/usr##LIBDIR##libkrb5.so.3 -/usr##LIBDIR##libkrb5support.so.0 -/usr##LIBDIR##liblber-2.2.so.7 -/usr##LIBDIR##libldap-2.2.so.7 -/usr##LIBDIR##libncurses.so.5 -/usr##LIBDIR##libORBit-2.so.0 -/usr##LIBDIR##libORBitCosNaming-2.so.0 -/usr##LIBDIR##libpango-1.0.so.0 -/usr##LIBDIR##libpangoft2-1.0.so.0 -/usr##LIBDIR##libpangox-1.0.so.0 -/usr##LIBDIR##libpangoxft-1.0.so.0 -/usr##LIBDIR##libpng12.so.0 -/usr##LIBDIR##libpopt.so.0 -/usr##LIBDIR##libpython2.4.so.1.0 -/usr##LIBDIR##librsvg-2.so.2 -/usr##LIBDIR##libsasl2.so.2 -/usr##LIBDIR##libusb-0.1.so.4 -/usr##LIBDIR##libvte.so.4 -/usr##LIBDIR##libwrap.so.0 -/usr##LIBDIR##libxml2.so.2 -/usr##LIBDIR##libz.so.1 -/usr##LIBDIR##pango/1.4.0/modules/pango-basic-fc.so -/usr##LIBDIR##python2.4/codecs.py -/usr##LIBDIR##python2.4/codecs.pyo -/usr##LIBDIR##python2.4/copy.py -/usr##LIBDIR##python2.4/copy.pyo -/usr##LIBDIR##python2.4/copy_reg.py -/usr##LIBDIR##python2.4/copy_reg.pyo -/usr##LIBDIR##python2.4/dis.py -/usr##LIBDIR##python2.4/dis.pyo -/usr##LIBDIR##python2.4/encodings/aliases.py -/usr##LIBDIR##python2.4/encodings/aliases.pyo -/usr##LIBDIR##python2.4/encodings/__init__.py -/usr##LIBDIR##python2.4/encodings/__init__.pyo -/usr##LIBDIR##python2.4/encodings/latin_1.py -/usr##LIBDIR##python2.4/encodings/latin_1.pyo -/usr##LIBDIR##python2.4/fnmatch.py -/usr##LIBDIR##python2.4/fnmatch.pyo -/usr##LIBDIR##python2.4/getopt.py -/usr##LIBDIR##python2.4/getopt.pyo -/usr##LIBDIR##python2.4/gettext.py -/usr##LIBDIR##python2.4/gettext.pyo -/usr##LIBDIR##python2.4/glob.py -/usr##LIBDIR##python2.4/glob.pyo -/usr##LIBDIR##python2.4/inspect.py -/usr##LIBDIR##python2.4/inspect.pyo -/usr##LIBDIR##python2.4/lib-dynload/cPickle.so -/usr##LIBDIR##python2.4/lib-dynload/cStringIO.so -/usr##LIBDIR##python2.4/lib-dynload/grpmodule.so -/usr##LIBDIR##python2.4/lib-dynload/_localemodule.so -/usr##LIBDIR##python2.4/lib-dynload/pwdmodule.so -/usr##LIBDIR##python2.4/lib-dynload/pyexpat.so -/usr##LIBDIR##python2.4/lib-dynload/stropmodule.so -/usr##LIBDIR##python2.4/lib-dynload/structmodule.so -/usr##LIBDIR##python2.4/lib-dynload/timemodule.so -/usr##LIBDIR##python2.4/lib-dynload/zlibmodule.so -/usr##LIBDIR##python2.4/linecache.py -/usr##LIBDIR##python2.4/linecache.pyo -/usr##LIBDIR##python2.4/locale.py -/usr##LIBDIR##python2.4/locale.pyo -/usr##LIBDIR##python2.4/opcode.py -/usr##LIBDIR##python2.4/opcode.pyo -/usr##LIBDIR##python2.4/os.py -/usr##LIBDIR##python2.4/os.pyo -/usr##LIBDIR##python2.4/posixpath.py -/usr##LIBDIR##python2.4/posixpath.pyo -/usr##LIBDIR##python2.4/re.py -/usr##LIBDIR##python2.4/re.pyo -/usr##LIBDIR##python2.4/site-packages/japanese/aliases/__init__.py -/usr##LIBDIR##python2.4/site-packages/japanese/aliases/__init__.pyo -/usr##LIBDIR##python2.4/site-packages/japanese/__init__.py -/usr##LIBDIR##python2.4/site-packages/japanese/__init__.pyo -/usr##LIBDIR##python2.4/site-packages/japanese.pth -/usr##LIBDIR##python2.4/site-packages/pyalchemist_python.py -/usr##LIBDIR##python2.4/site-packages/pyalchemist_python.pyo -/usr##LIBDIR##python2.4/site-packages/pyalchemist.so -/usr##LIBDIR##python2.4/site-packages/pygtk.pth -/usr##LIBDIR##python2.4/site-packages/rhpl/ethtool.so -/usr##LIBDIR##python2.4/site-packages/rhpl/gzread.py -/usr##LIBDIR##python2.4/site-packages/rhpl/gzread.pyo -/usr##LIBDIR##python2.4/site-packages/rhpl/iconv.so -/usr##LIBDIR##python2.4/site-packages/rhpl/__init__.py -/usr##LIBDIR##python2.4/site-packages/rhpl/__init__.pyo -/usr##LIBDIR##python2.4/site-packages/rhpl/translate.py -/usr##LIBDIR##python2.4/site-packages/rhpl/translate.pyo -/usr##LIBDIR##python2.4/site-packages/rhpl/_translate.so -/usr##LIBDIR##python2.4/site-packages/_xmlplus/__init__.py -/usr##LIBDIR##python2.4/site-packages/_xmlplus/__init__.pyo -/usr##LIBDIR##python2.4/site-packages/_xmlplus/utils/__init__.py -/usr##LIBDIR##python2.4/site-packages/_xmlplus/utils/__init__.pyo -/usr##LIBDIR##python2.4/site-packages/_xmlplus/utils/qp_xml.py -/usr##LIBDIR##python2.4/site-packages/_xmlplus/utils/qp_xml.pyo -/usr##LIBDIR##python2.4/site.py -/usr##LIBDIR##python2.4/site.pyo -/usr##LIBDIR##python2.4/sre_compile.py -/usr##LIBDIR##python2.4/sre_compile.pyo -/usr##LIBDIR##python2.4/sre_constants.py -/usr##LIBDIR##python2.4/sre_constants.pyo -/usr##LIBDIR##python2.4/sre_parse.py -/usr##LIBDIR##python2.4/sre_parse.pyo -/usr##LIBDIR##python2.4/sre.py -/usr##LIBDIR##python2.4/sre.pyo -/usr##LIBDIR##python2.4/stat.py -/usr##LIBDIR##python2.4/stat.pyo -/usr##LIBDIR##python2.4/string.py -/usr##LIBDIR##python2.4/string.pyo -/usr##LIBDIR##python2.4/tokenize.py -/usr##LIBDIR##python2.4/tokenize.pyo -/usr##LIBDIR##python2.4/token.py -/usr##LIBDIR##python2.4/token.pyo -/usr##LIBDIR##python2.4/types.py -/usr##LIBDIR##python2.4/types.pyo -/usr##LIBDIR##python2.4/UserDict.py -/usr##LIBDIR##python2.4/UserDict.pyo -/usr##LIBDIR##python2.4/warnings.py -/usr##LIBDIR##python2.4/warnings.pyo -/usr##LIBDIR##python2.4/xml/__init__.py -/usr##LIBDIR##python2.4/xml/__init__.pyo -/usr##LIBDIR##sasl2/libanonymous.la -/usr##LIBDIR##sasl2/libanonymous.so.2 -/usr##LIBDIR##sasl2/libcrammd5.la -/usr##LIBDIR##sasl2/libcrammd5.so.2 -/usr##LIBDIR##sasl2/libdigestmd5.la -/usr##LIBDIR##sasl2/libdigestmd5.so.2 -/usr##LIBDIR##sasl2/liblogin.la -/usr##LIBDIR##sasl2/liblogin.so.2 -/usr##LIBDIR##sasl2/libplain.la -/usr##LIBDIR##sasl2/libplain.so.2 -/usr##LIBDIR##sasl2/libsasldb.la -/usr##LIBDIR##sasl2/libsasldb.so.2 -/usr##LIBDIR##sasl2/Sendmail.conf -/usr##LIBDIR##vte/gnome-pty-helper -/usr/libexec/gcc/##ARCH##-redhat-linux/4.1.0/cc1 -/usr/libexec/gcc/##ARCH##-redhat-linux/4.1.0/collect2 +/usr/bin/setxkbmap +/usr/bin/X +/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}/gconv/gconv-modules.cache +/usr/%{_lib}/gconv/ISO8859-1.so +/usr/%{_lib}/gtk-2.0/2.4.0/engines/libclearlooks.so +/usr/%{_lib}/gtk-2.0/2.4.0/loaders/libpixbufloader-png.so +/usr/%{_lib}/libalchemist.so.0 +/usr/%{_lib}/libart_lgpl_2.so.2 +/usr/%{_lib}/libatk-1.0.so.0 +/usr/%{_lib}/libbluetooth.so.1 +/usr/%{_lib}/libbonobo-2.so.0 +/usr/%{_lib}/libbonobo-activation.so.4 +/usr/%{_lib}/libbz2.so.1 +/usr/%{_lib}/libcrack.so.2 +/usr/%{_lib}/libcroco-0.6.so.3 +/usr/%{_lib}/libcups.so.2 +/usr/%{_lib}/libdbus-1.so.2 +/usr/%{_lib}/libdbus-glib-1.so.2 +/usr/%{_lib}/libdes425.so.3 +/usr/%{_lib}/libexpat.so.0 +/usr/%{_lib}/libfontconfig.so.1 +/usr/%{_lib}/libfreetype.so.6 +/usr/%{_lib}/libgconf-2.so.4 +/usr/%{_lib}/libgdk_pixbuf-2.0.so.0 +/usr/%{_lib}/libgdk-x11-2.0.so.0 +/usr/%{_lib}/libglib-2.0.so.0 +/usr/%{_lib}/libgmodule-2.0.so.0 +/usr/%{_lib}/libgnomecanvas-2.so.0 +/usr/%{_lib}/libgnomevfs-2.so.0 +/usr/%{_lib}/libgobject-2.0.so.0 +/usr/%{_lib}/libgsf-1.so.113 +/usr/%{_lib}/libgssapi_krb5.so.2 +/usr/%{_lib}/libgthread-2.0.so.0 +/usr/%{_lib}/libgtk-x11-2.0.so.0 +/usr/%{_lib}/libhal.so.1 +/usr/%{_lib}/libhal-storage.so.1 +/usr/%{_lib}/libhesiod.so.0 +/usr/%{_lib}/libhowl.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}/libORBit-2.so.0 +/usr/%{_lib}/libORBitCosNaming-2.so.0 +/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.4 +/usr/%{_lib}/libwrap.so.0 +/usr/%{_lib}/libxml2.so.2 +/usr/%{_lib}/libz.so.1 +/usr/%{_lib}/pango/1.4.0/modules/pango-basic-fc.so +/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/aliases.py +/usr/%{_lib}/python2.4/encodings/aliases.pyo +/usr/%{_lib}/python2.4/encodings/__init__.py +/usr/%{_lib}/python2.4/encodings/__init__.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/cPickle.so +/usr/%{_lib}/python2.4/lib-dynload/cStringIO.so +/usr/%{_lib}/python2.4/lib-dynload/grpmodule.so +/usr/%{_lib}/python2.4/lib-dynload/_localemodule.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/japanese/aliases/__init__.py +/usr/%{_lib}/python2.4/site-packages/japanese/aliases/__init__.pyo +/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.pth +/usr/%{_lib}/python2.4/site-packages/pyalchemist_python.py +/usr/%{_lib}/python2.4/site-packages/pyalchemist_python.pyo +/usr/%{_lib}/python2.4/site-packages/pyalchemist.so +/usr/%{_lib}/python2.4/site-packages/pygtk.pth +/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/__init__.py +/usr/%{_lib}/python2.4/site-packages/rhpl/__init__.pyo +/usr/%{_lib}/python2.4/site-packages/rhpl/translate.py +/usr/%{_lib}/python2.4/site-packages/rhpl/translate.pyo +/usr/%{_lib}/python2.4/site-packages/rhpl/_translate.so +/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.py +/usr/%{_lib}/python2.4/site.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/sre.py +/usr/%{_lib}/python2.4/sre.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/tokenize.py +/usr/%{_lib}/python2.4/tokenize.pyo +/usr/%{_lib}/python2.4/token.py +/usr/%{_lib}/python2.4/token.pyo +/usr/%{_lib}/python2.4/types.py +/usr/%{_lib}/python2.4/types.pyo +/usr/%{_lib}/python2.4/UserDict.py +/usr/%{_lib}/python2.4/UserDict.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/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}/sasl2/Sendmail.conf +/usr/%{_lib}/vte/gnome-pty-helper +/usr/libexec/gcc/%{_arch}-redhat-linux/4.1.0/cc1 +/usr/libexec/gcc/%{_arch}-redhat-linux/4.1.0/collect2 /usr/libexec/hald-addon-acpi /usr/libexec/hald-addon-storage /usr/libexec/hald-add-selinux-mount-option @@ -630,11 +627,11 @@ /usr/libexec/hald-probe-storage /usr/libexec/hald-probe-volume /usr/lib/locale/locale-archive -/usr/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz -/usr/lib/X11/fonts/misc/cursor.pcf.gz -/usr/lib/X11/fonts/misc/fonts.alias -/usr/lib/X11/fonts/misc/fonts.dir -/usr/lib/X11/locale/locale.alias +/usr/share/X11/fonts/misc/6x13-ISO8859-1.pcf.gz +/usr/share/X11/fonts/misc/cursor.pcf.gz +/usr/share/X11/fonts/misc/fonts.alias +/usr/share/X11/fonts/misc/fonts.dir +/usr/share/X11/locale/locale.alias /usr/sbin/acpid /usr/sbin/anacron /usr/sbin/atd @@ -763,131 +760,125 @@ /usr/bin/X /usr/bin/xfs /usr/bin/xrdb -/usr##LIBDIR##libICE.so.6 -/usr##LIBDIR##libSM.so.6 -/usr##LIBDIR##libX11.so.6 -/usr##LIBDIR##libXcursor.so.1 -/usr##LIBDIR##libXext.so.6 -/usr##LIBDIR##libXfixes.so.3 -/usr##LIBDIR##libXfont.so.1 -/usr##LIBDIR##libXft.so.2 -/usr##LIBDIR##libXinerama.so.1 -/usr##LIBDIR##libXi.so.6 -/usr##LIBDIR##libxkbfile.so.1 -/usr##LIBDIR##libXmuu.so.1 -/usr##LIBDIR##libXrandr.so.2 -/usr##LIBDIR##libXrender.so.1 -/usr##LIBDIR##xorg/modules/drivers/apm_drv.o -/usr##LIBDIR##xorg/modules/drivers/ark_drv.o -/usr##LIBDIR##xorg/modules/drivers/ati_drv.o -/usr##LIBDIR##xorg/modules/drivers/atimisc_drv.o -/usr##LIBDIR##xorg/modules/drivers/chips_drv.o -/usr##LIBDIR##xorg/modules/drivers/cirrus_alpine.o -/usr##LIBDIR##xorg/modules/drivers/cirrus_drv.o -/usr##LIBDIR##xorg/modules/drivers/cirrus_laguna.o -/usr##LIBDIR##xorg/modules/drivers/cyrix_drv.o -/usr##LIBDIR##xorg/modules/drivers/dummy_drv.o -/usr##LIBDIR##xorg/modules/drivers/fbdev_drv.o -/usr##LIBDIR##xorg/modules/drivers/glint_drv.o -/usr##LIBDIR##xorg/modules/drivers/i128_drv.o -/usr##LIBDIR##xorg/modules/drivers/i810_drv.o -/usr##LIBDIR##xorg/modules/drivers/linux/v4l_drv.o -/usr##LIBDIR##xorg/modules/drivers/mga_drv.o -/usr##LIBDIR##xorg/modules/drivers/neomagic_drv.o -/usr##LIBDIR##xorg/modules/drivers/nv_drv.o -/usr##LIBDIR##xorg/modules/drivers/r128_drv.o -/usr##LIBDIR##xorg/modules/drivers/radeon_drv.o -/usr##LIBDIR##xorg/modules/drivers/rendition_drv.o -/usr##LIBDIR##xorg/modules/drivers/riva128.o -/usr##LIBDIR##xorg/modules/drivers/s3_drv.o -/usr##LIBDIR##xorg/modules/drivers/s3virge_drv.o -/usr##LIBDIR##xorg/modules/drivers/savage_drv.o -/usr##LIBDIR##xorg/modules/drivers/siliconmotion_drv.o -/usr##LIBDIR##xorg/modules/drivers/sis_drv.o -/usr##LIBDIR##xorg/modules/drivers/tdfx_drv.o -/usr##LIBDIR##xorg/modules/drivers/tga_drv.o -/usr##LIBDIR##xorg/modules/drivers/trident_drv.o -/usr##LIBDIR##xorg/modules/drivers/tseng_drv.o -/usr##LIBDIR##xorg/modules/drivers/vesa_drv.o -/usr##LIBDIR##xorg/modules/drivers/vga_drv.o -/usr##LIBDIR##xorg/modules/drivers/vmware_drv.o -/usr##LIBDIR##xorg/modules/extensions/libdbe.a -/usr##LIBDIR##xorg/modules/extensions/libdri.a -/usr##LIBDIR##xorg/modules/extensions/libextmod.a -/usr##LIBDIR##xorg/modules/extensions/libGLcore.a -/usr##LIBDIR##xorg/modules/extensions/libglx.a -/usr##LIBDIR##xorg/modules/extensions/librecord.a -/usr##LIBDIR##xorg/modules/extensions/libxtrap.a -/usr##LIBDIR##xorg/modules/extensions/vnc.so -/usr##LIBDIR##xorg/modules/fonts/libbitmap.a -/usr##LIBDIR##xorg/modules/fonts/libfreetype.so -/usr##LIBDIR##xorg/modules/fonts/libtype1.a -/usr##LIBDIR##xorg/modules/input/acecad_drv.o -/usr##LIBDIR##xorg/modules/input/aiptek_drv.o -/usr##LIBDIR##xorg/modules/input/calcomp_drv.o -/usr##LIBDIR##xorg/modules/input/citron_drv.o -/usr##LIBDIR##xorg/modules/input/digitaledge_drv.o -/usr##LIBDIR##xorg/modules/input/dmc_drv.o -/usr##LIBDIR##xorg/modules/input/dynapro_drv.o -/usr##LIBDIR##xorg/modules/input/elographics_drv.o -/usr##LIBDIR##xorg/modules/input/fpit_drv.o -/usr##LIBDIR##xorg/modules/input/hyperpen_drv.o -/usr##LIBDIR##xorg/modules/input/js_x_drv.o -/usr##LIBDIR##xorg/modules/input/kbd_drv.o -/usr##LIBDIR##xorg/modules/input/keyboard_drv.o -/usr##LIBDIR##xorg/modules/input/linux/ur98_drv.o -/usr##LIBDIR##xorg/modules/input/magellan_drv.o -/usr##LIBDIR##xorg/modules/input/microtouch_drv.o -/usr##LIBDIR##xorg/modules/input/mouse_drv.o -/usr##LIBDIR##xorg/modules/input/mutouch_drv.o -/usr##LIBDIR##xorg/modules/input/palmax_drv.o -/usr##LIBDIR##xorg/modules/input/penmount_drv.o -/usr##LIBDIR##xorg/modules/input/spaceorb_drv.o -/usr##LIBDIR##xorg/modules/input/summa_drv.o -/usr##LIBDIR##xorg/modules/input/synaptics_drv.o -/usr##LIBDIR##xorg/modules/input/tek4957_drv.o -/usr##LIBDIR##xorg/modules/input/void_drv.o -/usr##LIBDIR##xorg/modules/input/wacom_drv.o -/usr##LIBDIR##xorg/modules/libafb.a -/usr##LIBDIR##xorg/modules/libcfb16.a -/usr##LIBDIR##xorg/modules/libcfb24.a -/usr##LIBDIR##xorg/modules/libcfb32.a -/usr##LIBDIR##xorg/modules/libcfb.a -/usr##LIBDIR##xorg/modules/libcw.a -/usr##LIBDIR##xorg/modules/libdamage.a -/usr##LIBDIR##xorg/modules/libddc.a -/usr##LIBDIR##xorg/modules/libfb.a -/usr##LIBDIR##xorg/modules/libi2c.a -/usr##LIBDIR##xorg/modules/libint10.a -/usr##LIBDIR##xorg/modules/liblayer.a -/usr##LIBDIR##xorg/modules/libmfb.a -/usr##LIBDIR##xorg/modules/libpcidata.a -/usr##LIBDIR##xorg/modules/librac.a -/usr##LIBDIR##xorg/modules/libramdac.a -/usr##LIBDIR##xorg/modules/libscanpci.a -/usr##LIBDIR##xorg/modules/libshadow.a -/usr##LIBDIR##xorg/modules/libvbe.a -/usr##LIBDIR##xorg/modules/libvgahw.a -/usr##LIBDIR##xorg/modules/libxaa.a -/usr##LIBDIR##xorg/modules/libxf24_32bpp.a -/usr##LIBDIR##xorg/modules/libxf4bpp.a -/usr##LIBDIR##xorg/modules/libxf8_16bpp.a -/usr##LIBDIR##xorg/modules/libxf8_32bpp.a -/usr##LIBDIR##xorg/modules/linux/libdrm.a -/usr##LIBDIR##xorg/modules/linux/libfbdevhw.a -/usr##LIBDIR##xorg/modules/linux/libint10.a -/usr##LIBDIR##xorg/modules/v20002d.uc -/usr/share/X11/fonts/100dpi/fonts.alias -/usr/share/X11/fonts/100dpi/fonts.dir -/usr/share/X11/fonts/75dpi/fonts.alias -/usr/share/X11/fonts/75dpi/fonts.dir +/usr/%{_lib}/libICE.so.6 +/usr/%{_lib}/libSM.so.6 +/usr/%{_lib}/libX11.so.6 +/usr/%{_lib}/libXcursor.so.1 +/usr/%{_lib}/libXext.so.6 +/usr/%{_lib}/libXfixes.so.3 +/usr/%{_lib}/libXfont.so.1 +/usr/%{_lib}/libXft.so.2 +/usr/%{_lib}/libXinerama.so.1 +/usr/%{_lib}/libXi.so.6 +/usr/%{_lib}/libxkbfile.so.1 +/usr/%{_lib}/libXmuu.so.1 +/usr/%{_lib}/libXrandr.so.2 +/usr/%{_lib}/libXrender.so.1 +/usr/%{_lib}/xorg/modules/drivers/apm_drv.so +/usr/%{_lib}/xorg/modules/drivers/ark_drv.so +/usr/%{_lib}/xorg/modules/drivers/ati_drv.so +/usr/%{_lib}/xorg/modules/drivers/atimisc_drv.so +/usr/%{_lib}/xorg/modules/drivers/chips_drv.so +/usr/%{_lib}/xorg/modules/drivers/cirrus_alpine.so +/usr/%{_lib}/xorg/modules/drivers/cirrus_drv.so +/usr/%{_lib}/xorg/modules/drivers/cirrus_laguna.so +/usr/%{_lib}/xorg/modules/drivers/cyrix_drv.so +/usr/%{_lib}/xorg/modules/drivers/dummy_drv.so +/usr/%{_lib}/xorg/modules/drivers/fbdev_drv.so +/usr/%{_lib}/xorg/modules/drivers/glint_drv.so +/usr/%{_lib}/xorg/modules/drivers/i128_drv.so +/usr/%{_lib}/xorg/modules/drivers/i810_drv.so +/usr/%{_lib}/xorg/modules/drivers/linux/v4l_drv.so +/usr/%{_lib}/xorg/modules/drivers/mga_drv.so +/usr/%{_lib}/xorg/modules/drivers/neomagic_drv.so +/usr/%{_lib}/xorg/modules/drivers/nv_drv.so +/usr/%{_lib}/xorg/modules/drivers/r128_drv.so +/usr/%{_lib}/xorg/modules/drivers/radeon_drv.so +/usr/%{_lib}/xorg/modules/drivers/rendition_drv.so +/usr/%{_lib}/xorg/modules/drivers/riva128.so +/usr/%{_lib}/xorg/modules/drivers/s3_drv.so +/usr/%{_lib}/xorg/modules/drivers/s3virge_drv.so +/usr/%{_lib}/xorg/modules/drivers/savage_drv.so +/usr/%{_lib}/xorg/modules/drivers/siliconmotion_drv.so +/usr/%{_lib}/xorg/modules/drivers/sis_drv.so +/usr/%{_lib}/xorg/modules/drivers/tdfx_drv.so +/usr/%{_lib}/xorg/modules/drivers/tga_drv.so +/usr/%{_lib}/xorg/modules/drivers/trident_drv.so +/usr/%{_lib}/xorg/modules/drivers/tseng_drv.so +/usr/%{_lib}/xorg/modules/drivers/vesa_drv.so +/usr/%{_lib}/xorg/modules/drivers/vga_drv.so +/usr/%{_lib}/xorg/modules/drivers/vmware_drv.so +/usr/%{_lib}/xorg/modules/extensions/libdbe.so +/usr/%{_lib}/xorg/modules/extensions/libdri.so +/usr/%{_lib}/xorg/modules/extensions/libextmod.so +/usr/%{_lib}/xorg/modules/extensions/libGLcore.so +/usr/%{_lib}/xorg/modules/extensions/libglx.so +/usr/%{_lib}/xorg/modules/extensions/librecord.so +/usr/%{_lib}/xorg/modules/extensions/libxtrap.so +/usr/%{_lib}/xorg/modules/extensions/libvnc.so +/usr/%{_lib}/xorg/modules/fonts/libbitmap.so +/usr/%{_lib}/xorg/modules/fonts/libfreetype.so +/usr/%{_lib}/xorg/modules/fonts/libtype1.so +/usr/%{_lib}/xorg/modules/input/acecad_drv.so +/usr/%{_lib}/xorg/modules/input/aiptek_drv.so +/usr/%{_lib}/xorg/modules/input/calcomp_drv.so +/usr/%{_lib}/xorg/modules/input/citron_drv.so +/usr/%{_lib}/xorg/modules/input/digitaledge_drv.so +/usr/%{_lib}/xorg/modules/input/dmc_drv.so +/usr/%{_lib}/xorg/modules/input/dynapro_drv.so +/usr/%{_lib}/xorg/modules/input/elographics_drv.so +/usr/%{_lib}/xorg/modules/input/fpit_drv.so +/usr/%{_lib}/xorg/modules/input/hyperpen_drv.so +/usr/%{_lib}/xorg/modules/input/js_x_drv.so +/usr/%{_lib}/xorg/modules/input/kbd_drv.so +/usr/%{_lib}/xorg/modules/input/keyboard_drv.so +/usr/%{_lib}/xorg/modules/input/ur98_drv.so +/usr/%{_lib}/xorg/modules/input/magellan_drv.so +/usr/%{_lib}/xorg/modules/input/microtouch_drv.so +/usr/%{_lib}/xorg/modules/input/mouse_drv.so +/usr/%{_lib}/xorg/modules/input/mutouch_drv.so +/usr/%{_lib}/xorg/modules/input/palmax_drv.so +/usr/%{_lib}/xorg/modules/input/penmount_drv.so +/usr/%{_lib}/xorg/modules/input/spaceorb_drv.so +/usr/%{_lib}/xorg/modules/input/summa_drv.so +/usr/%{_lib}/xorg/modules/input/synaptics_drv.so +/usr/%{_lib}/xorg/modules/input/tek4957_drv.so +/usr/%{_lib}/xorg/modules/input/void_drv.so +/usr/%{_lib}/xorg/modules/input/wacom_drv.so +/usr/%{_lib}/xorg/modules/libafb.so +/usr/%{_lib}/xorg/modules/libcfb16.so +/usr/%{_lib}/xorg/modules/libcfb24.so +/usr/%{_lib}/xorg/modules/libcfb32.so +/usr/%{_lib}/xorg/modules/libcfb.so +/usr/%{_lib}/xorg/modules/libcw.so +/usr/%{_lib}/xorg/modules/libdamage.so +/usr/%{_lib}/xorg/modules/libddc.so +/usr/%{_lib}/xorg/modules/libfb.so +/usr/%{_lib}/xorg/modules/libi2c.so +/usr/%{_lib}/xorg/modules/libint10.so +/usr/%{_lib}/xorg/modules/liblayer.so +/usr/%{_lib}/xorg/modules/libmfb.so +/usr/%{_lib}/xorg/modules/libpcidata.so +/usr/%{_lib}/xorg/modules/librac.so +/usr/%{_lib}/xorg/modules/libramdac.so +/usr/%{_lib}/xorg/modules/libscanpci.so +/usr/%{_lib}/xorg/modules/libshadow.so +/usr/%{_lib}/xorg/modules/libvbe.so +/usr/%{_lib}/xorg/modules/libvgahw.so +/usr/%{_lib}/xorg/modules/libxaa.so +/usr/%{_lib}/xorg/modules/libxf24_32bpp.so +/usr/%{_lib}/xorg/modules/libxf4bpp.so +/usr/%{_lib}/xorg/modules/libxf8_16bpp.so +/usr/%{_lib}/xorg/modules/libxf8_32bpp.so +/usr/%{_lib}/xorg/modules/linux/libdrm.so +/usr/%{_lib}/xorg/modules/linux/libfbdevhw.so +/usr/%{_lib}/xorg/modules/linux/libint10.so +/usr/%{_lib}/xorg/modules/v20002d.uc +/usr/share/X11/fonts/misc/fonts.alias +/usr/share/X11/fonts/misc/fonts.dir +/usr/share/X11/fonts/misc/fonts.alias +/usr/share/X11/fonts/misc/fonts.dir /usr/share/X11/fonts/misc/6x13-ISO8859-1.pcf.gz /usr/share/X11/fonts/misc/cursor.pcf.gz /usr/share/X11/fonts/misc/fonts.alias /usr/share/X11/fonts/misc/fonts.dir -/usr/share/X11/fonts/OTF/fonts.cache-1 -/usr/share/X11/fonts/Type1/cour.pfa -/usr/share/X11/fonts/Type1/fonts.cache-1 -/usr/share/X11/fonts/Type1/fonts.dir -/usr/share/X11/fonts/Type1/l047013t.pfa -/usr/share/X11/fonts/Type1/l048013t.pfa Index: readahead.files.in =================================================================== RCS file: /cvs/dist/rpms/readahead/devel/readahead.files.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- readahead.files.in 21 Dec 2005 09:28:40 -0000 1.4 +++ readahead.files.in 13 Jan 2006 08:37:50 -0000 1.5 @@ -4,7 +4,6 @@ /etc/bonobo-activation/bonobo-activation-config.xml /etc/cups/client.conf /etc/dbus-1/session.conf -/etc/gconf/2/path /etc/gconf/gconf.xml.defaults/apps/CDDB-Slave2/%gconf.xml /etc/gconf/gconf.xml.defaults/apps/evince/%gconf.xml /etc/gconf/gconf.xml.defaults/apps/evolution/addressbook/completion/%gconf.xml @@ -145,9 +144,9 @@ /etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/cdda/%gconf.xml /etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml /etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml -/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323/%gconf.xml /etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml /etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/https/%gconf.xml +/etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/h323/%gconf.xml /etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml /etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/mailto/%gconf.xml /etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml @@ -156,7 +155,6 @@ /etc/gconf/gconf.xml.defaults/desktop/gnome/volume_manager/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/apps/CDDB-Slave2/%gconf.xml -/etc/gconf/gconf.xml.defaults/schemas/apps/charpick/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/apps/clock_applet/prefs/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/apps/cpufreq-applet/%gconf.xml @@ -219,6 +217,7 @@ /etc/gconf/gconf.xml.defaults/schemas/apps/gthumb/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/apps/gtik/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/apps/gweather/%gconf.xml +/etc/gconf/gconf.xml.defaults/schemas/apps/charpick/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/apps/metacity/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/apps/metacity/general/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/apps/metacity/global_keybindings/%gconf.xml @@ -264,8 +263,8 @@ /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background/%gconf.xml -/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file_views/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views/%gconf.xml +/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file_views/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface/%gconf.xml @@ -293,9 +292,9 @@ /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/cdda/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml -/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/https/%gconf.xml +/etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/h323/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/mailto/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml @@ -305,6 +304,7 @@ /etc/gconf/gconf.xml.defaults/schemas/%gconf.xml /etc/gconf/gconf.xml.defaults/schemas/system/%gconf.xml /etc/gconf/gconf.xml.defaults/system/%gconf.xml +/etc/gconf/2/path /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 @@ -312,13 +312,13 @@ /etc/gnome-vfs-2.0/modules/ssl-modules.conf /etc/gnome-vfs-2.0/modules/theme-method.conf /etc/pam.d/xscreensaver -/etc/rc5.d/K01yum -/etc/rc5.d/K02NetworkManager -/etc/rc5.d/K02NetworkManagerDispatcher /etc/rc.d/init.d/pcmcia /etc/rc.d/init.d/sendmail /etc/rc.d/rc5.d/S09pcmcia /etc/rc.d/rc5.d/S80sendmail +/etc/rc5.d/K01yum +/etc/rc5.d/K02NetworkManager +/etc/rc5.d/K02NetworkManagerDispatcher /etc/rpm/macros.jpackage /etc/rpm/macros.prelink /etc/rpm/macros.specspo @@ -335,7 +335,7 @@ /etc/X11/xinit/xinitrc-common /etc/X11/xinit/xinitrc.d/xinput.sh /etc/X11/Xmodmap -##LIBDIR##libgcc_s.so.1 +/%{_lib}/libgcc_s.so.1 /sbin/pam_timestamp_check /usr/bin/ainit /usr/bin/cut @@ -356,771 +356,191 @@ /usr/bin/magicdev /usr/bin/md5sum /usr/bin/metacity +/usr/bin/mkfontdir +/usr/bin/mkfontscale /usr/bin/nautilus /usr/bin/nautilus-connect-server /usr/bin/openoffice.org-2.0 /usr/bin/pam-panel-icon /usr/bin/printenv /usr/bin/rhn-applet-gui +/usr/bin/sessreg /usr/bin/ssh-agent /usr/bin/system-config-date /usr/bin/which +/usr/bin/xmodmap /usr/bin/xscreensaver -/usr##LIBDIR##bonobo/monikers/libmoniker_std_2.so -/usr##LIBDIR##bonobo/servers/Accessibility_Registry.server -/usr##LIBDIR##bonobo/servers/Bonobo_CosNaming_NamingContext.server -/usr##LIBDIR##bonobo/servers/Bonobo_Moniker_std.server -/usr##LIBDIR##bonobo/servers/Bonobo_Sample_Controls.server -/usr##LIBDIR##bonobo/servers/Bonobo_Sample_Echo.server -/usr##LIBDIR##bonobo/servers/CanvDemo.server -/usr##LIBDIR##bonobo/servers/File_Roller_Component.server -/usr##LIBDIR##bonobo/servers/GNOME_AccessxStatusApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_BattstatApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_CDPlayerApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_CharpickerApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_ClockApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_CPUFreqApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_DriveMountApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Addressbook_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Calendar_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Calendar_Importer_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_DataServer_1.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Mail_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Mail_Importers_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Shell_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_FishApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_GDictApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Gedit.server -/usr##LIBDIR##bonobo/servers/GNOME_GeyesApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Gok.server -/usr##LIBDIR##bonobo/servers/GNOME_GThumb_CatalogView.server -/usr##LIBDIR##bonobo/servers/GNOME_GThumb_Viewer.server -/usr##LIBDIR##bonobo/servers/GNOME_GtikApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_GtkHTML_Editor-3.6.server -/usr##LIBDIR##bonobo/servers/GNOME_GWeatherApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_KeyboardApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Magnifier.server -/usr##LIBDIR##bonobo/servers/GNOME_MailcheckApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_Media_CDDBSlave2.server -/usr##LIBDIR##bonobo/servers/gnomemeeting.server -/usr##LIBDIR##bonobo/servers/GNOME_MiniCommanderApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_MixerApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_ModemLightsApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Moniker_std.server -/usr##LIBDIR##bonobo/servers/GNOME_MultiLoadApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_NetstatusApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_NotificationAreaApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_NullApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_Panel.server -/usr##LIBDIR##bonobo/servers/GNOME_Panel_TrashApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Panel_WirelessApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_PilotApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Pilot_Daemon.server -/usr##LIBDIR##bonobo/servers/GNOME_RemoteDesktop.server -/usr##LIBDIR##bonobo/servers/GNOME_SettingsDaemon.server -/usr##LIBDIR##bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server -/usr##LIBDIR##bonobo/servers/GNOME_Spell.server -/usr##LIBDIR##bonobo/servers/GNOME_StickyNotesApplet.server -/usr##LIBDIR##bonobo/servers/gnome-terminal.server -/usr##LIBDIR##bonobo/servers/GNOME_VFS_Daemon.server -/usr##LIBDIR##bonobo/servers/GNOME_VFS_Moniker_std.server -/usr##LIBDIR##bonobo/servers/GNOME_Wncklet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_Yelp.server -/usr##LIBDIR##bonobo/servers/Nautilus_shell.server -/usr##LIBDIR##evolution/2.6/components/libevolution-addressbook.so -/usr##LIBDIR##evolution/2.6/components/libevolution-calendar.so -/usr##LIBDIR##evolution/2.6/components/libevolution-mail.so -/usr##LIBDIR##evolution/2.6/libeabutil.so.0 -/usr##LIBDIR##evolution/2.6/libecontacteditor.so.0 -/usr##LIBDIR##evolution/2.6/libecontactlisteditor.so.0 -/usr##LIBDIR##evolution/2.6/libefilterbar.so.0 -/usr##LIBDIR##evolution/2.6/libemiscwidgets.so.0 -/usr##LIBDIR##evolution/2.6/libeshell.so.0 -/usr##LIBDIR##evolution/2.6/libessmime.so.0 -/usr##LIBDIR##evolution/2.6/libetimezonedialog.so.0 -/usr##LIBDIR##evolution/2.6/libeutil.so.0 -/usr##LIBDIR##evolution/2.6/libevolution-a11y.so.0 -/usr##LIBDIR##evolution/2.6/libevolution-addressbook-a11y.so.0 -/usr##LIBDIR##evolution/2.6/libevolution-calendar-a11y.so.0 -/usr##LIBDIR##evolution/2.6/libevolution-importer.so.0 -/usr##LIBDIR##evolution/2.6/libevolution-mail-importers.so.0 -/usr##LIBDIR##evolution/2.6/libevolution-smime.so.0 -/usr##LIBDIR##evolution/2.6/libevolution-widgets-a11y.so.0 -/usr##LIBDIR##evolution/2.6/libfilter.so.0 -/usr##LIBDIR##evolution/2.6/libmenus.so.0 -/usr##LIBDIR##evolution/2.6/plugins/liborg-gnome-evolution-startup-wizard.so -/usr##LIBDIR##evolution/2.6/plugins/liborg-gnome-exchange-account-settings.so -/usr##LIBDIR##evolution/2.6/plugins/liborg-gnome-gw-account-setup.so -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-addressbook-file.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-addressbook-groupwise.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-audio-inline.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-calendar-file.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-calendar-http.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-calendar-weather.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-compose-send-options.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-copy-tool.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-default-source.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-evolution-bbdb.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-evolution-startup-wizard.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-exchange-account-setup.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-gw-account-setup.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-itip-formatter.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-mail-folder-unsubscribe.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-mailing-list-actions.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-mailing-list-actions.xml -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-mail-to-task.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-mark-calendar-offline.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-new-mail-notify.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-plugin-manager.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-plugin-manager.xml -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-prefer-plain.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-save-attachments.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-save-attachments.xml -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-save-calendar.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-select-one-source.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-send-options.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-shared-folder.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-status-track.eplug -/usr##LIBDIR##evolution/2.6/plugins/org-gnome-subject-thread.eplug -/usr##LIBDIR##evolution-data-server-1.6/camel-providers/libcamelgroupwise.urls -/usr##LIBDIR##evolution-data-server-1.6/camel-providers/libcamelimap4.urls -/usr##LIBDIR##evolution-data-server-1.6/camel-providers/libcamelimap.urls -/usr##LIBDIR##evolution-data-server-1.6/camel-providers/libcamellocal.so -/usr##LIBDIR##evolution-data-server-1.6/camel-providers/libcamellocal.urls -/usr##LIBDIR##evolution-data-server-1.6/camel-providers/libcamelnntp.urls -/usr##LIBDIR##evolution-data-server-1.6/camel-providers/libcamelpop3.urls -/usr##LIBDIR##evolution-data-server-1.6/camel-providers/libcamelsendmail.urls -/usr##LIBDIR##evolution-data-server-1.6/camel-providers/libcamelsmtp.urls -/usr##LIBDIR##evolution-data-server-1.6/extensions/libebookbackendfile.so -/usr##LIBDIR##evolution-data-server-1.6/extensions/libebookbackendgroupwise.so -/usr##LIBDIR##evolution-data-server-1.6/extensions/libebookbackendldap.so -/usr##LIBDIR##evolution-data-server-1.6/extensions/libebookbackendvcf.so -/usr##LIBDIR##evolution-data-server-1.6/extensions/libecalbackendcontacts.so -/usr##LIBDIR##evolution-data-server-1.6/extensions/libecalbackendfile.so -/usr##LIBDIR##evolution-data-server-1.6/extensions/libecalbackendgroupwise.so -/usr##LIBDIR##evolution-data-server-1.6/extensions/libecalbackendhttp.so -/usr##LIBDIR##evolution-data-server-1.6/extensions/libecalbackendweather.so -/usr##LIBDIR##firefox-1.5/chrome/browser.jar -/usr##LIBDIR##firefox-1.5/chrome/chrome.rdf -/usr##LIBDIR##firefox-1.5/chrome/classic.jar -/usr##LIBDIR##firefox-1.5/chrome/en-US.jar -/usr##LIBDIR##firefox-1.5/chrome/help.jar -/usr##LIBDIR##firefox-1.5/chrome/icons/default/default.xpm -/usr##LIBDIR##firefox-1.5/chrome/inspector.jar -/usr##LIBDIR##firefox-1.5/chrome/installed-chrome.txt -/usr##LIBDIR##firefox-1.5/chrome/overlayinfo/browser/content/overlays.rdf -/usr##LIBDIR##firefox-1.5/chrome/overlayinfo/inspector/content/overlays.rdf -/usr##LIBDIR##firefox-1.5/chrome/toolkit.jar -/usr##LIBDIR##firefox-1.5/components/accessibility-atk.xpt -/usr##LIBDIR##firefox-1.5/components/accessibility.xpt -/usr##LIBDIR##firefox-1.5/components/appshell.xpt -/usr##LIBDIR##firefox-1.5/components/autocomplete.xpt -/usr##LIBDIR##firefox-1.5/components/autoconfig.xpt -/usr##LIBDIR##firefox-1.5/components/bookmarks.xpt -/usr##LIBDIR##firefox-1.5/components/caps.xpt -/usr##LIBDIR##firefox-1.5/components/chardet.xpt -/usr##LIBDIR##firefox-1.5/components/commandhandler.xpt -/usr##LIBDIR##firefox-1.5/components/composer.xpt -/usr##LIBDIR##firefox-1.5/components/compreg.dat -/usr##LIBDIR##firefox-1.5/components/content_base.xpt -/usr##LIBDIR##firefox-1.5/components/content_htmldoc.xpt -/usr##LIBDIR##firefox-1.5/components/content_html.xpt -/usr##LIBDIR##firefox-1.5/components/content_xmldoc.xpt -/usr##LIBDIR##firefox-1.5/components/content_xslt.xpt -/usr##LIBDIR##firefox-1.5/components/cookie.xpt -/usr##LIBDIR##firefox-1.5/components/directory.xpt -/usr##LIBDIR##firefox-1.5/components/docshell.xpt -/usr##LIBDIR##firefox-1.5/components/dom_base.xpt -/usr##LIBDIR##firefox-1.5/components/dom_core.xpt -/usr##LIBDIR##firefox-1.5/components/dom_css.xpt -/usr##LIBDIR##firefox-1.5/components/dom_events.xpt -/usr##LIBDIR##firefox-1.5/components/dom_html.xpt -/usr##LIBDIR##firefox-1.5/components/dom_loadsave.xpt -/usr##LIBDIR##firefox-1.5/components/dom_range.xpt -/usr##LIBDIR##firefox-1.5/components/dom_stylesheets.xpt -/usr##LIBDIR##firefox-1.5/components/dom_traversal.xpt -/usr##LIBDIR##firefox-1.5/components/dom_views.xpt -/usr##LIBDIR##firefox-1.5/components/dom_xbl.xpt -/usr##LIBDIR##firefox-1.5/components/dom_xpath.xpt -/usr##LIBDIR##firefox-1.5/components/dom.xpt -/usr##LIBDIR##firefox-1.5/components/dom_xul.xpt -/usr##LIBDIR##firefox-1.5/components/downloads.xpt -/usr##LIBDIR##firefox-1.5/components/editor.xpt -/usr##LIBDIR##firefox-1.5/components/embed_base.xpt -/usr##LIBDIR##firefox-1.5/components/extensions.xpt -/usr##LIBDIR##firefox-1.5/components/exthandler.xpt -/usr##LIBDIR##firefox-1.5/components/fastfind.xpt -/usr##LIBDIR##firefox-1.5/components/filepicker.xpt -/usr##LIBDIR##firefox-1.5/components/find.xpt -/usr##LIBDIR##firefox-1.5/components/gfx.xpt -/usr##LIBDIR##firefox-1.5/components/helperAppDlg.xpt -/usr##LIBDIR##firefox-1.5/components/history.xpt -/usr##LIBDIR##firefox-1.5/components/htmlparser.xpt -/usr##LIBDIR##firefox-1.5/components/imgicon.xpt -/usr##LIBDIR##firefox-1.5/components/imglib2.xpt -/usr##LIBDIR##firefox-1.5/components.ini -/usr##LIBDIR##firefox-1.5/components/inspector-cmdline.js -/usr##LIBDIR##firefox-1.5/components/inspector.xpt -/usr##LIBDIR##firefox-1.5/components/intl.xpt -/usr##LIBDIR##firefox-1.5/components/jar.xpt -/usr##LIBDIR##firefox-1.5/components/jsconsole-clhandler.js -/usr##LIBDIR##firefox-1.5/components/jsconsole.xpt -/usr##LIBDIR##firefox-1.5/components/jsdservice.xpt -/usr##LIBDIR##firefox-1.5/components/jsurl.xpt -/usr##LIBDIR##firefox-1.5/components/layout_base.xpt -/usr##LIBDIR##firefox-1.5/components/layout_xul_tree.xpt -/usr##LIBDIR##firefox-1.5/components/layout_xul.xpt -/usr##LIBDIR##firefox-1.5/components/libaccessibility.so -/usr##LIBDIR##firefox-1.5/components/libappcomps.so -/usr##LIBDIR##firefox-1.5/components/libautoconfig.so -/usr##LIBDIR##firefox-1.5/components/libbrowsercomps.so -/usr##LIBDIR##firefox-1.5/components/libcaps.so -/usr##LIBDIR##firefox-1.5/components/libchrome.so -/usr##LIBDIR##firefox-1.5/components/libcomposer.so -/usr##LIBDIR##firefox-1.5/components/libcookie.so -/usr##LIBDIR##firefox-1.5/components/libdocshell.so -/usr##LIBDIR##firefox-1.5/components/libeditor.so -/usr##LIBDIR##firefox-1.5/components/libembedcomponents.so -/usr##LIBDIR##firefox-1.5/components/libfileview.so -/usr##LIBDIR##firefox-1.5/components/libgfx_gtk.so -/usr##LIBDIR##firefox-1.5/components/libgfxps.so -/usr##LIBDIR##firefox-1.5/components/libgklayout.so -/usr##LIBDIR##firefox-1.5/components/libgkplugin.so -/usr##LIBDIR##firefox-1.5/components/libhtmlpars.so -/usr##LIBDIR##firefox-1.5/components/libi18n.so -/usr##LIBDIR##firefox-1.5/components/libimgicon.so -/usr##LIBDIR##firefox-1.5/components/libimglib2.so -/usr##LIBDIR##firefox-1.5/components/libinspector.so -/usr##LIBDIR##firefox-1.5/components/libjar50.so -/usr##LIBDIR##firefox-1.5/components/libjsd.so -/usr##LIBDIR##firefox-1.5/components/libmork.so -/usr##LIBDIR##firefox-1.5/components/libmozfind.so -/usr##LIBDIR##firefox-1.5/components/libmozgnome.so -/usr##LIBDIR##firefox-1.5/components/libnecko2.so -/usr##LIBDIR##firefox-1.5/components/libnecko.so -/usr##LIBDIR##firefox-1.5/components/libnegotiateauth.so -/usr##LIBDIR##firefox-1.5/components/libnkgnomevfs.so -/usr##LIBDIR##firefox-1.5/components/libnsappshell.so -/usr##LIBDIR##firefox-1.5/components/liboji.so -/usr##LIBDIR##firefox-1.5/components/libpipboot.so -/usr##LIBDIR##firefox-1.5/components/libpipnss.so -/usr##LIBDIR##firefox-1.5/components/libpippki.so -/usr##LIBDIR##firefox-1.5/components/libpref.so -/usr##LIBDIR##firefox-1.5/components/librdf.so -/usr##LIBDIR##firefox-1.5/components/libsystem-pref.so -/usr##LIBDIR##firefox-1.5/components/libtoolkitcomps.so -/usr##LIBDIR##firefox-1.5/components/libtransformiix.so -/usr##LIBDIR##firefox-1.5/components/libtxmgr.so -/usr##LIBDIR##firefox-1.5/components/libuconv.so -/usr##LIBDIR##firefox-1.5/components/libucvmath.so -/usr##LIBDIR##firefox-1.5/components/libuniversalchardet.so -/usr##LIBDIR##firefox-1.5/components/libwebbrwsr.so -/usr##LIBDIR##firefox-1.5/components/libwebsrvcs.so -/usr##LIBDIR##firefox-1.5/components/libwidget_gtk2.so -/usr##LIBDIR##firefox-1.5/components/libxmlextras.so -/usr##LIBDIR##firefox-1.5/components/libxpcom_compat_c.so -/usr##LIBDIR##firefox-1.5/components/libxpconnect.so -/usr##LIBDIR##firefox-1.5/components/libxpinstall.so -/usr##LIBDIR##firefox-1.5/components/libxremote_client.so -/usr##LIBDIR##firefox-1.5/components/libxremoteservice.so -/usr##LIBDIR##firefox-1.5/components/locale.xpt -/usr##LIBDIR##firefox-1.5/components/lwbrk.xpt -/usr##LIBDIR##firefox-1.5/components/migration.xpt -/usr##LIBDIR##firefox-1.5/components/mimetype.xpt -/usr##LIBDIR##firefox-1.5/components/mozbrwsr.xpt -/usr##LIBDIR##firefox-1.5/components/mozfind.xpt -/usr##LIBDIR##firefox-1.5/components/mozgnome.xpt -/usr##LIBDIR##firefox-1.5/components/necko_about.xpt -/usr##LIBDIR##firefox-1.5/components/necko_cache.xpt -/usr##LIBDIR##firefox-1.5/components/necko_cookie.xpt -/usr##LIBDIR##firefox-1.5/components/necko_data.xpt -/usr##LIBDIR##firefox-1.5/components/necko_dns.xpt -/usr##LIBDIR##firefox-1.5/components/necko_file.xpt -/usr##LIBDIR##firefox-1.5/components/necko_ftp.xpt -/usr##LIBDIR##firefox-1.5/components/necko_http.xpt -/usr##LIBDIR##firefox-1.5/components/necko_jar.xpt -/usr##LIBDIR##firefox-1.5/components/necko_res.xpt -/usr##LIBDIR##firefox-1.5/components/necko_socket.xpt -/usr##LIBDIR##firefox-1.5/components/necko_strconv.xpt -/usr##LIBDIR##firefox-1.5/components/necko_viewsource.xpt -/usr##LIBDIR##firefox-1.5/components/necko.xpt -/usr##LIBDIR##firefox-1.5/components/nsCloseAllWindows.js -/usr##LIBDIR##firefox-1.5/components/nsDictionary.js -/usr##LIBDIR##firefox-1.5/components/nsExtensionManager.js -/usr##LIBDIR##firefox-1.5/components/nsFilePicker.js -/usr##LIBDIR##firefox-1.5/components/nsHelperAppDlg.js -/usr##LIBDIR##firefox-1.5/components/nsInterfaceInfoToIDL.js -/usr##LIBDIR##firefox-1.5/components/nsKillAll.js -/usr##LIBDIR##firefox-1.5/components/nsProgressDialog.js -/usr##LIBDIR##firefox-1.5/components/nsProxyAutoConfig.js -/usr##LIBDIR##firefox-1.5/components/nsResetPref.js -/usr##LIBDIR##firefox-1.5/components/nsSetDefaultBrowser.js -/usr##LIBDIR##firefox-1.5/components/nsSidebar.js -/usr##LIBDIR##firefox-1.5/components/nsUpdateService.js -/usr##LIBDIR##firefox-1.5/components/nsXmlRpcClient.js -/usr##LIBDIR##firefox-1.5/components/oji.xpt -/usr##LIBDIR##firefox-1.5/components/passwordmgr.xpt -/usr##LIBDIR##firefox-1.5/components/pipboot.xpt -/usr##LIBDIR##firefox-1.5/components/pipnss.xpt -/usr##LIBDIR##firefox-1.5/components/pippki.xpt -/usr##LIBDIR##firefox-1.5/components/plugin.xpt -/usr##LIBDIR##firefox-1.5/components/prefetch.xpt -/usr##LIBDIR##firefox-1.5/components/pref.xpt -/usr##LIBDIR##firefox-1.5/components/profile.xpt -/usr##LIBDIR##firefox-1.5/components/progressDlg.xpt -/usr##LIBDIR##firefox-1.5/components/proxyObjInst.xpt -/usr##LIBDIR##firefox-1.5/components/rdf.xpt -/usr##LIBDIR##firefox-1.5/components/satchel.xpt -/usr##LIBDIR##firefox-1.5/components/search.xpt -/usr##LIBDIR##firefox-1.5/components/shellservice.xpt -/usr##LIBDIR##firefox-1.5/components/shistory.xpt -/usr##LIBDIR##firefox-1.5/components/sidebar.xpt -/usr##LIBDIR##firefox-1.5/components/toolkitprofile.xpt -/usr##LIBDIR##firefox-1.5/components/txmgr.xpt -/usr##LIBDIR##firefox-1.5/components/txtsvc.xpt -/usr##LIBDIR##firefox-1.5/components/uconv.xpt -/usr##LIBDIR##firefox-1.5/components/unicharutil.xpt -/usr##LIBDIR##firefox-1.5/components/update.xpt -/usr##LIBDIR##firefox-1.5/components/uriloader.xpt -/usr##LIBDIR##firefox-1.5/components/webBrowser_core.xpt -/usr##LIBDIR##firefox-1.5/components/webbrowserpersist.xpt -/usr##LIBDIR##firefox-1.5/components/webshell_idls.xpt -/usr##LIBDIR##firefox-1.5/components/websrvcs.xpt -/usr##LIBDIR##firefox-1.5/components/widget.xpt -/usr##LIBDIR##firefox-1.5/components/windowds.xpt -/usr##LIBDIR##firefox-1.5/components/windowwatcher.xpt -/usr##LIBDIR##firefox-1.5/components/xmlextras.xpt -/usr##LIBDIR##firefox-1.5/components/xml-rpc.xpt -/usr##LIBDIR##firefox-1.5/components/xpcom_base.xpt -/usr##LIBDIR##firefox-1.5/components/xpcom_components.xpt -/usr##LIBDIR##firefox-1.5/components/xpcom_ds.xpt -/usr##LIBDIR##firefox-1.5/components/xpcom_io.xpt -/usr##LIBDIR##firefox-1.5/components/xpcom_obsolete.xpt -/usr##LIBDIR##firefox-1.5/components/xpcom_threads.xpt -/usr##LIBDIR##firefox-1.5/components/xpcom_xpti.xpt -/usr##LIBDIR##firefox-1.5/components/xpconnect.xpt -/usr##LIBDIR##firefox-1.5/components/xpinstall.xpt -/usr##LIBDIR##firefox-1.5/components/xpti.dat -/usr##LIBDIR##firefox-1.5/components/xremoteservice.xpt -/usr##LIBDIR##firefox-1.5/components/xuldoc.xpt -/usr##LIBDIR##firefox-1.5/components/xultmpl.xpt -/usr##LIBDIR##firefox-1.5/defaults/pref/all-redhat.js -/usr##LIBDIR##firefox-1.5/defaults/pref/firefox.js -/usr##LIBDIR##firefox-1.5/defaults/pref/firefox-l10n.js -/usr##LIBDIR##firefox-1.5/defaults/pref/inspector.js -/usr##LIBDIR##firefox-1.5/extensions/Extensions.rdf -/usr##LIBDIR##firefox-1.5/extensions/installed-extensions-processed.txt -/usr##LIBDIR##firefox-1.5/firefox -/usr##LIBDIR##firefox-1.5/firefox-bin -/usr##LIBDIR##firefox-1.5/greprefs/all.js -/usr##LIBDIR##firefox-1.5/greprefs/all-redhat.js -/usr##LIBDIR##firefox-1.5/greprefs/security-prefs.js -/usr##LIBDIR##firefox-1.5/greprefs/xpinstall.js -/usr##LIBDIR##firefox-1.5/libgkgfx.so -/usr##LIBDIR##firefox-1.5/libgtkxtbin.so -/usr##LIBDIR##firefox-1.5/libjsj.so -/usr##LIBDIR##firefox-1.5/libmozjs.so -/usr##LIBDIR##firefox-1.5/libnspr4.so -/usr##LIBDIR##firefox-1.5/libplc4.so -/usr##LIBDIR##firefox-1.5/libplds4.so -/usr##LIBDIR##firefox-1.5/libxpcom_compat.so -/usr##LIBDIR##firefox-1.5/libxpcom.so -/usr##LIBDIR##firefox-1.5/mozilla-xremote-client -/usr##LIBDIR##firefox-1.5/plugins/libnullplugin.so -/usr##LIBDIR##firefox-1.5/res/broken-image.gif -/usr##LIBDIR##firefox-1.5/res/builtin/platformHTMLBindings.xml -/usr##LIBDIR##firefox-1.5/res/charsetalias.properties -/usr##LIBDIR##firefox-1.5/res/charsetData.properties -/usr##LIBDIR##firefox-1.5/res/fonts/pangoFontEncoding.properties -/usr##LIBDIR##firefox-1.5/res/forms.css -/usr##LIBDIR##firefox-1.5/res/html.css -/usr##LIBDIR##firefox-1.5/res/langGroups.properties -/usr##LIBDIR##firefox-1.5/res/loading-image.gif -/usr##LIBDIR##firefox-1.5/res/platform-forms.css -/usr##LIBDIR##firefox-1.5/res/quirk.css -/usr##LIBDIR##firefox-1.5/res/ua.css -/usr##LIBDIR##firefox-1.5/run-mozilla.sh -/usr##LIBDIR##firefox-1.5/searchplugins/amazondotcom.png -/usr##LIBDIR##firefox-1.5/searchplugins/amazondotcom.src -/usr##LIBDIR##firefox-1.5/searchplugins/creativecommons.png -/usr##LIBDIR##firefox-1.5/searchplugins/creativecommons.src -/usr##LIBDIR##firefox-1.5/searchplugins/dictionary.png -/usr##LIBDIR##firefox-1.5/searchplugins/dictionary.src -/usr##LIBDIR##firefox-1.5/searchplugins/eBay.gif -/usr##LIBDIR##firefox-1.5/searchplugins/eBay.src -/usr##LIBDIR##firefox-1.5/searchplugins/google.gif -/usr##LIBDIR##firefox-1.5/searchplugins/google.src -/usr##LIBDIR##firefox-1.5/searchplugins/yahoo.gif -/usr##LIBDIR##firefox-1.5/searchplugins/yahoo.src -/usr##LIBDIR##GConf/2/libgconfbackend-xml.so -/usr##LIBDIR##gconv/UTF-16.so -/usr##LIBDIR##gnome-vfs-2.0/modules/libfile.so -/usr##LIBDIR##gnome-vfs-2.0/modules/libmapping.so -/usr##LIBDIR##gstreamer-0.8/libgst1394.so -/usr##LIBDIR##gstreamer-0.8/libgstac3parse.so -/usr##LIBDIR##gstreamer-0.8/libgstadder.so -/usr##LIBDIR##gstreamer-0.8/libgstalaw.so -/usr##LIBDIR##gstreamer-0.8/libgstalphacolor.so -/usr##LIBDIR##gstreamer-0.8/libgstalpha.so -/usr##LIBDIR##gstreamer-0.8/libgstalsa.so -/usr##LIBDIR##gstreamer-0.8/libgstapetag.so -/usr##LIBDIR##gstreamer-0.8/libgstartsdsink.so -/usr##LIBDIR##gstreamer-0.8/libgstarts.so -/usr##LIBDIR##gstreamer-0.8/libgstasf.so -/usr##LIBDIR##gstreamer-0.8/libgstaudioconvert.so -/usr##LIBDIR##gstreamer-0.8/libgstaudiofile.so -/usr##LIBDIR##gstreamer-0.8/libgstaudiofilter.so -/usr##LIBDIR##gstreamer-0.8/libgstaudiorate.so -/usr##LIBDIR##gstreamer-0.8/libgstaudioscale.so -/usr##LIBDIR##gstreamer-0.8/libgstaudio.so -/usr##LIBDIR##gstreamer-0.8/libgstauparse.so -/usr##LIBDIR##gstreamer-0.8/libgstautodetect.so -/usr##LIBDIR##gstreamer-0.8/libgstavi.so -/usr##LIBDIR##gstreamer-0.8/libgstbasicgthreadscheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstbasicomegascheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstbytestream.so -/usr##LIBDIR##gstreamer-0.8/libgstcdparanoia.so -/usr##LIBDIR##gstreamer-0.8/libgstcdplayer.so -/usr##LIBDIR##gstreamer-0.8/libgstcdxaparse.so -/usr##LIBDIR##gstreamer-0.8/libgstchart.so -/usr##LIBDIR##gstreamer-0.8/libgstcolorspace.so -/usr##LIBDIR##gstreamer-0.8/libgstcutter.so -/usr##LIBDIR##gstreamer-0.8/libgstdataprotocol.so -/usr##LIBDIR##gstreamer-0.8/libgstdebug.so -/usr##LIBDIR##gstreamer-0.8/libgstdecodebin.so -/usr##LIBDIR##gstreamer-0.8/libgstdeinterlace.so -/usr##LIBDIR##gstreamer-0.8/libgstdvdec.so -/usr##LIBDIR##gstreamer-0.8/libgstdvdlpcmdec.so -/usr##LIBDIR##gstreamer-0.8/libgstefence.so -/usr##LIBDIR##gstreamer-0.8/libgsteffectv.so -/usr##LIBDIR##gstreamer-0.8/libgstelements.so -/usr##LIBDIR##gstreamer-0.8/libgstentrygthreadscheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstentryomegascheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstequalizer.so -/usr##LIBDIR##gstreamer-0.8/libgstesd.so -/usr##LIBDIR##gstreamer-0.8/libgstfairgthreadscheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstfestival.so -/usr##LIBDIR##gstreamer-0.8/libgstffmpegcolorspace.so -/usr##LIBDIR##gstreamer-0.8/libgstfilter.so -/usr##LIBDIR##gstreamer-0.8/libgstflac.so -/usr##LIBDIR##gstreamer-0.8/libgstflxdec.so -/usr##LIBDIR##gstreamer-0.8/libgstgamma.so -/usr##LIBDIR##gstreamer-0.8/libgstgconfelements.so -/usr##LIBDIR##gstreamer-0.8/libgstgdkpixbuf.so -/usr##LIBDIR##gstreamer-0.8/libgstgetbits.so -/usr##LIBDIR##gstreamer-0.8/libgstglimagesink.so -/usr##LIBDIR##gstreamer-0.8/libgstgnomevfs.so -/usr##LIBDIR##gstreamer-0.8/libgstgoom.so -/usr##LIBDIR##gstreamer-0.8/libgstidct.so -/usr##LIBDIR##gstreamer-0.8/libgstindexers.so -/usr##LIBDIR##gstreamer-0.8/libgstinterleave.so -/usr##LIBDIR##gstreamer-0.8/libgstjpeg.so -/usr##LIBDIR##gstreamer-0.8/libgstlevel.so -/usr##LIBDIR##gstreamer-0.8/libgstmatroska.so -/usr##LIBDIR##gstreamer-0.8/libgstmedian.so -/usr##LIBDIR##gstreamer-0.8/libgstmixmatrix.so -/usr##LIBDIR##gstreamer-0.8/libgstmng.so -/usr##LIBDIR##gstreamer-0.8/libgstmodplug.so -/usr##LIBDIR##gstreamer-0.8/libgstmonoscope.so -/usr##LIBDIR##gstreamer-0.8/libgstmulaw.so -/usr##LIBDIR##gstreamer-0.8/libgstmultifilesink.so -/usr##LIBDIR##gstreamer-0.8/libgstmultipart.so -/usr##LIBDIR##gstreamer-0.8/libgstnavigationtest.so -/usr##LIBDIR##gstreamer-0.8/libgstogg.so -/usr##LIBDIR##gstreamer-0.8/libgstoptgthreadscheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstoptomegascheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstoptscheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstossaudio.so -/usr##LIBDIR##gstreamer-0.8/libgstoverlay.so -/usr##LIBDIR##gstreamer-0.8/libgstpassthrough.so -/usr##LIBDIR##gstreamer-0.8/libgstplaybin.so -/usr##LIBDIR##gstreamer-0.8/libgstplayondemand.so -/usr##LIBDIR##gstreamer-0.8/libgstpng.so -/usr##LIBDIR##gstreamer-0.8/libgstpuzzle.so -/usr##LIBDIR##gstreamer-0.8/libgstqtdemux.so -/usr##LIBDIR##gstreamer-0.8/libgstresample.so -/usr##LIBDIR##gstreamer-0.8/libgstrfbsrc.so -/usr##LIBDIR##gstreamer-0.8/libgstriff.so -/usr##LIBDIR##gstreamer-0.8/libgstrmdemux.so -/usr##LIBDIR##gstreamer-0.8/libgstrtjpeg.so -/usr##LIBDIR##gstreamer-0.8/libgstrtp.so -/usr##LIBDIR##gstreamer-0.8/libgstsdlvideosink.so -/usr##LIBDIR##gstreamer-0.8/libgstsilence.so -/usr##LIBDIR##gstreamer-0.8/libgstsinesrc.so -/usr##LIBDIR##gstreamer-0.8/libgstsmooth.so -/usr##LIBDIR##gstreamer-0.8/libgstsmoothwave.so -/usr##LIBDIR##gstreamer-0.8/libgstsmpte.so -/usr##LIBDIR##gstreamer-0.8/libgstsnapshot.so -/usr##LIBDIR##gstreamer-0.8/libgstspectrum.so -/usr##LIBDIR##gstreamer-0.8/libgstspeed.so -/usr##LIBDIR##gstreamer-0.8/libgstspeex.so -/usr##LIBDIR##gstreamer-0.8/libgstspider.so -/usr##LIBDIR##gstreamer-0.8/libgststereo.so -/usr##LIBDIR##gstreamer-0.8/libgstsubparse.so -/usr##LIBDIR##gstreamer-0.8/libgstswitch.so -/usr##LIBDIR##gstreamer-0.8/libgstsynaesthesia.so -/usr##LIBDIR##gstreamer-0.8/libgsttagedit.so -/usr##LIBDIR##gstreamer-0.8/libgsttcp.so -/usr##LIBDIR##gstreamer-0.8/libgsttextoverlay.so -/usr##LIBDIR##gstreamer-0.8/libgsttheora.so -/usr##LIBDIR##gstreamer-0.8/libgsttimeoverlay.so -/usr##LIBDIR##gstreamer-0.8/libgsttrm.so -/usr##LIBDIR##gstreamer-0.8/libgsttta.so -/usr##LIBDIR##gstreamer-0.8/libgsttypefindfunctions.so -/usr##LIBDIR##gstreamer-0.8/libgstudp.so -/usr##LIBDIR##gstreamer-0.8/libgstvbidec.so -/usr##LIBDIR##gstreamer-0.8/libgstvcdsrc.so -/usr##LIBDIR##gstreamer-0.8/libgstvideo4linux2.so -/usr##LIBDIR##gstreamer-0.8/libgstvideo4linux.so -/usr##LIBDIR##gstreamer-0.8/libgstvideobalance.so -/usr##LIBDIR##gstreamer-0.8/libgstvideobox.so -/usr##LIBDIR##gstreamer-0.8/libgstvideocrop.so -/usr##LIBDIR##gstreamer-0.8/libgstvideodrop.so -/usr##LIBDIR##gstreamer-0.8/libgstvideofilter.so -/usr##LIBDIR##gstreamer-0.8/libgstvideoflip.so -/usr##LIBDIR##gstreamer-0.8/libgstvideomixer.so -/usr##LIBDIR##gstreamer-0.8/libgstvideorate.so -/usr##LIBDIR##gstreamer-0.8/libgstvideoscale.so -/usr##LIBDIR##gstreamer-0.8/libgstvideo.so -/usr##LIBDIR##gstreamer-0.8/libgstvideotestsrc.so -/usr##LIBDIR##gstreamer-0.8/libgstvolenv.so -/usr##LIBDIR##gstreamer-0.8/libgstvolume.so -/usr##LIBDIR##gstreamer-0.8/libgstvorbis.so -/usr##LIBDIR##gstreamer-0.8/libgstwavenc.so -/usr##LIBDIR##gstreamer-0.8/libgstwavparse.so -/usr##LIBDIR##gstreamer-0.8/libgstximagesink.so -/usr##LIBDIR##gstreamer-0.8/libgstxvimagesink.so -/usr##LIBDIR##gstreamer-0.8/libgstxwindowlistener.so -/usr##LIBDIR##gstreamer-0.8/libgsty4menc.so -/usr##LIBDIR##gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so -/usr##LIBDIR##libaudiofile.so.0 -/usr##LIBDIR##libbeecrypt.so.6 -/usr##LIBDIR##libbonoboui-2.so.0 -/usr##LIBDIR##libcamel-1.2.so.0 -/usr##LIBDIR##libcamel-provider-1.2.so.3 -/usr##LIBDIR##libebook-1.2.so.3 -/usr##LIBDIR##libecal-1.2.so.2 -/usr##LIBDIR##libedata-book-1.2.so.2 -/usr##LIBDIR##libedata-cal-1.2.so.1 -/usr##LIBDIR##libedataserver-1.2.so.4 -/usr##LIBDIR##libedataserverui-1.2.so.4 -/usr##LIBDIR##libeel-2.so.2 -/usr##LIBDIR##libegroupwise-1.2.so.5 -/usr##LIBDIR##libelf.so.1 -/usr##LIBDIR##libesd.so.0 -/usr##LIBDIR##libexif.so.12 -/usr##LIBDIR##libfam.so.0 -/usr##LIBDIR##libgailutil.so.17 -/usr##LIBDIR##libgal-2.4.so.0 -/usr##LIBDIR##libgal-a11y-2.4.so.0 -/usr##LIBDIR##libgcrypt.so.11 -/usr##LIBDIR##libglade-2.0.so.0 -/usr##LIBDIR##libgnome-2.so.0 -/usr##LIBDIR##libgnomecups-1.0.so.1 -/usr##LIBDIR##libgnome-desktop-2.so.2 -/usr##LIBDIR##libgnome-keyring.so.0 -/usr##LIBDIR##libgnome-menu.so.0 -/usr##LIBDIR##libgnomeprint-2-2.so.0 -/usr##LIBDIR##libgnomeprintui-2-2.so.0 -/usr##LIBDIR##libgnomeui-2.so.0 -/usr##LIBDIR##libgnome-window-settings.so.1 -/usr##LIBDIR##libgnutls.so.11 -/usr##LIBDIR##libgpg-error.so.0 -/usr##LIBDIR##libgstinterfaces-0.8.so.0 -/usr##LIBDIR##libgstreamer-0.8.so.1 -/usr##LIBDIR##libgtkhtml-2.so.0 -/usr##LIBDIR##libgtkhtml-3.6.so.18 -/usr##LIBDIR##libIDL-2.so.0 -/usr##LIBDIR##libjpeg.so.62 -/usr##LIBDIR##libmetacity-private.so.0 -/usr##LIBDIR##libnautilus-extension.so.1 -/usr##LIBDIR##libnautilus-private.so.2 -/usr##LIBDIR##libneon.so.24 -/usr##LIBDIR##libnspr4.so -/usr##LIBDIR##libnss3.so -/usr##LIBDIR##libORBit-imodule-2.so.0 -/usr##LIBDIR##libpanel-applet-2.so.0 -/usr##LIBDIR##libplc4.so -/usr##LIBDIR##libplds4.so -/usr##LIBDIR##librpm-4.4.so -/usr##LIBDIR##librpmbuild-4.4.so -/usr##LIBDIR##librpmdb-4.4.so -/usr##LIBDIR##librpmio-4.4.so -/usr##LIBDIR##libsmime3.so -/usr##LIBDIR##libsoftokn3.so -/usr##LIBDIR##libsoup-2.2.so.7 -/usr##LIBDIR##libsqlite3.so.0 -/usr##LIBDIR##libssl3.so -/usr##LIBDIR##libstartup-notification-1.so.0 -/usr##LIBDIR##libstdc++.so.6 -/usr##LIBDIR##libwnck-1.so.16 -/usr##LIBDIR##libxklavier.so.10 -/usr##LIBDIR##nautilus/extensions-1.0/libnautilus-burn-extension.so -/usr##LIBDIR##nautilus/extensions-1.0/libnautilus-fileroller.so -/usr##LIBDIR##nautilus/extensions-1.0/libnautilus-fontilus.so -/usr##LIBDIR##nautilus/extensions-1.0/libnautilus-themus.so -/usr##LIBDIR##orbit-2.0/Bonobo_module.so -/usr##LIBDIR##python2.4/atexit.py -/usr##LIBDIR##python2.4/atexit.pyc -/usr##LIBDIR##python2.4/base64.py -/usr##LIBDIR##python2.4/base64.pyc -/usr##LIBDIR##python2.4/bisect.py -/usr##LIBDIR##python2.4/bisect.pyc -/usr##LIBDIR##python2.4/calendar.py -/usr##LIBDIR##python2.4/calendar.pyc -/usr##LIBDIR##python2.4/codecs.pyc -/usr##LIBDIR##python2.4/cookielib.py -/usr##LIBDIR##python2.4/cookielib.pyc -/usr##LIBDIR##python2.4/copy.pyc -/usr##LIBDIR##python2.4/copy_reg.pyc -/usr##LIBDIR##python2.4/dis.pyc -/usr##LIBDIR##python2.4/encodings/aliases.pyc -/usr##LIBDIR##python2.4/encodings/ascii.py -/usr##LIBDIR##python2.4/encodings/ascii.pyc -/usr##LIBDIR##python2.4/encodings/idna.py -/usr##LIBDIR##python2.4/encodings/idna.pyc -/usr##LIBDIR##python2.4/encodings/__init__.pyc -/usr##LIBDIR##python2.4/encodings/latin_1.pyc -/usr##LIBDIR##python2.4/encodings/utf_8.py -/usr##LIBDIR##python2.4/encodings/utf_8.pyc -/usr##LIBDIR##python2.4/fnmatch.pyc -/usr##LIBDIR##python2.4/ftplib.py -/usr##LIBDIR##python2.4/ftplib.pyc -/usr##LIBDIR##python2.4/gettext.pyc -/usr##LIBDIR##python2.4/glob.pyc -/usr##LIBDIR##python2.4/gopherlib.py -/usr##LIBDIR##python2.4/gopherlib.pyc -/usr##LIBDIR##python2.4/gzip.py -/usr##LIBDIR##python2.4/gzip.pyc -/usr##LIBDIR##python2.4/httplib.py -/usr##LIBDIR##python2.4/httplib.pyc -/usr##LIBDIR##python2.4/inspect.pyc -/usr##LIBDIR##python2.4/keyword.py -/usr##LIBDIR##python2.4/keyword.pyc -/usr##LIBDIR##python2.4/lib-dynload/arraymodule.so -/usr##LIBDIR##python2.4/lib-dynload/binascii.so -/usr##LIBDIR##python2.4/lib-dynload/_bisect.so -/usr##LIBDIR##python2.4/lib-dynload/collectionsmodule.so -/usr##LIBDIR##python2.4/lib-dynload/datetime.so -/usr##LIBDIR##python2.4/lib-dynload/fcntlmodule.so -/usr##LIBDIR##python2.4/lib-dynload/mathmodule.so -/usr##LIBDIR##python2.4/lib-dynload/md5module.so -/usr##LIBDIR##python2.4/lib-dynload/operator.so -/usr##LIBDIR##python2.4/lib-dynload/_randommodule.so -/usr##LIBDIR##python2.4/lib-dynload/selectmodule.so -/usr##LIBDIR##python2.4/lib-dynload/shamodule.so -/usr##LIBDIR##python2.4/lib-dynload/_socketmodule.so -/usr##LIBDIR##python2.4/lib-dynload/_ssl.so -/usr##LIBDIR##python2.4/lib-dynload/unicodedata.so -/usr##LIBDIR##python2.4/linecache.pyc -/usr##LIBDIR##python2.4/locale.pyc -/usr##LIBDIR##python2.4/logging/__init__.py -/usr##LIBDIR##python2.4/logging/__init__.pyc -/usr##LIBDIR##python2.4/_LWPCookieJar.py -/usr##LIBDIR##python2.4/_LWPCookieJar.pyc -/usr##LIBDIR##python2.4/mimetools.py -/usr##LIBDIR##python2.4/mimetools.pyc -/usr##LIBDIR##python2.4/mimetypes.py -/usr##LIBDIR##python2.4/mimetypes.pyc -/usr##LIBDIR##python2.4/_MozillaCookieJar.py -/usr##LIBDIR##python2.4/_MozillaCookieJar.pyc -/usr##LIBDIR##python2.4/opcode.pyc -/usr##LIBDIR##python2.4/os.pyc -/usr##LIBDIR##python2.4/popen2.py -/usr##LIBDIR##python2.4/popen2.pyc -/usr##LIBDIR##python2.4/posixpath.pyc -/usr##LIBDIR##python2.4/random.py -/usr##LIBDIR##python2.4/random.pyc -/usr##LIBDIR##python2.4/re.pyc -/usr##LIBDIR##python2.4/rfc822.py -/usr##LIBDIR##python2.4/rfc822.pyc -/usr##LIBDIR##python2.4/shelve.py -/usr##LIBDIR##python2.4/shelve.pyc -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/atk.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/bonobo/activation.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/bonobo/_bonobo.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/bonobo/__init__.py -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/bonobo/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/bonobo/ui.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnomecanvas.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnome/_gnome.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnome/__init__.py -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnome/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnome/ui.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnomevfs.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gobject.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/glade.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/_gtk.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtkhtml2.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/__init__.py -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/keysyms.py -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/keysyms.pyc -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/pango.so -/usr##LIBDIR##python2.4/site-packages/japanese/aliases/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/japanese/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/OpenSSL/crypto.so -/usr##LIBDIR##python2.4/site-packages/OpenSSL/__init__.py -/usr##LIBDIR##python2.4/site-packages/OpenSSL/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/OpenSSL/rand.so -/usr##LIBDIR##python2.4/site-packages/OpenSSL/SSL.so -/usr##LIBDIR##python2.4/site-packages/OpenSSL/tsafe.py -/usr##LIBDIR##python2.4/site-packages/OpenSSL/tsafe.pyc -/usr##LIBDIR##python2.4/site-packages/OpenSSL/version.py -/usr##LIBDIR##python2.4/site-packages/OpenSSL/version.pyc -/usr##LIBDIR##python2.4/site-packages/ORBit.so -/usr##LIBDIR##python2.4/site-packages/rhpl/gzread.pyc -/usr##LIBDIR##python2.4/site-packages/rhpl/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/rhpl/translate.pyc -/usr##LIBDIR##python2.4/site-packages/rpm/__init__.py -/usr##LIBDIR##python2.4/site-packages/rpm/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/rpm/_rpmmodule.so -/usr##LIBDIR##python2.4/site-packages/_xmlplus/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/_xmlplus/parsers/expat.py -/usr##LIBDIR##python2.4/site-packages/_xmlplus/parsers/expat.pyc -/usr##LIBDIR##python2.4/site-packages/_xmlplus/parsers/__init__.py -/usr##LIBDIR##python2.4/site-packages/_xmlplus/parsers/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/_xmlplus/parsers/pyexpat.so -/usr##LIBDIR##python2.4/site.pyc -/usr##LIBDIR##python2.4/socket.py -/usr##LIBDIR##python2.4/socket.pyc -/usr##LIBDIR##python2.4/sre_compile.pyc -/usr##LIBDIR##python2.4/sre_constants.pyc -/usr##LIBDIR##python2.4/sre_parse.pyc -/usr##LIBDIR##python2.4/sre.pyc -/usr##LIBDIR##python2.4/stat.pyc -/usr##LIBDIR##python2.4/StringIO.py -/usr##LIBDIR##python2.4/StringIO.pyc -/usr##LIBDIR##python2.4/stringprep.py -/usr##LIBDIR##python2.4/stringprep.pyc -/usr##LIBDIR##python2.4/string.pyc -/usr##LIBDIR##python2.4/tempfile.py -/usr##LIBDIR##python2.4/tempfile.pyc -/usr##LIBDIR##python2.4/threading.py -/usr##LIBDIR##python2.4/threading.pyc -/usr##LIBDIR##python2.4/tokenize.pyc -/usr##LIBDIR##python2.4/token.pyc -/usr##LIBDIR##python2.4/traceback.py -/usr##LIBDIR##python2.4/traceback.pyc -/usr##LIBDIR##python2.4/types.pyc -/usr##LIBDIR##python2.4/urllib2.py -/usr##LIBDIR##python2.4/urllib2.pyc -/usr##LIBDIR##python2.4/urllib.py -/usr##LIBDIR##python2.4/urllib.pyc -/usr##LIBDIR##python2.4/urlparse.py -/usr##LIBDIR##python2.4/urlparse.pyc -/usr##LIBDIR##python2.4/UserDict.pyc -/usr##LIBDIR##python2.4/warnings.pyc -/usr##LIBDIR##python2.4/xml/__init__.pyc -/usr##LIBDIR##python2.4/xmlrpclib.py -/usr##LIBDIR##python2.4/xmlrpclib.pyc +/usr/bin/xsetroot +/usr/%{_lib}/bonobo/monikers/libmoniker_std_2.so +/usr/%{_lib}/bonobo/servers/Accessibility_Registry.server +/usr/%{_lib}/bonobo/servers/Bonobo_CosNaming_NamingContext.server +/usr/%{_lib}/bonobo/servers/Bonobo_Moniker_std.server +/usr/%{_lib}/bonobo/servers/Bonobo_Sample_Controls.server +/usr/%{_lib}/bonobo/servers/Bonobo_Sample_Echo.server +/usr/%{_lib}/bonobo/servers/CanvDemo.server +/usr/%{_lib}/bonobo/servers/File_Roller_Component.server +/usr/%{_lib}/bonobo/servers/GNOME_AccessxStatusApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_BattstatApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_CDPlayerApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_ClockApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_CPUFreqApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_DriveMountApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Addressbook_2.6.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_2.6.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Calendar_2.6.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_DataServer_1.2.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Mail_2.6.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Shell_2.6.server +/usr/%{_lib}/bonobo/servers/GNOME_FishApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_GDictApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Gedit.server +/usr/%{_lib}/bonobo/servers/GNOME_GeyesApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Gok.server +/usr/%{_lib}/bonobo/servers/GNOME_GThumb_CatalogView.server +/usr/%{_lib}/bonobo/servers/GNOME_GThumb_Viewer.server +/usr/%{_lib}/bonobo/servers/GNOME_GtikApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_GtkHTML_Editor-3.8.server +/usr/%{_lib}/bonobo/servers/GNOME_GWeatherApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_CharpickerApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_KeyboardApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Magnifier.server +/usr/%{_lib}/bonobo/servers/GNOME_MailcheckApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_Media_CDDBSlave2.server +/usr/%{_lib}/bonobo/servers/gnomemeeting.server +/usr/%{_lib}/bonobo/servers/GNOME_MiniCommanderApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_MixerApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_ModemLightsApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Moniker_std.server +/usr/%{_lib}/bonobo/servers/GNOME_MultiLoadApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_NetstatusApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_NotificationAreaApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_NullApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_Panel.server +/usr/%{_lib}/bonobo/servers/GNOME_Panel_TrashApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Panel_WirelessApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_PilotApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Pilot_Daemon.server +/usr/%{_lib}/bonobo/servers/GNOME_RemoteDesktop.server +/usr/%{_lib}/bonobo/servers/GNOME_SettingsDaemon.server +/usr/%{_lib}/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server +/usr/%{_lib}/bonobo/servers/GNOME_Spell.server +/usr/%{_lib}/bonobo/servers/GNOME_StickyNotesApplet.server +/usr/%{_lib}/bonobo/servers/gnome-terminal.server +/usr/%{_lib}/bonobo/servers/GNOME_VFS_Daemon.server +/usr/%{_lib}/bonobo/servers/GNOME_VFS_Moniker_std.server +/usr/%{_lib}/bonobo/servers/GNOME_Wncklet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_Yelp.server +/usr/%{_lib}/bonobo/servers/Nautilus_shell.server +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelgroupwise.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelimap.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelimap4.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamellocal.so +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamellocal.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelnntp.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelpop3.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelsendmail.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelsmtp.urls +/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendfile.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendgroupwise.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendldap.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendvcf.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendcontacts.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendfile.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendgroupwise.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendhttp.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendweather.so +/usr/%{_lib}/evolution/2.6/components/libevolution-addressbook.so +/usr/%{_lib}/evolution/2.6/components/libevolution-calendar.so +/usr/%{_lib}/evolution/2.6/components/libevolution-mail.so +/usr/%{_lib}/evolution/2.6/libeabutil.so.0 +/usr/%{_lib}/evolution/2.6/libecontacteditor.so.0 +/usr/%{_lib}/evolution/2.6/libecontactlisteditor.so.0 +/usr/%{_lib}/evolution/2.6/libefilterbar.so.0 +/usr/%{_lib}/evolution/2.6/libemiscwidgets.so.0 +/usr/%{_lib}/evolution/2.6/libeshell.so.0 +/usr/%{_lib}/evolution/2.6/libessmime.so.0 +/usr/%{_lib}/evolution/2.6/libetimezonedialog.so.0 +/usr/%{_lib}/evolution/2.6/libeutil.so.0 +/usr/%{_lib}/evolution/2.6/libevolution-addressbook-a11y.so.0 +/usr/%{_lib}/evolution/2.6/libevolution-a11y.so.0 +/usr/%{_lib}/evolution/2.6/libevolution-calendar-a11y.so.0 +/usr/%{_lib}/evolution/2.6/libevolution-importer.so.0 +/usr/%{_lib}/evolution/2.6/libevolution-mail-importers.so.0 +/usr/%{_lib}/evolution/2.6/libevolution-smime.so.0 +/usr/%{_lib}/evolution/2.6/libevolution-widgets-a11y.so.0 +/usr/%{_lib}/evolution/2.6/libfilter.so.0 +/usr/%{_lib}/evolution/2.6/libmenus.so.0 +/usr/%{_lib}/evolution/2.6/plugins/libmail-account-disable.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-addressbook-file.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-audio-inline.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-calendar-file.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-calendar-http.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-calendar-weather.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-copy-tool.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-default-mailer.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-default-source.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-evolution-bbdb.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-evolution-hula-account-setup.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-evolution-startup-wizard.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-exchange-operations.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-groupwise-features.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-gw-account-setup.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-itip-formatter.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-mailing-list-actions.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-mail-to-task.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-mark-all-read.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-mark-calendar-offline.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-new-mail-notify.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-plugin-manager.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-print-message.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-publish-calendar.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-sa-junk-plugin.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-save-calendar.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-select-one-source.so +/usr/%{_lib}/evolution/2.6/plugins/liborg-gnome-subject-thread.so +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-addressbook-file.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-audio-inline.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-calendar-file.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-calendar-http.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-calendar-weather.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-compose-send-options.xml +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-copy-tool.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-default-mailer.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-default-source.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-evolution-bbdb.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-evolution-hula-account-setup.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-evolution-startup-wizard.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-exchange-ab-subscription.xml +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-exchange-cal-subscription.xml +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-exchange-operations.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-exchange-tasks-subscription.xml +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-folder-permissions.xml +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-folder-subscription.xml +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-groupwise-features.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-gw-account-setup.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-itip-formatter.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mail-account-disable.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mailing-list-actions.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mailing-list-actions.xml +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mail-to-task.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mark-all-read.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-mark-calendar-offline.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-new-mail-notify.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-plugin-manager.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-plugin-manager.xml +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-print-message.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-print-message.xml +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-publish-calendar.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-publish-calendar.xml +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-sa-junk-plugin.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-save-calendar.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-select-one-source.eplug +/usr/%{_lib}/evolution/2.6/plugins/org-gnome-subject-thread.eplug +/usr/%{_lib}/evolution/2.6/plugins/publish-calendar.glade /usr/libexec/bonobo-activation-server /usr/libexec/clock-applet -/usr/libexec/evolution/2.6/evolution-alarm-notify /usr/libexec/evolution-data-server-1.6 +/usr/libexec/evolution/2.6/evolution-alarm-notify /usr/libexec/gam_server /usr/libexec/gconfd-2 /usr/libexec/gconf-sanity-check-2 @@ -1130,17 +550,707 @@ /usr/libexec/mixer_applet2 /usr/libexec/notification-area-applet /usr/libexec/wnck-applet +/usr/%{_lib}/firefox-1.5/browserconfig.properties +/usr/%{_lib}/firefox-1.5/components/accessibility-atk.xpt +/usr/%{_lib}/firefox-1.5/components/accessibility.xpt +/usr/%{_lib}/firefox-1.5/components/alerts.xpt +/usr/%{_lib}/firefox-1.5/components/appshell.xpt +/usr/%{_lib}/firefox-1.5/components/appstartup.xpt +/usr/%{_lib}/firefox-1.5/components/autocomplete.xpt +/usr/%{_lib}/firefox-1.5/components/autoconfig.xpt +/usr/%{_lib}/firefox-1.5/components/bookmarks.xpt +/usr/%{_lib}/firefox-1.5/components/browsercompsbase.xpt +/usr/%{_lib}/firefox-1.5/components/caps.xpt +/usr/%{_lib}/firefox-1.5/components/commandhandler.xpt +/usr/%{_lib}/firefox-1.5/components/commandlines.xpt +/usr/%{_lib}/firefox-1.5/components/composer.xpt +/usr/%{_lib}/firefox-1.5/components/content_base.xpt +/usr/%{_lib}/firefox-1.5/components/content_htmldoc.xpt +/usr/%{_lib}/firefox-1.5/components/content_html.xpt +/usr/%{_lib}/firefox-1.5/components/content_xmldoc.xpt +/usr/%{_lib}/firefox-1.5/components/content_xslt.xpt +/usr/%{_lib}/firefox-1.5/components/content_xtf.xpt +/usr/%{_lib}/firefox-1.5/components/cookie.xpt +/usr/%{_lib}/firefox-1.5/components/directory.xpt +/usr/%{_lib}/firefox-1.5/components/docshell.xpt +/usr/%{_lib}/firefox-1.5/components/dom_base.xpt +/usr/%{_lib}/firefox-1.5/components/dom_canvas.xpt +/usr/%{_lib}/firefox-1.5/components/dom_core.xpt +/usr/%{_lib}/firefox-1.5/components/dom_css.xpt +/usr/%{_lib}/firefox-1.5/components/dom_events.xpt +/usr/%{_lib}/firefox-1.5/components/dom_html.xpt +/usr/%{_lib}/firefox-1.5/components/dom_loadsave.xpt +/usr/%{_lib}/firefox-1.5/components/dom_range.xpt +/usr/%{_lib}/firefox-1.5/components/dom_stylesheets.xpt +/usr/%{_lib}/firefox-1.5/components/dom_svg.xpt +/usr/%{_lib}/firefox-1.5/components/dom_traversal.xpt +/usr/%{_lib}/firefox-1.5/components/dom_views.xpt +/usr/%{_lib}/firefox-1.5/components/dom_xbl.xpt +/usr/%{_lib}/firefox-1.5/components/dom_xpath.xpt +/usr/%{_lib}/firefox-1.5/components/dom.xpt +/usr/%{_lib}/firefox-1.5/components/dom_xul.xpt +/usr/%{_lib}/firefox-1.5/components/downloads.xpt +/usr/%{_lib}/firefox-1.5/components/editor.xpt +/usr/%{_lib}/firefox-1.5/components/embed_base.xpt +/usr/%{_lib}/firefox-1.5/components/extensions.xpt +/usr/%{_lib}/firefox-1.5/components/exthandler.xpt +/usr/%{_lib}/firefox-1.5/components/fastfind.xpt +/usr/%{_lib}/firefox-1.5/components/filepicker.xpt +/usr/%{_lib}/firefox-1.5/components/find.xpt +/usr/%{_lib}/firefox-1.5/components/gfx.xpt +/usr/%{_lib}/firefox-1.5/components/gksvgrenderer.xpt +/usr/%{_lib}/firefox-1.5/components/history.xpt +/usr/%{_lib}/firefox-1.5/components/htmlparser.xpt +/usr/%{_lib}/firefox-1.5/components/chardet.xpt +/usr/%{_lib}/firefox-1.5/components/chrome.xpt +/usr/%{_lib}/firefox-1.5/components/imgicon.xpt +/usr/%{_lib}/firefox-1.5/components/imglib2.xpt +/usr/%{_lib}/firefox-1.5/components/intl.xpt +/usr/%{_lib}/firefox-1.5/components/jar.xpt +/usr/%{_lib}/firefox-1.5/components/jsconsole-clhandler.js +/usr/%{_lib}/firefox-1.5/components/jsconsole.xpt +/usr/%{_lib}/firefox-1.5/components/jsdservice.xpt +/usr/%{_lib}/firefox-1.5/components/layout_base.xpt +/usr/%{_lib}/firefox-1.5/components/layout_printing.xpt +/usr/%{_lib}/firefox-1.5/components/layout_xul_tree.xpt +/usr/%{_lib}/firefox-1.5/components/layout_xul.xpt +/usr/%{_lib}/firefox-1.5/components/libaccessibility.so +/usr/%{_lib}/firefox-1.5/components/libappcomps.so +/usr/%{_lib}/firefox-1.5/components/libauth.so +/usr/%{_lib}/firefox-1.5/components/libautoconfig.so +/usr/%{_lib}/firefox-1.5/components/libbrowsercomps.so +/usr/%{_lib}/firefox-1.5/components/libbrowserdirprovider.so +/usr/%{_lib}/firefox-1.5/components/libcaps.so +/usr/%{_lib}/firefox-1.5/components/libcommandlines.so +/usr/%{_lib}/firefox-1.5/components/libcomposer.so +/usr/%{_lib}/firefox-1.5/components/libcookie.so +/usr/%{_lib}/firefox-1.5/components/libdocshell.so +/usr/%{_lib}/firefox-1.5/components/libeditor.so +/usr/%{_lib}/firefox-1.5/components/libembedcomponents.so +/usr/%{_lib}/firefox-1.5/components/libfileview.so +/usr/%{_lib}/firefox-1.5/components/libgfx_gtk.so +/usr/%{_lib}/firefox-1.5/components/libgfxps.so +/usr/%{_lib}/firefox-1.5/components/libgklayout.so +/usr/%{_lib}/firefox-1.5/components/libgkplugin.so +/usr/%{_lib}/firefox-1.5/components/libhtmlpars.so +/usr/%{_lib}/firefox-1.5/components/libchrome.so +/usr/%{_lib}/firefox-1.5/components/libimgicon.so +/usr/%{_lib}/firefox-1.5/components/libimglib2.so +/usr/%{_lib}/firefox-1.5/components/libi18n.so +/usr/%{_lib}/firefox-1.5/components/libjar50.so +/usr/%{_lib}/firefox-1.5/components/libjsd.so +/usr/%{_lib}/firefox-1.5/components/libmork.so +/usr/%{_lib}/firefox-1.5/components/libmozfind.so +/usr/%{_lib}/firefox-1.5/components/libmozgnome.so +/usr/%{_lib}/firefox-1.5/components/libnecko.so +/usr/%{_lib}/firefox-1.5/components/libnecko2.so +/usr/%{_lib}/firefox-1.5/components/libnkgnomevfs.so +/usr/%{_lib}/firefox-1.5/components/libnsappshell.so +/usr/%{_lib}/firefox-1.5/components/liboji.so +/usr/%{_lib}/firefox-1.5/components/libpermissions.so +/usr/%{_lib}/firefox-1.5/components/libpipboot.so +/usr/%{_lib}/firefox-1.5/components/libpipnss.so +/usr/%{_lib}/firefox-1.5/components/libpippki.so +/usr/%{_lib}/firefox-1.5/components/libpref.so +/usr/%{_lib}/firefox-1.5/components/librdf.so +/usr/%{_lib}/firefox-1.5/components/libremoteservice.so +/usr/%{_lib}/firefox-1.5/components/libsearchservice.so +/usr/%{_lib}/firefox-1.5/components/libsystem-pref.so +/usr/%{_lib}/firefox-1.5/components/libtoolkitcomps.so +/usr/%{_lib}/firefox-1.5/components/libtransformiix.so +/usr/%{_lib}/firefox-1.5/components/libtxmgr.so +/usr/%{_lib}/firefox-1.5/components/libuconv.so +/usr/%{_lib}/firefox-1.5/components/libucvmath.so +/usr/%{_lib}/firefox-1.5/components/libuniversalchardet.so +/usr/%{_lib}/firefox-1.5/components/libwebbrwsr.so +/usr/%{_lib}/firefox-1.5/components/libwebsrvcs.so +/usr/%{_lib}/firefox-1.5/components/libwidget_gtk2.so +/usr/%{_lib}/firefox-1.5/components/libxmlextras.so +/usr/%{_lib}/firefox-1.5/components/libxpcom_compat_c.so +/usr/%{_lib}/firefox-1.5/components/libxpconnect.so +/usr/%{_lib}/firefox-1.5/components/libxpinstall.so +/usr/%{_lib}/firefox-1.5/components/locale.xpt +/usr/%{_lib}/firefox-1.5/components/lwbrk.xpt +/usr/%{_lib}/firefox-1.5/components/migration.xpt +/usr/%{_lib}/firefox-1.5/components/mimetype.xpt +/usr/%{_lib}/firefox-1.5/components/mozbrwsr.xpt +/usr/%{_lib}/firefox-1.5/components/mozfind.xpt +/usr/%{_lib}/firefox-1.5/components/mozgnome.xpt +/usr/%{_lib}/firefox-1.5/components/necko_about.xpt +/usr/%{_lib}/firefox-1.5/components/necko_cache.xpt +/usr/%{_lib}/firefox-1.5/components/necko_cookie.xpt +/usr/%{_lib}/firefox-1.5/components/necko_data.xpt +/usr/%{_lib}/firefox-1.5/components/necko_dns.xpt +/usr/%{_lib}/firefox-1.5/components/necko_file.xpt +/usr/%{_lib}/firefox-1.5/components/necko_ftp.xpt +/usr/%{_lib}/firefox-1.5/components/necko_http.xpt +/usr/%{_lib}/firefox-1.5/components/necko_res.xpt +/usr/%{_lib}/firefox-1.5/components/necko_socket.xpt +/usr/%{_lib}/firefox-1.5/components/necko_strconv.xpt +/usr/%{_lib}/firefox-1.5/components/necko_viewsource.xpt +/usr/%{_lib}/firefox-1.5/components/necko.xpt +/usr/%{_lib}/firefox-1.5/components/nsBrowserContentHandler.js +/usr/%{_lib}/firefox-1.5/components/nsBrowserGlue.js +/usr/%{_lib}/firefox-1.5/components/nsCloseAllWindows.js +/usr/%{_lib}/firefox-1.5/components/nsDefaultCLH.js +/usr/%{_lib}/firefox-1.5/components/nsDictionary.js +/usr/%{_lib}/firefox-1.5/components/nsExtensionManager.js +/usr/%{_lib}/firefox-1.5/components/nsFilePicker.js +/usr/%{_lib}/firefox-1.5/components/nsHelperAppDlg.js +/usr/%{_lib}/firefox-1.5/components/nsInterfaceInfoToIDL.js +/usr/%{_lib}/firefox-1.5/components/nsKillAll.js +/usr/%{_lib}/firefox-1.5/components/nsProgressDialog.js +/usr/%{_lib}/firefox-1.5/components/nsProxyAutoConfig.js +/usr/%{_lib}/firefox-1.5/components/nsResetPref.js +/usr/%{_lib}/firefox-1.5/components/nsSetDefaultBrowser.js +/usr/%{_lib}/firefox-1.5/components/nsSidebar.js +/usr/%{_lib}/firefox-1.5/components/nsUpdateService.js +/usr/%{_lib}/firefox-1.5/components/nsXmlRpcClient.js +/usr/%{_lib}/firefox-1.5/components/oji.xpt +/usr/%{_lib}/firefox-1.5/components/passwordmgr.xpt +/usr/%{_lib}/firefox-1.5/components/pipboot.xpt +/usr/%{_lib}/firefox-1.5/components/pipnss.xpt +/usr/%{_lib}/firefox-1.5/components/pippki.xpt +/usr/%{_lib}/firefox-1.5/components/plugin.xpt +/usr/%{_lib}/firefox-1.5/components/prefetch.xpt +/usr/%{_lib}/firefox-1.5/components/pref.xpt +/usr/%{_lib}/firefox-1.5/components/profile.xpt +/usr/%{_lib}/firefox-1.5/components/progressDlg.xpt +/usr/%{_lib}/firefox-1.5/components/proxyObjInst.xpt +/usr/%{_lib}/firefox-1.5/components/rdf.xpt +/usr/%{_lib}/firefox-1.5/components/satchel.xpt +/usr/%{_lib}/firefox-1.5/components/search.xpt +/usr/%{_lib}/firefox-1.5/components/shellservice.xpt +/usr/%{_lib}/firefox-1.5/components/shistory.xpt +/usr/%{_lib}/firefox-1.5/components/sidebar.xpt +/usr/%{_lib}/firefox-1.5/components/toolkitprofile.xpt +/usr/%{_lib}/firefox-1.5/components/toolkitremote.xpt +/usr/%{_lib}/firefox-1.5/components/txmgr.xpt +/usr/%{_lib}/firefox-1.5/components/txtsvc.xpt +/usr/%{_lib}/firefox-1.5/components/uconv.xpt +/usr/%{_lib}/firefox-1.5/components/unicharutil.xpt +/usr/%{_lib}/firefox-1.5/components/update.xpt +/usr/%{_lib}/firefox-1.5/components/uriloader.xpt +/usr/%{_lib}/firefox-1.5/components/webBrowser_core.xpt +/usr/%{_lib}/firefox-1.5/components/webbrowserpersist.xpt +/usr/%{_lib}/firefox-1.5/components/webshell_idls.xpt +/usr/%{_lib}/firefox-1.5/components/websrvcs.xpt +/usr/%{_lib}/firefox-1.5/components/widget.xpt +/usr/%{_lib}/firefox-1.5/components/windowds.xpt +/usr/%{_lib}/firefox-1.5/components/windowwatcher.xpt +/usr/%{_lib}/firefox-1.5/components/xmlextras.xpt +/usr/%{_lib}/firefox-1.5/components/xml-rpc.xpt +/usr/%{_lib}/firefox-1.5/components/xpcom_base.xpt +/usr/%{_lib}/firefox-1.5/components/xpcom_components.xpt +/usr/%{_lib}/firefox-1.5/components/xpcom_ds.xpt +/usr/%{_lib}/firefox-1.5/components/xpcom_io.xpt +/usr/%{_lib}/firefox-1.5/components/xpcom_obsolete.xpt +/usr/%{_lib}/firefox-1.5/components/xpcom_threads.xpt +/usr/%{_lib}/firefox-1.5/components/xpcom_xpti.xpt +/usr/%{_lib}/firefox-1.5/components/xpconnect.xpt +/usr/%{_lib}/firefox-1.5/components/xpinstall.xpt +/usr/%{_lib}/firefox-1.5/components/xulapp.xpt +/usr/%{_lib}/firefox-1.5/components/xuldoc.xpt +/usr/%{_lib}/firefox-1.5/components/xultmpl.xpt +/usr/%{_lib}/firefox-1.5/defaults/autoconfig +/usr/%{_lib}/firefox-1.5/defaults/autoconfig/platform.js +/usr/%{_lib}/firefox-1.5/defaults/autoconfig/prefcalls.js +/usr/%{_lib}/firefox-1.5/defaults/pref/all-redhat.js +/usr/%{_lib}/firefox-1.5/defaults/pref/firefox.js +/usr/%{_lib}/firefox-1.5/defaults/pref/firefox-l10n.js +/usr/%{_lib}/firefox-1.5/defaults/pref/channel-prefs.js +/usr/%{_lib}/firefox-1.5/defaults/pref/reporter.js +/usr/%{_lib}/firefox-1.5/defaults/profile/bookmarks.html +/usr/%{_lib}/firefox-1.5/defaults/profile/chrome +/usr/%{_lib}/firefox-1.5/defaults/profile/chrome/userContent-example.css +/usr/%{_lib}/firefox-1.5/defaults/profile/chrome/userChrome-example.css +/usr/%{_lib}/firefox-1.5/defaults/profile/localstore.rdf +/usr/%{_lib}/firefox-1.5/defaults/profile/mimeTypes.rdf +/usr/%{_lib}/firefox-1.5/defaults/profile/prefs.js +/usr/%{_lib}/firefox-1.5/defaults/profile/search.rdf +/usr/%{_lib}/firefox-1.5/dependentlibs.list +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/components +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/components/inspector-cmdline.js +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/components/inspector.xpt +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/components/libinspector.so +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/defaults +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/defaults/preferences +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/defaults/preferences/inspector.js +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/chrome +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/chrome/chromelist.txt +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/chrome/inspector.jar +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/chrome.manifest +/usr/%{_lib}/firefox-1.5/extensions/inspector at mozilla.org/install.rdf +/usr/%{_lib}/firefox-1.5/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} +/usr/%{_lib}/firefox-1.5/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +/usr/%{_lib}/firefox-1.5/firefox +/usr/%{_lib}/firefox-1.5/firefox-bin +/usr/%{_lib}/firefox-1.5/firefox-xremote-client +/usr/%{_lib}/firefox-1.5/greprefs/all.js +/usr/%{_lib}/firefox-1.5/greprefs/all-redhat.js +/usr/%{_lib}/firefox-1.5/greprefs/security-prefs.js +/usr/%{_lib}/firefox-1.5/greprefs/xpinstall.js +/usr/%{_lib}/firefox-1.5/chrome/browser.jar +/usr/%{_lib}/firefox-1.5/chrome/browser.manifest +/usr/%{_lib}/firefox-1.5/chrome/classic.jar +/usr/%{_lib}/firefox-1.5/chrome/classic.manifest +/usr/%{_lib}/firefox-1.5/chrome/comm.jar +/usr/%{_lib}/firefox-1.5/chrome/comm.manifest +/usr/%{_lib}/firefox-1.5/chrome/en-US.jar +/usr/%{_lib}/firefox-1.5/chrome/en-US.manifest +/usr/%{_lib}/firefox-1.5/chrome/chromelist.txt +/usr/%{_lib}/firefox-1.5/chrome/icons +/usr/%{_lib}/firefox-1.5/chrome/icons/default +/usr/%{_lib}/firefox-1.5/chrome/icons/default/default.xpm +/usr/%{_lib}/firefox-1.5/chrome/pippki.jar +/usr/%{_lib}/firefox-1.5/chrome/pippki.manifest +/usr/%{_lib}/firefox-1.5/chrome/reporter.jar +/usr/%{_lib}/firefox-1.5/chrome/reporter.manifest +/usr/%{_lib}/firefox-1.5/chrome/toolkit.jar +/usr/%{_lib}/firefox-1.5/chrome/toolkit.manifest +/usr/%{_lib}/firefox-1.5/icons/default.xpm +/usr/%{_lib}/firefox-1.5/icons/document.png +/usr/%{_lib}/firefox-1.5/icons/mozicon128.png +/usr/%{_lib}/firefox-1.5/icons/mozicon16.xpm +/usr/%{_lib}/firefox-1.5/icons/mozicon50.xpm +/usr/%{_lib}/firefox-1.5/init.d +/usr/%{_lib}/firefox-1.5/init.d/README +/usr/%{_lib}/firefox-1.5/libgfxpsshar.so +/usr/%{_lib}/firefox-1.5/libgkgfx.so +/usr/%{_lib}/firefox-1.5/libgtkembedmoz.so +/usr/%{_lib}/firefox-1.5/libgtkxtbin.so +/usr/%{_lib}/firefox-1.5/libjsj.so +/usr/%{_lib}/firefox-1.5/libmozjs.so +/usr/%{_lib}/firefox-1.5/libxpcom_compat.so +/usr/%{_lib}/firefox-1.5/libxpcom_core.so +/usr/%{_lib}/firefox-1.5/libxpcom.so +/usr/%{_lib}/firefox-1.5/libxpistub.so +/usr/%{_lib}/firefox-1.5/mozilla-xremote-client +/usr/%{_lib}/firefox-1.5/plugins/libnullplugin.so +/usr/%{_lib}/firefox-1.5/plugins/libunixprintplugin.so +/usr/%{_lib}/firefox-1.5/removed-files +/usr/%{_lib}/firefox-1.5/res/arrowd.gif +/usr/%{_lib}/firefox-1.5/res/arrow.gif +/usr/%{_lib}/firefox-1.5/res/bloatcycle.html +/usr/%{_lib}/firefox-1.5/res/broken-image.gif +/usr/%{_lib}/firefox-1.5/res/cmessage.txt +/usr/%{_lib}/firefox-1.5/res/dtd/mathml.dtd +/usr/%{_lib}/firefox-1.5/res/dtd/xhtml11.dtd +/usr/%{_lib}/firefox-1.5/res/EditorOverride.css +/usr/%{_lib}/firefox-1.5/res/entityTables/htmlEntityVersions.properties +/usr/%{_lib}/firefox-1.5/res/entityTables/html40Latin1.properties +/usr/%{_lib}/firefox-1.5/res/entityTables/html40Special.properties +/usr/%{_lib}/firefox-1.5/res/entityTables/html40Symbols.properties +/usr/%{_lib}/firefox-1.5/res/entityTables/mathml20.properties +/usr/%{_lib}/firefox-1.5/res/entityTables/transliterate.properties +/usr/%{_lib}/firefox-1.5/res/fonts +/usr/%{_lib}/firefox-1.5/res/fonts/fontEncoding.properties +/usr/%{_lib}/firefox-1.5/res/fonts/mathfontCMEX10.properties +/usr/%{_lib}/firefox-1.5/res/fonts/mathfontCMSY10.properties +/usr/%{_lib}/firefox-1.5/res/fonts/mathfontMath1.properties +/usr/%{_lib}/firefox-1.5/res/fonts/mathfontMath2.properties +/usr/%{_lib}/firefox-1.5/res/fonts/mathfontMath4.properties +/usr/%{_lib}/firefox-1.5/res/fonts/mathfontMTExtra.properties +/usr/%{_lib}/firefox-1.5/res/fonts/mathfont.properties +/usr/%{_lib}/firefox-1.5/res/fonts/mathfontPUA.properties +/usr/%{_lib}/firefox-1.5/res/fonts/mathfontSymbol.properties +/usr/%{_lib}/firefox-1.5/res/fonts/pangoFontEncoding.properties +/usr/%{_lib}/firefox-1.5/res/forms.css +/usr/%{_lib}/firefox-1.5/res/grabber.gif +/usr/%{_lib}/firefox-1.5/res/hiddenWindow.html +/usr/%{_lib}/firefox-1.5/res/html.css +/usr/%{_lib}/firefox-1.5/res/html/gopher-audio.gif +/usr/%{_lib}/firefox-1.5/res/html/gopher-binary.gif +/usr/%{_lib}/firefox-1.5/res/html/gopher-find.gif +/usr/%{_lib}/firefox-1.5/res/html/gopher-image.gif +/usr/%{_lib}/firefox-1.5/res/html/gopher-menu.gif +/usr/%{_lib}/firefox-1.5/res/html/gopher-movie.gif +/usr/%{_lib}/firefox-1.5/res/html/gopher-sound.gif +/usr/%{_lib}/firefox-1.5/res/html/gopher-telnet.gif +/usr/%{_lib}/firefox-1.5/res/html/gopher-text.gif +/usr/%{_lib}/firefox-1.5/res/html/gopher-unknown.gif +/usr/%{_lib}/firefox-1.5/res/charsetalias.properties +/usr/%{_lib}/firefox-1.5/res/charsetData.properties +/usr/%{_lib}/firefox-1.5/res/langGroups.properties +/usr/%{_lib}/firefox-1.5/res/language.properties +/usr/%{_lib}/firefox-1.5/res/loading-image.gif +/usr/%{_lib}/firefox-1.5/res/mathml.css +/usr/%{_lib}/firefox-1.5/res/quirk.css +/usr/%{_lib}/firefox-1.5/res/sample.unixpsfonts.properties +/usr/%{_lib}/firefox-1.5/res/svg.css +/usr/%{_lib}/firefox-1.5/res/table-add-column-after-active.gif +/usr/%{_lib}/firefox-1.5/res/table-add-column-after.gif +/usr/%{_lib}/firefox-1.5/res/table-add-column-after-hover.gif +/usr/%{_lib}/firefox-1.5/res/table-add-column-before-active.gif +/usr/%{_lib}/firefox-1.5/res/table-add-column-before.gif +/usr/%{_lib}/firefox-1.5/res/table-add-column-before-hover.gif +/usr/%{_lib}/firefox-1.5/res/table-add-row-after-active.gif +/usr/%{_lib}/firefox-1.5/res/table-add-row-after.gif +/usr/%{_lib}/firefox-1.5/res/table-add-row-after-hover.gif +/usr/%{_lib}/firefox-1.5/res/table-add-row-before-active.gif +/usr/%{_lib}/firefox-1.5/res/table-add-row-before.gif +/usr/%{_lib}/firefox-1.5/res/table-add-row-before-hover.gif +/usr/%{_lib}/firefox-1.5/res/table-remove-column-active.gif +/usr/%{_lib}/firefox-1.5/res/table-remove-column.gif +/usr/%{_lib}/firefox-1.5/res/table-remove-column-hover.gif +/usr/%{_lib}/firefox-1.5/res/table-remove-row-active.gif +/usr/%{_lib}/firefox-1.5/res/table-remove-row.gif +/usr/%{_lib}/firefox-1.5/res/table-remove-row-hover.gif +/usr/%{_lib}/firefox-1.5/res/ua.css +/usr/%{_lib}/firefox-1.5/res/unixcharset.properties +/usr/%{_lib}/firefox-1.5/res/viewer.properties +/usr/%{_lib}/firefox-1.5/res/viewsource.css +/usr/%{_lib}/firefox-1.5/run-mozilla.sh +/usr/%{_lib}/firefox-1.5/searchplugins/amazondotcom.png +/usr/%{_lib}/firefox-1.5/searchplugins/amazondotcom.src +/usr/%{_lib}/firefox-1.5/searchplugins/answers.png +/usr/%{_lib}/firefox-1.5/searchplugins/answers.src +/usr/%{_lib}/firefox-1.5/searchplugins/creativecommons.png +/usr/%{_lib}/firefox-1.5/searchplugins/creativecommons.src +/usr/%{_lib}/firefox-1.5/searchplugins/eBay.gif +/usr/%{_lib}/firefox-1.5/searchplugins/eBay.src +/usr/%{_lib}/firefox-1.5/searchplugins/google.gif +/usr/%{_lib}/firefox-1.5/searchplugins/google.src +/usr/%{_lib}/firefox-1.5/searchplugins/yahoo.gif +/usr/%{_lib}/firefox-1.5/searchplugins/yahoo.src +/usr/%{_lib}/firefox-1.5/updater +/usr/%{_lib}/firefox-1.5/updater.ini +/usr/%{_lib}/firefox-1.5/xpicleanup +/usr/%{_lib}/GConf/2/libgconfbackend-xml.so +/usr/%{_lib}/gconv/UTF-16.so +/usr/%{_lib}/gnome-vfs-2.0/modules/libfile.so +/usr/%{_lib}/gnome-vfs-2.0/modules/libmapping.so +/usr/%{_lib}/gstreamer-0.8/libgstac3parse.so +/usr/%{_lib}/gstreamer-0.8/libgstadder.so +/usr/%{_lib}/gstreamer-0.8/libgstalaw.so +/usr/%{_lib}/gstreamer-0.8/libgstalphacolor.so +/usr/%{_lib}/gstreamer-0.8/libgstalpha.so +/usr/%{_lib}/gstreamer-0.8/libgstalsa.so +/usr/%{_lib}/gstreamer-0.8/libgstapetag.so +/usr/%{_lib}/gstreamer-0.8/libgstartsdsink.so +/usr/%{_lib}/gstreamer-0.8/libgstarts.so +/usr/%{_lib}/gstreamer-0.8/libgstasf.so +/usr/%{_lib}/gstreamer-0.8/libgstaudioconvert.so +/usr/%{_lib}/gstreamer-0.8/libgstaudiofile.so +/usr/%{_lib}/gstreamer-0.8/libgstaudiofilter.so +/usr/%{_lib}/gstreamer-0.8/libgstaudiorate.so +/usr/%{_lib}/gstreamer-0.8/libgstaudioscale.so +/usr/%{_lib}/gstreamer-0.8/libgstaudio.so +/usr/%{_lib}/gstreamer-0.8/libgstauparse.so +/usr/%{_lib}/gstreamer-0.8/libgstautodetect.so +/usr/%{_lib}/gstreamer-0.8/libgstavi.so +/usr/%{_lib}/gstreamer-0.8/libgstbasicgthreadscheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstbasicomegascheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstbytestream.so +/usr/%{_lib}/gstreamer-0.8/libgstcdparanoia.so +/usr/%{_lib}/gstreamer-0.8/libgstcdplayer.so +/usr/%{_lib}/gstreamer-0.8/libgstcdxaparse.so +/usr/%{_lib}/gstreamer-0.8/libgstcolorspace.so +/usr/%{_lib}/gstreamer-0.8/libgstcutter.so +/usr/%{_lib}/gstreamer-0.8/libgstdataprotocol.so +/usr/%{_lib}/gstreamer-0.8/libgstdebug.so +/usr/%{_lib}/gstreamer-0.8/libgstdecodebin.so +/usr/%{_lib}/gstreamer-0.8/libgstdeinterlace.so +/usr/%{_lib}/gstreamer-0.8/libgstdvdec.so +/usr/%{_lib}/gstreamer-0.8/libgstdvdlpcmdec.so +/usr/%{_lib}/gstreamer-0.8/libgstefence.so +/usr/%{_lib}/gstreamer-0.8/libgsteffectv.so +/usr/%{_lib}/gstreamer-0.8/libgstelements.so +/usr/%{_lib}/gstreamer-0.8/libgstentrygthreadscheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstentryomegascheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstequalizer.so +/usr/%{_lib}/gstreamer-0.8/libgstesd.so +/usr/%{_lib}/gstreamer-0.8/libgstfairgthreadscheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstfestival.so +/usr/%{_lib}/gstreamer-0.8/libgstffmpegcolorspace.so +/usr/%{_lib}/gstreamer-0.8/libgstfilter.so +/usr/%{_lib}/gstreamer-0.8/libgstflac.so +/usr/%{_lib}/gstreamer-0.8/libgstflxdec.so +/usr/%{_lib}/gstreamer-0.8/libgstgamma.so +/usr/%{_lib}/gstreamer-0.8/libgstgconfelements.so +/usr/%{_lib}/gstreamer-0.8/libgstgdkpixbuf.so +/usr/%{_lib}/gstreamer-0.8/libgstgetbits.so +/usr/%{_lib}/gstreamer-0.8/libgstglimagesink.so +/usr/%{_lib}/gstreamer-0.8/libgstgnomevfs.so +/usr/%{_lib}/gstreamer-0.8/libgstgoom.so +/usr/%{_lib}/gstreamer-0.8/libgstchart.so +/usr/%{_lib}/gstreamer-0.8/libgstidct.so +/usr/%{_lib}/gstreamer-0.8/libgstindexers.so +/usr/%{_lib}/gstreamer-0.8/libgstinterleave.so +/usr/%{_lib}/gstreamer-0.8/libgstjpeg.so +/usr/%{_lib}/gstreamer-0.8/libgstlevel.so +/usr/%{_lib}/gstreamer-0.8/libgstmatroska.so +/usr/%{_lib}/gstreamer-0.8/libgstmedian.so +/usr/%{_lib}/gstreamer-0.8/libgstmixmatrix.so +/usr/%{_lib}/gstreamer-0.8/libgstmng.so +/usr/%{_lib}/gstreamer-0.8/libgstmodplug.so +/usr/%{_lib}/gstreamer-0.8/libgstmonoscope.so +/usr/%{_lib}/gstreamer-0.8/libgstmulaw.so +/usr/%{_lib}/gstreamer-0.8/libgstmultifilesink.so +/usr/%{_lib}/gstreamer-0.8/libgstmultipart.so +/usr/%{_lib}/gstreamer-0.8/libgstnavigationtest.so +/usr/%{_lib}/gstreamer-0.8/libgstogg.so +/usr/%{_lib}/gstreamer-0.8/libgstoptgthreadscheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstoptomegascheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstoptscheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstossaudio.so +/usr/%{_lib}/gstreamer-0.8/libgstoverlay.so +/usr/%{_lib}/gstreamer-0.8/libgstpassthrough.so +/usr/%{_lib}/gstreamer-0.8/libgstplaybin.so +/usr/%{_lib}/gstreamer-0.8/libgstplayondemand.so +/usr/%{_lib}/gstreamer-0.8/libgstpng.so +/usr/%{_lib}/gstreamer-0.8/libgstpuzzle.so +/usr/%{_lib}/gstreamer-0.8/libgstqtdemux.so +/usr/%{_lib}/gstreamer-0.8/libgstresample.so +/usr/%{_lib}/gstreamer-0.8/libgstrfbsrc.so +/usr/%{_lib}/gstreamer-0.8/libgstriff.so +/usr/%{_lib}/gstreamer-0.8/libgstrmdemux.so +/usr/%{_lib}/gstreamer-0.8/libgstrtjpeg.so +/usr/%{_lib}/gstreamer-0.8/libgstrtp.so +/usr/%{_lib}/gstreamer-0.8/libgstsdlvideosink.so +/usr/%{_lib}/gstreamer-0.8/libgstsilence.so +/usr/%{_lib}/gstreamer-0.8/libgstsinesrc.so +/usr/%{_lib}/gstreamer-0.8/libgstsmooth.so +/usr/%{_lib}/gstreamer-0.8/libgstsmoothwave.so +/usr/%{_lib}/gstreamer-0.8/libgstsmpte.so +/usr/%{_lib}/gstreamer-0.8/libgstsnapshot.so +/usr/%{_lib}/gstreamer-0.8/libgstspectrum.so +/usr/%{_lib}/gstreamer-0.8/libgstspeed.so +/usr/%{_lib}/gstreamer-0.8/libgstspeex.so +/usr/%{_lib}/gstreamer-0.8/libgstspider.so +/usr/%{_lib}/gstreamer-0.8/libgststereo.so +/usr/%{_lib}/gstreamer-0.8/libgstsubparse.so +/usr/%{_lib}/gstreamer-0.8/libgstswitch.so +/usr/%{_lib}/gstreamer-0.8/libgstsynaesthesia.so +/usr/%{_lib}/gstreamer-0.8/libgsttagedit.so +/usr/%{_lib}/gstreamer-0.8/libgsttcp.so +/usr/%{_lib}/gstreamer-0.8/libgsttextoverlay.so +/usr/%{_lib}/gstreamer-0.8/libgsttheora.so +/usr/%{_lib}/gstreamer-0.8/libgsttimeoverlay.so +/usr/%{_lib}/gstreamer-0.8/libgsttrm.so +/usr/%{_lib}/gstreamer-0.8/libgsttta.so +/usr/%{_lib}/gstreamer-0.8/libgsttypefindfunctions.so +/usr/%{_lib}/gstreamer-0.8/libgstudp.so +/usr/%{_lib}/gstreamer-0.8/libgstvbidec.so +/usr/%{_lib}/gstreamer-0.8/libgstvcdsrc.so +/usr/%{_lib}/gstreamer-0.8/libgstvideobalance.so +/usr/%{_lib}/gstreamer-0.8/libgstvideobox.so +/usr/%{_lib}/gstreamer-0.8/libgstvideocrop.so +/usr/%{_lib}/gstreamer-0.8/libgstvideodrop.so +/usr/%{_lib}/gstreamer-0.8/libgstvideofilter.so +/usr/%{_lib}/gstreamer-0.8/libgstvideoflip.so +/usr/%{_lib}/gstreamer-0.8/libgstvideomixer.so +/usr/%{_lib}/gstreamer-0.8/libgstvideorate.so +/usr/%{_lib}/gstreamer-0.8/libgstvideoscale.so +/usr/%{_lib}/gstreamer-0.8/libgstvideo.so +/usr/%{_lib}/gstreamer-0.8/libgstvideotestsrc.so +/usr/%{_lib}/gstreamer-0.8/libgstvideo4linux.so +/usr/%{_lib}/gstreamer-0.8/libgstvideo4linux2.so +/usr/%{_lib}/gstreamer-0.8/libgstvolenv.so +/usr/%{_lib}/gstreamer-0.8/libgstvolume.so +/usr/%{_lib}/gstreamer-0.8/libgstvorbis.so +/usr/%{_lib}/gstreamer-0.8/libgstwavenc.so +/usr/%{_lib}/gstreamer-0.8/libgstwavparse.so +/usr/%{_lib}/gstreamer-0.8/libgstximagesink.so +/usr/%{_lib}/gstreamer-0.8/libgstxvimagesink.so +/usr/%{_lib}/gstreamer-0.8/libgstxwindowlistener.so +/usr/%{_lib}/gstreamer-0.8/libgsty4menc.so +/usr/%{_lib}/gstreamer-0.8/libgst1394.so +/usr/%{_lib}/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so +/usr/%{_lib}/libaudiofile.so.0 +/usr/%{_lib}/libbeecrypt.so.6 +/usr/%{_lib}/libbonoboui-2.so.0 +/usr/%{_lib}/libcamel-provider-1.2.so.7 +/usr/%{_lib}/libcamel-1.2.so.0 +/usr/%{_lib}/libebook-1.2.so.5 +/usr/%{_lib}/libecal-1.2.so.3 +/usr/%{_lib}/libedata-book-1.2.so.2 +/usr/%{_lib}/libedata-cal-1.2.so.1 +/usr/%{_lib}/libedataserverui-1.2.so.6 +/usr/%{_lib}/libedataserver-1.2.so.6 +/usr/%{_lib}/libeel-2.so.2 +/usr/%{_lib}/libegroupwise-1.2.so.9 +/usr/%{_lib}/libelf.so.1 +/usr/%{_lib}/libesd.so.0 +/usr/%{_lib}/libexif.so.12 +/usr/%{_lib}/libfam.so.0 +/usr/%{_lib}/libfontenc.so.1 +/usr/%{_lib}/libgailutil.so.17 +/usr/%{_lib}/libgal-a11y-2.4.so.0 +/usr/%{_lib}/libgal-2.4.so.0 +/usr/%{_lib}/libgcrypt.so.11 +/usr/%{_lib}/libglade-2.0.so.0 +/usr/%{_lib}/libgnomecups-1.0.so.1 +/usr/%{_lib}/libgnome-desktop-2.so.2 +/usr/%{_lib}/libgnome-keyring.so.0 +/usr/%{_lib}/libgnome-menu.so.2 +/usr/%{_lib}/libgnomeprintui-2-2.so.0 +/usr/%{_lib}/libgnomeprint-2-2.so.0 +/usr/%{_lib}/libgnomeui-2.so.0 +/usr/%{_lib}/libgnome-window-settings.so.1 +/usr/%{_lib}/libgnome-2.so.0 +/usr/%{_lib}/libgnutls.so.12 +/usr/%{_lib}/libgpg-error.so.0 /usr/lib/libgssapi_krb5.so.2 -/usr/lib/libk5crypto.so.3 +/usr/%{_lib}/libgstinterfaces-0.8.so.0 +/usr/%{_lib}/libgstreamer-0.8.so.1 +/usr/%{_lib}/libgtkhtml-2.so.0 +/usr/%{_lib}/libIDL-2.so.0 +/usr/%{_lib}/libjpeg.so.62 /usr/lib/libkrb5.so.3 /usr/lib/libkrb5support.so.0 -/usr/lib/libnss3.so +/usr/lib/libk5crypto.so.3 +/usr/%{_lib}/libmetacity-private.so.0 +/usr/%{_lib}/libnautilus-extension.so.1 +/usr/%{_lib}/libnautilus-private.so.2 +/usr/%{_lib}/libneon.so.24 +/usr/%{_lib}/libnspr4.so /usr/lib/libnssckbi.so +/usr/lib/libnss3.so +/usr/%{_lib}/libnss3.so +/usr/%{_lib}/libORBit-imodule-2.so.0 +/usr/%{_lib}/libpanel-applet-2.so.0 +/usr/%{_lib}/libplc4.so +/usr/%{_lib}/libplds4.so +/usr/%{_lib}/librpmbuild-4.4.so +/usr/%{_lib}/librpmdb-4.4.so +/usr/%{_lib}/librpmio-4.4.so +/usr/%{_lib}/librpm-4.4.so +/usr/%{_lib}/libsmime3.so +/usr/%{_lib}/libsoftokn3.so +/usr/%{_lib}/libsoup-2.2.so.8 +/usr/%{_lib}/libsqlite3.so.0 +/usr/%{_lib}/libssl3.so +/usr/%{_lib}/libstartup-notification-1.so.0 +/usr/%{_lib}/libstdc++.so.6 +/usr/%{_lib}/libwnck-1.so.16 +/usr/%{_lib}/libxklavier.so.10 +/usr/%{_lib}/libXmu.so.6 +/usr/%{_lib}/libXRes.so.1 +/usr/%{_lib}/libXss.so.1 +/usr/%{_lib}/libXt.so.6 +/usr/%{_lib}/libXxf86misc.so.1 +/usr/%{_lib}/libXxf86vm.so.1 /usr/lib/libz.so.1 +/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-burn-extension.so +/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-fileroller.so +/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-fontilus.so +/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-themus.so /usr/lib/openoffice.org2.0/program/javaldx /usr/lib/openoffice.org2.0/program/pagein /usr/lib/openoffice.org2.0/program/soffice /usr/lib/openoffice.org2.0/program/soffice.bin +/usr/%{_lib}/orbit-2.0/Bonobo_module.so +/usr/%{_lib}/python2.4/atexit.py +/usr/%{_lib}/python2.4/atexit.pyc +/usr/%{_lib}/python2.4/base64.py +/usr/%{_lib}/python2.4/base64.pyc +/usr/%{_lib}/python2.4/bisect.py +/usr/%{_lib}/python2.4/bisect.pyc +/usr/%{_lib}/python2.4/calendar.py +/usr/%{_lib}/python2.4/calendar.pyc +/usr/%{_lib}/python2.4/codecs.pyc +/usr/%{_lib}/python2.4/cookielib.py +/usr/%{_lib}/python2.4/cookielib.pyc +/usr/%{_lib}/python2.4/copy.pyc +/usr/%{_lib}/python2.4/copy_reg.pyc +/usr/%{_lib}/python2.4/dis.pyc +/usr/%{_lib}/python2.4/encodings/aliases.pyc +/usr/%{_lib}/python2.4/encodings/ascii.py +/usr/%{_lib}/python2.4/encodings/ascii.pyc +/usr/%{_lib}/python2.4/encodings/idna.py +/usr/%{_lib}/python2.4/encodings/idna.pyc +/usr/%{_lib}/python2.4/encodings/__init__.pyc +/usr/%{_lib}/python2.4/encodings/latin_1.pyc +/usr/%{_lib}/python2.4/encodings/utf_8.py +/usr/%{_lib}/python2.4/encodings/utf_8.pyc +/usr/%{_lib}/python2.4/fnmatch.pyc +/usr/%{_lib}/python2.4/ftplib.py +/usr/%{_lib}/python2.4/ftplib.pyc +/usr/%{_lib}/python2.4/gettext.pyc +/usr/%{_lib}/python2.4/glob.pyc +/usr/%{_lib}/python2.4/gopherlib.py +/usr/%{_lib}/python2.4/gopherlib.pyc +/usr/%{_lib}/python2.4/gzip.py +/usr/%{_lib}/python2.4/gzip.pyc +/usr/%{_lib}/python2.4/httplib.py +/usr/%{_lib}/python2.4/httplib.pyc +/usr/%{_lib}/python2.4/inspect.pyc +/usr/%{_lib}/python2.4/keyword.py +/usr/%{_lib}/python2.4/keyword.pyc +/usr/%{_lib}/python2.4/lib-dynload/arraymodule.so +/usr/%{_lib}/python2.4/lib-dynload/binascii.so +/usr/%{_lib}/python2.4/lib-dynload/_bisect.so +/usr/%{_lib}/python2.4/lib-dynload/collectionsmodule.so +/usr/%{_lib}/python2.4/lib-dynload/datetime.so +/usr/%{_lib}/python2.4/lib-dynload/fcntlmodule.so +/usr/%{_lib}/python2.4/lib-dynload/mathmodule.so +/usr/%{_lib}/python2.4/lib-dynload/md5module.so +/usr/%{_lib}/python2.4/lib-dynload/operator.so +/usr/%{_lib}/python2.4/lib-dynload/_randommodule.so +/usr/%{_lib}/python2.4/lib-dynload/selectmodule.so +/usr/%{_lib}/python2.4/lib-dynload/shamodule.so +/usr/%{_lib}/python2.4/lib-dynload/_socketmodule.so +/usr/%{_lib}/python2.4/lib-dynload/_ssl.so +/usr/%{_lib}/python2.4/lib-dynload/unicodedata.so +/usr/%{_lib}/python2.4/linecache.pyc +/usr/%{_lib}/python2.4/locale.pyc +/usr/%{_lib}/python2.4/logging/__init__.py +/usr/%{_lib}/python2.4/logging/__init__.pyc +/usr/%{_lib}/python2.4/_LWPCookieJar.py +/usr/%{_lib}/python2.4/_LWPCookieJar.pyc +/usr/%{_lib}/python2.4/mimetools.py +/usr/%{_lib}/python2.4/mimetools.pyc +/usr/%{_lib}/python2.4/mimetypes.py +/usr/%{_lib}/python2.4/mimetypes.pyc +/usr/%{_lib}/python2.4/_MozillaCookieJar.py +/usr/%{_lib}/python2.4/_MozillaCookieJar.pyc +/usr/%{_lib}/python2.4/opcode.pyc +/usr/%{_lib}/python2.4/os.pyc +/usr/%{_lib}/python2.4/popen2.py +/usr/%{_lib}/python2.4/popen2.pyc +/usr/%{_lib}/python2.4/posixpath.pyc +/usr/%{_lib}/python2.4/random.py +/usr/%{_lib}/python2.4/random.pyc +/usr/%{_lib}/python2.4/re.pyc +/usr/%{_lib}/python2.4/rfc822.py +/usr/%{_lib}/python2.4/rfc822.pyc +/usr/%{_lib}/python2.4/shelve.py +/usr/%{_lib}/python2.4/shelve.pyc +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/atk.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/activation.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/_bonobo.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/__init__.py +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/ui.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnomecanvas.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/_gnome.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/__init__.py +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/ui.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnomevfs.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gobject.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/glade.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/_gtk.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtkhtml2.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/__init__.py +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/keysyms.py +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/keysyms.pyc +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/pango.so +/usr/%{_lib}/python2.4/site-packages/japanese/aliases/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/japanese/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/OpenSSL/crypto.so +/usr/%{_lib}/python2.4/site-packages/OpenSSL/__init__.py +/usr/%{_lib}/python2.4/site-packages/OpenSSL/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/OpenSSL/rand.so +/usr/%{_lib}/python2.4/site-packages/OpenSSL/SSL.so +/usr/%{_lib}/python2.4/site-packages/OpenSSL/tsafe.py +/usr/%{_lib}/python2.4/site-packages/OpenSSL/tsafe.pyc +/usr/%{_lib}/python2.4/site-packages/OpenSSL/version.py +/usr/%{_lib}/python2.4/site-packages/OpenSSL/version.pyc +/usr/%{_lib}/python2.4/site-packages/ORBit.so /usr/lib/python2.4/site-packages/rhn/connections.py /usr/lib/python2.4/site-packages/rhn/connections.pyc /usr/lib/python2.4/site-packages/rhn/__init__.py @@ -1157,17 +1267,64 @@ /usr/lib/python2.4/site-packages/rhn/transports.pyc /usr/lib/python2.4/site-packages/rhn/UserDictCase.py /usr/lib/python2.4/site-packages/rhn/UserDictCase.pyc +/usr/%{_lib}/python2.4/site-packages/rhpl/gzread.pyc +/usr/%{_lib}/python2.4/site-packages/rhpl/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/rhpl/translate.pyc +/usr/%{_lib}/python2.4/site-packages/rpm/__init__.py +/usr/%{_lib}/python2.4/site-packages/rpm/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/rpm/_rpmmodule.so +/usr/%{_lib}/python2.4/site-packages/_xmlplus/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/expat.py +/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/expat.pyc +/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/__init__.py +/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/pyexpat.so +/usr/%{_lib}/python2.4/site.pyc +/usr/%{_lib}/python2.4/socket.py +/usr/%{_lib}/python2.4/socket.pyc +/usr/%{_lib}/python2.4/sre_compile.pyc +/usr/%{_lib}/python2.4/sre_constants.pyc +/usr/%{_lib}/python2.4/sre_parse.pyc +/usr/%{_lib}/python2.4/sre.pyc +/usr/%{_lib}/python2.4/stat.pyc +/usr/%{_lib}/python2.4/StringIO.py +/usr/%{_lib}/python2.4/StringIO.pyc +/usr/%{_lib}/python2.4/stringprep.py +/usr/%{_lib}/python2.4/stringprep.pyc +/usr/%{_lib}/python2.4/string.pyc +/usr/%{_lib}/python2.4/tempfile.py +/usr/%{_lib}/python2.4/tempfile.pyc +/usr/%{_lib}/python2.4/threading.py +/usr/%{_lib}/python2.4/threading.pyc +/usr/%{_lib}/python2.4/tokenize.pyc +/usr/%{_lib}/python2.4/token.pyc +/usr/%{_lib}/python2.4/traceback.py +/usr/%{_lib}/python2.4/traceback.pyc +/usr/%{_lib}/python2.4/types.pyc +/usr/%{_lib}/python2.4/urllib.py +/usr/%{_lib}/python2.4/urllib.pyc +/usr/%{_lib}/python2.4/urllib2.py +/usr/%{_lib}/python2.4/urllib2.pyc +/usr/%{_lib}/python2.4/urlparse.py +/usr/%{_lib}/python2.4/urlparse.pyc +/usr/%{_lib}/python2.4/UserDict.pyc +/usr/%{_lib}/python2.4/warnings.pyc +/usr/%{_lib}/python2.4/xml/__init__.pyc +/usr/%{_lib}/python2.4/xmlrpclib.py +/usr/%{_lib}/python2.4/xmlrpclib.pyc +/usr/lib/rpm/%{_arch}-linux/macros /usr/lib/rpm/macros /usr/lib/rpm/redhat/macros /usr/lib/rpm/redhat/rpmrc /usr/lib/rpm/rpmrc -/usr/lib/rpm/##ARCH##-linux/macros +/usr/%{_lib}/X11/app-defaults/XScreenSaver /usr/sbin/lpc /usr/share/applications/defaults.list /usr/share/applications/gnome-nautilus-computer.desktop /usr/share/applications/gnome-nautilus-home.desktop /usr/share/applications/gnome-search-tool.desktop /usr/share/applications/mimeinfo.cache +/usr/share/applications/mozilla-firefox.desktop /usr/share/backgrounds/images/default.png /usr/share/control-center-2.0/xrdb/Editres.ad /usr/share/control-center-2.0/xrdb/Emacs.ad @@ -1189,6 +1346,8 @@ /usr/share/doc/HTML/img/header-projects.png /usr/share/doc/HTML/index.html /usr/share/eggcups/icon.png +/usr/share/evolution-data-server-1.6/zoneinfo/America/New_York.ics +/usr/share/evolution-data-server-1.6/zoneinfo/zones.tab /usr/share/evolution/2.6/etspec/message-list.etspec /usr/share/evolution/2.6/images/offline.png /usr/share/evolution/2.6/images/online.png @@ -1198,11 +1357,11 @@ /usr/share/evolution/2.6/ui/evolution-mail-message.xml /usr/share/evolution/2.6/ui/evolution.xml /usr/share/evolution/2.6/vfoldertypes.xml -/usr/share/evolution-data-server-1.6/zoneinfo/America/New_York.ics -/usr/share/evolution-data-server-1.6/zoneinfo/zones.tab /usr/share/fonts/bitstream-vera/VeraIt.ttf /usr/share/fonts/default/Type1/n021003l.pfb /usr/share/gdm/BuiltInSessions/default.desktop +/usr/share/gnome/default.session +/usr/share/gnome-panelrc /usr/share/gnome-2.0/ui/GNOME_ClockApplet.xml /usr/share/gnome-2.0/ui/GNOME_MixerApplet.xml /usr/share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml @@ -1210,9 +1369,16 @@ /usr/share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml /usr/share/gnome-2.0/ui/GNOME_WindowListApplet.xml /usr/share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml -/usr/share/gnome/default.session -/usr/share/gnome-panelrc -/usr/share/gtkhtml-3.6/keybindingsrc.emacs +/usr/share/gtkhtml-3.8/keybindingsrc.emacs +/usr/share/icons/Bluecurve/cursors/arrow +/usr/share/icons/Bluecurve/cursors/bottom_right_corner +/usr/share/icons/Bluecurve/cursors/crosshair +/usr/share/icons/Bluecurve/cursors/fleur +/usr/share/icons/Bluecurve/cursors/hand2 +/usr/share/icons/Bluecurve/cursors/sb_h_double_arrow +/usr/share/icons/Bluecurve/cursors/sb_v_double_arrow +/usr/share/icons/Bluecurve/cursors/08e8e1c95fe2fc01f976f1e063a24ccd +/usr/share/icons/Bluecurve/icon-theme.cache /usr/share/icons/Bluecurve/16x16/apps/gnome-panel.png /usr/share/icons/Bluecurve/16x16/apps/gnome-settings.png /usr/share/icons/Bluecurve/16x16/apps/openofficeorg-writer.png @@ -1236,11 +1402,11 @@ /usr/share/icons/Bluecurve/24x24/stock/gtk-home.png /usr/share/icons/Bluecurve/24x24/stock/gtk-print.png /usr/share/icons/Bluecurve/24x24/stock/gtk-stop.png -/usr/share/icons/Bluecurve/24x24/stock/stock_volume-0.png /usr/share/icons/Bluecurve/24x24/stock/stock_volume-max.png /usr/share/icons/Bluecurve/24x24/stock/stock_volume-med.png /usr/share/icons/Bluecurve/24x24/stock/stock_volume-min.png /usr/share/icons/Bluecurve/24x24/stock/stock_volume-mute.png +/usr/share/icons/Bluecurve/24x24/stock/stock_volume-0.png /usr/share/icons/Bluecurve/32x32/apps/gnome-panel.png /usr/share/icons/Bluecurve/32x32/filesystems/gnome-fs-desktop.png /usr/share/icons/Bluecurve/36x36/apps/gnome-panel.png @@ -1259,28 +1425,21 @@ /usr/share/icons/Bluecurve/48x48/filesystems/gnome-fs-home.icon /usr/share/icons/Bluecurve/48x48/filesystems/gnome-fs-home.png /usr/share/icons/Bluecurve/48x48/filesystems/gnome-fs-trash-empty.png -/usr/share/icons/Bluecurve/48x48/stock/stock_volume-0.png /usr/share/icons/Bluecurve/48x48/stock/stock_volume-max.png /usr/share/icons/Bluecurve/48x48/stock/stock_volume-med.png /usr/share/icons/Bluecurve/48x48/stock/stock_volume-min.png /usr/share/icons/Bluecurve/48x48/stock/stock_volume-mute.png +/usr/share/icons/Bluecurve/48x48/stock/stock_volume-0.png /usr/share/icons/Bluecurve/96x96/filesystems/gnome-fs-directory.icon /usr/share/icons/Bluecurve/96x96/filesystems/gnome-fs-directory.png -/usr/share/icons/Bluecurve/cursors/08e8e1c95fe2fc01f976f1e063a24ccd -/usr/share/icons/Bluecurve/cursors/arrow -/usr/share/icons/Bluecurve/cursors/bottom_right_corner -/usr/share/icons/Bluecurve/cursors/crosshair -/usr/share/icons/Bluecurve/cursors/fleur -/usr/share/icons/Bluecurve/cursors/hand2 -/usr/share/icons/Bluecurve/cursors/sb_h_double_arrow -/usr/share/icons/Bluecurve/cursors/sb_v_double_arrow -/usr/share/icons/Bluecurve/icon-theme.cache +/usr/share/icons/Clearlooks/icon-theme.cache +/usr/share/icons/Clearlooks/index.theme /usr/share/icons/Clearlooks/24x24/gtk/gtk-go-back-ltr.png /usr/share/icons/Clearlooks/24x24/gtk/gtk-go-forward-ltr.png /usr/share/icons/Clearlooks/24x24/gtk/gtk-refresh.png -/usr/share/icons/Clearlooks/icon-theme.cache -/usr/share/icons/Clearlooks/index.theme /usr/share/icons/gnome/icon-theme.cache +/usr/share/icons/hicolor/icon-theme.cache +/usr/share/icons/hicolor/index.theme /usr/share/icons/hicolor/16x16/stock/document/stock_attach.png /usr/share/icons/hicolor/16x16/stock/document/stock_task.png /usr/share/icons/hicolor/16x16/stock/document/stock_todo.png @@ -1290,10 +1449,10 @@ /usr/share/icons/hicolor/16x16/stock/generic/stock_delete.png /usr/share/icons/hicolor/16x16/stock/generic/stock_folder.png /usr/share/icons/hicolor/16x16/stock/generic/stock_folder-properties.png -/usr/share/icons/hicolor/16x16/stock/generic/stock_new-24h-appointment.png /usr/share/icons/hicolor/16x16/stock/generic/stock_new-appointment.png /usr/share/icons/hicolor/16x16/stock/generic/stock_new-dir.png /usr/share/icons/hicolor/16x16/stock/generic/stock_new-meeting.png +/usr/share/icons/hicolor/16x16/stock/generic/stock_new-24h-appointment.png /usr/share/icons/hicolor/16x16/stock/generic/stock_paste.png /usr/share/icons/hicolor/16x16/stock/generic/stock_score-higher.png /usr/share/icons/hicolor/16x16/stock/generic/stock_score-highest.png @@ -1358,9 +1517,8 @@ /usr/share/icons/hicolor/24x24/stock/net/stock_spam.png /usr/share/icons/hicolor/32x32/stock/net/stock_mail.png /usr/share/icons/hicolor/48x48/stock/net/stock_mail.png -/usr/share/icons/hicolor/icon-theme.cache -/usr/share/icons/hicolor/index.theme /usr/share/locale/en_US/cups_en_US +/usr/share/man/man1/firefox.1.gz /usr/share/mime/aliases /usr/share/mime/application/octet-stream.xml /usr/share/mime/globs @@ -1378,6 +1536,7 @@ /usr/share/pixmaps/applet-error.png /usr/share/pixmaps/applet-okay.png /usr/share/pixmaps/badge-small.png +/usr/share/pixmaps/firefox.png /usr/share/pixmaps/keyring.png /usr/share/pixmaps/nautilus/text-selection-frame.png /usr/share/pixmaps/nautilus/thumbnail_frame.png @@ -1427,10 +1586,10 @@ /usr/share/rhn/up2date_client/repoBackends/urlUtils.pyc /usr/share/rhn/up2date_client/repoDirector.py /usr/share/rhn/up2date_client/repoDirector.pyc -/usr/share/rhn/up2date_client/rhnChannel.py -/usr/share/rhn/up2date_client/rhnChannel.pyc /usr/share/rhn/up2date_client/rhnErrata.py /usr/share/rhn/up2date_client/rhnErrata.pyc +/usr/share/rhn/up2date_client/rhnChannel.py +/usr/share/rhn/up2date_client/rhnChannel.pyc /usr/share/rhn/up2date_client/rpcServer.py /usr/share/rhn/up2date_client/rpcServer.pyc /usr/share/rhn/up2date_client/rpmUtils.py @@ -1457,16 +1616,3 @@ /usr/share/themes/Default/gtk-2.0-key/gtkrc /usr/share/themes/Raleigh/gtk/gtkrc /usr/share/zoneinfo/UTC -/usr/bin/mkfontdir -/usr/bin/mkfontscale -/usr/bin/sessreg -/usr/bin/xmodmap -/usr/bin/xsetroot -/usr##LIBDIR##libfontenc.so.1 -/usr##LIBDIR##libXmu.so.6 -/usr##LIBDIR##libXRes.so.1 -/usr##LIBDIR##libXss.so.1 -/usr##LIBDIR##libXt.so.6 -/usr##LIBDIR##libXxf86misc.so.1 -/usr##LIBDIR##libXxf86vm.so.1 -/usr##LIBDIR##X11/app-defaults/XScreenSaver Index: readahead.spec =================================================================== RCS file: /cvs/dist/rpms/readahead/devel/readahead.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- readahead.spec 21 Dec 2005 09:28:40 -0000 1.20 +++ readahead.spec 13 Jan 2006 08:37:50 -0000 1.21 @@ -1,6 +1,6 @@ Summary: Read a preset list of files into memory. Name: readahead -Version: 1.1 +Version: 1.2 Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}).1 Epoch: 1 Group: System Environment/Base @@ -12,11 +12,12 @@ Source4: readahead.early.files.in Source5: COPYING Source6: README +Source7: readahead-gen Buildroot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig Requires: procps /bin/awk BuildPreReq: e2fsprogs-devel - +BuildPreReq: python Obsoletes: kernel-utils %description @@ -36,7 +37,7 @@ for file in %{SOURCE2} %{SOURCE4} ; do f=${file##*/} - sed 's|##LIBDIR##|/%{_lib}/|g; s|##ARCH##|%{_arch}|g' $file > ${f%%.in} + ./readahead-gen --template=$file --output=${f%%.in} done %install @@ -76,6 +77,9 @@ %changelog +* Fri Jan 13 2006 Karel Zak +- check & cleanup list of files by readahead-gen script + * Wed Dec 21 2005 Karel Zak - removed double slashes in the directory names - removed or fixed the rest of X11R6 directories From fedora-cvs-commits at redhat.com Fri Jan 13 08:42:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 03:42:06 -0500 Subject: rpms/file/devel file-4.16-fix-array-64bit.patch, NONE, 1.1 file.spec, 1.42, 1.43 Message-ID: <200601130842.k0D8g6Ns013151@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/file/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13137 Modified Files: file.spec Added Files: file-4.16-fix-array-64bit.patch Log Message: - fix for 64bit arrays file-4.16-fix-array-64bit.patch: readelf.c | 26 +++++++++++--------------- readelf.h | 1 + 2 files changed, 12 insertions(+), 15 deletions(-) --- NEW FILE file-4.16-fix-array-64bit.patch --- --- src/readelf.h +++ src/readelf.h @@ -50,6 +50,7 @@ typedef uint32_t Elf64_Off[2]; typedef uint32_t Elf64_Xword[2]; #else +#undef USE_ARRAY_FOR_64BIT_TYPES typedef uint64_t Elf64_Addr; typedef uint64_t Elf64_Off; typedef uint64_t Elf64_Xword; --- src/readelf.c +++ src/readelf.c @@ -121,6 +121,14 @@ return value; } +#ifdef USE_ARRAY_FOR_64BIT_TYPES +# define elf_getu64(swap, array) \ + ((swap ? ((uint64_t)getu32(swap, array[0])) << 32 : getu32(swap, array[0])) + \ + (swap ? getu32(swap, array[1]) : ((uint64_t)getu32(swap, array[1]) << 32))) +#else +# define elf_getu64(swap, value) getu64(swap, value) +#endif + #define xsh_addr (class == ELFCLASS32 \ ? (void *) &sh32 \ : (void *) &sh64) @@ -913,11 +921,7 @@ if (getu16(swap, elfhdr.e_type) == ET_CORE) { #ifdef ELFCORE if (dophn_core(ms, class, swap, fd, -#ifdef USE_ARRAY_FOR_64BIT_TYPES - (off_t)getu32(swap, elfhdr.e_phoff[1]), -#else - (off_t)getu64(swap, elfhdr.e_phoff), -#endif + (off_t)elf_getu64(swap, elfhdr.e_phoff), getu16(swap, elfhdr.e_phnum), (size_t)getu16(swap, elfhdr.e_phentsize)) == -1) return -1; @@ -927,22 +931,14 @@ } else { if (getu16(swap, elfhdr.e_type) == ET_EXEC) { if (dophn_exec(ms, class, swap, fd, -#ifdef USE_ARRAY_FOR_64BIT_TYPES - (off_t)getu32(swap, elfhdr.e_phoff[1]), -#else - (off_t)getu64(swap, elfhdr.e_phoff), -#endif + (off_t)elf_getu64(swap, elfhdr.e_phoff), getu16(swap, elfhdr.e_phnum), (size_t)getu16(swap, elfhdr.e_phentsize)) == -1) return -1; } if (doshn(ms, class, swap, fd, -#ifdef USE_ARRAY_FOR_64BIT_TYPES - (off_t)getu32(swap, elfhdr.e_shoff[1]), -#else - (off_t)getu64(swap, elfhdr.e_shoff), -#endif + (off_t)elf_getu64(swap, elfhdr.e_shoff), getu16(swap, elfhdr.e_shnum), (size_t)getu16(swap, elfhdr.e_shentsize)) == -1) return -1; Index: file.spec =================================================================== RCS file: /cvs/dist/rpms/file/devel/file.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- file.spec 9 Dec 2005 22:40:24 -0000 1.42 +++ file.spec 13 Jan 2006 08:42:03 -0000 1.43 @@ -3,7 +3,7 @@ Summary: A utility for determining file types. Name: file Version: 4.16 -Release: 4.1 +Release: 5 License: distributable Group: Applications/File Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -16,6 +16,7 @@ Patch8: file-4.15-berkeley.patch Patch9: file-4.16-readelf.patch Patch10: file-4.16-dont_use_isprint.patch +Patch11: file-4.16-fix-array-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: zlib-devel @@ -38,6 +39,7 @@ %patch8 -p1 -b .berkeley %patch9 -p1 -b .corefile %patch10 -p1 -b .isprint +%patch11 -p0 -b .64bit iconv -f iso-8859-1 -t utf-8 < doc/libmagic.man > doc/libmagic.man_ mv doc/libmagic.man_ doc/libmagic.man @@ -83,6 +85,9 @@ %{_libdir}/libmagic.* %changelog +* Fri Jan 13 2006 Radek Vokal 4.16-5 +- fix for 64bit arrays + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Fri Jan 13 08:50:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 03:50:52 -0500 Subject: rpms/readahead/devel readahead.spec,1.21,1.22 Message-ID: <200601130850.k0D8oqwe024477@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/readahead/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24465 Modified Files: readahead.spec Log Message: fix spec file Index: readahead.spec =================================================================== RCS file: /cvs/dist/rpms/readahead/devel/readahead.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- readahead.spec 13 Jan 2006 08:37:50 -0000 1.21 +++ readahead.spec 13 Jan 2006 08:50:50 -0000 1.22 @@ -17,7 +17,8 @@ Prereq: /sbin/chkconfig Requires: procps /bin/awk BuildPreReq: e2fsprogs-devel -BuildPreReq: python +BuildRequires: python +BuildRequires: pkgconfig Obsoletes: kernel-utils %description @@ -33,11 +34,11 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/etc/rc.d/init.d mkdir -p %{buildroot}/etc/sysconfig -gcc $RPM_OPT_FLAGS %{SOURCE0} -o readahead -lext2fs -lblkid +gcc $RPM_OPT_FLAGS %{SOURCE0} -o readahead `pkg-config --libs ext2fs blkid` for file in %{SOURCE2} %{SOURCE4} ; do f=${file##*/} - ./readahead-gen --template=$file --output=${f%%.in} + %{SOURCE7} --template=$file --output=${f%%.in} done %install From fedora-cvs-commits at redhat.com Fri Jan 13 09:02:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 04:02:30 -0500 Subject: rpms/tomboy/devel tomboy.spec,1.8,1.9 Message-ID: <200601130902.k0D92UT5003004@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/tomboy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2673 Modified Files: tomboy.spec Log Message: Add gtkspell dependency Index: tomboy.spec =================================================================== RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- tomboy.spec 9 Jan 2006 16:53:28 -0000 1.8 +++ tomboy.spec 13 Jan 2006 09:02:17 -0000 1.9 @@ -1,6 +1,6 @@ Name: tomboy Version: 0.3.3 -Release: 4 +Release: 5 Summary: Tomboy is a desktop note-taking application for Linux and Unix. Group: User Interface/Desktops @@ -16,6 +16,8 @@ BuildRequires: gtk2-devel >= 2.2.3 atk-devel >= 1.2.4 gtkspell-devel gtk-sharp dbus-sharp +Requires: gtkspell + # Mono only availible on these: (s390x disabled for now) ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x @@ -93,6 +95,9 @@ %{_sysconfdir}/gconf/schemas/tomboy.schemas %changelog +* Fri Jan 13 2006 Alexander Larsson 0.3.3-5 +- Add gtkspell requirement + * Mon Jan 9 2006 Alexander Larsson - 0.3.3-4 - Better icons From fedora-cvs-commits at redhat.com Fri Jan 13 09:23:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 04:23:39 -0500 Subject: rpms/libgdiplus/devel .cvsignore, 1.3, 1.4 libgdiplus.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200601130923.k0D9NdVH020660@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/libgdiplus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20623 Modified Files: .cvsignore libgdiplus.spec sources Log Message: * Fri Jan 13 2006 Alexander Larsson - 1.1.13-1 - update to 1.1.13 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgdiplus/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jan 2006 13:57:25 -0000 1.3 +++ .cvsignore 13 Jan 2006 09:23:33 -0000 1.4 @@ -1 +1 @@ -libgdiplus-1.1.11.tar.gz +libgdiplus-1.1.13.tar.gz Index: libgdiplus.spec =================================================================== RCS file: /cvs/dist/rpms/libgdiplus/devel/libgdiplus.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libgdiplus.spec 11 Jan 2006 10:03:56 -0000 1.7 +++ libgdiplus.spec 13 Jan 2006 09:23:33 -0000 1.8 @@ -1,6 +1,6 @@ Name: libgdiplus -Version: 1.1.11 -Release: 2 +Version: 1.1.13 +Release: 1 Summary: libgdiplus: An Open Source implementation of the GDI+ API Group: System Environment/Libraries @@ -48,6 +48,9 @@ %{_libdir}/pkgconfig/* %changelog +* Fri Jan 13 2006 Alexander Larsson - 1.1.13-1 +- update to 1.1.13 + * Wed Jan 11 2006 Alexander Larsson 1.1.11-2 - Don't package debug info Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgdiplus/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2006 13:57:25 -0000 1.3 +++ sources 13 Jan 2006 09:23:33 -0000 1.4 @@ -1 +1 @@ -c0de8ffb854029431e0f60bda8f34032 libgdiplus-1.1.11.tar.gz +9f655b0032603d653b52ce12b6c29a50 libgdiplus-1.1.13.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 13 09:24:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 04:24:45 -0500 Subject: rpms/readahead/devel readahead-gen, 1.1, 1.2 readahead.spec, 1.22, 1.23 Message-ID: <200601130924.k0D9Ojuw021132@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/readahead/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21094 Modified Files: readahead-gen readahead.spec Log Message: fix for ppc... Index: readahead-gen =================================================================== RCS file: /cvs/dist/rpms/readahead/devel/readahead-gen,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- readahead-gen 13 Jan 2006 08:37:50 -0000 1.1 +++ readahead-gen 13 Jan 2006 09:24:42 -0000 1.2 @@ -3,11 +3,10 @@ # # This script is helper for readahead.files mainatainers. # -# Basic featires: +# Basic features: # - allows to use RPM macros in paths (e.g. /usr/%{_lib}) # - checks for missing files and suggest possible solution # -# # Copyright, 2006 Red Hat, Inc. # Karel Zak # Index: readahead.spec =================================================================== RCS file: /cvs/dist/rpms/readahead/devel/readahead.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- readahead.spec 13 Jan 2006 08:50:50 -0000 1.22 +++ readahead.spec 13 Jan 2006 09:24:42 -0000 1.23 @@ -12,12 +12,10 @@ Source4: readahead.early.files.in Source5: COPYING Source6: README -Source7: readahead-gen Buildroot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig Requires: procps /bin/awk BuildPreReq: e2fsprogs-devel -BuildRequires: python BuildRequires: pkgconfig Obsoletes: kernel-utils @@ -38,7 +36,7 @@ for file in %{SOURCE2} %{SOURCE4} ; do f=${file##*/} - %{SOURCE7} --template=$file --output=${f%%.in} + sed 's|%%{_lib}|%{_lib}|g; s|%%{_arch}|%{_arch}|g' $file > ${f%%.in} done %install From fedora-cvs-commits at redhat.com Fri Jan 13 09:42:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 04:42:34 -0500 Subject: rpms/readahead/FC-4 readahead-gen, NONE, 1.1 readahead.early.files.in, 1.2, 1.3 readahead.files.in, 1.2, 1.3 readahead.spec, 1.18, 1.19 Message-ID: <200601130942.k0D9gYTO026429@cvs.devel.redhat.com> Author: kzak Update of /cvs/dist/rpms/readahead/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26363 Modified Files: readahead.early.files.in readahead.files.in readahead.spec Added Files: readahead-gen Log Message: add checker ***** Error reading new file: [Errno 2] No such file or directory: 'readahead-gen' Index: readahead.early.files.in =================================================================== RCS file: /cvs/dist/rpms/readahead/FC-4/readahead.early.files.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- readahead.early.files.in 4 Aug 2005 17:29:36 -0000 1.2 +++ readahead.early.files.in 13 Jan 2006 09:42:28 -0000 1.3 @@ -72,8 +72,8 @@ /etc/fstab /etc/group /etc/gtk-2.0/gtkrc -/etc/gtk-2.0/##ARCH##-redhat-linux-gnu/gdk-pixbuf.loaders -/etc/gtk-2.0/##ARCH##-redhat-linux-gnu/gtk.immodules +/etc/gtk-2.0/%{_arch}-redhat-linux-gnu/gdk-pixbuf.loaders +/etc/gtk-2.0/%{_arch}-redhat-linux-gnu/gtk.immodules /etc/hesiod.conf /etc/host.conf /etc/hosts @@ -137,7 +137,7 @@ /etc/pam.d/login /etc/pam.d/other /etc/pam.d/system-auth -/etc/pango/##ARCH##-redhat-linux-gnu/pango.modules +/etc/pango/%{_arch}-redhat-linux-gnu/pango.modules /etc/passwd /etc/pcmcia/config /etc/printcap @@ -289,49 +289,49 @@ /etc/X11/xorg.conf /etc/X11/Xresources /etc/X11/xserver/SecurityPolicy -##LIBDIR##iptables/libipt_icmp.so -##LIBDIR##iptables/libipt_REJECT.so -##LIBDIR##iptables/libipt_standard.so -##LIBDIR##iptables/libipt_state.so -##LIBDIR##iptables/libipt_tcp.so -##LIBDIR##iptables/libipt_udp.so -##LIBDIR##ld-linux-x86-64.so.2 -##LIBDIR##libacl.so.1 -##LIBDIR##libasound.so.2 -##LIBDIR##libattr.so.1 -##LIBDIR##libaudit.so.0 -##LIBDIR##libblkid.so.1 -##LIBDIR##libcom_err.so.2 -##LIBDIR##libcrypto.so.5 -##LIBDIR##libcrypt.so.1 -##LIBDIR##libc.so.6 -##LIBDIR##libdl.so.2 -##LIBDIR##libiw.so.28 -##LIBDIR##libm.so.6 -##LIBDIR##libnsl.so.1 -##LIBDIR##libnss_dns.so.2 -##LIBDIR##libnss_files.so.2 -##LIBDIR##libnss_hesiod.so.2 -##LIBDIR##libpam_misc.so.0 -##LIBDIR##libpam.so.0 -##LIBDIR##libpcre.so.0 -##LIBDIR##libproc-3.2.5.so -##LIBDIR##libpthread.so.0 -##LIBDIR##libresolv.so.2 -##LIBDIR##librt.so.1 -##LIBDIR##libselinux.so.1 -##LIBDIR##libssl.so.5 -##LIBDIR##libtermcap.so.2 -##LIBDIR##libutil.so.1 -##LIBDIR##libuuid.so.1 -##LIBDIR##security/pam_console.so -##LIBDIR##security/pam_deny.so -##LIBDIR##security/pam_env.so -##LIBDIR##security/pam_nologin.so -##LIBDIR##security/pam_securetty.so -##LIBDIR##security/pam_selinux.so -##LIBDIR##security/pam_stack.so -##LIBDIR##tls/libdb-4.3.so +/%{_lib}/iptables/libipt_icmp.so +/%{_lib}/iptables/libipt_REJECT.so +/%{_lib}/iptables/libipt_standard.so +/%{_lib}/iptables/libipt_state.so +/%{_lib}/iptables/libipt_tcp.so +/%{_lib}/iptables/libipt_udp.so +/%{_lib}/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}/libcom_err.so.2 +/%{_lib}/libcrypto.so.5 +/%{_lib}/libcrypt.so.1 +/%{_lib}/libc.so.6 +/%{_lib}/libdl.so.2 +/%{_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_misc.so.0 +/%{_lib}/libpam.so.0 +/%{_lib}/libpcre.so.0 +/%{_lib}/libproc-3.2.5.so +/%{_lib}/libpthread.so.0 +/%{_lib}/libresolv.so.2 +/%{_lib}/librt.so.1 +/%{_lib}/libselinux.so.1 +/%{_lib}/libssl.so.5 +/%{_lib}/libtermcap.so.2 +/%{_lib}/libutil.so.1 +/%{_lib}/libuuid.so.1 +/%{_lib}/security/pam_console.so +/%{_lib}/security/pam_deny.so +/%{_lib}/security/pam_env.so +/%{_lib}/security/pam_nologin.so +/%{_lib}/security/pam_securetty.so +/%{_lib}/security/pam_selinux.so +/%{_lib}/security/pam_stack.so +/%{_lib}/tls/libdb-4.3.so /lib/kbd/keymaps/amiga/amiga-de.map.gz /lib/kbd/keymaps/amiga/amiga-us.map.gz /lib/kbd/keymaps/atari/atari-de.map.gz @@ -345,14 +345,15 @@ /lib/kbd/keymaps/i386/qwerty/../include/linux-with-alt-and-altgr.inc /lib/kbd/keymaps/i386/qwerty/../include/qwerty-layout.inc /lib/kbd/keymaps/i386/qwerty/us.map.gz -/lib/security/../..##LIBDIR##security/pam_cracklib.so -/lib/security/../..##LIBDIR##security/pam_deny.so -/lib/security/../..##LIBDIR##security/pam_env.so -/lib/security/../..##LIBDIR##security/pam_krb5.so -/lib/security/../..##LIBDIR##security/pam_limits.so -/lib/security/../..##LIBDIR##security/pam_permit.so -/lib/security/../..##LIBDIR##security/pam_succeed_if.so -/lib/security/../..##LIBDIR##security/pam_unix.so +/%{_lib}/security/pam_cracklib.so +/%{_lib}/security/pam_cracklib.so +/%{_lib}/security/pam_deny.so +/%{_lib}/security/pam_env.so +/%{_lib}/security/pam_krb5.so +/%{_lib}/security/pam_limits.so +/%{_lib}/security/pam_permit.so +/%{_lib}/security/pam_succeed_if.so +/%{_lib}/security/pam_unix.so /sbin/alsactl /sbin/arping /sbin/auditctl @@ -427,200 +428,200 @@ /usr/bin/uniq /usr/bin/X11/setxkbmap /usr/bin/X11/X -/usr##LIBDIR##autofs/lookup_ldap.so -/usr##LIBDIR##autofs/mount_bind.so -/usr##LIBDIR##autofs/mount_nfs.so -/usr##LIBDIR##autofs/parse_sun.so -/usr##LIBDIR##cups/backend/hal -/usr##LIBDIR##cups/backend/http -/usr##LIBDIR##cups/backend/ipp -/usr##LIBDIR##cups/backend/lpd -/usr##LIBDIR##cups/backend/ncp -/usr##LIBDIR##cups/backend/parallel -/usr##LIBDIR##cups/backend/scsi -/usr##LIBDIR##cups/backend/serial -/usr##LIBDIR##cups/backend/smb -/usr##LIBDIR##cups/backend/socket -/usr##LIBDIR##cups/backend/usb -/usr##LIBDIR##cups/filter/hpgltops -/usr##LIBDIR##cups/filter/imagetops -/usr##LIBDIR##cups/filter/imagetoraster -/usr##LIBDIR##cups/filter/pdftops -/usr##LIBDIR##cups/filter/pstops -/usr##LIBDIR##cups/filter/pstoraster -/usr##LIBDIR##cups/filter/texttops -/usr##LIBDIR##gconv/gconv-modules.cache -/usr##LIBDIR##gconv/ISO8859-1.so -/usr##LIBDIR##gtk-2.0/2.4.0/engines/libclearlooks.so -/usr##LIBDIR##gtk-2.0/2.4.0/loaders/libpixbufloader-png.so -/usr##LIBDIR##libalchemist.so.0 -/usr##LIBDIR##libart_lgpl_2.so.2 -/usr##LIBDIR##libatk-1.0.so.0 -/usr##LIBDIR##libbluetooth.so.1 -/usr##LIBDIR##libbonobo-2.so.0 -/usr##LIBDIR##libbonobo-activation.so.4 -/usr##LIBDIR##libbz2.so.1 -/usr##LIBDIR##libcrack.so.2 -/usr##LIBDIR##libcroco-0.6.so.3 -/usr##LIBDIR##libcups.so.2 -/usr##LIBDIR##libdbus-1.so.1 -/usr##LIBDIR##libdbus-glib-1.so.1 -/usr##LIBDIR##libdes425.so.3 -/usr##LIBDIR##libexpat.so.0 -/usr##LIBDIR##libfontconfig.so.1 -/usr##LIBDIR##libfreetype.so.6 -/usr##LIBDIR##libgconf-2.so.4 -/usr##LIBDIR##libgdk_pixbuf-2.0.so.0 -/usr##LIBDIR##libgdk-x11-2.0.so.0 -/usr##LIBDIR##libglib-2.0.so.0 -/usr##LIBDIR##libgmodule-2.0.so.0 -/usr##LIBDIR##libgnomecanvas-2.so.0 -/usr##LIBDIR##libgnomevfs-2.so.0 -/usr##LIBDIR##libgobject-2.0.so.0 -/usr##LIBDIR##libgsf-1.so.1 -/usr##LIBDIR##libgssapi_krb5.so.2 -/usr##LIBDIR##libgthread-2.0.so.0 -/usr##LIBDIR##libgtk-x11-2.0.so.0 -/usr##LIBDIR##libhal.so.1 -/usr##LIBDIR##libhal-storage.so.1 -/usr##LIBDIR##libhesiod.so.0 -/usr##LIBDIR##libhowl.so.0 -/usr##LIBDIR##libk5crypto.so.3 -/usr##LIBDIR##libkrb4.so.2 -/usr##LIBDIR##libkrb5.so.3 -/usr##LIBDIR##libkrb5support.so.0 -/usr##LIBDIR##liblber-2.2.so.7 -/usr##LIBDIR##libldap-2.2.so.7 -/usr##LIBDIR##libncurses.so.5 -/usr##LIBDIR##libORBit-2.so.0 -/usr##LIBDIR##libORBitCosNaming-2.so.0 -/usr##LIBDIR##libpango-1.0.so.0 -/usr##LIBDIR##libpangoft2-1.0.so.0 -/usr##LIBDIR##libpangox-1.0.so.0 -/usr##LIBDIR##libpangoxft-1.0.so.0 -/usr##LIBDIR##libpng12.so.0 -/usr##LIBDIR##libpopt.so.0 -/usr##LIBDIR##libpython2.4.so.1.0 -/usr##LIBDIR##librsvg-2.so.2 -/usr##LIBDIR##libsasl2.so.2 -/usr##LIBDIR##libusb-0.1.so.4 -/usr##LIBDIR##libvte.so.4 -/usr##LIBDIR##libwrap.so.0 -/usr##LIBDIR##libxml2.so.2 -/usr##LIBDIR##libz.so.1 -/usr##LIBDIR##pango/1.4.0/modules/pango-basic-fc.so -/usr##LIBDIR##python2.4/codecs.py -/usr##LIBDIR##python2.4/codecs.pyo -/usr##LIBDIR##python2.4/copy.py -/usr##LIBDIR##python2.4/copy.pyo -/usr##LIBDIR##python2.4/copy_reg.py -/usr##LIBDIR##python2.4/copy_reg.pyo -/usr##LIBDIR##python2.4/dis.py -/usr##LIBDIR##python2.4/dis.pyo -/usr##LIBDIR##python2.4/encodings/aliases.py -/usr##LIBDIR##python2.4/encodings/aliases.pyo -/usr##LIBDIR##python2.4/encodings/__init__.py -/usr##LIBDIR##python2.4/encodings/__init__.pyo -/usr##LIBDIR##python2.4/encodings/latin_1.py -/usr##LIBDIR##python2.4/encodings/latin_1.pyo -/usr##LIBDIR##python2.4/fnmatch.py -/usr##LIBDIR##python2.4/fnmatch.pyo -/usr##LIBDIR##python2.4/getopt.py -/usr##LIBDIR##python2.4/getopt.pyo -/usr##LIBDIR##python2.4/gettext.py -/usr##LIBDIR##python2.4/gettext.pyo -/usr##LIBDIR##python2.4/glob.py -/usr##LIBDIR##python2.4/glob.pyo -/usr##LIBDIR##python2.4/inspect.py -/usr##LIBDIR##python2.4/inspect.pyo -/usr##LIBDIR##python2.4/lib-dynload/cPickle.so -/usr##LIBDIR##python2.4/lib-dynload/cStringIO.so -/usr##LIBDIR##python2.4/lib-dynload/grpmodule.so -/usr##LIBDIR##python2.4/lib-dynload/_localemodule.so -/usr##LIBDIR##python2.4/lib-dynload/pwdmodule.so -/usr##LIBDIR##python2.4/lib-dynload/pyexpat.so -/usr##LIBDIR##python2.4/lib-dynload/stropmodule.so -/usr##LIBDIR##python2.4/lib-dynload/structmodule.so -/usr##LIBDIR##python2.4/lib-dynload/timemodule.so -/usr##LIBDIR##python2.4/lib-dynload/zlibmodule.so -/usr##LIBDIR##python2.4/linecache.py -/usr##LIBDIR##python2.4/linecache.pyo -/usr##LIBDIR##python2.4/locale.py -/usr##LIBDIR##python2.4/locale.pyo -/usr##LIBDIR##python2.4/opcode.py -/usr##LIBDIR##python2.4/opcode.pyo -/usr##LIBDIR##python2.4/os.py -/usr##LIBDIR##python2.4/os.pyo -/usr##LIBDIR##python2.4/posixpath.py -/usr##LIBDIR##python2.4/posixpath.pyo -/usr##LIBDIR##python2.4/re.py -/usr##LIBDIR##python2.4/re.pyo -/usr##LIBDIR##python2.4/site-packages/japanese/aliases/__init__.py -/usr##LIBDIR##python2.4/site-packages/japanese/aliases/__init__.pyo -/usr##LIBDIR##python2.4/site-packages/japanese/__init__.py -/usr##LIBDIR##python2.4/site-packages/japanese/__init__.pyo -/usr##LIBDIR##python2.4/site-packages/japanese.pth -/usr##LIBDIR##python2.4/site-packages/pyalchemist_python.py -/usr##LIBDIR##python2.4/site-packages/pyalchemist_python.pyo -/usr##LIBDIR##python2.4/site-packages/pyalchemist.so -/usr##LIBDIR##python2.4/site-packages/pygtk.pth -/usr##LIBDIR##python2.4/site-packages/rhpl/ethtool.so -/usr##LIBDIR##python2.4/site-packages/rhpl/gzread.py -/usr##LIBDIR##python2.4/site-packages/rhpl/gzread.pyo -/usr##LIBDIR##python2.4/site-packages/rhpl/iconv.so -/usr##LIBDIR##python2.4/site-packages/rhpl/__init__.py -/usr##LIBDIR##python2.4/site-packages/rhpl/__init__.pyo -/usr##LIBDIR##python2.4/site-packages/rhpl/translate.py -/usr##LIBDIR##python2.4/site-packages/rhpl/translate.pyo -/usr##LIBDIR##python2.4/site-packages/rhpl/_translate.so -/usr##LIBDIR##python2.4/site-packages/_xmlplus/__init__.py -/usr##LIBDIR##python2.4/site-packages/_xmlplus/__init__.pyo -/usr##LIBDIR##python2.4/site-packages/_xmlplus/utils/__init__.py -/usr##LIBDIR##python2.4/site-packages/_xmlplus/utils/__init__.pyo -/usr##LIBDIR##python2.4/site-packages/_xmlplus/utils/qp_xml.py -/usr##LIBDIR##python2.4/site-packages/_xmlplus/utils/qp_xml.pyo -/usr##LIBDIR##python2.4/site.py -/usr##LIBDIR##python2.4/site.pyo -/usr##LIBDIR##python2.4/sre_compile.py -/usr##LIBDIR##python2.4/sre_compile.pyo -/usr##LIBDIR##python2.4/sre_constants.py -/usr##LIBDIR##python2.4/sre_constants.pyo -/usr##LIBDIR##python2.4/sre_parse.py -/usr##LIBDIR##python2.4/sre_parse.pyo -/usr##LIBDIR##python2.4/sre.py -/usr##LIBDIR##python2.4/sre.pyo -/usr##LIBDIR##python2.4/stat.py -/usr##LIBDIR##python2.4/stat.pyo -/usr##LIBDIR##python2.4/string.py -/usr##LIBDIR##python2.4/string.pyo -/usr##LIBDIR##python2.4/tokenize.py -/usr##LIBDIR##python2.4/tokenize.pyo -/usr##LIBDIR##python2.4/token.py -/usr##LIBDIR##python2.4/token.pyo -/usr##LIBDIR##python2.4/types.py -/usr##LIBDIR##python2.4/types.pyo -/usr##LIBDIR##python2.4/UserDict.py -/usr##LIBDIR##python2.4/UserDict.pyo -/usr##LIBDIR##python2.4/warnings.py -/usr##LIBDIR##python2.4/warnings.pyo -/usr##LIBDIR##python2.4/xml/__init__.py -/usr##LIBDIR##python2.4/xml/__init__.pyo -/usr##LIBDIR##sasl2/libanonymous.la -/usr##LIBDIR##sasl2/libanonymous.so.2 -/usr##LIBDIR##sasl2/libcrammd5.la -/usr##LIBDIR##sasl2/libcrammd5.so.2 -/usr##LIBDIR##sasl2/libdigestmd5.la -/usr##LIBDIR##sasl2/libdigestmd5.so.2 -/usr##LIBDIR##sasl2/liblogin.la -/usr##LIBDIR##sasl2/liblogin.so.2 -/usr##LIBDIR##sasl2/libplain.la -/usr##LIBDIR##sasl2/libplain.so.2 -/usr##LIBDIR##sasl2/libsasldb.la -/usr##LIBDIR##sasl2/libsasldb.so.2 -/usr##LIBDIR##sasl2/Sendmail.conf -/usr##LIBDIR##vte/gnome-pty-helper -/usr/libexec/gcc/##ARCH##-redhat-linux/4.0.1/cc1 -/usr/libexec/gcc/##ARCH##-redhat-linux/4.0.1/collect2 +/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}/gconv/gconv-modules.cache +/usr/%{_lib}/gconv/ISO8859-1.so +/usr/%{_lib}/gtk-2.0/2.4.0/engines/libclearlooks.so +/usr/%{_lib}/gtk-2.0/2.4.0/loaders/libpixbufloader-png.so +/usr/%{_lib}/libalchemist.so.0 +/usr/%{_lib}/libart_lgpl_2.so.2 +/usr/%{_lib}/libatk-1.0.so.0 +/usr/%{_lib}/libbluetooth.so.1 +/usr/%{_lib}/libbonobo-2.so.0 +/usr/%{_lib}/libbonobo-activation.so.4 +/usr/%{_lib}/libbz2.so.1 +/usr/%{_lib}/libcrack.so.2 +/usr/%{_lib}/libcroco-0.6.so.3 +/usr/%{_lib}/libcups.so.2 +/usr/%{_lib}/libdbus-1.so.1 +/usr/%{_lib}/libdbus-glib-1.so.1 +/usr/%{_lib}/libdes425.so.3 +/usr/%{_lib}/libexpat.so.0 +/usr/%{_lib}/libfontconfig.so.1 +/usr/%{_lib}/libfreetype.so.6 +/usr/%{_lib}/libgconf-2.so.4 +/usr/%{_lib}/libgdk_pixbuf-2.0.so.0 +/usr/%{_lib}/libgdk-x11-2.0.so.0 +/usr/%{_lib}/libglib-2.0.so.0 +/usr/%{_lib}/libgmodule-2.0.so.0 +/usr/%{_lib}/libgnomecanvas-2.so.0 +/usr/%{_lib}/libgnomevfs-2.so.0 +/usr/%{_lib}/libgobject-2.0.so.0 +/usr/%{_lib}/libgsf-1.so.1 +/usr/%{_lib}/libgssapi_krb5.so.2 +/usr/%{_lib}/libgthread-2.0.so.0 +/usr/%{_lib}/libgtk-x11-2.0.so.0 +/usr/%{_lib}/libhal.so.1 +/usr/%{_lib}/libhal-storage.so.1 +/usr/%{_lib}/libhesiod.so.0 +/usr/%{_lib}/libhowl.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.2.so.7 +/usr/%{_lib}/libldap-2.2.so.7 +/usr/%{_lib}/libncurses.so.5 +/usr/%{_lib}/libORBit-2.so.0 +/usr/%{_lib}/libORBitCosNaming-2.so.0 +/usr/%{_lib}/libpango-1.0.so.0 +/usr/%{_lib}/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.4 +/usr/%{_lib}/libwrap.so.0 +/usr/%{_lib}/libxml2.so.2 +/usr/%{_lib}/libz.so.1 +/usr/%{_lib}/pango/1.4.0/modules/pango-basic-fc.so +/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/aliases.py +/usr/%{_lib}/python2.4/encodings/aliases.pyo +/usr/%{_lib}/python2.4/encodings/__init__.py +/usr/%{_lib}/python2.4/encodings/__init__.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/cPickle.so +/usr/%{_lib}/python2.4/lib-dynload/cStringIO.so +/usr/%{_lib}/python2.4/lib-dynload/grpmodule.so +/usr/%{_lib}/python2.4/lib-dynload/_localemodule.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/japanese/aliases/__init__.py +/usr/%{_lib}/python2.4/site-packages/japanese/aliases/__init__.pyo +/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.pth +/usr/%{_lib}/python2.4/site-packages/pyalchemist_python.py +/usr/%{_lib}/python2.4/site-packages/pyalchemist_python.pyo +/usr/%{_lib}/python2.4/site-packages/pyalchemist.so +/usr/%{_lib}/python2.4/site-packages/pygtk.pth +/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/__init__.py +/usr/%{_lib}/python2.4/site-packages/rhpl/__init__.pyo +/usr/%{_lib}/python2.4/site-packages/rhpl/translate.py +/usr/%{_lib}/python2.4/site-packages/rhpl/translate.pyo +/usr/%{_lib}/python2.4/site-packages/rhpl/_translate.so +/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.py +/usr/%{_lib}/python2.4/site.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/sre.py +/usr/%{_lib}/python2.4/sre.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/tokenize.py +/usr/%{_lib}/python2.4/tokenize.pyo +/usr/%{_lib}/python2.4/token.py +/usr/%{_lib}/python2.4/token.pyo +/usr/%{_lib}/python2.4/types.py +/usr/%{_lib}/python2.4/types.pyo +/usr/%{_lib}/python2.4/UserDict.py +/usr/%{_lib}/python2.4/UserDict.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/libanonymous.la +/usr/%{_lib}/sasl2/libanonymous.so.2 +/usr/%{_lib}/sasl2/libcrammd5.la +/usr/%{_lib}/sasl2/libcrammd5.so.2 +/usr/%{_lib}/sasl2/libdigestmd5.la +/usr/%{_lib}/sasl2/libdigestmd5.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}/sasl2/Sendmail.conf +/usr/%{_lib}/vte/gnome-pty-helper +/usr/libexec/gcc/%{_arch}-redhat-linux/4.0.2/cc1 +/usr/libexec/gcc/%{_arch}-redhat-linux/4.0.2/collect2 /usr/libexec/hald-addon-acpi /usr/libexec/hald-addon-storage /usr/libexec/hald-add-selinux-mount-option @@ -763,120 +764,120 @@ /usr/X11R6/bin/X /usr/X11R6/bin/xfs /usr/X11R6/bin/xrdb -/usr/X11R6##LIBDIR##libICE.so.6 -/usr/X11R6##LIBDIR##libSM.so.6 -/usr/X11R6##LIBDIR##libX11.so.6 -/usr/X11R6##LIBDIR##libXcursor.so.1 -/usr/X11R6##LIBDIR##libXext.so.6 -/usr/X11R6##LIBDIR##libXfixes.so.3 -/usr/X11R6##LIBDIR##libXfont.so.1 -/usr/X11R6##LIBDIR##libXft.so.2 -/usr/X11R6##LIBDIR##libXinerama.so.1 -/usr/X11R6##LIBDIR##libXi.so.6 -/usr/X11R6##LIBDIR##libxkbfile.so.1 -/usr/X11R6##LIBDIR##libXmuu.so.1 -/usr/X11R6##LIBDIR##libXrandr.so.2 -/usr/X11R6##LIBDIR##libXrender.so.1 -/usr/X11R6##LIBDIR##modules/drivers/apm_drv.o -/usr/X11R6##LIBDIR##modules/drivers/ark_drv.o -/usr/X11R6##LIBDIR##modules/drivers/ati_drv.o -/usr/X11R6##LIBDIR##modules/drivers/atimisc_drv.o -/usr/X11R6##LIBDIR##modules/drivers/chips_drv.o -/usr/X11R6##LIBDIR##modules/drivers/cirrus_alpine.o -/usr/X11R6##LIBDIR##modules/drivers/cirrus_drv.o -/usr/X11R6##LIBDIR##modules/drivers/cirrus_laguna.o -/usr/X11R6##LIBDIR##modules/drivers/cyrix_drv.o -/usr/X11R6##LIBDIR##modules/drivers/dummy_drv.o -/usr/X11R6##LIBDIR##modules/drivers/fbdev_drv.o -/usr/X11R6##LIBDIR##modules/drivers/glint_drv.o -/usr/X11R6##LIBDIR##modules/drivers/i128_drv.o -/usr/X11R6##LIBDIR##modules/drivers/i810_drv.o -/usr/X11R6##LIBDIR##modules/drivers/linux/v4l_drv.o -/usr/X11R6##LIBDIR##modules/drivers/mga_drv.o -/usr/X11R6##LIBDIR##modules/drivers/neomagic_drv.o -/usr/X11R6##LIBDIR##modules/drivers/nv_drv.o -/usr/X11R6##LIBDIR##modules/drivers/r128_drv.o -/usr/X11R6##LIBDIR##modules/drivers/radeon_drv.o -/usr/X11R6##LIBDIR##modules/drivers/rendition_drv.o -/usr/X11R6##LIBDIR##modules/drivers/riva128.o -/usr/X11R6##LIBDIR##modules/drivers/s3_drv.o -/usr/X11R6##LIBDIR##modules/drivers/s3virge_drv.o -/usr/X11R6##LIBDIR##modules/drivers/savage_drv.o -/usr/X11R6##LIBDIR##modules/drivers/siliconmotion_drv.o -/usr/X11R6##LIBDIR##modules/drivers/sis_drv.o -/usr/X11R6##LIBDIR##modules/drivers/tdfx_drv.o -/usr/X11R6##LIBDIR##modules/drivers/tga_drv.o -/usr/X11R6##LIBDIR##modules/drivers/trident_drv.o -/usr/X11R6##LIBDIR##modules/drivers/tseng_drv.o -/usr/X11R6##LIBDIR##modules/drivers/vesa_drv.o -/usr/X11R6##LIBDIR##modules/drivers/vga_drv.o -/usr/X11R6##LIBDIR##modules/drivers/vmware_drv.o -/usr/X11R6##LIBDIR##modules/extensions/libdbe.a -/usr/X11R6##LIBDIR##modules/extensions/libdri.a -/usr/X11R6##LIBDIR##modules/extensions/libextmod.a -/usr/X11R6##LIBDIR##modules/extensions/libGLcore.a -/usr/X11R6##LIBDIR##modules/extensions/libglx.a -/usr/X11R6##LIBDIR##modules/extensions/librecord.a -/usr/X11R6##LIBDIR##modules/extensions/libxtrap.a -/usr/X11R6##LIBDIR##modules/extensions/vnc.so -/usr/X11R6##LIBDIR##modules/fonts/libbitmap.a -/usr/X11R6##LIBDIR##modules/fonts/libfreetype.so -/usr/X11R6##LIBDIR##modules/fonts/libtype1.a -/usr/X11R6##LIBDIR##modules/input/acecad_drv.o -/usr/X11R6##LIBDIR##modules/input/aiptek_drv.o -/usr/X11R6##LIBDIR##modules/input/calcomp_drv.o -/usr/X11R6##LIBDIR##modules/input/citron_drv.o -/usr/X11R6##LIBDIR##modules/input/digitaledge_drv.o -/usr/X11R6##LIBDIR##modules/input/dmc_drv.o -/usr/X11R6##LIBDIR##modules/input/dynapro_drv.o -/usr/X11R6##LIBDIR##modules/input/elographics_drv.o -/usr/X11R6##LIBDIR##modules/input/fpit_drv.o -/usr/X11R6##LIBDIR##modules/input/hyperpen_drv.o -/usr/X11R6##LIBDIR##modules/input/js_x_drv.o -/usr/X11R6##LIBDIR##modules/input/kbd_drv.o -/usr/X11R6##LIBDIR##modules/input/keyboard_drv.o -/usr/X11R6##LIBDIR##modules/input/linux/ur98_drv.o -/usr/X11R6##LIBDIR##modules/input/magellan_drv.o -/usr/X11R6##LIBDIR##modules/input/microtouch_drv.o -/usr/X11R6##LIBDIR##modules/input/mouse_drv.o -/usr/X11R6##LIBDIR##modules/input/mutouch_drv.o -/usr/X11R6##LIBDIR##modules/input/palmax_drv.o -/usr/X11R6##LIBDIR##modules/input/penmount_drv.o -/usr/X11R6##LIBDIR##modules/input/spaceorb_drv.o -/usr/X11R6##LIBDIR##modules/input/summa_drv.o -/usr/X11R6##LIBDIR##modules/input/synaptics_drv.o -/usr/X11R6##LIBDIR##modules/input/tek4957_drv.o -/usr/X11R6##LIBDIR##modules/input/void_drv.o -/usr/X11R6##LIBDIR##modules/input/wacom_drv.o -/usr/X11R6##LIBDIR##modules/libafb.a -/usr/X11R6##LIBDIR##modules/libcfb16.a -/usr/X11R6##LIBDIR##modules/libcfb24.a -/usr/X11R6##LIBDIR##modules/libcfb32.a -/usr/X11R6##LIBDIR##modules/libcfb.a -/usr/X11R6##LIBDIR##modules/libcw.a -/usr/X11R6##LIBDIR##modules/libdamage.a -/usr/X11R6##LIBDIR##modules/libddc.a -/usr/X11R6##LIBDIR##modules/libfb.a -/usr/X11R6##LIBDIR##modules/libi2c.a -/usr/X11R6##LIBDIR##modules/libint10.a -/usr/X11R6##LIBDIR##modules/liblayer.a -/usr/X11R6##LIBDIR##modules/libmfb.a -/usr/X11R6##LIBDIR##modules/libpcidata.a -/usr/X11R6##LIBDIR##modules/librac.a -/usr/X11R6##LIBDIR##modules/libramdac.a -/usr/X11R6##LIBDIR##modules/libscanpci.a -/usr/X11R6##LIBDIR##modules/libshadow.a -/usr/X11R6##LIBDIR##modules/libvbe.a -/usr/X11R6##LIBDIR##modules/libvgahw.a -/usr/X11R6##LIBDIR##modules/libxaa.a -/usr/X11R6##LIBDIR##modules/libxf24_32bpp.a -/usr/X11R6##LIBDIR##modules/libxf4bpp.a -/usr/X11R6##LIBDIR##modules/libxf8_16bpp.a -/usr/X11R6##LIBDIR##modules/libxf8_32bpp.a -/usr/X11R6##LIBDIR##modules/linux/libdrm.a -/usr/X11R6##LIBDIR##modules/linux/libfbdevhw.a -/usr/X11R6##LIBDIR##modules/linux/libint10.a -/usr/X11R6##LIBDIR##modules/v20002d.uc +/usr/X11R6/%{_lib}/libICE.so.6 +/usr/X11R6/%{_lib}/libSM.so.6 +/usr/X11R6/%{_lib}/libX11.so.6 +/usr/X11R6/%{_lib}/libXcursor.so.1 +/usr/X11R6/%{_lib}/libXext.so.6 +/usr/X11R6/%{_lib}/libXfixes.so.3 +/usr/X11R6/%{_lib}/libXfont.so.1 +/usr/X11R6/%{_lib}/libXft.so.2 +/usr/X11R6/%{_lib}/libXinerama.so.1 +/usr/X11R6/%{_lib}/libXi.so.6 +/usr/X11R6/%{_lib}/libxkbfile.so.1 +/usr/X11R6/%{_lib}/libXmuu.so.1 +/usr/X11R6/%{_lib}/libXrandr.so.2 +/usr/X11R6/%{_lib}/libXrender.so.1 +/usr/X11R6/%{_lib}/modules/drivers/apm_drv.o +/usr/X11R6/%{_lib}/modules/drivers/ark_drv.o +/usr/X11R6/%{_lib}/modules/drivers/ati_drv.o +/usr/X11R6/%{_lib}/modules/drivers/atimisc_drv.o +/usr/X11R6/%{_lib}/modules/drivers/chips_drv.o +/usr/X11R6/%{_lib}/modules/drivers/cirrus_alpine.o +/usr/X11R6/%{_lib}/modules/drivers/cirrus_drv.o +/usr/X11R6/%{_lib}/modules/drivers/cirrus_laguna.o +/usr/X11R6/%{_lib}/modules/drivers/cyrix_drv.o +/usr/X11R6/%{_lib}/modules/drivers/dummy_drv.o +/usr/X11R6/%{_lib}/modules/drivers/fbdev_drv.o +/usr/X11R6/%{_lib}/modules/drivers/glint_drv.o +/usr/X11R6/%{_lib}/modules/drivers/i128_drv.o +/usr/X11R6/%{_lib}/modules/drivers/i810_drv.o +/usr/X11R6/%{_lib}/modules/drivers/linux/v4l_drv.o +/usr/X11R6/%{_lib}/modules/drivers/mga_drv.o +/usr/X11R6/%{_lib}/modules/drivers/neomagic_drv.o +/usr/X11R6/%{_lib}/modules/drivers/nv_drv.o +/usr/X11R6/%{_lib}/modules/drivers/r128_drv.o +/usr/X11R6/%{_lib}/modules/drivers/radeon_drv.o +/usr/X11R6/%{_lib}/modules/drivers/rendition_drv.o +/usr/X11R6/%{_lib}/modules/drivers/riva128.o +/usr/X11R6/%{_lib}/modules/drivers/s3_drv.o +/usr/X11R6/%{_lib}/modules/drivers/s3virge_drv.o +/usr/X11R6/%{_lib}/modules/drivers/savage_drv.o +/usr/X11R6/%{_lib}/modules/drivers/siliconmotion_drv.o +/usr/X11R6/%{_lib}/modules/drivers/sis_drv.o +/usr/X11R6/%{_lib}/modules/drivers/tdfx_drv.o +/usr/X11R6/%{_lib}/modules/drivers/tga_drv.o +/usr/X11R6/%{_lib}/modules/drivers/trident_drv.o +/usr/X11R6/%{_lib}/modules/drivers/tseng_drv.o +/usr/X11R6/%{_lib}/modules/drivers/vesa_drv.o +/usr/X11R6/%{_lib}/modules/drivers/vga_drv.o +/usr/X11R6/%{_lib}/modules/drivers/vmware_drv.o +/usr/X11R6/%{_lib}/modules/extensions/libdbe.a +/usr/X11R6/%{_lib}/modules/extensions/libdri.a +/usr/X11R6/%{_lib}/modules/extensions/libextmod.a +/usr/X11R6/%{_lib}/modules/extensions/libGLcore.a +/usr/X11R6/%{_lib}/modules/extensions/libglx.a +/usr/X11R6/%{_lib}/modules/extensions/librecord.a +/usr/X11R6/%{_lib}/modules/extensions/libxtrap.a +/usr/X11R6/%{_lib}/modules/extensions/vnc.so +/usr/X11R6/%{_lib}/modules/fonts/libbitmap.a +/usr/X11R6/%{_lib}/modules/fonts/libfreetype.so +/usr/X11R6/%{_lib}/modules/fonts/libtype1.a +/usr/X11R6/%{_lib}/modules/input/acecad_drv.o +/usr/X11R6/%{_lib}/modules/input/aiptek_drv.o +/usr/X11R6/%{_lib}/modules/input/calcomp_drv.o +/usr/X11R6/%{_lib}/modules/input/citron_drv.o +/usr/X11R6/%{_lib}/modules/input/digitaledge_drv.o +/usr/X11R6/%{_lib}/modules/input/dmc_drv.o +/usr/X11R6/%{_lib}/modules/input/dynapro_drv.o +/usr/X11R6/%{_lib}/modules/input/elographics_drv.o +/usr/X11R6/%{_lib}/modules/input/fpit_drv.o +/usr/X11R6/%{_lib}/modules/input/hyperpen_drv.o +/usr/X11R6/%{_lib}/modules/input/js_x_drv.o +/usr/X11R6/%{_lib}/modules/input/kbd_drv.o +/usr/X11R6/%{_lib}/modules/input/keyboard_drv.o +/usr/X11R6/%{_lib}/modules/input/linux/ur98_drv.o +/usr/X11R6/%{_lib}/modules/input/magellan_drv.o +/usr/X11R6/%{_lib}/modules/input/microtouch_drv.o +/usr/X11R6/%{_lib}/modules/input/mouse_drv.o +/usr/X11R6/%{_lib}/modules/input/mutouch_drv.o +/usr/X11R6/%{_lib}/modules/input/palmax_drv.o +/usr/X11R6/%{_lib}/modules/input/penmount_drv.o +/usr/X11R6/%{_lib}/modules/input/spaceorb_drv.o +/usr/X11R6/%{_lib}/modules/input/summa_drv.o +/usr/X11R6/%{_lib}/modules/input/synaptics_drv.o +/usr/X11R6/%{_lib}/modules/input/tek4957_drv.o +/usr/X11R6/%{_lib}/modules/input/void_drv.o +/usr/X11R6/%{_lib}/modules/input/wacom_drv.o +/usr/X11R6/%{_lib}/modules/libafb.a +/usr/X11R6/%{_lib}/modules/libcfb16.a +/usr/X11R6/%{_lib}/modules/libcfb24.a +/usr/X11R6/%{_lib}/modules/libcfb32.a +/usr/X11R6/%{_lib}/modules/libcfb.a +/usr/X11R6/%{_lib}/modules/libcw.a +/usr/X11R6/%{_lib}/modules/libdamage.a +/usr/X11R6/%{_lib}/modules/libddc.a +/usr/X11R6/%{_lib}/modules/libfb.a +/usr/X11R6/%{_lib}/modules/libi2c.a +/usr/X11R6/%{_lib}/modules/libint10.a +/usr/X11R6/%{_lib}/modules/liblayer.a +/usr/X11R6/%{_lib}/modules/libmfb.a +/usr/X11R6/%{_lib}/modules/libpcidata.a +/usr/X11R6/%{_lib}/modules/librac.a +/usr/X11R6/%{_lib}/modules/libramdac.a +/usr/X11R6/%{_lib}/modules/libscanpci.a +/usr/X11R6/%{_lib}/modules/libshadow.a +/usr/X11R6/%{_lib}/modules/libvbe.a +/usr/X11R6/%{_lib}/modules/libvgahw.a +/usr/X11R6/%{_lib}/modules/libxaa.a +/usr/X11R6/%{_lib}/modules/libxf24_32bpp.a +/usr/X11R6/%{_lib}/modules/libxf4bpp.a +/usr/X11R6/%{_lib}/modules/libxf8_16bpp.a +/usr/X11R6/%{_lib}/modules/libxf8_32bpp.a +/usr/X11R6/%{_lib}/modules/linux/libdrm.a +/usr/X11R6/%{_lib}/modules/linux/libfbdevhw.a +/usr/X11R6/%{_lib}/modules/linux/libint10.a +/usr/X11R6/%{_lib}/modules/v20002d.uc /usr/X11R6/lib/X11/fonts/100dpi/fonts.alias /usr/X11R6/lib/X11/fonts/100dpi/fonts.dir /usr/X11R6/lib/X11/fonts/75dpi/fonts.alias @@ -896,7 +897,7 @@ /usr/X11R6/lib/X11/locale/C/XLC_LOCALE /usr/X11R6/lib/X11/locale/iso8859-1/XI18N_OBJS /usr/X11R6/lib/X11/locale/iso8859-1/XLC_LOCALE -/usr/X11R6/lib/X11/locale##LIBDIR##common/xlcDef.so.2 +/usr/X11R6/lib/X11/locale/%{_lib}/common/xlcDef.so.2 /usr/X11R6/lib/X11/locale/locale.alias /usr/X11R6/lib/X11/locale/locale.dir /usr/X11R6/lib/X11/rgb.txt Index: readahead.files.in =================================================================== RCS file: /cvs/dist/rpms/readahead/FC-4/readahead.files.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- readahead.files.in 4 Aug 2005 17:29:36 -0000 1.2 +++ readahead.files.in 13 Jan 2006 09:42:28 -0000 1.3 @@ -335,7 +335,7 @@ /etc/X11/xinit/xinitrc-common /etc/X11/xinit/xinitrc.d/xinput.sh /etc/X11/Xmodmap -##LIBDIR##libgcc_s.so.1 +/%{_lib}/libgcc_s.so.1 /sbin/pam_timestamp_check /usr/bin/ainit /usr/bin/cut @@ -366,757 +366,756 @@ /usr/bin/system-config-date /usr/bin/which /usr/bin/xscreensaver -/usr##LIBDIR##bonobo/monikers/libmoniker_std_2.so -/usr##LIBDIR##bonobo/servers/Accessibility_Registry.server -/usr##LIBDIR##bonobo/servers/Bonobo_CosNaming_NamingContext.server -/usr##LIBDIR##bonobo/servers/Bonobo_Moniker_std.server -/usr##LIBDIR##bonobo/servers/Bonobo_Sample_Controls.server -/usr##LIBDIR##bonobo/servers/Bonobo_Sample_Echo.server -/usr##LIBDIR##bonobo/servers/CanvDemo.server -/usr##LIBDIR##bonobo/servers/File_Roller_Component.server -/usr##LIBDIR##bonobo/servers/GNOME_AccessxStatusApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_BattstatApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_CDPlayerApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_CharpickerApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_ClockApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_CPUFreqApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_DriveMountApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Addressbook_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Calendar_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Calendar_Importer_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_DataServer_1.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Mail_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Mail_Importers_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_Evolution_Shell_2.2.server -/usr##LIBDIR##bonobo/servers/GNOME_FishApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_GDictApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Gedit.server -/usr##LIBDIR##bonobo/servers/GNOME_GeyesApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Gok.server -/usr##LIBDIR##bonobo/servers/GNOME_GThumb_CatalogView.server -/usr##LIBDIR##bonobo/servers/GNOME_GThumb_Viewer.server -/usr##LIBDIR##bonobo/servers/GNOME_GtikApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_GtkHTML_Editor-3.6.server -/usr##LIBDIR##bonobo/servers/GNOME_GWeatherApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_KeyboardApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Magnifier.server -/usr##LIBDIR##bonobo/servers/GNOME_MailcheckApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_Media_CDDBSlave2.server -/usr##LIBDIR##bonobo/servers/gnomemeeting.server -/usr##LIBDIR##bonobo/servers/GNOME_MiniCommanderApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_MixerApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_ModemLightsApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Moniker_std.server -/usr##LIBDIR##bonobo/servers/GNOME_MultiLoadApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_NetstatusApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_NotificationAreaApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_NullApplet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_Panel.server -/usr##LIBDIR##bonobo/servers/GNOME_Panel_TrashApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Panel_WirelessApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_PilotApplet.server -/usr##LIBDIR##bonobo/servers/GNOME_Pilot_Daemon.server -/usr##LIBDIR##bonobo/servers/GNOME_RemoteDesktop.server -/usr##LIBDIR##bonobo/servers/GNOME_SettingsDaemon.server -/usr##LIBDIR##bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server -/usr##LIBDIR##bonobo/servers/GNOME_Spell.server -/usr##LIBDIR##bonobo/servers/GNOME_StickyNotesApplet.server -/usr##LIBDIR##bonobo/servers/gnome-terminal.server -/usr##LIBDIR##bonobo/servers/GNOME_VFS_Daemon.server -/usr##LIBDIR##bonobo/servers/GNOME_VFS_Moniker_std.server -/usr##LIBDIR##bonobo/servers/GNOME_Wncklet_Factory.server -/usr##LIBDIR##bonobo/servers/GNOME_Yelp.server -/usr##LIBDIR##bonobo/servers/Nautilus_shell.server -/usr##LIBDIR##evolution/2.2/components/libevolution-addressbook.so -/usr##LIBDIR##evolution/2.2/components/libevolution-calendar.so -/usr##LIBDIR##evolution/2.2/components/libevolution-mail.so -/usr##LIBDIR##evolution/2.2/libeabutil.so.0 -/usr##LIBDIR##evolution/2.2/libecontacteditor.so.0 -/usr##LIBDIR##evolution/2.2/libecontactlisteditor.so.0 -/usr##LIBDIR##evolution/2.2/libefilterbar.so.0 -/usr##LIBDIR##evolution/2.2/libemiscwidgets.so.0 -/usr##LIBDIR##evolution/2.2/libeshell.so.0 -/usr##LIBDIR##evolution/2.2/libessmime.so.0 -/usr##LIBDIR##evolution/2.2/libetimezonedialog.so.0 -/usr##LIBDIR##evolution/2.2/libeutil.so.0 -/usr##LIBDIR##evolution/2.2/libevolution-a11y.so.0 -/usr##LIBDIR##evolution/2.2/libevolution-addressbook-a11y.so.0 -/usr##LIBDIR##evolution/2.2/libevolution-calendar-a11y.so.0 -/usr##LIBDIR##evolution/2.2/libevolution-importer.so.0 -/usr##LIBDIR##evolution/2.2/libevolution-mail-importers.so.0 -/usr##LIBDIR##evolution/2.2/libevolution-smime.so.0 -/usr##LIBDIR##evolution/2.2/libevolution-widgets-a11y.so.0 -/usr##LIBDIR##evolution/2.2/libfilter.so.0 -/usr##LIBDIR##evolution/2.2/libmenus.so.0 -/usr##LIBDIR##evolution/2.2/plugins/liborg-gnome-evolution-startup-wizard.so -/usr##LIBDIR##evolution/2.2/plugins/liborg-gnome-exchange-account-settings.so -/usr##LIBDIR##evolution/2.2/plugins/liborg-gnome-gw-account-setup.so -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-addressbook-file.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-addressbook-groupwise.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-audio-inline.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-calendar-file.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-calendar-http.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-calendar-weather.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-compose-send-options.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-copy-tool.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-default-source.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-evolution-bbdb.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-evolution-startup-wizard.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-exchange-account-setup.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-gw-account-setup.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-itip-formatter.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-mail-folder-unsubscribe.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-mailing-list-actions.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-mailing-list-actions.xml -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-mail-to-task.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-mark-calendar-offline.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-new-mail-notify.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-plugin-manager.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-plugin-manager.xml -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-prefer-plain.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-save-attachments.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-save-attachments.xml -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-save-calendar.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-select-one-source.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-send-options.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-shared-folder.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-status-track.eplug -/usr##LIBDIR##evolution/2.2/plugins/org-gnome-subject-thread.eplug -/usr##LIBDIR##evolution-data-server-1.2/camel-providers/libcamelgroupwise.urls -/usr##LIBDIR##evolution-data-server-1.2/camel-providers/libcamelimap4.urls -/usr##LIBDIR##evolution-data-server-1.2/camel-providers/libcamelimap.urls -/usr##LIBDIR##evolution-data-server-1.2/camel-providers/libcamellocal.so -/usr##LIBDIR##evolution-data-server-1.2/camel-providers/libcamellocal.urls -/usr##LIBDIR##evolution-data-server-1.2/camel-providers/libcamelnntp.urls -/usr##LIBDIR##evolution-data-server-1.2/camel-providers/libcamelpop3.urls -/usr##LIBDIR##evolution-data-server-1.2/camel-providers/libcamelsendmail.urls -/usr##LIBDIR##evolution-data-server-1.2/camel-providers/libcamelsmtp.urls -/usr##LIBDIR##evolution-data-server-1.2/extensions/libebookbackendfile.so -/usr##LIBDIR##evolution-data-server-1.2/extensions/libebookbackendgroupwise.so -/usr##LIBDIR##evolution-data-server-1.2/extensions/libebookbackendldap.so -/usr##LIBDIR##evolution-data-server-1.2/extensions/libebookbackendvcf.so -/usr##LIBDIR##evolution-data-server-1.2/extensions/libecalbackendcontacts.so -/usr##LIBDIR##evolution-data-server-1.2/extensions/libecalbackendfile.so -/usr##LIBDIR##evolution-data-server-1.2/extensions/libecalbackendgroupwise.so -/usr##LIBDIR##evolution-data-server-1.2/extensions/libecalbackendhttp.so -/usr##LIBDIR##evolution-data-server-1.2/extensions/libecalbackendweather.so -/usr##LIBDIR##firefox-1.0.6/chrome/browser.jar -/usr##LIBDIR##firefox-1.0.6/chrome/chrome.rdf -/usr##LIBDIR##firefox-1.0.6/chrome/classic.jar -/usr##LIBDIR##firefox-1.0.6/chrome/en-US.jar -/usr##LIBDIR##firefox-1.0.6/chrome/help.jar -/usr##LIBDIR##firefox-1.0.6/chrome/icons/default/default.xpm -/usr##LIBDIR##firefox-1.0.6/chrome/inspector.jar -/usr##LIBDIR##firefox-1.0.6/chrome/installed-chrome.txt -/usr##LIBDIR##firefox-1.0.6/chrome/overlayinfo/browser/content/overlays.rdf -/usr##LIBDIR##firefox-1.0.6/chrome/overlayinfo/inspector/content/overlays.rdf -/usr##LIBDIR##firefox-1.0.6/chrome/toolkit.jar -/usr##LIBDIR##firefox-1.0.6/components/accessibility-atk.xpt -/usr##LIBDIR##firefox-1.0.6/components/accessibility.xpt -/usr##LIBDIR##firefox-1.0.6/components/appshell.xpt -/usr##LIBDIR##firefox-1.0.6/components/autocomplete.xpt -/usr##LIBDIR##firefox-1.0.6/components/autoconfig.xpt -/usr##LIBDIR##firefox-1.0.6/components/bookmarks.xpt -/usr##LIBDIR##firefox-1.0.6/components/caps.xpt -/usr##LIBDIR##firefox-1.0.6/components/chardet.xpt -/usr##LIBDIR##firefox-1.0.6/components/commandhandler.xpt -/usr##LIBDIR##firefox-1.0.6/components/composer.xpt -/usr##LIBDIR##firefox-1.0.6/components/compreg.dat -/usr##LIBDIR##firefox-1.0.6/components/content_base.xpt -/usr##LIBDIR##firefox-1.0.6/components/content_htmldoc.xpt -/usr##LIBDIR##firefox-1.0.6/components/content_html.xpt -/usr##LIBDIR##firefox-1.0.6/components/content_xmldoc.xpt -/usr##LIBDIR##firefox-1.0.6/components/content_xslt.xpt -/usr##LIBDIR##firefox-1.0.6/components/cookie.xpt -/usr##LIBDIR##firefox-1.0.6/components/directory.xpt -/usr##LIBDIR##firefox-1.0.6/components/docshell.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_base.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_core.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_css.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_events.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_html.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_loadsave.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_range.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_stylesheets.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_traversal.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_views.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_xbl.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_xpath.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom.xpt -/usr##LIBDIR##firefox-1.0.6/components/dom_xul.xpt -/usr##LIBDIR##firefox-1.0.6/components/downloads.xpt -/usr##LIBDIR##firefox-1.0.6/components/editor.xpt -/usr##LIBDIR##firefox-1.0.6/components/embed_base.xpt -/usr##LIBDIR##firefox-1.0.6/components/extensions.xpt -/usr##LIBDIR##firefox-1.0.6/components/exthandler.xpt -/usr##LIBDIR##firefox-1.0.6/components/fastfind.xpt -/usr##LIBDIR##firefox-1.0.6/components/filepicker.xpt -/usr##LIBDIR##firefox-1.0.6/components/find.xpt -/usr##LIBDIR##firefox-1.0.6/components/gfx.xpt -/usr##LIBDIR##firefox-1.0.6/components/helperAppDlg.xpt -/usr##LIBDIR##firefox-1.0.6/components/history.xpt -/usr##LIBDIR##firefox-1.0.6/components/htmlparser.xpt -/usr##LIBDIR##firefox-1.0.6/components/imgicon.xpt -/usr##LIBDIR##firefox-1.0.6/components/imglib2.xpt -/usr##LIBDIR##firefox-1.0.6/components.ini -/usr##LIBDIR##firefox-1.0.6/components/inspector-cmdline.js -/usr##LIBDIR##firefox-1.0.6/components/inspector.xpt -/usr##LIBDIR##firefox-1.0.6/components/intl.xpt -/usr##LIBDIR##firefox-1.0.6/components/jar.xpt -/usr##LIBDIR##firefox-1.0.6/components/jsconsole-clhandler.js -/usr##LIBDIR##firefox-1.0.6/components/jsconsole.xpt -/usr##LIBDIR##firefox-1.0.6/components/jsdservice.xpt -/usr##LIBDIR##firefox-1.0.6/components/jsurl.xpt -/usr##LIBDIR##firefox-1.0.6/components/layout_base.xpt -/usr##LIBDIR##firefox-1.0.6/components/layout_xul_tree.xpt -/usr##LIBDIR##firefox-1.0.6/components/layout_xul.xpt -/usr##LIBDIR##firefox-1.0.6/components/libaccessibility.so -/usr##LIBDIR##firefox-1.0.6/components/libappcomps.so -/usr##LIBDIR##firefox-1.0.6/components/libautoconfig.so -/usr##LIBDIR##firefox-1.0.6/components/libbrowsercomps.so -/usr##LIBDIR##firefox-1.0.6/components/libcaps.so -/usr##LIBDIR##firefox-1.0.6/components/libchrome.so -/usr##LIBDIR##firefox-1.0.6/components/libcomposer.so -/usr##LIBDIR##firefox-1.0.6/components/libcookie.so -/usr##LIBDIR##firefox-1.0.6/components/libdocshell.so -/usr##LIBDIR##firefox-1.0.6/components/libeditor.so -/usr##LIBDIR##firefox-1.0.6/components/libembedcomponents.so -/usr##LIBDIR##firefox-1.0.6/components/libfileview.so -/usr##LIBDIR##firefox-1.0.6/components/libgfx_gtk.so -/usr##LIBDIR##firefox-1.0.6/components/libgfxps.so -/usr##LIBDIR##firefox-1.0.6/components/libgklayout.so -/usr##LIBDIR##firefox-1.0.6/components/libgkplugin.so -/usr##LIBDIR##firefox-1.0.6/components/libhtmlpars.so -/usr##LIBDIR##firefox-1.0.6/components/libi18n.so -/usr##LIBDIR##firefox-1.0.6/components/libimgicon.so -/usr##LIBDIR##firefox-1.0.6/components/libimglib2.so -/usr##LIBDIR##firefox-1.0.6/components/libinspector.so -/usr##LIBDIR##firefox-1.0.6/components/libjar50.so -/usr##LIBDIR##firefox-1.0.6/components/libjsd.so -/usr##LIBDIR##firefox-1.0.6/components/libmork.so -/usr##LIBDIR##firefox-1.0.6/components/libmozfind.so -/usr##LIBDIR##firefox-1.0.6/components/libmozgnome.so -/usr##LIBDIR##firefox-1.0.6/components/libnecko2.so -/usr##LIBDIR##firefox-1.0.6/components/libnecko.so -/usr##LIBDIR##firefox-1.0.6/components/libnegotiateauth.so -/usr##LIBDIR##firefox-1.0.6/components/libnkgnomevfs.so -/usr##LIBDIR##firefox-1.0.6/components/libnsappshell.so -/usr##LIBDIR##firefox-1.0.6/components/liboji.so -/usr##LIBDIR##firefox-1.0.6/components/libpipboot.so -/usr##LIBDIR##firefox-1.0.6/components/libpipnss.so -/usr##LIBDIR##firefox-1.0.6/components/libpippki.so -/usr##LIBDIR##firefox-1.0.6/components/libpref.so -/usr##LIBDIR##firefox-1.0.6/components/librdf.so -/usr##LIBDIR##firefox-1.0.6/components/libsystem-pref.so -/usr##LIBDIR##firefox-1.0.6/components/libtoolkitcomps.so -/usr##LIBDIR##firefox-1.0.6/components/libtransformiix.so -/usr##LIBDIR##firefox-1.0.6/components/libtxmgr.so -/usr##LIBDIR##firefox-1.0.6/components/libuconv.so -/usr##LIBDIR##firefox-1.0.6/components/libucvmath.so -/usr##LIBDIR##firefox-1.0.6/components/libuniversalchardet.so -/usr##LIBDIR##firefox-1.0.6/components/libwebbrwsr.so -/usr##LIBDIR##firefox-1.0.6/components/libwebsrvcs.so -/usr##LIBDIR##firefox-1.0.6/components/libwidget_gtk2.so -/usr##LIBDIR##firefox-1.0.6/components/libxmlextras.so -/usr##LIBDIR##firefox-1.0.6/components/libxpcom_compat_c.so -/usr##LIBDIR##firefox-1.0.6/components/libxpconnect.so -/usr##LIBDIR##firefox-1.0.6/components/libxpinstall.so -/usr##LIBDIR##firefox-1.0.6/components/libxremote_client.so -/usr##LIBDIR##firefox-1.0.6/components/libxremoteservice.so -/usr##LIBDIR##firefox-1.0.6/components/locale.xpt -/usr##LIBDIR##firefox-1.0.6/components/lwbrk.xpt -/usr##LIBDIR##firefox-1.0.6/components/migration.xpt -/usr##LIBDIR##firefox-1.0.6/components/mimetype.xpt -/usr##LIBDIR##firefox-1.0.6/components/mozbrwsr.xpt -/usr##LIBDIR##firefox-1.0.6/components/mozfind.xpt -/usr##LIBDIR##firefox-1.0.6/components/mozgnome.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_about.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_cache.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_cookie.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_data.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_dns.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_file.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_ftp.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_http.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_jar.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_res.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_socket.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_strconv.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko_viewsource.xpt -/usr##LIBDIR##firefox-1.0.6/components/necko.xpt -/usr##LIBDIR##firefox-1.0.6/components/nsCloseAllWindows.js -/usr##LIBDIR##firefox-1.0.6/components/nsDictionary.js -/usr##LIBDIR##firefox-1.0.6/components/nsExtensionManager.js -/usr##LIBDIR##firefox-1.0.6/components/nsFilePicker.js -/usr##LIBDIR##firefox-1.0.6/components/nsHelperAppDlg.js -/usr##LIBDIR##firefox-1.0.6/components/nsInterfaceInfoToIDL.js -/usr##LIBDIR##firefox-1.0.6/components/nsKillAll.js -/usr##LIBDIR##firefox-1.0.6/components/nsProgressDialog.js -/usr##LIBDIR##firefox-1.0.6/components/nsProxyAutoConfig.js -/usr##LIBDIR##firefox-1.0.6/components/nsResetPref.js -/usr##LIBDIR##firefox-1.0.6/components/nsSetDefaultBrowser.js -/usr##LIBDIR##firefox-1.0.6/components/nsSidebar.js -/usr##LIBDIR##firefox-1.0.6/components/nsUpdateService.js -/usr##LIBDIR##firefox-1.0.6/components/nsXmlRpcClient.js -/usr##LIBDIR##firefox-1.0.6/components/oji.xpt -/usr##LIBDIR##firefox-1.0.6/components/passwordmgr.xpt -/usr##LIBDIR##firefox-1.0.6/components/pipboot.xpt -/usr##LIBDIR##firefox-1.0.6/components/pipnss.xpt -/usr##LIBDIR##firefox-1.0.6/components/pippki.xpt -/usr##LIBDIR##firefox-1.0.6/components/plugin.xpt -/usr##LIBDIR##firefox-1.0.6/components/prefetch.xpt -/usr##LIBDIR##firefox-1.0.6/components/pref.xpt -/usr##LIBDIR##firefox-1.0.6/components/profile.xpt -/usr##LIBDIR##firefox-1.0.6/components/progressDlg.xpt -/usr##LIBDIR##firefox-1.0.6/components/proxyObjInst.xpt -/usr##LIBDIR##firefox-1.0.6/components/rdf.xpt -/usr##LIBDIR##firefox-1.0.6/components/satchel.xpt -/usr##LIBDIR##firefox-1.0.6/components/search.xpt -/usr##LIBDIR##firefox-1.0.6/components/shellservice.xpt -/usr##LIBDIR##firefox-1.0.6/components/shistory.xpt -/usr##LIBDIR##firefox-1.0.6/components/sidebar.xpt -/usr##LIBDIR##firefox-1.0.6/components/toolkitprofile.xpt -/usr##LIBDIR##firefox-1.0.6/components/txmgr.xpt -/usr##LIBDIR##firefox-1.0.6/components/txtsvc.xpt -/usr##LIBDIR##firefox-1.0.6/components/uconv.xpt -/usr##LIBDIR##firefox-1.0.6/components/unicharutil.xpt -/usr##LIBDIR##firefox-1.0.6/components/update.xpt -/usr##LIBDIR##firefox-1.0.6/components/uriloader.xpt -/usr##LIBDIR##firefox-1.0.6/components/webBrowser_core.xpt -/usr##LIBDIR##firefox-1.0.6/components/webbrowserpersist.xpt -/usr##LIBDIR##firefox-1.0.6/components/webshell_idls.xpt -/usr##LIBDIR##firefox-1.0.6/components/websrvcs.xpt -/usr##LIBDIR##firefox-1.0.6/components/widget.xpt -/usr##LIBDIR##firefox-1.0.6/components/windowds.xpt -/usr##LIBDIR##firefox-1.0.6/components/windowwatcher.xpt -/usr##LIBDIR##firefox-1.0.6/components/xmlextras.xpt -/usr##LIBDIR##firefox-1.0.6/components/xml-rpc.xpt -/usr##LIBDIR##firefox-1.0.6/components/xpcom_base.xpt -/usr##LIBDIR##firefox-1.0.6/components/xpcom_components.xpt -/usr##LIBDIR##firefox-1.0.6/components/xpcom_ds.xpt -/usr##LIBDIR##firefox-1.0.6/components/xpcom_io.xpt -/usr##LIBDIR##firefox-1.0.6/components/xpcom_obsolete.xpt -/usr##LIBDIR##firefox-1.0.6/components/xpcom_threads.xpt -/usr##LIBDIR##firefox-1.0.6/components/xpcom_xpti.xpt -/usr##LIBDIR##firefox-1.0.6/components/xpconnect.xpt -/usr##LIBDIR##firefox-1.0.6/components/xpinstall.xpt -/usr##LIBDIR##firefox-1.0.6/components/xpti.dat -/usr##LIBDIR##firefox-1.0.6/components/xremoteservice.xpt -/usr##LIBDIR##firefox-1.0.6/components/xuldoc.xpt -/usr##LIBDIR##firefox-1.0.6/components/xultmpl.xpt -/usr##LIBDIR##firefox-1.0.6/defaults/pref/all-redhat.js -/usr##LIBDIR##firefox-1.0.6/defaults/pref/firefox.js -/usr##LIBDIR##firefox-1.0.6/defaults/pref/firefox-l10n.js -/usr##LIBDIR##firefox-1.0.6/defaults/pref/inspector.js -/usr##LIBDIR##firefox-1.0.6/extensions/Extensions.rdf -/usr##LIBDIR##firefox-1.0.6/extensions/installed-extensions-processed.txt -/usr##LIBDIR##firefox-1.0.6/firefox -/usr##LIBDIR##firefox-1.0.6/firefox-bin -/usr##LIBDIR##firefox-1.0.6/greprefs/all.js -/usr##LIBDIR##firefox-1.0.6/greprefs/all-redhat.js -/usr##LIBDIR##firefox-1.0.6/greprefs/security-prefs.js -/usr##LIBDIR##firefox-1.0.6/greprefs/xpinstall.js -/usr##LIBDIR##firefox-1.0.6/libgkgfx.so -/usr##LIBDIR##firefox-1.0.6/libgtkxtbin.so -/usr##LIBDIR##firefox-1.0.6/libjsj.so -/usr##LIBDIR##firefox-1.0.6/libmozjs.so -/usr##LIBDIR##firefox-1.0.6/libnspr4.so -/usr##LIBDIR##firefox-1.0.6/libplc4.so -/usr##LIBDIR##firefox-1.0.6/libplds4.so -/usr##LIBDIR##firefox-1.0.6/libxpcom_compat.so -/usr##LIBDIR##firefox-1.0.6/libxpcom.so -/usr##LIBDIR##firefox-1.0.6/mozilla-xremote-client -/usr##LIBDIR##firefox-1.0.6/plugins/libnullplugin.so -/usr##LIBDIR##firefox-1.0.6/res/broken-image.gif -/usr##LIBDIR##firefox-1.0.6/res/builtin/platformHTMLBindings.xml -/usr##LIBDIR##firefox-1.0.6/res/charsetalias.properties -/usr##LIBDIR##firefox-1.0.6/res/charsetData.properties -/usr##LIBDIR##firefox-1.0.6/res/fonts/pangoFontEncoding.properties -/usr##LIBDIR##firefox-1.0.6/res/forms.css -/usr##LIBDIR##firefox-1.0.6/res/html.css -/usr##LIBDIR##firefox-1.0.6/res/langGroups.properties -/usr##LIBDIR##firefox-1.0.6/res/loading-image.gif -/usr##LIBDIR##firefox-1.0.6/res/platform-forms.css -/usr##LIBDIR##firefox-1.0.6/res/quirk.css -/usr##LIBDIR##firefox-1.0.6/res/ua.css -/usr##LIBDIR##firefox-1.0.6/run-mozilla.sh -/usr##LIBDIR##firefox-1.0.6/searchplugins/amazondotcom.png -/usr##LIBDIR##firefox-1.0.6/searchplugins/amazondotcom.src -/usr##LIBDIR##firefox-1.0.6/searchplugins/creativecommons.png -/usr##LIBDIR##firefox-1.0.6/searchplugins/creativecommons.src -/usr##LIBDIR##firefox-1.0.6/searchplugins/dictionary.png -/usr##LIBDIR##firefox-1.0.6/searchplugins/dictionary.src -/usr##LIBDIR##firefox-1.0.6/searchplugins/eBay.gif -/usr##LIBDIR##firefox-1.0.6/searchplugins/eBay.src -/usr##LIBDIR##firefox-1.0.6/searchplugins/google.gif -/usr##LIBDIR##firefox-1.0.6/searchplugins/google.src -/usr##LIBDIR##firefox-1.0.6/searchplugins/yahoo.gif -/usr##LIBDIR##firefox-1.0.6/searchplugins/yahoo.src -/usr##LIBDIR##GConf/2/libgconfbackend-xml.so -/usr##LIBDIR##gconv/UTF-16.so -/usr##LIBDIR##gnome-vfs-2.0/modules/libfile.so -/usr##LIBDIR##gnome-vfs-2.0/modules/libmapping.so -/usr##LIBDIR##gstreamer-0.8/libgst1394.so -/usr##LIBDIR##gstreamer-0.8/libgstac3parse.so -/usr##LIBDIR##gstreamer-0.8/libgstadder.so -/usr##LIBDIR##gstreamer-0.8/libgstalaw.so -/usr##LIBDIR##gstreamer-0.8/libgstalphacolor.so -/usr##LIBDIR##gstreamer-0.8/libgstalpha.so -/usr##LIBDIR##gstreamer-0.8/libgstalsa.so -/usr##LIBDIR##gstreamer-0.8/libgstapetag.so -/usr##LIBDIR##gstreamer-0.8/libgstartsdsink.so -/usr##LIBDIR##gstreamer-0.8/libgstarts.so -/usr##LIBDIR##gstreamer-0.8/libgstasf.so -/usr##LIBDIR##gstreamer-0.8/libgstaudioconvert.so -/usr##LIBDIR##gstreamer-0.8/libgstaudiofile.so -/usr##LIBDIR##gstreamer-0.8/libgstaudiofilter.so -/usr##LIBDIR##gstreamer-0.8/libgstaudiorate.so -/usr##LIBDIR##gstreamer-0.8/libgstaudioscale.so -/usr##LIBDIR##gstreamer-0.8/libgstaudio.so -/usr##LIBDIR##gstreamer-0.8/libgstauparse.so -/usr##LIBDIR##gstreamer-0.8/libgstautodetect.so -/usr##LIBDIR##gstreamer-0.8/libgstavi.so -/usr##LIBDIR##gstreamer-0.8/libgstbasicgthreadscheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstbasicomegascheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstbytestream.so -/usr##LIBDIR##gstreamer-0.8/libgstcdparanoia.so -/usr##LIBDIR##gstreamer-0.8/libgstcdplayer.so -/usr##LIBDIR##gstreamer-0.8/libgstcdxaparse.so -/usr##LIBDIR##gstreamer-0.8/libgstchart.so -/usr##LIBDIR##gstreamer-0.8/libgstcolorspace.so -/usr##LIBDIR##gstreamer-0.8/libgstcutter.so -/usr##LIBDIR##gstreamer-0.8/libgstdataprotocol.so -/usr##LIBDIR##gstreamer-0.8/libgstdebug.so -/usr##LIBDIR##gstreamer-0.8/libgstdecodebin.so -/usr##LIBDIR##gstreamer-0.8/libgstdeinterlace.so -/usr##LIBDIR##gstreamer-0.8/libgstdvdec.so -/usr##LIBDIR##gstreamer-0.8/libgstdvdlpcmdec.so -/usr##LIBDIR##gstreamer-0.8/libgstefence.so -/usr##LIBDIR##gstreamer-0.8/libgsteffectv.so -/usr##LIBDIR##gstreamer-0.8/libgstelements.so -/usr##LIBDIR##gstreamer-0.8/libgstentrygthreadscheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstentryomegascheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstequalizer.so -/usr##LIBDIR##gstreamer-0.8/libgstesd.so -/usr##LIBDIR##gstreamer-0.8/libgstfairgthreadscheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstfestival.so -/usr##LIBDIR##gstreamer-0.8/libgstffmpegcolorspace.so -/usr##LIBDIR##gstreamer-0.8/libgstfilter.so -/usr##LIBDIR##gstreamer-0.8/libgstflac.so -/usr##LIBDIR##gstreamer-0.8/libgstflxdec.so -/usr##LIBDIR##gstreamer-0.8/libgstgamma.so -/usr##LIBDIR##gstreamer-0.8/libgstgconfelements.so -/usr##LIBDIR##gstreamer-0.8/libgstgdkpixbuf.so -/usr##LIBDIR##gstreamer-0.8/libgstgetbits.so -/usr##LIBDIR##gstreamer-0.8/libgstglimagesink.so -/usr##LIBDIR##gstreamer-0.8/libgstgnomevfs.so -/usr##LIBDIR##gstreamer-0.8/libgstgoom.so -/usr##LIBDIR##gstreamer-0.8/libgstidct.so -/usr##LIBDIR##gstreamer-0.8/libgstindexers.so -/usr##LIBDIR##gstreamer-0.8/libgstinterleave.so -/usr##LIBDIR##gstreamer-0.8/libgstjpeg.so -/usr##LIBDIR##gstreamer-0.8/libgstlevel.so -/usr##LIBDIR##gstreamer-0.8/libgstmatroska.so -/usr##LIBDIR##gstreamer-0.8/libgstmedian.so -/usr##LIBDIR##gstreamer-0.8/libgstmixmatrix.so -/usr##LIBDIR##gstreamer-0.8/libgstmng.so -/usr##LIBDIR##gstreamer-0.8/libgstmodplug.so -/usr##LIBDIR##gstreamer-0.8/libgstmonoscope.so -/usr##LIBDIR##gstreamer-0.8/libgstmulaw.so -/usr##LIBDIR##gstreamer-0.8/libgstmultifilesink.so -/usr##LIBDIR##gstreamer-0.8/libgstmultipart.so -/usr##LIBDIR##gstreamer-0.8/libgstnavigationtest.so -/usr##LIBDIR##gstreamer-0.8/libgstogg.so -/usr##LIBDIR##gstreamer-0.8/libgstoptgthreadscheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstoptomegascheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstoptscheduler.so -/usr##LIBDIR##gstreamer-0.8/libgstossaudio.so -/usr##LIBDIR##gstreamer-0.8/libgstoverlay.so -/usr##LIBDIR##gstreamer-0.8/libgstpassthrough.so -/usr##LIBDIR##gstreamer-0.8/libgstplaybin.so -/usr##LIBDIR##gstreamer-0.8/libgstplayondemand.so -/usr##LIBDIR##gstreamer-0.8/libgstpng.so -/usr##LIBDIR##gstreamer-0.8/libgstpuzzle.so -/usr##LIBDIR##gstreamer-0.8/libgstqtdemux.so -/usr##LIBDIR##gstreamer-0.8/libgstresample.so -/usr##LIBDIR##gstreamer-0.8/libgstrfbsrc.so -/usr##LIBDIR##gstreamer-0.8/libgstriff.so -/usr##LIBDIR##gstreamer-0.8/libgstrmdemux.so -/usr##LIBDIR##gstreamer-0.8/libgstrtjpeg.so -/usr##LIBDIR##gstreamer-0.8/libgstrtp.so -/usr##LIBDIR##gstreamer-0.8/libgstsdlvideosink.so -/usr##LIBDIR##gstreamer-0.8/libgstsilence.so -/usr##LIBDIR##gstreamer-0.8/libgstsinesrc.so -/usr##LIBDIR##gstreamer-0.8/libgstsmooth.so -/usr##LIBDIR##gstreamer-0.8/libgstsmoothwave.so -/usr##LIBDIR##gstreamer-0.8/libgstsmpte.so -/usr##LIBDIR##gstreamer-0.8/libgstsnapshot.so -/usr##LIBDIR##gstreamer-0.8/libgstspectrum.so -/usr##LIBDIR##gstreamer-0.8/libgstspeed.so -/usr##LIBDIR##gstreamer-0.8/libgstspeex.so -/usr##LIBDIR##gstreamer-0.8/libgstspider.so -/usr##LIBDIR##gstreamer-0.8/libgststereo.so -/usr##LIBDIR##gstreamer-0.8/libgstsubparse.so -/usr##LIBDIR##gstreamer-0.8/libgstswitch.so -/usr##LIBDIR##gstreamer-0.8/libgstsynaesthesia.so -/usr##LIBDIR##gstreamer-0.8/libgsttagedit.so -/usr##LIBDIR##gstreamer-0.8/libgsttcp.so -/usr##LIBDIR##gstreamer-0.8/libgsttextoverlay.so -/usr##LIBDIR##gstreamer-0.8/libgsttheora.so -/usr##LIBDIR##gstreamer-0.8/libgsttimeoverlay.so -/usr##LIBDIR##gstreamer-0.8/libgsttrm.so -/usr##LIBDIR##gstreamer-0.8/libgsttta.so -/usr##LIBDIR##gstreamer-0.8/libgsttypefindfunctions.so -/usr##LIBDIR##gstreamer-0.8/libgstudp.so -/usr##LIBDIR##gstreamer-0.8/libgstvbidec.so -/usr##LIBDIR##gstreamer-0.8/libgstvcdsrc.so -/usr##LIBDIR##gstreamer-0.8/libgstvideo4linux2.so -/usr##LIBDIR##gstreamer-0.8/libgstvideo4linux.so -/usr##LIBDIR##gstreamer-0.8/libgstvideobalance.so -/usr##LIBDIR##gstreamer-0.8/libgstvideobox.so -/usr##LIBDIR##gstreamer-0.8/libgstvideocrop.so -/usr##LIBDIR##gstreamer-0.8/libgstvideodrop.so -/usr##LIBDIR##gstreamer-0.8/libgstvideofilter.so -/usr##LIBDIR##gstreamer-0.8/libgstvideoflip.so -/usr##LIBDIR##gstreamer-0.8/libgstvideomixer.so -/usr##LIBDIR##gstreamer-0.8/libgstvideorate.so -/usr##LIBDIR##gstreamer-0.8/libgstvideoscale.so -/usr##LIBDIR##gstreamer-0.8/libgstvideo.so -/usr##LIBDIR##gstreamer-0.8/libgstvideotestsrc.so -/usr##LIBDIR##gstreamer-0.8/libgstvolenv.so -/usr##LIBDIR##gstreamer-0.8/libgstvolume.so -/usr##LIBDIR##gstreamer-0.8/libgstvorbis.so -/usr##LIBDIR##gstreamer-0.8/libgstwavenc.so -/usr##LIBDIR##gstreamer-0.8/libgstwavparse.so -/usr##LIBDIR##gstreamer-0.8/libgstximagesink.so -/usr##LIBDIR##gstreamer-0.8/libgstxvimagesink.so -/usr##LIBDIR##gstreamer-0.8/libgstxwindowlistener.so -/usr##LIBDIR##gstreamer-0.8/libgsty4menc.so -/usr##LIBDIR##gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so -/usr##LIBDIR##libaudiofile.so.0 -/usr##LIBDIR##libbeecrypt.so.6 -/usr##LIBDIR##libbonoboui-2.so.0 -/usr##LIBDIR##libcamel-1.2.so.0 -/usr##LIBDIR##libcamel-provider-1.2.so.3 -/usr##LIBDIR##libebook-1.2.so.3 -/usr##LIBDIR##libecal-1.2.so.2 -/usr##LIBDIR##libedata-book-1.2.so.2 -/usr##LIBDIR##libedata-cal-1.2.so.1 -/usr##LIBDIR##libedataserver-1.2.so.4 -/usr##LIBDIR##libedataserverui-1.2.so.4 -/usr##LIBDIR##libeel-2.so.2 -/usr##LIBDIR##libegroupwise-1.2.so.5 -/usr##LIBDIR##libelf.so.1 -/usr##LIBDIR##libesd.so.0 -/usr##LIBDIR##libexif.so.12 -/usr##LIBDIR##libfam.so.0 -/usr##LIBDIR##libgailutil.so.17 -/usr##LIBDIR##libgal-2.4.so.0 -/usr##LIBDIR##libgal-a11y-2.4.so.0 -/usr##LIBDIR##libgcrypt.so.11 -/usr##LIBDIR##libglade-2.0.so.0 -/usr##LIBDIR##libgnome-2.so.0 -/usr##LIBDIR##libgnomecups-1.0.so.1 -/usr##LIBDIR##libgnome-desktop-2.so.2 -/usr##LIBDIR##libgnome-keyring.so.0 -/usr##LIBDIR##libgnome-menu.so.0 -/usr##LIBDIR##libgnomeprint-2-2.so.0 -/usr##LIBDIR##libgnomeprintui-2-2.so.0 -/usr##LIBDIR##libgnomeui-2.so.0 -/usr##LIBDIR##libgnome-window-settings.so.1 -/usr##LIBDIR##libgnutls.so.11 -/usr##LIBDIR##libgpg-error.so.0 -/usr##LIBDIR##libgstinterfaces-0.8.so.0 -/usr##LIBDIR##libgstreamer-0.8.so.1 -/usr##LIBDIR##libgtkhtml-2.so.0 -/usr##LIBDIR##libgtkhtml-3.6.so.18 -/usr##LIBDIR##libIDL-2.so.0 -/usr##LIBDIR##libjpeg.so.62 -/usr##LIBDIR##libmetacity-private.so.0 -/usr##LIBDIR##libnautilus-extension.so.1 -/usr##LIBDIR##libnautilus-private.so.2 -/usr##LIBDIR##libneon.so.24 -/usr##LIBDIR##libnspr4.so -/usr##LIBDIR##libnss3.so -/usr##LIBDIR##libORBit-imodule-2.so.0 -/usr##LIBDIR##libpanel-applet-2.so.0 -/usr##LIBDIR##libplc4.so -/usr##LIBDIR##libplds4.so -/usr##LIBDIR##librpm-4.4.so -/usr##LIBDIR##librpmbuild-4.4.so -/usr##LIBDIR##librpmdb-4.4.so -/usr##LIBDIR##librpmio-4.4.so -/usr##LIBDIR##libsmime3.so -/usr##LIBDIR##libsoftokn3.so -/usr##LIBDIR##libsoup-2.2.so.7 -/usr##LIBDIR##libsqlite3.so.0 -/usr##LIBDIR##libssl3.so -/usr##LIBDIR##libstartup-notification-1.so.0 -/usr##LIBDIR##libstdc++.so.6 -/usr##LIBDIR##libwnck-1.so.16 -/usr##LIBDIR##libxklavier.so.10 -/usr##LIBDIR##nautilus/extensions-1.0/libnautilus-burn-extension.so -/usr##LIBDIR##nautilus/extensions-1.0/libnautilus-fileroller.so -/usr##LIBDIR##nautilus/extensions-1.0/libnautilus-fontilus.so -/usr##LIBDIR##nautilus/extensions-1.0/libnautilus-themus.so -/usr##LIBDIR##orbit-2.0/Bonobo_module.so -/usr##LIBDIR##python2.4/atexit.py -/usr##LIBDIR##python2.4/atexit.pyc -/usr##LIBDIR##python2.4/base64.py -/usr##LIBDIR##python2.4/base64.pyc -/usr##LIBDIR##python2.4/bisect.py -/usr##LIBDIR##python2.4/bisect.pyc -/usr##LIBDIR##python2.4/calendar.py -/usr##LIBDIR##python2.4/calendar.pyc -/usr##LIBDIR##python2.4/codecs.pyc -/usr##LIBDIR##python2.4/cookielib.py -/usr##LIBDIR##python2.4/cookielib.pyc -/usr##LIBDIR##python2.4/copy.pyc -/usr##LIBDIR##python2.4/copy_reg.pyc -/usr##LIBDIR##python2.4/dis.pyc -/usr##LIBDIR##python2.4/encodings/aliases.pyc -/usr##LIBDIR##python2.4/encodings/ascii.py -/usr##LIBDIR##python2.4/encodings/ascii.pyc -/usr##LIBDIR##python2.4/encodings/idna.py -/usr##LIBDIR##python2.4/encodings/idna.pyc -/usr##LIBDIR##python2.4/encodings/__init__.pyc -/usr##LIBDIR##python2.4/encodings/latin_1.pyc -/usr##LIBDIR##python2.4/encodings/utf_8.py -/usr##LIBDIR##python2.4/encodings/utf_8.pyc -/usr##LIBDIR##python2.4/fnmatch.pyc -/usr##LIBDIR##python2.4/ftplib.py -/usr##LIBDIR##python2.4/ftplib.pyc -/usr##LIBDIR##python2.4/gettext.pyc -/usr##LIBDIR##python2.4/glob.pyc -/usr##LIBDIR##python2.4/gopherlib.py -/usr##LIBDIR##python2.4/gopherlib.pyc -/usr##LIBDIR##python2.4/gzip.py -/usr##LIBDIR##python2.4/gzip.pyc -/usr##LIBDIR##python2.4/httplib.py -/usr##LIBDIR##python2.4/httplib.pyc -/usr##LIBDIR##python2.4/inspect.pyc -/usr##LIBDIR##python2.4/keyword.py -/usr##LIBDIR##python2.4/keyword.pyc -/usr##LIBDIR##python2.4/lib-dynload/arraymodule.so -/usr##LIBDIR##python2.4/lib-dynload/binascii.so -/usr##LIBDIR##python2.4/lib-dynload/_bisect.so -/usr##LIBDIR##python2.4/lib-dynload/collectionsmodule.so -/usr##LIBDIR##python2.4/lib-dynload/datetime.so -/usr##LIBDIR##python2.4/lib-dynload/fcntlmodule.so -/usr##LIBDIR##python2.4/lib-dynload/mathmodule.so -/usr##LIBDIR##python2.4/lib-dynload/md5module.so -/usr##LIBDIR##python2.4/lib-dynload/operator.so -/usr##LIBDIR##python2.4/lib-dynload/_randommodule.so -/usr##LIBDIR##python2.4/lib-dynload/selectmodule.so -/usr##LIBDIR##python2.4/lib-dynload/shamodule.so -/usr##LIBDIR##python2.4/lib-dynload/_socketmodule.so -/usr##LIBDIR##python2.4/lib-dynload/_ssl.so -/usr##LIBDIR##python2.4/lib-dynload/unicodedata.so -/usr##LIBDIR##python2.4/linecache.pyc -/usr##LIBDIR##python2.4/locale.pyc -/usr##LIBDIR##python2.4/logging/__init__.py -/usr##LIBDIR##python2.4/logging/__init__.pyc -/usr##LIBDIR##python2.4/_LWPCookieJar.py -/usr##LIBDIR##python2.4/_LWPCookieJar.pyc -/usr##LIBDIR##python2.4/mimetools.py -/usr##LIBDIR##python2.4/mimetools.pyc -/usr##LIBDIR##python2.4/mimetypes.py -/usr##LIBDIR##python2.4/mimetypes.pyc -/usr##LIBDIR##python2.4/_MozillaCookieJar.py -/usr##LIBDIR##python2.4/_MozillaCookieJar.pyc -/usr##LIBDIR##python2.4/opcode.pyc -/usr##LIBDIR##python2.4/os.pyc -/usr##LIBDIR##python2.4/popen2.py -/usr##LIBDIR##python2.4/popen2.pyc -/usr##LIBDIR##python2.4/posixpath.pyc -/usr##LIBDIR##python2.4/random.py -/usr##LIBDIR##python2.4/random.pyc -/usr##LIBDIR##python2.4/re.pyc -/usr##LIBDIR##python2.4/rfc822.py -/usr##LIBDIR##python2.4/rfc822.pyc -/usr##LIBDIR##python2.4/shelve.py -/usr##LIBDIR##python2.4/shelve.pyc -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/atk.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/bonobo/activation.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/bonobo/_bonobo.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/bonobo/__init__.py -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/bonobo/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/bonobo/ui.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnomecanvas.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnome/_gnome.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnome/__init__.py -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnome/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnome/ui.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gnomevfs.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gobject.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/glade.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/_gtk.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtkhtml2.so -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/__init__.py -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/keysyms.py -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/gtk/keysyms.pyc -/usr##LIBDIR##python2.4/site-packages/gtk-2.0/pango.so -/usr##LIBDIR##python2.4/site-packages/japanese/aliases/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/japanese/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/OpenSSL/crypto.so -/usr##LIBDIR##python2.4/site-packages/OpenSSL/__init__.py -/usr##LIBDIR##python2.4/site-packages/OpenSSL/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/OpenSSL/rand.so -/usr##LIBDIR##python2.4/site-packages/OpenSSL/SSL.so -/usr##LIBDIR##python2.4/site-packages/OpenSSL/tsafe.py -/usr##LIBDIR##python2.4/site-packages/OpenSSL/tsafe.pyc -/usr##LIBDIR##python2.4/site-packages/OpenSSL/version.py -/usr##LIBDIR##python2.4/site-packages/OpenSSL/version.pyc -/usr##LIBDIR##python2.4/site-packages/ORBit.so -/usr##LIBDIR##python2.4/site-packages/rhpl/gzread.pyc -/usr##LIBDIR##python2.4/site-packages/rhpl/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/rhpl/translate.pyc -/usr##LIBDIR##python2.4/site-packages/rpm/__init__.py -/usr##LIBDIR##python2.4/site-packages/rpm/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/rpm/_rpmmodule.so -/usr##LIBDIR##python2.4/site-packages/_xmlplus/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/_xmlplus/parsers/expat.py -/usr##LIBDIR##python2.4/site-packages/_xmlplus/parsers/expat.pyc -/usr##LIBDIR##python2.4/site-packages/_xmlplus/parsers/__init__.py -/usr##LIBDIR##python2.4/site-packages/_xmlplus/parsers/__init__.pyc -/usr##LIBDIR##python2.4/site-packages/_xmlplus/parsers/pyexpat.so -/usr##LIBDIR##python2.4/site.pyc -/usr##LIBDIR##python2.4/socket.py -/usr##LIBDIR##python2.4/socket.pyc -/usr##LIBDIR##python2.4/sre_compile.pyc -/usr##LIBDIR##python2.4/sre_constants.pyc -/usr##LIBDIR##python2.4/sre_parse.pyc -/usr##LIBDIR##python2.4/sre.pyc -/usr##LIBDIR##python2.4/stat.pyc -/usr##LIBDIR##python2.4/StringIO.py -/usr##LIBDIR##python2.4/StringIO.pyc -/usr##LIBDIR##python2.4/stringprep.py -/usr##LIBDIR##python2.4/stringprep.pyc -/usr##LIBDIR##python2.4/string.pyc -/usr##LIBDIR##python2.4/tempfile.py -/usr##LIBDIR##python2.4/tempfile.pyc -/usr##LIBDIR##python2.4/threading.py -/usr##LIBDIR##python2.4/threading.pyc -/usr##LIBDIR##python2.4/tokenize.pyc -/usr##LIBDIR##python2.4/token.pyc -/usr##LIBDIR##python2.4/traceback.py -/usr##LIBDIR##python2.4/traceback.pyc -/usr##LIBDIR##python2.4/types.pyc -/usr##LIBDIR##python2.4/urllib2.py -/usr##LIBDIR##python2.4/urllib2.pyc -/usr##LIBDIR##python2.4/urllib.py -/usr##LIBDIR##python2.4/urllib.pyc -/usr##LIBDIR##python2.4/urlparse.py -/usr##LIBDIR##python2.4/urlparse.pyc -/usr##LIBDIR##python2.4/UserDict.pyc -/usr##LIBDIR##python2.4/warnings.pyc -/usr##LIBDIR##python2.4/xml/__init__.pyc -/usr##LIBDIR##python2.4/xmlrpclib.py -/usr##LIBDIR##python2.4/xmlrpclib.pyc +/usr/%{_lib}/bonobo/monikers/libmoniker_std_2.so +/usr/%{_lib}/bonobo/servers/Accessibility_Registry.server +/usr/%{_lib}/bonobo/servers/Bonobo_CosNaming_NamingContext.server +/usr/%{_lib}/bonobo/servers/Bonobo_Moniker_std.server +/usr/%{_lib}/bonobo/servers/Bonobo_Sample_Controls.server +/usr/%{_lib}/bonobo/servers/Bonobo_Sample_Echo.server +/usr/%{_lib}/bonobo/servers/CanvDemo.server +/usr/%{_lib}/bonobo/servers/File_Roller_Component.server +/usr/%{_lib}/bonobo/servers/GNOME_AccessxStatusApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_BattstatApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_CDPlayerApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_CharpickerApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_ClockApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_CPUFreqApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_DriveMountApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Addressbook_2.2.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Addressbook_LDIF_Importer_2.2.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Addressbook_VCard_Importer_2.2.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Calendar_2.2.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_2.2.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Calendar_Importer_2.2.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_DataServer_1.2.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Mail_2.2.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Mail_Importers_2.2.server +/usr/%{_lib}/bonobo/servers/GNOME_Evolution_Shell_2.2.server +/usr/%{_lib}/bonobo/servers/GNOME_FishApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_GDictApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Gedit.server +/usr/%{_lib}/bonobo/servers/GNOME_GeyesApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Gok.server +/usr/%{_lib}/bonobo/servers/GNOME_GThumb_CatalogView.server +/usr/%{_lib}/bonobo/servers/GNOME_GThumb_Viewer.server +/usr/%{_lib}/bonobo/servers/GNOME_GtikApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_GtkHTML_Editor-3.6.server +/usr/%{_lib}/bonobo/servers/GNOME_GWeatherApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_KeyboardApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Magnifier.server +/usr/%{_lib}/bonobo/servers/GNOME_MailcheckApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_Media_CDDBSlave2.server +/usr/%{_lib}/bonobo/servers/gnomemeeting.server +/usr/%{_lib}/bonobo/servers/GNOME_MiniCommanderApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_MixerApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_ModemLightsApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Moniker_std.server +/usr/%{_lib}/bonobo/servers/GNOME_MultiLoadApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_NetstatusApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_NotificationAreaApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_NullApplet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_Panel.server +/usr/%{_lib}/bonobo/servers/GNOME_Panel_TrashApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Panel_WirelessApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_PilotApplet.server +/usr/%{_lib}/bonobo/servers/GNOME_Pilot_Daemon.server +/usr/%{_lib}/bonobo/servers/GNOME_RemoteDesktop.server +/usr/%{_lib}/bonobo/servers/GNOME_SettingsDaemon.server +/usr/%{_lib}/bonobo/servers/GNOME_Speech_SynthesisDriver_Festival.server +/usr/%{_lib}/bonobo/servers/GNOME_Spell.server +/usr/%{_lib}/bonobo/servers/GNOME_StickyNotesApplet.server +/usr/%{_lib}/bonobo/servers/gnome-terminal.server +/usr/%{_lib}/bonobo/servers/GNOME_VFS_Daemon.server +/usr/%{_lib}/bonobo/servers/GNOME_VFS_Moniker_std.server +/usr/%{_lib}/bonobo/servers/GNOME_Wncklet_Factory.server +/usr/%{_lib}/bonobo/servers/GNOME_Yelp.server +/usr/%{_lib}/bonobo/servers/Nautilus_shell.server +/usr/%{_lib}/evolution/2.2/components/libevolution-addressbook.so +/usr/%{_lib}/evolution/2.2/components/libevolution-calendar.so +/usr/%{_lib}/evolution/2.2/components/libevolution-mail.so +/usr/%{_lib}/evolution/2.2/libeabutil.so.0 +/usr/%{_lib}/evolution/2.2/libecontacteditor.so.0 +/usr/%{_lib}/evolution/2.2/libecontactlisteditor.so.0 +/usr/%{_lib}/evolution/2.2/libefilterbar.so.0 +/usr/%{_lib}/evolution/2.2/libemiscwidgets.so.0 +/usr/%{_lib}/evolution/2.2/libeshell.so.0 +/usr/%{_lib}/evolution/2.2/libessmime.so.0 +/usr/%{_lib}/evolution/2.2/libetimezonedialog.so.0 +/usr/%{_lib}/evolution/2.2/libeutil.so.0 +/usr/%{_lib}/evolution/2.2/libevolution-a11y.so.0 +/usr/%{_lib}/evolution/2.2/libevolution-addressbook-a11y.so.0 +/usr/%{_lib}/evolution/2.2/libevolution-calendar-a11y.so.0 +/usr/%{_lib}/evolution/2.2/libevolution-importer.so.0 +/usr/%{_lib}/evolution/2.2/libevolution-mail-importers.so.0 +/usr/%{_lib}/evolution/2.2/libevolution-smime.so.0 +/usr/%{_lib}/evolution/2.2/libevolution-widgets-a11y.so.0 +/usr/%{_lib}/evolution/2.2/libfilter.so.0 +/usr/%{_lib}/evolution/2.2/libmenus.so.0 +/usr/%{_lib}/evolution/2.2/plugins/liborg-gnome-evolution-startup-wizard.so +/usr/%{_lib}/evolution/2.2/plugins/liborg-gnome-exchange-account-settings.so +/usr/%{_lib}/evolution/2.2/plugins/liborg-gnome-gw-account-setup.so +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-addressbook-file.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-addressbook-groupwise.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-audio-inline.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-calendar-file.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-calendar-http.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-calendar-weather.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-compose-send-options.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-copy-tool.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-default-source.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-evolution-bbdb.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-evolution-startup-wizard.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-exchange-account-setup.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-gw-account-setup.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-itip-formatter.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-mail-folder-unsubscribe.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-mailing-list-actions.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-mailing-list-actions.xml +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-mail-to-task.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-mark-calendar-offline.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-new-mail-notify.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-plugin-manager.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-plugin-manager.xml +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-prefer-plain.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-save-attachments.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-save-attachments.xml +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-save-calendar.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-select-one-source.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-send-options.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-shared-folder.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-status-track.eplug +/usr/%{_lib}/evolution/2.2/plugins/org-gnome-subject-thread.eplug +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelgroupwise.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelimap4.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelimap.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamellocal.so +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamellocal.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelnntp.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelpop3.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelsendmail.urls +/usr/%{_lib}/evolution-data-server-1.2/camel-providers/libcamelsmtp.urls +/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendfile.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendgroupwise.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendldap.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libebookbackendvcf.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendcontacts.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendfile.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendgroupwise.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendhttp.so +/usr/%{_lib}/evolution-data-server-1.2/extensions/libecalbackendweather.so +/usr/%{_lib}/firefox-1.0.7/chrome/browser.jar +/usr/%{_lib}/firefox-1.0.7/chrome/chrome.rdf +/usr/%{_lib}/firefox-1.0.7/chrome/classic.jar +/usr/%{_lib}/firefox-1.0.7/chrome/en-US.jar +/usr/%{_lib}/firefox-1.0.7/chrome/help.jar +/usr/%{_lib}/firefox-1.0.7/chrome/icons/default/default.xpm +/usr/%{_lib}/firefox-1.0.7/chrome/inspector.jar +/usr/%{_lib}/firefox-1.0.7/chrome/installed-chrome.txt +/usr/%{_lib}/firefox-1.0.7/chrome/overlayinfo/browser/content/overlays.rdf +/usr/%{_lib}/firefox-1.0.7/chrome/overlayinfo/inspector/content/overlays.rdf +/usr/%{_lib}/firefox-1.0.7/chrome/toolkit.jar +/usr/%{_lib}/firefox-1.0.7/components/accessibility-atk.xpt +/usr/%{_lib}/firefox-1.0.7/components/accessibility.xpt +/usr/%{_lib}/firefox-1.0.7/components/appshell.xpt +/usr/%{_lib}/firefox-1.0.7/components/autocomplete.xpt +/usr/%{_lib}/firefox-1.0.7/components/autoconfig.xpt +/usr/%{_lib}/firefox-1.0.7/components/bookmarks.xpt +/usr/%{_lib}/firefox-1.0.7/components/caps.xpt +/usr/%{_lib}/firefox-1.0.7/components/chardet.xpt +/usr/%{_lib}/firefox-1.0.7/components/commandhandler.xpt +/usr/%{_lib}/firefox-1.0.7/components/composer.xpt +/usr/%{_lib}/firefox-1.0.7/components/compreg.dat +/usr/%{_lib}/firefox-1.0.7/components/content_base.xpt +/usr/%{_lib}/firefox-1.0.7/components/content_htmldoc.xpt +/usr/%{_lib}/firefox-1.0.7/components/content_html.xpt +/usr/%{_lib}/firefox-1.0.7/components/content_xmldoc.xpt +/usr/%{_lib}/firefox-1.0.7/components/content_xslt.xpt +/usr/%{_lib}/firefox-1.0.7/components/cookie.xpt +/usr/%{_lib}/firefox-1.0.7/components/directory.xpt +/usr/%{_lib}/firefox-1.0.7/components/docshell.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_base.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_core.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_css.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_events.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_html.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_loadsave.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_range.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_stylesheets.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_traversal.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_views.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_xbl.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_xpath.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom.xpt +/usr/%{_lib}/firefox-1.0.7/components/dom_xul.xpt +/usr/%{_lib}/firefox-1.0.7/components/downloads.xpt +/usr/%{_lib}/firefox-1.0.7/components/editor.xpt +/usr/%{_lib}/firefox-1.0.7/components/embed_base.xpt +/usr/%{_lib}/firefox-1.0.7/components/extensions.xpt +/usr/%{_lib}/firefox-1.0.7/components/exthandler.xpt +/usr/%{_lib}/firefox-1.0.7/components/fastfind.xpt +/usr/%{_lib}/firefox-1.0.7/components/filepicker.xpt +/usr/%{_lib}/firefox-1.0.7/components/find.xpt +/usr/%{_lib}/firefox-1.0.7/components/gfx.xpt +/usr/%{_lib}/firefox-1.0.7/components/helperAppDlg.xpt +/usr/%{_lib}/firefox-1.0.7/components/history.xpt +/usr/%{_lib}/firefox-1.0.7/components/htmlparser.xpt +/usr/%{_lib}/firefox-1.0.7/components/imgicon.xpt +/usr/%{_lib}/firefox-1.0.7/components/imglib2.xpt +/usr/%{_lib}/firefox-1.0.7/components.ini +/usr/%{_lib}/firefox-1.0.7/components/inspector-cmdline.js +/usr/%{_lib}/firefox-1.0.7/components/inspector.xpt +/usr/%{_lib}/firefox-1.0.7/components/intl.xpt +/usr/%{_lib}/firefox-1.0.7/components/jar.xpt +/usr/%{_lib}/firefox-1.0.7/components/jsconsole-clhandler.js +/usr/%{_lib}/firefox-1.0.7/components/jsconsole.xpt +/usr/%{_lib}/firefox-1.0.7/components/jsdservice.xpt +/usr/%{_lib}/firefox-1.0.7/components/jsurl.xpt +/usr/%{_lib}/firefox-1.0.7/components/layout_base.xpt +/usr/%{_lib}/firefox-1.0.7/components/layout_xul_tree.xpt +/usr/%{_lib}/firefox-1.0.7/components/layout_xul.xpt +/usr/%{_lib}/firefox-1.0.7/components/libaccessibility.so +/usr/%{_lib}/firefox-1.0.7/components/libappcomps.so +/usr/%{_lib}/firefox-1.0.7/components/libautoconfig.so +/usr/%{_lib}/firefox-1.0.7/components/libbrowsercomps.so +/usr/%{_lib}/firefox-1.0.7/components/libcaps.so +/usr/%{_lib}/firefox-1.0.7/components/libchrome.so +/usr/%{_lib}/firefox-1.0.7/components/libcomposer.so +/usr/%{_lib}/firefox-1.0.7/components/libcookie.so +/usr/%{_lib}/firefox-1.0.7/components/libdocshell.so +/usr/%{_lib}/firefox-1.0.7/components/libeditor.so +/usr/%{_lib}/firefox-1.0.7/components/libembedcomponents.so +/usr/%{_lib}/firefox-1.0.7/components/libfileview.so +/usr/%{_lib}/firefox-1.0.7/components/libgfx_gtk.so +/usr/%{_lib}/firefox-1.0.7/components/libgfxps.so +/usr/%{_lib}/firefox-1.0.7/components/libgklayout.so +/usr/%{_lib}/firefox-1.0.7/components/libgkplugin.so +/usr/%{_lib}/firefox-1.0.7/components/libhtmlpars.so +/usr/%{_lib}/firefox-1.0.7/components/libi18n.so +/usr/%{_lib}/firefox-1.0.7/components/libimgicon.so +/usr/%{_lib}/firefox-1.0.7/components/libimglib2.so +/usr/%{_lib}/firefox-1.0.7/components/libinspector.so +/usr/%{_lib}/firefox-1.0.7/components/libjar50.so +/usr/%{_lib}/firefox-1.0.7/components/libjsd.so +/usr/%{_lib}/firefox-1.0.7/components/libmork.so +/usr/%{_lib}/firefox-1.0.7/components/libmozfind.so +/usr/%{_lib}/firefox-1.0.7/components/libmozgnome.so +/usr/%{_lib}/firefox-1.0.7/components/libnecko2.so +/usr/%{_lib}/firefox-1.0.7/components/libnecko.so +/usr/%{_lib}/firefox-1.0.7/components/libnegotiateauth.so +/usr/%{_lib}/firefox-1.0.7/components/libnkgnomevfs.so +/usr/%{_lib}/firefox-1.0.7/components/libnsappshell.so +/usr/%{_lib}/firefox-1.0.7/components/liboji.so +/usr/%{_lib}/firefox-1.0.7/components/libpipboot.so +/usr/%{_lib}/firefox-1.0.7/components/libpipnss.so +/usr/%{_lib}/firefox-1.0.7/components/libpippki.so +/usr/%{_lib}/firefox-1.0.7/components/libpref.so +/usr/%{_lib}/firefox-1.0.7/components/librdf.so +/usr/%{_lib}/firefox-1.0.7/components/libsystem-pref.so +/usr/%{_lib}/firefox-1.0.7/components/libtoolkitcomps.so +/usr/%{_lib}/firefox-1.0.7/components/libtransformiix.so +/usr/%{_lib}/firefox-1.0.7/components/libtxmgr.so +/usr/%{_lib}/firefox-1.0.7/components/libuconv.so +/usr/%{_lib}/firefox-1.0.7/components/libucvmath.so +/usr/%{_lib}/firefox-1.0.7/components/libuniversalchardet.so +/usr/%{_lib}/firefox-1.0.7/components/libwebbrwsr.so +/usr/%{_lib}/firefox-1.0.7/components/libwebsrvcs.so +/usr/%{_lib}/firefox-1.0.7/components/libwidget_gtk2.so +/usr/%{_lib}/firefox-1.0.7/components/libxmlextras.so +/usr/%{_lib}/firefox-1.0.7/components/libxpcom_compat_c.so +/usr/%{_lib}/firefox-1.0.7/components/libxpconnect.so +/usr/%{_lib}/firefox-1.0.7/components/libxpinstall.so +/usr/%{_lib}/firefox-1.0.7/components/libxremote_client.so +/usr/%{_lib}/firefox-1.0.7/components/libxremoteservice.so +/usr/%{_lib}/firefox-1.0.7/components/locale.xpt +/usr/%{_lib}/firefox-1.0.7/components/lwbrk.xpt +/usr/%{_lib}/firefox-1.0.7/components/migration.xpt +/usr/%{_lib}/firefox-1.0.7/components/mimetype.xpt +/usr/%{_lib}/firefox-1.0.7/components/mozbrwsr.xpt +/usr/%{_lib}/firefox-1.0.7/components/mozfind.xpt +/usr/%{_lib}/firefox-1.0.7/components/mozgnome.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_about.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_cache.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_cookie.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_data.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_dns.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_file.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_ftp.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_http.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_jar.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_res.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_socket.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_strconv.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko_viewsource.xpt +/usr/%{_lib}/firefox-1.0.7/components/necko.xpt +/usr/%{_lib}/firefox-1.0.7/components/nsCloseAllWindows.js +/usr/%{_lib}/firefox-1.0.7/components/nsDictionary.js +/usr/%{_lib}/firefox-1.0.7/components/nsExtensionManager.js +/usr/%{_lib}/firefox-1.0.7/components/nsFilePicker.js +/usr/%{_lib}/firefox-1.0.7/components/nsHelperAppDlg.js +/usr/%{_lib}/firefox-1.0.7/components/nsInterfaceInfoToIDL.js +/usr/%{_lib}/firefox-1.0.7/components/nsKillAll.js +/usr/%{_lib}/firefox-1.0.7/components/nsProgressDialog.js +/usr/%{_lib}/firefox-1.0.7/components/nsProxyAutoConfig.js +/usr/%{_lib}/firefox-1.0.7/components/nsResetPref.js +/usr/%{_lib}/firefox-1.0.7/components/nsSetDefaultBrowser.js +/usr/%{_lib}/firefox-1.0.7/components/nsSidebar.js +/usr/%{_lib}/firefox-1.0.7/components/nsUpdateService.js +/usr/%{_lib}/firefox-1.0.7/components/nsXmlRpcClient.js +/usr/%{_lib}/firefox-1.0.7/components/oji.xpt +/usr/%{_lib}/firefox-1.0.7/components/passwordmgr.xpt +/usr/%{_lib}/firefox-1.0.7/components/pipboot.xpt +/usr/%{_lib}/firefox-1.0.7/components/pipnss.xpt +/usr/%{_lib}/firefox-1.0.7/components/pippki.xpt +/usr/%{_lib}/firefox-1.0.7/components/plugin.xpt +/usr/%{_lib}/firefox-1.0.7/components/prefetch.xpt +/usr/%{_lib}/firefox-1.0.7/components/pref.xpt +/usr/%{_lib}/firefox-1.0.7/components/profile.xpt +/usr/%{_lib}/firefox-1.0.7/components/progressDlg.xpt +/usr/%{_lib}/firefox-1.0.7/components/proxyObjInst.xpt +/usr/%{_lib}/firefox-1.0.7/components/rdf.xpt +/usr/%{_lib}/firefox-1.0.7/components/satchel.xpt +/usr/%{_lib}/firefox-1.0.7/components/search.xpt +/usr/%{_lib}/firefox-1.0.7/components/shellservice.xpt +/usr/%{_lib}/firefox-1.0.7/components/shistory.xpt +/usr/%{_lib}/firefox-1.0.7/components/sidebar.xpt +/usr/%{_lib}/firefox-1.0.7/components/toolkitprofile.xpt +/usr/%{_lib}/firefox-1.0.7/components/txmgr.xpt +/usr/%{_lib}/firefox-1.0.7/components/txtsvc.xpt +/usr/%{_lib}/firefox-1.0.7/components/uconv.xpt +/usr/%{_lib}/firefox-1.0.7/components/unicharutil.xpt +/usr/%{_lib}/firefox-1.0.7/components/update.xpt +/usr/%{_lib}/firefox-1.0.7/components/uriloader.xpt +/usr/%{_lib}/firefox-1.0.7/components/webBrowser_core.xpt +/usr/%{_lib}/firefox-1.0.7/components/webbrowserpersist.xpt +/usr/%{_lib}/firefox-1.0.7/components/webshell_idls.xpt +/usr/%{_lib}/firefox-1.0.7/components/websrvcs.xpt +/usr/%{_lib}/firefox-1.0.7/components/widget.xpt +/usr/%{_lib}/firefox-1.0.7/components/windowds.xpt +/usr/%{_lib}/firefox-1.0.7/components/windowwatcher.xpt +/usr/%{_lib}/firefox-1.0.7/components/xmlextras.xpt +/usr/%{_lib}/firefox-1.0.7/components/xml-rpc.xpt +/usr/%{_lib}/firefox-1.0.7/components/xpcom_base.xpt +/usr/%{_lib}/firefox-1.0.7/components/xpcom_components.xpt +/usr/%{_lib}/firefox-1.0.7/components/xpcom_ds.xpt +/usr/%{_lib}/firefox-1.0.7/components/xpcom_io.xpt +/usr/%{_lib}/firefox-1.0.7/components/xpcom_obsolete.xpt +/usr/%{_lib}/firefox-1.0.7/components/xpcom_threads.xpt +/usr/%{_lib}/firefox-1.0.7/components/xpcom_xpti.xpt +/usr/%{_lib}/firefox-1.0.7/components/xpconnect.xpt +/usr/%{_lib}/firefox-1.0.7/components/xpinstall.xpt +/usr/%{_lib}/firefox-1.0.7/components/xpti.dat +/usr/%{_lib}/firefox-1.0.7/components/xremoteservice.xpt +/usr/%{_lib}/firefox-1.0.7/components/xuldoc.xpt +/usr/%{_lib}/firefox-1.0.7/components/xultmpl.xpt +/usr/%{_lib}/firefox-1.0.7/defaults/pref/all-redhat.js +/usr/%{_lib}/firefox-1.0.7/defaults/pref/firefox.js +/usr/%{_lib}/firefox-1.0.7/defaults/pref/firefox-l10n.js +/usr/%{_lib}/firefox-1.0.7/defaults/pref/inspector.js +/usr/%{_lib}/firefox-1.0.7/extensions/Extensions.rdf +/usr/%{_lib}/firefox-1.0.7/extensions/installed-extensions-processed.txt +/usr/%{_lib}/firefox-1.0.7/firefox +/usr/%{_lib}/firefox-1.0.7/firefox-bin +/usr/%{_lib}/firefox-1.0.7/greprefs/all.js +/usr/%{_lib}/firefox-1.0.7/greprefs/all-redhat.js +/usr/%{_lib}/firefox-1.0.7/greprefs/security-prefs.js +/usr/%{_lib}/firefox-1.0.7/greprefs/xpinstall.js +/usr/%{_lib}/firefox-1.0.7/libgkgfx.so +/usr/%{_lib}/firefox-1.0.7/libgtkxtbin.so +/usr/%{_lib}/firefox-1.0.7/libjsj.so +/usr/%{_lib}/firefox-1.0.7/libmozjs.so +/usr/%{_lib}/firefox-1.0.7/libnspr4.so +/usr/%{_lib}/firefox-1.0.7/libplc4.so +/usr/%{_lib}/firefox-1.0.7/libplds4.so +/usr/%{_lib}/firefox-1.0.7/libxpcom_compat.so +/usr/%{_lib}/firefox-1.0.7/libxpcom.so +/usr/%{_lib}/firefox-1.0.7/mozilla-xremote-client +/usr/%{_lib}/firefox-1.0.7/plugins/libnullplugin.so +/usr/%{_lib}/firefox-1.0.7/res/broken-image.gif +/usr/%{_lib}/firefox-1.0.7/res/charsetalias.properties +/usr/%{_lib}/firefox-1.0.7/res/charsetData.properties +/usr/%{_lib}/firefox-1.0.7/res/fonts/pangoFontEncoding.properties +/usr/%{_lib}/firefox-1.0.7/res/forms.css +/usr/%{_lib}/firefox-1.0.7/res/html.css +/usr/%{_lib}/firefox-1.0.7/res/langGroups.properties +/usr/%{_lib}/firefox-1.0.7/res/loading-image.gif +/usr/%{_lib}/firefox-1.0.7/res/platform-forms.css +/usr/%{_lib}/firefox-1.0.7/res/quirk.css +/usr/%{_lib}/firefox-1.0.7/res/ua.css +/usr/%{_lib}/firefox-1.0.7/run-mozilla.sh +/usr/%{_lib}/firefox-1.0.7/searchplugins/amazondotcom.png +/usr/%{_lib}/firefox-1.0.7/searchplugins/amazondotcom.src +/usr/%{_lib}/firefox-1.0.7/searchplugins/creativecommons.png +/usr/%{_lib}/firefox-1.0.7/searchplugins/creativecommons.src +/usr/%{_lib}/firefox-1.0.7/searchplugins/dictionary.png +/usr/%{_lib}/firefox-1.0.7/searchplugins/dictionary.src +/usr/%{_lib}/firefox-1.0.7/searchplugins/eBay.gif +/usr/%{_lib}/firefox-1.0.7/searchplugins/eBay.src +/usr/%{_lib}/firefox-1.0.7/searchplugins/google.gif +/usr/%{_lib}/firefox-1.0.7/searchplugins/google.src +/usr/%{_lib}/firefox-1.0.7/searchplugins/yahoo.gif +/usr/%{_lib}/firefox-1.0.7/searchplugins/yahoo.src +/usr/%{_lib}/GConf/2/libgconfbackend-xml.so +/usr/%{_lib}/gconv/UTF-16.so +/usr/%{_lib}/gnome-vfs-2.0/modules/libfile.so +/usr/%{_lib}/gnome-vfs-2.0/modules/libmapping.so +/usr/%{_lib}/gstreamer-0.8/libgst1394.so +/usr/%{_lib}/gstreamer-0.8/libgstac3parse.so +/usr/%{_lib}/gstreamer-0.8/libgstadder.so +/usr/%{_lib}/gstreamer-0.8/libgstalaw.so +/usr/%{_lib}/gstreamer-0.8/libgstalphacolor.so +/usr/%{_lib}/gstreamer-0.8/libgstalpha.so +/usr/%{_lib}/gstreamer-0.8/libgstalsa.so +/usr/%{_lib}/gstreamer-0.8/libgstapetag.so +/usr/%{_lib}/gstreamer-0.8/libgstartsdsink.so +/usr/%{_lib}/gstreamer-0.8/libgstarts.so +/usr/%{_lib}/gstreamer-0.8/libgstasf.so +/usr/%{_lib}/gstreamer-0.8/libgstaudioconvert.so +/usr/%{_lib}/gstreamer-0.8/libgstaudiofile.so +/usr/%{_lib}/gstreamer-0.8/libgstaudiofilter.so +/usr/%{_lib}/gstreamer-0.8/libgstaudiorate.so +/usr/%{_lib}/gstreamer-0.8/libgstaudioscale.so +/usr/%{_lib}/gstreamer-0.8/libgstaudio.so +/usr/%{_lib}/gstreamer-0.8/libgstauparse.so +/usr/%{_lib}/gstreamer-0.8/libgstautodetect.so +/usr/%{_lib}/gstreamer-0.8/libgstavi.so +/usr/%{_lib}/gstreamer-0.8/libgstbasicgthreadscheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstbasicomegascheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstbytestream.so +/usr/%{_lib}/gstreamer-0.8/libgstcdparanoia.so +/usr/%{_lib}/gstreamer-0.8/libgstcdplayer.so +/usr/%{_lib}/gstreamer-0.8/libgstcdxaparse.so +/usr/%{_lib}/gstreamer-0.8/libgstchart.so +/usr/%{_lib}/gstreamer-0.8/libgstcolorspace.so +/usr/%{_lib}/gstreamer-0.8/libgstcutter.so +/usr/%{_lib}/gstreamer-0.8/libgstdataprotocol.so +/usr/%{_lib}/gstreamer-0.8/libgstdebug.so +/usr/%{_lib}/gstreamer-0.8/libgstdecodebin.so +/usr/%{_lib}/gstreamer-0.8/libgstdeinterlace.so +/usr/%{_lib}/gstreamer-0.8/libgstdvdec.so +/usr/%{_lib}/gstreamer-0.8/libgstdvdlpcmdec.so +/usr/%{_lib}/gstreamer-0.8/libgstefence.so +/usr/%{_lib}/gstreamer-0.8/libgsteffectv.so +/usr/%{_lib}/gstreamer-0.8/libgstelements.so +/usr/%{_lib}/gstreamer-0.8/libgstentrygthreadscheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstentryomegascheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstequalizer.so +/usr/%{_lib}/gstreamer-0.8/libgstesd.so +/usr/%{_lib}/gstreamer-0.8/libgstfairgthreadscheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstfestival.so +/usr/%{_lib}/gstreamer-0.8/libgstffmpegcolorspace.so +/usr/%{_lib}/gstreamer-0.8/libgstfilter.so +/usr/%{_lib}/gstreamer-0.8/libgstflac.so +/usr/%{_lib}/gstreamer-0.8/libgstflxdec.so +/usr/%{_lib}/gstreamer-0.8/libgstgamma.so +/usr/%{_lib}/gstreamer-0.8/libgstgconfelements.so +/usr/%{_lib}/gstreamer-0.8/libgstgdkpixbuf.so +/usr/%{_lib}/gstreamer-0.8/libgstgetbits.so +/usr/%{_lib}/gstreamer-0.8/libgstglimagesink.so +/usr/%{_lib}/gstreamer-0.8/libgstgnomevfs.so +/usr/%{_lib}/gstreamer-0.8/libgstgoom.so +/usr/%{_lib}/gstreamer-0.8/libgstidct.so +/usr/%{_lib}/gstreamer-0.8/libgstindexers.so +/usr/%{_lib}/gstreamer-0.8/libgstinterleave.so +/usr/%{_lib}/gstreamer-0.8/libgstjpeg.so +/usr/%{_lib}/gstreamer-0.8/libgstlevel.so +/usr/%{_lib}/gstreamer-0.8/libgstmatroska.so +/usr/%{_lib}/gstreamer-0.8/libgstmedian.so +/usr/%{_lib}/gstreamer-0.8/libgstmixmatrix.so +/usr/%{_lib}/gstreamer-0.8/libgstmng.so +/usr/%{_lib}/gstreamer-0.8/libgstmodplug.so +/usr/%{_lib}/gstreamer-0.8/libgstmonoscope.so +/usr/%{_lib}/gstreamer-0.8/libgstmulaw.so +/usr/%{_lib}/gstreamer-0.8/libgstmultifilesink.so +/usr/%{_lib}/gstreamer-0.8/libgstmultipart.so +/usr/%{_lib}/gstreamer-0.8/libgstnavigationtest.so +/usr/%{_lib}/gstreamer-0.8/libgstogg.so +/usr/%{_lib}/gstreamer-0.8/libgstoptgthreadscheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstoptomegascheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstoptscheduler.so +/usr/%{_lib}/gstreamer-0.8/libgstossaudio.so +/usr/%{_lib}/gstreamer-0.8/libgstoverlay.so +/usr/%{_lib}/gstreamer-0.8/libgstpassthrough.so +/usr/%{_lib}/gstreamer-0.8/libgstplaybin.so +/usr/%{_lib}/gstreamer-0.8/libgstplayondemand.so +/usr/%{_lib}/gstreamer-0.8/libgstpng.so +/usr/%{_lib}/gstreamer-0.8/libgstpuzzle.so +/usr/%{_lib}/gstreamer-0.8/libgstqtdemux.so +/usr/%{_lib}/gstreamer-0.8/libgstresample.so +/usr/%{_lib}/gstreamer-0.8/libgstrfbsrc.so +/usr/%{_lib}/gstreamer-0.8/libgstriff.so +/usr/%{_lib}/gstreamer-0.8/libgstrmdemux.so +/usr/%{_lib}/gstreamer-0.8/libgstrtjpeg.so +/usr/%{_lib}/gstreamer-0.8/libgstrtp.so +/usr/%{_lib}/gstreamer-0.8/libgstsdlvideosink.so +/usr/%{_lib}/gstreamer-0.8/libgstsilence.so +/usr/%{_lib}/gstreamer-0.8/libgstsinesrc.so +/usr/%{_lib}/gstreamer-0.8/libgstsmooth.so +/usr/%{_lib}/gstreamer-0.8/libgstsmoothwave.so +/usr/%{_lib}/gstreamer-0.8/libgstsmpte.so +/usr/%{_lib}/gstreamer-0.8/libgstsnapshot.so +/usr/%{_lib}/gstreamer-0.8/libgstspectrum.so +/usr/%{_lib}/gstreamer-0.8/libgstspeed.so +/usr/%{_lib}/gstreamer-0.8/libgstspeex.so +/usr/%{_lib}/gstreamer-0.8/libgstspider.so +/usr/%{_lib}/gstreamer-0.8/libgststereo.so +/usr/%{_lib}/gstreamer-0.8/libgstsubparse.so +/usr/%{_lib}/gstreamer-0.8/libgstswitch.so +/usr/%{_lib}/gstreamer-0.8/libgstsynaesthesia.so +/usr/%{_lib}/gstreamer-0.8/libgsttagedit.so +/usr/%{_lib}/gstreamer-0.8/libgsttcp.so +/usr/%{_lib}/gstreamer-0.8/libgsttextoverlay.so +/usr/%{_lib}/gstreamer-0.8/libgsttheora.so +/usr/%{_lib}/gstreamer-0.8/libgsttimeoverlay.so +/usr/%{_lib}/gstreamer-0.8/libgsttrm.so +/usr/%{_lib}/gstreamer-0.8/libgsttta.so +/usr/%{_lib}/gstreamer-0.8/libgsttypefindfunctions.so +/usr/%{_lib}/gstreamer-0.8/libgstudp.so +/usr/%{_lib}/gstreamer-0.8/libgstvbidec.so +/usr/%{_lib}/gstreamer-0.8/libgstvcdsrc.so +/usr/%{_lib}/gstreamer-0.8/libgstvideo4linux2.so +/usr/%{_lib}/gstreamer-0.8/libgstvideo4linux.so +/usr/%{_lib}/gstreamer-0.8/libgstvideobalance.so +/usr/%{_lib}/gstreamer-0.8/libgstvideobox.so +/usr/%{_lib}/gstreamer-0.8/libgstvideocrop.so +/usr/%{_lib}/gstreamer-0.8/libgstvideodrop.so +/usr/%{_lib}/gstreamer-0.8/libgstvideofilter.so +/usr/%{_lib}/gstreamer-0.8/libgstvideoflip.so +/usr/%{_lib}/gstreamer-0.8/libgstvideomixer.so +/usr/%{_lib}/gstreamer-0.8/libgstvideorate.so +/usr/%{_lib}/gstreamer-0.8/libgstvideoscale.so +/usr/%{_lib}/gstreamer-0.8/libgstvideo.so +/usr/%{_lib}/gstreamer-0.8/libgstvideotestsrc.so +/usr/%{_lib}/gstreamer-0.8/libgstvolenv.so +/usr/%{_lib}/gstreamer-0.8/libgstvolume.so +/usr/%{_lib}/gstreamer-0.8/libgstvorbis.so +/usr/%{_lib}/gstreamer-0.8/libgstwavenc.so +/usr/%{_lib}/gstreamer-0.8/libgstwavparse.so +/usr/%{_lib}/gstreamer-0.8/libgstximagesink.so +/usr/%{_lib}/gstreamer-0.8/libgstxvimagesink.so +/usr/%{_lib}/gstreamer-0.8/libgstxwindowlistener.so +/usr/%{_lib}/gstreamer-0.8/libgsty4menc.so +/usr/%{_lib}/gtk-2.0/2.4.0/loaders/libpixbufloader-xpm.so +/usr/%{_lib}/libaudiofile.so.0 +/usr/%{_lib}/libbeecrypt.so.6 +/usr/%{_lib}/libbonoboui-2.so.0 +/usr/%{_lib}/libcamel-1.2.so.0 +/usr/%{_lib}/libcamel-provider-1.2.so.3 +/usr/%{_lib}/libebook-1.2.so.3 +/usr/%{_lib}/libecal-1.2.so.2 +/usr/%{_lib}/libedata-book-1.2.so.2 +/usr/%{_lib}/libedata-cal-1.2.so.1 +/usr/%{_lib}/libedataserver-1.2.so.4 +/usr/%{_lib}/libedataserverui-1.2.so.4 +/usr/%{_lib}/libeel-2.so.2 +/usr/%{_lib}/libegroupwise-1.2.so.5 +/usr/%{_lib}/libelf.so.1 +/usr/%{_lib}/libesd.so.0 +/usr/%{_lib}/libexif.so.12 +/usr/%{_lib}/libfam.so.0 +/usr/%{_lib}/libgailutil.so.17 +/usr/%{_lib}/libgal-2.4.so.0 +/usr/%{_lib}/libgal-a11y-2.4.so.0 +/usr/%{_lib}/libgcrypt.so.11 +/usr/%{_lib}/libglade-2.0.so.0 +/usr/%{_lib}/libgnome-2.so.0 +/usr/%{_lib}/libgnomecups-1.0.so.1 +/usr/%{_lib}/libgnome-desktop-2.so.2 +/usr/%{_lib}/libgnome-keyring.so.0 +/usr/%{_lib}/libgnome-menu.so.0 +/usr/%{_lib}/libgnomeprint-2-2.so.0 +/usr/%{_lib}/libgnomeprintui-2-2.so.0 +/usr/%{_lib}/libgnomeui-2.so.0 +/usr/%{_lib}/libgnome-window-settings.so.1 +/usr/%{_lib}/libgnutls.so.11 +/usr/%{_lib}/libgpg-error.so.0 +/usr/%{_lib}/libgstinterfaces-0.8.so.0 +/usr/%{_lib}/libgstreamer-0.8.so.1 +/usr/%{_lib}/libgtkhtml-2.so.0 +/usr/%{_lib}/libgtkhtml-3.6.so.18 +/usr/%{_lib}/libIDL-2.so.0 +/usr/%{_lib}/libjpeg.so.62 +/usr/%{_lib}/libmetacity-private.so.0 +/usr/%{_lib}/libnautilus-extension.so.1 +/usr/%{_lib}/libnautilus-private.so.2 +/usr/%{_lib}/libneon.so.24 +/usr/%{_lib}/libnspr4.so +/usr/%{_lib}/libnss3.so +/usr/%{_lib}/libORBit-imodule-2.so.0 +/usr/%{_lib}/libpanel-applet-2.so.0 +/usr/%{_lib}/libplc4.so +/usr/%{_lib}/libplds4.so +/usr/%{_lib}/librpm-4.4.so +/usr/%{_lib}/librpmbuild-4.4.so +/usr/%{_lib}/librpmdb-4.4.so +/usr/%{_lib}/librpmio-4.4.so +/usr/%{_lib}/libsmime3.so +/usr/%{_lib}/libsoftokn3.so +/usr/%{_lib}/libsoup-2.2.so.7 +/usr/%{_lib}/libsqlite3.so.0 +/usr/%{_lib}/libssl3.so +/usr/%{_lib}/libstartup-notification-1.so.0 +/usr/%{_lib}/libstdc++.so.6 +/usr/%{_lib}/libwnck-1.so.16 +/usr/%{_lib}/libxklavier.so.10 +/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-burn-extension.so +/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-fileroller.so +/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-fontilus.so +/usr/%{_lib}/nautilus/extensions-1.0/libnautilus-themus.so +/usr/%{_lib}/orbit-2.0/Bonobo_module.so +/usr/%{_lib}/python2.4/atexit.py +/usr/%{_lib}/python2.4/atexit.pyc +/usr/%{_lib}/python2.4/base64.py +/usr/%{_lib}/python2.4/base64.pyc +/usr/%{_lib}/python2.4/bisect.py +/usr/%{_lib}/python2.4/bisect.pyc +/usr/%{_lib}/python2.4/calendar.py +/usr/%{_lib}/python2.4/calendar.pyc +/usr/%{_lib}/python2.4/codecs.pyc +/usr/%{_lib}/python2.4/cookielib.py +/usr/%{_lib}/python2.4/cookielib.pyc +/usr/%{_lib}/python2.4/copy.pyc +/usr/%{_lib}/python2.4/copy_reg.pyc +/usr/%{_lib}/python2.4/dis.pyc +/usr/%{_lib}/python2.4/encodings/aliases.pyc +/usr/%{_lib}/python2.4/encodings/ascii.py +/usr/%{_lib}/python2.4/encodings/ascii.pyc +/usr/%{_lib}/python2.4/encodings/idna.py +/usr/%{_lib}/python2.4/encodings/idna.pyc +/usr/%{_lib}/python2.4/encodings/__init__.pyc +/usr/%{_lib}/python2.4/encodings/latin_1.pyc +/usr/%{_lib}/python2.4/encodings/utf_8.py +/usr/%{_lib}/python2.4/encodings/utf_8.pyc +/usr/%{_lib}/python2.4/fnmatch.pyc +/usr/%{_lib}/python2.4/ftplib.py +/usr/%{_lib}/python2.4/ftplib.pyc +/usr/%{_lib}/python2.4/gettext.pyc +/usr/%{_lib}/python2.4/glob.pyc +/usr/%{_lib}/python2.4/gopherlib.py +/usr/%{_lib}/python2.4/gopherlib.pyc +/usr/%{_lib}/python2.4/gzip.py +/usr/%{_lib}/python2.4/gzip.pyc +/usr/%{_lib}/python2.4/httplib.py +/usr/%{_lib}/python2.4/httplib.pyc +/usr/%{_lib}/python2.4/inspect.pyc +/usr/%{_lib}/python2.4/keyword.py +/usr/%{_lib}/python2.4/keyword.pyc +/usr/%{_lib}/python2.4/lib-dynload/arraymodule.so +/usr/%{_lib}/python2.4/lib-dynload/binascii.so +/usr/%{_lib}/python2.4/lib-dynload/_bisect.so +/usr/%{_lib}/python2.4/lib-dynload/collectionsmodule.so +/usr/%{_lib}/python2.4/lib-dynload/datetime.so +/usr/%{_lib}/python2.4/lib-dynload/fcntlmodule.so +/usr/%{_lib}/python2.4/lib-dynload/mathmodule.so +/usr/%{_lib}/python2.4/lib-dynload/md5module.so +/usr/%{_lib}/python2.4/lib-dynload/operator.so +/usr/%{_lib}/python2.4/lib-dynload/_randommodule.so +/usr/%{_lib}/python2.4/lib-dynload/selectmodule.so +/usr/%{_lib}/python2.4/lib-dynload/shamodule.so +/usr/%{_lib}/python2.4/lib-dynload/_socketmodule.so +/usr/%{_lib}/python2.4/lib-dynload/_ssl.so +/usr/%{_lib}/python2.4/lib-dynload/unicodedata.so +/usr/%{_lib}/python2.4/linecache.pyc +/usr/%{_lib}/python2.4/locale.pyc +/usr/%{_lib}/python2.4/logging/__init__.py +/usr/%{_lib}/python2.4/logging/__init__.pyc +/usr/%{_lib}/python2.4/_LWPCookieJar.py +/usr/%{_lib}/python2.4/_LWPCookieJar.pyc +/usr/%{_lib}/python2.4/mimetools.py +/usr/%{_lib}/python2.4/mimetools.pyc +/usr/%{_lib}/python2.4/mimetypes.py +/usr/%{_lib}/python2.4/mimetypes.pyc +/usr/%{_lib}/python2.4/_MozillaCookieJar.py +/usr/%{_lib}/python2.4/_MozillaCookieJar.pyc +/usr/%{_lib}/python2.4/opcode.pyc +/usr/%{_lib}/python2.4/os.pyc +/usr/%{_lib}/python2.4/popen2.py +/usr/%{_lib}/python2.4/popen2.pyc +/usr/%{_lib}/python2.4/posixpath.pyc +/usr/%{_lib}/python2.4/random.py +/usr/%{_lib}/python2.4/random.pyc +/usr/%{_lib}/python2.4/re.pyc +/usr/%{_lib}/python2.4/rfc822.py +/usr/%{_lib}/python2.4/rfc822.pyc +/usr/%{_lib}/python2.4/shelve.py +/usr/%{_lib}/python2.4/shelve.pyc +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/atk.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/activation.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/_bonobo.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/__init__.py +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/bonobo/ui.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnomecanvas.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/_gnome.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/__init__.py +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnome/ui.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gnomevfs.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gobject.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/glade.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/_gtk.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtkhtml2.so +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/__init__.py +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/keysyms.py +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/gtk/keysyms.pyc +/usr/%{_lib}/python2.4/site-packages/gtk-2.0/pango.so +/usr/%{_lib}/python2.4/site-packages/japanese/aliases/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/japanese/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/OpenSSL/crypto.so +/usr/%{_lib}/python2.4/site-packages/OpenSSL/__init__.py +/usr/%{_lib}/python2.4/site-packages/OpenSSL/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/OpenSSL/rand.so +/usr/%{_lib}/python2.4/site-packages/OpenSSL/SSL.so +/usr/%{_lib}/python2.4/site-packages/OpenSSL/tsafe.py +/usr/%{_lib}/python2.4/site-packages/OpenSSL/tsafe.pyc +/usr/%{_lib}/python2.4/site-packages/OpenSSL/version.py +/usr/%{_lib}/python2.4/site-packages/OpenSSL/version.pyc +/usr/%{_lib}/python2.4/site-packages/ORBit.so +/usr/%{_lib}/python2.4/site-packages/rhpl/gzread.pyc +/usr/%{_lib}/python2.4/site-packages/rhpl/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/rhpl/translate.pyc +/usr/%{_lib}/python2.4/site-packages/rpm/__init__.py +/usr/%{_lib}/python2.4/site-packages/rpm/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/rpm/_rpmmodule.so +/usr/%{_lib}/python2.4/site-packages/_xmlplus/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/expat.py +/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/expat.pyc +/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/__init__.py +/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/__init__.pyc +/usr/%{_lib}/python2.4/site-packages/_xmlplus/parsers/pyexpat.so +/usr/%{_lib}/python2.4/site.pyc +/usr/%{_lib}/python2.4/socket.py +/usr/%{_lib}/python2.4/socket.pyc +/usr/%{_lib}/python2.4/sre_compile.pyc +/usr/%{_lib}/python2.4/sre_constants.pyc +/usr/%{_lib}/python2.4/sre_parse.pyc +/usr/%{_lib}/python2.4/sre.pyc +/usr/%{_lib}/python2.4/stat.pyc +/usr/%{_lib}/python2.4/StringIO.py +/usr/%{_lib}/python2.4/StringIO.pyc +/usr/%{_lib}/python2.4/stringprep.py +/usr/%{_lib}/python2.4/stringprep.pyc +/usr/%{_lib}/python2.4/string.pyc +/usr/%{_lib}/python2.4/tempfile.py +/usr/%{_lib}/python2.4/tempfile.pyc +/usr/%{_lib}/python2.4/threading.py +/usr/%{_lib}/python2.4/threading.pyc +/usr/%{_lib}/python2.4/tokenize.pyc +/usr/%{_lib}/python2.4/token.pyc +/usr/%{_lib}/python2.4/traceback.py +/usr/%{_lib}/python2.4/traceback.pyc +/usr/%{_lib}/python2.4/types.pyc +/usr/%{_lib}/python2.4/urllib2.py +/usr/%{_lib}/python2.4/urllib2.pyc +/usr/%{_lib}/python2.4/urllib.py +/usr/%{_lib}/python2.4/urllib.pyc +/usr/%{_lib}/python2.4/urlparse.py +/usr/%{_lib}/python2.4/urlparse.pyc +/usr/%{_lib}/python2.4/UserDict.pyc +/usr/%{_lib}/python2.4/warnings.pyc +/usr/%{_lib}/python2.4/xml/__init__.pyc +/usr/%{_lib}/python2.4/xmlrpclib.py +/usr/%{_lib}/python2.4/xmlrpclib.pyc /usr/libexec/bonobo-activation-server /usr/libexec/clock-applet /usr/libexec/evolution/2.2/evolution-alarm-notify @@ -1161,7 +1160,7 @@ /usr/lib/rpm/redhat/macros /usr/lib/rpm/redhat/rpmrc /usr/lib/rpm/rpmrc -/usr/lib/rpm/##ARCH##-linux/macros +/usr/lib/rpm/%{_arch}-linux/macros /usr/sbin/lpc /usr/share/applications/defaults.list /usr/share/applications/gnome-nautilus-computer.desktop @@ -1462,13 +1461,13 @@ /usr/X11R6/bin/sessreg /usr/X11R6/bin/xmodmap /usr/X11R6/bin/xsetroot -/usr/X11R6##LIBDIR##libfontenc.so.1 -/usr/X11R6##LIBDIR##libXmu.so.6 -/usr/X11R6##LIBDIR##libXRes.so.1 -/usr/X11R6##LIBDIR##libXss.so.1 -/usr/X11R6##LIBDIR##libXt.so.6 -/usr/X11R6##LIBDIR##libXxf86misc.so.1 -/usr/X11R6##LIBDIR##libXxf86vm.so.1 +/usr/X11R6/%{_lib}/libfontenc.so.1 +/usr/X11R6/%{_lib}/libXmu.so.6 +/usr/X11R6/%{_lib}/libXRes.so.1 +/usr/X11R6/%{_lib}/libXss.so.1 +/usr/X11R6/%{_lib}/libXt.so.6 +/usr/X11R6/%{_lib}/libXxf86misc.so.1 +/usr/X11R6/%{_lib}/libXxf86vm.so.1 /usr/X11R6/lib/X11/app-defaults/XScreenSaver /usr/X11R6/lib/X11/fonts/Type1/l047016t.pfa /usr/X11R6/lib/X11/fonts/Type1/l047033t.pfa Index: readahead.spec =================================================================== RCS file: /cvs/dist/rpms/readahead/FC-4/readahead.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- readahead.spec 4 Aug 2005 17:29:36 -0000 1.18 +++ readahead.spec 13 Jan 2006 09:42:28 -0000 1.19 @@ -16,7 +16,7 @@ Prereq: /sbin/chkconfig Requires: procps /bin/awk BuildPreReq: e2fsprogs-devel - +BuildRequires: pkgconfig Obsoletes: kernel-utils %description @@ -32,11 +32,11 @@ mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/etc/rc.d/init.d mkdir -p %{buildroot}/etc/sysconfig -gcc $RPM_OPT_FLAGS %{SOURCE0} -o readahead -lext2fs -lblkid +gcc $RPM_OPT_FLAGS %{SOURCE0} -o readahead `pkg-config --libs ext2fs blkid` for file in %{SOURCE2} %{SOURCE4} ; do f=${file##*/} - sed 's|##LIBDIR##|/%{_lib}/|g; s|##ARCH##|%{_arch}|g' $file > ${f%%.in} + sed 's|%%{_lib}|%{_lib}|g; s|%%{_arch}|%{_arch}|g' $file > ${f%%.in} done %install From fedora-cvs-commits at redhat.com Fri Jan 13 10:15:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 05:15:15 -0500 Subject: rpms/mono/devel .cvsignore, 1.4, 1.5 mono.spec, 1.23, 1.24 sources, 1.4, 1.5 Message-ID: <200601131015.k0DAFFgO015470@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/mono/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15429 Modified Files: .cvsignore mono.spec sources Log Message: * Fri Jan 13 2006 Alexander Larsson - 1.1.13-1 - Update to 1.13 - Add libgdiplus dep to mono-core - Add s390x to build Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mono/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Jan 2006 15:16:38 -0000 1.4 +++ .cvsignore 13 Jan 2006 10:15:09 -0000 1.5 @@ -1 +1 @@ -mono-1.1.12.1.tar.gz +mono-1.1.13.tar.gz Index: mono.spec =================================================================== RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mono.spec 9 Jan 2006 15:39:18 -0000 1.23 +++ mono.spec 13 Jan 2006 10:15:09 -0000 1.24 @@ -1,5 +1,5 @@ Name: mono -Version: 1.1.12.1 +Version: 1.1.13 Release: 1 Summary: a .NET runtime environment @@ -12,9 +12,7 @@ BuildRequires: bison, glib2-devel, pkgconfig, libicu-devel libgdiplus # JIT only availible on these: -ExclusiveArch: %ix86 x86_64 ppc ia64 s390 armv4l sparc -# Some build failure on s390x -ExcludeArch: s390x +ExclusiveArch: %ix86 x86_64 ppc ia64 s390 s390x armv4l sparc %description The Mono runtime implements a JIT engine for the ECMA CLI @@ -25,6 +23,7 @@ %package core Summary: The Mono CIL runtime, suitable for running .NET code Group: Development/Languages +Requires: libgdiplus %description core This package contains the core of the Mono runtime including its @@ -256,7 +255,7 @@ rm $RPM_BUILD_ROOT%{monodir}/1.0/cilc* rm $RPM_BUILD_ROOT/%_bindir/jay rm -r $RPM_BUILD_ROOT%{_datadir}/jay -rm $RPM_BUILD_ROOT%{_prefix}/man/man1/jay.1 +rm $RPM_BUILD_ROOT%{_mandir}/man1/jay.1 rm $RPM_BUILD_ROOT%{_mandir}/man1/monostyle.1 rm $RPM_BUILD_ROOT%{_mandir}/man1/oldmono.1 rm $RPM_BUILD_ROOT%{_mandir}/man1/mint.1 @@ -491,6 +490,11 @@ %gac_dll IBM.Data.DB2 %changelog +* Fri Jan 13 2006 Alexander Larsson - 1.1.13-1 +- Update to 1.13 +- Add libgdiplus dep to mono-core +- Add s390x to build + * Mon Jan 9 2006 Alexander Larsson - 1.1.12.1-1 - Update to 1.1.12.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/mono/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Jan 2006 15:16:38 -0000 1.4 +++ sources 13 Jan 2006 10:15:09 -0000 1.5 @@ -1 +1 @@ -1afd911a96a0032b5d1c13656a5d0369 mono-1.1.12.1.tar.gz +37fe3f191321ab7c426d57d0e1581bfe mono-1.1.13.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 13 10:32:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 05:32:57 -0500 Subject: rpms/php/devel .cvsignore, 1.24, 1.25 php.spec, 1.99, 1.100 sources, 1.25, 1.26 Message-ID: <200601131032.k0DAWvWW032753@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32714 Modified Files: .cvsignore php.spec sources Log Message: * Fri Jan 13 2006 Joe Orton 5.1.2-2 - update to 5.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/php/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 29 Nov 2005 17:08:03 -0000 1.24 +++ .cvsignore 13 Jan 2006 10:32:50 -0000 1.25 @@ -6,3 +6,4 @@ XML_Parser-1.2.7.tgz Mail-1.1.9.tgz php-5.1.1 +php-5.1.2.tar.gz Index: php.spec =================================================================== RCS file: /cvs/dist/rpms/php/devel/php.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- php.spec 5 Jan 2006 08:05:12 -0000 1.99 +++ php.spec 13 Jan 2006 10:32:50 -0000 1.100 @@ -2,8 +2,8 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php -Version: 5.1.1 -Release: 8 +Version: 5.1.2 +Release: 2 License: The PHP License Group: Development/Languages URL: http://www.php.net/ @@ -537,6 +537,9 @@ %files pdo -f files.pdo %changelog +* Fri Jan 13 2006 Joe Orton 5.1.2-2 +- update to 5.1.2 + * Thu Jan 5 2006 Joe Orton 5.1.1-8 - rebuild again Index: sources =================================================================== RCS file: /cvs/dist/rpms/php/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 29 Nov 2005 17:08:03 -0000 1.25 +++ sources 13 Jan 2006 10:32:51 -0000 1.26 @@ -1 +1 @@ -ed3d099828282e66c66cadd8d879d739 php-5.1.1.tar.gz +b5b6564e8c6a0d5bc1d2b4787480d792 php-5.1.2.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 13 10:44:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 05:44:25 -0500 Subject: rpms/php/devel php.spec,1.100,1.101 Message-ID: <200601131044.k0DAiPXL028195@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28183 Modified Files: php.spec Log Message: - adapt for changed configure argument name Index: php.spec =================================================================== RCS file: /cvs/dist/rpms/php/devel/php.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- php.spec 13 Jan 2006 10:32:50 -0000 1.100 +++ php.spec 13 Jan 2006 10:44:20 -0000 1.101 @@ -383,7 +383,7 @@ --with-snmp=shared,%{_prefix} \ --enable-soap=shared \ --with-xsl=shared,%{_prefix} \ - --with-xmlreader=shared \ + --enable-xmlreader=shared \ --enable-fastcgi \ --enable-pdo=shared \ --with-pdo-odbc=shared,unixODBC,%{_prefix} \ From fedora-cvs-commits at redhat.com Fri Jan 13 11:27:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 06:27:00 -0500 Subject: rpms/php-pear/devel php-pear-1.4.5-makerpm-cleanup.patch, NONE, 1.1 php-pear-1.4.5-makerpm-rh-namingconvs.patch, NONE, 1.1 php-pear-1.4.5-template-fixes.patch, NONE, 1.1 php-pear-1.4.5-template-postun.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 php-pear.spec, 1.6, 1.7 Message-ID: <200601131127.k0DBR01u003827@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php-pear/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3787 Modified Files: .cvsignore php-pear.spec Added Files: php-pear-1.4.5-makerpm-cleanup.patch php-pear-1.4.5-makerpm-rh-namingconvs.patch php-pear-1.4.5-template-fixes.patch php-pear-1.4.5-template-postun.patch Log Message: * Fri Dec 30 2005 Tim Jackson 1:1.4.5-6 - Patches to fix "pear makerpm" php-pear-1.4.5-makerpm-cleanup.patch: PEAR/Command/Package.php | 170 ++++++++++++++++++++++++++++++++++++++--------- data/PEAR/template.spec | 2 2 files changed, 141 insertions(+), 31 deletions(-) --- NEW FILE php-pear-1.4.5-makerpm-cleanup.patch --- --- PEAR/Command/Package.php 2005-12-23 14:23:41.000000000 +0000 +++ PEAR/Command/Package.php 2005-12-30 13:25:41.000000000 +0000 @@ -205,12 +205,29 @@ 'arg' => 'FILE', 'doc' => 'Use FILE as RPM spec file template' ), + 'rpm-release' => array( + 'shortopt' => 'r', + 'arg' => 'RELEASE', + 'doc' => 'RPM release version. Defaults to "1".' + ), 'rpm-pkgname' => array( 'shortopt' => 'p', 'arg' => 'FORMAT', - 'doc' => 'Use FORMAT as format string for RPM package name, %s is replaced -by the PEAR package name, defaults to "PEAR::%s".', + 'doc' => 'Use FORMAT as format string for RPM package name. Substitutions +are as follows: +%s = PEAR package name +%S = PEAR package name (with underscores replaced with hyphens) +%C = Channel alias +%c = Channel alias, lowercased +Defaults to "%C::%s".', ), + 'rpm-depname' => array( + 'shortopt' => 'd', + 'arg' => 'FORMAT', + 'doc' => 'Use FORMAT as format string for RPM package name. Substitutions +are as for the --rpm-pkgname option. Defaults to be the same as +the format defined by the --rpm-pkgname option.', + ), ), 'doc' => ' @@ -219,7 +236,7 @@ package tarball in the SOURCES directory: $ pear makerpm ../SOURCES/Net_Socket-1.0.tgz -Wrote RPM spec file PEAR::Net_Geo-1.0.spec +Wrote RPM spec file PEAR::Net_Socket-1.0.spec $ rpm -bb PEAR::Net_Socket-1.0.spec ... Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm @@ -736,10 +753,7 @@ /* (cox) - - TODO: - - Fill the rpm dependencies in the template file. - + IDEAS: - Instead of mapping the role to rpm vars, perhaps it's better to use directly the pear cmd to install the files by itself @@ -797,25 +811,42 @@ } $info['possible_channel'] = ''; $info['extra_config'] = ''; + if (isset($options['rpm-pkgname'])) { $rpm_pkgname_format = $options['rpm-pkgname']; } else { - if ($pf->getChannel() == 'pear.php.net' || $pf->getChannel() == 'pecl.php.net') { - $alias = 'PEAR'; - } else { - $chan = &$reg->getChannel($pf->getChannel()); - $alias = $chan->getAlias(); - $alias = strtoupper($alias); - $info['possible_channel'] = $pf->getChannel() . '/'; - } - $rpm_pkgname_format = $alias . '::%s'; + $rpm_pkgname_format = '%C::%s'; + } + + if (isset($options['rpm-depname'])) { + $rpm_depname_format = $options['rpm-depname']; + } else { + $rpm_depname_format = $rpm_pkgname_format; + } + + if (isset($options['rpm-release'])) { + $info['release'] = $options['rpm-release']; + } else { + $info['release'] = '1'; + } + + $alias = $this->_getChannelAlias($pf->getChannel(), $pf->getPackage()); + if ($alias != 'PEAR' && $alias != 'PECL') { + $info['possible_channel'] = $pf->getChannel() . '/'; } $info['extra_headers'] = ''; $info['doc_files'] = ''; $info['files'] = ''; $info['package2xml'] = ''; - $info['rpm_package'] = sprintf($rpm_pkgname_format, $pf->getPackage()); + $info['rpm_package'] = $this->_getRPMNameFromFormat($rpm_pkgname_format, $pf->getPackage(), $alias); + + // Hook to support virtual provides, where the dependency name differs + // from the package name + if ($rpm_pkgname_format != $rpm_depname_format) { + $info['extra_headers'] .= 'Provides: ' . $this->_getRPMNameFromFormat($rpm_depname_format, $pf->getPackage(), $alias) . ' = ' . $pf->getVersion(). "\n"; + } + $srcfiles = 0; foreach ($info['filelist'] as $name => $attr) { if (!isset($attr['role'])) { @@ -896,13 +927,11 @@ if ($dep['type'] != 'pkg') { continue; } - if (isset($dep['channel']) && $dep['channel'] != 'pear.php.net' && - $dep['channel'] != 'pecl.php.net') { - $chan = &$reg->getChannel($dep['channel']); - $package = strtoupper($chan->getAlias()) . '::' . $dep['name']; - } else { - $package = 'PEAR::' . $dep['name']; - } + + if (!isset($dep['channel'])) $dep['channel'] = null; + // $package contains the *dependency name* here, which may or may + // not be the same as the package name + $package = $this->_getRPMNameFromFormat($rpm_depname_format, $dep['name'], $this->_getChannelAlias($dep['channel'], $dep['name'])); $trans = array( '>' => '>', '<' => '<', @@ -940,12 +969,10 @@ $deps['required']['package'] = array($deps['required']['package']); } foreach ($deps['required']['package'] as $dep) { - if ($dep['channel'] != 'pear.php.net' && $dep['channel'] != 'pecl.php.net') { - $chan = &$reg->getChannel($dep['channel']); - $package = strtoupper($chan->getAlias()) . '::' . $dep['name']; - } else { - $package = 'PEAR::' . $dep['name']; - } + if (!isset($dep['channel'])) $dep['channel'] = null; + // $package contains the *dependency name* here, which may or may + // not be the same as the package name + $package = $this->_getRPMNameFromFormat($rpm_depname_format, $dep['name'], $this->_getChannelAlias($dep['channel'], $dep['name'])); if (isset($dep['conflicts']) && (isset($dep['min']) || isset($dep['max']))) { $deprange = array(); @@ -1082,6 +1109,89 @@ return true; } + + // }}} + // {{{ _getChannelAlias() + /* + * Return a channel alias from a channel name + * + * @param string $chan_name Channel name (e.g. 'pecl.php.net') + * @param string $package_name Optional name of the PEAR package to which $chan_name relates. + * Assists when "guessing" channel aliases for PEAR/PECL + * @return string Channel alias (e.g. 'PECL') + */ + + function _getChannelAlias($chan_name, $package_name = null) + { + switch($chan_name) { + case null: + case '': + // If channel name not supplied, it is presumably + // either PEAR or PECL. There's no sure-fire way of + // telling between the two, but we try to make an + // intelligent guess: if the package name is supplied + // and starts with a lowercase letter, it's PECL. + if (ereg('^[a-z]', $package_name)) { + $alias = 'PECL'; + } else { + $alias = 'PEAR'; + } + break; + case 'pear.php.net': + $alias = 'PEAR'; + break; + case 'pecl.php.net': + $alias = 'PECL'; + break; + default: + $reg = &$this->config->getRegistry(); + $chan = &$reg->getChannel($pf->getChannel()); + $alias = $chan->getAlias(); + $alias = strtoupper($alias); + break; + } + return $alias; + } + + // }}} + // {{{ _getRPMNameFromFormat() + + /* + * Get an RPM package or dependency name from a format string + * + * This method generates an RPM package or dependency name based on + * a format string containing substitution variables, rather like + * sprintf(). It supports the following substitution variables: + * %s = package name + * %S = package name, with underscores replaced with hyphens + * %C = channel alias + * %c = channel alias, lowercased + * + * @param string $format Format string + * @param string $pear_package_name PEAR package name (e.g. Example_Package) + * @param string $channel_alias Channel alias (e.g. 'PEAR', 'PECL') + * @return string RPM package/dependency name + */ + + function _getRPMNameFromFormat($format, $pear_package_name, $channel_alias) + { + // The package name + $name = str_replace('%s', $pear_package_name, $format); + + // The package name, with underscores replaced with hyphens + $name = str_replace('%S', str_replace('_', '-', $pear_package_name), $name); + + // The channel alias + $name = str_replace('%C', $channel_alias, $name); + + // The channel alias, lowercased + $name = str_replace('%c', strtolower($channel_alias), $name); + + return $name; + } + + // }}} + // {{{ doConvert() function doConvert($command, $options, $params) { --- data/PEAR/template.spec 2005-12-30 12:36:53.000000000 +0000 +++ data/PEAR/template.spec 2005-12-30 13:10:50.000000000 +0000 @@ -1,7 +1,7 @@ Summary: PEAR: @summary@ Name: @rpm_package@ Version: @version@ -Release: 1 +Release: @release@ License: @release_license@ Group: Development/Libraries Source: http://@master_server@/get/@package at -%{version}.tgz php-pear-1.4.5-makerpm-rh-namingconvs.patch: Package.php | 43 +++++++++++++++++++++++++++---------------- 1 files changed, 27 insertions(+), 16 deletions(-) --- NEW FILE php-pear-1.4.5-makerpm-rh-namingconvs.patch --- --- PEAR/Command/Package.php.orig 2005-12-30 13:59:44.000000000 +0000 +++ PEAR/Command/Package.php 2005-12-30 22:33:02.000000000 +0000 @@ -219,14 +219,13 @@ %S = PEAR package name (with underscores replaced with hyphens) %C = Channel alias %c = Channel alias, lowercased -Defaults to "%C::%s".', +Defaults to "php-%c-%S".', ), 'rpm-depname' => array( 'shortopt' => 'd', 'arg' => 'FORMAT', 'doc' => 'Use FORMAT as format string for RPM package name. Substitutions -are as for the --rpm-pkgname option. Defaults to be the same as -the format defined by the --rpm-pkgname option.', +are as for the --rpm-pkgname option. Defaults to "php-%c(%s)"', ), ), 'doc' => ' @@ -236,10 +235,10 @@ package tarball in the SOURCES directory: $ pear makerpm ../SOURCES/Net_Socket-1.0.tgz -Wrote RPM spec file PEAR::Net_Socket-1.0.spec -$ rpm -bb PEAR::Net_Socket-1.0.spec +Wrote RPM spec file php-pear-Net-Socket.spec +$ rpm -bb php-pear-Net-Socket.spec ... -Wrote: /usr/src/redhat/RPMS/i386/PEAR::Net_Socket-1.0-1.i386.rpm +Wrote: /usr/src/redhat/RPMS/i386/php-pear-Net-Socket-1.0-1.i386.rpm ', ), 'convert' => array( @@ -815,13 +814,13 @@ if (isset($options['rpm-pkgname'])) { $rpm_pkgname_format = $options['rpm-pkgname']; } else { - $rpm_pkgname_format = '%C::%s'; + $rpm_pkgname_format = 'php-%c-%S'; } if (isset($options['rpm-depname'])) { $rpm_depname_format = $options['rpm-depname']; } else { - $rpm_depname_format = $rpm_pkgname_format; + $rpm_depname_format = 'php-%c(%s)'; } if (isset($options['rpm-release'])) { @@ -857,7 +856,7 @@ $info['doc_files'] .= " $name"; // Map role to the rpm vars } else { - $c_prefix = '%{_libdir}/php/pear'; + $c_prefix = '%{_datadir}/pear'; switch ($attr['role']) { case 'php': $prefix = $c_prefix; @@ -924,14 +923,26 @@ if (isset($dep['optional']) && $dep['optional'] == 'yes') { continue; } - if ($dep['type'] != 'pkg') { - continue; - } - if (!isset($dep['channel'])) $dep['channel'] = null; - // $package contains the *dependency name* here, which may or may - // not be the same as the package name - $package = $this->_getRPMNameFromFormat($rpm_depname_format, $dep['name'], $this->_getChannelAlias($dep['channel'], $dep['name'])); + switch ($dep['type']) { + case 'pkg': + if (!isset($dep['channel'])) $dep['channel'] = null; + // $package contains the *dependency name* here, which may or may + // not be the same as the package name + $package = $this->_getRPMNameFromFormat($rpm_depname_format, $dep['name'], $this->_getChannelAlias($dep['channel'], $dep['name'])); + break; + case 'ext': + // This only works if all PHP extensions are either in their own + // package, and/or the main package Provides: php-[extname] for + // built-in extensions + $package = 'php-'.$dep['name']; + break; + case 'php': + $package = 'php'; + break; + default: + continue; + } $trans = array( '>' => '>', '<' => '<', php-pear-1.4.5-template-fixes.patch: template.spec | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) --- NEW FILE php-pear-1.4.5-template-fixes.patch --- This patch rolls up: - php-pear-1.4.5-rh-namingconvs.patch - php-pear-1.4.5-template-docfix.patch --- template.spec 2005-12-30 10:52:57.000000000 +0000 +++ template.spec 2005-12-30 10:58:49.000000000 +0000 @@ -1,3 +1,5 @@ +%define peardir %{_datadir}/pear + Summary: PEAR: @summary@ Name: @rpm_package@ Version: @version@ @@ -8,7 +10,6 @@ BuildRoot: %{_tmppath}/%{name}-root URL: http://@master_server@/package/@package@ Prefix: %{_prefix} -#Docdir: @doc_dir@/@package@ BuildArchitectures: @arch@ @extra_headers@ @@ -17,13 +18,14 @@ %prep rm -rf %{buildroot}/* +%setup -c -T # XXX Source files location is missing here in pear cmd pear -v -c %{buildroot}/pearrc \ - -d php_dir=%{_libdir}/php/pear \ + -d php_dir=%{peardir} \ -d doc_dir=/docs \ -d bin_dir=%{_bindir} \ - -d data_dir=%{_libdir}/php/pear/data \ - -d test_dir=%{_libdir}/php/pear/tests \ + -d data_dir=%{peardir}/data \ + -d test_dir=%{peardir}/tests \ -d ext_dir=%{_libdir} \@extra_config@ -s @@ -50,14 +52,15 @@ pear -c %{buildroot}/pearrc install --nodeps -R %{buildroot} \ $RPM_SOURCE_DIR/@package at -%{version}.tgz rm %{buildroot}/pearrc -rm %{buildroot}/%{_libdir}/php/pear/.filemap -rm %{buildroot}/%{_libdir}/php/pear/.lock -rm -rf %{buildroot}/%{_libdir}/php/pear/.registry -if [ -d "%{buildroot}/docs/@package@/doc" ]; then - rm -rf $RPM_BUILD_DIR/doc - mv %{buildroot}/docs/@package@/doc $RPM_BUILD_DIR +rm %{buildroot}/%{peardir}/.filemap +rm %{buildroot}/%{peardir}/.lock +rm -rf %{buildroot}/%{peardir}/.registry + +if [ "@doc_files@" != "" ]; then + mv %{buildroot}/docs/@package@/* . rm -rf %{buildroot}/docs fi + mkdir -p %{buildroot}@rpm_xml_dir@ tar -xzf $RPM_SOURCE_DIR/@package at -%{version}.tgz package at package2xml@.xml cp -p package at package2xml@.xml %{buildroot}@rpm_xml_dir@/@package at .xml php-pear-1.4.5-template-postun.patch: template.spec | 1 - 1 files changed, 1 deletion(-) --- NEW FILE php-pear-1.4.5-template-postun.patch --- --- template.spec 2005-12-30 12:29:18.000000000 +0000 +++ template.spec 2005-12-30 12:36:53.000000000 +0000 @@ -34,7 +34,6 @@ # if refcount = 0 then package has been removed (not upgraded) if [ "$1" -eq "0" ]; then pear uninstall --nodeps -r @possible_channel@@package@ - rm @rpm_xml_dir@/@package at .xml fi Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/php-pear/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Dec 2005 17:15:43 -0000 1.3 +++ .cvsignore 13 Jan 2006 11:26:55 -0000 1.4 @@ -1,2 +1,3 @@ XML_RPC-1.4.4.tgz install-pear-nozlib-1.4.5.phar +install-pear-nozlib-1.4.6.phar Index: php-pear.spec =================================================================== RCS file: /cvs/dist/rpms/php-pear/devel/php-pear.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- php-pear.spec 14 Dec 2005 09:06:39 -0000 1.6 +++ php-pear.spec 13 Jan 2006 11:26:56 -0000 1.7 @@ -6,7 +6,7 @@ Summary: PHP Extension and Application Repository framework Name: php-pear Version: 1.4.5 -Release: 5 +Release: 6 Epoch: 1 License: PHP Group: System @@ -18,6 +18,10 @@ Source11: pecl.sh Source12: peardev.sh Source20: XML_RPC-%{xmlrpcver}.tgz +Patch0: php-pear-1.4.5-template-fixes.patch +Patch1: php-pear-1.4.5-template-postun.patch +Patch2: php-pear-1.4.5-makerpm-cleanup.patch +Patch3: php-pear-1.4.5-makerpm-rh-namingconvs.patch BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: php >= 5.1.0-1 @@ -45,6 +49,13 @@ -b $RPM_BUILD_ROOT%{_bindir} \ %{SOURCE20} +pushd %{buildroot}%{peardir} +%{__patch} -p0 data/PEAR/template.spec %{PATCH0} +%{__patch} -p1 data/PEAR/template.spec %{PATCH1} +%{__patch} -p0 < %{PATCH2} +%{__patch} -p0 < %{PATCH3} +popd + # Replace /usr/bin/* with simple scripts: for f in pecl pear peardev; do install -m 755 $RPM_SOURCE_DIR/${f}.sh $RPM_BUILD_ROOT%{_bindir}/${f} @@ -83,6 +94,9 @@ %config %{_sysconfdir}/pear.conf %changelog +* Fri Dec 30 2005 Tim Jackson 1:1.4.5-6 +- Patches to fix "pear makerpm" + * Wed Dec 14 2005 Joe Orton 1:1.4.5-5 - set default sig_keydir to /etc/pearkeys - remove ext_dir setting from /etc/pear.conf (#175673) From fedora-cvs-commits at redhat.com Fri Jan 13 11:47:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 06:47:19 -0500 Subject: rpms/gphoto2/devel gphoto2.spec,1.46,1.47 Message-ID: <200601131147.k0DBlJcg017257@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16978 Modified Files: gphoto2.spec Log Message: - spec file clean-up - use ./print-usb-map instead Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gphoto2.spec 5 Jan 2006 14:21:31 -0000 1.46 +++ gphoto2.spec 13 Jan 2006 11:47:14 -0000 1.47 @@ -5,13 +5,13 @@ %define libpkg libgphoto2 %define libver 2.1.99 Version: %{pkgver} -Release: 1 +Release: 2 License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-root Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.bz2 Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2 -Source2: gen-libgphoto-hal-fdi +#Source2: gen-libgphoto-hal-fdi Source3: 90-gphoto-camera-policy.fdi Source4: gphoto-set-procperm Patch2: gphoto2-gcc4.patch @@ -77,8 +77,13 @@ #################################### %build pushd %{libpkg}-%{libver} -%configure --disable-rpath --enable-docs--enable-docs \ - --with-doc-dir=%{buildroot}%{_docdir}/%{name} +export CFLAGS=$RPM_OPT_FLAGS +%configure \ + --mandir=%{_mandir} \ + --libdir=%{_libdir} \ + --with-drivers=all \ + --with-doc-dir=%{_docdir}/%{name} \ + --disable-static export tagname=CC make ln -s . libgphoto2/gphoto2 @@ -93,8 +98,11 @@ -e "s,^Cflags:.*$,Cflags: -I\${includedir}/$gp_path -I\${includedir}," \ > libgphoto2.pc export PKG_CONFIG_PATH=. -export DESTDIR=%{buildroot}%{_docdir}/%{name} -%configure --enable-docs --with-doc-dir=%{buildroot}%{_docdir}/%{name} +%configure \ + --mandir=%{_mandir} \ + --libdir=%{_libdir} \ + --with-doc-dir=%{_docdir}/%{name} + export tagname=CC make @@ -105,18 +113,21 @@ pushd %{libpkg}-%{libver} export tagname=CC -%makeinstall +make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/ -LIBDIR=%{buildroot}%{_libdir} %{SOURCE2} > %{buildroot}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi - +# +#LIBDIR=%{buildroot}%{_libdir} %{SOURCE2} > %{buildroot}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi +# +export CAMLIBS=$RPM_BUILD_ROOT/%{_libdir}/%{libpkg}/%{libver} +$RPM_BUILD_ROOT/%{_libdir}/%{libpkg}/print-usb-usermap --fdi > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi popd install -d -m755 %{buildroot}/usr/share/hal/fdi/policy/20thirdparty/ install -m755 %{SOURCE3} %{buildroot}/usr/share/hal/fdi/policy/20thirdparty/90-gphoto-camera-policy.fdi export tagname=CC -%makeinstall +make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install install -d -m755 $RPM_BUILD_ROOT%{_libexecdir}/ @@ -137,11 +148,9 @@ cat libgphoto2*.lang >> %{name}.lang - #################################### %clean rm -rf "${RPM_BUILD_ROOT}" -#echo ${RPM_BUILD_ROOT} ######################################################################## # file list and installation for main package @@ -195,6 +204,10 @@ # ChangeLog ######################################################################## %changelog +* Fri Jan 13 2006 Radek Vokal 2.1.99-2 +- spec file clean-up +- use ./print-usb-map instead + * Thu Jan 05 2006 Radek Vokal 2.1.99-1 - upgrade to 2.1.99 + dbus patch From fedora-cvs-commits at redhat.com Fri Jan 13 12:27:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 07:27:15 -0500 Subject: rpms/groff/FC-4 groff-1.18.1.1-grn.patch, 1.2, 1.3 groff-1.18.1-8bit.patch, 1.2, 1.3 groff-1.18.1-fix15.patch, 1.2, 1.3 Message-ID: <200601131227.k0DCREm3013708@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv13647 Added Files: groff-1.18.1.1-grn.patch groff-1.18.1-8bit.patch groff-1.18.1-fix15.patch Log Message: undelete groff-1.18.1.1-grn.patch: hdb.cc | 1 - 1 files changed, 1 deletion(-) Index: groff-1.18.1.1-grn.patch =================================================================== RCS file: groff-1.18.1.1-grn.patch diff -N groff-1.18.1.1-grn.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ groff-1.18.1.1-grn.patch 13 Jan 2006 12:27:11 -0000 1.3 @@ -0,0 +1,10 @@ +--- groff-1.18.1.1/src/preproc/grn/hdb.cc.grn 2002-10-07 06:42:55.000000000 +0200 ++++ groff-1.18.1.1/src/preproc/grn/hdb.cc 2004-09-16 10:23:42.394486378 +0200 +@@ -115,7 +115,6 @@ + type = DBGetType(string); /* interpret element type */ + if (type < 0) { /* no more data */ + done = TRUE; +- (void) fclose(file); + } else { + #ifdef UW_FASTSCAN + (void) xscanf(file, &x, &y); /* always one point */ groff-1.18.1-8bit.patch: env.cc | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: groff-1.18.1-8bit.patch =================================================================== RCS file: groff-1.18.1-8bit.patch diff -N groff-1.18.1-8bit.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ groff-1.18.1-8bit.patch 13 Jan 2006 12:27:11 -0000 1.3 @@ -0,0 +1,17 @@ +2002-10-11 Ruslan Ermilov + + * src/roff/troff/env.cc (hyphen_trie::read_patterns_file): Add + cast to `unsigned char' to properly read patterns with 8bit + characters. + +--- groff-1.18.1/src/roff/troff/env.cc ++++ groff-1.18.1/src/roff/troff/env.cc +@@ -3924,7 +3924,7 @@ + if (i > 0) { + if (have_patterns || final_pattern || traditional) { + for (int j = 0; j < i; j++) +- buf[j] = hpf_code_table[buf[j]]; ++ buf[j] = hpf_code_table[(unsigned char)buf[j]]; + insert_pattern(buf, i, num); + final_pattern = 0; + } groff-1.18.1-fix15.patch: encoding.cc | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) Index: groff-1.18.1-fix15.patch =================================================================== RCS file: groff-1.18.1-fix15.patch diff -N groff-1.18.1-fix15.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ groff-1.18.1-fix15.patch 13 Jan 2006 12:27:11 -0000 1.3 @@ -0,0 +1,27 @@ +--- groff-1.18.1/src/libs/libgroff/encoding.cc.fix15 2004-03-08 16:13:15.825000416 +0100 ++++ groff-1.18.1/src/libs/libgroff/encoding.cc 2004-03-08 16:14:41.451983136 +0100 +@@ -384,21 +384,10 @@ + } + /* otherwise */ + #if HAVE_LANGINFO_CODESET +- charset = nl_langinfo(CODESET); +-#else +- charset = strchr(locale, '.'); +- if (charset) +- ++charset; +- else +- charset = ""; ++ locale = nl_langinfo(CODESET); + #endif +- if (strncmp(locale, "ja", 2) == 0) { +- select_input_encoding_handler(charset); +- select_output_encoding_handler(charset); +- } else if ((!device || strcmp(device, "ascii8") == 0)) { +- select_input_encoding_handler(NULL); +- select_output_encoding_handler(NULL); +- } ++ select_input_encoding_handler(locale); ++ select_output_encoding_handler(locale); + #endif + return; + } From fedora-cvs-commits at redhat.com Fri Jan 13 12:43:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 07:43:06 -0500 Subject: rpms/gphoto2/devel gphoto2.spec,1.47,1.48 Message-ID: <200601131243.k0DCh6fi010073@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10060 Modified Files: gphoto2.spec Log Message: - docs are back in -devel package Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gphoto2.spec 13 Jan 2006 11:47:14 -0000 1.47 +++ gphoto2.spec 13 Jan 2006 12:42:57 -0000 1.48 @@ -82,6 +82,7 @@ --mandir=%{_mandir} \ --libdir=%{_libdir} \ --with-drivers=all \ + --enable-docs \ --with-doc-dir=%{_docdir}/%{name} \ --disable-static export tagname=CC @@ -101,6 +102,7 @@ %configure \ --mandir=%{_mandir} \ --libdir=%{_libdir} \ + --enable-docs \ --with-doc-dir=%{_docdir}/%{name} export tagname=CC @@ -133,9 +135,12 @@ install -m755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/gphoto-set-procperm -cp -a %{buildroot}%{_docdir}/%{name} installed-doc +mv -f %{buildroot}%{_docdir}/%{name} installed-doc +mv -f %{buildroot}/%{name} installed-doc +mv -f %{buildroot}/%{name}-port installed-doc +mv -f %{buildroot}/canon installed-doc find installed-doc -name '*.sgml' | xargs -r rm -rm -rf %{buildroot}%{_docdir}/%{name} + rm -rf %{buildroot}%{_libdir}/libgphoto2/*/*a rm -rf %{buildroot}%{_libdir}/libgphoto2_port/*/*a rm -rf %{buildroot}%{_libdir}/*.a @@ -148,6 +153,7 @@ cat libgphoto2*.lang >> %{name}.lang + #################################### %clean rm -rf "${RPM_BUILD_ROOT}" @@ -206,7 +212,8 @@ %changelog * Fri Jan 13 2006 Radek Vokal 2.1.99-2 - spec file clean-up -- use ./print-usb-map instead +- use ./print-usb-map +- docs are back in -devel package * Thu Jan 05 2006 Radek Vokal 2.1.99-1 - upgrade to 2.1.99 + dbus patch From fedora-cvs-commits at redhat.com Fri Jan 13 12:53:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 07:53:24 -0500 Subject: rpms/groff/FC-4 groff-1.16-safer.patch, 1.3, 1.4 groff-1.18-gzip.patch, 1.2, 1.3 groff-1.18-nohtml.patch, 1.2, 1.3 groff-1.18-pfbtops_cpp.patch, 1.2, 1.3 groff-1.18.1-devutf8.patch, 1.3, 1.4 groff-1.18.1-fixminus.patch, 1.2, 1.3 groff-1.18.1-gzext.patch, 1.2, 1.3 groff-1.18.1-korean.patch, 1.2, 1.3 groff-xlibs.patch, 1.2, 1.3 groff.spec, 1.27, 1.28 sources, 1.10, 1.11 Message-ID: <200601131253.k0DCrOo9021417@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv21403 Modified Files: groff-1.16-safer.patch groff-1.18-gzip.patch groff-1.18-nohtml.patch groff-1.18-pfbtops_cpp.patch groff-1.18.1-devutf8.patch groff-1.18.1-fixminus.patch groff-1.18.1-gzext.patch groff-1.18.1-korean.patch groff-xlibs.patch groff.spec sources Log Message: revert groff-1.16-safer.patch: input.cc | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) Index: groff-1.16-safer.patch =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff-1.16-safer.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- groff-1.16-safer.patch 12 Jan 2005 14:08:37 -0000 1.3 +++ groff-1.16-safer.patch 13 Jan 2006 12:53:21 -0000 1.4 @@ -1,21 +1,18 @@ ---- groff-1.19.1/src/roff/troff/input.cpp.safer 2004-05-05 18:41:58.000000000 +0200 -+++ groff-1.19.1/src/roff/troff/input.cpp 2005-01-12 13:27:33.947740912 +0100 -@@ -5444,20 +5444,35 @@ void source() - if (nm.is_null()) - skip_line(); +--- groff-1.16/src/roff/troff/input.cc.safer Wed Jun 7 21:47:48 2000 ++++ groff-1.16/src/roff/troff/input.cc Wed Jun 7 21:50:37 2000 +@@ -4404,12 +4406,28 @@ else { -+ char cbuf[PATH_MAX], * cwd; -+ char pbuf[PATH_MAX], * path; -+ struct stat st; -+ while (!tok.newline() && !tok.eof()) tok.next(); - errno = 0; -- FILE *fp = include_search_path.open_file_cautious(nm.contents()); +- FILE *fp = fopen(nm.contents(), "r"); - if (fp) - input_stack::push(new file_iterator(fp, nm.contents())); - else - error("can't open `%1': %2", nm.contents(), strerror(errno)); ++ char cbuf[PATH_MAX], * cwd; ++ char pbuf[PATH_MAX], * path; ++ struct stat st; + + if ((cwd = realpath(".", cbuf)) == NULL) + error("realpath on `%1' failed: %2", ".", strerror(errno)); @@ -38,9 +35,3 @@ tok.next(); } } - --// like .so but use popen() -- - void pipe_source() - { - if (safer_flag) { groff-1.18-gzip.patch: Makefile.sub | 2 input.cc | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 172 insertions(+), 25 deletions(-) Index: groff-1.18-gzip.patch =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff-1.18-gzip.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18-gzip.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18-gzip.patch 13 Jan 2006 12:53:21 -0000 1.3 @@ -1,5 +1,5 @@ ---- groff-1.19.1/src/roff/troff/Makefile.sub.gzip 2004-01-06 23:49:05.000000000 +0100 -+++ groff-1.19.1/src/roff/troff/Makefile.sub 2005-01-12 13:49:11.542476528 +0100 +--- groff-1.18/src/roff/troff/Makefile.sub.hugo 2002-05-03 00:33:21.000000000 +0200 ++++ groff-1.18/src/roff/troff/Makefile.sub 2002-11-04 21:30:09.000000000 +0100 @@ -1,6 +1,6 @@ PROG=troff$(EXEEXT) MAN1=troff.n @@ -7,10 +7,10 @@ +XLIBS=-lz $(LIBGROFF) MLIB=$(LIBM) OBJS=\ - dictionary.$(OBJEXT) \ ---- groff-1.19.1/src/roff/troff/input.cpp.gzip 2005-01-12 13:49:11.516480480 +0100 -+++ groff-1.19.1/src/roff/troff/input.cpp 2005-01-12 13:57:40.615085728 +0100 -@@ -41,6 +41,8 @@ Foundation, 59 Temple Place - Suite 330, + env.o \ +--- groff-1.18/src/roff/troff/input.cc.hugo 2002-11-04 21:30:09.000000000 +0100 ++++ groff-1.18/src/roff/troff/input.cc 2002-11-04 21:36:13.000000000 +0100 +@@ -42,6 +42,8 @@ #include "nonposix.h" @@ -19,7 +19,7 @@ #ifdef NEED_DECLARATION_PUTENV extern "C" { int putenv(const char *); -@@ -190,6 +192,130 @@ void restore_escape_char() +@@ -217,6 +219,130 @@ skip_line(); } @@ -150,7 +150,7 @@ class input_iterator { public: input_iterator(); -@@ -209,7 +335,7 @@ private: +@@ -236,7 +362,7 @@ virtual int get_location(int, const char **, int *) { return 0; } virtual void backtrace() {} virtual int set_location(const char *, int) { return 0; } @@ -159,7 +159,7 @@ virtual void shift(int) {} virtual int is_boundary() {return 0; } virtual int internal_level() { return 0; } -@@ -250,7 +376,7 @@ public: +@@ -277,7 +403,7 @@ }; class file_iterator : public input_iterator { @@ -168,7 +168,7 @@ int lineno; const char *filename; int popened; -@@ -259,7 +385,9 @@ class file_iterator : public input_itera +@@ -286,7 +412,9 @@ enum { BUF_SIZE = 512 }; unsigned char buf[BUF_SIZE]; void close(); @@ -178,7 +178,7 @@ file_iterator(FILE *, const char *, int = 0); ~file_iterator(); int fill(node **); -@@ -267,18 +395,30 @@ public: +@@ -294,18 +422,30 @@ int get_location(int, const char **, int *); void backtrace(); int set_location(const char *, int); @@ -213,7 +213,7 @@ } } -@@ -289,6 +429,8 @@ file_iterator::~file_iterator() +@@ -316,6 +456,8 @@ void file_iterator::close() { @@ -222,7 +222,7 @@ if (fp == stdin) clearerr(stdin); #ifndef POPEN_MISSING -@@ -297,6 +439,7 @@ void file_iterator::close() +@@ -324,6 +466,7 @@ #endif /* not POPEN_MISSING */ else fclose(fp); @@ -230,7 +230,7 @@ } int file_iterator::is_file() -@@ -304,7 +447,7 @@ int file_iterator::is_file() +@@ -331,7 +474,7 @@ return 1; } @@ -239,7 +239,7 @@ { close(); filename = s; -@@ -327,7 +470,7 @@ int file_iterator::fill(node **) +@@ -354,7 +497,7 @@ ptr = p; unsigned char *e = p + BUF_SIZE; while (p < e) { @@ -248,7 +248,7 @@ if (c == EOF) break; if (invalid_input_char(c)) -@@ -354,13 +497,13 @@ int file_iterator::fill(node **) +@@ -381,13 +524,13 @@ int file_iterator::peek() { @@ -265,7 +265,7 @@ return c; } -@@ -406,7 +549,7 @@ public: +@@ -433,7 +576,7 @@ static int set_location(const char *, int); static void backtrace(); static void backtrace_all(); @@ -274,7 +274,7 @@ static void end_file(); static void shift(int n); static void add_boundary(); -@@ -583,7 +726,7 @@ int input_stack::set_location(const char +@@ -605,7 +748,7 @@ return 0; } @@ -283,22 +283,22 @@ { input_iterator **pp; for (pp = ⊤ *pp != &nil_iterator; pp = &(*pp)->next) -@@ -669,10 +812,11 @@ void next_file() +@@ -691,10 +834,11 @@ input_stack::end_file(); else { errno = 0; -- FILE *fp = include_search_path.open_file_cautious(nm.contents()); +- FILE *fp = fopen(nm.contents(), "r"); - if (!fp) + opaque_fp *fp = new opaque_fp(nm.contents(), "r"); + if (!fp->active()) { -+ delete fp; ++ delete fp; error("can't open `%1': %2", nm.contents(), strerror(errno)); - else + } else input_stack::next_file(fp, nm.contents()); } tok.next(); -@@ -5463,11 +5607,12 @@ void source() +@@ -5372,11 +5516,12 @@ error("won't source non-file `%1' without -U flag", path); else { errno = 0; @@ -315,7 +315,7 @@ } tok.next(); } -@@ -6856,16 +7001,18 @@ void macro_source() +@@ -6822,16 +6967,18 @@ static void process_input_file(const char *name) { @@ -328,11 +328,11 @@ } else { errno = 0; -- fp = include_search_path.open_file_cautious(name); +- fp = fopen(name, "r"); - if (!fp) + fp = new opaque_fp(name, "r", OPQ_FP_GUESS); + if (!fp->active()) { -+ delete fp; ++ delete fp; fatal("can't open `%1': %2", name, strerror(errno)); + } } groff-1.18-nohtml.patch: Makefile.sub | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) Index: groff-1.18-nohtml.patch =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff-1.18-nohtml.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18-nohtml.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18-nohtml.patch 13 Jan 2006 12:53:21 -0000 1.3 @@ -1,6 +1,6 @@ ---- groff-1.19.1/doc/Makefile.sub.nohtml 2004-03-05 10:52:57.000000000 +0100 -+++ groff-1.19.1/doc/Makefile.sub 2005-01-12 13:39:54.345183392 +0100 -@@ -59,14 +59,11 @@ +--- groff-1.18/doc/Makefile.sub.nohtml 2002-06-14 17:18:34.000000000 +0200 ++++ groff-1.18/doc/Makefile.sub 2002-08-06 13:46:19.000000000 +0200 +@@ -54,11 +54,9 @@ meintro.ps \ pic.ps @@ -8,18 +8,14 @@ - pic.html +HTMLDOCFILES= --HTMLDOCFILESALL=\ -- pic*.html -+HTMLDOCFILESALL= - -HTMLDOCIMAGEFILES=\ - pic* +HTMLDOCIMAGEFILES= EXAMPLEFILES=\ webpage.ms \ -@@ -77,11 +74,9 @@ - webpage.ps \ +@@ -71,11 +69,9 @@ + gnu.png \ grnexmpl.ps -HTMLEXAMPLEFILES=\ @@ -32,7 +28,7 @@ imagedir=img htmldocimagedir=$(htmldocdir)/$(imagedir) -@@ -120,7 +115,7 @@ +@@ -109,7 +105,7 @@ all: groff $(PROCESSEDDOCFILES) prepare_examples \ @@ -41,9 +37,9 @@ html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES) -@@ -148,7 +143,7 @@ +@@ -131,7 +127,7 @@ - distfiles: groff gnu.eps gnu.png + distfiles: groff -install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \ +install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) \ groff-1.18-pfbtops_cpp.patch: Makefile.in | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) Index: groff-1.18-pfbtops_cpp.patch =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff-1.18-pfbtops_cpp.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18-pfbtops_cpp.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18-pfbtops_cpp.patch 13 Jan 2006 12:53:21 -0000 1.3 @@ -1,6 +1,6 @@ ---- groff-1.19.1/Makefile.in.pfbtops_cpp 2004-04-07 17:33:39.000000000 +0200 -+++ groff-1.19.1/Makefile.in 2005-01-12 13:46:40.242477624 +0100 -@@ -464,8 +464,9 @@ +--- groff-1.18/Makefile.in.sopwith 2002-10-04 17:10:56.000000000 -0400 ++++ groff-1.18/Makefile.in 2002-10-04 17:11:09.000000000 -0400 +@@ -422,8 +422,9 @@ src/utils/lookbib \ src/utils/indxbib \ src/utils/lkbib \ @@ -9,6 +9,6 @@ + src/utils/addftinfo \ + src/utils/pfbtops +CPROGDIRS= - PROGDEPDIRS=arch/misc - PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) + PROGDIRS=$(CCPROGDIRS) $(CPROGDIRS) DEVDIRS=\ + font/devps \ groff-1.18.1-devutf8.patch: DESC.proto | 7 ++----- M.proto | 6 +++--- Makefile.sub | 6 +----- 3 files changed, 6 insertions(+), 13 deletions(-) Index: groff-1.18.1-devutf8.patch =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff-1.18.1-devutf8.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- groff-1.18.1-devutf8.patch 12 Jan 2005 14:08:37 -0000 1.3 +++ groff-1.18.1-devutf8.patch 13 Jan 2006 12:53:21 -0000 1.4 @@ -1,3 +1,15 @@ +--- groff-1.18.1/font/devutf8/M.proto.devutf8 2004-03-08 16:25:52.000000000 +0100 ++++ groff-1.18.1/font/devutf8/M.proto 2004-03-08 17:02:40.265336984 +0100 +@@ -1,6 +1,6 @@ + name M + internalname 4 +-spacewidth 48 ++spacewidth 24 + charset +-u2E00..u9FFF 48 0 +-uFF00..uFFEF 48 0 ++u0100..u07FF 24 0 ++u0800..uFFFF 48 0 --- groff-1.18.1/font/devutf8/DESC.proto.devutf8 2004-03-08 16:25:52.000000000 +0100 +++ groff-1.18.1/font/devutf8/DESC.proto 2004-03-08 16:25:53.000000000 +0100 @@ -3,10 +3,7 @@ groff-1.18.1-fixminus.patch: R.proto | 1 + 1 files changed, 1 insertion(+) Index: groff-1.18.1-fixminus.patch =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff-1.18.1-fixminus.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18.1-fixminus.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18.1-fixminus.patch 13 Jan 2006 12:53:21 -0000 1.3 @@ -1,9 +1,9 @@ ---- groff-1.19.1/font/devutf8/R.proto.fixminus 2003-12-28 09:42:31.000000000 +0100 -+++ groff-1.19.1/font/devutf8/R.proto 2005-01-12 14:00:15.628520104 +0100 -@@ -405,7 +405,7 @@ - *f 24 0 0x03D5 +--- groff-1.18.1/font/devutf8/R.proto.fixminus 2003-02-03 14:19:47.000000000 +0100 ++++ groff-1.18.1/font/devutf8/R.proto 2003-02-03 14:20:06.000000000 +0100 +@@ -285,7 +285,7 @@ + +h 24 0 0x03D1 + +f 24 0 0x03D5 +p 24 0 0x03D6 - +e 24 0 0x03F5 -- 24 0 0x2010 +- 24 0 0x002D hy " groff-1.18.1-gzext.patch: input.cc | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) Index: groff-1.18.1-gzext.patch =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff-1.18.1-gzext.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18.1-gzext.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18.1-gzext.patch 13 Jan 2006 12:53:21 -0000 1.3 @@ -1,16 +1,11 @@ ---- groff-1.19.1/src/roff/troff/input.cpp.gzext 2005-01-12 14:17:15.469480712 +0100 -+++ groff-1.19.1/src/roff/troff/input.cpp 2005-01-12 14:22:57.666458864 +0100 -@@ -5590,16 +5590,20 @@ void source() - else { +--- groff-1.18.1/src/roff/troff/input.cc.gzext 2003-02-10 18:32:00.000000000 +0100 ++++ groff-1.18.1/src/roff/troff/input.cc 2003-02-10 18:33:18.000000000 +0100 +@@ -5487,12 +5487,16 @@ char cbuf[PATH_MAX], * cwd; char pbuf[PATH_MAX], * path; -+ char tmp[PATH_MAX]; struct stat st; - ++ char tmp[PATH_MAX]; + snprintf(tmp, PATH_MAX, "%s.gz", nm.contents()); -+ - while (!tok.newline() && !tok.eof()) - tok.next(); if ((cwd = realpath(".", cbuf)) == NULL) error("realpath on `%1' failed: %2", ".", strerror(errno)); @@ -18,8 +13,9 @@ - error("realpath on `%1' failed: %2", nm.contents(), strerror(errno)); - else if (safer_flag && strncmp(cwd, path, strlen(cwd))) + else if ((path = realpath(nm.contents(), pbuf)) == NULL && -+ (path = realpath(tmp, pbuf)) == NULL) { -+ error("realpath on `%1' failed: %3", nm.contents(), strerror(errno)); ++ (path = realpath(tmp, pbuf)) == NULL) ++ { ++ error("realpath on `%1' failed: %3", nm.contents(), strerror(errno)); + } else if (safer_flag && strncmp(cwd, path, strlen(cwd))) error("won't source `%1' outside of `%2' without -U flag", path, cwd); else if (stat(path, &st) < 0) groff-1.18.1-korean.patch: nroff.sh | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) Index: groff-1.18.1-korean.patch =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff-1.18.1-korean.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-1.18.1-korean.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-1.18.1-korean.patch 13 Jan 2006 12:53:21 -0000 1.3 @@ -1,44 +1,38 @@ ---- groff-1.19.1/src/roff/nroff/nroff.sh.korean 2004-04-06 16:10:32.000000000 +0200 -+++ groff-1.19.1/src/roff/nroff/nroff.sh 2005-01-12 14:15:39.714037752 +0100 -@@ -12,6 +12,10 @@ - T=-Tlatin1 ;; - IBM-1047) +--- groff-1.18.1/src/roff/nroff/nroff.sh.orig 2003-02-06 19:37:17.000000000 +0900 ++++ groff-1.18.1/src/roff/nroff/nroff.sh 2003-02-06 19:38:34.000000000 +0900 +@@ -14,6 +14,8 @@ T=-Tcp1047 ;; -+ EUC-JP) -+ T=-Tnippon ;; + EUC-JP) + T=-Tnippon ;; + EUC-KR) + T=-Tkorean ;; *) case "${LC_ALL-${LC_CTYPE-${LANG}}}" in *.UTF-8) -@@ -20,6 +24,10 @@ - T=-Tlatin1 ;; - *.IBM-1047) +@@ -24,6 +26,8 @@ T=-Tcp1047 ;; -+ ja_JP.ujis | ja_JP.eucJP) -+ T=-Tnippon ;; + ja_JP.ujis | ja_JP.eucJP) + T=-Tnippon ;; + ko_KR.eucKR) + T=-Tkorean ;; *) case "$LESSCHARSET" in utf-8) -@@ -28,6 +36,10 @@ - T=-Tlatin1 ;; - cp1047) +@@ -34,6 +38,8 @@ T=-Tcp1047 ;; -+ japanese) -+ T=-Tnippon ;; -+ ko) -+ T=-Tkorean ;; + japanese) + T=-Tnippon ;; ++ ko) ++ T=-Tkorean ;; *) - T=-Tascii ;; + T=-Tascii8 ;; esac ;; -@@ -52,7 +64,7 @@ +@@ -58,7 +64,7 @@ exit 1 ;; - -[iptSUC] | -[dmrno]*) + -[iptSUC] | -[mrno]*) opts="$opts $1" ;; -- -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047) -+ -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tnippon | -Tkorean) +- -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tascii8 | -Tnippon) ++ -Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tascii8 | -Tnippon | -Tkorean) T=$1 ;; -T*) # ignore other devices groff-xlibs.patch: Makefile.ccpg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: groff-xlibs.patch =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff-xlibs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- groff-xlibs.patch 12 Jan 2005 14:08:37 -0000 1.2 +++ groff-xlibs.patch 13 Jan 2006 12:53:21 -0000 1.3 @@ -1,12 +1,12 @@ ---- groff-1.19.1/Makefile.ccpg.xlibs 2003-04-12 16:07:05.000000000 +0200 -+++ groff-1.19.1/Makefile.ccpg 2005-01-12 14:24:58.349112312 +0100 +--- groff-1.18.1/Makefile.ccpg.sopwith Mon Feb 10 08:33:21 2003 ++++ groff-1.18.1/Makefile.ccpg Mon Feb 10 08:54:00 2003 @@ -8,7 +8,7 @@ all: $(PROG) $(MANPAGES) -$(PROG): $(OBJS) $(XLIBS) +$(PROG): $(OBJS) - $(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) + $(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) install_bin: install_prog @@ -28,6 +28,6 @@ @@ -16,4 +16,4 @@ -$(PROG).pure: $(OBJS) $(XLIBS) +$(PROG).pure: $(OBJS) $(PURIFY) $(PURIFYCCFLAGS) \ - $(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) + $(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB) Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- groff.spec 12 Jan 2005 14:08:37 -0000 1.27 +++ groff.spec 13 Jan 2006 12:53:21 -0000 1.28 @@ -2,27 +2,32 @@ Summary: A document formatting system. Name: groff -Version: 1.19.1 -Release: 1 +Version: 1.18.1.1 +Release: 5 License: GPL Group: Applications/Publishing -Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.bz2 +Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz Source3: mandocj.tar.gz Source4: man-pages-ja-GNU_groff-20000115.tar.gz Source6: hyphen.cs Source7: nroff Patch1: groff-1.16-safer.patch -Patch2: groff-1.18-info.patch -Patch3: groff-1.18-nohtml.patch -Patch4: groff-1.18-pfbtops_cpp.patch -Patch5: groff-1.18-gzip.patch -Patch6: groff-1.18.1-fixminus.patch -Patch7: groff-1.18.1-korean.patch -Patch8: groff-1.18.1-gzext.patch -Patch9: groff-xlibs.patch -Patch10: groff-1.18.1.1-revision.patch -Patch11: groff-1.18.1.1-do_char.patch -Patch12: groff-1.18.1.1-tempfile.patch +Patch3: groff_1.18.1-15.diff +Patch4: groff-1.18-info.patch +Patch5: groff-1.18-nohtml.patch +Patch6: groff-1.18-pfbtops_cpp.patch +Patch7: groff-1.18-gzip.patch +Patch9: groff-1.18.1-fixminus.patch +Patch11: groff-1.18.1-8bit.patch +Patch12: groff-1.18.1-korean.patch +Patch13: groff-1.18.1-gzext.patch +Patch14: groff-xlibs.patch +Patch15: groff-1.18.1-fix15.patch +Patch16: groff-1.18.1-devutf8.patch +Patch17: groff-1.18.1.1-revision.patch +Patch18: groff-1.18.1.1-do_char.patch +Patch19: groff-1.18.1.1-grn.patch +Patch20: groff-1.18.1.1-tempfile.patch URL: ftp://ftp.gnu.org/gnu/groff/ Requires: mktemp @@ -71,19 +76,23 @@ %prep %setup -q -a 4 -%patch1 -p1 -b .safer -%patch2 -p1 -b .infopatch -%patch3 -p1 -b .nohtml -%patch4 -p1 -b .pfbtops_cpp -%patch5 -p1 -b .gzip -%patch6 -p1 -b .fixminus -%patch7 -p1 -b .korean -%patch8 -p1 -b .gzext -%patch9 -p1 -b .xlibs -%patch10 -p1 -b .revision -%patch11 -p1 -b .do_char -%patch12 -p1 -b .tempfile - +%patch1 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch9 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 -b .gzext +%patch14 -p1 +%patch15 -p1 -b .fix9 +%patch16 -p1 -b .devutf8 +%patch17 -p1 -b .revision +%patch18 -p1 -b .do_char +%patch19 -p1 -b .grn +%patch20 -p1 -b .tempfile for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \ src/devices/grolbp/grolbp.man; do iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" @@ -92,6 +101,7 @@ %build PATH=$PATH:%{_prefix}/X11R6/bin +#autoconf %configure --enable-japanese --enable-multibyte make (cd doc && makeinfo groff.texinfo) @@ -193,12 +203,6 @@ %endif %changelog -* Wed Jan 12 2005 Jindrich Novy 1.19.1-1 -- update to groff 1.19.1 -- drop 8bit, fix15, devutf8, grn patches -- sync the rest of patches with current release -- spec cleanup - * Wed Nov 24 2004 Miloslav Trmac - 1.18.1.1-5 - Convert also mmroff.1 to UTF-8 Index: sources =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 12 Jan 2005 14:08:37 -0000 1.10 +++ sources 13 Jan 2006 12:53:21 -0000 1.11 @@ -1,4 +1,3 @@ 511dbd64b67548c99805f1521f82cc5e groff-1.18.1.1.tar.gz 9bbf9b74fd587d248e17543bda4ce5de man-pages-ja-GNU_groff-20000115.tar.gz e5d7f3273b4d53033723fcd2654d980c mandocj.tar.gz -88239a9aa668235ac82c34bcdfc4e83a groff-1.19.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 13 13:54:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 08:54:36 -0500 Subject: rpms/gphoto2/devel gphoto2.spec,1.48,1.49 Message-ID: <200601131354.k0DDsaS9006723@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6676 Modified Files: gphoto2.spec Log Message: - export LIBDIR before creating .fdi file Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- gphoto2.spec 13 Jan 2006 12:42:57 -0000 1.48 +++ gphoto2.spec 13 Jan 2006 13:54:31 -0000 1.49 @@ -5,7 +5,7 @@ %define libpkg libgphoto2 %define libver 2.1.99 Version: %{pkgver} -Release: 2 +Release: 3 License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -118,9 +118,9 @@ make mandir=%{_mandir} DESTDIR=$RPM_BUILD_ROOT install install -d -m755 %{buildroot}/usr/share/hal/fdi/information/20thirdparty/ -# + #LIBDIR=%{buildroot}%{_libdir} %{SOURCE2} > %{buildroot}/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi -# +export LIBDIR=$RPM_BUILD_ROOT/%{_libdir} export CAMLIBS=$RPM_BUILD_ROOT/%{_libdir}/%{libpkg}/%{libver} $RPM_BUILD_ROOT/%{_libdir}/%{libpkg}/print-usb-usermap --fdi > $RPM_BUILD_ROOT/%{_datadir}/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi popd @@ -210,6 +210,9 @@ # ChangeLog ######################################################################## %changelog +* Fri Jan 13 2006 Radek Vokal 2.1.99-3 +- export LIBDIR before creating .fdi file + * Fri Jan 13 2006 Radek Vokal 2.1.99-2 - spec file clean-up - use ./print-usb-map From fedora-cvs-commits at redhat.com Fri Jan 13 14:51:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 09:51:39 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.80, 1.81 libsepol.spec, 1.103, 1.104 sources, 1.81, 1.82 Message-ID: <200601131451.k0DEpdQp003630@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3618 Modified Files: .cvsignore libsepol.spec sources Log Message: * Fri Jan 13 2006 Dan Walsh 1.11.9-1 - Upgrade to latest from NSA * Merged size_t -> unsigned int patch from Ivan Gyurdiev. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- .cvsignore 10 Jan 2006 13:48:05 -0000 1.80 +++ .cvsignore 13 Jan 2006 14:51:35 -0000 1.81 @@ -77,3 +77,4 @@ libsepol-1.11.5.tgz libsepol-1.11.7.tgz libsepol-1.11.8.tgz +libsepol-1.11.9.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- libsepol.spec 10 Jan 2006 13:48:05 -0000 1.103 +++ libsepol.spec 13 Jan 2006 14:51:35 -0000 1.104 @@ -1,6 +1,6 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.11.8 +Version: 1.11.9 Release: 1 License: GPL Group: System Environment/Libraries @@ -80,6 +80,10 @@ %{_includedir}/sepol/policydb/*.h %changelog +* Fri Jan 13 2006 Dan Walsh 1.11.9-1 +- Upgrade to latest from NSA + * Merged size_t -> unsigned int patch from Ivan Gyurdiev. + * Tue Jan 10 2006 Dan Walsh 1.11.8-1 - Upgrade to latest from NSA * Merged 2nd const in APIs patch from Ivan Gyurdiev. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- sources 10 Jan 2006 13:48:05 -0000 1.81 +++ sources 13 Jan 2006 14:51:35 -0000 1.82 @@ -1 +1 @@ -80daa3d1bee59dfc06934394cd7304f9 libsepol-1.11.8.tgz +cabc1603030e939e7a19d60671fb0afe libsepol-1.11.9.tgz From fedora-cvs-commits at redhat.com Fri Jan 13 15:50:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 10:50:39 -0500 Subject: rpms/kernel/devel linux-2.6-bcm43xx-wpa.patch, NONE, 1.1 .cvsignore, 1.323, 1.324 kernel-2.6.spec, 1.1851, 1.1852 linux-2.6-devmem.patch, 1.4, 1.5 linux-2.6-softmac-git.patch, 1.3, 1.4 sources, 1.265, 1.266 linux-2.6-queue-stall.patch, 1.1, NONE Message-ID: <200601131550.k0DFodq0009521@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9477 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-devmem.patch linux-2.6-softmac-git.patch sources Added Files: linux-2.6-bcm43xx-wpa.patch Removed Files: linux-2.6-queue-stall.patch Log Message: git9, WPA on bcm43xx linux-2.6-bcm43xx-wpa.patch: 0 files changed --- NEW FILE linux-2.6-bcm43xx-wpa.patch --- --- linux/drivers/net/wireless/bcm43xx/bcm43xx_wx.c (revision 1051) +++ linux/drivers/net/wireless/bcm43xx/bcm43xx_wx.c (working copy) @@ -554,6 +554,21 @@ return err; } +static int bcm43xx_wx_set_encodingext(struct net_device *net_dev, + struct iw_request_info *info, + union iwreq_data *data, + char *extra) +{ + struct bcm43xx_private *bcm = bcm43xx_priv(net_dev); + int err; + + wx_enter(); + + err = ieee80211_wx_set_encodeext(bcm->ieee, info, data, extra); + + return err; +} + static int bcm43xx_wx_get_encoding(struct net_device *net_dev, struct iw_request_info *info, union iwreq_data *data, @@ -569,6 +584,21 @@ return err; } +static int bcm43xx_wx_get_encodingext(struct net_device *net_dev, + struct iw_request_info *info, + union iwreq_data *data, + char *extra) +{ + struct bcm43xx_private *bcm = bcm43xx_priv(net_dev); + int err; + + wx_enter(); + + err = ieee80211_wx_get_encodeext(bcm->ieee, info, data, extra); + + return err; +} + static int bcm43xx_wx_set_power(struct net_device *net_dev, struct iw_request_info *info, union iwreq_data *data, @@ -970,11 +1000,15 @@ /* Encoding */ WX(SIOCSIWENCODE) = bcm43xx_wx_set_encoding, WX(SIOCGIWENCODE) = bcm43xx_wx_get_encoding, + WX(SIOCSIWENCODEEXT) = bcm43xx_wx_set_encodingext, + WX(SIOCGIWENCODEEXT) = bcm43xx_wx_get_encodingext, /* Power saving */ //TODO WX(SIOCSIWPOWER) = bcm43xx_wx_set_power, //TODO WX(SIOCGIWPOWER) = bcm43xx_wx_get_power, WX(SIOCSIWGENIE) = ieee80211softmac_wx_set_genie, WX(SIOCGIWGENIE) = ieee80211softmac_wx_get_genie, + WX(SIOCSIWAUTH) = ieee80211_wx_set_auth, + WX(SIOCGIWAUTH) = ieee80211_wx_get_auth, }; #undef WX Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.323 retrieving revision 1.324 diff -u -r1.323 -r1.324 --- .cvsignore 12 Jan 2006 23:52:50 -0000 1.323 +++ .cvsignore 13 Jan 2006 15:50:35 -0000 1.324 @@ -3,5 +3,4 @@ kernel-2.6.15 linux-2.6.15.tar.bz2 bcm43xx-20060111.tar.bz2 -patch-2.6.15-git7a.bz2 -patch-2.6.15-git8.bz2 +patch-2.6.15-git9.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1851 retrieving revision 1.1852 diff -u -r1.1851 -r1.1852 --- kernel-2.6.spec 13 Jan 2006 08:27:34 -0000 1.1851 +++ kernel-2.6.spec 13 Jan 2006 15:50:35 -0000 1.1852 @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git8.bz2 +Patch1: patch-2.6.15-git9.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -351,7 +351,6 @@ Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch Patch1850: linux-2.6-mv643xx-compile-fix.patch -Patch1860: linux-2.6-queue-stall.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -374,6 +373,7 @@ # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx.patch +Patch5002: linux-2.6-bcm43xx-wpa.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -834,8 +834,6 @@ %patch1840 -p1 # Fix compilation for MV643xx Ethernet %patch1850 -p1 -# Fix disk I/O queue stalls -%patch1860 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 %patch1901 -p1 @@ -874,6 +872,8 @@ %patch5000 -p1 # Patch Kconfig and Makefiles to merge bcm43xx 'properly' %patch5001 -p1 +# Add WPA support +%patch5002 -p1 # # final stuff @@ -1360,6 +1360,10 @@ %changelog * Fri Jan 13 2006 David Woodhouse +- Update softmac and add WPA support to bcm43xx driver +- 2.6.15-git9 + +* Fri Jan 13 2006 David Woodhouse - Add TIF_RESTORE_SIGMASK patches. - Fix I/O queue stalls linux-2.6-devmem.patch: arch/powerpc/mm/mem.c | 14 +++ linux-1050/arch/i386/mm/init.c | 19 ++++ linux-1050/arch/ia64/mm/init.c | 7 + linux-1050/arch/s390/mm/init.c | 5 + linux-1050/arch/x86_64/mm/init.c | 20 ++++ linux-1050/drivers/char/mem.c | 146 ++++---------------------------- linux-1050/fs/proc/kcore.c | 2 linux-1050/include/asm-alpha/page.h | 1 linux-1050/include/asm-arm/page.h | 2 linux-1050/include/asm-arm26/page.h | 2 linux-1050/include/asm-cris/page.h | 2 linux-1050/include/asm-h8300/page.h | 2 linux-1050/include/asm-i386/page.h | 4 linux-1050/include/asm-ia64/page.h | 2 linux-1050/include/asm-m68k/page.h | 2 linux-1050/include/asm-m68knommu/page.h | 2 linux-1050/include/asm-mips/page.h | 2 linux-1050/include/asm-parisc/page.h | 2 linux-1050/include/asm-ppc/page.h | 2 linux-1050/include/asm-s390/page.h | 2 linux-1050/include/asm-sh/page.h | 2 linux-1050/include/asm-sh64/page.h | 2 linux-1050/include/asm-sparc/page.h | 2 linux-1050/include/asm-sparc64/page.h | 2 linux-1050/include/asm-um/page.h | 1 linux-1050/include/asm-v850/page.h | 2 linux-1050/include/asm-x86_64/page.h | 4 linux-2.6.13/arch/x86_64/mm/init.c | 22 ++++ linux-2.6.14/include/asm-powerpc/page.h | 2 29 files changed, 154 insertions(+), 125 deletions(-) Index: linux-2.6-devmem.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-devmem.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-devmem.patch 15 Nov 2005 17:23:57 -0000 1.4 +++ linux-2.6-devmem.patch 13 Jan 2006 15:50:35 -0000 1.5 @@ -299,7 +299,7 @@ - return virtr + wrote; -} - - #if (defined(CONFIG_ISA) || !defined(__mc68000__)) && (!defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI)) + #if defined(CONFIG_ISA) || !defined(__mc68000__) static ssize_t read_port(struct file * file, char __user * buf, size_t count, loff_t *ppos) @@ -717,7 +617,6 @@ static struct file_operations mem_fops = linux-2.6-softmac-git.patch: include/net/ieee80211.h | 8 include/net/ieee80211softmac.h | 292 ++++++++++++++ include/net/ieee80211softmac_wx.h | 94 ++++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/ieee80211_module.c | 2 net/ieee80211/ieee80211_rx.c | 4 net/ieee80211/ieee80211_wx.c | 89 ++++ net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 392 +++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 376 +++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 159 ++++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 456 +++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 237 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 237 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 412 ++++++++++++++++++++ 18 files changed, 3250 insertions(+), 3 deletions(-) Index: linux-2.6-softmac-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-softmac-git.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-softmac-git.patch 11 Jan 2006 13:04:21 -0000 1.3 +++ linux-2.6-softmac-git.patch 13 Jan 2006 15:50:35 -0000 1.4 @@ -1,33 +1,54 @@ diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h -index cde2f4f..df05f46 100644 +index df05f46..c1cb23a 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h -@@ -363,8 +363,9 @@ enum ieee80211_reasoncode { - #define IEEE80211_OFDM_SHIFT_MASK_A 4 +@@ -1122,6 +1122,14 @@ extern int ieee80211_wx_set_encodeext(st + extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, + struct iw_request_info *info, + union iwreq_data *wrqu, char *extra); ++extern int ieee80211_wx_set_auth(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, ++ char *extra); ++extern int ieee80211_wx_get_auth(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, ++ char *extra); - /* NOTE: This data is for statistical purposes; not all hardware provides this -- * information for frames received. Not setting these will not cause -- * any adverse affects. */ -+ * information for frames received. -+ * For ieee80211_rx_mgt, you need to set at least the 'len' parameter. -+ */ - struct ieee80211_rx_stats { - u32 mac_time; - s8 rssi; -@@ -1088,6 +1089,7 @@ extern int ieee80211_tx_frame(struct iee - /* ieee80211_rx.c */ - extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, - struct ieee80211_rx_stats *rx_stats); -+/* make sure to set stats->len */ - extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, - struct ieee80211_hdr_4addr *header, - struct ieee80211_rx_stats *stats); + static inline void ieee80211_increment_scans(struct ieee80211_device *ieee) + { diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h new file mode 100644 -index 0000000..7264bd8 +index 0000000..b971d8c --- /dev/null +++ b/include/net/ieee80211softmac.h -@@ -0,0 +1,266 @@ +@@ -0,0 +1,292 @@ ++/* ++ * ieee80211softmac.h - public interface to the softmac ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#ifndef IEEE80211SOFTMAC_H_ +#define IEEE80211SOFTMAC_H_ + @@ -296,10 +317,38 @@ +#endif /* IEEE80211SOFTMAC_H_ */ diff --git a/include/net/ieee80211softmac_wx.h b/include/net/ieee80211softmac_wx.h new file mode 100644 -index 0000000..165ea4c +index 0000000..3e0be45 --- /dev/null +++ b/include/net/ieee80211softmac_wx.h -@@ -0,0 +1,66 @@ +@@ -0,0 +1,94 @@ ++/* ++ * This file contains the prototypes for the wireless extension ++ * handlers that the softmac API provides. Include this file to ++ * use the wx handlers, you can assign these directly. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#ifndef _IEEE80211SOFTMAC_WX_H +#define _IEEE80211SOFTMAC_WX_H + @@ -398,7 +447,7 @@ static int show_debug_level(char *page, char **start, off_t offset, int count, int *eof, void *data) diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c -index 4cc6f41..9943096 100644 +index 5e33803..64eceb7 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c @@ -1289,9 +1289,9 @@ static inline void update_network(struct @@ -413,6 +462,109 @@ } static inline void ieee80211_process_probe_response(struct ieee80211_device +diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c +index 406d5b9..2f16cbe 100644 +--- a/net/ieee80211/ieee80211_wx.c ++++ b/net/ieee80211/ieee80211_wx.c +@@ -726,9 +726,98 @@ int ieee80211_wx_get_encodeext(struct ie + return 0; + } + ++int ieee80211_wx_set_auth(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, ++ char *extra) ++{ ++ struct ieee80211_device *ieee = netdev_priv(dev); ++ unsigned long flags; ++ int err = 0; ++ ++ spin_lock_irqsave(&ieee->lock, flags); ++ ++ switch (wrqu->param.flags & IW_AUTH_INDEX) { ++ case IW_AUTH_WPA_VERSION: ++ case IW_AUTH_CIPHER_PAIRWISE: ++ case IW_AUTH_CIPHER_GROUP: ++ case IW_AUTH_KEY_MGMT: ++ /* ++ * Host AP driver does not use these parameters and allows ++ * wpa_supplicant to control them internally. ++ */ ++ break; ++ case IW_AUTH_TKIP_COUNTERMEASURES: ++ break; /* FIXME */ ++ case IW_AUTH_DROP_UNENCRYPTED: ++ ieee->drop_unencrypted = !!wrqu->param.value; ++ break; ++ case IW_AUTH_80211_AUTH_ALG: ++ break; /* FIXME */ ++ case IW_AUTH_WPA_ENABLED: ++ ieee->privacy_invoked = ieee->wpa_enabled = !!wrqu->param.value; ++ break; ++ case IW_AUTH_RX_UNENCRYPTED_EAPOL: ++ ieee->ieee802_1x = !!wrqu->param.value; ++ break; ++ case IW_AUTH_PRIVACY_INVOKED: ++ ieee->privacy_invoked = !!wrqu->param.value; ++ break; ++ default: ++ err = -EOPNOTSUPP; ++ break; ++ } ++ spin_unlock_irqrestore(&ieee->lock, flags); ++ return err; ++} ++ ++int ieee80211_wx_get_auth(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, ++ char *extra) ++{ ++ struct ieee80211_device *ieee = netdev_priv(dev); ++ unsigned long flags; ++ int err = 0; ++ ++ spin_lock_irqsave(&ieee->lock, flags); ++ ++ switch (wrqu->param.flags & IW_AUTH_INDEX) { ++ case IW_AUTH_WPA_VERSION: ++ case IW_AUTH_CIPHER_PAIRWISE: ++ case IW_AUTH_CIPHER_GROUP: ++ case IW_AUTH_KEY_MGMT: ++ case IW_AUTH_TKIP_COUNTERMEASURES: /* FIXME */ ++ case IW_AUTH_80211_AUTH_ALG: /* FIXME */ ++ /* ++ * Host AP driver does not use these parameters and allows ++ * wpa_supplicant to control them internally. ++ */ ++ err = -EOPNOTSUPP; ++ break; ++ case IW_AUTH_DROP_UNENCRYPTED: ++ wrqu->param.value = ieee->drop_unencrypted; ++ break; ++ case IW_AUTH_WPA_ENABLED: ++ wrqu->param.value = ieee->wpa_enabled; ++ break; ++ case IW_AUTH_RX_UNENCRYPTED_EAPOL: ++ wrqu->param.value = ieee->ieee802_1x; ++ break; ++ default: ++ err = -EOPNOTSUPP; ++ break; ++ } ++ spin_unlock_irqrestore(&ieee->lock, flags); ++ return err; ++} ++ + EXPORT_SYMBOL(ieee80211_wx_set_encodeext); + EXPORT_SYMBOL(ieee80211_wx_get_encodeext); + + EXPORT_SYMBOL(ieee80211_wx_get_scan); + EXPORT_SYMBOL(ieee80211_wx_set_encode); + EXPORT_SYMBOL(ieee80211_wx_get_encode); ++ ++EXPORT_SYMBOL_GPL(ieee80211_wx_set_auth); ++EXPORT_SYMBOL_GPL(ieee80211_wx_get_auth); diff --git a/net/ieee80211/softmac/Kconfig b/net/ieee80211/softmac/Kconfig new file mode 100644 index 0000000..6cd9f34 @@ -446,10 +598,36 @@ + ieee80211softmac_event.o diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c new file mode 100644 -index 0000000..aef018f +index 0000000..b29fb1c --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c -@@ -0,0 +1,366 @@ +@@ -0,0 +1,392 @@ ++/* ++ * This file contains the softmac's association logic. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#include "ieee80211softmac_priv.h" + +/* @@ -818,10 +996,36 @@ +} diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c new file mode 100644 -index 0000000..6eab2be +index 0000000..84ad029 --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_auth.c -@@ -0,0 +1,350 @@ +@@ -0,0 +1,376 @@ ++/* ++ * This file contains the softmac's authentication logic. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#include "ieee80211softmac_priv.h" + +static void ieee80211softmac_auth_queue(void *data); @@ -1174,16 +1378,40 @@ +} diff --git a/net/ieee80211/softmac/ieee80211softmac_event.c b/net/ieee80211/softmac/ieee80211softmac_event.c new file mode 100644 -index 0000000..b640a58 +index 0000000..0ed8e30 --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_event.c -@@ -0,0 +1,135 @@ -+#include "ieee80211softmac_priv.h" -+ +@@ -0,0 +1,159 @@ +/* + * Event system -+ * Also see comments in public header file ++ * Also see comments in public header file and longer explanation below. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch + * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ ++#include "ieee80211softmac_priv.h" ++ ++/* + * Each event has associated to it + * - an event type (see constants in public header) + * - an event context (see below) @@ -1795,10 +2023,36 @@ +} diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c new file mode 100644 -index 0000000..ea4a19e +index 0000000..671f83b --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_module.c -@@ -0,0 +1,425 @@ +@@ -0,0 +1,456 @@ ++/* ++ * Contains some basic softmac functions along with module registration code etc. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#include "ieee80211softmac_priv.h" +#include + @@ -1846,6 +2100,7 @@ + + return dev; +} ++EXPORT_SYMBOL_GPL(alloc_ieee80211softmac); + +/* Clears the pending work queue items, stops all scans, etc. */ +void @@ -1878,7 +2133,7 @@ + spin_unlock_irqrestore(&sm->lock, flags); + flush_scheduled_work(); + -+ // now we should be save and no longer need locking... ++ /* now we should be save and no longer need locking... */ + spin_lock_irqsave(&sm->lock, flags); + /* Free all pending auth work items */ + list_for_each_entry_safe(authptr, authtmp, &sm->auth_queue, list) { @@ -1902,6 +2157,7 @@ + + spin_unlock_irqrestore(&sm->lock, flags); +} ++EXPORT_SYMBOL_GPL(ieee80211softmac_clear_pending_work); + +void free_ieee80211softmac(struct net_device *dev) +{ @@ -1911,6 +2167,7 @@ + kfree(sm->wpa.IE); + free_ieee80211(dev); +} ++EXPORT_SYMBOL_GPL(free_ieee80211softmac); + +static void ieee80211softmac_start_check_rates(struct ieee80211softmac_device *mac) +{ @@ -1969,6 +2226,7 @@ + if (mac->txrates_change) + mac->txrates_change(dev, change, &oldrates); +} ++EXPORT_SYMBOL_GPL(ieee80211softmac_start); + +void ieee80211softmac_stop(struct net_device *dev) +{ @@ -1976,6 +2234,7 @@ + + ieee80211softmac_clear_pending_work(mac); +} ++EXPORT_SYMBOL_GPL(ieee80211softmac_stop); + +void ieee80211softmac_set_rates(struct net_device *dev, u8 count, u8 *rates) +{ @@ -1987,6 +2246,7 @@ + mac->ratesinfo.count = count; + spin_unlock_irqrestore(&mac->lock, flags); +} ++EXPORT_SYMBOL_GPL(ieee80211softmac_set_rates); + +static u8 raise_rate(struct ieee80211softmac_device *mac, u8 rate) +{ @@ -2069,6 +2329,7 @@ + + spin_unlock_irqrestore(&mac->lock, flags); +} ++EXPORT_SYMBOL_GPL(ieee80211softmac_fragment_lost); + +static int rate_cmp(const void *a_, const void *b_) { + u8 *a, *b; @@ -2216,20 +2477,44 @@ +} + +MODULE_LICENSE("GPL"); -+ -+EXPORT_SYMBOL_GPL(alloc_ieee80211softmac); -+EXPORT_SYMBOL_GPL(free_ieee80211softmac); -+EXPORT_SYMBOL_GPL(ieee80211softmac_set_rates); -+EXPORT_SYMBOL_GPL(ieee80211softmac_start); -+EXPORT_SYMBOL_GPL(ieee80211softmac_stop); -+EXPORT_SYMBOL_GPL(ieee80211softmac_fragment_lost); -+EXPORT_SYMBOL_GPL(ieee80211softmac_clear_pending_work); ++MODULE_AUTHOR("Johannes Berg"); ++MODULE_AUTHOR("Joseph Jezak"); ++MODULE_AUTHOR("Larry Finger"); ++MODULE_AUTHOR("Danny van Dyk"); ++MODULE_AUTHOR("Michael Buesch"); ++MODULE_DESCRIPTION("802.11 software MAC"); diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h b/net/ieee80211/softmac/ieee80211softmac_priv.h new file mode 100644 -index 0000000..44a8ba4 +index 0000000..5b98c3e --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_priv.h -@@ -0,0 +1,211 @@ +@@ -0,0 +1,237 @@ ++/* ++ * Internal softmac API definitions. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#ifndef IEEE80211SOFTMAC_PRIV_H_ +#define IEEE80211SOFTMAC_PRIV_H_ + @@ -2443,14 +2728,36 @@ +#endif /* IEEE80211SOFTMAC_PRIV_H_ */ diff --git a/net/ieee80211/softmac/ieee80211softmac_scan.c b/net/ieee80211/softmac/ieee80211softmac_scan.c new file mode 100644 -index 0000000..1a1eda4 +index 0000000..d90d31f --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_scan.c -@@ -0,0 +1,216 @@ +@@ -0,0 +1,237 @@ +/* + * Scanning routines. + * + * These are not exported because they're assigned to the function pointers. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. + */ + +#include @@ -2533,7 +2840,6 @@ + + if (!invalid_channel) { + sm->set_channel(sm->dev, si->channels[current_channel_idx].channel); -+ //TODO: Probe the channel + // FIXME make this user configurable (active/passive) + if(ieee80211softmac_send_mgt_frame(sm, NULL, IEEE80211_STYPE_PROBE_REQ, 0)) + printkl(KERN_DEBUG PFX "Sending Probe Request Failed\n"); @@ -2665,12 +2971,34 @@ +EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished); diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c new file mode 100644 -index 0000000..ca11737 +index 0000000..17d30f4 --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_wx.c -@@ -0,0 +1,390 @@ +@@ -0,0 +1,412 @@ +/* + * This file contains our _wx handlers. Make sure you EXPORT_SYMBOL_GPL them ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. + */ + +#include "ieee80211softmac_priv.h" Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.265 retrieving revision 1.266 diff -u -r1.265 -r1.266 --- sources 12 Jan 2006 23:52:50 -0000 1.265 +++ sources 13 Jan 2006 15:50:35 -0000 1.266 @@ -1,4 +1,3 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 e7291436e5d71b575dea034883cb42e5 bcm43xx-20060111.tar.bz2 -f791ce18c0e962f30dce760274f6be07 patch-2.6.15-git7a.bz2 -17649f28b91b319cb916a89f46eb37c3 patch-2.6.15-git8.bz2 +e2b01ad85559d6f690cadca732347936 patch-2.6.15-git9.bz2 --- linux-2.6-queue-stall.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 13 15:53:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 10:53:00 -0500 Subject: rpms/alsa-lib/devel alsa-lib-1.0.11-group.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 alsa-lib.spec, 1.39, 1.40 sources, 1.21, 1.22 ainit-0.6-rights.patch, 1.1, NONE Message-ID: <200601131553.k0DFr0oh010434@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-lib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10402 Modified Files: .cvsignore alsa-lib.spec sources Added Files: alsa-lib-1.0.11-group.patch Removed Files: ainit-0.6-rights.patch Log Message: fix for #169729 - Kernel update makes snd-atiixp-modem & slmodemd fail alsa-lib-1.0.11-group.patch: dmix.conf | 1 - dsnoop.conf | 1 - 2 files changed, 2 deletions(-) --- NEW FILE alsa-lib-1.0.11-group.patch --- --- alsa-lib-1.0.11rc2/src/conf/pcm/dmix.conf.old 2005-09-19 14:38:14.000000000 +0200 +++ alsa-lib-1.0.11rc2/src/conf/pcm/dmix.conf 2006-01-13 14:56:10.000000000 +0100 @@ -26,7 +26,6 @@ } type dmix ipc_key 5678293 - ipc_gid audio ipc_perm 0660 slave { pcm { --- alsa-lib-1.0.11rc2/src/conf/pcm/dsnoop.conf.old 2005-09-08 08:36:00.000000000 +0200 +++ alsa-lib-1.0.11rc2/src/conf/pcm/dsnoop.conf 2006-01-13 14:56:17.000000000 +0100 @@ -26,7 +26,6 @@ } type dsnoop ipc_key 5778293 - ipc_gid audio ipc_perm 0660 slave { pcm { Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 12 Jan 2006 14:05:21 -0000 1.19 +++ .cvsignore 13 Jan 2006 15:52:56 -0000 1.20 @@ -6,3 +6,4 @@ ainit-0.6.tar.gz alsa-lib-1.0.10.tar.bz2 alsa-lib-1.0.11rc2.tar.bz2 +ainit-0.7.tar.gz Index: alsa-lib.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/alsa-lib.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- alsa-lib.spec 12 Jan 2006 14:05:22 -0000 1.39 +++ alsa-lib.spec 13 Jan 2006 15:52:56 -0000 1.40 @@ -1,17 +1,17 @@ %define prever rc2 %define version_main 1.0.11 -%define version_ainit 0.6 +%define version_ainit 0.7 Summary: The Advanced Linux Sound Architecture (ALSA) library. Name: alsa-lib Version: %{version_main} -Release: 1.rc2 +Release: 2.rc2 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}.tar.bz2 Source1: ainit-%{version_ainit}.tar.gz Patch0: alsa-lib-1.0.10-ainit-2.patch -Patch1: ainit-0.6-rights.patch +Patch1: alsa-lib-1.0.11-group.patch URL: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version_main}-root BuildRequires: doxygen @@ -40,7 +40,7 @@ %prep %setup -q -n %{name}-%{version_main}%{?prever} -a 1 %patch0 -p1 -b .ainit -%patch1 -p1 -b .rights +%patch1 -p1 -b .group %build %configure \ @@ -79,6 +79,9 @@ install -m 644 ainit/config/dmix.conf.lock %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf.lock install -m 644 ainit/config/dsnoop.conf.lock %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf.lock +cp %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf.back +cp %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf.back + # install ainit man pages mkdir -p %{buildroot}%{_mandir}/man8 install -m 644 ainit/doc/ainit.8 %{buildroot}%{_mandir}/man8/ainit.8 @@ -128,8 +131,9 @@ %config %{_sysconfdir}/alsa/pcm/dsnoop.template %ghost %{_sysconfdir}/alsa/pcm/dmix.conf.lock %ghost %{_sysconfdir}/alsa/pcm/dsnoop.conf.lock -%ghost %{_sysconfdir}/alsa/pcm/dmix.conf -%ghost %{_sysconfdir}/alsa/pcm/dsnoop.conf +%config %{_sysconfdir}/alsa/pcm/dmix.conf +%config %{_sysconfdir}/alsa/pcm/dsnoop.conf +%config %{_sysconfdir}/alsa/ainit.conf %files devel %defattr(-, root, root) @@ -143,6 +147,10 @@ %{_datadir}/aclocal/alsa.m4 %changelog +* Fri Jan 13 2006 Martin Stransky 1.0.11-2.rc2 +- fix for #169729 - Kernel update makes snd-atiixp-modem & slmodemd fail +- new ainit (0.7) should fix some problems with root users + * Tue Jan 12 2006 Martin Stransky 1.0.11-1.rc2 - new upstream version Index: sources =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 12 Jan 2006 14:05:22 -0000 1.21 +++ sources 13 Jan 2006 15:52:56 -0000 1.22 @@ -1,2 +1,2 @@ -16bbe521dfc466200399d59f274b4001 ainit-0.6.tar.gz 4e73229d7f88a6610993470011d39ee6 alsa-lib-1.0.11rc2.tar.bz2 +062cf16b02de99ddea47a76884d7fe3d ainit-0.7.tar.gz --- ainit-0.6-rights.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 13 16:03:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 11:03:28 -0500 Subject: rpms/avahi/devel avahi.spec,1.26,1.27 Message-ID: <200601131603.k0DG3StG013951@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13922 Modified Files: avahi.spec Log Message: fix bugs 177610 177609 Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- avahi.spec 12 Jan 2006 22:49:32 -0000 1.26 +++ avahi.spec 13 Jan 2006 16:03:23 -0000 1.27 @@ -6,7 +6,7 @@ License: LGPL URL: http://avahi.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, gdbm-devel, mono-devel +BuildRequires: doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, gdbm-devel, mono-devel >= 1.1.13 Requires: dbus, libdaemon, expat, python, dbus-python, libcap Obsoletes: howl, howl-libs Source0: %{name}-%{version}.tar.gz @@ -79,7 +79,7 @@ Summary: Mono language bindings for avahi mono development Group: Development/Libraries Requires: %{name}-devel = %{version} -Requires: mono-core >= 1.1.12 +Requires: mono-core >= 1.1.13 %description sharp The avahi-sharp package contains the files needed to develop From fedora-cvs-commits at redhat.com Fri Jan 13 16:18:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 11:18:11 -0500 Subject: rpms/flex/devel flex-2.5.4a2-std.patch, NONE, 1.1 flex-2.5.4a2-warn.patch, NONE, 1.1 flex.spec, 1.17, 1.18 Message-ID: <200601131618.k0DGIBvB029178@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27373 Modified Files: flex.spec Added Files: flex-2.5.4a2-std.patch flex-2.5.4a2-warn.patch Log Message: - Adding `std::' prefixes, got rid of `using namespace std'. (#115354) - Dummy use of `yy_flex_realloc' to silent warnings. (#30943) - Adding URL of flex home page to spec (#142675) flex-2.5.4a2-std.patch: flex.skl | 30 +++++++++++++++--------------- skel.c | 27 +++++++++++++-------------- 2 files changed, 28 insertions(+), 29 deletions(-) --- NEW FILE flex-2.5.4a2-std.patch --- diff -Burp flex-2.5.4/flex.skl flex-2.5.4-new/flex.skl --- flex-2.5.4/flex.skl 2006-01-13 16:16:52.000000000 +0100 +++ flex-2.5.4-new/flex.skl 2006-01-13 16:57:50.000000000 +0100 @@ -1,4 +1,4 @@ -/* A lexical scanner generated by flex */ +/* A lexical scanner generated by flex*/ /* Scanner skeleton version: * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ @@ -26,7 +26,7 @@ #include %+ -class istream; +#include %* /* Use prototypes in function declarations. */ @@ -153,7 +153,7 @@ struct yy_buffer_state %- FILE *yy_input_file; %+ - istream* yy_input_file; + std::istream* yy_input_file; %* char *yy_ch_buf; /* input buffer */ @@ -276,7 +276,7 @@ static void yy_flex_free YY_PROTO(( void #define YY_AT_BOL() (yy_current_buffer->yy_at_bol) -%% yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here +%% yytext/yyin/yyout/yy_state_type/yylineno etc. def\'s & init go here %- Standard (non-C++) definition static yy_state_type yy_get_previous_state YY_PROTO(( void )); @@ -296,7 +296,7 @@ static void yy_fatal_error YY_PROTO(( yy %% code to copy yytext_ptr to yytext[] goes here, if %array yy_c_buf_p = yy_cp; -%% data tables for the DFA and the user's section 1 definitions go here +%% data tables for the DFA and the user\'s section 1 definitions go here /* Macros after this point can all be overridden by user definitions in * section 1. @@ -449,10 +449,10 @@ YY_MALLOC_DECL YY_DECL { register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; + register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -%% user's declarations go here +%% user\'s declarations go here if ( yy_init ) { @@ -469,14 +469,14 @@ YY_DECL %- yyin = stdin; %+ - yyin = &cin; + yyin = &std::cin; %* if ( ! yyout ) %- yyout = stdout; %+ - yyout = &cout; + yyout = &std::cout; %* if ( ! yy_current_buffer ) @@ -646,7 +646,7 @@ do_action: /* This label is used only to } /* end of yylex */ %+ -yyFlexLexer::yyFlexLexer( istream* arg_yyin, ostream* arg_yyout ) +yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout ) { yyin = arg_yyin; yyout = arg_yyout; @@ -681,7 +681,7 @@ yyFlexLexer::~yyFlexLexer() yy_delete_buffer( yy_current_buffer ); } -void yyFlexLexer::switch_streams( istream* new_in, ostream* new_out ) +void yyFlexLexer::switch_streams( std::istream* new_in, std::ostream* new_out ) { if ( new_in ) { @@ -1058,7 +1058,7 @@ void yyrestart( input_file ) FILE *input_file; #endif %+ -void yyFlexLexer::yyrestart( istream* input_file ) +void yyFlexLexer::yyrestart( std::istream* input_file ) %* { if ( ! yy_current_buffer ) @@ -1129,7 +1129,7 @@ FILE *file; int size; #endif %+ -YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( istream* file, int size ) +YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size ) %* { YY_BUFFER_STATE b; @@ -1190,7 +1190,7 @@ FILE *file; #endif %+ -void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file ) +void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file ) %* { @@ -1434,7 +1434,7 @@ char msg[]; void yyFlexLexer::LexerError( yyconst char msg[] ) { - cerr << msg << '\n'; + std::cerr << msg << '\n'; exit( YY_EXIT_FAILURE ); } %* diff -Burp flex-2.5.4/skel.c flex-2.5.4-new/skel.c --- flex-2.5.4/skel.c 2006-01-13 16:16:52.000000000 +0100 +++ flex-2.5.4-new/skel.c 2006-01-13 16:58:53.000000000 +0100 @@ -3,7 +3,7 @@ #include "flexdef.h" const char *skel[] = { - "/* A lexical scanner generated by flex */", + "/* A lexical scanner generated by flex*/", "", "/* Scanner skeleton version:", " * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $", @@ -32,7 +32,6 @@ const char *skel[] = { "#include ", "%+", "#include ", - "using namespace std;", "%*", "", "/* Use prototypes in function declarations. */", @@ -159,7 +158,7 @@ const char *skel[] = { "%-", " FILE *yy_input_file;", "%+", - " istream* yy_input_file;", + " std::istream* yy_input_file;", "%*", "", " char *yy_ch_buf; /* input buffer */", @@ -282,7 +281,7 @@ const char *skel[] = { "", "#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)", "", - "%% yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here", + "%% yytext/yyin/yyout/yy_state_type/yylineno etc. def\\'s & init go here", "", "%- Standard (non-C++) definition", "static yy_state_type yy_get_previous_state YY_PROTO(( void ));", @@ -302,7 +301,7 @@ const char *skel[] = { "%% code to copy yytext_ptr to yytext[] goes here, if %array", " yy_c_buf_p = yy_cp;", "", - "%% data tables for the DFA and the user's section 1 definitions go here", + "%% data tables for the DFA and the user\\'s section 1 definitions go here", "", "/* Macros after this point can all be overridden by user definitions in", " * section 1.", @@ -458,7 +457,7 @@ const char *skel[] = { " register char *yy_cp = NULL, *yy_bp = NULL;", " register int yy_act;", "", - "%% user's declarations go here", + "%% user\\'s declarations go here", "", " if ( yy_init )", " {", @@ -475,14 +474,14 @@ const char *skel[] = { "%-", " yyin = stdin;", "%+", - " yyin = &cin;", + " yyin = &std::cin;", "%*", "", " if ( ! yyout )", "%-", " yyout = stdout;", "%+", - " yyout = &cout;", + " yyout = &std::cout;", "%*", "", " if ( ! yy_current_buffer )", @@ -652,7 +651,7 @@ const char *skel[] = { " } /* end of yylex */", "", "%+", - "yyFlexLexer::yyFlexLexer( istream* arg_yyin, ostream* arg_yyout )", + "yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout )", " {", " yyin = arg_yyin;", " yyout = arg_yyout;", @@ -687,7 +686,7 @@ const char *skel[] = { " yy_delete_buffer( yy_current_buffer );", " }", "", - "void yyFlexLexer::switch_streams( istream* new_in, ostream* new_out )", + "void yyFlexLexer::switch_streams( std::istream* new_in, std::ostream* new_out )", " {", " if ( new_in )", " {", @@ -1064,7 +1063,7 @@ const char *skel[] = { "FILE *input_file;", "#endif", "%+", - "void yyFlexLexer::yyrestart( istream* input_file )", + "void yyFlexLexer::yyrestart( std::istream* input_file )", "%*", " {", " if ( ! yy_current_buffer )", @@ -1135,7 +1134,7 @@ const char *skel[] = { "int size;", "#endif", "%+", - "YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( istream* file, int size )", + "YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size )", "%*", " {", " YY_BUFFER_STATE b;", @@ -1196,7 +1195,7 @@ const char *skel[] = { "#endif", "", "%+", - "void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )", + "void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file )", "%*", "", " {", @@ -1440,7 +1439,7 @@ const char *skel[] = { "", "void yyFlexLexer::LexerError( yyconst char msg[] )", " {", - " cerr << msg << '\\n';", + " std::cerr << msg << '\\n';", " exit( YY_EXIT_FAILURE );", " }", "%*", flex-2.5.4a2-warn.patch: flex.skl | 10 ++++++++++ skel.c | 10 ++++++++++ 2 files changed, 20 insertions(+) --- NEW FILE flex-2.5.4a2-warn.patch --- diff -Burp flex-2.5.4/flex.skl flex-2.5.4-new/flex.skl --- flex-2.5.4/flex.skl 2006-01-13 17:00:08.000000000 +0100 +++ flex-2.5.4-new/flex.skl 2006-01-13 17:02:17.000000000 +0100 @@ -1536,3 +1536,13 @@ int main() return 0; } #endif + +/* Some people want warning-free code, and under certain #define + conditions, gcc will warn for unusedness of some functions. This + function is provided merely to silent these warnings. It's not + static itself, so it will clutter exports, but it has at least + urandom name so that clashes won't occur.*/ +void _yy_dummy_uses_of_static_functions_b2f4_517d_02ff_b30c_3e5a_47d7_aaa3_3b5d_() +{ + yy_flex_realloc ((void*)0, 0); +} diff -Burp flex-2.5.4/skel.c flex-2.5.4-new/skel.c --- flex-2.5.4/skel.c 2006-01-13 17:00:08.000000000 +0100 +++ flex-2.5.4-new/skel.c 2006-01-13 17:02:28.000000000 +0100 @@ -1541,5 +1541,15 @@ const char *skel[] = { " return 0;", " }", "#endif", + "", + "/* Some people want warning-free code, and under certain #define", + " conditions, gcc will warn for unusedness of some functions. This", + " function is provided merely to silent these warnings. It's not", + " static itself, so it will clutter exports, but it has at least", + " urandom name so that clashes won't occur.*/", + "void _yy_dummy_uses_of_static_functions_b2f4_517d_02ff_b30c_3e5a_47d7_aaa3_3b5d_()", + "{", + " yy_flex_realloc ((void*)0, 0);", + "}", 0 }; Index: flex.spec =================================================================== RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- flex.spec 18 Dec 2005 20:38:47 -0000 1.17 +++ flex.spec 13 Jan 2006 16:18:07 -0000 1.18 @@ -1,19 +1,20 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex Version: 2.5.4a -Release: 34.3 +Release: 35 License: BSD Group: Development/Tools +URL: http://www.gnu.org/software/flex/ BuildRoot: %{_tmppath}/%{name}-root - Source: ftp://ftp.gnu.org/non-gnu/flex/flex-2.5.4a.tar.gz - Patch0: flex-2.5.4a-skel.patch Patch1: flex-2.5.4-glibc22.patch Patch2: flex-2.5.4a-gcc3.patch Patch3: flex-2.5.4a-gcc31.patch Patch4: flex-2.5.4a2.patch Patch5: flex-pic.patch +Patch6: flex-2.5.4a2-std.patch +Patch7: flex-2.5.4a2-warn.patch BuildRequires: autoconf, byacc %description @@ -38,6 +39,8 @@ %patch3 -p1 -b .gcc31 %patch4 -p1 -b .yynoinput %patch5 -p1 -b .pic +%patch6 -p1 -b .std +%patch7 -p1 -b .warn %build autoconf @@ -71,8 +74,13 @@ %{_includedir}/FlexLexer.h %changelog +* Fri Jan 13 2006 Petr Machata 2.5.4a-35 +- Adding `std::' prefixes, got rid of `using namespace std'. (#115354) +- Dummy use of `yy_flex_realloc' to silent warnings. (#30943) +- Adding URL of flex home page to spec (#142675) + * Sun Dec 18 2005 Jason Vas Dias -* rebuild with 'flex-pic.patch' to enable -pie links +- rebuild with 'flex-pic.patch' to enable -pie links on x86_64 (patch from Jesse Keating) . * Fri Dec 09 2005 Jesse Keating From fedora-cvs-commits at redhat.com Fri Jan 13 16:21:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 11:21:42 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.605, 1.606 sources, 1.148, 1.149 Message-ID: <200601131621.k0DGLgak030596@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30570 Modified Files: openoffice.org.spec sources Log Message: try this Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.605 retrieving revision 1.606 diff -u -r1.605 -r1.606 --- openoffice.org.spec 12 Jan 2006 13:52:56 -0000 1.605 +++ openoffice.org.spec 13 Jan 2006 16:21:40 -0000 1.606 @@ -1,6 +1,6 @@ %define oootag OOA680 %define ooomilestone 1 -%define rh_rpm_release 5 +%define rh_rpm_release 5.cmctest %define build_fc5 1 %define build_fc4 0 @@ -127,15 +127,14 @@ URL: http://www.openoffice.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: %{ooo_base_name}.tar.bz2 -Source1: openoffice.org-jakubicons.tar.gz -Source2: openoffice.org-myspell-contrib.tar.gz -Source3: GSI_ta-IN.sdf -Source4: openoffice.org-simple-crash_report.sh -Source5: RegisterAndLicence.xcu -Source6: opens___.ttf -Source7: GSI_ga.sdf -Source8: gcj-sed.sh -Source9: evolocal.odb +Source1: openoffice.org-myspell-contrib.tar.gz +Source2: GSI_ta-IN.sdf +Source3: openoffice.org-simple-crash_report.sh +Source4: RegisterAndLicence.xcu +Source5: opens___.ttf +Source6: GSI_ga.sdf +Source7: gcj-sed.sh +Source8: evolocal.odb BuildRequires: tcsh, perl, sed, zip, bzip2, unzip, tar, findutils BuildRequires: autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib BuildRequires: gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip @@ -879,7 +878,9 @@ %if %{build_fc4} %patch47 -p1 -b .gcc25199.bitfieldaccess.patch %endif +%if %{build_fc5} %patch48 -p1 -b .ooo59537.config_office.nss.patch +%endif %patch49 -p1 -b .ooo59666.vcl.animatedtheme.patch %patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch %patch51 -p1 -b .ooo59997.sw.defaultbullets.patch @@ -905,9 +906,9 @@ #end ludicrous workaround %endif -tar xzf %{SOURCE2} +tar xzf %{SOURCE1} -cp %{SOURCE9} extras/source/database/evolocal.odb +cp %{SOURCE8} extras/source/database/evolocal.odb %build echo build start time is `date`, diskspace: `df -h . | tail -n 1` @@ -974,7 +975,7 @@ # gcc#19870# gcj access problems, monsterous hack to force all java through # a sed script which replaces private and protected with public, shudder! -cp %{SOURCE8} solenv/bin/gcj +cp %{SOURCE7} solenv/bin/gcj chmod u+x solenv/bin/gcj export TRUEJAVACOMPILER=$JAVACOMPILER export JAVACOMPILER=`pwd`/solenv/bin/gcj @@ -994,8 +995,8 @@ cd transex3/prj build --dlv_switch link --all -P$MAXBUILDS deliver -localize -m -x -l ta-IN -f %{SOURCE3} -localize -m -x -l ga -f %{SOURCE7} +localize -m -x -l ta-IN -f %{SOURCE2} +localize -m -x -l ga -f %{SOURCE6} cd ../.. cd instsetoo_native/util @@ -1053,7 +1054,7 @@ %install #add our custom configuration options -$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE5} +$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{SOURCE4} # rh#163147# convert non AMT to AMT fonts sed -i -e "s/Thorndale/Thorndale AMT/g" $RPM_BUILD_ROOT/%{instdir}/share/registry/data/org/openoffice/VCL.xcu @@ -1136,11 +1137,11 @@ if [ $executable == 1 ]; then false; fi #add in a simple crash reporter replacement -cp -f %{SOURCE4} $RPM_BUILD_ROOT/%{instdir}/program/crash_report +cp -f %{SOURCE3} $RPM_BUILD_ROOT/%{instdir}/program/crash_report chmod a+x $RPM_BUILD_ROOT/%{instdir}/program/crash_report #use ooo-build opens___.ttf with greater coverage -cp -f %{SOURCE6} $RPM_BUILD_ROOT/%{instdir}/share/fonts/truetype/opens___.ttf +cp -f %{SOURCE5} $RPM_BUILD_ROOT/%{instdir}/share/fonts/truetype/opens___.ttf #make up some /usr/bin scripts mkdir -p $RPM_BUILD_ROOT/%{_bindir} @@ -1205,8 +1206,7 @@ mv $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop %endif rm -rf $RPM_BUILD_ROOT/%{instdir}/share/xdg -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons -tar -C $RPM_BUILD_ROOT/%{_datadir}/icons -xzf %{SOURCE1} +cp -r sysui/unxlng*/misc/redhat/usr/share/icons $RPM_BUILD_ROOT/%{_datadir} cp -r sysui/unxlng*/misc/redhat/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir} cp -r sysui/unxlng*/misc/redhat/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir} rm -f $RPM_BUILD_ROOT/%{_datadir}/mimelnk/application.flag @@ -2885,7 +2885,7 @@ %post core update-desktop-database -q %{_datadir}/applications -for theme in hicolor; do +for theme in hicolor locolor gnome; do if [ -x /usr/bin/gtk-update-icon-cache ]; then if test -f "%{_datadir}/icons/$theme"; then if test -f "%{_datadir}/icons/$theme/index.theme"; then @@ -2898,7 +2898,7 @@ %postun core update-desktop-database -q %{_datadir}/applications -for theme in hicolor; do +for theme in hicolor locolor gnome; do if [ -x /usr/bin/gtk-update-icon-cache ]; then if test -f "%{_datadir}/icons/$theme"; then if test -f "%{_datadir}/icons/$theme/index.theme"; then @@ -3342,6 +3342,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Fri Jan 13 2006 Caolan McNamara - 1:2.0.1.1-5.cmctest +- icons + * Wed Jan 04 2006 Caolan McNamara - 1:2.0.1.1-5 - spinbutton factory needs to be uneditable as well as combobox - add openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch for jrb Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- sources 15 Dec 2005 14:00:49 -0000 1.148 +++ sources 13 Jan 2006 16:21:40 -0000 1.149 @@ -1,5 +1,4 @@ a66c6ab52b2eb2deaa7ff85595276b15 GSI_ta-IN.sdf -176aa81d51a6ed28c5e9a14696a8d208 openoffice.org-jakubicons.tar.gz a4a22f6b80a4f02c01bbe0400e131e57 RegisterAndLicence.xcu 66ee360bd11d33b0ba2283922d853706 opens___.ttf 2cd37ed5f2ac9fa129f6aaaa3491988f openoffice.org-myspell-contrib.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 13 16:28:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 11:28:07 -0500 Subject: rpms/libiec61883/devel libiec61883.spec,1.5,1.6 Message-ID: <200601131628.k0DGS7wB000737@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/libiec61883/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv699 Modified Files: libiec61883.spec Log Message: - Add missing autoconf, automake and libtool BuildRequires Index: libiec61883.spec =================================================================== RCS file: /cvs/dist/rpms/libiec61883/devel/libiec61883.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libiec61883.spec 9 Dec 2005 22:41:36 -0000 1.5 +++ libiec61883.spec 13 Jan 2006 16:28:05 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Streaming library for IEEE1394 Name: libiec61883 Version: 1.0.0 -Release: 9.fc5.1 +Release: 10.fc5 License: LGPL Group: Libraries Source: http://linux1394.org/dl/%{name}-%{version}.tar.gz @@ -12,6 +12,7 @@ # Works only with newer libraw1394 versions BuildRequires: libraw1394-devel >= 1.2.0 +BuildRequires: autoconf, automake, libtool Requires: libraw1394 >= 1.2.0 %description @@ -78,6 +79,10 @@ %{_bindir}/* %changelog +* Fri Dec 30 2005 Jarod Wilson 1.0.0-10 +- Add missing autoconf, automake and libtool + BuildRequires + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Fri Jan 13 16:35:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 11:35:40 -0500 Subject: rpms/control-center/devel control-center.spec,1.107,1.108 Message-ID: <200601131635.k0DGZeHX002678@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2629 Modified Files: control-center.spec Log Message: Fix mouse capplet Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- control-center.spec 5 Jan 2006 06:24:34 -0000 1.107 +++ control-center.spec 13 Jan 2006 16:35:25 -0000 1.108 @@ -21,7 +21,7 @@ Summary: GNOME Control Center. Name: control-center Version: 2.13.4 -Release: 1 +Release: 2 Epoch: 1 License: GPL/LGPL Group: User Interface/Desktops @@ -68,6 +68,7 @@ BuildRequires: /usr/bin/autoconf BuildRequires: metacity >= %{metacity_version} BuildRequires: libxklavier-devel >= %{libxklavier_version} +BuildRequires: libXcursor-devel BuildRequires: alsa-lib-devel BuildRequires: nautilus BuildRequires: eel2-devel @@ -215,6 +216,10 @@ # (also its headers) %changelog +* Fri Jan 13 2006 Matthias Clasen - 1:2.13.4-2 +- Add a build requires for libXcursor-devel, to fix the + mouse capplet. + * Wed Jan 4 2006 Matthias Clasen - 1:2.13.4-1 - Update to 2.13.4 From fedora-cvs-commits at redhat.com Fri Jan 13 16:35:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 11:35:50 -0500 Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec,1.1,1.2 Message-ID: <200601131635.k0DGZoTB002737@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-String-CRC32/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2713 Modified Files: perl-String-CRC32.spec Log Message: fix bug 177700: differentiate version from FE4, FE dev versions Index: perl-String-CRC32.spec =================================================================== RCS file: /cvs/dist/rpms/perl-String-CRC32/devel/perl-String-CRC32.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-String-CRC32.spec 19 Dec 2005 22:28:47 -0000 1.1 +++ perl-String-CRC32.spec 13 Jan 2006 16:35:46 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-String-CRC32 Version: 1.3 -Release: 1 +Release: 1.4.FC5 Summary: Perl interface for cyclic redundency check generation @@ -53,9 +53,10 @@ %{_mandir}/man3/*.3* %changelog +* Fri Jan 13 2006 Jason Vas Dias - 0.1.03-1.4.FC5 +- fix bug 177700: differentiate version from FE4, FE dev versions + * Fri Dec 16 2005 Jason Vas Dias - 0:1.03-1 - Initial build. - Required by lftp-3.3.x+ - Imported to fix bug 176175 - - From fedora-cvs-commits at redhat.com Fri Jan 13 16:42:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 11:42:29 -0500 Subject: rpms/flex/FC-4 flex-2.5.4a2-std.patch, NONE, 1.1 flex-2.5.4a2-warn.patch, NONE, 1.1 flex-pic.patch, NONE, 1.1 flex.spec, 1.14, 1.15 Message-ID: <200601131642.k0DGgTSr004642@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv4303 Modified Files: flex.spec Added Files: flex-2.5.4a2-std.patch flex-2.5.4a2-warn.patch flex-pic.patch Log Message: - Porting changes done in devel back to fc4. flex-2.5.4a2-std.patch: flex.skl | 30 +++++++++++++++--------------- skel.c | 27 +++++++++++++-------------- 2 files changed, 28 insertions(+), 29 deletions(-) --- NEW FILE flex-2.5.4a2-std.patch --- diff -Burp flex-2.5.4/flex.skl flex-2.5.4-new/flex.skl --- flex-2.5.4/flex.skl 2006-01-13 16:16:52.000000000 +0100 +++ flex-2.5.4-new/flex.skl 2006-01-13 16:57:50.000000000 +0100 @@ -1,4 +1,4 @@ -/* A lexical scanner generated by flex */ +/* A lexical scanner generated by flex*/ /* Scanner skeleton version: * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $ @@ -26,7 +26,7 @@ #include %+ -class istream; +#include %* /* Use prototypes in function declarations. */ @@ -153,7 +153,7 @@ struct yy_buffer_state %- FILE *yy_input_file; %+ - istream* yy_input_file; + std::istream* yy_input_file; %* char *yy_ch_buf; /* input buffer */ @@ -276,7 +276,7 @@ static void yy_flex_free YY_PROTO(( void #define YY_AT_BOL() (yy_current_buffer->yy_at_bol) -%% yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here +%% yytext/yyin/yyout/yy_state_type/yylineno etc. def\'s & init go here %- Standard (non-C++) definition static yy_state_type yy_get_previous_state YY_PROTO(( void )); @@ -296,7 +296,7 @@ static void yy_fatal_error YY_PROTO(( yy %% code to copy yytext_ptr to yytext[] goes here, if %array yy_c_buf_p = yy_cp; -%% data tables for the DFA and the user's section 1 definitions go here +%% data tables for the DFA and the user\'s section 1 definitions go here /* Macros after this point can all be overridden by user definitions in * section 1. @@ -449,10 +449,10 @@ YY_MALLOC_DECL YY_DECL { register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; + register char *yy_cp = NULL, *yy_bp = NULL; register int yy_act; -%% user's declarations go here +%% user\'s declarations go here if ( yy_init ) { @@ -469,14 +469,14 @@ YY_DECL %- yyin = stdin; %+ - yyin = &cin; + yyin = &std::cin; %* if ( ! yyout ) %- yyout = stdout; %+ - yyout = &cout; + yyout = &std::cout; %* if ( ! yy_current_buffer ) @@ -646,7 +646,7 @@ do_action: /* This label is used only to } /* end of yylex */ %+ -yyFlexLexer::yyFlexLexer( istream* arg_yyin, ostream* arg_yyout ) +yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout ) { yyin = arg_yyin; yyout = arg_yyout; @@ -681,7 +681,7 @@ yyFlexLexer::~yyFlexLexer() yy_delete_buffer( yy_current_buffer ); } -void yyFlexLexer::switch_streams( istream* new_in, ostream* new_out ) +void yyFlexLexer::switch_streams( std::istream* new_in, std::ostream* new_out ) { if ( new_in ) { @@ -1058,7 +1058,7 @@ void yyrestart( input_file ) FILE *input_file; #endif %+ -void yyFlexLexer::yyrestart( istream* input_file ) +void yyFlexLexer::yyrestart( std::istream* input_file ) %* { if ( ! yy_current_buffer ) @@ -1129,7 +1129,7 @@ FILE *file; int size; #endif %+ -YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( istream* file, int size ) +YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size ) %* { YY_BUFFER_STATE b; @@ -1190,7 +1190,7 @@ FILE *file; #endif %+ -void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file ) +void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file ) %* { @@ -1434,7 +1434,7 @@ char msg[]; void yyFlexLexer::LexerError( yyconst char msg[] ) { - cerr << msg << '\n'; + std::cerr << msg << '\n'; exit( YY_EXIT_FAILURE ); } %* diff -Burp flex-2.5.4/skel.c flex-2.5.4-new/skel.c --- flex-2.5.4/skel.c 2006-01-13 16:16:52.000000000 +0100 +++ flex-2.5.4-new/skel.c 2006-01-13 16:58:53.000000000 +0100 @@ -3,7 +3,7 @@ #include "flexdef.h" const char *skel[] = { - "/* A lexical scanner generated by flex */", + "/* A lexical scanner generated by flex*/", "", "/* Scanner skeleton version:", " * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $", @@ -32,7 +32,6 @@ const char *skel[] = { "#include ", "%+", "#include ", - "using namespace std;", "%*", "", "/* Use prototypes in function declarations. */", @@ -159,7 +158,7 @@ const char *skel[] = { "%-", " FILE *yy_input_file;", "%+", - " istream* yy_input_file;", + " std::istream* yy_input_file;", "%*", "", " char *yy_ch_buf; /* input buffer */", @@ -282,7 +281,7 @@ const char *skel[] = { "", "#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)", "", - "%% yytext/yyin/yyout/yy_state_type/yylineno etc. def's & init go here", + "%% yytext/yyin/yyout/yy_state_type/yylineno etc. def\\'s & init go here", "", "%- Standard (non-C++) definition", "static yy_state_type yy_get_previous_state YY_PROTO(( void ));", @@ -302,7 +301,7 @@ const char *skel[] = { "%% code to copy yytext_ptr to yytext[] goes here, if %array", " yy_c_buf_p = yy_cp;", "", - "%% data tables for the DFA and the user's section 1 definitions go here", + "%% data tables for the DFA and the user\\'s section 1 definitions go here", "", "/* Macros after this point can all be overridden by user definitions in", " * section 1.", @@ -458,7 +457,7 @@ const char *skel[] = { " register char *yy_cp = NULL, *yy_bp = NULL;", " register int yy_act;", "", - "%% user's declarations go here", + "%% user\\'s declarations go here", "", " if ( yy_init )", " {", @@ -475,14 +474,14 @@ const char *skel[] = { "%-", " yyin = stdin;", "%+", - " yyin = &cin;", + " yyin = &std::cin;", "%*", "", " if ( ! yyout )", "%-", " yyout = stdout;", "%+", - " yyout = &cout;", + " yyout = &std::cout;", "%*", "", " if ( ! yy_current_buffer )", @@ -652,7 +651,7 @@ const char *skel[] = { " } /* end of yylex */", "", "%+", - "yyFlexLexer::yyFlexLexer( istream* arg_yyin, ostream* arg_yyout )", + "yyFlexLexer::yyFlexLexer( std::istream* arg_yyin, std::ostream* arg_yyout )", " {", " yyin = arg_yyin;", " yyout = arg_yyout;", @@ -687,7 +686,7 @@ const char *skel[] = { " yy_delete_buffer( yy_current_buffer );", " }", "", - "void yyFlexLexer::switch_streams( istream* new_in, ostream* new_out )", + "void yyFlexLexer::switch_streams( std::istream* new_in, std::ostream* new_out )", " {", " if ( new_in )", " {", @@ -1064,7 +1063,7 @@ const char *skel[] = { "FILE *input_file;", "#endif", "%+", - "void yyFlexLexer::yyrestart( istream* input_file )", + "void yyFlexLexer::yyrestart( std::istream* input_file )", "%*", " {", " if ( ! yy_current_buffer )", @@ -1135,7 +1134,7 @@ const char *skel[] = { "int size;", "#endif", "%+", - "YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( istream* file, int size )", + "YY_BUFFER_STATE yyFlexLexer::yy_create_buffer( std::istream* file, int size )", "%*", " {", " YY_BUFFER_STATE b;", @@ -1196,7 +1195,7 @@ const char *skel[] = { "#endif", "", "%+", - "void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, istream* file )", + "void yyFlexLexer::yy_init_buffer( YY_BUFFER_STATE b, std::istream* file )", "%*", "", " {", @@ -1440,7 +1439,7 @@ const char *skel[] = { "", "void yyFlexLexer::LexerError( yyconst char msg[] )", " {", - " cerr << msg << '\\n';", + " std::cerr << msg << '\\n';", " exit( YY_EXIT_FAILURE );", " }", "%*", flex-2.5.4a2-warn.patch: flex.skl | 10 ++++++++++ skel.c | 10 ++++++++++ 2 files changed, 20 insertions(+) --- NEW FILE flex-2.5.4a2-warn.patch --- diff -Burp flex-2.5.4/flex.skl flex-2.5.4-new/flex.skl --- flex-2.5.4/flex.skl 2006-01-13 17:00:08.000000000 +0100 +++ flex-2.5.4-new/flex.skl 2006-01-13 17:02:17.000000000 +0100 @@ -1536,3 +1536,13 @@ int main() return 0; } #endif + +/* Some people want warning-free code, and under certain #define + conditions, gcc will warn for unusedness of some functions. This + function is provided merely to silent these warnings. It's not + static itself, so it will clutter exports, but it has at least + urandom name so that clashes won't occur.*/ +void _yy_dummy_uses_of_static_functions_b2f4_517d_02ff_b30c_3e5a_47d7_aaa3_3b5d_() +{ + yy_flex_realloc ((void*)0, 0); +} diff -Burp flex-2.5.4/skel.c flex-2.5.4-new/skel.c --- flex-2.5.4/skel.c 2006-01-13 17:00:08.000000000 +0100 +++ flex-2.5.4-new/skel.c 2006-01-13 17:02:28.000000000 +0100 @@ -1541,5 +1541,15 @@ const char *skel[] = { " return 0;", " }", "#endif", + "", + "/* Some people want warning-free code, and under certain #define", + " conditions, gcc will warn for unusedness of some functions. This", + " function is provided merely to silent these warnings. It's not", + " static itself, so it will clutter exports, but it has at least", + " urandom name so that clashes won't occur.*/", + "void _yy_dummy_uses_of_static_functions_b2f4_517d_02ff_b30c_3e5a_47d7_aaa3_3b5d_()", + "{", + " yy_flex_realloc ((void*)0, 0);", + "}", 0 }; flex-pic.patch: Makefile.in | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE flex-pic.patch --- --- flex-2.5.4/Makefile.in 2005-12-16 19:32:59.000000000 -0800 +++ flex-2.5.4/Makefile.in.pic 2005-12-16 19:31:18.000000000 -0800 @@ -118,6 +118,11 @@ scan.o: scan.c parse.h flexdef.h config.h yylex.o: yylex.c parse.h flexdef.h config.h +libmain.o: libmain.c + $(CC) -c $(CPPFLAGS) -fPIC $(CFLAGS) $< +libyywrap.o: libyywrap.c + $(CC) -c $(CPPFLAGS) -fPIC $(CFLAGS) $< + skel.c: flex.skl mkskel.sh $(SHELL) $(srcdir)/mkskel.sh $(srcdir)/flex.skl >skel.c Index: flex.spec =================================================================== RCS file: /cvs/dist/rpms/flex/FC-4/flex.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- flex.spec 10 Apr 2005 12:14:37 -0000 1.14 +++ flex.spec 13 Jan 2006 16:42:25 -0000 1.15 @@ -1,19 +1,20 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex Version: 2.5.4a -Release: 34 +Release: 35.fc4 License: BSD Group: Development/Tools +URL: http://www.gnu.org/software/flex/ BuildRoot: %{_tmppath}/%{name}-root - Source: ftp://ftp.gnu.org/non-gnu/flex/flex-2.5.4a.tar.gz - Patch0: flex-2.5.4a-skel.patch Patch1: flex-2.5.4-glibc22.patch Patch2: flex-2.5.4a-gcc3.patch Patch3: flex-2.5.4a-gcc31.patch Patch4: flex-2.5.4a2.patch - +Patch5: flex-pic.patch +Patch6: flex-2.5.4a2-std.patch +Patch7: flex-2.5.4a2-warn.patch BuildRequires: autoconf, byacc %description @@ -37,6 +38,9 @@ %patch2 -p1 -b .glib3 %patch3 -p1 -b .gcc31 %patch4 -p1 -b .yynoinput +%patch5 -p1 -b .pic +%patch6 -p1 -b .std +%patch7 -p1 -b .warn %build autoconf @@ -70,6 +74,15 @@ %{_includedir}/FlexLexer.h %changelog +* Fri Jan 13 2006 Petr Machata 2.5.4a-35.fc4 +- Adding `std::' prefixes, got rid of `using namespace std'. (#115354) +- Dummy use of `yy_flex_realloc' to silent warnings. (#30943) +- Adding URL of flex home page to spec (#142675) + +* Sun Dec 18 2005 Jason Vas Dias +- rebuild with 'flex-pic.patch' to enable -pie links + on x86_64 (patch from Jesse Keating) . + * Sun Apr 10 2005 Jakub Jelinek 2.5.4a-34 - rebuilt with GCC 4 - add %%check script From fedora-cvs-commits at redhat.com Fri Jan 13 17:05:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 12:05:48 -0500 Subject: rpms/bash/devel bash-login.patch,NONE,1.1 bash.spec,1.102,1.103 Message-ID: <200601131705.k0DH5mca023497@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23454 Modified Files: bash.spec Added Files: bash-login.patch Log Message: * Fri Jan 13 2006 Tim Waugh - Fix 'exec -l /bin/bash'. bash-login.patch: shell.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) --- NEW FILE bash-login.patch --- --- bash-3.1/shell.c.login 2006-01-13 16:52:14.000000000 +0000 +++ bash-3.1/shell.c 2006-01-13 16:52:15.000000000 +0000 @@ -1543,9 +1543,10 @@ any startup files; just try to be more like /bin/sh. */ shell_name = argv0 ? base_pathname (argv0) : PROGRAM; - if (*shell_name == '-') + if (argv0 && *argv0 == '-') { - shell_name++; + if (*shell_name == '-') + shell_name++; login_shell++; } Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- bash.spec 12 Jan 2006 10:32:28 -0000 1.102 +++ bash.spec 13 Jan 2006 17:05:44 -0000 1.103 @@ -22,6 +22,7 @@ Patch102: bash-2.03-profile.patch Patch103: bash-2.05a-requires.patch Patch105: bash-aq.patch +Patch106: bash-login.patch Patch107: bash-2.05a-interpreter.patch Patch108: bash-2.05b-readline-oom.patch Patch112: bash-ulimit.patch @@ -68,6 +69,7 @@ %patch102 -p1 -b .profile %patch103 -p1 -b .requires %patch105 -p1 -b .aq +%patch106 -p1 -b .login %patch107 -p1 -b .interpreter %patch108 -p1 -b .readline-oom %patch112 -p1 -b .ulimit @@ -211,6 +213,9 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Fri Jan 13 2006 Tim Waugh +- Fix 'exec -l /bin/bash'. + * Thu Jan 12 2006 Tim Waugh 3.1-4 - Fix sighandler patch bug (bug #177545). From fedora-cvs-commits at redhat.com Fri Jan 13 17:06:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 12:06:43 -0500 Subject: rpms/bash/devel bash.spec,1.103,1.104 Message-ID: <200601131706.k0DH6hBa023668@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23631 Modified Files: bash.spec Log Message: 3.1-5 Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- bash.spec 13 Jan 2006 17:05:44 -0000 1.103 +++ bash.spec 13 Jan 2006 17:06:27 -0000 1.104 @@ -1,7 +1,7 @@ Version: 3.1 Name: bash Summary: The GNU Bourne Again shell (bash) version %{version}. -Release: 4 +Release: 5 Group: System Environment/Shells License: GPL Url: http://www.gnu.org/software/bash @@ -213,7 +213,7 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog -* Fri Jan 13 2006 Tim Waugh +* Fri Jan 13 2006 Tim Waugh 3.1-5 - Fix 'exec -l /bin/bash'. * Thu Jan 12 2006 Tim Waugh 3.1-4 From fedora-cvs-commits at redhat.com Fri Jan 13 17:17:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 12:17:19 -0500 Subject: rpms/kernel/devel linux-2.6-audit-git.patch, NONE, 1.1.6.1 linux-2.6-audit-promisc.patch, NONE, 1.1.2.1 linux-2.6-audit-rule-log.patch, NONE, 1.1.2.1 linux-2.6-audit-string-1.patch, NONE, 1.1.2.1 linux-2.6-audit-string-2.patch, NONE, 1.1.2.1 linux-2.6-audit-tty.patch, NONE, 1.1.2.1 linux-2.6-unshare-1.patch, NONE, 1.1.2.1 linux-2.6-unshare-10.patch, NONE, 1.1.2.1 linux-2.6-unshare-2.patch, NONE, 1.1.2.1 linux-2.6-unshare-3.patch, NONE, 1.1.2.1 linux-2.6-unshare-4.patch, NONE, 1.1.2.1 linux-2.6-unshare-5.patch, NONE, 1.1.2.1 linux-2.6-unshare-6.patch, NONE, 1.1.2.1 linux-2.6-unshare-7.patch, NONE, 1.1.2.1 linux-2.6-unshare-8.patch, NONE, 1.1.2.1 linux-2.6-unshare-9.patch, NONE, 1.1.2.1 kernel-2.6.spec, 1.1826.2.10, 1.1826.2.10.2.1 Message-ID: <200601131717.k0DHHJM8026725@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26343 Modified Files: Tag: private-fc5-test2-lspp-branch kernel-2.6.spec Added Files: Tag: private-fc5-test2-lspp-branch linux-2.6-audit-git.patch linux-2.6-audit-promisc.patch linux-2.6-audit-rule-log.patch linux-2.6-audit-string-1.patch linux-2.6-audit-string-2.patch linux-2.6-audit-tty.patch linux-2.6-unshare-1.patch linux-2.6-unshare-10.patch linux-2.6-unshare-2.patch linux-2.6-unshare-3.patch linux-2.6-unshare-4.patch linux-2.6-unshare-5.patch linux-2.6-unshare-6.patch linux-2.6-unshare-7.patch linux-2.6-unshare-8.patch linux-2.6-unshare-9.patch Log Message: lspp.6 kernel linux-2.6-audit-git.patch: arch/ia64/kernel/ptrace.c | 10 fs/namei.c | 14 fs/open.c | 8 fs/xattr.c | 11 include/linux/audit.h | 98 ++++- include/linux/fsnotify.h | 14 include/linux/security.h | 33 + ipc/msg.c | 5 ipc/sem.c | 5 ipc/shm.c | 4 ipc/util.c | 2 kernel/Makefile | 2 kernel/audit.c | 142 +++++-- kernel/audit.h | 70 +++ kernel/auditfilter.c | 375 +++++++++++++++++++ kernel/auditsc.c | 786 +++++++++++++++++++++-------------------- security/dummy.c | 14 security/selinux/hooks.c | 98 ++--- security/selinux/nlmsgtab.c | 6 security/selinux/selinuxfs.c | 11 security/selinux/ss/services.c | 15 21 files changed, 1204 insertions(+), 519 deletions(-) --- NEW FILE linux-2.6-audit-git.patch --- diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c index 4b19d04..49fd3f6 100644 --- a/arch/ia64/kernel/ptrace.c +++ b/arch/ia64/kernel/ptrace.c @@ -1663,8 +1663,14 @@ syscall_trace_leave (long arg0, long arg long arg4, long arg5, long arg6, long arg7, struct pt_regs regs) { - if (unlikely(current->audit_context)) - audit_syscall_exit(current, AUDITSC_RESULT(regs.r10), regs.r8); + if (unlikely(current->audit_context)) { + int success = AUDITSC_RESULT(regs.r10); + long result = regs.r8; + + if (success != AUDITSC_SUCCESS) + result = -result; + audit_syscall_exit(current, success, result); + } if (test_thread_flag(TIF_SYSCALL_TRACE) && (current->ptrace & PT_PTRACED)) diff --git a/fs/namei.c b/fs/namei.c index 6dbbd42..55798c3 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1090,8 +1090,7 @@ int fastcall path_lookup(const char *nam current->total_link_count = 0; retval = link_path_walk(name, nd); out: - if (unlikely(current->audit_context - && nd && nd->dentry && nd->dentry->d_inode)) + if (nd && nd->dentry && nd->dentry->d_inode) audit_inode(name, nd->dentry->d_inode, flags); return retval; } @@ -1301,6 +1300,7 @@ static inline int may_delete(struct inod return -ENOENT; BUG_ON(victim->d_parent->d_inode != dir); + audit_inode_child(victim->d_name.name, victim->d_inode, dir->i_ino); error = permission(dir,MAY_WRITE | MAY_EXEC, NULL); if (error) @@ -1420,7 +1420,7 @@ int vfs_create(struct inode *dir, struct DQUOT_INIT(dir); error = dir->i_op->create(dir, dentry, mode, nd); if (!error) - fsnotify_create(dir, dentry->d_name.name); + fsnotify_create(dir, dentry); return error; } @@ -1739,7 +1739,7 @@ int vfs_mknod(struct inode *dir, struct DQUOT_INIT(dir); error = dir->i_op->mknod(dir, dentry, mode, dev); if (!error) - fsnotify_create(dir, dentry->d_name.name); + fsnotify_create(dir, dentry); return error; } @@ -1810,7 +1810,7 @@ int vfs_mkdir(struct inode *dir, struct DQUOT_INIT(dir); error = dir->i_op->mkdir(dir, dentry, mode); if (!error) - fsnotify_mkdir(dir, dentry->d_name.name); + fsnotify_mkdir(dir, dentry); return error; } @@ -2047,7 +2047,7 @@ int vfs_symlink(struct inode *dir, struc DQUOT_INIT(dir); error = dir->i_op->symlink(dir, dentry, oldname); if (!error) - fsnotify_create(dir, dentry->d_name.name); + fsnotify_create(dir, dentry); return error; } @@ -2118,7 +2118,7 @@ int vfs_link(struct dentry *old_dentry, error = dir->i_op->link(old_dentry, dir, new_dentry); up(&old_dentry->d_inode->i_sem); if (!error) - fsnotify_create(dir, new_dentry->d_name.name); + fsnotify_create(dir, new_dentry); return error; } diff --git a/fs/open.c b/fs/open.c index f53a5b9..3231a67 100644 --- a/fs/open.c +++ b/fs/open.c @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -613,6 +614,8 @@ asmlinkage long sys_fchmod(unsigned int dentry = file->f_dentry; inode = dentry->d_inode; + audit_inode(NULL, inode, 0); + err = -EROFS; if (IS_RDONLY(inode)) goto out_putf; @@ -736,7 +739,10 @@ asmlinkage long sys_fchown(unsigned int file = fget(fd); if (file) { - error = chown_common(file->f_dentry, user, group); + struct dentry * dentry; + dentry = file->f_dentry; + audit_inode(NULL, dentry->d_inode, 0); + error = chown_common(dentry, user, group); fput(file); } return error; diff --git a/fs/xattr.c b/fs/xattr.c index bcc2156..8f40edf 100644 --- a/fs/xattr.c +++ b/fs/xattr.c @@ -17,6 +17,7 @@ #include #include #include +#include #include /* @@ -113,12 +114,15 @@ sys_fsetxattr(int fd, char __user *name, size_t size, int flags) { struct file *f; + struct dentry *dentry; int error = -EBADF; f = fget(fd); if (!f) return error; - error = setxattr(f->f_dentry, name, value, size, flags); + dentry = f->f_dentry; + audit_inode(NULL, dentry->d_inode, 0); + error = setxattr(dentry, name, value, size, flags); fput(f); return error; } @@ -365,12 +369,15 @@ asmlinkage long sys_fremovexattr(int fd, char __user *name) { struct file *f; + struct dentry *dentry; int error = -EBADF; f = fget(fd); if (!f) return error; - error = removexattr(f->f_dentry, name); + dentry = f->f_dentry; + audit_inode(NULL, dentry->d_inode, 0); + error = removexattr(dentry, name); fput(f); return error; } diff --git a/include/linux/audit.h b/include/linux/audit.h index da3c019..a485639 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -33,11 +33,20 @@ * 1200 - 1299 messages internal to the audit daemon * 1300 - 1399 audit event messages * 1400 - 1499 SE Linux use - * 1500 - 1999 future use - * 2000 is for otherwise unclassified kernel audit messages + * 1500 - 1599 kernel LSPP events + * 1600 - 1699 kernel crypto events + * 1700 - 1999 future kernel use (maybe integrity labels and related events) + * 2000 is for otherwise unclassified kernel audit messages (legacy) + * 2001 - 2099 unused (kernel) + * 2100 - 2199 user space anomaly records + * 2200 - 2299 user space actions taken in response to anomalies + * 2300 - 2399 user space generated LSPP events + * 2400 - 2499 user space crypto events + * 2500 - 2999 future user space (maybe integrity labels and related events) * - * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user - * space. Anything over that is kernel --> user space communication. + * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are + * exclusively user space. 1300-2099 is kernel --> user space + * communication. */ #define AUDIT_GET 1000 /* Get status */ #define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ @@ -54,6 +63,8 @@ #define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages mostly uninteresting to kernel */ #define AUDIT_USER_AVC 1107 /* We filter this differently */ [...2439 lines suppressed...] - rc = -EOPNOTSUPP; - goto out; - } - - rc = security_sid_to_context(isec->sid, &context, &len); - if (rc) - goto out; - - /* Probe for required buffer size */ - if (!buffer || !size) { - rc = len; - goto out_free; - } - if (size < len) { - rc = -ERANGE; - goto out_free; - } + if (strcmp(name, XATTR_SELINUX_SUFFIX)) + return -EOPNOTSUPP; - if (err > 0) { - if ((len == err) && !(memcmp(context, buffer, len))) { - /* Don't need to canonicalize value */ - rc = err; - goto out_free; - } - memset(buffer, 0, size); - } - memcpy(buffer, context, len); - rc = len; -out_free: - kfree(context); -out: - return rc; + return selinux_getsecurity(isec->sid, buffer, size); } static int selinux_inode_setsecurity(struct inode *inode, const char *name, @@ -4054,6 +4052,13 @@ static int selinux_ipc_permission(struct return ipc_has_perm(ipcp, av); } +static int selinux_ipc_getsecurity(struct kern_ipc_perm *ipcp, void *buffer, size_t size) +{ + struct ipc_security_struct *isec = ipcp->security; + + return selinux_getsecurity(isec->sid, buffer, size); +} + /* module stacking operations */ static int selinux_register_security (const char *name, struct security_operations *ops) { @@ -4095,8 +4100,7 @@ static int selinux_getprocattr(struct ta char *name, void *value, size_t size) { struct task_security_struct *tsec; - u32 sid, len; - char *context; + u32 sid; int error; if (current != p) { @@ -4105,9 +4109,6 @@ static int selinux_getprocattr(struct ta return error; } - if (!size) - return -ERANGE; - tsec = p->security; if (!strcmp(name, "current")) @@ -4124,16 +4125,7 @@ static int selinux_getprocattr(struct ta if (!sid) return 0; - error = security_sid_to_context(sid, &context, &len); - if (error) - return error; - if (len > size) { - kfree(context); - return -ERANGE; - } - memcpy(value, context, len); - kfree(context); - return len; + return selinux_getsecurity(sid, value, size); } static int selinux_setprocattr(struct task_struct *p, @@ -4291,6 +4283,7 @@ static struct security_operations selinu .inode_getxattr = selinux_inode_getxattr, .inode_listxattr = selinux_inode_listxattr, .inode_removexattr = selinux_inode_removexattr, + .inode_xattr_getsuffix = selinux_inode_xattr_getsuffix, .inode_getsecurity = selinux_inode_getsecurity, .inode_setsecurity = selinux_inode_setsecurity, .inode_listsecurity = selinux_inode_listsecurity, @@ -4328,6 +4321,7 @@ static struct security_operations selinu .task_to_inode = selinux_task_to_inode, .ipc_permission = selinux_ipc_permission, + .ipc_getsecurity = selinux_ipc_getsecurity, .msg_msg_alloc_security = selinux_msg_msg_alloc_security, .msg_msg_free_security = selinux_msg_msg_free_security, diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c index 69b9329..d7c0e91 100644 --- a/security/selinux/nlmsgtab.c +++ b/security/selinux/nlmsgtab.c @@ -145,8 +145,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16 break; case SECCLASS_NETLINK_AUDIT_SOCKET: - if (nlmsg_type >= AUDIT_FIRST_USER_MSG && - nlmsg_type <= AUDIT_LAST_USER_MSG) { + if ((nlmsg_type >= AUDIT_FIRST_USER_MSG && + nlmsg_type <= AUDIT_LAST_USER_MSG) || + (nlmsg_type >= AUDIT_FIRST_USER_MSG2 && + nlmsg_type <= AUDIT_LAST_USER_MSG2)) { *perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY; } else { err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms, diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index 0e1352a..e64923b 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -126,6 +127,10 @@ static ssize_t sel_write_enforce(struct length = task_has_security(current, SECURITY__SETENFORCE); if (length) goto out; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, + "enforcing=%d old_enforcing=%d auid=%u", new_value, + selinux_enforcing, + audit_get_loginuid(current->audit_context)); selinux_enforcing = new_value; if (selinux_enforcing) avc_ss_reset(0); @@ -176,6 +181,9 @@ static ssize_t sel_write_disable(struct length = selinux_disable(); if (length < 0) goto out; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, + "selinux=0 auid=%u", + audit_get_loginuid(current->audit_context)); } length = count; @@ -261,6 +269,9 @@ static ssize_t sel_write_load(struct fil length = ret; else length = count; + audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD, + "policy loaded auid=%u", + audit_get_loginuid(current->audit_context)); out: up(&sel_sem); vfree(data); diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 44eb4d7..2311255 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -1758,19 +1758,22 @@ int security_set_bools(int len, int *val goto out; } - printk(KERN_INFO "security: committed booleans { "); for (i = 0; i < len; i++) { + if (!!values[i] != policydb.bool_val_to_struct[i]->state) { + audit_log(current->audit_context, GFP_ATOMIC, + AUDIT_MAC_CONFIG_CHANGE, + "bool=%s val=%d old_val=%d auid=%u", + policydb.p_bool_val_to_name[i], + !!values[i], + policydb.bool_val_to_struct[i]->state, + audit_get_loginuid(current->audit_context)); + } if (values[i]) { policydb.bool_val_to_struct[i]->state = 1; } else { policydb.bool_val_to_struct[i]->state = 0; } - if (i != 0) - printk(", "); - printk("%s:%d", policydb.p_bool_val_to_name[i], - policydb.bool_val_to_struct[i]->state); } - printk(" }\n"); for (cur = policydb.cond_list; cur != NULL; cur = cur->next) { rc = evaluate_cond_node(&policydb, cur); linux-2.6-audit-promisc.patch: include/linux/audit.h | 7 ++++++- net/core/dev.c | 7 +++++++ 2 files changed, 13 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-audit-promisc.patch --- >From linux-audit-bounces at redhat.com Sat Dec 3 13:39:07 2005 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Sat, 03 Dec 2005 13:39:07 +0000 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EiXbW-0003Ra-S4 for dwmw2 at baythorne.infradead.org; Sat, 03 Dec 2005 13:39:07 +0000 Received: from hormel.redhat.com ([209.132.177.30]) by pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id 1EiXbU-0006dw-2W for dwmw2 at infradead.org; Sat, 03 Dec 2005 13:39:06 +0000 Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 18B39732FF; Sat, 3 Dec 2005 08:39:03 -0500 (EST) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id jB3Dd1du018704; Sat, 3 Dec 2005 08:39:01 -0500 Received: from mail.boston.redhat.com (mail.boston.redhat.com [172.16.76.12]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id jB3Dd1V16833; Sat, 3 Dec 2005 08:39:01 -0500 Received: from vpn83-123.boston.redhat.com (vpn83-123.boston.redhat.com [172.16.83.123]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id jB3Dd0EW010094; Sat, 3 Dec 2005 08:39:00 -0500 From: Steve Grubb To: Linux Audit Discussion Date: Sat, 3 Dec 2005 08:39:35 -0500 User-Agent: KMail/1.7.2 MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_XAakD2Qt0krjnKY" Message-Id: <200512030839.35344.sgrubb at redhat.com> X-loop: linux-audit at redhat.com Cc: lspp-list Subject: [PATCH] promiscuous mode X-BeenThere: linux-audit at redhat.com X-Mailman-Version: 2.1.5 Precedence: junk List-Id: Linux Audit Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces at redhat.com Errors-To: linux-audit-bounces at redhat.com X-Spam-Score: 0.0 (/) X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ --Boundary-00=_XAakD2Qt0krjnKY Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline Content-Transfer-Encoding: 8bit Hi, When a network interface goes into promiscuous mode, its an important security issue. The attached patch is intended to capture that action and send an event to the audit system. The patch carves out a new block of numbers for kernel detected anomalies. These are events that may indicate suspicious activity. Other examples of potential kernel anomalies would be: exceeding disk quota, rlimit violations, changes to syscall entry table. Signed-off-by: Steve Grubb --Boundary-00=_XAakD2Qt0krjnKY Content-Type: text/x-diff; charset="us-ascii"; name="linux-2.6.14-audit-promiscuous.patch" Content-Disposition: attachment; filename="linux-2.6.14-audit-promiscuous.patch" Content-Transfer-Encoding: 8bit diff -urp linux-2.6.14.orig/include/linux/audit.h linux-2.6.14/include/linux/audit.h --- linux-2.6.14.orig/include/linux/audit.h 2005-12-02 15:28:34.000000000 -0500 +++ linux-2.6.14/include/linux/audit.h 2005-12-02 15:28:22.000000000 -0500 @@ -35,7 +35,8 @@ * 1400 - 1499 SE Linux use * 1500 - 1599 kernel LSPP events * 1600 - 1699 kernel crypto events - * 1700 - 1999 future kernel use (maybe integrity labels and related events) + * 1700 - 1799 kernel anomaly records + * 1800 - 1999 future kernel use (maybe integrity labels and related events) * 2000 is for otherwise unclassified kernel audit messages (legacy) * 2001 - 2099 unused (kernel) * 2100 - 2199 user space anomaly records @@ -87,6 +88,10 @@ #define AUDIT_MAC_STATUS 1404 /* Changed enforcing,permissive,off */ #define AUDIT_MAC_CONFIG_CHANGE 1405 /* Changes to booleans */ +#define AUDIT_FIRST_KERN_ANOM_MSG 1700 +#define AUDIT_LAST_KERN_ANOM_MSG 1799 +#define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */ + #define AUDIT_KERNEL 2000 /* Asynchronous audit record. NOT A REQUEST. */ /* Rule flags */ diff -urp linux-2.6.14.orig/net/core/dev.c linux-2.6.14/net/core/dev.c --- linux-2.6.14.orig/net/core/dev.c 2005-12-02 14:22:10.000000000 -0500 +++ linux-2.6.14/net/core/dev.c 2005-12-02 15:23:27.000000000 -0500 @@ -114,6 +114,7 @@ #include #endif /* CONFIG_NET_RADIO */ #include +#include /* * The list of packet types we will receive (as opposed to discard) @@ -2121,6 +2122,12 @@ void dev_set_promiscuity(struct net_devi printk(KERN_INFO "device %s %s promiscuous mode\n", dev->name, (dev->flags & IFF_PROMISC) ? "entered" : "left"); + audit_log(current->audit_context, GFP_KERNEL, + AUDIT_ANOM_PROMISCUOUS, + "dev=%s prom=%d old_prom=%d auid=%u", + dev->name, (dev->flags & IFF_PROMISC), + (old_flags & IFF_PROMISC), + audit_get_loginuid(current->audit_context)); } } --Boundary-00=_XAakD2Qt0krjnKY Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit -- Linux-audit mailing list Linux-audit at redhat.com https://www.redhat.com/mailman/listinfo/linux-audit --Boundary-00=_XAakD2Qt0krjnKY-- linux-2.6-audit-rule-log.patch: include/linux/audit.h | 2 +- kernel/auditfilter.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE linux-2.6-audit-rule-log.patch --- >From linux-audit-bounces at redhat.com Mon Jan 9 14:48:00 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Mon, 09 Jan 2006 14:48:00 +0000 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EvyJU-0008Ah-Ie for dwmw2 at baythorne.infradead.org; Mon, 09 Jan 2006 14:48:00 +0000 Received: from hormel.redhat.com ([209.132.177.30]) by pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id 1EvyJS-00083r-Ac for dwmw2 at infradead.org; Mon, 09 Jan 2006 14:47:59 +0000 Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 0081172F6B; Mon, 9 Jan 2006 09:47:57 -0500 (EST) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k09Els3H012878 for ; Mon, 9 Jan 2006 09:47:55 -0500 Received: from mail.boston.redhat.com (mail.boston.redhat.com [172.16.76.12]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k09Els116875 for ; Mon, 9 Jan 2006 09:47:54 -0500 Received: from discovery.boston.redhat.com (discovery.boston.redhat.com [172.16.80.171]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k09ElsEg002852 for ; Mon, 9 Jan 2006 09:47:54 -0500 From: Steve Grubb Organization: Red Hat To: Linux Audit Discussion Date: Mon, 9 Jan 2006 09:48:17 -0500 User-Agent: KMail/1.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline Message-Id: <200601090948.17487.sgrubb at redhat.com> X-loop: linux-audit at redhat.com Subject: [PATCH] add/remove rule update X-BeenThere: linux-audit at redhat.com X-Mailman-Version: 2.1.5 Precedence: junk List-Id: Linux Audit Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces at redhat.com Errors-To: linux-audit-bounces at redhat.com X-Spam-Score: 0.0 (/) X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit Hi, The following patch adds a little more information to the add/remove rule message emitted by the kernel. Signed-off-by: Steve Grubb diff -urp linux-2.6.14.orig/include/linux/audit.h linux-2.6.14/include/linux/audit.h --- linux-2.6.14.orig/include/linux/audit.h 2006-01-05 10:13:30.000000000 -0500 +++ linux-2.6.14/include/linux/audit.h 2006-01-05 10:12:09.000000000 -0500 @@ -238,7 +238,7 @@ struct audit_rule { /* for AUDIT_LIST, __u32 flags; /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */ __u32 action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */ __u32 field_count; - __u32 mask[AUDIT_BITMASK_SIZE]; + __u32 mask[AUDIT_BITMASK_SIZE]; /* syscall(s) affected */ __u32 fields[AUDIT_MAX_FIELDS]; __u32 values[AUDIT_MAX_FIELDS]; }; diff -urp linux-2.6.14.orig/kernel/auditfilter.c linux-2.6.14/kernel/auditfilter.c --- linux-2.6.14.orig/kernel/auditfilter.c 2006-01-05 10:13:40.000000000 -0500 +++ linux-2.6.14/kernel/auditfilter.c 2006-01-05 10:11:29.000000000 -0500 @@ -571,10 +571,10 @@ int audit_receive_filter(int type, int p err = audit_add_rule(entry, &audit_filter_list[entry->rule.listnr]); - if (!err) - audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, - "auid=%u added an audit rule\n", loginuid); - else { + audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, + "auid=%u added rule to list=%d res=%d\n", + loginuid, entry->rule.listnr, !err); + if (err) { audit_free_watch(entry->rule.watch); kfree(entry); } @@ -590,9 +590,9 @@ int audit_receive_filter(int type, int p err = audit_del_rule(entry, &audit_filter_list[entry->rule.listnr]); - if (!err) - audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, - "auid=%u removed an audit rule\n", loginuid); + audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, + "auid=%u removed rule from list=%d res=%d\n", + loginuid, entry->rule.listnr, !err); audit_free_watch(entry->rule.watch); kfree(entry); break; -- Linux-audit mailing list Linux-audit at redhat.com https://www.redhat.com/mailman/listinfo/linux-audit linux-2.6-audit-string-1.patch: include/linux/audit.h | 31 ++- kernel/audit.c | 19 + kernel/audit.h | 23 ++ kernel/auditfilter.c | 434 +++++++++++++++++++++++++++++++++----------- kernel/auditsc.c | 50 ++--- security/selinux/nlmsgtab.c | 3 6 files changed, 424 insertions(+), 136 deletions(-) --- NEW FILE linux-2.6-audit-string-1.patch --- >From linux-audit-bounces at redhat.com Wed Jan 11 19:03:09 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Wed, 11 Jan 2006 19:03:09 +0000 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EwlFV-00027M-Bu for dwmw2 at baythorne.infradead.org; Wed, 11 Jan 2006 19:03:09 +0000 Received: from hormel.redhat.com ([209.132.177.30]) by pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id 1EwlFP-0002O8-AR for dwmw2 at infradead.org; Wed, 11 Jan 2006 19:03:08 +0000 Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 4BE3F72F9A; Wed, 11 Jan 2006 14:03:02 -0500 (EST) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k0BJ2xCK027396 for ; Wed, 11 Jan 2006 14:03:00 -0500 Received: from mx3.redhat.com (mx3.redhat.com [172.16.48.32]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k0BJ2x104580 for ; Wed, 11 Jan 2006 14:02:59 -0500 Received: from ccerelbas03.cce.hp.com (ccerelbas03.cce.hp.com [161.114.21.106]) by mx3.redhat.com (8.13.1/8.13.1) with ESMTP id k0BJ2jBE023986 for ; Wed, 11 Jan 2006 14:02:51 -0500 Received: from ccerelint01.cce.cpqcorp.net (ccerelint01.cce.cpqcorp.net [16.110.74.103]) by ccerelbas03.cce.hp.com (Postfix) with ESMTP id 8ADFA346F4; Wed, 11 Jan 2006 13:02:32 -0600 (CST) Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.104.162]) by ccerelint01.cce.cpqcorp.net (Postfix) with ESMTP id 40E2334005; Wed, 11 Jan 2006 13:02:32 -0600 (CST) Received: by dill.zko.hp.com (Postfix, from userid 10412) id 0352E30BA1DD; Wed, 11 Jan 2006 14:02:31 -0500 (EST) Date: Wed, 11 Jan 2006 14:02:31 -0500 From: Amy Griffis To: linux-audit at redhat.com Message-ID: <20060111190231.GB24489 at zk3.dec.com> Mail-Followup-To: linux-audit at redhat.com, Stephen Smalley References: <20060111185921.GA24489 at zk3.dec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060111185921.GA24489 at zk3.dec.com> X-Mailer: Mutt http://www.mutt.org/ X-Editor: Vim http://www.vim.org/ User-Agent: Mutt/1.5.10i X-RedHat-Spam-Score: -100 X-loop: linux-audit at redhat.com Cc: Subject: Re: [PATCH 1/2] audit string fields interface + consumer X-BeenThere: linux-audit at redhat.com X-Mailman-Version: 2.1.5 Precedence: junk List-Id: Linux Audit Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces at redhat.com Errors-To: linux-audit-bounces at redhat.com X-Spam-Score: 0.0 (/) X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit Modify audit's kernel-userspace interface to allow the specification of string fields in audit rules. Signed-off-by: Amy Griffis --- include/linux/audit.h | 31 +++ kernel/audit.c | 19 ++ kernel/audit.h | 23 ++ kernel/auditfilter.c | 434 +++++++++++++++++++++++++++++++++---------- kernel/auditsc.c | 50 ++--- security/selinux/nlmsgtab.c | 3 6 files changed, 424 insertions(+), 136 deletions(-) e637a0b9ed7b52263d9a687bbff0c45ae281e2d4 diff --git a/include/linux/audit.h b/include/linux/audit.h index a485639..c208554 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -50,15 +50,18 @@ */ #define AUDIT_GET 1000 /* Get status */ #define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ -#define AUDIT_LIST 1002 /* List syscall filtering rules */ -#define AUDIT_ADD 1003 /* Add syscall filtering rule */ -#define AUDIT_DEL 1004 /* Delete syscall filtering rule */ +#define AUDIT_LIST 1002 /* List syscall rules -- deprecated */ +#define AUDIT_ADD 1003 /* Add syscall rule -- deprecated */ +#define AUDIT_DEL 1004 /* Delete syscall rule -- deprecated */ #define AUDIT_USER 1005 /* Message from userspace -- deprecated */ #define AUDIT_LOGIN 1006 /* Define the login id and information */ #define AUDIT_WATCH_INS 1007 /* Insert file/dir watch entry */ #define AUDIT_WATCH_REM 1008 /* Remove file/dir watch entry */ #define AUDIT_WATCH_LIST 1009 /* List all file/dir watches */ #define AUDIT_SIGNAL_INFO 1010 /* Get info about sender of signal to auditd */ +#define AUDIT_ADD_RULE 1011 /* Add syscall filtering rule */ +#define AUDIT_DEL_RULE 1012 /* Delete syscall filtering rule */ +#define AUDIT_LIST_RULES 1013 /* List syscall filtering rules */ #define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages mostly uninteresting to kernel */ #define AUDIT_USER_AVC 1107 /* We filter this differently */ @@ -229,6 +232,26 @@ struct audit_status { __u32 backlog; /* messages waiting in queue */ }; +/* audit_rule_data supports filter rules with both integer and string + * fields. It corresponds with AUDIT_ADD_RULE, AUDIT_DEL_RULE and + * AUDIT_LIST_RULES requests. + */ +struct audit_rule_data { + __u32 flags; /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */ + __u32 action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */ + __u32 field_count; + __u32 mask[AUDIT_BITMASK_SIZE]; + __u32 fields[AUDIT_MAX_FIELDS]; + __u32 values[AUDIT_MAX_FIELDS]; + __u32 fieldflags[AUDIT_MAX_FIELDS]; + __u32 buflen; /* total length of string fields */ + char buf[0]; /* string fields buffer */ +}; + +/* audit_rule is supported to maintain backward compatibility with + * userspace. It supports integer fields only and corresponds to + * AUDIT_ADD, AUDIT_DEL and AUDIT_LIST requests. + */ struct audit_rule { /* for AUDIT_LIST, AUDIT_ADD, and AUDIT_DEL */ __u32 flags; /* AUDIT_PER_{TASK,CALL}, AUDIT_PREPEND */ __u32 action; /* AUDIT_NEVER, AUDIT_POSSIBLE, AUDIT_ALWAYS */ @@ -340,7 +363,7 @@ extern void audit_log_d_path(struct extern int audit_filter_user(struct netlink_skb_parms *cb, int type); extern int audit_filter_type(int type); extern int audit_receive_filter(int type, int pid, int uid, int seq, - void *data, uid_t loginuid); + void *data, size_t datasz, uid_t loginuid); #else #define audit_log(c,g,t,f,...) do { ; } while (0) #define audit_log_start(c,g,t) ({ NULL; }) diff --git a/kernel/audit.c b/kernel/audit.c index d95efd6..bdda766 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -52,6 +52,7 @@ #include #include +#include #include #include @@ -361,9 +362,12 @@ static int audit_netlink_ok(kernel_cap_t switch (msg_type) { case AUDIT_GET: case AUDIT_LIST: + case AUDIT_LIST_RULES: case AUDIT_SET: case AUDIT_ADD: + case AUDIT_ADD_RULE: case AUDIT_DEL: + case AUDIT_DEL_RULE: case AUDIT_SIGNAL_INFO: if (!cap_raised(eff_cap, CAP_AUDIT_CONTROL)) err = -EPERM; @@ -470,12 +474,23 @@ static int audit_receive_msg(struct sk_b break; case AUDIT_ADD: case AUDIT_DEL: - if (nlh->nlmsg_len < sizeof(struct audit_rule)) + if (nlmsg_len(nlh) < sizeof(struct audit_rule)) return -EINVAL; /* fallthrough */ case AUDIT_LIST: err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid, - uid, seq, data, loginuid); + uid, seq, data, nlmsg_len(nlh), + loginuid); + break; + case AUDIT_ADD_RULE: + case AUDIT_DEL_RULE: + if (nlmsg_len(nlh) < sizeof(struct audit_rule_data)) + return -EINVAL; + /* fallthrough */ + case AUDIT_LIST_RULES: + err = audit_receive_filter(nlh->nlmsg_type, NETLINK_CB(skb).pid, + uid, seq, data, nlmsg_len(nlh), + loginuid); break; case AUDIT_SIGNAL_INFO: sig_data.uid = audit_sig_uid; diff --git a/kernel/audit.h b/kernel/audit.h index 7643e46..f3b2a00 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -52,10 +52,27 @@ enum audit_state { }; /* Rule lists */ +struct audit_field { + u32 type; + u32 val; + u32 op; +}; + +struct audit_krule { + int vers_ops; + u32 flags; + u32 listnr; + u32 action; + u32 mask[AUDIT_BITMASK_SIZE]; + u32 buflen; /* for data alloc on list rules */ + u32 field_count; + struct audit_field fields[AUDIT_MAX_FIELDS]; +}; + struct audit_entry { - struct list_head list; - struct rcu_head rcu; - struct audit_rule rule; + struct list_head list; + struct rcu_head rcu; + struct audit_krule rule; }; diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index a3a3275..9c8865e 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -40,52 +40,258 @@ struct list_head audit_filter_list[AUDIT #endif }; -/* Copy rule from user-space to kernel-space. Called from - * audit_add_rule during AUDIT_ADD. */ -static inline int audit_copy_rule(struct audit_rule *d, struct audit_rule *s) +/* Unpack a filter field's string representation from user-space + * buffer. */ +static char *audit_unpack_string(void **bufp, size_t *remain, size_t len) { + char *str; + + if (!*bufp || (len == 0) || (len > *remain)) + return ERR_PTR(-EINVAL); + + /* Of the currently implemented string fields, PATH_MAX + * defines the longest valid length. + */ + if (len > PATH_MAX) + return ERR_PTR(-ENAMETOOLONG); + + str = kmalloc(len + 1, GFP_KERNEL); + if (!str) + return ERR_PTR(-ENOMEM); + + memcpy(str, *bufp, len); + str[len] = 0; + *bufp += len; + *remain -= len; + + return str; +} + +/* Common user-space to kernel rule translation. */ +static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule) +{ + unsigned listnr; + struct audit_entry *entry; + int i, err; + + err = -EINVAL; + listnr = rule->flags & ~AUDIT_FILTER_PREPEND; + switch(listnr) { + default: + goto exit_err; + case AUDIT_FILTER_USER: + case AUDIT_FILTER_TYPE: +#ifdef CONFIG_AUDITSYSCALL + case AUDIT_FILTER_ENTRY: + case AUDIT_FILTER_EXIT: + case AUDIT_FILTER_TASK: +#endif + ; + } + if (rule->action != AUDIT_NEVER && rule->action != AUDIT_POSSIBLE && + rule->action != AUDIT_ALWAYS) + goto exit_err; + if (rule->field_count > AUDIT_MAX_FIELDS) + goto exit_err; + + err = -ENOMEM; + entry = kmalloc(sizeof(*entry), GFP_KERNEL); + if (!entry) + goto exit_err; + memset(&entry->rule, 0, sizeof(struct audit_krule)); + + entry->rule.flags = rule->flags & AUDIT_FILTER_PREPEND; + entry->rule.listnr = listnr; + entry->rule.action = rule->action; + entry->rule.field_count = rule->field_count; + + for (i = 0; i < AUDIT_BITMASK_SIZE; i++) + entry->rule.mask[i] = rule->mask[i]; + + return entry; + +exit_err: + return ERR_PTR(err); +} + +/* Translate struct audit_rule to kernel's rule respresentation. + * Exists for backward compatibility with userspace. */ +static struct audit_entry *audit_rule_to_entry(struct audit_rule *rule) +{ + struct audit_entry *entry; + int err = 0; int i; - if (s->action != AUDIT_NEVER - && s->action != AUDIT_POSSIBLE - && s->action != AUDIT_ALWAYS) - return -1; - if (s->field_count < 0 || s->field_count > AUDIT_MAX_FIELDS) - return -1; - if ((s->flags & ~AUDIT_FILTER_PREPEND) >= AUDIT_NR_FILTERS) - return -1; - - d->flags = s->flags; - d->action = s->action; - d->field_count = s->field_count; - for (i = 0; i < d->field_count; i++) { - d->fields[i] = s->fields[i]; - d->values[i] = s->values[i]; + entry = audit_to_entry_common(rule); + if (IS_ERR(entry)) + goto exit_nofree; + + for (i = 0; i < rule->field_count; i++) { + struct audit_field *f = &entry->rule.fields[i]; + + if (rule->fields[i] & AUDIT_UNUSED_BITS) { + err = -EINVAL; + goto exit_free; + } + + f->op = rule->fields[i] & (AUDIT_NEGATE|AUDIT_OPERATORS); + f->type = rule->fields[i] & (~AUDIT_NEGATE|AUDIT_OPERATORS); + f->val = rule->values[i]; + + entry->rule.vers_ops = (f->op & AUDIT_OPERATORS) ? 2 : 1; + if (f->op & AUDIT_NEGATE) + f->op |= AUDIT_NOT_EQUAL; + else if (!(f->op & AUDIT_OPERATORS)) + f->op |= AUDIT_EQUAL; + f->op &= ~AUDIT_NEGATE; } - for (i = 0; i < AUDIT_BITMASK_SIZE; i++) d->mask[i] = s->mask[i]; - return 0; + +exit_nofree: + return entry; + +exit_free: + kfree(entry); + return ERR_PTR(err); } -/* Check to see if two rules are identical. It is called from - * audit_add_rule during AUDIT_ADD and - * audit_del_rule during AUDIT_DEL. */ -static int audit_compare_rule(struct audit_rule *a, struct audit_rule *b) +/* Translate struct audit_rule_data to kernel's rule respresentation. */ +static struct audit_entry *audit_data_to_entry(struct audit_rule_data *data, + size_t datasz) { + int err = 0; + struct audit_entry *entry; + void *bufp; + /* size_t remain = datasz - sizeof(struct audit_rule_data); */ int i; - if (a->flags != b->flags) - return 1; + entry = audit_to_entry_common((struct audit_rule *)data); + if (IS_ERR(entry)) + goto exit_nofree; + + bufp = data->buf; + entry->rule.vers_ops = 2; + for (i = 0; i < data->field_count; i++) { + struct audit_field *f = &entry->rule.fields[i]; + + err = -EINVAL; + if (!(data->fieldflags[i] & AUDIT_OPERATORS) || + data->fieldflags[i] & ~AUDIT_OPERATORS) + goto exit_free; + + f->op = data->fieldflags[i] & AUDIT_OPERATORS; + f->type = data->fields[i]; + switch(f->type) { + /* call type-specific conversion routines here */ + default: + f->val = data->values[i]; + } + } - if (a->action != b->action) - return 1; +exit_nofree: + return entry; + +exit_free: + kfree(entry); + return ERR_PTR(err); +} + +/* Pack a filter field's string representation into data block. */ +static inline size_t audit_pack_string(void **bufp, char *str) +{ + size_t len = strlen(str); + + memcpy(*bufp, str, len); + *bufp += len; + + return len; +} + +/* Translate kernel rule respresentation to struct audit_rule. + * Exists for backward compatibility with userspace. */ +static struct audit_rule *audit_krule_to_rule(struct audit_krule *krule) +{ + struct audit_rule *rule; + int i; + + rule = kmalloc(sizeof(*rule), GFP_KERNEL); + if (!rule) + return ERR_PTR(-ENOMEM); + memset(rule, 0, sizeof(*rule)); + + rule->flags = krule->flags | krule->listnr; + rule->action = krule->action; + rule->field_count = krule->field_count; + for (i = 0; i < rule->field_count; i++) { + rule->values[i] = krule->fields[i].val; + rule->fields[i] = krule->fields[i].type; + + if (krule->vers_ops == 1) { + if (krule->fields[i].op & AUDIT_NOT_EQUAL) + rule->fields[i] |= AUDIT_NEGATE; + } else { + rule->fields[i] |= krule->fields[i].op; + } + } + for (i = 0; i < AUDIT_BITMASK_SIZE; i++) rule->mask[i] = krule->mask[i]; + + return rule; +} + +/* Translate kernel rule respresentation to struct audit_rule_data. */ +static struct audit_rule_data *audit_krule_to_data(struct audit_krule *krule) +{ + struct audit_rule_data *data; + void *bufp; + int i; + + data = kmalloc(sizeof(*data) + krule->buflen, GFP_KERNEL); + if (!data) + return ERR_PTR(-ENOMEM); + memset(data, 0, sizeof(*data)); + + data->flags = krule->flags | krule->listnr; + data->action = krule->action; + data->field_count = krule->field_count; + bufp = data->buf; + for (i = 0; i < data->field_count; i++) { + struct audit_field *f = &krule->fields[i]; + + data->fields[i] = f->type; + data->fieldflags[i] = f->op; + switch(f->type) { + /* call type-specific conversion routines here */ + default: + data->values[i] = f->val; + } + } + for (i = 0; i < AUDIT_BITMASK_SIZE; i++) data->mask[i] = krule->mask[i]; + + return data; +} - if (a->field_count != b->field_count) +/* Compare two rules in kernel format. Considered success if rules + * don't match. */ +static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b) +{ + int i; + + if (a->flags != b->flags || + a->listnr != b->listnr || + a->action != b->action || + a->field_count != b->field_count) return 1; for (i = 0; i < a->field_count; i++) { - if (a->fields[i] != b->fields[i] - || a->values[i] != b->values[i]) + if (a->fields[i].type != b->fields[i].type || + a->fields[i].op != b->fields[i].op) return 1; + + switch(a->fields[i].type) { + /* call type-specific comparison routines here */ + default: + if (a->fields[i].val != b->fields[i].val) + return 1; + } } for (i = 0; i < AUDIT_BITMASK_SIZE; i++) @@ -95,41 +301,21 @@ static int audit_compare_rule(struct aud return 0; } -/* Note that audit_add_rule and audit_del_rule are called via - * audit_receive() in audit.c, and are protected by +/* Add rule to given filterlist if not a duplicate. Protected by * audit_netlink_sem. */ -static inline int audit_add_rule(struct audit_rule *rule, +static inline int audit_add_rule(struct audit_entry *entry, struct list_head *list) { - struct audit_entry *entry; - int i; + struct audit_entry *e; /* Do not use the _rcu iterator here, since this is the only * addition routine. */ - list_for_each_entry(entry, list, list) { - if (!audit_compare_rule(rule, &entry->rule)) + list_for_each_entry(e, list, list) { + if (!audit_compare_rule(&entry->rule, &e->rule)) return -EEXIST; } - for (i = 0; i < rule->field_count; i++) { - if (rule->fields[i] & AUDIT_UNUSED_BITS) - return -EINVAL; - if ( rule->fields[i] & AUDIT_NEGATE) - rule->fields[i] |= AUDIT_NOT_EQUAL; - else if ( (rule->fields[i] & AUDIT_OPERATORS) == 0 ) - rule->fields[i] |= AUDIT_EQUAL; - rule->fields[i] &= ~AUDIT_NEGATE; - } - - if (!(entry = kmalloc(sizeof(*entry), GFP_KERNEL))) - return -ENOMEM; - if (audit_copy_rule(&entry->rule, rule)) { - kfree(entry); - return -EINVAL; - } - if (entry->rule.flags & AUDIT_FILTER_PREPEND) { - entry->rule.flags &= ~AUDIT_FILTER_PREPEND; list_add_rcu(&entry->list, list); } else { list_add_tail_rcu(&entry->list, list); @@ -144,10 +330,9 @@ static inline void audit_free_rule(struc kfree(e); } -/* Note that audit_add_rule and audit_del_rule are called via - * audit_receive() in audit.c, and are protected by +/* Remove an existing rule from filterlist. Protected by * audit_netlink_sem. */ -static inline int audit_del_rule(struct audit_rule *rule, +static inline int audit_del_rule(struct audit_entry *entry, struct list_head *list) { struct audit_entry *e; @@ -155,7 +340,7 @@ static inline int audit_del_rule(struct /* Do not use the _rcu iterator here, since this is the only * deletion routine. */ list_for_each_entry(e, list, list) { - if (!audit_compare_rule(rule, &e->rule)) { + if (!audit_compare_rule(&entry->rule, &e->rule)) { list_del_rcu(&e->list); call_rcu(&e->rcu, audit_free_rule); return 0; @@ -164,7 +349,9 @@ static inline int audit_del_rule(struct return -ENOENT; /* No matching rule */ } -static int audit_list_rules(void *_dest) +/* List rules using struct audit_rule. Exists for backward + * compatibility with userspace. */ +static int audit_list(void *_dest) { int pid, seq; int *dest = _dest; @@ -180,9 +367,16 @@ static int audit_list_rules(void *_dest) /* The *_rcu iterators not needed here because we are always called with audit_netlink_sem held. */ for (i=0; irule); + if (!rule) + break; audit_send_reply(pid, seq, AUDIT_LIST, 0, 1, - &entry->rule, sizeof(entry->rule)); + rule, sizeof(*rule)); + kfree(rule); + } } audit_send_reply(pid, seq, AUDIT_LIST, 1, 1, NULL, 0); @@ -190,6 +384,40 @@ static int audit_list_rules(void *_dest) return 0; } +/* List rules using struct audit_rule_data. */ +static int audit_list_rules(void *_dest) +{ + int pid, seq; + int *dest = _dest; + struct audit_entry *e; + int i; + + pid = dest[0]; + seq = dest[1]; + kfree(dest); + + down(&audit_netlink_sem); + + /* The *_rcu iterators not needed here because we are + always called with audit_netlink_sem held. */ + for (i=0; irule); + if (!data) + break; + audit_send_reply(pid, seq, AUDIT_LIST_RULES, 0, 1, + data, sizeof(*data)); + kfree(data); + } + } + audit_send_reply(pid, seq, AUDIT_LIST_RULES, 1, 1, NULL, 0); + + up(&audit_netlink_sem); + return 0; +} + /** * audit_receive_filter - apply all rules to the specified message type * @type: audit message type @@ -197,18 +425,20 @@ static int audit_list_rules(void *_dest) * @uid: target uid for netlink audit messages * @seq: netlink audit message sequence (serial) number * @data: payload data + * @datasz: size of payload data * @loginuid: loginuid of sender */ int audit_receive_filter(int type, int pid, int uid, int seq, void *data, - uid_t loginuid) + size_t datasz, uid_t loginuid) { struct task_struct *tsk; int *dest; - int err = 0; - unsigned listnr; + int err = 0; + struct audit_entry *entry; switch (type) { case AUDIT_LIST: + case AUDIT_LIST_RULES: /* We can't just spew out the rules here because we might fill * the available socket buffer space and deadlock waiting for * auditctl to read from it... which isn't ever going to @@ -221,41 +451,48 @@ int audit_receive_filter(int type, int p dest[0] = pid; dest[1] = seq; - tsk = kthread_run(audit_list_rules, dest, "audit_list_rules"); + if (type == AUDIT_LIST) + tsk = kthread_run(audit_list, dest, "audit_list"); + else + tsk = kthread_run(audit_list_rules, dest, + "audit_list_rules"); if (IS_ERR(tsk)) { kfree(dest); err = PTR_ERR(tsk); } break; case AUDIT_ADD: - listnr = ((struct audit_rule *)data)->flags & ~AUDIT_FILTER_PREPEND; - switch(listnr) { - default: - return -EINVAL; + case AUDIT_ADD_RULE: + if (type == AUDIT_ADD) + entry = audit_rule_to_entry(data); + else + entry = audit_data_to_entry(data, datasz); + if (IS_ERR(entry)) + return PTR_ERR(entry); - case AUDIT_FILTER_USER: - case AUDIT_FILTER_TYPE: -#ifdef CONFIG_AUDITSYSCALL - case AUDIT_FILTER_ENTRY: - case AUDIT_FILTER_EXIT: - case AUDIT_FILTER_TASK: -#endif - ; - } - err = audit_add_rule(data, &audit_filter_list[listnr]); + err = audit_add_rule(entry, + &audit_filter_list[entry->rule.listnr]); if (!err) audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, "auid=%u added an audit rule\n", loginuid); + else + kfree(entry); break; case AUDIT_DEL: - listnr =((struct audit_rule *)data)->flags & ~AUDIT_FILTER_PREPEND; - if (listnr >= AUDIT_NR_FILTERS) - return -EINVAL; + case AUDIT_DEL_RULE: + if (type == AUDIT_DEL) + entry = audit_rule_to_entry(data); + else + entry = audit_data_to_entry(data, datasz); + if (IS_ERR(entry)) + return PTR_ERR(entry); - err = audit_del_rule(data, &audit_filter_list[listnr]); + err = audit_del_rule(entry, + &audit_filter_list[entry->rule.listnr]); if (!err) audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, "auid=%u removed an audit rule\n", loginuid); + kfree(entry); break; default: return -EINVAL; @@ -287,29 +524,27 @@ int audit_comparator(const u32 left, con static int audit_filter_user_rules(struct netlink_skb_parms *cb, - struct audit_rule *rule, + struct audit_krule *rule, enum audit_state *state) { int i; for (i = 0; i < rule->field_count; i++) { - u32 field = rule->fields[i] & ~AUDIT_OPERATORS; - u32 op = rule->fields[i] & AUDIT_OPERATORS; - u32 value = rule->values[i]; + struct audit_field *f = &rule->fields[i]; int result = 0; - switch (field) { + switch (f->type) { case AUDIT_PID: - result = audit_comparator(cb->creds.pid, op, value); + result = audit_comparator(cb->creds.pid, f->op, f->val); break; case AUDIT_UID: - result = audit_comparator(cb->creds.uid, op, value); + result = audit_comparator(cb->creds.uid, f->op, f->val); break; case AUDIT_GID: - result = audit_comparator(cb->creds.gid, op, value); + result = audit_comparator(cb->creds.gid, f->op, f->val); break; case AUDIT_LOGINUID: - result = audit_comparator(cb->loginuid, op, value); + result = audit_comparator(cb->loginuid, f->op, f->val); break; } @@ -354,14 +589,11 @@ int audit_filter_type(int type) list_for_each_entry_rcu(e, &audit_filter_list[AUDIT_FILTER_TYPE], list) { - struct audit_rule *rule = &e->rule; int i; - for (i = 0; i < rule->field_count; i++) { - u32 field = rule->fields[i] & ~AUDIT_OPERATORS; - u32 op = rule->fields[i] & AUDIT_OPERATORS; - u32 value = rule->values[i]; - if ( field == AUDIT_MSGTYPE ) { - result = audit_comparator(type, op, value); + for (i = 0; i < e->rule.field_count; i++) { + struct audit_field *f = &e->rule.fields[i]; + if (f->type == AUDIT_MSGTYPE) { + result = audit_comparator(type, f->op, f->val); if (!result) break; } diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 8f0a61c..e4f7096 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -161,70 +161,68 @@ struct audit_context { /* Compare a task_struct with an audit_rule. Return 1 on match, 0 * otherwise. */ static int audit_filter_rules(struct task_struct *tsk, - struct audit_rule *rule, + struct audit_krule *rule, struct audit_context *ctx, enum audit_state *state) { int i, j; for (i = 0; i < rule->field_count; i++) { - u32 field = rule->fields[i] & ~AUDIT_OPERATORS; - u32 op = rule->fields[i] & AUDIT_OPERATORS; - u32 value = rule->values[i]; + struct audit_field *f = &rule->fields[i]; int result = 0; - switch (field) { + switch (f->type) { case AUDIT_PID: - result = audit_comparator(tsk->pid, op, value); + result = audit_comparator(tsk->pid, f->op, f->val); break; case AUDIT_UID: - result = audit_comparator(tsk->uid, op, value); + result = audit_comparator(tsk->uid, f->op, f->val); break; case AUDIT_EUID: - result = audit_comparator(tsk->euid, op, value); + result = audit_comparator(tsk->euid, f->op, f->val); break; case AUDIT_SUID: - result = audit_comparator(tsk->suid, op, value); + result = audit_comparator(tsk->suid, f->op, f->val); break; case AUDIT_FSUID: - result = audit_comparator(tsk->fsuid, op, value); + result = audit_comparator(tsk->fsuid, f->op, f->val); break; case AUDIT_GID: - result = audit_comparator(tsk->gid, op, value); + result = audit_comparator(tsk->gid, f->op, f->val); break; case AUDIT_EGID: - result = audit_comparator(tsk->egid, op, value); + result = audit_comparator(tsk->egid, f->op, f->val); break; case AUDIT_SGID: - result = audit_comparator(tsk->sgid, op, value); + result = audit_comparator(tsk->sgid, f->op, f->val); break; case AUDIT_FSGID: - result = audit_comparator(tsk->fsgid, op, value); + result = audit_comparator(tsk->fsgid, f->op, f->val); break; case AUDIT_PERS: - result = audit_comparator(tsk->personality, op, value); + result = audit_comparator(tsk->personality, f->op, f->val); break; case AUDIT_ARCH: if (ctx) - result = audit_comparator(ctx->arch, op, value); + result = audit_comparator(ctx->arch, f->op, f->val); break; case AUDIT_EXIT: if (ctx && ctx->return_valid) - result = audit_comparator(ctx->return_code, op, value); + result = audit_comparator(ctx->return_code, f->op, f->val); break; case AUDIT_SUCCESS: if (ctx && ctx->return_valid) { - if (value) - result = audit_comparator(ctx->return_valid, op, AUDITSC_SUCCESS); + if (f->val) + result = audit_comparator(ctx->return_valid, f->op, AUDITSC_SUCCESS); else - result = audit_comparator(ctx->return_valid, op, AUDITSC_FAILURE); + result = audit_comparator(ctx->return_valid, f->op, AUDITSC_FAILURE); } break; case AUDIT_DEVMAJOR: if (ctx) { for (j = 0; j < ctx->name_count; j++) { - if (audit_comparator(MAJOR(ctx->names[j].dev), op, value)) { + if (audit_comparator(MAJOR(ctx->names[j].dev), f->op, f->val)) { ++result; break; } @@ -234,7 +232,7 @@ static int audit_filter_rules(struct tas case AUDIT_DEVMINOR: if (ctx) { for (j = 0; j < ctx->name_count; j++) { - if (audit_comparator(MINOR(ctx->names[j].dev), op, value)) { + if (audit_comparator(MINOR(ctx->names[j].dev), f->op, f->val)) { ++result; break; } @@ -244,8 +242,8 @@ static int audit_filter_rules(struct tas case AUDIT_INODE: if (ctx) { for (j = 0; j < ctx->name_count; j++) { - if (audit_comparator(ctx->names[j].ino, op, value) || - audit_comparator(ctx->names[j].pino, op, value)) { + if (audit_comparator(ctx->names[j].ino, f->op, f->val) || + audit_comparator(ctx->names[j].pino, f->op, f->val)) { ++result; break; } @@ -255,14 +253,14 @@ static int audit_filter_rules(struct tas case AUDIT_LOGINUID: result = 0; if (ctx) - result = audit_comparator(ctx->loginuid, op, value); + result = audit_comparator(ctx->loginuid, f->op, f->val); break; case AUDIT_ARG0: case AUDIT_ARG1: case AUDIT_ARG2: case AUDIT_ARG3: if (ctx) - result = audit_comparator(ctx->argv[field-AUDIT_ARG0], op, value); + result = audit_comparator(ctx->argv[f->type-AUDIT_ARG0], f->op, f->val); break; } diff --git a/security/selinux/nlmsgtab.c b/security/selinux/nlmsgtab.c index d7c0e91..7315824 100644 --- a/security/selinux/nlmsgtab.c +++ b/security/selinux/nlmsgtab.c @@ -99,6 +99,9 @@ static struct nlmsg_perm nlmsg_audit_per { AUDIT_LIST, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV }, { AUDIT_ADD, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, { AUDIT_DEL, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, + { AUDIT_LIST_RULES, NETLINK_AUDIT_SOCKET__NLMSG_READPRIV }, + { AUDIT_ADD_RULE, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, + { AUDIT_DEL_RULE, NETLINK_AUDIT_SOCKET__NLMSG_WRITE }, { AUDIT_USER, NETLINK_AUDIT_SOCKET__NLMSG_RELAY }, { AUDIT_SIGNAL_INFO, NETLINK_AUDIT_SOCKET__NLMSG_READ }, }; -- 0.99.9n -- Linux-audit mailing list Linux-audit at redhat.com https://www.redhat.com/mailman/listinfo/linux-audit linux-2.6-audit-string-2.patch: include/linux/audit.h | 1 kernel/audit.h | 8 +++ kernel/auditfilter.c | 122 +++++++++++++++++++++++++++++++++++++++++++++----- kernel/auditsc.c | 3 - 4 files changed, 123 insertions(+), 11 deletions(-) --- NEW FILE linux-2.6-audit-string-2.patch --- >From linux-audit-bounces at redhat.com Wed Jan 11 19:05:06 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Wed, 11 Jan 2006 19:05:06 +0000 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EwlHN-000282-Px for dwmw2 at baythorne.infradead.org; Wed, 11 Jan 2006 19:05:06 +0000 Received: from hormel.redhat.com ([209.132.177.30]) by pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id 1EwlHK-0002Oq-Vt for dwmw2 at infradead.org; Wed, 11 Jan 2006 19:05:05 +0000 Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 1BEB17346A; Wed, 11 Jan 2006 14:05:02 -0500 (EST) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k0BJ50Zj027646 for ; Wed, 11 Jan 2006 14:05:00 -0500 Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k0BJ50105987 for ; Wed, 11 Jan 2006 14:05:00 -0500 Received: from tayrelbas04.tay.hp.com (tayrelbas04.tay.hp.com [161.114.80.247]) by mx1.redhat.com (8.12.11/8.12.11) with ESMTP id k0BJ4wwY013947 for ; Wed, 11 Jan 2006 14:04:58 -0500 Received: from tayrelint01.nz-tay.cpqcorp.net (tayrelint01.nz-tay.cpqcorp.net [16.47.5.6]) by tayrelbas04.tay.hp.com (Postfix) with ESMTP id B1B8434236; Wed, 11 Jan 2006 14:04:53 -0500 (EST) Received: from dill.zko.hp.com (dill.zko.hp.com [16.116.104.162]) by tayrelint01.nz-tay.cpqcorp.net (Postfix) with ESMTP id 94A9E34004; Wed, 11 Jan 2006 14:04:53 -0500 (EST) Received: by dill.zko.hp.com (Postfix, from userid 10412) id 7910D30BA1DD; Wed, 11 Jan 2006 14:04:53 -0500 (EST) Date: Wed, 11 Jan 2006 14:04:53 -0500 From: Amy Griffis To: linux-audit at redhat.com Message-ID: <20060111190453.GC24489 at zk3.dec.com> Mail-Followup-To: linux-audit at redhat.com, Stephen Smalley References: <20060111185921.GA24489 at zk3.dec.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060111185921.GA24489 at zk3.dec.com> X-Mailer: Mutt http://www.mutt.org/ X-Editor: Vim http://www.vim.org/ User-Agent: Mutt/1.5.10i X-RedHat-Spam-Score: -100 X-loop: linux-audit at redhat.com Cc: Subject: Re: [PATCH 2/2] audit string fields interface + consumer X-BeenThere: linux-audit at redhat.com X-Mailman-Version: 2.1.5 Precedence: junk List-Id: Linux Audit Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces at redhat.com Errors-To: linux-audit-bounces at redhat.com X-Spam-Score: 0.0 (/) X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit Add AUDIT_WATCH field type and associated helpers. Signed-off-by: Amy Griffis --- include/linux/audit.h | 1 kernel/audit.h | 8 +++ kernel/auditfilter.c | 122 +++++++++++++++++++++++++++++++++++++++++++++---- kernel/auditsc.c | 3 + 4 files changed, 123 insertions(+), 11 deletions(-) d7ade2dd92b0ff7a3c6488b068f77089c9952d93 diff --git a/include/linux/audit.h b/include/linux/audit.h index c208554..d76fa58 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -148,6 +148,7 @@ #define AUDIT_INODE 102 #define AUDIT_EXIT 103 #define AUDIT_SUCCESS 104 /* exit >= 0; value ignored */ +#define AUDIT_WATCH 105 #define AUDIT_ARG0 200 #define AUDIT_ARG1 (AUDIT_ARG0+1) diff --git a/kernel/audit.h b/kernel/audit.h index f3b2a00..cc979e9 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -52,6 +52,12 @@ enum audit_state { }; /* Rule lists */ +struct audit_watch { + char *path; /* watch insertion path */ + struct list_head mlist; /* entry in master_watchlist */ + struct list_head rules; /* associated rules */ +}; + struct audit_field { u32 type; u32 val; @@ -67,6 +73,8 @@ struct audit_krule { u32 buflen; /* for data alloc on list rules */ u32 field_count; struct audit_field fields[AUDIT_MAX_FIELDS]; + struct audit_watch *watch; /* associated watch */ + struct list_head rlist; /* entry in audit_watch.rules list */ }; struct audit_entry { diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 9c8865e..8ea0a14 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include #include "audit.h" @@ -40,6 +42,8 @@ struct list_head audit_filter_list[AUDIT #endif }; +static LIST_HEAD(master_watchlist); + /* Unpack a filter field's string representation from user-space * buffer. */ static char *audit_unpack_string(void **bufp, size_t *remain, size_t len) @@ -67,6 +71,34 @@ static char *audit_unpack_string(void ** return str; } +/* Translate a watch string to kernel respresentation. */ +static int audit_to_watch(char *path, struct audit_krule *krule, int fidx) +{ + int err; + struct audit_field *f = &krule->fields[fidx]; + struct nameidata nd; + struct audit_watch *watch; + + err = -EINVAL; + if (path[0] != '/' || krule->listnr != AUDIT_FILTER_EXIT || + f->op & ~AUDIT_EQUAL) + return err; + + if (path_lookup(path, 0, &nd) == 0) + f->val = nd.dentry->d_inode->i_ino; + else + f->val = (unsigned int)-1; + + err = -ENOMEM; + watch = kmalloc(sizeof(*watch), GFP_KERNEL); + if (!watch) + return err; + watch->path = path; + krule->watch = watch; + + return 0; +} + /* Common user-space to kernel rule translation. */ static inline struct audit_entry *audit_to_entry_common(struct audit_rule *rule) { @@ -161,8 +193,9 @@ static struct audit_entry *audit_data_to int err = 0; struct audit_entry *entry; void *bufp; - /* size_t remain = datasz - sizeof(struct audit_rule_data); */ - int i; + size_t remain = datasz - sizeof(struct audit_rule_data); + int i, len; + char *path; entry = audit_to_entry_common((struct audit_rule *)data); if (IS_ERR(entry)) @@ -181,7 +214,19 @@ static struct audit_entry *audit_data_to f->op = data->fieldflags[i] & AUDIT_OPERATORS; f->type = data->fields[i]; switch(f->type) { - /* call type-specific conversion routines here */ + case AUDIT_WATCH: + len = data->values[i]; + path = audit_unpack_string(&bufp, &remain, len); + if (IS_ERR(path)) + goto exit_free; + entry->rule.buflen += len; + + err = audit_to_watch(path, &entry->rule, i); + if (err) { + kfree(path); + goto exit_free; + } + break; default: f->val = data->values[i]; } @@ -259,7 +304,10 @@ static struct audit_rule_data *audit_kru data->fields[i] = f->type; data->fieldflags[i] = f->op; switch(f->type) { - /* call type-specific conversion routines here */ + case AUDIT_WATCH: + data->buflen += data->values[i] = + audit_pack_string(&bufp, krule->watch->path); + break; default: data->values[i] = f->val; } @@ -269,6 +317,12 @@ static struct audit_rule_data *audit_kru return data; } +/* Compare two watches. Considered success if rules don't match. */ +static inline int audit_compare_watch(struct audit_watch *a, struct audit_watch *b) +{ + return strcmp(a->path, b->path); +} + /* Compare two rules in kernel format. Considered success if rules * don't match. */ static int audit_compare_rule(struct audit_krule *a, struct audit_krule *b) @@ -287,7 +341,10 @@ static int audit_compare_rule(struct aud return 1; switch(a->fields[i].type) { - /* call type-specific comparison routines here */ + case AUDIT_WATCH: + if (audit_compare_watch(a->watch, b->watch)) + return 1; + break; default: if (a->fields[i].val != b->fields[i].val) return 1; @@ -301,6 +358,38 @@ static int audit_compare_rule(struct aud return 0; } +static inline void audit_free_watch(struct audit_watch *watch) +{ + kfree(watch->path); + kfree(watch); +} + +static inline void audit_free_rule(struct rcu_head *head) +{ + struct audit_entry *e = container_of(head, struct audit_entry, rcu); + kfree(e); +} + +/* Attach krule's watch to master_watchlist, using existing watches + * when possible. */ +static inline void audit_add_watch(struct audit_krule *krule) +{ + struct audit_watch *w; + + list_for_each_entry(w, &master_watchlist, mlist) { + if (strcmp(w->path, krule->watch->path) != 0) + continue; + + audit_free_watch(krule->watch); + krule->watch = w; + list_add(&krule->rlist, &w->rules); + return; + } + INIT_LIST_HEAD(&krule->watch->rules); + list_add(&krule->rlist, &krule->watch->rules); + list_add(&krule->watch->mlist, &master_watchlist); +} + /* Add rule to given filterlist if not a duplicate. Protected by * audit_netlink_sem. */ static inline int audit_add_rule(struct audit_entry *entry, @@ -315,6 +404,7 @@ static inline int audit_add_rule(struct return -EEXIST; } + audit_add_watch(&entry->rule); if (entry->rule.flags & AUDIT_FILTER_PREPEND) { list_add_rcu(&entry->list, list); } else { @@ -324,10 +414,18 @@ static inline int audit_add_rule(struct return 0; } -static inline void audit_free_rule(struct rcu_head *head) +/* Detach watch from krule, freeing if it has no associated rules. */ +static inline void audit_remove_watch(struct audit_krule *krule) { - struct audit_entry *e = container_of(head, struct audit_entry, rcu); - kfree(e); + struct audit_watch *watch = krule->watch; + + list_del(&krule->rlist); + krule->watch = NULL; + + if (list_empty(&watch->rules)) { + list_del(&watch->mlist); + audit_free_watch(watch); + } } /* Remove an existing rule from filterlist. Protected by @@ -342,6 +440,7 @@ static inline int audit_del_rule(struct list_for_each_entry(e, list, list) { if (!audit_compare_rule(&entry->rule, &e->rule)) { list_del_rcu(&e->list); + audit_remove_watch(&e->rule); call_rcu(&e->rcu, audit_free_rule); return 0; } @@ -408,7 +507,7 @@ static int audit_list_rules(void *_dest) if (!data) break; audit_send_reply(pid, seq, AUDIT_LIST_RULES, 0, 1, - data, sizeof(*data)); + data, sizeof(*data) + data->buflen); kfree(data); } } @@ -475,8 +574,10 @@ int audit_receive_filter(int type, int p if (!err) audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, "auid=%u added an audit rule\n", loginuid); - else + else { + audit_free_watch(entry->rule.watch); kfree(entry); + } break; case AUDIT_DEL: case AUDIT_DEL_RULE: @@ -492,6 +593,7 @@ int audit_receive_filter(int type, int p if (!err) audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, "auid=%u removed an audit rule\n", loginuid); + audit_free_watch(entry->rule.watch); kfree(entry); break; default: diff --git a/kernel/auditsc.c b/kernel/auditsc.c index e4f7096..8e98b65 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -240,7 +240,8 @@ static int audit_filter_rules(struct tas } break; case AUDIT_INODE: - if (ctx) { + case AUDIT_WATCH: + if (ctx && f->val != (unsigned int)-1) { for (j = 0; j < ctx->name_count; j++) { if (audit_comparator(ctx->names[j].ino, f->op, f->val) || audit_comparator(ctx->names[j].pino, f->op, f->val)) { -- 0.99.9n -- Linux-audit mailing list Linux-audit at redhat.com https://www.redhat.com/mailman/listinfo/linux-audit linux-2.6-audit-tty.patch: auditsc.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-audit-tty.patch --- >From linux-audit-bounces at redhat.com Sun Jan 1 19:07:06 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Sun, 01 Jan 2006 19:07:06 +0000 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Et8Xq-0006yT-4F for dwmw2 at baythorne.infradead.org; Sun, 01 Jan 2006 19:07:06 +0000 Received: from hormel.redhat.com ([209.132.177.30]) by pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id 1Et8Xo-0000N4-CS for dwmw2 at infradead.org; Sun, 01 Jan 2006 19:07:05 +0000 Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 2C86D72EB7; Sun, 1 Jan 2006 14:07:02 -0500 (EST) Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id k01J71MX011720 for ; Sun, 1 Jan 2006 14:07:01 -0500 Received: from mail.boston.redhat.com (mail.boston.redhat.com [172.16.76.12]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k01J70127937 for ; Sun, 1 Jan 2006 14:07:00 -0500 Received: from vpn50-34.rdu.redhat.com (vpn50-34.rdu.redhat.com [172.16.50.34]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id k01J6xa3016921 for ; Sun, 1 Jan 2006 14:07:00 -0500 From: Steve Grubb Organization: Red Hat To: linux-audit at redhat.com Date: Sun, 1 Jan 2006 14:07:00 -0500 User-Agent: KMail/1.9 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline Message-Id: <200601011407.00175.sgrubb at redhat.com> X-MIME-Autoconverted: from quoted-printable to 8bit by listman.util.phx.redhat.com id k01J71MX011720 X-loop: linux-audit at redhat.com Subject: Add tty to syscall audit records X-BeenThere: linux-audit at redhat.com X-Mailman-Version: 2.1.5 Precedence: junk List-Id: Linux Audit Discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces at redhat.com Errors-To: linux-audit-bounces at redhat.com X-Spam-Score: 0.0 (/) X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit Hi, >From the RBAC specs: FAU_SAR.1.1 The TSF shall provide the set of authorized RBAC administrators with the capability to read the following audit information from the audit records: (e) The User Session Identifier or Terminal Type A patch adding the tty for all syscalls is included in this email. Please apply. Signed-off-by: Steve Grubb diff -urp linux-2.6.14.orig/kernel/auditsc.c linux-2.6.14/kernel/auditsc.c --- linux-2.6.14.orig/kernel/auditsc.c 2005-12-28 10:39:04.000000000 -0500 +++ linux-2.6.14/kernel/auditsc.c 2005-12-28 10:40:28.000000000 -0500 @@ -56,6 +56,7 @@ #include #include #include +#include #include "audit.h" @@ -567,6 +568,7 @@ static void audit_log_exit(struct audit_ int i; struct audit_buffer *ab; struct audit_aux_data *aux; + const char *tty; ab = audit_log_start(context, gfp_mask, AUDIT_SYSCALL); if (!ab) @@ -579,11 +581,15 @@ static void audit_log_exit(struct audit_ audit_log_format(ab, " success=%s exit=%ld", (context->return_valid==AUDITSC_SUCCESS)?"yes":"no", context->return_code); + if (current->signal->tty && current->signal->tty->name) + tty = current->signal->tty->name; + else + tty = "(none)"; audit_log_format(ab, " a0=%lx a1=%lx a2=%lx a3=%lx items=%d" " pid=%d auid=%u uid=%u gid=%u" " euid=%u suid=%u fsuid=%u" - " egid=%u sgid=%u fsgid=%u", + " egid=%u sgid=%u fsgid=%u tty=%s", context->argv[0], context->argv[1], context->argv[2], @@ -594,7 +600,7 @@ static void audit_log_exit(struct audit_ context->uid, context->gid, context->euid, context->suid, context->fsuid, - context->egid, context->sgid, context->fsgid); + context->egid, context->sgid, context->fsgid, tty); audit_log_task_info(ab); audit_log_end(ab); -- Linux-audit mailing list Linux-audit at redhat.com https://www.redhat.com/mailman/listinfo/linux-audit linux-2.6-unshare-1.patch: unshare.txt | 295 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 295 insertions(+) --- NEW FILE linux-2.6-unshare-1.patch --- >From janak at us.ibm.com Thu Jan 12 04:15:28 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Thu, 12 Jan 2006 04:15:28 +0000 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewts0-0004Oy-6U for dwmw2 at baythorne.infradead.org; Thu, 12 Jan 2006 04:15:28 +0000 Received: from e6.ny.us.ibm.com ([32.97.182.146]) by pentafluge.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewtrt-0001mJ-W4 for dwmw2 at infradead.org; Thu, 12 Jan 2006 04:15:26 +0000 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e6.ny.us.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FJoe010866 for ; Wed, 11 Jan 2006 23:15:19 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay04.pok.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id k0C4FJ4f110076 for ; Wed, 11 Jan 2006 23:15:19 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.12.11/8.13.3) with ESMTP id k0C4FJo9027950 for ; Wed, 11 Jan 2006 23:15:19 -0500 Received: from sig-9-65-207-107.mts.ibm.com (sig-9-65-207-107.mts.ibm.com [9.65.207.107]) by d01av01.pok.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FHq3027907; Wed, 11 Jan 2006 23:15:17 -0500 Subject: [PATCH -mm 1/10] unshare system call -v5 : Documentation file From: JANAK DESAI Reply-To: janak at us.ibm.com To: akpm at osdl.org, viro at ftp.linux.org.uk, dwmw2 at infradead.org Cc: chrisw at sous-sol.org, jamie at shareable.org, serue at us.ibm.com, sds at tycho.nsa.gov, sgrubb at redhat.com, ebiederm at xmission.com, janak at us.ibm.com, linux-kernel at vger.kernel.org Content-Type: text/plain Message-Id: <1137038987.7488.204.camel at hobbes.atlanta.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 (1.4.5-9) Date: Wed, 11 Jan 2006 23:10:44 -0500 X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.0.4 on pentafluge.infradead.org summary: Content analysis details: (0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 DNS_FROM_RFC_ABUSE RBL: Envelope sender in abuse.rfc-ignorant.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit [PATCH -mm 1/10] unshare system call: Documentation file Documents the new feature, why it is needed, it's cost, design, implementation, and test plan. Changes since -v4 submitted on 12/13/05: - New patch in the patch series that adds unshare.txt file. Signed-off-by: Janak Desai --- unshare.txt | 295 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 295 insertions(+) diff -Naurp 2.6.15-mm3/Documentation/unshare.txt 2.6.15-mm3+unsh-doc/Documentation/unshare.txt --- 2.6.15-mm3/Documentation/unshare.txt 1970-01-01 00:00:00.000000000 +0000 +++ 2.6.15-mm3+unsh-doc/Documentation/unshare.txt 2006-01-11 22:27:01.000000000 +0000 @@ -0,0 +1,295 @@ + +unshare system call: +-------------------- +This document describes the new system call, unshare. The document +provides an overview of the feature, why it is needed, how it can +be used, its interface specification, design, implementation and +how it can be tested. + +Change Log: +----------- +version 0.1 Initial document, Janak Desai (janak at us.ibm.com), Jan 11, 2006 + +Contents: +--------- + 1) Overview + 2) Benefits + 3) Cost + 4) Requirements + 5) Functional Specification + 6) High Level Design + 7) Low Level Design + 8) Test Specification + 9) Future Work + +1) Overview +----------- +Most legacy operating system kernels support an abstraction of threads +as multiple execution contexts within a process. These kernels provide +special resources and mechanisms to maintain these "threads". The Linux +kernel, in a clever and simple manner, does not make distinction +between processes and "threads". The kernel allows processes to share +resources and thus they can achieve legacy "threads" behavior without +requiring additional data structures and mechanisms in the kernel. The +power of implementing threads in this manner comes not only from +its simplicity but also from allowing application programmers to work +outside the confinement of all-or-nothing shared resources of legacy +threads. On Linux, at the time of thread creation using the clone system +call, applications can selectively choose which resources to share +between threads. + +unshare system call adds a primitive to the Linux thread model that +allows threads to selectively 'unshare' any resources that were being +shared at the time of their creation. unshare was conceptualized by +Al Viro in the August of 2000, on the Linux-Kernel mailing list, as part +of the discussion on POSIX threads on Linux. unshare augments the +usefulness of Linux threads for applications that would like to control +shared resources without creating a new process. unshare is a natural +addition to the set of available primitives on Linux that implement +the concept of process/thread as a virtual machine. + +2) Benefits +----------- +unshare would be useful to large application frameworks such as PAM +where creating a new process to control sharing/unsharing of process +resources is not possible. Since namespaces are shared by default +when creating a new process using fork or clone, unshare can benefit +even non-threaded applications if they have a need to disassociate +from default shared namespace. The following lists two use-cases +where unshare can be used. + +2.1 Per-security context namespaces +----------------------------------- +unshare can be used to implement polyinstantiated directories using +the kernel's per-process namespace mechanism. Polyinstantiated directories, +such as per-user and/or per-security context instance of /tmp, /var/tmp or +per-security context instance of a user's home directory, isolate user +processes when working with these directories. Using unshare, a PAM +module can easily setup a private namespace for a user at login. +Polyinstantiated directories are required for Common Criteria certification +with Labeled System Protection Profile, however, with the availability +of shared-tree feature in the Linux kernel, even regular Linux systems +can benefit from setting up private namespaces at login and +polyinstantiating /tmp, /var/tmp and other directories deemed +appropriate by system administrators. + +2.2 unsharing of virtual memory and/or open files +------------------------------------------------- +Consider a client/server application where the server is processing +client requests by creating processes that share resources such as +virtual memory and open files. Without unshare, the server has to +decide what needs to be shared at the time of creating the process +which services the request. unshare allows the server an ability to +disassociate parts of the context during the servicing of the +request. For large and complex middleware application frameworks, this +ability to unshare after the process was created can be very +useful. + +3) Cost +------- +In order to not duplicate code and to handle the fact that unshare +works on an active task (as opposed to clone/fork working on a newly +allocated inactive task) unshare had to make minor reorganizational +changes to copy_* functions utilized by clone/fork system call. +There is a cost associated with altering existing, well tested and +stable code to implement a new feature that may not get exercised +extensively in the beginning. However, with proper design and code +review of the changes and creation of an unshare test for the LTP +the benefits of this new feature can exceed its cost. + +4) Requirements +--------------- +unshare reverses sharing that was done using clone(2) system call, +so unshare should have a similar interface as clone(2). That is, +since flags in clone(int flags, void *stack) specifies what should +be shared, similar flags in unshare(int flags) should specify +what should be unshared. Unfortunately, this may appear to invert +the meaning of the flags from the way they are used in clone(2). +However, there was no easy solution that was less confusing and that +allowed incremental context unsharing in future without an ABI change. + +unshare interface should accommodate possible future addition of +new context flags without requiring a rebuild of old applications. +If and when new context flags are added, unshare design should allow +incremental unsharing of those resources on an as needed basis. + +5) Functional Specification +--------------------------- +NAME + unshare - disassociate parts of the process execution context + +SYNOPSIS + #include + + int unshare(int flags); + +DESCRIPTION + unshare allows a process to disassociate parts of its execution + context that are currently being shared with other processes. Part + of execution context, such as the namespace, is shared by default + when a new process is created using fork(2), while other parts, + such as the virtual memory, open file descriptors, etc, may be + shared by explicit request to share them when creating a process + using clone(2). + + The main use of unshare is to allow a process to control its + shared execution context without creating a new process. + + The flags argument specifies one or bitwise-or'ed of several of + the following constants. + + CLONE_FS + If CLONE_FS is set, file system information of the caller + is disassociated from the shared file system information. + + CLONE_FILES + If CLONE_FILES is set, the file descriptor table of the + caller is disassociated from the shared file descriptor + table. + + CLONE_NEWNS + If CLONE_NEWNS is set, the namespace of the caller is + disassociated from the shared namespace. + + CLONE_VM + If CLONE_VM is set, the virtual memory of the caller is + disassociated from the shared virtual memory. + +RETURN VALUE + On success, zero returned. On failure, -1 is returned and errno is + +ERRORS + EPERM CLONE_NEWNS was specified by a non-root process (process + without CAP_SYS_ADMIN). + + ENOMEM Cannot allocate sufficient memory to copy parts of caller's + context that need to be unshared. + + EINVAL Invalid flag was specified as an argument. + +CONFORMING TO + The unshare() call is Linux-specific and should not be used + in programs intended to be portable. + +SEE ALSO + clone(2), fork(2) + +6) High Level Design +-------------------- +Depending on the flags argument, the unshare system call allocates +appropriate process context structures, populates it with values from +the current shared version, associates newly duplicated structures +with the current task structure and releases corresponding shared +versions. Helper functions of clone (copy_*) could not be used +directly by unshare because of the following two reasons. + 1) clone operates on a newly allocated not-yet-active task + structure, where as unshare operates on the current active + task. Therefore unshare has to take appropriate task_lock() + before associating newly duplicated context structures + 2) unshare has to allocate and duplicate all context structures + that are being unshared, before associating them with the + current task and releasing older shared structures. Failure + do so will create race conditions and/or oops when trying + to backout due to an error. Consider the case of unsharing + both virtual memory and namespace. After successfully unsharing + vm, if the system call encounters an error while allocating + new namespace structure, the error return code will have to + reverse the unsharing of vm. As part of the reversal the + system call will have to go back to older, shared, vm + structure, which may not exist anymore. + +Therefore code from copy_* functions that allocated and duplicated +current context structure was moved into new dup_* functions. Now, +copy_* functions call dup_* functions to allocate and duplicate +appropriate context structures and then associate them with the +task structure that is being constructed. unshare system call on +the other hand performs the following: + 1) Check flags to force missing, but implied, flags + 2) For each context structure, call the corresponding unshare + helper function to allocate and duplicate a new context + structure, if the appropriate bit is set in the flags argument. + 3) If there is no error in allocation and duplication and there + are new context structures then lock the current task structure, + associate new context structures with the current task structure, + and release the lock on the current task structure. + 4) Appropriately release older, shared, context structures. + +7) Low Level Design +------------------- +Implementation of unshare can be grouped in the following 4 different +items: + a) Reorganization of existing copy_* functions + b) unshare system call service function + c) unshare helper functions for each different process context + d) Registration of system call number for different architectures + + 7.1) Reorganization of copy_* functions + Each copy function such as copy_mm, copy_namespace, copy_files, + etc, had roughly two components. The first component allocated + and duplicated the appropriate structure and the second component + linked it to the task structure passed in as an argument to the copy + function. The first component was split into its own function. + These dup_* functions allocated and duplicated the appropriate + context structure. The reorganized copy_* functions invoked + their corresponding dup_* functions and then linked the newly + duplicated structures to the task structure with which the + copy function was called. + + 7.2) unshare system call service function + * Check flags + Force implied flags. If CLONE_THREAD is set force CLONE_VM. + If CLONE_VM is set, force CLONE_SIGHAND. If CLONE_SIGHAND is + set and signals are also being shared, force CLONE_THREAD. If + CLONE_NEWNS is set, force CLONE_FS. + * For each context flag, invoke the corresponding unshare_* + helper routine with flags passed into the system call and a + reference to pointer pointing the new unshared structure + * If any new structures are created by unshare_* helper + functions, take the task_lock() on the current task, + modify appropriate context pointers, and release the + task lock. + * For all newly unshared structures, release the corresponding + older, shared, structures. + + 7.3) unshare_* helper functions + For unshare_* helpers corresponding to CLONE_SYSVSEM, CLONE_SIGHAND, + and CLONE_THREAD, return -EINVAL since they are not implemented yet. + For others, check the flag value to see if the unsharing is + required for that structure. If it is, invoke the corresponding + dup_* function to allocate and duplicate the structure and return + a pointer to it. + + 7.4) Appropriately modify architecture specific code to register the + the new system call. + +8) Test Specification +--------------------- +The test for unshare should test the following: + 1) Valid flags: Test to check that clone flags for signal and + signal handlers, for which unsharing is not implemented + yet, return -EINVAL. + 2) Missing/implied flags: Test to make sure that if unsharing + namespace without specifying unsharing of filesystem, correctly + unshares both namespace and filesystem information. + 3) For each of the four (namespace, filesystem, files and vm) + supported unsharing, verify that the system call correctly + unshares the appropriate structure. Verify that unsharing + them individually as well as in combination with each + other works as expected. + 4) Concurrent execution: Use shared memory segments and futex on + an address in the shm segment to synchronize execution of + about 10 threads. Have a couple of threads execute execve, + a couple _exit and the rest unshare with different combination + of flags. Verify that unsharing is performed as expected and + that there are no oops or hangs. + +9) Future Work +-------------- +The current implementation of unshare does not allow unsharing of +signals and signal handlers. Signals are complex to begin with and +to unshare signals and/or signal handlers of a currently running +process is even more complex. If in the future there is a specific +need to allow unsharing of signals and/or signal handlers, it can +be incrementally added to unshare without affecting legacy +applications using unshare. + linux-2.6-unshare-10.patch: arch/x86_64/ia32/ia32entry.S | 1 + include/asm-x86_64/ia32_unistd.h | 3 ++- include/asm-x86_64/unistd.h | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-unshare-10.patch --- >From janak at us.ibm.com Thu Jan 12 04:16:00 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Thu, 12 Jan 2006 04:16:00 +0000 Received: from canuck.infradead.org ([2001:8b0:10b:4::1]) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EwtsU-0004QB-SW for dwmw2 at baythorne.infradead.org; Thu, 12 Jan 2006 04:16:00 +0000 Received: from e34.co.us.ibm.com ([32.97.110.152]) by canuck.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EwtsK-0000Cy-F2 for dwmw2 at infradead.org; Wed, 11 Jan 2006 23:15:51 -0500 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e34.co.us.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FcAo003973 for ; Wed, 11 Jan 2006 23:15:38 -0500 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay04.boulder.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id k0C4HgX5147072 for ; Wed, 11 Jan 2006 21:17:42 -0700 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.12.11/8.13.3) with ESMTP id k0C4FbPq023652 for ; Wed, 11 Jan 2006 21:15:37 -0700 Received: from sig-9-65-207-107.mts.ibm.com (sig-9-65-207-107.mts.ibm.com [9.65.207.107]) by d03av03.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FZMp023601; Wed, 11 Jan 2006 21:15:36 -0700 Subject: [PATCH -mm 10/10] unshare system call -v5 : system call registration for x86_64 From: JANAK DESAI Reply-To: janak at us.ibm.com To: akpm at osdl.org, viro at ftp.linux.org.uk, dwmw2 at infradead.org Cc: chrisw at sous-sol.org, jamie at shareable.org, serue at us.ibm.com, sds at tycho.nsa.gov, sgrubb at redhat.com, ebiederm at xmission.com, janak at us.ibm.com, linux-kernel at vger.kernel.org Content-Type: text/plain Message-Id: <1137039015.7488.222.camel at hobbes.atlanta.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 (1.4.5-9) Date: Wed, 11 Jan 2006 23:11:03 -0500 X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.0.4 on canuck.infradead.org summary: Content analysis details: (0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 DNS_FROM_RFC_ABUSE RBL: Envelope sender in abuse.rfc-ignorant.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit [PATCH -mm 10/10] unshare system call: system call registration for x86_64 Registers system call for the x86_64 architecture. Changes since -v4 of this patch submitted on 12/13/05: - Forward ported to 2.6.15-mm3 which modified the syscall number. Signed-off-by: Janak Desai --- arch/x86_64/ia32/ia32entry.S | 1 + include/asm-x86_64/ia32_unistd.h | 3 ++- include/asm-x86_64/unistd.h | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff -Naurp 2.6.15-mm3/arch/x86_64/ia32/ia32entry.S 2.6.15-mm3+unsh-x86_64/arch/x86_64/ia32/ia32entry.S --- 2.6.15-mm3/arch/x86_64/ia32/ia32entry.S 2006-01-11 20:21:49.000000000 +0000 +++ 2.6.15-mm3+unsh-x86_64/arch/x86_64/ia32/ia32entry.S 2006-01-12 00:49:51.000000000 +0000 @@ -685,6 +685,7 @@ ia32_sys_call_table: .quad sys_inotify_init .quad sys_inotify_add_watch .quad sys_inotify_rm_watch + .quad sys_unshare ia32_syscall_end: .rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8 .quad ni_syscall diff -Naurp 2.6.15-mm3/include/asm-x86_64/ia32_unistd.h 2.6.15-mm3+unsh-x86_64/include/asm-x86_64/ia32_unistd.h --- 2.6.15-mm3/include/asm-x86_64/ia32_unistd.h 2006-01-11 20:22:17.000000000 +0000 +++ 2.6.15-mm3+unsh-x86_64/include/asm-x86_64/ia32_unistd.h 2006-01-12 00:51:13.000000000 +0000 @@ -313,7 +313,8 @@ define __NR_ia32_inotify_init 291 #define __NR_ia32_inotify_add_watch 292 #define __NR_ia32_inotify_rm_watch 293 +#define __NR_ia32_unshare 294 -#define IA32_NR_syscalls 294 /* must be > than biggest syscall! */ +#define IA32_NR_syscalls 295 /* must be > than biggest syscall! */ #endif /* _ASM_X86_64_IA32_UNISTD_H_ */ diff -Naurp 2.6.15-mm3/include/asm-x86_64/unistd.h 2.6.15-mm3+unsh-x86_64/include/asm-x86_64/unistd.h --- 2.6.15-mm3/include/asm-x86_64/unistd.h 2006-01-11 20:22:17.000000000 +0000 +++ 2.6.15-mm3+unsh-x86_64/include/asm-x86_64/unistd.h 2006-01-12 00:54:02.000000000 +0000 @@ -599,7 +599,9 @@ __SYSCALL(__NR_readlinkat, sys_readlinka __SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch) #define __NR_inotify_rm_watch 255 __SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch) +#define __NR_unshare 256 +__SYSCALL(__NR_unshare, sys_unshare) -#define __NR_syscall_max __NR_inotify_rm_watch +#define __NR_syscall_max __NR_unshare #ifndef __NO_STUBS linux-2.6-unshare-2.patch: fork.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 232 insertions(+) --- NEW FILE linux-2.6-unshare-2.patch --- >From janak at us.ibm.com Thu Jan 12 04:16:00 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Thu, 12 Jan 2006 04:16:00 +0000 Received: from canuck.infradead.org ([2001:8b0:10b:4::1]) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EwtsU-0004QC-NQ for dwmw2 at baythorne.infradead.org; Thu, 12 Jan 2006 04:16:00 +0000 Received: from e4.ny.us.ibm.com ([32.97.182.144]) by canuck.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewts7-0000Cq-MA for dwmw2 at infradead.org; Wed, 11 Jan 2006 23:15:54 -0500 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e4.ny.us.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FLVs014352 for ; Wed, 11 Jan 2006 23:15:21 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay02.pok.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id k0C4FLYs133248 for ; Wed, 11 Jan 2006 23:15:21 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.12.11/8.13.3) with ESMTP id k0C4FLU5028010 for ; Wed, 11 Jan 2006 23:15:21 -0500 Received: from sig-9-65-207-107.mts.ibm.com (sig-9-65-207-107.mts.ibm.com [9.65.207.107]) by d01av01.pok.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FJBb027961; Wed, 11 Jan 2006 23:15:19 -0500 Subject: [PATCH -mm 2/10] unshare system call -v5 : system call handler function From: JANAK DESAI Reply-To: janak at us.ibm.com To: akpm at osdl.org, viro at ftp.linux.org.uk, dwmw2 at infradead.org Cc: chrisw at sous-sol.org, jamie at shareable.org, serue at us.ibm.com, sds at tycho.nsa.gov, sgrubb at redhat.com, ebiederm at xmission.com, janak at us.ibm.com, linux-kernel at vger.kernel.org Content-Type: text/plain Message-Id: <1137038992.7488.206.camel at hobbes.atlanta.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 (1.4.5-9) Date: Wed, 11 Jan 2006 23:10:46 -0500 X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.0.4 on canuck.infradead.org summary: Content analysis details: (0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 DNS_FROM_RFC_ABUSE RBL: Envelope sender in abuse.rfc-ignorant.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit [PATCH -mm 2/10] unshare system call: system call handler function sys_unshare system call handler function accepts the same flags as clone system call, checks constraints on each of the flags and invokes corresponding unshare functions to disassociate respective process context if it was being shared with another task. Changes since the -v4 submitted on 12/13/05: - none Signed-off-by: Janak Desai --- fork.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 232 insertions(+) diff -Naurp 2.6.15-mm3/kernel/fork.c 2.6.15-mm3+unsh-base/kernel/fork.c --- 2.6.15-mm3/kernel/fork.c 2006-01-11 20:22:20.000000000 +0000 +++ 2.6.15-mm3+unsh-base/kernel/fork.c 2006-01-11 22:46:49.000000000 +0000 @@ -1323,3 +1323,235 @@ void __init proc_caches_init(void) sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); } + + +/* + * Check constraints on flags passed to the unshare system call and + * force unsharing of additional process context as appropriate. + */ +static inline void check_unshare_flags(unsigned long *flags_ptr) +{ + /* + * If unsharing a thread from a thread group, must also + * unshare vm. + */ + if (*flags_ptr & CLONE_THREAD) + *flags_ptr |= CLONE_VM; + + /* + * If unsharing vm, must also unshare signal handlers. + */ + if (*flags_ptr & CLONE_VM) + *flags_ptr |= CLONE_SIGHAND; + + /* + * If unsharing signal handlers and the task was created + * using CLONE_THREAD, then must unshare the thread + */ + if ((*flags_ptr & CLONE_SIGHAND) && + (atomic_read(¤t->signal->count) > 1)) + *flags_ptr |= CLONE_THREAD; + + /* + * If unsharing namespace, must also unshare filesystem information. + */ + if (*flags_ptr & CLONE_NEWNS) + *flags_ptr |= CLONE_FS; +} + +/* + * Unsharing of tasks created with CLONE_THREAD is not supported yet + */ +static int unshare_thread(unsigned long unshare_flags) +{ + if (unshare_flags & CLONE_THREAD) + return -EINVAL; + + return 0; +} + +/* + * Unsharing of fs info for tasks created with CLONE_FS is not supported yet + */ +static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp) +{ + struct fs_struct *fs = current->fs; + + if ((unshare_flags & CLONE_FS) && + (fs && atomic_read(&fs->count) > 1)) + return -EINVAL; + + return 0; +} + +/* + * Unsharing of namespace for tasks created without CLONE_NEWNS is not + * supported yet + */ +static int unshare_namespace(unsigned long unshare_flags, struct namespace **new_nsp) +{ + struct namespace *ns = current->namespace; + + if ((unshare_flags & CLONE_NEWNS) && + (ns && atomic_read(&ns->count) > 1)) + return -EINVAL; + + return 0; +} + +/* + * Unsharing of sighand for tasks created with CLONE_SIGHAND is not + * supported yet + */ +static int unshare_sighand(unsigned long unshare_flags, struct sighand_struct **new_sighp) +{ + struct sighand_struct *sigh = current->sighand; + + if ((unshare_flags & CLONE_SIGHAND) && + (sigh && atomic_read(&sigh->count) > 1)) + return -EINVAL; + else + return 0; +} + +/* + * Unsharing of vm for tasks created with CLONE_VM is not supported yet + */ +static int unshare_vm(unsigned long unshare_flags, struct mm_struct **new_mmp) +{ + struct mm_struct *mm = current->mm; + + if ((unshare_flags & CLONE_VM) && + (mm && atomic_read(&mm->mm_users) > 1)) + return -EINVAL; + + return 0; + +} + +/* + * Unsharing of files for tasks created with CLONE_FILES is not supported yet + */ +static int unshare_fd(unsigned long unshare_flags, struct files_struct **new_fdp) +{ + struct files_struct *fd = current->files; + + if ((unshare_flags & CLONE_FILES) && + (fd && atomic_read(&fd->count) > 1)) + return -EINVAL; + + return 0; +} + +/* + * Unsharing of semundo for tasks created with CLONE_SYSVSEM is not + * supported yet + */ +static int unshare_semundo(unsigned long unshare_flags, struct sem_undo_list **new_ulistp) +{ + if (unshare_flags & CLONE_SYSVSEM) + return -EINVAL; + + return 0; +} + +/* + * unshare allows a process to 'unshare' part of the process + * context which was originally shared using clone. copy_* + * functions used by do_fork() cannot be used here directly + * because they modify an inactive task_struct that is being + * constructed. Here we are modifying the current, active, + * task_struct. + */ +asmlinkage long sys_unshare(unsigned long unshare_flags) +{ + int err = 0; + struct fs_struct *fs, *new_fs = NULL; + struct namespace *ns, *new_ns = NULL; + struct sighand_struct *sigh, *new_sigh = NULL; + struct mm_struct *mm, *new_mm = NULL, *active_mm = NULL; + struct files_struct *fd, *new_fd = NULL; + struct sem_undo_list *new_ulist = NULL; + + check_unshare_flags(&unshare_flags); + + if ((err = unshare_thread(unshare_flags))) + goto bad_unshare_out; + if ((err = unshare_fs(unshare_flags, &new_fs))) + goto bad_unshare_cleanup_thread; + if ((err = unshare_namespace(unshare_flags, &new_ns))) + goto bad_unshare_cleanup_fs; + if ((err = unshare_sighand(unshare_flags, &new_sigh))) + goto bad_unshare_cleanup_ns; + if ((err = unshare_vm(unshare_flags, &new_mm))) + goto bad_unshare_cleanup_sigh; + if ((err = unshare_fd(unshare_flags, &new_fd))) + goto bad_unshare_cleanup_vm; + if ((err = unshare_semundo(unshare_flags, &new_ulist))) + goto bad_unshare_cleanup_fd; + + if (new_fs || new_ns || new_sigh || new_mm || new_fd || new_ulist) { + + task_lock(current); + + if (new_fs) { + fs = current->fs; + current->fs = new_fs; + new_fs = fs; + } + + if (new_ns) { + ns = current->namespace; + current->namespace = new_ns; + new_ns = ns; + } + + if (new_sigh) { + sigh = current->sighand; + current->sighand = new_sigh; + new_sigh = sigh; + } + + if (new_mm) { + mm = current->mm; + active_mm = current->active_mm; + current->mm = new_mm; + current->active_mm = new_mm; + activate_mm(active_mm, new_mm); + new_mm = mm; + } + + if (new_fd) { + fd = current->files; + current->files = new_fd; + new_fd = fd; + } + + task_unlock(current); + } + +bad_unshare_cleanup_fd: + if (new_fd) + put_files_struct(new_fd); + +bad_unshare_cleanup_vm: + if (new_mm) + mmput(new_mm); + +bad_unshare_cleanup_sigh: + if (new_sigh) + if (atomic_dec_and_test(&new_sigh->count)) + kmem_cache_free(sighand_cachep, new_sigh); + +bad_unshare_cleanup_ns: + if (new_ns) + put_namespace(new_ns); + +bad_unshare_cleanup_fs: + if (new_fs) + put_fs_struct(new_fs); + +bad_unshare_cleanup_thread: +bad_unshare_out: + return err; +} linux-2.6-unshare-3.patch: fork.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-unshare-3.patch --- >From janak at us.ibm.com Thu Jan 12 04:15:29 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Thu, 12 Jan 2006 04:15:29 +0000 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewts0-0004Oz-TD for dwmw2 at baythorne.infradead.org; Thu, 12 Jan 2006 04:15:29 +0000 Received: from e1.ny.us.ibm.com ([32.97.182.141]) by pentafluge.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewtry-0001mS-Uv for dwmw2 at infradead.org; Thu, 12 Jan 2006 04:15:28 +0000 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e1.ny.us.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FMos019206 for ; Wed, 11 Jan 2006 23:15:22 -0500 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay04.pok.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id k0C4FN4f124468 for ; Wed, 11 Jan 2006 23:15:23 -0500 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.12.11/8.13.3) with ESMTP id k0C4FN7g008363 for ; Wed, 11 Jan 2006 23:15:23 -0500 Received: from sig-9-65-207-107.mts.ibm.com (sig-9-65-207-107.mts.ibm.com [9.65.207.107]) by d01av03.pok.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FLJr008307; Wed, 11 Jan 2006 23:15:21 -0500 Subject: [PATCH -mm 3/10] unshare system call -v5 : unshare filesystem info From: JANAK DESAI Reply-To: janak at us.ibm.com To: akpm at osdl.org, viro at ftp.linux.org.uk, dwmw2 at infradead.org Cc: chrisw at sous-sol.org, jamie at shareable.org, serue at us.ibm.com, sds at tycho.nsa.gov, sgrubb at redhat.com, ebiederm at xmission.com, janak at us.ibm.com, linux-kernel at vger.kernel.org Content-Type: text/plain Message-Id: <1137038994.7488.208.camel at hobbes.atlanta.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 (1.4.5-9) Date: Wed, 11 Jan 2006 23:10:48 -0500 X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.0.4 on pentafluge.infradead.org summary: Content analysis details: (0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 DNS_FROM_RFC_ABUSE RBL: Envelope sender in abuse.rfc-ignorant.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit [PATCH -mm 3/10] unshare system call: allow unsharing of filesystem info If filesystem structure is being shared, allocate a new one and copy information from the current, shared, structure. Changes since -v4 of this patch submitted on 12/13/05: - none Signed-off-by: Janak Desai --- fork.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff -Naurp 2.6.15-mm3+unsh-base/kernel/fork.c 2.6.15-mm3+unsh-fs/kernel/fork.c --- 2.6.15-mm3+unsh-base/kernel/fork.c 2006-01-11 22:46:49.000000000 +0000 +++ 2.6.15-mm3+unsh-fs/kernel/fork.c 2006-01-12 00:26:46.000000000 +0000 @@ -1371,15 +1371,18 @@ static int unshare_thread(unsigned long } /* - * Unsharing of fs info for tasks created with CLONE_FS is not supported yet + * Unshare the filesystem structure if it is being shared */ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp) { struct fs_struct *fs = current->fs; if ((unshare_flags & CLONE_FS) && - (fs && atomic_read(&fs->count) > 1)) - return -EINVAL; + (fs && atomic_read(&fs->count) > 1)) { + *new_fsp = __copy_fs_struct(current->fs); + if (!*new_fsp) + return -ENOMEM; + } return 0; } linux-2.6-unshare-4.patch: fs/namespace.c | 56 +++++++++++++++++++++++++++++----------------- include/linux/namespace.h | 1 kernel/fork.c | 17 +++++++++---- 3 files changed, 48 insertions(+), 26 deletions(-) --- NEW FILE linux-2.6-unshare-4.patch --- >From janak at us.ibm.com Thu Jan 12 04:16:00 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Thu, 12 Jan 2006 04:16:00 +0000 Received: from canuck.infradead.org ([2001:8b0:10b:4::1]) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EwtsU-0004QD-OA for dwmw2 at baythorne.infradead.org; Thu, 12 Jan 2006 04:16:00 +0000 Received: from e3.ny.us.ibm.com ([32.97.182.143]) by canuck.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewts9-0000Cs-7c for dwmw2 at infradead.org; Wed, 11 Jan 2006 23:15:52 -0500 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e3.ny.us.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FPvZ012443 for ; Wed, 11 Jan 2006 23:15:25 -0500 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay04.pok.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id k0C4FP4f124472 for ; Wed, 11 Jan 2006 23:15:25 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11/8.13.3) with ESMTP id k0C4FPDU025965 for ; Wed, 11 Jan 2006 23:15:25 -0500 Received: from sig-9-65-207-107.mts.ibm.com (sig-9-65-207-107.mts.ibm.com [9.65.207.107]) by d01av04.pok.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FN2D025924; Wed, 11 Jan 2006 23:15:23 -0500 Subject: [PATCH -mm 4/10] unshare system call -v5 : unshare namespace From: JANAK DESAI Reply-To: janak at us.ibm.com To: akpm at osdl.org, viro at ftp.linux.org.uk, dwmw2 at infradead.org Cc: chrisw at sous-sol.org, jamie at shareable.org, serue at us.ibm.com, sds at tycho.nsa.gov, sgrubb at redhat.com, ebiederm at xmission.com, janak at us.ibm.com, linux-kernel at vger.kernel.org Content-Type: text/plain Message-Id: <1137038997.7488.210.camel at hobbes.atlanta.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 (1.4.5-9) Date: Wed, 11 Jan 2006 23:10:50 -0500 X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.0.4 on canuck.infradead.org summary: Content analysis details: (0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 DNS_FROM_RFC_ABUSE RBL: Envelope sender in abuse.rfc-ignorant.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit [PATCH -mm 4/10] unshare system call: allow unsharing of namespace If the namespace structure is being shared, allocate a new one and copy information from the current, shared, structure. Changes since -v4 of this patch submitted on 12/13/05: - none Signed-off-by: Janak Desai --- fs/namespace.c | 56 +++++++++++++++++++++++++++++----------------- include/linux/namespace.h | 1 kernel/fork.c | 17 +++++++++---- 3 files changed, 48 insertions(+), 26 deletions(-) diff -Naurp 2.6.15-mm3+unsh-fs/fs/namespace.c 2.6.15-mm3+unsh-ns/fs/namespace.c --- 2.6.15-mm3+unsh-fs/fs/namespace.c 2006-01-12 00:24:06.000000000 +0000 +++ 2.6.15-mm3+unsh-ns/fs/namespace.c 2006-01-12 00:39:49.000000000 +0000 @@ -1321,27 +1321,17 @@ dput_out: return retval; } -int copy_namespace(int flags, struct task_struct *tsk) +/* + * Allocate a new namespace structure and populate it with contents + * copied from the namespace of the passed in task structure. + */ +struct namespace *dup_namespace(struct task_struct *tsk, struct fs_struct *fs) { struct namespace *namespace = tsk->namespace; struct namespace *new_ns; struct vfsmount *rootmnt = NULL, *pwdmnt = NULL, *altrootmnt = NULL; - struct fs_struct *fs = tsk->fs; struct vfsmount *p, *q; - if (!namespace) - return 0; - - get_namespace(namespace); - - if (!(flags & CLONE_NEWNS)) - return 0; - - if (!capable(CAP_SYS_ADMIN)) { - put_namespace(namespace); - return -EPERM; - } - new_ns = kmalloc(sizeof(struct namespace), GFP_KERNEL); if (!new_ns) goto out; @@ -1392,8 +1382,6 @@ int copy_namespace(int flags, struct tas } up_write(&namespace_sem); - tsk->namespace = new_ns; - if (rootmnt) mntput(rootmnt); if (pwdmnt) @@ -1401,12 +1389,40 @@ int copy_namespace(int flags, struct tas if (altrootmnt) mntput(altrootmnt); - put_namespace(namespace); - return 0; +out: + return new_ns; +} + +int copy_namespace(int flags, struct task_struct *tsk) +{ + struct namespace *namespace = tsk->namespace; + struct namespace *new_ns; + int err = 0; + + if (!namespace) + return 0; + + get_namespace(namespace); + + if (!(flags & CLONE_NEWNS)) + return 0; + + if (!capable(CAP_SYS_ADMIN)) { + err = -EPERM; + goto out; + } + + new_ns = dup_namespace(tsk, tsk->fs); + if (!new_ns) { + err = -ENOMEM; + goto out; + } + + tsk->namespace = new_ns; out: put_namespace(namespace); - return -ENOMEM; + return err; } asmlinkage long sys_mount(char __user * dev_name, char __user * dir_name, diff -Naurp 2.6.15-mm3+unsh-fs/include/linux/namespace.h 2.6.15-mm3+unsh-ns/include/linux/namespace.h --- 2.6.15-mm3+unsh-fs/include/linux/namespace.h 2006-01-12 00:25:13.000000000 +0000 +++ 2.6.15-mm3+unsh-ns/include/linux/namespace.h 2006-01-12 00:39:49.000000000 +0000 @@ -15,6 +15,7 @@ struct namespace { extern int copy_namespace(int, struct task_struct *); extern void __put_namespace(struct namespace *namespace); +extern struct namespace *dup_namespace(struct task_struct *, struct fs_struct *); static inline void put_namespace(struct namespace *namespace) { diff -Naurp 2.6.15-mm3+unsh-fs/kernel/fork.c 2.6.15-mm3+unsh-ns/kernel/fork.c --- 2.6.15-mm3+unsh-fs/kernel/fork.c 2006-01-12 00:26:46.000000000 +0000 +++ 2.6.15-mm3+unsh-ns/kernel/fork.c 2006-01-12 00:39:49.000000000 +0000 @@ -1388,16 +1388,21 @@ static int unshare_fs(unsigned long unsh } /* - * Unsharing of namespace for tasks created without CLONE_NEWNS is not - * supported yet + * Unshare the namespace structure if it is being shared */ -static int unshare_namespace(unsigned long unshare_flags, struct namespace **new_nsp) +static int unshare_namespace(unsigned long unshare_flags, struct namespace **new_nsp, struct fs_struct *new_fs) { struct namespace *ns = current->namespace; if ((unshare_flags & CLONE_NEWNS) && - (ns && atomic_read(&ns->count) > 1)) - return -EINVAL; + (ns && atomic_read(&ns->count) > 1)) { + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; + + *new_nsp = dup_namespace(current, new_fs ? new_fs : current->fs); + if (!*new_nsp) + return -ENOMEM; + } return 0; } @@ -1482,7 +1487,7 @@ asmlinkage long sys_unshare(unsigned lon goto bad_unshare_out; if ((err = unshare_fs(unshare_flags, &new_fs))) goto bad_unshare_cleanup_thread; - if ((err = unshare_namespace(unshare_flags, &new_ns))) + if ((err = unshare_namespace(unshare_flags, &new_ns, new_fs))) goto bad_unshare_cleanup_fs; if ((err = unshare_sighand(unshare_flags, &new_sigh))) goto bad_unshare_cleanup_ns; linux-2.6-unshare-5.patch: fork.c | 87 +++++++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 56 insertions(+), 31 deletions(-) --- NEW FILE linux-2.6-unshare-5.patch --- >From janak at us.ibm.com Thu Jan 12 04:16:00 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Thu, 12 Jan 2006 04:16:00 +0000 Received: from canuck.infradead.org ([2001:8b0:10b:4::1]) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EwtsU-0004QA-RL for dwmw2 at baythorne.infradead.org; Thu, 12 Jan 2006 04:16:00 +0000 Received: from e3.ny.us.ibm.com ([32.97.182.143]) by canuck.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewts9-0000Ct-7Z for dwmw2 at infradead.org; Wed, 11 Jan 2006 23:15:49 -0500 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e3.ny.us.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FR0m012461 for ; Wed, 11 Jan 2006 23:15:27 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay04.pok.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id k0C4FR4f061702 for ; Wed, 11 Jan 2006 23:15:27 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.12.11/8.13.3) with ESMTP id k0C4FQ4C028205 for ; Wed, 11 Jan 2006 23:15:27 -0500 Received: from sig-9-65-207-107.mts.ibm.com (sig-9-65-207-107.mts.ibm.com [9.65.207.107]) by d01av01.pok.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FPr0028164; Wed, 11 Jan 2006 23:15:25 -0500 Subject: [PATCH -mm 5/10] unshare system call -v5 : unshare vm From: JANAK DESAI Reply-To: janak at us.ibm.com To: akpm at osdl.org, viro at ftp.linux.org.uk, dwmw2 at infradead.org Cc: chrisw at sous-sol.org, jamie at shareable.org, serue at us.ibm.com, sds at tycho.nsa.gov, sgrubb at redhat.com, ebiederm at xmission.com, janak at us.ibm.com, linux-kernel at vger.kernel.org Content-Type: text/plain Message-Id: <1137039000.7488.212.camel at hobbes.atlanta.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 (1.4.5-9) Date: Wed, 11 Jan 2006 23:10:52 -0500 X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.0.4 on canuck.infradead.org summary: Content analysis details: (0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 DNS_FROM_RFC_ABUSE RBL: Envelope sender in abuse.rfc-ignorant.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit [PATCH -mm 5/10] unshare system call: allow unsharing of vm If vm structure is being shared, allocate a new one and copy information from the current, shared, structure. Changes since -v4 of this patch submitted on 12/13/05: - none Signed-off-by: Janak Desai --- fork.c | 87 +++++++++++++++++++++++++++++++++++++++++------------------------ 1 files changed, 56 insertions(+), 31 deletions(-) diff -Naurp 2.6.15-mm3+unsh-ns/kernel/fork.c 2.6.15-mm3+unsh-vm/kernel/fork.c --- 2.6.15-mm3+unsh-ns/kernel/fork.c 2006-01-12 00:39:49.000000000 +0000 +++ 2.6.15-mm3+unsh-vm/kernel/fork.c 2006-01-12 00:47:33.000000000 +0000 @@ -446,6 +446,55 @@ void mm_release(struct task_struct *tsk, } } +/* + * Allocate a new mm structure and copy contents from the + * mm structure of the passed in task structure. + */ +static struct mm_struct *dup_mm(struct task_struct *tsk) +{ + struct mm_struct *mm, *oldmm = current->mm; + int err; + + if (!oldmm) + return NULL; + + mm = allocate_mm(); + if (!mm) + goto fail_nomem; + + memcpy(mm, oldmm, sizeof(*mm)); + + if (!mm_init(mm)) + goto fail_nomem; + + if (init_new_context(tsk, mm)) + goto fail_nocontext; + + err = dup_mmap(mm, oldmm); + if (err) + goto free_pt; + + mm->hiwater_rss = get_mm_rss(mm); + mm->hiwater_vm = mm->total_vm; + + return mm; + +free_pt: + mmput(mm); + +fail_nomem: + return NULL; + +fail_nocontext: + /* + * If init_new_context() failed, we cannot use mmput() to free the mm + * because it calls destroy_context() + */ + mm_free_pgd(mm); + free_mm(mm); + return NULL; +} + static int copy_mm(unsigned long clone_flags, struct task_struct * tsk) { struct mm_struct * mm, *oldmm; @@ -473,43 +522,17 @@ static int copy_mm(unsigned long clone_f } retval = -ENOMEM; - mm = allocate_mm(); + mm = dup_mm(tsk); if (!mm) goto fail_nomem; - /* Copy the current MM stuff.. */ - memcpy(mm, oldmm, sizeof(*mm)); - if (!mm_init(mm)) - goto fail_nomem; - - if (init_new_context(tsk,mm)) - goto fail_nocontext; - - retval = dup_mmap(mm, oldmm); - if (retval) - goto free_pt; - - mm->hiwater_rss = get_mm_rss(mm); - mm->hiwater_vm = mm->total_vm; - good_mm: tsk->mm = mm; tsk->active_mm = mm; return 0; -free_pt: - mmput(mm); fail_nomem: return retval; - -fail_nocontext: - /* - * If init_new_context() failed, we cannot use mmput() to free the mm - * because it calls destroy_context() - */ - mm_free_pgd(mm); - free_mm(mm); - return retval; } static inline struct fs_struct *__copy_fs_struct(struct fs_struct *old) @@ -1423,18 +1446,20 @@ static int unshare_sighand(unsigned long } /* - * Unsharing of vm for tasks created with CLONE_VM is not supported yet + * Unshare vm if it is being shared */ static int unshare_vm(unsigned long unshare_flags, struct mm_struct **new_mmp) { struct mm_struct *mm = current->mm; if ((unshare_flags & CLONE_VM) && - (mm && atomic_read(&mm->mm_users) > 1)) - return -EINVAL; + (mm && atomic_read(&mm->mm_users) > 1)) { + *new_mmp = dup_mm(current); + if (!*new_mmp) + return -ENOMEM; + } return 0; - } /* linux-2.6-unshare-6.patch: fork.c | 81 ++++++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 51 insertions(+), 30 deletions(-) --- NEW FILE linux-2.6-unshare-6.patch --- >From janak at us.ibm.com Thu Jan 12 04:15:33 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Thu, 12 Jan 2006 04:15:33 +0000 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewts4-0004P6-Rd for dwmw2 at baythorne.infradead.org; Thu, 12 Jan 2006 04:15:33 +0000 Received: from e1.ny.us.ibm.com ([32.97.182.141]) by pentafluge.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewts2-0001mm-GZ for dwmw2 at infradead.org; Thu, 12 Jan 2006 04:15:32 +0000 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e1.ny.us.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FSZ2019328 for ; Wed, 11 Jan 2006 23:15:28 -0500 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay02.pok.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id k0C4FTYs133286 for ; Wed, 11 Jan 2006 23:15:29 -0500 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.12.11/8.13.3) with ESMTP id k0C4FTxR008567 for ; Wed, 11 Jan 2006 23:15:29 -0500 Received: from sig-9-65-207-107.mts.ibm.com (sig-9-65-207-107.mts.ibm.com [9.65.207.107]) by d01av03.pok.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FRYC008536; Wed, 11 Jan 2006 23:15:27 -0500 Subject: [PATCH -mm 6/10] unshare system call -v5 : unshare files From: JANAK DESAI Reply-To: janak at us.ibm.com To: akpm at osdl.org, viro at ftp.linux.org.uk, dwmw2 at infradead.org Cc: chrisw at sous-sol.org, jamie at shareable.org, serue at us.ibm.com, sds at tycho.nsa.gov, sgrubb at redhat.com, ebiederm at xmission.com, janak at us.ibm.com, linux-kernel at vger.kernel.org Content-Type: text/plain Message-Id: <1137039003.7488.214.camel at hobbes.atlanta.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 (1.4.5-9) Date: Wed, 11 Jan 2006 23:10:54 -0500 X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.0.4 on pentafluge.infradead.org summary: Content analysis details: (0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 DNS_FROM_RFC_ABUSE RBL: Envelope sender in abuse.rfc-ignorant.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit [PATCH -mm 6/10] unshare system call: allow unsharing of files If the file descriptor structure is being shared, allocate a new one and copy information from the current, shared, structure. Changes since -v4 of this patch submitted on 12/13/05: - Fixed intermittent oops encountered when starting wine applications. Instead of passing current task structure to dup_fd and obtaining files pointer from it, pass the old files pointer because copy_files, when called from unshare_files, clears the current->files pointer. Signed-off-by: Janak Desai --- fork.c | 81 ++++++++++++++++++++++++++++++++++++++++------------------------- 1 files changed, 51 insertions(+), 30 deletions(-) diff -Naurp 2.6.15-mm3+unsh-vm/kernel/fork.c 2.6.15-mm3+unsh-fd/kernel/fork.c --- 2.6.15-mm3+unsh-vm/kernel/fork.c 2006-01-12 00:47:33.000000000 +0000 +++ 2.6.15-mm3+unsh-fd/kernel/fork.c 2006-01-12 00:56:53.000000000 +0000 @@ -620,32 +620,17 @@ out: return newf; } -static int copy_files(unsigned long clone_flags, struct task_struct * tsk) +/* + * Allocate a new files structure and copy contents from the + * passed in files structure. + */ +static struct files_struct *dup_fd(struct files_struct *oldf, int *errorp) { - struct files_struct *oldf, *newf; + struct files_struct *newf; struct file **old_fds, **new_fds; - int open_files, size, i, error = 0, expand; + int open_files, size, i, expand; struct fdtable *old_fdt, *new_fdt; - /* - * A background process may not have any files ... - */ - oldf = current->files; - if (!oldf) - goto out; - - if (clone_flags & CLONE_FILES) { - atomic_inc(&oldf->count); - goto out; - } - - /* - * Note: we may be using current for both targets (See exec.c) - * This works because we cache current->files (old) as oldf. Don't - * break this. - */ - tsk->files = NULL; - error = -ENOMEM; newf = alloc_files(); if (!newf) goto out; @@ -674,9 +659,9 @@ static int copy_files(unsigned long clon if (expand) { spin_unlock(&oldf->file_lock); spin_lock(&newf->file_lock); - error = expand_files(newf, open_files-1); + *errorp = expand_files(newf, open_files-1); spin_unlock(&newf->file_lock); - if (error < 0) + if (*errorp < 0) goto out_release; new_fdt = files_fdtable(newf); /* @@ -725,10 +710,8 @@ static int copy_files(unsigned long clon memset(&new_fdt->close_on_exec->fds_bits[start], 0, left); } - tsk->files = newf; - error = 0; out: - return error; + return newf; out_release: free_fdset (new_fdt->close_on_exec, new_fdt->max_fdset); @@ -738,6 +721,40 @@ out_release: goto out; } +static int copy_files(unsigned long clone_flags, struct task_struct * tsk) +{ + struct files_struct *oldf, *newf; + int error = 0; + + /* + * A background process may not have any files ... + */ + oldf = current->files; + if (!oldf) + goto out; + + if (clone_flags & CLONE_FILES) { + atomic_inc(&oldf->count); + goto out; + } + + /* + * Note: we may be using current for both targets (See exec.c) + * This works because we cache current->files (old) as oldf. Don't + * break this. + */ + tsk->files = NULL; + error = -ENOMEM; + newf = dup_fd(oldf, &error); + if (!newf) + goto out; + + tsk->files = newf; + error = 0; +out: + return error; +} + /* * Helper to unshare the files of the current task. * We don't want to expose copy_files internals to @@ -1463,15 +1480,19 @@ static int unshare_vm(unsigned long unsh } /* - * Unsharing of files for tasks created with CLONE_FILES is not supported yet + * Unshare file descriptor table if it is being shared */ static int unshare_fd(unsigned long unshare_flags, struct files_struct **new_fdp) { struct files_struct *fd = current->files; + int error = 0; if ((unshare_flags & CLONE_FILES) && - (fd && atomic_read(&fd->count) > 1)) - return -EINVAL; + (fd && atomic_read(&fd->count) > 1)) { + *new_fdp = dup_fd(fd, &error); + if (!*new_fdp) + return error; + } return 0; } linux-2.6-unshare-7.patch: arch/i386/kernel/syscall_table.S | 1 + include/asm-i386/unistd.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-unshare-7.patch --- >From janak at us.ibm.com Thu Jan 12 04:15:34 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Thu, 12 Jan 2006 04:15:34 +0000 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewts6-0004PB-GB for dwmw2 at baythorne.infradead.org; Thu, 12 Jan 2006 04:15:34 +0000 Received: from e5.ny.us.ibm.com ([32.97.182.145]) by pentafluge.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewts4-0001mp-H8 for dwmw2 at infradead.org; Thu, 12 Jan 2006 04:15:33 +0000 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e5.ny.us.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FVHr013497 for ; Wed, 11 Jan 2006 23:15:31 -0500 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay02.pok.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id k0C4FVYs113402 for ; Wed, 11 Jan 2006 23:15:31 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11/8.13.3) with ESMTP id k0C4FULG026136 for ; Wed, 11 Jan 2006 23:15:31 -0500 Received: from sig-9-65-207-107.mts.ibm.com (sig-9-65-207-107.mts.ibm.com [9.65.207.107]) by d01av04.pok.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FTOp026107; Wed, 11 Jan 2006 23:15:29 -0500 Subject: [PATCH -mm 7/10] unshare system call -v5 : system call registration for i386 From: JANAK DESAI Reply-To: janak at us.ibm.com To: akpm at osdl.org, viro at ftp.linux.org.uk, dwmw2 at infradead.org Cc: chrisw at sous-sol.org, jamie at shareable.org, serue at us.ibm.com, sds at tycho.nsa.gov, sgrubb at redhat.com, ebiederm at xmission.com, janak at us.ibm.com, linux-kernel at vger.kernel.org Content-Type: text/plain Message-Id: <1137039006.7488.216.camel at hobbes.atlanta.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 (1.4.5-9) Date: Wed, 11 Jan 2006 23:10:56 -0500 X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.0.4 on pentafluge.infradead.org summary: Content analysis details: (0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 DNS_FROM_RFC_ABUSE RBL: Envelope sender in abuse.rfc-ignorant.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit [PATCH -mm 7/10] unshare system call: system call registration for i386 Registers system call for the i386 architecture. Changes since -v4 of this patch submitted on 12/13/05: - Forward ported to 2.6.15-mm3 which modified the syscall number. Signed-off-by: Janak Desai --- arch/i386/kernel/syscall_table.S | 1 + include/asm-i386/unistd.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff -Naurp 2.6.15-mm3/arch/i386/kernel/syscall_table.S 2.6.15-mm3+unsh-i386/arch/i386/kernel/syscall_table.S --- 2.6.15-mm3/arch/i386/kernel/syscall_table.S 2006-01-11 20:21:43.000000000 +0000 +++ 2.6.15-mm3+unsh-i386/arch/i386/kernel/syscall_table.S 2006-01-12 00:32:53.000000000 +0000 @@ -301,3 +301,4 @@ ENTRY(sys_call_table) .long sys_inotify_init .long sys_inotify_add_watch .long sys_inotify_rm_watch + .long sys_unshare diff -Naurp 2.6.15-mm3/include/asm-i386/unistd.h 2.6.15-mm3+unsh-i386/include/asm-i386/unistd.h --- 2.6.15-mm3/include/asm-i386/unistd.h 2006-01-11 20:22:16.000000000 +0000 +++ 2.6.15-mm3+unsh-i386/include/asm-i386/unistd.h 2006-01-12 00:33:21.000000000 +0000 @@ -313,8 +313,9 @@ #define __NR_inotify_init 291 #define __NR_inotify_add_watch 292 #define __NR_inotify_rm_watch 293 +#define __NR_unshare 294 -#define NR_syscalls 294 +#define NR_syscalls 295 /* * user-visible error numbers are in the range -1 - -128: see linux-2.6-unshare-8.patch: arch/powerpc/kernel/systbl.S | 1 + include/asm-powerpc/unistd.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-unshare-8.patch --- >From janak at us.ibm.com Thu Jan 12 04:16:00 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Thu, 12 Jan 2006 04:16:00 +0000 Received: from canuck.infradead.org ([2001:8b0:10b:4::1]) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EwtsU-0004Q8-PH for dwmw2 at baythorne.infradead.org; Thu, 12 Jan 2006 04:16:00 +0000 Received: from e3.ny.us.ibm.com ([32.97.182.143]) by canuck.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EwtsB-0000Cv-Ns for dwmw2 at infradead.org; Wed, 11 Jan 2006 23:15:49 -0500 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e3.ny.us.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FXvn012503 for ; Wed, 11 Jan 2006 23:15:33 -0500 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay02.pok.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id k0C4FXYs118788 for ; Wed, 11 Jan 2006 23:15:33 -0500 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.12.11/8.13.3) with ESMTP id k0C4FWix026174 for ; Wed, 11 Jan 2006 23:15:32 -0500 Received: from sig-9-65-207-107.mts.ibm.com (sig-9-65-207-107.mts.ibm.com [9.65.207.107]) by d01av04.pok.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FVoB026147; Wed, 11 Jan 2006 23:15:31 -0500 Subject: [PATCH -mm 8/10] unshare system call -v5 : system call registration for powerpc From: JANAK DESAI Reply-To: janak at us.ibm.com To: akpm at osdl.org, viro at ftp.linux.org.uk, dwmw2 at infradead.org Cc: chrisw at sous-sol.org, jamie at shareable.org, serue at us.ibm.com, sds at tycho.nsa.gov, sgrubb at redhat.com, ebiederm at xmission.com, janak at us.ibm.com, linux-kernel at vger.kernel.org Content-Type: text/plain Message-Id: <1137039008.7488.218.camel at hobbes.atlanta.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 (1.4.5-9) Date: Wed, 11 Jan 2006 23:10:58 -0500 X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.0.4 on canuck.infradead.org summary: Content analysis details: (0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 DNS_FROM_RFC_ABUSE RBL: Envelope sender in abuse.rfc-ignorant.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit [PATCH -mm 8/10] unshare system call: system call registration for powerpc Registers system call for the powerpc architecture. Changes since -v4 of this patch submitted on 12/13/05: - Forward ported to 2.6.15-mm3 which modified the syscall number. Signed-off-by: Janak Desai --- arch/powerpc/kernel/systbl.S | 1 + include/asm-powerpc/unistd.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff -Naurp 2.6.15-mm3/arch/powerpc/kernel/systbl.S 2.6.15-mm3+unsh-powerpc/arch/powerpc/kernel/systbl.S --- 2.6.15-mm3/arch/powerpc/kernel/systbl.S 2006-01-11 20:21:45.000000000 +0000 +++ 2.6.15-mm3+unsh-powerpc/arch/powerpc/kernel/systbl.S 2006-01-12 00:36:51.000000000 +0000 @@ -321,1 +321,2 @@ SYSCALL(inotify_add_watch) SYSCALL(inotify_rm_watch) +SYSCALL(unshare) diff -Naurp 2.6.15-mm3/include/asm-powerpc/unistd.h 2.6.15-mm3+unsh-powerpc/include/asm-powerpc/unistd.h --- 2.6.15-mm3/include/asm-powerpc/unistd.h 2006-01-11 20:22:17.000000000 +0000 +++ 2.6.15-mm3+unsh-powerpc/include/asm-powerpc/unistd.h 2006-01-12 00:37:40.000000000 +0000 @@ -298,8 +298,9 @@ #define __NR_inotify_init 275 #define __NR_inotify_add_watch 276 #define __NR_inotify_rm_watch 277 +#define __NR_unshare 278 -#define __NR_syscalls 278 +#define __NR_syscalls 279 #ifdef __KERNEL__ #define __NR__exit __NR_exit linux-2.6-unshare-9.patch: misc.S | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6-unshare-9.patch --- >From janak at us.ibm.com Thu Jan 12 04:15:40 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Thu, 12 Jan 2006 04:15:40 +0000 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1EwtsB-0004PG-Rf for dwmw2 at baythorne.infradead.org; Thu, 12 Jan 2006 04:15:40 +0000 Received: from e36.co.us.ibm.com ([32.97.110.154]) by pentafluge.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1Ewts9-0001mw-SP for dwmw2 at infradead.org; Thu, 12 Jan 2006 04:15:39 +0000 Received: from westrelay02.boulder.ibm.com (westrelay02.boulder.ibm.com [9.17.195.11]) by e36.co.us.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4Fa0C030711 for ; Wed, 11 Jan 2006 23:15:36 -0500 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by westrelay02.boulder.ibm.com (8.12.10/NCO/VERS6.8) with ESMTP id k0C4E7Cb246748 for ; Wed, 11 Jan 2006 21:14:07 -0700 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.12.11/8.13.3) with ESMTP id k0C4FZE0024290 for ; Wed, 11 Jan 2006 21:15:35 -0700 Received: from sig-9-65-207-107.mts.ibm.com (sig-9-65-207-107.mts.ibm.com [9.65.207.107]) by d03av02.boulder.ibm.com (8.12.11/8.12.11) with ESMTP id k0C4FXs4024235; Wed, 11 Jan 2006 21:15:33 -0700 Subject: [PATCH -mm 9/10] unshare system call -v5 : system call registration for ppc From: JANAK DESAI Reply-To: janak at us.ibm.com To: akpm at osdl.org, viro at ftp.linux.org.uk, dwmw2 at infradead.org Cc: chrisw at sous-sol.org, jamie at shareable.org, serue at us.ibm.com, sds at tycho.nsa.gov, sgrubb at redhat.com, ebiederm at xmission.com, janak at us.ibm.com, linux-kernel at vger.kernel.org Content-Type: text/plain Message-Id: <1137039010.7488.220.camel at hobbes.atlanta.ibm.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.5 (1.4.5-9) Date: Wed, 11 Jan 2006 23:11:00 -0500 X-Spam-Score: 0.4 (/) X-Spam-Report: SpamAssassin version 3.0.4 on pentafluge.infradead.org summary: Content analysis details: (0.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 DNS_FROM_RFC_ABUSE RBL: Envelope sender in abuse.rfc-ignorant.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit [PATCH -mm 9/10] unshare system call: system call registration for ppc Registers system call for the ppc architecture. Changes since -v4 of this patch submitted on 12/13/05: - Forward ported to 2.6.15-mm3 which modified the syscall number. Signed-off-by: Janak Desai --- misc.S | 1 + 1 files changed, 1 insertion(+) diff -Naurp 2.6.15-mm3/arch/ppc/kernel/misc.S 2.6.15-mm3+unsh-ppc/arch/ppc/kernel/misc.S --- 2.6.15-mm3/arch/ppc/kernel/misc.S 2006-01-11 20:21:46.000000000 +0000 +++ 2.6.15-mm3+unsh-ppc/arch/ppc/kernel/misc.S 2006-01-12 00:44:16.000000000 +0000 @@ -1403,3 +1403,4 @@ _GLOBAL(sys_call_table) .long sys_inotify_init /* 275 */ .long sys_inotify_add_watch .long sys_inotify_rm_watch + .long sys_unshare Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.10 retrieving revision 1.1826.2.10.2.1 diff -u -r1.1826.2.10 -r1.1826.2.10.2.1 --- kernel-2.6.spec 11 Jan 2006 22:13:27 -0000 1.1826.2.10 +++ kernel-2.6.spec 13 Jan 2006 17:17:15 -0000 1.1826.2.10.2.1 @@ -20,7 +20,7 @@ %define sublevel 15 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define rhbsys %([ -r /etc/beehive-root -o -n "%{?__beehive_build}" ] && echo || echo .`whoami`) +%define rhbsys ,lspp.6 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -403,6 +403,24 @@ Patch10003: linux-2.6-gcc41.patch Patch10004: linux-2.6-compile-fixes.patch +Patch20000: linux-2.6-audit-git.patch +Patch20001: linux-2.6-unshare-1.patch +Patch20002: linux-2.6-unshare-2.patch +Patch20003: linux-2.6-unshare-3.patch +Patch20004: linux-2.6-unshare-4.patch +Patch20005: linux-2.6-unshare-5.patch +Patch20006: linux-2.6-unshare-6.patch +Patch20007: linux-2.6-unshare-7.patch +Patch20008: linux-2.6-unshare-8.patch +Patch20009: linux-2.6-unshare-9.patch +Patch20010: linux-2.6-unshare-10.patch + +Patch20020: linux-2.6-audit-string-1.patch +Patch20021: linux-2.6-audit-string-2.patch +Patch20022: linux-2.6-audit-promisc.patch +Patch20023: linux-2.6-audit-tty.patch +Patch20024: linux-2.6-audit-rule-log.patch + # END OF PATCH DEFINITIONS BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root @@ -939,6 +957,23 @@ %patch10003 -p1 #%patch10004 -p1 +%patch20000 -p1 +%patch20001 -p1 +%patch20002 -p1 +%patch20003 -p1 +%patch20004 -p1 +%patch20005 -p1 +%patch20006 -p1 +%patch20007 -p1 +%patch20008 -p1 +%patch20009 -p1 +%patch20010 -p1 + +%patch20020 -p1 +%patch20021 -p1 +%patch20022 -p1 +%patch20023 -p1 +%patch20024 -p1 # END OF PATCH APPLICATIONS From fedora-cvs-commits at redhat.com Fri Jan 13 17:18:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 12:18:58 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1826.2.10.2.1,1.1826.2.10.2.2 Message-ID: <200601131718.k0DHIwCi030831@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30821 Modified Files: Tag: private-fc5-test2-lspp-branch kernel-2.6.spec Log Message: fix rhbsys tag Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.10.2.1 retrieving revision 1.1826.2.10.2.2 diff -u -r1.1826.2.10.2.1 -r1.1826.2.10.2.2 --- kernel-2.6.spec 13 Jan 2006 17:17:15 -0000 1.1826.2.10.2.1 +++ kernel-2.6.spec 13 Jan 2006 17:18:55 -0000 1.1826.2.10.2.2 @@ -20,7 +20,7 @@ %define sublevel 15 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define rhbsys ,lspp.6 +%define rhbsys .lspp.6 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} %define signmodules 0 %define make_target bzImage From fedora-cvs-commits at redhat.com Fri Jan 13 17:20:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 12:20:07 -0500 Subject: rpms/xsane/devel .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 xsane.spec, 1.25, 1.26 Message-ID: <200601131720.k0DHK762030921@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/xsane/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30905 Modified Files: .cvsignore sources xsane.spec Log Message: version 0.99 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xsane/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 24 Nov 2005 16:59:24 -0000 1.12 +++ .cvsignore 13 Jan 2006 17:20:03 -0000 1.13 @@ -1 +1 @@ -xsane-0.98a.tar.gz +xsane-0.99.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xsane/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 24 Nov 2005 16:59:24 -0000 1.12 +++ sources 13 Jan 2006 17:20:03 -0000 1.13 @@ -1 +1 @@ -fec674f4c2e7395a86c2e8211deb99f7 xsane-0.98a.tar.gz +c850be334dcd36d426d5d85c7334275a xsane-0.99.tar.gz Index: xsane.spec =================================================================== RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- xsane.spec 9 Dec 2005 22:43:55 -0000 1.25 +++ xsane.spec 13 Jan 2006 17:20:03 -0000 1.26 @@ -1,7 +1,7 @@ Name: xsane Summary: An X Window System front-end for the SANE scanner interface. -Version: 0.98a -Release: 1.1 +Version: 0.99 +Release: 1 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-install-gimp-plugin Patch0: xsane-0.90-htmlview.patch @@ -95,6 +95,9 @@ exit 0 %changelog +* Fri Jan 13 2006 Nils Philippsen 0.99-1 +- version 0.99 + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Fri Jan 13 17:40:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 12:40:32 -0500 Subject: rpms/gnucash/devel gnucash.spec,1.18.2.4,1.18.2.5 Message-ID: <200601131740.k0DHeWHO031269@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31253 Modified Files: Tag: gnucash-g2-branch gnucash.spec Log Message: disable postgres Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.18.2.4 retrieving revision 1.18.2.5 diff -u -r1.18.2.4 -r1.18.2.5 --- gnucash.spec 9 Jan 2006 19:34:53 -0000 1.18.2.4 +++ gnucash.spec 13 Jan 2006 17:40:29 -0000 1.18.2.5 @@ -1,4 +1,4 @@ -%define svnrev 12307 +%define svnrev 12326 Name: gnucash Summary: GnuCash is an application to keep track of your finances. @@ -15,7 +15,7 @@ Patch5: gnucash-1.8.12-aq.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildPrereq: g-wrap-devel >= 1.3.2, gtkhtml3-devel -BuildPrereq: postgresql-devel, libgsf-devel >= 1.12.2 +BuildPrereq: libgsf-devel >= 1.12.2 # cairo-devel >= 0.5.0 BuildPrereq: libglade2-devel >= 2.3.6, libgnomeprint22-devel >= 2.8.0 BuildPrereq: libofx-devel, aqbanking-devel, docbook-style-xsl @@ -23,6 +23,7 @@ Requires: slib >= 3a1-5 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4 %define __perl_requires %{nil} +Obsoletes: gnucash-backend-postgres %description GnuCash is a personal finance manager. A check-book like register GUI @@ -31,18 +32,6 @@ use, but is backed with double-entry accounting principles to ensure balanced books. -%package backend-postgres -Summary: Backend for storing GnuCash data in a PostgreSQL database. -Group: Applications/Productivity -Requires: gnucash = %{version} - -%description backend-postgres - -This package contains a backend for storing your GnuCash accounts and -transactions in a PostgreSQL database. Install this package if you -want to keep your financial data in a database instead of a flat file -(recommended for large volumes of data and commercial sites). - %prep %setup -q -n gnucash -a 1 #%patch3 -p1 -b .icon @@ -51,7 +40,7 @@ %build ./autogen.sh --prefix=/usr -%configure --enable-sql --enable-error-on-warning=no \ +%configure --disable-sql --enable-error-on-warning=no \ --enable-ofx \ --enable-hbci \ # --with-cairo \ @@ -118,7 +107,6 @@ %{_libexecdir}/gnucash %{_libdir}/* %exclude /usr/lib/debug -%exclude %{_libdir}/libgnc-backend-postgres* %{_datadir}/xml/* %{_datadir}/gnucash %{_datadir}/gnome/help/gnucash @@ -132,11 +120,6 @@ %doc AUTHORS COPYING ChangeLog ChangeLog.1 HACKING NEWS README README.patches %doc doc/README.german doc/README.francais doc/guile-hackers.txt -%files backend-postgres -%defattr(-,root,root) -%doc src/backend/postgres/README -%{_libdir}/libgnc-backend-postgres* - %changelog * Sat Dec 24 2005 Bill Nottingham 1.9.0-0.12168.1 - update to 2.x branch From fedora-cvs-commits at redhat.com Fri Jan 13 18:06:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 13:06:17 -0500 Subject: rpms/eog/devel .cvsignore, 1.22, 1.23 eog.spec, 1.33, 1.34 sources, 1.22, 1.23 Message-ID: <200601131806.k0DI6Htf021591@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21549 Modified Files: .cvsignore eog.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 14 Dec 2005 20:47:45 -0000 1.22 +++ .cvsignore 13 Jan 2006 18:06:13 -0000 1.23 @@ -9,3 +9,4 @@ eog-2.12.1.tar.bz2 eog-2.13.2.tar.bz2 eog-2.13.3.tar.bz2 +eog-2.13.4.tar.bz2 Index: eog.spec =================================================================== RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- eog.spec 14 Dec 2005 20:47:45 -0000 1.33 +++ eog.spec 13 Jan 2006 18:06:13 -0000 1.34 @@ -12,7 +12,7 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.13.3 +Version: 2.13.4 Release: 1 URL: http://www.gnome.org Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2 @@ -97,6 +97,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Fri Jan 13 2005 Matthias Clasen 2.13.4-1 +- Update to 2.13.4 + * Wed Dec 14 2005 Matthias Clasen 2.13.3-1 - Update to 2.13.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/eog/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 14 Dec 2005 20:47:45 -0000 1.22 +++ sources 13 Jan 2006 18:06:13 -0000 1.23 @@ -1 +1 @@ -e36a5ef37583b69c6784705e50d07bea eog-2.13.3.tar.bz2 +e5071b9c10f18ce13888c7e53b9ec7ab eog-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 13 18:07:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 13:07:19 -0500 Subject: rpms/eog/devel eog.spec,1.34,1.35 Message-ID: <200601131807.k0DI7JN8021822@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21771 Modified Files: eog.spec Log Message: 2.13.4 Index: eog.spec =================================================================== RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- eog.spec 13 Jan 2006 18:06:13 -0000 1.34 +++ eog.spec 13 Jan 2006 18:07:16 -0000 1.35 @@ -97,7 +97,7 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog -* Fri Jan 13 2005 Matthias Clasen 2.13.4-1 +* Fri Jan 13 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 * Wed Dec 14 2005 Matthias Clasen 2.13.3-1 From fedora-cvs-commits at redhat.com Fri Jan 13 18:13:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 13:13:19 -0500 Subject: rpms/gedit/devel .cvsignore, 1.30, 1.31 gedit.spec, 1.56, 1.57 sources, 1.32, 1.33 Message-ID: <200601131813.k0DIDJcF023405@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23339 Modified Files: .cvsignore gedit.spec sources Log Message: 2.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 3 Jan 2006 16:53:01 -0000 1.30 +++ .cvsignore 13 Jan 2006 18:13:16 -0000 1.31 @@ -5,3 +5,4 @@ gedit-2.12.1.tar.bz2 gedit-2.13.0.tar.bz2 gedit-2.13.1.tar.bz2 +gedit-2.13.2.tar.bz2 Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- gedit.spec 9 Jan 2006 02:46:59 -0000 1.56 +++ gedit.spec 13 Jan 2006 18:13:16 -0000 1.57 @@ -14,8 +14,8 @@ Summary: gEdit is a small but powerful text editor for GNOME. Name: gedit -Version: 2.13.1 -Release: 2 +Version: 2.13.2 +Release: 1 Epoch: 1 License: GPL Group: Applications/Editors @@ -148,6 +148,9 @@ %{_libdir}/pkgconfig/gedit-2.10.pc %changelog +* Sun Jan 13 2006 Matthias Clasen - 1.2.13.2-1 +- Update to 2.13.2 + * Sun Jan 8 2006 Dan Williams - 1:2.13.1-2 - Fix up and re-enable persistent file selector size patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 3 Jan 2006 16:53:01 -0000 1.32 +++ sources 13 Jan 2006 18:13:16 -0000 1.33 @@ -1 +1 @@ -9606f4af2c751a9c1ccca11a17b12a38 gedit-2.13.1.tar.bz2 +a10042484fe2e9b5d44909f62fc51fad gedit-2.13.2.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 13 18:44:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 13:44:28 -0500 Subject: rpms/gedit/devel gedit-2.13.2-filesel.patch, NONE, 1.1 gedit.spec, 1.57, 1.58 Message-ID: <200601131844.k0DIiSRi012439@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12367 Modified Files: gedit.spec Added Files: gedit-2.13.2-filesel.patch Log Message: Fix patch gedit-2.13.2-filesel.patch: data/gedit.schemas.in | 19 +++++++++++++++++++ gedit/gedit-commands-file.c | 24 ++++++++++++++++++++++++ gedit/gedit-prefs-manager.c | 10 ++++++++++ gedit/gedit-prefs-manager.h | 16 ++++++++++++++++ 4 files changed, 69 insertions(+) --- NEW FILE gedit-2.13.2-filesel.patch --- --- gedit-2.13.2/data/gedit.schemas.in.filesel 2006-01-13 13:27:15.000000000 -0500 +++ gedit-2.13.2/data/gedit.schemas.in 2006-01-13 13:29:14.000000000 -0500 @@ -629,5 +629,24 @@ + + /schemas/apps/gedit-2/preferences/ui/open_save/selector_width + /apps/gedit-2/preferences/ui/open_save/selector_width + gedit + int + 400 + + Open/Save Dialog Width + Persistent Open/Save dialog width. + + + + + /schemas/apps/gedit-2/preferences/ui/open_save/selector_height+ /apps/gedit-2/preferences/ui/open_save/selector_height+ gedit + int + 400 + + Open/Save Dialog Height + Persistent Open/Save dialog height. + + --- gedit-2.13.2/gedit/gedit-prefs-manager.h.filesel 2006-01-13 13:29:39.000000000 -0500 +++ gedit-2.13.2/gedit/gedit-prefs-manager.h 2006-01-13 13:36:05.000000000 -0500 @@ -106,6 +106,10 @@ #define GPM_RECENTS_DIR GPM_PREFS_DIR "/ui/recents" #define GPM_MAX_RECENTS GPM_RECENTS_DIR "/max_recents" +#define GPM_OPENSAVE_DIR GPM_PREFS_DIR "/ui/open_save" +#define GPM_OPENSAVE_WIDTH GPM_OPENSAVE_DIR "/selector_width" +#define GPM_OPENSAVE_HEIGHT GPM_OPENSAVE_DIR "/selector_height" + /* Print */ #define GPM_PRINT_PAGE_DIR GPM_PREFS_DIR "/print/page" #define GPM_PRINT_SYNTAX GPM_PRINT_PAGE_DIR "/print_syntax_highlighting" @@ -189,6 +193,9 @@ #define GPM_DEFAULT_MAX_RECENTS 5 +#define GPM_DEFAULT_OPENSAVE_WIDTH 400 +#define GPM_DEFAULT_OPENSAVE_HEIGHT 400 + #define GPM_DEFAULT_WINDOW_STATE 0 #define GPM_DEFAULT_WINDOW_WIDTH 650 #define GPM_DEFAULT_WINDOW_HEIGHT 500 @@ -386,6 +393,15 @@ */ gint gedit_prefs_manager_get_max_recents (void); +/* Persistent size of open/save dialogs */ +gint gedit_prefs_manager_get_opensave_dialog_width (void); +void gedit_prefs_manager_set_opensave_dialog_width (gint width); +gboolean gedit_prefs_manager_opensave_dialog_width_can_set (void); + +gint gedit_prefs_manager_get_opensave_dialog_height (void); +void gedit_prefs_manager_set_opensave_dialog_height (gint height); +gboolean gedit_prefs_manager_opensave_dialog_height_can_set (void); + /* Encodings */ GSList *gedit_prefs_manager_get_auto_detected_encodings (void); --- gedit-2.13.2/gedit/gedit-prefs-manager.c.filesel 2006-01-13 13:42:22.000000000 -0500 +++ gedit-2.13.2/gedit/gedit-prefs-manager.c 2006-01-13 13:42:56.000000000 -0500 @@ -721,6 +721,16 @@ } +/* Open/Save dialog width */ +DEFINE_INT_PREF (opensave_dialog_width, + GPM_OPENSAVE_WIDTH, + GPM_DEFAULT_OPENSAVE_WIDTH) + +/* Open/Save dialog height */ +DEFINE_INT_PREF (opensave_dialog_height, + GPM_OPENSAVE_HEIGHT, + GPM_DEFAULT_OPENSAVE_HEIGHT) + /* Statusbar visiblity */ DEFINE_BOOL_PREF (statusbar_visible, GPM_STATUSBAR_VISIBLE, --- gedit-2.13.2/gedit/gedit-commands-file.c.filesel 2006-01-13 13:36:19.000000000 -0500 +++ gedit-2.13.2/gedit/gedit-commands-file.c 2006-01-13 13:42:11.000000000 -0500 @@ -50,6 +50,7 @@ #include "dialogs/gedit-close-confirmation-dialog.h" #include "dialogs/gedit-open-location-dialog.h" #include "gedit-file-chooser-dialog.h" +#include "gedit-prefs-manager.h" /* Defined constants */ @@ -239,9 +240,15 @@ { GSList *uris; const GeditEncoding *encoding; + gint selector_width; + gint selector_height; gedit_debug (DEBUG_COMMANDS); + gtk_window_get_size (GTK_WINDOW (dialog), &selector_width, &selector_height); + gedit_prefs_manager_set_opensave_dialog_width (selector_width); + gedit_prefs_manager_set_opensave_dialog_height (selector_height); + if (response_id != GTK_RESPONSE_OK) { gtk_widget_destroy (GTK_WIDGET (dialog)); @@ -272,6 +279,8 @@ gpointer data; GeditDocument *doc; gchar *default_path = NULL; + gint selector_width; + gint selector_height; gedit_debug (DEBUG_COMMANDS); @@ -336,6 +345,9 @@ g_free (default_path); + selector_width = gedit_prefs_manager_get_opensave_dialog_width (); + selector_height = gedit_prefs_manager_get_opensave_dialog_height (); + gtk_window_resize (GTK_WINDOW (open_dialog), selector_width, selector_heigh g_signal_connect (open_dialog, "response", G_CALLBACK (open_dialog_response_cb), @@ -585,6 +597,8 @@ GeditTab *tab; gpointer data; GSList *tabs_to_save_as; + gint selector_width; + gint selector_height; gedit_debug (DEBUG_COMMANDS); @@ -603,6 +617,10 @@ encoding = gedit_file_chooser_dialog_get_encoding (dialog); + gtk_window_get_size (GTK_WINDOW (dialog), &selector_width, &selector_height); + gedit_prefs_manager_set_opensave_dialog_width (selector_width); + gedit_prefs_manager_set_opensave_dialog_height (selector_height); + gtk_widget_destroy (GTK_WIDGET (dialog)); if (tab != NULL) @@ -701,6 +719,8 @@ gchar *uri; gboolean uri_set = FALSE; const GeditEncoding *encoding; + gint selector_width; + gint selector_height; g_return_if_fail (GEDIT_IS_TAB (tab)); g_return_if_fail (GEDIT_IS_WINDOW (window)); @@ -778,6 +798,10 @@ G_CALLBACK (save_dialog_response_cb), window); + selector_width = gedit_prefs_manager_get_opensave_dialog_width(); + selector_height = gedit_prefs_manager_get_opensave_dialog_height(); + gtk_window_resize (GTK_WINDOW (save_dialog), selector_width, selector_height); + gtk_widget_show (save_dialog); } Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- gedit.spec 13 Jan 2006 18:13:16 -0000 1.57 +++ gedit.spec 13 Jan 2006 18:44:24 -0000 1.58 @@ -28,7 +28,7 @@ PreReq: desktop-file-utils >= %{desktop_file_utils_version} # Make the file selector remember last window size -Patch0: gedit-2.13.1-filesel-persistent-size.patch +Patch0: gedit-2.13.2-filesel-persistent-size.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -150,6 +150,7 @@ %changelog * Sun Jan 13 2006 Matthias Clasen - 1.2.13.2-1 - Update to 2.13.2 +- Update the persistent file selector size patch (again!) * Sun Jan 8 2006 Dan Williams - 1:2.13.1-2 - Fix up and re-enable persistent file selector size patch From fedora-cvs-commits at redhat.com Fri Jan 13 18:54:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 13:54:40 -0500 Subject: rpms/gnome-terminal/devel .cvsignore, 1.16, 1.17 gnome-terminal.spec, 1.24, 1.25 sources, 1.16, 1.17 Message-ID: <200601131854.k0DIsevB027254@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27210 Modified Files: .cvsignore gnome-terminal.spec sources Log Message: 2.13.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 15 Dec 2005 14:39:10 -0000 1.16 +++ .cvsignore 13 Jan 2006 18:54:35 -0000 1.17 @@ -1,3 +1,4 @@ gnome-terminal-2.11.2.tar.bz2 gnome-terminal-2.12.0.tar.bz2 gnome-terminal-2.13.0.tar.bz2 +gnome-terminal-2.13.1.tar.bz2 Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gnome-terminal.spec 5 Jan 2006 19:43:13 -0000 1.24 +++ gnome-terminal.spec 13 Jan 2006 18:54:35 -0000 1.25 @@ -12,8 +12,8 @@ Summary: GNOME Terminal Name: gnome-terminal -Version: 2.13.0 -Release: 2 +Version: 2.13.1 +Release: 1 URL: http://www.gnome.org/ Source0: gnome-terminal-%{version}.tar.bz2 Source1: ne.po @@ -104,6 +104,9 @@ %{_datadir}/application-registry/gnome-terminal.applications %changelog +* Fri Jan 13 2006 Matthias Clasen 2.13.1-1 +- Update to 2.13.1 + * Thu Jan 4 2006 Christopher Aillon 2.13.0-2 - Revert patch from gnome bug 98715 to fix 176029, 176642 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 15 Dec 2005 14:39:10 -0000 1.16 +++ sources 13 Jan 2006 18:54:35 -0000 1.17 @@ -1 +1 @@ -e60adc20ff440d814a7c6bbffd2fa2c4 gnome-terminal-2.13.0.tar.bz2 +e38e2a85a930cf9bd5d3150297d0a83a gnome-terminal-2.13.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 13 18:55:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 13:55:28 -0500 Subject: rpms/gnucash/devel gnucash.spec,1.19,1.20 Message-ID: <200601131855.k0DItSPG027537@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27039 Modified Files: gnucash.spec Log Message: *docs* Disable postgresql backend, as it is unmaintained upstream, does not support the full set of Gnucash features, and can lead to crashes. Users who use the postgres backend should, *BEFORE* upgrading, load their data and save it as an XML file. Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gnucash.spec 22 Dec 2005 21:42:37 -0000 1.19 +++ gnucash.spec 13 Jan 2006 18:55:25 -0000 1.20 @@ -3,7 +3,7 @@ Name: gnucash Summary: GnuCash is an application to keep track of your finances. Version: 1.8.12 -Release: 1 +Release: 2 License: GPL/GFDL Group: Applications/Productivity Source: http://www.gnucash.org/pub/gnucash/sources/unstable/%{name}-%{version}.tar.gz @@ -15,7 +15,7 @@ BuildPrereq: g-wrap-devel >= 1.3.2, gtkhtml-devel >= 1.1.4, BuildPrereq: Guppi-devel, gal-devel, libxml-devel, db4-devel BuildPrereq: libglade-devel, libghttp-devel, python-devel, libtermcap-devel -BuildPrereq: readline-devel postgresql-devel, autoconf +BuildPrereq: readline-devel, autoconf BuildPrereq: libofx-devel, aqbanking-devel, docbook-style-xsl BuildPrereq: libtool-ltdl-devel, GConf-devel BuildRequires: desktop-file-utils, scrollkeeper @@ -30,18 +30,6 @@ use, but is backed with double-entry accounting principles to ensure balanced books. -%package backend-postgres -Summary: Backend for storing GnuCash data in a PostgreSQL database. -Group: Applications/Productivity -Requires: gnucash = %{version} - -%description backend-postgres - -This package contains a backend for storing your GnuCash accounts and -transactions in a PostgreSQL database. Install this package if you -want to keep your financial data in a database instead of a flat file -(recommended for large volumes of data and commercial sites). - %prep %setup -q -a 1 %patch3 -p1 -b .icon @@ -50,7 +38,7 @@ %build autoconf -%configure --enable-sql --enable-error-on-warning=no \ +%configure --disable-sql --enable-error-on-warning=no \ --enable-ofx \ --enable-hbci @@ -105,7 +93,6 @@ %{_libexecdir}/gnucash %{_libdir}/* %exclude /usr/lib/debug -%exclude %{_libdir}/gnucash/libgncmod-backend-postgres* %{_datadir}/gnucash %{_datadir}/gnome/help/gnucash %{_datadir}/mime-info/gnucash.* @@ -117,12 +104,10 @@ %doc AUTHORS COPYING ChangeLog ChangeLog.1 HACKING NEWS README README.patches %doc doc/README.german doc/README.francais doc/guile-hackers.txt -%files backend-postgres -%defattr(-,root,root) -%doc src/backend/postgres/README -%{_libdir}/gnucash/libgncmod-backend-postgres* - %changelog +* Fri Jan 13 2005 Bill Nottingham 1.8.12-2 +- disable postgres backend (#177646) + * Thu Dec 22 2005 Bill Nottingham 1.8.12-1 - update to 1.8.12 From fedora-cvs-commits at redhat.com Fri Jan 13 18:56:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 13:56:11 -0500 Subject: rpms/gnucash/devel gnucash.spec,1.20,1.21 Message-ID: <200601131856.k0DIuBGB027745@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27722 Modified Files: gnucash.spec Log Message: happy new year Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gnucash.spec 13 Jan 2006 18:55:25 -0000 1.20 +++ gnucash.spec 13 Jan 2006 18:56:06 -0000 1.21 @@ -105,7 +105,7 @@ %doc doc/README.german doc/README.francais doc/guile-hackers.txt %changelog -* Fri Jan 13 2005 Bill Nottingham 1.8.12-2 +* Fri Jan 13 2006 Bill Nottingham 1.8.12-2 - disable postgres backend (#177646) * Thu Dec 22 2005 Bill Nottingham 1.8.12-1 From fedora-cvs-commits at redhat.com Fri Jan 13 18:57:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 13:57:35 -0500 Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.25,1.26 Message-ID: <200601131857.k0DIvZ4c028122@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28061 Modified Files: gnome-terminal.spec Log Message: 2.13.1 Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- gnome-terminal.spec 13 Jan 2006 18:54:35 -0000 1.25 +++ gnome-terminal.spec 13 Jan 2006 18:57:31 -0000 1.26 @@ -18,7 +18,6 @@ Source0: gnome-terminal-%{version}.tar.bz2 Source1: ne.po Patch0: gnome-terminal-2.12.0-inputmethod.patch -Patch1: gnome-terminal-2.13.0-revert-98715.patch License: GPL Group: User Interface/Desktops @@ -54,7 +53,6 @@ %setup -q cp ${RPM_SOURCE_DIR}/ne.po po %patch0 -p1 -b .inputmethod -%patch1 -p1 -b .revert-98715 %build @@ -106,6 +104,7 @@ %changelog * Fri Jan 13 2006 Matthias Clasen 2.13.1-1 - Update to 2.13.1 +- Remove upstreamed patches * Thu Jan 4 2006 Christopher Aillon 2.13.0-2 - Revert patch from gnome bug 98715 to fix 176029, 176642 From fedora-cvs-commits at redhat.com Fri Jan 13 19:01:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:01:58 -0500 Subject: rpms/gedit/devel gedit.spec,1.58,1.59 Message-ID: <200601131901.k0DJ1wYw029250@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29187 Modified Files: gedit.spec Log Message: Fix patch name Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- gedit.spec 13 Jan 2006 18:44:24 -0000 1.58 +++ gedit.spec 13 Jan 2006 19:01:43 -0000 1.59 @@ -28,7 +28,7 @@ PreReq: desktop-file-utils >= %{desktop_file_utils_version} # Make the file selector remember last window size -Patch0: gedit-2.13.2-filesel-persistent-size.patch +Patch0: gedit-2.13.2-filesel.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} From fedora-cvs-commits at redhat.com Fri Jan 13 19:03:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:03:27 -0500 Subject: rpms/redhat-artwork/devel redhat-artwork.spec,1.113,1.114 Message-ID: <200601131903.k0DJ3RSJ029417@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/redhat-artwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29381 Modified Files: redhat-artwork.spec Log Message: * Fri Jan 13 2006 Christopher Aillon 0.131-3 - BuildRequire xorg-x11-apps, as xcursorgen moved there. This should really really fix the cursors issue. Index: redhat-artwork.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- redhat-artwork.spec 3 Jan 2006 15:41:25 -0000 1.113 +++ redhat-artwork.spec 13 Jan 2006 19:03:25 -0000 1.114 @@ -4,7 +4,7 @@ Summary: Artwork for Red Hat default look-and-feel Name: redhat-artwork Version: 0.131 -Release: 2 +Release: 3 URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz Source1: post-install-fixup.sh @@ -30,6 +30,7 @@ BuildRequires: gtk2-devel >= 2.6.2 #BuildRequires: qt-devel >= 1:3.3.4-10 BuildRequires: kdebase-devel >= 3.2.0 +BuildRequires: xorg-x11-apps BuildRequires: icon-slicer >= 0.3-6 # for intltool to work BuildRequires: perl-XML-Parser @@ -141,6 +142,10 @@ %config /root/.gtkrc %changelog +* Fri Jan 13 2006 Christopher Aillon 0.131-3 +- BuildRequire xorg-x11-apps, as xcursorgen moved there. + This should really really fix the cursors issue. + * Tue Jan 03 2006 John (J5) Palmieri 0.131-2 - rebuild again to fix problem with cursors not showing up From fedora-cvs-commits at redhat.com Fri Jan 13 19:05:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:05:34 -0500 Subject: rpms/gaim/devel gaim.spec,1.109,1.110 Message-ID: <200601131905.k0DJ5YNC029752@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/gaim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29723 Modified Files: gaim.spec Log Message: - buildreq desktop-file-utils (ivazquez #176688) - detect NSS in a generic way and abort on failure Index: gaim.spec =================================================================== RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- gaim.spec 21 Dec 2005 13:14:27 -0000 1.109 +++ gaim.spec 13 Jan 2006 19:05:29 -0000 1.110 @@ -13,7 +13,7 @@ Name: gaim Version: 1.5.0 -Release: 9.fc5.3 +Release: 13.fc5 Epoch: 1 License: GPL Group: Applications/Internet @@ -82,8 +82,9 @@ # Basic Library Requirements BuildRequires: libao-devel, startup-notification-devel, audiofile-devel -BuildRequires: nss-devel +BuildRequires: mozilla-nss-devel BuildRequires: gtk2-devel +BuildRequires: desktop-file-utils # krb5 needed for Zephyr (FC1+) %if %{krb_integration} @@ -198,6 +199,10 @@ # disable tcl and tk because nobody uses it # gnutls is buggy so use mozilla-nss on all distributions %configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes $WITH_KRB $WITH_SILC $WITH_PERL + +# Abort build if NSS was not detected +grep -q "#define HAVE_NSS 1" config.h || exit 1 + # patch Makefile for PIE patch -p1 < %{PATCH5} make %{?_smp_mflags} @@ -268,6 +273,10 @@ %endif %changelog +* Fri Jan 13 2006 Warren Togami 1:1.5.0-13 +- buildreq desktop-file-utils (ivazquez #176688) +- detect NSS in a generic way and abort on failure + * Wed Dec 21 2005 Warren Togami - rebuild for nss-devel (#176314 nosnilmot) From fedora-cvs-commits at redhat.com Fri Jan 13 19:07:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:07:21 -0500 Subject: rpms/librsvg2/devel .cvsignore, 1.18, 1.19 librsvg2.spec, 1.33, 1.34 sources, 1.18, 1.19 Message-ID: <200601131907.k0DJ7LvR030096@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/librsvg2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30061 Modified Files: .cvsignore librsvg2.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/librsvg2/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 30 Nov 2005 19:16:28 -0000 1.18 +++ .cvsignore 13 Jan 2006 19:07:19 -0000 1.19 @@ -7,3 +7,4 @@ librsvg-2.12.5.tar.bz2 librsvg-2.12.7.tar.bz2 librsvg-2.13.3.tar.bz2 +librsvg-2.13.5.tar.bz2 Index: librsvg2.spec =================================================================== RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- librsvg2.spec 3 Jan 2006 19:22:16 -0000 1.33 +++ librsvg2.spec 13 Jan 2006 19:07:19 -0000 1.34 @@ -11,8 +11,8 @@ Name: librsvg2 Summary: An SVG library based on cairo. -Version: 2.13.3 -Release: 4 +Version: 2.13.5 +Release: 1 License: LGPL Group: System Environment/Libraries @@ -112,6 +112,9 @@ ##%doc %{_datadir}/gtk-doc/html/rsvg %changelog +* Fri Jan 13 2006 Matthias Clasen 2.13.5-1 +- Update to 2.13.5 + * Tue Jan 3 2006 Jesse Keating 2.13.3-4 - Rebuilt on new gcc Index: sources =================================================================== RCS file: /cvs/dist/rpms/librsvg2/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 30 Nov 2005 19:16:28 -0000 1.18 +++ sources 13 Jan 2006 19:07:19 -0000 1.19 @@ -1 +1 @@ -43a4e685828f8b2611a2ebccfa51aa67 librsvg-2.13.3.tar.bz2 +ed74fe02d3a624956dd3bde0909d8516 librsvg-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 13 19:07:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:07:41 -0500 Subject: rpms/gnucash/devel gnucash.spec,1.21,1.22 Message-ID: <200601131907.k0DJ7fAX030161@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gnucash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30127 Modified Files: gnucash.spec Log Message: add obsolete Index: gnucash.spec =================================================================== RCS file: /cvs/dist/rpms/gnucash/devel/gnucash.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gnucash.spec 13 Jan 2006 18:56:06 -0000 1.21 +++ gnucash.spec 13 Jan 2006 19:07:38 -0000 1.22 @@ -22,6 +22,7 @@ Requires: slib >= 3a1-5 Prereq: /sbin/ldconfig, scrollkeeper >= 0.3.4 %define __perl_requires %{nil} +Obsoletes: gnucash-backend-postgres %description GnuCash is a personal finance manager. A check-book like register GUI From fedora-cvs-commits at redhat.com Fri Jan 13 19:11:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:11:43 -0500 Subject: rpms/gnome-terminal/devel gnome-terminal.spec,1.26,1.27 Message-ID: <200601131911.k0DJBhbo031132@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31086 Modified Files: gnome-terminal.spec Log Message: Fix up filelists Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- gnome-terminal.spec 13 Jan 2006 18:57:31 -0000 1.26 +++ gnome-terminal.spec 13 Jan 2006 19:11:32 -0000 1.27 @@ -99,7 +99,6 @@ %{_datadir}/applications %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas %{_libdir}/bonobo -%{_datadir}/application-registry/gnome-terminal.applications %changelog * Fri Jan 13 2006 Matthias Clasen 2.13.1-1 From fedora-cvs-commits at redhat.com Fri Jan 13 19:15:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:15:00 -0500 Subject: rpms/gedit/devel gedit-2.13.2-filesel.patch,1.1,1.2 Message-ID: <200601131915.k0DJF0wp032351@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32294 Modified Files: gedit-2.13.2-filesel.patch Log Message: Fix the patch gedit-2.13.2-filesel.patch: data/gedit.schemas.in | 19 +++++++++++++++++++ gedit/gedit-commands-file.c | 24 ++++++++++++++++++++++++ gedit/gedit-prefs-manager.c | 10 ++++++++++ gedit/gedit-prefs-manager.h | 16 ++++++++++++++++ 4 files changed, 69 insertions(+) Index: gedit-2.13.2-filesel.patch =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit-2.13.2-filesel.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gedit-2.13.2-filesel.patch 13 Jan 2006 18:44:24 -0000 1.1 +++ gedit-2.13.2-filesel.patch 13 Jan 2006 19:14:54 -0000 1.2 @@ -124,7 +124,7 @@ + selector_width = gedit_prefs_manager_get_opensave_dialog_width (); + selector_height = gedit_prefs_manager_get_opensave_dialog_height (); -+ gtk_window_resize (GTK_WINDOW (open_dialog), selector_width, selector_heigh ++ gtk_window_resize (GTK_WINDOW (open_dialog), selector_width, selector_height); g_signal_connect (open_dialog, "response", G_CALLBACK (open_dialog_response_cb), From fedora-cvs-commits at redhat.com Fri Jan 13 19:17:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:17:11 -0500 Subject: rpms/librsvg2/devel librsvg2.spec,1.34,1.35 Message-ID: <200601131917.k0DJHBDk003673@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/librsvg2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3429 Modified Files: librsvg2.spec Log Message: Fix file lists Index: librsvg2.spec =================================================================== RCS file: /cvs/dist/rpms/librsvg2/devel/librsvg2.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- librsvg2.spec 13 Jan 2006 19:07:19 -0000 1.34 +++ librsvg2.spec 13 Jan 2006 19:17:09 -0000 1.35 @@ -100,6 +100,7 @@ %{_libdir}/gtk-2.0/*/loaders/svg_loader.so %{_bindir}/rsvg %{_bindir}/rsvg-view +%{_bindir}/rsvg-convert %{_mandir}/man1/* %files devel From fedora-cvs-commits at redhat.com Fri Jan 13 19:19:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:19:20 -0500 Subject: rpms/lftp/devel lftp.spec, 1.35, 1.36 sources, 1.20, 1.21 .cvsignore, 1.20, 1.21 Message-ID: <200601131919.k0DJJK07007063@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/lftp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6988 Modified Files: lftp.spec sources .cvsignore Log Message: Upgrade to 3.4.0 Index: lftp.spec =================================================================== RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- lftp.spec 21 Dec 2005 20:27:10 -0000 1.35 +++ lftp.spec 13 Jan 2006 19:19:16 -0000 1.36 @@ -1,15 +1,15 @@ -Summary: A sophisticated file transfer program -Name: lftp -Version: 3.3.5 -Release: 4 -License: GPL -Group: Applications/Internet -Source0: http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2 -URL: http://lftp.yar.ru/ -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildPrereq: ncurses-devel, openssl-devel, pkgconfig, readline-devel -Requires: perl-String-CRC32 -Patch173276: lftp-3.3.5-bz173276.patch +Summary: A sophisticated file transfer program +Name: lftp +Version: 3.4.0 +Release: 1 +License: GPL +Group: Applications/Internet +Source0: http://ftp.yars.free.net/lftp/lftp-%{version}.tar.bz2 +URL: http://lftp.yar.ru/ +BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildPrereq: ncurses-devel, openssl-devel, pkgconfig, readline-devel +Requires: perl-String-CRC32 +Patch173276: lftp-3.3.5-bz173276.patch %description LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job @@ -19,7 +19,8 @@ %prep %setup -q -%patch173276 -p1 -b .bz173276 +#%patch173276 -p1 -b .bz173276 +#^- now fixed upstream %build if pkg-config openssl ; then @@ -46,7 +47,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %doc BUGS COPYING ChangeLog FAQ FEATURES README* NEWS THANKS TODO %config %{_sysconfdir}/lftp.conf %{_bindir}/* @@ -54,6 +55,8 @@ %{_datadir}/lftp %dir %{_libdir}/lftp %dir %{_libdir}/lftp/%{version} +%{_libdir}/liblftp-jobs* +%{_libdir}/liblftp-tasks* %{_libdir}/lftp/%{version}/cmd-mirror.so %{_libdir}/lftp/%{version}/cmd-sleep.so %{_libdir}/lftp/%{version}/liblftp-network.so @@ -65,6 +68,9 @@ %{_libdir}/lftp/%{version}/proto-sftp.so %changelog +* Fri Jan 13 2005 Jason Vas Dias - 3.4.0-1 +- Upgrade to upstream version 3.4.0 + * Wed Dec 21 2005 Jason Vas Dias - 3.3.5-4 - fix bug 176315: openssl libraries not being picked up - gnutls was instead - improvements to bug 172376 fix Index: sources =================================================================== RCS file: /cvs/dist/rpms/lftp/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 17 Dec 2005 01:53:40 -0000 1.20 +++ sources 13 Jan 2006 19:19:16 -0000 1.21 @@ -1,3 +1,2 @@ -7683cd1b183a6af807f20ee5fd076d0b String-CRC32-1.3.tar.gz -5bacd284d10f578fcd4feeaefebca6f3 lftp-3.3.5.tar.bz2 -d0c49a8ad9f80c1df02fe41bac5382a4 lftp-3.3.5.tar.bz2.asc +5d39a8b250691a693470b1773b5c6bd4 lftp-3.4.0.tar.bz2 +5b942423a324da718ec42e30e2feed74 lftp-3.4.0.tar.bz2.asc Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/lftp/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 17 Dec 2005 01:53:40 -0000 1.20 +++ .cvsignore 13 Jan 2006 19:19:16 -0000 1.21 @@ -8,3 +8,5 @@ lftp-3.3.3.tar.bz2 lftp-3.3.5.tar.bz2 lftp-3.3.5.tar.bz2.asc +lftp-3.4.0.tar.bz2 +lftp-3.4.0.tar.bz2.asc From fedora-cvs-commits at redhat.com Fri Jan 13 19:19:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:19:59 -0500 Subject: rpms/lftp/devel lftp.spec,1.36,1.37 Message-ID: <200601131919.k0DJJxhp008285@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/lftp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8185 Modified Files: lftp.spec Log Message: Upgrade to 3.4.0 Index: lftp.spec =================================================================== RCS file: /cvs/dist/rpms/lftp/devel/lftp.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- lftp.spec 13 Jan 2006 19:19:16 -0000 1.36 +++ lftp.spec 13 Jan 2006 19:19:56 -0000 1.37 @@ -68,7 +68,7 @@ %{_libdir}/lftp/%{version}/proto-sftp.so %changelog -* Fri Jan 13 2005 Jason Vas Dias - 3.4.0-1 +* Fri Jan 13 2006 Jason Vas Dias - 3.4.0-1 - Upgrade to upstream version 3.4.0 * Wed Dec 21 2005 Jason Vas Dias - 3.3.5-4 From fedora-cvs-commits at redhat.com Fri Jan 13 19:21:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:21:53 -0500 Subject: rpms/metacity/devel .cvsignore, 1.26, 1.27 metacity.spec, 1.46, 1.47 sources, 1.26, 1.27 Message-ID: <200601131921.k0DJLrQx013303@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/metacity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12998 Modified Files: .cvsignore metacity.spec sources Log Message: 2.13.13 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 3 Jan 2006 18:48:20 -0000 1.26 +++ .cvsignore 13 Jan 2006 19:21:49 -0000 1.27 @@ -5,3 +5,4 @@ metacity-2.13.3.tar.bz2 metacity-2.13.5.tar.bz2 metacity-2.13.8.tar.bz2 +metacity-2.13.13.tar.bz2 Index: metacity.spec =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- metacity.spec 3 Jan 2006 18:48:20 -0000 1.46 +++ metacity.spec 13 Jan 2006 19:21:49 -0000 1.47 @@ -2,7 +2,7 @@ Summary: Metacity window manager Name: metacity -Version: 2.13.8 +Version: 2.13.13 Release: 1 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/ Source0: %{name}-%{version}.tar.bz2 @@ -106,6 +106,9 @@ %{_mandir}/man1/* %changelog +* Fri Jan 13 2006 Matthias Clasen 2.13.13-1 +- Update to 2.13.13 + * Tue Jan 03 2006 Matthias Clasen 2.13.8-1 - Update to 2.13.8 Index: sources =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 3 Jan 2006 18:48:20 -0000 1.26 +++ sources 13 Jan 2006 19:21:49 -0000 1.27 @@ -1 +1 @@ -b1db1e02891fcb4515e6824b0f069a57 metacity-2.13.8.tar.bz2 +f81177d046be528a6f421a7a27bd3826 metacity-2.13.13.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 13 19:23:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:23:33 -0500 Subject: rpms/linuxwacom/devel linuxwacom-0.7.2-modular-sdk.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 linuxwacom.spec, 1.25, 1.26 sources, 1.4, 1.5 linuxwacom-0.6.4-linux-input.patch, 1.1, NONE linuxwacom-0.6.6-configure-fixes.patch, 1.4, NONE linuxwacom-0.6.6-modular-sdk.patch, 1.4, NONE Message-ID: <200601131923.k0DJNXPN013934@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/linuxwacom/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13906 Modified Files: .cvsignore linuxwacom.spec sources Added Files: linuxwacom-0.7.2-modular-sdk.patch Removed Files: linuxwacom-0.6.4-linux-input.patch linuxwacom-0.6.6-configure-fixes.patch linuxwacom-0.6.6-modular-sdk.patch Log Message: * Fri Jan 13 2006 Kristian H??gsberg 0:0.7.2-1 - Update to version 0.7.2. - Drop linuxwacom-0.6.4-linux-input.patch since the kernel headers now define EV_SYN. - Update SDK patch to work with new modular paths. linuxwacom-0.7.2-modular-sdk.patch: acinclude.m4 | 2 +- src/Makefile.am | 2 +- src/xf86Wacom.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE linuxwacom-0.7.2-modular-sdk.patch --- --- src/Makefile.am.modular-sdk 2006-01-13 14:10:02.000000000 -0500 +++ src/Makefile.am 2006-01-13 14:10:02.000000000 -0500 @@ -52,7 +52,7 @@ XSERVER64 =@WCM_XSERVER64@ if WCM_ENV_XORGSDK -DRIVER_INCLUDES = -I$(XORGSDK_DIR)/include +DRIVER_INCLUDES = -I$(XORGSDK_DIR) endif if WCM_ENV_XF86 --- src/xf86Wacom.h.modular-sdk 2006-01-13 14:10:22.000000000 -0500 +++ src/xf86Wacom.h 2006-01-13 14:10:31.000000000 -0500 @@ -79,7 +79,7 @@ #include #include #include /* Needed for InitValuator/Proximity stuff */ -#include +#include #include #ifdef XFree86LOADER --- acinclude.m4.modular-sdk 2005-12-21 18:04:36.000000000 -0500 +++ acinclude.m4 2006-01-13 14:10:02.000000000 -0500 @@ -220,7 +220,7 @@ if test -n "$WCM_XORGSDK"; then AC_MSG_CHECKING(for valid Xorg SDK) - if test -f $WCM_XORGSDK/include/xf86Version.h; then + if test -f $WCM_XORGSDK/xf86Version.h; then WCM_ENV_XORGSDK=yes AC_MSG_RESULT(ok) elif test -f $WCM_XORGSDK/xc/include/xf86Version.h; then Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/linuxwacom/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Dec 2005 11:03:01 -0000 1.4 +++ .cvsignore 13 Jan 2006 19:23:30 -0000 1.5 @@ -1,2 +1 @@ -linuxwacom-0.6.6.tar.bz2 -linuxwacom-0.7.0-1.tar.bz2 +linuxwacom-0.7.2.tar.bz2 Index: linuxwacom.spec =================================================================== RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- linuxwacom.spec 12 Dec 2005 15:31:32 -0000 1.25 +++ linuxwacom.spec 13 Jan 2006 19:23:30 -0000 1.26 @@ -1,22 +1,20 @@ %define _x11dir /usr %define _x11libdir %{_x11dir}/%{_lib} -%define _x11sdkdir /usr/include/xorg/sdk +%define _x11sdkdir %(pkg-config --variable=sdkdir xorg-server) Name: linuxwacom -Version: 0.7.0 +Version: 0.7.2 Epoch: 0 -Release: 2 +Release: 1 Summary: Wacom Drivers from Linux Wacom Project Group: User Interface/X Hardware Support License: GPL/X11 URL: http://linuxwacom.sourceforge.net -Source0: http://prdownloads.sourceforge.net/linuxwacom/linuxwacom-0.7.0-1.tar.bz2 +Source0: http://prdownloads.sourceforge.net/linuxwacom/linuxwacom-%{version}.tar.bz2 Source1: 10-wacom.rules -Patch0: linuxwacom-0.6.4-linux-input.patch -Patch1: linuxwacom-0.6.6-configure-fixes.patch Patch2: linuxwacom-fsp.patch -Patch3: linuxwacom-0.6.6-modular-sdk.patch +Patch3: linuxwacom-0.7.2-modular-sdk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRequires: libX11-devel, libXi-devel, xorg-x11-server-sdk, ncurses-devel @@ -41,10 +39,8 @@ %prep %setup -q -%patch0 -p1 -b .linux-input -%patch1 -p1 -b .configure-fixes %patch2 -p1 -b .fsp -%patch3 -p1 -b .modular-sdk +%patch3 -p0 -b .modular-sdk %build libtoolize --copy --force @@ -101,6 +97,12 @@ %{_libdir}/libwacomcfg*.so %changelog +* Fri Jan 13 2006 Kristian H??gsberg 0:0.7.2-1 +- Update to version 0.7.2. +- Drop linuxwacom-0.6.4-linux-input.patch since the kernel headers now + define EV_SYN. +- Update SDK patch to work with new modular paths. + * Mon Dec 12 2005 Tim Waugh 0:0.7.0-2 - More SDK path fixes. - Don't build input driver with -fstack-protector since the X loader Index: sources =================================================================== RCS file: /cvs/dist/rpms/linuxwacom/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Dec 2005 11:03:01 -0000 1.4 +++ sources 13 Jan 2006 19:23:30 -0000 1.5 @@ -1 +1 @@ -9b9a12b606818858bc6c72011975a5bc linuxwacom-0.7.0-1.tar.bz2 +3f6290101d5712a24097243ca9f092ed linuxwacom-0.7.2.tar.bz2 --- linuxwacom-0.6.4-linux-input.patch DELETED --- --- linuxwacom-0.6.6-configure-fixes.patch DELETED --- --- linuxwacom-0.6.6-modular-sdk.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 13 19:27:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:27:46 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.111,1.112 Message-ID: <200601131927.k0DJRkQj015509@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15474 Modified Files: gnbd-kernel.spec Log Message: Bumped version number to 2.6.15. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- gnbd-kernel.spec 12 Jan 2006 01:25:39 -0000 1.111 +++ gnbd-kernel.spec 13 Jan 2006 19:27:43 -0000 1.112 @@ -24,7 +24,7 @@ %endif Name: gnbd-kernel -Version: 2.6.14.0 +Version: 2.6.15.0 Release: 20051108.134753.FC5.14 License: GPL Group: System Environment/Kernel @@ -217,6 +217,9 @@ %{_includedir}/linux/gnbd.h %changelog +* Fri Jan 13 2006 Chris Feist +- Rebuilt and bumped version number to 2.6.15 + * Wed Jan 11 2006 Jesse Keating - rebuilt again From fedora-cvs-commits at redhat.com Fri Jan 13 19:27:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:27:48 -0500 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.105,1.106 Message-ID: <200601131927.k0DJRmU3015548@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15498 Modified Files: dlm-kernel.spec Log Message: Bumped version number to 2.6.15. Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- dlm-kernel.spec 12 Jan 2006 01:23:45 -0000 1.105 +++ dlm-kernel.spec 13 Jan 2006 19:27:46 -0000 1.106 @@ -24,7 +24,7 @@ %endif Name: dlm-kernel -Version: 2.6.14.1 +Version: 2.6.15.0 Release: 20051219.162641.FC5.8 License: GPL Group: System Environment/Kernel @@ -233,6 +233,9 @@ %{_includedir}/cluster/* %changelog +* Fri Jan 13 2006 Chris Feist +- Rebuilt and bumped version number to 2.6.15 + * Wed Jan 11 2006 Jesse Keating - rebuilt again From fedora-cvs-commits at redhat.com Fri Jan 13 19:27:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:27:53 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.130,1.131 Message-ID: <200601131927.k0DJRoIf015527@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15490 Modified Files: cman-kernel.spec Log Message: Bumped version number to 2.6.15. Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- cman-kernel.spec 12 Jan 2006 01:22:00 -0000 1.130 +++ cman-kernel.spec 13 Jan 2006 19:27:44 -0000 1.131 @@ -24,7 +24,7 @@ %endif Name: cman-kernel -Version: 2.6.14.1 +Version: 2.6.15.0 Release: 20051219.162641.FC5.10 License: GPL Group: System Environment/Kernel @@ -225,6 +225,9 @@ %{_includedir}/cluster/* %changelog +* Fri Jan 13 2006 Chris Feist +- Rebuilt and bumped version number to 2.6.15 + * Wed Jan 11 2006 Jesse Keating - and again From fedora-cvs-commits at redhat.com Fri Jan 13 19:27:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:27:53 -0500 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.121,1.122 Message-ID: <200601131927.k0DJRpmm015558@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15503 Modified Files: GFS-kernel.spec Log Message: Bumped version number to 2.6.15. Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- GFS-kernel.spec 12 Jan 2006 01:24:54 -0000 1.121 +++ GFS-kernel.spec 13 Jan 2006 19:27:47 -0000 1.122 @@ -24,7 +24,7 @@ %endif Name: GFS-kernel -Version: 2.6.14.1 +Version: 2.6.15.0 Release: 20051219.162641.FC5.9 License: GPL Group: System Environment/Kernel @@ -249,6 +249,9 @@ %{_includedir}/linux/* %changelog +* Fri Jan 13 2006 Chris Feist +- Rebuilt and bumped version number to 2.6.15 + * Wed Jan 11 2006 Jesse Keating - rebuilt again From fedora-cvs-commits at redhat.com Fri Jan 13 19:31:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:31:34 -0500 Subject: rpms/gnome-screensaver/devel .cvsignore, 1.11, 1.12 gnome-screensaver.spec, 1.42, 1.43 sources, 1.11, 1.12 Message-ID: <200601131931.k0DJVYVB016815@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16762 Modified Files: .cvsignore gnome-screensaver.spec sources Log Message: 0.0.24 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 20 Dec 2005 21:39:42 -0000 1.11 +++ .cvsignore 13 Jan 2006 19:31:18 -0000 1.12 @@ -2,3 +2,4 @@ gnome-screensaver-0.0.22.tar.bz2 fedoralogo-floaters-lock-dialog.tar.gz gnome-screensaver-0.0.23.tar.bz2 +gnome-screensaver-0.0.24.tar.bz2 Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- gnome-screensaver.spec 9 Jan 2006 15:59:22 -0000 1.42 +++ gnome-screensaver.spec 13 Jan 2006 19:31:18 -0000 1.43 @@ -11,8 +11,8 @@ Summary: GNOME Sreensaver Name: gnome-screensaver -Version: 0.0.23 -Release: 4 +Version: 0.0.24 +Release: 1 License: GPL Group: Amusement/Graphics Source0: %{name}-%{version}.tar.bz2 @@ -118,6 +118,9 @@ %{_sysconfdir}/pam.d/* %changelog +* Fri Jan 13 2006 Matthias Clasen - 0.0.24-1 +- Update to 0.0.24 + * Mon Jan 9 2006 Ray Strode - 0.0.23-4 - don't include .desktop part of theme name in gconf schema Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 20 Dec 2005 21:39:42 -0000 1.11 +++ sources 13 Jan 2006 19:31:18 -0000 1.12 @@ -1,2 +1,2 @@ -42b838e47d43ab2b08539c6a2bbefa28 gnome-screensaver-0.0.23.tar.bz2 3f0250f7f2b0de901ddc3760a4f942b6 fedoralogo-floaters-lock-dialog.tar.gz +767ac5360e7ba1c218cad725b21f78e1 gnome-screensaver-0.0.24.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 13 19:40:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 14:40:49 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.112,1.113 Message-ID: <200601131940.k0DJenrc018569@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18527 Modified Files: gnbd-kernel.spec Log Message: Added xen builds. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- gnbd-kernel.spec 13 Jan 2006 19:27:43 -0000 1.112 +++ gnbd-kernel.spec 13 Jan 2006 19:40:46 -0000 1.113 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 0 +%define buildxen 1 %define kernel_version 2.6.15-1.1826.2.10_FC5 %define subversion 20051108.134753.FC5 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15.0 -Release: 20051108.134753.FC5.14 +Release: 20051108.134753.FC5.15 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device @@ -33,8 +33,8 @@ BuildRequires: kernel-smp = %{kernel_version} BuildRequires: kernel-devel = %{kernel_version} BuildRequires: kernel-smp-devel = %{kernel_version} -#BuildRequires: kernel-xenU-devel = %{kernel_version} -#BuildRequires: kernel-xen0-devel = %{kernel_version} +BuildRequires: kernel-xenU-devel = %{kernel_version} +BuildRequires: kernel-xen0-devel = %{kernel_version} Conflicts: GFS <= 6.0 Conflicts: GFS-modules Requires: kernel = %{kernel_version} @@ -218,7 +218,7 @@ %changelog * Fri Jan 13 2006 Chris Feist -- Rebuilt and bumped version number to 2.6.15 +- Rebuilt, bumped version number to 2.6.15 and added xen build. * Wed Jan 11 2006 Jesse Keating - rebuilt again From fedora-cvs-commits at redhat.com Fri Jan 13 20:03:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 15:03:00 -0500 Subject: rpms/gnbd-kernel/devel .cvsignore, 1.11, 1.12 gnbd-kernel.spec, 1.113, 1.114 sources, 1.13, 1.14 Message-ID: <200601132003.k0DK30fl027854@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27839 Modified Files: .cvsignore gnbd-kernel.spec sources Log Message: New sources. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 8 Nov 2005 19:50:53 -0000 1.11 +++ .cvsignore 13 Jan 2006 20:02:57 -0000 1.12 @@ -1,9 +1 @@ -gnbd-kernel-2.6.7-2.tar.gz -gnbd-kernel-2.6.10-0.tar.gz -gnbd-kernel-2.6.11-0.tar.gz -gnbd-kernel-2.6.11-0.5.devel.1110235827.FC4.tar.gz -gnbd-kernel-2.6.11.1.20050419-162405.FC4.tar.gz -gnbd-kernel-2.6.11.1-20050419.165550.FC4.tar.gz -gnbd-kernel-2.6.11.1-20050419.170309.FC4.tar.gz -gnbd-kernel-2.6.11.2-20050420.133124.FC4.tar.gz -gnbd-kernel-2.6.14.0-20051108.134753.FC5.tar.gz +gnbd-kernel-2.6.15.0-20051108.134753.FC5.tar.gz Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- gnbd-kernel.spec 13 Jan 2006 19:40:46 -0000 1.113 +++ gnbd-kernel.spec 13 Jan 2006 20:02:57 -0000 1.114 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15.0 -Release: 20051108.134753.FC5.15 +Release: 20051108.134753.FC5.16 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 8 Nov 2005 19:50:53 -0000 1.13 +++ sources 13 Jan 2006 20:02:57 -0000 1.14 @@ -1 +1 @@ -a8c4fbbcd4529e49a99c124fde14ccb3 gnbd-kernel-2.6.14.0-20051108.134753.FC5.tar.gz +a8c4fbbcd4529e49a99c124fde14ccb3 gnbd-kernel-2.6.15.0-20051108.134753.FC5.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 13 20:12:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 15:12:01 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec, 1.114, 1.115 sources, 1.14, 1.15 Message-ID: <200601132012.k0DKC1Gv028069@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28059 Modified Files: gnbd-kernel.spec sources Log Message: Updated sources. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- gnbd-kernel.spec 13 Jan 2006 20:02:57 -0000 1.114 +++ gnbd-kernel.spec 13 Jan 2006 20:11:57 -0000 1.115 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15.0 -Release: 20051108.134753.FC5.16 +Release: 20051108.134753.FC5.17 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 13 Jan 2006 20:02:57 -0000 1.14 +++ sources 13 Jan 2006 20:11:57 -0000 1.15 @@ -1 +1 @@ -a8c4fbbcd4529e49a99c124fde14ccb3 gnbd-kernel-2.6.15.0-20051108.134753.FC5.tar.gz +e80582426a34fc242414a0eb57cf212b gnbd-kernel-2.6.15.0-20051108.134753.FC5.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 13 21:31:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 16:31:12 -0500 Subject: rpms/gdm/devel gdm.spec,1.110,1.111 Message-ID: <200601132131.k0DLVCS0017101@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17047 Modified Files: gdm.spec Log Message: - migrate X server configuration for pre-modular X configurations. Problems reported by Dennis Gregorovic Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- gdm.spec 9 Jan 2006 19:27:38 -0000 1.110 +++ gdm.spec 13 Jan 2006 21:31:08 -0000 1.111 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager. Name: gdm Version: 2.13.0.4 -Release: 2 +Release: 3 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -225,6 +225,11 @@ # migrate it to the new location if [ $1 -ge 2 ] && [ -f %{_sysconfdir}/X11/gdm/gdm.conf ]; then mv -f %{_sysconfdir}/X11/gdm/gdm.conf %{_datadir}/gdm/config/gdm.conf-custom + + # Also migrate the X configuration to work with modular X + sed -ie 's@^command=/usr/X11R6/bin/X at command=/usr/bin/Xorg@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^Xnest=/usr/X11R6/bin/Xnest at Xnest=/usr/X11R6/bin/Xnest@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^BaseXsession=/etc/X11/xdm/Xsession at BaseXsession=/etc/X11/xinit/Xsession@' %{_datadir}/gdm/config/gdm.conf-custom fi %{_sbindir}/gdm-safe-restart || : @@ -279,6 +284,10 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Fri Jan 13 2006 Ray Strode - 1:2.13.0.4-3 +- migrate X server configuration for pre-modular X configurations. + Problems reported by Dennis Gregorovic + * Mon Jan 9 2006 Ray Strode - 1:2.13.0.4-2 - use xinit Xsession again. From fedora-cvs-commits at redhat.com Fri Jan 13 21:47:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 16:47:28 -0500 Subject: rpms/grub/devel grub-0.97-dmraid.patch, NONE, 1.1 grub.spec, 1.32, 1.33 Message-ID: <200601132147.k0DLlSfn025971@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/grub/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25391 Modified Files: grub.spec Added Files: grub-0.97-dmraid.patch Log Message: - add dmraid support grub-0.97-dmraid.patch: grub-install.in | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 55 insertions(+), 6 deletions(-) --- NEW FILE grub-0.97-dmraid.patch --- --- grub-0.97/util/grub-install.in.dmraid 2006-01-13 16:40:24.000000000 -0500 +++ grub-0.97/util/grub-install.in 2006-01-13 16:40:37.000000000 -0500 @@ -101,17 +101,24 @@ # Break the device name into the disk part and the partition part. case "$host_os" in linux*) - tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \ + tmp_disk=`echo "$1" | grep -v '/mapper/control$' | + grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq | + sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \ -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \ -e 's%\(fd[0-9]*\)$%\1%' \ -e 's%/part[0-9]*$%/disc%' \ - -e 's%\(c[0-7]d[0-9]*\).*$%\1%'` - tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \ + -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \ + -e 's%\(/mapper/[[:alpha:]]\+_[[:alpha:]]\+\)[[:digit:]]\+$%\1%'` + tmp_part=`echo "$1" | grep -v '/mapper/control$' | + grep -v '/mapper/[[:alnum:]]\+-[[:alnum:]]\+$' | uniq | + sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \ -e 's%.*d[0-9]*p%%' \ -e 's%.*/fd[0-9]*$%%' \ -e 's%.*/floppy/[0-9]*$%%' \ -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \ - -e 's%.*c[0-7]d[0-9]*p%%'` + -e 's%.*c[0-7]d[0-9]*p%%' \ + -e 's%.*/mapper/[[:alpha:]]\+_[[:alpha:]]\+\([[:digit:]]\+\)$%\1%' | + grep -v '.*/mapper/.*'` ;; gnu*) tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'` @@ -253,6 +260,43 @@ return 0 } +# Usage: stat_device file +# Find major:minor of a device node. +stat_device() { + majmin=`stat -c "%t:%T" "$1" 2>/dev/null` + if test -z "$majmin"; then + echo "Could not find device for $1" 2>&1 + exit 1 + fi + + echo "$majmin" +} + +# Usage: find_mapper_device file +# Find a file in /dev/mapper with the same major:minor as the specified node. +find_mapper_device() { + if [ -b "$1" ]; then + dev="$1" + else + mntpnt=`echo "$1" | sed 's,/,\\\\/,g'` + dev=`awk '($2 ~ /'$mntpnt'/) { print $1 }' /etc/mtab` + fi + if test -z "$dev"; then + echo "Could not find device for $1" 2>&1 + exit 1 + fi + + majmin=`stat_device $dev` + for x in /dev/mapper/* ; do + devmajmin=`stat_device "$x"` + if [ "$majmin" == "$devmajmin" ]; then + echo "$x" + return 0 + fi + done + return 1 +} + # Usage: find_device file # Find block device on which the file resides. find_device () { @@ -265,9 +309,14 @@ exit 1 fi - tmp_fname=`resolve_symlink $tmp_fname` + ret_fname=`resolve_symlink $tmp_fname` + tmp_fname=`find_mapper_device $ret_fname` + if test -n "$tmp_fname"; then + ret_fname="$tmp_fname" + fi - echo "$tmp_fname" + echo "$ret_fname" + return 0 } copy_images() { Index: grub.spec =================================================================== RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- grub.spec 14 Dec 2005 22:50:23 -0000 1.32 +++ grub.spec 13 Jan 2006 21:47:22 -0000 1.33 @@ -1,6 +1,6 @@ Name: grub Version: 0.97 -Release: 1 +Release: 2 Summary: GRUB - the Grand Unified Boot Loader. Group: System Environment/Base License: GPL @@ -93,6 +93,9 @@ # scripts don't screw up. Patch1111: grub-0.97-datadir.patch +# install correctly on dmraid devices +Patch1112: grub-0.97-dmraid.patch + ExclusiveArch: i386 x86_64 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, texinfo BuildRequires: automake @@ -161,6 +164,8 @@ %patch1111 -p1 -b .datadir +%patch1112 -p1 -b .dmraid + %build autoreconf --install --force GCCVERS=$(gcc --version | head -1 | cut -d\ -f3 | cut -d. -f1) @@ -213,6 +218,9 @@ %{_datadir}/grub %changelog +* Fri Jan 13 2006 Peter Jones - 0.97-2 +- add dmraid support + * Wed Dec 14 2005 Peter Jones - 0.97-1 - update to grub 0.97 From fedora-cvs-commits at redhat.com Fri Jan 13 22:14:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 17:14:08 -0500 Subject: rpms/grub/devel grub-0.97-dmraid-recheck-bad.patch, NONE, 1.1 grub.spec, 1.33, 1.34 Message-ID: <200601132214.k0DME82k008375@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/grub/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8277 Modified Files: grub.spec Added Files: grub-0.97-dmraid-recheck-bad.patch Log Message: "fix" --recheck when using dmraid grub-0.97-dmraid-recheck-bad.patch: grub-install.in | 8 ++++++++ 1 files changed, 8 insertions(+) --- NEW FILE grub-0.97-dmraid-recheck-bad.patch --- --- grub-0.97/util/grub-install.in.dmraid-recheck-bad 2006-01-13 17:04:26.000000000 -0500 +++ grub-0.97/util/grub-install.in 2006-01-13 17:05:00.000000000 -0500 @@ -415,6 +415,14 @@ grubdir=${bootdir}/grub device_map=${grubdir}/device.map +if [ "$recheck" == "yes" ]; then + if grep 'mapper' ${device_map} >/dev/null; then + echo 'grub-install does not support reprobing of device.map when' 1>&2 + echo 'using a device-mapper based boot device.' 1>&2 + exit 1 + fi +fi + # if they just want the images copied, copy the images and then exit if test $justcopy = yes; then copy_images Index: grub.spec =================================================================== RCS file: /cvs/dist/rpms/grub/devel/grub.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- grub.spec 13 Jan 2006 21:47:22 -0000 1.33 +++ grub.spec 13 Jan 2006 22:14:04 -0000 1.34 @@ -95,6 +95,7 @@ # install correctly on dmraid devices Patch1112: grub-0.97-dmraid.patch +Patch1113: grub-0.97-dmraid-recheck-bad.patch ExclusiveArch: i386 x86_64 BuildRequires: binutils >= 2.9.1.0.23, ncurses-devel, texinfo @@ -165,6 +166,7 @@ %patch1111 -p1 -b .datadir %patch1112 -p1 -b .dmraid +%patch1113 -p1 -b .dmraid-recheck-bad %build autoreconf --install --force From fedora-cvs-commits at redhat.com Fri Jan 13 22:14:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 17:14:32 -0500 Subject: rpms/libselinux/devel .cvsignore, 1.98, 1.99 libselinux.spec, 1.174, 1.175 sources, 1.100, 1.101 Message-ID: <200601132214.k0DMEWJx008514@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8479 Modified Files: .cvsignore libselinux.spec sources Log Message: * Fri Jan 13 2006 Dan Walsh 1.29.5-1 - Upgrade to latest from NSA * Added getseuser test program. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- .cvsignore 6 Jan 2006 15:47:03 -0000 1.98 +++ .cvsignore 13 Jan 2006 22:14:28 -0000 1.99 @@ -72,3 +72,4 @@ libselinux-1.29.2.tgz libselinux-1.29.3.tgz libselinux-1.29.4.tgz +libselinux-1.29.5.tgz Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- libselinux.spec 6 Jan 2006 15:47:03 -0000 1.174 +++ libselinux.spec 13 Jan 2006 22:14:28 -0000 1.175 @@ -1,8 +1,8 @@ -%define libsepolver 1.11.7-1 -%define libsetransver 0.1.15-1 +%define libsepolver 1.11.9-1 +%define libsetransver 0.1.17-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 1.29.4 +Version: 1.29.5 Release: 1 License: Public domain (uncopyrighted) Group: System Environment/Libraries @@ -110,6 +110,10 @@ %{_libdir}/python2.4/site-packages/selinux.py* %changelog +* Fri Jan 13 2006 Dan Walsh 1.29.5-1 +- Upgrade to latest from NSA + * Added getseuser test program. + * Fri Jan 7 2006 Dan Walsh 1.29.4-1 - Upgrade to latest from NSA * Added format attribute to myprintf in matchpathcon.c and Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/sources,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- sources 6 Jan 2006 15:47:03 -0000 1.100 +++ sources 13 Jan 2006 22:14:28 -0000 1.101 @@ -1 +1 @@ -14a01eff41a58032ed94f4c51c76efb7 libselinux-1.29.4.tgz +a35322febc094bbf201ddf313c6fd2b2 libselinux-1.29.5.tgz From fedora-cvs-commits at redhat.com Fri Jan 13 22:16:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 17:16:13 -0500 Subject: rpms/cman-kernel/devel cman-kernel.spec,1.131,1.132 Message-ID: <200601132216.k0DMGD2q012300@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12216 Modified Files: cman-kernel.spec Log Message: Updated Kernel Version Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/devel/cman-kernel.spec,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- cman-kernel.spec 13 Jan 2006 19:27:44 -0000 1.131 +++ cman-kernel.spec 13 Jan 2006 22:16:10 -0000 1.132 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.15.0 -Release: 20051219.162641.FC5.10 +Release: 20051219.162641.FC5.11 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Fri Jan 13 22:16:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 17:16:33 -0500 Subject: rpms/gnbd-kernel/devel gnbd-kernel.spec,1.115,1.116 Message-ID: <200601132216.k0DMGXi8013057@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12949 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/devel/gnbd-kernel.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- gnbd-kernel.spec 13 Jan 2006 20:11:57 -0000 1.115 +++ gnbd-kernel.spec 13 Jan 2006 22:16:30 -0000 1.116 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.15.0 -Release: 20051108.134753.FC5.17 +Release: 20051108.134753.FC5.18 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Fri Jan 13 22:16:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 17:16:50 -0500 Subject: rpms/dlm-kernel/devel dlm-kernel.spec,1.106,1.107 Message-ID: <200601132216.k0DMGo3m013914@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13834 Modified Files: dlm-kernel.spec Log Message: Updated Kernel Version Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/devel/dlm-kernel.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- dlm-kernel.spec 13 Jan 2006 19:27:46 -0000 1.106 +++ dlm-kernel.spec 13 Jan 2006 22:16:47 -0000 1.107 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.15.0 -Release: 20051219.162641.FC5.8 +Release: 20051219.162641.FC5.9 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Fri Jan 13 22:17:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 17:17:10 -0500 Subject: rpms/GFS-kernel/devel GFS-kernel.spec,1.122,1.123 Message-ID: <200601132217.k0DMHAO4014570@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14474 Modified Files: GFS-kernel.spec Log Message: Updated Kernel Version Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/devel/GFS-kernel.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- GFS-kernel.spec 13 Jan 2006 19:27:47 -0000 1.122 +++ GFS-kernel.spec 13 Jan 2006 22:17:06 -0000 1.123 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.15.0 -Release: 20051219.162641.FC5.9 +Release: 20051219.162641.FC5.10 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Fri Jan 13 22:31:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 17:31:52 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.44, 1.45 libsemanage-rhat.patch, 1.7, 1.8 libsemanage.spec, 1.62, 1.63 sources, 1.46, 1.47 Message-ID: <200601132231.k0DMVqHG026085@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26042 Modified Files: .cvsignore libsemanage-rhat.patch libsemanage.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 6 Jan 2006 16:07:00 -0000 1.44 +++ .cvsignore 13 Jan 2006 22:31:44 -0000 1.45 @@ -46,3 +46,5 @@ libsemanage-1.5.6.tgz libsemanage-1.5.8.tgz libsemanage-1.5.9.tgz +libsemanage-1.5.11.tgz +libsemanage-1.5.14.tgz libsemanage-rhat.patch: fcontext_record.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libsemanage-rhat.patch 5 Jan 2006 16:10:57 -0000 1.7 +++ libsemanage-rhat.patch 13 Jan 2006 22:31:44 -0000 1.8 @@ -1,11 +1,45 @@ -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/database_llist.c libsemanage-1.5.4/src/database_llist.c ---- nsalibsemanage/src/database_llist.c 2006-01-04 12:18:17.000000000 -0500 -+++ libsemanage-1.5.4/src/database_llist.c 2006-01-04 16:26:39.000000000 -0500 -@@ -136,6 +136,7 @@ - if (dbase_llist_cache_prepend(handle, dbase, data) < 0) - goto err; +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/fcontext_record.c libsemanage-1.5.9/src/fcontext_record.c +--- nsalibsemanage/src/fcontext_record.c 2006-01-06 10:33:10.000000000 -0500 ++++ libsemanage-1.5.9/src/fcontext_record.c 2006-01-06 13:40:38.000000000 -0500 +@@ -81,8 +81,18 @@ + const semanage_fcontext_t* fcontext, + const semanage_fcontext_key_t* key) { -+ dbase->modified = 1; - return STATUS_SUCCESS; +- return strcmp(fcontext->expr, key->expr) && +- (fcontext->type == key->type); ++ int rv = strcmp(fcontext->expr, key->expr); ++ if (rv != 0) ++ return rv; ++ else { ++ if (fcontext->type < key->type) ++ return -1; ++ ++ else if (key->type < fcontext->type) ++ return 1; ++ ++ else return 0; ++ } + } + hidden_def(semanage_fcontext_compare) + +@@ -90,8 +100,18 @@ + const semanage_fcontext_t* fcontext, + const semanage_fcontext_t* fcontext2) { + +- return strcmp(fcontext->expr, fcontext2->expr) && +- (fcontext->type == fcontext2->type); ++ int rv = strcmp(fcontext->expr, fcontext2->expr); ++ if (rv != 0) ++ return rv; ++ else { ++ if (fcontext->type < fcontext2->type) ++ return -1; ++ ++ else if (fcontext2->type < fcontext->type) ++ return 1; ++ ++ else return 0; ++ } + } + hidden_def(semanage_fcontext_compare2) - err: Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- libsemanage.spec 6 Jan 2006 16:07:00 -0000 1.62 +++ libsemanage.spec 13 Jan 2006 22:31:44 -0000 1.63 @@ -1,12 +1,13 @@ -%define libsepolver 1.11.7-1 -%define libselinuxver 1.29.4-1 +%define libsepolver 1.11.9-1 +%define libselinuxver 1.29.5-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.5.9 +Version: 1.5.14 Release: 1 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz +Patch: libsemanage-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} @@ -39,6 +40,7 @@ %prep %setup -q +%patch -p 1 -b .rhat %build make clean @@ -76,6 +78,19 @@ %changelog +* Fri Jan 13 2006 Dan Walsh 1.5.14-1 +- Upgrade to latest from NSA + * Merged disallow port overlap patch from Ivan Gyurdiev. + * Merged join prereq and implementation patches from Ivan Gyurdiev. + * Merged join user extra data part 2 patch from Ivan Gyurdiev. + * Merged bugfix patch from Ivan Gyurdiev. + * Merged remove add_local/set_local patch from Ivan Gyurdiev. + * Merged user extra data part 1 patch from Ivan Gyurdiev. + * Merged size_t -> unsigned int patch from Ivan Gyurdiev. + * Merged calloc check in semanage_store patch from Ivan Gyurdiev, + bug noticed by Steve Grubb. + * Merged cleanups after add/set removal patch from Ivan Gyurdiev. + * Fri Jan 7 2006 Dan Walsh 1.5.9-1 - Upgrade to latest from NSA * Merged const in APIs patch from Ivan Gyurdiev. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 6 Jan 2006 16:07:00 -0000 1.46 +++ sources 13 Jan 2006 22:31:44 -0000 1.47 @@ -1 +1 @@ -4b27bec1cb92dac96c2fda30b4c6cafe libsemanage-1.5.9.tgz +6a136bd40751507a05a6a6f0996cb4cc libsemanage-1.5.14.tgz From fedora-cvs-commits at redhat.com Fri Jan 13 22:32:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 17:32:15 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.22, 1.23 policy-20060104.patch, 1.10, 1.11 selinux-policy.spec, 1.82, 1.83 sources, 1.24, 1.25 Message-ID: <200601132232.k0DMWBm3026148@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26125 Modified Files: .cvsignore policy-20060104.patch selinux-policy.spec sources Log Message: * Fri Jan 13 2006 Dan Walsh 2.1.10-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 11 Jan 2006 22:25:06 -0000 1.22 +++ .cvsignore 13 Jan 2006 22:32:06 -0000 1.23 @@ -23,3 +23,4 @@ serefpolicy-2.1.7.tgz serefpolicy-2.1.8.tgz serefpolicy-2.1.9.tgz +serefpolicy-2.1.10.tgz policy-20060104.patch: Makefile | 2 - policy/modules/admin/kudzu.te | 1 policy/modules/admin/readahead.te | 2 + policy/modules/apps/java.fc | 2 + policy/modules/apps/wine.fc | 2 + policy/modules/apps/wine.if | 23 ++++++++++++++++ policy/modules/apps/wine.te | 27 ++++++++++++++++++ policy/modules/kernel/devices.if | 16 +++++++++++ policy/modules/kernel/mls.te | 2 + policy/modules/services/apache.te | 5 +++ policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 1 policy/modules/services/cron.te | 2 - policy/modules/services/cups.te | 6 +--- policy/modules/services/dovecot.te | 1 policy/modules/services/hal.te | 12 +++++++- policy/modules/services/locate.fc | 4 ++ policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++++++++++++++++++++++++++++++++++ policy/modules/services/sendmail.te | 2 + policy/modules/system/authlogin.te | 12 ++------ policy/modules/system/hostname.te | 29 -------------------- policy/modules/system/init.te | 1 policy/modules/system/lvm.te | 8 ----- policy/modules/system/mount.te | 3 +- policy/modules/system/selinuxutil.te | 1 policy/modules/system/unconfined.if | 1 policy/modules/system/userdomain.if | 1 policy/users | 8 +++-- 29 files changed, 171 insertions(+), 55 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- policy-20060104.patch 12 Jan 2006 02:36:17 -0000 1.10 +++ policy-20060104.patch 13 Jan 2006 22:32:06 -0000 1.11 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.9/Makefile ---- nsaserefpolicy/Makefile 2006-01-11 14:31:29.000000000 -0500 -+++ serefpolicy-2.1.9/Makefile 2006-01-11 17:13:44.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.10/Makefile +--- nsaserefpolicy/Makefile 2006-01-13 09:48:25.000000000 -0500 ++++ serefpolicy-2.1.10/Makefile 2006-01-13 16:49:54.000000000 -0500 @@ -92,7 +92,7 @@ # enable MLS if requested. @@ -10,23 +10,9 @@ override CHECKPOLICY += -M override CHECKMODULE += -M endif -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/amanda.te serefpolicy-2.1.9/policy/modules/admin/amanda.te ---- nsaserefpolicy/policy/modules/admin/amanda.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/admin/amanda.te 2006-01-11 17:13:44.000000000 -0500 -@@ -165,6 +165,10 @@ - - sysnet_read_config(amanda_t) - -+optional_policy(`prelink', ` -+ prelink_relabel(amanda_usr_lib_t) -+') -+ - optional_policy(`authlogin',` - auth_read_shadow(amanda_t) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.1.9/policy/modules/admin/kudzu.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.1.10/policy/modules/admin/kudzu.te --- nsaserefpolicy/policy/modules/admin/kudzu.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/admin/kudzu.te 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/admin/kudzu.te 2006-01-13 16:49:54.000000000 -0500 @@ -63,6 +63,7 @@ fs_write_ramfs_socket(kudzu_t) @@ -35,18 +21,10 @@ modutils_read_mods_deps(kudzu_t) modutils_read_module_conf(kudzu_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.1.9/policy/modules/admin/readahead.te ---- nsaserefpolicy/policy/modules/admin/readahead.te 2006-01-04 16:55:14.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/admin/readahead.te 2006-01-11 17:13:44.000000000 -0500 -@@ -27,6 +27,7 @@ - - kernel_read_kernel_sysctl(readahead_t) - kernel_read_system_state(readahead_t) -+kernel_dontaudit_getattr_core(readahead_t) - - dev_read_sysfs(readahead_t) - dev_getattr_generic_chr_file(readahead_t) -@@ -34,6 +35,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.1.10/policy/modules/admin/readahead.te +--- nsaserefpolicy/policy/modules/admin/readahead.te 2006-01-13 09:48:26.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/admin/readahead.te 2006-01-13 16:49:54.000000000 -0500 +@@ -35,6 +35,7 @@ dev_getattr_all_chr_files(readahead_t) dev_getattr_all_blk_files(readahead_t) dev_dontaudit_read_all_blk_files(readahead_t) @@ -54,208 +32,33 @@ domain_use_wide_inherit_fd(readahead_t) -@@ -43,6 +45,9 @@ - - fs_getattr_all_fs(readahead_t) +@@ -46,6 +47,7 @@ fs_search_auto_mountpoints(readahead_t) -+fs_getattr_all_pipes(readahead_t) -+fs_getattr_all_files(readahead_t) + fs_getattr_all_pipes(readahead_t) + fs_getattr_all_files(readahead_t) +fs_search_ramfs(readahead_t) term_dontaudit_use_console(readahead_t) -@@ -50,6 +55,7 @@ - - init_use_fd(readahead_t) - init_use_script_pty(readahead_t) -+init_getattr_initctl(readahead_t) - - libs_use_ld_so(readahead_t) - libs_use_shared_libs(readahead_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/su.if serefpolicy-2.1.9/policy/modules/admin/su.if ---- nsaserefpolicy/policy/modules/admin/su.if 2006-01-11 14:31:30.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/admin/su.if 2006-01-11 17:13:44.000000000 -0500 -@@ -193,7 +193,9 @@ - domain_use_wide_inherit_fd($1_su_t) - - files_read_etc_files($1_su_t) -+ files_read_etc_runtime_files($1_su_t) - files_search_var_lib($1_su_t) -+ files_dontaudit_getattr_tmp_dir($1_su_t) - - init_dontaudit_use_fd($1_su_t) - # Write to utmp. -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/vpn.te serefpolicy-2.1.9/policy/modules/admin/vpn.te ---- nsaserefpolicy/policy/modules/admin/vpn.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/admin/vpn.te 2006-01-11 17:13:44.000000000 -0500 -@@ -24,6 +24,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.1.10/policy/modules/apps/java.fc +--- nsaserefpolicy/policy/modules/apps/java.fc 2006-01-12 18:28:45.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/apps/java.fc 2006-01-13 16:52:58.000000000 -0500 +@@ -1,4 +1,6 @@ # - - allow vpnc_t self:capability { net_admin ipc_lock net_raw }; -+allow vpnc_t self:process getsched; - allow vpnc_t self:fifo_file { getattr ioctl read write }; - allow vpnc_t self:netlink_route_socket rw_netlink_socket_perms; - allow vpnc_t self:tcp_socket create_stream_socket_perms; -@@ -88,6 +89,8 @@ - libs_use_ld_so(vpnc_t) - libs_use_shared_libs(vpnc_t) - -+logging_send_syslog_msg(vpnc_t) -+ - miscfiles_read_localization(vpnc_t) - - seutil_dontaudit_search_config(vpnc_t) -@@ -110,3 +113,7 @@ - optional_policy(`nscd',` - nscd_use_socket(vpnc_t) - ') -+ -+optional_policy(`dbus',` -+ dbus_system_bus_client_template(vpnc,vpnc_t) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/alsa.fc serefpolicy-2.1.9/policy/modules/apps/alsa.fc ---- nsaserefpolicy/policy/modules/apps/alsa.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/apps/alsa.fc 2006-01-11 17:13:44.000000000 -0500 -@@ -0,0 +1,3 @@ -+#DESC ainit - configuration tool for ALSA -+/usr/bin/ainit -- gen_context(system_u:object_r:alsa_exec_t, s0) -+/etc/alsa/pcm(/.*)? gen_context(system_u:object_r:alsa_etc_rw_t, s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/alsa.if serefpolicy-2.1.9/policy/modules/apps/alsa.if ---- nsaserefpolicy/policy/modules/apps/alsa.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/apps/alsa.if 2006-01-11 17:13:44.000000000 -0500 -@@ -0,0 +1,21 @@ -+## configuration tool for ALSA. -+######################################## -+## -+## Execute alsa in the alsa domain. -+## -+## -+## The type of the process performing this action. -+## -+# -+interface(`alsa_domtrans',` -+ gen_require(` -+ type alsa_t, alsa_exec_t; -+ ') -+ -+ domain_auto_trans($1,alsa_exec_t,alsa_t) -+ -+ allow $1 alsa_t:fd use; -+ allow alsa_t $1:fd use; -+ allow alsa_t $1:fifo_file rw_file_perms; -+ allow alsa_t $1:process sigchld; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/alsa.te serefpolicy-2.1.9/policy/modules/apps/alsa.te ---- nsaserefpolicy/policy/modules/apps/alsa.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/apps/alsa.te 2006-01-11 17:13:44.000000000 -0500 -@@ -0,0 +1,34 @@ -+policy_module(alsa,1.0.0) -+type alsa_t; -+domain_type(alsa_t) -+ -+type alsa_exec_t; -+domain_entry_file(alsa_t,alsa_exec_t) -+role system_r types alsa_t; -+ -+type alsa_etc_rw_t; -+files_type(alsa_etc_rw_t) -+ -+allow alsa_t self:capability { setgid setuid ipc_owner }; -+dontaudit alsa_t self:capability sys_admin; -+ -+files_read_etc_files(alsa_t) -+ -+logging_send_syslog_msg(alsa_t) -+ -+libs_use_ld_so(alsa_t) -+libs_use_shared_libs(alsa_t) -+ -+miscfiles_read_localization(alsa_t) -+ -+allow alsa_t { unpriv_userdomain self }:sem create_sem_perms; -+allow alsa_t { unpriv_userdomain self }:shm create_shm_perms; -+allow alsa_t self:unix_stream_socket create_stream_socket_perms; -+allow alsa_t self:unix_dgram_socket create_socket_perms; -+allow unpriv_userdomain alsa_t:sem { unix_read unix_write associate read write }; -+allow unpriv_userdomain alsa_t:shm { unix_read unix_write create_shm_perms }; -+ -+allow alsa_t alsa_etc_rw_t:dir rw_dir_perms; -+allow alsa_t alsa_etc_rw_t:file create_file_perms; -+ -+allow alsa_t devpts_t:chr_file { read write }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.1.9/policy/modules/apps/java.fc ---- nsaserefpolicy/policy/modules/apps/java.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/apps/java.fc 2006-01-11 17:13:44.000000000 -0500 -@@ -0,0 +1,4 @@ -+ -+/usr/.*/java -- gen_context(system_u:object_r:java_exec_t,s0) + # /usr + # + /usr(/.*)?/bin/java.* -- gen_context(system_u:object_r:java_exec_t,s0) +/usr/bin/gij -- gen_context(system_u:object_r:java_exec_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.if serefpolicy-2.1.9/policy/modules/apps/java.if ---- nsaserefpolicy/policy/modules/apps/java.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/apps/java.if 2006-01-11 17:13:44.000000000 -0500 -@@ -0,0 +1,23 @@ -+## Load keyboard mappings. -+ -+######################################## -+## -+## Execute the java program in the java domain. -+## -+## -+## The type of the process performing this action. -+## -+# -+interface(`java_domtrans',` -+ gen_require(` -+ type java_t, java_exec_t; -+ ') -+ -+ corecmd_search_bin($1) -+ domain_auto_trans($1, java_exec_t, java_t) -+ -+ allow $1 java_t:fd use; -+ allow java_t $1:fd use; -+ allow java_t $1:fifo_file rw_file_perms; -+ allow java_t $1:process sigchld; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.1.9/policy/modules/apps/java.te ---- nsaserefpolicy/policy/modules/apps/java.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/apps/java.te 2006-01-11 17:13:44.000000000 -0500 -@@ -0,0 +1,25 @@ -+policy_module(java,1.0.0) -+ -+######################################## -+# -+# Declarations -+# -+ -+type java_t; -+domain_type(java_t) -+ -+type java_exec_t; -+domain_entry_file(java_t,java_exec_t) -+ -+ -+######################################## -+# -+# Local policy -+# -+ -+ifdef(`targeted_policy',` -+ allow java_t self:process execmem; -+ unconfined_domain_template(java_t) -+ unconfined_domtrans(java_t) -+ role system_r types java_t; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.9/policy/modules/apps/wine.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.10/policy/modules/apps/wine.fc --- nsaserefpolicy/policy/modules/apps/wine.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/apps/wine.fc 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/apps/wine.fc 2006-01-13 16:49:54.000000000 -0500 @@ -0,0 +1,2 @@ +/usr/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.9/policy/modules/apps/wine.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.10/policy/modules/apps/wine.if --- nsaserefpolicy/policy/modules/apps/wine.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/apps/wine.if 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/apps/wine.if 2006-01-13 16:49:54.000000000 -0500 @@ -0,0 +1,23 @@ +## Load keyboard mappings. + @@ -280,9 +83,9 @@ + allow wine_t $1:fifo_file rw_file_perms; + allow wine_t $1:process sigchld; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.9/policy/modules/apps/wine.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.10/policy/modules/apps/wine.te --- nsaserefpolicy/policy/modules/apps/wine.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/apps/wine.te 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/apps/wine.te 2006-01-13 16:49:54.000000000 -0500 @@ -0,0 +1,27 @@ +policy_module(wine,1.0.0) + @@ -311,22 +114,9 @@ + allow wine_t file_type:file execmod; + +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/corecommands.te serefpolicy-2.1.9/policy/modules/kernel/corecommands.te ---- nsaserefpolicy/policy/modules/kernel/corecommands.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/kernel/corecommands.te 2006-01-11 17:13:44.000000000 -0500 -@@ -35,3 +35,9 @@ - - type chroot_exec_t; - files_type(chroot_exec_t) -+ -+optional_policy(`prelink', ` -+ prelink_relabel({ sbin_t bin_t }) -+') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.1.9/policy/modules/kernel/devices.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.1.10/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/kernel/devices.if 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/kernel/devices.if 2006-01-13 16:49:54.000000000 -0500 @@ -2248,3 +2248,19 @@ typeattribute $1 memory_raw_write, memory_raw_read; ') @@ -347,57 +137,9 @@ + dontaudit $1 memory_device_t:chr_file getattr; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.1.9/policy/modules/kernel/domain.if ---- nsaserefpolicy/policy/modules/kernel/domain.if 2005-12-12 15:35:53.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/kernel/domain.if 2006-01-11 17:13:44.000000000 -0500 -@@ -501,6 +501,7 @@ - ') - - dontaudit $1 domain:dir search_dir_perms; -+ dontaudit $1 domain:{ file lnk_file } r_file_perms; - ') - - ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.te serefpolicy-2.1.9/policy/modules/kernel/domain.te ---- nsaserefpolicy/policy/modules/kernel/domain.te 2005-12-09 23:35:04.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/kernel/domain.te 2006-01-11 17:13:44.000000000 -0500 -@@ -67,3 +67,7 @@ - # cjp: also need to except correctly for SEFramework - neverallow { domain unlabeled_t } file_type:process *; - neverallow ~{ domain unlabeled_t } *:process *; -+ -+optional_policy(`prelink', ` -+ prelink_relabel(entry_type) -+') -\ No newline at end of file -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.1.9/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-01-11 14:31:30.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/kernel/files.if 2006-01-11 17:13:44.000000000 -0500 -@@ -3241,3 +3241,20 @@ - ') - ') - ') -+ -+ -+######################################## -+## -+## Allow attempts to modify any directory -+## -+## -+## Domain to allow -+## -+# -+interface(`files_write_non_security_dir',` -+ gen_require(` -+ attribute file_type, security_file_type; -+ ') -+ -+ allow $1 file_type:dir write; -+') -\ No newline at end of file -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.9/policy/modules/kernel/mls.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.10/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/kernel/mls.te 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/kernel/mls.te 2006-01-13 16:49:54.000000000 -0500 @@ -82,9 +82,11 @@ # these might be targeted_policy only range_transition unconfined_t su_exec_t s0 - s0:c0.c255; @@ -410,21 +152,10 @@ range_transition kernel_t init_exec_t s0 - s15:c0.c255; +range_transition initrc_t auditd_exec_t s15:c0.c255; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.1.9/policy/modules/services/apache.te ---- nsaserefpolicy/policy/modules/services/apache.te 2005-12-12 23:05:35.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/apache.te 2006-01-11 17:13:44.000000000 -0500 -@@ -391,6 +391,10 @@ - userdom_dontaudit_use_sysadm_terms(httpd_t) - ') - -+optional_policy(`prelink', ` -+ prelink_relabel(httpd_modules_t) -+') -+ - optional_policy(`kerberos',` - kerberos_use(httpd_t) - ') -@@ -685,3 +689,8 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.1.10/policy/modules/services/apache.te +--- nsaserefpolicy/policy/modules/services/apache.te 2006-01-13 09:48:26.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/apache.te 2006-01-13 16:49:54.000000000 -0500 +@@ -689,3 +689,8 @@ optional_policy(`nscd',` nscd_use_socket(httpd_unconfined_script_t) ') @@ -433,9 +164,9 @@ + cron_system_entry(httpd_t, httpd_exec_t) +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.1.9/policy/modules/services/apm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.1.10/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/apm.te 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/apm.te 2006-01-13 16:49:54.000000000 -0500 @@ -196,6 +196,7 @@ ') @@ -444,29 +175,10 @@ cron_domtrans_anacron_system_job(apmd_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.1.9/policy/modules/services/automount.te ---- nsaserefpolicy/policy/modules/services/automount.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/automount.te 2006-01-11 17:13:44.000000000 -0500 -@@ -28,7 +28,7 @@ - # Local policy - # - --allow automount_t self:capability { sys_nice dac_override }; -+allow automount_t self:capability { net_bind_service sys_nice dac_override }; - dontaudit automount_t self:capability sys_tty_config; - allow automount_t self:process { signal_perms getpgid setpgid setsched }; - allow automount_t self:fifo_file rw_file_perms; -@@ -80,7 +80,9 @@ - corenet_udp_sendrecv_all_ports(automount_t) - corenet_tcp_bind_all_nodes(automount_t) - corenet_udp_bind_all_nodes(automount_t) -+ - corenet_tcp_connect_portmap_port(automount_t) -+corenet_tcp_connect_all_ports(automount_t) - corenet_dontaudit_tcp_connect_all_reserved_ports(automount_t) - - dev_read_sysfs(automount_t) -@@ -107,6 +109,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.1.10/policy/modules/services/automount.te +--- nsaserefpolicy/policy/modules/services/automount.te 2006-01-13 09:48:26.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/automount.te 2006-01-13 16:49:54.000000000 -0500 +@@ -108,6 +108,7 @@ fs_manage_auto_mountpoints(automount_t) term_dontaudit_use_console(automount_t) @@ -474,51 +186,9 @@ init_use_fd(automount_t) init_use_script_pty(automount_t) -@@ -143,6 +146,10 @@ - fstools_domtrans(automount_t) - ') - -+optional_policy(`bind',` -+ bind_search_mounts(automount_t) -+') -+ - optional_policy(`nis',` - nis_use_ypbind(automount_t) - ') -@@ -158,3 +165,4 @@ - optional_policy(`udev',` - udev_read_db(automount_t) - ') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-2.1.9/policy/modules/services/bind.if ---- nsaserefpolicy/policy/modules/services/bind.if 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/bind.if 2006-01-11 17:13:44.000000000 -0500 -@@ -207,3 +207,22 @@ - allow $1 named_zone_t:file r_file_perms; - ') - -+######################################## -+## -+## Read BIND search for mount points -+## -+## -+## Domain allowed access. -+## -+# -+interface(`bind_search_mounts',` -+ gen_require(` -+ type named_zone_t; -+ type named_conf_t; -+ ') -+ -+ files_search_var($1) -+ allow $1 named_zone_t:dir search_dir_perms; -+ allow $1 named_conf_t:dir search_dir_perms; -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.1.9/policy/modules/services/cron.te ---- nsaserefpolicy/policy/modules/services/cron.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/cron.te 2006-01-11 17:13:44.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.1.10/policy/modules/services/cron.te +--- nsaserefpolicy/policy/modules/services/cron.te 2006-01-13 09:48:27.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/cron.te 2006-01-13 16:49:54.000000000 -0500 @@ -120,7 +120,7 @@ init_use_fd(crond_t) @@ -528,58 +198,9 @@ libs_use_ld_so(crond_t) libs_use_shared_libs(crond_t) -@@ -407,43 +407,21 @@ - sysstat_manage_log(system_crond_t) - ') - -+ -+ optional_policy(`mta',` -+ dontaudit system_mail_t crond_t:fifo_file write; -+ ') -+ - ifdef(`TODO',` - dontaudit userdomain system_crond_t:fd use; - -- # Do not audit attempts to search unlabeled directories (e.g. slocate). -- dontaudit system_crond_t unlabeled_t:dir r_dir_perms; -- dontaudit system_crond_t unlabeled_t:file r_file_perms; -- - allow system_crond_t { sysfs_t rpc_pipefs_t }:dir getattr; - -- # Write to /var/lib/slocate.db. -- allow system_crond_t var_lib_t:dir rw_dir_perms; -- allow system_crond_t var_lib_t:file create_file_perms; -- - # for if /var/mail is a symlink - allow system_crond_t mail_spool_t:lnk_file read; - -- # -- # These rules are here to allow system cron jobs to su -- # -- ifdef(`su.te', ` -- su_restricted_domain(system_crond,system) -- role system_r types system_crond_su_t; -- allow system_crond_su_t crond_t:fifo_file ioctl; -- ') -- -- # -- # Required for webalizer -- # -- ifdef(`apache.te', ` -- allow system_crond_t { httpd_log_t httpd_config_t }:file r_file_perms; -- ') -- - ifdef(`mta.te', ` - mta_send_mail_transition(system_crond_t) -- -- # system_mail_t should only be reading from the cron fifo not needing to write -- dontaudit system_mail_t crond_t:fifo_file write; - allow mta_user_agent system_crond_t:fd use; - r_dir_file(system_mail_t, crond_tmp_t) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.1.9/policy/modules/services/cups.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.1.10/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/cups.te 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/cups.te 2006-01-13 16:49:54.000000000 -0500 @@ -201,8 +201,7 @@ ') @@ -600,9 +221,9 @@ ') optional_policy(`dbus',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.9/policy/modules/services/dovecot.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.10/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/dovecot.te 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/dovecot.te 2006-01-13 16:49:54.000000000 -0500 @@ -95,6 +95,7 @@ files_read_etc_files(dovecot_t) files_search_spool(dovecot_t) @@ -611,33 +232,13 @@ files_dontaudit_list_default(dovecot_t) init_use_fd(dovecot_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/finger.te serefpolicy-2.1.9/policy/modules/services/finger.te ---- nsaserefpolicy/policy/modules/services/finger.te 2006-01-11 14:31:32.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/finger.te 2006-01-11 17:13:44.000000000 -0500 -@@ -65,6 +65,7 @@ - fs_getattr_all_fs(fingerd_t) - fs_search_auto_mountpoints(fingerd_t) - -+term_search_ptys(fingerd_t) - term_dontaudit_use_console(fingerd_t) - term_getattr_all_user_ttys(fingerd_t) - term_getattr_all_user_ptys(fingerd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.fc serefpolicy-2.1.9/policy/modules/services/hal.fc ---- nsaserefpolicy/policy/modules/services/hal.fc 2005-11-14 18:24:07.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/hal.fc 2006-01-11 17:13:44.000000000 -0500 -@@ -7,3 +7,4 @@ - /usr/sbin/hald -- gen_context(system_u:object_r:hald_exec_t,s0) - - /usr/share/hal/device-manager/hal-device-manager -- gen_context(system_u:object_r:bin_t,s0) -+/usr/share/hal/scripts(/.*)? gen_context(system_u:object_r:bin_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.9/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/hal.te 2006-01-11 17:13:44.000000000 -0500 -@@ -47,8 +47,14 @@ - kernel_read_system_state(hald_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.10/policy/modules/services/hal.te +--- nsaserefpolicy/policy/modules/services/hal.te 2006-01-13 09:48:27.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/hal.te 2006-01-13 16:49:54.000000000 -0500 +@@ -48,8 +48,13 @@ kernel_read_network_state(hald_t) kernel_read_kernel_sysctl(hald_t) -+kernel_read_fs_sysctl(hald_t) + kernel_read_fs_sysctl(hald_t) + kernel_write_proc_file(hald_t) @@ -648,28 +249,17 @@ corecmd_exec_bin(hald_t) corecmd_exec_sbin(hald_t) -@@ -81,7 +87,8 @@ +@@ -82,8 +87,8 @@ files_exec_etc_files(hald_t) files_read_etc_files(hald_t) files_rw_etc_runtime_files(hald_t) -files_search_mnt(hald_t) -+files_manage_mnt_dirs(hald_t) + files_manage_mnt_dirs(hald_t) +files_manage_mnt_files(hald_t) files_search_var_lib(hald_t) files_read_usr_files(hald_t) # hal is now execing pm-suspend -@@ -145,6 +152,10 @@ - clock_domtrans(hald_t) - ') - -+optional_policy(`rpc',` -+ rpc_search_nfs_state_data(hald_t) -+') -+ - optional_policy(`cups',` - cups_domtrans_config(hald_t) - cups_signal_config(hald_t) -@@ -154,6 +165,7 @@ +@@ -158,6 +163,7 @@ dbus_system_bus_client_template(hald,hald_t) dbus_send_system_bus_msg(hald_t) dbus_connect_system_bus(hald_t) @@ -677,44 +267,30 @@ init_dbus_chat_script(hald_t) -@@ -205,6 +217,6 @@ +@@ -212,3 +218,7 @@ + optional_policy(`vbetool',` vbetool_domtrans(hald_t) ') - --ifdef(`TODO',` --allow hald_t device_t:dir create_dir_perms; --') dnl end TODO ++ +optional_policy(`bind',` + bind_search_mounts(hald_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/kerberos.te serefpolicy-2.1.9/policy/modules/services/kerberos.te ---- nsaserefpolicy/policy/modules/services/kerberos.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/kerberos.te 2006-01-11 17:13:44.000000000 -0500 -@@ -249,8 +249,3 @@ - udev_read_db(krb5kdc_t) - ') - --ifdef(`TODO',` --# Allow user programs to talk to KDC --allow krb5kdc_t userdomain:udp_socket recvfrom; --allow userdomain krb5kdc_t:udp_socket recvfrom; --') dnl end TODO -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.fc serefpolicy-2.1.9/policy/modules/services/locate.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.fc serefpolicy-2.1.10/policy/modules/services/locate.fc --- nsaserefpolicy/policy/modules/services/locate.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/locate.fc 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/locate.fc 2006-01-13 16:49:54.000000000 -0500 @@ -0,0 +1,4 @@ +# locate - file locater +/usr/bin/updatedb -- gen_context(system_u:object_r:locate_exec_t, s0) +/var/lib/[sm]locate(/.*)? gen_context(system_u:object_r:locate_var_lib_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.if serefpolicy-2.1.9/policy/modules/services/locate.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.if serefpolicy-2.1.10/policy/modules/services/locate.if --- nsaserefpolicy/policy/modules/services/locate.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/locate.if 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/locate.if 2006-01-13 16:49:54.000000000 -0500 @@ -0,0 +1 @@ +## Update database for mlocate -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.te serefpolicy-2.1.9/policy/modules/services/locate.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.te serefpolicy-2.1.10/policy/modules/services/locate.te --- nsaserefpolicy/policy/modules/services/locate.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/locate.te 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/locate.te 2006-01-13 16:49:54.000000000 -0500 @@ -0,0 +1,50 @@ +policy_module(locate,1.0.0) + @@ -766,207 +342,9 @@ + allow system_crond_t locate_log_t:dir rw_dir_perms; + allow system_crond_t locate_log_t:file { create append getattr }; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.1.9/policy/modules/services/mta.te ---- nsaserefpolicy/policy/modules/services/mta.te 2006-01-11 14:31:32.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/mta.te 2006-01-11 17:20:33.000000000 -0500 -@@ -128,6 +128,10 @@ - logwatch_read_tmp_files(system_mail_t) - ') - -+optional_policy(`sendmail',` -+ files_create_etc_config(sendmail_t,etc_aliases_t, file) -+') -+ - optional_policy(`postfix',` - allow system_mail_t etc_aliases_t:dir create_dir_perms; - allow system_mail_t etc_aliases_t:file create_file_perms; -@@ -178,3 +182,9 @@ - cron_read_system_job_tmp_files(mta_user_agent) - ') - ') -+ -+ifdef(`TODO',` -+# for the start script to run make -C /etc/mail -+allow initrc_t etc_mail_t:dir rw_dir_perms; -+allow initrc_t etc_mail_t:file create_file_perms; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.1.9/policy/modules/services/networkmanager.te ---- nsaserefpolicy/policy/modules/services/networkmanager.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/networkmanager.te 2006-01-11 17:13:44.000000000 -0500 -@@ -28,8 +28,6 @@ - allow NetworkManager_t self:tcp_socket create_stream_socket_perms; - allow NetworkManager_t self:udp_socket create_socket_perms; - allow NetworkManager_t self:packet_socket create_socket_perms; --# allow vpnc connections --allow NetworkManager_t self:rawip_socket create_socket_perms; - - allow NetworkManager_t NetworkManager_var_run_t:file create_file_perms; - allow NetworkManager_t NetworkManager_var_run_t:dir rw_dir_perms; -@@ -54,8 +52,6 @@ - corenet_tcp_connect_all_ports(NetworkManager_t) - corenet_udp_bind_isakmp_port(NetworkManager_t) - corenet_udp_bind_dhcpc_port(NetworkManager_t) --# vpn connections --corenet_use_tun_tap_device(NetworkManager_t) - - dev_read_sysfs(NetworkManager_t) - dev_read_rand(NetworkManager_t) -@@ -170,4 +166,5 @@ - - optional_policy(`vpn',` - vpn_domtrans(NetworkManager_t) -+ allow NetworkManager_t vpnc_t:process signal; - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ntp.te serefpolicy-2.1.9/policy/modules/services/ntp.te ---- nsaserefpolicy/policy/modules/services/ntp.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/ntp.te 2006-01-11 17:13:44.000000000 -0500 -@@ -148,8 +148,6 @@ - ') - - optional_policy(`samba',` -- # cjp: the connect was previously missing -- # so it might be ok to drop this - samba_connect_winbind(ntpd_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.fc serefpolicy-2.1.9/policy/modules/services/prelink.fc ---- nsaserefpolicy/policy/modules/services/prelink.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/prelink.fc 2006-01-11 17:13:44.000000000 -0500 -@@ -0,0 +1,7 @@ -+# prelink - prelink ELF shared libraries and binaries to speed up startup time -+/usr/sbin/prelink -- gen_context(system_u:object_r:prelink_exec_t,s0) -+ifdef(`distro_debian', ` -+/usr/sbin/prelink\.bin -- gen_context(system_u:object_r:prelink_exec_t,s0) -+') -+/var/log/prelink\.log -- gen_context(system_u:object_r:prelink_log_t,s0) -+/etc/prelink\.cache -- gen_context(system_u:object_r:prelink_cache_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.if serefpolicy-2.1.9/policy/modules/services/prelink.if ---- nsaserefpolicy/policy/modules/services/prelink.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/prelink.if 2006-01-11 17:13:44.000000000 -0500 -@@ -0,0 +1,39 @@ -+## Prelink mappings. -+ -+######################################## -+## -+## Execute the prelink program in the prelink domain. -+## -+## -+## The type of the process performing this action. -+## -+# -+interface(`prelink_domtrans',` -+ gen_require(` -+ type prelink_t, prelink_exec_t; -+ ') -+ -+ corecmd_search_bin($1) -+ domain_auto_trans($1, prelink_exec_t, prelink_t) -+ -+ allow $1 prelink_t:fd use; -+ allow prelink_t $1:fd use; -+ allow prelink_t $1:fifo_file rw_file_perms; -+ allow prelink_t $1:process sigchld; -+') -+ -+ -+######################################## -+## -+## Allow prelink to rebuild the executable or library -+## -+## -+## The type of the process performing this action. -+## -+# -+interface(`prelink_relabel',` -+ gen_require(` -+ type prelink_t; -+ ') -+ allow prelink_t $1:file { create_file_perms execute relabelto relabelfrom }; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/prelink.te serefpolicy-2.1.9/policy/modules/services/prelink.te ---- nsaserefpolicy/policy/modules/services/prelink.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/prelink.te 2006-01-11 17:13:44.000000000 -0500 -@@ -0,0 +1,64 @@ -+policy_module(prelink,1.0.0) -+ -+#DESC PRELINK - Security Enhanced version of the GNU Prelink -+# -+# Author: Dan Walsh -+# -+ -+################################# -+# -+# Rules for the prelink_t domain. -+# -+# prelink_exec_t is the type of the prelink executable. -+# -+type prelink_t; -+type prelink_exec_t; -+init_daemon_domain(prelink_t,prelink_exec_t) -+# -+# prelink_cache_t is the type of /etc/prelink.cache. -+# -+type prelink_cache_t; -+files_type(prelink_cache_t) -+ -+type prelink_log_t; -+logging_log_file(prelink_log_t) -+ -+allow prelink_t self:capability { chown dac_override fowner fsetid }; -+allow prelink_t self:process { execheap execmem execstack }; -+allow prelink_t self:fifo_file rw_file_perms; -+allow prelink_t self:file { getattr read }; -+ -+allow prelink_t prelink_log_t:dir { setattr rw_dir_perms }; -+allow prelink_t prelink_log_t:file { create ra_file_perms }; -+allow prelink_t prelink_log_t:lnk_file read; -+logging_create_log(prelink_t, prelink_log_t) -+ -+fs_getattr_xattr_fs(prelink_t) -+ -+libs_use_ld_so(prelink_t) -+libs_use_shared_libs(prelink_t) -+ -+files_list_all(prelink_t) -+files_getattr_all_files(prelink_t) -+files_write_non_security_dir(prelink_t) -+files_create_etc_config(prelink_t, prelink_cache_t, file) -+ -+kernel_dontaudit_search_kernel_sysctl(prelink_t) -+kernel_dontaudit_search_sysctl(prelink_t) -+kernel_read_system_state(prelink_t) -+ -+files_read_etc_runtime_files(prelink_t) -+ -+miscfiles_read_localization(prelink_t) -+ -+dev_read_urand(prelink_t) -+ -+optional_policy(`crond',` -+ cron_system_entry(prelink_t, prelink_exec_t) -+ allow system_crond_t prelink_log_t:dir rw_dir_perms; -+ allow system_crond_t prelink_log_t:file create_file_perms; -+ allow system_crond_t prelink_cache_t:file { getattr read unlink }; -+ allow prelink_t crond_log_t:file append; -+') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/samba.if serefpolicy-2.1.9/policy/modules/services/samba.if ---- nsaserefpolicy/policy/modules/services/samba.if 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/samba.if 2006-01-11 17:13:44.000000000 -0500 -@@ -342,7 +342,9 @@ - ') - - files_search_pids($1) -+ samba_search_var($1) - allow $1 winbind_var_run_t:dir search_dir_perms; - allow $1 winbind_var_run_t:sock_file { getattr read write }; - allow $1 winbind_t:unix_stream_socket connectto; - ') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.1.9/policy/modules/services/sendmail.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.1.10/policy/modules/services/sendmail.te --- nsaserefpolicy/policy/modules/services/sendmail.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/sendmail.te 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/sendmail.te 2006-01-13 16:49:54.000000000 -0500 @@ -17,6 +17,7 @@ type sendmail_t; @@ -983,61 +361,9 @@ dev_read_urand(sendmail_t) dev_read_sysfs(sendmail_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/ssh.if serefpolicy-2.1.9/policy/modules/services/ssh.if ---- nsaserefpolicy/policy/modules/services/ssh.if 2005-12-06 19:49:51.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/ssh.if 2006-01-11 17:13:44.000000000 -0500 -@@ -58,6 +58,10 @@ - domain_entry_file($1_ssh_keysign_t,ssh_keysign_exec_t) - role $3 types $1_ssh_keysign_t; - -+ allow $1_ssh_t $1_devpts_t:chr_file { rw_file_perms setattr getattr relabelfrom }; -+ term_create_pty($1_ssh_t,$1_devpts_t) -+ -+ - ############################## - # - # $1_ssh_t local policy -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xdm.te serefpolicy-2.1.9/policy/modules/services/xdm.te ---- nsaserefpolicy/policy/modules/services/xdm.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/services/xdm.te 2006-01-11 17:13:44.000000000 -0500 -@@ -319,6 +319,10 @@ - allow xdm_xserver_t xkb_var_lib_t:lnk_file read; - can_exec(xdm_xserver_t, xkb_var_lib_t) - -+optional_policy(`prelink', ` -+ prelink_relabel(xkb_var_lib_t) -+') -+ - # Insert video drivers. - allow xdm_xserver_t self:capability mknod; - allow xdm_xserver_t sysctl_modprobe_t:file { getattr read }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.1.9/policy/modules/system/authlogin.if ---- nsaserefpolicy/policy/modules/system/authlogin.if 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/authlogin.if 2006-01-11 17:13:44.000000000 -0500 -@@ -977,6 +977,20 @@ - - ####################################### - # -+# auth_setattr_login_records(domain) -+# -+interface(`auth_setattr_login_records',` -+ gen_require(` -+ type wtmp_t; -+ class file setattr; -+ ') -+ -+ allow $1 wtmp_t:file setattr; -+ logging_search_logs($1) -+') -+ -+####################################### -+# - # auth_create_login_records(domain) - # - interface(`auth_create_login_records',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.1.9/policy/modules/system/authlogin.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.1.10/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/authlogin.te 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/authlogin.te 2006-01-13 16:49:54.000000000 -0500 @@ -129,14 +129,6 @@ nscd_use_socket(pam_t) ') @@ -1064,34 +390,10 @@ ifdef(`targeted_policy', ` term_dontaudit_use_unallocated_tty(pam_console_t) term_dontaudit_use_generic_pty(pam_console_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.1.9/policy/modules/system/fstools.te ---- nsaserefpolicy/policy/modules/system/fstools.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/fstools.te 2006-01-11 17:13:44.000000000 -0500 -@@ -69,6 +69,8 @@ - dev_read_sysfs(fsadm_t) - # Access to /initrd devices - dev_getattr_usbfs_dir(fsadm_t) -+# Access to /dev/mapper/control -+dev_rw_lvm_control(fsadm_t) - - fs_search_auto_mountpoints(fsadm_t) - fs_getattr_xattr_fs(fsadm_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.1.9/policy/modules/system/hostname.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.1.10/policy/modules/system/hostname.te --- nsaserefpolicy/policy/modules/system/hostname.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/hostname.te 2006-01-11 17:13:44.000000000 -0500 -@@ -7,8 +7,10 @@ - # - - type hostname_t; -+domain_type(hostname_t) -+ - type hostname_exec_t; --init_system_domain(hostname_t,hostname_exec_t) -+domain_entry_file(hostname_t,hostname_exec_t) - role system_r types hostname_t; - - ######################################## -@@ -55,35 +57,6 @@ ++++ serefpolicy-2.1.10/policy/modules/system/hostname.te 2006-01-13 16:49:54.000000000 -0500 +@@ -55,35 +55,6 @@ sysnet_read_config(hostname_t) sysnet_dns_name_resolve(hostname_t) @@ -1100,13 +402,13 @@ -ifdef(`distro_redhat', ` - fs_use_tmpfs_chr_dev(hostname_t) -') -- + -ifdef(`targeted_policy', ` - term_dontaudit_use_unallocated_tty(hostname_t) - term_dontaudit_use_generic_pty(hostname_t) - files_dontaudit_read_root_file(hostname_t) -') -- + -optional_policy(`firstboot',` - firstboot_use_fd(hostname_t) -') @@ -1127,24 +429,9 @@ - udev_dontaudit_use_fd(hostname_t) - udev_read_db(hostname_t) -') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.if serefpolicy-2.1.9/policy/modules/system/init.if ---- nsaserefpolicy/policy/modules/system/init.if 2006-01-11 14:31:32.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/init.if 2006-01-11 17:13:44.000000000 -0500 -@@ -345,6 +345,9 @@ - interface(`init_domtrans_script',` - gen_require(` - type initrc_t, initrc_exec_t; -+ class process sigchld; -+ class fd use; -+ class fifo_file rw_file_perms; - ') - - files_list_etc($1) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.1.9/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/init.te 2006-01-11 17:14:12.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.1.10/policy/modules/system/init.te +--- nsaserefpolicy/policy/modules/system/init.te 2006-01-13 09:48:27.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/init.te 2006-01-13 16:49:54.000000000 -0500 @@ -298,6 +298,7 @@ term_reset_tty_labels(initrc_t) @@ -1153,291 +440,10 @@ auth_rw_lastlog(initrc_t) auth_read_pam_pid(initrc_t) auth_delete_pam_pid(initrc_t) -@@ -449,7 +450,6 @@ - - # readahead asks for these - auth_dontaudit_read_shadow(initrc_t) -- mta_read_aliases(initrc_t) - - optional_policy(`bind',` - bind_manage_config_dir(initrc_t) -@@ -575,8 +575,7 @@ - ') - - optional_policy(`lvm',` -- #allow initrc_t lvm_control_t:chr_file unlink; -- -+ lvm_read_config(initrc_t) - dev_read_lvm_control(initrc_t) - dev_create_generic_chr_file(initrc_t) - ') -@@ -687,6 +686,10 @@ - zebra_read_config(initrc_t) - ') - -+optional_policy(`hostname',` -+ hostname_exec(initrc_t) -+') -+ - ifdef(`TODO',` - # Set device ownerships/modes. - allow initrc_t xconsole_device_t:fifo_file setattr; -@@ -695,24 +698,13 @@ - allow initrc_t default_t:dir write; - - ifdef(`distro_redhat', ` -- # readahead asks for these -- allow initrc_t var_lib_nfs_t:file r_file_perms; -- -- allow initrc_t file_type:{ dir_file_class_set socket_class_set } getattr; - allow initrc_t device_t:dir create; - -- # wants to delete /poweroff and other files -- allow initrc_t root_t:file unlink; - ifdef(`xserver.te', ` - # wants to cleanup xserver log dir - allow initrc_t xserver_log_t:dir rw_dir_perms; - allow initrc_t xserver_log_t:file unlink; - ') - -- optional_policy(`rpm',` -- rpm_stub(initrc_t) -- #read ahead wants to read this -- allow initrc_t system_cron_spool_t:file { getattr read }; -- ') - ') - ') dnl end TODO -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/iptables.te serefpolicy-2.1.9/policy/modules/system/iptables.te ---- nsaserefpolicy/policy/modules/system/iptables.te 2006-01-11 14:31:32.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/iptables.te 2006-01-11 17:13:44.000000000 -0500 -@@ -87,6 +87,7 @@ - ') - - optional_policy(`modutils',` -+ corecmd_search_sbin(iptables_t) - modutils_domtrans_insmod(iptables_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.1.9/policy/modules/system/libraries.fc ---- nsaserefpolicy/policy/modules/system/libraries.fc 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/libraries.fc 2006-01-11 17:13:44.000000000 -0500 -@@ -11,6 +11,9 @@ - /emul/ia32-linux/lib(/.*)? gen_context(system_u:object_r:lib_t,s0) - /emul/ia32-linux/lib/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0) - /emul/ia32-linux/lib(/.*)?/ld-[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:ld_so_t,s0) -+ -+/usr/bin/fedora-rmdevelrpms -- gen_context(system_u:object_r:rpm_exec_t,s0) -+ - ') - - # -@@ -55,7 +58,7 @@ - - /usr(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) - --/usr/lib/pgsql/test/regress/.*\.so -- gen_context(system_u:object_r:shlib_t,s0) -+/usr/lib(64)?/pgsql/test/regress/.*\.so -- gen_context(system_u:object_r:shlib_t,s0) - - /usr/lib/win32/.* -- gen_context(system_u:object_r:shlib_t,s0) - -@@ -75,8 +78,10 @@ - - /usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - -+/usr/lib(64)?/libmono\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+ - ifdef(`distro_redhat',` --/usr/lib/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) -+/usr/lib(64)?/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) - /usr/share/rhn/rhn_applet/eggtrayiconmodule\.so -- gen_context(system_u:object_r:shlib_t,s0) - - # The following are libraries with text relocations in need of execmod permissions -@@ -84,32 +89,32 @@ - - # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv - # HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php --/usr/lib/gstreamer-.*/libgstffmpeg\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/gstreamer-.*/libgsthermescolorspace\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/gstreamer-.*/libgstmms\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libstdc\+\+\.so\.2\.7\.2\.8 -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libg\+\+\.so\.2\.7\.2\.8 -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libglide3\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libdv\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/helix/plugins/oggfformat\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/helix/plugins/theorarend\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/helix/plugins/vorbisrend\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/helix/codecs/colorcvt\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/helix/codecs/cvt1\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libSDL-.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/gstreamer-.*/libgstffmpeg\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/gstreamer-.*/libgsthermescolorspace\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/gstreamer-.*/libgstmms\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libstdc\+\+\.so\.2\.7\.2\.8 -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libg\+\+\.so\.2\.7\.2\.8 -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libglide3\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libdv\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/helix/plugins/oggfformat\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/helix/plugins/theorarend\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/helix/plugins/vorbisrend\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/helix/codecs/colorcvt\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/helix/codecs/cvt1\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libSDL-.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/X11R6/lib/modules/dri/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/dri/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/dri/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/X11R6/lib/libOSMesa\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/X11R6/lib/libfglrx_gamma\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libHermes\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/valgrind/hp2ps -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/valgrind/stage2 -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/valgrind/vg.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/.*/program/libicudata\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/.*/program/libsts645li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/.*/program/libvclplug_gen645li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/.*/program/libwrp645li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/.*/program/libswd680li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libHermes\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/valgrind/hp2ps -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/valgrind/stage2 -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/valgrind/vg.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/.*/program/libicudata\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/.*/program/libsts645li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/.*/program/libvclplug_gen645li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/.*/program/libwrp645li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/.*/program/libswd680li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?/.*/program/librecentfile\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?/.*/program/libsvx680li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - /usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -@@ -122,48 +127,48 @@ - /usr/lib(64)?/thunderbird.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - - # Fedora Extras packages: ladspa, imlib2, ocaml --/usr/lib/ladspa/analogue_osc_1416\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/bandpass_a_iir_1893\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/bandpass_iir_1892\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/butterworth_1902\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/fm_osc_1415\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/gsm_1215\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/gverb_1216\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/hermes_filter_1200\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/highpass_iir_1890\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/lowpass_iir_1891\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/notch_iir_1894\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/pitch_scale_1193\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/pitch_scale_1194\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/sc1_1425\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/sc2_1426\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/sc3_1427\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/sc4_1882\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ladspa/se4_1883\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libImlib2\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/ocaml/stublibs/dllnums\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/httpd/modules/libphp5\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/php/modules/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/analogue_osc_1416\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/bandpass_a_iir_1893\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/bandpass_iir_1892\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/butterworth_1902\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/fm_osc_1415\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/gsm_1215\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/gverb_1216\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/hermes_filter_1200\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/highpass_iir_1890\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/lowpass_iir_1891\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/notch_iir_1894\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/pitch_scale_1193\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/pitch_scale_1194\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/sc1_1425\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/sc2_1426\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/sc3_1427\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/sc4_1882\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ladspa/se4_1883\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libImlib2\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/ocaml/stublibs/dllnums\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/httpd/modules/libphp5\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/php/modules/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) - - # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame --/usr/lib/xmms/Input/libmpg123\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libpostproc\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libavformat-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libavcodec-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libavutil-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libxvidcore\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/xine/plugins/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libgsm\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libmp3lame\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/xmms/Input/libmpg123\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libpostproc\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libavformat-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libavcodec-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libavutil-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libxvidcore\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/xine/plugins/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libgsm\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libmp3lame\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - - # Flash plugin, Macromedia - HOME_DIR/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - - # Jai, Sun Microsystems (Jpackage SPRM) --/usr/lib/libmlib_jai\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libdivxdecore.so.0 -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib/libdivxencore.so.0 -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libmlib_jai\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libdivxdecore.so.0 -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/libdivxencore.so.0 -- gen_context(system_u:object_r:textrel_shlib_t,s0) - - # Java, Sun Microsystems (JPackage SRPM) - /usr/.*/jre/lib/i386/libdeploy.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -@@ -175,7 +180,7 @@ - ') dnl end distro_redhat - - ifdef(`distro_suse',` --/usr/lib/samba/classic/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0) -+/usr/lib(64)?/samba/classic/[^/]*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0) - ') - - # -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.te serefpolicy-2.1.9/policy/modules/system/libraries.te ---- nsaserefpolicy/policy/modules/system/libraries.te 2005-12-12 15:35:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/libraries.te 2006-01-11 17:13:44.000000000 -0500 -@@ -94,6 +94,10 @@ - unconfined_domain_template(ldconfig_t) - ') - -+optional_policy(`prelink', ` -+ prelink_relabel({ ld_so_t texrel_shlib_t shlib_t lib_t }) -+') -+ - optional_policy(`apache',` - # dontaudit access to /usr/lib/apache, normal programs cannot read these libs anyway - apache_dontaudit_search_modules(ldconfig_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.1.9/policy/modules/system/locallogin.te ---- nsaserefpolicy/policy/modules/system/locallogin.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/locallogin.te 2006-01-11 17:13:44.000000000 -0500 -@@ -165,6 +165,7 @@ - userdom_signal_all_users(local_login_t) - userdom_search_all_users_home(local_login_t) - userdom_use_unpriv_users_fd(local_login_t) -+userdom_all_users_sigchld(local_login_t) - - # Search for mail spool file. - mta_getattr_spool(local_login_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.1.9/policy/modules/system/lvm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.1.10/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/lvm.te 2006-01-11 17:15:14.000000000 -0500 -@@ -155,6 +155,7 @@ - - allow lvm_t lvm_etc_t:file r_file_perms; - allow lvm_t lvm_etc_t:lnk_file r_file_perms; -+ - # Write to /etc/lvm, /etc/lvmtab, /etc/lvmtab.d - allow lvm_t lvm_etc_t:dir rw_dir_perms; - allow lvm_t lvm_metadata_t:file create_file_perms; -@@ -209,6 +210,7 @@ ++++ serefpolicy-2.1.10/policy/modules/system/lvm.te 2006-01-13 16:49:54.000000000 -0500 +@@ -209,6 +209,7 @@ storage_manage_fixed_disk(lvm_t) term_dontaudit_getattr_all_user_ttys(lvm_t) @@ -1445,7 +451,7 @@ corecmd_search_sbin(lvm_t) corecmd_dontaudit_getattr_sbin_file(lvm_t) -@@ -260,10 +262,3 @@ +@@ -260,10 +261,3 @@ udev_read_db(lvm_t) ') @@ -1456,9 +462,9 @@ - -dontaudit lvm_t xconsole_device_t:fifo_file getattr; -') dnl end TODO -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.1.9/policy/modules/system/mount.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.1.10/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2005-12-12 23:05:35.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/mount.te 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/mount.te 2006-01-13 16:49:54.000000000 -0500 @@ -32,6 +32,7 @@ dev_getattr_all_blk_files(mount_t) @@ -1476,9 +482,9 @@ # required for mount.smbfs corecmd_exec_sbin(mount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.9/policy/modules/system/selinuxutil.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.10/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/selinuxutil.te 2006-01-11 17:22:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/selinuxutil.te 2006-01-13 16:49:54.000000000 -0500 @@ -414,6 +414,7 @@ allow run_init_t self:capability setuid; allow run_init_t self:fifo_file rw_file_perms; @@ -1487,9 +493,9 @@ # often the administrator runs such programs from a directory that is owned # by a different user or has restrictive SE permissions, do not want to audit -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.1.9/policy/modules/system/unconfined.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.1.10/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2005-12-13 15:51:50.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/unconfined.if 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/unconfined.if 2006-01-13 16:49:54.000000000 -0500 @@ -33,6 +33,7 @@ corenet_unconfined($1) dev_unconfined($1) @@ -1498,56 +504,9 @@ files_unconfined($1) fs_unconfined($1) selinux_unconfined($1) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.1.9/policy/modules/system/unconfined.te ---- nsaserefpolicy/policy/modules/system/unconfined.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/unconfined.te 2006-01-11 17:13:44.000000000 -0500 -@@ -57,6 +57,10 @@ - bluetooth_domtrans_helper(unconfined_t) - ') - -+ optional_policy(`java',` -+ java_domtrans(unconfined_t) -+ ') -+ - optional_policy(`dbus',` - dbus_stub(unconfined_t) - -@@ -125,10 +129,6 @@ - samba_domtrans_winbind_helper(unconfined_t) - ') - -- optional_policy(`su',` -- su_per_userdomain_template(sysadm,unconfined_t,system_r) -- ') -- - optional_policy(`sysnetwork',` - sysnet_domtrans_dhcpc(unconfined_t) - ') -@@ -141,6 +141,10 @@ - webalizer_domtrans(unconfined_t) - ') - -+ optional_policy(`sendmail',` -+ sendmail_domtrans(unconfined_t) -+ ') -+ - ifdef(`TODO',` - ifdef(`use_mcs',` - rw_dir_create_file(sysadm_su_t, home_dir_type) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.fc serefpolicy-2.1.9/policy/modules/system/userdomain.fc ---- nsaserefpolicy/policy/modules/system/userdomain.fc 2005-11-15 09:13:40.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/userdomain.fc 2006-01-11 17:13:44.000000000 -0500 -@@ -4,6 +4,6 @@ - HOME_DIR -d gen_context(system_u:object_r:user_home_dir_t,s0) - HOME_DIR/.+ gen_context(system_u:object_r:user_home_t,s0) - ',` --HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0) -+HOME_DIR -d gen_context(system_u:object_r:ROLE_home_dir_t,s0-s15:c0.c255) - HOME_DIR/.+ gen_context(system_u:object_r:ROLE_home_t,s0) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.9/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-11 14:31:32.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/userdomain.if 2006-01-11 17:13:44.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.10/policy/modules/system/userdomain.if +--- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-13 09:48:27.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/userdomain.if 2006-01-13 16:49:54.000000000 -0500 @@ -103,6 +103,7 @@ # execute files in the home directory can_exec($1_t,$1_home_t) @@ -1556,120 +515,9 @@ # full control of the home directory allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto }; allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto }; -@@ -1880,19 +1881,16 @@ - ## - # - interface(`userdom_dontaudit_getattr_sysadm_home_dir',` -- ifdef(`targeted_policy',` -- gen_require(` -- type user_home_dir_t; -- ') -+ gen_require(` -+ type sysadm_home_dir_t; -+ ') - -- dontaudit $1 user_home_dir_t:dir getattr; -- ', ` -- gen_require(` -- type sysadm_home_dir_t; -- ') -+ dontaudit $1 sysadm_home_dir_t:dir getattr; -+ -+ifdef(`targeted_policy', ` -+ userdom_dontaudit_getattr_user_home_dirs($1) -+') - -- dontaudit $1 sysadm_home_dir_t:dir getattr; -- ') - ') - - ######################################## -@@ -1921,19 +1919,15 @@ - ## - # - interface(`userdom_dontaudit_search_sysadm_home_dir',` -- ifdef(`targeted_policy',` - gen_require(` -- type user_home_dir_t; -+ type sysadm_home_dir_t; - ') - -- dontaudit $1 user_home_dir_t:dir search_dir_perms; -- ',` -- gen_require(` -- type sysadm_home_dir_t; -- ') -+ dontaudit $1 sysadm_home_dir_t:dir search_dir_perms; - -- dontaudit $1 sysadm_home_dir_t:dir search_dir_perms; -- ') -+ifdef(`targeted_policy', ` -+ userdom_dontaudit_search_user_home_dirs($1) -+') - ') - - ######################################## -@@ -2073,6 +2067,22 @@ - - ######################################## - ## -+## Do not audit attempts to getattr all users home directories. -+## -+## -+## Domain to not audit. -+## -+# -+interface(`userdom_dontaudit_getattr_user_home_dirs',` -+ gen_require(` -+ type user_home_dir_t; -+ ') -+ -+ dontaudit $1 user_home_dir_t:dir getattr; -+') -+ -+######################################## -+## - ## Read all files in all users home directories. - ## - ## -@@ -2664,6 +2674,23 @@ - - ######################################## - ## -+## Send a chld signal to local login processes. -+## -+## -+## Domain allowed access. -+## -+# -+interface(`userdom_all_users_sigchld',` -+ gen_require(` -+ attribute userdomain; -+ class process sigchld; -+ ') -+ -+ allow userdomain $1:process sigchld; -+') -+ -+######################################## -+## - ## Send general signals to all user domains. - ## - ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.1.9/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-11 14:31:32.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/system/userdomain.te 2006-01-11 17:13:44.000000000 -0500 -@@ -205,6 +205,7 @@ - - optional_policy(`hostname',` - hostname_run(sysadm_t,sysadm_r,admin_terminal) -+ hostname_exec(userdomain) - ') - - optional_policy(`ipsec',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.9/policy/users +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.10/policy/users --- nsaserefpolicy/policy/users 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.9/policy/users 2006-01-11 17:13:44.000000000 -0500 ++++ serefpolicy-2.1.10/policy/users 2006-01-13 16:49:54.000000000 -0500 @@ -26,7 +26,9 @@ ifdef(`targeted_policy',` gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) @@ -1692,24 +540,3 @@ + gen_user(root, sysadm_r staff_r secadm_r , s0, s0 - s15:c0.c255, c0.c255) ') ') ---- serefpolicy-2.1.9/policy/modules/admin/rpm.fc.pirut 2006-01-11 18:59:28.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/admin/rpm.fc 2006-01-11 18:59:31.000000000 -0500 -@@ -15,6 +15,8 @@ - ifdef(`distro_redhat', ` - /usr/sbin/up2date -- gen_context(system_u:object_r:rpm_exec_t,s0) - /usr/sbin/rhn_check -- gen_context(system_u:object_r:rpm_exec_t,s0) -+/usr/sbin/pup -- gen_context(system_u:object_r:rpm_exec_t,s0) -+/usr/sbin/pirut -- gen_context(system_u:object_r:rpm_exec_t,s0) - ') - - /var/lib/alternatives(/.*)? gen_context(system_u:object_r:rpm_var_lib_t,s0) ---- serefpolicy-2.1.9/policy/modules/kernel/storage.fc.xen 2006-01-11 21:31:15.000000000 -0500 -+++ serefpolicy-2.1.9/policy/modules/kernel/storage.fc 2006-01-11 21:31:48.000000000 -0500 -@@ -12,6 +12,7 @@ - /dev/cm20.* -b gen_context(system_u:object_r:removable_device_t,s0) - /dev/dasd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) - /dev/dm-[0-9]+ -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) -+/dev/xvd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) - /dev/fd[^/]+ -b gen_context(system_u:object_r:removable_device_t,s0) - /dev/flash[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) - /dev/gscd -b gen_context(system_u:object_r:removable_device_t,s0) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- selinux-policy.spec 12 Jan 2006 02:36:17 -0000 1.82 +++ selinux-policy.spec 13 Jan 2006 22:32:06 -0000 1.83 @@ -6,8 +6,8 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.1.9 -Release: 2 +Version: 2.1.10 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -262,6 +262,9 @@ %endif %changelog +* Fri Jan 13 2006 Dan Walsh 2.1.10-1 +- Update to upstream + * Wed Jan 11 2006 Jeremy Katz - 2.1.9-2 - fix pup transitions (#177262) - fix xen disks (#177599) Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 11 Jan 2006 22:25:06 -0000 1.24 +++ sources 13 Jan 2006 22:32:06 -0000 1.25 @@ -1 +1 @@ -ff669d0d686714cd3a4e57047277e539 serefpolicy-2.1.9.tgz +d221d682117dfbe36b8473ad008cd304 serefpolicy-2.1.10.tgz From fedora-cvs-commits at redhat.com Fri Jan 13 22:33:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 17:33:19 -0500 Subject: rpms/checkpolicy/devel checkpolicy.spec,1.86,1.87 Message-ID: <200601132233.k0DMXJHu026415@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/checkpolicy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26376 Modified Files: checkpolicy.spec Log Message: * Fri Jan 13 2006 Dan Walsh 1.28-5 - Rebuild to get latest libsepol Index: checkpolicy.spec =================================================================== RCS file: /cvs/dist/rpms/checkpolicy/devel/checkpolicy.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- checkpolicy.spec 5 Jan 2006 22:02:52 -0000 1.86 +++ checkpolicy.spec 13 Jan 2006 22:33:16 -0000 1.87 @@ -1,8 +1,8 @@ -%define libsepolver 1.11.5-1 +%define libsepolver 1.11.9-1 Summary: SELinux policy compiler Name: checkpolicy Version: 1.28 -Release: 4 +Release: 5 License: GPL Group: Development/System Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -47,6 +47,9 @@ %{_mandir}/man8/checkmodule.8.gz %changelog +* Fri Jan 13 2006 Dan Walsh 1.28-5 +- Rebuild to get latest libsepol + * Thu Jan 5 2006 Dan Walsh 1.28-4 - Rebuild to get latest libsepol From fedora-cvs-commits at redhat.com Fri Jan 13 22:36:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 17:36:59 -0500 Subject: rpms/libsemanage/devel libsemanage.spec,1.63,1.64 Message-ID: <200601132236.k0DMaxuI027180@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27140 Modified Files: libsemanage.spec Log Message: Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- libsemanage.spec 13 Jan 2006 22:31:44 -0000 1.63 +++ libsemanage.spec 13 Jan 2006 22:36:39 -0000 1.64 @@ -7,7 +7,6 @@ License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz -Patch: libsemanage-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} @@ -40,7 +39,6 @@ %prep %setup -q -%patch -p 1 -b .rhat %build make clean From fedora-cvs-commits at redhat.com Fri Jan 13 22:58:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 17:58:22 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.131, 1.132 config-powerpc-generic, 1.11, 1.12 Message-ID: <200601132258.k0DMwMYM002125@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv2107/configs Modified Files: config-generic config-powerpc-generic Log Message: This is a ppc specific build failure. Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- config-generic 13 Jan 2006 00:40:12 -0000 1.131 +++ config-generic 13 Jan 2006 22:58:19 -0000 1.132 @@ -2022,10 +2022,7 @@ # CONFIG_USB_MOUSE is not set CONFIG_USB_AIPTEK=m -# WACOM disabled 2006-01-10 dwmw2: -# drivers/usb/input/wacom.c:98: error: redeclaration of enumerator ???G4??? -# include/asm/cputable.h:37: error: previous definition of ???G4??? was here -# CONFIG_USB_WACOM is not set +CONFIG_USB_WACOM=m CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- config-powerpc-generic 11 Jan 2006 00:19:04 -0000 1.11 +++ config-powerpc-generic 13 Jan 2006 22:58:19 -0000 1.12 @@ -79,3 +79,9 @@ # CONFIG_ATM_AMBASSADOR is not set # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_BUSLOGIC is not set + +# WACOM disabled 2006-01-10 dwmw2: +# drivers/usb/input/wacom.c:98: error: redeclaration of enumerator ???G4??? +# include/asm/cputable.h:37: error: previous definition of ???G4??? was here +# CONFIG_USB_WACOM is not set + From fedora-cvs-commits at redhat.com Fri Jan 13 23:24:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 18:24:39 -0500 Subject: rpms/gnome-volume-manager/devel .cvsignore, 1.15, 1.16 gnome-volume-manager.spec, 1.27, 1.28 sources, 1.15, 1.16 Message-ID: <200601132324.k0DNOdu4021926@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-volume-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21834 Modified Files: .cvsignore gnome-volume-manager.spec sources Log Message: 1.5.9 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 21 Dec 2005 03:51:55 -0000 1.15 +++ .cvsignore 13 Jan 2006 23:24:36 -0000 1.16 @@ -10,3 +10,4 @@ gnome-volume-manager-1.5.4.tar.bz2 gnome-volume-manager-1.5.5.tar.bz2 gnome-volume-manager-1.5.7.tar.bz2 +gnome-volume-manager-1.5.9.tar.bz2 Index: gnome-volume-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gnome-volume-manager.spec 5 Jan 2006 01:58:47 -0000 1.27 +++ gnome-volume-manager.spec 13 Jan 2006 23:24:36 -0000 1.28 @@ -1,7 +1,7 @@ Summary: The GNOME Volume Manager Name: gnome-volume-manager -Version: 1.5.7 -Release: 2 +Version: 1.5.9 +Release: 1 License: GPL Group: Applications/System Source0: gnome-volume-manager-%{version}.tar.bz2 @@ -11,10 +11,6 @@ Source4: cdda-url-handler.schemas Patch0: gnome-volume-manager-0.9.10.add-to-base.patch Patch1: gnome-volume-manager-1.5.1.rh-defaults.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=320997 -Patch2: gnome-volume-manager-1.5.3-spew.patch -#send upstream -Patch3: gnome-volume-manager-1.5.7-array-pointer-fix.patch BuildRoot: /var/tmp/%{name}-root BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.60 BuildPrereq: hal-devel >= 0.5.0 @@ -43,8 +39,6 @@ %setup -q %patch0 -p1 -b .add-to-base %patch1 -p1 -b .rh-defaults -%patch2 -p1 -b .spew -%patch3 -p1 -b .array-pointer-fix %build %configure make @@ -81,6 +75,9 @@ %{_libexecdir}/gnome-cdda-handler %changelog +* Fri Jan 13 2006 Matthias Clasen - 1.5.9-1 +- Update to 1.5.9 + * Wed Jan 04 2006 John (J5) Palmieri - 1.5.7-2 - Added a patch to fix an array being passed to dbus Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 21 Dec 2005 03:51:55 -0000 1.15 +++ sources 13 Jan 2006 23:24:36 -0000 1.16 @@ -1 +1 @@ -bf8f353d39bffdf8364aea408bf6c823 gnome-volume-manager-1.5.7.tar.bz2 +bc16973d9870da8055c0299d3be9c08d gnome-volume-manager-1.5.9.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 13 23:35:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 18:35:14 -0500 Subject: rpms/elfutils/devel .cvsignore,1.25,1.26 sources,1.26,1.27 Message-ID: <200601132335.k0DNZEZt025188@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/elfutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25168 Modified Files: .cvsignore sources Log Message: New upstream tarball Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/elfutils/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 7 Dec 2005 20:00:43 -0000 1.25 +++ .cvsignore 13 Jan 2006 23:35:10 -0000 1.26 @@ -1 +1 @@ -elfutils-0.118.tar.gz +elfutils-0.119.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/elfutils/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 7 Dec 2005 20:00:59 -0000 1.26 +++ sources 13 Jan 2006 23:35:10 -0000 1.27 @@ -1 +1 @@ -fb8ea485fca0032cc4b4c8fd634b6f46 elfutils-0.118.tar.gz +57b9e4ab3b9fb597a72badf26f7f9bdc elfutils-0.119.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 13 23:43:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 18:43:27 -0500 Subject: rpms/elfutils/devel elfutils-portability.patch, 1.19, 1.20 elfutils.spec, 1.56, 1.57 Message-ID: <200601132343.k0DNhR2i027834@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/elfutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27806 Modified Files: elfutils-portability.patch elfutils.spec Log Message: New version 0.119 elfutils-portability.patch: ChangeLog | 15 ++++++++ Makefile.in | 2 + backends/ChangeLog | 8 ++++ backends/Makefile.am | 6 ++- backends/Makefile.in | 8 ++-- config/Makefile.in | 2 + configure | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 28 +++++++++++++++ lib/ChangeLog | 5 ++ lib/Makefile.am | 3 + lib/Makefile.in | 6 ++- libasm/ChangeLog | 5 ++ libasm/Makefile.am | 3 + libasm/Makefile.in | 6 ++- libcpu/ChangeLog | 5 ++ libcpu/Makefile.am | 3 + libcpu/Makefile.in | 4 +- libdw/ChangeLog | 5 ++ libdw/Makefile.am | 3 + libdw/Makefile.in | 7 ++- libdwfl/ChangeLog | 5 ++ libdwfl/Makefile.am | 3 + libdwfl/Makefile.in | 6 ++- libebl/ChangeLog | 5 ++ libebl/Makefile.am | 3 + libebl/Makefile.in | 6 ++- libelf/ChangeLog | 5 ++ libelf/Makefile.am | 6 ++- libelf/Makefile.in | 8 ++-- libelf/common.h | 4 +- m4/Makefile.in | 2 + src/ChangeLog | 5 ++ src/Makefile.am | 3 + src/Makefile.in | 6 ++- src/findtextrel.c | 6 ++- src/strip.c | 20 ++++++++++- tests/ChangeLog | 5 ++ tests/Makefile.am | 5 +- tests/Makefile.in | 6 ++- 39 files changed, 284 insertions(+), 39 deletions(-) Index: elfutils-portability.patch =================================================================== RCS file: /cvs/dist/rpms/elfutils/devel/elfutils-portability.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- elfutils-portability.patch 7 Dec 2005 20:11:06 -0000 1.19 +++ elfutils-portability.patch 13 Jan 2006 23:43:23 -0000 1.20 @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -19,6 +19,11 @@ +@@ -38,6 +38,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -12,7 +12,7 @@ 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. -@@ -41,6 +46,9 @@ +@@ -60,6 +65,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -51,7 +51,7 @@ libebl_%.map: Makefile --- elfutils/backends/Makefile.in +++ elfutils/backends/Makefile.in -@@ -159,6 +159,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -160,6 +160,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -59,7 +59,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -194,6 +195,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ +@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -67,7 +67,7 @@ XGETTEXT = @XGETTEXT@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ -@@ -236,9 +238,9 @@ sharedstatedir = @sharedstatedir@ +@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @@ -79,7 +79,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \ -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ -I$(top_srcdir)/lib -I.. -@@ -594,7 +596,7 @@ uninstall-am: uninstall-info-am +@@ -597,7 +599,7 @@ uninstall-am: uninstall-info-am libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw) $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ -Wl,--version-script,$(word 2,$^) \ @@ -136,7 +136,7 @@ ac_ct_CC = @ac_ct_CC@ --- elfutils/configure +++ elfutils/configure -@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.118' +@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.119' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/' ac_unique_file="libelf/libelf.h" @@ -458,7 +458,7 @@ libcpu_i386_a_SOURCES = i386_dis.c --- elfutils/libdw/ChangeLog +++ elfutils/libdw/ChangeLog -@@ -251,6 +251,11 @@ +@@ -266,6 +266,11 @@ 2005-05-31 Roland McGrath @@ -522,7 +522,7 @@ $(COMPILE))) --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -245,6 +245,11 @@ +@@ -259,6 +259,11 @@ 2005-07-21 Roland McGrath @@ -644,7 +644,7 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -103,6 +103,11 @@ +@@ -113,6 +113,11 @@ If section content hasn't been read yet, do it before looking for the block size. If no section data present, infer size of section header. @@ -909,7 +909,7 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -316,6 +316,11 @@ +@@ -349,6 +349,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. Index: elfutils.spec =================================================================== RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- elfutils.spec 9 Dec 2005 22:40:18 -0000 1.56 +++ elfutils.spec 13 Jan 2006 23:43:23 -0000 1.57 @@ -1,5 +1,5 @@ -%define version 0.118 -%define release 1.1 +%define version 0.119 +%define release 1 %define gpl 0 %if %{?_with_compat:1}%{!?_with_compat:0} @@ -247,6 +247,9 @@ %{_libdir}/libelf.so %changelog +* Fri Jan 13 2006 Roland McGrath - 0.119-1 +- update to 0.119 + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Sat Jan 14 00:02:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 19:02:49 -0500 Subject: rpms/elfutils/devel elfutils.spec,1.57,1.58 Message-ID: <200601140002.k0E02mKn013790@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/elfutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13750 Modified Files: elfutils.spec Log Message: Fix bonehead way release was changed by rel-eng. Index: elfutils.spec =================================================================== RCS file: /cvs/dist/rpms/elfutils/devel/elfutils.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- elfutils.spec 13 Jan 2006 23:43:23 -0000 1.57 +++ elfutils.spec 14 Jan 2006 00:02:42 -0000 1.58 @@ -12,9 +12,9 @@ Name: elfutils Version: %{version} %if !%{compat} -Release: %{release}.1 +Release: %{release} %else -Release: 0.%{release}.1 +Release: 0.%{release} %endif %if %{gpl} License: GPL From fedora-cvs-commits at redhat.com Sat Jan 14 00:03:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 19:03:04 -0500 Subject: rpms/gnome-session/devel .cvsignore, 1.15, 1.16 gnome-session.spec, 1.47, 1.48 sources, 1.15, 1.16 Message-ID: <200601140003.k0E034kO013827@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13780 Modified Files: .cvsignore gnome-session.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 8 Sep 2005 14:40:23 -0000 1.15 +++ .cvsignore 14 Jan 2006 00:02:50 -0000 1.16 @@ -1,2 +1,3 @@ gnome-session-2.11.91.tar.bz2 gnome-session-2.12.0.tar.bz2 +gnome-session-2.13.4.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gnome-session.spec 12 Jan 2006 07:34:40 -0000 1.47 +++ gnome-session.spec 14 Jan 2006 00:02:50 -0000 1.48 @@ -12,8 +12,8 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.12.0 -Release: 6 +Version: 2.13.4 +Release: 1 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -148,6 +148,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Fri Jan 13 2006 Matthias Clasen - 2.13.4-1 +- Update to 2.13.4 + * Thu Jan 12 2006 Ray Strode - 2.12.0-6 - Fix screen corruption around splash screen shape (bug 177502) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 8 Sep 2005 14:40:23 -0000 1.15 +++ sources 14 Jan 2006 00:02:50 -0000 1.16 @@ -1 +1 @@ -835e9340d23e139430224b931ff4c597 gnome-session-2.12.0.tar.bz2 +d303bc5faf4d244dde483691727fcbe1 gnome-session-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 14 00:18:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 19:18:26 -0500 Subject: rpms/kernel/devel linux-2.6-chrp-build.patch, NONE, 1.1 kernel-2.6.spec, 1.1852, 1.1853 Message-ID: <200601140018.k0E0IQ8k027750@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27543 Modified Files: kernel-2.6.spec Added Files: linux-2.6-chrp-build.patch Log Message: Fix CHRP linux-2.6-chrp-build.patch: arch/powerpc/platforms/chrp/pci.c | 27 +++++++++++++++++---------- arch/powerpc/platforms/chrp/setup.c | 7 ++++--- arch/powerpc/platforms/chrp/time.c | 7 +++++-- drivers/macintosh/macio-adb.c | 13 ++++++++----- 4 files changed, 34 insertions(+), 20 deletions(-) --- NEW FILE linux-2.6-chrp-build.patch --- --- linux/arch/powerpc/platforms/chrp/setup.c~ 2006-01-13 15:26:41.000000000 +0000 +++ linux/arch/powerpc/platforms/chrp/setup.c 2006-01-13 23:44:29.000000000 +0000 @@ -352,9 +352,10 @@ static void __init chrp_find_openpic(voi opaddr = opprop[na-1]; /* assume 32-bit */ oplen /= na * sizeof(unsigned int); } else { - if (np->n_addrs == 0) + struct resource r; + if (of_address_to_resource(np, 0, &r)) return; - opaddr = np->addrs[0].address; + opaddr = r.start; oplen = 0; } @@ -377,7 +378,7 @@ static void __init chrp_find_openpic(voi */ if (oplen < len) { printk(KERN_ERR "Insufficient addresses for distributed" - " OpenPIC (%d < %d)\n", np->n_addrs, len); + " OpenPIC (%d < %d)\n", oplen, len); len = oplen; } --- linux/arch/powerpc/platforms/chrp/time.c~ 2006-01-03 03:21:10.000000000 +0000 +++ linux/arch/powerpc/platforms/chrp/time.c 2006-01-13 23:54:44.000000000 +0000 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -37,14 +38,16 @@ static int nvram_data = NVRAM_DATA; long __init chrp_time_init(void) { struct device_node *rtcs; + struct resource r; int base; rtcs = find_compatible_devices("rtc", "pnpPNP,b00"); if (rtcs == NULL) rtcs = find_compatible_devices("rtc", "ds1385-rtc"); - if (rtcs == NULL || rtcs->addrs == NULL) + if (rtcs == NULL || of_address_to_resource(rtcs, 0, &r)) return 0; - base = rtcs->addrs[0].address; + + base = r.start; nvram_as1 = 0; nvram_as0 = base; nvram_data = base + 1; --- linux/arch/powerpc/platforms/chrp/pci.c~ 2006-01-03 03:21:10.000000000 +0000 +++ linux/arch/powerpc/platforms/chrp/pci.c 2006-01-14 00:03:36.000000000 +0000 @@ -135,12 +135,13 @@ int __init hydra_init(void) { struct device_node *np; + struct resource r; np = find_devices("mac-io"); - if (np == NULL || np->n_addrs == 0) + if (np == NULL || of_address_to_resource(np, 0, &r)) return 0; - Hydra = ioremap(np->addrs[0].address, np->addrs[0].size); - printk("Hydra Mac I/O at %lx\n", np->addrs[0].address); + Hydra = ioremap(r.start, r.end-r.start); + printk("Hydra Mac I/O at %lx\n", r.start); printk("Hydra Feature_Control was %x", in_le32(&Hydra->Feature_Control)); out_le32(&Hydra->Feature_Control, (HYDRA_FC_SCC_CELL_EN | @@ -177,18 +178,24 @@ setup_python(struct pci_controller *hose { u32 __iomem *reg; u32 val; - unsigned long addr = dev->addrs[0].address; + struct resource r; - setup_indirect_pci(hose, addr + 0xf8000, addr + 0xf8010); + if (of_address_to_resource(dev, 0, &r)) { + printk(KERN_ERR "No address for Python PCI controller\n"); + return; + } /* Clear the magic go-slow bit */ - reg = ioremap(dev->addrs[0].address + 0xf6000, 0x40); + reg = ioremap(r.start + 0xf6000, 0x40); + BUG_ON(!reg); val = in_be32(®[12]); if (val & PRG_CL_RESET_VALID) { out_be32(®[12], val & ~PRG_CL_RESET_VALID); in_be32(®[12]); } iounmap(reg); + + setup_indirect_pci(hose, r.start + 0xf8000, r.start + 0xf8010); } /* Marvell Discovery II based Pegasos 2 */ @@ -218,7 +225,7 @@ chrp_find_bridges(void) char *model, *machine; int is_longtrail = 0, is_mot = 0, is_pegasos = 0; struct device_node *root = find_path_device("/"); - + struct resource r; /* * The PCI host bridge nodes on some machines don't have * properties to adequately identify them, so we have to @@ -238,7 +245,7 @@ chrp_find_bridges(void) continue; ++index; /* The GG2 bridge on the LongTrail doesn't have an address */ - if (dev->n_addrs < 1 && !is_longtrail) { + if (of_address_to_resource(dev, 0, &r) && !is_longtrail) { printk(KERN_WARNING "Can't use %s: no address\n", dev->full_name); continue; @@ -255,8 +262,8 @@ chrp_find_bridges(void) printk(KERN_INFO "PCI buses %d..%d", bus_range[0], bus_range[1]); printk(" controlled by %s", dev->type); - if (dev->n_addrs > 0) - printk(" at %lx", dev->addrs[0].address); + if (!is_longtrail) + printk(" at %lx", r.start); printk("\n"); hose = pcibios_alloc_controller(); --- linux/drivers/macintosh/macio-adb.c~ 2006-01-03 03:21:10.000000000 +0000 +++ linux/drivers/macintosh/macio-adb.c 2006-01-14 00:13:43.000000000 +0000 @@ -17,6 +17,7 @@ #include #include #include +#include struct preg { unsigned char r; @@ -88,24 +89,26 @@ int macio_probe(void) int macio_init(void) { struct device_node *adbs; + struct resource r; adbs = find_compatible_devices("adb", "chrp,adb0"); if (adbs == 0) return -ENXIO; #if 0 - { int i; + { int i = 0; printk("macio_adb_init: node = %p, addrs =", adbs->node); - for (i = 0; i < adbs->n_addrs; ++i) - printk(" %x(%x)", adbs->addrs[i].address, adbs->addrs[i].size); + while(!of_address_to_resource(adbs, i, &r)) + printk(" %x(%x)", r.start, r.end - r.start); printk(", intrs ="); for (i = 0; i < adbs->n_intrs; ++i) printk(" %x", adbs->intrs[i].line); printk("\n"); } #endif - - adb = ioremap(adbs->addrs->address, sizeof(struct adb_regs)); + if (of_address_to_resource(adbs, 0, &r)) + return -ENXIO; + adb = ioremap(r.start, sizeof(struct adb_regs)); out_8(&adb->ctrl.r, 0); out_8(&adb->intr.r, 0); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1852 retrieving revision 1.1853 diff -u -r1.1852 -r1.1853 --- kernel-2.6.spec 13 Jan 2006 15:50:35 -0000 1.1852 +++ kernel-2.6.spec 14 Jan 2006 00:18:19 -0000 1.1853 @@ -225,6 +225,7 @@ # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch Patch301: linux-2.6.15-cell-numa-init.patch +Patch302: linux-2.6-chrp-build.patch Patch304: linux-2.6.15-mv643xx-fixes.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch @@ -628,6 +629,8 @@ %patch300 -p1 # Arnd says don't call cell_spumem_init() till he fixes it. %patch301 -p1 +# Make CHRP build again +%patch302 -p1 # Fix the MV643xx Gigabit Ethernet driver %patch304 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. @@ -1359,6 +1362,9 @@ %endif %changelog +* Sat Jan 14 2006 David Woodhouse +- Make CHRP build again + * Fri Jan 13 2006 David Woodhouse - Update softmac and add WPA support to bcm43xx driver - 2.6.15-git9 From fedora-cvs-commits at redhat.com Sat Jan 14 00:18:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 19:18:26 -0500 Subject: rpms/kernel/devel/configs config-powerpc32-generic,1.9,1.10 Message-ID: <200601140018.k0E0IQid027771@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv27543/configs Modified Files: config-powerpc32-generic Log Message: Fix CHRP Index: config-powerpc32-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc32-generic,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- config-powerpc32-generic 12 Jan 2006 01:56:27 -0000 1.9 +++ config-powerpc32-generic 14 Jan 2006 00:18:21 -0000 1.10 @@ -7,7 +7,7 @@ CONFIG_CLASSIC32=y CONFIG_CPU_FREQ_PMAC=y CONFIG_PPC_MULTIPLATFORM=y -# CONFIG_PPC_CHRP is not set +CONFIG_PPC_CHRP=y CONFIG_PPC_PMAC=y # CONFIG_PPC_PREP is not set From fedora-cvs-commits at redhat.com Sat Jan 14 00:40:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 19:40:15 -0500 Subject: rpms/gnome-session/devel gnome-session.spec,1.48,1.49 Message-ID: <200601140040.k0E0eF72003857@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3743 Modified Files: gnome-session.spec Log Message: Intltoolize acts up Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- gnome-session.spec 14 Jan 2006 00:02:50 -0000 1.48 +++ gnome-session.spec 14 Jan 2006 00:40:01 -0000 1.49 @@ -85,6 +85,7 @@ aclocal automake +intltoolize --force autoheader autoconf From fedora-cvs-commits at redhat.com Sat Jan 14 03:35:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 22:35:22 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.106,1.107 Message-ID: <200601140335.k0E3ZMqj015160@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15049 Modified Files: gtk2.spec Log Message: Run make check Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- gtk2.spec 12 Jan 2006 13:18:52 -0000 1.106 +++ gtk2.spec 14 Jan 2006 03:35:13 -0000 1.107 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. Name: gtk2 Version: %{base_version} -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 @@ -118,6 +118,7 @@ ## smp_mflags doesn't work for now due to gdk-pixbuf.loaders, may be fixed ## past gtk 2.1.2 make ## %{?_smp_mflags} +make check %install rm -rf $RPM_BUILD_ROOT @@ -256,6 +257,9 @@ %doc tmpdocs/examples %changelog +* Fri Jan 13 2006 Matthias Clasen 2.8.10-2 +- Run make check + * Thu Jan 12 2006 Matthias Clasen 2.8.10-1 - Update to 2.8.10 From fedora-cvs-commits at redhat.com Sat Jan 14 03:51:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 22:51:34 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.93, 1.94 policycoreutils.spec, 1.213, 1.214 sources, 1.97, 1.98 Message-ID: <200601140351.k0E3pYPd021863@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21850 Modified Files: .cvsignore policycoreutils.spec sources Log Message: * Fri Jan 13 2006 Dan Walsh 1.29.7-1 - Update to match NSA * Merged newrole cleanup patch from Steve Grubb. * Merged setfiles/restorecon performance patch from Russell Coker. * Merged genhomedircon and semanage patches from Dan Walsh. * Merged remove add_local/set_local patch from Ivan Gyurdiev. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- .cvsignore 5 Jan 2006 21:39:11 -0000 1.93 +++ .cvsignore 14 Jan 2006 03:51:29 -0000 1.94 @@ -79,3 +79,4 @@ policycoreutils-1.29.3.tgz policycoreutils-1.29.4.tgz policycoreutils-1.29.5.tgz +policycoreutils-1.29.7.tgz Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- policycoreutils.spec 10 Jan 2006 19:13:15 -0000 1.213 +++ policycoreutils.spec 14 Jan 2006 03:51:29 -0000 1.214 @@ -1,14 +1,14 @@ -%define libsepolver 1.11.5-1 -%define libsemanagever 1.5.8-1 -%define libselinuxver 1.29.3-2 +%define libsepolver 1.11.9-1 +%define libsemanagever 1.5.14-1 +%define libselinuxver 1.29.5-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.29.5 -Release: 3 +Version: 1.29.7 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz -Patch: policycoreutils-rhat.patch +#Patch: policycoreutils-rhat.patch BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} PreReq: /bin/mount /bin/egrep /bin/awk /usr/bin/diff @@ -34,7 +34,7 @@ %prep %setup -q -%patch -p1 -b .rhat +#%patch -p1 -b .rhat %build make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all @@ -97,6 +97,13 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Fri Jan 13 2006 Dan Walsh 1.29.7-1 +- Update to match NSA + * Merged newrole cleanup patch from Steve Grubb. + * Merged setfiles/restorecon performance patch from Russell Coker. + * Merged genhomedircon and semanage patches from Dan Walsh. + * Merged remove add_local/set_local patch from Ivan Gyurdiev. + * Tue Jan 10 2006 Dan Walsh 1.29.5-3 - Fixes for mls policy Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- sources 5 Jan 2006 21:39:11 -0000 1.97 +++ sources 14 Jan 2006 03:51:29 -0000 1.98 @@ -1 +1 @@ -da2c70fed32e21137b61f23da7a459f5 policycoreutils-1.29.5.tgz +4bd38ec2ccaf8cc047dfdcb30876b9fb policycoreutils-1.29.7.tgz From fedora-cvs-commits at redhat.com Sat Jan 14 04:09:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 23:09:31 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch,1.11,1.12 Message-ID: <200601140409.k0E49UtP022009@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21999 Modified Files: policy-20060104.patch Log Message: * Fri Jan 13 2006 Dan Walsh 2.1.10-1 - Update to upstream policy-20060104.patch: Makefile | 2 - policy/modules/admin/kudzu.te | 1 policy/modules/admin/readahead.te | 2 + policy/modules/apps/java.fc | 2 + policy/modules/apps/wine.fc | 2 + policy/modules/apps/wine.if | 23 ++++++++++++++++ policy/modules/apps/wine.te | 27 ++++++++++++++++++ policy/modules/kernel/devices.if | 16 +++++++++++ policy/modules/kernel/mls.te | 2 + policy/modules/services/apache.te | 5 +++ policy/modules/services/apm.te | 1 policy/modules/services/automount.te | 1 policy/modules/services/bind.if | 19 +++++++++++++ policy/modules/services/cron.te | 2 - policy/modules/services/cups.te | 6 +--- policy/modules/services/dovecot.te | 1 policy/modules/services/hal.te | 12 +++++++- policy/modules/services/locate.fc | 4 ++ policy/modules/services/locate.if | 1 policy/modules/services/locate.te | 50 +++++++++++++++++++++++++++++++++++ policy/modules/services/sendmail.te | 2 + policy/modules/system/authlogin.if | 13 +++++++++ policy/modules/system/authlogin.te | 12 ++------ policy/modules/system/hostname.te | 29 -------------------- policy/modules/system/init.te | 1 policy/modules/system/lvm.te | 8 ----- policy/modules/system/mount.te | 3 +- policy/modules/system/selinuxutil.te | 1 policy/modules/system/unconfined.if | 1 policy/modules/system/userdomain.if | 1 policy/users | 8 +++-- 31 files changed, 203 insertions(+), 55 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- policy-20060104.patch 13 Jan 2006 22:32:06 -0000 1.11 +++ policy-20060104.patch 14 Jan 2006 04:09:22 -0000 1.12 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.10/Makefile --- nsaserefpolicy/Makefile 2006-01-13 09:48:25.000000000 -0500 -+++ serefpolicy-2.1.10/Makefile 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/Makefile 2006-01-13 17:12:12.000000000 -0500 @@ -92,7 +92,7 @@ # enable MLS if requested. @@ -11,8 +11,8 @@ override CHECKMODULE += -M endif diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.1.10/policy/modules/admin/kudzu.te ---- nsaserefpolicy/policy/modules/admin/kudzu.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/admin/kudzu.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/kudzu.te 2006-01-13 17:06:02.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/admin/kudzu.te 2006-01-13 17:12:12.000000000 -0500 @@ -63,6 +63,7 @@ fs_write_ramfs_socket(kudzu_t) @@ -22,8 +22,8 @@ modutils_read_mods_deps(kudzu_t) modutils_read_module_conf(kudzu_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.1.10/policy/modules/admin/readahead.te ---- nsaserefpolicy/policy/modules/admin/readahead.te 2006-01-13 09:48:26.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/admin/readahead.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/admin/readahead.te 2006-01-13 17:06:02.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/admin/readahead.te 2006-01-13 17:12:12.000000000 -0500 @@ -35,6 +35,7 @@ dev_getattr_all_chr_files(readahead_t) dev_getattr_all_blk_files(readahead_t) @@ -42,9 +42,8 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.1.10/policy/modules/apps/java.fc --- nsaserefpolicy/policy/modules/apps/java.fc 2006-01-12 18:28:45.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/apps/java.fc 2006-01-13 16:52:58.000000000 -0500 -@@ -1,4 +1,6 @@ - # ++++ serefpolicy-2.1.10/policy/modules/apps/java.fc 2006-01-13 17:12:12.000000000 -0500 +@@ -2,3 +2,5 @@ # /usr # /usr(/.*)?/bin/java.* -- gen_context(system_u:object_r:java_exec_t,s0) @@ -52,13 +51,13 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.10/policy/modules/apps/wine.fc --- nsaserefpolicy/policy/modules/apps/wine.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/apps/wine.fc 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/apps/wine.fc 2006-01-13 17:12:12.000000000 -0500 @@ -0,0 +1,2 @@ +/usr/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.10/policy/modules/apps/wine.if --- nsaserefpolicy/policy/modules/apps/wine.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/apps/wine.if 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/apps/wine.if 2006-01-13 17:12:12.000000000 -0500 @@ -0,0 +1,23 @@ +## Load keyboard mappings. + @@ -85,7 +84,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.10/policy/modules/apps/wine.te --- nsaserefpolicy/policy/modules/apps/wine.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/apps/wine.te 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/apps/wine.te 2006-01-13 17:12:12.000000000 -0500 @@ -0,0 +1,27 @@ +policy_module(wine,1.0.0) + @@ -115,8 +114,8 @@ + +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.1.10/policy/modules/kernel/devices.if ---- nsaserefpolicy/policy/modules/kernel/devices.if 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/kernel/devices.if 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/kernel/devices.if 2006-01-13 17:06:03.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/kernel/devices.if 2006-01-13 17:12:12.000000000 -0500 @@ -2248,3 +2248,19 @@ typeattribute $1 memory_raw_write, memory_raw_read; ') @@ -139,7 +138,7 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.10/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/kernel/mls.te 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/kernel/mls.te 2006-01-13 17:12:12.000000000 -0500 @@ -82,9 +82,11 @@ # these might be targeted_policy only range_transition unconfined_t su_exec_t s0 - s0:c0.c255; @@ -153,8 +152,8 @@ +range_transition initrc_t auditd_exec_t s15:c0.c255; ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.1.10/policy/modules/services/apache.te ---- nsaserefpolicy/policy/modules/services/apache.te 2006-01-13 09:48:26.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/apache.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/apache.te 2006-01-13 17:06:04.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/apache.te 2006-01-13 17:12:12.000000000 -0500 @@ -689,3 +689,8 @@ optional_policy(`nscd',` nscd_use_socket(httpd_unconfined_script_t) @@ -165,8 +164,8 @@ +') + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.1.10/policy/modules/services/apm.te ---- nsaserefpolicy/policy/modules/services/apm.te 2005-12-09 23:35:05.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/apm.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/apm.te 2006-01-13 17:06:04.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/apm.te 2006-01-13 17:12:12.000000000 -0500 @@ -196,6 +196,7 @@ ') @@ -176,8 +175,8 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.1.10/policy/modules/services/automount.te ---- nsaserefpolicy/policy/modules/services/automount.te 2006-01-13 09:48:26.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/automount.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/automount.te 2006-01-13 17:06:04.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/automount.te 2006-01-13 17:12:12.000000000 -0500 @@ -108,6 +108,7 @@ fs_manage_auto_mountpoints(automount_t) @@ -186,9 +185,35 @@ init_use_fd(automount_t) init_use_script_pty(automount_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-2.1.10/policy/modules/services/bind.if +--- nsaserefpolicy/policy/modules/services/bind.if 2006-01-13 09:48:26.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/bind.if 2006-01-13 23:04:39.000000000 -0500 +@@ -225,3 +225,22 @@ + allow $1 named_zone_t:file r_file_perms; + ') + ++######################################## ++## ++## Read BIND search for mount points ++## ++## ++## Domain allowed access. ++## ++# ++interface(`bind_search_mounts',` ++ gen_require(` ++ type named_zone_t; ++ type named_conf_t; ++ ') ++ ++ files_search_var($1) ++ allow $1 named_zone_t:dir search_dir_perms; ++ allow $1 named_conf_t:dir search_dir_perms; ++') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.1.10/policy/modules/services/cron.te ---- nsaserefpolicy/policy/modules/services/cron.te 2006-01-13 09:48:27.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/cron.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/cron.te 2006-01-13 17:06:04.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/cron.te 2006-01-13 17:12:12.000000000 -0500 @@ -120,7 +120,7 @@ init_use_fd(crond_t) @@ -199,8 +224,8 @@ libs_use_ld_so(crond_t) libs_use_shared_libs(crond_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.1.10/policy/modules/services/cups.te ---- nsaserefpolicy/policy/modules/services/cups.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/cups.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/cups.te 2006-01-13 17:06:04.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/cups.te 2006-01-13 17:12:12.000000000 -0500 @@ -201,8 +201,7 @@ ') @@ -222,8 +247,8 @@ optional_policy(`dbus',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.10/policy/modules/services/dovecot.te ---- nsaserefpolicy/policy/modules/services/dovecot.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/dovecot.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/dovecot.te 2006-01-13 17:06:05.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/dovecot.te 2006-01-13 17:12:12.000000000 -0500 @@ -95,6 +95,7 @@ files_read_etc_files(dovecot_t) files_search_spool(dovecot_t) @@ -233,8 +258,8 @@ init_use_fd(dovecot_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.10/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2006-01-13 09:48:27.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/hal.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/hal.te 2006-01-13 17:06:05.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/hal.te 2006-01-13 17:12:12.000000000 -0500 @@ -48,8 +48,13 @@ kernel_read_network_state(hald_t) kernel_read_kernel_sysctl(hald_t) @@ -277,7 +302,7 @@ +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.fc serefpolicy-2.1.10/policy/modules/services/locate.fc --- nsaserefpolicy/policy/modules/services/locate.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/locate.fc 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/locate.fc 2006-01-13 17:12:12.000000000 -0500 @@ -0,0 +1,4 @@ +# locate - file locater +/usr/bin/updatedb -- gen_context(system_u:object_r:locate_exec_t, s0) @@ -285,12 +310,12 @@ + diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.if serefpolicy-2.1.10/policy/modules/services/locate.if --- nsaserefpolicy/policy/modules/services/locate.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/locate.if 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/locate.if 2006-01-13 17:12:12.000000000 -0500 @@ -0,0 +1 @@ +## Update database for mlocate diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.te serefpolicy-2.1.10/policy/modules/services/locate.te --- nsaserefpolicy/policy/modules/services/locate.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/locate.te 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/locate.te 2006-01-13 17:12:12.000000000 -0500 @@ -0,0 +1,50 @@ +policy_module(locate,1.0.0) + @@ -343,8 +368,8 @@ + allow system_crond_t locate_log_t:file { create append getattr }; +') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.1.10/policy/modules/services/sendmail.te ---- nsaserefpolicy/policy/modules/services/sendmail.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/sendmail.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/services/sendmail.te 2006-01-13 17:06:07.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/services/sendmail.te 2006-01-13 17:12:12.000000000 -0500 @@ -17,6 +17,7 @@ type sendmail_t; @@ -361,9 +386,29 @@ dev_read_urand(sendmail_t) dev_read_sysfs(sendmail_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.1.10/policy/modules/system/authlogin.if +--- nsaserefpolicy/policy/modules/system/authlogin.if 2006-01-13 17:06:08.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/authlogin.if 2006-01-13 23:07:17.000000000 -0500 +@@ -1075,3 +1075,16 @@ + typeattribute $1 can_write_shadow_passwords; + typeattribute $1 can_relabelto_shadow_passwords; + ') ++####################################### ++# ++# auth_setattr_login_records(domain) ++# ++interface(`auth_setattr_login_records',` ++ gen_require(` ++ type wtmp_t; ++ class file setattr; ++ ') ++ ++ allow $1 wtmp_t:file setattr; ++ logging_search_logs($1) ++') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.1.10/policy/modules/system/authlogin.te ---- nsaserefpolicy/policy/modules/system/authlogin.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/authlogin.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/authlogin.te 2006-01-13 17:06:08.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/authlogin.te 2006-01-13 17:12:12.000000000 -0500 @@ -129,14 +129,6 @@ nscd_use_socket(pam_t) ') @@ -392,7 +437,7 @@ term_dontaudit_use_generic_pty(pam_console_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.1.10/policy/modules/system/hostname.te --- nsaserefpolicy/policy/modules/system/hostname.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/hostname.te 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/hostname.te 2006-01-13 17:12:12.000000000 -0500 @@ -55,35 +55,6 @@ sysnet_read_config(hostname_t) sysnet_dns_name_resolve(hostname_t) @@ -430,8 +475,8 @@ - udev_read_db(hostname_t) -') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.1.10/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2006-01-13 09:48:27.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/init.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/init.te 2006-01-13 17:06:08.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/init.te 2006-01-13 17:12:12.000000000 -0500 @@ -298,6 +298,7 @@ term_reset_tty_labels(initrc_t) @@ -441,8 +486,8 @@ auth_read_pam_pid(initrc_t) auth_delete_pam_pid(initrc_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.1.10/policy/modules/system/lvm.te ---- nsaserefpolicy/policy/modules/system/lvm.te 2005-12-09 23:35:08.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/lvm.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/lvm.te 2006-01-13 17:06:08.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/lvm.te 2006-01-13 17:12:12.000000000 -0500 @@ -209,6 +209,7 @@ storage_manage_fixed_disk(lvm_t) @@ -463,8 +508,8 @@ -dontaudit lvm_t xconsole_device_t:fifo_file getattr; -') dnl end TODO diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.1.10/policy/modules/system/mount.te ---- nsaserefpolicy/policy/modules/system/mount.te 2005-12-12 23:05:35.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/mount.te 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/mount.te 2006-01-13 17:06:08.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/mount.te 2006-01-13 17:12:12.000000000 -0500 @@ -32,6 +32,7 @@ dev_getattr_all_blk_files(mount_t) @@ -484,7 +529,7 @@ corecmd_exec_sbin(mount_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.10/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/selinuxutil.te 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/selinuxutil.te 2006-01-13 17:12:12.000000000 -0500 @@ -414,6 +414,7 @@ allow run_init_t self:capability setuid; allow run_init_t self:fifo_file rw_file_perms; @@ -495,7 +540,7 @@ # by a different user or has restrictive SE permissions, do not want to audit diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.1.10/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2005-12-13 15:51:50.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/unconfined.if 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/unconfined.if 2006-01-13 17:12:12.000000000 -0500 @@ -33,6 +33,7 @@ corenet_unconfined($1) dev_unconfined($1) @@ -505,8 +550,8 @@ fs_unconfined($1) selinux_unconfined($1) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.10/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-13 09:48:27.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/userdomain.if 2006-01-13 16:49:54.000000000 -0500 +--- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-13 17:06:08.000000000 -0500 ++++ serefpolicy-2.1.10/policy/modules/system/userdomain.if 2006-01-13 17:12:12.000000000 -0500 @@ -103,6 +103,7 @@ # execute files in the home directory can_exec($1_t,$1_home_t) @@ -517,7 +562,7 @@ allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto }; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.10/policy/users --- nsaserefpolicy/policy/users 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.10/policy/users 2006-01-13 16:49:54.000000000 -0500 ++++ serefpolicy-2.1.10/policy/users 2006-01-13 17:12:12.000000000 -0500 @@ -26,7 +26,9 @@ ifdef(`targeted_policy',` gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) From fedora-cvs-commits at redhat.com Sat Jan 14 04:17:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 23:17:06 -0500 Subject: rpms/gtk2/devel gtk+-2.8.10-abicheck.patch, NONE, 1.1 gtk2.spec, 1.107, 1.108 Message-ID: <200601140417.k0E4H5Wx030578@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29572 Modified Files: gtk2.spec Added Files: gtk+-2.8.10-abicheck.patch Log Message: Fix abichecking gtk+-2.8.10-abicheck.patch: gdk-pixbuf/abicheck.sh | 2 +- gdk/abicheck.sh | 2 +- gtk/abicheck.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE gtk+-2.8.10-abicheck.patch --- --- gtk+-2.8.10/gdk-pixbuf/abicheck.sh.abicheck 2006-01-13 23:15:12.000000000 -0500 +++ gtk+-2.8.10/gdk-pixbuf/abicheck.sh 2006-01-13 23:15:26.000000000 -0500 @@ -1,5 +1,5 @@ #! /bin/sh cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi -nm -D .libs/libgdk_pixbuf-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi +nm -D -g --defined-only .libs/libgdk_pixbuf-2.0.so | cut -d ' ' -f 3 | sort > actual-abi diff -u expected-abi actual-abi && rm expected-abi actual-abi --- gtk+-2.8.10/gtk/abicheck.sh.abicheck 2006-01-13 23:14:33.000000000 -0500 +++ gtk+-2.8.10/gtk/abicheck.sh 2006-01-13 23:15:00.000000000 -0500 @@ -1,5 +1,5 @@ #! /bin/sh cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi -nm -D .libs/libgtk-x11-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi +nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi diff -u expected-abi actual-abi && rm expected-abi actual-abi --- gtk+-2.8.10/gdk/abicheck.sh.abicheck 2006-01-13 23:15:36.000000000 -0500 +++ gtk+-2.8.10/gdk/abicheck.sh 2006-01-13 23:15:50.000000000 -0500 @@ -1,5 +1,5 @@ #! /bin/sh cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi -nm -D .libs/libgdk-x11-2.0.so | grep " [BDTR] " | cut -d ' ' -f 3 | sort > actual-abi +nm -D -g --defined-only .libs/libgdk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi diff -u expected-abi actual-abi && rm expected-abi actual-abi Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- gtk2.spec 14 Jan 2006 03:35:13 -0000 1.107 +++ gtk2.spec 14 Jan 2006 04:17:01 -0000 1.108 @@ -26,6 +26,7 @@ Patch0: gtk+-2.4.1-lib64.patch # Backported from 2.10 Patch1: gtk+-2.8.6-inputmethod.patch +Patch2: gtk+-2.8.10-abicheck.pach BuildPrereq: atk-devel >= %{atk_version} BuildPrereq: pango-devel >= %{pango_version} @@ -88,6 +89,7 @@ %patch0 -p1 -b .lib64 %patch1 -p1 -b .inputmethod +%patch2 -p1 -b .abicheck for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . From fedora-cvs-commits at redhat.com Sat Jan 14 04:20:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 23:20:40 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.108,1.109 Message-ID: <200601140420.k0E4KeGX001035@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1023 Modified Files: gtk2.spec Log Message: Fix the fix Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- gtk2.spec 14 Jan 2006 04:17:01 -0000 1.108 +++ gtk2.spec 14 Jan 2006 04:20:38 -0000 1.109 @@ -26,7 +26,7 @@ Patch0: gtk+-2.4.1-lib64.patch # Backported from 2.10 Patch1: gtk+-2.8.6-inputmethod.patch -Patch2: gtk+-2.8.10-abicheck.pach +Patch2: gtk+-2.8.10-abicheck.patch BuildPrereq: atk-devel >= %{atk_version} BuildPrereq: pango-devel >= %{pango_version} From fedora-cvs-commits at redhat.com Sat Jan 14 04:52:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 13 Jan 2006 23:52:51 -0500 Subject: rpms/libsemanage/devel libsemanage-rhat.patch, 1.8, 1.9 libsemanage.spec, 1.64, 1.65 Message-ID: <200601140452.k0E4qpan029599@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29569 Modified Files: libsemanage-rhat.patch libsemanage.spec Log Message: libsemanage-rhat.patch: Makefile | 6 ++++++ src/Makefile | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) Index: libsemanage-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage-rhat.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libsemanage-rhat.patch 13 Jan 2006 22:31:44 -0000 1.8 +++ libsemanage-rhat.patch 14 Jan 2006 04:52:46 -0000 1.9 @@ -1,45 +1,42 @@ -diff --exclude-from=exclude -N -u -r nsalibsemanage/src/fcontext_record.c libsemanage-1.5.9/src/fcontext_record.c ---- nsalibsemanage/src/fcontext_record.c 2006-01-06 10:33:10.000000000 -0500 -+++ libsemanage-1.5.9/src/fcontext_record.c 2006-01-06 13:40:38.000000000 -0500 -@@ -81,8 +81,18 @@ - const semanage_fcontext_t* fcontext, - const semanage_fcontext_key_t* key) { - -- return strcmp(fcontext->expr, key->expr) && -- (fcontext->type == key->type); -+ int rv = strcmp(fcontext->expr, key->expr); -+ if (rv != 0) -+ return rv; -+ else { -+ if (fcontext->type < key->type) -+ return -1; -+ -+ else if (key->type < fcontext->type) -+ return 1; -+ -+ else return 0; -+ } - } - hidden_def(semanage_fcontext_compare) - -@@ -90,8 +100,18 @@ - const semanage_fcontext_t* fcontext, - const semanage_fcontext_t* fcontext2) { - -- return strcmp(fcontext->expr, fcontext2->expr) && -- (fcontext->type == fcontext2->type); -+ int rv = strcmp(fcontext->expr, fcontext2->expr); -+ if (rv != 0) -+ return rv; -+ else { -+ if (fcontext->type < fcontext2->type) -+ return -1; +diff --exclude-from=exclude -N -u -r nsalibsemanage/Makefile libsemanage-1.5.14/Makefile +--- nsalibsemanage/Makefile 2006-01-05 10:33:10.000000000 -0500 ++++ libsemanage-1.5.14/Makefile 2006-01-13 23:46:32.000000000 -0500 +@@ -1,11 +1,17 @@ + all: + $(MAKE) -C src all + ++pywrap: ++ $(MAKE) -C src pywrap + -+ else if (fcontext2->type < fcontext->type) -+ return 1; + install: + $(MAKE) -C include install + $(MAKE) -C src install + $(MAKE) -C man install + ++install-pywrap: ++ $(MAKE) -C src install-pywrap + -+ else return 0; -+ } - } - hidden_def(semanage_fcontext_compare2) + relabel: + + clean: +diff --exclude-from=exclude -N -u -r nsalibsemanage/src/Makefile libsemanage-1.5.14/src/Makefile +--- nsalibsemanage/src/Makefile 2005-11-29 10:54:15.000000000 -0500 ++++ libsemanage-1.5.14/src/Makefile 2006-01-13 23:46:17.000000000 -0500 +@@ -37,7 +37,7 @@ + + SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ + +-all: $(LIBA) $(LIBSO) $(SWIGSO) ++all: $(LIBA) $(LIBSO) + + pywrap: all $(SWIGLOBJ) $(SWIGSO) + +@@ -75,7 +75,7 @@ + swigify: $(SWIGIF) + $(SWIG) $^ +-install: all install-pywrap ++install: all + test -d $(LIBDIR) || install -m 755 -d $(LIBDIR) + install -m 644 $(LIBA) $(LIBDIR) + test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- libsemanage.spec 13 Jan 2006 22:36:39 -0000 1.64 +++ libsemanage.spec 14 Jan 2006 04:52:47 -0000 1.65 @@ -3,10 +3,11 @@ Summary: SELinux binary policy manipulation library Name: libsemanage Version: 1.5.14 -Release: 1 +Release: 2 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz +Patch: libsemanage-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} @@ -39,17 +40,18 @@ %prep %setup -q +%patch -p1 -b .rhat %build make clean -make CFLAGS="%{optflags}" +make CFLAGS="%{optflags}" all pywrap %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}/%{_lib} mkdir -p ${RPM_BUILD_ROOT}/%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_includedir} -make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" install +make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" install install-pywrap %clean rm -rf ${RPM_BUILD_ROOT} @@ -76,6 +78,9 @@ %changelog +* Fri Jan 13 2006 Dan Walsh 1.5.14-2 +- Break out python out of regular Makefile + * Fri Jan 13 2006 Dan Walsh 1.5.14-1 - Upgrade to latest from NSA * Merged disallow port overlap patch from Ivan Gyurdiev. From fedora-cvs-commits at redhat.com Sat Jan 14 05:05:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 14 Jan 2006 00:05:33 -0500 Subject: rpms/libselinux/devel libselinux-rhat.patch, 1.73, 1.74 libselinux.spec, 1.175, 1.176 Message-ID: <200601140505.k0E55X5W001044@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv998 Modified Files: libselinux-rhat.patch libselinux.spec Log Message: * Fri Jan 13 2006 Dan Walsh 1.29.5-2 - Split out pywrap in Makefile libselinux-rhat.patch: Makefile | 6 ++++++ src/Makefile | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux-rhat.patch,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- libselinux-rhat.patch 20 Dec 2005 14:44:43 -0000 1.73 +++ libselinux-rhat.patch 14 Jan 2006 05:05:18 -0000 1.74 @@ -1,204 +1,36 @@ -diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig.i libselinux-1.29.2/src/selinuxswig.i ---- nsalibselinux/src/selinuxswig.i 2005-12-08 12:52:24.000000000 -0500 -+++ libselinux-1.29.2/src/selinuxswig.i 2005-12-20 09:41:32.000000000 -0500 -@@ -36,7 +37,7 @@ - extern int is_selinux_mls_enabled(void); - extern int getcon(security_context_t *con); - extern int setcon(security_context_t con); --extern int getpidcon(pid_t pid, security_context_t *con); -+extern int getpidcon(int pid, security_context_t *con); - extern int getprevcon(security_context_t *con); - extern int getexeccon(security_context_t *con); - extern int setexeccon(security_context_t con); -diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinuxswig_wrap.c libselinux-1.29.2/src/selinuxswig_wrap.c ---- nsalibselinux/src/selinuxswig_wrap.c 2005-12-08 12:52:24.000000000 -0500 -+++ libselinux-1.29.2/src/selinuxswig_wrap.c 2005-12-20 09:41:35.000000000 -0500 -@@ -1322,17 +1322,16 @@ - /* -------- TYPES TABLE (BEGIN) -------- */ - - #define SWIGTYPE_p_mode_t swig_types[0] --#define SWIGTYPE_p_pid_t swig_types[1] --#define SWIGTYPE_p_SELboolean swig_types[2] --#define SWIGTYPE_p_char swig_types[3] --#define SWIGTYPE_p_p_p_char swig_types[4] --#define SWIGTYPE_p_access_vector_t swig_types[5] --#define SWIGTYPE_p_p_char swig_types[6] --#define SWIGTYPE_size_t swig_types[7] --#define SWIGTYPE_p_security_context_t swig_types[8] --#define SWIGTYPE_ptrdiff_t swig_types[9] --#define SWIGTYPE_p_int swig_types[10] --static swig_type_info *swig_types[12]; -+#define SWIGTYPE_p_SELboolean swig_types[1] -+#define SWIGTYPE_p_char swig_types[2] -+#define SWIGTYPE_p_p_p_char swig_types[3] -+#define SWIGTYPE_p_access_vector_t swig_types[4] -+#define SWIGTYPE_p_p_char swig_types[5] -+#define SWIGTYPE_size_t swig_types[6] -+#define SWIGTYPE_p_security_context_t swig_types[7] -+#define SWIGTYPE_ptrdiff_t swig_types[8] -+#define SWIGTYPE_p_int swig_types[9] -+static swig_type_info *swig_types[11]; - - /* -------- TYPES TABLE (END) -------- */ - -@@ -1355,59 +1354,7 @@ - int is_selinux_mls_enabled(void); - int getcon(security_context_t *); - int setcon(security_context_t); --int getpidcon(pid_t,security_context_t *); --int getprevcon(security_context_t *); --int getexeccon(security_context_t *); --int setexeccon(security_context_t); --int getfscreatecon(security_context_t *); --int setfscreatecon(security_context_t); --int getfilecon(char const *,security_context_t *); -- --/* returns SWIG_OLDOBJ if the input is a raw char*, SWIG_PYSTR if is a PyString */ --SWIGINTERN int --SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize) --{ -- static swig_type_info* pchar_info = 0; -- char* vptr = 0; -- if (!pchar_info) pchar_info = SWIG_TypeQuery("char *"); -- if (SWIG_ConvertPtr(obj, (void**)&vptr, pchar_info, 0) != -1) { -- if (cptr) *cptr = vptr; -- if (psize) *psize = vptr ? (strlen(vptr) + 1) : 0; -- return SWIG_OLDOBJ; -- } else { -- PyErr_Clear(); -- if (PyString_Check(obj)) { -- if (cptr) { -- *cptr = PyString_AS_STRING(obj); -- if (psize) { -- *psize = PyString_GET_SIZE(obj) + 1; -- } -- } -- return SWIG_PYSTR; -- } -- } -- if (cptr) { -- SWIG_type_error("char *", obj); -- } -- return 0; --} -- -- --SWIGINTERNSHORT int --SWIG_AsCharPtr(PyObject *obj, char **val) --{ -- if (SWIG_AsCharPtrAndSize(obj, val, (size_t*)(0))) { -- return 1; -- } -- if (val) { -- PyErr_Clear(); -- SWIG_type_error("char *", obj); -- } -- return 0; --} -- --int lgetfilecon(char const *,security_context_t *); --int fgetfilecon(int,security_context_t *); -+int getpidcon(int,security_context_t *); - - #include - -@@ -1509,6 +1456,58 @@ - return SWIG_AsVal_int(obj, (int*)0); - } - -+int getprevcon(security_context_t *); -+int getexeccon(security_context_t *); -+int setexeccon(security_context_t); -+int getfscreatecon(security_context_t *); -+int setfscreatecon(security_context_t); -+int getfilecon(char const *,security_context_t *); -+ -+/* returns SWIG_OLDOBJ if the input is a raw char*, SWIG_PYSTR if is a PyString */ -+SWIGINTERN int -+SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize) -+{ -+ static swig_type_info* pchar_info = 0; -+ char* vptr = 0; -+ if (!pchar_info) pchar_info = SWIG_TypeQuery("char *"); -+ if (SWIG_ConvertPtr(obj, (void**)&vptr, pchar_info, 0) != -1) { -+ if (cptr) *cptr = vptr; -+ if (psize) *psize = vptr ? (strlen(vptr) + 1) : 0; -+ return SWIG_OLDOBJ; -+ } else { -+ PyErr_Clear(); -+ if (PyString_Check(obj)) { -+ if (cptr) { -+ *cptr = PyString_AS_STRING(obj); -+ if (psize) { -+ *psize = PyString_GET_SIZE(obj) + 1; -+ } -+ } -+ return SWIG_PYSTR; -+ } -+ } -+ if (cptr) { -+ SWIG_type_error("char *", obj); -+ } -+ return 0; -+} +diff --exclude-from=exclude -N -u -r nsalibselinux/Makefile libselinux-1.29.5/Makefile +--- nsalibselinux/Makefile 2005-02-09 17:04:51.000000000 -0500 ++++ libselinux-1.29.5/Makefile 2006-01-13 23:54:13.000000000 -0500 +@@ -2,12 +2,18 @@ + $(MAKE) -C src + $(MAKE) -C utils + ++pywrap: ++ $(MAKE) -C src pywrap + + install: + $(MAKE) -C include install + $(MAKE) -C src install + $(MAKE) -C utils install + $(MAKE) -C man install + ++install-pywrap: ++ $(MAKE) -C src install-pywrap + -+SWIGINTERNSHORT int -+SWIG_AsCharPtr(PyObject *obj, char **val) -+{ -+ if (SWIG_AsCharPtrAndSize(obj, val, (size_t*)(0))) { -+ return 1; -+ } -+ if (val) { -+ PyErr_Clear(); -+ SWIG_type_error("char *", obj); -+ } -+ return 0; -+} + relabel: + $(MAKE) -C src relabel + +diff --exclude-from=exclude -N -u -r nsalibselinux/src/Makefile libselinux-1.29.5/src/Makefile +--- nsalibselinux/src/Makefile 2006-01-04 10:37:34.000000000 -0500 ++++ libselinux-1.29.5/src/Makefile 2006-01-13 23:54:50.000000000 -0500 +@@ -26,7 +26,9 @@ + + SWIG = swig -Wall -python -o $(SWIGCOUT) -outdir ./ + +-all: $(LIBA) $(LIBSO) $(SWIGSO) ++all: $(LIBA) $(LIBSO) + -+int lgetfilecon(char const *,security_context_t *); -+int fgetfilecon(int,security_context_t *); - int setfilecon(char const *,security_context_t); - int lsetfilecon(char const *,security_context_t); - int fsetfilecon(int,security_context_t); -@@ -1799,7 +1798,7 @@ - - static PyObject *_wrap_getpidcon(PyObject *self, PyObject *args) { - PyObject *resultobj; -- pid_t arg1 ; -+ int arg1 ; - security_context_t *arg2 = (security_context_t *) 0 ; - int result; - security_context_t temp2 ; -@@ -1810,14 +1809,8 @@ - } - if(!PyArg_ParseTuple(args,(char *)"O:getpidcon",&obj0)) goto fail; - { -- pid_t * argp; -- SWIG_Python_ConvertPtr(obj0, (void **)&argp, SWIGTYPE_p_pid_t, SWIG_POINTER_EXCEPTION); -- if (SWIG_arg_fail(1)) SWIG_fail; -- if (argp == NULL) { -- SWIG_null_ref("pid_t"); -- } -+ arg1 = (int)(SWIG_As_int(obj0)); - if (SWIG_arg_fail(1)) SWIG_fail; -- arg1 = *argp; - } - result = (int)getpidcon(arg1,arg2); - -@@ -3142,7 +3135,6 @@ - /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ - - static swig_type_info _swigt__p_mode_t[] = {{"_p_mode_t", 0, "mode_t *", 0, 0, 0, 0},{"_p_mode_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; --static swig_type_info _swigt__p_pid_t[] = {{"_p_pid_t", 0, "pid_t *", 0, 0, 0, 0},{"_p_pid_t", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_SELboolean[] = {{"_p_SELboolean", 0, "SELboolean *", 0, 0, 0, 0},{"_p_SELboolean", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_char[] = {{"_p_char", 0, "char *", 0, 0, 0, 0},{"_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; - static swig_type_info _swigt__p_p_p_char[] = {{"_p_p_p_char", 0, "char ***", 0, 0, 0, 0},{"_p_p_p_char", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}}; -@@ -3155,7 +3147,6 @@ - - static swig_type_info *swig_types_initial[] = { - _swigt__p_mode_t, --_swigt__p_pid_t, - _swigt__p_SELboolean, - _swigt__p_char, - _swigt__p_p_p_char, ++pywrap: $(SWIGSO) + + $(LIBA): $(OBJS) + $(AR) rcs $@ $^ Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- libselinux.spec 13 Jan 2006 22:14:28 -0000 1.175 +++ libselinux.spec 14 Jan 2006 05:05:19 -0000 1.176 @@ -3,11 +3,11 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 1.29.5 -Release: 1 +Release: 2 License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz -#Patch: libselinux-rhat.patch +Patch: libselinux-rhat.patch BuildRequires: libsepol-devel >= %{libsepolver} Requires: libsepol >= %{libsepolver} @@ -50,11 +50,11 @@ %prep %setup -q -#%patch -p1 -b .rhat +%patch -p1 -b .rhat %build make clean -make CFLAGS="-g %{optflags}" +make CFLAGS="-g %{optflags}" all pywrap %install rm -rf ${RPM_BUILD_ROOT} @@ -62,7 +62,7 @@ mkdir -p ${RPM_BUILD_ROOT}/%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_includedir} mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} -make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" BINDIR="${RPM_BUILD_ROOT}%{_sbindir}" install +make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" SHLIBDIR="${RPM_BUILD_ROOT}/%{_lib}" BINDIR="${RPM_BUILD_ROOT}%{_sbindir}" install install-pywrap # Nuke the files we don't want to distribute rm -f ${RPM_BUILD_ROOT}%{_sbindir}/compute_* @@ -110,6 +110,9 @@ %{_libdir}/python2.4/site-packages/selinux.py* %changelog +* Fri Jan 13 2006 Dan Walsh 1.29.5-2 +- Split out pywrap in Makefile + * Fri Jan 13 2006 Dan Walsh 1.29.5-1 - Upgrade to latest from NSA * Added getseuser test program. From fedora-cvs-commits at redhat.com Sat Jan 14 06:50:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 14 Jan 2006 01:50:39 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.144, 1.145 policycoreutils.spec, 1.214, 1.215 Message-ID: <200601140650.k0E6odV8026718@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26704 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Sat Jan 14 2006 Dan Walsh 1.29.7-2 - Add ivans patch policycoreutils-rhat.patch: semanage | 6 seobject.py | 676 ++++++++++++++++++++++++++++++++++++------------------------ 2 files changed, 420 insertions(+), 262 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.144 -r 1.145 policycoreutils-rhat.patch Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.144 retrieving revision 1.145 diff -u -r1.144 -r1.145 --- policycoreutils-rhat.patch 10 Jan 2006 19:13:15 -0000 1.144 +++ policycoreutils-rhat.patch 14 Jan 2006 06:50:34 -0000 1.145 @@ -1,88 +1,47 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.5/scripts/genhomedircon ---- nsapolicycoreutils/scripts/genhomedircon 2006-01-05 10:35:49.000000000 -0500 -+++ policycoreutils-1.29.5/scripts/genhomedircon 2006-01-10 14:10:21.000000000 -0500 -@@ -144,7 +144,7 @@ - for i in fd.read().split('\n'): - if i.find("HOME_ROOT") == 0: - i=i.replace("HOME_ROOT", homedir) -- ret = i+"\n" -+ ret += i+"\n" - fd.close() - if ret=="": - errorExit("No Home Root Context Found") -@@ -162,9 +162,10 @@ - for idx in range(self.usize): - user = semanage_user_by_idx(self.ulist, idx) - if semanage_user_get_name(user) == name: -- #role=semanage_user_get_defrole(user) -- #return role -- return "user_r" -+ if name == "staff_u" or name == "root" and self.type != "targeted": -+ return "staff_r" -+ else: -+ return "user_r" - return name - def getOldRole(self, role): - rc=findval(self.selinuxdir+self.type+"/users/system.users", 'grep "^user %s"' % role, "=") -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/Makefile policycoreutils-1.29.5/semanage/Makefile ---- nsapolicycoreutils/semanage/Makefile 2005-11-29 10:55:01.000000000 -0500 -+++ policycoreutils-1.29.5/semanage/Makefile 2006-01-06 14:34:47.000000000 -0500 -@@ -2,6 +2,8 @@ - PREFIX ?= ${DESTDIR}/usr - SBINDIR ?= $(PREFIX)/sbin - MANDIR = $(PREFIX)/share/man -+PYLIBVER ?= python2.4 -+PYTHONLIBDIR ?= $(LIBDIR)/$(PYLIBVER) - - TARGETS=semanage - -@@ -12,6 +14,8 @@ - -mkdir -p $(SBINDIR) - install -m 755 semanage $(SBINDIR) - install -m 644 semanage.8 $(MANDIR)/man8 -+ test -d $(PYTHONLIBDIR)/site-packages || install -m 755 -d $(PYTHONLIBDIR)/site-packages -+ install -m 755 seobject.py $(PYTHONLIBDIR)/site-packages - - clean: - -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.5/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2006-01-05 10:35:49.000000000 -0500 -+++ policycoreutils-1.29.5/semanage/semanage 2006-01-06 14:41:04.000000000 -0500 -@@ -20,345 +20,9 @@ - # 02111-1307 USA - # - # --import commands, sys, os, pwd, string, getopt, pwd --from semanage import *; --class loginRecords: -- def __init__(self): -- self.sh = semanage_handle_create() -- self.semanaged = semanage_is_managed(self.sh) -- if self.semanaged: -- semanage_connect(self.sh) -- -- def add(self, name, sename, serange): -- if serange == "": -- serange = "s0" -- if sename == "": -- sename = "user_u" -- -- (rc,k) = semanage_seuser_key_create(self.sh, name) -- if rc < 0: -- raise ValueError("Could not create a key for %s" % name) -- -- (rc,exists) = semanage_seuser_exists(self.sh, k) -- if exists: +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.7/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2006-01-13 09:47:40.000000000 -0500 ++++ policycoreutils-1.29.7/semanage/semanage 2006-01-14 01:50:09.000000000 -0500 +@@ -186,6 +186,7 @@ + + if object == "fcontext": + OBJECT.add(target, setype, ftype, serange, seuser) ++ + sys.exit(0); + + if modify: +@@ -210,8 +211,13 @@ + if delete: + if object == "port": + OBJECT.delete(target, proto) ++ ++ if object == "fcontext": ++ OBJECT.delete(target, ftype) ++ + else: + OBJECT.delete(target) ++ + sys.exit(0); + usage() + +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.7/semanage/seobject.py +--- nsapolicycoreutils/semanage/seobject.py 2006-01-13 08:39:11.000000000 -0500 ++++ policycoreutils-1.29.7/semanage/seobject.py 2006-01-14 01:50:09.000000000 -0500 +@@ -46,7 +46,7 @@ + + (rc,exists) = semanage_seuser_exists(self.sh, k) + if exists: - raise ValueError("SELinux User %s mapping already defined" % name) -- try: -- pwd.getpwnam(name) -- except: -- raise ValueError("Linux User %s does not exist" % name) -- -- (rc,u) = semanage_seuser_create(self.sh) -- if rc < 0: ++ raise ValueError("Login mapping for %s is already defined" % name) + try: + pwd.getpwnam(name) + except: +@@ -54,40 +54,65 @@ + + (rc,u) = semanage_seuser_create(self.sh) + if rc < 0: - raise ValueError("Could not create seuser for %s" % name) -- ++ raise ValueError("Could not create login mapping for %s" % name) + - semanage_seuser_set_name(self.sh, u, name) - semanage_seuser_set_mlsrange(self.sh, u, serange) - semanage_seuser_set_sename(self.sh, u, sename) @@ -90,1135 +49,884 @@ - semanage_seuser_add(self.sh, k, u) - if semanage_commit(self.sh) < 0: - raise ValueError("Failed to add SELinux user mapping") -- -- def modify(self, name, sename = "", serange = ""): -- (rc,k) = semanage_seuser_key_create(self.sh, name) -- if rc < 0: -- raise ValueError("Could not create a key for %s" % name) -- ++ rc = semanage_seuser_set_name(self.sh, u, name) ++ if rc < 0: ++ raise ValueError("Could not set name for %s" % name) ++ ++ rc = semanage_seuser_set_mlsrange(self.sh, u, serange) ++ if rc < 0: ++ raise ValueError("Could not set MLS range for %s" % name) ++ ++ rc = semanage_seuser_set_sename(self.sh, u, sename) ++ if rc < 0: ++ raise ValueError("Could not set SELinux user for %s" % name) ++ ++ rc = semanage_begin_transaction(self.sh) ++ if rc < 0: ++ raise ValueError("Could not start semanage transaction") ++ ++ rc = semanage_seuser_modify(self.sh, k, u) ++ if rc < 0: ++ raise ValueError("Failed to add login mapping for %s" % name) ++ ++ rc = semanage_commit(self.sh) ++ if rc < 0: ++ raise ValueError("Failed to add login mapping for %s" % name) + + def modify(self, name, sename = "", serange = ""): ++ if sename == "" and serange == "": ++ raise ValueError("Requires seuser or serange") ++ + (rc,k) = semanage_seuser_key_create(self.sh, name) + if rc < 0: + raise ValueError("Could not create a key for %s" % name) + - if sename == "" and serange == "": - raise ValueError("Requires, seuser or serange") - -- (rc,exists) = semanage_seuser_exists(self.sh, k) + (rc,exists) = semanage_seuser_exists(self.sh, k) - if exists: - (rc,u) = semanage_seuser_query(self.sh, k) - if rc < 0: - raise ValueError("Could not query seuser for %s" % name) - else: - raise ValueError("SELinux user %s mapping is not defined." % name) -- -- if serange != "": -- semanage_seuser_set_mlsrange(self.sh, u, serange) -- if sename != "": -- semanage_seuser_set_sename(self.sh, u, sename) ++ if not exists: ++ raise ValueError("Login mapping for %s is not defined" % name) ++ [...1630 lines suppressed...] +- (rc,exists) = semanage_fcontext_exists(self.sh, k) +- if exists: +- (rc,p) = semanage_fcontext_query(self.sh, k) +- else: +- raise ValueError("fcontext %s is not defined." % target) ++ raise ValueError("Could not query file context %s" % name) ++ ++ if value != "": ++ nvalue = string.atoi(value) ++ semanage_bool_set_value(b, nvalue) ++ ++ rc = semanage_begin_transaction(self.sh) + if rc < 0: +- raise ValueError("Could not query fcontext for %s" % target) +- con = semanage_fcontext_get_con(p) ++ raise ValueError("Could not start semanage transaction") ++ ++ rc = semanage_bool_modify_local(self.sh, k, b) + if rc < 0: +- raise ValueError("Could not get fcontext context for %s" % target) +- +- if serange != "": +- semanage_context_set_mls(self.sh, con, serange) +- if seuser != "": +- semanage_context_set_user(self.sh, con, seuser) +- if setype != "": +- semanage_context_set_type(self.sh, con, setype) ++ raise ValueError("Failed to modify boolean %s" % name) + +- semanage_begin_transaction(self.sh) +- semanage_fcontext_modify_local(self.sh, k, p) +- if semanage_commit(self.sh) < 0: +- raise ValueError("Failed to add fcontext") ++ rc = semanage_commit(self.sh) + if rc < 0: -+ raise ValueError("Could not create context for %s" % target) ++ raise ValueError("Failed to modify boolean %s" % name) + +- def delete(self, target): +- (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) ++ def delete(self, name): ++ (rc,k) = semanage_bool_key_create(self.sh, name) + if rc < 0: +- raise ValueError("Can't create key for %s" % target) +- (rc,exists) = semanage_fcontext_exists(self.sh, k) ++ raise ValueError("Could not create a key for %s" % name) + -+ semanage_context_set_user(self.sh, con, seuser) -+ semanage_context_set_role(self.sh, con, "object_r") -+ semanage_context_set_type(self.sh, con, type) -+ semanage_context_set_mls(self.sh, con, serange) -+ semanage_fcontext_set_type(fcontext, self.file_types[ftype]) -+ semanage_begin_transaction(self.sh) -+ semanage_fcontext_set_con(fcontext, con) -+ semanage_fcontext_add_local(self.sh, k, fcontext) -+ if semanage_commit(self.sh) < 0: -+ raise ValueError("Failed to add fcontext") -+ -+ def modify(self, target, setype, ftype, serange, seuser): -+ if serange == "" and setype == "" and seuser == "": -+ raise ValueError("Requires, setype, serange or seuser") ++ (rc,exists) = semanage_bool_exists(self.sh, k) + if not exists: +- raise ValueError("fcontext %s is not defined." % target) +- else: +- (rc,exists) = semanage_fcontext_exists_local(self.sh, k) +- if not exists: +- raise ValueError("fcontext %s is not defined localy, can not be deleted." % target) +- +- semanage_begin_transaction(self.sh) +- semanage_fcontext_del_local(self.sh, k) +- if semanage_commit(self.sh) < 0: +- raise ValueError("fcontext %s not defined" % target) ++ raise ValueError("Boolean %s is not defined" % name) ++ ++ (rc,exists) = semanage_bool_exists_local(self.sh, k) ++ if not exists: ++ raise ValueError("Boolean %s is defined in policy, cannot be deleted" % name) + -+ (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) ++ rc = semanage_begin_transaction(self.sh) + if rc < 0: -+ raise ValueError("Can't creater key for %s" % target) -+ (rc,exists) = semanage_fcontext_exists(self.sh, k) -+ if exists: -+ (rc,p) = semanage_fcontext_query(self.sh, k) -+ else: -+ raise ValueError("fcontext %s is not defined." % target) ++ raise ValueError("Could not start semanage transaction") ++ ++ rc = semanage_fcontext_del_local(self.sh, k) + if rc < 0: -+ raise ValueError("Could not query fcontext for %s" % target) -+ con = semanage_fcontext_get_con(p) ++ raise ValueError("Failed to delete boolean %s" % name) ++ ++ rc = semanage_commit(self.sh) + if rc < 0: -+ raise ValueError("Could not get fcontext context for %s" % target) -+ -+ if serange != "": -+ semanage_context_set_mls(self.sh, con, serange) -+ if seuser != "": -+ semanage_context_set_user(self.sh, con, seuser) -+ if setype != "": -+ semanage_context_set_type(self.sh, con, setype) -+ -+ semanage_begin_transaction(self.sh) -+ semanage_fcontext_modify_local(self.sh, k, p) -+ if semanage_commit(self.sh) < 0: -+ raise ValueError("Failed to add fcontext") -+ -+ def delete(self, target): -+ (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) ++ raise ValueError("Failed to delete boolean %s" % name) + + def get_all(self): + dict={} +- (status, self.plist, self.psize) = semanage_fcontext_list(self.sh) +- if status < 0: +- raise ValueError("Unable to list fcontexts") ++ (rc, self.blist, self.bsize) = semanage_bool_list(self.sh) + if rc < 0: -+ raise ValueError("Can't create key for %s" % target) -+ (rc,exists) = semanage_fcontext_exists(self.sh, k) -+ if not exists: -+ raise ValueError("fcontext %s is not defined." % target) -+ else: -+ (rc,exists) = semanage_fcontext_exists_local(self.sh, k) -+ if not exists: -+ raise ValueError("fcontext %s is not defined localy, can not be deleted." % target) -+ -+ semanage_begin_transaction(self.sh) -+ semanage_fcontext_del_local(self.sh, k) -+ if semanage_commit(self.sh) < 0: -+ raise ValueError("fcontext %s not defined" % target) -+ -+ def get_all(self): -+ dict={} -+ (status, self.plist, self.psize) = semanage_fcontext_list(self.sh) -+ if status < 0: -+ raise ValueError("Unable to list fcontexts") -+ -+ for idx in range(self.psize): -+ fcontext = semanage_fcontext_by_idx(self.plist, idx) -+ expr=semanage_fcontext_get_expr(fcontext) -+ ftype=semanage_fcontext_get_type_str(fcontext) -+ con = semanage_fcontext_get_con(fcontext) -+ if con: -+ dict[expr, ftype]=(semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con)) -+ else: -+ dict[expr, ftype]=con -+ -+ return dict -+ -+ def list(self, heading=1): -+ if heading: -+ print "%-50s %-18s %s\n" % ("SELinux fcontext", "type", "Context") -+ dict=self.get_all() -+ keys=dict.keys() -+ for k in keys: -+ if dict[k]: -+ print "%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], dict[k][0], dict[k][1],dict[k][2], dict[k][3]) -+ else: -+ print "%-50s %-18s <>" % (k[0], k[1]) -+ -+ ++ raise ValueError("Could not list booleans") + +- for idx in range(self.psize): +- fcontext = semanage_fcontext_by_idx(self.plist, idx) +- expr=semanage_fcontext_get_expr(fcontext) +- ftype=semanage_fcontext_get_type_str(fcontext) +- con = semanage_fcontext_get_con(fcontext) +- if con: +- dict[expr, ftype]=(semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con)) +- else: +- dict[expr, ftype]=con ++ for idx in range(self.bsize): ++ boolean = semanage_bool_by_idx(self.blist, idx) ++ name = semanage_bool_get_name(boolean) ++ value = semanage_bool_get_value(boolean) ++ dict[name] = value + + return dict + + def list(self, heading=1): + if heading: +- print "%-50s %-18s %s\n" % ("SELinux fcontext", "type", "Context") ++ print "%-50s %-18s\n" % ("SELinux boolean", "value") + dict=self.get_all() + keys=dict.keys() + for k in keys: + if dict[k]: +- print "%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], dict[k][0], dict[k][1],dict[k][2], dict[k][3]) +- else: +- print "%-50s %-18s <>" % (k[0], k[1]) +- +- ++ print "%-50s %-18s " % (k[0], dict[k][0]) Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.214 retrieving revision 1.215 diff -u -r1.214 -r1.215 --- policycoreutils.spec 14 Jan 2006 03:51:29 -0000 1.214 +++ policycoreutils.spec 14 Jan 2006 06:50:35 -0000 1.215 @@ -4,11 +4,11 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.7 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz -#Patch: policycoreutils-rhat.patch +Patch: policycoreutils-rhat.patch BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} PreReq: /bin/mount /bin/egrep /bin/awk /usr/bin/diff @@ -34,7 +34,7 @@ %prep %setup -q -#%patch -p1 -b .rhat +%patch -p2 -b .rhat %build make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all @@ -97,6 +97,9 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Sat Jan 14 2006 Dan Walsh 1.29.7-2 +- Add ivans patch + * Fri Jan 13 2006 Dan Walsh 1.29.7-1 - Update to match NSA * Merged newrole cleanup patch from Steve Grubb. From fedora-cvs-commits at redhat.com Sat Jan 14 06:56:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 14 Jan 2006 01:56:26 -0500 Subject: rpms/policycoreutils/devel policycoreutils.spec,1.215,1.216 Message-ID: <200601140656.k0E6uQaI003137@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3108 Modified Files: policycoreutils.spec Log Message: * Sat Jan 14 2006 Dan Walsh 1.29.7-2 - Add ivans patch Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- policycoreutils.spec 14 Jan 2006 06:50:35 -0000 1.215 +++ policycoreutils.spec 14 Jan 2006 06:56:23 -0000 1.216 @@ -34,7 +34,7 @@ %prep %setup -q -%patch -p2 -b .rhat +%patch -p1 -b .rhat %build make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all From fedora-cvs-commits at redhat.com Sat Jan 14 07:38:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 14 Jan 2006 02:38:14 -0500 Subject: rpms/spamassassin/devel spamassassin.spec,1.58,1.59 Message-ID: <200601140738.k0E7cDmr027088@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27039 Modified Files: spamassassin.spec Log Message: include SPAM_PID dir (#177788 Roy-Magne Mo) Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- spamassassin.spec 9 Dec 2005 22:43:16 -0000 1.58 +++ spamassassin.spec 14 Jan 2006 07:38:05 -0000 1.59 @@ -6,7 +6,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.1.0 -Release: 3.fc5.1 +Release: 4.fc5 License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -115,6 +115,7 @@ %config(noreplace) %{_sysconfdir}/mail/spamassassin %config(noreplace) %{_sysconfdir}/sysconfig/spamassassin %dir %{_datadir}/spamassassin +%dir %{_localstatedir}/run/spamassassin %clean rm -rf $RPM_BUILD_ROOT @@ -148,6 +149,9 @@ exit 0 %changelog +* Sat Jan 14 2006 Warren Togami - 3.1.0-4 +- include SPAM_PID dir (#177788 Roy-Magne Mo) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Sat Jan 14 09:52:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 14 Jan 2006 04:52:01 -0500 Subject: rpms/kernel/devel patch-2.6.15-git10.bz2.sign, NONE, 1.1 .cvsignore, 1.324, 1.325 kernel-2.6.spec, 1.1853, 1.1854 sources, 1.266, 1.267 upstream, 1.242, 1.243 linux-2.6-bcm43xx-wpa.patch, 1.1, NONE linux-2.6-chrp-build.patch, 1.1, NONE patch-2.6.15-git8.bz2.sign, 1.1, NONE Message-ID: <200601140952.k0E9q1jf025031@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24984 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.15-git10.bz2.sign Removed Files: linux-2.6-bcm43xx-wpa.patch linux-2.6-chrp-build.patch patch-2.6.15-git8.bz2.sign Log Message: git10 --- NEW FILE patch-2.6.15-git10.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDyLDEyGugalF9Dw4RAlFxAJ4jYnpDBDaZSlJG1Qad+gMrW3LIfACZATPa uYe0Z0ICOGOVftvpv9U2GpI= =symn -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- .cvsignore 13 Jan 2006 15:50:35 -0000 1.324 +++ .cvsignore 14 Jan 2006 09:51:58 -0000 1.325 @@ -2,5 +2,5 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 -bcm43xx-20060111.tar.bz2 -patch-2.6.15-git9.bz2 +bcm43xx-20060114.tar.bz2 +patch-2.6.15-git10.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1853 retrieving revision 1.1854 diff -u -r1.1853 -r1.1854 --- kernel-2.6.spec 14 Jan 2006 00:18:19 -0000 1.1853 +++ kernel-2.6.spec 14 Jan 2006 09:51:58 -0000 1.1854 @@ -183,7 +183,7 @@ Source10: COPYING.modules Source11: genkey -%define BCMVER 20060111 +%define BCMVER 20060114 Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2 Source20: kernel-%{kversion}-i586.config @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git9.bz2 +Patch1: patch-2.6.15-git10.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -225,7 +225,6 @@ # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch Patch301: linux-2.6.15-cell-numa-init.patch -Patch302: linux-2.6-chrp-build.patch Patch304: linux-2.6.15-mv643xx-fixes.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch @@ -374,7 +373,6 @@ # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx.patch -Patch5002: linux-2.6-bcm43xx-wpa.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -577,13 +575,13 @@ else # We already have a vanilla dir. cd kernel-%{kversion} - if [ -d linux-%{kversion}.%{_arch} ]; then - mv linux-%{kversion}.%{_arch} deleteme + if [ -d linux-%{kversion}.%{_target_cpu} ]; then + mv linux-%{kversion}.%{_target_cpu} deleteme rm -rf deleteme & fi fi -cp -rl vanilla linux-%{kversion}.%{_arch} -cd linux-%{kversion}.%{_arch} +cp -rl vanilla linux-%{kversion}.%{_target_cpu} +cd linux-%{kversion}.%{_target_cpu} # Update to latest upstream. %patch1 -p1 @@ -629,8 +627,6 @@ %patch300 -p1 # Arnd says don't call cell_spumem_init() till he fixes it. %patch301 -p1 -# Make CHRP build again -%patch302 -p1 # Fix the MV643xx Gigabit Ethernet driver %patch304 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. @@ -875,8 +871,6 @@ %patch5000 -p1 # Patch Kconfig and Makefiles to merge bcm43xx 'properly' %patch5001 -p1 -# Add WPA support -%patch5002 -p1 # # final stuff @@ -932,10 +926,10 @@ gpg --homedir . --batch --gen-key %{SOURCE11} gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub -make linux-%{kversion}.%{_arch}/scripts/bin2c -linux-%{kversion}.%{_arch}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_arch}/crypto/signature/key.h +make linux-%{kversion}.%{_target_cpu}/scripts/bin2c +linux-%{kversion}.%{_target_cpu}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_target_cpu}/crypto/signature/key.h -cd linux-%{kversion}.%{_arch} +cd linux-%{kversion}.%{_target_cpu} @@ -1133,7 +1127,7 @@ %install -cd linux-%{kversion}.%{_arch} +cd linux-%{kversion}.%{_target_cpu} %if %{buildxen} mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d @@ -1363,6 +1357,10 @@ %changelog * Sat Jan 14 2006 David Woodhouse +- 2.6.15-git10 +- Re-enable Wacom driver on PPC + +* Sat Jan 14 2006 David Woodhouse - Make CHRP build again * Fri Jan 13 2006 David Woodhouse Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.266 retrieving revision 1.267 diff -u -r1.266 -r1.267 --- sources 13 Jan 2006 15:50:35 -0000 1.266 +++ sources 14 Jan 2006 09:51:58 -0000 1.267 @@ -1,3 +1,3 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -e7291436e5d71b575dea034883cb42e5 bcm43xx-20060111.tar.bz2 -e2b01ad85559d6f690cadca732347936 patch-2.6.15-git9.bz2 +ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 +b88bcec6eddc41ccb4e34a486d58b3dd patch-2.6.15-git10.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.242 retrieving revision 1.243 diff -u -r1.242 -r1.243 --- upstream 12 Jan 2006 23:52:50 -0000 1.242 +++ upstream 14 Jan 2006 09:51:58 -0000 1.243 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 -patch-2.6.15-git8.bz2 +patch-2.6.15-git10.bz2 --- linux-2.6-bcm43xx-wpa.patch DELETED --- --- linux-2.6-chrp-build.patch DELETED --- --- patch-2.6.15-git8.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 14 09:52:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 14 Jan 2006 04:52:02 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.132, 1.133 config-powerpc-generic, 1.12, 1.13 Message-ID: <200601140952.k0E9q2xJ025047@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv24984/configs Modified Files: config-generic config-powerpc-generic Log Message: git10 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- config-generic 13 Jan 2006 22:58:19 -0000 1.132 +++ config-generic 14 Jan 2006 09:51:58 -0000 1.133 @@ -632,6 +632,30 @@ CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m + # CONFIG_NETFILTER_DEBUG is not set CONFIG_BRIDGE_NETFILTER=y @@ -799,6 +823,13 @@ CONFIG_IP_DCCP_UNLOAD_HACK=y # +# TIPC Configuration (EXPERIMENTAL) +# +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set + +# # QoS and/or fair queueing # CONFIG_NET_SCHED=y Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- config-powerpc-generic 13 Jan 2006 22:58:19 -0000 1.12 +++ config-powerpc-generic 14 Jan 2006 09:51:58 -0000 1.13 @@ -80,8 +80,3 @@ # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_BUSLOGIC is not set -# WACOM disabled 2006-01-10 dwmw2: -# drivers/usb/input/wacom.c:98: error: redeclaration of enumerator ???G4??? -# include/asm/cputable.h:37: error: previous definition of ???G4??? was here -# CONFIG_USB_WACOM is not set - From fedora-cvs-commits at redhat.com Sat Jan 14 13:54:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 14 Jan 2006 08:54:31 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.145, 1.146 policycoreutils.spec, 1.216, 1.217 Message-ID: <200601141354.k0EDsU4V022211@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22170 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Sat Jan 14 2006 Dan Walsh 1.29.7-3 - Add check for root for semanage, genhomedircon policycoreutils-rhat.patch: scripts/genhomedircon | 3 semanage/semanage | 11 semanage/seobject.py | 676 ++++++++++++++++++++++++++++++-------------------- semanage/seobject.pyc |binary 4 files changed, 427 insertions(+), 263 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.145 retrieving revision 1.146 diff -u -r1.145 -r1.146 --- policycoreutils-rhat.patch 14 Jan 2006 06:50:34 -0000 1.145 +++ policycoreutils-rhat.patch 14 Jan 2006 13:54:25 -0000 1.146 @@ -1,7 +1,35 @@ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.7/scripts/genhomedircon +--- nsapolicycoreutils/scripts/genhomedircon 2006-01-13 09:47:40.000000000 -0500 ++++ policycoreutils-1.29.7/scripts/genhomedircon 2006-01-14 08:39:02.000000000 -0500 +@@ -327,6 +327,9 @@ + sys.stderr.write("%s: %s\n" % ( sys.argv[0], error )) + + ++if os.getuid() > 0 or os.geteuid() > 0: ++ print "You must be root to run %s." % sys.argv[0] ++ sys.exit(0) + + # + # This script will generate home dir file context diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.7/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2006-01-13 09:47:40.000000000 -0500 -+++ policycoreutils-1.29.7/semanage/semanage 2006-01-14 01:50:09.000000000 -0500 -@@ -186,6 +186,7 @@ ++++ policycoreutils-1.29.7/semanage/semanage 2006-01-14 08:38:35.000000000 -0500 +@@ -20,10 +20,13 @@ + # 02111-1307 USA + # + # +-import sys, getopt ++import os, sys, getopt + import seobject + + if __name__ == '__main__': ++ if os.getuid() > 0 or os.geteuid() > 0: ++ print "You must be root to run %s." % sys.argv[0] ++ sys.exit(0) + + def usage(message = ""): + print '\ +@@ -186,6 +189,7 @@ if object == "fcontext": OBJECT.add(target, setype, ftype, serange, seuser) @@ -9,7 +37,7 @@ sys.exit(0); if modify: -@@ -210,8 +211,13 @@ +@@ -210,8 +214,13 @@ if delete: if object == "port": OBJECT.delete(target, proto) @@ -930,3 +958,4 @@ - - + print "%-50s %-18s " % (k[0], dict[k][0]) +Binary files nsapolicycoreutils/semanage/seobject.pyc and policycoreutils-1.29.7/semanage/seobject.pyc differ Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- policycoreutils.spec 14 Jan 2006 06:56:23 -0000 1.216 +++ policycoreutils.spec 14 Jan 2006 13:54:25 -0000 1.217 @@ -4,7 +4,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.7 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -97,6 +97,9 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Sat Jan 14 2006 Dan Walsh 1.29.7-3 +- Add check for root for semanage, genhomedircon + * Sat Jan 14 2006 Dan Walsh 1.29.7-2 - Add ivans patch From fedora-cvs-commits at redhat.com Sat Jan 14 14:00:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 14 Jan 2006 09:00:49 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.146,1.147 Message-ID: <200601141400.k0EE0nQr024632@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24556 Modified Files: policycoreutils-rhat.patch Log Message: * Sat Jan 14 2006 Dan Walsh 1.29.7-3 - Add check for root for semanage, genhomedircon policycoreutils-rhat.patch: scripts/genhomedircon | 3 semanage/semanage | 10 semanage/seobject.py | 676 ++++++++++++++++++++++++++++++-------------------- semanage/seobject.pyc |binary 4 files changed, 426 insertions(+), 263 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.146 retrieving revision 1.147 diff -u -r1.146 -r1.147 --- policycoreutils-rhat.patch 14 Jan 2006 13:54:25 -0000 1.146 +++ policycoreutils-rhat.patch 14 Jan 2006 14:00:29 -0000 1.147 @@ -29,14 +29,6 @@ def usage(message = ""): print '\ -@@ -186,6 +189,7 @@ - - if object == "fcontext": - OBJECT.add(target, setype, ftype, serange, seuser) -+ - sys.exit(0); - - if modify: @@ -210,8 +214,13 @@ if delete: if object == "port": From fedora-cvs-commits at redhat.com Sat Jan 14 21:25:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 14 Jan 2006 16:25:52 -0500 Subject: rpms/pirut/devel .cvsignore, 1.3, 1.4 pirut.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200601142125.k0ELPq5Y024763@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/pirut/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24717/devel Modified Files: .cvsignore pirut.spec sources Log Message: auto-import pirut-0.9.4-1 on branch devel from pirut-0.9.4-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jan 2006 22:05:34 -0000 1.3 +++ .cvsignore 14 Jan 2006 21:25:49 -0000 1.4 @@ -1 +1 @@ -pirut-0.9.2.tar.gz +pirut-0.9.4.tar.gz Index: pirut.spec =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pirut.spec 9 Jan 2006 22:16:21 -0000 1.3 +++ pirut.spec 14 Jan 2006 21:25:49 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Package Installation, Removal and Update Tools Name: pirut -Version: 0.9.2 +Version: 0.9.4 Release: 1 License: GPL Group: Applications/System @@ -10,7 +10,7 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: pygtk2, pygtk2-libglade, yum >= 2.5.1 -Obsoletes: system-config-packages, redhat-config-packages +Obsoletes: system-config-packages, redhat-config-packages, pup BuildArch: noarch %description @@ -40,9 +40,11 @@ %{python_sitelib}/pirut/*.pyc %{python_sitelib}/pirut/*.pyo %{_bindir}/pirut +%{_bindir}/pup %{_sbindir}/pirut -%{_sysconfdir}/pam.d/pirut -%{_sysconfdir}/security/console.apps/pirut +%{_sbindir}/pup +%{_sysconfdir}/pam.d/* +%{_sysconfdir}/security/console.apps/* %{_datadir}/applications/*.desktop %dir %{_datadir}/pirut %dir %{_datadir}/pirut/ui Index: sources =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2006 22:05:34 -0000 1.3 +++ sources 14 Jan 2006 21:25:49 -0000 1.4 @@ -1 +1 @@ -74b3da2b27d4351b389191ad9490dd1d pirut-0.9.2.tar.gz +271dd45be0188fc8948b561f140db1a6 pirut-0.9.4.tar.gz From fedora-cvs-commits at redhat.com Sun Jan 15 12:45:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 15 Jan 2006 07:45:59 -0500 Subject: rpms/yum/devel yum-2.5.1-remove.patch,NONE,1.1 yum.spec,1.75,1.76 Message-ID: <200601151245.k0FCjxvt026121@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/yum/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25836 Modified Files: yum.spec Added Files: yum-2.5.1-remove.patch Log Message: Fix traceback yum-2.5.1-remove.patch: __init__.py | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE yum-2.5.1-remove.patch --- --- yum-2.5.1/yum/__init__.py.remove 2006-01-15 12:43:10.000000000 +0000 +++ yum-2.5.1/yum/__init__.py 2006-01-15 12:43:23.000000000 +0000 @@ -1278,7 +1278,7 @@ try: txmbr.groups.remove(grpid) except ValueError: - self.log(4, "package %s was not marked in group %s" % (po, grpid)) + self.log(4, "package %s was not marked in group %s" % (txmbr.po, grpid)) continue # if there aren't any other groups mentioned then remove the pkg Index: yum.spec =================================================================== RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- yum.spec 9 Jan 2006 02:06:21 -0000 1.75 +++ yum.spec 15 Jan 2006 12:45:53 -0000 1.76 @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 2.5.1 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.5/yum-%{version}.tar.gz @@ -12,7 +12,7 @@ Source99: plugin.conf # default plugins here Source100: installonlyn.py - +Patch0: yum-2.5.1-remove.patch URL: http://linux.duke.edu/yum/ BuildArchitectures: noarch BuildRequires: python @@ -32,6 +32,7 @@ %prep %setup -q +%patch0 -p1 -b .remove %build make @@ -93,6 +94,9 @@ /usr/lib/yum-plugins/* %changelog +* Sun Jan 15 2006 Paul Nasrat - 2.5.1-2 +- Fix group removal traceback (#177737) + * Sun Jan 8 2006 Jeremy Katz - 2.5.1-1 - seth loves me and made a 2.5.1 release. so no cvs snap for you! From fedora-cvs-commits at redhat.com Sun Jan 15 15:31:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 15 Jan 2006 10:31:36 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch,1.147,1.148 Message-ID: <200601151531.k0FFVZrh009164@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9117 Modified Files: policycoreutils-rhat.patch Log Message: * Sat Jan 14 2006 Dan Walsh 1.29.7-3 - Add check for root for semanage, genhomedircon policycoreutils-rhat.patch: scripts/genhomedircon | 3 semanage/semanage | 41 +- semanage/semanage.8 | 74 +++- semanage/seobject.py | 748 +++++++++++++++++++++++++++++++------------------- semanage/seobject.pyc |binary 5 files changed, 548 insertions(+), 318 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.147 retrieving revision 1.148 diff -u -r1.147 -r1.148 --- policycoreutils-rhat.patch 14 Jan 2006 14:00:29 -0000 1.147 +++ policycoreutils-rhat.patch 15 Jan 2006 15:31:28 -0000 1.148 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.7/scripts/genhomedircon --- nsapolicycoreutils/scripts/genhomedircon 2006-01-13 09:47:40.000000000 -0500 -+++ policycoreutils-1.29.7/scripts/genhomedircon 2006-01-14 08:39:02.000000000 -0500 ++++ policycoreutils-1.29.7/scripts/genhomedircon 2006-01-15 08:42:38.000000000 -0500 @@ -327,6 +327,9 @@ sys.stderr.write("%s: %s\n" % ( sys.argv[0], error )) @@ -13,8 +13,8 @@ # This script will generate home dir file context diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.7/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2006-01-13 09:47:40.000000000 -0500 -+++ policycoreutils-1.29.7/semanage/semanage 2006-01-14 08:38:35.000000000 -0500 -@@ -20,10 +20,13 @@ ++++ policycoreutils-1.29.7/semanage/semanage 2006-01-15 09:04:05.000000000 -0500 +@@ -20,23 +20,27 @@ # 02111-1307 USA # # @@ -29,7 +29,83 @@ def usage(message = ""): print '\ -@@ -210,8 +214,13 @@ +-semanage user [-admsRrh] SELINUX_USER\n\ +-semanage login [-admsrh] LOGIN_NAME\n\ +-semanage port [-admth] PORT | PORTRANGE\n\ +-semanage interface [-admth] INTERFACE\n\ +-semanage fcontext [-admhfst] INTERFACE\n\ ++semanage user [-admLRr] SELINUX_USER\n\ ++semanage login [-admsr] LOGIN_NAME\n\ ++semanage port [-admtpr] PORT | PORTRANGE\n\ ++semanage interface [-admtr] INTERFACE\n\ ++semanage fcontext [-admhfrst] INTERFACE\n\ + -a, --add Add a OBJECT record NAME\n\ + -d, --delete Delete a OBJECT record NAME\n\ + -f, --ftype File Type of OBJECT \n\ + -h, --help display this message\n\ + -l, --list List the OBJECTS\n\ ++ -L, --level Default SELinux Level\n\ + -n, --noheading Do not print heading when listing OBJECTS\n\ + -m, --modify Modify a OBJECT record NAME\n\ + -r, --range MLS/MCS Security Range\n\ +@@ -84,7 +88,7 @@ + + args = sys.argv[2:] + gopts, cmds = getopt.getopt(args, +- 'adf:lhmnp:P:s:R:r:t:v', ++ 'adf:lhmnp:P:s:R:L:r:t:v', + ['add', + 'delete', + 'ftype=', +@@ -96,6 +100,7 @@ + 'proto=', + 'seuser=', + 'range=', ++ 'level=', + 'roles=', + 'type=', + 'verbose' +@@ -106,7 +111,7 @@ + usage() + add = 1 + +- if o == "-d" or o == "--delese": ++ if o == "-d" or o == "--delete": + if modify or add: + usage() + delete = 1 +@@ -126,21 +131,24 @@ + if o == "-r" or o == '--range': + serange = a + ++ if o == "-l" or o == "--list": ++ list = 1 ++ ++ if o == "-L" or o == '--level': ++ selevel = a ++ + if o == "-P" or o == '--proto': + proto = a + + if o == "-R" or o == '--roles': + roles = a + +- if o == "-t" or o == "--type": +- setype = a +- +- if o == "-l" or o == "--list": +- list = 1 +- + if o == "-s" or o == "--seuser": + seuser = a + ++ if o == "-t" or o == "--type": ++ setype = a ++ + if o == "-v" or o == "--verbose": + verbose = 1 + +@@ -210,8 +218,13 @@ if delete: if object == "port": OBJECT.delete(target, proto) @@ -43,10 +119,165 @@ sys.exit(0); usage() +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.7/semanage/semanage.8 +--- nsapolicycoreutils/semanage/semanage.8 2005-11-29 10:55:01.000000000 -0500 ++++ policycoreutils-1.29.7/semanage/semanage.8 2006-01-15 09:04:56.000000000 -0500 +@@ -3,55 +3,71 @@ + semanage \- SELinux Policy Management tool + + .SH "SYNOPSIS" +-.B semanage OBJECTTYPE [\-admsrh] OBJECT +-.B semanage login [\-admsrh] login_name ++.B semanage {login|user|port|interface|fcontext} \-l + .br +-.B semanage seuser [\-admsrh] selinux_name ++.B semanage login \-{a|d|m} [\-sr] login_name + .br +-.B semanage port [\-admth] port_number ++.B semanage user \-{a|d|m} [\-LrR] selinux_name ++.br ++.B semanage port \-{a|d|m} [\-tp] port_number ++.br ++.B semanage interface \-{a|d|m} [\-tr] interface_spec ++.br ++.B semanage fcontext \-{a|d|m} [\-frst] file_spec + .P +-This tool is used to manage configuration of the SELinux policy ++ ++This tool is used to configure SELinux policy + + .SH "DESCRIPTION" + This manual page describes the + .BR semanage + program. + .br +-This tool is used to manage configuration of SELinux Policy. You can configure SELinux User Mappings, SELinux Port Mappings, SELinux Users. +- ++This tool is used to configure SELinux Policy. You can configure SELinux User Mappings, SELinux Port Mappings, SELinux Users. File Context and Network Interfaces. + + .SH "OPTIONS" +-.TP +- \-a, \-\-add +-.P ++.TP ++.I \-a, \-\-add + Add a OBJECT record NAME +-.B \-d, \-\-delete +-.P ++.TP ++.I \-d, \-\-delete + Delete a OBJECT record NAME +-.B \-h, \-\-help +-.P ++.TP ++.I \-h, \-\-help + display this message +-.B \-l, \-\-list +-.P ++.TP ++.I \-f, \-\-ftype ++File Type. This is used with fcontext. ++Requires a file type as shown in the mode field by ls, e.g. use -d to match only directories or -- to match only regular files. ++.TP ++.I \-l, \-\-list + List the OBJECTS +-.B \-m, \-\-modify +-.P ++.TP ++.I \-L, \-\-level ++Default SELinux Level for SELinux use. (s0) ++.TP ++.I \-m, \-\-modify + Modify a OBJECT record NAME +-.B \-r, \-\-range +-.P ++.TP ++.I \-p, \-\-proto ++Protocol for the specified port (tcp|udp). ++.TP ++.I \-R, \-\-role ++SELinux Roles (Separate by spaces) ++.TP ++.I \-r, \-\-range + MLS/MCS Security Range +-.B \-s, \-\-seuser +-.P ++.TP ++.I \-s, \-\-seuser + SELinux user name +-.B \-t, \-\-type +-.P ++.TP ++.I \-t, \-\-type + SELinux Type for the object +-.B \-v, \-\-verbose +-.P ++.TP ++.I \-v, \-\-verbose + verbose output + + .SH "AUTHOR" +-This man page was written by Daniel Walsh . +- +- ++This man page was written by Daniel Walsh and ++Russell Coker . + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.7/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-01-13 08:39:11.000000000 -0500 -+++ policycoreutils-1.29.7/semanage/seobject.py 2006-01-14 01:50:09.000000000 -0500 -@@ -46,7 +46,7 @@ ++++ policycoreutils-1.29.7/semanage/seobject.py 2006-01-15 09:50:28.000000000 -0500 +@@ -21,8 +21,39 @@ + # + # + +-import pwd, string ++import pwd, string, selinux + from semanage import *; ++ ++def translate(raw, prepend=1): ++ if prepend == 1: ++ context="a:b:c:%s" % raw ++ else: ++ context=raw ++ (rc, trans)=selinux.selinux_raw_to_trans_context(context) ++ if rc != 0: ++ return raw ++ if prepend: ++ trans = trans.strip("a:b:c") ++ if trans == "": ++ return raw ++ else: ++ return trans ++ ++def untranslate(trans, prepend=1): ++ if prepend == 1: ++ context="a:b:c:%s" % trans ++ else: ++ context=raw ++ (rc, raw)=selinux.selinux_trans_to_raw_context(context) ++ if rc != 0: ++ return trans ++ if prepend: ++ raw = raw.strip("a:b:c") ++ if raw == "": ++ return trans ++ else: ++ return raw ++ + class semanageRecords: + def __init__(self): + self.sh = semanage_handle_create() +@@ -37,6 +68,9 @@ + def add(self, name, sename, serange): + if serange == "": + serange = "s0" ++ else: ++ serange = untranslate(serange) ++ + if sename == "": + sename = "user_u" + +@@ -46,7 +80,7 @@ (rc,exists) = semanage_seuser_exists(self.sh, k) if exists: @@ -55,7 +286,7 @@ try: pwd.getpwnam(name) except: -@@ -54,40 +54,65 @@ +@@ -54,40 +88,65 @@ (rc,u) = semanage_seuser_create(self.sh) if rc < 0: @@ -119,7 +350,8 @@ + raise ValueError("Could not query seuser for %s" % name) if serange != "": - semanage_seuser_set_mlsrange(self.sh, u, serange) +- semanage_seuser_set_mlsrange(self.sh, u, serange) ++ semanage_seuser_set_mlsrange(self.sh, u, untranslate(serange)) if sename != "": semanage_seuser_set_sename(self.sh, u, sename) - semanage_begin_transaction(self.sh) @@ -142,7 +374,7 @@ def delete(self, name): (rc,k) = semanage_seuser_key_create(self.sh, name) if rc < 0: -@@ -95,15 +120,26 @@ +@@ -95,15 +154,26 @@ (rc,exists) = semanage_seuser_exists(self.sh, k) if not exists: @@ -175,7 +407,29 @@ for idx in range(self.usize): u = semanage_seuser_by_idx(self.ulist, idx) name = semanage_seuser_get_name(u) -@@ -134,40 +170,59 @@ +@@ -117,7 +187,7 @@ + keys=dict.keys() + keys.sort() + for k in keys: +- print "%-25s %-25s %-25s" % (k, dict[k][0], dict[k][1]) ++ print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) + + class seluserRecords(semanageRecords): + def __init__(self): +@@ -126,87 +196,134 @@ + def add(self, name, roles, selevel, serange): + if serange == "": + serange = "s0" ++ else: ++ serange = untranslate(serange) ++ + if selevel == "": + selevel = "s0" ++ else: ++ selevel = untranslate(selevel) + + (rc,k) = semanage_user_key_create(self.sh, name) + if rc < 0: raise ValueError("Could not create a key for %s" % name) (rc,exists) = semanage_user_exists(self.sh, k) @@ -251,7 +505,13 @@ if rc < 0: raise ValueError("Could not query user for %s" % name) -@@ -178,35 +233,57 @@ + if serange != "": +- semanage_user_set_mlsrange(self.sh, u, serange) ++ semanage_user_set_mlsrange(self.sh, u, untranslate(serange)) + if selevel != "": +- semanage_user_set_mlslevel(self.sh, u, selevel) ++ semanage_user_set_mlslevel(self.sh, u, untranslate(selevel)) ++ if len(roles) != 0: for r in roles: semanage_user_add_role(self.sh, u, r) @@ -326,7 +586,33 @@ roles = "" if rlist_size: -@@ -278,62 +355,97 @@ +@@ -219,13 +336,13 @@ + + def list(self, heading=1): + if heading: +- print "\n%-15s %-10s %-20s" % ("", "MLS/", "MLS/") +- print "%-15s %-10s %-15s %-20s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") ++ print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/") ++ print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") + dict=self.get_all() + keys=dict.keys() + keys.sort() + for k in keys: +- print "%-15s %-10s %-15s %s" % (k, dict[k][0], dict[k][1], dict[k][2]) ++ print "%-15s %-10s %-30s %s" % (k, translate(dict[k][0]), translate(dict[k][1]), dict[k][2]) + + class portRecords(semanageRecords): + def __init__(self): +@@ -258,6 +375,8 @@ + def add(self, port, proto, serange, type): + if serange == "": + serange="s0" ++ else: ++ serange=untranslate(serange) + + if type == "": + raise ValueError("Type is required") +@@ -278,62 +397,97 @@ if rc < 0: raise ValueError("Could not create context for %s/%s" % (proto, port)) @@ -394,7 +680,8 @@ - raise ValueError("Could not get port context for %s/%s" % (proto, port)) if serange != "": - semanage_context_set_mls(self.sh, con, serange) +- semanage_context_set_mls(self.sh, con, serange) ++ semanage_context_set_mls(self.sh, con, untranslate(serange)) if setype != "": semanage_context_set_type(self.sh, con, setype) - semanage_begin_transaction(self.sh) @@ -456,7 +743,15 @@ for idx in range(self.psize): u = semanage_port_by_idx(self.plist, idx) con = semanage_port_get_con(u) -@@ -375,83 +487,122 @@ +@@ -369,89 +523,130 @@ + def add(self, interface, serange, type): + if serange == "": + serange="s0" ++ else: ++ serange=untranslate(serange) + + if type == "": + raise ValueError("SELinux Type is required") (rc,k) = semanage_iface_key_create(self.sh, interface) if rc < 0: @@ -550,7 +845,8 @@ - raise ValueError("Could not get interface context for %s" % interface) if serange != "": - semanage_context_set_mls(self.sh, con, serange) +- semanage_context_set_mls(self.sh, con, serange) ++ semanage_context_set_mls(self.sh, con, untranslate(serange)) if setype != "": semanage_context_set_type(self.sh, con, setype) @@ -618,7 +914,24 @@ for idx in range(self.psize): interface = semanage_iface_by_idx(self.plist, idx) con = semanage_iface_get_ifcon(interface) -@@ -501,48 +652,69 @@ +@@ -466,7 +661,7 @@ + keys=dict.keys() + keys.sort() + for k in keys: +- print "%-30s %s:%s:%s:%s " % (k,dict[k][0], dict[k][1],dict[k][2], dict[k][3]) ++ print "%-30s %s:%s:%s:%s " % (k,dict[k][0], dict[k][1],dict[k][2], translate(dict[k][3], False)) + + class fcontextRecords(semanageRecords): + def __init__(self): +@@ -495,89 +690,127 @@ + + if serange == "": + serange="s0" ++ else: ++ serange=untranslate(serange) + + if type == "": + raise ValueError("SELinux Type is required") (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) if rc < 0: @@ -708,8 +1021,10 @@ - raise ValueError("Could not get fcontext context for %s" % target) if serange != "": - semanage_context_set_mls(self.sh, con, serange) -@@ -551,33 +723,48 @@ +- semanage_context_set_mls(self.sh, con, serange) ++ semanage_context_set_mls(self.sh, con, untranslate(serange)) + if seuser != "": + semanage_context_set_user(self.sh, con, seuser) if setype != "": semanage_context_set_type(self.sh, con, setype) @@ -777,7 +1092,16 @@ for idx in range(self.psize): fcontext = semanage_fcontext_by_idx(self.plist, idx) -@@ -606,117 +793,82 @@ +@@ -598,7 +831,7 @@ + keys=dict.keys() + for k in keys: + if dict[k]: +- print "%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], dict[k][0], dict[k][1],dict[k][2], dict[k][3]) ++ print "%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], dict[k][0], dict[k][1],dict[k][2], translate(dict[k][3],False)) + else: + print "%-50s %-18s <>" % (k[0], k[1]) + +@@ -606,117 +839,82 @@ def __init__(self): semanageRecords.__init__(self) @@ -802,13 +1126,13 @@ - if exists: - raise ValueError("fcontext %s already defined" % target) - (rc,fcontext) = semanage_fcontext_create(self.sh) -+ (rc,k) = semanage_bool_key_create(self.sh, name) - if rc < 0: +- if rc < 0: - raise ValueError("Could not create fcontext for %s" % target) - - rc = semanage_fcontext_set_expr(self.sh, fcontext, target) - (rc, con) = semanage_context_create(self.sh) -- if rc < 0: ++ (rc,k) = semanage_bool_key_create(self.sh, name) + if rc < 0: - raise ValueError("Could not create context for %s" % target) - - semanage_context_set_user(self.sh, con, seuser) From fedora-cvs-commits at redhat.com Mon Jan 16 00:57:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 15 Jan 2006 19:57:55 -0500 Subject: rpms/kernel/devel linux-2.6-x86_64-page-table-setup.patch, NONE, 1.1 kernel-2.6.spec, 1.1854, 1.1855 Message-ID: <200601160057.k0G0vtdQ006485@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6423 Modified Files: kernel-2.6.spec Added Files: linux-2.6-x86_64-page-table-setup.patch Log Message: experiment. linux-2.6-x86_64-page-table-setup.patch: init.c | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) --- NEW FILE linux-2.6-x86_64-page-table-setup.patch --- Don't try to put kernel page tables beyond ZONE_DMA32. For not fully explained reasons it broke mem=... on several setups. Also minor cleanup. Cc: axboe at suse.de Signed-off-by: Andi Kleen Index: linux/arch/x86_64/mm/init.c =================================================================== --- linux.orig/arch/x86_64/mm/init.c +++ linux/arch/x86_64/mm/init.c @@ -262,19 +262,11 @@ static void __init find_early_table_spac tables = round_up(puds * sizeof(pud_t), PAGE_SIZE) + round_up(pmds * sizeof(pmd_t), PAGE_SIZE); - /* Put page tables beyond the DMA zones if possible. - RED-PEN might be better to spread them out more over - memory to avoid hotspots */ - if (end > MAX_DMA32_PFN< MAX_DMA_PFN << PAGE_SHIFT) - start = MAX_DMA_PFN << PAGE_SHIFT; - else - start = 0x8000; - - table_start = find_e820_area(start, end, tables); - if (table_start == -1) - table_start = find_e820_area(0x8000, end, tables); + /* RED-PEN putting page tables only on node 0 could + cause a hotspot and fill up ZONE_DMA. The page tables + need roughly 0.5KB per GB. */ + start = 0x8000; + table_start = find_e820_area(start, end, tables); if (table_start == -1UL) panic("Cannot find space for the kernel page tables"); Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1854 retrieving revision 1.1855 diff -u -r1.1854 -r1.1855 --- kernel-2.6.spec 14 Jan 2006 09:51:58 -0000 1.1854 +++ kernel-2.6.spec 16 Jan 2006 00:57:51 -0000 1.1855 @@ -221,6 +221,7 @@ Patch203: linux-2.6.14-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch Patch205: linux-2.6-edid-check.patch +Patch206: linux-2.6-x86_64-page-table-setup.patch # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch @@ -619,6 +620,8 @@ %patch204 -p1 # Reboot thru bios on HP laptops. %patch205 -p1 +# Revert some page table setup changes. +%patch206 -p1 # # ppc64 @@ -1356,6 +1359,9 @@ %endif %changelog +* Sun Jan 15 2006 Dave Jones +- Revert some x86-64 page table changes as an experiment. + * Sat Jan 14 2006 David Woodhouse - 2.6.15-git10 - Re-enable Wacom driver on PPC From fedora-cvs-commits at redhat.com Mon Jan 16 01:34:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 15 Jan 2006 20:34:17 -0500 Subject: rpms/pygtk2/devel .cvsignore, 1.23, 1.24 pygtk.spec, 1.43, 1.44 sources, 1.23, 1.24 Message-ID: <200601160134.k0G1YHNP028895@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/pygtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28873 Modified Files: .cvsignore pygtk.spec sources Log Message: * Sun Jan 15 2006 Christopher Aillon - 2.8.4-1 - Bump to upstream 2.8.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pygtk2/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 24 Oct 2005 16:04:18 -0000 1.23 +++ .cvsignore 16 Jan 2006 01:34:07 -0000 1.24 @@ -1,3 +1,4 @@ pygtk-2.7.3.tar.bz2 pygtk-2.8.0.tar.bz2 pygtk-2.8.2.tar.bz2 +pygtk-2.8.4.tar.bz2 Index: pygtk.spec =================================================================== RCS file: /cvs/dist/rpms/pygtk2/devel/pygtk.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- pygtk.spec 10 Dec 2005 09:37:25 -0000 1.43 +++ pygtk.spec 16 Jan 2006 01:34:08 -0000 1.44 @@ -2,8 +2,8 @@ Summary: Python bindings for the GTK+ widget set. Name: pygtk2 -Version: 2.8.2 -Release: 2.1 +Version: 2.8.4 +Release: 1 License: LGPL Group: Development/Languages Source: ftp://ftp.gtk.org/pub/gtk/python/pygtk-%{version}.tar.bz2 @@ -109,6 +109,9 @@ %{_prefix}/share/pygtk/2.0/defs/pangocairo.override %changelog +* Sun Jan 15 2006 Christopher Aillon - 2.8.4-1 +- Bump to upstream 2.8.4 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/pygtk2/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 24 Oct 2005 16:04:18 -0000 1.23 +++ sources 16 Jan 2006 01:34:08 -0000 1.24 @@ -1 +1 @@ -455b50a79015e46b8bcb0664f6d1ece8 pygtk-2.8.2.tar.bz2 +bc82fdb458754feef2336d5fe9b31370 pygtk-2.8.4.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 16 02:40:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 15 Jan 2006 21:40:22 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.133, 1.134 config-ia64-generic, 1.18, 1.19 config-powerpc-generic, 1.13, 1.14 Message-ID: <200601160240.k0G2eM06000629@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv22008/configs Modified Files: config-generic config-ia64-generic config-powerpc-generic Log Message: git11 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- config-generic 14 Jan 2006 09:51:58 -0000 1.133 +++ config-generic 16 Jan 2006 02:40:18 -0000 1.134 @@ -115,6 +115,8 @@ # CONFIG_FW_LOADER=y +# CONFIG_SPI is not set + # # Memory Technology Devices (MTD) # @@ -461,7 +463,7 @@ # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set CONFIG_SCSI_DC390T=m -CONFIG_SCSI_QLA2XXX=m +CONFIG_SCSI_QLA_FC=m # CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set CONFIG_SCSI_QLA21XX=m CONFIG_SCSI_QLA22XX=m @@ -1610,6 +1612,7 @@ CONFIG_W83977F_WDT=m CONFIG_PCIPCWATCHDOG=m CONFIG_USBPCWATCHDOG=m +# CONFIG_SBC_EPX_C3_WATCHDOG is not set CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set @@ -2688,3 +2691,8 @@ ## END of ISA options. +# FIXME: This needs to be made to depend on PPC +# CONFIG_USB_HIDINPUT_POWERBOOK is not set + +# CONFIG_FORCED_INLINING is not set + Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-ia64-generic,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- config-ia64-generic 28 Dec 2005 19:02:31 -0000 1.18 +++ config-ia64-generic 16 Jan 2006 02:40:19 -0000 1.19 @@ -157,3 +157,8 @@ CONFIG_IA64_ACPI_CPUFREQ=m # CONFIG_CRASH is not set + +CONFIG_SERIAL_SGI_IOC3=m +CONFIG_SGI_IOC3=m + + Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-powerpc-generic,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- config-powerpc-generic 14 Jan 2006 09:51:58 -0000 1.13 +++ config-powerpc-generic 16 Jan 2006 02:40:19 -0000 1.14 @@ -80,3 +80,5 @@ # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_BUSLOGIC is not set +CONFIG_USB_HIDINPUT_POWERBOOK=y + From fedora-cvs-commits at redhat.com Mon Jan 16 02:40:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 15 Jan 2006 21:40:29 -0500 Subject: rpms/kernel/devel patch-2.6.15-git11.bz2.sign, NONE, 1.1 .cvsignore, 1.325, 1.326 kernel-2.6.spec, 1.1855, 1.1856 linux-2.6-debug-dual-line-backtrace.patch, 1.1, 1.2 linux-2.6-vm-oomkiller-debugging.patch, 1.1, 1.2 sources, 1.267, 1.268 upstream, 1.243, 1.244 linux-2.6-ia64-spinlock-size.patch, 1.1, NONE patch-2.6.15-git10.bz2.sign, 1.1, NONE Message-ID: <200601160240.k0G2eT0b000639@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22008 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-debug-dual-line-backtrace.patch linux-2.6-vm-oomkiller-debugging.patch sources upstream Added Files: patch-2.6.15-git11.bz2.sign Removed Files: linux-2.6-ia64-spinlock-size.patch patch-2.6.15-git10.bz2.sign Log Message: git11 --- NEW FILE patch-2.6.15-git11.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDygJFyGugalF9Dw4RAv6HAJsHZ9b4rovUQkpoki+3pRHgtEbs5QCffcpM a+VY+hsbx1LmLfBBhAgRGNw= =0L25 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.325 retrieving revision 1.326 diff -u -r1.325 -r1.326 --- .cvsignore 14 Jan 2006 09:51:58 -0000 1.325 +++ .cvsignore 16 Jan 2006 02:40:15 -0000 1.326 @@ -4,3 +4,4 @@ linux-2.6.15.tar.bz2 bcm43xx-20060114.tar.bz2 patch-2.6.15-git10.bz2 +patch-2.6.15-git11.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1855 retrieving revision 1.1856 diff -u -r1.1855 -r1.1856 --- kernel-2.6.spec 16 Jan 2006 00:57:51 -0000 1.1855 +++ kernel-2.6.spec 16 Jan 2006 02:40:15 -0000 1.1856 @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git10.bz2 +Patch1: patch-2.6.15-git11.bz2 #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -235,8 +235,6 @@ Patch317: linux-2.6-ppc-iseries-input-layer.patch # 400 - 499 ia64 -Patch400: linux-2.6-ia64-spinlock-size.patch - # 500 - 599 s390(x) # 600 - 699 sparc(64) @@ -645,10 +643,6 @@ # No input layer on iseries %patch317 -p1 -# IA64 -# Altix: Fix sn_flush_device_kernel & spinlock initialization -%patch400 -p1 - # # Xen # @@ -1360,6 +1354,7 @@ %changelog * Sun Jan 15 2006 Dave Jones +- 2.6.15-git11 - Revert some x86-64 page table changes as an experiment. * Sat Jan 14 2006 David Woodhouse linux-2.6-debug-dual-line-backtrace.patch: traps.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) Index: linux-2.6-debug-dual-line-backtrace.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-dual-line-backtrace.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-debug-dual-line-backtrace.patch 1 Dec 2005 09:38:28 -0000 1.1 +++ linux-2.6-debug-dual-line-backtrace.patch 16 Jan 2006 02:40:16 -0000 1.2 @@ -1,29 +1,20 @@ ---- linux-2.6.14/arch/i386/kernel/traps.c~ 2005-12-01 04:25:36.000000000 -0500 -+++ linux-2.6.14/arch/i386/kernel/traps.c 2005-12-01 04:36:19.000000000 -0500 -@@ -116,6 +116,7 @@ static inline unsigned long print_contex - unsigned long *stack, unsigned long ebp) - { - unsigned long addr; -+ char space=0; +--- linux-2.6.15.noarch/arch/i386/kernel/traps.c~ 2006-01-15 20:49:55.000000000 -0500 ++++ linux-2.6.15.noarch/arch/i386/kernel/traps.c 2006-01-15 20:50:38.000000000 -0500 +@@ -117,10 +117,16 @@ static inline int valid_stack_ptr(struct - #ifdef CONFIG_FRAME_POINTER - while (valid_stack_ptr(tinfo, (void *)ebp)) { -@@ -131,9 +132,17 @@ static inline unsigned long print_contex - if (__kernel_text_address(addr)) { - printk(" [<%08lx>]", addr); - print_symbol(" %s", addr); -- printk("\n"); -+ if (space == 0) { -+ printk(" "); -+ space = 1; -+ } else { -+ printk("\n"); -+ space = 0; -+ } - } - } -+ if (space==1) + static void print_addr_and_symbol(unsigned long addr, char *log_lvl) + { ++ static char space=0; ++ + printk(log_lvl); + printk(" [<%08lx>] ", addr); + print_symbol("%s", addr); +- printk("\n"); ++ if (space == 0) ++ printk(" "); ++ else + printk("\n"); - #endif - return ebp; ++ space = !space; } + + static inline unsigned long print_context_stack(struct thread_info *tinfo, linux-2.6-vm-oomkiller-debugging.patch: oom_kill.c | 1 + 1 files changed, 1 insertion(+) Index: linux-2.6-vm-oomkiller-debugging.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-vm-oomkiller-debugging.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-vm-oomkiller-debugging.patch 15 Oct 2005 01:13:22 -0000 1.1 +++ linux-2.6-vm-oomkiller-debugging.patch 16 Jan 2006 02:40:16 -0000 1.2 @@ -1,9 +1,9 @@ ---- linux-2.6.12/mm/oom_kill.c~ 2005-06-22 14:16:57.000000000 -0400 -+++ linux-2.6.12/mm/oom_kill.c 2005-06-22 14:17:35.000000000 -0400 -@@ -272,6 +272,7 @@ retry: - /* Found nothing?!?! Either we hang forever, or we panic. */ +--- linux-2.6.15.noarch/mm/oom_kill.c~ 2006-01-15 20:48:36.000000000 -0500 ++++ linux-2.6.15.noarch/mm/oom_kill.c 2006-01-15 20:48:43.000000000 -0500 +@@ -286,6 +286,7 @@ retry: if (!p) { read_unlock(&tasklist_lock); + cpuset_unlock(); + show_mem(); panic("Out of memory and no killable processes...\n"); } Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.267 retrieving revision 1.268 diff -u -r1.267 -r1.268 --- sources 14 Jan 2006 09:51:58 -0000 1.267 +++ sources 16 Jan 2006 02:40:16 -0000 1.268 @@ -1,3 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 b88bcec6eddc41ccb4e34a486d58b3dd patch-2.6.15-git10.bz2 +4d91884fd53623e6af96be128c1ce040 patch-2.6.15-git11.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- upstream 14 Jan 2006 09:51:58 -0000 1.243 +++ upstream 16 Jan 2006 02:40:16 -0000 1.244 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 -patch-2.6.15-git10.bz2 +patch-2.6.15-git11.bz2 --- linux-2.6-ia64-spinlock-size.patch DELETED --- --- patch-2.6.15-git10.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 16 04:15:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 15 Jan 2006 23:15:36 -0500 Subject: rpms/kernel/FC-4 .cvsignore, 1.170, 1.171 kernel-2.6.spec, 1.1574, 1.1575 sources, 1.154, 1.155 upstream, 1.95, 1.96 Message-ID: <200601160415.k0G4FakL025787@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv25608 Modified Files: .cvsignore kernel-2.6.spec sources upstream Log Message: 15.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/.cvsignore,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- .cvsignore 6 Jan 2006 05:42:17 -0000 1.170 +++ .cvsignore 16 Jan 2006 04:15:31 -0000 1.171 @@ -2,3 +2,4 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 +patch-2.6.15.1.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1574 retrieving revision 1.1575 diff -u -r1.1574 -r1.1575 --- kernel-2.6.spec 12 Jan 2006 20:50:54 -0000 1.1574 +++ kernel-2.6.spec 16 Jan 2006 04:15:31 -0000 1.1575 @@ -206,7 +206,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -#Patch1: patch-2.6.15.1.bz2 +Patch1: patch-2.6.15.1.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -542,7 +542,7 @@ cd linux-%{kversion} # Update to latest upstream. -#%patch1 -p1 +%patch1 -p1 #%patch2 -p1 # @@ -1267,6 +1267,9 @@ %endif %changelog +* Sun Jan 15 2006 Dave Jones [2.6.15-1.1825_FC4] +- 2.6.15.1 + * Thu Jan 12 2006 Dave Jones [2.6.15-1.1824_FC4] - Remove broken vm debug patch. - kill blk_attempt_merge() which was horribly broken. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/sources,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- sources 6 Jan 2006 05:42:18 -0000 1.154 +++ sources 16 Jan 2006 04:15:31 -0000 1.155 @@ -1 +1,2 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 +b1cddab58d9ab34cca4742e9b050478f patch-2.6.15.1.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/upstream,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- upstream 6 Jan 2006 05:42:18 -0000 1.95 +++ upstream 16 Jan 2006 04:15:31 -0000 1.96 @@ -1 +1,3 @@ linux-2.6.15.tar.bz2 +patch-2.6.15.1.bz2 + From fedora-cvs-commits at redhat.com Mon Jan 16 04:15:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 15 Jan 2006 23:15:50 -0500 Subject: rpms/kernel/FC-4 patch-2.6.15.1.bz2.sign,NONE,1.1 Message-ID: <200601160415.k0G4FoQx026742@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26475 Added Files: patch-2.6.15.1.bz2.sign Log Message: sign --- NEW FILE patch-2.6.15.1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDyfKZyGugalF9Dw4RAhGCAJ0dI+M+X1gF8kkCBahO/8VE9EPK4QCcDgau sfhgHWOtfO3001ed2Ai12wE= =QQrF -----END PGP SIGNATURE----- From fedora-cvs-commits at redhat.com Mon Jan 16 04:27:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 15 Jan 2006 23:27:10 -0500 Subject: rpms/texinfo/devel texinfo-4.3-zlib.patch, 1.3, 1.4 texinfo.spec, 1.30, 1.31 Message-ID: <200601160427.k0G4RADT008834@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/texinfo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8760 Modified Files: texinfo-4.3-zlib.patch texinfo.spec Log Message: * Mon Jan 16 2006 Miloslav Trmac - 4.8-8 - Ignore scriptlet failures with --excludedocs (#166958) - Don't link texindex to zlib, don't pretend to link to zlib statically texinfo-4.3-zlib.patch: Makefile.in | 2 - install-info.c | 87 ++++++++------------------------------------------------- 2 files changed, 14 insertions(+), 75 deletions(-) Index: texinfo-4.3-zlib.patch =================================================================== RCS file: /cvs/dist/rpms/texinfo/devel/texinfo-4.3-zlib.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- texinfo-4.3-zlib.patch 9 Sep 2004 13:17:03 -0000 1.3 +++ texinfo-4.3-zlib.patch 16 Jan 2006 04:27:06 -0000 1.4 @@ -1,16 +1,16 @@ ---- texinfo-4.7/util/Makefile.in.zlib 2004-04-09 22:32:26.000000000 +0100 -+++ texinfo-4.7/util/Makefile.in 2004-06-25 09:59:33.990117203 +0100 -@@ -157,7 +157,7 @@ - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ -lz - LTLIBICONV = @LTLIBICONV@ - LTLIBINTL = @LTLIBINTL@ - LTLIBOBJS = @LTLIBOBJS@ ---- texinfo-4.7/util/install-info.c.zlib 2004-03-29 13:44:23.000000000 +0100 -+++ texinfo-4.7/util/install-info.c 2004-06-25 10:00:23.115729565 +0100 +--- texinfo-4.8/util/Makefile.in.zlib 2004-12-31 19:01:49.000000000 +0100 ++++ texinfo-4.8/util/Makefile.in 2006-01-16 04:59:19.000000000 +0100 +@@ -83,7 +83,7 @@ + PROGRAMS = $(bin_PROGRAMS) + am_ginstall_info_OBJECTS = install-info.$(OBJEXT) + ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) +-ginstall_info_LDADD = $(LDADD) ++ginstall_info_LDADD = $(LDADD) -lz + am__DEPENDENCIES_1 = + ginstall_info_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1) + texindex_SOURCES = texindex.c +--- texinfo-4.8/util/install-info.c.zlib 2004-04-11 19:56:47.000000000 +0200 ++++ texinfo-4.8/util/install-info.c 2006-01-15 15:02:11.000000000 +0100 @@ -20,6 +20,7 @@ #include "system.h" Index: texinfo.spec =================================================================== RCS file: /cvs/dist/rpms/texinfo/devel/texinfo.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- texinfo.spec 9 Dec 2005 22:43:35 -0000 1.30 +++ texinfo.spec 16 Jan 2006 04:27:06 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Tools needed to create Texinfo format documentation files. Name: texinfo Version: 4.8 -Release: 7.1 +Release: 8 License: GPL Group: Applications/Publishing Url: http://www.gnu.org/software/texinfo/ @@ -38,7 +38,7 @@ # ugly method of doing it (triggers which fire on set intersection would # be better), but it's the best we can do for now. Talk to Erik before # removing this. -Prereq: bash +Prereq: bash %description -n info The GNU project uses the texinfo file format for much of its @@ -55,13 +55,11 @@ %configure make %{?_smp_mflags} -make -C util LIBS=%{_libdir}/libz.a - %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}/sbin -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT pushd ${RPM_BUILD_ROOT} install -m644 %{SOURCE2} .%{_mandir}/man1/texi2pdf.1 @@ -79,19 +77,20 @@ rm -rf ${RPM_BUILD_ROOT} %post -/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir || : fi %post -n info -/sbin/install-info %{_infodir}/info-stnd.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/info-stnd.info.gz %{_infodir}/dir || : %preun -n info if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/info-stnd.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/info-stnd.info.gz %{_infodir}/dir \ + || : fi %files -f %{name}.lang @@ -112,7 +111,6 @@ %files -n info %defattr(-,root,root) -#%config(missingok) /etc/X11/applnk/Utilities/info.desktop %config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir %{_bindir}/info %{_bindir}/infokey @@ -125,6 +123,10 @@ %{_mandir}/man5/info.5* %changelog +* Mon Jan 16 2006 Miloslav Trmac - 4.8-8 +- Ignore scriptlet failures with --excludedocs (#166958) +- Don't link texindex to zlib, don't pretend to link to zlib statically + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Mon Jan 16 04:30:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 15 Jan 2006 23:30:05 -0500 Subject: rpms/kernel/devel drm.patch, NONE, 1.1 kernel-2.6.spec, 1.1856, 1.1857 linux-2.6-x86_64-page-table-setup.patch, 1.1, NONE Message-ID: <200601160430.k0G4U5wD010052@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9961 Modified Files: kernel-2.6.spec Added Files: drm.patch Removed Files: linux-2.6-x86_64-page-table-setup.patch Log Message: revert some drm bits drm.patch: b/drivers/char/drm/Makefile | 4 b/drivers/char/drm/ati_pcigart.c | 23 b/drivers/char/drm/drm.h | 4 b/drivers/char/drm/drmP.h | 122 +++-- b/drivers/char/drm/drm_agpsupport.c | 133 +++-- b/drivers/char/drm/drm_bufs.c | 49 +- b/drivers/char/drm/drm_context.c | 2 b/drivers/char/drm/drm_core.h | 4 b/drivers/char/drm/drm_drv.c | 152 +++--- b/drivers/char/drm/drm_fops.c | 317 +++++++------ b/drivers/char/drm/drm_ioc32.c | 1 b/drivers/char/drm/drm_ioctl.c | 27 - b/drivers/char/drm/drm_lock.c | 1 b/drivers/char/drm/drm_memory.c | 8 b/drivers/char/drm/drm_memory_debug.h | 269 +++++------ b/drivers/char/drm/drm_os_linux.h | 1 b/drivers/char/drm/drm_pciids.h | 12 b/drivers/char/drm/drm_proc.c | 16 b/drivers/char/drm/drm_stub.c | 63 -- b/drivers/char/drm/drm_sysfs.c | 66 +- b/drivers/char/drm/i810_dma.c | 49 +- b/drivers/char/drm/i810_drv.c | 60 -- b/drivers/char/drm/i810_drv.h | 10 b/drivers/char/drm/i830_dma.c | 47 + b/drivers/char/drm/i830_drv.c | 59 -- b/drivers/char/drm/i830_drv.h | 8 b/drivers/char/drm/i915_dma.c | 52 +- b/drivers/char/drm/i915_drm.h | 6 b/drivers/char/drm/i915_drv.c | 66 -- b/drivers/char/drm/i915_drv.h | 44 + b/drivers/char/drm/i915_ioc32.c | 1 b/drivers/char/drm/i915_irq.c | 48 +- b/drivers/char/drm/i915_mem.c | 5 b/drivers/char/drm/mga_dma.c | 160 ++++-- b/drivers/char/drm/mga_drv.c | 58 -- b/drivers/char/drm/mga_drv.h | 14 b/drivers/char/drm/mga_ioc32.c | 1 b/drivers/char/drm/mga_state.c | 26 - b/drivers/char/drm/r128_cce.c | 15 b/drivers/char/drm/r128_drm.h | 4 b/drivers/char/drm/r128_drv.c | 48 -- b/drivers/char/drm/r128_drv.h | 8 b/drivers/char/drm/r128_ioc32.c | 1 b/drivers/char/drm/r128_irq.c | 4 b/drivers/char/drm/r128_state.c | 44 - b/drivers/char/drm/r300_cmdbuf.c | 38 - b/drivers/char/drm/r300_reg.h | 1 b/drivers/char/drm/radeon_cp.c | 106 ++-- b/drivers/char/drm/radeon_drm.h | 6 b/drivers/char/drm/radeon_drv.c | 62 +- b/drivers/char/drm/radeon_drv.h | 41 - b/drivers/char/drm/radeon_ioc32.c | 1 b/drivers/char/drm/radeon_state.c | 246 ++++------ b/drivers/char/drm/savage_bci.c | 81 +-- b/drivers/char/drm/savage_drv.c | 50 -- b/drivers/char/drm/savage_drv.h | 29 - b/drivers/char/drm/savage_state.c | 324 ++++++------- b/drivers/char/drm/sis_drm.h | 25 + b/drivers/char/drm/sis_drv.c | 42 - b/drivers/char/drm/sis_drv.h | 4 b/drivers/char/drm/sis_ds.h | 7 b/drivers/char/drm/sis_mm.c | 30 - b/drivers/char/drm/tdfx_drv.c | 42 - b/drivers/char/drm/tdfx_drv.h | 7 b/drivers/char/drm/via_dma.c | 38 + b/drivers/char/drm/via_dmablit.c | 805 ++++++++++++++++++++++++++++++++++ b/drivers/char/drm/via_dmablit.h | 140 +++++ b/drivers/char/drm/via_drm.h | 58 +- b/drivers/char/drm/via_drv.c | 63 -- b/drivers/char/drm/via_drv.h | 56 +- b/drivers/char/drm/via_ds.c | 9 b/drivers/char/drm/via_irq.c | 53 +- b/drivers/char/drm/via_map.c | 47 + b/drivers/char/drm/via_mm.c | 20 b/drivers/char/drm/via_verifier.c | 6 b/drivers/char/drm/via_verifier.h | 4 b/drivers/char/drm/via_video.c | 7 drivers/char/drm/drm_init.c | 53 -- 78 files changed, 2795 insertions(+), 1818 deletions(-) --- NEW FILE drm.patch --- diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile index e41060c..9d180c4 100644 --- a/drivers/char/drm/Makefile +++ b/drivers/char/drm/Makefile @@ -3,7 +3,7 @@ # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. drm-objs := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \ - drm_drv.o drm_fops.o drm_init.o drm_ioctl.o drm_irq.o \ + drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \ drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \ drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \ drm_sysfs.o @@ -18,7 +18,7 @@ radeon-objs := radeon_drv.o radeon_cp.o ffb-objs := ffb_drv.o ffb_context.o sis-objs := sis_drv.o sis_ds.o sis_mm.o savage-objs := savage_drv.o savage_bci.o savage_state.o -via-objs := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o +via-objs := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o ifeq ($(CONFIG_COMPAT),y) drm-objs += drm_ioc32.o diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c index efff0ee..5485382 100644 --- a/drivers/char/drm/ati_pcigart.c +++ b/drivers/char/drm/ati_pcigart.c @@ -52,7 +52,7 @@ # define ATI_MAX_PCIGART_PAGES 8192 /**< 32 MB aperture, 4K pages */ # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ -static unsigned long drm_ati_alloc_pcigart_table(void) +static void *drm_ati_alloc_pcigart_table(void) { unsigned long address; struct page *page; @@ -72,27 +72,26 @@ static unsigned long drm_ati_alloc_pciga } DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address); - return address; + return (void *)address; } -static void drm_ati_free_pcigart_table(unsigned long address) +static void drm_ati_free_pcigart_table(void *address) { struct page *page; int i; DRM_DEBUG("%s\n", __FUNCTION__); - page = virt_to_page(address); + page = virt_to_page((unsigned long)address); for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) { __put_page(page); ClearPageReserved(page); } - free_pages(address, ATI_PCIGART_TABLE_ORDER); + free_pages((unsigned long)address, ATI_PCIGART_TABLE_ORDER); } -int drm_ati_pcigart_cleanup(drm_device_t * dev, - drm_ati_pcigart_info * gart_info) +int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info) { drm_sg_mem_t *entry = dev->sg; unsigned long pages; @@ -136,10 +135,10 @@ int drm_ati_pcigart_cleanup(drm_device_t EXPORT_SYMBOL(drm_ati_pcigart_cleanup); -int drm_ati_pcigart_init(drm_device_t * dev, drm_ati_pcigart_info * gart_info) +int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info) { drm_sg_mem_t *entry = dev->sg; - unsigned long address = 0; + void *address = NULL; unsigned long pages; u32 *pci_gart, page_base, bus_address = 0; int i, j, ret = 0; @@ -163,7 +162,7 @@ int drm_ati_pcigart_init(drm_device_t * goto done; } - bus_address = pci_map_single(dev->pdev, (void *)address, + bus_address = pci_map_single(dev->pdev, address, ATI_PCIGART_TABLE_PAGES * PAGE_SIZE, PCI_DMA_TODEVICE); if (bus_address == 0) { @@ -176,7 +175,7 @@ int drm_ati_pcigart_init(drm_device_t * address = gart_info->addr; bus_address = gart_info->bus_addr; DRM_DEBUG("PCI: Gart Table: VRAM %08X mapped at %08lX\n", - bus_address, address); + bus_address, (unsigned long)address); } pci_gart = (u32 *) address; @@ -195,7 +194,7 @@ int drm_ati_pcigart_init(drm_device_t * if (entry->busaddr[i] == 0) { DRM_ERROR("unable to map PCIGART pages!\n"); drm_ati_pcigart_cleanup(dev, gart_info); - address = 0; + address = NULL; bus_address = 0; goto done; } diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h index 64d6237..9da0ddb 100644 --- a/drivers/char/drm/drm.h +++ b/drivers/char/drm/drm.h @@ -90,8 +90,8 @@ #define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */ #define DRM_RAM_PERCENT 10 /**< How much system ram can we lock? */ -#define _DRM_LOCK_HELD 0x80000000 /**< Hardware lock is held */ -#define _DRM_LOCK_CONT 0x40000000 /**< Hardware lock is contended */ +#define _DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ +#define _DRM_LOCK_CONT 0x40000000U /**< Hardware lock is contended */ #define _DRM_LOCK_IS_HELD(lock) ((lock) & _DRM_LOCK_HELD) #define _DRM_LOCK_IS_CONT(lock) ((lock) & _DRM_LOCK_CONT) #define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT)) diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 3dc3c9d..54b561e 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h @@ -144,20 +144,6 @@ /** \name Backward compatibility section */ /*@{*/ -#ifndef MODULE_LICENSE -#define MODULE_LICENSE(x) -#endif - -#ifndef preempt_disable -#define preempt_disable() -#define preempt_enable() -#endif - -#ifndef pte_offset_map -#define pte_offset_map pte_offset -#define pte_unmap(pte) -#endif - #define DRM_RPR_ARG(vma) vma, #define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT) @@ -286,10 +272,13 @@ typedef int drm_ioctl_t(struct inode *in typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd, unsigned long arg); +#define DRM_AUTH 0x1 +#define DRM_MASTER 0x2 +#define DRM_ROOT_ONLY 0x4 + typedef struct drm_ioctl_desc { drm_ioctl_t *func; - int auth_needed; - int root_only; + int flags; } drm_ioctl_desc_t; typedef struct drm_devstate { @@ -384,6 +373,7 @@ typedef struct drm_buf_entry { /** File private data */ typedef struct drm_file { int authenticated; + int master; int minor; pid_t pid; uid_t uid; @@ -532,8 +522,9 @@ typedef struct drm_vbl_sig { typedef struct ati_pcigart_info { int gart_table_location; int is_pcie; - unsigned long addr; + void *addr; dma_addr_t bus_addr; + drm_local_map_t mapping; } drm_ati_pcigart_info; /** @@ -544,16 +535,14 @@ typedef struct ati_pcigart_info { struct drm_device; struct drm_driver { - int (*preinit) (struct drm_device *, unsigned long flags); - void (*prerelease) (struct drm_device *, struct file * filp); - void (*pretakedown) (struct drm_device *); - int (*postcleanup) (struct drm_device *); - int (*presetup) (struct drm_device *); - int (*postsetup) (struct drm_device *); + int (*load) (struct drm_device *, unsigned long flags); + int (*firstopen) (struct drm_device *); + int (*open) (struct drm_device *, drm_file_t *); + void (*preclose) (struct drm_device *, struct file * filp); + void (*postclose) (struct drm_device *, drm_file_t *); + void (*lastclose) (struct drm_device *); [...8171 lines suppressed...] + via_dma_cleanup(dev); return 0; } @@ -107,3 +94,29 @@ int via_map_init(DRM_IOCTL_ARGS) return -EINVAL; } + +int via_driver_load(drm_device_t *dev, unsigned long chipset) +{ + drm_via_private_t *dev_priv; + + dev_priv = drm_calloc(1, sizeof(drm_via_private_t), DRM_MEM_DRIVER); + if (dev_priv == NULL) + return DRM_ERR(ENOMEM); + + dev->dev_private = (void *)dev_priv; + + if (chipset == VIA_PRO_GROUP_A) + dev_priv->pro_group_a = 1; + + return 0; +} + +int via_driver_unload(drm_device_t *dev) +{ + drm_via_private_t *dev_priv = dev->dev_private; + + drm_free(dev_priv, sizeof(drm_via_private_t), DRM_MEM_DRIVER); + + return 0; +} + diff --git a/drivers/char/drm/via_mm.c b/drivers/char/drm/via_mm.c index 3baddac..33e0cb1 100644 --- a/drivers/char/drm/via_mm.c +++ b/drivers/char/drm/via_mm.c @@ -42,7 +42,7 @@ static int via_agp_free(drm_via_mem_t * static int via_fb_alloc(drm_via_mem_t * mem); static int via_fb_free(drm_via_mem_t * mem); -static int add_alloc_set(int context, int type, unsigned int val) +static int add_alloc_set(int context, int type, unsigned long val) { int i, retval = 0; @@ -56,7 +56,7 @@ static int add_alloc_set(int context, in return retval; } -static int del_alloc_set(int context, int type, unsigned int val) +static int del_alloc_set(int context, int type, unsigned long val) { int i, retval = 0; @@ -199,13 +199,13 @@ int via_mem_alloc(DRM_IOCTL_ARGS) sizeof(mem)); switch (mem.type) { - case VIDEO: + case VIA_MEM_VIDEO: if (via_fb_alloc(&mem) < 0) return -EFAULT; DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem, sizeof(mem)); return 0; - case AGP: + case VIA_MEM_AGP: if (via_agp_alloc(&mem) < 0) return -EFAULT; DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem, @@ -232,7 +232,7 @@ static int via_fb_alloc(drm_via_mem_t * if (block) { fb.offset = block->ofs; fb.free = (unsigned long)block; - if (!add_alloc_set(fb.context, VIDEO, fb.free)) { + if (!add_alloc_set(fb.context, VIA_MEM_VIDEO, fb.free)) { DRM_DEBUG("adding to allocation set fails\n"); via_mmFreeMem((PMemBlock) fb.free); retval = -1; @@ -269,7 +269,7 @@ static int via_agp_alloc(drm_via_mem_t * if (block) { agp.offset = block->ofs; agp.free = (unsigned long)block; - if (!add_alloc_set(agp.context, AGP, agp.free)) { + if (!add_alloc_set(agp.context, VIA_MEM_AGP, agp.free)) { DRM_DEBUG("adding to allocation set fails\n"); via_mmFreeMem((PMemBlock) agp.free); retval = -1; @@ -297,11 +297,11 @@ int via_mem_free(DRM_IOCTL_ARGS) switch (mem.type) { - case VIDEO: + case VIA_MEM_VIDEO: if (via_fb_free(&mem) == 0) return 0; break; - case AGP: + case VIA_MEM_AGP: if (via_agp_free(&mem) == 0) return 0; break; @@ -329,7 +329,7 @@ static int via_fb_free(drm_via_mem_t * m via_mmFreeMem((PMemBlock) fb.free); - if (!del_alloc_set(fb.context, VIDEO, fb.free)) { + if (!del_alloc_set(fb.context, VIA_MEM_VIDEO, fb.free)) { retval = -1; } @@ -352,7 +352,7 @@ static int via_agp_free(drm_via_mem_t * via_mmFreeMem((PMemBlock) agp.free); - if (!del_alloc_set(agp.context, AGP, agp.free)) { + if (!del_alloc_set(agp.context, VIA_MEM_AGP, agp.free)) { retval = -1; } diff --git a/drivers/char/drm/via_verifier.c b/drivers/char/drm/via_verifier.c index 4ac495f..70c897c 100644 --- a/drivers/char/drm/via_verifier.c +++ b/drivers/char/drm/via_verifier.c @@ -237,7 +237,7 @@ static hazard_t table3[256]; static __inline__ int eat_words(const uint32_t ** buf, const uint32_t * buf_end, unsigned num_words) { - if ((*buf - buf_end) >= num_words) { + if ((buf_end - *buf) >= num_words) { *buf += num_words; return 0; } @@ -249,14 +249,14 @@ eat_words(const uint32_t ** buf, const u * Partially stolen from drm_memory.h */ -static __inline__ drm_map_t *via_drm_lookup_agp_map(drm_via_state_t * seq, +static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq, unsigned long offset, unsigned long size, drm_device_t * dev) { struct list_head *list; drm_map_list_t *r_list; - drm_map_t *map = seq->map_cache; + drm_local_map_t *map = seq->map_cache; if (map && map->offset <= offset && (offset + size) <= (map->offset + map->size)) { diff --git a/drivers/char/drm/via_verifier.h b/drivers/char/drm/via_verifier.h index eb4eda3..256590f 100644 --- a/drivers/char/drm/via_verifier.h +++ b/drivers/char/drm/via_verifier.h @@ -47,7 +47,7 @@ typedef struct { int agp_texture; int multitex; drm_device_t *dev; - drm_map_t *map_cache; + drm_local_map_t *map_cache; uint32_t vertex_count; int agp; const uint32_t *buf_start; @@ -55,5 +55,7 @@ typedef struct { extern int via_verify_command_stream(const uint32_t * buf, unsigned int size, drm_device_t * dev, int agp); +extern int via_parse_command_stream(drm_device_t *dev, const uint32_t *buf, + unsigned int size); #endif diff --git a/drivers/char/drm/via_video.c b/drivers/char/drm/via_video.c index 7fab9fb..300ac61 100644 --- a/drivers/char/drm/via_video.c +++ b/drivers/char/drm/via_video.c @@ -50,8 +50,11 @@ void via_release_futex(drm_via_private_t unsigned int i; volatile int *lock; + if (!dev_priv->sarea_priv) + return; + for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) { - lock = (int *)XVMCLOCKPTR(dev_priv->sarea_priv, i); + lock = (volatile int *)XVMCLOCKPTR(dev_priv->sarea_priv, i); if ((_DRM_LOCKING_CONTEXT(*lock) == context)) { if (_DRM_LOCK_IS_HELD(*lock) && (*lock & _DRM_LOCK_CONT)) { @@ -79,7 +82,7 @@ int via_decoder_futex(DRM_IOCTL_ARGS) if (fx.lock > VIA_NR_XVMC_LOCKS) return -EFAULT; - lock = (int *)XVMCLOCKPTR(sAPriv, fx.lock); + lock = (volatile int *)XVMCLOCKPTR(sAPriv, fx.lock); switch (fx.func) { case VIA_FUTEX_WAIT: Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1856 retrieving revision 1.1857 diff -u -r1.1856 -r1.1857 --- kernel-2.6.spec 16 Jan 2006 02:40:15 -0000 1.1856 +++ kernel-2.6.spec 16 Jan 2006 04:30:02 -0000 1.1857 @@ -208,6 +208,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.15-git11.bz2 +Patch2: drm.patch #Patch2: patch-2.6.16-rc1-git1.bz2 # Patches 100 through 500 are meant for architecture patches @@ -221,7 +222,6 @@ Patch203: linux-2.6.14-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch Patch205: linux-2.6-edid-check.patch -Patch206: linux-2.6-x86_64-page-table-setup.patch # 300 - 399 ppc(64) Patch300: linux-2.6.15-default-powerpc.patch @@ -584,7 +584,7 @@ # Update to latest upstream. %patch1 -p1 -#%patch2 -p1 +%patch2 -p1 -R # # Patches 10 through 100 are meant for core subsystem upgrades @@ -618,8 +618,6 @@ %patch204 -p1 # Reboot thru bios on HP laptops. %patch205 -p1 -# Revert some page table setup changes. -%patch206 -p1 # # ppc64 @@ -1355,7 +1353,7 @@ %changelog * Sun Jan 15 2006 Dave Jones - 2.6.15-git11 -- Revert some x86-64 page table changes as an experiment. +- Revert some DRM changes as an experiment. * Sat Jan 14 2006 David Woodhouse - 2.6.15-git10 --- linux-2.6-x86_64-page-table-setup.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 16 05:17:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 00:17:32 -0500 Subject: rpms/texinfo/devel texinfo-4.8-zlib.patch, NONE, 1.1 texinfo.spec, 1.31, 1.32 texinfo-4.3-zlib.patch, 1.4, NONE Message-ID: <200601160517.k0G5HWtl031574@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/texinfo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30881 Modified Files: texinfo.spec Added Files: texinfo-4.8-zlib.patch Removed Files: texinfo-4.3-zlib.patch Log Message: * Mon Jan 16 2006 Miloslav Trmac - 4.8-9 - Fix handling of bzip2'ed files (#128637) texinfo-4.8-zlib.patch: Makefile.in | 2 +- install-info.c | 46 +++++++++++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 20 deletions(-) --- NEW FILE texinfo-4.8-zlib.patch --- --- texinfo-4.8/util/Makefile.in.zlib 2006-01-16 05:53:28.000000000 +0100 +++ texinfo-4.8/util/Makefile.in 2006-01-16 05:53:45.000000000 +0100 @@ -83,7 +83,7 @@ PROGRAMS = $(bin_PROGRAMS) am_ginstall_info_OBJECTS = install-info.$(OBJEXT) ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) -ginstall_info_LDADD = $(LDADD) +ginstall_info_LDADD = $(LDADD) -lz am__DEPENDENCIES_1 = ginstall_info_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1) texindex_SOURCES = texindex.c --- texinfo-4.8/util/install-info.c.zlib 2006-01-16 05:55:00.000000000 +0100 +++ texinfo-4.8/util/install-info.c 2006-01-16 06:03:40.000000000 +0100 @@ -20,6 +20,7 @@ #include "system.h" #include +#include static char *progname = "install-info"; @@ -529,7 +530,7 @@ COMPRESSION_PROGRAM. The compression program is determined by the magic number, not the filename. */ -FILE * +void * open_possibly_compressed_file (char *filename, void (*create_callback) (char *), char **opened_filename, char **compression_program, int *is_pipe) @@ -537,7 +538,7 @@ char *local_opened_filename, *local_compression_program; int nread; char data[4]; - FILE *f; + gzFile *f; /* We let them pass NULL if they don't want this info, but it's easier to always determine it. */ @@ -545,16 +546,16 @@ opened_filename = &local_opened_filename; *opened_filename = filename; - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); if (!f) { *opened_filename = concat (filename, ".gz", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); if (!f) { free (*opened_filename); *opened_filename = concat (filename, ".bz2", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); } #ifdef __MSDOS__ @@ -562,13 +563,13 @@ { free (*opened_filename); *opened_filename = concat (filename, ".igz", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); } if (!f) { free (*opened_filename); *opened_filename = concat (filename, ".inz", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); } #endif if (!f) @@ -580,7 +581,7 @@ /* And try opening it again. */ free (*opened_filename); *opened_filename = filename; - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); if (!f) pfatal_with_name (filename); } @@ -591,12 +592,12 @@ /* Read first few bytes of file rather than relying on the filename. If the file is shorter than this it can't be usable anyway. */ - nread = fread (data, sizeof (data), 1, f); - if (nread != 1) + nread = gzread (f, data, sizeof (data)); + if (nread != sizeof (data)) { /* Empty files don't set errno, so we get something like "install-info: No error for foo", which is confusing. */ - if (nread == 0) + if (nread >= 0) fatal (_("%s: empty file"), *opened_filename, 0); pfatal_with_name (*opened_filename); } @@ -629,20 +630,22 @@ if (*compression_program) { /* It's compressed, so fclose the file and then open a pipe. */ + FILE *p; char *command = concat (*compression_program," -cd <", *opened_filename); - if (fclose (f) < 0) + if (gzclose (f) < 0) pfatal_with_name (*opened_filename); - f = popen (command, "r"); - if (f) + p = popen (command, "r"); + if (p) *is_pipe = 1; else pfatal_with_name (command); + return p; } else { /* It's a plain file, seek back over the magic bytes. */ - if (fseek (f, 0, 0) < 0) + if (gzseek (f, 0, SEEK_SET) < 0) pfatal_with_name (*opened_filename); -#if O_BINARY +#if 0 && O_BINARY /* Since this is a text file, and we opened it in binary mode, switch back to text mode. */ f = freopen (*opened_filename, "r", f); @@ -667,7 +670,7 @@ char **compression_program) { char *real_name; - FILE *f; + void *f; int pipe_p; int filled = 0; int data_size = 8192; @@ -681,7 +684,12 @@ for (;;) { - int nread = fread (data + filled, 1, data_size - filled, f); + int nread; + + if (pipe_p) + nread = fread (data + filled, 1, data_size - filled, f); + else + nread = gzread (f, data + filled, data_size - filled); if (nread < 0) pfatal_with_name (real_name); if (nread == 0) @@ -703,7 +711,7 @@ if (pipe_p) pclose (f); else - fclose (f); + gzclose (f); *sizep = filled; return data; Index: texinfo.spec =================================================================== RCS file: /cvs/dist/rpms/texinfo/devel/texinfo.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- texinfo.spec 16 Jan 2006 04:27:06 -0000 1.31 +++ texinfo.spec 16 Jan 2006 05:17:26 -0000 1.32 @@ -1,14 +1,14 @@ Summary: Tools needed to create Texinfo format documentation files. Name: texinfo Version: 4.8 -Release: 8 +Release: 9 License: GPL Group: Applications/Publishing Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.bz2 Source1: info-dir Source2: texi2pdf.man -Patch1: texinfo-4.3-zlib.patch +Patch1: texinfo-4.8-zlib.patch Patch2: texinfo-CAN-2005-3011.patch Prereq: /sbin/install-info Prefix: %{_prefix} @@ -123,6 +123,9 @@ %{_mandir}/man5/info.5* %changelog +* Mon Jan 16 2006 Miloslav Trmac - 4.8-9 +- Fix handling of bzip2'ed files (#128637) + * Mon Jan 16 2006 Miloslav Trmac - 4.8-8 - Ignore scriptlet failures with --excludedocs (#166958) - Don't link texindex to zlib, don't pretend to link to zlib statically --- texinfo-4.3-zlib.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 16 07:15:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 02:15:04 -0500 Subject: rpms/man-pages-ja/devel .cvsignore, 1.32, 1.33 man-pages-ja.spec, 1.38, 1.39 sources, 1.31, 1.32 Message-ID: <200601160715.k0G7F4tw006397@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/man-pages-ja/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6359 Modified Files: .cvsignore man-pages-ja.spec sources Log Message: * Mon Jan 16 2006 Akira TAGOH - 20060115-1 - updates to 20060115. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/man-pages-ja/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 21 Dec 2005 10:00:40 -0000 1.32 +++ .cvsignore 16 Jan 2006 07:14:57 -0000 1.33 @@ -19,3 +19,4 @@ man-pages-ja-20051015.tar.gz man-pages-ja-20051115.tar.gz man-pages-ja-20051215.tar.gz +man-pages-ja-20060115.tar.gz Index: man-pages-ja.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages-ja/devel/man-pages-ja.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- man-pages-ja.spec 21 Dec 2005 10:00:40 -0000 1.38 +++ man-pages-ja.spec 16 Jan 2006 07:14:58 -0000 1.39 @@ -1,4 +1,4 @@ -%define manver 20051215 +%define manver 20060115 %define use_utf8 1 Summary: Japanese man (manual) pages from the Japanese Manual Project @@ -99,6 +99,9 @@ %changelog +* Mon Jan 16 2006 Akira TAGOH - 20060115-1 +- updates to 20060115. + * Wed Dec 21 2005 Akira TAGOH - 20051215-1 - updates to 20051215. Index: sources =================================================================== RCS file: /cvs/dist/rpms/man-pages-ja/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 21 Dec 2005 10:00:40 -0000 1.31 +++ sources 16 Jan 2006 07:14:58 -0000 1.32 @@ -1 +1 @@ -dd8d4b42f5e7ab456ed93a0099d9602e man-pages-ja-20051215.tar.gz +b91ffbd3a518e8778ee9689397d2fad4 man-pages-ja-20060115.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 16 08:46:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 03:46:02 -0500 Subject: rpms/alsa-utils/devel sources,1.15,1.16 Message-ID: <200601160846.k0G8k2ul002564@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2427 Modified Files: sources Log Message: removing old file Index: sources =================================================================== RCS file: /cvs/dist/rpms/alsa-utils/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 12 Jan 2006 14:17:30 -0000 1.15 +++ sources 16 Jan 2006 08:45:58 -0000 1.16 @@ -1,2 +1 @@ -94bdec65e9c3fd02f7ef8ceb8f918afe alsa-utils-1.0.10.tar.bz2 290762029ea7d2d323f362bbf6cc340b alsa-utils-1.0.11rc2.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 16 09:05:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 04:05:42 -0500 Subject: rpms/alsa-lib/FC-4 alsa-lib-1.0.11-group.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 alsa-lib.spec, 1.32, 1.33 sources, 1.17, 1.18 Message-ID: <200601160905.k0G95gIx018835@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/alsa-lib/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18797 Modified Files: .cvsignore alsa-lib.spec sources Added Files: alsa-lib-1.0.11-group.patch Log Message: new ainit (0.7), fix for SW modems and root users alsa-lib-1.0.11-group.patch: dmix.conf | 1 - dsnoop.conf | 1 - 2 files changed, 2 deletions(-) --- NEW FILE alsa-lib-1.0.11-group.patch --- --- alsa-lib-1.0.11rc2/src/conf/pcm/dmix.conf.old 2005-09-19 14:38:14.000000000 +0200 +++ alsa-lib-1.0.11rc2/src/conf/pcm/dmix.conf 2006-01-13 14:56:10.000000000 +0100 @@ -26,7 +26,6 @@ } type dmix ipc_key 5678293 - ipc_gid audio ipc_perm 0660 slave { pcm { --- alsa-lib-1.0.11rc2/src/conf/pcm/dsnoop.conf.old 2005-09-08 08:36:00.000000000 +0200 +++ alsa-lib-1.0.11rc2/src/conf/pcm/dsnoop.conf 2006-01-13 14:56:17.000000000 +0100 @@ -26,7 +26,6 @@ } type dsnoop ipc_key 5778293 - ipc_gid audio ipc_perm 0660 slave { pcm { Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/FC-4/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 5 Dec 2005 06:58:46 -0000 1.15 +++ .cvsignore 16 Jan 2006 09:05:38 -0000 1.16 @@ -3,3 +3,4 @@ alsa-lib-1.0.9.tar.bz2 ainit-0.6.tar.gz alsa-lib-1.0.10.tar.bz2 +ainit-0.7.tar.gz Index: alsa-lib.spec =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/FC-4/alsa-lib.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- alsa-lib.spec 6 Dec 2005 06:52:13 -0000 1.32 +++ alsa-lib.spec 16 Jan 2006 09:05:39 -0000 1.33 @@ -1,16 +1,17 @@ %define version_lib 1.0.10 -%define version_ainit 0.6 +%define version_ainit 0.7 Summary: The Advanced Linux Sound Architecture (ALSA) library. Name: alsa-lib Version: %{version_lib}%{?version_app} -Release: 2.FC4 +Release: 3.FC4 License: LGPL Group: System Environment/Libraries Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_lib}%{?prever}.tar.bz2 Source1: ainit-%{version_ainit}.tar.gz Patch0: alsa-lib-1.0.10-ainit.patch Patch1: alsa-lib-1.0.10-channel.patch +Patch2: alsa-lib-1.0.11-group.patch URL: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: doxygen @@ -40,6 +41,7 @@ %setup -q -n %{name}-%{version_lib}%{?prever} -a 1 %patch0 -p1 -b .ainit %patch1 -p1 -b .chan +%patch2 -p1 -b .grp %build %configure \ @@ -77,6 +79,9 @@ install -m 644 ainit/config/dmix.conf.lock %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf.lock install -m 644 ainit/config/dsnoop.conf.lock %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf.lock +cp %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf %{buildroot}%{_sysconfdir}/alsa/pcm/dmix.conf.back +cp %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf %{buildroot}%{_sysconfdir}/alsa/pcm/dsnoop.conf.back + # install ainit man pages mkdir -p %{buildroot}%{_mandir}/man8 install -m 644 ainit/doc/ainit.8 %{buildroot}%{_mandir}/man8/ainit.8 @@ -126,8 +131,9 @@ %config %{_sysconfdir}/alsa/pcm/dsnoop.template %ghost %{_sysconfdir}/alsa/pcm/dmix.conf.lock %ghost %{_sysconfdir}/alsa/pcm/dsnoop.conf.lock -%ghost %{_sysconfdir}/alsa/pcm/dmix.conf -%ghost %{_sysconfdir}/alsa/pcm/dsnoop.conf +%config %{_sysconfdir}/alsa/pcm/dmix.conf +%config %{_sysconfdir}/alsa/pcm/dsnoop.conf +%config %{_sysconfdir}/alsa/ainit.conf %files devel %defattr(-, root, root) @@ -141,6 +147,9 @@ %{_datadir}/aclocal/alsa.m4 %changelog +* Mon Jan 16 2006 Martin Stransky 1.0.10-3 +- new ainit (0.7), fix for SW modems and root users + * Tue Dec 06 2005 Martin Stransky 1.0.10-2 - export snd_pcm_channel_info() from library, it's needed for compatibility with 1.0.9 Index: sources =================================================================== RCS file: /cvs/dist/rpms/alsa-lib/FC-4/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 5 Dec 2005 06:58:46 -0000 1.17 +++ sources 16 Jan 2006 09:05:39 -0000 1.18 @@ -1,2 +1,2 @@ -16bbe521dfc466200399d59f274b4001 ainit-0.6.tar.gz b1a4e15c9ff81798507de470a92fcc43 alsa-lib-1.0.10.tar.bz2 +062cf16b02de99ddea47a76884d7fe3d ainit-0.7.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 16 09:44:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 04:44:49 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.606,1.607 Message-ID: <200601160944.k0G9in2c000801@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv789 Modified Files: openoffice.org.spec Log Message: rh#177669# twit Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.606 retrieving revision 1.607 diff -u -r1.606 -r1.607 --- openoffice.org.spec 13 Jan 2006 16:21:40 -0000 1.606 +++ openoffice.org.spec 16 Jan 2006 09:44:39 -0000 1.607 @@ -1,6 +1,6 @@ %define oootag OOA680 %define ooomilestone 1 -%define rh_rpm_release 5.cmctest +%define rh_rpm_release 6 %define build_fc5 1 %define build_fc4 0 @@ -2887,7 +2887,7 @@ update-desktop-database -q %{_datadir}/applications for theme in hicolor locolor gnome; do if [ -x /usr/bin/gtk-update-icon-cache ]; then - if test -f "%{_datadir}/icons/$theme"; then + if test -d "%{_datadir}/icons/$theme"; then if test -f "%{_datadir}/icons/$theme/index.theme"; then touch --no-create %{_datadir}/icons/$theme gtk-update-icon-cache -q %{_datadir}/icons/$theme @@ -2900,7 +2900,7 @@ update-desktop-database -q %{_datadir}/applications for theme in hicolor locolor gnome; do if [ -x /usr/bin/gtk-update-icon-cache ]; then - if test -f "%{_datadir}/icons/$theme"; then + if test -d "%{_datadir}/icons/$theme"; then if test -f "%{_datadir}/icons/$theme/index.theme"; then touch --no-create %{_datadir}/icons/$theme gtk-update-icon-cache -q %{_datadir}/icons/$theme @@ -3342,8 +3342,8 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog -* Fri Jan 13 2006 Caolan McNamara - 1:2.0.1.1-5.cmctest -- icons +* Fri Jan 13 2006 Caolan McNamara - 1:2.0.1.1-6 +- rh#177669# icons s/test -f/test -d/ :-) * Wed Jan 04 2006 Caolan McNamara - 1:2.0.1.1-5 - spinbutton factory needs to be uneditable as well as combobox From fedora-cvs-commits at redhat.com Mon Jan 16 10:15:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 05:15:52 -0500 Subject: rpms/php/devel php.spec,1.101,1.102 Message-ID: <200601161015.k0GAFplg025936@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25881 Modified Files: php.spec Log Message: * Mon Jan 16 2006 Joe Orton 5.1.2-3 - only build xmlreader and xmlwriter shared (#177810) Index: php.spec =================================================================== RCS file: /cvs/dist/rpms/php/devel/php.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- php.spec 13 Jan 2006 10:44:20 -0000 1.101 +++ php.spec 16 Jan 2006 10:15:42 -0000 1.102 @@ -3,7 +3,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php Version: 5.1.2 -Release: 2 +Release: 3 License: The PHP License Group: Development/Languages URL: http://www.php.net/ @@ -383,7 +383,7 @@ --with-snmp=shared,%{_prefix} \ --enable-soap=shared \ --with-xsl=shared,%{_prefix} \ - --enable-xmlreader=shared \ + --enable-xmlreader=shared --enable-xmlwriter=shared \ --enable-fastcgi \ --enable-pdo=shared \ --with-pdo-odbc=shared,unixODBC,%{_prefix} \ @@ -398,7 +398,7 @@ --without-mysql --without-gd \ --without-odbc --disable-dom \ --disable-dba --without-unixODBC \ - --disable-pdo + --disable-pdo --disable-xmlreader --disable-xmlwriter popd %check @@ -457,7 +457,7 @@ # Generate files lists and stub .ini files for each subpackage for mod in pgsql mysql mysqli odbc ldap snmp xmlrpc imap \ - mbstring ncurses gd dom xsl soap bcmath dba xmlreader \ + mbstring ncurses gd dom xsl soap bcmath dba xmlreader xmlwriter \ pdo pdo_mysql pdo_pgsql pdo_odbc pdo_sqlite; do cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini < files.xml +# The dom, xsl and xml* modules are all packaged in php-xml +cat files.dom files.xsl files.xml{reader,writer} > files.xml # The mysql and mysqli modules are both packaged in php-mysql cat files.mysqli >> files.mysql @@ -537,6 +537,9 @@ %files pdo -f files.pdo %changelog +* Mon Jan 16 2006 Joe Orton 5.1.2-3 +- only build xmlreader and xmlwriter shared (#177810) + * Fri Jan 13 2006 Joe Orton 5.1.2-2 - update to 5.1.2 From fedora-cvs-commits at redhat.com Mon Jan 16 10:32:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 05:32:09 -0500 Subject: rpms/valgrind-callgrind/devel .cvsignore, 1.8, 1.9 sources, 1.7, 1.8 valgrind-callgrind.spec, 1.11, 1.12 callgrind-pkg-config.patch, 1.2, NONE Message-ID: <200601161032.k0GAW9m5010199@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/valgrind-callgrind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10113 Modified Files: .cvsignore sources valgrind-callgrind.spec Removed Files: callgrind-pkg-config.patch Log Message: 0.10.1-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/valgrind-callgrind/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Oct 2005 06:38:16 -0000 1.8 +++ .cvsignore 16 Jan 2006 10:32:02 -0000 1.9 @@ -1 +1 @@ -callgrind-0.10.0.tar.gz +callgrind-0.10.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/valgrind-callgrind/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 12 Oct 2005 06:38:17 -0000 1.7 +++ sources 16 Jan 2006 10:32:02 -0000 1.8 @@ -1 +1 @@ -3bd2afd50fde7db4bd5a59dcb412d5e7 callgrind-0.10.0.tar.gz +6d8acca6b58b0b72804339d04426d550 callgrind-0.10.1.tar.bz2 Index: valgrind-callgrind.spec =================================================================== RCS file: /cvs/dist/rpms/valgrind-callgrind/devel/valgrind-callgrind.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- valgrind-callgrind.spec 9 Dec 2005 22:43:45 -0000 1.11 +++ valgrind-callgrind.spec 16 Jan 2006 10:32:02 -0000 1.12 @@ -1,16 +1,15 @@ Summary: Call-graph profiler plugin for valgrind Name: valgrind-callgrind -Version: 0.10.0 -Release: 1.1 -Source0: http://kcachegrind.sourceforge.net/callgrind-%{version}.tar.gz -Patch0: callgrind-pkg-config.patch +Version: 0.10.1 +Release: 1 +Source0: http://kcachegrind.sourceforge.net/callgrind-%{version}.tar.bz2 License: GPL URL: http://kcachegrind.sourceforge.net/ Group: Development/Debuggers BuildRoot: %{_tmppath}/%{name}-root ExclusiveArch: %{ix86} x86_64 -BuildRequires: valgrind >= 1:3.0.0 -Requires: valgrind = 1:3.0.1 +BuildRequires: valgrind >= 1:3.1.0 +Requires: valgrind = 1:3.1.0 # For make check BuildRequires: qt-devel @@ -28,13 +27,13 @@ %prep %setup -q -n callgrind-%{version} -%patch0 -p1 %build # make check below needs to compile/link against Qt unset QTDIR || : ; . /etc/profile.d/qt.sh -%configure +%configure CFLAGS="${RPM_OPT_FLAGS/-fstack-protector/-fno-stack-protector}" \ + CXXFLAGS="${RPM_OPT_FLAGS/-fstack-protector/-fno-stack-protector}" make %{?_smp_mflags} # test @@ -46,20 +45,24 @@ rm -rf $RPM_BUILD_ROOT %makeinstall +objcopy -R .debug_loc -R .debug_frame -R .debug_ranges $RPM_BUILD_ROOT%{_libdir}/valgrind/*/callgrind +mkdir docs.installed +mv $RPM_BUILD_ROOT%{_datadir}/doc/callgrind/html/* docs.installed/ %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc AUTHORS COPYING README +%doc AUTHORS COPYING README docs.installed/* %{_bindir}/* %{_includedir}/valgrind %{_libdir}/valgrind +%{_mandir}/man1/* %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Mon Jan 16 2006 Jakub Jelinek 0.10.1-1 +- update to 0.10.1 (#176551) * Thu Oct 13 2005 Jakub Jelinek 0.10.0-1 - update to 0.10.0 (#170460) --- callgrind-pkg-config.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 16 12:32:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 07:32:42 -0500 Subject: rpms/man-pages/devel man-pages-2.20-nscd.conf.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 man-pages.spec, 1.36, 1.37 sources, 1.19, 1.20 Message-ID: <200601161232.k0GCWgh4016238@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/man-pages/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16078 Modified Files: .cvsignore man-pages.spec sources Added Files: man-pages-2.20-nscd.conf.patch Log Message: - update to 2.21 - add the description of reload-count option (nscd.conf man page - bug 177368) man-pages-2.20-nscd.conf.patch: nscd.conf.5 | 10 ++++++++++ 1 files changed, 10 insertions(+) --- NEW FILE man-pages-2.20-nscd.conf.patch --- --- man-pages-2.21/man5/nscd.conf.5.pom 2006-01-16 12:56:09.753612568 +0100 +++ man-pages-2.21/man5/nscd.conf.5 2006-01-16 13:03:07.392121864 +0100 @@ -118,6 +118,16 @@ .IR /etc/hosts . .RE +.B reload-count +.I unlimited| +.RS +Sets the number of times a cached record is reloaded +before it is pruned from the cache. +Each cache record has a timeout, when that timeout expires, +nscd will either reload it (query the NSS service again if the data +hasn't changed), or drop it. +.RE + .SH "SEE ALSO" .BR nscd (8) .SH AUTHOR Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/man-pages/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 6 Jan 2006 13:10:53 -0000 1.19 +++ .cvsignore 16 Jan 2006 12:32:25 -0000 1.20 @@ -1,3 +1,3 @@ man-pages-extralocale.tar.bz2 man2.tar.gz -man-pages-2.20.tar.gz +man-pages-2.21.tar.gz Index: man-pages.spec =================================================================== RCS file: /cvs/dist/rpms/man-pages/devel/man-pages.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- man-pages.spec 6 Jan 2006 13:10:53 -0000 1.36 +++ man-pages.spec 16 Jan 2006 12:32:25 -0000 1.37 @@ -1,6 +1,6 @@ Summary: Man (manual) pages from the Linux Documentation Project. Name: man-pages -Version: 2.20 +Version: 2.21 Release: 1 License: distributable Group: Documentation @@ -22,6 +22,7 @@ Patch19: man-pages-2.07-termcap.patch Patch20: man-pages-2.13-aio.patch Patch21: man-pages-2.16-mmap.patch +Patch22: man-pages-2.20-nscd.conf.patch Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -52,6 +53,7 @@ %patch19 -p1 %patch20 -p1 %patch21 -p1 +%patch22 -p1 %build @@ -145,6 +147,11 @@ %{_mandir}/en/man*/* %changelog +* Mon Jan 16 2006 Ivana Varekova 2.21-1 +- update to 2.21 +- add the description of reload-count option (nscd.conf + man page - bug 177368) + * Fri Jan 6 2006 Ivana Varekova 2.20-1 - update to 2.20 Index: sources =================================================================== RCS file: /cvs/dist/rpms/man-pages/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 6 Jan 2006 13:10:53 -0000 1.19 +++ sources 16 Jan 2006 12:32:25 -0000 1.20 @@ -1,3 +1,3 @@ 57f2e0500d177e05647990eae439a8ee man-pages-extralocale.tar.bz2 af09d031dcee66929510e078d00066f2 man2.tar.gz -fcd3de7266a5e2999ea77fe5fbea13c1 man-pages-2.20.tar.gz +b14c8c4bac497013d8d7f0e0701fc7bb man-pages-2.21.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 16 13:11:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 08:11:44 -0500 Subject: rpms/groff/FC-3 nroff,1.1,1.2 Message-ID: <200601161311.k0GDBihh007322@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv7226 Modified Files: nroff Log Message: work if bash's noclobber is on (#127492) Index: nroff =================================================================== RCS file: /cvs/dist/rpms/groff/FC-3/nroff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nroff 9 Sep 2004 05:56:32 -0000 1.1 +++ nroff 16 Jan 2006 13:11:38 -0000 1.2 @@ -47,7 +47,7 @@ TMPFILE=$(mktemp /tmp/man.XXXXXX) trap "rm -f $TMPFILE" 0 1 2 3 15 -cat ${1+"$@"} > ${TMPFILE} +cat ${1+"$@"} >| ${TMPFILE} if iconv -f utf-8 -t utf-8 -o /dev/null ${TMPFILE} 2>/dev/null then From fedora-cvs-commits at redhat.com Mon Jan 16 13:12:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 08:12:32 -0500 Subject: rpms/groff/FC-3 groff-1.18.1-gzext.patch,1.1,1.2 Message-ID: <200601161312.k0GDCWuC007502@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv7440 Modified Files: groff-1.18.1-gzext.patch Log Message: fix assertion failure on abort message (#141912) groff-1.18.1-gzext.patch: input.cc | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) Index: groff-1.18.1-gzext.patch =================================================================== RCS file: /cvs/dist/rpms/groff/FC-3/groff-1.18.1-gzext.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- groff-1.18.1-gzext.patch 9 Sep 2004 05:54:44 -0000 1.1 +++ groff-1.18.1-gzext.patch 16 Jan 2006 13:12:27 -0000 1.2 @@ -15,7 +15,7 @@ + else if ((path = realpath(nm.contents(), pbuf)) == NULL && + (path = realpath(tmp, pbuf)) == NULL) + { -+ error("realpath on `%1' failed: %3", nm.contents(), strerror(errno)); ++ error("realpath on `%1' failed: %2", nm.contents(), strerror(errno)); + } else if (safer_flag && strncmp(cwd, path, strlen(cwd))) error("won't source `%1' outside of `%2' without -U flag", path, cwd); else if (stat(path, &st) < 0) From fedora-cvs-commits at redhat.com Mon Jan 16 13:13:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 08:13:03 -0500 Subject: rpms/groff/FC-3 groff-1.18.1.1-spacefix.patch,NONE,1.1 Message-ID: <200601161313.k0GDD3Ze007649@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv7600 Added Files: groff-1.18.1.1-spacefix.patch Log Message: attempt to fix a space problem with several european languages (#137728) groff-1.18.1.1-spacefix.patch: env.cc | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE groff-1.18.1.1-spacefix.patch --- --- ./src/roff/troff/env.cc.orig 2006-01-12 14:43:05.000000000 +0100 +++ ./src/roff/troff/env.cc 2006-01-12 14:45:55.000000000 +0100 @@ -300,7 +300,7 @@ * This code is based on jgroff * about kerning between ASCII and EUC-JP */ - if (!ci->get_wchar_code()) { + if (!ci->get_wchar_code() || wchar_code(ci->get_wchar_code()) < 0x590) { /* * This node is a ASCII character node. */ From fedora-cvs-commits at redhat.com Mon Jan 16 13:14:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 08:14:38 -0500 Subject: rpms/groff/FC-3 groff.spec,1.24,1.25 Message-ID: <200601161314.k0GDEcgf008228@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv8142 Modified Files: groff.spec Log Message: - convert man pages to UTF-8 - spec cleanup - work if bash's noclobber is on (#127492) - fix assertion failure on abort message (#141912) - attempt to fix a space problem with several european languages (#137728) Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/FC-3/groff.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- groff.spec 19 Oct 2004 11:08:03 -0000 1.24 +++ groff.spec 16 Jan 2006 13:14:34 -0000 1.25 @@ -3,7 +3,7 @@ Summary: A document formatting system. Name: groff Version: 1.18.1.1 -Release: 3 +Release: 4.FC3 License: GPL Group: Applications/Publishing Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz @@ -28,6 +28,7 @@ Patch18: groff-1.18.1.1-do_char.patch Patch19: groff-1.18.1.1-grn.patch Patch20: groff-1.18.1.1-tempfile.patch +Patch21: groff-1.18.1.1-spacefix.patch URL: ftp://ftp.gnu.org/gnu/groff/ Requires: mktemp @@ -93,11 +94,18 @@ %patch18 -p1 -b .do_char %patch19 -p1 -b .grn %patch20 -p1 -b .tempfile +%patch21 -p1 -b .spacefix + +for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \ + src/devices/grolbp/grolbp.man; do + iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" + mv "${i}_" "$i" +done %build -PATH=$PATH:%{_prefix}/X11R6/bin +#PATH=$PATH:%{_prefix}/X11R6/bin #autoconf -%configure --enable-japanese --enable-multibyte +%configure --enable-multibyte make (cd doc && makeinfo groff.texinfo) %if %{with_x} @@ -107,7 +115,7 @@ %install rm -rf ${RPM_BUILD_ROOT} -PATH=$PATH:%{_prefix}/X11R6/bin +#PATH=$PATH:%{_prefix}/X11R6/bin mkdir -p ${RPM_BUILD_ROOT}%{_prefix} ${RPM_BUILD_ROOT}%{_infodir} %makeinstall manroot=${RPM_BUILD_ROOT}/%{_mandir} #install -m 644 doc/groff.info* ${RPM_BUILD_ROOT}/%{_infodir} @@ -117,20 +125,20 @@ cd ../.. %endif #mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_prefix}/share -ln -s s.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gs.tmac -ln -s mse.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gmse.tmac -ln -s m.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gm.tmac -ln -s troff ${RPM_BUILD_ROOT}%{_prefix}/bin/gtroff -ln -s tbl ${RPM_BUILD_ROOT}%{_prefix}/bin/gtbl -ln -s pic ${RPM_BUILD_ROOT}%{_prefix}/bin/gpic -ln -s eqn ${RPM_BUILD_ROOT}%{_prefix}/bin/geqn -ln -s neqn ${RPM_BUILD_ROOT}%{_prefix}/bin/gneqn -ln -s refer ${RPM_BUILD_ROOT}%{_prefix}/bin/grefer -ln -s lookbib ${RPM_BUILD_ROOT}%{_prefix}/bin/glookbib -ln -s indxbib ${RPM_BUILD_ROOT}%{_prefix}/bin/gindxbib -ln -s soelim ${RPM_BUILD_ROOT}%{_prefix}/bin/gsoelim -ln -s soelim ${RPM_BUILD_ROOT}%{_prefix}/bin/zsoelim -ln -s nroff ${RPM_BUILD_ROOT}%{_prefix}/bin/gnroff +ln -s s.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gs.tmac +ln -s mse.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gmse.tmac +ln -s m.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gm.tmac +ln -s troff ${RPM_BUILD_ROOT}%{_bindir}/gtroff +ln -s tbl ${RPM_BUILD_ROOT}%{_bindir}/gtbl +ln -s pic ${RPM_BUILD_ROOT}%{_bindir}/gpic +ln -s eqn ${RPM_BUILD_ROOT}%{_bindir}/geqn +ln -s neqn ${RPM_BUILD_ROOT}%{_bindir}/gneqn +ln -s refer ${RPM_BUILD_ROOT}%{_bindir}/grefer +ln -s lookbib ${RPM_BUILD_ROOT}%{_bindir}/glookbib +ln -s indxbib ${RPM_BUILD_ROOT}%{_bindir}/gindxbib +ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/gsoelim +ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/zsoelim +ln -s nroff ${RPM_BUILD_ROOT}%{_bindir}/gnroff # Build system is compressing man-pages ln -s eqn.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/geqn.1.gz @@ -144,23 +152,23 @@ ln -s tbl.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gtbl.1.gz ln -s troff.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gtroff.1.gz -ln -s devnippon ${RPM_BUILD_ROOT}/usr/share/groff/%{version}/font/devkorean +ln -s devnippon ${RPM_BUILD_ROOT}%{_datadir}/groff/%{version}/font/devkorean -cat debian/mandoc.local >> ${RPM_BUILD_ROOT}/usr/share/groff/site-tmac/mdoc.local -cat debian/mandoc.local >> ${RPM_BUILD_ROOT}/usr/share/groff/site-tmac/man.local +cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/mdoc.local +cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/man.local -find ${RPM_BUILD_ROOT}%{_prefix}/bin ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l | \ +find ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l | \ grep -v afmtodit | grep -v grog | grep -v mdoc.samples |\ grep -v mmroff |\ sed "s|${RPM_BUILD_ROOT}||g" | sed "s|\.[0-9]|\.*|g" > groff-files -install -m 644 %SOURCE6 $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/hyphen.cs +install -m 644 %SOURCE6 $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/hyphen.cs -install -m 755 %SOURCE7 $RPM_BUILD_ROOT/usr/bin/nroff +install -m 755 %SOURCE7 $RPM_BUILD_ROOT%{_bindir}/nroff -ln -sf doc.tmac $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/docj.tmac +ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac # installed, but not packaged in rpm -rm -fr $RPM_BUILD_ROOT/usr/share/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir +rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir %clean rm -rf ${RPM_BUILD_ROOT} @@ -178,14 +186,14 @@ %defattr(-,root,root) %doc BUG-REPORT NEWS PROBLEMS README TODO VERSION %doc doc/meintro.me doc/meref.me doc/pic.ms -%{_prefix}/share/groff +%{_datadir}/groff %{_infodir}/groff* %files perl %defattr(-,root,root) -%{_prefix}/bin/grog -%{_prefix}/bin/mmroff -%{_prefix}/bin/afmtodit +%{_bindir}/grog +%{_bindir}/mmroff +%{_bindir}/afmtodit %{_mandir}/man1/afmtodit.* %{_mandir}/man1/grog.* %{_mandir}/man1/mmroff* @@ -198,6 +206,13 @@ %endif %changelog +* Fri Jan 13 2006 Miroslav Lichvar 1.18.1.1-4.FC3 +- convert man pages to UTF-8 +- spec cleanup +- work if bash's noclobber is on (#127492) +- fix assertion failure on abort message (#141912) +- attempt to fix a space problem with several european languages (#137728) + * Tue Oct 19 2004 Thomas Woerner 1.18.1.1-3 - fixed groffer scripte security problem (#136314) From fedora-cvs-commits at redhat.com Mon Jan 16 13:41:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 08:41:14 -0500 Subject: rpms/groff/FC-4 groff-1.18.1.1-spacefix.patch,NONE,1.1 Message-ID: <200601161341.k0GDfEZd028042@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv27984 Added Files: groff-1.18.1.1-spacefix.patch Log Message: attempt to fix a space problem with several european languages (#137728) groff-1.18.1.1-spacefix.patch: env.cc | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE groff-1.18.1.1-spacefix.patch --- --- ./src/roff/troff/env.cc.orig 2006-01-12 14:43:05.000000000 +0100 +++ ./src/roff/troff/env.cc 2006-01-12 14:45:55.000000000 +0100 @@ -300,7 +300,7 @@ * This code is based on jgroff * about kerning between ASCII and EUC-JP */ - if (!ci->get_wchar_code()) { + if (!ci->get_wchar_code() || wchar_code(ci->get_wchar_code()) < 0x590) { /* * This node is a ASCII character node. */ From fedora-cvs-commits at redhat.com Mon Jan 16 13:42:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 08:42:01 -0500 Subject: rpms/groff/FC-4 nroff,1.1,1.2 Message-ID: <200601161342.k0GDg10C028385@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv28318 Modified Files: nroff Log Message: work if bash's noclobber is on (#127492) Index: nroff =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/nroff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nroff 9 Sep 2004 05:56:32 -0000 1.1 +++ nroff 16 Jan 2006 13:41:58 -0000 1.2 @@ -47,7 +47,7 @@ TMPFILE=$(mktemp /tmp/man.XXXXXX) trap "rm -f $TMPFILE" 0 1 2 3 15 -cat ${1+"$@"} > ${TMPFILE} +cat ${1+"$@"} >| ${TMPFILE} if iconv -f utf-8 -t utf-8 -o /dev/null ${TMPFILE} 2>/dev/null then From fedora-cvs-commits at redhat.com Mon Jan 16 13:42:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 08:42:58 -0500 Subject: rpms/groff/FC-4 groff-1.18.1-gzext.patch,1.3,1.4 Message-ID: <200601161342.k0GDgwdr028762@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv28655 Modified Files: groff-1.18.1-gzext.patch Log Message: fix assertion failure on abort message (#141912) groff-1.18.1-gzext.patch: input.cc | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) Index: groff-1.18.1-gzext.patch =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff-1.18.1-gzext.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- groff-1.18.1-gzext.patch 13 Jan 2006 12:53:21 -0000 1.3 +++ groff-1.18.1-gzext.patch 16 Jan 2006 13:42:55 -0000 1.4 @@ -15,7 +15,7 @@ + else if ((path = realpath(nm.contents(), pbuf)) == NULL && + (path = realpath(tmp, pbuf)) == NULL) + { -+ error("realpath on `%1' failed: %3", nm.contents(), strerror(errno)); ++ error("realpath on `%1' failed: %2", nm.contents(), strerror(errno)); + } else if (safer_flag && strncmp(cwd, path, strlen(cwd))) error("won't source `%1' outside of `%2' without -U flag", path, cwd); else if (stat(path, &st) < 0) From fedora-cvs-commits at redhat.com Mon Jan 16 13:45:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 08:45:03 -0500 Subject: rpms/groff/FC-4 groff.spec,1.28,1.29 Message-ID: <200601161345.k0GDj3sA029624@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/groff/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv29394 Modified Files: groff.spec Log Message: - spec cleanup - work if bash's noclobber is on (#127492) - fix assertion failure on abort message (#141912) - attempt to fix a space problem with several european languages (#137728) Index: groff.spec =================================================================== RCS file: /cvs/dist/rpms/groff/FC-4/groff.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- groff.spec 13 Jan 2006 12:53:21 -0000 1.28 +++ groff.spec 16 Jan 2006 13:45:00 -0000 1.29 @@ -3,7 +3,7 @@ Summary: A document formatting system. Name: groff Version: 1.18.1.1 -Release: 5 +Release: 6.FC4 License: GPL Group: Applications/Publishing Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz @@ -28,6 +28,7 @@ Patch18: groff-1.18.1.1-do_char.patch Patch19: groff-1.18.1.1-grn.patch Patch20: groff-1.18.1.1-tempfile.patch +Patch21: groff-1.18.1.1-spacefix.patch URL: ftp://ftp.gnu.org/gnu/groff/ Requires: mktemp @@ -93,16 +94,18 @@ %patch18 -p1 -b .do_char %patch19 -p1 -b .grn %patch20 -p1 -b .tempfile +%patch21 -p1 -b .spacefix + for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \ - src/devices/grolbp/grolbp.man; do - iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" - mv "${i}_" "$i" + src/devices/grolbp/grolbp.man; do + iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" + mv "${i}_" "$i" done %build -PATH=$PATH:%{_prefix}/X11R6/bin +#PATH=$PATH:%{_prefix}/X11R6/bin #autoconf -%configure --enable-japanese --enable-multibyte +%configure --enable-multibyte make (cd doc && makeinfo groff.texinfo) %if %{with_x} @@ -112,7 +115,7 @@ %install rm -rf ${RPM_BUILD_ROOT} -PATH=$PATH:%{_prefix}/X11R6/bin +#PATH=$PATH:%{_prefix}/X11R6/bin mkdir -p ${RPM_BUILD_ROOT}%{_prefix} ${RPM_BUILD_ROOT}%{_infodir} %makeinstall manroot=${RPM_BUILD_ROOT}/%{_mandir} #install -m 644 doc/groff.info* ${RPM_BUILD_ROOT}/%{_infodir} @@ -122,20 +125,20 @@ cd ../.. %endif #mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_prefix}/share -ln -s s.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gs.tmac -ln -s mse.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gmse.tmac -ln -s m.tmac ${RPM_BUILD_ROOT}%{_prefix}/share/groff/%version/tmac/gm.tmac -ln -s troff ${RPM_BUILD_ROOT}%{_prefix}/bin/gtroff -ln -s tbl ${RPM_BUILD_ROOT}%{_prefix}/bin/gtbl -ln -s pic ${RPM_BUILD_ROOT}%{_prefix}/bin/gpic -ln -s eqn ${RPM_BUILD_ROOT}%{_prefix}/bin/geqn -ln -s neqn ${RPM_BUILD_ROOT}%{_prefix}/bin/gneqn -ln -s refer ${RPM_BUILD_ROOT}%{_prefix}/bin/grefer -ln -s lookbib ${RPM_BUILD_ROOT}%{_prefix}/bin/glookbib -ln -s indxbib ${RPM_BUILD_ROOT}%{_prefix}/bin/gindxbib -ln -s soelim ${RPM_BUILD_ROOT}%{_prefix}/bin/gsoelim -ln -s soelim ${RPM_BUILD_ROOT}%{_prefix}/bin/zsoelim -ln -s nroff ${RPM_BUILD_ROOT}%{_prefix}/bin/gnroff +ln -s s.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gs.tmac +ln -s mse.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gmse.tmac +ln -s m.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gm.tmac +ln -s troff ${RPM_BUILD_ROOT}%{_bindir}/gtroff +ln -s tbl ${RPM_BUILD_ROOT}%{_bindir}/gtbl +ln -s pic ${RPM_BUILD_ROOT}%{_bindir}/gpic +ln -s eqn ${RPM_BUILD_ROOT}%{_bindir}/geqn +ln -s neqn ${RPM_BUILD_ROOT}%{_bindir}/gneqn +ln -s refer ${RPM_BUILD_ROOT}%{_bindir}/grefer +ln -s lookbib ${RPM_BUILD_ROOT}%{_bindir}/glookbib +ln -s indxbib ${RPM_BUILD_ROOT}%{_bindir}/gindxbib +ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/gsoelim +ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/zsoelim +ln -s nroff ${RPM_BUILD_ROOT}%{_bindir}/gnroff # Build system is compressing man-pages ln -s eqn.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/geqn.1.gz @@ -149,23 +152,23 @@ ln -s tbl.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gtbl.1.gz ln -s troff.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gtroff.1.gz -ln -s devnippon ${RPM_BUILD_ROOT}/usr/share/groff/%{version}/font/devkorean +ln -s devnippon ${RPM_BUILD_ROOT}%{_datadir}/groff/%{version}/font/devkorean -cat debian/mandoc.local >> ${RPM_BUILD_ROOT}/usr/share/groff/site-tmac/mdoc.local -cat debian/mandoc.local >> ${RPM_BUILD_ROOT}/usr/share/groff/site-tmac/man.local +cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/mdoc.local +cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/man.local -find ${RPM_BUILD_ROOT}%{_prefix}/bin ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l | \ +find ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l | \ grep -v afmtodit | grep -v grog | grep -v mdoc.samples |\ grep -v mmroff |\ sed "s|${RPM_BUILD_ROOT}||g" | sed "s|\.[0-9]|\.*|g" > groff-files -install -m 644 %SOURCE6 $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/hyphen.cs +install -m 644 %SOURCE6 $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/hyphen.cs -install -m 755 %SOURCE7 $RPM_BUILD_ROOT/usr/bin/nroff +install -m 755 %SOURCE7 $RPM_BUILD_ROOT%{_bindir}/nroff -ln -sf doc.tmac $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/docj.tmac +ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac # installed, but not packaged in rpm -rm -fr $RPM_BUILD_ROOT/usr/share/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir +rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir %clean rm -rf ${RPM_BUILD_ROOT} @@ -183,14 +186,14 @@ %defattr(-,root,root) %doc BUG-REPORT NEWS PROBLEMS README TODO VERSION %doc doc/meintro.me doc/meref.me doc/pic.ms -%{_prefix}/share/groff +%{_datadir}/groff %{_infodir}/groff* %files perl %defattr(-,root,root) -%{_prefix}/bin/grog -%{_prefix}/bin/mmroff -%{_prefix}/bin/afmtodit +%{_bindir}/grog +%{_bindir}/mmroff +%{_bindir}/afmtodit %{_mandir}/man1/afmtodit.* %{_mandir}/man1/grog.* %{_mandir}/man1/mmroff* @@ -203,6 +206,12 @@ %endif %changelog +* Mon Jan 16 2006 Miroslav Lichvar 1.18.1.1-6.FC4 +- spec cleanup +- work if bash's noclobber is on (#127492) +- fix assertion failure on abort message (#141912) +- attempt to fix a space problem with several european languages (#137728) + * Wed Nov 24 2004 Miloslav Trmac - 1.18.1.1-5 - Convert also mmroff.1 to UTF-8 From fedora-cvs-commits at redhat.com Mon Jan 16 13:50:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 08:50:20 -0500 Subject: rpms/nfs-utils/devel nfs-utils-1.0.8-rc2-innetgr.patch, NONE, 1.1 nfs-utils.spec, 1.80, 1.81 Message-ID: <200601161350.k0GDoKjR010194@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10120 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.0.8-rc2-innetgr.patch Log Message: Added innetgr patch that changes configure scripts to check for the innetgr function. nfs-utils-1.0.8-rc2-innetgr.patch: configure.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE nfs-utils-1.0.8-rc2-innetgr.patch --- --- nfs-utils-1.0.8-rc2/configure.in.orig 2006-01-16 11:37:36.000000000 +0100 +++ nfs-utils-1.0.8-rc2/configure.in 2006-01-16 11:37:36.000000000 +0100 @@ -219,9 +219,9 @@ AC_FUNC_VPRINTF AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \ gethostbyaddr gethostbyname gethostname getmntent \ - gettimeofday hasmntopt inet_ntoa memset mkdir pathconf \ - realpath rmdir select socket strcasecmp strchr strdup \ - strerror strrchr strtol strtoul]) + gettimeofday hasmntopt inet_ntoa innetgr memset mkdir \ + pathconf realpath rmdir select socket strcasecmp strchr \ + strdup strerror strrchr strtol strtoul]) dnl ************************************************************* Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- nfs-utils.spec 11 Jan 2006 22:07:07 -0000 1.80 +++ nfs-utils.spec 16 Jan 2006 13:50:16 -0000 1.81 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.8.rc2 -Release: 2.FC5 +Release: 3.FC5 # group all 32bit related archs %define all_32bit_archs i386 i686 athlon @@ -22,6 +22,7 @@ Patch54: nfs-utils-1.0.7-mountd-stat64.patch Patch55: nfs-utils-1.0.7-nfsd-ctlbits.patch Patch56: nfs-utils-1.0.8-rc2-Makefileam.patch +Patch57: nfs-utils-1.0.8-rc2-innetgr.patch Patch100: nfs-utils-1.0.8-compile.patch @@ -66,6 +67,7 @@ %patch54 -p1 -b .stat64 %patch55 -p1 -b .ctlbits %patch56 -p1 -b .makeam +%patch57 -p1 -b .innetgr # Do the magic to get things to compile %patch100 -p1 -b .compile @@ -82,14 +84,9 @@ %endif export PIE -sh autogen.sh +sh -x autogen.sh CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`" -# -# Hack to enable netgroups. If anybody knows the right way to do -# this, please help yourself. -# -ac_cv_func_innetgr=yes \ %configure \ CFLAGS="$CFLAGS" \ CPPFLAGS="$DEFINES" \ @@ -223,6 +220,10 @@ %config /etc/rc.d/init.d/nfslock %changelog +* Mon Jan 16 2006 Steve Dickson 1.0.8.rc2-3.FC5 +- Added innetgr patch that changes configure scripts to + check for the innetgr function. + * Wed Jan 11 2006 Peter Jones 1.0.8.rc2-2.FC5 - Fix lockfile naming in the initscripts so they're stopped correctly. From fedora-cvs-commits at redhat.com Mon Jan 16 13:53:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 08:53:43 -0500 Subject: rpms/nfs-utils/devel nfs-utils.spec,1.81,1.82 Message-ID: <200601161353.k0GDrh67011572@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11471 Modified Files: nfs-utils.spec Log Message: Added bz number to last changelog Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- nfs-utils.spec 16 Jan 2006 13:50:16 -0000 1.81 +++ nfs-utils.spec 16 Jan 2006 13:53:39 -0000 1.82 @@ -221,8 +221,8 @@ %changelog * Mon Jan 16 2006 Steve Dickson 1.0.8.rc2-3.FC5 -- Added innetgr patch that changes configure scripts to - check for the innetgr function. +- Added innetgr patch that changes configure scripts to + check for the innetgr function. (bz 177899) * Wed Jan 11 2006 Peter Jones 1.0.8.rc2-2.FC5 - Fix lockfile naming in the initscripts so they're stopped correctly. From fedora-cvs-commits at redhat.com Mon Jan 16 14:12:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 09:12:56 -0500 Subject: rpms/foomatic/devel foomatic-badxml.patch, NONE, 1.1 .cvsignore, 1.36, 1.37 foomatic.spec, 1.125, 1.126 sources, 1.36, 1.37 Message-ID: <200601161412.k0GECuUY008927@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8908 Modified Files: .cvsignore foomatic.spec sources Added Files: foomatic-badxml.patch Log Message: * Mon Jan 16 2006 Tim Waugh 3.0.2-31 - Fix tag mismatch in db. - Updated db to 3.0-20060116. foomatic-badxml.patch: HP-Color_LaserJet_3500.xml | 5 ----- 1 files changed, 5 deletions(-) --- NEW FILE foomatic-badxml.patch --- --- foomatic-db-20060116/db/source/printer/HP-Color_LaserJet_3500.xml.badxml 2006-01-16 13:36:35.000000000 +0000 +++ foomatic-db-20060116/db/source/printer/HP-Color_LaserJet_3500.xml 2006-01-16 13:36:45.000000000 +0000 @@ -23,11 +23,6 @@ - - PJL,PML,DW-PCL,JR4.0 - Hewlet-Packardz - hp color LaserJet 3500 - B hpijs Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 3 Jan 2006 13:08:39 -0000 1.36 +++ .cvsignore 16 Jan 2006 14:12:52 -0000 1.37 @@ -26,3 +26,4 @@ foomatic-db-hpijs-1.5-20051209.tar.gz foomatic-db-engine-3.0-20051209.tar.gz foomatic-db-3.0-20060103.tar.gz +foomatic-db-3.0-20060116.tar.gz Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- foomatic.spec 10 Jan 2006 13:27:54 -0000 1.125 +++ foomatic.spec 16 Jan 2006 14:12:52 -0000 1.126 @@ -1,4 +1,4 @@ -%define dbver 20060103 +%define dbver 20060116 %define enginever 3.0-20051209 %define filtersver 20051209 %define hpijsver 1.5-20051209 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 30 +Release: 31 License: GPL Group: System Environment/Libraries @@ -51,6 +51,9 @@ # Handle non-UTF-8 encodings in imported PPD files. Patch15: foomatic-bad-utf8.patch +# Fix tag mismatch in db. +Patch16: foomatic-badxml.patch + Url: http://www.linuxprinting.org BuildRequires: perl >= 3:5.8.1 BuildRequires: libxml2-devel @@ -110,6 +113,7 @@ pushd foomatic-db-%{dbver} %patch7 -p1 -b .ppdload-ppd +%patch16 -p1 -b .badxml %if %with_omni # Omni printers @@ -263,6 +267,10 @@ %{_var}/cache/foomatic %changelog +* Mon Jan 16 2006 Tim Waugh 3.0.2-31 +- Fix tag mismatch in db. +- Updated db to 3.0-20060116. + * Tue Jan 10 2006 Tim Waugh - Don't remove the cache directory, only its contents (bug #177266). Index: sources =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 3 Jan 2006 13:08:39 -0000 1.36 +++ sources 16 Jan 2006 14:12:52 -0000 1.37 @@ -3,4 +3,4 @@ 5876178c3aefd36102bc5eef575d3f9c foomatic-filters-3.0-20051209.tar.gz 8c217af8a570124d9ad7f8a4b1270ebe foomatic-db-hpijs-1.5-20051209.tar.gz c0375c9e1d78685639e39abe24ffbdff foomatic-db-engine-3.0-20051209.tar.gz -abe054a3f80b180b670d96f46f6ec556 foomatic-db-3.0-20060103.tar.gz +54ae910edbb0ed3816cebe05a0f0b605 foomatic-db-3.0-20060116.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 16 14:20:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 09:20:58 -0500 Subject: rpms/less/devel less-382-fixline.patch,1.1,1.2 less.spec,1.25,1.26 Message-ID: <200601161420.k0GEKwKP020287@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/less/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20275 Modified Files: less-382-fixline.patch less.spec Log Message: * Mon Jan 16 2005 Jindrich Novy 394-2 - apply better fix for #120916 from Avi Kivity (#177819) to avoid flickering when '>' is pressed multiple times less-382-fixline.patch: jump.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) Index: less-382-fixline.patch =================================================================== RCS file: /cvs/dist/rpms/less/devel/less-382-fixline.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- less-382-fixline.patch 6 Sep 2005 10:10:07 -0000 1.1 +++ less-382-fixline.patch 16 Jan 2006 14:20:52 -0000 1.2 @@ -1,10 +1,28 @@ ---- less-382/command.c.fixline 2004-02-04 05:52:26.000000000 +0100 -+++ less-382/command.c 2005-09-05 09:24:03.000000000 +0200 -@@ -1168,6 +1168,7 @@ - jump_forw(); - else - jump_back(number); +--- less-394/jump.c.fixline 2005-12-03 21:20:32.000000000 +0100 ++++ less-394/jump.c 2006-01-16 15:12:00.000000000 +0100 +@@ -30,7 +30,7 @@ + public void + jump_forw() + { +- POSITION pos; ++ POSITION pos, end_pos; + + if (ch_end_seek()) + { +@@ -42,11 +42,15 @@ jump_forw() + * Go back one line from the end of the file + * to get to the beginning of the last line. + */ +- pos = back_line(ch_tell()); ++ pos = back_line(end_pos = ch_tell()); + if (pos == NULL_POSITION) + jump_loc((POSITION)0, sc_height-1); + else ++ { + jump_loc(pos, sc_height-1); ++ if (position(sc_height-1) != end_pos) + repaint(); - break; ++ } + } - case A_GOPOS: + /* Index: less.spec =================================================================== RCS file: /cvs/dist/rpms/less/devel/less.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- less.spec 9 Dec 2005 22:41:15 -0000 1.25 +++ less.spec 16 Jan 2006 14:20:52 -0000 1.26 @@ -1,7 +1,7 @@ Summary: A text file browser similar to more, but better. Name: less Version: 394 -Release: 1.1 +Release: 2 License: GPL Group: Applications/Text Source: http://www.greenwoodsoftware.com/less/%{name}-%{version}.tar.gz @@ -54,6 +54,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 16 2005 Jindrich Novy 394-2 +- apply better fix for #120916 from Avi Kivity (#177819) + to avoid flickering when '>' is pressed multiple times + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Mon Jan 16 14:21:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 09:21:47 -0500 Subject: rpms/less/devel less.spec,1.26,1.27 Message-ID: <200601161421.k0GELkDA020338@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/less/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20325 Modified Files: less.spec Log Message: fix date in changelog Index: less.spec =================================================================== RCS file: /cvs/dist/rpms/less/devel/less.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- less.spec 16 Jan 2006 14:20:52 -0000 1.26 +++ less.spec 16 Jan 2006 14:21:41 -0000 1.27 @@ -54,7 +54,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Jan 16 2005 Jindrich Novy 394-2 +* Mon Jan 16 2006 Jindrich Novy 394-2 - apply better fix for #120916 from Avi Kivity (#177819) to avoid flickering when '>' is pressed multiple times From fedora-cvs-commits at redhat.com Mon Jan 16 14:26:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 09:26:19 -0500 Subject: rpms/xsane/devel xsane-0.99-buffer.patch, NONE, 1.1 xsane.spec, 1.26, 1.27 Message-ID: <200601161426.k0GEQJ1B020449@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/xsane/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20432 Modified Files: xsane.spec Added Files: xsane-0.99-buffer.patch Log Message: fix buffer overflow xsane-0.99-buffer.patch: xsane-scan.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE xsane-0.99-buffer.patch --- --- xsane-0.99/src/xsane-scan.c.buffer 2005-12-28 20:55:03.000000000 +0100 +++ xsane-0.99/src/xsane-scan.c 2006-01-16 15:23:38.000000000 +0100 @@ -1772,11 +1772,11 @@ char buf2[255]; if (preferences.adf_pages_max > 1) { - snprintf(buf2, sizeof(buf), "%s (%d/%d)", PROGRESS_SCANNING, xsane.adf_page_counter+1, preferences.adf_pages_max); + snprintf(buf2, sizeof(buf2), "%s (%d/%d)", PROGRESS_SCANNING, xsane.adf_page_counter+1, preferences.adf_pages_max); } else { - snprintf(buf2, sizeof(buf), "%s (%d)", PROGRESS_SCANNING, xsane.adf_page_counter+1); + snprintf(buf2, sizeof(buf2), "%s (%d)", PROGRESS_SCANNING, xsane.adf_page_counter+1); } xsane_progress_new(buf, buf2, (GtkSignalFunc) xsane_cancel, NULL); } Index: xsane.spec =================================================================== RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- xsane.spec 13 Jan 2006 17:20:03 -0000 1.26 +++ xsane.spec 16 Jan 2006 14:26:12 -0000 1.27 @@ -7,6 +7,7 @@ Patch0: xsane-0.90-htmlview.patch Patch1: xsane-medium-definitions.patch Patch2: xsane-0.92_gimp2.0.patch +Patch3: xsane-0.99-buffer.patch License: GPL URL: http://www.xsane.org/ Group: Applications/Multimedia @@ -39,6 +40,7 @@ %patch0 -p1 -b .htmlview %patch1 -p1 -b .medium-definitions %patch2 -p1 -b .gimp2.0 +%patch3 -p1 -b .buffer %build %{expand:%%define optflags %{optflags} -DGIMP_ENABLE_COMPAT_CRUFT=1} @@ -95,7 +97,10 @@ exit 0 %changelog -* Fri Jan 13 2006 Nils Philippsen 0.99-1 +* Mon Jan 16 2006 Nils Philippsen 0.99-1 +- fix buffer overflow + +* Fri Jan 13 2006 Nils Philippsen - version 0.99 * Fri Dec 09 2005 Jesse Keating From fedora-cvs-commits at redhat.com Mon Jan 16 14:27:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 09:27:14 -0500 Subject: rpms/xsane/devel xsane.spec,1.27,1.28 Message-ID: <200601161427.k0GERErS020512@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/xsane/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20498 Modified Files: xsane.spec Log Message: bump release Index: xsane.spec =================================================================== RCS file: /cvs/dist/rpms/xsane/devel/xsane.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- xsane.spec 16 Jan 2006 14:26:12 -0000 1.27 +++ xsane.spec 16 Jan 2006 14:27:10 -0000 1.28 @@ -1,7 +1,7 @@ Name: xsane Summary: An X Window System front-end for the SANE scanner interface. Version: 0.99 -Release: 1 +Release: 2 Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source1: xsane-install-gimp-plugin Patch0: xsane-0.90-htmlview.patch @@ -97,10 +97,10 @@ exit 0 %changelog -* Mon Jan 16 2006 Nils Philippsen 0.99-1 +* Mon Jan 16 2006 Nils Philippsen 0.99-2 - fix buffer overflow -* Fri Jan 13 2006 Nils Philippsen +* Fri Jan 13 2006 Nils Philippsen 0.99-1 - version 0.99 * Fri Dec 09 2005 Jesse Keating From fedora-cvs-commits at redhat.com Mon Jan 16 15:03:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 10:03:32 -0500 Subject: rpms/gnome-session/devel gnome-session-2.13.4-no-crashes.patch, NONE, 1.1 gnome-session.spec, 1.49, 1.50 Message-ID: <200601161503.k0GF3Wav010318@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10063 Modified Files: gnome-session.spec Added Files: gnome-session-2.13.4-no-crashes.patch Log Message: No fatal criticals gnome-session-2.13.4-no-crashes.patch: main.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE gnome-session-2.13.4-no-crashes.patch --- --- gnome-session-2.13.4/gnome-session/main.c.no-crashes 2006-01-16 09:59:23.000000000 -0500 +++ gnome-session-2.13.4/gnome-session/main.c 2006-01-16 09:59:41.000000000 -0500 @@ -344,6 +344,7 @@ if (getenv ("GSM_VERBOSE_DEBUG")) gsm_set_verbose (TRUE); +#if 0 /* Help eradicate the critical warnings in unstable releases of GNOME */ versions = g_strsplit (VERSION, ".", 3); if (versions && versions [0] && versions [1]) @@ -357,6 +358,7 @@ } } g_strfreev (versions); +#endif set_lang(); set_gtk1_theme_rcfile (); Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gnome-session.spec 14 Jan 2006 00:40:01 -0000 1.49 +++ gnome-session.spec 16 Jan 2006 15:03:29 -0000 1.50 @@ -13,7 +13,7 @@ Summary: GNOME session manager Name: gnome-session Version: 2.13.4 -Release: 1 +Release: 2 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -48,6 +48,8 @@ Patch7: gnome-session-user-share.patch # do shaped window for splash screen Patch8: gnome-session-2.12.0-shaped.patch +# too much crashing +Patch9: gnome-session-2.13.4-no-crashes.patch BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} @@ -149,6 +151,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Mon Jan 16 2006 Matthias Clasen - 2.13.4-2 +- Disable the fatal-criticals, since it crashes too much + * Fri Jan 13 2006 Matthias Clasen - 2.13.4-1 - Update to 2.13.4 From fedora-cvs-commits at redhat.com Mon Jan 16 15:53:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 10:53:24 -0500 Subject: rpms/kdegraphics/FC-4 post-3.5.0-kdegraphics-CAN-2005-3193.diff, NONE, 1.1 kdegraphics.spec, 1.51, 1.52 admin-visibility.patch, 1.3, NONE kdegraphics-3.3.2-cleanup.patch, 1.1, NONE kdegraphics-3.4.1-dviwin_draw.patch, 1.1, NONE kdegraphics-3.4.1-gcc4.patch, 1.1, NONE Message-ID: <200601161553.k0GFrOGf016302@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdegraphics/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16253 Modified Files: kdegraphics.spec Added Files: post-3.5.0-kdegraphics-CAN-2005-3193.diff Removed Files: admin-visibility.patch kdegraphics-3.3.2-cleanup.patch kdegraphics-3.4.1-dviwin_draw.patch kdegraphics-3.4.1-gcc4.patch Log Message: final fix for CAN-2005-3193 post-3.5.0-kdegraphics-CAN-2005-3193.diff: goo/gmem.c | 5 +++-- xpdf/JBIG2Stream.cc | 28 +++++++++++++++++++++++++++- xpdf/Stream.cc | 49 ++++++++++++++++++++++++++++++++++++++++++++----- xpdf/Stream.h | 15 ++++++++++++--- 4 files changed, 86 insertions(+), 11 deletions(-) --- NEW FILE post-3.5.0-kdegraphics-CAN-2005-3193.diff --- Index: kpdf/xpdf/xpdf/JBIG2Stream.cc =================================================================== --- kpdf/xpdf/xpdf/JBIG2Stream.cc (revision 481099) +++ kpdf/xpdf/xpdf/JBIG2Stream.cc (revision 488715) @@ -7,6 +7,7 @@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@ -681,6 +682,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = wA; h = hA; line = (wA + 7) >> 3; + + if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line ) { + data = NULL; + return; + } + // need to allocate one extra guard byte for use in combine() data = (Guchar *)gmalloc(h * line + 1); data[h * line] = 0; @@ -692,6 +699,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = bitmap->w; h = bitmap->h; line = bitmap->line; + + if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { + data = NULL; + return; + } + // need to allocate one extra guard byte for use in combine() data = (Guchar *)gmalloc(h * line + 1); memcpy(data, bitmap->data, h * line); @@ -720,7 +733,8 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint } void JBIG2Bitmap::expand(int newH, Guint pixel) { - if (newH <= h) { + + if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) { return; } // need to allocate one extra guard byte for use in combine() @@ -2305,6 +2319,15 @@ void JBIG2Stream::readHalftoneRegionSeg( error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } + if (gridH == 0 || gridW >= INT_MAX / gridH) { + error(getPos(), "Bad size in JBIG2 halftone segment"); + return; + } + if (h < 0 || w == 0 || h >= INT_MAX / w) { + error(getPos(), "Bad size in JBIG2 bitmap segment"); + return; + } + patternDict = (JBIG2PatternDict *)seg; bpp = 0; i = 1; @@ -2936,6 +2959,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2; int x, y, pix; + if (w < 0 || h <= 0 || w >= INT_MAX / h) + return NULL; + bitmap = new JBIG2Bitmap(0, w, h); bitmap->clearToZero(); Index: kpdf/xpdf/xpdf/Stream.cc =================================================================== --- kpdf/xpdf/xpdf/Stream.cc (revision 481099) +++ kpdf/xpdf/xpdf/Stream.cc (revision 488715) @@ -15,6 +15,7 @@ #include #include #include +#include #ifndef WIN32 #include #endif @@ -408,13 +409,27 @@ StreamPredictor::StreamPredictor(Stream width = widthA; nComps = nCompsA; nBits = nBitsA; + predLine = NULL; + ok = gFalse; + + if (width <= 0 || nComps <= 0 || nBits <= 0 || + nComps >= INT_MAX / nBits || + width >= INT_MAX / nComps / nBits) + return; nVals = width * nComps; + if (nVals * nBits + 7 <= 0) + return; pixBytes = (nComps * nBits + 7) >> 3; rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; + if (rowBytes < 0) + return; + predLine = (Guchar *)gmalloc(rowBytes); memset(predLine, 0, rowBytes); predIdx = rowBytes; + + ok = gTrue; } StreamPredictor::~StreamPredictor() { @@ -1006,6 +1021,10 @@ LZWStream::LZWStream(Stream *strA, int p FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if (!pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } @@ -1258,8 +1277,9 @@ CCITTFaxStream::CCITTFaxStream(Stream *s endOfLine = endOfLineA; byteAlign = byteAlignA; columns = columnsA; - if (columns < 1) { - columns = 1; + if (columns < 1 || columns >= INT_MAX / sizeof(short)) { + error(getPos(), "Bad number of columns in CCITTFaxStream"); + exit(1); } rows = rowsA; endOfBlock = endOfBlockA; @@ -2903,7 +2923,12 @@ GBool DCTStream::readBaselineSOF() { height = read16(); width = read16(); numComps = str->getChar(); - if (prec != 8) { + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream", prec); + return gFalse; + } + if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; } @@ -2929,6 +2954,11 @@ GBool DCTStream::readProgressiveSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@ -2951,6 +2981,11 @@ GBool DCTStream::readScanInfo() { length = read16() - 2; scanInfo.numComps = str->getChar(); + if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { + scanInfo.numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } --length; if (length != 2 * scanInfo.numComps + 3) { error(getPos(), "Bad DCT scan info block"); @@ -3035,12 +3070,12 @@ GBool DCTStream::readHuffmanTables() { while (length > 0) { index = str->getChar(); --length; - if ((index & 0x0f) >= 4) { + if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) { error(getPos(), "Bad DCT Huffman table"); return gFalse; } if (index & 0x10) { - index &= 0x0f; + index &= 0x03; if (index >= numACHuffTables) numACHuffTables = index+1; tbl = &acHuffTables[index]; @@ -3833,6 +3868,10 @@ FlateStream::FlateStream(Stream *strA, i FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if (!pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } Index: kpdf/xpdf/xpdf/Stream.h =================================================================== --- kpdf/xpdf/xpdf/Stream.h (revision 481099) +++ kpdf/xpdf/xpdf/Stream.h (revision 488715) @@ -232,6 +232,8 @@ public: ~StreamPredictor(); + GBool isOk() { return ok; } + int lookChar(); int getChar(); @@ -249,6 +251,7 @@ private: int rowBytes; // bytes per line Guchar *predLine; // line buffer int predIdx; // current index in predLine + GBool ok; }; //------------------------------------------------------------------------ --- kpdf/xpdf/xpdf/JPXStream.cc (revision 481099) +++ kpdf/xpdf/xpdf/JPXStream.cc (revision 488715) @@ -7,6 +7,7 @@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@ -783,7 +784,7 @@ GBool JPXStream::readCodestream(Guint /* int segType; GBool haveSIZ, haveCOD, haveQCD, haveSOT; Guint precinctSize, style; - Guint segLen, capabilities, comp, i, j, r; + Guint segLen, capabilities, nTiles, comp, i, j, r; //----- main header haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; @@ -818,8 +819,13 @@ GBool JPXStream::readCodestream(Guint /* / img.xTileSize; img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) / img.yTileSize; - img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles, - sizeof(JPXTile)); + nTiles = img.nXTiles * img.nYTiles; + // check for overflow before allocating memory + if (img.nXTiles <= 0 || img.nYTiles <= 0 || img.nXTiles >= INT_MAX / img.nYTiles) { + error(getPos(), "Bad tile count in JPX SIZ marker segment"); + return gFalse; + } + img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile)); for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps, sizeof(JPXTileComp)); Index: kpdf/xpdf/goo/gmem.c =================================================================== --- kpdf/xpdf/goo/gmem.c (revision 481099) +++ kpdf/xpdf/goo/gmem.c (revision 488715) @@ -11,6 +11,7 @@ #include #include #include +#include #include "gmem.h" #ifdef DEBUG_MEM @@ -141,7 +142,7 @@ void *gmallocn(int nObjs, int objSize) { int n; n = nObjs * objSize; - if (objSize == 0 || n / objSize != nObjs) { + if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { fprintf(stderr, "Bogus memory allocation size\n"); exit(1); } @@ -152,7 +153,7 @@ void *greallocn(void *p, int nObjs, int int n; n = nObjs * objSize; - if (objSize == 0 || n / objSize != nObjs) { + if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { fprintf(stderr, "Bogus memory allocation size\n"); exit(1); } Index: kdegraphics.spec =================================================================== RCS file: /cvs/dist/rpms/kdegraphics/FC-4/kdegraphics.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- kdegraphics.spec 5 Jul 2005 07:02:42 -0000 1.51 +++ kdegraphics.spec 16 Jan 2006 15:53:20 -0000 1.52 @@ -10,22 +10,25 @@ %define no_scanner_archs s390 s390x -Version: 3.4.1 -Release: 0.fc4.2 +%define disable_gcc_check_and_hidden_visibility 1 + +Version: 3.5.0 +Release: 0.2.fc4 Name: kdegraphics Summary: K Desktop Environment - Graphics Applications Epoch: 7 Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{rfelease}-buildroot License: GPL +Url: http://www.kde.org Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: kde-libtool.patch Patch1: kdegraphics-3.3.0-misc.patch Patch2: kdegraphics-3.3.1-xorg.patch -Patch3: admin-visibility.patch -Patch4: kdegraphics-3.4.1-gcc4.patch -Patch5: kdegraphics-3.4.1-dviwin_draw.patch + +# securitiy fixes +Patch100: post-3.5.0-kdegraphics-CAN-2005-3193.diff %ifnarch %{no_scanner_archs} BuildRequires: sane-backends-devel >= 1.0.3-10 @@ -43,6 +46,7 @@ BuildRequires: libtiff-devel BuildRequires: imlib-devel BuildRequires: fribidi-devel +BuildRequires: libieee1284-devel Requires: kdelibs >= 6:%{version} Requires: kdebase >= 6:%{version} @@ -260,21 +264,27 @@ %patch0 -p1 -b .libtool %patch1 -p1 -b .misc %patch2 -p1 -b .xorg -%patch3 -p1 -b .gcc -%patch4 -p1 -b .gcc4 -%patch5 -p1 -b .gcc4 + +# security fixes +%patch100 -p0 -b .CAN-2005-3193 %if %{rhel} echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in %endif - # disable kpovmodeler temporary. waiting for freeglut %if !%{kpovmodeler} echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kpovmodeler\"" >kpovmodeler/configure.in.in %endif +%if %{disable_gcc_check_and_hidden_visibility} + # disable gcc check + perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in + # disable hidden visibility + perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in +%endif + %if %{make_cvs} make -f admin/Makefile.common cvs %endif @@ -319,7 +329,9 @@ done popd -echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop +if [ -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop ] ; then + echo "OnlyShowIn=KDE;" >> $RPM_BUILD_ROOT%{_datadir}/applications/kde/kcmkmrml.desktop +fi %clean rm -rf $RPM_BUILD_ROOT @@ -338,12 +350,11 @@ %{_datadir}/applications/kde/* %{_datadir}/applnk/* %{_datadir}/apps/* -%ifnarch %{no_scanner_archs} %{_datadir}/config/* -%endif %{_datadir}/config.kcfg/* %{_datadir}/icons/*/*/*/* %{_datadir}/mimelnk/text/* +%{_datadir}/mimelnk/image/* %{_datadir}/services/* %{_datadir}/servicetypes/* @@ -352,6 +363,21 @@ %{_includedir}/kde/* %changelog +* Mon Jan 16 2006 Than Ngo 7:3.5.0-0.2.fc4 +- final fix for CAN-2005-3193 + +* Tue Dec 13 2005 Than Ngo 7:3.5.0-0.1.fc4 +- 3.5 + +* Thu Sep 15 2005 Than Ngo 7:3.4.2-0.fc4.3 +- add BuildRequires: libieee1284-devel #168356 + +* Mon Sep 05 2005 Than Ngo 7:3.4.2-0.fc4.2 +- backport CVS patches to fix several crash in kpdf, #167390 + +* Thu Jul 28 2005 Than Ngo 7:3.4.2-0.fc4.1 +- update to 3.4.2, CAN-2005-2097, #163926 + * Tue Jul 05 2005 Than Ngo 3.4.1-0.fc4.2 - apply gcc4 workaround to fix #162430 --- admin-visibility.patch DELETED --- --- kdegraphics-3.3.2-cleanup.patch DELETED --- --- kdegraphics-3.4.1-dviwin_draw.patch DELETED --- --- kdegraphics-3.4.1-gcc4.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 16 15:54:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 10:54:46 -0500 Subject: rpms/system-config-date/devel .cvsignore, 1.34, 1.35 sources, 1.37, 1.38 system-config-date.spec, 1.42, 1.43 Message-ID: <200601161554.k0GFskWG016927@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-date/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16814 Modified Files: .cvsignore sources system-config-date.spec Log Message: put Etc/... timezones into "Non-geographic timezones" (#148025) default to already set timezone on startup (#177815) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- .cvsignore 9 Jan 2006 23:34:55 -0000 1.34 +++ .cvsignore 16 Jan 2006 15:54:42 -0000 1.35 @@ -1,2 +1 @@ -system-config-date-1.7.99.12.tar.bz2 -system-config-date-1.7.99.13.tar.bz2 +system-config-date-1.7.99.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 9 Jan 2006 23:34:55 -0000 1.37 +++ sources 16 Jan 2006 15:54:42 -0000 1.38 @@ -1 +1 @@ -92f145b8d291945697ca009f024de303 system-config-date-1.7.99.13.tar.bz2 +d679b271a906c3491d4ec7f59a082993 system-config-date-1.7.99.14.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- system-config-date.spec 9 Jan 2006 23:34:55 -0000 1.42 +++ system-config-date.spec 16 Jan 2006 15:54:42 -0000 1.43 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.7.99.13 +Version: 1.7.99.14 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -93,6 +93,13 @@ %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template %changelog +* Mon Jan 16 2006 Nils Philippsen 1.7.99.14-1 +- put Etc/... timezones into "Non-geographic timezones" (#148025) +- default to already set timezone on startup (#177815) + +* Tue Jan 10 2006 Nils Philippsen +- Add translation string for UTC-relative and other non-geographic timezones + * Mon Jan 09 2006 Chris Lumens 1.7.99.13-1 - Rename mainWindow to scdMainWindow to avoid import problems in firstboot. From fedora-cvs-commits at redhat.com Mon Jan 16 16:01:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 11:01:45 -0500 Subject: rpms/kdegraphics/FC-3 post-3.4.3-kdegraphics-CAN-2005-3193.diff, NONE, 1.1 kdegraphics.spec, 1.45, 1.46 Message-ID: <200601161601.k0GG1jNP019462@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdegraphics/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv19409 Modified Files: kdegraphics.spec Added Files: post-3.4.3-kdegraphics-CAN-2005-3193.diff Log Message: apply patch to fix CAN-2005-3193, #175107 post-3.4.3-kdegraphics-CAN-2005-3193.diff: goo/gmem.c | 23 +++++++++++++++++++++++ goo/gmem.h | 9 +++++++++ xpdf/JBIG2Stream.cc | 34 +++++++++++++++++++++++++++++++++- xpdf/JPXStream.cc | 11 ++++++++--- xpdf/Stream.cc | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- xpdf/Stream.h | 3 +++ 6 files changed, 122 insertions(+), 6 deletions(-) --- NEW FILE post-3.4.3-kdegraphics-CAN-2005-3193.diff --- Index: kpdf/xpdf/xpdf/JBIG2Stream.cc =================================================================== --- kpdf/xpdf/xpdf/JBIG2Stream.cc (revision 466932) +++ kpdf/xpdf/xpdf/JBIG2Stream.cc (revision 488714) @@ -7,6 +7,7 @@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@ -681,6 +682,13 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = wA; h = hA; line = (wA + 7) >> 3; + + if (h < 0 || line <= 0 || h >= INT_MAX / line) { + error(-1, "invalid width/height"); + data = NULL; + return; + } + data = (Guchar *)gmalloc(h * line); } @@ -690,6 +698,13 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = bitmap->w; h = bitmap->h; line = bitmap->line; + + if (h < 0 || line <= 0 || h >= INT_MAX / line) { + error(-1, "invalid width/height"); + data = NULL; + return; + } + data = (Guchar *)gmalloc(h * line); memcpy(data, bitmap->data, h * line); } @@ -716,7 +731,10 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint } void JBIG2Bitmap::expand(int newH, Guint pixel) { - if (newH <= h) { + if (newH <= h || line <= 0 || newH >= INT_MAX / line) { + error(-1, "invalid width/height"); + gfree(data); + data = NULL; return; } data = (Guchar *)grealloc(data, newH * line); @@ -2256,6 +2274,15 @@ void JBIG2Stream::readHalftoneRegionSeg( error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } + if (gridH == 0 || gridW >= INT_MAX / gridH) { + error(getPos(), "Bad size in JBIG2 halftone segment"); + return; + } + if (w == 0 || h >= INT_MAX / w) { + error(getPos(), "Bad size in JBIG2 bitmap segment"); + return; + } + patternDict = (JBIG2PatternDict *)seg; bpp = 0; i = 1; @@ -2887,6 +2914,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2; int x, y, pix; + if (w < 0 || h <= 0 || w >= INT_MAX / h) { + error(-1, "invalid width/height"); + return NULL; + } + bitmap = new JBIG2Bitmap(0, w, h); bitmap->clearToZero(); Index: kpdf/xpdf/xpdf/Stream.cc =================================================================== --- kpdf/xpdf/xpdf/Stream.cc (revision 466932) +++ kpdf/xpdf/xpdf/Stream.cc (revision 488714) @@ -15,6 +15,7 @@ #include #include #include +#include #ifndef WIN32 #include #endif @@ -413,13 +414,27 @@ StreamPredictor::StreamPredictor(Stream width = widthA; nComps = nCompsA; nBits = nBitsA; + predLine = NULL; + ok = gFalse; + + if (width <= 0 || nComps <= 0 || nBits <= 0 || + nComps >= INT_MAX / nBits || + width >= INT_MAX / nComps / nBits) + return; nVals = width * nComps; + if (nVals * nBits + 7 <= 0) + return; pixBytes = (nComps * nBits + 7) >> 3; rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; + if (rowBytes < 0) + return; + predLine = (Guchar *)gmalloc(rowBytes); memset(predLine, 0, rowBytes); predIdx = rowBytes; + + ok = gTrue; } StreamPredictor::~StreamPredictor() { @@ -1013,6 +1028,10 @@ LZWStream::LZWStream(Stream *strA, int p FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if (!pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } @@ -1261,6 +1280,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s endOfLine = endOfLineA; byteAlign = byteAlignA; columns = columnsA; + if (columns < 1 || columns >= INT_MAX / sizeof(short)) { + error(-1, "invalid number of columns"); + exit(1); + } rows = rowsA; endOfBlock = endOfBlockA; black = blackA; @@ -2899,6 +2922,11 @@ GBool DCTStream::readBaselineSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@ -2925,6 +2953,11 @@ GBool DCTStream::readProgressiveSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@ -2947,6 +2980,11 @@ GBool DCTStream::readScanInfo() { length = read16() - 2; scanInfo.numComps = str->getChar(); + if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { + scanInfo.numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } --length; if (length != 2 * scanInfo.numComps + 3) { error(getPos(), "Bad DCT scan info block"); @@ -3021,12 +3059,12 @@ GBool DCTStream::readHuffmanTables() { while (length > 0) { index = str->getChar(); --length; - if ((index & 0x0f) >= 4) { + if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) { error(getPos(), "Bad DCT Huffman table"); return gFalse; } if (index & 0x10) { - index &= 0x0f; + index &= 0x03; if (index >= numACHuffTables) numACHuffTables = index+1; tbl = &acHuffTables[index]; @@ -3144,9 +3182,11 @@ int DCTStream::readMarker() { do { do { c = str->getChar(); + if(c == EOF) return EOF; } while (c != 0xff); do { c = str->getChar(); + if(c == EOF) return EOF; } while (c == 0xff); } while (c == 0x00); return c; @@ -3258,6 +3298,10 @@ FlateStream::FlateStream(Stream *strA, i FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if (!pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } Index: kpdf/xpdf/xpdf/Stream.h =================================================================== --- kpdf/xpdf/xpdf/Stream.h (revision 466932) +++ kpdf/xpdf/xpdf/Stream.h (revision 488714) @@ -233,6 +233,8 @@ public: ~StreamPredictor(); + GBool isOk() { return ok; } + int lookChar(); int getChar(); @@ -250,6 +252,7 @@ private: int rowBytes; // bytes per line Guchar *predLine; // line buffer int predIdx; // current index in predLine + GBool ok; }; //------------------------------------------------------------------------ Index: kpdf/xpdf/xpdf/JPXStream.cc =================================================================== --- kpdf/xpdf/xpdf/JPXStream.cc (revision 466932) +++ kpdf/xpdf/xpdf/JPXStream.cc (revision 488714) @@ -7,6 +7,7 @@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@ -666,7 +667,7 @@ GBool JPXStream::readCodestream(Guint /* int segType; GBool haveSIZ, haveCOD, haveQCD, haveSOT; Guint precinctSize, style; - Guint segLen, capabilities, comp, i, j, r; + Guint segLen, capabilities, nTiles, comp, i, j, r; //----- main header haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; @@ -701,8 +702,12 @@ GBool JPXStream::readCodestream(Guint /* / img.xTileSize; img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) / img.yTileSize; - img.tiles = (JPXTile *)gmalloc(img.nXTiles * img.nYTiles * - sizeof(JPXTile)); + nTiles = img.nXTiles * img.nYTiles; + if (img.nXTiles <= 0 || img.nYTiles <= 0 || img.nXTiles >= INT_MAX / img.nYTiles) { + error(getPos(), "Bad tile count in JPX SIZ marker segment"); + return gFalse; + } + img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile)); for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps * sizeof(JPXTileComp)); Index: kpdf/xpdf/goo/gmem.c =================================================================== --- kpdf/xpdf/goo/gmem.c (revision 466932) +++ kpdf/xpdf/goo/gmem.c (revision 488714) @@ -11,6 +11,7 @@ #include #include #include +#include #include "gmem.h" #ifdef DEBUG_MEM @@ -175,6 +176,28 @@ void gfree(void *p) { #endif } +void *gmallocn(int nObjs, int objSize) { + int n; + + n = nObjs * objSize; + if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { + fprintf(stderr, "Bogus memory allocation size\n"); + exit(1); + } + return gmalloc(n); +} + +void *greallocn(void *p, int nObjs, int objSize) { + int n; + + n = nObjs * objSize; + if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { + fprintf(stderr, "Bogus memory allocation size\n"); + exit(1); + } + return grealloc(p, n); +} + #ifdef DEBUG_MEM void gMemReport(FILE *f) { GMemHdr *p; Index: kpdf/xpdf/goo/gmem.h =================================================================== --- kpdf/xpdf/goo/gmem.h (revision 466932) +++ kpdf/xpdf/goo/gmem.h (revision 488714) @@ -28,6 +28,15 @@ extern void *gmalloc(size_t size); extern void *grealloc(void *p, size_t size); /* + * These are similar to gmalloc and grealloc, but take an object count + * and size. The result is similar to allocating nObjs * objSize + * bytes, but there is an additional error check that the total size + * doesn't overflow an int. + */ +extern void *gmallocn(int nObjs, int objSize); +extern void *greallocn(void *p, int nObjs, int objSize); + +/* * Same as free, but checks for and ignores NULL pointers. */ extern void gfree(void *p); Index: kdegraphics.spec =================================================================== RCS file: /cvs/dist/rpms/kdegraphics/FC-3/kdegraphics.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- kdegraphics.spec 15 Sep 2005 11:15:03 -0000 1.45 +++ kdegraphics.spec 16 Jan 2006 16:01:24 -0000 1.46 @@ -10,7 +10,7 @@ %define no_scanner_archs s390 s390x Version: 3.4.2 -Release: 0.fc3.2 +Release: 0.fc3.3 Name: kdegraphics Summary: K Desktop Environment - Graphics Applications Epoch: 7 @@ -24,6 +24,9 @@ Patch1: kdegraphics-3.3.0-misc.patch Patch2: kdegraphics-3.3.1-xorg.patch +# securitiy fixes +Patch100: post-3.4.3-kdegraphics-CAN-2005-3193.diff + %ifnarch %{no_scanner_archs} BuildRequires: sane-backends-devel >= 1.0.3-10 BuildRequires: gphoto2-devel @@ -259,6 +262,9 @@ %patch1 -p1 -b .misc %patch2 -p1 -b .xorg +# security fixes +%patch100 -p0 -b .CAN-2005-3193 + %if %{rhel} echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in @@ -346,6 +352,9 @@ %{_includedir}/kde/* %changelog +* Mon Jan 16 2006 Than Ngo 7:3.4.2-0.fc3.3 +- apply patch to fix CAN-2005-3193, #175107 + * Thu Sep 15 2005 Than Ngo 7:3.4.2-0.fc3.2 - add BuildRequires: libieee1284-devel #168356 From fedora-cvs-commits at redhat.com Mon Jan 16 16:06:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 11:06:39 -0500 Subject: rpms/kdegraphics/devel post-3.5.0-kdegraphics-CAN-2005-3193.diff, NONE, 1.1 kdegraphics.spec, 1.68, 1.69 Message-ID: <200601161606.k0GG6dBT020334@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdegraphics/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20295 Modified Files: kdegraphics.spec Added Files: post-3.5.0-kdegraphics-CAN-2005-3193.diff Log Message: apply patch to fix CAN-2005-3193, #177908 post-3.5.0-kdegraphics-CAN-2005-3193.diff: goo/gmem.c | 5 +++-- xpdf/JBIG2Stream.cc | 28 +++++++++++++++++++++++++++- xpdf/Stream.cc | 49 ++++++++++++++++++++++++++++++++++++++++++++----- xpdf/Stream.h | 15 ++++++++++++--- 4 files changed, 86 insertions(+), 11 deletions(-) --- NEW FILE post-3.5.0-kdegraphics-CAN-2005-3193.diff --- Index: kpdf/xpdf/xpdf/JBIG2Stream.cc =================================================================== --- kpdf/xpdf/xpdf/JBIG2Stream.cc (revision 481099) +++ kpdf/xpdf/xpdf/JBIG2Stream.cc (revision 488715) @@ -7,6 +7,7 @@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@ -681,6 +682,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = wA; h = hA; line = (wA + 7) >> 3; + + if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line ) { + data = NULL; + return; + } + // need to allocate one extra guard byte for use in combine() data = (Guchar *)gmalloc(h * line + 1); data[h * line] = 0; @@ -692,6 +699,12 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, w = bitmap->w; h = bitmap->h; line = bitmap->line; + + if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { + data = NULL; + return; + } + // need to allocate one extra guard byte for use in combine() data = (Guchar *)gmalloc(h * line + 1); memcpy(data, bitmap->data, h * line); @@ -720,7 +733,8 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint } void JBIG2Bitmap::expand(int newH, Guint pixel) { - if (newH <= h) { + + if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) { return; } // need to allocate one extra guard byte for use in combine() @@ -2305,6 +2319,15 @@ void JBIG2Stream::readHalftoneRegionSeg( error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); return; } + if (gridH == 0 || gridW >= INT_MAX / gridH) { + error(getPos(), "Bad size in JBIG2 halftone segment"); + return; + } + if (h < 0 || w == 0 || h >= INT_MAX / w) { + error(getPos(), "Bad size in JBIG2 bitmap segment"); + return; + } + patternDict = (JBIG2PatternDict *)seg; bpp = 0; i = 1; @@ -2936,6 +2959,9 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2; int x, y, pix; + if (w < 0 || h <= 0 || w >= INT_MAX / h) + return NULL; + bitmap = new JBIG2Bitmap(0, w, h); bitmap->clearToZero(); Index: kpdf/xpdf/xpdf/Stream.cc =================================================================== --- kpdf/xpdf/xpdf/Stream.cc (revision 481099) +++ kpdf/xpdf/xpdf/Stream.cc (revision 488715) @@ -15,6 +15,7 @@ #include #include #include +#include #ifndef WIN32 #include #endif @@ -408,13 +409,27 @@ StreamPredictor::StreamPredictor(Stream width = widthA; nComps = nCompsA; nBits = nBitsA; + predLine = NULL; + ok = gFalse; + + if (width <= 0 || nComps <= 0 || nBits <= 0 || + nComps >= INT_MAX / nBits || + width >= INT_MAX / nComps / nBits) + return; nVals = width * nComps; + if (nVals * nBits + 7 <= 0) + return; pixBytes = (nComps * nBits + 7) >> 3; rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; + if (rowBytes < 0) + return; + predLine = (Guchar *)gmalloc(rowBytes); memset(predLine, 0, rowBytes); predIdx = rowBytes; + + ok = gTrue; } StreamPredictor::~StreamPredictor() { @@ -1006,6 +1021,10 @@ LZWStream::LZWStream(Stream *strA, int p FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if (!pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } @@ -1258,8 +1277,9 @@ CCITTFaxStream::CCITTFaxStream(Stream *s endOfLine = endOfLineA; byteAlign = byteAlignA; columns = columnsA; - if (columns < 1) { - columns = 1; + if (columns < 1 || columns >= INT_MAX / sizeof(short)) { + error(getPos(), "Bad number of columns in CCITTFaxStream"); + exit(1); } rows = rowsA; endOfBlock = endOfBlockA; @@ -2903,7 +2923,12 @@ GBool DCTStream::readBaselineSOF() { height = read16(); width = read16(); numComps = str->getChar(); - if (prec != 8) { + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream", prec); + return gFalse; + } + if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; } @@ -2929,6 +2954,11 @@ GBool DCTStream::readProgressiveSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { + numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; @@ -2951,6 +2981,11 @@ GBool DCTStream::readScanInfo() { length = read16() - 2; scanInfo.numComps = str->getChar(); + if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { + scanInfo.numComps = 0; + error(getPos(), "Bad number of components in DCT stream"); + return gFalse; + } --length; if (length != 2 * scanInfo.numComps + 3) { error(getPos(), "Bad DCT scan info block"); @@ -3035,12 +3070,12 @@ GBool DCTStream::readHuffmanTables() { while (length > 0) { index = str->getChar(); --length; - if ((index & 0x0f) >= 4) { + if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) { error(getPos(), "Bad DCT Huffman table"); return gFalse; } if (index & 0x10) { - index &= 0x0f; + index &= 0x03; if (index >= numACHuffTables) numACHuffTables = index+1; tbl = &acHuffTables[index]; @@ -3833,6 +3868,10 @@ FlateStream::FlateStream(Stream *strA, i FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); + if (!pred->isOk()) { + delete pred; + pred = NULL; + } } else { pred = NULL; } Index: kpdf/xpdf/xpdf/Stream.h =================================================================== --- kpdf/xpdf/xpdf/Stream.h (revision 481099) +++ kpdf/xpdf/xpdf/Stream.h (revision 488715) @@ -232,6 +232,8 @@ public: ~StreamPredictor(); + GBool isOk() { return ok; } + int lookChar(); int getChar(); @@ -249,6 +251,7 @@ private: int rowBytes; // bytes per line Guchar *predLine; // line buffer int predIdx; // current index in predLine + GBool ok; }; //------------------------------------------------------------------------ --- kpdf/xpdf/xpdf/JPXStream.cc (revision 481099) +++ kpdf/xpdf/xpdf/JPXStream.cc (revision 488715) @@ -7,6 +7,7 @@ //======================================================================== #include +#include #ifdef USE_GCC_PRAGMAS #pragma implementation @@ -783,7 +784,7 @@ GBool JPXStream::readCodestream(Guint /* int segType; GBool haveSIZ, haveCOD, haveQCD, haveSOT; Guint precinctSize, style; - Guint segLen, capabilities, comp, i, j, r; + Guint segLen, capabilities, nTiles, comp, i, j, r; //----- main header haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; @@ -818,8 +819,13 @@ GBool JPXStream::readCodestream(Guint /* / img.xTileSize; img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) / img.yTileSize; - img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles, - sizeof(JPXTile)); + nTiles = img.nXTiles * img.nYTiles; + // check for overflow before allocating memory + if (img.nXTiles <= 0 || img.nYTiles <= 0 || img.nXTiles >= INT_MAX / img.nYTiles) { + error(getPos(), "Bad tile count in JPX SIZ marker segment"); + return gFalse; + } + img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile)); for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps, sizeof(JPXTileComp)); Index: kpdf/xpdf/goo/gmem.c =================================================================== --- kpdf/xpdf/goo/gmem.c (revision 481099) +++ kpdf/xpdf/goo/gmem.c (revision 488715) @@ -11,6 +11,7 @@ #include #include #include +#include #include "gmem.h" #ifdef DEBUG_MEM @@ -141,7 +142,7 @@ void *gmallocn(int nObjs, int objSize) { int n; n = nObjs * objSize; - if (objSize == 0 || n / objSize != nObjs) { + if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { fprintf(stderr, "Bogus memory allocation size\n"); exit(1); } @@ -152,7 +153,7 @@ void *greallocn(void *p, int nObjs, int int n; n = nObjs * objSize; - if (objSize == 0 || n / objSize != nObjs) { + if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { fprintf(stderr, "Bogus memory allocation size\n"); exit(1); } Index: kdegraphics.spec =================================================================== RCS file: /cvs/dist/rpms/kdegraphics/devel/kdegraphics.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- kdegraphics.spec 12 Dec 2005 11:14:42 -0000 1.68 +++ kdegraphics.spec 16 Jan 2006 16:06:25 -0000 1.69 @@ -13,7 +13,7 @@ %define disable_gcc_check_and_hidden_visibility 1 Version: 3.5.0 -Release: 2 +Release: 3 Name: kdegraphics Summary: K Desktop Environment - Graphics Applications Epoch: 7 @@ -28,6 +28,9 @@ Patch2: kdegraphics-3.3.1-xorg.patch Patch3: kdegraphics-3.5.0-xft.patch +# security fixes +Patch100: post-3.5.0-kdegraphics-CAN-2005-3193.diff + %ifnarch %{no_scanner_archs} BuildRequires: sane-backends-devel >= 1.0.3-10 BuildRequires: gphoto2-devel @@ -264,6 +267,9 @@ %patch2 -p1 -b .xorg %patch3 -p1 -b .modular-x +# security fixes +%patch100 -p0 -b .CAN-2005-3193 + %if %{rhel} echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfaxview\"" >kfaxview/configure.in.in @@ -359,6 +365,9 @@ %{_includedir}/kde/* %changelog +* Mon Jan 16 2006 Than Ngo 7:3.5.0-3 +- apply patch to fix CAN-2005-3193, #177908 + * Mon Dec 12 2005 Than Ngo 7:3.5.0-2 - apply patch to fix modula-X problem From fedora-cvs-commits at redhat.com Mon Jan 16 16:10:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 11:10:54 -0500 Subject: rpms/kdegraphics/FC-4 sources,1.27,1.28 Message-ID: <200601161610.k0GGAsMC021323@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdegraphics/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv21208 Modified Files: sources Log Message: merging from embargo Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdegraphics/FC-4/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 16 Jun 2005 09:11:47 -0000 1.27 +++ sources 16 Jan 2006 16:10:41 -0000 1.28 @@ -1 +1 @@ -d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 +389a00d4387e621d4dd325a59c7657c4 kdegraphics-3.5.0.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 16 16:21:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 11:21:17 -0500 Subject: rpms/pango/devel .cvsignore, 1.24, 1.25 pango.spec, 1.51, 1.52 sources, 1.24, 1.25 Message-ID: <200601161621.k0GGLHDX003524@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3474 Modified Files: .cvsignore pango.spec sources Log Message: 1.11.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 14 Dec 2005 21:19:38 -0000 1.24 +++ .cvsignore 16 Jan 2006 16:21:13 -0000 1.25 @@ -8,3 +8,4 @@ pango-1.10.2.tar.bz2 pango-1.11.0.tar.bz2 pango-1.11.1.tar.bz2 +pango-1.11.2.tar.bz2 Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- pango.spec 19 Dec 2005 17:36:37 -0000 1.51 +++ pango.spec 16 Jan 2006 16:21:13 -0000 1.52 @@ -7,8 +7,8 @@ Summary: System for layout and rendering of internationalized text. Name: pango -Version: 1.11.1 -Release: 2 +Version: 1.11.2 +Release: 1 License: LGPL Group: System Environment/Libraries Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2 @@ -187,6 +187,9 @@ %changelog +* Mon Jan 16 2006 Matthias Clasen - 1.11.2-1 +- Update to 1.11.2 + * Wed Dec 19 2005 Matthias Clasen - 1.11.1-2 - BuildRequire cairo-devel Index: sources =================================================================== RCS file: /cvs/dist/rpms/pango/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 14 Dec 2005 21:19:38 -0000 1.24 +++ sources 16 Jan 2006 16:21:13 -0000 1.25 @@ -1 +1 @@ -c6255bba9bb738a564716fd57b7cc546 pango-1.11.1.tar.bz2 +3e1a72b0324a03f8710b9cd13f98c81f pango-1.11.2.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 16 16:25:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 11:25:44 -0500 Subject: rpms/gdb/FC-4 gdb-6.3-type-punning-20051219.patch, NONE, 1.1 gdb.spec, 1.165, 1.166 Message-ID: <200601161625.k0GGPiaU005302@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gdb/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv5120 Modified Files: gdb.spec Added Files: gdb-6.3-type-punning-20051219.patch Log Message: * Mon Jan 16 2006 Alexandre Oliva 6.3.0.0-1.97 - Bump up release number. * Mon Dec 19 2005 Alexandre Oliva 6.3.0.0-1.94 - Fix type-punning warnings issued by GCC 4.1. gdb-6.3-type-punning-20051219.patch: gdb-6.3/gdb/c-exp.c | 4 ++-- gdb-6.3/gdb/c-exp.y | 4 ++-- gdb-6.3/gdb/jv-exp.c | 4 ++-- gdb-6.3/gdb/jv-exp.y | 4 ++-- gdb-6.3/gdb/objc-exp.c | 4 ++-- gdb-6.3/gdb/objc-exp.y | 4 ++-- gdb-6.3/gdb/p-exp.c | 4 ++-- gdb-6.3/gdb/p-exp.y | 4 ++-- gdb-6.3/gdb/tui/tui-data.c | 8 +++++++- gdb-6.3/gdb/varobj.c | 4 ++-- gdb/ChangeLog | 0 11 files changed, 25 insertions(+), 19 deletions(-) --- NEW FILE gdb-6.3-type-punning-20051219.patch --- Index: gdb/ChangeLog 2005-12-19 Alexandre Oliva * c-exp.y (parse_number): Silence type-punning warnings. * jv-exp.y (parse_number): Likewise. * objc-exp.y (parse_number): Likewise. * p-exp.y (parse_number): Likewise. * tui/tui-data.c (source_windows): Likewise. * varobj.c (free_variable, varobj_refresh): Likewise. * c-exp.c, jv-exp.c, objc-exp.c, p-exp.c: Rebuilt. Index: gdb-6.3/gdb/c-exp.y =================================================================== --- gdb-6.3.orig/gdb/c-exp.y 2005-12-19 14:48:56.000000000 -0200 +++ gdb-6.3/gdb/c-exp.y 2005-12-19 14:48:59.000000000 -0200 @@ -1076,9 +1076,9 @@ p[len] = 0; /* null-terminate the token */ if (sizeof (putithere->typed_val_float.dval) <= sizeof (float)) - num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c); + num = sscanf (p, "%g%c", (float *) (void *) &putithere->typed_val_float.dval,&c); else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double)) - num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c); + num = sscanf (p, "%lg%c", (double *) (void *) &putithere->typed_val_float.dval,&c); else { #ifdef SCANF_HAS_LONG_DOUBLE Index: gdb-6.3/gdb/jv-exp.y =================================================================== --- gdb-6.3.orig/gdb/jv-exp.y 2005-12-19 14:48:56.000000000 -0200 +++ gdb-6.3/gdb/jv-exp.y 2005-12-19 14:48:59.000000000 -0200 @@ -713,9 +713,9 @@ p[len] = 0; /* null-terminate the token */ if (sizeof (putithere->typed_val_float.dval) <= sizeof (float)) - num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval, &c); + num = sscanf (p, "%g%c", (float *) (void *) &putithere->typed_val_float.dval, &c); else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double)) - num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval, &c); + num = sscanf (p, "%lg%c", (double *) (void *) &putithere->typed_val_float.dval, &c); else { #ifdef SCANF_HAS_LONG_DOUBLE Index: gdb-6.3/gdb/objc-exp.y =================================================================== --- gdb-6.3.orig/gdb/objc-exp.y 2005-12-19 14:48:56.000000000 -0200 +++ gdb-6.3/gdb/objc-exp.y 2005-12-19 14:48:59.000000000 -0200 @@ -1026,9 +1026,9 @@ /* It's a float since it contains a point or an exponent. */ if (sizeof (putithere->typed_val_float.dval) <= sizeof (float)) - sscanf (p, "%g", (float *)&putithere->typed_val_float.dval); + sscanf (p, "%g", (float *) (void *) &putithere->typed_val_float.dval); else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double)) - sscanf (p, "%lg", (double *)&putithere->typed_val_float.dval); + sscanf (p, "%lg", (double *) (void *) &putithere->typed_val_float.dval); else { #ifdef PRINTF_HAS_LONG_DOUBLE Index: gdb-6.3/gdb/p-exp.y =================================================================== --- gdb-6.3.orig/gdb/p-exp.y 2005-12-19 14:48:57.000000000 -0200 +++ gdb-6.3/gdb/p-exp.y 2005-12-19 14:48:59.000000000 -0200 @@ -799,9 +799,9 @@ p[len] = 0; /* null-terminate the token */ if (sizeof (putithere->typed_val_float.dval) <= sizeof (float)) - num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c); + num = sscanf (p, "%g%c", (float *) (void *) &putithere->typed_val_float.dval,&c); else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double)) - num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c); + num = sscanf (p, "%lg%c", (double *) (void *) &putithere->typed_val_float.dval,&c); else { #ifdef SCANF_HAS_LONG_DOUBLE Index: gdb-6.3/gdb/tui/tui-data.c =================================================================== --- gdb-6.3.orig/gdb/tui/tui-data.c 2005-12-19 14:48:57.000000000 -0200 +++ gdb-6.3/gdb/tui/tui-data.c 2005-12-19 14:48:59.000000000 -0200 @@ -44,7 +44,13 @@ static struct tui_gen_win_info _locator; static struct tui_gen_win_info exec_info[2]; static struct tui_win_info * src_win_list[2]; -static struct tui_list source_windows = {(void **) src_win_list, 0}; +/* The intermediate cast to void* silences a type-punning warning + issued by GCC. The use appears to be safe, since we always access + source_windows.list with type void**, and whenever we access one of + the list members, we cast it to struct tui_win_info*. The + interface of struct tui_list should probably be redesigned with + less type opacity to avoid type punning. -aoliva */ +static struct tui_list source_windows = {(void **) (void *) src_win_list, 0}; static int default_tab_len = DEFAULT_TAB_LEN; static struct tui_win_info * win_with_focus = (struct tui_win_info *) NULL; static struct tui_layout_def layout_def = Index: gdb-6.3/gdb/varobj.c =================================================================== --- gdb-6.3.orig/gdb/varobj.c 2005-12-19 14:48:57.000000000 -0200 +++ gdb-6.3/gdb/varobj.c 2005-12-19 14:48:59.000000000 -0200 @@ -866,7 +866,7 @@ /* Get rid of the memory for the old expression. This also leaves var->root->exp == NULL, which is ok for the parsing below. */ - free_current_contents ((char **) &var->root->exp); + free_current_contents (&var->root->exp); value_free (var->value); var->type = NULL; @@ -1410,7 +1410,7 @@ /* Free the expression if this is a root variable. */ if (var->root->rootvar == var) { - free_current_contents ((char **) &var->root->exp); + free_current_contents (&var->root->exp); xfree (var->root); } Index: gdb-6.3/gdb/c-exp.c =================================================================== --- gdb-6.3.orig/gdb/c-exp.c 2005-12-19 14:48:56.000000000 -0200 +++ gdb-6.3/gdb/c-exp.c 2005-12-19 14:48:59.000000000 -0200 @@ -2728,9 +2728,9 @@ p[len] = 0; /* null-terminate the token */ if (sizeof (putithere->typed_val_float.dval) <= sizeof (float)) - num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c); + num = sscanf (p, "%g%c", (float *) (void *) &putithere->typed_val_float.dval,&c); else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double)) - num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c); + num = sscanf (p, "%lg%c", (double *) (void *) &putithere->typed_val_float.dval,&c); else { #ifdef SCANF_HAS_LONG_DOUBLE Index: gdb-6.3/gdb/jv-exp.c =================================================================== --- gdb-6.3.orig/gdb/jv-exp.c 2005-12-19 14:48:56.000000000 -0200 +++ gdb-6.3/gdb/jv-exp.c 2005-12-19 14:48:59.000000000 -0200 @@ -2100,9 +2100,9 @@ p[len] = 0; /* null-terminate the token */ if (sizeof (putithere->typed_val_float.dval) <= sizeof (float)) - num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval, &c); + num = sscanf (p, "%g%c", (float *) (void *) &putithere->typed_val_float.dval, &c); else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double)) - num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval, &c); + num = sscanf (p, "%lg%c", (double *) (void *) &putithere->typed_val_float.dval, &c); else { #ifdef SCANF_HAS_LONG_DOUBLE Index: gdb-6.3/gdb/objc-exp.c =================================================================== --- gdb-6.3.orig/gdb/objc-exp.c 2005-12-19 14:48:56.000000000 -0200 +++ gdb-6.3/gdb/objc-exp.c 2005-12-19 14:48:59.000000000 -0200 @@ -2689,9 +2689,9 @@ /* It's a float since it contains a point or an exponent. */ if (sizeof (putithere->typed_val_float.dval) <= sizeof (float)) - sscanf (p, "%g", (float *)&putithere->typed_val_float.dval); + sscanf (p, "%g", (float *) (void *) &putithere->typed_val_float.dval); else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double)) - sscanf (p, "%lg", (double *)&putithere->typed_val_float.dval); + sscanf (p, "%lg", (double *) (void *) &putithere->typed_val_float.dval); else { #ifdef PRINTF_HAS_LONG_DOUBLE Index: gdb-6.3/gdb/p-exp.c =================================================================== --- gdb-6.3.orig/gdb/p-exp.c 2005-12-19 14:48:57.000000000 -0200 +++ gdb-6.3/gdb/p-exp.c 2005-12-19 14:48:59.000000000 -0200 @@ -2142,9 +2142,9 @@ p[len] = 0; /* null-terminate the token */ if (sizeof (putithere->typed_val_float.dval) <= sizeof (float)) - num = sscanf (p, "%g%c", (float *) &putithere->typed_val_float.dval,&c); + num = sscanf (p, "%g%c", (float *) (void *) &putithere->typed_val_float.dval,&c); else if (sizeof (putithere->typed_val_float.dval) <= sizeof (double)) - num = sscanf (p, "%lg%c", (double *) &putithere->typed_val_float.dval,&c); + num = sscanf (p, "%lg%c", (double *) (void *) &putithere->typed_val_float.dval,&c); else { #ifdef SCANF_HAS_LONG_DOUBLE Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/FC-4/gdb.spec,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- gdb.spec 1 Dec 2005 21:05:06 -0000 1.165 +++ gdb.spec 16 Jan 2006 16:25:41 -0000 1.166 @@ -11,7 +11,7 @@ Version: 6.3.0.0 # The release always contains a leading reserved number, start it at 0. -Release: 1.92 +Release: 1.97 License: GPL Group: Development/Debuggers @@ -261,6 +261,10 @@ # Allow option to continue backtracing past a zero pc value Patch170: gdb-6.3-bt-past-zero-20051201.patch +# Silence type-punning warnings that cause compilation errors because +# of -Werror. +Patch171: gdb-6.3-type-punning-20051219.patch + %ifarch ia64 BuildRequires: ncurses-devel glibc-devel gcc make gzip texinfo dejagnu libunwind >= 0.96-3 %else @@ -363,6 +367,7 @@ %patch168 -p1 %patch169 -p1 %patch170 -p1 +%patch171 -p1 # Change the version that gets printed at GDB startup, so it is RedHat # specific. @@ -531,7 +536,16 @@ # don't include the files in include, they are part of binutils %changelog -* Thu Dec 01 2005 Jeff Johnston 6.3.0.0-1.92 +* Mon Jan 16 2006 Alexandre Oliva 6.3.0.0-1.97 +- Bump up release number. + +* Mon Dec 19 2005 Alexandre Oliva 6.3.0.0-1.94 +- Fix type-punning warnings issued by GCC 4.1. + +* Fri Dec 16 2005 Jesse Keating +- rebuilt for new gcj + +* Thu Dec 01 2005 Jeff Johnston 6.3.0.0-1.93 - Bump up release number. * Thu Dec 01 2005 Jeff Johnston 6.3.0.0-1.90 From fedora-cvs-commits at redhat.com Mon Jan 16 16:27:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 11:27:14 -0500 Subject: rpms/gdb/devel gdb.spec,1.166,1.167 Message-ID: <200601161627.k0GGRE2M005708@cvs.devel.redhat.com> Author: aoliva Update of /cvs/dist/rpms/gdb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5613 Modified Files: gdb.spec Log Message: * Mon Jan 16 2006 Alexandre Oliva 6.3.0.0-1.98 - Bump up release number. Index: gdb.spec =================================================================== RCS file: /cvs/dist/rpms/gdb/devel/gdb.spec,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- gdb.spec 19 Dec 2005 18:59:07 -0000 1.166 +++ gdb.spec 16 Jan 2006 16:27:08 -0000 1.167 @@ -11,7 +11,7 @@ Version: 6.3.0.0 # The release always contains a leading reserved number, start it at 0. -Release: 1.94 +Release: 1.98 License: GPL Group: Development/Debuggers @@ -536,6 +536,9 @@ # don't include the files in include, they are part of binutils %changelog +* Mon Jan 16 2006 Alexandre Oliva 6.3.0.0-1.98 +- Bump up release number. + * Mon Dec 19 2005 Alexandre Oliva 6.3.0.0-1.94 - Fix type-punning warnings issued by GCC 4.1. From fedora-cvs-commits at redhat.com Mon Jan 16 16:31:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 11:31:29 -0500 Subject: rpms/gdm/devel gdm.spec,1.111,1.112 Message-ID: <200601161631.k0GGVTmc006984@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6940 Modified Files: gdm.spec Log Message: - migrate to new greeter location (bug 177443). Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- gdm.spec 13 Jan 2006 21:31:08 -0000 1.111 +++ gdm.spec 16 Jan 2006 16:31:25 -0000 1.112 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager. Name: gdm Version: 2.13.0.4 -Release: 3 +Release: 4 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -27,7 +27,6 @@ Patch1: gdm-2.13.0.4-change-defaults.patch Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch -Patch3: gdm-2.13.0.4-fix-selinux-check.patch Patch4: gdm-2.8.0.2-session-errors-in-tmp.patch Patch5: gdm-2.13.0.4-update-switchdesk-location.patch Patch6: gdm-2.6.0.7-wait-for-bootup.patch @@ -230,6 +229,8 @@ sed -ie 's@^command=/usr/X11R6/bin/X at command=/usr/bin/Xorg@' %{_datadir}/gdm/config/gdm.conf-custom sed -ie 's@^Xnest=/usr/X11R6/bin/Xnest at Xnest=/usr/X11R6/bin/Xnest@' %{_datadir}/gdm/config/gdm.conf-custom sed -ie 's@^BaseXsession=/etc/X11/xdm/Xsession at BaseXsession=/etc/X11/xinit/Xsession@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^Greeter=/usr/bin/gdmgreeter at Greeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^RemoteGreeter=/usr/bin/gdmlogin at RemoteGreeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom fi %{_sbindir}/gdm-safe-restart || : @@ -284,6 +285,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Mon Jan 16 2006 Ray Strode - 1:2.13.0.4-4 +- migrate to new greeter location (bug 177443). + * Fri Jan 13 2006 Ray Strode - 1:2.13.0.4-3 - migrate X server configuration for pre-modular X configurations. Problems reported by Dennis Gregorovic From fedora-cvs-commits at redhat.com Mon Jan 16 16:34:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 11:34:04 -0500 Subject: rpms/gdm/devel gdm.spec,1.112,1.113 Message-ID: <200601161634.k0GGY4vp007436@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7400 Modified Files: gdm.spec Log Message: add patch3 back Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- gdm.spec 16 Jan 2006 16:31:25 -0000 1.112 +++ gdm.spec 16 Jan 2006 16:33:47 -0000 1.113 @@ -27,6 +27,7 @@ Patch1: gdm-2.13.0.4-change-defaults.patch Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch +Patch3: gdm-2.13.0.4-fix-selinux-check.patch Patch4: gdm-2.8.0.2-session-errors-in-tmp.patch Patch5: gdm-2.13.0.4-update-switchdesk-location.patch Patch6: gdm-2.6.0.7-wait-for-bootup.patch From fedora-cvs-commits at redhat.com Mon Jan 16 16:35:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 11:35:33 -0500 Subject: rpms/radvd/devel .cvsignore, 1.8, 1.9 radvd.spec, 1.25, 1.26 sources, 1.8, 1.9 Message-ID: <200601161635.k0GGZXQC007757@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/radvd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7743 Modified Files: .cvsignore radvd.spec sources Log Message: upgrade to upstream version 0.9.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/radvd/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 18 Dec 2005 19:48:12 -0000 1.8 +++ .cvsignore 16 Jan 2006 16:35:29 -0000 1.9 @@ -2,3 +2,4 @@ radvd-0.7.3.tar.gz radvd-0.8.tar.gz radvd-0.9.tar.gz +radvd-0.9.1.tar.gz Index: radvd.spec =================================================================== RCS file: /cvs/dist/rpms/radvd/devel/radvd.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- radvd.spec 18 Dec 2005 19:48:12 -0000 1.25 +++ radvd.spec 16 Jan 2006 16:35:29 -0000 1.26 @@ -2,7 +2,7 @@ %define RADVD_UID 75 Summary: A Router Advertisement daemon Name: radvd -Version: 0.9 +Version: 0.9.1 Release: 1 License: BSD-style Group: System Environment/Daemons @@ -82,7 +82,10 @@ %{_sbindir}/radvdump %changelog -* Sun Dec 18 2006 Jason Vas Dias +* Mon Jan 16 2006 Jason Vas Dias - 0.9.1-1 +- Upgrade to upstream version 0.9.1 + +* Sun Dec 18 2005 Jason Vas Dias - Upgrade to upstream version 0.9 * Fri Dec 09 2005 Jesse Keating Index: sources =================================================================== RCS file: /cvs/dist/rpms/radvd/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 18 Dec 2005 19:48:12 -0000 1.8 +++ sources 16 Jan 2006 16:35:29 -0000 1.9 @@ -1 +1 @@ -128c1825975cd81168fe607e41587fbf radvd-0.9.tar.gz +d5d24abd3dddc2b702e621ebf6b9cfdc radvd-0.9.1.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 16 17:02:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 12:02:40 -0500 Subject: rpms/libnl/devel libnl-1.0-install-no-root.patch, NONE, 1.1 libnl.spec, 1.8, 1.9 Message-ID: <200601161702.k0GH2eVR015358@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/libnl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15343 Modified Files: libnl.spec Added Files: libnl-1.0-install-no-root.patch Log Message: * Mon Jan 16 2006 Christopher Aillon 1.0-0.7.pre5 - Add patch to not chown files to root.root during make install; it happens normally. libnl-1.0-install-no-root.patch: include/Makefile | 8 ++++---- lib/Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE libnl-1.0-install-no-root.patch --- diff -prudN libnl-1.0-pre5-root/include/Makefile libnl-1.0-pre5/include/Makefile --- libnl-1.0-pre5-root/include/Makefile 2005-11-02 12:29:06.000000000 -0500 +++ libnl-1.0-pre5/include/Makefile 2006-01-16 11:56:07.000000000 -0500 @@ -27,7 +27,7 @@ distclean: install: mkdir -p $(DESTDIR)$(prefix)/include/netlink/route/sch/ mkdir -p $(DESTDIR)$(prefix)/include/netlink/route/cls/ - install -o root -g root -m 0644 netlink/*.h $(DESTDIR)$(prefix)/include/netlink/ - install -o root -g root -m 0644 netlink/route/*.h $(DESTDIR)$(prefix)/include/netlink/route/ - install -o root -g root -m 0644 netlink/route/sch/*.h $(DESTDIR)$(prefix)/include/netlink/route/sch/ - install -o root -g root -m 0644 netlink/route/cls/*.h $(DESTDIR)$(prefix)/include/netlink/route/cls/ + install -m 0644 netlink/*.h $(DESTDIR)$(prefix)/include/netlink/ + install -m 0644 netlink/route/*.h $(DESTDIR)$(prefix)/include/netlink/route/ + install -m 0644 netlink/route/sch/*.h $(DESTDIR)$(prefix)/include/netlink/route/sch/ + install -m 0644 netlink/route/cls/*.h $(DESTDIR)$(prefix)/include/netlink/route/cls/ diff -prudN libnl-1.0-pre5-root/lib/Makefile libnl-1.0-pre5/lib/Makefile --- libnl-1.0-pre5-root/lib/Makefile 2005-11-02 12:29:06.000000000 -0500 +++ libnl-1.0-pre5/lib/Makefile 2006-01-16 11:56:29.000000000 -0500 @@ -58,7 +58,7 @@ distclean: install: mkdir -p $(DESTDIR)$(LIBDIR)/ - install -o root -g root -m 0644 $(OUT_SLIB) $(DESTDIR)$(LIBDIR) + install -m 0644 $(OUT_SLIB) $(DESTDIR)$(LIBDIR) rm -f $(DESTDIR)$(LIBDIR)/$(LN1_SLIB) ; \ $(LN) -s $(OUT_SLIB) $(DESTDIR)$(LIBDIR)/$(LN1_SLIB) rm -f $(DESTDIR)$(LIBDIR)/$(LN_SLIB) ; \ Index: libnl.spec =================================================================== RCS file: /cvs/dist/rpms/libnl/devel/libnl.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libnl.spec 9 Jan 2006 21:41:42 -0000 1.8 +++ libnl.spec 16 Jan 2006 17:02:38 -0000 1.9 @@ -5,13 +5,14 @@ License: LGPL Name: libnl Version: 1.0 -Release: 0.6.%{preversion} +Release: 0.7.%{preversion} URL: http://people.suug.ch/~tgr/libnl/ Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}-%{preversion}.tar.gz Source1: %{name}-1.pc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: doxygen Patch1: libnl-64bit.patch +Patch2: libnl-1.0-install-no-root.patch %description This package contains a convenience library to simplify @@ -30,6 +31,7 @@ %prep %setup -q -n libnl-%{version}-%{preversion} %patch1 -p1 +%patch2 -p1 %build %configure @@ -61,6 +63,10 @@ %{_libdir}/pkgconfig/%{name}-1.pc %changelog +* Mon Jan 16 2006 Christopher Aillon 1.0-0.7.pre5 +- Add patch to not chown files to root.root during make install; it + happens normally. + * Mon Jan 9 2006 Christopher Aillon 1.0-0.6.pre5 - Correctly install the pkgconfig file From fedora-cvs-commits at redhat.com Mon Jan 16 17:28:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 12:28:01 -0500 Subject: rpms/gdm/devel gdm.spec,1.113,1.114 Message-ID: <200601161728.k0GHS1Ie004005@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3941 Modified Files: gdm.spec Log Message: - improve migration snippet (bug 177443). Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- gdm.spec 16 Jan 2006 16:33:47 -0000 1.113 +++ gdm.spec 16 Jan 2006 17:27:58 -0000 1.114 @@ -224,14 +224,34 @@ # if the user already has a config file, then # migrate it to the new location if [ $1 -ge 2 ] && [ -f %{_sysconfdir}/X11/gdm/gdm.conf ]; then - mv -f %{_sysconfdir}/X11/gdm/gdm.conf %{_datadir}/gdm/config/gdm.conf-custom + cp -a %{_sysconfdir}/X11/gdm/gdm.conf %{_datadir}/gdm/config/gdm.conf-custom - # Also migrate the X configuration to work with modular X - sed -ie 's@^command=/usr/X11R6/bin/X at command=/usr/bin/Xorg@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^Xnest=/usr/X11R6/bin/Xnest at Xnest=/usr/X11R6/bin/Xnest@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^BaseXsession=/etc/X11/xdm/Xsession at BaseXsession=/etc/X11/xinit/Xsession@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^Greeter=/usr/bin/gdmgreeter at Greeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^RemoteGreeter=/usr/bin/gdmlogin at RemoteGreeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom + # Comment out some entries from the custom config file that may have changed + # locations in the update + sed -ie 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^GraphicalTheme=Bluecurve@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^BackgroundColor=#20305a@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^HostImageDir=/usr/share/hosts/@#HostImageDir=/usr/share/pixmaps/faces/@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^LogDir=/var/log/gdm@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^PostLoginScriptDir=/etc/X11/gdm/PostLogin@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^PreLoginScriptDir=/etc/X11/gdm/PreLogin@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^PreSessionScriptDir=/etc/X11/gdm/PreSession@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^PostSessionScriptDir=/etc/X11/gdm/PostSession@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^DisplayInitDir=/var/run/gdm.pid@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^ServAuthDir=/var/gdm@#&@' %{_datadir}/gdm/config/gdm.conf-custom + + # Someone might be trying to use different greeters for the local/remote cases + # so migrate them to their new locations. + sed -ie 's@^Greeter=/usr/bin/gdmlogin at Greeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom + sed -ie 's@^RemoteGreeter=/usr/bin/gdmgreeter at RemoteGreeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom fi %{_sbindir}/gdm-safe-restart || : @@ -287,7 +307,7 @@ %changelog * Mon Jan 16 2006 Ray Strode - 1:2.13.0.4-4 -- migrate to new greeter location (bug 177443). +- improve migration snippet (bug 177443). * Fri Jan 13 2006 Ray Strode - 1:2.13.0.4-3 - migrate X server configuration for pre-modular X configurations. From fedora-cvs-commits at redhat.com Mon Jan 16 17:29:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 12:29:24 -0500 Subject: rpms/lm_sensors/devel lm_sensors.init, 1.5, 1.6 lm_sensors.spec, 1.30, 1.31 Message-ID: <200601161729.k0GHTOks004537@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/lm_sensors/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4436 Modified Files: lm_sensors.init lm_sensors.spec Log Message: - fix subsys locking in the initscript Index: lm_sensors.init =================================================================== RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.init,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lm_sensors.init 23 Dec 2004 15:07:20 -0000 1.5 +++ lm_sensors.init 16 Jan 2006 17:29:20 -0000 1.6 @@ -67,7 +67,7 @@ $PSENSORS -s RETVAL=$? - if [ $RETVAL -eq 0 ] && touch /var/lock/subsys/sensors ; then + if [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lm_sensors ; then echo_success echo else @@ -88,7 +88,7 @@ done RETVAL=$? - if [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/sensors ; then + if [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/lm_sensors ; then echo_success echo else @@ -109,7 +109,7 @@ } condrestart() { - [ -e /var/lock/subsys/sensors ] && restart || : + [ -e /var/lock/subsys/lm_sensors ] && restart || : } # See how we were called. Index: lm_sensors.spec =================================================================== RCS file: /cvs/dist/rpms/lm_sensors/devel/lm_sensors.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- lm_sensors.spec 16 Dec 2005 23:21:30 -0000 1.30 +++ lm_sensors.spec 16 Jan 2006 17:29:20 -0000 1.31 @@ -1,6 +1,6 @@ Name: lm_sensors Version: 2.9.1 -Release: 5.1 +Release: 6 URL: http://secure.netroedge.com/~lm78/ Source: http://secure.netroedge.com/~lm78/archive/lm_sensors-%{version}.tar.gz Source1: lm_sensors.sysconfig @@ -72,6 +72,11 @@ %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT +%pre +if [ -f /var/lock/subsys/sensors ]; then + mv -f /var/lock/subsys/sensors /var/lock/subsys/lm_sensors +fi + %post /sbin/ldconfig /sbin/chkconfig --add lm_sensors @@ -102,7 +107,10 @@ %{_libdir}/lib*.so %changelog -* Fri Dec 16 2005 Jesse Keating +* Mon Jan 16 2006 Peter Jones 2.9.1-6 +- fix initscript subsys locking + +* Fri Dec 16 2005 Jesse Keating 2.9.1-5.1 - rebuilt for new gcj * Tue Nov 08 2005 Phil Knirsch 2.9.1-5 From fedora-cvs-commits at redhat.com Mon Jan 16 18:58:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 13:58:11 -0500 Subject: rpms/kdeutils/devel kdeutils-3.5.0-kcalc.patch, NONE, 1.1 kdeutils.spec, 1.50, 1.51 Message-ID: <200601161858.k0GIwAHv002743@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdeutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2699 Modified Files: kdeutils.spec Added Files: kdeutils-3.5.0-kcalc.patch Log Message: apply patch to fix #176463 kdeutils-3.5.0-kcalc.patch: kcalc_core.cpp | 2 kcalcdisplay.cpp | 17 +--- knumber/knumber.cpp | 192 +++++++++++++++++++++++++++++++++++++++-------- knumber/knumber.h | 28 +++--- knumber/knumber_priv.cpp | 35 +++++--- knumber/knumber_priv.h | 10 +- stats.cpp | 16 +-- 7 files changed, 218 insertions(+), 82 deletions(-) --- NEW FILE kdeutils-3.5.0-kcalc.patch --- diff -Nur kdeutils-3.5.0.orig/kcalc/kcalc_core.cpp kdeutils-3.5.0/kcalc/kcalc_core.cpp --- kdeutils-3.5.0.orig/kcalc/kcalc_core.cpp 2005-10-10 16:59:12.000000000 +0200 +++ kdeutils-3.5.0/kcalc/kcalc_core.cpp 2006-01-16 19:41:11.000000000 +0100 @@ -770,7 +770,7 @@ void CalcEngine::TangensHyp(KNumber input) { - CALCAMNT tmp_num = input.toQString().toDouble(); + CALCAMNT tmp_num = static_cast(input); _last_number = KNumber(double(TANH(tmp_num))); } diff -Nur kdeutils-3.5.0.orig/kcalc/kcalcdisplay.cpp kdeutils-3.5.0/kcalc/kcalcdisplay.cpp --- kdeutils-3.5.0.orig/kcalc/kcalcdisplay.cpp 2005-11-19 11:03:43.000000000 +0100 +++ kdeutils-3.5.0/kcalc/kcalcdisplay.cpp 2006-01-16 19:41:11.000000000 +0100 @@ -119,7 +119,11 @@ void KCalcDisplay::slotCopy(void) { - QString txt = _display_amount.toQString(); + QString txt; + if (_num_base != NB_DECIMAL) + txt = QLabel::text(); + else + txt = _display_amount.toQString(); if (_num_base == NB_HEX) txt.prepend( "0x" ); (QApplication::clipboard())->setText(txt, QClipboard::Clipboard); @@ -275,15 +279,10 @@ } else // _num_base == NB_DECIMAL { - // We need to use QCString here since it uses the systems native ::sprintf() - // implementation which is more flexible than QString's. - _display_amount = new_amount; + _display_amount = new_amount; - - display_str = _display_amount.toQString(QString().setNum(KCalcSettings::precision())); + display_str = _display_amount.toQString(KCalcSettings::precision(), _fixed_precision); #if 0 - if (_fixed_precision != -1 && _display_amount <= 1.0e+16) - display_str = QCString().sprintf(PRINT_FLOAT, _fixed_precision, _display_amount); else if (_display_amount > 1.0e+16) display_str = QCString().sprintf(PRINT_LONG_BIG, _precision + 1, _display_amount); else @@ -317,7 +316,7 @@ { if (_num_base != NB_DECIMAL) return QLabel::text(); - QString display_str = _display_amount.toQString(QString().setNum(KCalcSettings::precision())); + QString display_str = _display_amount.toQString(KCalcSettings::precision()); return display_str; // return QCString().sprintf(PRINT_LONG_BIG, 40, _display_amount); diff -Nur kdeutils-3.5.0.orig/kcalc/knumber/knumber.cpp kdeutils-3.5.0/kcalc/knumber/knumber.cpp --- kdeutils-3.5.0.orig/kcalc/knumber/knumber.cpp 2005-10-10 16:59:12.000000000 +0200 +++ kdeutils-3.5.0/kcalc/knumber/knumber.cpp 2006-01-16 19:41:47.000000000 +0100 @@ -207,56 +207,188 @@ return *this; } -QString const KNumber::toQString(QString const & prec) const +// increase the digit at 'position' by one +static void _inc_by_one(QString &str, int position) +{ + for (int i = position; i >= 0; i--) + { + char last_char = str[i].latin1(); + switch(last_char) + { + case '0': + str[i] = '1'; + break; + case '1': + str[i] = '2'; + break; + case '2': + str[i] = '3'; + break; + case '3': + str[i] = '4'; + break; + case '4': + str[i] = '5'; + break; + case '5': + str[i] = '6'; + break; + case '6': + str[i] = '7'; + break; + case '7': + str[i] = '8'; + break; + case '8': + str[i] = '9'; + break; + case '9': + str[i] = '0'; + if (i == 0) str.prepend('1'); + continue; + case '.': + continue; + } + break; + } +} + +// Cut off if more digits in fractional part than 'precision' +static void _round(QString &str, int precision) +{ + int decimalSymbolPos = str.find('.'); + + if (decimalSymbolPos == -1) + if (precision == 0) return; + else if (precision > 0) // add dot if missing (and needed) + { + str.append('.'); + decimalSymbolPos = str.length() - 1; + } + + // fill up with more than enough zeroes (in case fractional part too short) + str.append(QString().fill('0', precision)); + + // Now decide whether to round up or down + char last_char = str[decimalSymbolPos + precision + 1].latin1(); + switch (last_char) + { + case '0': + case '1': + case '2': + case '3': + case '4': + // nothing to do, rounding down + break; + case '5': + case '6': + case '7': + case '8': + case '9': + // rounding up + _inc_by_one(str, decimalSymbolPos + precision); + break; + default: + break; + } + + decimalSymbolPos = str.find('.'); + str.truncate(decimalSymbolPos + precision + 1); + + // if precision == 0 delete also '.' + if (precision == 0) str = str.section('.', 0, 0); +} + +static QString roundNumber(const QString &numStr, int precision) +{ + QString tmpString = numStr; + if (precision < 0 || + ! QRegExp("^[+-]?\\d+(\\.\\d+)*(e[+-]?\\d+)?$").exactMatch(tmpString)) + return numStr; + + + // Skip the sign (for now) + bool neg = (tmpString[0] == '-'); + if (neg || tmpString[0] == '+') tmpString.remove(0, 1); + + + // Split off exponential part (including 'e'-symbol) + QString mantString = tmpString.section('e', 0, 0, + QString::SectionCaseInsensitiveSeps); + QString expString = tmpString.section('e', 1, 1, + QString::SectionCaseInsensitiveSeps | + QString::SectionIncludeLeadingSep); + if (expString.length() == 1) expString = QString(); + + + _round(mantString, precision); + + if(neg) mantString.prepend('-'); + + return mantString + expString; +} + + +QString const KNumber::toQString(int width, int prec) const { QString tmp_str; + + if (*this == Zero) // important to avoid infinite loops below + return "0"; switch (type()) { case IntegerType: - tmp_str = QString(_num->ascii(prec)); - if (QRegExp("^\\d+$").exactMatch(prec)) { - int int_num = prec.toInt(); - if (int_num < tmp_str.length()) { - bool tmp_bool = _fraction_input; // stupid work-around - _fraction_input = false; - tmp_str = (KNumber("1.0")*(*this)).toQString(prec); - _fraction_input = tmp_bool; - } - } + if (width > 0) { //result needs to be cut-off + bool tmp_bool = _fraction_input; // stupid work-around + _fraction_input = false; + tmp_str = (KNumber("1.0")*(*this)).toQString(width, -1); + _fraction_input = tmp_bool; + } else + tmp_str = QString(_num->ascii()); break; case FractionType: if (_float_output) { bool tmp_bool = _fraction_input; // stupid work-around _fraction_input = false; - tmp_str = QString((KNumber("1.0")*(*this))._num->ascii()); + tmp_str = (KNumber("1.0")*(*this)).toQString(width, -1); _fraction_input = tmp_bool; - } - else if(_splitoffinteger_output) { - // split off integer part - KNumber int_part = this->integerPart(); - if (int_part == Zero) + } else { // _float_output == false + if(_splitoffinteger_output) { + // split off integer part + KNumber int_part = this->integerPart(); + if (int_part == Zero) + tmp_str = QString(_num->ascii()); + else if (int_part < Zero) + tmp_str = int_part.toQString() + " " + (int_part - *this)._num->ascii(); + else + tmp_str = int_part.toQString() + " " + (*this - int_part)._num->ascii(); + } else tmp_str = QString(_num->ascii()); - else if (int_part < Zero) - tmp_str = int_part.toQString() + " " + (int_part - *this)._num->ascii(); - else - tmp_str = int_part.toQString() + " " + (*this - int_part)._num->ascii(); - } else - tmp_str = QString(_num->ascii()); - if (QRegExp("^\\d+$").exactMatch(prec)) { - int int_num = prec.toInt(); - if (int_num < tmp_str.length()) { + if (width > 0 && tmp_str.length() > width) { + //result needs to be cut-off bool tmp_bool = _fraction_input; // stupid work-around _fraction_input = false; - tmp_str = (KNumber("1.0")*(*this)).toQString(prec); + tmp_str = (KNumber("1.0")*(*this)).toQString(width, -1); _fraction_input = tmp_bool; } } + + break; + case FloatType: + if (width > 0) + tmp_str = QString(_num->ascii(width)); + else + // rough estimate for maximal decimal precision (10^3 = 2^10) + tmp_str = QString(_num->ascii(3*mpf_get_default_prec()/10)); break; default: - tmp_str = QString(_num->ascii(prec)); + return QString(_num->ascii()); } - - return tmp_str; + + if (prec >= 0) + return roundNumber(tmp_str, prec); + else + return tmp_str; } void KNumber::setDefaultFloatOutput(bool flag) diff -Nur kdeutils-3.5.0.orig/kcalc/knumber/knumber.h kdeutils-3.5.0/kcalc/knumber/knumber.h --- kdeutils-3.5.0.orig/kcalc/knumber/knumber.h 2005-10-10 16:59:12.000000000 +0200 +++ kdeutils-3.5.0/kcalc/knumber/knumber.h 2006-01-16 19:40:41.000000000 +0100 @@ -45,7 +45,7 @@ * of this class will be described below: * * @li @p NumType::SpecialType - This type represents an error that - * has occured, e.g. trying to divide 1 by 0 gives an object that + * has occurred, e.g. trying to divide 1 by 0 gives an object that * represents infinity. * * @li @p NumType::IntegerType - The number is an integer. It can be @@ -75,7 +75,7 @@ * KNumber tries to provide transparent access to the following type * of numbers: * - * @li @p NumType::SpecialType - Some type of error has occured, + * @li @p NumType::SpecialType - Some type of error has occurred, * further inspection with @p KNumber::ErrorType * * @li @p NumType::IntegerType - the number is an integer @@ -134,7 +134,7 @@ * NumType::FractionType, which can be either displayed as fractions * or in decimal notation. * - * The default behaviour is not to display fractions in floating + * The default behavior is not to display fractions in floating * point notation. */ static void setDefaultFloatOutput(bool flag); @@ -157,8 +157,8 @@ /** * What a terrible method name!! When displaying a fraction, the - * default mode gives "@p nomin/denom". With this method one can - * choose to display a fraction as "@p integer nomin/denom". + * default mode gives @p "nomin/denom". With this method one can + * choose to display a fraction as @p "integer nomin/denom". * * Examples: Default representation mode is 47/17, but if @p flag is * @p true, then the result is 2 13/17. @@ -168,17 +168,19 @@ /** * Return a QString representing the KNumber. * - * @param prec The string is similar to the optional conversion - * specifications for formatted output for printf and friends, - * e.g. "10.3" to display numbers with 10 digits in front of the - * decimal point, and 3 after the decimal point. More precise - * explanations will be given later. - * + * @param width This number specifies the maximal length of the + * output, before the method switches to exponential notation and + * does rounding. For negative numbers, this option is ignored. + * + * @param prec This parameter controls the number of digits + * following the decimal point. For negative numbers, this option + * is ignored. + * */ - QString const toQString(QString const & prec = QString::null) const; + QString const toQString(int width = -1, int prec = -1) const; /** - * Compute the absoulte value, i.e. @p x.abs() returns the value + * Compute the absolute value, i.e. @p x.abs() returns the value * * \f[ \left\{\begin{array}{cl} x, & x \ge 0 \\ -x, & x < * 0\end{array}\right.\f] diff -Nur kdeutils-3.5.0.orig/kcalc/knumber/knumber_priv.cpp kdeutils-3.5.0/kcalc/knumber/knumber_priv.cpp --- kdeutils-3.5.0.orig/kcalc/knumber/knumber_priv.cpp 2005-10-10 16:59:12.000000000 +0200 +++ kdeutils-3.5.0/kcalc/knumber/knumber_priv.cpp 2006-01-16 19:41:47.000000000 +0100 @@ -13,13 +13,16 @@ You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #include #include +#ifdef HAVE_STDLIB_H +#include +#endif #include #include @@ -158,9 +161,9 @@ return *this; } -QString const _knumerror::ascii(QString const &num) const +QString const _knumerror::ascii(int prec) const { - static_cast(num); + static_cast(prec); switch(_error) { case UndefinedNumber: @@ -174,19 +177,21 @@ } } -QString const _knuminteger::ascii(QString const &num) const +QString const _knuminteger::ascii(int prec) const { + static_cast(prec); char *tmp_ptr; - gmp_asprintf(&tmp_ptr, "%Zd", _mpz); - QString ret_str = tmp_ptr; + gmp_asprintf(&tmp_ptr, "%Zd", _mpz); + QString ret_str = tmp_ptr; #warning ok to free with delete? - delete tmp_ptr; - return ret_str; + delete tmp_ptr; + return ret_str; } -QString const _knumfraction::ascii(QString const &num) const +QString const _knumfraction::ascii(int prec) const { + static_cast(prec); char const *tmp_ptr = mpq_get_str(0, 10, _mpq); QString ret_str = tmp_ptr; #warning ok to free with delete? @@ -195,12 +200,14 @@ return ret_str; } -QString const _knumfloat::ascii(QString const &num) const +QString const _knumfloat::ascii(int prec) const { QString ret_str; char *tmp_ptr; - - gmp_asprintf(&tmp_ptr, "%Fg", _mpf); + if (prec > 0) + gmp_asprintf(&tmp_ptr, ("%." + QString().setNum(prec) + "Fg").ascii(), _mpf); + else + gmp_asprintf(&tmp_ptr, "%Fg", _mpf); ret_str = tmp_ptr; @@ -320,7 +327,7 @@ -#warning _cbrt for now this is a stupid work around for now +#warning _cbrt for now this is a stupid work around static void _cbrt(mpf_t &num) { double tmp_num = cbrt(mpf_get_d(num)); diff -Nur kdeutils-3.5.0.orig/kcalc/knumber/knumber_priv.h kdeutils-3.5.0/kcalc/knumber/knumber_priv.h --- kdeutils-3.5.0.orig/kcalc/knumber/knumber_priv.h 2005-11-08 23:29:27.000000000 +0100 +++ kdeutils-3.5.0/kcalc/knumber/knumber_priv.h 2006-01-16 19:40:41.000000000 +0100 @@ -46,7 +46,7 @@ virtual NumType type(void) const = 0; - virtual QString const ascii(QString const &num = QString::null) const = 0; + virtual QString const ascii(int prec = -1) const = 0; virtual _knumber * abs(void) const = 0; virtual _knumber * intPart(void) const = 0; @@ -90,7 +90,7 @@ virtual NumType type(void) const {return SpecialType;} - virtual QString const ascii(QString const &num = QString::null) const; + virtual QString const ascii(int prec = -1) const; virtual _knumber * abs(void) const; virtual _knumber * intPart(void) const; @@ -156,7 +156,7 @@ virtual NumType type(void) const {return IntegerType;} - virtual QString const ascii(QString const &num = QString::null) const; + virtual QString const ascii(int prec = -1) const; virtual _knumber * abs(void) const; virtual _knumber * intPart(void) const; @@ -216,7 +216,7 @@ virtual NumType type(void) const {return FractionType;} - virtual QString const ascii(QString const &num= QString::null) const; + virtual QString const ascii(int prec = -1) const; bool isInteger(void) const; @@ -269,7 +269,7 @@ virtual NumType type(void) const {return FloatType;} - virtual QString const ascii(QString const &num = QString::null) const; + virtual QString const ascii(int prec = -1) const; virtual _knumber * abs(void) const; virtual _knumber * intPart(void) const; diff -Nur kdeutils-3.5.0.orig/kcalc/stats.cpp kdeutils-3.5.0/kcalc/stats.cpp --- kdeutils-3.5.0.orig/kcalc/stats.cpp 2005-09-10 10:21:34.000000000 +0200 +++ kdeutils-3.5.0/kcalc/stats.cpp 2006-01-16 19:41:11.000000000 +0100 @@ -82,14 +82,6 @@ KNumber result = 0; unsigned int bound; size_t index; - qHeapSort(mData); - -#ifdef DEBUG_STATS - QValueVector::iterator p; - for(p = mData.begin(); p != mData.end(); ++p) { - printf("Sorted %Lg\n", *p) - } -#endif bound = count(); @@ -101,12 +93,16 @@ if (bound == 1) return mData.at(0); + // need to copy mData-list, because sorting afterwards + QValueVector tmp_mData(mData); + qHeapSort(tmp_mData); + if( bound & 1) { // odd index = (bound - 1 ) / 2 + 1; - result = mData.at(index - 1); + result = tmp_mData.at(index - 1); } else { // even index = bound / 2; - result = ((mData.at(index - 1)) + (mData.at(index))) / KNumber(2); + result = ((tmp_mData.at(index - 1)) + (tmp_mData.at(index))) / KNumber(2); } return result; Index: kdeutils.spec =================================================================== RCS file: /cvs/dist/rpms/kdeutils/devel/kdeutils.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- kdeutils.spec 5 Jan 2006 09:30:16 -0000 1.50 +++ kdeutils.spec 16 Jan 2006 18:58:06 -0000 1.51 @@ -9,7 +9,7 @@ %define disable_gcc_check_and_hidden_visibility 1 Version: 3.5.0 -Release: 3 +Release: 4 Name: kdeutils Prefix: /usr Summary: K Desktop Environment - Utilities @@ -23,6 +23,9 @@ Patch1: kdf-3.0.2-label.patch Patch2: kde-libtool.patch +# upstream fixes +Patch50: kdeutils-3.5.0-kcalc.patch + Requires: kdelibs >= 6:%{version} Requires: kdebase >= 6:%{version} @@ -240,6 +243,7 @@ %setup -q %patch1 -p1 -b .label %patch2 -p1 -b .libtool +%patch50 -p1 -b .kcalc %build unset QTDIR || : ; . /etc/profile.d/qt.sh @@ -320,6 +324,9 @@ %{_includedir}/kde/* %changelog +* Mon Jan 16 2006 Than Ngo 6:3.5.0-4 +- apply patch to fix #176463 + * Thu Jan 05 2006 Radek Vokal 6:3.5.0-3 - rebuilt against new libnetsnmp From fedora-cvs-commits at redhat.com Mon Jan 16 19:20:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 14:20:51 -0500 Subject: rpms/kudzu/devel .cvsignore, 1.96, 1.97 kudzu.spec, 1.109, 1.110 sources, 1.107, 1.108 Message-ID: <200601161920.k0GJKpsC010836@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10824 Modified Files: .cvsignore kudzu.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- .cvsignore 10 Jan 2006 21:03:38 -0000 1.96 +++ .cvsignore 16 Jan 2006 19:20:45 -0000 1.97 @@ -1 +1 @@ -kudzu-1.2.18.tar.gz +kudzu-1.2.19.tar.gz Index: kudzu.spec =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- kudzu.spec 10 Jan 2006 21:45:29 -0000 1.109 +++ kudzu.spec 16 Jan 2006 19:20:45 -0000 1.110 @@ -1,5 +1,5 @@ Name: kudzu -Version: 1.2.18 +Version: 1.2.19 Release: 1 License: GPL Summary: The Red Hat Linux hardware probing tool. @@ -79,6 +79,9 @@ %{_includedir}/kudzu %changelog +* Mon Jan 16 2006 Bill Nottingham - 1.2.19-1 +- don't configure (or unconfigure) storage adapters (#177740) + * Tue Jan 10 2006 Bill Nottingham - 1.2.18-1 - add missing fchdir in pcmcia code - fix segfault if pcmcia network devices are found before their drivers Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.107 retrieving revision 1.108 diff -u -r1.107 -r1.108 --- sources 10 Jan 2006 22:24:12 -0000 1.107 +++ sources 16 Jan 2006 19:20:46 -0000 1.108 @@ -1 +1 @@ -ccdff346d139186e464dfc69ef532386 kudzu-1.2.18.tar.gz +6840cc4b68fea461b1e5dd691732b9ef kudzu-1.2.19.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 16 19:37:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 14:37:09 -0500 Subject: rpms/metacity/devel .cvsignore, 1.27, 1.28 metacity.spec, 1.47, 1.48 sources, 1.27, 1.28 Message-ID: <200601161937.k0GJb8bl010984@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/metacity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10972 Modified Files: .cvsignore metacity.spec sources Log Message: - Update to 2.13.21 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 13 Jan 2006 19:21:49 -0000 1.27 +++ .cvsignore 16 Jan 2006 19:37:00 -0000 1.28 @@ -1,8 +1 @@ -metacity-2.11.2.tar.bz2 -metacity-2.12.0.tar.bz2 -metacity-2.12.1.tar.bz2 -metacity-2.13.2.tar.bz2 -metacity-2.13.3.tar.bz2 -metacity-2.13.5.tar.bz2 -metacity-2.13.8.tar.bz2 -metacity-2.13.13.tar.bz2 +metacity-2.13.21.tar.bz2 Index: metacity.spec =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- metacity.spec 13 Jan 2006 19:21:49 -0000 1.47 +++ metacity.spec 16 Jan 2006 19:37:00 -0000 1.48 @@ -2,7 +2,7 @@ Summary: Metacity window manager Name: metacity -Version: 2.13.13 +Version: 2.13.21 Release: 1 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/ Source0: %{name}-%{version}.tar.bz2 @@ -106,6 +106,9 @@ %{_mandir}/man1/* %changelog +* Mon Jan 16 2006 Ray Strode at redhat.com> 2.13.21-1 +- Update to 2.13.21 + * Fri Jan 13 2006 Matthias Clasen 2.13.13-1 - Update to 2.13.13 Index: sources =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 13 Jan 2006 19:21:49 -0000 1.27 +++ sources 16 Jan 2006 19:37:00 -0000 1.28 @@ -1 +1 @@ -f81177d046be528a6f421a7a27bd3826 metacity-2.13.13.tar.bz2 +eacaa2aa7905e2294bdafe35d502b2a9 metacity-2.13.21.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 16 21:08:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 16:08:31 -0500 Subject: rpms/newt/devel newt.spec,1.29,1.30 Message-ID: <200601162108.k0GL8VY0010737@cvs.devel.redhat.com> Author: prockai Update of /cvs/dist/rpms/newt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10682 Modified Files: newt.spec Log Message: Actually bump the Release:. Index: newt.spec =================================================================== RCS file: /cvs/dist/rpms/newt/devel/newt.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- newt.spec 16 Jan 2006 20:54:24 -0000 1.29 +++ newt.spec 16 Jan 2006 21:08:29 -0000 1.30 @@ -4,7 +4,7 @@ Name: newt %define version 0.52.2 Version: %{version} -Release: 1.1 +Release: 2 License: LGPL Group: System Environment/Libraries Source: newt-%{version}.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 16 21:10:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 16:10:42 -0500 Subject: rpms/dhcp/devel dhcp-3.0.3-bz177845.patch,NONE,1.1 Message-ID: <200601162110.k0GLAgFc011277@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11252 Added Files: dhcp-3.0.3-bz177845.patch Log Message: fix bug 176615 dhcp-3.0.3-bz177845.patch: linux | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE dhcp-3.0.3-bz177845.patch --- --- dhcp-3.0.3/client/scripts/linux.bz177845 2006-01-09 15:17:10.000000000 -0500 +++ dhcp-3.0.3/client/scripts/linux 2006-01-16 15:45:05.000000000 -0500 @@ -281,7 +281,7 @@ added_router=1; fi; done - if [ -z "$router" ] || [ "$added_router" -eq 1 ] || [ `IFS=. ip2num $router` -le 0 ] || [[ "$router" = "$new_broadcast_address" ]]; then + if [ -z "$router" ] || [ "$added_router" -eq 1 ] || [ `IFS=. ip2num $router` -le 0 ] || [[ ( "$router" = "$new_broadcast_address" ) && ( "$new_subnet_mask" != "255.255.255.255" ) ]]; then continue; fi; default_routers=(${default_routers[@]} $router) @@ -434,7 +434,7 @@ fi; } -if [ x$new_broadcast_address != x ]; then +if [ x$new_broadcast_address != x ] && [ x$new_subnet_mask != x ] && [ "$new_subnet_mask" != "255.255.255.255" ]; then new_broadcast_arg="broadcast $new_broadcast_address" fi if [ x$old_broadcast_address != x ]; then From fedora-cvs-commits at redhat.com Mon Jan 16 21:11:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 16:11:02 -0500 Subject: rpms/dhcp/devel dhcp-3.0.3-bz177845.patch,1.1,1.2 Message-ID: <200601162111.k0GLB1bh011360@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11337 Modified Files: dhcp-3.0.3-bz177845.patch Log Message: fix bug 177845 dhcp-3.0.3-bz177845.patch: linux | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) From fedora-cvs-commits at redhat.com Mon Jan 16 21:12:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 16:12:04 -0500 Subject: rpms/dhcp/devel dhcp-3.0.3-bz176615.patch,NONE,1.1 Message-ID: <200601162112.k0GLC4bP011602@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11576 Added Files: dhcp-3.0.3-bz176615.patch Log Message: fix bug 176615 dhcp-3.0.3-bz176615.patch: dhcp.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) --- NEW FILE dhcp-3.0.3-bz176615.patch --- --- dhcp-3.0.3/server/dhcp.c.bz176615 2006-01-09 15:17:10.000000000 -0500 +++ dhcp-3.0.3/server/dhcp.c 2006-01-16 15:41:11.000000000 -0500 @@ -193,8 +193,19 @@ */ if ((oc = lookup_option (&dhcp_universe, packet -> options, DHO_HOST_NAME))) { - if (!oc -> expression) - ms_nulltp = oc->flags & OPTION_HAD_NULLS; + if (!oc -> expression) + { + ms_nulltp = oc->flags & OPTION_HAD_NULLS; + if ( (!ms_nulltp) && (oc->data.data[ oc->data.len - 1 ] == '\0') ) + { + while (oc -> data.len && + oc -> data.data [oc -> data.len - 1] == 0) { + ms_nulltp = 1; + oc -> flags |= OPTION_HAD_NULLS; + oc -> data.len--; + } + } + } } /* Classify the client. */ From fedora-cvs-commits at redhat.com Mon Jan 16 21:18:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 16:18:35 -0500 Subject: rpms/dhcp/devel dhcp.spec,1.81,1.82 Message-ID: <200601162118.k0GLIZea024930@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24904 Modified Files: dhcp.spec Log Message: fix bugs 177845 176615 Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- dhcp.spec 20 Dec 2005 19:26:39 -0000 1.81 +++ dhcp.spec 16 Jan 2006 21:18:31 -0000 1.82 @@ -2,7 +2,7 @@ Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.3 -Release: 18 +Release: 20 Epoch: 11 License: distributable Group: System Environment/Daemons @@ -73,6 +73,8 @@ Patch166: dhcp-3.0.3-bz173619.patch Patch167: dhcp-3.0.3-gcc4.1-Werrors.patch Patch168: dhcp-3.0.3-bz176270.patch +Patch169: dhcp-3.0.3-bz176615.patch +Patch170: dhcp-3.0.3-bz177845.patch URL: http://isc.org/products/DHCP/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig @@ -188,6 +190,8 @@ %patch166 -p1 -b .bz173619 %patch167 -p1 -b .gcc4.1-Werrors %patch168 -p1 -b .bz176270 +%patch169 -p1 -b .bz176615 +%patch170 -p1 -b .bz177845 cp %SOURCE1 . cat <site.conf VARDB=%{_localstatedir}/lib/dhcpd @@ -321,6 +325,11 @@ %{_mandir}/man3/* %changelog +* Mon Jan 16 2006 Jason Vas Dias - 11:3.0.3-20 +- fix bug 177845: allow client ip-address as default router +- fix bug 176615: fix DDNS update when Windows-NT client sends + host-name with trailing nul + * Tue Dec 20 2005 Jason Vas Dias - 11:3.0.3-18 - fix bug 176270: allow routers with an octet of 255 in their IP address From fedora-cvs-commits at redhat.com Mon Jan 16 21:31:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 16:31:09 -0500 Subject: rpms/dhcp/FC-4 dhcp-3.0.2-bz176615.patch,NONE,1.1 Message-ID: <200601162131.k0GLV9Xo029655@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv29624 Added Files: dhcp-3.0.2-bz176615.patch Log Message: fix bug 176615 dhcp-3.0.2-bz176615.patch: dhcp.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) --- NEW FILE dhcp-3.0.2-bz176615.patch --- --- dhcp-3.0.2/server/dhcp.c.bz176615 2006-01-16 16:20:45.000000000 -0500 +++ dhcp-3.0.2/server/dhcp.c 2006-01-16 16:21:23.000000000 -0500 @@ -193,8 +193,19 @@ */ if ((oc = lookup_option (&dhcp_universe, packet -> options, DHO_HOST_NAME))) { - if (!oc -> expression) - ms_nulltp = oc->flags & OPTION_HAD_NULLS; + if (!oc -> expression) + { + ms_nulltp = oc->flags & OPTION_HAD_NULLS; + if ( (!ms_nulltp) && (oc->data.data[ oc->data.len - 1 ] == '\0') ) + { + while (oc -> data.len && + oc -> data.data [oc -> data.len - 1] == 0) { + ms_nulltp = 1; + oc -> flags |= OPTION_HAD_NULLS; + oc -> data.len--; + } + } + } } /* Classify the client. */ From fedora-cvs-commits at redhat.com Mon Jan 16 21:31:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 16:31:48 -0500 Subject: rpms/dhcp/FC-4 dhcp-3.0.2-bz177845.patch,NONE,1.1 Message-ID: <200601162131.k0GLVmOi029753@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv29736 Added Files: dhcp-3.0.2-bz177845.patch Log Message: fix bug 177845 dhcp-3.0.2-bz177845.patch: linux | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE dhcp-3.0.2-bz177845.patch --- --- dhcp-3.0.2/client/scripts/linux.bz177845 2006-01-16 16:20:45.000000000 -0500 +++ dhcp-3.0.2/client/scripts/linux 2006-01-16 16:21:42.000000000 -0500 @@ -282,7 +282,7 @@ added_router=1; fi; done - if [ -z "$router" ] || [ "$added_router" -eq 1 ] || [ `IFS=. ip2num $router` -le 0 ] || [[ "$router" = "$new_broadcast_address" ]]; then + if [ -z "$router" ] || [ "$added_router" -eq 1 ] || [ `IFS=. ip2num $router` -le 0 ] || [[ ( "$router" = "$new_broadcast_address" ) && ( "$new_subnet_mask" != "255.255.255.255" ) ]]; then continue; fi; default_routers=(${default_routers[@]} $router) @@ -435,7 +435,7 @@ fi; } -if [ x$new_broadcast_address != x ]; then +if [ x$new_broadcast_address != x ] && [ x$new_subnet_mask != x ] && [ "$new_subnet_mask" != "255.255.255.255" ]; then new_broadcast_arg="broadcast $new_broadcast_address" fi if [ x$old_broadcast_address != x ]; then From fedora-cvs-commits at redhat.com Mon Jan 16 21:32:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 16:32:27 -0500 Subject: rpms/dhcp/FC-4 dhcp.spec,1.67,1.68 Message-ID: <200601162132.k0GLWRgB029874@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcp/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv29858 Modified Files: dhcp.spec Log Message: fix bugs 176615, 177845 Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/FC-4/dhcp.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- dhcp.spec 20 Dec 2005 19:32:27 -0000 1.67 +++ dhcp.spec 16 Jan 2006 21:32:25 -0000 1.68 @@ -2,7 +2,7 @@ Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.2 -Release: 28.FC4 +Release: 30.FC4 Epoch: 10 License: distributable Group: System Environment/Daemons @@ -67,6 +67,8 @@ Patch160: dhcp-3.0.2-dhclient-script_bz173619_and_route_metrics.patch Patch161: dhcp-3.0.2-bz167028-ibm-unicast-bootp.patch Patch162: dhcp-3.0.2-bz176270.patch +Patch163: dhcp-3.0.2-bz176615.patch +Patch164: dhcp-3.0.2-bz177845.patch URL: http://isc.org/products/DHCP/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Prereq: /sbin/chkconfig @@ -175,6 +177,8 @@ %patch160 -p1 -b .dhclient-script_bz173619_and_route_metrics %patch161 -p1 -b .bz167028-ibm-unicast-bootp %patch162 -p1 -b .bz176270 +%patch163 -p1 -b .bz176615 +%patch164 -p1 -b .bz177845 cp %SOURCE1 . cat <site.conf VARDB=%{_localstatedir}/lib/dhcp @@ -305,6 +309,10 @@ %{_mandir}/man3/* %changelog +* Mon Jan 16 2006 Jason Vas Dias - 11:3.0.2-30 +- fix bug 177845: allow default router to be same as ip-address +- fix bug 176615: fix DDNS updates when client sends host-name with trailing NUL + * Tue Dec 20 2005 Jason Vas Dias - 11:3.0.2-28 - fix bug 176270: allow routers with an octet of 255 in their IP address From fedora-cvs-commits at redhat.com Mon Jan 16 23:20:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 18:20:33 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.118, 1.119 Message-ID: <200601162320.k0GNKXMY000709@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv634 Modified Files: java-1.4.2-gcj-compat.spec Log Message: * Thu Jan 5 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_62rh - Remove aot-compile-rpm and rebuild-gcj-db when building a custom RPM. Index: java-1.4.2-gcj-compat.spec =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- java-1.4.2-gcj-compat.spec 9 Jan 2006 21:33:21 -0000 1.118 +++ java-1.4.2-gcj-compat.spec 16 Jan 2006 23:20:30 -0000 1.119 @@ -21,7 +21,7 @@ %define name java-%{javaver}-%{origin}-compat %define version %{javaver}.%{buildver} -%define release 40jpp_61rh +%define release 40jpp_62rh %define cname java-%{javaver}-%{origin} #%define bcarchivever 127 @@ -172,6 +172,11 @@ make DESTDIR=$RPM_BUILD_ROOT install %if %{custom} +rm -f $RPM_BUILD_ROOT%{_bindir}/aot-compile-rpm +rm -f $RPM_BUILD_ROOT%{_bindir}/rebuild-gcj-db +%endif + +%if %{custom} ln -sf %{_bindir}/ecj-%{cname} $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/javac %endif @@ -542,6 +547,9 @@ %defattr(-,root,root) %changelog +* Thu Jan 5 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_62rh +- Remove aot-compile-rpm and rebuild-gcj-db when building a custom RPM. + * Mon Jan 9 2006 Archit Shah - 0:1.4.2.0-40jpp_61rh - Import java-gcj-compat 1.0.50. From fedora-cvs-commits at redhat.com Mon Jan 16 23:34:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 18:34:41 -0500 Subject: rpms/bind/devel bind-9.3.2-bz177854.patch, NONE, 1.1 bind.spec, 1.86, 1.87 Message-ID: <200601162334.k0GNYfVT005542@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5511 Modified Files: bind.spec Added Files: bind-9.3.2-bz177854.patch Log Message: fix bug 177854 bind-9.3.2-bz177854.patch: ifiter_ioctl.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) --- NEW FILE bind-9.3.2-bz177854.patch --- --- bind-9.3.2/lib/isc/unix/ifiter_ioctl.c.bz177854 2005-10-13 21:13:07.000000000 -0500 +++ bind-9.3.2/lib/isc/unix/ifiter_ioctl.c 2006-01-16 17:50:37.000000000 -0500 @@ -50,7 +50,7 @@ #define VALID_IFITER(t) ISC_MAGIC_VALID(t, IFITER_MAGIC) #define ISC_IF_INET6_SZ \ - sizeof("00000000000000000000000000000001 01 80 10 80 XXXXXXloXXXXXXXX\n") + sizeof("0000:0000:0000:0000:0000:0000:0000:0001 01 80 10 80 XXXXXXloXXXXXXXX\n") struct isc_interfaceiter { unsigned int magic; /* Magic number. */ @@ -463,11 +463,21 @@ res = sscanf(iter->entry, "%32[a-f0-9] %x %x %x %x %16s\n", address, &ifindex, &prefix, &flag3, &flag4, name); if (res != 6) { - isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL, - ISC_LOGMODULE_INTERFACE, ISC_LOG_ERROR, - "/proc/net/if_inet6:sscanf() -> %d (expected 6)", - res); - return (ISC_R_FAILURE); + /* temporary fix to deal with broken kernel-2.6.15-1854+ : */ + res = sscanf(iter->entry, + "%4[a-f0-9]:%4[a-f0-9]:%4[a-f0-9]:%4[a-f0-9]:" + "%4[a-f0-9]:%4[a-f0-9]:%4[a-f0-9]:%4[a-f0-9] %x %x %x %x %16s\n", + &(address[0]),&(address[4]),&(address[8]),&(address[12]), + &(address[16]),&(address[20]),&(address[24]),&(address[28]), + &ifindex, &prefix, &flag3, &flag4, name); + if ( res != 13 ) + { + isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL, + ISC_LOGMODULE_INTERFACE, ISC_LOG_ERROR, + "/proc/net/if_inet6:sscanf() -> %d (expected 6)", + res); + return (ISC_R_FAILURE); + } } if (strlen(address) != 32) { isc_log_write(isc_lctx, ISC_LOGCATEGORY_GENERAL, Index: bind.spec =================================================================== RCS file: /cvs/dist/rpms/bind/devel/bind.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- bind.spec 21 Dec 2005 21:35:59 -0000 1.86 +++ bind.spec 16 Jan 2006 23:34:34 -0000 1.87 @@ -9,7 +9,7 @@ Name: bind License: BSD-like Version: 9.3.2 -Release: 1 +Release: 2 Epoch: 30 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-root @@ -62,6 +62,7 @@ Patch26: bind-9.3.1-flush-cache.patch Patch27: bind-9.3.1-dbus_restart.patch Patch28: bind-9.3.2rc1-dbus-0.6.patch +Patch29: bind-9.3.2-bz177854.patch Requires(pre,preun): shadow-utils Requires(post,preun): chkconfig Requires(post): textutils, fileutils, sed, grep @@ -242,6 +243,7 @@ %patch26 -p1 -b .flush_cache %patch27 -p1 -b .dbus_restart %patch28 -p1 -b .dbus-0.6 +%patch29 -p1 -b .bz177854 # # this must follow all dbus patches: %if %{WITH_DBUS} @@ -750,6 +752,10 @@ :; %changelog +* Mon Jan 16 2006 Jason Vas Dias - 30.9.3.2-2 +- fix bug 177854: temporary fix for broken kernel-2.6.15-1854+ + /proc/net/if_inet6 format + * Wed Dec 21 2005 Jason Vas Dias - 30:9.3.2-1 - Upgrade to 9.3.2, released today From fedora-cvs-commits at redhat.com Mon Jan 16 23:36:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 18:36:38 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.44, 1.45 java-1.4.2-gcj-compat.spec, 1.119, 1.120 sources, 1.48, 1.49 Message-ID: <200601162336.k0GNacmo006016@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5934 Modified Files: .cvsignore java-1.4.2-gcj-compat.spec sources Log Message: * Mon Jan 16 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_62rh - Remove aot-compile-rpm and rebuild-gcj-db when building a custom RPM. - Import java-gcj-compat 1.0.51. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 9 Jan 2006 21:33:20 -0000 1.44 +++ .cvsignore 16 Jan 2006 23:36:35 -0000 1.45 @@ -1,3 +1,3 @@ -java-gcj-compat-1.0.50.tar.gz bcprov-jdk14-127.tar.gz eclipse-ecj-3.1.0_fc-12.jar +java-gcj-compat-1.0.51.tar.gz Index: java-1.4.2-gcj-compat.spec =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- java-1.4.2-gcj-compat.spec 16 Jan 2006 23:20:30 -0000 1.119 +++ java-1.4.2-gcj-compat.spec 16 Jan 2006 23:36:35 -0000 1.120 @@ -17,7 +17,7 @@ %define buildver 0 # the version-release string for the gcj rpms we require %define gccver 4.0.0-0.42 -%define jgcver 1.0.50 +%define jgcver 1.0.51 %define name java-%{javaver}-%{origin}-compat %define version %{javaver}.%{buildver} @@ -547,8 +547,9 @@ %defattr(-,root,root) %changelog -* Thu Jan 5 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_62rh +* Mon Jan 16 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_62rh - Remove aot-compile-rpm and rebuild-gcj-db when building a custom RPM. +- Import java-gcj-compat 1.0.51. * Mon Jan 9 2006 Archit Shah - 0:1.4.2.0-40jpp_61rh - Import java-gcj-compat 1.0.50. Index: sources =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 9 Jan 2006 21:33:21 -0000 1.48 +++ sources 16 Jan 2006 23:36:35 -0000 1.49 @@ -1,3 +1,3 @@ -0b0f9037d62b6631d0c72d5f62abde7c java-gcj-compat-1.0.50.tar.gz d17b7fa532fc87fdf14d42c2d293ec3f bcprov-jdk14-127.tar.gz 95766e40c6ab6b641341f3a44dcf0b9e eclipse-ecj-3.1.0_fc-12.jar +ae0b2a3872d238da52b8c40d9c41f473 java-gcj-compat-1.0.51.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 16 23:57:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 18:57:02 -0500 Subject: rpms/avahi/devel .cvsignore, 1.5, 1.6 avahi.spec, 1.27, 1.28 sources, 1.5, 1.6 Message-ID: <200601162357.k0GNv2IO024681@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24656 Modified Files: .cvsignore avahi.spec sources Log Message: fix bugs 177610, 177609; upgrade to avahi-0.6.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Jan 2006 16:25:30 -0000 1.5 +++ .cvsignore 16 Jan 2006 23:56:58 -0000 1.6 @@ -2,3 +2,4 @@ avahi-0.6.tar.gz avahi-0.6.1.tar.gz avahi-0.6.3.tar.gz +avahi-0.6.4.tar.gz Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- avahi.spec 13 Jan 2006 16:03:23 -0000 1.27 +++ avahi.spec 16 Jan 2006 23:56:58 -0000 1.28 @@ -1,12 +1,19 @@ +%{?!WITH_MONO: %define WITH_MONO 1} +%ifarch ppc64 +%define WITH_MONO 0 +%endif Name: avahi -Version: 0.6.3 -Release: 2 +Version: 0.6.4 +Release: 1 Summary: Local network service discovery Group: System Environment/Base License: LGPL URL: http://avahi.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, gdbm-devel, mono-devel >= 1.1.13 +BuildRequires: doxygen, gtk2-devel, qt-devel, libglade2-devel, libdaemon-devel, glib-devel, libcap-devel, dbus-devel, expat-devel, python, dbus-python, gdbm-devel +%if %{WITH_MONO} +BuildRequires: mono-devel >= 1.1.13 +%endif Requires: dbus, libdaemon, expat, python, dbus-python, libcap Obsoletes: howl, howl-libs Source0: %{name}-%{version}.tar.gz @@ -75,6 +82,7 @@ The avahi-qt3-devel package contains the header files and libraries necessary for developing programs using avahi with Qt3. +%if %{WITH_MONO} %package sharp Summary: Mono language bindings for avahi mono development Group: Development/Libraries @@ -84,6 +92,7 @@ %description sharp The avahi-sharp package contains the files needed to develop mono programs that use avahi. +%endif %package devel Summary: Libraries and header files for avahi development @@ -106,7 +115,9 @@ #%patch4 -p1 -b .dbus-0.6 #^- this patch now upstream %patch5 -p1 -b .bz177148 +%if %{WITH_MONO} %patch6 -p1 -b .MONO_SHARED_DIR +%endif %build # auto* update needed for avahi-0.5.2-fedora.patch @@ -115,7 +126,11 @@ automake-1.9 --add-missing autoconf -%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --enable-compat-libdns_sd +%configure --with-distro=fedora --disable-qt4 --disable-monodoc --without-python-twisted --with-avahi-user=avahi --with-avahi-group=avahi --enable-compat-howl --enable-compat-libdns_sd \ +%if ! %{WITH_MONO} + --disable-mono \ +%endif +; make %{?_smp_mflags} %install @@ -259,13 +274,18 @@ %attr(755,root,root) %{_libdir}/libavahi-qt3.so %{_includedir}/avahi-qt3 +%if %{WITH_MONO} %files sharp %defattr(0644, root, root, 0755) /usr/lib/mono/avahi-sharp /usr/lib/mono/gac/avahi-sharp /usr/lib/pkgconfig/avahi-sharp.pc +%endif %changelog +* Mon Jan 16 2006 Jason Vas Dias - 0.6.4-1 +- Upgrade to upstream version 0.6.4 + * Thu Jan 12 2006 Jason Vas Dias - 0.6.3-2 - fix bug 177610: Enable mono support with new avahi-sharp package - fix bug 177609: add gdbm / gdbm-devel Requires for avahi-browse Index: sources =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Jan 2006 16:25:30 -0000 1.5 +++ sources 16 Jan 2006 23:56:58 -0000 1.6 @@ -1 +1 @@ -0203f7fdd8d16914594f5c7ab2ec8e71 avahi-0.6.3.tar.gz +12eb941043f26f82c51e99821ac52c44 avahi-0.6.4.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 17 00:36:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 19:36:18 -0500 Subject: rpms/glib2/devel .cvsignore, 1.42, 1.43 glib2.spec, 1.72, 1.73 sources, 1.42, 1.43 Message-ID: <200601170036.k0H0aIgK032588@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/glib2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32574 Modified Files: .cvsignore glib2.spec sources Log Message: 2.9.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 6 Jan 2006 14:39:39 -0000 1.42 +++ .cvsignore 17 Jan 2006 00:36:05 -0000 1.43 @@ -27,3 +27,4 @@ glib-2.9.1.tar.bz2 glib-2.9.2.tar.gz glib-2.9.2.tar.bz2 +glib-2.9.3.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- glib2.spec 6 Jan 2006 14:41:39 -0000 1.72 +++ glib2.spec 17 Jan 2006 00:36:05 -0000 1.73 @@ -1,7 +1,7 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.9.2 -Release: 2 +Version: 2.9.3 +Release: 1 License: LGPL Group: System Environment/Libraries Source: glib-%{version}.tar.bz2 @@ -96,6 +96,9 @@ %{_mandir}/man1/* %changelog +* Mon Jan 16 2006 Matthias Clasen - 2.9.3-1 +- Update to 2.9.3 + * Fri Jan 6 2006 Matthias Clasen - 2.9.2-2 - Update to 2.9.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 6 Jan 2006 14:39:39 -0000 1.42 +++ sources 17 Jan 2006 00:36:05 -0000 1.43 @@ -1 +1 @@ -98a33482d62735ed7e202bbbd5b27851 glib-2.9.2.tar.bz2 +e33d4a886492541e793d22dc5bc6a3d0 glib-2.9.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 00:44:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 19:44:14 -0500 Subject: rpms/libXScrnSaver/devel libXScrnSaver.spec,1.11,1.12 Message-ID: <200601170044.k0H0iENN032700@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/libXScrnSaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32687 Modified Files: libXScrnSaver.spec Log Message: * Mon Jan 16 2006 Mike A. Harris 1.0.0-2 - Added "Requires: libX11-devel, libXext-devel" to work around bug (#176674). Index: libXScrnSaver.spec =================================================================== RCS file: /cvs/dist/rpms/libXScrnSaver/devel/libXScrnSaver.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libXScrnSaver.spec 16 Dec 2005 10:59:31 -0000 1.11 +++ libXScrnSaver.spec 17 Jan 2006 00:44:11 -0000 1.12 @@ -1,7 +1,7 @@ Summary: X.Org X11 libXss runtime library Name: libXScrnSaver Version: 1.0.0 -Release: 1 +Release: 2 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -24,6 +24,10 @@ Requires: %{name} = %{version}-%{release} Requires(pre): xorg-x11-filesystem >= 0.99.2-3 +# NOTE: libX11-devel, libXext-devel were added to work around bug (#176674) +Requires: libX11-devel +Requires: libXext-devel + Obsoletes: XFree86-devel, xorg-x11-devel %description devel @@ -77,6 +81,9 @@ %{_mandir}/man3/*.3x* %changelog +* Mon Jan 16 2006 Mike A. Harris 1.0.0-2 +- Added "Requires: libX11-devel, libXext-devel" to work around bug (#176674). + * Fri Dec 16 2005 Mike A. Harris 1.0.0-1 - Updated libXScrnSaver to version 1.0.0 from X11R7 RC4 From fedora-cvs-commits at redhat.com Tue Jan 17 00:58:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 19:58:33 -0500 Subject: rpms/kernel/devel patch-2.6.15-git12.bz2.sign, NONE, 1.1 .cvsignore, 1.326, 1.327 kernel-2.6.spec, 1.1857, 1.1858 linux-2.6-radeon-backlight.patch, 1.9, 1.10 sources, 1.268, 1.269 upstream, 1.244, 1.245 linux-2.6.15-default-powerpc.patch, 1.1, NONE patch-2.6.15-git11.bz2.sign, 1.1, NONE Message-ID: <200601170058.k0H0wX1Z021199@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21151 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-radeon-backlight.patch sources upstream Added Files: patch-2.6.15-git12.bz2.sign Removed Files: linux-2.6.15-default-powerpc.patch patch-2.6.15-git11.bz2.sign Log Message: git12 --- NEW FILE patch-2.6.15-git12.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDy1TyyGugalF9Dw4RAu/HAJ95+dgxfX2WPZ84ejx22yU89ejVEQCdEP0L rduRoW27pvv3TwBhg4UyKj4= =QEAr -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.326 retrieving revision 1.327 diff -u -r1.326 -r1.327 --- .cvsignore 16 Jan 2006 02:40:15 -0000 1.326 +++ .cvsignore 17 Jan 2006 00:58:29 -0000 1.327 @@ -3,5 +3,4 @@ kernel-2.6.15 linux-2.6.15.tar.bz2 bcm43xx-20060114.tar.bz2 -patch-2.6.15-git10.bz2 -patch-2.6.15-git11.bz2 +patch-2.6.15-git12.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1857 retrieving revision 1.1858 diff -u -r1.1857 -r1.1858 --- kernel-2.6.spec 16 Jan 2006 04:30:02 -0000 1.1857 +++ kernel-2.6.spec 17 Jan 2006 00:58:29 -0000 1.1858 @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git11.bz2 +Patch1: patch-2.6.15-git12.bz2 Patch2: drm.patch #Patch2: patch-2.6.16-rc1-git1.bz2 @@ -224,7 +224,6 @@ Patch205: linux-2.6-edid-check.patch # 300 - 399 ppc(64) -Patch300: linux-2.6.15-default-powerpc.patch Patch301: linux-2.6.15-cell-numa-init.patch Patch304: linux-2.6.15-mv643xx-fixes.patch Patch305: linux-2.6-cell-mambo-drivers.patch @@ -622,8 +621,6 @@ # # ppc64 # -# Default to ARCH=powerpc -%patch300 -p1 # Arnd says don't call cell_spumem_init() till he fixes it. %patch301 -p1 # Fix the MV643xx Gigabit Ethernet driver @@ -1351,6 +1348,9 @@ %endif %changelog +* Mon Jan 16 2006 Dave Jones +- 2.6.15-git12 + * Sun Jan 15 2006 Dave Jones - 2.6.15-git11 - Revert some DRM changes as an experiment. linux-2.6-radeon-backlight.patch: radeon_base.c | 11 + radeon_pm.c | 557 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 567 insertions(+), 1 deletion(-) Index: linux-2.6-radeon-backlight.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-radeon-backlight.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linux-2.6-radeon-backlight.patch 30 Nov 2005 18:06:11 -0000 1.9 +++ linux-2.6-radeon-backlight.patch 17 Jan 2006 00:58:30 -0000 1.10 @@ -563,7 +563,7 @@ @@ -2779,6 +3311,29 @@ void radeonfb_pm_init(struct radeonfb_in #endif } - #endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_OF) */ + #endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC) */ + +/* The PM code also works on some PC laptops. + * Only a few models are actually tested so Your mileage may vary. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.268 retrieving revision 1.269 diff -u -r1.268 -r1.269 --- sources 16 Jan 2006 02:40:16 -0000 1.268 +++ sources 17 Jan 2006 00:58:30 -0000 1.269 @@ -1,4 +1,3 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 -b88bcec6eddc41ccb4e34a486d58b3dd patch-2.6.15-git10.bz2 -4d91884fd53623e6af96be128c1ce040 patch-2.6.15-git11.bz2 +71e0d170ea951b1b453335bbdac91c24 patch-2.6.15-git12.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- upstream 16 Jan 2006 02:40:16 -0000 1.244 +++ upstream 17 Jan 2006 00:58:30 -0000 1.245 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 -patch-2.6.15-git11.bz2 +patch-2.6.15-git12.bz2 --- linux-2.6.15-default-powerpc.patch DELETED --- --- patch-2.6.15-git11.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 17 01:05:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 20:05:39 -0500 Subject: rpms/atk/devel .cvsignore, 1.17, 1.18 atk.spec, 1.24, 1.25 sources, 1.17, 1.18 Message-ID: <200601170105.k0H15dDi022751@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/atk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22684 Modified Files: .cvsignore atk.spec sources Log Message: 1.11.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/atk/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 7 Sep 2005 15:45:59 -0000 1.17 +++ .cvsignore 17 Jan 2006 01:05:35 -0000 1.18 @@ -4,3 +4,4 @@ atk-1.9.1.tar.bz2 atk-1.10.1.tar.bz2 atk-1.10.3.tar.bz2 +atk-1.11.0.tar.bz2 Index: atk.spec =================================================================== RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- atk.spec 9 Dec 2005 22:39:41 -0000 1.24 +++ atk.spec 17 Jan 2006 01:05:35 -0000 1.25 @@ -2,11 +2,11 @@ Summary: Interfaces for accessibility support. Name: atk -Version: 1.10.3 -Release: 1.1 +Version: 1.11.0 +Release: 1 License: LGPL Group: System Environment/Libraries -Source: http://ftp.gnome.org/pub/GNOME/sources/atk/1.10/atk-1.10.3.tar.bz2 +Source: atk-%{version}.tar.bz2 URL: http://developer.gnome.org/projects/gap/ BuildRoot: %{_tmppath}/atk-%{PACKAGE_VERSION}-root BuildPreReq: glib2-devel >= %{glib2_version} @@ -68,6 +68,9 @@ %{_datadir}/gtk-doc/ %changelog +* Mon Jan 16 2006 Matthias Clasen - 1.11.0-1 +- Update to 1.11.0 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/atk/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 7 Sep 2005 15:45:59 -0000 1.17 +++ sources 17 Jan 2006 01:05:35 -0000 1.18 @@ -1 +1 @@ -c84a01fea567b365c0d44b227fead948 atk-1.10.3.tar.bz2 +5b320d6eae88d76ef7fb89595cf26a3b atk-1.11.0.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 01:13:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 20:13:12 -0500 Subject: rpms/atk/devel atk.spec,1.25,1.26 Message-ID: <200601170113.k0H1DCcF024616@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/atk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24555 Modified Files: atk.spec Log Message: Build api docs Index: atk.spec =================================================================== RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- atk.spec 17 Jan 2006 01:05:35 -0000 1.25 +++ atk.spec 17 Jan 2006 01:12:59 -0000 1.26 @@ -10,6 +10,8 @@ URL: http://developer.gnome.org/projects/gap/ BuildRoot: %{_tmppath}/atk-%{PACKAGE_VERSION}-root BuildPreReq: glib2-devel >= %{glib2_version} +# 1.11.0 tarball is missing api docs +BuildRequires: gtk-doc %description The ATK library provides a set of interfaces for adding accessibility @@ -35,7 +37,7 @@ %build -%configure --disable-gtk-doc +%configure --enable-gtk-doc make %install From fedora-cvs-commits at redhat.com Tue Jan 17 01:18:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 20:18:33 -0500 Subject: rpms/at-spi/devel .cvsignore, 1.14, 1.15 at-spi.spec, 1.21, 1.22 sources, 1.14, 1.15 Message-ID: <200601170118.k0H1IXJO005147@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/at-spi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5079 Modified Files: .cvsignore at-spi.spec sources Log Message: 1.7.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Sep 2005 15:55:34 -0000 1.14 +++ .cvsignore 17 Jan 2006 01:18:29 -0000 1.15 @@ -4,3 +4,4 @@ at-spi-1.6.3.tar.bz2 at-spi-1.6.4.tar.bz2 at-spi-1.6.6.tar.bz2 +at-spi-1.7.0.tar.bz2 Index: at-spi.spec =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- at-spi.spec 9 Dec 2005 22:39:41 -0000 1.21 +++ at-spi.spec 17 Jan 2006 01:18:29 -0000 1.22 @@ -6,8 +6,8 @@ Summary: Assistive Technology Service Provider Interface Name: at-spi -Version: 1.6.6 -Release: 2.1 +Version: 1.7.0 +Release: 1 URL: http://developer.gnome.org/projects/gap/ Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -87,6 +87,9 @@ %{_includedir}/* %changelog +* Mon Jan 16 2006 Matthias Clasen 1.7.0-1 +- Update to 1.7.0 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 7 Sep 2005 15:55:34 -0000 1.14 +++ sources 17 Jan 2006 01:18:29 -0000 1.15 @@ -1 +1 @@ -9669ee9e3633ffb43a70795edd748e4d at-spi-1.6.6.tar.bz2 +86add745eeee0de1d41be345c5fc571f at-spi-1.7.0.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 02:05:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 21:05:11 -0500 Subject: rpms/dasher/devel dasher-3.99.1-export.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 dasher.spec, 1.19, 1.20 sources, 1.6, 1.7 Message-ID: <200601170205.k0H25BNS032043@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31963 Modified Files: .cvsignore dasher.spec sources Added Files: dasher-3.99.1-export.patch Log Message: 3.99.1 dasher-3.99.1-export.patch: configure | 2 +- configure.in | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE dasher-3.99.1-export.patch --- --- dasher-3.99.1/configure.export 2006-01-16 20:37:16.000000000 -0500 +++ dasher-3.99.1/configure 2006-01-16 20:38:31.000000000 -0500 @@ -24581,7 +24581,7 @@ _ACEOF - +glade_LIBS="-Wl,--export-dynamic, $glade_LIBS" cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets --- dasher-3.99.1/configure.in.export 2006-01-16 20:33:21.000000000 -0500 +++ dasher-3.99.1/configure.in 2006-01-16 20:35:54.000000000 -0500 @@ -211,6 +211,8 @@ AC_SUBST(gnome_LIBS) AC_SUBST(gnome_CFLAGS) +glade_LIBS="-Wl,--export-dynamic, $glade_LIBS" + AC_SUBST(glade_LIBS) AC_SUBST(glade_CFLAGS) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 7 Sep 2005 16:13:31 -0000 1.6 +++ .cvsignore 17 Jan 2006 02:04:55 -0000 1.7 @@ -3,3 +3,4 @@ dasher-3.2.13.tar.bz2 dasher-3.2.15.tar.bz2 dasher-3.2.18.tar.bz2 +dasher-3.99.1.tar.bz2 Index: dasher.spec =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- dasher.spec 11 Dec 2005 07:15:52 -0000 1.19 +++ dasher.spec 17 Jan 2006 02:04:55 -0000 1.20 @@ -1,15 +1,12 @@ Summary: GNOME Accessibility method Name: dasher -Version: 3.2.18 -Release: 3 +Version: 3.99.1 +Release: 1 License: GPL Group: Desktop/Accessibility URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 -# This source exists only until dasher fixes its tarball -Source1: dasher.schemas -Patch0: dasher-3.2.18-export.patch -Patch1: dasher-3.2.18-c++.patch +Patch0: dasher-3.99.1-export.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gnome-speech-devel @@ -28,10 +25,6 @@ %prep %setup -q %patch0 -p1 -b .export -%patch1 -p1 -b .c++ - -# Make the build happy -cp %{SOURCE1} Data/ %build @@ -85,6 +78,9 @@ %{_sysconfdir}/gconf/schemas/dasher.schemas %changelog +* Mon Jan 16 2006 Matthias Clasen +- Update to 3.99.1 + * Sun Dec 11 2005 Matthias Clasen - Add -Wl,--export-dynamic, - Make compile with gcc 4.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 7 Sep 2005 16:13:31 -0000 1.6 +++ sources 17 Jan 2006 02:04:55 -0000 1.7 @@ -1 +1 @@ -f724113d3148a3c7f888b9e830ae75af dasher-3.2.18.tar.bz2 +b25e1f3221cce7b503f5bffb54341807 dasher-3.99.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 02:25:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 21:25:41 -0500 Subject: rpms/dasher/devel dasher-3.99.1-c++.patch, NONE, 1.1 dasher.spec, 1.20, 1.21 Message-ID: <200601170225.k0H2PfB6016138@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16059 Modified Files: dasher.spec Added Files: dasher-3.99.1-c++.patch Log Message: Try to fix some C++ dasher-3.99.1-c++.patch: Common/Types/int.h | 2 ++ DasherCore/SocketInput.h | 1 + 2 files changed, 3 insertions(+) --- NEW FILE dasher-3.99.1-c++.patch --- --- dasher-3.99.1/Src/DasherCore/SocketInput.h.c++ 2006-01-16 21:21:29.000000000 -0500 +++ dasher-3.99.1/Src/DasherCore/SocketInput.h 2006-01-16 21:22:55.000000000 -0500 @@ -31,6 +31,7 @@ // don't know how this interacts with recv blocking myClass->ReadForever(); + return NULL; } public: --- dasher-3.99.1/Src/Common/Types/int.h.c++ 2006-01-16 21:17:17.000000000 -0500 +++ dasher-3.99.1/Src/Common/Types/int.h 2006-01-16 21:17:45.000000000 -0500 @@ -33,8 +33,10 @@ typedef int int32; typedef unsigned int uint32; +#ifndef LLONG_MAX #define LLONG_MAX 9223372036854775807LL #define LLONG_MIN (-LLONG_MAX - 1LL) +#endif #endif Index: dasher.spec =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- dasher.spec 17 Jan 2006 02:04:55 -0000 1.20 +++ dasher.spec 17 Jan 2006 02:25:35 -0000 1.21 @@ -7,6 +7,7 @@ URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 Patch0: dasher-3.99.1-export.patch +Patch1: dasher-3.99.1-c++.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gnome-speech-devel @@ -25,6 +26,7 @@ %prep %setup -q %patch0 -p1 -b .export +%patch1 -p1 -b .c++ %build From fedora-cvs-commits at redhat.com Tue Jan 17 02:29:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 21:29:49 -0500 Subject: rpms/eel2/devel .cvsignore, 1.27, 1.28 eel2.spec, 1.32, 1.33 sources, 1.27, 1.28 Message-ID: <200601170229.k0H2Tng9017816@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eel2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17767 Modified Files: .cvsignore eel2.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 13 Dec 2005 16:33:30 -0000 1.27 +++ .cvsignore 17 Jan 2006 02:29:46 -0000 1.28 @@ -11,3 +11,4 @@ eel-2.12.1.tar.bz2 eel-2.13.2.tar.bz2 eel-2.13.3.tar.bz2 +eel-2.13.4.tar.bz2 Index: eel2.spec =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- eel2.spec 13 Dec 2005 16:33:30 -0000 1.32 +++ eel2.spec 17 Jan 2006 02:29:46 -0000 1.33 @@ -15,7 +15,7 @@ Name: eel2 Summary: Eazel Extensions Library. -Version: 2.13.3 +Version: 2.13.4 Release: 1 License: LGPL Group: System Environment/Libraries @@ -105,6 +105,9 @@ %{_includedir}/eel-2 %changelog +- Mon Jan 16 2006 Matthias Clasen 2.13.4-1 +- Update to 2.13.4 + * Tue Dec 13 2005 Alexander Larsson 2.13.3-1 - Update to 2.13.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 13 Dec 2005 16:33:30 -0000 1.27 +++ sources 17 Jan 2006 02:29:46 -0000 1.28 @@ -1 +1 @@ -cfbcad0fe48a6aa30a06becd7f5ddbe1 eel-2.13.3.tar.bz2 +276e71d00ed3db09eb4a29d15fad2edb eel-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 02:30:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 21:30:36 -0500 Subject: rpms/eel2/devel eel2.spec,1.33,1.34 Message-ID: <200601170230.k0H2UaSF018036@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eel2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18003 Modified Files: eel2.spec Log Message: 2.13.4 Index: eel2.spec =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- eel2.spec 17 Jan 2006 02:29:46 -0000 1.33 +++ eel2.spec 17 Jan 2006 02:30:34 -0000 1.34 @@ -105,7 +105,7 @@ %{_includedir}/eel-2 %changelog -- Mon Jan 16 2006 Matthias Clasen 2.13.4-1 +* Mon Jan 16 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 * Tue Dec 13 2005 Alexander Larsson 2.13.3-1 From fedora-cvs-commits at redhat.com Tue Jan 17 02:36:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 21:36:39 -0500 Subject: rpms/dasher/devel dasher-3.99.1-c++.patch,1.1,1.2 Message-ID: <200601170236.k0H2ad07019361@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19308 Modified Files: dasher-3.99.1-c++.patch Log Message: Grr dasher-3.99.1-c++.patch: Common/Types/int.h | 2 ++ DasherCore/SocketInput.cpp | 2 +- DasherCore/SocketInput.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) Index: dasher-3.99.1-c++.patch =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher-3.99.1-c++.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dasher-3.99.1-c++.patch 17 Jan 2006 02:25:35 -0000 1.1 +++ dasher-3.99.1-c++.patch 17 Jan 2006 02:36:35 -0000 1.2 @@ -8,6 +8,17 @@ } public: +--- dasher-3.99.1/Src/DasherCore/SocketInput.cpp.c++ 2006-01-16 21:35:06.000000000 -0500 ++++ dasher-3.99.1/Src/DasherCore/SocketInput.cpp 2006-01-16 21:35:59.000000000 -0500 +@@ -25,7 +25,7 @@ + // private methods: + + bool CSocketInput::LaunchReaderThread() { +- if (pthread_create(&readerThread, NULL, ThreadLauncherStub, this) == 0) { ++ if (pthread_create(&readerThread, NULL, CSocketInputBase::ThreadLauncherStub, this) == 0) { + return true; + } else { + //TODO should probably pop up a Gtk error message and think about how to do i18n: --- dasher-3.99.1/Src/Common/Types/int.h.c++ 2006-01-16 21:17:17.000000000 -0500 +++ dasher-3.99.1/Src/Common/Types/int.h 2006-01-16 21:17:45.000000000 -0500 @@ -33,8 +33,10 @@ From fedora-cvs-commits at redhat.com Tue Jan 17 02:40:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 21:40:35 -0500 Subject: rpms/libwnck/devel .cvsignore, 1.26, 1.27 libwnck.spec, 1.37, 1.38 sources, 1.26, 1.27 Message-ID: <200601170240.k0H2eZPJ020608@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libwnck/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20461 Modified Files: .cvsignore libwnck.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 3 Jan 2006 17:11:48 -0000 1.26 +++ .cvsignore 17 Jan 2006 02:40:32 -0000 1.27 @@ -4,3 +4,4 @@ libwnck-2.13.2.tar.bz2 libwnck-2.13.3.tar.bz2 libwnck-2.13.4.tar.bz2 +libwnck-2.13.5.tar.bz2 Index: libwnck.spec =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- libwnck.spec 3 Jan 2006 17:11:48 -0000 1.37 +++ libwnck.spec 17 Jan 2006 02:40:32 -0000 1.38 @@ -5,7 +5,7 @@ Summary: Window Navigator Construction Kit Name: libwnck -Version: 2.13.4 +Version: 2.13.5 Release: 1 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/ Source0: %{name}-%{version}.tar.bz2 @@ -87,6 +87,9 @@ %{_datadir}/gtk-doc/html/libwnck %changelog +* Mon Jan 16 2006 Matthias Clasen - 2.13.5-1 +- Update to 2.13.5 + * Tue Jan 03 2006 Matthias Clasen - 2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 3 Jan 2006 17:11:48 -0000 1.26 +++ sources 17 Jan 2006 02:40:32 -0000 1.27 @@ -1 +1 @@ -d8f1ade2b3b39eaebf834f74c3784705 libwnck-2.13.4.tar.bz2 +cb2da2795f517c713ec98560d078a102 libwnck-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 02:42:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 21:42:44 -0500 Subject: rpms/dasher/devel dasher-3.99.1-c++.patch,1.2,1.3 Message-ID: <200601170242.k0H2giFE021515@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21386 Modified Files: dasher-3.99.1-c++.patch Log Message: I hate C++ dasher-3.99.1-c++.patch: Common/Types/int.h | 2 ++ DasherCore/SocketInput.cpp | 2 +- DasherCore/SocketInput.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) Index: dasher-3.99.1-c++.patch =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher-3.99.1-c++.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dasher-3.99.1-c++.patch 17 Jan 2006 02:36:35 -0000 1.2 +++ dasher-3.99.1-c++.patch 17 Jan 2006 02:42:39 -0000 1.3 @@ -15,7 +15,7 @@ bool CSocketInput::LaunchReaderThread() { - if (pthread_create(&readerThread, NULL, ThreadLauncherStub, this) == 0) { -+ if (pthread_create(&readerThread, NULL, CSocketInputBase::ThreadLauncherStub, this) == 0) { ++ if (pthread_create(&readerThread, NULL, ThreadLauncherStub, this) == 0) { return true; } else { //TODO should probably pop up a Gtk error message and think about how to do i18n: From fedora-cvs-commits at redhat.com Tue Jan 17 02:50:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 21:50:23 -0500 Subject: rpms/dasher/devel dasher-3.99.1-c++.patch,1.3,1.4 Message-ID: <200601170250.k0H2oN6s027826@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27814 Modified Files: dasher-3.99.1-c++.patch Log Message: ... dasher-3.99.1-c++.patch: Common/Types/int.h | 2 ++ DasherCore/SocketInput.cpp | 2 +- DasherCore/SocketInput.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) Index: dasher-3.99.1-c++.patch =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher-3.99.1-c++.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dasher-3.99.1-c++.patch 17 Jan 2006 02:42:39 -0000 1.3 +++ dasher-3.99.1-c++.patch 17 Jan 2006 02:50:20 -0000 1.4 @@ -9,13 +9,13 @@ public: --- dasher-3.99.1/Src/DasherCore/SocketInput.cpp.c++ 2006-01-16 21:35:06.000000000 -0500 -+++ dasher-3.99.1/Src/DasherCore/SocketInput.cpp 2006-01-16 21:35:59.000000000 -0500 ++++ dasher-3.99.1/Src/DasherCore/SocketInput.cpp 2006-01-16 21:50:04.000000000 -0500 @@ -25,7 +25,7 @@ // private methods: bool CSocketInput::LaunchReaderThread() { - if (pthread_create(&readerThread, NULL, ThreadLauncherStub, this) == 0) { -+ if (pthread_create(&readerThread, NULL, ThreadLauncherStub, this) == 0) { ++ if (pthread_create(&readerThread, NULL, CSocketInput::ThreadLauncherStub, this) == 0) { return true; } else { //TODO should probably pop up a Gtk error message and think about how to do i18n: From fedora-cvs-commits at redhat.com Tue Jan 17 02:53:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 21:53:00 -0500 Subject: rpms/libbonobo/devel .cvsignore, 1.13, 1.14 libbonobo.spec, 1.22, 1.23 sources, 1.13, 1.14 Message-ID: <200601170253.k0H2r0nX027904@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27892 Modified Files: .cvsignore libbonobo.spec sources Log Message: 2.13.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 1 Dec 2005 20:33:35 -0000 1.13 +++ .cvsignore 17 Jan 2006 02:52:56 -0000 1.14 @@ -4,3 +4,4 @@ libbonobo-2.10.0.tar.bz2 libbonobo-2.10.1.tar.bz2 libbonobo-2.13.0.tar.bz2 +libbonobo-2.13.1.tar.bz2 Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- libbonobo.spec 9 Dec 2005 22:41:30 -0000 1.22 +++ libbonobo.spec 17 Jan 2006 02:52:56 -0000 1.23 @@ -5,8 +5,8 @@ Summary: Bonobo component system Name: libbonobo -Version: 2.13.0 -Release: 1.1 +Version: 2.13.1 +Release: 1 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -100,6 +100,9 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Mon Jan 16 2006 Matthias Clasen +- Update to 2.13.1 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 1 Dec 2005 20:33:36 -0000 1.13 +++ sources 17 Jan 2006 02:52:56 -0000 1.14 @@ -1 +1 @@ -34046c6880f4c90e47a1acae34b74d26 libbonobo-2.13.0.tar.bz2 +e418c385ff2010323233a90fda318ffb libbonobo-2.13.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 02:55:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 21:55:37 -0500 Subject: rpms/libbonoboui/devel .cvsignore, 1.18, 1.19 libbonoboui.spec, 1.30, 1.31 sources, 1.19, 1.20 Message-ID: <200601170255.k0H2tbhf028043@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libbonoboui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28031 Modified Files: .cvsignore libbonoboui.spec sources Log Message: 2.13.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 1 Dec 2005 20:36:59 -0000 1.18 +++ .cvsignore 17 Jan 2006 02:55:33 -0000 1.19 @@ -7,3 +7,4 @@ libbonoboui-2.10.0.tar.bz2 libbonoboui-2.10.1.tar.bz2 libbonoboui-2.13.0.tar.bz2 +libbonoboui-2.13.1.tar.bz2 Index: libbonoboui.spec =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- libbonoboui.spec 9 Dec 2005 22:41:30 -0000 1.30 +++ libbonoboui.spec 17 Jan 2006 02:55:33 -0000 1.31 @@ -13,8 +13,8 @@ Summary: Bonobo user interface components Name: libbonoboui -Version: 2.13.0 -Release: 1.1 +Version: 2.13.1 +Release: 1 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: ta.po @@ -127,6 +127,9 @@ %{_datadir}/gtk-doc %changelog +* Mon Jan 16 2006 Matthias Clasen +- Update to 2.13.1 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 1 Dec 2005 20:36:59 -0000 1.19 +++ sources 17 Jan 2006 02:55:33 -0000 1.20 @@ -1 +1 @@ -0432d5c01dec64533bee8ff035a5696c libbonoboui-2.13.0.tar.bz2 +076905fc924b22e9b5656a51490ea07e libbonoboui-2.13.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 03:09:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 22:09:52 -0500 Subject: rpms/libgnome/devel .cvsignore, 1.20, 1.21 libgnome.spec, 1.43, 1.44 sources, 1.20, 1.21 Message-ID: <200601170309.k0H39q3L028229@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnome/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28217 Modified Files: .cvsignore libgnome.spec sources Log Message: 2.13.7 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnome/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 14 Dec 2005 21:41:06 -0000 1.20 +++ .cvsignore 17 Jan 2006 03:09:49 -0000 1.21 @@ -3,3 +3,4 @@ libgnome-2.12.0.1.tar.bz2 libgnome-2.13.2.tar.bz2 libgnome-2.13.4.tar.bz2 +libgnome-2.13.7.tar.bz2 Index: libgnome.spec =================================================================== RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- libgnome.spec 14 Dec 2005 21:41:06 -0000 1.43 +++ libgnome.spec 17 Jan 2006 03:09:49 -0000 1.44 @@ -11,7 +11,7 @@ Summary: GNOME base library Name: libgnome -Version: 2.13.4 +Version: 2.13.7 Release: 1 URL: ftp://ftp.gnome.org/ Source0: %{name}-%{version}.tar.bz2 @@ -153,6 +153,9 @@ %{_datadir}/gtk-doc %changelog +* Mon Jan 16 2006 Matthias Clasen - 2.13.7-1 +- Update to 2.13.7 + * Wed Dec 14 2005 Matthias Clasen - 2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnome/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 14 Dec 2005 21:41:06 -0000 1.20 +++ sources 17 Jan 2006 03:09:49 -0000 1.21 @@ -1 +1 @@ -2f0d052b2ac3f48e03a4f21ed40c7128 libgnome-2.13.4.tar.bz2 +63cbfa0fe44c478c99ce4cb5f6889c39 libgnome-2.13.7.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 03:13:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 22:13:53 -0500 Subject: rpms/libselinux/FC-4 libselinux-rhat.patch, 1.44, 1.45 libselinux.spec, 1.103, 1.104 Message-ID: <200601170313.k0H3Dr3X028356@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv28343 Modified Files: libselinux-rhat.patch libselinux.spec Log Message: * Mon Jan 16 2006 Dan Walsh 1.23.11-1.1 - Allow rpm_exec to continue on failure if permissive mode libselinux-rhat.patch: rpm.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) Index: libselinux-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/libselinux/FC-4/libselinux-rhat.patch,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- libselinux-rhat.patch 11 May 2005 15:00:11 -0000 1.44 +++ libselinux-rhat.patch 17 Jan 2006 03:13:48 -0000 1.45 @@ -1,66 +1,39 @@ ---- libselinux-1.23.10/man/man8/selinux.8.rhat 2005-04-29 14:07:14.000000000 -0400 -+++ libselinux-1.23.10/man/man8/selinux.8 2005-05-11 10:56:10.000000000 -0400 -@@ -1,4 +1,4 @@ --.TH "selinux" "8" "11 Aug 2004" "dwalsh at redhat.com" "SELinux Command Line documentation" -+.TH "selinux" "8" "29 Apr 2005" "dwalsh at redhat.com" "SELinux Command Line documentation" - - .SH "NAME" - selinux \- NSA Security-Enhanced Linux (SELinux) -@@ -62,11 +62,22 @@ - .B system-config-securitylevel - allows customization of these booleans and tunables. - -+.br -+Many domains that are protected by SELinux also include selinux man pages explainging how to customize their policy. -+ -+.SH FILE LABELING +diff --exclude-from=exclude -N -u -r nsalibselinux/src/rpm.c libselinux-1.23.11/src/rpm.c +--- nsalibselinux/src/rpm.c 2005-05-20 13:15:53.000000000 -0400 ++++ libselinux-1.23.11/src/rpm.c 2006-01-16 22:09:51.000000000 -0500 +@@ -11,7 +11,7 @@ + { + security_context_t mycon = NULL, fcon = NULL, newcon = NULL; + context_t con = NULL; +- int rc; ++ int rc = 0; + + if (is_selinux_enabled() < 1) + return execve(filename, argv, envp); +@@ -30,6 +30,7 @@ + + if (!strcmp(mycon, newcon)) { + /* No default transition, use rpm_script_t for now. */ ++ rc = -1; + con = context_new(mycon); + if (!con) + goto out; +@@ -39,13 +40,17 @@ + newcon = strdup(context_str(con)); + if (!newcon) + goto out; ++ rc = 0; + } + + rc = setexeccon(newcon); + if (rc < 0) + goto out; +- rc = execve(filename, argv, envp); + out: + -+All files, directories, devices ... have a security context/label associated with them. These context are stored in the extended attributes of the file system. -+Problems with SELinux often arise from the file system being mislabeled. This can be caused by booting the machine with a non selinux kernel. If you see an error message containing file_t, that is usually a good indicator that you have a serious problem with file system labeling. -+.br -+The best way to relabel the file system is to create the flag file /.autorelabel and reboot. system-config-securitylevel, also has this capability. The restorcon/fixfiles commands are also available for relabeling files. -+ - .SH AUTHOR - This manual page was written by Dan Walsh . - - .SH "SEE ALSO" --booleans(8), setsebool(8), selinuxenabled(8), togglesebool(8) -+booleans(8), setsebool(8), selinuxenabled(8), togglesebool(8), restorecon(8), setfiles(8), ftpd_selinux(8), named_selinux(8), rsync_selinux(8), httpd_selinux(8), nfs_selinux(8), samba_selinux(8), kerberos_selinux(8), nis_selinux(8), ypbind_selinux(8) ++ if (rc >= 0 || !security_getenforce()) ++ rc = execve(filename, argv, envp); + - - .SH FILES - /etc/selinux/config ---- libselinux-1.23.10/utils/avcstat.c.rhat 2005-04-29 14:07:14.000000000 -0400 -+++ libselinux-1.23.10/utils/avcstat.c 2005-05-11 10:57:30.000000000 -0400 -@@ -90,12 +90,15 @@ - - int main(int argc, char **argv) - { -+ struct avc_cache_stats tot, rel, last; - int fd, i, cumulative = 0; - struct sigaction sa; - char avcstatfile[PATH_MAX]; - snprintf(avcstatfile, sizeof avcstatfile, "%s%s", selinux_mnt, DEF_STAT_FILE); - progname = basename(argv[0]); - -+ memset(&last, 0, sizeof(last)); -+ - while((i = getopt(argc, argv, "cf:h?-")) != -1) { - switch (i) { - case 'c': -@@ -144,7 +147,6 @@ - for (i = 0;; i++) { - char *line; - ssize_t ret, parsed = 0; -- struct avc_cache_stats tot, rel, last; - - memset(buf, 0, DEF_BUF_SIZE); - ret = read(fd, buf, DEF_BUF_SIZE); -@@ -166,7 +168,6 @@ - "hits", "misses", "allocs", "reclaims", "frees"); - - memset(&tot, 0, sizeof(tot)); -- memset(&last, 0, sizeof(last)); - - while ((line = strtok(NULL, "\n"))) { - struct avc_cache_stats tmp; + context_free(con); + freecon(newcon); + freecon(fcon); Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/FC-4/libselinux.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- libselinux.spec 20 May 2005 17:18:49 -0000 1.103 +++ libselinux.spec 17 Jan 2006 03:13:48 -0000 1.104 @@ -1,10 +1,11 @@ Summary: SELinux library and simple utilities Name: libselinux Version: 1.23.11 -Release: 1 +Release: 1.1 License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz +Patch: libselinux-rhat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -34,6 +35,7 @@ %prep %setup -q +%patch -p1 -b .rhat %build make CFLAGS="-g %{optflags}" @@ -83,6 +85,9 @@ %{_mandir}/man8/* %changelog +* Mon Jan 16 2006 Dan Walsh 1.23.11-1.1 +- Allow rpm_exec to continue on failure if permissive mode + * Fri May 20 2005 Dan Walsh 1.23.11-1 - Update from NSA * Merged avcstat and selinux man page from Dan Walsh. From fedora-cvs-commits at redhat.com Tue Jan 17 03:17:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 22:17:49 -0500 Subject: rpms/libgnomeui/devel .cvsignore, 1.19, 1.20 libgnomeui.spec, 1.31, 1.32 sources, 1.19, 1.20 Message-ID: <200601170317.k0H3Hn7t008159@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnomeui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8144 Modified Files: .cvsignore libgnomeui.spec sources Log Message: 2.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnomeui/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 14 Dec 2005 21:47:05 -0000 1.19 +++ .cvsignore 17 Jan 2006 03:17:47 -0000 1.20 @@ -1,3 +1,4 @@ libgnomeui-2.11.2.tar.gz libgnomeui-2.12.0.tar.bz2 libgnomeui-2.13.0.tar.bz2 +libgnomeui-2.13.2.tar.bz2 Index: libgnomeui.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- libgnomeui.spec 14 Dec 2005 21:47:05 -0000 1.31 +++ libgnomeui.spec 17 Jan 2006 03:17:47 -0000 1.32 @@ -17,7 +17,7 @@ Summary: GNOME base GUI library Name: libgnomeui -Version: 2.13.0 +Version: 2.13.2 Release: 1 URL: ftp://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 @@ -161,6 +161,9 @@ %{_datadir}/gtk-doc %changelog +* Mon Jan 16 2006 Matthias Clasen +- Update to 2.13.2 + * Wed Dec 14 2005 Matthias Clasen - Update to 2.13.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnomeui/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 14 Dec 2005 21:47:05 -0000 1.19 +++ sources 17 Jan 2006 03:17:47 -0000 1.20 @@ -1 +1 @@ -ffe4ce813e98823e580ab839045c2bdd libgnomeui-2.13.0.tar.bz2 +beee8d2e32ddb4b5647e8c5c950a42fa libgnomeui-2.13.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 03:36:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 22:36:05 -0500 Subject: rpms/GConf2/devel .cvsignore, 1.23, 1.24 GConf2.spec, 1.31, 1.32 sources, 1.23, 1.24 Message-ID: <200601170336.k0H3a5OK019625@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/GConf2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19576 Modified Files: .cvsignore GConf2.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 3 Nov 2005 16:46:35 -0000 1.23 +++ .cvsignore 17 Jan 2006 03:35:51 -0000 1.24 @@ -1,3 +1,4 @@ GConf-2.11.90.tar.bz2 GConf-2.12.0.tar.bz2 GConf-2.12.1.tar.bz2 +GConf-2.13.5.tar.bz2 Index: GConf2.spec =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/GConf2.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- GConf2.spec 9 Dec 2005 22:39:28 -0000 1.31 +++ GConf2.spec 17 Jan 2006 03:35:51 -0000 1.32 @@ -4,8 +4,8 @@ Summary: A process-transparent configuration system Name: GConf2 -Version: 2.12.1 -Release: 2.1 +Version: 2.13.5 +Release: 1 License: LGPL Group: System Environment/Base Source: ftp://ftp.gnome.org/pub/GNOME/unstable/sources/GConf/GConf-%{version}.tar.bz2 @@ -23,8 +23,6 @@ BuildRequires: gettext BuildRequires: openldap-devel -Patch0: GConf-2.12.1-unescape-key-fix.patch - %description GConf is a process-transparent configuration database API used to store user preferences. It has pluggable backends and features to @@ -44,7 +42,6 @@ %prep %setup -q -n GConf-%{version} -%patch0 -p1 -b .unescape-key-fix %build %configure @@ -100,6 +97,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Jan 16 2006 Matthias Clasen 2.13.5-1 +- Update to 2.13.5 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/GConf2/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 3 Nov 2005 16:46:35 -0000 1.23 +++ sources 17 Jan 2006 03:35:51 -0000 1.24 @@ -1 +1 @@ -247110de013ed24b17cf4191eb6daec5 GConf-2.12.1.tar.bz2 +097823748dac6afc7a138001df6d3c35 GConf-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 03:40:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 22:40:38 -0500 Subject: rpms/libgnomeui/devel libgnomeui.spec,1.32,1.33 Message-ID: <200601170340.k0H3ecBE020971@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnomeui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20854 Modified Files: libgnomeui.spec Log Message: Don't build api docs Index: libgnomeui.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- libgnomeui.spec 17 Jan 2006 03:17:47 -0000 1.32 +++ libgnomeui.spec 17 Jan 2006 03:40:34 -0000 1.33 @@ -4,7 +4,7 @@ %define libgnomecanvas_version 2.0.0 %define libgnome_version 2.2.0 %define libart_lgpl_version 2.3.8 -%define libbonoboui_version 2.3.6 +%define libbonoboui_version 2.13.1 %define glib2_version 2.6.0 %define pango_version 1.2.0 %define gtk2_version 2.6.0 @@ -62,7 +62,6 @@ BuildRequires: fontconfig BuildRequires: gnome-keyring-devel BuildRequires: libjpeg-devel -BuildRequires: gtk-doc %description @@ -117,7 +116,7 @@ %setup -q %build -%configure --enable-gtk-doc +%configure --disable-gtk-doc export tagname=CC make From fedora-cvs-commits at redhat.com Tue Jan 17 03:46:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 22:46:42 -0500 Subject: rpms/eog/devel .cvsignore, 1.23, 1.24 eog.spec, 1.35, 1.36 sources, 1.23, 1.24 Message-ID: <200601170346.k0H3kgHm029262@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28886 Modified Files: .cvsignore eog.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 13 Jan 2006 18:06:13 -0000 1.23 +++ .cvsignore 17 Jan 2006 03:46:37 -0000 1.24 @@ -10,3 +10,4 @@ eog-2.13.2.tar.bz2 eog-2.13.3.tar.bz2 eog-2.13.4.tar.bz2 +eog-2.13.5.tar.bz2 Index: eog.spec =================================================================== RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- eog.spec 13 Jan 2006 18:07:16 -0000 1.35 +++ eog.spec 17 Jan 2006 03:46:37 -0000 1.36 @@ -12,7 +12,7 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.13.4 +Version: 2.13.5 Release: 1 URL: http://www.gnome.org Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2 @@ -97,6 +97,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Mon Jan 16 2006 Matthias Clasen 2.13.5-1 +- Update to 2.13.5 + * Fri Jan 13 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/eog/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 13 Jan 2006 18:06:13 -0000 1.23 +++ sources 17 Jan 2006 03:46:37 -0000 1.24 @@ -1 +1 @@ -e5071b9c10f18ce13888c7e53b9ec7ab eog-2.13.4.tar.bz2 +71f67205117602068b246ded1a5ddf83 eog-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 03:55:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 22:55:15 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.23, 1.24 modules-mls.conf, 1.8, 1.9 policy-20060104.patch, 1.12, 1.13 selinux-policy.spec, 1.83, 1.84 sources, 1.25, 1.26 Message-ID: <200601170355.k0H3tFrC006163@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6125 Modified Files: .cvsignore modules-mls.conf policy-20060104.patch selinux-policy.spec sources Log Message: * Sat Jan 14 2006 Dan Walsh 2.1.11-1 - Update to upstream - Fix ftp Man page Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 13 Jan 2006 22:32:06 -0000 1.23 +++ .cvsignore 17 Jan 2006 03:55:13 -0000 1.24 @@ -24,3 +24,4 @@ serefpolicy-2.1.8.tgz serefpolicy-2.1.9.tgz serefpolicy-2.1.10.tgz +serefpolicy-2.1.11.tgz Index: modules-mls.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-mls.conf,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- modules-mls.conf 11 Jan 2006 22:25:06 -0000 1.8 +++ modules-mls.conf 17 Jan 2006 03:55:13 -0000 1.9 @@ -950,12 +950,12 @@ # prelink = base -# Layer: services -# Module: locate +# Layer: apps +# Module: slocate # # locate executable # -locate = base +slocate = base # Layer: services # Module: logwatch policy-20060104.patch: Makefile | 2 +- man/man8/ftpd_selinux.8 | 4 ++-- policy/modules/admin/kudzu.te | 1 + policy/modules/admin/readahead.te | 2 ++ policy/modules/apps/java.fc | 2 ++ policy/modules/apps/wine.fc | 2 ++ policy/modules/apps/wine.if | 23 +++++++++++++++++++++++ policy/modules/apps/wine.te | 27 +++++++++++++++++++++++++++ policy/modules/kernel/devices.if | 16 ++++++++++++++++ policy/modules/kernel/filesystem.if | 20 ++++++++++++++++++++ policy/modules/kernel/mls.te | 2 ++ policy/modules/services/apache.te | 5 +++++ policy/modules/services/apm.te | 1 + policy/modules/services/automount.te | 1 + policy/modules/services/cron.te | 2 +- policy/modules/services/cups.te | 6 ++---- policy/modules/services/dovecot.te | 1 + policy/modules/services/hal.te | 12 +++++++++++- policy/modules/services/mta.te | 1 + policy/modules/services/sendmail.te | 2 ++ policy/modules/system/authlogin.if | 13 +++++++++++++ policy/modules/system/authlogin.te | 12 ++++-------- policy/modules/system/hostname.te | 34 +++------------------------------- policy/modules/system/init.te | 1 + policy/modules/system/libraries.fc | 2 +- policy/modules/system/lvm.te | 8 +------- policy/modules/system/mount.te | 3 ++- policy/modules/system/selinuxutil.te | 3 +++ policy/modules/system/unconfined.if | 1 + policy/modules/system/userdomain.if | 1 + policy/users | 8 +++++--- 31 files changed, 158 insertions(+), 60 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- policy-20060104.patch 14 Jan 2006 04:09:22 -0000 1.12 +++ policy-20060104.patch 17 Jan 2006 03:55:13 -0000 1.13 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.10/Makefile +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.11/Makefile --- nsaserefpolicy/Makefile 2006-01-13 09:48:25.000000000 -0500 -+++ serefpolicy-2.1.10/Makefile 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/Makefile 2006-01-16 22:32:53.000000000 -0500 @@ -92,7 +92,7 @@ # enable MLS if requested. @@ -10,9 +10,24 @@ override CHECKPOLICY += -M override CHECKMODULE += -M endif -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.1.10/policy/modules/admin/kudzu.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-2.1.11/man/man8/ftpd_selinux.8 +--- nsaserefpolicy/man/man8/ftpd_selinux.8 2006-01-06 17:55:17.000000000 -0500 ++++ serefpolicy-2.1.11/man/man8/ftpd_selinux.8 2006-01-16 22:32:53.000000000 -0500 +@@ -16,9 +16,9 @@ + .TP + chcon -t public_content_rw_t /var/ftp/incoming + .TP +-You must also turn on the boolean allow_ftp_anon_write. ++You must also turn on the boolean allow_ftpd_anon_write. + .TP +-setsebool -P allow_ftp_anon_write=1 ++setsebool -P allow_ftpd_anon_write=1 + .TP + If you want to make this permanant, i.e. survive a relabel, you must add an entry to the file_contexts.local file. + .TP +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.1.11/policy/modules/admin/kudzu.te --- nsaserefpolicy/policy/modules/admin/kudzu.te 2006-01-13 17:06:02.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/admin/kudzu.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/admin/kudzu.te 2006-01-16 22:32:53.000000000 -0500 @@ -63,6 +63,7 @@ fs_write_ramfs_socket(kudzu_t) @@ -21,9 +36,9 @@ modutils_read_mods_deps(kudzu_t) modutils_read_module_conf(kudzu_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.1.10/policy/modules/admin/readahead.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.1.11/policy/modules/admin/readahead.te --- nsaserefpolicy/policy/modules/admin/readahead.te 2006-01-13 17:06:02.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/admin/readahead.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/admin/readahead.te 2006-01-16 22:32:53.000000000 -0500 @@ -35,6 +35,7 @@ dev_getattr_all_chr_files(readahead_t) dev_getattr_all_blk_files(readahead_t) @@ -40,24 +55,24 @@ term_dontaudit_use_console(readahead_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.1.10/policy/modules/apps/java.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.1.11/policy/modules/apps/java.fc --- nsaserefpolicy/policy/modules/apps/java.fc 2006-01-12 18:28:45.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/apps/java.fc 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/apps/java.fc 2006-01-16 22:32:53.000000000 -0500 @@ -2,3 +2,5 @@ # /usr # /usr(/.*)?/bin/java.* -- gen_context(system_u:object_r:java_exec_t,s0) +/usr/bin/gij -- gen_context(system_u:object_r:java_exec_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.10/policy/modules/apps/wine.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.11/policy/modules/apps/wine.fc --- nsaserefpolicy/policy/modules/apps/wine.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/apps/wine.fc 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/apps/wine.fc 2006-01-16 22:32:53.000000000 -0500 @@ -0,0 +1,2 @@ +/usr/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.10/policy/modules/apps/wine.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.11/policy/modules/apps/wine.if --- nsaserefpolicy/policy/modules/apps/wine.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/apps/wine.if 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/apps/wine.if 2006-01-16 22:32:53.000000000 -0500 @@ -0,0 +1,23 @@ +## Load keyboard mappings. + @@ -82,9 +97,9 @@ + allow wine_t $1:fifo_file rw_file_perms; + allow wine_t $1:process sigchld; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.10/policy/modules/apps/wine.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.11/policy/modules/apps/wine.te --- nsaserefpolicy/policy/modules/apps/wine.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/apps/wine.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/apps/wine.te 2006-01-16 22:32:53.000000000 -0500 @@ -0,0 +1,27 @@ +policy_module(wine,1.0.0) + @@ -113,9 +128,9 @@ + allow wine_t file_type:file execmod; + +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.1.10/policy/modules/kernel/devices.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.1.11/policy/modules/kernel/devices.if --- nsaserefpolicy/policy/modules/kernel/devices.if 2006-01-13 17:06:03.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/kernel/devices.if 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/kernel/devices.if 2006-01-16 22:32:53.000000000 -0500 @@ -2248,3 +2248,19 @@ typeattribute $1 memory_raw_write, memory_raw_read; ') @@ -136,9 +151,39 @@ + dontaudit $1 memory_device_t:chr_file getattr; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.10/policy/modules/kernel/mls.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.1.11/policy/modules/kernel/filesystem.if +--- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-13 17:06:04.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/kernel/filesystem.if 2006-01-16 22:32:53.000000000 -0500 +@@ -2282,6 +2282,26 @@ + + ######################################## + ## ++## dontaudit Read and write character nodes on tmpfs filesystems. ++## ++## ++## The type of the process performing this action. ++## ++# ++interface(`fs_dontaudit_use_tmpfs_chr_dev',` ++ gen_require(` ++ type tmpfs_t; ++ class dir r_dir_perms; ++ class chr_file rw_file_perms; ++ ') ++ ++ dontaudit $1 tmpfs_t:dir r_dir_perms; ++ dontaudit $1 tmpfs_t:chr_file rw_file_perms; ++') ++ ++ ++######################################## ++## + ## Relabel character nodes on tmpfs filesystems. + ## + ## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.11/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/kernel/mls.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/kernel/mls.te 2006-01-16 22:32:53.000000000 -0500 @@ -82,9 +82,11 @@ # these might be targeted_policy only range_transition unconfined_t su_exec_t s0 - s0:c0.c255; @@ -151,10 +196,10 @@ range_transition kernel_t init_exec_t s0 - s15:c0.c255; +range_transition initrc_t auditd_exec_t s15:c0.c255; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.1.10/policy/modules/services/apache.te ---- nsaserefpolicy/policy/modules/services/apache.te 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/apache.te 2006-01-13 17:12:12.000000000 -0500 -@@ -689,3 +689,8 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.1.11/policy/modules/services/apache.te +--- nsaserefpolicy/policy/modules/services/apache.te 2006-01-16 22:19:19.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/services/apache.te 2006-01-16 22:32:53.000000000 -0500 +@@ -693,3 +693,8 @@ optional_policy(`nscd',` nscd_use_socket(httpd_unconfined_script_t) ') @@ -163,9 +208,9 @@ + cron_system_entry(httpd_t, httpd_exec_t) +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.1.10/policy/modules/services/apm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.1.11/policy/modules/services/apm.te --- nsaserefpolicy/policy/modules/services/apm.te 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/apm.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/services/apm.te 2006-01-16 22:32:53.000000000 -0500 @@ -196,6 +196,7 @@ ') @@ -174,9 +219,9 @@ cron_domtrans_anacron_system_job(apmd_t) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.1.10/policy/modules/services/automount.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.1.11/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/automount.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/services/automount.te 2006-01-16 22:32:53.000000000 -0500 @@ -108,6 +108,7 @@ fs_manage_auto_mountpoints(automount_t) @@ -185,35 +230,9 @@ init_use_fd(automount_t) init_use_script_pty(automount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-2.1.10/policy/modules/services/bind.if ---- nsaserefpolicy/policy/modules/services/bind.if 2006-01-13 09:48:26.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/bind.if 2006-01-13 23:04:39.000000000 -0500 -@@ -225,3 +225,22 @@ - allow $1 named_zone_t:file r_file_perms; - ') - -+######################################## -+## -+## Read BIND search for mount points -+## -+## -+## Domain allowed access. -+## -+# -+interface(`bind_search_mounts',` -+ gen_require(` -+ type named_zone_t; -+ type named_conf_t; -+ ') -+ -+ files_search_var($1) -+ allow $1 named_zone_t:dir search_dir_perms; -+ allow $1 named_conf_t:dir search_dir_perms; -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.1.10/policy/modules/services/cron.te ---- nsaserefpolicy/policy/modules/services/cron.te 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/cron.te 2006-01-13 17:12:12.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.1.11/policy/modules/services/cron.te +--- nsaserefpolicy/policy/modules/services/cron.te 2006-01-16 22:19:19.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/services/cron.te 2006-01-16 22:32:53.000000000 -0500 @@ -120,7 +120,7 @@ init_use_fd(crond_t) @@ -223,9 +242,9 @@ libs_use_ld_so(crond_t) libs_use_shared_libs(crond_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.1.10/policy/modules/services/cups.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.1.11/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/cups.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/services/cups.te 2006-01-16 22:32:53.000000000 -0500 @@ -201,8 +201,7 @@ ') @@ -246,9 +265,9 @@ ') optional_policy(`dbus',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.10/policy/modules/services/dovecot.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.11/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2006-01-13 17:06:05.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/dovecot.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/services/dovecot.te 2006-01-16 22:32:53.000000000 -0500 @@ -95,6 +95,7 @@ files_read_etc_files(dovecot_t) files_search_spool(dovecot_t) @@ -257,9 +276,9 @@ files_dontaudit_list_default(dovecot_t) init_use_fd(dovecot_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.10/policy/modules/services/hal.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.11/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-01-13 17:06:05.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/hal.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/services/hal.te 2006-01-16 22:39:09.000000000 -0500 @@ -48,8 +48,13 @@ kernel_read_network_state(hald_t) kernel_read_kernel_sysctl(hald_t) @@ -298,78 +317,22 @@ ') + +optional_policy(`bind',` -+ bind_search_mounts(hald_t) ++ bind_search_cache(hald_t) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.fc serefpolicy-2.1.10/policy/modules/services/locate.fc ---- nsaserefpolicy/policy/modules/services/locate.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/locate.fc 2006-01-13 17:12:12.000000000 -0500 -@@ -0,0 +1,4 @@ -+# locate - file locater -+/usr/bin/updatedb -- gen_context(system_u:object_r:locate_exec_t, s0) -+/var/lib/[sm]locate(/.*)? gen_context(system_u:object_r:locate_var_lib_t,s0) -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.if serefpolicy-2.1.10/policy/modules/services/locate.if ---- nsaserefpolicy/policy/modules/services/locate.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/locate.if 2006-01-13 17:12:12.000000000 -0500 -@@ -0,0 +1 @@ -+## Update database for mlocate -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/locate.te serefpolicy-2.1.10/policy/modules/services/locate.te ---- nsaserefpolicy/policy/modules/services/locate.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/locate.te 2006-01-13 17:12:12.000000000 -0500 -@@ -0,0 +1,50 @@ -+policy_module(locate,1.0.0) -+ -+#DESC LOCATE - Security Enhanced version of the GNU Locate -+# -+# Author: Dan Walsh -+# -+ -+################################# -+# -+# Rules for the locate_t domain. -+# -+# locate_exec_t is the type of the locate executable. -+# -+type locate_t; -+type locate_exec_t; -+init_daemon_domain(locate_t,locate_exec_t) -+ -+type locate_log_t; -+logging_log_file(locate_log_t) -+ -+type locate_var_lib_t; -+files_type(locate_var_lib_t) -+ -+allow locate_t self:capability { chown dac_read_search dac_override fowner fsetid }; -+allow locate_t self:process { execheap execmem execstack }; -+allow locate_t self:fifo_file rw_file_perms; -+allow locate_t self:file { getattr read }; -+allow locate_t self:unix_stream_socket create_socket_perms; -+ -+allow locate_t locate_var_lib_t:dir create_dir_perms; -+allow locate_t locate_var_lib_t:file create_file_perms; -+ -+fs_getattr_xattr_fs(locate_t) -+ -+files_list_all(locate_t) -+files_getattr_all_files(locate_t) -+ -+kernel_dontaudit_search_sysctl(locate_t) -+kernel_read_system_state(locate_t) -+ -+corecmd_exec_bin(locate_t) -+ -+files_read_etc_runtime_files(locate_t) -+files_read_etc_files(locate_t) -+ -+optional_policy(`crond',` -+ cron_system_entry(locate_t, locate_exec_t) -+ allow system_crond_t locate_log_t:dir rw_dir_perms; -+ allow system_crond_t locate_log_t:file { create append getattr }; -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.1.10/policy/modules/services/sendmail.te ---- nsaserefpolicy/policy/modules/services/sendmail.te 2006-01-13 17:06:07.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/services/sendmail.te 2006-01-13 17:12:12.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.1.11/policy/modules/services/mta.te +--- nsaserefpolicy/policy/modules/services/mta.te 2006-01-16 22:19:19.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/services/mta.te 2006-01-16 22:32:53.000000000 -0500 +@@ -46,6 +46,7 @@ + + allow system_mail_t etc_mail_t:dir { getattr search }; + allow system_mail_t etc_mail_t:file r_file_perms; ++allow system_mail_t eventpollfs_t:file r_file_perms; + + kernel_read_system_state(system_mail_t) + kernel_read_network_state(system_mail_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.1.11/policy/modules/services/sendmail.te +--- nsaserefpolicy/policy/modules/services/sendmail.te 2006-01-16 22:19:19.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/services/sendmail.te 2006-01-16 22:32:53.000000000 -0500 @@ -17,6 +17,7 @@ type sendmail_t; @@ -386,9 +349,9 @@ dev_read_urand(sendmail_t) dev_read_sysfs(sendmail_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.1.10/policy/modules/system/authlogin.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.1.11/policy/modules/system/authlogin.if --- nsaserefpolicy/policy/modules/system/authlogin.if 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/authlogin.if 2006-01-13 23:07:17.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/system/authlogin.if 2006-01-16 22:32:53.000000000 -0500 @@ -1075,3 +1075,16 @@ typeattribute $1 can_write_shadow_passwords; typeattribute $1 can_relabelto_shadow_passwords; @@ -406,9 +369,9 @@ + allow $1 wtmp_t:file setattr; + logging_search_logs($1) +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.1.10/policy/modules/system/authlogin.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.1.11/policy/modules/system/authlogin.te --- nsaserefpolicy/policy/modules/system/authlogin.te 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/authlogin.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/system/authlogin.te 2006-01-16 22:32:53.000000000 -0500 @@ -129,14 +129,6 @@ nscd_use_socket(pam_t) ') @@ -435,10 +398,18 @@ ifdef(`targeted_policy', ` term_dontaudit_use_unallocated_tty(pam_console_t) term_dontaudit_use_generic_pty(pam_console_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.1.10/policy/modules/system/hostname.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.1.11/policy/modules/system/hostname.te --- nsaserefpolicy/policy/modules/system/hostname.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/hostname.te 2006-01-13 17:12:12.000000000 -0500 -@@ -55,35 +55,6 @@ ++++ serefpolicy-2.1.11/policy/modules/system/hostname.te 2006-01-16 22:32:53.000000000 -0500 +@@ -29,6 +29,7 @@ + + fs_getattr_xattr_fs(hostname_t) + fs_search_auto_mountpoints(hostname_t) ++fs_dontaudit_use_tmpfs_chr_dev(hostname_t) + + term_dontaudit_use_console(hostname_t) + term_use_all_user_ttys(hostname_t) +@@ -55,35 +56,6 @@ sysnet_read_config(hostname_t) sysnet_dns_name_resolve(hostname_t) @@ -447,13 +418,13 @@ -ifdef(`distro_redhat', ` - fs_use_tmpfs_chr_dev(hostname_t) -') - +- -ifdef(`targeted_policy', ` - term_dontaudit_use_unallocated_tty(hostname_t) - term_dontaudit_use_generic_pty(hostname_t) - files_dontaudit_read_root_file(hostname_t) -') - +- -optional_policy(`firstboot',` - firstboot_use_fd(hostname_t) -') @@ -474,9 +445,11 @@ - udev_dontaudit_use_fd(hostname_t) - udev_read_db(hostname_t) -') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.1.10/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/init.te 2006-01-13 17:12:12.000000000 -0500 ++ ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.1.11/policy/modules/system/init.te +--- nsaserefpolicy/policy/modules/system/init.te 2006-01-16 22:19:19.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/system/init.te 2006-01-16 22:32:53.000000000 -0500 @@ -298,6 +298,7 @@ term_reset_tty_labels(initrc_t) @@ -485,9 +458,21 @@ auth_rw_lastlog(initrc_t) auth_read_pam_pid(initrc_t) auth_delete_pam_pid(initrc_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.1.10/policy/modules/system/lvm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.1.11/policy/modules/system/libraries.fc +--- nsaserefpolicy/policy/modules/system/libraries.fc 2006-01-13 09:48:27.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/system/libraries.fc 2006-01-16 22:32:53.000000000 -0500 +@@ -158,7 +158,7 @@ + + # Flash plugin, Macromedia + HOME_DIR/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +-/usr/lib(64)?/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/lib(64)?/.*/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) + + # Jai, Sun Microsystems (Jpackage SPRM) + /usr/lib(64)?/libmlib_jai\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.1.11/policy/modules/system/lvm.te --- nsaserefpolicy/policy/modules/system/lvm.te 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/lvm.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/system/lvm.te 2006-01-16 22:32:53.000000000 -0500 @@ -209,6 +209,7 @@ storage_manage_fixed_disk(lvm_t) @@ -507,9 +492,9 @@ - -dontaudit lvm_t xconsole_device_t:fifo_file getattr; -') dnl end TODO -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.1.10/policy/modules/system/mount.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.1.11/policy/modules/system/mount.te --- nsaserefpolicy/policy/modules/system/mount.te 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/mount.te 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/system/mount.te 2006-01-16 22:32:53.000000000 -0500 @@ -32,6 +32,7 @@ dev_getattr_all_blk_files(mount_t) @@ -527,10 +512,18 @@ # required for mount.smbfs corecmd_exec_sbin(mount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.10/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-09 11:32:54.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/selinuxutil.te 2006-01-13 17:12:12.000000000 -0500 -@@ -414,6 +414,7 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.11/policy/modules/system/selinuxutil.te +--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-16 22:19:19.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/system/selinuxutil.te 2006-01-16 22:32:53.000000000 -0500 +@@ -316,6 +316,7 @@ + # + + allow restorecon_t self:capability { dac_override dac_read_search fowner }; ++allow restorecon_t self:fifo_file rw_file_perms; + + allow restorecon_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:dir r_dir_perms; + allow restorecon_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:file r_file_perms; +@@ -414,6 +415,7 @@ allow run_init_t self:capability setuid; allow run_init_t self:fifo_file rw_file_perms; allow run_init_t self:netlink_audit_socket { create bind write nlmsg_read read }; @@ -538,9 +531,17 @@ # often the administrator runs such programs from a directory that is owned # by a different user or has restrictive SE permissions, do not want to audit -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.1.10/policy/modules/system/unconfined.if ---- nsaserefpolicy/policy/modules/system/unconfined.if 2005-12-13 15:51:50.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/unconfined.if 2006-01-13 17:12:12.000000000 -0500 +@@ -469,6 +471,7 @@ + # + + allow setfiles_t self:capability { dac_override dac_read_search fowner }; ++allow setfiles_t self:fifo_file rw_file_perms; + + allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:dir r_dir_perms; + allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:file r_file_perms; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.1.11/policy/modules/system/unconfined.if +--- nsaserefpolicy/policy/modules/system/unconfined.if 2006-01-16 22:19:19.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/system/unconfined.if 2006-01-16 22:32:53.000000000 -0500 @@ -33,6 +33,7 @@ corenet_unconfined($1) dev_unconfined($1) @@ -549,9 +550,9 @@ files_unconfined($1) fs_unconfined($1) selinux_unconfined($1) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.10/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.1.10/policy/modules/system/userdomain.if 2006-01-13 17:12:12.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.11/policy/modules/system/userdomain.if +--- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-16 22:19:19.000000000 -0500 ++++ serefpolicy-2.1.11/policy/modules/system/userdomain.if 2006-01-16 22:32:53.000000000 -0500 @@ -103,6 +103,7 @@ # execute files in the home directory can_exec($1_t,$1_home_t) @@ -560,9 +561,9 @@ # full control of the home directory allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto }; allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.10/policy/users +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.11/policy/users --- nsaserefpolicy/policy/users 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.10/policy/users 2006-01-13 17:12:12.000000000 -0500 ++++ serefpolicy-2.1.11/policy/users 2006-01-16 22:32:53.000000000 -0500 @@ -26,7 +26,9 @@ ifdef(`targeted_policy',` gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- selinux-policy.spec 13 Jan 2006 22:32:06 -0000 1.83 +++ selinux-policy.spec 17 Jan 2006 03:55:13 -0000 1.84 @@ -6,7 +6,7 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.1.10 +Version: 2.1.11 Release: 1 License: GPL Group: System Environment/Base @@ -262,6 +262,10 @@ %endif %changelog +* Sat Jan 14 2006 Dan Walsh 2.1.11-1 +- Update to upstream +- Fix ftp Man page + * Fri Jan 13 2006 Dan Walsh 2.1.10-1 - Update to upstream Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 13 Jan 2006 22:32:06 -0000 1.25 +++ sources 17 Jan 2006 03:55:13 -0000 1.26 @@ -1 +1 @@ -d221d682117dfbe36b8473ad008cd304 serefpolicy-2.1.10.tgz +297377c6b7b728b7f2a91bbe9afab297 serefpolicy-2.1.11.tgz From fedora-cvs-commits at redhat.com Tue Jan 17 04:11:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 23:11:53 -0500 Subject: rpms/gtksourceview/devel .cvsignore, 1.17, 1.18 gtksourceview.spec, 1.23, 1.24 sources, 1.16, 1.17 Message-ID: <200601170411.k0H4Br1V010908@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtksourceview/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10836 Modified Files: .cvsignore gtksourceview.spec sources Log Message: 1.5.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 5 Jan 2006 06:27:44 -0000 1.17 +++ .cvsignore 17 Jan 2006 04:11:48 -0000 1.18 @@ -5,3 +5,4 @@ gtksourceview-1.5.2.tar.bz2 gtksourceview-1.5.3.tar.bz2 gtksourceview-1.5.4.tar.bz2 +gtksourceview-1.5.6.tar.bz2 Index: gtksourceview.spec =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gtksourceview.spec 5 Jan 2006 06:27:44 -0000 1.23 +++ gtksourceview.spec 17 Jan 2006 04:11:48 -0000 1.24 @@ -3,7 +3,7 @@ Summary: A library for viewing source files Name: gtksourceview -Version: 1.5.4 +Version: 1.5.6 Release: 1 License: LGPL Group: System Environment/Libraries @@ -71,6 +71,9 @@ %{_libdir}/*.so %changelog +* Mon Jan 16 2006 Matthias Clasen +- Update to 1.5.6 + * Tue Jan 05 2006 Matthias Clasen - Update to 1.5.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 5 Jan 2006 06:27:44 -0000 1.16 +++ sources 17 Jan 2006 04:11:48 -0000 1.17 @@ -1 +1 @@ -c1984fea0fa6b080351b5a7364b9c4e6 gtksourceview-1.5.4.tar.bz2 +6176b1d1eae0a4b7baf46ead5321d33b gtksourceview-1.5.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 04:14:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 23:14:31 -0500 Subject: rpms/gedit/devel .cvsignore, 1.31, 1.32 gedit.spec, 1.59, 1.60 sources, 1.33, 1.34 Message-ID: <200601170414.k0H4EVCP011700@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11657 Modified Files: .cvsignore gedit.spec sources Log Message: 2.13.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 13 Jan 2006 18:13:16 -0000 1.31 +++ .cvsignore 17 Jan 2006 04:14:27 -0000 1.32 @@ -6,3 +6,4 @@ gedit-2.13.0.tar.bz2 gedit-2.13.1.tar.bz2 gedit-2.13.2.tar.bz2 +gedit-2.13.3.tar.bz2 Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- gedit.spec 13 Jan 2006 19:01:43 -0000 1.59 +++ gedit.spec 17 Jan 2006 04:14:27 -0000 1.60 @@ -14,7 +14,7 @@ Summary: gEdit is a small but powerful text editor for GNOME. Name: gedit -Version: 2.13.2 +Version: 2.13.3 Release: 1 Epoch: 1 License: GPL @@ -148,7 +148,10 @@ %{_libdir}/pkgconfig/gedit-2.10.pc %changelog -* Sun Jan 13 2006 Matthias Clasen - 1.2.13.2-1 +* Mon Jan 16 2006 Matthias Clasen - 1:2.13.3-1 +- Update to 2.13.3 + +* Sun Jan 13 2006 Matthias Clasen - 1:2.13.2-1 - Update to 2.13.2 - Update the persistent file selector size patch (again!) Index: sources =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 13 Jan 2006 18:13:16 -0000 1.33 +++ sources 17 Jan 2006 04:14:27 -0000 1.34 @@ -1 +1 @@ -a10042484fe2e9b5d44909f62fc51fad gedit-2.13.2.tar.bz2 +645a9fee4e4db0a1c52983e46e160129 gedit-2.13.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 04:23:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 23:23:52 -0500 Subject: rpms/gnome-vfs2/devel .cvsignore, 1.26, 1.27 gnome-vfs2.spec, 1.82, 1.83 sources, 1.26, 1.27 Message-ID: <200601170423.k0H4NqD8027131@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27089 Modified Files: .cvsignore gnome-vfs2.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 15 Dec 2005 13:57:41 -0000 1.26 +++ .cvsignore 17 Jan 2006 04:23:46 -0000 1.27 @@ -13,3 +13,4 @@ gnome-vfs-2.13.1.tar.bz2 gnome-vfs-2.13.2.tar.bz2 gnome-vfs-2.13.3.tar.bz2 +gnome-vfs-2.13.4.tar.bz2 Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- gnome-vfs2.spec 9 Jan 2006 21:21:30 -0000 1.82 +++ gnome-vfs2.spec 17 Jan 2006 04:23:46 -0000 1.83 @@ -8,8 +8,8 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 -Version: 2.13.3 -Release: 3 +Version: 2.13.4 +Release: 1 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -176,6 +176,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Mon Jan 16 2006 Matthias Clasen 2.13.4-1 +- Update to 2.13.4 + * Mon Jan 09 2006 John (J5) Palmieri 2.13.3-3 - Add patch so --hal-udi is sent in when mounting and unmounting Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 15 Dec 2005 13:57:41 -0000 1.26 +++ sources 17 Jan 2006 04:23:47 -0000 1.27 @@ -1 +1 @@ -5516fbfd0e39f882093ac18534f007b5 gnome-vfs-2.13.3.tar.bz2 +194490e2cfa95ec8eb753d4cc3992902 gnome-vfs-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 04:26:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 23:26:30 -0500 Subject: rpms/gedit/devel gedit.spec,1.60,1.61 Message-ID: <200601170426.k0H4QU6C028101@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28040 Modified Files: gedit.spec Log Message: Bump requirements Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- gedit.spec 17 Jan 2006 04:14:27 -0000 1.60 +++ gedit.spec 17 Jan 2006 04:26:25 -0000 1.61 @@ -1,6 +1,7 @@ %define glib2_version 2.6.0 %define pango_version 1.8.0 %define gtk2_version 2.6.0 +%define gnome_vfs2_version 2.13.4 %define libgnomeui_version 2.6.0 %define libgnomeprint_version 2.7.1 %define libgnomeprintui_version 2.7.1 @@ -33,6 +34,7 @@ BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: gnome-vfs2 >= %{gnome_vfs2_version} BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui_version} BuildRequires: libgnomeprint22-devel >= %{libgnomeprint_version} From fedora-cvs-commits at redhat.com Tue Jan 17 04:37:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 23:37:15 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.83,1.84 Message-ID: <200601170437.k0H4bFOf031160@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31104 Modified Files: gnome-vfs2.spec Log Message: Drop gnome-mount patch Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- gnome-vfs2.spec 17 Jan 2006 04:23:46 -0000 1.83 +++ gnome-vfs2.spec 17 Jan 2006 04:37:10 -0000 1.84 @@ -45,8 +45,6 @@ Patch201: gnome-vfs-2.8.1-console-mount-opt.patch -Patch202: gnome-vfs-2.13.3-gnome-mount.patch - %description GNOME VFS is the GNOME virtual file system. It is the foundation of the Nautilus file manager. It provides a modular architecture and @@ -90,7 +88,6 @@ %patch104 -p1 -b .browser_default %patch201 -p0 -b .console -%patch202 -p1 -b .gnome-mount %build From fedora-cvs-commits at redhat.com Tue Jan 17 04:55:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 23:55:55 -0500 Subject: rpms/gnome-utils/devel .cvsignore, 1.33, 1.34 gnome-utils.spec, 1.76, 1.77 sources, 1.34, 1.35 Message-ID: <200601170455.k0H4ttqQ017604@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17548 Modified Files: .cvsignore gnome-utils.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 3 Jan 2006 19:39:22 -0000 1.33 +++ .cvsignore 17 Jan 2006 04:55:52 -0000 1.34 @@ -11,3 +11,6 @@ gucharmap-1.5.0.tar.bz2 gnome-utils-2.13.4.tar.bz2 gcalctool-5.7.18.tar.bz2 +gnome-utils-2.13.5.tar.bz2 +zenity-2.13.5.tar.bz2 +gcalctool-5.7.23.tar.bz2 Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- gnome-utils.spec 3 Jan 2006 19:49:48 -0000 1.76 +++ gnome-utils.spec 17 Jan 2006 04:55:53 -0000 1.77 @@ -11,15 +11,15 @@ %define po_package gnome-utils-2.0 -%define gcalctool_version 5.7.18 +%define gcalctool_version 5.7.23 %define gucharmap_version 1.5.0 -%define zenity_version 2.13.3 +%define zenity_version 2.13.5 %define dbus_version 0.60 Summary: GNOME utility programs. Name: gnome-utils -Version: 2.13.4 +Version: 2.13.5 Release: 1 Epoch: 1 License: GPL @@ -209,6 +209,11 @@ %{_sysconfdir}/pam.d/gnome-system-log %changelog +* Mon Jan 16 2006 Matthias Clasen 2.13.5 +- Update to gnome-utils 2.13.5 +- Update to zenity 2.13.5 +- Update to gcalctool 5.7.23 + * Tue Jan 03 2006 Matthias Clasen 2.13.4 - Update to gnome-utils 2.13.4 - Update to gcalctool 5.7.18 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 3 Jan 2006 19:39:22 -0000 1.34 +++ sources 17 Jan 2006 04:55:53 -0000 1.35 @@ -1,4 +1,4 @@ -b644bff4213d31be3e7ac1eb416cc282 zenity-2.13.3.tar.bz2 e7f8e1201b2b81cd283d7a4db512141a gucharmap-1.5.0.tar.bz2 -3fd0e69055bacffd81b3397a5b6ced3b gnome-utils-2.13.4.tar.bz2 -89bed90db2f6f2d324df5726ddd6fe6c gcalctool-5.7.18.tar.bz2 +599744ac5f121b0671abf6e7a4112da4 gnome-utils-2.13.5.tar.bz2 +bc4672759e106dde8547675d4f46720e zenity-2.13.5.tar.bz2 +76fd98ff12aa4a3c097c6d7d17b7126c gcalctool-5.7.23.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 04:58:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 16 Jan 2006 23:58:33 -0500 Subject: rpms/gedit/devel gedit.spec,1.61,1.62 Message-ID: <200601170458.k0H4wXw7018727@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18664 Modified Files: gedit.spec Log Message: Fix file lists Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- gedit.spec 17 Jan 2006 04:26:25 -0000 1.61 +++ gedit.spec 17 Jan 2006 04:58:29 -0000 1.62 @@ -146,8 +146,8 @@ %files devel %defattr(-, root, root) -%{_includedir}/gedit-2.10 -%{_libdir}/pkgconfig/gedit-2.10.pc +%{_includedir}/gedit-2.14 +%{_libdir}/pkgconfig/gedit-2.14.pc %changelog * Mon Jan 16 2006 Matthias Clasen - 1:2.13.3-1 From fedora-cvs-commits at redhat.com Tue Jan 17 05:03:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 00:03:19 -0500 Subject: rpms/gnome-terminal/devel .cvsignore, 1.17, 1.18 gnome-terminal.spec, 1.27, 1.28 sources, 1.17, 1.18 Message-ID: <200601170503.k0H53JT5020014@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19956 Modified Files: .cvsignore gnome-terminal.spec sources Log Message: 2.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 Jan 2006 18:54:35 -0000 1.17 +++ .cvsignore 17 Jan 2006 05:03:15 -0000 1.18 @@ -2,3 +2,4 @@ gnome-terminal-2.12.0.tar.bz2 gnome-terminal-2.13.0.tar.bz2 gnome-terminal-2.13.1.tar.bz2 +gnome-terminal-2.13.2.tar.bz2 Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gnome-terminal.spec 13 Jan 2006 19:11:32 -0000 1.27 +++ gnome-terminal.spec 17 Jan 2006 05:03:16 -0000 1.28 @@ -12,7 +12,7 @@ Summary: GNOME Terminal Name: gnome-terminal -Version: 2.13.1 +Version: 2.13.2 Release: 1 URL: http://www.gnome.org/ Source0: gnome-terminal-%{version}.tar.bz2 @@ -101,6 +101,9 @@ %{_libdir}/bonobo %changelog +* Tue Jan 17 2006 Matthias Clasen 2.13.2-1 +- Update to 2.13.2 + * Fri Jan 13 2006 Matthias Clasen 2.13.1-1 - Update to 2.13.1 - Remove upstreamed patches Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 13 Jan 2006 18:54:35 -0000 1.17 +++ sources 17 Jan 2006 05:03:16 -0000 1.18 @@ -1 +1 @@ -e38e2a85a930cf9bd5d3150297d0a83a gnome-terminal-2.13.1.tar.bz2 +a7e43c966c0c871386a91b790c03a560 gnome-terminal-2.13.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 05:07:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 00:07:47 -0500 Subject: rpms/gnome-menus/devel .cvsignore, 1.10, 1.11 gnome-menus.spec, 1.20, 1.21 sources, 1.10, 1.11 Message-ID: <200601170507.k0H57lkl020874@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-menus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20854 Modified Files: .cvsignore gnome-menus.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-menus/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Sep 2005 09:42:06 -0000 1.10 +++ .cvsignore 17 Jan 2006 05:07:41 -0000 1.11 @@ -1 +1,7 @@ +<<<<<<< .cvsignore +gnome-menus-2.11.91.tar.bz2 gnome-menus-2.12.0.tar.bz2 +======= +gnome-menus-2.12.0.tar.bz2 +>>>>>>> 1.10 +gnome-menus-2.13.5.tar.bz2 Index: gnome-menus.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gnome-menus.spec 9 Dec 2005 22:40:40 -0000 1.20 +++ gnome-menus.spec 17 Jan 2006 05:07:41 -0000 1.21 @@ -6,8 +6,8 @@ Summary: A menu system for the GNOME project Name: gnome-menus -Version: 2.12.0 -Release: 1.1 +Version: 2.13.5 +Release: 1 License: LGPL Group: System Environment/Libraries URL: http://www.gnome.org/ @@ -87,6 +87,9 @@ %{_bindir}/gnome-menu-spec-test %changelog +* Tue Jan 17 2006 Matthias Clasen 2.13.5-1 +- Update to 2.13.5 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-menus/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Sep 2005 09:42:06 -0000 1.10 +++ sources 17 Jan 2006 05:07:41 -0000 1.11 @@ -1 +1 @@ -615392c4f729f70c03aa3aa7dbe40a95 gnome-menus-2.12.0.tar.bz2 +07083058ce27a2132bc3f578c055fff6 gnome-menus-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 05:19:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 00:19:23 -0500 Subject: rpms/gnome-desktop/devel .cvsignore, 1.23, 1.24 gnome-desktop.spec, 1.44, 1.45 sources, 1.23, 1.24 Message-ID: <200601170519.k0H5JNMP024424@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24168 Modified Files: .cvsignore gnome-desktop.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 3 Jan 2006 16:56:53 -0000 1.23 +++ .cvsignore 17 Jan 2006 05:19:14 -0000 1.24 @@ -11,3 +11,4 @@ gnome-desktop-2.13.2.tar.bz2 gnome-desktop-2.13.3.tar.bz2 gnome-desktop-2.13.4.tar.bz2 +gnome-desktop-2.13.5.tar.bz2 Index: gnome-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- gnome-desktop.spec 3 Jan 2006 16:57:24 -0000 1.44 +++ gnome-desktop.spec 17 Jan 2006 05:19:14 -0000 1.45 @@ -10,7 +10,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc. Name: gnome-desktop -Version: 2.13.4 +Version: 2.13.5 Release: 1 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2 @@ -132,6 +132,9 @@ #%{_datadir}/gtk-doc %changelog +* Tue Jan 16 2006 Matthias Clasen - 2.13.5-1 +- Update to 2.13.5 + * Tue Jan 03 2006 Matthias Clasen - 2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 3 Jan 2006 16:56:53 -0000 1.23 +++ sources 17 Jan 2006 05:19:14 -0000 1.24 @@ -1 +1 @@ -993beb1396a7a8a1629343cc26a2f1a9 gnome-desktop-2.13.4.tar.bz2 +dc80dcb7be0714edb11d1cbceaec96db gnome-desktop-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 05:23:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 00:23:35 -0500 Subject: rpms/gnome-applets/devel .cvsignore, 1.32, 1.33 gnome-applets.spec, 1.99, 1.100 sources, 1.33, 1.34 Message-ID: <200601170523.k0H5NZPs027775@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27761 Modified Files: .cvsignore gnome-applets.spec sources Log Message: 2.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 15 Dec 2005 05:18:27 -0000 1.32 +++ .cvsignore 17 Jan 2006 05:23:27 -0000 1.33 @@ -4,3 +4,4 @@ gnome-applets-2.12.1.tar.bz2 gnome-applets-2.12.2.tar.bz2 gnome-applets-2.13.1.tar.bz2 +gnome-applets-2.13.2.tar.bz2 Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- gnome-applets.spec 5 Jan 2006 23:28:52 -0000 1.99 +++ gnome-applets.spec 17 Jan 2006 05:23:27 -0000 1.100 @@ -17,8 +17,8 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets -Version: 2.13.1 -Release: 4 +Version: 2.13.2 +Release: 1 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -169,6 +169,9 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Tue Jan 17 2006 Matthias Clasen 2.13.2-1 +- Update to 2.13.2 + * Fri Jan 05 2006 John (J5) Palmieri 2.13.1-4 - GStreamer has been split into gstreamer08 and gstreamer (0.10) packages we need gstreamer08 for now Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 15 Dec 2005 05:18:27 -0000 1.33 +++ sources 17 Jan 2006 05:23:28 -0000 1.34 @@ -1,2 +1,2 @@ ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2 -3e7a78d837c6e2f8e41c8a0553673417 gnome-applets-2.13.1.tar.bz2 +fd89a1eb8c1384084f29b0da6acdecb3 gnome-applets-2.13.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 05:27:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 00:27:56 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1575,1.1576 Message-ID: <200601170527.k0H5Runt027881@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv27864 Modified Files: kernel-2.6.spec Log Message: disable slab debug Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1575 retrieving revision 1.1576 diff -u -r1.1575 -r1.1576 --- kernel-2.6.spec 16 Jan 2006 04:15:31 -0000 1.1575 +++ kernel-2.6.spec 17 Jan 2006 05:27:47 -0000 1.1576 @@ -1269,6 +1269,7 @@ %changelog * Sun Jan 15 2006 Dave Jones [2.6.15-1.1825_FC4] - 2.6.15.1 +- Disable slab debug. * Thu Jan 12 2006 Dave Jones [2.6.15-1.1824_FC4] - Remove broken vm debug patch. From fedora-cvs-commits at redhat.com Tue Jan 17 05:27:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 00:27:56 -0500 Subject: rpms/kernel/FC-4/configs config-generic,1.48,1.49 Message-ID: <200601170527.k0H5Ru4Z027889@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv27864/configs Modified Files: config-generic Log Message: disable slab debug Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- config-generic 9 Jan 2006 16:42:20 -0000 1.48 +++ config-generic 17 Jan 2006 05:27:49 -0000 1.49 @@ -2519,7 +2519,7 @@ CONFIG_DEBUG_RODATA=y # Turn off these debug options for production kernels. -CONFIG_DEBUG_SLAB=y +# CONFIG_DEBUG_SLAB is not set # # Security options From fedora-cvs-commits at redhat.com Tue Jan 17 05:28:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 00:28:19 -0500 Subject: rpms/gnome-panel/devel .cvsignore, 1.36, 1.37 gnome-panel.spec, 1.103, 1.104 sources, 1.36, 1.37 Message-ID: <200601170528.k0H5SJcq027924@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27912 Modified Files: .cvsignore gnome-panel.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 5 Jan 2006 20:12:35 -0000 1.36 +++ .cvsignore 17 Jan 2006 05:28:16 -0000 1.37 @@ -6,3 +6,4 @@ gnome-panel-2.13.2.tar.bz2 gnome-panel-2.13.3.tar.bz2 gnome-panel-2.13.4.tar.bz2 +gnome-panel-2.13.5.tar.bz2 Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- gnome-panel.spec 5 Jan 2006 20:12:35 -0000 1.103 +++ gnome-panel.spec 17 Jan 2006 05:28:16 -0000 1.104 @@ -15,7 +15,7 @@ Summary: GNOME panel Name: gnome-panel -Version: 2.13.4 +Version: 2.13.5 Release: 1 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2 @@ -194,6 +194,9 @@ %{_datadir}/gtk-doc %changelog +* Tue Jan 17 2006 Matthias Clasen 2.13.5-1 +- Update to 2.13.5 + * Thu Jan 5 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 - reinstate the desktop-menu-renaming Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 5 Jan 2006 20:12:35 -0000 1.36 +++ sources 17 Jan 2006 05:28:16 -0000 1.37 @@ -1 +1 @@ -0470b5005716660966d39fb4a6299e24 gnome-panel-2.13.4.tar.bz2 +8578cd2af550b4bf64161eef95f8d3c8 gnome-panel-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 05:47:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 00:47:30 -0500 Subject: rpms/vino/devel .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 vino.spec, 1.29, 1.30 Message-ID: <200601170547.k0H5lUwc007786@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/vino/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7773 Modified Files: .cvsignore sources vino.spec Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/vino/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 7 Sep 2005 19:58:02 -0000 1.14 +++ .cvsignore 17 Jan 2006 05:47:27 -0000 1.15 @@ -4,3 +4,4 @@ vino-2.11.1.2.tar.bz2 vino-2.11.90.tar.bz2 vino-2.12.0.tar.bz2 +vino-2.13.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/vino/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 7 Sep 2005 19:58:02 -0000 1.14 +++ sources 17 Jan 2006 05:47:28 -0000 1.15 @@ -1 +1 @@ -eba0962a0e1b9f21719c5688d3d0728b vino-2.12.0.tar.bz2 +9bc8c3f0e639fdc7b9ed023501308359 vino-2.13.5.tar.bz2 Index: vino.spec =================================================================== RCS file: /cvs/dist/rpms/vino/devel/vino.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- vino.spec 9 Dec 2005 22:43:46 -0000 1.29 +++ vino.spec 17 Jan 2006 05:47:28 -0000 1.30 @@ -6,8 +6,8 @@ Summary: A remote desktop system for GNOME Name: vino -Version: 2.12.0 -Release: 2.1 +Version: 2.13.5 +Release: 1 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 License: GPL @@ -94,6 +94,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Tue Jan 17 2006 Matthias Clasen 2.13.5-1 +- Update to 2.13.5 + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 17 05:48:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 00:48:33 -0500 Subject: rpms/vino/devel vino.spec,1.30,1.31 Message-ID: <200601170548.k0H5mXmI007850@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/vino/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7840 Modified Files: vino.spec Log Message: Drop upstreamed patch Index: vino.spec =================================================================== RCS file: /cvs/dist/rpms/vino/devel/vino.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- vino.spec 17 Jan 2006 05:47:28 -0000 1.30 +++ vino.spec 17 Jan 2006 05:48:30 -0000 1.31 @@ -29,8 +29,6 @@ BuildRequires: libgcrypt-devel >= %{libgcrypt_version} Prereq: gtk2 >= %{gtk2_version} -Patch0: vino-2.12.0-fix-broken-level3-shift.patch - %description Vino is a VNC server for GNOME. It allows remote users to connect to a running GNOME session using VNC. @@ -38,8 +36,6 @@ %prep %setup -q -%patch0 -p1 -b .broken-level3-shift - %build %configure --disable-gnutls --disable-session-support --disable-http-server make From fedora-cvs-commits at redhat.com Tue Jan 17 05:51:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 00:51:55 -0500 Subject: rpms/control-center/devel .cvsignore, 1.31, 1.32 control-center.spec, 1.108, 1.109 sources, 1.34, 1.35 Message-ID: <200601170551.k0H5pt1e007980@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7967 Modified Files: .cvsignore control-center.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 5 Jan 2006 06:24:34 -0000 1.31 +++ .cvsignore 17 Jan 2006 05:51:52 -0000 1.32 @@ -4,3 +4,4 @@ control-center-2.13.2.tar.bz2 control-center-2.13.3.tar.bz2 control-center-2.13.4.tar.bz2 +control-center-2.13.5.tar.bz2 Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- control-center.spec 13 Jan 2006 16:35:25 -0000 1.108 +++ control-center.spec 17 Jan 2006 05:51:52 -0000 1.109 @@ -20,8 +20,8 @@ Summary: GNOME Control Center. Name: control-center -Version: 2.13.4 -Release: 2 +Version: 2.13.5 +Release: 1 Epoch: 1 License: GPL/LGPL Group: User Interface/Desktops @@ -216,6 +216,9 @@ # (also its headers) %changelog +* Tue Jan 17 2006 Matthias Clasen - 1:2.13.5-1 +- Update to 2.13.5 + * Fri Jan 13 2006 Matthias Clasen - 1:2.13.4-2 - Add a build requires for libXcursor-devel, to fix the mouse capplet. Index: sources =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 5 Jan 2006 06:24:34 -0000 1.34 +++ sources 17 Jan 2006 05:51:52 -0000 1.35 @@ -1 +1 @@ -4bd5ee29d4ae59439d7ba31dd77fbcaa control-center-2.13.4.tar.bz2 +9e2797c56d6cd4bf96a6114b7f7b18b9 control-center-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 05:58:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 00:58:10 -0500 Subject: rpms/kernel/devel linux-2.6-net-nip6_fmt.patch, NONE, 1.1 kernel-2.6.spec, 1.1858, 1.1859 Message-ID: <200601170558.k0H5wA5E017545@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17462 Modified Files: kernel-2.6.spec Added Files: linux-2.6-net-nip6_fmt.patch Log Message: Fix named etc. linux-2.6-net-nip6_fmt.patch: include/linux/kernel.h | 1 + net/ipv6/addrconf.c | 2 +- net/ipv6/anycast.c | 2 +- net/ipv6/ip6_flowlabel.c | 4 ++-- net/ipv6/mcast.c | 7 +++---- 5 files changed, 8 insertions(+), 8 deletions(-) --- NEW FILE linux-2.6-net-nip6_fmt.patch --- >From netdev-owner at vger.kernel.org Sat Jan 14 00:11:34 2006 Return-path: Envelope-to: dwmw2 at baythorne.infradead.org Delivery-date: Sat, 14 Jan 2006 00:11:34 +0000 Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1ExZ13-00087o-Ub for dwmw2 at baythorne.infradead.org; Sat, 14 Jan 2006 00:11:34 +0000 Received: from vger.kernel.org ([209.132.176.167]) by pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id 1ExZ12-0007zM-VL; Sat, 14 Jan 2006 00:11:33 +0000 Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand id S1161574AbWANALb (ORCPT + 1 other); Fri, 13 Jan 2006 19:11:31 -0500 Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1161579AbWANALb (ORCPT ); Fri, 13 Jan 2006 19:11:31 -0500 Received: from yue.linux-ipv6.org ([203.178.140.15]:21776 "EHLO yue.st-paulia.net") by vger.kernel.org with ESMTP id S1161574AbWANALa (ORCPT ); Fri, 13 Jan 2006 19:11:30 -0500 Received: from localhost (localhost [127.0.0.1]) by yue.st-paulia.net (Postfix) with ESMTP id 4C7F933CC2; Sat, 14 Jan 2006 09:12:21 +0900 (JST) Date: Sat, 14 Jan 2006 09:12:13 +0900 (JST) Message-Id: <20060114.091213.64259870.yoshfuji at linux-ipv6.org> To: davem at davemloft.net Cc: joe at perches.com, netdev at vger.kernel.org, yoshfuji at linux-ipv6.org Subject: Re: [PATCH] Use NIP6_FMT in kernel.h From: YOSHIFUJI Hideaki / =?iso-2022-jp?B?GyRCNUhGIzFRTEAbKEI=?= In-Reply-To: <20060113.142924.50915981.davem at davemloft.net> References: <1137190488.13017.34.camel at localhost> <20060113.142924.50915981.davem at davemloft.net> Organization: USAGI/WIDE Project X-URL: http://www.yoshifuji.org/%7Ehideaki/ X-Fingerprint: 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA X-PGP-Key-URL: http://www.yoshifuji.org/%7Ehideaki/hideaki at yoshifuji.org.asc X-Face: "5$Al-.M>NJ%a'@hhZdQm:."qn~PA^gq4o*>iCFToq*bAi#4FRtx}enhuQKz7fNqQz\BYU] $~O_5m-9'}MIs`XGwIEscw;e5b>n"B_?j/AkL~i/MEaZBLP X-Mailer: Mew version 2.2 on Emacs 20.7 / Mule 4.1 (AOI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Sender: netdev-owner at vger.kernel.org Precedence: bulk X-Mailing-List: netdev at vger.kernel.org X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ Content-Transfer-Encoding: 8bit In article <20060113.142924.50915981.davem at davemloft.net> (at Fri, 13 Jan 2006 14:29:24 -0800 (PST)), "David S. Miller" says: > > changes all code to use NIP6_FMT > > fixes net/ipv6/ip6_flowlabel.c : > This looks good, applied, thanks Joe. As I have commented in another mail, the original patch breaks applications such as ifconfig, radvd etc. Please apply this. Signed-off-by: YOSHIFUJI Hideaki diff -u b/include/linux/kernel.h b/include/linux/kernel.h --- b/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -228,6 +228,7 @@ ntohs((addr).s6_addr16[6]), \ ntohs((addr).s6_addr16[7]) #define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x" +#define NIP6_SEQFMT "%04x%04x%04x%04x%04x%04x%04x%04x" #if defined(__LITTLE_ENDIAN) #define HIPQUAD(addr) \ diff -u b/net/ipv6/addrconf.c b/net/ipv6/addrconf.c --- b/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2643,7 +2643,7 @@ { struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; seq_printf(seq, - NIP6_FMT " %02x %02x %02x %02x %8s\n", + NIP6_SEQFMT " %02x %02x %02x %02x %8s\n", NIP6(ifp->addr), ifp->idev->dev->ifindex, ifp->prefix_len, diff -u b/net/ipv6/anycast.c b/net/ipv6/anycast.c --- b/net/ipv6/anycast.c +++ b/net/ipv6/anycast.c @@ -531,7 +531,7 @@ struct ac6_iter_state *state = ac6_seq_private(seq); seq_printf(seq, - "%-4d %-15s " NIP6_FMT " %5d\n", + "%-4d %-15s " NIP6_SEQFMT " %5d\n", state->dev->ifindex, state->dev->name, NIP6(im->aca_addr), im->aca_users); diff -u b/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c --- b/net/ipv6/ip6_flowlabel.c +++ b/net/ipv6/ip6_flowlabel.c @@ -628,7 +628,7 @@ { while(fl) { seq_printf(seq, - "%05X %-1d %-6d %-6d %-6ld %-8ld " NIP6_FMT " %-4d\n", + "%05X %-1d %-6d %-6d %-6ld %-8ld " NIP6_SEQFMT " %-4d\n", (unsigned)ntohl(fl->label), fl->share, (unsigned)fl->owner, @@ -644,7 +644,7 @@ static int ip6fl_seq_show(struct seq_file *seq, void *v) { if (v == SEQ_START_TOKEN) - seq_printf(seq, "%-5s %-1s %-6s %-6s %-6s %-8s %-39s %s\n", + seq_printf(seq, "%-5s %-1s %-6s %-6s %-6s %-8s %-32s %s\n", "Label", "S", "Owner", "Users", "Linger", "Expires", "Dst", "Opt"); else ip6fl_fl_seq_show(seq, v); diff -u b/net/ipv6/mcast.c b/net/ipv6/mcast.c --- b/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -2374,7 +2374,7 @@ struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq); seq_printf(seq, - "%-4d %-15s " NIP6_FMT " %5d %08X %ld\n", + "%-4d %-15s " NIP6_SEQFMT " %5d %08X %ld\n", state->dev->ifindex, state->dev->name, NIP6(im->mca_addr), im->mca_users, im->mca_flags, @@ -2543,12 +2543,12 @@ if (v == SEQ_START_TOKEN) { seq_printf(seq, "%3s %6s " - "%39s %39s %6s %6s\n", "Idx", + "%32s %32s %6s %6s\n", "Idx", "Device", "Multicast Address", "Source Address", "INC", "EXC"); } else { seq_printf(seq, - "%3d %6.6s " NIP6_FMT " " NIP6_FMT " %6lu %6lu\n", + "%3d %6.6s " NIP6_SEQFMT " " NIP6_SEQFMT " %6lu %6lu\n", state->dev->ifindex, state->dev->name, NIP6(state->im->mca_addr), NIP6(psf->sf_addr), -- YOSHIFUJI Hideaki @ USAGI Project GPG-FP : 9022 65EB 1ECF 3AD1 0BDF 80D8 4807 F894 E062 0EEA - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1858 retrieving revision 1.1859 diff -u -r1.1858 -r1.1859 --- kernel-2.6.spec 17 Jan 2006 00:58:29 -0000 1.1858 +++ kernel-2.6.spec 17 Jan 2006 05:58:08 -0000 1.1859 @@ -349,6 +349,7 @@ Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch Patch1850: linux-2.6-mv643xx-compile-fix.patch +Patch1860: linux-2.6-net-nip6_fmt.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -825,6 +826,8 @@ %patch1840 -p1 # Fix compilation for MV643xx Ethernet %patch1850 -p1 +# Revert changes that broke named, ifconfig, radvd etc +%patch1860 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 %patch1901 -p1 @@ -1348,6 +1351,9 @@ %endif %changelog +* Tue Jan 17 2006 Dave Jones +- Revert changes that broke named, ifconfig, radvd etc + * Mon Jan 16 2006 Dave Jones - 2.6.15-git12 From fedora-cvs-commits at redhat.com Tue Jan 17 06:04:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 01:04:54 -0500 Subject: rpms/control-center/devel control-center-2.13.5-fedora-apps.patch, NONE, 1.1 control-center.spec, 1.109, 1.110 Message-ID: <200601170604.k0H64soY019077@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19001 Modified Files: control-center.spec Added Files: control-center-2.13.5-fedora-apps.patch Log Message: 2.13.5 control-center-2.13.5-fedora-apps.patch: gnome-default-applications.xml.in | 114 ++++++++------------------------------ 1 files changed, 25 insertions(+), 89 deletions(-) --- NEW FILE control-center-2.13.5-fedora-apps.patch --- --- control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in.fedora-apps 2006-01-17 00:57:15.000000000 -0500 +++ control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in 2006-01-17 01:03:16.000000000 -0500 @@ -10,7 +10,7 @@ opera opera %s opera - fasle + false true opera -newpage %s opera -newwindow %s @@ -44,24 +44,6 @@ galeon -w %s - <_name>Encompass - encompass - encompass %s - encompass - false - false - - - <_name>Firebird - mozilla-firebird - mozilla-firebird %s - - false - true - mozilla-firebird -remote "openurl(%s,new-tab)" - mozilla-firebird -remote "openurl(%s,new-window)" - - <_name>Firefox firefox firefox %s @@ -72,16 +54,6 @@ firefox -remote "openurl(%s,new-window)" - <_name>Mozilla 1.6 - mozilla-1.6 - mozilla-1.6 %s - mozilla-icon - false - true - mozilla-1.6 -remote "openurl(%s,new-tab)" - mozilla-1.6 -remote "openurl(%s,new-window)" - - <_name>Mozilla mozilla mozilla %s @@ -91,8 +63,7 @@ mozilla -remote "openurl(%s,new-tab)" mozilla -remote "openurl(%s,new-window)" - - <_name>Netscape Communicator + <_name>Netscape netscape netscape %s netscape @@ -137,48 +108,6 @@ - <_name>Evolution Mail Reader 2.4 - evolution-2.4 - evolution-2.4 %s - evolution - false - - - <_name>Evolution Mail Reader 2.2 - evolution-2.2 - evolution-2.2 %s - evolution - false - - - <_name>Evolution Mail Reader 2.0 - evolution-2.0 - evolution-2.0 %s - evolution - false - - - <_name>Evolution Mail Reader 1.6 - evolution-1.6 - evolution-1.6 %s - evolution - false - - - <_name>Evolution Mail Reader 1.5 - evolution-1.5 - evolution-1.5 %s - evolution - false - - - <_name>Evolution Mail Reader 1.4 - evolution-1.4 - evolution-1.4 %s - evolution - false - - <_name>Evolution Mail Reader evolution evolution %s @@ -200,27 +129,13 @@ false - <_name>Thunderbird + <_name>Thunderbird Mail thunderbird thunderbird -mail %s thunderbird false - <_name>Mozilla Thunderbird - mozilla-thunderbird - mozilla-thunderbird -mail %s - thunderbird - false - - - <_name>Mozilla Mail - mozilla - mozilla -mail %s - mozilla-mail-icon - false - - <_name>Mutt mutt mutt %s @@ -228,8 +143,15 @@ true + <_name>Sylpheed + sylpheed + sylpheed --compose %s + sylpheed + false + + <_name>Sylpheed-Claws - ylpheed-claws + sylpheed-claws sylpheed-claws --compose %s sylpheed false @@ -245,6 +167,20 @@ -e + <_name>KDE Konsole + konsole + konsole + konsole + -e + + + <_name>KTerm + kterm + kterm + kterm + -e + + <_name>GNOME Terminal gnome-terminal gnome-terminal --working-directory=%f Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- control-center.spec 17 Jan 2006 05:51:52 -0000 1.109 +++ control-center.spec 17 Jan 2006 06:04:50 -0000 1.110 @@ -27,7 +27,7 @@ Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center-%{version}.tar.bz2 -Patch1: control-center-2.13.4-fedora-apps.patch +Patch1: control-center-2.13.5-fedora-apps.patch Patch2: control-center-2.9.4-filesel.patch Patch3: control-center-2.10.1-mark-tool-buttons-important.patch Patch5: control-center-2.12.0-run-power-manager.patch From fedora-cvs-commits at redhat.com Tue Jan 17 06:23:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 01:23:32 -0500 Subject: rpms/squirrelmail/devel squirrelmail.spec,1.25,1.26 Message-ID: <200601170623.k0H6NW5t004343@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/squirrelmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4297 Modified Files: squirrelmail.spec Log Message: - do not remove mo files - require php-mbstring Index: squirrelmail.spec =================================================================== RCS file: /cvs/dist/rpms/squirrelmail/devel/squirrelmail.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- squirrelmail.spec 9 Dec 2005 22:43:17 -0000 1.25 +++ squirrelmail.spec 17 Jan 2006 06:23:28 -0000 1.26 @@ -6,7 +6,7 @@ Summary: SquirrelMail webmail client Name: squirrelmail Version: 1.4.6 -Release: 0.cvs20050812.2.fc5.1 +Release: 0.cvs20050812.3.fc5 License: GPL URL: http://www.squirrelmail.org/ Group: Applications/Internet @@ -21,7 +21,7 @@ Patch4: squirrelmail-1.4.5-charset.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch -Requires: httpd, php >= 4.0.4, perl, tmpwatch >= 2.8, aspell +Requires: httpd, php >= 4.0.4, php-mbstring, perl, tmpwatch >= 2.8, aspell Requires: /usr/sbin/sendmail Prereq: httpd, perl Provides: squirrelmail-i18n @@ -171,7 +171,6 @@ fi done ./compilelocales -find -name '*.mo' |xargs rm cp -r locale/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/locale/ cp -r images/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/images/ cp -r help/* $RPM_BUILD_ROOT%{_datadir}/squirrelmail/help/ @@ -208,6 +207,10 @@ %{_sysconfdir}/cron.daily/squirrelmail.cron %changelog +* Tue Jan 17 2006 Warren Togami 1.4.6-0.cvs20050812.3 +- do not remove mo files +- require php-mbstring + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 17 06:25:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 01:25:07 -0500 Subject: rpms/strace/devel .cvsignore, 1.19, 1.20 sources, 1.23, 1.24 strace.spec, 1.32, 1.33 Message-ID: <200601170625.k0H6P7vw004986@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/strace/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4952 Modified Files: .cvsignore sources strace.spec Log Message: New version 4.5.14 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/strace/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 3 Aug 2005 11:48:27 -0000 1.19 +++ .cvsignore 17 Jan 2006 06:25:02 -0000 1.20 @@ -1 +1 @@ -strace-4.5.13.tar.bz2 +strace-4.5.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/strace/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 3 Aug 2005 12:19:46 -0000 1.23 +++ sources 17 Jan 2006 06:25:02 -0000 1.24 @@ -1 +1 @@ -55f9673e9712d02a4cb5314bafe38dea strace-4.5.13.tar.bz2 +09bcd5d00ece28f8154dec11cadfce3c strace-4.5.14.tar.bz2 Index: strace.spec =================================================================== RCS file: /cvs/dist/rpms/strace/devel/strace.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- strace.spec 9 Dec 2005 22:43:19 -0000 1.32 +++ strace.spec 17 Jan 2006 06:25:03 -0000 1.33 @@ -1,7 +1,7 @@ Summary: Tracks and displays system calls associated with a running process. Name: strace -Version: 4.5.13 -Release: 1.1 +Version: 4.5.14 +Release: 1 License: BSD Group: Development/Debuggers URL: http://sourceforge.net/projects/strace/ @@ -75,8 +75,15 @@ %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Mon Jan 16 2006 Roland McGrath - 4.5.14-1 +- Fix biarch decoding of socket syscalls (#174354). +- Fix biarch -e support (#173986). +- Accept numeric syscalls in -e (#174798). +- Fix ipc syscall decoding (#164755). +- Improve msgrcv printing (#164757). +- Man page updates (#165375). +- Improve mount syscall printing (#165377). +- Correct printing of restarting syscalls (#165469). * Wed Aug 3 2005 Roland McGrath - 4.5.13-1 - Fix setsockopt decoding on 64-bit (#162449). From fedora-cvs-commits at redhat.com Tue Jan 17 06:34:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 01:34:16 -0500 Subject: rpms/pyxf86config/devel .cvsignore, 1.12, 1.13 pyxf86config.spec, 1.21, 1.22 sources, 1.12, 1.13 Message-ID: <200601170634.k0H6YGNt007891@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/pyxf86config/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7860 Modified Files: .cvsignore pyxf86config.spec sources Log Message: * Tue Jan 17 2006 Christopher Aillon 0.3.23-1 - Use the standard X headers instead of keeping a copy in-tree Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pyxf86config/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 14 Nov 2005 03:35:28 -0000 1.12 +++ .cvsignore 17 Jan 2006 06:34:13 -0000 1.13 @@ -1 +1,2 @@ pyxf86config-0.3.22.tar.gz +pyxf86config-0.3.23.tar.gz Index: pyxf86config.spec =================================================================== RCS file: /cvs/dist/rpms/pyxf86config/devel/pyxf86config.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- pyxf86config.spec 21 Dec 2005 10:39:10 -0000 1.21 +++ pyxf86config.spec 17 Jan 2006 06:34:13 -0000 1.22 @@ -2,8 +2,8 @@ Summary: Python wrappers for libxf86config Name: pyxf86config -Version: 0.3.22 -Release: 1.1 +Version: 0.3.23 +Release: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL @@ -43,6 +43,9 @@ %changelog +* Tue Jan 17 2006 Christopher Aillon 0.3.23-1 +- Use the standard X headers instead of keeping a copy in-tree + * Wed Dec 21 2005 Jesse Keating - changed BuildReq to new modular devel package - Changed search path for X libraries Index: sources =================================================================== RCS file: /cvs/dist/rpms/pyxf86config/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 14 Nov 2005 03:35:28 -0000 1.12 +++ sources 17 Jan 2006 06:34:13 -0000 1.13 @@ -1 +1 @@ -3ce7a6cd57cee5556a57fcebfab16d1d pyxf86config-0.3.22.tar.gz +e587ee27ac4bedb9fc60daa1b11e8fd8 pyxf86config-0.3.23.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 17 06:36:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 01:36:36 -0500 Subject: rpms/bootparamd/devel bootparamd-err.patch, NONE, 1.1 bootparamd.spec, 1.16, 1.17 Message-ID: <200601170636.k0H6aZOY008411@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/bootparamd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8371 Modified Files: bootparamd.spec Added Files: bootparamd-err.patch Log Message: fix for #177902 - Callbootd segfaults when connecting to nonexistent server bootparamd-err.patch: callbootd.c | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE bootparamd-err.patch --- --- netkit-bootparamd-0.17-pre20000412/rpc.bootparamd/callbootd.c.old 1997-09-23 10:39:26.000000000 +0200 +++ netkit-bootparamd-0.17-pre20000412/rpc.bootparamd/callbootd.c 2006-01-17 07:25:25.000000000 +0100 @@ -80,6 +80,10 @@ if (!broadcast) { clnt = clnt_create(server,BOOTPARAMPROG, BOOTPARAMVERS, "udp"); + if(!clnt) { + fprintf(stderr,"Unable to connect to '%s'.\n", server); + exit(1); + } } switch (argc) { Index: bootparamd.spec =================================================================== RCS file: /cvs/dist/rpms/bootparamd/devel/bootparamd.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- bootparamd.spec 9 Dec 2005 22:39:49 -0000 1.16 +++ bootparamd.spec 17 Jan 2006 06:36:32 -0000 1.17 @@ -3,7 +3,7 @@ Summary: A server process which provides boot information to diskless clients. Name: bootparamd Version: 0.17 -Release: 23.devel.1 +Release: 24.devel License: BSD Group: System Environment/Daemons Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit-devel/netkit-bootparamd-%{version}%{_snapshot}.tar.gz @@ -14,6 +14,7 @@ Patch3: bootparamd.fast-dns.patch Patch4: bootparamd-resolver-fix.patch Patch5: bootparamd-get-router.patch +Patch6: bootparamd-err.patch Prereq: /sbin/chkconfig /etc/init.d Requires: portmap BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -40,6 +41,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -b .router +%patch6 -p1 -b .err %build sh configure --with-c-compiler=gcc @@ -88,6 +90,10 @@ %config /etc/rc.d/init.d/bootparamd %changelog +* Tue Jan 17 2006 Martin Stransky 0.17-24.devel +- fix for #177902 - Callbootd segfaults when connecting to + nonexistent server + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 17 06:47:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 01:47:15 -0500 Subject: rpms/strace/FC-4 .cvsignore, 1.17, 1.18 sources, 1.19, 1.20 strace.spec, 1.29, 1.30 Message-ID: <200601170647.k0H6lF2o016855@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/strace/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16667 Modified Files: .cvsignore sources strace.spec Log Message: New version 4.5.14 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/strace/FC-4/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 23 Mar 2005 00:05:12 -0000 1.17 +++ .cvsignore 17 Jan 2006 06:47:10 -0000 1.18 @@ -1 +1 @@ -strace-4.5.11.tar.bz2 +strace-4.5.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/strace/FC-4/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 23 Mar 2005 00:05:12 -0000 1.19 +++ sources 17 Jan 2006 06:47:10 -0000 1.20 @@ -1 +1 @@ -28335e15c83456a3db055a0a0efcb4fe strace-4.5.11.tar.bz2 +09bcd5d00ece28f8154dec11cadfce3c strace-4.5.14.tar.bz2 Index: strace.spec =================================================================== RCS file: /cvs/dist/rpms/strace/FC-4/strace.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- strace.spec 23 Mar 2005 00:05:12 -0000 1.29 +++ strace.spec 17 Jan 2006 06:47:10 -0000 1.30 @@ -1,7 +1,7 @@ Summary: Tracks and displays system calls associated with a running process. Name: strace -Version: 4.5.11 -Release: 1 +Version: 4.5.14 +Release: 0.FC4.1 License: BSD Group: Development/Debuggers URL: http://sourceforge.net/projects/strace/ @@ -75,6 +75,36 @@ %changelog +* Mon Jan 16 2006 Roland McGrath - 4.5.14-0.FC4.1 +- Fix biarch decoding of socket syscalls (#174354). +- Fix biarch -e support (#173986). +- Accept numeric syscalls in -e (#174798). +- Fix ipc syscall decoding (#164755). +- Improve msgrcv printing (#164757). +- Man page updates (#165375). +- Improve mount syscall printing (#165377). +- Correct printing of restarting syscalls (#165469). + +* Wed Aug 3 2005 Roland McGrath - 4.5.13-1 +- Fix setsockopt decoding on 64-bit (#162449). +- Fix typos in socket option name strings (#161578). +- Display more IPV6 socket options by name (#162450). +- Don't display inappropriate syscalls for -e trace=file (#159340). +- New selector type -e trace=desc for file-descriptor using calls (#159400). +- Fix 32-bit old_mmap syscall decoding on x86-64 (#162467, #164215). +- Fix errors detaching from multithreaded process on interrupt (#161919). +- Note 4.5.12 fix for crash handling bad signal numbers (#162739). + +* Wed Jun 8 2005 Roland McGrath - 4.5.12-1 +- Fix known syscall recognition for IA32 processes on x86-64 (#158934). +- Fix bad output for ptrace on x86-64 (#159787). +- Fix potential buffer overruns (#151570, #159196). +- Make some diagnostics more consistent (#159308). +- Update PowerPC system calls. +- Better printing for Linux aio system calls. +- Don't truncate statfs64 fields to 32 bits in output (#158243). +- Cosmetic code cleanups (#159688). + * Tue Mar 22 2005 Roland McGrath - 4.5.11-1 - Build tweaks. - Note 4.5.10 select fix (#151570). From fedora-cvs-commits at redhat.com Tue Jan 17 06:48:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 01:48:45 -0500 Subject: rpms/kernel/devel linux-2.6-debug-dual-line-backtrace.patch, 1.2, 1.3 Message-ID: <200601170648.k0H6mj4N019897@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19650 Modified Files: linux-2.6-debug-dual-line-backtrace.patch Log Message: improve backtrace. linux-2.6-debug-dual-line-backtrace.patch: traps.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) Index: linux-2.6-debug-dual-line-backtrace.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-dual-line-backtrace.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-dual-line-backtrace.patch 16 Jan 2006 02:40:16 -0000 1.2 +++ linux-2.6-debug-dual-line-backtrace.patch 17 Jan 2006 06:48:40 -0000 1.3 @@ -1,12 +1,14 @@ ---- linux-2.6.15.noarch/arch/i386/kernel/traps.c~ 2006-01-15 20:49:55.000000000 -0500 -+++ linux-2.6.15.noarch/arch/i386/kernel/traps.c 2006-01-15 20:50:38.000000000 -0500 -@@ -117,10 +117,16 @@ static inline int valid_stack_ptr(struct +--- linux-2.6.15.noarch/arch/i386/kernel/traps.c~ 2006-01-17 01:46:02.000000000 -0500 ++++ linux-2.6.15.noarch/arch/i386/kernel/traps.c 2006-01-17 01:46:50.000000000 -0500 +@@ -114,10 +114,17 @@ static inline int valid_stack_ptr(struct static void print_addr_and_symbol(unsigned long addr, char *log_lvl) { +- printk(log_lvl); + static char space=0; + - printk(log_lvl); ++ if (space == 0) ++ printk(log_lvl); printk(" [<%08lx>] ", addr); print_symbol("%s", addr); - printk("\n"); From fedora-cvs-commits at redhat.com Tue Jan 17 07:51:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 02:51:37 -0500 Subject: rpms/systemtap/FC-4 .cvsignore, 1.13, 1.14 elfutils-portability.patch, 1.8, 1.9 sources, 1.14, 1.15 systemtap.spec, 1.16, 1.17 Message-ID: <200601170751.k0H7pbXa026299@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/systemtap/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26287 Modified Files: .cvsignore elfutils-portability.patch sources systemtap.spec Log Message: New version 0.5.3, with elfutils 0.119 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/systemtap/FC-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 20 Dec 2005 01:10:23 -0000 1.13 +++ .cvsignore 17 Jan 2006 07:51:29 -0000 1.14 @@ -1,2 +1,2 @@ -systemtap-0.5.2.tar.gz -elfutils-0.118.tar.gz +systemtap-0.5.3.tar.gz +elfutils-0.119.tar.gz elfutils-portability.patch: ChangeLog | 15 ++++++++ Makefile.in | 2 + backends/ChangeLog | 8 ++++ backends/Makefile.am | 6 ++- backends/Makefile.in | 8 ++-- config/Makefile.in | 2 + configure | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 28 +++++++++++++++ lib/ChangeLog | 5 ++ lib/Makefile.am | 3 + lib/Makefile.in | 6 ++- libasm/ChangeLog | 5 ++ libasm/Makefile.am | 3 + libasm/Makefile.in | 6 ++- libcpu/ChangeLog | 5 ++ libcpu/Makefile.am | 3 + libcpu/Makefile.in | 4 +- libdw/ChangeLog | 5 ++ libdw/Makefile.am | 3 + libdw/Makefile.in | 7 ++- libdwfl/ChangeLog | 5 ++ libdwfl/Makefile.am | 3 + libdwfl/Makefile.in | 6 ++- libebl/ChangeLog | 5 ++ libebl/Makefile.am | 3 + libebl/Makefile.in | 6 ++- libelf/ChangeLog | 5 ++ libelf/Makefile.am | 6 ++- libelf/Makefile.in | 8 ++-- libelf/common.h | 4 +- m4/Makefile.in | 2 + src/ChangeLog | 5 ++ src/Makefile.am | 3 + src/Makefile.in | 6 ++- src/findtextrel.c | 6 ++- src/strip.c | 20 ++++++++++- tests/ChangeLog | 5 ++ tests/Makefile.am | 5 +- tests/Makefile.in | 6 ++- 39 files changed, 284 insertions(+), 39 deletions(-) Index: elfutils-portability.patch =================================================================== RCS file: /cvs/dist/rpms/systemtap/FC-4/elfutils-portability.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- elfutils-portability.patch 12 Dec 2005 05:55:54 -0000 1.8 +++ elfutils-portability.patch 17 Jan 2006 07:51:29 -0000 1.9 @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -19,6 +19,11 @@ +@@ -38,6 +38,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -12,7 +12,7 @@ 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. -@@ -41,6 +46,9 @@ +@@ -60,6 +65,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -51,7 +51,7 @@ libebl_%.map: Makefile --- elfutils/backends/Makefile.in +++ elfutils/backends/Makefile.in -@@ -159,6 +159,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -160,6 +160,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -59,7 +59,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -194,6 +195,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ +@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -67,7 +67,7 @@ XGETTEXT = @XGETTEXT@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ -@@ -236,9 +238,9 @@ sharedstatedir = @sharedstatedir@ +@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @@ -79,7 +79,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \ -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ -I$(top_srcdir)/lib -I.. -@@ -594,7 +596,7 @@ uninstall-am: uninstall-info-am +@@ -597,7 +599,7 @@ uninstall-am: uninstall-info-am libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw) $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ -Wl,--version-script,$(word 2,$^) \ @@ -136,7 +136,7 @@ ac_ct_CC = @ac_ct_CC@ --- elfutils/configure +++ elfutils/configure -@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.118' +@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.119' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/' ac_unique_file="libelf/libelf.h" @@ -458,7 +458,7 @@ libcpu_i386_a_SOURCES = i386_dis.c --- elfutils/libdw/ChangeLog +++ elfutils/libdw/ChangeLog -@@ -251,6 +251,11 @@ +@@ -266,6 +266,11 @@ 2005-05-31 Roland McGrath @@ -522,7 +522,7 @@ $(COMPILE))) --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -245,6 +245,11 @@ +@@ -259,6 +259,11 @@ 2005-07-21 Roland McGrath @@ -644,7 +644,7 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -103,6 +103,11 @@ +@@ -113,6 +113,11 @@ If section content hasn't been read yet, do it before looking for the block size. If no section data present, infer size of section header. @@ -909,7 +909,7 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -316,6 +316,11 @@ +@@ -349,6 +349,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. Index: sources =================================================================== RCS file: /cvs/dist/rpms/systemtap/FC-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 20 Dec 2005 01:10:23 -0000 1.14 +++ sources 17 Jan 2006 07:51:29 -0000 1.15 @@ -1,2 +1,2 @@ -0ebbfc091e19e97ae1c78b50a1c603af systemtap-0.5.2.tar.gz -fb8ea485fca0032cc4b4c8fd634b6f46 elfutils-0.118.tar.gz +5aef2312e7e767902e398811ed9388c9 systemtap-0.5.3.tar.gz +57b9e4ab3b9fb597a72badf26f7f9bdc elfutils-0.119.tar.gz Index: systemtap.spec =================================================================== RCS file: /cvs/dist/rpms/systemtap/FC-4/systemtap.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- systemtap.spec 20 Dec 2005 01:10:23 -0000 1.16 +++ systemtap.spec 17 Jan 2006 07:51:29 -0000 1.17 @@ -1,8 +1,8 @@ %define bundled_elfutils 1 -%define elfutils_version 0.118 +%define elfutils_version 0.119 Name: systemtap -Version: 0.5.2 +Version: 0.5.3 Release: 1 Summary: Instrumentation System Group: Development/System @@ -100,6 +100,10 @@ %changelog +* Mon Jan 16 2006 Roland McGrath - 0.5.3-1 +- Many changes, affected PRs include: 2056, 1144, 1379, 2057, + 2060, 1972, 2140, 2148 + * Mon Dec 19 2005 Roland McGrath - 0.5.2-1 - Fixed build with gcc 4.1, various tapset changes. From fedora-cvs-commits at redhat.com Tue Jan 17 07:52:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 02:52:38 -0500 Subject: rpms/systemtap/devel elfutils-portability.patch, 1.6, 1.7 sources, 1.12, 1.13 systemtap.spec, 1.18, 1.19 Message-ID: <200601170752.k0H7qcM9026344@cvs.devel.redhat.com> Author: roland Update of /cvs/dist/rpms/systemtap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26329 Modified Files: elfutils-portability.patch sources systemtap.spec Log Message: New version 0.5.3, with elfutils 0.119 elfutils-portability.patch: ChangeLog | 15 ++++++++ Makefile.in | 2 + backends/ChangeLog | 8 ++++ backends/Makefile.am | 6 ++- backends/Makefile.in | 8 ++-- config/Makefile.in | 2 + configure | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 28 +++++++++++++++ lib/ChangeLog | 5 ++ lib/Makefile.am | 3 + lib/Makefile.in | 6 ++- libasm/ChangeLog | 5 ++ libasm/Makefile.am | 3 + libasm/Makefile.in | 6 ++- libcpu/ChangeLog | 5 ++ libcpu/Makefile.am | 3 + libcpu/Makefile.in | 4 +- libdw/ChangeLog | 5 ++ libdw/Makefile.am | 3 + libdw/Makefile.in | 7 ++- libdwfl/ChangeLog | 5 ++ libdwfl/Makefile.am | 3 + libdwfl/Makefile.in | 6 ++- libebl/ChangeLog | 5 ++ libebl/Makefile.am | 3 + libebl/Makefile.in | 6 ++- libelf/ChangeLog | 5 ++ libelf/Makefile.am | 6 ++- libelf/Makefile.in | 8 ++-- libelf/common.h | 4 +- m4/Makefile.in | 2 + src/ChangeLog | 5 ++ src/Makefile.am | 3 + src/Makefile.in | 6 ++- src/findtextrel.c | 6 ++- src/strip.c | 20 ++++++++++- tests/ChangeLog | 5 ++ tests/Makefile.am | 5 +- tests/Makefile.in | 6 ++- 39 files changed, 284 insertions(+), 39 deletions(-) Index: elfutils-portability.patch =================================================================== RCS file: /cvs/dist/rpms/systemtap/devel/elfutils-portability.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- elfutils-portability.patch 12 Dec 2005 10:16:46 -0000 1.6 +++ elfutils-portability.patch 17 Jan 2006 07:52:34 -0000 1.7 @@ -1,6 +1,6 @@ --- elfutils/backends/ChangeLog +++ elfutils/backends/ChangeLog -@@ -19,6 +19,11 @@ +@@ -38,6 +38,11 @@ * sparc_init.c: Likewise. * x86_64_init.c: Likewise. @@ -12,7 +12,7 @@ 2005-11-19 Roland McGrath * ppc64_reloc.def: REL30 -> ADDR30. -@@ -41,6 +46,9 @@ +@@ -60,6 +65,9 @@ * Makefile.am (uninstall): Don't try to remove $(pkgincludedir). (CLEANFILES): Add libebl_$(m).so. @@ -51,7 +51,7 @@ libebl_%.map: Makefile --- elfutils/backends/Makefile.in +++ elfutils/backends/Makefile.in -@@ -159,6 +159,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +@@ -160,6 +160,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LDFLAGS = @LDFLAGS@ @@ -59,7 +59,7 @@ LEX = @LEX@ LEXLIB = @LEXLIB@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -@@ -194,6 +195,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ +@@ -195,6 +196,7 @@ TESTS_RPATH_FALSE = @TESTS_RPATH_FALSE@ TESTS_RPATH_TRUE = @TESTS_RPATH_TRUE@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ @@ -67,7 +67,7 @@ XGETTEXT = @XGETTEXT@ YACC = @YACC@ ac_ct_CC = @ac_ct_CC@ -@@ -236,9 +238,9 @@ sharedstatedir = @sharedstatedir@ +@@ -237,9 +239,9 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ @MUDFLAP_FALSE at AM_CFLAGS = -fpic -Wall -Wshadow -Werror -Wunused \ @@ -79,7 +79,7 @@ INCLUDES = -I$(srcdir) -I$(top_srcdir)/libebl \ -I$(top_srcdir)/libelf -I$(top_srcdir)/libdw \ -I$(top_srcdir)/lib -I.. -@@ -594,7 +596,7 @@ uninstall-am: uninstall-info-am +@@ -597,7 +599,7 @@ uninstall-am: uninstall-info-am libebl_%.so: libebl_%_pic.a libebl_%.map $(libelf) $(libdw) $(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \ -Wl,--version-script,$(word 2,$^) \ @@ -136,7 +136,7 @@ ac_ct_CC = @ac_ct_CC@ --- elfutils/configure +++ elfutils/configure -@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.118' +@@ -276,7 +276,7 @@ PACKAGE_STRING='Red Hat elfutils 0.119' PACKAGE_BUGREPORT='http://bugzilla.redhat.com/bugzilla/' ac_unique_file="libelf/libelf.h" @@ -458,7 +458,7 @@ libcpu_i386_a_SOURCES = i386_dis.c --- elfutils/libdw/ChangeLog +++ elfutils/libdw/ChangeLog -@@ -251,6 +251,11 @@ +@@ -266,6 +266,11 @@ 2005-05-31 Roland McGrath @@ -522,7 +522,7 @@ $(COMPILE))) --- elfutils/libdwfl/ChangeLog +++ elfutils/libdwfl/ChangeLog -@@ -245,6 +245,11 @@ +@@ -259,6 +259,11 @@ 2005-07-21 Roland McGrath @@ -644,7 +644,7 @@ --- elfutils/libelf/ChangeLog +++ elfutils/libelf/ChangeLog -@@ -103,6 +103,11 @@ +@@ -113,6 +113,11 @@ If section content hasn't been read yet, do it before looking for the block size. If no section data present, infer size of section header. @@ -909,7 +909,7 @@ cannot set access and modification date of '%s'"), fname); --- elfutils/tests/ChangeLog +++ elfutils/tests/ChangeLog -@@ -316,6 +316,11 @@ +@@ -349,6 +349,11 @@ * Makefile.am (TESTS): Add run-elflint-test.sh. (EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2. Index: sources =================================================================== RCS file: /cvs/dist/rpms/systemtap/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 20 Dec 2005 01:11:30 -0000 1.12 +++ sources 17 Jan 2006 07:52:34 -0000 1.13 @@ -1,2 +1,2 @@ -0ebbfc091e19e97ae1c78b50a1c603af systemtap-0.5.2.tar.gz -fb8ea485fca0032cc4b4c8fd634b6f46 elfutils-0.118.tar.gz +5aef2312e7e767902e398811ed9388c9 systemtap-0.5.3.tar.gz +57b9e4ab3b9fb597a72badf26f7f9bdc elfutils-0.119.tar.gz Index: systemtap.spec =================================================================== RCS file: /cvs/dist/rpms/systemtap/devel/systemtap.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- systemtap.spec 20 Dec 2005 01:11:30 -0000 1.18 +++ systemtap.spec 17 Jan 2006 07:52:34 -0000 1.19 @@ -1,8 +1,8 @@ %define bundled_elfutils 0 -%define elfutils_version 0.118 +%define elfutils_version 0.119 Name: systemtap -Version: 0.5.2 +Version: 0.5.3 Release: 2 Summary: Instrumentation System Group: Development/System @@ -100,9 +100,13 @@ %changelog -* Mon Dec 19 2005 Roland McGrath - 0.5.2-2 +* Mon Jan 16 2006 Roland McGrath - 0.5.3-2 - Rebuilt for devel +* Mon Jan 16 2006 Roland McGrath - 0.5.3-1 +- Many changes, affected PRs include: 2056, 1144, 1379, 2057, + 2060, 1972, 2140, 2148 + * Mon Dec 19 2005 Roland McGrath - 0.5.2-1 - Fixed build with gcc 4.1, various tapset changes. From fedora-cvs-commits at redhat.com Tue Jan 17 07:56:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 02:56:55 -0500 Subject: rpms/libXrender/devel libXrender.spec,1.7,1.8 Message-ID: <200601170756.k0H7utLV026471@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/libXrender/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26458 Modified Files: libXrender.spec Log Message: * Mon Jan 16 2006 Mike A. Harris 0.9.0.2-2 - Added "Requires: xorg-x11-proto-devel" to resolve bug (#176742) Index: libXrender.spec =================================================================== RCS file: /cvs/dist/rpms/libXrender/devel/libXrender.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libXrender.spec 16 Dec 2005 11:09:26 -0000 1.7 +++ libXrender.spec 17 Jan 2006 07:56:52 -0000 1.8 @@ -1,8 +1,7 @@ - Summary: X.Org X11 libXrender runtime library Name: libXrender Version: 0.9.0.2 -Release: 1 +Release: 2 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -12,7 +11,6 @@ BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel - Obsoletes: XFree86-libs, xorg-x11-libs %description @@ -24,6 +22,8 @@ Requires: %{name} = %{version}-%{release} Requires(pre): xorg-x11-filesystem >= 0.99.2-3 +Requires: xorg-x11-proto-devel +#Requires: libX11-devel Obsoletes: XFree86-devel, xorg-x11-devel @@ -78,6 +78,9 @@ %{_libdir}/pkgconfig/xrender.pc %changelog +* Mon Jan 16 2006 Mike A. Harris 0.9.0.2-2 +- Added "Requires: xorg-x11-proto-devel" to resolve bug (#176742) + * Fri Dec 16 2005 Mike A. Harris 0.9.0.2-1 - Updated libXrender to version 0.9.0.2 from X11R7 RC4 @@ -94,7 +97,6 @@ - Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes' - Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes' - * Mon Oct 24 2005 Mike A. Harris 0.9.0-4 - Updated libXrender to version 0.9.0 from X11R7 RC1 From fedora-cvs-commits at redhat.com Tue Jan 17 08:34:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 03:34:20 -0500 Subject: rpms/system-config-date/devel .cvsignore, 1.35, 1.36 sources, 1.38, 1.39 system-config-date.spec, 1.43, 1.44 Message-ID: <200601170834.k0H8YKiN017451@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-date/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17407 Modified Files: .cvsignore sources system-config-date.spec Log Message: fix setting timezone from firstboot (#177779, patch by Chris Lumens) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 16 Jan 2006 15:54:42 -0000 1.35 +++ .cvsignore 17 Jan 2006 08:34:15 -0000 1.36 @@ -1 +1 @@ -system-config-date-1.7.99.14.tar.bz2 +system-config-date-1.7.99.15.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 16 Jan 2006 15:54:42 -0000 1.38 +++ sources 17 Jan 2006 08:34:15 -0000 1.39 @@ -1 +1 @@ -d679b271a906c3491d4ec7f59a082993 system-config-date-1.7.99.14.tar.bz2 +7591b09fc66ae88a759aead6b94974b3 system-config-date-1.7.99.15.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- system-config-date.spec 16 Jan 2006 15:54:42 -0000 1.43 +++ system-config-date.spec 17 Jan 2006 08:34:15 -0000 1.44 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.7.99.14 +Version: 1.7.99.15 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -93,7 +93,10 @@ %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template %changelog -* Mon Jan 16 2006 Nils Philippsen 1.7.99.14-1 +* Tue Jan 17 2006 Nils Philippsen 1.7.99.15 +- fix setting timezone from firstboot (#177779, patch by Chris Lumens) + +* Mon Jan 16 2006 Nils Philippsen 1.7.99.14 - put Etc/... timezones into "Non-geographic timezones" (#148025) - default to already set timezone on startup (#177815) From fedora-cvs-commits at redhat.com Tue Jan 17 08:41:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 03:41:53 -0500 Subject: rpms/xorg-x11-xfs/devel xorg-x11-xfs.spec,1.10,1.11 Message-ID: <200601170841.k0H8fqbJ019542@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xfs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19518 Modified Files: xorg-x11-xfs.spec Log Message: Strip % from rpm macro in changelog Index: xorg-x11-xfs.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xorg-x11-xfs.spec 10 Jan 2006 20:48:38 -0000 1.10 +++ xorg-x11-xfs.spec 17 Jan 2006 08:41:48 -0000 1.11 @@ -289,7 +289,7 @@ %changelog * Tue Jan 10 2006 Bill Nottingham 1:1.0.0-2 -- fix %post script (#176009, ) +- fix rpm post script (#176009, ) * Fri Dec 16 2005 Mike A. Harris 1:1.0.0-1 - Updated all tarballs to version 1.0.0 from X11R7 RC4. From fedora-cvs-commits at redhat.com Tue Jan 17 08:59:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 03:59:44 -0500 Subject: rpms/newt/devel newt.spec,1.30,1.31 Message-ID: <200601170859.k0H8xhOx006170@cvs.devel.redhat.com> Author: prockai Update of /cvs/dist/rpms/newt/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6083 Modified Files: newt.spec Log Message: * Tue Jan 17 2006 Petr Rockai - 0.52.2-3 - 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. Index: newt.spec =================================================================== RCS file: /cvs/dist/rpms/newt/devel/newt.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- newt.spec 16 Jan 2006 21:08:29 -0000 1.30 +++ newt.spec 17 Jan 2006 08:59:39 -0000 1.31 @@ -4,14 +4,14 @@ Name: newt %define version 0.52.2 Version: %{version} -Release: 2 +Release: 3 License: LGPL Group: System Environment/Libraries Source: newt-%{version}.tar.gz Patch0: newt-0.52.2-notcl.patch BuildRequires: python, python-devel, perl, slang-devel Requires: slang -Provides: snack +Provides: snack = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-root %package devel @@ -85,6 +85,11 @@ %{_libdir}/libnewt.so %changelog +* Tue Jan 17 2006 Petr Rockai - 0.52.2-3 +- 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. + * Mon Jan 16 2006 Petr Rockai - 0.52.2-2 - do not build whiptcl, as per 177346 -- so that we avoid dependency on tcl From fedora-cvs-commits at redhat.com Tue Jan 17 09:18:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 04:18:25 -0500 Subject: rpms/vino/devel vino.spec,1.31,1.32 Message-ID: <200601170918.k0H9IPNc018746@cvs.devel.redhat.com> Author: markmc Update of /cvs/dist/rpms/vino/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18446 Modified Files: vino.spec Log Message: * Tue Jan 17 2006 Mark McLoughlin 2.13.5-2 - Build with --enable-avahi Index: vino.spec =================================================================== RCS file: /cvs/dist/rpms/vino/devel/vino.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- vino.spec 17 Jan 2006 05:48:30 -0000 1.31 +++ vino.spec 17 Jan 2006 09:18:20 -0000 1.32 @@ -7,7 +7,7 @@ Summary: A remote desktop system for GNOME Name: vino Version: 2.13.5 -Release: 1 +Release: 2 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 License: GPL @@ -37,7 +37,11 @@ %setup -q %build -%configure --disable-gnutls --disable-session-support --disable-http-server +%configure \ + --enable-avahi \ + --disable-gnutls \ + --disable-session-support \ + --disable-http-server make %install @@ -90,6 +94,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Tue Jan 17 2006 Mark McLoughlin 2.13.5-2 +- Build with --enable-avahi + * Tue Jan 17 2006 Matthias Clasen 2.13.5-1 - Update to 2.13.5 From fedora-cvs-commits at redhat.com Tue Jan 17 10:27:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 05:27:06 -0500 Subject: rpms/net-tools/devel net-tools-1.60-selinux.patch, NONE, 1.1 net-tools.spec, 1.51, 1.52 Message-ID: <200601171027.k0HAR6K6025049@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25036 Modified Files: net-tools.spec Added Files: net-tools-1.60-selinux.patch Log Message: - new option for nestat, -Z shows selinux context. Patch by net-tools-1.60-selinux.patch: Makefile | 6 +++++ netstat.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 70 insertions(+), 3 deletions(-) --- NEW FILE net-tools-1.60-selinux.patch --- --- net-tools-1.60/Makefile~ 2005-12-24 06:56:57.000000000 -0500 +++ net-tools-1.60/Makefile 2005-12-29 16:54:06.000000000 -0500 @@ -113,6 +113,12 @@ NET_LIB = $(NET_LIB_PATH)/lib$(NET_LIB_NAME).a +ifeq ($(HAVE_SELINUX),1) +LDFLAGS += -lselinux +CFLAGS += -DHAVE_SELINUX +else +endif + CFLAGS += $(COPTS) -I. -idirafter ./include/ -I$(NET_LIB_PATH) LDFLAGS += $(LOPTS) -L$(NET_LIB_PATH) --- net-tools-1.60/netstat.c~ 2005-12-24 06:56:57.000000000 -0500 +++ net-tools-1.60/netstat.c 2005-12-29 16:54:07.000000000 -0500 @@ -86,6 +86,11 @@ #include #include +#if HAVE_SELINUX +#include +#else +#define security_context_t char* +#endif #include "net-support.h" #include "pathnames.h" #include "version.h" @@ -96,6 +101,7 @@ #include "util.h" #define PROGNAME_WIDTH 20 +#define SELINUX_WIDTH 50 #if !defined(s6_addr32) && defined(in6a_words) #define s6_addr32 in6a_words /* libinet6 */ @@ -150,6 +156,7 @@ int flag_prg = 0; int flag_arg = 0; int flag_ver = 0; +int flag_selinux = 0; FILE *procinfo; @@ -213,12 +220,17 @@ #define PROGNAME_WIDTH1(s) PROGNAME_WIDTH2(s) #define PROGNAME_WIDTH2(s) #s +#define SELINUX_WIDTHs SELINUX_WIDTH1(SELINUX_WIDTH) +#define SELINUX_WIDTH1(s) SELINUX_WIDTH2(s) +#define SELINUX_WIDTH2(s) #s + #define PRG_HASH_SIZE 211 static struct prg_node { struct prg_node *next; int inode; char name[PROGNAME_WIDTH]; + char scon[SELINUX_WIDTH]; } *prg_hash[PRG_HASH_SIZE]; static char prg_cache_loaded = 0; @@ -226,9 +238,12 @@ #define PRG_HASHIT(x) ((x) % PRG_HASH_SIZE) #define PROGNAME_BANNER "PID/Program name" +#define SELINUX_BANNER "Security Context" #define print_progname_banner() do { if (flag_prg) printf("%-" PROGNAME_WIDTHs "s"," " PROGNAME_BANNER); } while (0) +#define print_selinux_banner() do { if (flag_selinux) printf("%-" SELINUX_WIDTHs "s"," " SELINUX_BANNER); } while (0) + #define PRG_LOCAL_ADDRESS "local_address" #define PRG_INODE "inode" #define PRG_SOCKET_PFX "socket:[" @@ -250,7 +265,7 @@ /* NOT working as of glibc-2.0.7: */ #undef DIRENT_HAVE_D_TYPE_WORKS -static void prg_cache_add(int inode, char *name) +static void prg_cache_add(int inode, char *name, char *scon) { unsigned hi = PRG_HASHIT(inode); struct prg_node **pnp,*pn; @@ -271,6 +286,14 @@ if (strlen(name)>sizeof(pn->name)-1) name[sizeof(pn->name)-1]='\0'; strcpy(pn->name,name); + + { + int len=(strlen(scon)-sizeof(pn->scon))+1; + if (len > 0) + strcpy(pn->scon,&scon[len+1]); + else + strcpy(pn->scon,scon); + } } static const char *prg_cache_get(unsigned long inode) @@ -283,6 +306,16 @@ return("-"); } +static const char *prg_cache_get_con(unsigned long inode) +{ + unsigned hi=PRG_HASHIT(inode); + struct prg_node *pn; + + for (pn=prg_hash[hi];pn;pn=pn->next) + if (pn->inode==inode) return(pn->scon); + return("-"); +} + static void prg_cache_clear(void) { struct prg_node **pnp,*pn; @@ -348,6 +381,7 @@ const char *cs,*cmdlp; DIR *dirproc=NULL,*dirfd=NULL; struct dirent *direproc,*direfd; + security_context_t scon=NULL; if (prg_cache_loaded || !flag_prg) return; prg_cache_loaded=1; @@ -415,7 +449,15 @@ } snprintf(finbuf, sizeof(finbuf), "%s/%s", direproc->d_name, cmdlp); - prg_cache_add(inode, finbuf); +#if HAVE_SELINUX + if (getpidcon(atoi(direproc->d_name), &scon) == -1) { + scon=strdup("-"); + } + prg_cache_add(inode, finbuf, scon); + freecon(scon); +#else + prg_cache_add(inode, finbuf, "-"); +#endif } closedir(dirfd); dirfd = NULL; @@ -1385,6 +1428,8 @@ printf("- "); if (flag_prg) printf("%-" PROGNAME_WIDTHs "s",(has & HAS_INODE?prg_cache_get(inode):"-")); + if (flag_selinux) + printf("%-" SELINUX_WIDTHs "s",(has & HAS_INODE?prg_cache_get_con(inode):"-")); puts(path); } @@ -1403,6 +1448,7 @@ printf(_("\nProto RefCnt Flags Type State I-Node")); print_progname_banner(); + print_selinux_banner(); printf(_(" Path\n")); /* xxx */ { @@ -1682,6 +1728,7 @@ fprintf(stderr, _(" -o, --timers display timers\n")); fprintf(stderr, _(" -F, --fib display Forwarding Information Base (default)\n")); fprintf(stderr, _(" -C, --cache display routing cache instead of FIB\n\n")); + fprintf(stderr, _(" -Z, --context display SELinux security context for sockets\n\n")); fprintf(stderr, _(" : Name of interface to monitor/list.\n")); fprintf(stderr, _(" ={-t|--tcp} {-u|--udp} {-w|--raw} {-x|--unix} --ax25 --ipx --netrom\n")); @@ -1729,6 +1776,7 @@ {"cache", 0, 0, 'C'}, {"fib", 0, 0, 'F'}, {"groups", 0, 0, 'g'}, + {"context", 0, 0, 'Z'}, {NULL, 0, 0, 0} }; @@ -1741,7 +1789,7 @@ afname[0] = '\0'; - while ((i = getopt_long(argc, argv, "MCFA:acdegphiI::nNorstuVv?wxl", longopts, &lop)) != EOF) + while ((i = getopt_long(argc, argv, "MCFA:acdegphiI::nNorstuVv?wxlZ", longopts, &lop)) != EOF) switch (i) { case -1: break; @@ -1838,6 +1886,20 @@ if (aftrans_opt("unix")) exit(1); break; + case 'Z': +#if HAVE_SELINUX + if (is_selinux_enabled() <= 0) { + fprintf(stderr, _("SELinux is not enabled on this machine.\n")); + exit(1); + } + flag_prg++; + flag_selinux++; +#else + fprintf(stderr, _("SELinux is not enabled for this application.\n")); + exit(1); +#endif + + break; case '?': case 'h': usage(); Index: net-tools.spec =================================================================== RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- net-tools.spec 2 Jan 2006 10:00:42 -0000 1.51 +++ net-tools.spec 17 Jan 2006 10:27:02 -0000 1.52 @@ -3,7 +3,7 @@ Summary: Basic networking tools. Name: net-tools Version: 1.60 -Release: 58 +Release: 59 License: GPL Group: System Environment/Base Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 @@ -57,6 +57,7 @@ Patch43: net-tools-1.60-arp_overflow.patch Patch44: net-tools-1.60-hostname_man.patch Patch45: net-tools-1.60-interface_stack.patch +Patch46: net-tools-1.60-selinux.patch BuildRoot: %{_tmppath}/%{name}-root Requires(post,preun): chkconfig @@ -110,6 +111,7 @@ %patch43 -p1 -b .overflow %patch44 -p1 -b .hostname_man %patch45 -p0 -b .stack +%patch46 -p1 -b .selinux cp %SOURCE2 ./config.h cp %SOURCE3 ./config.make @@ -221,6 +223,9 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Tue Jan 17 2006 Radek Vokal 1.60-59 +- new option for nestat, -Z shows selinux context. Patch by + * Mon Jan 02 2006 Radek Vokal 1.60-58 - clear static buffers in interface.c by (#176714) From fedora-cvs-commits at redhat.com Tue Jan 17 11:32:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 06:32:43 -0500 Subject: rpms/httpd/FC-4 httpd-2.0.52-CVE-2005-2970.patch, NONE, 1.1 httpd-2.0.52-CVE-2005-3352.patch, NONE, 1.1 httpd-2.0.52-CVE-2005-3357.patch, NONE, 1.1 httpd-2.0.54-sslreneg.patch, NONE, 1.1 httpd.spec, 1.72, 1.73 Message-ID: <200601171132.k0HBWh2o004938@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/httpd/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv4894 Modified Files: httpd.spec Added Files: httpd-2.0.52-CVE-2005-2970.patch httpd-2.0.52-CVE-2005-3352.patch httpd-2.0.52-CVE-2005-3357.patch httpd-2.0.54-sslreneg.patch Log Message: * Tue Jan 17 2006 Joe Orton 2.0.54-10.3 - mod_ssl: add security fix for HTTP-on-SSL-port handling (CVE-2005-3357) - mod_imap: add security fix for XSS issue (CVE-2005-3352) - worker MPM: add security fix for memory consumption DoS (CVE-2005-2970), and bug fixes for handling resource allocation failures (#171759) - mod_ssl: buffer request bodies for per-location renegotiation (upstream #12355) httpd-2.0.52-CVE-2005-2970.patch: worker.c | 96 ++++++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 61 insertions(+), 35 deletions(-) --- NEW FILE httpd-2.0.52-CVE-2005-2970.patch --- --- httpd-2.0.52/server/mpm/worker/worker.c.cve2970 +++ httpd-2.0.52/server/mpm/worker/worker.c @@ -133,6 +134,7 @@ static fd_queue_t *worker_queue; static fd_queue_info_t *worker_queue_info; static int mpm_state = AP_MPMQ_STARTING; +static int sick_child_detected; /* The structure used to pass unique initialization info to each thread */ typedef struct { @@ -572,8 +574,7 @@ int process_slot = ti->pid; apr_pool_t *tpool = apr_thread_pool_get(thd); void *csd = NULL; - apr_pool_t *ptrans; /* Pool for per-transaction stuff */ - apr_pool_t *recycled_pool = NULL; + apr_pool_t *ptrans = NULL; /* Pool for per-transaction stuff */ int n; apr_pollfd_t *pollset; apr_status_t rv; @@ -602,8 +603,11 @@ if (listener_may_exit) break; if (!have_idle_worker) { + /* the following pops a recycled ptrans pool off a stack + * if there is one, in addition to reserving a worker thread + */ rv = ap_queue_info_wait_for_idler(worker_queue_info, - &recycled_pool); + &ptrans); if (APR_STATUS_IS_EOF(rv)) { break; /* we've been signaled to die now */ } @@ -680,8 +684,9 @@ } got_fd: if (!listener_may_exit) { - /* create a new transaction pool for each accepted socket */ - if (recycled_pool == NULL) { + if (ptrans == NULL) { + /* we can't use a recycled transaction pool this time. + * create a new transaction pool */ apr_allocator_t *allocator; apr_allocator_create(&allocator); @@ -689,9 +694,6 @@ apr_pool_create_ex(&ptrans, NULL, NULL, allocator); apr_allocator_owner_set(allocator, ptrans); } - else { - ptrans = recycled_pool; - } apr_pool_tag(ptrans, "transaction"); rv = lr->accept_func(&csd, lr, ptrans); /* later we trash rv and rely on csd to indicate success/failure */ @@ -736,7 +738,13 @@ else { if ((rv = SAFE_ACCEPT(apr_proc_mutex_unlock(accept_mutex))) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_EMERG, rv, ap_server_conf, + int level = APLOG_EMERG; + + if (ap_scoreboard_image->parent[process_slot].generation != + ap_scoreboard_image->global->running_generation) { + level = APLOG_DEBUG; /* common to get these at restart time */ + } + ap_log_error(APLOG_MARK, level, rv, ap_server_conf, "apr_proc_mutex_unlock failed. Attempting to " "shutdown process gracefully."); signal_threads(ST_GRACEFUL); @@ -871,14 +879,8 @@ if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, "apr_thread_create: unable to create listener thread"); - /* In case system resources are maxxed out, we don't want - * Apache running away with the CPU trying to fork over and - * over and over again if we exit. - * XXX Jeff doesn't see how Apache is going to try to fork again since - * the exit code is APEXIT_CHILDFATAL - */ - apr_sleep(apr_time_from_sec(10)); - clean_child_exit(APEXIT_CHILDFATAL); + /* let the parent decide how bad this really is */ + clean_child_exit(APEXIT_CHILDSICK); } apr_os_thread_get(&listener_os_thread, ts->listener); } @@ -955,11 +957,8 @@ if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, "apr_thread_create: unable to create worker thread"); - /* In case system resources are maxxed out, we don't want - Apache running away with the CPU trying to fork over and - over and over again if we exit. */ - apr_sleep(apr_time_from_sec(10)); - clean_child_exit(APEXIT_CHILDFATAL); + /* let the parent decide how bad this really is */ + clean_child_exit(APEXIT_CHILDSICK); } threads_created++; } @@ -1159,11 +1151,8 @@ if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, "apr_thread_create: unable to create worker thread"); - /* In case system resources are maxxed out, we don't want - Apache running away with the CPU trying to fork over and - over and over again if we exit. */ - apr_sleep(apr_time_from_sec(10)); - clean_child_exit(APEXIT_CHILDFATAL); + /* let the parent decide how bad this really is */ + clean_child_exit(APEXIT_CHILDSICK); } mpm_state = AP_MPMQ_RUNNING; @@ -1336,6 +1340,7 @@ int free_slots[MAX_SPAWN_RATE]; int last_non_dead; int total_non_dead; + int active_thread_count = 0; /* initialize the free_list */ free_length = 0; @@ -1373,14 +1378,16 @@ * So we hopefully won't need to fork more if we count it. * This depends on the ordering of SERVER_READY and SERVER_STARTING. */ - if (status <= SERVER_READY && status != SERVER_DEAD && - !ps->quiescing && - ps->generation == ap_my_generation && - /* XXX the following shouldn't be necessary if we clean up - * properly after seg faults, but we're not yet GLA - */ - ps->pid != 0) { - ++idle_thread_count; + if (ps->pid != 0) { /* XXX just set all_dead_threads in outer for + loop if no pid? not much else matters */ + if (status <= SERVER_READY && status != SERVER_DEAD && + !ps->quiescing && + ps->generation == ap_my_generation) { + ++idle_thread_count; + } + if (status >= SERVER_READY && status < SERVER_GRACEFUL) { + ++active_thread_count; + } } } if (any_dead_threads && totally_free_length < idle_spawn_rate @@ -1411,6 +1418,28 @@ ++total_non_dead; } } + + if (sick_child_detected) { + if (active_thread_count > 0) { + /* some child processes appear to be working. don't kill the + * whole server. + */ + sick_child_detected = 0; + } + else { + /* looks like a basket case. give up. + */ + shutdown_pending = 1; + child_fatal = 1; + ap_log_error(APLOG_MARK, APLOG_ALERT, 0, + ap_server_conf, + "No active workers found..." + " Apache is exiting!"); + /* the child already logged the failure details */ + return; + } + } + ap_max_daemons_limit = last_non_dead + 1; if (idle_thread_count > max_spare_threads) { @@ -1484,6 +1513,12 @@ child_fatal = 1; return; } + else if (processed_status == APEXIT_CHILDSICK) { + /* tell perform_idle_server_maintenance to check into this + * on the next timer pop + */ + sick_child_detected = 1; + } /* non-fatal death... note that it's gone in the scoreboard. */ child_slot = find_child_by_pid(&pid); if (child_slot >= 0) { httpd-2.0.52-CVE-2005-3352.patch: modules/mappers/mod_imap.c | 2 +- server/util.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) --- NEW FILE httpd-2.0.52-CVE-2005-3352.patch --- --- httpd-2.0.52/modules/mappers/mod_imap.c.cve3352 +++ httpd-2.0.52/modules/mappers/mod_imap.c @@ -341,7 +341,7 @@ if (!strcasecmp(value, "referer")) { referer = apr_table_get(r->headers_in, "Referer"); if (referer && *referer) { - return apr_pstrdup(r->pool, referer); + return ap_escape_html(r->pool, referer); } else { /* XXX: This used to do *value = '\0'; ... which is totally bogus --- httpd-2.0.52/server/util.c.cve3352 +++ httpd-2.0.52/server/util.c @@ -1761,6 +1761,8 @@ j += 3; else if (s[i] == '&') j += 4; + else if (s[i] == '"') + j += 5; if (j == 0) return apr_pstrmemdup(p, s, i); @@ -1779,6 +1781,10 @@ memcpy(&x[j], "&", 5); j += 4; } + else if (s[i] == '"') { + memcpy(&x[j], """, 6); + j += 5; + } else x[j] = s[i]; httpd-2.0.52-CVE-2005-3357.patch: ssl_engine_kernel.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE httpd-2.0.52-CVE-2005-3357.patch --- Author: jorton Date: Tue Dec 6 02:21:41 2005 New Revision: 354394 URL: http://svn.apache.org/viewcvs?rev=354394&view=rev Log: * modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): Omit further access control checks if SSL is not in use regardless of vhost settings. Submitted by: R??diger Pl??m, Joe Orton PR: 37791 --- httpd-2.0.52/modules/ssl/ssl_engine_kernel.c.cve3357 +++ httpd-2.0.52/modules/ssl/ssl_engine_kernel.c @@ -193,7 +193,7 @@ /* * Check to see if SSL protocol is on */ - if (!(sc->enabled || ssl)) { + if (!sc->enabled || !ssl) { return DECLINED; } /* httpd-2.0.54-sslreneg.patch: ssl_engine_io.c | 178 ++++++++++++++++++++++++++++++++++++++++++++++++++++ ssl_engine_kernel.c | 96 ++++++++-------------------- ssl_private.h | 4 + 3 files changed, 211 insertions(+), 67 deletions(-) --- NEW FILE httpd-2.0.54-sslreneg.patch --- Index: modules/ssl/ssl_engine_io.c =================================================================== --- httpd-2.0.54/modules/ssl/ssl_engine_io.c.sslreneg +++ httpd-2.0.54/modules/ssl/ssl_engine_io.c @@ -882,6 +882,7 @@ } static const char ssl_io_filter[] = "SSL/TLS Filter"; +static const char ssl_io_buffer[] = "SSL/TLS Buffer"; /* * Close the SSL part of the socket connection @@ -1375,6 +1376,180 @@ return status; } +/* 128K maximum buffer size by default. */ +#ifndef SSL_MAX_IO_BUFFER +#define SSL_MAX_IO_BUFFER (128 * 1024) +#endif + +struct modssl_buffer_ctx { + apr_bucket_brigade *bb; +}; + +int ssl_io_buffer_fill(request_rec *r) +{ + conn_rec *c = r->connection; + struct modssl_buffer_ctx *ctx; + apr_bucket_brigade *tempb; + apr_off_t total = 0; /* total length buffered */ + int eos = 0; /* non-zero once EOS is seen */ + + /* Create the context which will be passed to the input filter. */ + ctx = apr_palloc(r->pool, sizeof *ctx); + ctx->bb = apr_brigade_create(r->pool, c->bucket_alloc); + + /* ... and a temporary brigade. */ + tempb = apr_brigade_create(r->pool, c->bucket_alloc); + + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "filling buffer"); + + do { + apr_status_t rv; + apr_bucket *e, *next; + + /* The request body is read from the protocol-level input + * filters; the buffering filter will reinject it from that + * level, allowing content/resource filters to run later, if + * necessary. */ + + rv = ap_get_brigade(r->proto_input_filters, tempb, AP_MODE_READBYTES, + APR_BLOCK_READ, 8192); + if (rv) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + "could not read request body for SSL buffer"); + return HTTP_INTERNAL_SERVER_ERROR; + } + + /* Iterate through the returned brigade: setaside each bucket + * into the context's pool and move it into the brigade. */ + for (e = APR_BRIGADE_FIRST(tempb); + e != APR_BRIGADE_SENTINEL(tempb) && !eos; e = next) { + const char *data; + apr_size_t len; + + next = APR_BUCKET_NEXT(e); + + if (APR_BUCKET_IS_EOS(e)) { + eos = 1; + } else if (!APR_BUCKET_IS_METADATA(e)) { + rv = apr_bucket_read(e, &data, &len, APR_BLOCK_READ); + if (rv != APR_SUCCESS) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + "could not read bucket for SSL buffer"); + return HTTP_INTERNAL_SERVER_ERROR; + } + total += len; + } + + rv = apr_bucket_setaside(e, r->pool); + if (rv != APR_SUCCESS) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, + "could not setaside bucket for SSL buffer"); + return HTTP_INTERNAL_SERVER_ERROR; + } + + APR_BUCKET_REMOVE(e); + APR_BRIGADE_INSERT_TAIL(ctx->bb, e); + } + + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, + "total of %" APR_OFF_T_FMT " bytes in buffer, eos=%d", + total, eos); + + /* Fail if this exceeds the maximum buffer size. */ + if (total > SSL_MAX_IO_BUFFER) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + "request body exceeds maximum size for SSL buffer"); + return HTTP_REQUEST_ENTITY_TOO_LARGE; + } + + } while (!eos); + + apr_brigade_destroy(tempb); + + /* Insert the filter which will supply the buffered data. */ + ap_add_input_filter(ssl_io_buffer, ctx, r, c); + + return 0; +} + +/* This input filter supplies the buffered request body to the caller + * from the brigade stored in f->ctx. */ +static apr_status_t ssl_io_filter_buffer(ap_filter_t *f, + apr_bucket_brigade *bb, + ap_input_mode_t mode, + apr_read_type_e block, + apr_off_t bytes) +{ + struct modssl_buffer_ctx *ctx = f->ctx; + apr_status_t rv; + + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r, + "read from buffered SSL brigade, mode %d, " + "%" APR_OFF_T_FMT " bytes", + mode, bytes); + + if (mode != AP_MODE_READBYTES && mode != AP_MODE_GETLINE) { + return APR_ENOTIMPL; + } + + if (mode == AP_MODE_READBYTES) { + apr_bucket *e; + + /* Partition the buffered brigade. */ + rv = apr_brigade_partition(ctx->bb, bytes, &e); + if (rv && rv != APR_INCOMPLETE) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, + "could not partition buffered SSL brigade"); + ap_remove_input_filter(f); + return rv; + } + + /* If the buffered brigade contains less then the requested + * length, just pass it all back. */ + if (rv == APR_INCOMPLETE) { + APR_BRIGADE_CONCAT(bb, ctx->bb); + } else { + apr_bucket *d = APR_BRIGADE_FIRST(ctx->bb); + + e = APR_BUCKET_PREV(e); + + /* Unsplice the partitioned segment and move it into the + * passed-in brigade; no convenient way to do this with + * the APR_BRIGADE_* macros. */ + APR_RING_UNSPLICE(d, e, link); + APR_RING_SPLICE_HEAD(&bb->list, d, e, apr_bucket, link); + } + } + else { + /* Split a line into the passed-in brigade. */ + rv = apr_brigade_split_line(bb, ctx->bb, mode, bytes); + + if (rv) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, f->r, + "could not split line from buffered SSL brigade"); + ap_remove_input_filter(f); + return rv; + } + } + + if (APR_BRIGADE_EMPTY(ctx->bb)) { + apr_bucket *e = APR_BRIGADE_LAST(bb); + + /* Ensure that the brigade is terminated by an EOS if the + * buffered request body has been entirely consumed. */ + if (e == APR_BRIGADE_SENTINEL(bb) || !APR_BUCKET_IS_EOS(e)) { + e = apr_bucket_eos_create(f->c->bucket_alloc); + APR_BRIGADE_INSERT_TAIL(bb, e); + } + + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, f->r, + "buffered SSL brigade now exhausted; removing filter"); + ap_remove_input_filter(f); + } + + return APR_SUCCESS; +} + static void ssl_io_input_add_filter(ssl_filter_ctx_t *filter_ctx, conn_rec *c, SSL *ssl) { @@ -1433,6 +1608,9 @@ { ap_register_input_filter (ssl_io_filter, ssl_io_filter_input, NULL, AP_FTYPE_CONNECTION + 5); ap_register_output_filter (ssl_io_filter, ssl_io_filter_output, NULL, AP_FTYPE_CONNECTION + 5); + + ap_register_input_filter (ssl_io_buffer, ssl_io_filter_buffer, NULL, AP_FTYPE_PROTOCOL - 1); + return; } --- httpd-2.0.54/modules/ssl/ssl_engine_kernel.c.sslreneg +++ httpd-2.0.54/modules/ssl/ssl_engine_kernel.c @@ -480,73 +480,35 @@ } #endif /* HAVE_SSL_SET_CERT_STORE */ - /* - * SSL renegotiations in conjunction with HTTP - * requests using the POST method are not supported. - * - * Background: - * - * 1. When the client sends a HTTP/HTTPS request, Apache's core code - * reads only the request line ("METHOD /path HTTP/x.y") and the - * attached MIME headers ("Foo: bar") up to the terminating line ("CR - * LF"). An attached request body (for instance the data of a POST - * method) is _NOT_ read. Instead it is read by mod_cgi's content - * handler and directly passed to the CGI script. - * - * 2. mod_ssl supports per-directory re-configuration of SSL parameters. - * This is implemented by performing an SSL renegotiation of the - * re-configured parameters after the request is read, but before the - * response is sent. In more detail: the renegotiation happens after the - * request line and MIME headers were read, but _before_ the attached - * request body is read. The reason simply is that in the HTTP protocol - * usually there is no acknowledgment step between the headers and the - * body (there is the 100-continue feature and the chunking facility - * only), so Apache has no API hook for this step. - * - * 3. the problem now occurs when the client sends a POST request for - * URL /foo via HTTPS the server and the server has SSL parameters - * re-configured on a per-URL basis for /foo. Then mod_ssl has to - * perform an SSL renegotiation after the request was read and before - * the response is sent. But the problem is the pending POST body data - * in the receive buffer of SSL (which Apache still has not read - it's - * pending until mod_cgi sucks it in). When mod_ssl now tries to perform - * the renegotiation the pending data leads to an I/O error. - * - * Solution Idea: - * - * There are only two solutions: Either to simply state that POST - * requests to URLs with SSL re-configurations are not allowed, or to - * renegotiate really after the _complete_ request (i.e. including - * the POST body) was read. Obviously the latter would be preferred, - * but it cannot be done easily inside Apache, because as already - * mentioned, there is no API step between the body reading and the body - * processing. And even when we mod_ssl would hook directly into the - * loop of mod_cgi, we wouldn't solve the problem for other handlers, of - * course. So the only general solution is to suck in the pending data - * of the request body from the OpenSSL BIO into the Apache BUFF. Then - * the renegotiation can be done and after this step Apache can proceed - * processing the request as before. - * - * Solution Implementation: - * - * We cannot simply suck in the data via an SSL_read-based loop because of - * HTTP chunking. Instead we _have_ to use the Apache API for this step which - * is aware of HTTP chunking. So the trick is to suck in the pending request - * data via the Apache API (which uses Apache's BUFF code and in the - * background mod_ssl's I/O glue code) and re-inject it later into the Apache - * BUFF code again. This way the data flows twice through the Apache BUFF, of - * course. But this way the solution doesn't depend on any Apache specifics - * and is fully transparent to Apache modules. - * - * !! BUT ALL THIS IS STILL NOT RE-IMPLEMENTED FOR APACHE 2.0 !! - */ - if (renegotiate && !renegotiate_quick && (r->method_number == M_POST)) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server, - "SSL Re-negotiation in conjunction " - "with POST method not supported! " - "hint: try SSLOptions +OptRenegotiate"); - - return HTTP_METHOD_NOT_ALLOWED; + /* If a renegotiation is now required for this location, and the + * request includes a message body (and the client has not + * requested a "100 Continue" response), then the client will be + * streaming the request body over the wire already. In that + * case, it is not possible to stop and perform a new SSL + * handshake immediately; once the SSL library moves to the + * "accept" state, it will reject the SSL packets which the client + * is sending for the request body. + * + * To allow authentication to complete in this auth hook, the + * solution used here is to fill a (bounded) buffer with the + * request body, and then to reinject that request body later. + */ + if (renegotiate && !renegotiate_quick + && (apr_table_get(r->headers_in, "transfer-encoding") + || (apr_table_get(r->headers_in, "content-length") + && strcmp(apr_table_get(r->headers_in, "content-length"), "0"))) + && !r->expecting_100) { + int rv; + + /* Fill the I/O buffer with the request body if possible. */ + rv = ssl_io_buffer_fill(r); + + if (rv) { + ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, + "could not buffer message body to allow " + "SSL renegotiation to proceed"); + return rv; + } } /* --- httpd-2.0.54/modules/ssl/ssl_private.h.sslreneg +++ httpd-2.0.54/modules/ssl/ssl_private.h @@ -708,6 +708,10 @@ void ssl_io_filter_register(apr_pool_t *); long ssl_io_data_cb(BIO *, int, MODSSL_BIO_CB_ARG_TYPE *, int, long, long); +/* ssl_io_buffer_fill fills the setaside buffering of the HTTP request + * to allow an SSL renegotiation to take place. */ +int ssl_io_buffer_fill(request_rec *r); + /* PRNG */ int ssl_rand_seed(server_rec *, apr_pool_t *, ssl_rsctx_t, char *); Index: httpd.spec =================================================================== RCS file: /cvs/dist/rpms/httpd/FC-4/httpd.spec,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- httpd.spec 2 Sep 2005 15:50:53 -0000 1.72 +++ httpd.spec 17 Jan 2006 11:32:24 -0000 1.73 @@ -7,7 +7,7 @@ Summary: Apache HTTP Server Name: httpd Version: 2.0.54 -Release: 10.2 +Release: 10.3 URL: http://httpd.apache.org/ Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz Source1: index.html @@ -74,11 +74,15 @@ Patch90: httpd-2.0.49-workerstack.patch Patch91: httpd-2.0.46-testhook.patch Patch92: httpd-2.0.46-dumpcerts.patch +Patch93: httpd-2.0.54-sslreneg.patch # Security fixes Patch110: httpd-2.0.52-CAN-2005-1268.patch Patch111: httpd-2.0.52-CAN-2005-2088.patch Patch112: httpd-2.0.52-CAN-2005-2700.patch Patch113: httpd-2.0.52-CAN-2005-2728.patch +Patch114: httpd-2.0.52-CVE-2005-2970.patch +Patch115: httpd-2.0.52-CVE-2005-3352.patch +Patch116: httpd-2.0.52-CVE-2005-3357.patch License: Apache Software License Group: System Environment/Daemons BuildRoot: %{_tmppath}/%{name}-root @@ -191,11 +195,15 @@ %patch90 -p1 -b .workerstack %patch91 -p1 -b .testhook %patch92 -p1 -b .dumpcerts +%patch93 -p1 -b .sslreneg %patch110 -p1 -b .can1268 %patch111 -p1 -b .can2088 %patch112 -p1 -b .can2700 %patch113 -p1 -b .can2728 +%patch114 -p1 -b .cve2970 +%patch115 -p1 -b .cve3352 +%patch116 -p1 -b .cve3357 # Patch in vendor/release string sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1 @@ -566,6 +574,13 @@ %{_libdir}/httpd/build/libtool %changelog +* Tue Jan 17 2006 Joe Orton 2.0.54-10.3 +- mod_ssl: add security fix for HTTP-on-SSL-port handling (CVE-2005-3357) +- mod_imap: add security fix for XSS issue (CVE-2005-3352) +- worker MPM: add security fix for memory consumption DoS (CVE-2005-2970), + and bug fixes for handling resource allocation failures (#171759) +- mod_ssl: buffer request bodies for per-location renegotiation (upstream #12355) + * Fri Sep 2 2005 Joe Orton 2.0.54-10.2 - mod_ssl: add security fix for SSLVerifyClient (#167196, CVE CAN-2005-2700) - add security fix for byterange filter DoS (#167104, CVE CAN-2005-2728) From fedora-cvs-commits at redhat.com Tue Jan 17 11:44:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 06:44:25 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec, 1.607, 1.608 sources, 1.149, 1.150 Message-ID: <200601171144.k0HBiPCV008505@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8475 Modified Files: openoffice.org.spec sources Log Message: add serbian language pack Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.607 retrieving revision 1.608 diff -u -r1.607 -r1.608 --- openoffice.org.spec 16 Jan 2006 09:44:39 -0000 1.607 +++ openoffice.org.spec 17 Jan 2006 11:44:22 -0000 1.608 @@ -1,6 +1,6 @@ %define oootag OOA680 %define ooomilestone 1 -%define rh_rpm_release 6 +%define rh_rpm_release 7 %define build_fc5 1 %define build_fc4 0 @@ -22,7 +22,7 @@ %define cripplemenus 1 %define seperatebase 1 %define gnomeprintui 0 -%define galangpack 1 +%define fc5langpack 1 %endif %if %{build_fc4} %define usegcc3 0 @@ -35,7 +35,7 @@ %define cripplemenus 0 %define seperatebase 0 %define gnomeprintui 0 -%define galangpack 0 +%define fc5langpack 0 %endif %if %{build_fc5} %define usegcc3 0 @@ -48,7 +48,7 @@ %define cripplemenus 1 %define seperatebase 1 %define gnomeprintui 1 -%define galangpack 1 +%define fc5langpack 1 %endif %if %{usegcc3} @@ -105,8 +105,8 @@ %if %{langpacks} %define langpack_core af ar bg bn ca cs cy da de el en-US es et eu fi fr gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn pl pt pt-BR ru sk sl sv ta-IN th tr zh-CN zh-TW zu -%if %{galangpack} -%define langpack_langs %{langpack_core} ga +%if %{fc5langpack} +%define langpack_langs %{langpack_core} ga sr-CS %else %define langpack_langs %{langpack_core} %endif @@ -522,7 +522,7 @@ %description langpack-fr Provides additional french translations for %{name} -%if %{galangpack} +%if %{fc5langpack} %package langpack-ga_IE Summary: Irish language pack for %{name} Group: Applications/Productivity @@ -744,6 +744,16 @@ %description langpack-sl_SI Provides additional slovenian translations for %{name} +%if %{fc5langpack} +%package langpack-sr_CS +Summary: Serbian language pack for %{name} +Group: Applications/Productivity +Requires: %{name}-core = %{epoch}:%{version}-%{release} + +%description langpack-sr_CS +Provides additional serbian translations for %{name} +%endif + %package langpack-sv Summary: Swedish language pack for %{name} Group: Applications/Productivity @@ -1548,7 +1558,7 @@ %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-fr.xcu -%if %{galangpack} +%if %{fc5langpack} %files langpack-ga_IE %defattr(-,root,root) %dir %{instdir} @@ -2052,6 +2062,28 @@ %dir %{instdir}/share/registry/modules/org/openoffice/Setup %{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sl.xcu +%if %{fc5langpack} +%files langpack-sr_CS +%defattr(-,root,root) +%dir %{instdir} +%dir %{instdir}/help +%{instdir}/help/sr +%{instdir}/program/resource/*680sr.res +%dir %{instdir}/share +%{instdir}/share/readme/LICENSE_sr* +%{instdir}/share/readme/README_sr* +%dir %{instdir}/share/registry +%dir %{instdir}/share/registry/res +%{instdir}/share/registry/res/sr +%dir %{instdir}/share/template +%{instdir}/share/template/sr +%dir %{instdir}/share/registry/modules +%dir %{instdir}/share/registry/modules/org +%dir %{instdir}/share/registry/modules/org/openoffice +%dir %{instdir}/share/registry/modules/org/openoffice/Setup +%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sr.xcu +%endif + %files langpack-sv %defattr(-,root,root) %dir %{instdir} @@ -2843,7 +2875,7 @@ %{_datadir}/icons %dir %{_datadir}/mime-info %{_datadir}/mime-info/* -%if ! %{galangpack} +%if ! %{fc5langpack} %{instdir}/share/dict/ooo/*ga_IE* %endif %if %{internalxmlsec} @@ -3342,6 +3374,10 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Tue Jan 17 2006 Caolan McNamara - 1:2.0.1.1-7 +- rh#177933# add Serbian sr_CS language pack +- rh#178002# af_ZA dictionary in wrong encoding + * Fri Jan 13 2006 Caolan McNamara - 1:2.0.1.1-6 - rh#177669# icons s/test -f/test -d/ :-) Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- sources 13 Jan 2006 16:21:40 -0000 1.149 +++ sources 17 Jan 2006 11:44:22 -0000 1.150 @@ -1,9 +1,9 @@ a66c6ab52b2eb2deaa7ff85595276b15 GSI_ta-IN.sdf a4a22f6b80a4f02c01bbe0400e131e57 RegisterAndLicence.xcu 66ee360bd11d33b0ba2283922d853706 opens___.ttf -2cd37ed5f2ac9fa129f6aaaa3491988f openoffice.org-myspell-contrib.tar.gz 33abf0fa04f7ec90b49ba4a8072713b6 GSI_ga.sdf b96362d6fe9451cffc21da249038a007 openoffice.org-simple-crash_report.sh 1825a3b182fd46e08075a42257cfc6aa gcj-sed.sh 16cb79cb018c6311e9797e85bd2461b2 evolocal.odb 374c6a2d4d846acf171d0fd212d4d7af OOA680_m1.tar.bz2 +9296ac8fa8e4f85cfdacfdaeeac6547f openoffice.org-myspell-contrib.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 17 11:56:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 06:56:16 -0500 Subject: rpms/cups/devel cups-autodetected-tag.patch, NONE, 1.1 cups.spec, 1.129, 1.130 Message-ID: <200601171156.k0HBuGP2025166@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25132 Modified Files: cups.spec Added Files: cups-autodetected-tag.patch Log Message: * Tue Jan 17 2006 Tim Waugh 1:1.1.23-30 - Include 'Autodetected' tag for better integration with autodetection tools. cups-autodetected-tag.patch: printers.c | 11 +++++++++++ printers.h | 1 + 2 files changed, 12 insertions(+) --- NEW FILE cups-autodetected-tag.patch --- --- cups-1.1.23/scheduler/printers.c.autodetected-tag 2006-01-17 11:37:52.000000000 +0000 +++ cups-1.1.23/scheduler/printers.c 2006-01-17 11:45:18.000000000 +0000 @@ -1004,6 +1004,13 @@ p->page_limit = atoi(value); else if (strcmp(name, "KLimit") == 0) p->k_limit = atoi(value); + else if (strcmp(name, "Autodetected") == 0) + { + if (strcasecmp(value, "yes") == 0) + p->autodetected = 1; + else + p->autodetected = 0; + } else { /* @@ -1127,6 +1134,10 @@ cupsFilePrintf(fp, "QuotaPeriod %d\n", printer->quota_period); cupsFilePrintf(fp, "PageLimit %d\n", printer->page_limit); cupsFilePrintf(fp, "KLimit %d\n", printer->k_limit); + if (printer->autodetected) + cupsFilePrintf(fp, "Autodetected Yes\n"); + else + cupsFilePrintf(fp, "Autodetected No\n"); for (i = 0; i < printer->num_users; i ++) cupsFilePrintf(fp, "%sUser %s\n", printer->deny_users ? "Deny" : "Allow", --- cups-1.1.23/scheduler/printers.h.autodetected-tag 2006-01-17 11:45:47.000000000 +0000 +++ cups-1.1.23/scheduler/printers.h 2006-01-17 11:54:28.000000000 +0000 @@ -76,6 +76,7 @@ int num_history; /* Number of history collections */ ipp_t **history; /* History data */ int sequence_number; /* Increasing sequence number */ + int autodetected; /* Autodetected marker */ } printer_t; Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- cups.spec 10 Jan 2006 17:54:41 -0000 1.129 +++ cups.spec 17 Jan 2006 11:56:14 -0000 1.130 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.23 -Release: 29 +Release: 30 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2 @@ -43,6 +43,7 @@ Patch20: cups-gcc4.patch Patch21: cups-slow.patch Patch22: cups-dest-cache-v2.patch +Patch23: cups-autodetected-tag.patch Patch24: cups-maxlogsize.patch Patch25: cups-enabledisable.patch Patch28: cups-no-propagate-ipp-port.patch @@ -150,6 +151,7 @@ %patch20 -p1 -b .gcc4 %patch21 -p1 -b .slow %patch22 -p1 -b .dest-cache-v2 +%patch23 -p1 -b .autodetected-tag %patch24 -p1 -b .maxlogsize %patch25 -p1 -b .enabledisable %patch28 -p1 -b .no-propagate-ipp-port @@ -431,6 +433,9 @@ %{_libdir}/cups/daemon/cups-lpd %changelog +* Tue Jan 17 2006 Tim Waugh 1:1.1.23-30 +- Include 'Autodetected' tag for better integration with autodetection tools. + * Tue Jan 10 2006 Tim Waugh 1:1.1.23-29 - Apply dest-cache-v2 patch (bug #175847). From fedora-cvs-commits at redhat.com Tue Jan 17 12:01:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 07:01:24 -0500 Subject: rpms/net-tools/devel net-tools-1.60-config.make, 1.2, 1.3 net-tools.spec, 1.52, 1.53 Message-ID: <200601171201.k0HC1OUQ026994@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26956 Modified Files: net-tools-1.60-config.make net-tools.spec Log Message: - forget to enable the new selinux option :( - config.make changed Index: net-tools-1.60-config.make =================================================================== RCS file: /cvs/dist/rpms/net-tools/devel/net-tools-1.60-config.make,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- net-tools-1.60-config.make 9 Feb 2005 09:09:57 -0000 1.2 +++ net-tools-1.60-config.make 17 Jan 2006 12:01:20 -0000 1.3 @@ -34,3 +34,4 @@ HAVE_FW_MASQUERADE=1 HAVE_IP_TOOLS=1 HAVE_MII=1 +HAVE_SELINUX=1 Index: net-tools.spec =================================================================== RCS file: /cvs/dist/rpms/net-tools/devel/net-tools.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- net-tools.spec 17 Jan 2006 10:27:02 -0000 1.52 +++ net-tools.spec 17 Jan 2006 12:01:20 -0000 1.53 @@ -3,7 +3,7 @@ Summary: Basic networking tools. Name: net-tools Version: 1.60 -Release: 59 +Release: 60 License: GPL Group: System Environment/Base Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2 @@ -223,6 +223,9 @@ %{_sysconfdir}/rc.d/init.d/netplugd %changelog +* Tue Jan 17 2006 Radek Vokal 1.60-60 +- forget to enable the new selinux option :( - config.make changed + * Tue Jan 17 2006 Radek Vokal 1.60-59 - new option for nestat, -Z shows selinux context. Patch by From fedora-cvs-commits at redhat.com Tue Jan 17 12:14:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 07:14:16 -0500 Subject: rpms/tetex/devel tetex-3.0-CVE-2005-3193.patch, 1.3, 1.4 tetex.spec, 1.79, 1.80 Message-ID: <200601171214.k0HCEGuH030063@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/tetex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29958 Modified Files: tetex-3.0-CVE-2005-3193.patch tetex.spec Log Message: * Tue Jan 17 2006 Jindrich Novy 3.0-15 - apply the latest patch to fix new xpdf flaws found since the latest update, thanks to Ludwig Nussel and others (#177912) tetex-3.0-CVE-2005-3193.patch: goo/gmem.c | 22 ++++++++++++++++++++++ goo/gmem.h | 9 +++++++++ xpdf/JPXStream.cc | 11 ++++++++--- xpdf/Stream.cc | 33 ++++++++++++++++++++++++++++++++- xpdf/Stream.h | 3 +++ 5 files changed, 74 insertions(+), 4 deletions(-) Index: tetex-3.0-CVE-2005-3193.patch =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/tetex-3.0-CVE-2005-3193.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tetex-3.0-CVE-2005-3193.patch 11 Jan 2006 14:41:32 -0000 1.3 +++ tetex-3.0-CVE-2005-3193.patch 17 Jan 2006 12:14:12 -0000 1.4 @@ -1,14 +1,55 @@ ---- tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 -+++ tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc 2006-01-09 15:15:27.000000000 +0100 -@@ -7,6 +7,7 @@ - //======================================================================== - - #include -+#include +--- tetex-src-3.0/libs/xpdf/goo/gmem.c.CVE-2005-3193 2004-01-22 02:26:44.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/goo/gmem.c 2006-01-16 15:41:04.000000000 +0100 +@@ -135,6 +135,28 @@ void *grealloc(void *p, int size) { + #endif + } - #ifdef USE_GCC_PRAGMAS - #pragma implementation -@@ -666,7 +667,7 @@ GBool JPXStream::readCodestream(Guint le ++void *gmallocn(int nObjs, int objSize) { ++ int n; ++ ++ n = nObjs * objSize; ++ if (objSize == 0 || n / objSize != nObjs) { ++ fprintf(stderr, "Bogus memory allocation size\n"); ++ exit(1); ++ } ++ return gmalloc(n); ++} ++ ++void *greallocn(void *p, int nObjs, int objSize) { ++ int n; ++ ++ n = nObjs * objSize; ++ if (objSize == 0 || n / objSize != nObjs) { ++ fprintf(stderr, "Bogus memory allocation size\n"); ++ exit(1); ++ } ++ return grealloc(p, n); ++} ++ + void gfree(void *p) { + #ifdef DEBUG_MEM + int size; +--- tetex-src-3.0/libs/xpdf/goo/gmem.h.CVE-2005-3193 2004-01-22 02:26:44.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/goo/gmem.h 2006-01-16 15:41:04.000000000 +0100 +@@ -28,6 +28,15 @@ extern void *gmalloc(int size); + extern void *grealloc(void *p, int size); + + /* ++ * These are similar to gmalloc and grealloc, but take an object count ++ * and size. The result is similar to allocating nObjs * objSize ++ * bytes, but there is an additional error check that the total size ++ * doesn't overflow an int. ++ */ ++extern void *gmallocn(int nObjs, int objSize); ++extern void *greallocn(void *p, int nObjs, int objSize); ++ ++/* + * Same as free, but checks for and ignores NULL pointers. + */ + extern void gfree(void *p); +--- tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/JPXStream.cc 2006-01-16 15:41:04.000000000 +0100 +@@ -666,7 +666,7 @@ GBool JPXStream::readCodestream(Guint le int segType; GBool haveSIZ, haveCOD, haveQCD, haveSOT; Guint precinctSize, style; @@ -17,30 +58,24 @@ //----- main header haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; -@@ -701,8 +702,19 @@ GBool JPXStream::readCodestream(Guint le +@@ -701,8 +701,13 @@ GBool JPXStream::readCodestream(Guint le / img.xTileSize; img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) / img.yTileSize; - img.tiles = (JPXTile *)gmalloc(img.nXTiles * img.nYTiles * - sizeof(JPXTile)); -+ // check for overflow before allocating memory -+ if (img.nXTiles <= 0 || img.nYTiles <= 0 || -+ img.nXTiles >= INT_MAX/img.nYTiles) { -+ error(getPos(), "Bad tile count in JPX SIZ marker segment"); -+ return gFalse; -+ } + nTiles = img.nXTiles * img.nYTiles; -+ if (nTiles >= INT_MAX/sizeof(JPXTile)) { ++ // check for overflow before allocating memory ++ if (nTiles == 0 || nTiles / img.nXTiles != img.nYTiles) { + error(getPos(), "Bad tile count in JPX SIZ marker segment"); + return gFalse; + } -+ img.tiles = (JPXTile *)gmalloc(nTiles * sizeof(JPXTile)); -+ ++ img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile)); for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { img.tiles[i].tileComps = (JPXTileComp *)gmalloc(img.nComps * sizeof(JPXTileComp)); --- tetex-src-3.0/libs/xpdf/xpdf/Stream.h.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 -+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.h 2006-01-09 15:15:27.000000000 +0100 ++++ tetex-src-3.0/libs/xpdf/xpdf/Stream.h 2006-01-16 15:41:04.000000000 +0100 @@ -233,6 +233,8 @@ public: ~StreamPredictor(); @@ -59,33 +94,31 @@ //------------------------------------------------------------------------ --- tetex-src-3.0/libs/xpdf/xpdf/Stream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 -+++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc 2006-01-09 15:15:27.000000000 +0100 -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #ifndef WIN32 - #include - #endif -@@ -412,13 +413,28 @@ StreamPredictor::StreamPredictor(Stream ++++ tetex-src-3.0/libs/xpdf/xpdf/Stream.cc 2006-01-16 15:41:04.000000000 +0100 +@@ -407,18 +407,33 @@ void ImageStream::skipLine() { + + StreamPredictor::StreamPredictor(Stream *strA, int predictorA, + int widthA, int nCompsA, int nBitsA) { ++ int totalBits; ++ + str = strA; + predictor = predictorA; width = widthA; nComps = nCompsA; nBits = nBitsA; + predLine = NULL; + ok = gFalse; -+ if (width <= 0 || nComps <= 0 || nBits <= 0 || -+ nComps >= INT_MAX/nBits || -+ width >= INT_MAX/nComps/nBits) { -+ return; -+ } nVals = width * nComps; -+ if (nVals * nBits + 7 <= 0) { ++ totalBits = nVals * nBits; ++ if (totalBits == 0 || ++ (totalBits / nBits) / nComps != width || ++ totalBits + 7 < 0) { + return; + } pixBytes = (nComps * nBits + 7) >> 3; - rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; +- rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; ++ rowBytes = ((totalBits + 7) >> 3) + pixBytes; + if (rowBytes < 0) { + return; + } @@ -97,7 +130,7 @@ } StreamPredictor::~StreamPredictor() { -@@ -1012,6 +1028,10 @@ LZWStream::LZWStream(Stream *strA, int p +@@ -1012,6 +1027,10 @@ LZWStream::LZWStream(Stream *strA, int p FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); @@ -108,81 +141,22 @@ } else { pred = NULL; } -@@ -1260,6 +1280,10 @@ CCITTFaxStream::CCITTFaxStream(Stream *s - endOfLine = endOfLineA; - byteAlign = byteAlignA; - columns = columnsA; -+ if (columns < 1 || columns >= INT_MAX / sizeof(short)) { -+ error(-1, "invalid number of columns: %d", columns); -+ exit(1); -+ } - rows = rowsA; - endOfBlock = endOfBlockA; - black = blackA; -@@ -2897,6 +2921,11 @@ GBool DCTStream::readBaselineSOF() { +@@ -2897,6 +2916,14 @@ GBool DCTStream::readBaselineSOF() { height = read16(); width = read16(); numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { -+ numComps = 0; -+ error(getPos(), "Bad number of components in DCT stream"); ++ error(getPos(), "Bad number of components in DCT stream", prec); + return gFalse; + } - if (prec != 8) { - error(getPos(), "Bad DCT precision %d", prec); - return gFalse; -@@ -2923,6 +2952,11 @@ GBool DCTStream::readProgressiveSOF() { - height = read16(); - width = read16(); - numComps = str->getChar(); + if (numComps <= 0 || numComps > 4) { -+ numComps = 0; -+ error(getPos(), "Bad number of components in DCT stream"); ++ error(getPos(), "Bad number of components in DCT stream", prec); + return gFalse; + } if (prec != 8) { error(getPos(), "Bad DCT precision %d", prec); return gFalse; -@@ -2945,6 +2979,11 @@ GBool DCTStream::readScanInfo() { - - length = read16() - 2; - scanInfo.numComps = str->getChar(); -+ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { -+ scanInfo.numComps = 0; -+ error(getPos(), "Bad number of components in DCT stream"); -+ return gFalse; -+ } - --length; - if (length != 2 * scanInfo.numComps + 3) { - error(getPos(), "Bad DCT scan info block"); -@@ -3019,12 +3058,12 @@ GBool DCTStream::readHuffmanTables() { - while (length > 0) { - index = str->getChar(); - --length; -- if ((index & 0x0f) >= 4) { -+ if ((index & ~0x10) >= 4 || (index & ~0x10) < 0) { - error(getPos(), "Bad DCT Huffman table"); - return gFalse; - } - if (index & 0x10) { -- index &= 0x0f; -+ index &= 0x03; - if (index >= numACHuffTables) - numACHuffTables = index+1; - tbl = &acHuffTables[index]; -@@ -3142,9 +3181,11 @@ int DCTStream::readMarker() { - do { - do { - c = str->getChar(); -+ if(c == EOF) return EOF; - } while (c != 0xff); - do { - c = str->getChar(); -+ if(c == EOF) return EOF; - } while (c == 0xff); - } while (c == 0x00); - return c; -@@ -3255,6 +3296,10 @@ FlateStream::FlateStream(Stream *strA, i +@@ -3255,6 +3282,10 @@ FlateStream::FlateStream(Stream *strA, i FilterStream(strA) { if (predictor != 1) { pred = new StreamPredictor(this, predictor, columns, colors, bits); @@ -193,95 +167,3 @@ } else { pred = NULL; } ---- tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc.CVE-2005-3193 2004-01-22 02:26:45.000000000 +0100 -+++ tetex-src-3.0/libs/xpdf/xpdf/JBIG2Stream.cc 2006-01-09 15:15:27.000000000 +0100 -@@ -7,6 +7,7 @@ - //======================================================================== - - #include -+#include - - #ifdef USE_GCC_PRAGMAS - #pragma implementation -@@ -681,7 +682,16 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, - w = wA; - h = hA; - line = (wA + 7) >> 3; -- data = (Guchar *)gmalloc(h * line); -+ -+ if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { -+ error(-1, "invalid width/height"); -+ data = NULL; -+ return; -+ } -+ -+ // need to allocate one extra guard byte for use in combine() -+ data = (Guchar *)gmalloc(h * line + 1); -+ data[h * line] = 0; - } - - JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, JBIG2Bitmap *bitmap): -@@ -690,8 +700,17 @@ JBIG2Bitmap::JBIG2Bitmap(Guint segNumA, - w = bitmap->w; - h = bitmap->h; - line = bitmap->line; -- data = (Guchar *)gmalloc(h * line); -+ -+ if (h < 0 || line <= 0 || h >= (INT_MAX - 1) / line) { -+ error(-1, "invalid width/height"); -+ data = NULL; -+ return; -+ } -+ -+ // need to allocate one extra guard byte for use in combine() -+ data = (Guchar *)gmalloc(h * line + 1); - memcpy(data, bitmap->data, h * line); -+ data[h * line] = 0; - } - - JBIG2Bitmap::~JBIG2Bitmap() { -@@ -716,10 +735,14 @@ JBIG2Bitmap *JBIG2Bitmap::getSlice(Guint - } - - void JBIG2Bitmap::expand(int newH, Guint pixel) { -- if (newH <= h) { -+ if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) { -+ error(-1, "invalid width/height"); -+ gfree(data); -+ data = NULL; - return; - } -- data = (Guchar *)grealloc(data, newH * line); -+ // need to allocate one extra guard byte for use in combine() -+ data = (Guchar *)grealloc(data, newH * line + 1); - if (pixel) { - memset(data + h * line, 0xff, (newH - h) * line); - } else { -@@ -2256,6 +2279,15 @@ void JBIG2Stream::readHalftoneRegionSeg( - error(getPos(), "Bad symbol dictionary reference in JBIG2 halftone segment"); - return; - } -+ if (gridH == 0 || gridW >= INT_MAX / gridH) { -+ error(getPos(), "Bad size in JBIG2 halftone segment"); -+ return; -+ } -+ if (w == 0 || h >= INT_MAX / w) { -+ error(getPos(), "Bad size in JBIG2 bitmap segment"); -+ return; -+ } -+ - patternDict = (JBIG2PatternDict *)seg; - bpp = 0; - i = 1; -@@ -2887,6 +2919,11 @@ JBIG2Bitmap *JBIG2Stream::readGenericRef - JBIG2BitmapPtr tpgrCXPtr0, tpgrCXPtr1, tpgrCXPtr2; - int x, y, pix; - -+ if (w < 0 || h <= 0 || w >= INT_MAX / h) { -+ error(-1, "invalid width/height"); -+ return NULL; -+ } -+ - bitmap = new JBIG2Bitmap(0, w, h); - bitmap->clearToZero(); - Index: tetex.spec =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- tetex.spec 11 Jan 2006 14:41:32 -0000 1.79 +++ tetex.spec 17 Jan 2006 12:14:12 -0000 1.80 @@ -11,7 +11,7 @@ Summary: The TeX text formatting system. Name: tetex Version: 3.0 -Release: 14 +Release: 15 License: distributable Group: Applications/Publishing Requires: tmpwatch, dialog, ed @@ -789,6 +789,10 @@ %defattr(-,root,root) %changelog +* Tue Jan 17 2006 Jindrich Novy 3.0-15 +- apply the latest patch to fix new xpdf flaws found since the latest + update, thanks to Ludwig Nussel and others (#177912) + * Mon Jan 11 2006 Jindrich Novy 3.0-14 - apply additional patch to fix xpdf flaws from Ludwig Nussel (CVE-2005-3191, CVE-2005-3192 and CVE-2005-3193) (#177128) From fedora-cvs-commits at redhat.com Tue Jan 17 12:51:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 07:51:59 -0500 Subject: rpms/cdrtools/devel cdrtools-2.01.01a03-nozero.patch, NONE, 1.1 cdrtools.spec, 1.37, 1.38 Message-ID: <200601171251.k0HCpxKb022994@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/cdrtools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22981 Modified Files: cdrtools.spec Added Files: cdrtools-2.01.01a03-nozero.patch Log Message: removed rezero_unit, so that non-root users can burn CDs cdrtools-2.01.01a03-nozero.patch: cdrecord.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE cdrtools-2.01.01a03-nozero.patch --- --- cdrtools-2.01.01/cdrecord/cdrecord.c.nozero 2006-01-17 13:26:45.000000000 +0100 +++ cdrtools-2.01.01/cdrecord/cdrecord.c 2006-01-17 13:37:56.000000000 +0100 @@ -4053,7 +4053,7 @@ scsi_start_stop_unit(scgp, 1, 0, immed); wait_unit_ready(scgp, 120); scgp->silent++; - rezero_unit(scgp); /* Is this needed? Not supported by some drvives */ + /*rezero_unit(scgp);*/ /* Is this needed? Not supported by some drvives */ scgp->silent--; test_unit_ready(scgp); scsi_start_stop_unit(scgp, 1, 0, immed); Index: cdrtools.spec =================================================================== RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- cdrtools.spec 9 Dec 2005 22:39:55 -0000 1.37 +++ cdrtools.spec 17 Jan 2006 12:51:56 -0000 1.38 @@ -1,7 +1,7 @@ Summary: A collection of CD/DVD utilities. Name: cdrtools Version: 2.01.01.0.a03 -Release: 1.1 +Release: 2 %define tarversion 2.01.01a03 License: GPL Group: Applications/System @@ -27,6 +27,7 @@ Patch30: cdrtools-2.01.01-O_EXCL.patch Patch31: mkisofs-padsize-123548.patch Patch33: cdrtools-2.01-dbg.patch +Patch34: cdrtools-2.01.01a03-nozero.patch Patch41: cdrtools-2.01.1-gcc4.patch BuildRequires: perl, groff @@ -111,6 +112,7 @@ %patch30 -p1 -b .excl %patch31 -p1 -b .padsize %patch33 -p1 -b .dbgsafe +%patch34 -p1 -b .nozero %patch41 -p1 -b .gcc4 # Turn off buggy CD_EXTRA code. @@ -227,6 +229,9 @@ %{_mandir}/man1/cdda2wav.1* %changelog +* Tue Jan 17 2005 Harald Hoyer 8:2.01.01.0.a03-2 +- removed rezero_unit, so that non-root users can burn CDs + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 17 13:13:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 08:13:25 -0500 Subject: rpms/libwpd/FC-4 .cvsignore, 1.9, 1.10 libwpd.spec, 1.14, 1.15 sources, 1.9, 1.10 Message-ID: <200601171313.k0HDDP8v003984@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/libwpd/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv3958 Modified Files: .cvsignore libwpd.spec sources Log Message: next version for abiword and OOo Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libwpd/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 28 Jun 2005 09:30:34 -0000 1.9 +++ .cvsignore 17 Jan 2006 13:13:21 -0000 1.10 @@ -2,3 +2,4 @@ libwpd-0.8.0.tar.gz libwpd-0.8.1.tar.gz libwpd-0.8.2.tar.gz +libwpd-0.8.4.tar.gz Index: libwpd.spec =================================================================== RCS file: /cvs/dist/rpms/libwpd/FC-4/libwpd.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libwpd.spec 28 Jun 2005 09:30:34 -0000 1.14 +++ libwpd.spec 17 Jan 2006 13:13:21 -0000 1.15 @@ -1,7 +1,7 @@ Name: libwpd Summary: Library for reading and converting WordPerfect(tm) documents. -Version: 0.8.2 -Release: 1.fc4 +Version: 0.8.4 +Release: 0 Source: %{name}-%{version}.tar.gz Group: System Environment/Libraries URL: http://libwpd.sf.net/ @@ -66,6 +66,9 @@ %{_includedir}/libwpd-0.8/libwpd %changelog +* Tue Jan 17 2006 Caolan McNamara 0.8.4-0 +- update to latest libwpd + * Tue Jun 28 2005 Caolan McNamara 0.8.2-1.fc4 - fix import that causes glitches on export Index: sources =================================================================== RCS file: /cvs/dist/rpms/libwpd/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 28 Jun 2005 09:30:34 -0000 1.9 +++ sources 17 Jan 2006 13:13:21 -0000 1.10 @@ -1 +1 @@ -264e955e19c7e961e22382db09e19597 libwpd-0.8.2.tar.gz +0461d4bf2da534b4bed041b67d7f7064 libwpd-0.8.4.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 17 13:24:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 08:24:33 -0500 Subject: rpms/foomatic/devel foomatic-default0.patch, NONE, 1.1 foomatic.spec, 1.126, 1.127 Message-ID: <200601171324.k0HDOXOc020190@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20139 Modified Files: foomatic.spec Added Files: foomatic-default0.patch Log Message: * Tue Jan 17 2006 Tim Waugh 3.0.2-32 - Handle PPDs with default option values of '0'. foomatic-default0.patch: DB.pm | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE foomatic-default0.patch --- --- foomatic-db-engine-3.0-20051209/lib/Foomatic/DB.pm.default0 2006-01-17 13:21:22.000000000 +0000 +++ foomatic-db-engine-3.0-20051209/lib/Foomatic/DB.pm 2006-01-17 13:22:17.000000000 +0000 @@ -1025,7 +1025,7 @@ $dat->{'args_byname'}{$currentargument}{'vals_byname'}{$setting}{'comment'} = $translation; # Make sure that this argument has a default setting, even # if none is defined in this PPD file - if (!$dat->{'args_byname'}{$currentargument}{'default'}) { + if ($dat->{'args_byname'}{$currentargument}{'default'} eq "") { $dat->{'args_byname'}{$currentargument}{'default'} = $setting; } } Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- foomatic.spec 16 Jan 2006 14:12:52 -0000 1.126 +++ foomatic.spec 17 Jan 2006 13:24:25 -0000 1.127 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 31 +Release: 32 License: GPL Group: System Environment/Libraries @@ -54,6 +54,9 @@ # Fix tag mismatch in db. Patch16: foomatic-badxml.patch +# Handle PPDs with default option values of '0'. +Patch17: foomatic-default0.patch + Url: http://www.linuxprinting.org BuildRequires: perl >= 3:5.8.1 BuildRequires: libxml2-devel @@ -105,6 +108,7 @@ %patch14 -p1 -b .ampathxml %patch10 -p1 -b .xml-cflags %patch15 -p1 +%patch17 -p1 -b .default0 ./make_configure popd @@ -267,6 +271,9 @@ %{_var}/cache/foomatic %changelog +* Tue Jan 17 2006 Tim Waugh 3.0.2-32 +- Handle PPDs with default option values of '0'. + * Mon Jan 16 2006 Tim Waugh 3.0.2-31 - Fix tag mismatch in db. - Updated db to 3.0-20060116. From fedora-cvs-commits at redhat.com Tue Jan 17 13:26:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 08:26:40 -0500 Subject: rpms/cdrtools/devel cdrtools.spec,1.38,1.39 Message-ID: <200601171326.k0HDQewx021085@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/cdrtools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21045 Modified Files: cdrtools.spec Log Message: Index: cdrtools.spec =================================================================== RCS file: /cvs/dist/rpms/cdrtools/devel/cdrtools.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- cdrtools.spec 17 Jan 2006 12:51:56 -0000 1.38 +++ cdrtools.spec 17 Jan 2006 13:26:37 -0000 1.39 @@ -229,7 +229,7 @@ %{_mandir}/man1/cdda2wav.1* %changelog -* Tue Jan 17 2005 Harald Hoyer 8:2.01.01.0.a03-2 +* Tue Jan 17 2006 Harald Hoyer 8:2.01.01.0.a03-2 - removed rezero_unit, so that non-root users can burn CDs * Fri Dec 09 2005 Jesse Keating From fedora-cvs-commits at redhat.com Tue Jan 17 13:36:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 08:36:15 -0500 Subject: rpms/cdrdao/devel cdrdao.spec,1.28,1.29 Message-ID: <200601171336.k0HDaF3K023888@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/cdrdao/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23868 Modified Files: cdrdao.spec Log Message: rebuild Index: cdrdao.spec =================================================================== RCS file: /cvs/dist/rpms/cdrdao/devel/cdrdao.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- cdrdao.spec 9 Dec 2005 22:39:53 -0000 1.28 +++ cdrdao.spec 17 Jan 2006 13:36:10 -0000 1.29 @@ -1,7 +1,7 @@ Summary: Writes audio CD-Rs in disk-at-once (DAO) mode. Name: cdrdao Version: 1.2.0 -Release: 1.1 +Release: 1.2 License: GPL Group: Applications/Multimedia URL: http://cdrdao.sourceforge.net/ @@ -54,6 +54,9 @@ %{_mandir}/*/* %changelog +* Tue Jan 17 2006 Harald Hoyer +- rebuilt + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 17 13:36:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 08:36:57 -0500 Subject: rpms/cdrdao/devel cdrdao.spec,1.29,1.30 Message-ID: <200601171336.k0HDavoM024104@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/cdrdao/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24073 Modified Files: cdrdao.spec Log Message: rebuild Index: cdrdao.spec =================================================================== RCS file: /cvs/dist/rpms/cdrdao/devel/cdrdao.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- cdrdao.spec 17 Jan 2006 13:36:10 -0000 1.29 +++ cdrdao.spec 17 Jan 2006 13:36:53 -0000 1.30 @@ -11,7 +11,7 @@ Patch1: cdrdao-1.2.0-compile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: cdrecord-devel >= 2.01.1-6 +BuildRequires: cdrecord-devel >= 8:2.01.01.0.a03-2 BuildRequires: libvorbis-devel >= 1.0 # Only exclude s390 From fedora-cvs-commits at redhat.com Tue Jan 17 13:40:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 08:40:46 -0500 Subject: rpms/tetex/devel tetex.spec,1.80,1.81 Message-ID: <200601171340.k0HDekZP025144@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/tetex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25090 Modified Files: tetex.spec Log Message: * Tue Jan 17 2006 Jindrich Novy - add missing libXaw-devel dependency Index: tetex.spec =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- tetex.spec 17 Jan 2006 12:14:12 -0000 1.80 +++ tetex.spec 17 Jan 2006 13:40:43 -0000 1.81 @@ -104,7 +104,7 @@ BuildPreReq: desktop-file-utils >= %{desktop_file_utils_version} BuildPreReq: autoconf213 BuildPreReq: libX11-devel libXpm-devel libXext-devel libSM-devel -BuildPreReq: libICE-devel libXt-devel +BuildPreReq: libICE-devel libXt-devel libXaw-devel PreReq: desktop-file-utils >= %{desktop_file_utils_version} BuildPreReq: ed @@ -789,6 +789,9 @@ %defattr(-,root,root) %changelog +* Tue Jan 17 2006 Jindrich Novy +- add missing libXaw-devel dependency + * Tue Jan 17 2006 Jindrich Novy 3.0-15 - apply the latest patch to fix new xpdf flaws found since the latest update, thanks to Ludwig Nussel and others (#177912) From fedora-cvs-commits at redhat.com Tue Jan 17 13:46:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 08:46:09 -0500 Subject: rpms/control-center/devel control-center-2.13.5-m4.patch, NONE, 1.1 control-center.spec, 1.110, 1.111 Message-ID: <200601171346.k0HDk9Za030839@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29829 Modified Files: control-center.spec Added Files: control-center-2.13.5-m4.patch Log Message: Fix configure error control-center-2.13.5-m4.patch: configure.in | 1 - 1 files changed, 1 deletion(-) --- NEW FILE control-center-2.13.5-m4.patch --- --- control-center-2.13.5/configure.in.m4 2006-01-17 08:44:25.000000000 -0500 +++ control-center-2.13.5/configure.in 2006-01-17 08:44:33.000000000 -0500 @@ -1,7 +1,6 @@ AC_INIT([control-center], [2.13.5], [http://bugzilla.gnome.org/enter_bug.cgi?product=control-center]) -AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([control-center]) AC_CONFIG_HEADERS([config.h]) Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- control-center.spec 17 Jan 2006 06:04:50 -0000 1.110 +++ control-center.spec 17 Jan 2006 13:46:05 -0000 1.111 @@ -33,6 +33,7 @@ Patch5: control-center-2.12.0-run-power-manager.patch Patch6: control-center-2.12.1-passwd.patch Patch7: control-center-2.13.3-gecos.patch +Patch8: control-center-2.13.5-m4.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.gnome.org @@ -96,6 +97,7 @@ %patch5 -p1 -b .run-power-manager %patch6 -p1 -b .passwd %patch7 -p1 -b .gecos +%patch8 -p1 -b .m4 %build From fedora-cvs-commits at redhat.com Tue Jan 17 13:50:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 08:50:51 -0500 Subject: rpms/foomatic/devel .cvsignore, 1.37, 1.38 foomatic-db-engine-libdir.patch, 1.2, 1.3 foomatic-ppdload.patch, 1.1, 1.2 foomatic.spec, 1.127, 1.128 sources, 1.37, 1.38 Message-ID: <200601171350.k0HDophM008565@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8530 Modified Files: .cvsignore foomatic-db-engine-libdir.patch foomatic-ppdload.patch foomatic.spec sources Log Message: * Tue Jan 17 2006 Tim Waugh 3.0.2-32 - Updated db-engine to 3.0-20060117. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 16 Jan 2006 14:12:52 -0000 1.37 +++ .cvsignore 17 Jan 2006 13:50:45 -0000 1.38 @@ -27,3 +27,4 @@ foomatic-db-engine-3.0-20051209.tar.gz foomatic-db-3.0-20060103.tar.gz foomatic-db-3.0-20060116.tar.gz +foomatic-db-engine-3.0-20060117.tar.gz foomatic-db-engine-libdir.patch: configure.ac | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) Index: foomatic-db-engine-libdir.patch =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic-db-engine-libdir.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- foomatic-db-engine-libdir.patch 9 Sep 2004 04:53:21 -0000 1.2 +++ foomatic-db-engine-libdir.patch 17 Jan 2006 13:50:45 -0000 1.3 @@ -1,5 +1,5 @@ ---- foomatic-db-engine-3.0-20031217/configure.in.libdir 2003-11-19 18:31:07.000000000 +0000 -+++ foomatic-db-engine-3.0-20031217/configure.in 2003-12-17 13:23:23.975555441 +0000 +--- foomatic-db-engine-3.0-20031217/configure.ac.libdir 2003-11-19 18:31:07.000000000 +0000 ++++ foomatic-db-engine-3.0-20031217/configure.ac 2003-12-17 13:23:23.975555441 +0000 @@ -43,8 +43,8 @@ SYSCONFSEARCHPATH=/etc:/usr/etc:/usr/local/etc:/var/etc SBINSEARCHPATH=/usr/sbin:/sbin:/usr/local/sbin:/etc/sbin foomatic-ppdload.patch: Makefile.in | 3 - configure.ac | 2 foomatic-ppdload.8.in | 47 +++++++++++++++++++ foomatic-ppdload.in | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 168 insertions(+), 2 deletions(-) Index: foomatic-ppdload.patch =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic-ppdload.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- foomatic-ppdload.patch 9 Sep 2004 04:53:21 -0000 1.1 +++ foomatic-ppdload.patch 17 Jan 2006 13:50:45 -0000 1.2 @@ -169,8 +169,8 @@ +There are several limitations, but it's an interesting experiment. + +Please send bug reports to foomatic-devel at linuxprinting.org. ---- foomatic-db-engine-3.0-20031217/configure.in.ppdload 2003-12-19 15:27:03.188905120 +0000 -+++ foomatic-db-engine-3.0-20031217/configure.in 2003-12-19 15:27:21.165766554 +0000 +--- foomatic-db-engine-3.0-20031217/configure.ac.ppdload 2003-12-19 15:27:03.188905120 +0000 ++++ foomatic-db-engine-3.0-20031217/configure.ac 2003-12-19 15:27:21.165766554 +0000 @@ -280,7 +280,7 @@ foomatic-configure foomatic-printjob foomatic-kitload foomatic-ppdfile foomatic-preferred-driver foomatic-cleanupdrivers Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- foomatic.spec 17 Jan 2006 13:24:25 -0000 1.127 +++ foomatic.spec 17 Jan 2006 13:50:45 -0000 1.128 @@ -1,5 +1,5 @@ %define dbver 20060116 -%define enginever 3.0-20051209 +%define enginever 3.0-20060117 %define filtersver 20051209 %define hpijsver 1.5-20051209 @@ -272,6 +272,7 @@ %changelog * Tue Jan 17 2006 Tim Waugh 3.0.2-32 +- Updated db-engine to 3.0-20060117. - Handle PPDs with default option values of '0'. * Mon Jan 16 2006 Tim Waugh 3.0.2-31 Index: sources =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 16 Jan 2006 14:12:52 -0000 1.37 +++ sources 17 Jan 2006 13:50:45 -0000 1.38 @@ -2,5 +2,5 @@ dcfbfbe16d76d0b6e44cb261fccd138f Omni-printers-0.9.2.tar.bz2 5876178c3aefd36102bc5eef575d3f9c foomatic-filters-3.0-20051209.tar.gz 8c217af8a570124d9ad7f8a4b1270ebe foomatic-db-hpijs-1.5-20051209.tar.gz -c0375c9e1d78685639e39abe24ffbdff foomatic-db-engine-3.0-20051209.tar.gz 54ae910edbb0ed3816cebe05a0f0b605 foomatic-db-3.0-20060116.tar.gz +d764bd043e47abc523ea9fbcd77659f1 foomatic-db-engine-3.0-20060117.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 17 13:54:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 08:54:38 -0500 Subject: rpms/control-center/devel control-center-2.13.5-fedora-apps.patch, 1.1, 1.2 Message-ID: <200601171354.k0HDscBY010092@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10021 Modified Files: control-center-2.13.5-fedora-apps.patch Log Message: Fix fedora apps patch control-center-2.13.5-fedora-apps.patch: gnome-default-applications.xml.in | 113 ++++++++------------------------------ 1 files changed, 25 insertions(+), 88 deletions(-) Index: control-center-2.13.5-fedora-apps.patch =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.13.5-fedora-apps.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- control-center-2.13.5-fedora-apps.patch 17 Jan 2006 06:04:50 -0000 1.1 +++ control-center-2.13.5-fedora-apps.patch 17 Jan 2006 13:54:36 -0000 1.2 @@ -1,5 +1,5 @@ ---- control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in.fedora-apps 2006-01-17 00:57:15.000000000 -0500 -+++ control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in 2006-01-17 01:03:16.000000000 -0500 +--- control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in.fedora-apps 2006-01-16 10:13:33.000000000 -0500 ++++ control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in 2006-01-17 08:54:07.000000000 -0500 @@ -10,7 +10,7 @@ opera opera %s @@ -51,17 +51,16 @@ <_name>Mozilla mozilla mozilla %s -@@ -91,8 +63,7 @@ - mozilla -remote "openurl(%s,new-tab)" +@@ -92,7 +64,7 @@ mozilla -remote "openurl(%s,new-window)" -- + - <_name>Netscape Communicator + <_name>Netscape netscape netscape %s netscape -@@ -137,48 +108,6 @@ +@@ -137,48 +109,6 @@ @@ -110,7 +109,7 @@ <_name>Evolution Mail Reader evolution evolution %s -@@ -200,27 +129,13 @@ +@@ -200,27 +130,13 @@ false @@ -139,7 +138,7 @@ <_name>Mutt mutt mutt %s -@@ -228,8 +143,15 @@ +@@ -228,8 +144,15 @@ true @@ -156,7 +155,7 @@ sylpheed-claws --compose %s sylpheed false -@@ -245,6 +167,20 @@ +@@ -245,6 +168,20 @@ -e From fedora-cvs-commits at redhat.com Tue Jan 17 13:57:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 08:57:49 -0500 Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.20, 1.21 gnome-icon-theme.spec, 1.28, 1.29 sources, 1.20, 1.21 Message-ID: <200601171357.k0HDvnLH011496@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-icon-theme/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11440 Modified Files: .cvsignore gnome-icon-theme.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 3 Jan 2006 19:08:47 -0000 1.20 +++ .cvsignore 17 Jan 2006 13:57:47 -0000 1.21 @@ -11,3 +11,4 @@ gnome-icon-theme-2.12.1.tar.bz2 gnome-icon-theme-2.13.2.tar.bz2 gnome-icon-theme-2.13.4.tar.bz2 +gnome-icon-theme-2.13.5.tar.bz2 Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gnome-icon-theme.spec 3 Jan 2006 19:08:47 -0000 1.28 +++ gnome-icon-theme.spec 17 Jan 2006 13:57:47 -0000 1.29 @@ -1,6 +1,6 @@ Summary: Base gnome icons Name: gnome-icon-theme -Version: 2.13.4 +Version: 2.13.5 Release: 1 Source0: %{name}-%{version}.tar.bz2 Source1: external-icons-2.10.1-2.tar.gz @@ -87,6 +87,9 @@ %{_datadir}/pkgconfig/gnome-icon-theme.pc %changelog +* Tue Jan 17 1006 Matthias Clasen 2.13.5-1 +- Update to 2.13.5 + * Tue Jan 03 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 3 Jan 2006 19:08:47 -0000 1.20 +++ sources 17 Jan 2006 13:57:47 -0000 1.21 @@ -1,2 +1,2 @@ e6c3328995f2ce73ee91d1a654198f3f external-icons-2.10.1-2.tar.gz -e47c9440f6a4de261834bbee0a5d051e gnome-icon-theme-2.13.4.tar.bz2 +d2d5ceb38d29e5edbb8a70585ff41e27 gnome-icon-theme-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 13:58:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 08:58:22 -0500 Subject: rpms/gnome-icon-theme/devel gnome-icon-theme.spec,1.29,1.30 Message-ID: <200601171358.k0HDwMKv011712@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-icon-theme/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11634 Modified Files: gnome-icon-theme.spec Log Message: 2.13.5 Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gnome-icon-theme.spec 17 Jan 2006 13:57:47 -0000 1.29 +++ gnome-icon-theme.spec 17 Jan 2006 13:58:18 -0000 1.30 @@ -87,7 +87,7 @@ %{_datadir}/pkgconfig/gnome-icon-theme.pc %changelog -* Tue Jan 17 1006 Matthias Clasen 2.13.5-1 +* Tue Jan 17 2006 Matthias Clasen 2.13.5-1 - Update to 2.13.5 * Tue Jan 03 2006 Matthias Clasen 2.13.4-1 From fedora-cvs-commits at redhat.com Tue Jan 17 14:08:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 09:08:53 -0500 Subject: rpms/foomatic/devel foomatic-cleanup.patch, NONE, 1.1 foomatic.spec, 1.128, 1.129 Message-ID: <200601171408.k0HE8r2S014045@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14006 Modified Files: foomatic.spec Added Files: foomatic-cleanup.patch Log Message: * Tue Jan 17 2006 Tim Waugh 3.0.2-32 - Fix foomatic-cleanupdrivers. foomatic-cleanup.patch: foomatic-cleanupdrivers.in | 1 + 1 files changed, 1 insertion(+) --- NEW FILE foomatic-cleanup.patch --- --- foomatic-db-engine-3.0-20060117/foomatic-cleanupdrivers.in.cleanup 2006-01-17 14:02:26.000000000 +0000 +++ foomatic-db-engine-3.0-20060117/foomatic-cleanupdrivers.in 2006-01-17 14:02:47.000000000 +0000 @@ -28,6 +28,7 @@ my @driverentryfield = ; close DRIVERENTRY; my $driverentry = join ('', @driverentryfield); + next unless $driverentry; if (($driverentry =~ m!\s*!sg) || ($driverentry =~ m!!sg) || ($driverentry !~ m!/\s]!sg)) { Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- foomatic.spec 17 Jan 2006 13:50:45 -0000 1.128 +++ foomatic.spec 17 Jan 2006 14:08:51 -0000 1.129 @@ -57,6 +57,9 @@ # Handle PPDs with default option values of '0'. Patch17: foomatic-default0.patch +# Fix foomatic-cleanupdrivers. +Patch18: foomatic-cleanup.patch + Url: http://www.linuxprinting.org BuildRequires: perl >= 3:5.8.1 BuildRequires: libxml2-devel @@ -109,6 +112,7 @@ %patch10 -p1 -b .xml-cflags %patch15 -p1 %patch17 -p1 -b .default0 +%patch18 -p1 -b .cleanup ./make_configure popd @@ -272,6 +276,7 @@ %changelog * Tue Jan 17 2006 Tim Waugh 3.0.2-32 +- Fix foomatic-cleanupdrivers. - Updated db-engine to 3.0-20060117. - Handle PPDs with default option values of '0'. From fedora-cvs-commits at redhat.com Tue Jan 17 14:11:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 09:11:43 -0500 Subject: rpms/control-center/devel control-center.spec,1.111,1.112 Message-ID: <200601171411.k0HEBhwl014907@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14861 Modified Files: control-center.spec Log Message: Fix file lists Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- control-center.spec 17 Jan 2006 13:46:05 -0000 1.111 +++ control-center.spec 17 Jan 2006 14:11:39 -0000 1.112 @@ -198,16 +198,17 @@ %doc AUTHORS COPYING ChangeLog NEWS README %{_datadir}/control-center-2.0 -%{_datadir}/pixmaps -%{_datadir}/icons -%{_datadir}/gnome +%{_datadir}/pixmaps/* +%{_datadir}/icons/* +%{_datadir}/gnome/* %{_datadir}/applications/*.desktop %{_datadir}/idl %{_datadir}/omf/control-center +%{_datadir}/gnome-default-applications/* %{_bindir}/* %{_libexecdir}/* -%{_libdir}/bonobo -%{_libdir}/nautilus/extensions-1.0 +%{_libdir}/bonobo/* +%{_libdir}/nautilus/extensions-1.0/* %{_libdir}/*.so.* %{_libdir}/window-manager-settings %{_sysconfdir}/gconf/schemas/*.schemas From fedora-cvs-commits at redhat.com Tue Jan 17 14:13:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 09:13:20 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-1.2.14-dyn-keys.patch, NONE, 1.1 system-config-soundcard.spec, 1.23, 1.24 Message-ID: <200601171413.k0HEDKv7015325@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15294 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-1.2.14-dyn-keys.patch Log Message: added ainit configuration system-config-soundcard-1.2.14-dyn-keys.patch: soundcard.py | 13 ++++++++++++ soundcardBackend.py | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ system-config-soundcard | 1 3 files changed, 66 insertions(+) --- NEW FILE system-config-soundcard-1.2.14-dyn-keys.patch --- --- system-config-soundcard-1.2.14/src/soundcard.py.dyn 2005-10-26 15:04:26.000000000 +0200 +++ system-config-soundcard-1.2.14/src/soundcard.py 2006-01-17 14:53:07.000000000 +0100 @@ -189,6 +189,14 @@ deviceTopBox.pack_start(button) + #Create a check-box for key config + button = gtk.CheckButton(_("Dynamic keys for dmix and dsnoop")) + button.set_active(self.soundcardBackend.getDynamicKeys()) + button.connect("toggled", self.changeDynKeys) + button.show() + + deviceTopBox.pack_start(button) + self.box.pack_start(self.notebook) self.box.pack_start(deviceTopBox) @@ -256,6 +264,11 @@ self.soundcardBackend.setHardwareDevice(widget.get_active()) self.soundcardBackend.writeConfig() + def changeDynKeys(self, widget, data=None): + self.soundcardBackend.setDynamicKeys(widget.get_active()) + self.soundcardBackend.writeConfig() + self.soundcardBackend.reconfigureDynamicKeys() + def apply(self, *args): if self.doDebug: return --- system-config-soundcard-1.2.14/src/system-config-soundcard.dyn 2005-10-04 12:53:25.000000000 +0200 +++ system-config-soundcard-1.2.14/src/system-config-soundcard 2006-01-17 13:45:08.000000000 +0100 @@ -9,6 +9,7 @@ echo -e "------- /etc/asound.conf --------\n`cat /etc/asound.conf`\n" >> $LOG_FILE 2>&1 echo -e "------- aplay -l --------\n`aplay -l 2>&1`\n" >> $LOG_FILE 2>&1 echo -e "------- amixer --------\n`amixer`\n" >> $LOG_FILE 2>&1 +echo -e "------- /proc/asound/version --------\n`cat /proc/asound/version`\n" >> $LOG_FILE 2>&1 echo -e "------- /proc/asound/modules --------\n`cat /proc/asound/modules`\n" >> $LOG_FILE 2>&1 echo -e "------- /proc/asound/pcm --------\n`cat /proc/asound/pcm`\n" >> $LOG_FILE 2>&1 --- system-config-soundcard-1.2.14/src/soundcardBackend.py.dyn 2005-10-26 15:04:26.000000000 +0200 +++ system-config-soundcard-1.2.14/src/soundcardBackend.py 2006-01-17 15:07:52.000000000 +0100 @@ -119,6 +119,7 @@ self.hardware_device = 0 self.default_device = 0 self.default_card = 0 + self.dynamic_keys = 0 self.readConfig() def probeCards(self): @@ -311,8 +312,23 @@ def getHardwareDevice(self): return self.hardware_device + def setDynamicKeys(self, state): + self.dynamic_keys = state; + + def getDynamicKeys(self): + return self.dynamic_keys + + def reconfigureDynamicKeys(self): + if self.dynamic_keys : + if os.path.exists("/var/run/console/console.lock"): + os.system("/usr/bin/ainit `cat /var/run/console/console.lock` start") + else: + if os.path.exists("/var/run/console/console.lock"): + os.system("/usr/bin/ainit `cat /var/run/console/console.lock` stop") + def writeConfig(self): + # Writing to asound.conf index = self.default_card device = self.default_device @@ -337,7 +353,28 @@ fd.write(line) fd.close() + # re-writing ainit.conf + fd = open('/etc/alsa/ainit.conf', 'r') + lines = fd.readlines() + fd.close() + + lines_out = [] + for line in lines: + line_tmp = string.split(string.strip(line)) + if line_tmp != [] and cmp(string.lower(line_tmp[0]),"enable") == 0: + if self.dynamic_keys: + lines_out.append("enable = yes\n") + else: + lines_out.append("enable = no\n") + else: + lines_out.append(line) + + fd = open('/etc/alsa/ainit.conf', 'w') + fd.writelines(lines_out) + fd.close() + def readConfig(self): + # Check alsa configuration try: fd = open('/etc/asound.conf', 'r') line = fd.readline() @@ -353,6 +390,21 @@ self.hardware_device = 0 self.default_device = 0 + # Check ainit configuration + try: + fd = open('/etc/alsa/ainit.conf', 'r') + lines = fd.readlines() + fd.close() + + for line in lines: + line = string.split(string.strip(line)) + if line != [] and cmp(string.lower(line[0]),"enable") == 0: + self.dynamic_keys = (cmp(string.lower(line[2]),'yes') == 0) + break; + + except: + self.dynamic_keys = 0 + try: self.default_card = int(commands.getoutput('/bin/alsacard')) except: Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- system-config-soundcard.spec 12 Jan 2006 10:06:37 -0000 1.23 +++ system-config-soundcard.spec 17 Jan 2006 14:13:15 -0000 1.24 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard Version: 1.2.14 -Release: 2 +Release: 3 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html License: GPL ExclusiveOS: Linux @@ -10,6 +10,7 @@ BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 Patch1: system-config-soundcard-1.2.14-desktop.patch +Patch2: system-config-soundcard-1.2.14-dyn-keys.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -20,7 +21,7 @@ Requires: sox Requires: rhpl Requires: kudzu -Requires: alsa-utils >= 1.0.9rf-3 +Requires: alsa-utils >= 1.0.11 Requires: alsa-lib %description @@ -30,6 +31,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 -b .dyn %build make @@ -83,6 +85,9 @@ %ghost /root/scsound.log %changelog +* Tue Jan 17 2006 Martin Stransky 1.2.14-3 +- added ainit configuration + * Thu Jan 12 2006 Martin Stransky 1.2.14-2 - added patch for menu entries (#177479) From fedora-cvs-commits at redhat.com Tue Jan 17 14:33:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 09:33:54 -0500 Subject: rpms/gnome-utils/devel gcalctool-5.7.23-dummy-uses.patch, NONE, 1.1 gnome-utils.spec, 1.77, 1.78 Message-ID: <200601171433.k0HEXsUH000676@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv593 Modified Files: gnome-utils.spec Added Files: gcalctool-5.7.23-dummy-uses.patch Log Message: fix errors gcalctool-5.7.23-dummy-uses.patch: lex.ce.c | 11 ----------- lex.lr.c | 11 ----------- 2 files changed, 22 deletions(-) --- NEW FILE gcalctool-5.7.23-dummy-uses.patch --- --- gnome-utils-2.13.5/gcalctool-5.7.23/gcalctool/lex.lr.c.dummy-uses 2006-01-17 09:25:36.000000000 -0500 +++ gnome-utils-2.13.5/gcalctool-5.7.23/gcalctool/lex.lr.c 2006-01-17 09:25:46.000000000 -0500 @@ -1845,17 +1845,6 @@ } #endif -/* Some people want warning-free code, and under certain #define - conditions, gcc will warn for unusedness of some functions. This - function is provided merely to silent these warnings. It's not - static itself, so it will clutter exports, but it has at least - urandom name so that clashes won't occur.*/ -void _yy_dummy_uses_of_static_functions_b2f4_517d_02ff_b30c_3e5a_47d7_aaa3_3b5d_() -{ - yy_flex_realloc ((void*)0, 0); -} -#line 110 "./lr_tokeniser.l" - void reset_lr_tokeniser() --- gnome-utils-2.13.5/gcalctool-5.7.23/gcalctool/lex.ce.c.dummy-uses 2006-01-17 09:08:41.000000000 -0500 +++ gnome-utils-2.13.5/gcalctool-5.7.23/gcalctool/lex.ce.c 2006-01-17 09:08:54.000000000 -0500 @@ -1878,17 +1878,6 @@ } #endif -/* Some people want warning-free code, and under certain #define - conditions, gcc will warn for unusedness of some functions. This - function is provided merely to silent these warnings. It's not - static itself, so it will clutter exports, but it has at least - urandom name so that clashes won't occur.*/ -void _yy_dummy_uses_of_static_functions_b2f4_517d_02ff_b30c_3e5a_47d7_aaa3_3b5d_() -{ - yy_flex_realloc ((void*)0, 0); -} -#line 116 "./ce_tokeniser.l" - void reset_ce_tokeniser() Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- gnome-utils.spec 17 Jan 2006 04:55:53 -0000 1.77 +++ gnome-utils.spec 17 Jan 2006 14:33:49 -0000 1.78 @@ -84,6 +84,7 @@ pushd gcalctool-%{gcalctool_version} %patch0 -p2 -b .schemasdir +%patch1 -p2 -b .dummy-uses popd %build From fedora-cvs-commits at redhat.com Tue Jan 17 14:42:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 09:42:57 -0500 Subject: rpms/gnome-session/devel .cvsignore, 1.16, 1.17 gnome-session.spec, 1.50, 1.51 sources, 1.16, 1.17 Message-ID: <200601171442.k0HEgvGc003188@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3142 Modified Files: .cvsignore gnome-session.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 14 Jan 2006 00:02:50 -0000 1.16 +++ .cvsignore 17 Jan 2006 14:42:52 -0000 1.17 @@ -1,3 +1,4 @@ gnome-session-2.11.91.tar.bz2 gnome-session-2.12.0.tar.bz2 gnome-session-2.13.4.tar.bz2 +gnome-session-2.13.5.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gnome-session.spec 16 Jan 2006 15:03:29 -0000 1.50 +++ gnome-session.spec 17 Jan 2006 14:42:53 -0000 1.51 @@ -12,8 +12,8 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.13.4 -Release: 2 +Version: 2.13.5 +Release: 1 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: redhat-default-session @@ -79,6 +79,7 @@ %patch6 -p1 -b .gnome-common %patch7 -p0 -b .user-share %patch8 -p1 -b .shaped +%patch9 -p1 -b .no-crashes %build @@ -151,6 +152,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Tue Jan 17 2006 Matthias Clasen - 2.13.5-1 +- Update to 2.13.5 + * Mon Jan 16 2006 Matthias Clasen - 2.13.4-2 - Disable the fatal-criticals, since it crashes too much Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 14 Jan 2006 00:02:50 -0000 1.16 +++ sources 17 Jan 2006 14:42:53 -0000 1.17 @@ -1 +1 @@ -d303bc5faf4d244dde483691727fcbe1 gnome-session-2.13.4.tar.bz2 +a82550cdbefb2d9c43339fbf078c1ee1 gnome-session-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 14:44:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 09:44:39 -0500 Subject: rpms/gnome-utils/devel gnome-utils.spec,1.78,1.79 Message-ID: <200601171444.k0HEidDQ003915@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3864 Modified Files: gnome-utils.spec Log Message: Fix error Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- gnome-utils.spec 17 Jan 2006 14:33:49 -0000 1.78 +++ gnome-utils.spec 17 Jan 2006 14:44:36 -0000 1.79 @@ -32,6 +32,7 @@ Source6: gnome-system-log.pam Patch0: gnome-utils-2.11.90-schemasdir.patch +Patch1: gcalctool-5.7.23-dummy-uses.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: gnome From fedora-cvs-commits at redhat.com Tue Jan 17 14:47:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 09:47:03 -0500 Subject: rpms/hal/devel .cvsignore, 1.36, 1.37 hal.spec, 1.75, 1.76 sources, 1.37, 1.38 Message-ID: <200601171447.k0HEl3oa002353@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22620 Modified Files: .cvsignore hal.spec sources Log Message: * Tue Jan 17 2006 John (J5) Palmieri - 0.5.6 - New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 12 Jan 2006 04:13:31 -0000 1.36 +++ .cvsignore 17 Jan 2006 14:47:00 -0000 1.37 @@ -23,4 +23,5 @@ hal-0.5.5.1.tar.gz hal-0.5.5.1.cvs20060105.tar.gz hal-0.5.5.1.cvs20060109.tar.gz +hal-0.5.6.tar.gz hal-0.5.5.1.cvs20060111.tar.gz Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- hal.spec 12 Jan 2006 04:13:31 -0000 1.75 +++ hal.spec 17 Jan 2006 14:47:00 -0000 1.76 @@ -17,7 +17,7 @@ Summary: Hardware Abstraction Layer Name: hal -Version: 0.5.5.1.cvs20060111 +Version: 0.5.6 Release: 1 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz @@ -169,6 +169,9 @@ %{_bindir}/hal-device-manager %changelog +* Tue Jan 17 2006 John (J5) Palmieri - 0.5.6 +- New upstream release + * Wed Jan 11 2006 Christopher Aillon - 0.5.5.1.cvs20060111-1 - Update to an even newer CVS snapshot, to fix privelege escalation issue - Remove mount options patch (upstreamed already) Index: sources =================================================================== RCS file: /cvs/dist/rpms/hal/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 12 Jan 2006 04:13:31 -0000 1.37 +++ sources 17 Jan 2006 14:47:00 -0000 1.38 @@ -1 +1 @@ -5c124f3b0459da726c977ba65daaaab9 hal-0.5.5.1.cvs20060111.tar.gz +1e494b4319bbdfeb25224f914e34d0d3 hal-0.5.6.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 17 15:02:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 10:02:03 -0500 Subject: rpms/gnome-mount/devel gnome-mount.spec,1.2,1.3 Message-ID: <200601171502.k0HF23KW010386@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-mount/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10370 Modified Files: gnome-mount.spec Log Message: * Tue Jan 17 2006 John (J5) Palmieri - 0.3-2 - Install the schema in the post Index: gnome-mount.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gnome-mount.spec 12 Jan 2006 04:18:45 -0000 1.2 +++ gnome-mount.spec 17 Jan 2006 15:02:01 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Mount replacement which uses HAL to do the mounting Name: gnome-mount Version: 0.3 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source: %{name}-%{version}.tar.gz @@ -29,6 +29,13 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +SCHEMAS="gnome-mount.schemas" +for S in $SCHEMAS; do + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null +done + %files %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README @@ -41,6 +48,9 @@ %changelog +* Tue Jan 17 2006 John (J5) Palmieri - 0.3-2 +- Install the schema in the post + * Wed Jan 11 2006 Christopher Aillon - 0.3-1 - Update to 0.3 From fedora-cvs-commits at redhat.com Tue Jan 17 15:04:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 10:04:33 -0500 Subject: rpms/hal/devel hal.spec, 1.76, 1.77 hal-0.5.4-match-on-capabilities.patch, 1.1, NONE Message-ID: <200601171504.k0HF4XO7010549@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10531 Modified Files: hal.spec Removed Files: hal-0.5.4-match-on-capabilities.patch Log Message: - Remove match on capabilities patch (upstream already) Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- hal.spec 17 Jan 2006 14:47:00 -0000 1.76 +++ hal.spec 17 Jan 2006 15:04:30 -0000 1.77 @@ -21,7 +21,6 @@ Release: 1 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz -Patch0: hal-0.5.4-match-on-capabilities.patch License: AFL/GPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root @@ -80,7 +79,6 @@ %prep %setup -q -%patch0 -p1 -b .match-on-capabilities %build %configure --disable-docbook-docs --with-os-type=redhat --enable-pcmcia-support --with-stab-file=/var/lib/pcmcia/stab @@ -171,6 +169,7 @@ %changelog * Tue Jan 17 2006 John (J5) Palmieri - 0.5.6 - New upstream release +- Remove match on capabilities patch (upstream already) * Wed Jan 11 2006 Christopher Aillon - 0.5.5.1.cvs20060111-1 - Update to an even newer CVS snapshot, to fix privelege escalation issue --- hal-0.5.4-match-on-capabilities.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 17 15:46:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 10:46:12 -0500 Subject: rpms/gnome-utils/devel gnome-utils.spec, 1.79, 1.80 sources, 1.35, 1.36 Message-ID: <200601171546.k0HFkC0G006500@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5828 Modified Files: gnome-utils.spec sources Log Message: grr Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- gnome-utils.spec 17 Jan 2006 14:44:36 -0000 1.79 +++ gnome-utils.spec 17 Jan 2006 15:46:08 -0000 1.80 @@ -11,7 +11,7 @@ %define po_package gnome-utils-2.0 -%define gcalctool_version 5.7.23 +%define gcalctool_version 5.7.18 %define gucharmap_version 1.5.0 %define zenity_version 2.13.5 @@ -32,7 +32,6 @@ Source6: gnome-system-log.pam Patch0: gnome-utils-2.11.90-schemasdir.patch -Patch1: gcalctool-5.7.23-dummy-uses.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: gnome @@ -85,7 +84,6 @@ pushd gcalctool-%{gcalctool_version} %patch0 -p2 -b .schemasdir -%patch1 -p2 -b .dummy-uses popd %build @@ -214,7 +212,6 @@ * Mon Jan 16 2006 Matthias Clasen 2.13.5 - Update to gnome-utils 2.13.5 - Update to zenity 2.13.5 -- Update to gcalctool 5.7.23 * Tue Jan 03 2006 Matthias Clasen 2.13.4 - Update to gnome-utils 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 17 Jan 2006 04:55:53 -0000 1.35 +++ sources 17 Jan 2006 15:46:08 -0000 1.36 @@ -1,4 +1,4 @@ e7f8e1201b2b81cd283d7a4db512141a gucharmap-1.5.0.tar.bz2 599744ac5f121b0671abf6e7a4112da4 gnome-utils-2.13.5.tar.bz2 bc4672759e106dde8547675d4f46720e zenity-2.13.5.tar.bz2 -76fd98ff12aa4a3c097c6d7d17b7126c gcalctool-5.7.23.tar.bz2 +89bed90db2f6f2d324df5726ddd6fe6c gcalctool-5.7.18.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 16:01:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 11:01:35 -0500 Subject: rpms/gnome-utils/devel gcalctool-flex-crap.patch, NONE, 1.1 gnome-utils.spec, 1.80, 1.81 sources, 1.36, 1.37 Message-ID: <200601171601.k0HG1ZGn022692@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22597 Modified Files: gnome-utils.spec sources Added Files: gcalctool-flex-crap.patch Log Message: flex crap gcalctool-flex-crap.patch: Makefile.in | 1 + 1 files changed, 1 insertion(+) --- NEW FILE gcalctool-flex-crap.patch --- --- gnome-utils-2.13.5/gcalctool-5.7.23/gcalctool/Makefile.in.flex-crap 2006-01-17 10:57:18.000000000 -0500 +++ gnome-utils-2.13.5/gcalctool-5.7.23/gcalctool/Makefile.in 2006-01-17 10:58:02.000000000 -0500 @@ -665,6 +665,7 @@ lex.ce.c: ce_parser.tab.c ce_tokeniser.l $(LEX) -Pce $(srcdir)/ce_tokeniser.l + sed -i -e "s/dummy_uses_of_static_functions/ce_flex_crap/" lex.ce.c lex.lr.c: lr_parser.tab.c lr_tokeniser.l $(LEX) -i -Plr $(srcdir)/lr_tokeniser.l Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- gnome-utils.spec 17 Jan 2006 15:46:08 -0000 1.80 +++ gnome-utils.spec 17 Jan 2006 16:01:27 -0000 1.81 @@ -11,7 +11,7 @@ %define po_package gnome-utils-2.0 -%define gcalctool_version 5.7.18 +%define gcalctool_version 5.7.23 %define gucharmap_version 1.5.0 %define zenity_version 2.13.5 @@ -32,6 +32,7 @@ Source6: gnome-system-log.pam Patch0: gnome-utils-2.11.90-schemasdir.patch +Patch1: gcalctool-flex-crap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: gnome @@ -84,6 +85,7 @@ pushd gcalctool-%{gcalctool_version} %patch0 -p2 -b .schemasdir +%patch1 -p2 -b .flex-crap popd %build Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 17 Jan 2006 15:46:08 -0000 1.36 +++ sources 17 Jan 2006 16:01:30 -0000 1.37 @@ -1,4 +1,4 @@ e7f8e1201b2b81cd283d7a4db512141a gucharmap-1.5.0.tar.bz2 599744ac5f121b0671abf6e7a4112da4 gnome-utils-2.13.5.tar.bz2 bc4672759e106dde8547675d4f46720e zenity-2.13.5.tar.bz2 -89bed90db2f6f2d324df5726ddd6fe6c gcalctool-5.7.18.tar.bz2 +76fd98ff12aa4a3c097c6d7d17b7126c gcalctool-5.7.23.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 16:15:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 11:15:42 -0500 Subject: rpms/nautilus/devel .cvsignore, 1.32, 1.33 nautilus.spec, 1.87, 1.88 sources, 1.35, 1.36 Message-ID: <200601171615.k0HGFg8f026572@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/nautilus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26244 Modified Files: .cvsignore nautilus.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 13 Dec 2005 16:42:11 -0000 1.32 +++ .cvsignore 17 Jan 2006 16:15:38 -0000 1.33 @@ -11,3 +11,4 @@ nautilus-2.12.1.tar.bz2 nautilus-2.13.2.tar.bz2 nautilus-2.13.3.tar.bz2 +nautilus-2.13.4.tar.bz2 Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- nautilus.spec 9 Jan 2006 21:44:56 -0000 1.87 +++ nautilus.spec 17 Jan 2006 16:15:38 -0000 1.88 @@ -2,7 +2,7 @@ %define pango_version 1.1.3 %define gtk2_version 2.6.0 %define libgnomeui_version 2.6.0 -%define eel2_version 2.13.3 +%define eel2_version 2.13.4 %define gnome_icon_theme_version 1.1.5 %define libxml2_version 2.4.20 %define gail_version 0.17-2 @@ -17,8 +17,8 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME. -Version: 2.13.3 -Release: 2 +Version: 2.13.4 +Release: 1 License: GPL Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/sources/2.7/%{name}/%{name}-%{version}.tar.bz2 @@ -173,6 +173,9 @@ %{_includedir}/nautilus %changelog +* Tue Jan 17 2006 Matthias Clasen - 2.13.4-1 +- Update to 2.13.4 + * Mon Jan 9 2006 Alexander Larsson - 2.13.3-2 - Buildrequire libbeagle Index: sources =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 13 Dec 2005 16:42:11 -0000 1.35 +++ sources 17 Jan 2006 16:15:38 -0000 1.36 @@ -1 +1 @@ -b93bb76a270a5a7e50a7a7373649c744 nautilus-2.13.3.tar.bz2 +bdc4802e6f3545e7be4b93f5c35d02e7 nautilus-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 16:21:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 11:21:27 -0500 Subject: rpms/system-config-printer/devel .cvsignore, 1.54, 1.55 printconf.spec, 1.57, 1.58 sources, 1.56, 1.57 Message-ID: <200601171621.k0HGLRn6007843@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/system-config-printer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7796 Modified Files: .cvsignore printconf.spec sources Log Message: * Tue Jan 17 2006 Tim Waugh 0.6.149-1 - 0.6.149: - Use better string for invalid name in UI. - Fixed over-zealous A4 option setting (bug #177741). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- .cvsignore 10 Jan 2006 13:42:23 -0000 1.54 +++ .cvsignore 17 Jan 2006 16:21:23 -0000 1.55 @@ -34,3 +34,4 @@ printconf-0.6.146.tar.bz2 printconf-0.6.147.tar.bz2 printconf-0.6.148.tar.bz2 +printconf-0.6.149.tar.bz2 Index: printconf.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/printconf.spec,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- printconf.spec 10 Jan 2006 13:42:23 -0000 1.57 +++ printconf.spec 17 Jan 2006 16:21:23 -0000 1.58 @@ -1,6 +1,6 @@ Summary: A printer configuration backend/frontend combination. Name: system-config-printer -Version: 0.6.148 +Version: 0.6.149 Release: 1 License: GPL Group: System Environment/Daemons @@ -174,6 +174,11 @@ %changelog +* Tue Jan 17 2006 Tim Waugh 0.6.149-1 +- 0.6.149: + - Use better string for invalid name in UI. + - Fixed over-zealous A4 option setting (bug #177741). + * Tue Jan 10 2006 Tim Waugh 0.6.148-1 - Don't remove the cache directory, only its contents (bug #177266). Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- sources 10 Jan 2006 13:42:23 -0000 1.56 +++ sources 17 Jan 2006 16:21:23 -0000 1.57 @@ -1 +1 @@ -d6b099d3611b7fd52ec9086fbc1f7ef3 printconf-0.6.148.tar.bz2 +19442d322b3d7b0d71fa655e3062266f printconf-0.6.149.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 16:35:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 11:35:12 -0500 Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.22, 1.23 gnome-system-monitor.spec, 1.38, 1.39 sources, 1.22, 1.23 Message-ID: <200601171635.k0HGZC3M012311@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-system-monitor/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12266 Modified Files: .cvsignore gnome-system-monitor.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 3 Jan 2006 18:36:24 -0000 1.22 +++ .cvsignore 17 Jan 2006 16:35:00 -0000 1.23 @@ -4,3 +4,4 @@ gnome-system-monitor-2.13.2.tar.bz2 gnome-system-monitor-2.13.3.tar.bz2 gnome-system-monitor-2.13.4.tar.bz2 +gnome-system-monitor-2.13.5.tar.bz2 Index: gnome-system-monitor.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- gnome-system-monitor.spec 3 Jan 2006 18:36:24 -0000 1.38 +++ gnome-system-monitor.spec 17 Jan 2006 16:35:00 -0000 1.39 @@ -10,7 +10,7 @@ Summary: Simple process monitor Name: gnome-system-monitor -Version: 2.13.4 +Version: 2.13.5 Release: 1 License: GPL Group: Applications/System @@ -80,6 +80,9 @@ %{_datadir}/omf %changelog +* Tue Jan 17 2006 Matthias Clasen 2.13.5-1 +- Update to 2.13.5 + * Tue Jan 03 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 3 Jan 2006 18:36:24 -0000 1.22 +++ sources 17 Jan 2006 16:35:00 -0000 1.23 @@ -1 +1 @@ -ddfdf81aed7593ba5d2bc5d0a273af22 gnome-system-monitor-2.13.4.tar.bz2 +26b8cedf49ed8b16b77db193b405afb6 gnome-system-monitor-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 16:45:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 11:45:10 -0500 Subject: rpms/gnome-games/devel .cvsignore, 1.30, 1.31 gnome-games.spec, 1.58, 1.59 sources, 1.33, 1.34 Message-ID: <200601171645.k0HGjAFQ014998@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-games/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14953 Modified Files: .cvsignore gnome-games.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 6 Jan 2006 21:51:48 -0000 1.30 +++ .cvsignore 17 Jan 2006 16:45:07 -0000 1.31 @@ -1,2 +1,3 @@ gnome-games-2.13.4.tar.bz2 gnome-games-extra-data-no-windows-2.12.0.tar.bz2 +gnome-games-2.13.5.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- gnome-games.spec 6 Jan 2006 21:51:49 -0000 1.58 +++ gnome-games.spec 17 Jan 2006 16:45:07 -0000 1.59 @@ -10,8 +10,8 @@ Summary: GNOME games. Name: gnome-games -Version: 2.13.4 -Release: 2 +Version: 2.13.5 +Release: 1 Epoch: 1 License: LGPL Group: Amusements/Games @@ -176,6 +176,9 @@ %changelog +* Tue Jan 17 2006 Matthias Clasen 1:2.13.5-1 +- Update to 2.13.5 + * Fri Jan 06 2006 Ray Strode 1:2.13.4-2 - remove "Windows" theme from gnobots Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 6 Jan 2006 21:51:49 -0000 1.33 +++ sources 17 Jan 2006 16:45:07 -0000 1.34 @@ -1,2 +1,2 @@ -dc83b2ed649c5866b70ad165eb71ad0d gnome-games-2.13.4.tar.bz2 19b2d6dbca182fb426a0bd86d322a2ac gnome-games-extra-data-no-windows-2.12.0.tar.bz2 +99972b2bf1ddeb9d8eb9ae59e6da70b8 gnome-games-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 16:50:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 11:50:47 -0500 Subject: rpms/file-roller/devel .cvsignore, 1.29, 1.30 file-roller.spec, 1.42, 1.43 sources, 1.30, 1.31 Message-ID: <200601171650.k0HGolqt028810@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/file-roller/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28664 Modified Files: .cvsignore file-roller.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 3 Jan 2006 15:19:23 -0000 1.29 +++ .cvsignore 17 Jan 2006 16:50:42 -0000 1.30 @@ -15,3 +15,4 @@ file-roller-2.13.1.tar.bz2 file-roller-2.13.2.tar.bz2 file-roller-2.13.3.tar.bz2 +file-roller-2.13.4.tar.bz2 Index: file-roller.spec =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- file-roller.spec 3 Jan 2006 15:20:07 -0000 1.42 +++ file-roller.spec 17 Jan 2006 16:50:42 -0000 1.43 @@ -9,7 +9,7 @@ Summary: File Roller is a tool for viewing and creating archives. Name: file-roller -Version: 2.13.3 +Version: 2.13.4 Release: 1 License: GPL @@ -107,6 +107,9 @@ %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so %changelog +* Tue Jan 16 2006 Matthias Clasen 2.13.4-1 +- Update to 2.13.4 + * Thu Jan 03 2006 Matthias Clasen 2.13.3-1 - Update to 2.13.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 3 Jan 2006 15:19:23 -0000 1.30 +++ sources 17 Jan 2006 16:50:42 -0000 1.31 @@ -1 +1 @@ -b301ce7a7fcb005ee03d848db7aeb2df file-roller-2.13.3.tar.bz2 +4b5f4ebe8d113d5a619cb5a69bf52728 file-roller-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 16:51:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 11:51:31 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.608,1.609 Message-ID: <200601171651.k0HGpVpT029140@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29114 Modified Files: openoffice.org.spec Log Message: sr-CS not sr Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.608 retrieving revision 1.609 diff -u -r1.608 -r1.609 --- openoffice.org.spec 17 Jan 2006 11:44:22 -0000 1.608 +++ openoffice.org.spec 17 Jan 2006 16:51:26 -0000 1.609 @@ -2067,21 +2067,21 @@ %defattr(-,root,root) %dir %{instdir} %dir %{instdir}/help -%{instdir}/help/sr -%{instdir}/program/resource/*680sr.res +%{instdir}/help/sr-CS +%{instdir}/program/resource/*680sr-CS.res %dir %{instdir}/share -%{instdir}/share/readme/LICENSE_sr* -%{instdir}/share/readme/README_sr* +%{instdir}/share/readme/LICENSE_sr-CS* +%{instdir}/share/readme/README_sr-CS* %dir %{instdir}/share/registry %dir %{instdir}/share/registry/res -%{instdir}/share/registry/res/sr +%{instdir}/share/registry/res/sr-CS %dir %{instdir}/share/template -%{instdir}/share/template/sr +%{instdir}/share/template/sr-CS %dir %{instdir}/share/registry/modules %dir %{instdir}/share/registry/modules/org %dir %{instdir}/share/registry/modules/org/openoffice %dir %{instdir}/share/registry/modules/org/openoffice/Setup -%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sr.xcu +%{instdir}/share/registry/modules/org/openoffice/Setup/Langpack-sr-CS.xcu %endif %files langpack-sv From fedora-cvs-commits at redhat.com Tue Jan 17 16:58:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 11:58:12 -0500 Subject: rpms/file-roller/devel file-roller.spec,1.43,1.44 Message-ID: <200601171658.k0HGwCCe031481@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/file-roller/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31437 Modified Files: file-roller.spec Log Message: fix file lists Index: file-roller.spec =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- file-roller.spec 17 Jan 2006 16:50:42 -0000 1.43 +++ file-roller.spec 17 Jan 2006 16:58:07 -0000 1.44 @@ -102,7 +102,6 @@ %{_datadir}/omf %{_datadir}/applications %{_datadir}/mime-info/* -%{_datadir}/application-registry %{_sysconfdir}/gconf/schemas %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so From fedora-cvs-commits at redhat.com Tue Jan 17 17:13:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 12:13:13 -0500 Subject: rpms/redhat-artwork/devel .cvsignore, 1.63, 1.64 redhat-artwork.spec, 1.114, 1.115 sources, 1.64, 1.65 Message-ID: <200601171713.k0HHDDWS002916@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/redhat-artwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2824 Modified Files: .cvsignore redhat-artwork.spec sources Log Message: - update to 0.234 to get new gdm theme designed by Diana Fong and implemented by M??ir??n Duffy and me Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- .cvsignore 13 Nov 2005 19:43:38 -0000 1.63 +++ .cvsignore 17 Jan 2006 17:13:06 -0000 1.64 @@ -1,38 +1 @@ -redhat-artwork-0.98.tar.gz -redhat-artwork-0.99.tar.gz -redhat-artwork-0.100.tar.gz -redhat-artwork-0.101.tar.gz -redhat-artwork-0.102.tar.gz -redhat-artwork-0.103.tar.gz -redhat-artwork-0.104.tar.gz -redhat-artwork-0.105.tar.gz -redhat-artwork-0.108.tar.gz -redhat-artwork-0.109.tar.gz -redhat-artwork-0.110.tar.gz -redhat-artwork-0.111.tar.gz -RHEL-gdm-theme-0.1.tar.gz -redhat-artwork-0.112.tar.gz -post-install-fixup.sh -post-install-sources.tar.gz -redhat-artwork-0.113.tar.gz -redhat-artwork-0.114.tar.gz -redhat-artwork-0.115.tar.gz -redhat-artwork-0.116.tar.gz -redhat-artwork-0.117.tar.gz -RHEL-gdm-theme-0.2.tar.gz -redhat-artwork-0.118.tar.gz -redhat-artwork-0.119.tar.gz -redhat-artwork-0.120.tar.gz -redhat-artwork-0.121.tar.gz -throbbers.tar.bz2 -volume.tar.gz -WeatherIcons.tar.gz -redhat-artwork-0.124.tar.gz -redhat-artwork-0.125.tar.gz -redhat-artwork-0.126.tar.gz -redhat-artwork-0.127.tar.gz -redhat-artwork-0.128.tar.gz -redhat-artwork-0.129.tar.gz -fedora-logo.tar.bz2 -redhat-artwork-0.130.tar.gz -redhat-artwork-0.131.tar.gz +redhat-artwork-0.234.tar.gz Index: redhat-artwork.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/redhat-artwork.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- redhat-artwork.spec 13 Jan 2006 19:03:25 -0000 1.114 +++ redhat-artwork.spec 17 Jan 2006 17:13:06 -0000 1.115 @@ -3,8 +3,8 @@ Summary: Artwork for Red Hat default look-and-feel Name: redhat-artwork -Version: 0.131 -Release: 3 +Version: 0.234 +Release: 1 URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz Source1: post-install-fixup.sh @@ -142,6 +142,11 @@ %config /root/.gtkrc %changelog +* Tue Jan 17 2006 Ray Strode 0.234-1 +- update to 0.234 to get new gdm theme designed by + Diana Fong and implemented by + M??ir??n Duffy and me + * Fri Jan 13 2006 Christopher Aillon 0.131-3 - BuildRequire xorg-x11-apps, as xcursorgen moved there. This should really really fix the cursors issue. Index: sources =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- sources 13 Nov 2005 19:43:38 -0000 1.64 +++ sources 17 Jan 2006 17:13:06 -0000 1.65 @@ -1,3 +1 @@ -cd630f83371dd14cf01a3767caa24da0 RHEL-gdm-theme-0.2.tar.gz -395452caaf476a7145ffccea356a8966 throbbers.tar.bz2 -574c81af738377f9a7669960493dabd7 redhat-artwork-0.131.tar.gz +8c6b1ea017d15b11c6867b2cf8595b28 redhat-artwork-0.234.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 17 17:17:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 12:17:30 -0500 Subject: rpms/redhat-artwork/devel .cvsignore,1.64,1.65 sources,1.65,1.66 Message-ID: <200601171717.k0HHHUud005490@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/redhat-artwork/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4397 Modified Files: .cvsignore sources Log Message: - add other source tarballs back in Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/.cvsignore,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- .cvsignore 17 Jan 2006 17:13:06 -0000 1.64 +++ .cvsignore 17 Jan 2006 17:17:27 -0000 1.65 @@ -1 +1,4 @@ redhat-artwork-0.234.tar.gz +post-install-sources.tar.gz +RHEL-gdm-theme-0.2.tar.gz +throbbers.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/redhat-artwork/devel/sources,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- sources 17 Jan 2006 17:13:06 -0000 1.65 +++ sources 17 Jan 2006 17:17:27 -0000 1.66 @@ -1 +1,4 @@ 8c6b1ea017d15b11c6867b2cf8595b28 redhat-artwork-0.234.tar.gz +d30a30110d8a040f7fd584d7430cf019 post-install-sources.tar.gz +cd630f83371dd14cf01a3767caa24da0 RHEL-gdm-theme-0.2.tar.gz +395452caaf476a7145ffccea356a8966 throbbers.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 17:22:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 12:22:32 -0500 Subject: rpms/bug-buddy/devel bug-buddy-2.13.0-save.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 bug-buddy.spec, 1.43, 1.44 sources, 1.24, 1.25 Message-ID: <200601171722.k0HHMW3h009930@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/bug-buddy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9917 Modified Files: .cvsignore bug-buddy.spec sources Added Files: bug-buddy-2.13.0-save.patch Log Message: Update patch bug-buddy-2.13.0-save.patch: bug-buddy.glade | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE bug-buddy-2.13.0-save.patch --- --- bug-buddy-2.13.0/src/bug-buddy.glade.save 2006-01-05 13:54:34.000000000 -0500 +++ bug-buddy-2.13.0/src/bug-buddy.glade 2006-01-17 12:20:54.000000000 -0500 @@ -1942,7 +1942,7 @@ False False True - GTK_FILE_CHOOSER_ACTION_OPEN + GTK_FILE_CHOOSER_ACTION_SAVE Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/bug-buddy/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 6 Oct 2005 14:30:43 -0000 1.24 +++ .cvsignore 17 Jan 2006 17:22:26 -0000 1.25 @@ -1,3 +1,4 @@ bug-buddy-2.11.1.tar.bz2 bug-buddy-2.12.0.tar.bz2 bug-buddy-2.12.1.tar.bz2 +bug-buddy-2.13.0.tar.bz2 Index: bug-buddy.spec =================================================================== RCS file: /cvs/dist/rpms/bug-buddy/devel/bug-buddy.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- bug-buddy.spec 9 Dec 2005 22:39:50 -0000 1.43 +++ bug-buddy.spec 17 Jan 2006 17:22:28 -0000 1.44 @@ -4,8 +4,8 @@ %define gnome_doc_utils_version 0.2.0 Name: bug-buddy -Version: 2.12.1 -Release: 2.1 +Version: 2.13.0 +Release: 1 Epoch: 1 Summary: A bug reporting utility for GNOME. License: GPL @@ -14,10 +14,8 @@ URL: http://ftp.gnome.org/pub/GNOME/sources/bug-buddy/ BuildRoot:%{_tmppath}/%{name}-%{version}-root -# http://bugzilla.gnome.org/show_bug.cgi?id=317530 -Patch0: bug-buddy-2.12.0-title.patch # http://bugzilla.gnome.org/show_bug.cgi?id=304508 -Patch1: bug-buddy-2.12.0-save.patch +Patch1: bug-buddy-2.13.0-save.patch Requires: gdb @@ -53,7 +51,6 @@ %prep %setup -q -%patch0 -p1 -b .title %patch1 -p1 -b .save %build @@ -110,6 +107,9 @@ %{_sysconfdir}/gconf/schemas/* %changelog +* Tue Jan 17 2006 Matthias Clasen - 2.13.0-1 +- Update to 2.13.0 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/bug-buddy/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 6 Oct 2005 14:30:43 -0000 1.24 +++ sources 17 Jan 2006 17:22:28 -0000 1.25 @@ -1 +1 @@ -2f8b52ad25891e7c99820c80e7c6d78d bug-buddy-2.12.1.tar.bz2 +297c24f6afa33e5c776a68396e96b7c4 bug-buddy-2.13.0.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 17:31:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 12:31:10 -0500 Subject: rpms/gnome-screensaver/devel .cvsignore, 1.12, 1.13 gnome-screensaver.spec, 1.43, 1.44 sources, 1.12, 1.13 Message-ID: <200601171731.k0HHVAgQ010067@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10054 Modified Files: .cvsignore gnome-screensaver.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Jan 2006 19:31:18 -0000 1.12 +++ .cvsignore 17 Jan 2006 17:31:05 -0000 1.13 @@ -3,3 +3,4 @@ fedoralogo-floaters-lock-dialog.tar.gz gnome-screensaver-0.0.23.tar.bz2 gnome-screensaver-0.0.24.tar.bz2 +gnome-screensaver-2.13.5.tar.bz2 Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- gnome-screensaver.spec 13 Jan 2006 19:31:18 -0000 1.43 +++ gnome-screensaver.spec 17 Jan 2006 17:31:06 -0000 1.44 @@ -1,5 +1,5 @@ -%define gtk2_version 2.6.0 +%define gtk2_version 2.7.0 %define gnome_vfs2_version 2.6.0 %define libgnomeui_version 2.6.0 %define libglade2_version 2.5.0 @@ -8,10 +8,12 @@ %define gconf2_version 2.6.1 %define redhat_menus_version 5.0.1 %define system_logos_version 1.1.37 +%define gnome_menus_version 2.11.1 +%define libexif_version 0.6.12 Summary: GNOME Sreensaver Name: gnome-screensaver -Version: 0.0.24 +Version: 2.13.5 Release: 1 License: GPL Group: Amusement/Graphics @@ -33,6 +35,8 @@ BuildRequires: libglade2-devel => %{libglade2_version} BuildRequires: libxml2-devel >= %{libxml2_version} BuildRequires: GConf2-devel >= %{gconf2_version} +BuildRequires: gnome-menus-devel >= %{gnome_menus_version} +BuildRequires: libexif-devel >= %{libexif_version} BuildRequires: pam-devel BuildRequires: libX11-devel, libXScrnSaver-devel, libXext-devel BuildRequires: libXinerama-devel @@ -118,6 +122,9 @@ %{_sysconfdir}/pam.d/* %changelog +* Tue Jan 17 2006 Matthias Clasen - 2.13.5-1 +- Update to 2.13.5 + * Fri Jan 13 2006 Matthias Clasen - 0.0.24-1 - Update to 0.0.24 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Jan 2006 19:31:18 -0000 1.12 +++ sources 17 Jan 2006 17:31:07 -0000 1.13 @@ -1,2 +1,2 @@ 3f0250f7f2b0de901ddc3760a4f942b6 fedoralogo-floaters-lock-dialog.tar.gz -767ac5360e7ba1c218cad725b21f78e1 gnome-screensaver-0.0.24.tar.bz2 +2ab5b1c5b432f6b763f40c3a4a2b1c94 gnome-screensaver-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 17:36:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 12:36:13 -0500 Subject: rpms/at-spi/devel .cvsignore, 1.15, 1.16 at-spi.spec, 1.22, 1.23 sources, 1.15, 1.16 Message-ID: <200601171736.k0HHaDVc010180@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/at-spi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10164 Modified Files: .cvsignore at-spi.spec sources Log Message: 1.7.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 17 Jan 2006 01:18:29 -0000 1.15 +++ .cvsignore 17 Jan 2006 17:36:03 -0000 1.16 @@ -5,3 +5,4 @@ at-spi-1.6.4.tar.bz2 at-spi-1.6.6.tar.bz2 at-spi-1.7.0.tar.bz2 +at-spi-1.7.1.tar.bz2 Index: at-spi.spec =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- at-spi.spec 17 Jan 2006 01:18:29 -0000 1.22 +++ at-spi.spec 17 Jan 2006 17:36:03 -0000 1.23 @@ -6,7 +6,7 @@ Summary: Assistive Technology Service Provider Interface Name: at-spi -Version: 1.7.0 +Version: 1.7.1 Release: 1 URL: http://developer.gnome.org/projects/gap/ Source0: %{name}-%{version}.tar.bz2 @@ -87,8 +87,8 @@ %{_includedir}/* %changelog -* Mon Jan 16 2006 Matthias Clasen 1.7.0-1 -- Update to 1.7.0 +* Tue Jan 17 2006 Matthias Clasen 1.7.1-1 +- Update to 1.7.1 * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 17 Jan 2006 01:18:29 -0000 1.15 +++ sources 17 Jan 2006 17:36:03 -0000 1.16 @@ -1 +1 @@ -86add745eeee0de1d41be345c5fc571f at-spi-1.7.0.tar.bz2 +12fe91d821ae88ee2a4dff807094b5dc at-spi-1.7.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 17:44:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 12:44:24 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.44,1.45 Message-ID: <200601171744.k0HHiOjH010314@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10302 Modified Files: gnome-screensaver.spec Log Message: Fix file lists Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- gnome-screensaver.spec 17 Jan 2006 17:31:06 -0000 1.44 +++ gnome-screensaver.spec 17 Jan 2006 17:44:20 -0000 1.45 @@ -114,7 +114,6 @@ %{_datadir}/applications/gnome-screensaver-preferences.desktop %{_datadir}/gnome-screensaver/* %{_datadir}/pixmaps/backgrounds/* -%{_datadir}/pixmaps/* %{_datadir}/desktop-directories/gnome-screensaver.directory %{_sysconfdir}/gconf/schemas/*.schemas %{_sysconfdir}/xdg/menus/preferences-post-merged/* From fedora-cvs-commits at redhat.com Tue Jan 17 17:49:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 12:49:01 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.45,1.46 Message-ID: <200601171749.k0HHn1YT022597@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22582 Modified Files: gnome-screensaver.spec Log Message: fix file lists Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gnome-screensaver.spec 17 Jan 2006 17:44:20 -0000 1.45 +++ gnome-screensaver.spec 17 Jan 2006 17:48:59 -0000 1.46 @@ -114,6 +114,7 @@ %{_datadir}/applications/gnome-screensaver-preferences.desktop %{_datadir}/gnome-screensaver/* %{_datadir}/pixmaps/backgrounds/* +%{_datadir}/pixmaps/gnome-logo-white.svg %{_datadir}/desktop-directories/gnome-screensaver.directory %{_sysconfdir}/gconf/schemas/*.schemas %{_sysconfdir}/xdg/menus/preferences-post-merged/* From fedora-cvs-commits at redhat.com Tue Jan 17 17:52:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 12:52:35 -0500 Subject: rpms/dasher/devel dasher.spec,1.21,1.22 Message-ID: <200601171752.k0HHqZpr022701@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22683 Modified Files: dasher.spec Log Message: grr Index: dasher.spec =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- dasher.spec 17 Jan 2006 02:25:35 -0000 1.21 +++ dasher.spec 17 Jan 2006 17:52:32 -0000 1.22 @@ -7,7 +7,7 @@ URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 Patch0: dasher-3.99.1-export.patch -Patch1: dasher-3.99.1-c++.patch +#Patch1: dasher-3.99.1-c++.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gnome-speech-devel @@ -26,7 +26,7 @@ %prep %setup -q %patch0 -p1 -b .export -%patch1 -p1 -b .c++ +#%patch1 -p1 -b .c++ %build From fedora-cvs-commits at redhat.com Tue Jan 17 18:05:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 13:05:15 -0500 Subject: rpms/gcc/devel gcc41-ppc-libffi.patch, NONE, 1.1 gcc41-pr25717.patch, NONE, 1.1 gcc41-rh177918.patch, NONE, 1.1 .cvsignore, 1.125, 1.126 gcc41.spec, 1.16, 1.17 sources, 1.127, 1.128 gcc41-gomp-lastprivate-static.patch, 1.1, NONE gcc41-pr24940.patch, 1.1, NONE gcc41-pr25535.patch, 1.1, NONE gcc41-rh176562.patch, 1.1, NONE Message-ID: <200601171805.k0HI5FZH000886@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv823 Modified Files: .cvsignore gcc41.spec sources Added Files: gcc41-ppc-libffi.patch gcc41-pr25717.patch gcc41-rh177918.patch Removed Files: gcc41-gomp-lastprivate-static.patch gcc41-pr24940.patch gcc41-pr25535.patch gcc41-rh176562.patch Log Message: 4.1.0-0.15 gcc41-ppc-libffi.patch: ppc_closure.S | 62 ++++++++++++++++++++++++++-------------------------------- sysv.S | 10 +++++++-- 2 files changed, 36 insertions(+), 36 deletions(-) --- NEW FILE gcc41-ppc-libffi.patch --- On Tue, Jul 19, 2005 at 11:19:14PM +0200, Andreas Tobler wrote: > > >Okay with those changes. > > > >Thanks, David > > I committed the attached. > Thanks David, for review. 2005-07-19 Andreas Tobler * Makefile.am (nodist_libffi_la_SOURCES): Add POWERPC_FREEBSD. * Makefile.in: Regenerate. * include/Makefile.in: Likewise. * testsuite/Makefile.in: Likewise. * configure.ac: Add POWERPC_FREEBSD rules. * configure: Regenerate. * src/powerpc/ffitarget.h: Add POWERPC_FREEBSD rules. (FFI_SYSV_TYPE_SMALL_STRUCT): Define. * src/powerpc/ffi.c: Add flags to handle small structure returns in ffi_call_SYSV. (ffi_prep_cif_machdep): Handle small structures for SYSV 4 ABI. Aka FFI_SYSV. (ffi_closure_helper_SYSV): Likewise. * src/powerpc/ppc_closure.S: Add return types for small structures. * src/powerpc/sysv.S: Add bits to handle small structures for final SYSV 4 ABI. This patch broke libffi on powerpc*-linux, because the > + lwz %r3,0(%r6) > + lwz %r4,4(%r6) > + bl __lshrdi3 # libgcc function to shift r3/r4, shift value in r5. > + b .Lfinish and > + rlwinm %r5,%r31,5+23,32-5,31 /* Extract the value to shift. */ > + bl __ashldi3 /* libgcc function to shift r3/r4, > + shift value in r5. */ calls aren't PLT calls even in libffi.so and libffi_convenience.a. This in turn makes libgcj.so.7 a DT_TEXTREL library and a) in largish Java programs the relocation can easily fail, libgcc_s.so.1 can be mapped too far from libgcj.so.7 b) SELinux policy might by default refuse textrel libraries, unless whitelisted Simply adding @plt is not an option, because that would still be broken on -msecure-plt builds. So, either we'd need to add configury stuff to detect -msecure-plt support in the assembler, conditionally add the: bcl 20,31,.LCF0 .LCF0: stw 30,8(1) mflr 30 ... addis 30,30,_GLOBAL_OFFSET_TABLE_-.LCF0 at ha addi 30,30,_GLOBAL_OFFSET_TABLE_-.LCF0 at l etc. stuff and make the 2 calls @plt, or we can inline the calls. The latter is done by the attached patch. The __ashldi3 inline call can be simplified, because we know %r5 must be 0, 8, 16 or 24, so it will be also faster than __ashldi3, even when not counting the overhead of a PLT call. For the closure, the small struct reg passing patch added IMHO completely unnecessarily 7 instructions to the fast path - returning small structs is pretty rare and those insns would be wasting time for all return types. For 1, 2, 3, 4 and 8 byte structs we can easily fit the insn sequences into the 4 insn slots and don't need to run through lots of nops. For 5, 6 and 7 byte structs 4 insns is not enough, but in that case we know the shift count is only 8, 16 or 24, so the __lshrdi3 operation can be simplified even further and inlined. I don't have access to powerpc*-*-freebsd*, so I have just briefly tested the sysv.S change with powerpc64-*-linux -> powerpc*-*-freebsd* cross compiling and writing my own testcase that called the freebsd cross compiler compiled routines, but I haven't really tested the ppc_closure.S bits (I ran make check on powerpc64-*-linux* -m32, but that doesn't test those bits). Can anyone please test this on powerpc*-*-freebsd*? Ok for trunk/4.1 if that testing succeeds? 2006-01-17 Jakub Jelinek * src/powerpc/sysv.S (smst_two_register): Don't call __ashldi3, instead do the shifting inline. * src/powerpc/ppc_closure.S (ffi_closure_SYSV): Don't compute %r5 shift count unconditionally. Simplify load sequences for 1, 2, 3, 4 and 8 byte structs, for the remaining struct sizes don't call __lshrdi3, instead do the shifting inline. --- libffi/src/powerpc/sysv.S.jj 2005-11-12 18:08:36.000000000 +0100 +++ libffi/src/powerpc/sysv.S 2006-01-17 13:36:16.000000000 +0100 @@ -140,8 +140,14 @@ L(smst_one_register): b L(done_return_value) L(smst_two_register): rlwinm %r5,%r31,5+23,32-5,31 /* Extract the value to shift. */ - bl __ashldi3 /* libgcc function to shift r3/r4, - shift value in r5. */ + cmpwi %r5,0 + subfic %r9,%r5,32 + slw %r29,%r3,%r5 + srw %r9,%r4,%r9 + beq- L(smst_8byte) + or %r3,%r9,%r29 + slw %r4,%r4,%r5 +L(smst_8byte): stw %r3,0(%r30) stw %r4,4(%r30) b L(done_return_value) --- libffi/src/powerpc/ppc_closure.S.jj 2005-11-12 18:08:36.000000000 +0100 +++ libffi/src/powerpc/ppc_closure.S 2006-01-17 13:59:59.000000000 +0100 @@ -63,19 +63,6 @@ ENTRY(ffi_closure_SYSV) # so use it to look up in a table # so we know how to deal with each type - # Extract the size of the return type for small structures. - # Then calculate (4 - size) and multiply the result by 8. - # This gives the value needed for the shift operation below. - # This part is only needed for FFI_SYSV and small structures. - addi %r5,%r3,-(FFI_SYSV_TYPE_SMALL_STRUCT) - cmpwi cr0,%r5,4 - ble cr0,.Lnext - addi %r5,%r5,-4 -.Lnext: - addi %r5,%r5,-4 - neg %r5,%r5 - slwi %r5,%r5,3 - # look up the proper starting point in table # by using return type as offset addi %r6,%r1,112 # get pointer to results area @@ -207,66 +194,66 @@ ENTRY(ffi_closure_SYSV) # case FFI_SYSV_TYPE_SMALL_STRUCT + 1. One byte struct. .Lret_type15: # fall through. - nop - nop + lbz %r3,0(%r6) + b .Lfinish nop nop # case FFI_SYSV_TYPE_SMALL_STRUCT + 2. Two byte struct. .Lret_type16: # fall through. - nop - nop + lhz %r3,0(%r6) + b .Lfinish nop nop # case FFI_SYSV_TYPE_SMALL_STRUCT + 3. Three byte struct. .Lret_type17: # fall through. - nop - nop - nop + lwz %r3,0(%r6) + srwi %r3,%r3,8 + b .Lfinish nop # case FFI_SYSV_TYPE_SMALL_STRUCT + 4. Four byte struct. .Lret_type18: # this one handles the structs from above too. lwz %r3,0(%r6) - srw %r3,%r3,%r5 b .Lfinish nop + nop # case FFI_SYSV_TYPE_SMALL_STRUCT + 5. Five byte struct. .Lret_type19: # fall through. - nop - nop - nop - nop + lwz %r3,0(%r6) + lwz %r4,4(%r6) + li %r5,24 + b .Lstruct567 # case FFI_SYSV_TYPE_SMALL_STRUCT + 6. Six byte struct. .Lret_type20: # fall through. - nop - nop - nop - nop + lwz %r3,0(%r6) + lwz %r4,4(%r6) + li %r5,16 + b .Lstruct567 # case FFI_SYSV_TYPE_SMALL_STRUCT + 7. Seven byte struct. .Lret_type21: # fall through. - nop - nop - nop - nop + lwz %r3,0(%r6) + lwz %r4,4(%r6) + li %r5,8 + b .Lstruct567 # case FFI_SYSV_TYPE_SMALL_STRUCT + 8. Eight byte struct. .Lret_type22: # this one handles the above unhandled structs. lwz %r3,0(%r6) lwz %r4,4(%r6) - bl __lshrdi3 # libgcc function to shift r3/r4, shift value in r5. b .Lfinish + nop # case done .Lfinish: @@ -275,6 +262,13 @@ ENTRY(ffi_closure_SYSV) mtlr %r0 addi %r1,%r1,144 blr + +.Lstruct567: + slw %r0,%r3,%r5 + srw %r4,%r4,%r5 + srw %r3,%r3,%r5 + or %r4,%r0,%r4 + b .Lfinish END(ffi_closure_SYSV) .section ".eh_frame",EH_FRAME_FLAGS, at progbits Jakub gcc41-pr25717.patch: init.c | 8 +++++++- macro.c | 14 +++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) --- NEW FILE gcc41-pr25717.patch --- Hi! PR25717 complains that gcc -E -dD -xc /dev/null doesn't print __STDC__ macro definition like it used to do up to GCC 3.2. __STDC__ macro still won't be printed on Solaris/Interix with -dD/-dM and when not using one of the pedantic standards (-std=c89, -std=c99, etc.), but in that case it is IMHO desirable, because __STDC__ doesn't act as a normal macro in that case, and it also matches GCC 3.2 behaviour which had: #ifdef STDC_0_IN_SYSTEM_HEADERS B("__STDC__", BT_STDC), #else C("__STDC__", "1"), #endif Ok for 4.0/4.1/trunk? 2006-01-16 Jakub Jelinek PR preprocessor/25717 * init.c (cpp_init_builtins): If __STDC__ will not change value between system headers and other sources, define it as a normal macro rather than a builtin. * macro.c (_cpp_builtin_macro_text) : Only check cpp_in_system_header condition. --- libcpp/init.c.jj 2005-11-09 22:09:47.000000000 +0100 +++ libcpp/init.c 2006-01-16 14:28:53.000000000 +0100 @@ -357,8 +357,14 @@ cpp_init_builtins (cpp_reader *pfile, in if (CPP_OPTION (pfile, traditional)) n -= 2; + else if (! CPP_OPTION (pfile, stdc_0_in_system_headers) + || CPP_OPTION (pfile, std)) + { + n--; + _cpp_define_builtin (pfile, "__STDC__ 1"); + } - for(b = builtin_array; b < builtin_array + n; b++) + for (b = builtin_array; b < builtin_array + n; b++) { cpp_hashnode *hp = cpp_lookup (pfile, b->name, b->len); hp->type = NT_MACRO; --- libcpp/macro.c.jj 2006-01-05 10:00:21.000000000 +0100 +++ libcpp/macro.c 2006-01-16 14:25:57.000000000 +0100 @@ -169,16 +169,12 @@ _cpp_builtin_macro_text (cpp_reader *pfi However, if (a) we are in a system header, (b) the option stdc_0_in_system_headers is true (set by target config), and (c) we are not in strictly conforming mode, then it has the - value 0. */ + value 0. (b) and (c) is already checked in cpp_init_builtins. */ case BT_STDC: - { - if (cpp_in_system_header (pfile) - && CPP_OPTION (pfile, stdc_0_in_system_headers) - && !CPP_OPTION (pfile,std)) - number = 0; - else - number = 1; - } + if (cpp_in_system_header (pfile)) + number = 0; + else + number = 1; break; case BT_DATE: Jakub gcc41-rh177918.patch: cp/search.c | 2 +- testsuite/g++.dg/parse/lookup5.C | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) --- NEW FILE gcc41-rh177918.patch --- Hi! On the attached testcase we ICE in lookup_conversions_r, parent_convs is NULL. The code was introduced by Nathan for 4.0+ with http://gcc.gnu.org/ml/gcc-patches/2004-07/msg02102.html and to me, without deep understanding what exactly it is doing, it looks like a pasto from a few lines above it and indeed changing it fixes the testcase. Is my guess right (I'm really not familiar with that part of C+ FE)? If so, is this ok for 4.0/4.1/trunk after testing? 2006-01-17 Jakub Jelinek * search.c (lookup_conversions_r): Fix a pasto. * g++.dg/parse/lookup5.C: New test. --- gcc/cp/search.c.jj 2005-10-28 22:59:33.000000000 +0200 +++ gcc/cp/search.c 2006-01-17 16:34:38.000000000 +0100 @@ -2355,7 +2355,7 @@ lookup_conversions_r (tree binfo, { parent_tpl_convs = tree_cons (binfo, my_tpl_convs, parent_tpl_convs); if (virtual_depth) - TREE_STATIC (parent_convs) = 1; + TREE_STATIC (parent_tpl_convs) = 1; } child_convs = other_convs; --- gcc/testsuite/g++.dg/parse/lookup5.C.jj 2006-01-17 16:42:26.000000000 +0100 +++ gcc/testsuite/g++.dg/parse/lookup5.C 2006-01-17 16:42:36.000000000 +0100 @@ -0,0 +1,26 @@ +// { dg-do compile } + +struct A {}; + +template struct B +{ + T a, b; + B() {} + B(T x, T y) : a(x), b(y) {} + template operator B () const + { return B((U)(this->a), (U)(this->b)); } +}; + +template struct C : public B +{ + T *c; + inline T & operator *() { return *c; } +}; + +template struct D : virtual public C { }; + +void +foo (D x) +{ + *x; +} Jakub Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- .cvsignore 6 Jan 2006 09:12:36 -0000 1.125 +++ .cvsignore 17 Jan 2006 18:05:12 -0000 1.126 @@ -1 +1 @@ -gcc-4.1.0-20060106.tar.bz2 +gcc-4.1.0-20060117.tar.bz2 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gcc41.spec 6 Jan 2006 09:12:36 -0000 1.16 +++ gcc41.spec 17 Jan 2006 18:05:12 -0000 1.17 @@ -1,6 +1,6 @@ -%define DATE 20060106 +%define DATE 20060117 %define gcc_version 4.1.0 -%define gcc_release 0.14 +%define gcc_release 0.15 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 @@ -95,11 +95,10 @@ Patch14: gcc41-ppc64-sync.patch Patch15: gcc41-ppc32-retaddr.patch Patch16: gcc41-s390-atomic1.patch -Patch17: gcc41-gomp-lastprivate-static.patch -Patch18: gcc41-pr25535.patch +Patch17: gcc41-ppc-libffi.patch +Patch18: gcc41-pr25717.patch Patch19: gcc41-pr25324.patch -Patch20: gcc41-rh176562.patch -Patch21: gcc41-pr24940.patch +Patch20: gcc41-rh177918.patch %define _gnu %{nil} %ifarch sparc @@ -446,11 +445,10 @@ %patch14 -p0 -b .ppc64-sync~ %patch15 -p0 -b .ppc32-retaddr~ %patch16 -p0 -b .s390-atomic1~ -%patch17 -p0 -b .gomp-lastprivate-static~ -%patch18 -p0 -b .pr25535~ +%patch17 -p0 -b .ppc-libffi~ +%patch18 -p0 -b .pr25717~ %patch19 -p0 -b .pr25324~ -%patch20 -p0 -b .rh176562~ -%patch21 -p0 -b .pr24940~ +%patch20 -p0 -b .rh177918~ sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1536,6 +1534,25 @@ %endif %changelog +* Tue Jan 17 2006 Jakub Jelinek 4.1.0-0.15 +- update from gcc-4_1-branch (-r109401:109815) + - PRs c++/24824, c++/25386, c++/25663, c/25682, classpath/25803, + fortran/12456, fortran/20868, fortran/20870, fortran/21256, + fortran/21977, fortran/22146, fortran/24640, fortran/25029, + fortran/25093, fortran/25101, fortran/25486, fortran/25598, + fortran/25730, libgcj/21637, libgcj/23499, libgfortran/25598, + libstdc++/23591, libstdc++/25472, rtl-optimization/24257, + rtl-optimization/25367, rtl-optimization/25662, target/20754, + target/25042, target/25168, testsuite/25728, testsuite/25777, + tree-opt/24365, tree-optimization/23109, tree-optimization/23948, + tree-optimization/24123, tree-optimization/25125 +- update from gomp-20050608-branch (up to -r109816) +- fix ppc32 libffi (#177655) +- fix lookup_conversions_r (#177918) +- define __STDC__ as a normal macro rather than a preprocessor builtin + unless it needs to change its value between system and non-system + headers (PR preprocessor/25717) + * Fri Jan 6 2006 Jakub Jelinek 4.1.0-0.14 - update from gcc-4_1-branch (-r109369:109401) - PR fortran/23675 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- sources 6 Jan 2006 09:12:36 -0000 1.127 +++ sources 17 Jan 2006 18:05:12 -0000 1.128 @@ -1 +1 @@ -b2a01514112261eafd8c302d347ef632 gcc-4.1.0-20060106.tar.bz2 +893769a66a2abbeda6d0bbacace7f9c2 gcc-4.1.0-20060117.tar.bz2 --- gcc41-gomp-lastprivate-static.patch DELETED --- --- gcc41-pr24940.patch DELETED --- --- gcc41-pr25535.patch DELETED --- --- gcc41-rh176562.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 17 18:06:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 13:06:05 -0500 Subject: rpms/iproute/devel .cvsignore, 1.16, 1.17 iproute.spec, 1.42, 1.43 sources, 1.16, 1.17 Message-ID: <200601171806.k0HI65Ah001040@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/iproute/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv998 Modified Files: .cvsignore iproute.spec sources Log Message: - upgrade to 2.6.15-060110 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/iproute/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 10 Nov 2005 07:50:52 -0000 1.16 +++ .cvsignore 17 Jan 2006 18:06:01 -0000 1.17 @@ -1,2 +1 @@ -iproute2-051007.tar.gz -iproute2-2.6.14-051107.tar.gz +iproute2-2.6.15-060110.tar.gz Index: iproute.spec =================================================================== RCS file: /cvs/dist/rpms/iproute/devel/iproute.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- iproute.spec 12 Dec 2005 06:45:14 -0000 1.42 +++ iproute.spec 17 Jan 2006 18:06:02 -0000 1.43 @@ -1,10 +1,10 @@ -%define date_version 051107 +%define date_version 060110 %define cbq_version v0.7.3 Summary: Advanced IP routing and network device configuration tools. Name: iproute -Version: 2.6.14 -Release: 11 +Version: 2.6.15 +Release: 1 Group: Applications/System Source: http://developer.osdl.org/dev/iproute2/download/iproute2-%{version}-%{date_version}.tar.gz URL: http://linux-net.osdl.org/index.php/Iproute2 @@ -85,6 +85,9 @@ %config(noreplace) /etc/sysconfig/cbq/* %changelog +* Tue Jan 17 2006 Radek Vokal 2.6.15-1 +- upgrade to 2.6.15-060110 + * Mon Dec 12 2005 Radek Vokal 2.6.14-11 - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/iproute/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 10 Nov 2005 07:50:52 -0000 1.16 +++ sources 17 Jan 2006 18:06:02 -0000 1.17 @@ -1,2 +1 @@ -53f47d46f50eff9ed8c6fa2ac2b41a80 iproute2-051007.tar.gz -756a160a6d9c72d2ee2d29b1ede8ffab iproute2-2.6.14-051107.tar.gz +04f57a6d366d36426d276178b600f5c5 iproute2-2.6.15-060110.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 17 18:27:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 13:27:15 -0500 Subject: rpms/fedora-logos/devel .cvsignore, 1.19, 1.20 fedora-logos.spec, 1.21, 1.22 sources, 1.20, 1.21 Message-ID: <200601171827.k0HIRFIQ018732@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/fedora-logos/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18659 Modified Files: .cvsignore fedora-logos.spec sources Log Message: - add logo bits of new gdm theme Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 20 Dec 2005 21:33:57 -0000 1.19 +++ .cvsignore 17 Jan 2006 18:27:11 -0000 1.20 @@ -1 +1 @@ -fedora-logos-1.1.37.tar.bz2 +fedora-logos-1.1.38.tar.bz2 Index: fedora-logos.spec =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fedora-logos.spec 20 Dec 2005 21:33:57 -0000 1.21 +++ fedora-logos.spec 17 Jan 2006 18:27:11 -0000 1.22 @@ -1,6 +1,6 @@ Name: fedora-logos Summary: Red Hat-related icons and pictures. -Version: 1.1.37 +Version: 1.1.38 Release: 1 Group: System Environment/Base Source0: fedora-logos-%{version}.tar.bz2 @@ -90,10 +90,16 @@ done mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/themes/Bluecurve -for i in gdm/* ; do +for i in gdm/Bluecurve/* ; do install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gdm/themes/Bluecurve done +mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/themes/FedoraBubbles +for i in gdm/FedoraBubbles/* ; do + install -m 644 $i $RPM_BUILD_ROOT%{_datadir}/gdm/themes/FedoraBubbles +done + + # kdmtheme mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/kdm/themes/Bluecurve pushd $RPM_BUILD_ROOT%{_datadir}/apps/kdm/themes/Bluecurve @@ -129,6 +135,9 @@ # end i386 bits %changelog +* Tue Jan 17 2006 Ray Strode - 1.1.38-1 +- add logo bits of new gdm theme + * Tue Dec 20 2005 Ray Strode - 1.1.37-1 - another new image from dfong (splash screen) - move screensaver lock dialog background here Index: sources =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 20 Dec 2005 21:33:57 -0000 1.20 +++ sources 17 Jan 2006 18:27:11 -0000 1.21 @@ -1 +1 @@ -5b11c726ea9b337678b34a45527abbc5 fedora-logos-1.1.37.tar.bz2 +75faf02ce5382a6e308390cb2c84867d fedora-logos-1.1.38.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 18:41:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 13:41:19 -0500 Subject: rpms/gdm/devel gdm-2.13.0.4-change-defaults.patch, 1.2, 1.3 gdm.spec, 1.114, 1.115 Message-ID: <200601171841.k0HIfJcJ022664@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22607 Modified Files: gdm-2.13.0.4-change-defaults.patch gdm.spec Log Message: - add new theme by Diana Fong, M??ir??n Duffy, and me gdm-2.13.0.4-change-defaults.patch: gdm.conf.in | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) Index: gdm-2.13.0.4-change-defaults.patch =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm-2.13.0.4-change-defaults.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gdm-2.13.0.4-change-defaults.patch 9 Jan 2006 19:27:38 -0000 1.2 +++ gdm-2.13.0.4-change-defaults.patch 17 Jan 2006 18:41:14 -0000 1.3 @@ -1,6 +1,6 @@ ---- gdm-2.13.0.4/config/gdm.conf.in.change-defaults 2005-12-20 21:22:36.000000000 -0500 -+++ gdm-2.13.0.4/config/gdm.conf.in 2006-01-09 14:03:14.000000000 -0500 -@@ -59,9 +59,9 @@ TimedLoginDelay=30 +--- gdm-2.13.0.5/config/gdm.conf.in.change-defaults 2006-01-06 18:41:05.000000000 -0500 ++++ gdm-2.13.0.5/config/gdm.conf.in 2006-01-17 13:38:55.000000000 -0500 +@@ -59,9 +59,9 @@ # should leave this alone. #Chooser=@EXPANDED_LIBEXECDIR@/gdmchooser @@ -13,7 +13,7 @@ # The greeter for xdmcp logins, usually you want a less graphically intensive # greeter here so it's better to leave this with gdmlogin -@@ -78,11 +78,11 @@ TimedLoginDelay=30 +@@ -78,11 +78,11 @@ # Default path to set. The profile scripts will likely override this value. # This value will be overridden with the value from /etc/default/login if it # contains "ROOT=". @@ -27,7 +27,7 @@ # If you are having trouble with using a single server for a long time and want # GDM to kill/restart the server, turn this on. On Solaris, this value is -@@ -116,22 +116,22 @@ DisplayInitDir=@EXPANDED_SYSCONFDIR@/gdm +@@ -116,22 +116,22 @@ XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing # Reboot, Halt and suspend commands, you can add different commands separated # by a semicolon. GDM will use the first one it can find. @@ -54,7 +54,7 @@ # Better leave this blank and HOME will be used. You can use syntax ~/ below # to indicate home directory of the user. You can also set this to something # like /tmp if you don't want the authorizations to be in home directories. -@@ -280,7 +280,7 @@ Enable=false +@@ -280,7 +280,7 @@ #GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc # The GTK+ theme to use for the GUI. @@ -63,7 +63,7 @@ # If to allow changing the GTK+ (widget) theme from the greeter. Currently # this only affects the standard greeter as the graphical greeter does not yet # have this ability. -@@ -297,7 +297,7 @@ Enable=false +@@ -297,7 +297,7 @@ [greeter] # Greeter has a nice title bar that the user can move. @@ -72,7 +72,7 @@ # Configuration is available from the system menu of the greeter. #ConfigAvailable=false # Face browser is enabled. This only works currently for the standard greeter -@@ -308,7 +308,7 @@ Browser=false +@@ -308,7 +308,7 @@ # User ID's less than the MinimalUID value will not be included in the face # browser or in the gdmselection list for Automatic/Timed login. They will not # be displayed regardless of the settings for Include and Exclude. @@ -81,7 +81,7 @@ # Users listed in Include will be included in the face browser and in the # gdmsetup selection list for Automatic/Timed login. Users should be separated # by commas. -@@ -333,7 +333,7 @@ Browser=false +@@ -333,7 +333,7 @@ # file, although GDM will be able to read a standard locale.alias file as well. #LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias # Logo shown in the standard greeter. @@ -90,7 +90,7 @@ # Logo shown on file chooser button in gdmsetup (do not modify this value). #ChooserButtonLogo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png # The standard greeter should shake if a user entered the wrong username or -@@ -381,7 +381,7 @@ DefaultRemoteWelcome=true +@@ -381,7 +381,7 @@ #BackgroundType=2 #BackgroundImage= #BackgroundScaleToFit=true @@ -99,7 +99,7 @@ # XDMCP session should only get a color, this is the sanest setting since you # don't want to take up too much bandwidth #BackgroundRemoteOnlyColor=true -@@ -394,7 +394,7 @@ DefaultRemoteWelcome=true +@@ -394,7 +394,7 @@ # Show the Failsafe sessions. These are much MUCH nicer (focus for xterm for # example) and more failsafe then those supplied by scripts so distros should # use this rather then just running an xterm from a script. @@ -108,12 +108,12 @@ #ShowXtermFailsafeSession=true # Normally there is a session type called 'Last' that is shown which refers to # the last session the user used. If off, we will be in 'switchdesk' mode -@@ -413,7 +413,7 @@ DefaultRemoteWelcome=true +@@ -413,7 +413,7 @@ # list that is delimited by /: to the GraphicalThemes key and set # GraphicalThemeRand to true. Otherwise use GraphicalTheme and specify just # one theme. -#GraphicalTheme=circles -+GraphicalTheme=Bluecurve ++GraphicalTheme=FedoraBubbles #GraphicalThemes=circles/:happygnome GraphicalThemeDir=@EXPANDED_DATADIR@/gdm/themes/ GraphicalThemeRand=false Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- gdm.spec 16 Jan 2006 17:27:58 -0000 1.114 +++ gdm.spec 17 Jan 2006 18:41:14 -0000 1.115 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager. Name: gdm Version: 2.13.0.4 -Release: 4 +Release: 5 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -60,7 +60,8 @@ Requires: /etc/pam.d/system-auth Requires: usermode Requires: /sbin/nologin -Requires: redhat-artwork >= 0:0.129-3 +Requires: fedora-logos >= 0:1.1.38-1 +Requires: redhat-artwork >= 0:0.234-1 Requires: /usr/share/desktop-menu-patches/gnome-gdmsetup.desktop Requires: xorg-x11-server-utils Requires: xorg-x11-xkb-utils @@ -306,6 +307,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Tue Jan 17 2006 Ray Strode - 1:2.13.0.4-5 +- add new theme by Diana Fong, M?ir?n Duffy, and me + * Mon Jan 16 2006 Ray Strode - 1:2.13.0.4-4 - improve migration snippet (bug 177443). From fedora-cvs-commits at redhat.com Tue Jan 17 19:15:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 14:15:01 -0500 Subject: rpms/libsetrans/devel .cvsignore, 1.18, 1.19 libsetrans.spec, 1.26, 1.27 sources, 1.23, 1.24 Message-ID: <200601171915.k0HJF1gH013989@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsetrans/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13950 Modified Files: .cvsignore libsetrans.spec sources Log Message: * Wed Jan 11 2006 Dan Walsh 0.1.18-1 - Return original context on translation failure Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 11 Jan 2006 19:03:19 -0000 1.18 +++ .cvsignore 17 Jan 2006 19:14:59 -0000 1.19 @@ -16,3 +16,4 @@ libsetrans-0.1.15.tgz libsetrans-0.1.16.tgz libsetrans-0.1.17.tgz +libsetrans-0.1.18.tgz Index: libsetrans.spec =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/libsetrans.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libsetrans.spec 11 Jan 2006 19:03:19 -0000 1.26 +++ libsetrans.spec 17 Jan 2006 19:14:59 -0000 1.27 @@ -1,6 +1,6 @@ Summary: SELinux Translation library Name: libsetrans -Version: 0.1.17 +Version: 0.1.18 Release: 1 License: LGPL Group: System Environment/Libraries @@ -51,6 +51,9 @@ %{_mandir}/man8/mcs.8.gz %changelog +* Wed Jan 11 2006 Dan Walsh 0.1.18-1 +- Return original context on translation failure + * Wed Jan 11 2006 Dan Walsh 0.1.17-1 - Fix range translations Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsetrans/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 11 Jan 2006 19:03:19 -0000 1.23 +++ sources 17 Jan 2006 19:14:59 -0000 1.24 @@ -1 +1 @@ -5e22e2129d450a4bd53a88fecd7ec521 libsetrans-0.1.17.tgz +ff25169478d6b97581e0c29b05d051a3 libsetrans-0.1.18.tgz From fedora-cvs-commits at redhat.com Tue Jan 17 19:40:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 14:40:19 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.24, 1.25 policy-20060104.patch, 1.13, 1.14 selinux-policy.spec, 1.84, 1.85 sources, 1.26, 1.27 Message-ID: <200601171940.k0HJeJLW001791@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1745 Modified Files: .cvsignore policy-20060104.patch selinux-policy.spec sources Log Message: * Tue Jan 17 2006 Dan Walsh 2.1.12-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 17 Jan 2006 03:55:13 -0000 1.24 +++ .cvsignore 17 Jan 2006 19:40:15 -0000 1.25 @@ -25,3 +25,4 @@ serefpolicy-2.1.9.tgz serefpolicy-2.1.10.tgz serefpolicy-2.1.11.tgz +serefpolicy-2.1.12.tgz policy-20060104.patch: Makefile | 2 +- policy/modules/apps/wine.fc | 2 ++ policy/modules/apps/wine.if | 23 +++++++++++++++++++++++ policy/modules/apps/wine.te | 27 +++++++++++++++++++++++++++ policy/modules/kernel/kernel.if | 1 + policy/modules/kernel/mls.te | 1 + policy/modules/services/dovecot.te | 1 + policy/modules/services/hal.te | 3 +++ policy/modules/system/selinuxutil.te | 1 + policy/users | 8 +++++--- 10 files changed, 65 insertions(+), 4 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- policy-20060104.patch 17 Jan 2006 03:55:13 -0000 1.13 +++ policy-20060104.patch 17 Jan 2006 19:40:15 -0000 1.14 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.11/Makefile +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.12/Makefile --- nsaserefpolicy/Makefile 2006-01-13 09:48:25.000000000 -0500 -+++ serefpolicy-2.1.11/Makefile 2006-01-16 22:32:53.000000000 -0500 ++++ serefpolicy-2.1.12/Makefile 2006-01-17 14:23:22.000000000 -0500 @@ -92,7 +92,7 @@ # enable MLS if requested. @@ -10,69 +10,15 @@ override CHECKPOLICY += -M override CHECKMODULE += -M endif -diff --exclude-from=exclude -N -u -r nsaserefpolicy/man/man8/ftpd_selinux.8 serefpolicy-2.1.11/man/man8/ftpd_selinux.8 ---- nsaserefpolicy/man/man8/ftpd_selinux.8 2006-01-06 17:55:17.000000000 -0500 -+++ serefpolicy-2.1.11/man/man8/ftpd_selinux.8 2006-01-16 22:32:53.000000000 -0500 -@@ -16,9 +16,9 @@ - .TP - chcon -t public_content_rw_t /var/ftp/incoming - .TP --You must also turn on the boolean allow_ftp_anon_write. -+You must also turn on the boolean allow_ftpd_anon_write. - .TP --setsebool -P allow_ftp_anon_write=1 -+setsebool -P allow_ftpd_anon_write=1 - .TP - If you want to make this permanant, i.e. survive a relabel, you must add an entry to the file_contexts.local file. - .TP -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.1.11/policy/modules/admin/kudzu.te ---- nsaserefpolicy/policy/modules/admin/kudzu.te 2006-01-13 17:06:02.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/admin/kudzu.te 2006-01-16 22:32:53.000000000 -0500 -@@ -63,6 +63,7 @@ - fs_write_ramfs_socket(kudzu_t) - - mls_file_read_up(kudzu_t) -+mls_file_write_down(kudzu_t) - - modutils_read_mods_deps(kudzu_t) - modutils_read_module_conf(kudzu_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.1.11/policy/modules/admin/readahead.te ---- nsaserefpolicy/policy/modules/admin/readahead.te 2006-01-13 17:06:02.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/admin/readahead.te 2006-01-16 22:32:53.000000000 -0500 -@@ -35,6 +35,7 @@ - dev_getattr_all_chr_files(readahead_t) - dev_getattr_all_blk_files(readahead_t) - dev_dontaudit_read_all_blk_files(readahead_t) -+dev_dontaudit_getattr_memory_device(readahead_t) - - domain_use_wide_inherit_fd(readahead_t) - -@@ -46,6 +47,7 @@ - fs_search_auto_mountpoints(readahead_t) - fs_getattr_all_pipes(readahead_t) - fs_getattr_all_files(readahead_t) -+fs_search_ramfs(readahead_t) - - term_dontaudit_use_console(readahead_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.fc serefpolicy-2.1.11/policy/modules/apps/java.fc ---- nsaserefpolicy/policy/modules/apps/java.fc 2006-01-12 18:28:45.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/apps/java.fc 2006-01-16 22:32:53.000000000 -0500 -@@ -2,3 +2,5 @@ - # /usr - # - /usr(/.*)?/bin/java.* -- gen_context(system_u:object_r:java_exec_t,s0) -+/usr/bin/gij -- gen_context(system_u:object_r:java_exec_t,s0) -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.11/policy/modules/apps/wine.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.12/policy/modules/apps/wine.fc --- nsaserefpolicy/policy/modules/apps/wine.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/apps/wine.fc 2006-01-16 22:32:53.000000000 -0500 ++++ serefpolicy-2.1.12/policy/modules/apps/wine.fc 2006-01-17 14:23:22.000000000 -0500 @@ -0,0 +1,2 @@ +/usr/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.11/policy/modules/apps/wine.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.12/policy/modules/apps/wine.if --- nsaserefpolicy/policy/modules/apps/wine.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/apps/wine.if 2006-01-16 22:32:53.000000000 -0500 ++++ serefpolicy-2.1.12/policy/modules/apps/wine.if 2006-01-17 14:23:22.000000000 -0500 @@ -0,0 +1,23 @@ +## Load keyboard mappings. + @@ -97,9 +43,9 @@ + allow wine_t $1:fifo_file rw_file_perms; + allow wine_t $1:process sigchld; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.11/policy/modules/apps/wine.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.12/policy/modules/apps/wine.te --- nsaserefpolicy/policy/modules/apps/wine.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/apps/wine.te 2006-01-16 22:32:53.000000000 -0500 ++++ serefpolicy-2.1.12/policy/modules/apps/wine.te 2006-01-17 14:23:22.000000000 -0500 @@ -0,0 +1,27 @@ +policy_module(wine,1.0.0) + @@ -128,63 +74,21 @@ + allow wine_t file_type:file execmod; + +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/devices.if serefpolicy-2.1.11/policy/modules/kernel/devices.if ---- nsaserefpolicy/policy/modules/kernel/devices.if 2006-01-13 17:06:03.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/kernel/devices.if 2006-01-16 22:32:53.000000000 -0500 -@@ -2248,3 +2248,19 @@ - typeattribute $1 memory_raw_write, memory_raw_read; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.1.12/policy/modules/kernel/kernel.if +--- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-01-13 17:06:04.000000000 -0500 ++++ serefpolicy-2.1.12/policy/modules/kernel/kernel.if 2006-01-17 14:27:12.000000000 -0500 +@@ -1666,6 +1666,7 @@ + typeattribute $1 kern_unconfined; + + kernel_rw_all_sysctl($1) ++ kernel_sendrecv_unlabeled_association($1) ') -+######################################## -+## -+## dontaudit getattr raw memory devices (e.g. /dev/mem). -+## -+## -+## Domain allowed access. -+## -+# -+interface(`dev_dontaudit_getattr_memory_device',` -+ gen_require(` -+ type memory_device_t; -+ ') -+ -+ dontaudit $1 memory_device_t:chr_file getattr; -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.1.11/policy/modules/kernel/filesystem.if ---- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/kernel/filesystem.if 2006-01-16 22:32:53.000000000 -0500 -@@ -2282,6 +2282,26 @@ - - ######################################## - ## -+## dontaudit Read and write character nodes on tmpfs filesystems. -+## -+## -+## The type of the process performing this action. -+## -+# -+interface(`fs_dontaudit_use_tmpfs_chr_dev',` -+ gen_require(` -+ type tmpfs_t; -+ class dir r_dir_perms; -+ class chr_file rw_file_perms; -+ ') -+ -+ dontaudit $1 tmpfs_t:dir r_dir_perms; -+ dontaudit $1 tmpfs_t:chr_file rw_file_perms; -+') -+ -+ -+######################################## -+## - ## Relabel character nodes on tmpfs filesystems. - ## - ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.11/policy/modules/kernel/mls.te ---- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/kernel/mls.te 2006-01-16 22:32:53.000000000 -0500 -@@ -82,9 +82,11 @@ + ################################################################################ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.12/policy/modules/kernel/mls.te +--- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-17 13:22:13.000000000 -0500 ++++ serefpolicy-2.1.12/policy/modules/kernel/mls.te 2006-01-17 14:23:22.000000000 -0500 +@@ -83,6 +83,7 @@ # these might be targeted_policy only range_transition unconfined_t su_exec_t s0 - s0:c0.c255; range_transition unconfined_t initrc_exec_t s0; @@ -192,82 +96,9 @@ ') ifdef(`enable_mls',` - # run init with maximum MLS range - range_transition kernel_t init_exec_t s0 - s15:c0.c255; -+range_transition initrc_t auditd_exec_t s15:c0.c255; - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.1.11/policy/modules/services/apache.te ---- nsaserefpolicy/policy/modules/services/apache.te 2006-01-16 22:19:19.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/services/apache.te 2006-01-16 22:32:53.000000000 -0500 -@@ -693,3 +693,8 @@ - optional_policy(`nscd',` - nscd_use_socket(httpd_unconfined_script_t) - ') -+ -+optional_policy(`crond',` -+ cron_system_entry(httpd_t, httpd_exec_t) -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apm.te serefpolicy-2.1.11/policy/modules/services/apm.te ---- nsaserefpolicy/policy/modules/services/apm.te 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/services/apm.te 2006-01-16 22:32:53.000000000 -0500 -@@ -196,6 +196,7 @@ - ') - - optional_policy(`cron',` -+ cron_system_entry(apmd_t, apmd_exec_t) - cron_domtrans_anacron_system_job(apmd_t) - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.1.11/policy/modules/services/automount.te ---- nsaserefpolicy/policy/modules/services/automount.te 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/services/automount.te 2006-01-16 22:32:53.000000000 -0500 -@@ -108,6 +108,7 @@ - fs_manage_auto_mountpoints(automount_t) - - term_dontaudit_use_console(automount_t) -+term_dontaudit_getattr_pty_dir(automount_t) - - init_use_fd(automount_t) - init_use_script_pty(automount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cron.te serefpolicy-2.1.11/policy/modules/services/cron.te ---- nsaserefpolicy/policy/modules/services/cron.te 2006-01-16 22:19:19.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/services/cron.te 2006-01-16 22:32:53.000000000 -0500 -@@ -120,7 +120,7 @@ - - init_use_fd(crond_t) - init_use_script_pty(crond_t) --init_read_script_pid(crond_t) -+init_rw_script_pid(crond_t) - - libs_use_ld_so(crond_t) - libs_use_shared_libs(crond_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.1.11/policy/modules/services/cups.te ---- nsaserefpolicy/policy/modules/services/cups.te 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/services/cups.te 2006-01-16 22:32:53.000000000 -0500 -@@ -201,8 +201,7 @@ - ') - - optional_policy(`cron',` -- cron_use_fd(cupsd_t) -- cron_read_pipe(cupsd_t) -+ cron_system_entry(cupsd_t, cupsd_exec_t) - ') - - optional_policy(`dbus',` -@@ -580,8 +579,7 @@ - ') - - optional_policy(`cron',` -- cron_use_system_job_fd(cupsd_config_t) -- cron_read_pipe(cupsd_config_t) -+ cron_system_entry(cupsd_config_t, cupsd_config_exec_t) - ') - - optional_policy(`dbus',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.11/policy/modules/services/dovecot.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.12/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2006-01-13 17:06:05.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/services/dovecot.te 2006-01-16 22:32:53.000000000 -0500 ++++ serefpolicy-2.1.12/policy/modules/services/dovecot.te 2006-01-17 14:23:22.000000000 -0500 @@ -95,6 +95,7 @@ files_read_etc_files(dovecot_t) files_search_spool(dovecot_t) @@ -276,10 +107,10 @@ files_dontaudit_list_default(dovecot_t) init_use_fd(dovecot_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.11/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2006-01-13 17:06:05.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/services/hal.te 2006-01-16 22:39:09.000000000 -0500 -@@ -48,8 +48,13 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.12/policy/modules/services/hal.te +--- nsaserefpolicy/policy/modules/services/hal.te 2006-01-17 13:22:13.000000000 -0500 ++++ serefpolicy-2.1.12/policy/modules/services/hal.te 2006-01-17 14:23:22.000000000 -0500 +@@ -48,8 +48,11 @@ kernel_read_network_state(hald_t) kernel_read_kernel_sysctl(hald_t) kernel_read_fs_sysctl(hald_t) @@ -288,242 +119,13 @@ +mls_file_read_up(hald_t) + -+bootloader_getattr_boot_dir(hald_t) -+ - corecmd_exec_bin(hald_t) - corecmd_exec_sbin(hald_t) - -@@ -82,8 +87,8 @@ - files_exec_etc_files(hald_t) - files_read_etc_files(hald_t) - files_rw_etc_runtime_files(hald_t) --files_search_mnt(hald_t) - files_manage_mnt_dirs(hald_t) -+files_manage_mnt_files(hald_t) - files_search_var_lib(hald_t) - files_read_usr_files(hald_t) - # hal is now execing pm-suspend -@@ -158,6 +163,7 @@ - dbus_system_bus_client_template(hald,hald_t) - dbus_send_system_bus_msg(hald_t) - dbus_connect_system_bus(hald_t) -+ allow hald_t self:dbus send_msg; - - init_dbus_chat_script(hald_t) - -@@ -212,3 +218,7 @@ - optional_policy(`vbetool',` - vbetool_domtrans(hald_t) - ') -+ -+optional_policy(`bind',` -+ bind_search_cache(hald_t) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/mta.te serefpolicy-2.1.11/policy/modules/services/mta.te ---- nsaserefpolicy/policy/modules/services/mta.te 2006-01-16 22:19:19.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/services/mta.te 2006-01-16 22:32:53.000000000 -0500 -@@ -46,6 +46,7 @@ - - allow system_mail_t etc_mail_t:dir { getattr search }; - allow system_mail_t etc_mail_t:file r_file_perms; -+allow system_mail_t eventpollfs_t:file r_file_perms; - - kernel_read_system_state(system_mail_t) - kernel_read_network_state(system_mail_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.te serefpolicy-2.1.11/policy/modules/services/sendmail.te ---- nsaserefpolicy/policy/modules/services/sendmail.te 2006-01-16 22:19:19.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/services/sendmail.te 2006-01-16 22:32:53.000000000 -0500 -@@ -17,6 +17,7 @@ - - type sendmail_t; - mta_sendmail_mailserver(sendmail_t) -+mta_read_config(sendmail_t) - mta_mailserver_delivery(sendmail_t) - mta_mailserver_sender(sendmail_t) - -@@ -53,6 +54,7 @@ - corenet_udp_bind_all_nodes(sendmail_t) - corenet_tcp_bind_smtp_port(sendmail_t) - corenet_tcp_connect_all_ports(sendmail_t) -+allow sendmail_t self:udp_socket create_socket_perms; - - dev_read_urand(sendmail_t) - dev_read_sysfs(sendmail_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.if serefpolicy-2.1.11/policy/modules/system/authlogin.if ---- nsaserefpolicy/policy/modules/system/authlogin.if 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/system/authlogin.if 2006-01-16 22:32:53.000000000 -0500 -@@ -1075,3 +1075,16 @@ - typeattribute $1 can_write_shadow_passwords; - typeattribute $1 can_relabelto_shadow_passwords; - ') -+####################################### -+# -+# auth_setattr_login_records(domain) -+# -+interface(`auth_setattr_login_records',` -+ gen_require(` -+ type wtmp_t; -+ class file setattr; -+ ') -+ -+ allow $1 wtmp_t:file setattr; -+ logging_search_logs($1) -+') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.1.11/policy/modules/system/authlogin.te ---- nsaserefpolicy/policy/modules/system/authlogin.te 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/system/authlogin.te 2006-01-16 22:32:53.000000000 -0500 -@@ -129,14 +129,6 @@ - nscd_use_socket(pam_t) - ') - --ifdef(`TODO',` --ifdef(`gnome-pty-helper.te', `allow pam_t gphdomain:fd use;') --# Supress xdm denial --ifdef(`xdm.te', ` --dontaudit pam_t xdm_t:fd use; --') dnl ifdef --') dnl endif TODO -- - ######################################## - # - # PAM console local policy -@@ -223,6 +215,10 @@ - userdom_dontaudit_use_sysadm_terms(pam_console_t) - ') + bootloader_getattr_boot_dir(hald_t) -+optional_policy(`alsa',` -+ alsa_domtrans(pam_console_t) -+') -+ - ifdef(`targeted_policy', ` - term_dontaudit_use_unallocated_tty(pam_console_t) - term_dontaudit_use_generic_pty(pam_console_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/hostname.te serefpolicy-2.1.11/policy/modules/system/hostname.te ---- nsaserefpolicy/policy/modules/system/hostname.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/system/hostname.te 2006-01-16 22:32:53.000000000 -0500 -@@ -29,6 +29,7 @@ - - fs_getattr_xattr_fs(hostname_t) - fs_search_auto_mountpoints(hostname_t) -+fs_dontaudit_use_tmpfs_chr_dev(hostname_t) - - term_dontaudit_use_console(hostname_t) - term_use_all_user_ttys(hostname_t) -@@ -55,35 +56,6 @@ - sysnet_read_config(hostname_t) - sysnet_dns_name_resolve(hostname_t) - --userdom_use_all_user_fd(hostname_t) - --ifdef(`distro_redhat', ` -- fs_use_tmpfs_chr_dev(hostname_t) --') -- --ifdef(`targeted_policy', ` -- term_dontaudit_use_unallocated_tty(hostname_t) -- term_dontaudit_use_generic_pty(hostname_t) -- files_dontaudit_read_root_file(hostname_t) --') -- --optional_policy(`firstboot',` -- firstboot_use_fd(hostname_t) --') -- --optional_policy(`hotplug',` -- hotplug_dontaudit_use_fd(hostname_t) --') -- --optional_policy(`nscd',` -- nscd_use_socket(hostname_t) --') -- --optional_policy(`selinuxutil',` -- seutil_sigchld_newrole(hostname_t) --') -- --optional_policy(`udev',` -- udev_dontaudit_use_fd(hostname_t) -- udev_read_db(hostname_t) --') -+ -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.te serefpolicy-2.1.11/policy/modules/system/init.te ---- nsaserefpolicy/policy/modules/system/init.te 2006-01-16 22:19:19.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/system/init.te 2006-01-16 22:32:53.000000000 -0500 -@@ -298,6 +298,7 @@ - term_reset_tty_labels(initrc_t) - - auth_rw_login_records(initrc_t) -+auth_setattr_login_records(initrc_t) - auth_rw_lastlog(initrc_t) - auth_read_pam_pid(initrc_t) - auth_delete_pam_pid(initrc_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.1.11/policy/modules/system/libraries.fc ---- nsaserefpolicy/policy/modules/system/libraries.fc 2006-01-13 09:48:27.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/system/libraries.fc 2006-01-16 22:32:53.000000000 -0500 -@@ -158,7 +158,7 @@ - - # Flash plugin, Macromedia - HOME_DIR/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) --/usr/lib(64)?/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -+/usr/lib(64)?/.*/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) - - # Jai, Sun Microsystems (Jpackage SPRM) - /usr/lib(64)?/libmlib_jai\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.1.11/policy/modules/system/lvm.te ---- nsaserefpolicy/policy/modules/system/lvm.te 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/system/lvm.te 2006-01-16 22:32:53.000000000 -0500 -@@ -209,6 +209,7 @@ - storage_manage_fixed_disk(lvm_t) - - term_dontaudit_getattr_all_user_ttys(lvm_t) -+term_dontaudit_getattr_pty_dir(lvm_t) - - corecmd_search_sbin(lvm_t) - corecmd_dontaudit_getattr_sbin_file(lvm_t) -@@ -260,10 +261,3 @@ - udev_read_db(lvm_t) - ') - --ifdef(`TODO',` --# it has no reason to need this --allow lvm_t var_t:dir { search getattr }; --allow lvm_t ramfs_t:filesystem unmount; -- --dontaudit lvm_t xconsole_device_t:fifo_file getattr; --') dnl end TODO -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.1.11/policy/modules/system/mount.te ---- nsaserefpolicy/policy/modules/system/mount.te 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/system/mount.te 2006-01-16 22:32:53.000000000 -0500 -@@ -32,6 +32,7 @@ - - dev_getattr_all_blk_files(mount_t) - dev_list_all_dev_nodes(mount_t) -+dev_rw_lvm_control(mount_t) - - storage_raw_read_fixed_disk(mount_t) - storage_raw_write_fixed_disk(mount_t) -@@ -46,7 +47,7 @@ - fs_search_auto_mountpoints(mount_t) - fs_use_tmpfs_chr_dev(mount_t) - --term_use_console(mount_t) -+term_use_all_terms(mount_t) - - # required for mount.smbfs - corecmd_exec_sbin(mount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.11/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-16 22:19:19.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/system/selinuxutil.te 2006-01-16 22:32:53.000000000 -0500 -@@ -316,6 +316,7 @@ - # - - allow restorecon_t self:capability { dac_override dac_read_search fowner }; -+allow restorecon_t self:fifo_file rw_file_perms; - - allow restorecon_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:dir r_dir_perms; - allow restorecon_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:file r_file_perms; -@@ -414,6 +415,7 @@ + corecmd_exec_bin(hald_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.12/policy/modules/system/selinuxutil.te +--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-17 13:22:14.000000000 -0500 ++++ serefpolicy-2.1.12/policy/modules/system/selinuxutil.te 2006-01-17 14:23:22.000000000 -0500 +@@ -415,6 +415,7 @@ allow run_init_t self:capability setuid; allow run_init_t self:fifo_file rw_file_perms; allow run_init_t self:netlink_audit_socket { create bind write nlmsg_read read }; @@ -531,39 +133,9 @@ # often the administrator runs such programs from a directory that is owned # by a different user or has restrictive SE permissions, do not want to audit -@@ -469,6 +471,7 @@ - # - - allow setfiles_t self:capability { dac_override dac_read_search fowner }; -+allow setfiles_t self:fifo_file rw_file_perms; - - allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:dir r_dir_perms; - allow setfiles_t { policy_src_t policy_config_t file_context_t selinux_config_t default_context_t }:file r_file_perms; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.1.11/policy/modules/system/unconfined.if ---- nsaserefpolicy/policy/modules/system/unconfined.if 2006-01-16 22:19:19.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/system/unconfined.if 2006-01-16 22:32:53.000000000 -0500 -@@ -33,6 +33,7 @@ - corenet_unconfined($1) - dev_unconfined($1) - domain_unconfined($1) -+ domain_dontaudit_read_all_domains_state($1) - files_unconfined($1) - fs_unconfined($1) - selinux_unconfined($1) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.1.11/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-16 22:19:19.000000000 -0500 -+++ serefpolicy-2.1.11/policy/modules/system/userdomain.if 2006-01-16 22:32:53.000000000 -0500 -@@ -103,6 +103,7 @@ - # execute files in the home directory - can_exec($1_t,$1_home_t) - -+ allow $1_t home_root_t:dir { getattr search }; - # full control of the home directory - allow $1_t $1_home_t:file { create_file_perms relabelfrom relabelto }; - allow $1_t $1_home_t:lnk_file { create_lnk_perms relabelfrom relabelto }; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.11/policy/users +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.12/policy/users --- nsaserefpolicy/policy/users 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.11/policy/users 2006-01-16 22:32:53.000000000 -0500 ++++ serefpolicy-2.1.12/policy/users 2006-01-17 14:23:22.000000000 -0500 @@ -26,7 +26,9 @@ ifdef(`targeted_policy',` gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- selinux-policy.spec 17 Jan 2006 03:55:13 -0000 1.84 +++ selinux-policy.spec 17 Jan 2006 19:40:15 -0000 1.85 @@ -6,7 +6,7 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.1.11 +Version: 2.1.12 Release: 1 License: GPL Group: System Environment/Base @@ -262,6 +262,9 @@ %endif %changelog +* Tue Jan 17 2006 Dan Walsh 2.1.12-1 +- Update to upstream + * Sat Jan 14 2006 Dan Walsh 2.1.11-1 - Update to upstream - Fix ftp Man page Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 17 Jan 2006 03:55:13 -0000 1.26 +++ sources 17 Jan 2006 19:40:15 -0000 1.27 @@ -1 +1 @@ -297377c6b7b728b7f2a91bbe9afab297 serefpolicy-2.1.11.tgz +77f907adaeff94135c3d410cd26dcb8f serefpolicy-2.1.12.tgz From fedora-cvs-commits at redhat.com Tue Jan 17 20:02:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 15:02:59 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch, 1.14, 1.15 selinux-policy.spec, 1.85, 1.86 Message-ID: <200601172002.k0HK2xmn010829@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10814 Modified Files: policy-20060104.patch selinux-policy.spec Log Message: * Tue Jan 17 2006 Dan Walsh 2.1.12-2 - Update to upstream - Add rules to allow rpcd to work with unlabeled_networks. policy-20060104.patch: Makefile | 2 +- policy/modules/apps/wine.fc | 2 ++ policy/modules/apps/wine.if | 23 +++++++++++++++++++++++ policy/modules/apps/wine.te | 27 +++++++++++++++++++++++++++ policy/modules/kernel/kernel.if | 1 + policy/modules/services/dovecot.te | 1 + policy/modules/services/hal.te | 3 +++ policy/modules/services/rpc.te | 1 + policy/modules/system/selinuxutil.te | 1 + policy/users | 8 +++++--- 10 files changed, 65 insertions(+), 4 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- policy-20060104.patch 17 Jan 2006 19:40:15 -0000 1.14 +++ policy-20060104.patch 17 Jan 2006 20:02:54 -0000 1.15 @@ -85,17 +85,6 @@ ') ################################################################################ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.1.12/policy/modules/kernel/mls.te ---- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-17 13:22:13.000000000 -0500 -+++ serefpolicy-2.1.12/policy/modules/kernel/mls.te 2006-01-17 14:23:22.000000000 -0500 -@@ -83,6 +83,7 @@ - # these might be targeted_policy only - range_transition unconfined_t su_exec_t s0 - s0:c0.c255; - range_transition unconfined_t initrc_exec_t s0; -+range_transition unconfined_t ping_exec_t s0; - ') - - ifdef(`enable_mls',` diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.12/policy/modules/services/dovecot.te --- nsaserefpolicy/policy/modules/services/dovecot.te 2006-01-13 17:06:05.000000000 -0500 +++ serefpolicy-2.1.12/policy/modules/services/dovecot.te 2006-01-17 14:23:22.000000000 -0500 @@ -122,6 +111,17 @@ bootloader_getattr_boot_dir(hald_t) corecmd_exec_bin(hald_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.1.12/policy/modules/services/rpc.te +--- nsaserefpolicy/policy/modules/services/rpc.te 2006-01-13 17:06:07.000000000 -0500 ++++ serefpolicy-2.1.12/policy/modules/services/rpc.te 2006-01-17 14:57:16.000000000 -0500 +@@ -48,6 +48,7 @@ + kernel_search_network_state(rpcd_t) + # for rpc.rquotad + kernel_read_sysctl(rpcd_t) ++kernel_sendrecv_unlabeled_association(rpcd_t) + + corenet_udp_bind_generic_port(rpcd_t) + corenet_udp_bind_reserved_port(rpcd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.12/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-17 13:22:14.000000000 -0500 +++ serefpolicy-2.1.12/policy/modules/system/selinuxutil.te 2006-01-17 14:23:22.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- selinux-policy.spec 17 Jan 2006 19:40:15 -0000 1.85 +++ selinux-policy.spec 17 Jan 2006 20:02:54 -0000 1.86 @@ -7,7 +7,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.1.12 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -262,8 +262,9 @@ %endif %changelog -* Tue Jan 17 2006 Dan Walsh 2.1.12-1 +* Tue Jan 17 2006 Dan Walsh 2.1.12-2 - Update to upstream +- Add rules to allow rpcd to work with unlabeled_networks. * Sat Jan 14 2006 Dan Walsh 2.1.11-1 - Update to upstream From fedora-cvs-commits at redhat.com Tue Jan 17 20:25:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 15:25:44 -0500 Subject: rpms/gnome-mount/devel .cvsignore, 1.3, 1.4 gnome-mount.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200601172025.k0HKPiDs031775@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-mount/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31725 Modified Files: .cvsignore gnome-mount.spec sources Log Message: * Tue Jan 17 2006 John (J5) Palmieri - 0.4-0.cvs20060117 - CVS snapshot of gnome-mount - Added a devel sub package for apps that compile in gnome-mount support Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-mount/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Jan 2006 04:18:45 -0000 1.3 +++ .cvsignore 17 Jan 2006 20:25:41 -0000 1.4 @@ -1,2 +1,3 @@ gnome-mount-0.2.tar.gz gnome-mount-0.3.tar.gz +gnome-mount-0.4-0.cvs20060117.tar.gz Index: gnome-mount.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-mount/devel/gnome-mount.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnome-mount.spec 17 Jan 2006 15:02:01 -0000 1.3 +++ gnome-mount.spec 17 Jan 2006 20:25:41 -0000 1.4 @@ -1,10 +1,10 @@ Summary: Mount replacement which uses HAL to do the mounting Name: gnome-mount -Version: 0.3 -Release: 2 +Version: 0.4 +Release: 0.cvs20060117 License: GPL Group: Applications/System -Source: %{name}-%{version}.tar.gz +Source: %{name}-%{version}-%{release}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: hal >= 0.5.0 Requires: dbus >= 0.60 @@ -13,10 +13,17 @@ A replacement for the mount, umount and eject commands that uses HAL to do all the heavy lifting. +%package devel +Summary: Development files for gnome-mount +Group: Development/Libraries + +%description devel +Development files for gnome-mount + %prep rm -rf $RPM_BUILD_ROOT -%setup -q +%setup -q %build @@ -46,8 +53,15 @@ %{_bindir}/gnome-umount %{_datadir}/gnome-mount/gnome-mount-properties.glade +%files devel +%defattr(-, root, root) +%{_libdir}/pkgconfig/gnome-mount.pc %changelog +* Tue Jan 17 2006 John (J5) Palmieri - 0.4-0.cvs20060117 +- CVS snapshot of gnome-mount +- Added a devel sub package for apps that compile in gnome-mount support + * Tue Jan 17 2006 John (J5) Palmieri - 0.3-2 - Install the schema in the post Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-mount/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 12 Jan 2006 04:18:45 -0000 1.3 +++ sources 17 Jan 2006 20:25:41 -0000 1.4 @@ -1 +1 @@ -2bf5649b21e98378c49e44bbd42bf89d gnome-mount-0.3.tar.gz +bc4542ecc2b22d4576fd14f0aec8344f gnome-mount-0.4-0.cvs20060117.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 17 20:39:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 15:39:01 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.84,1.85 Message-ID: <200601172039.k0HKd1u5003167@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3108 Modified Files: gnome-vfs2.spec Log Message: - Add a BuildRequires on gnome-mount-devel so we build with gnome-mount support Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- gnome-vfs2.spec 17 Jan 2006 04:37:10 -0000 1.84 +++ gnome-vfs2.spec 17 Jan 2006 20:38:58 -0000 1.85 @@ -9,7 +9,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.13.4 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -33,6 +33,7 @@ BuildRequires: krb5-devel BuildRequires: avahi-glib-devel >= 0.6 BuildRequires: hal-devel >= 0.5.0 +BuildRequires: gnome-mount-devel >= 0.4 Prereq: GConf2 >= %{gconf2_version} Patch3: gnome-vfs-2.9.90-modules-conf.patch @@ -104,7 +105,7 @@ #needed for patch 102 (kerberos fix) autoconf -%configure --enable-gtk-doc --with-gtk=no --enable-hal --with-hal-mount=/usr/bin/gnome-mount --with-hal-umount=/usr/bin/gnome-umount --with-hal-eject=/usr/bin/gnome-eject +%configure --enable-gtk-doc --with-gtk=no --enable-hal export tagname=CC make LIBTOOL=/usr/bin/libtool @@ -173,6 +174,10 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Tue Jan 17 2006 John (J5) Palmieri 2.13.4-2 +- Add a BuildRequires on gnome-mount-devel so we build with + gnome-mount support + * Mon Jan 16 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 From fedora-cvs-commits at redhat.com Tue Jan 17 20:41:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 15:41:11 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.85,1.86 Message-ID: <200601172041.k0HKfBvH003806@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3712 Modified Files: gnome-vfs2.spec Log Message: - require the correct version of gnome-mount Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- gnome-vfs2.spec 17 Jan 2006 20:38:58 -0000 1.85 +++ gnome-vfs2.spec 17 Jan 2006 20:41:08 -0000 1.86 @@ -5,6 +5,7 @@ %define gnome_mime_data_version 2.0.0-11 %define perl_XML_Parser_version 2.31-16 %define po_package gnome-vfs-2.0 +%define gnome_mount_version 0.4 Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 @@ -18,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: gnome-mime-data >= %{gnome_mime_data_version} Requires: shared-mime-info -Requires: gnome-mount +Requires: gnome-mount >= %{gnome_mount_verion} BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: GConf2-devel >= %{gconf2_version} BuildRequires: gnome-mime-data >= %{gnome_mime_data_version} @@ -33,7 +34,7 @@ BuildRequires: krb5-devel BuildRequires: avahi-glib-devel >= 0.6 BuildRequires: hal-devel >= 0.5.0 -BuildRequires: gnome-mount-devel >= 0.4 +BuildRequires: gnome-mount-devel >= %{gnome_mount_verion} Prereq: GConf2 >= %{gconf2_version} Patch3: gnome-vfs-2.9.90-modules-conf.patch From fedora-cvs-commits at redhat.com Tue Jan 17 20:41:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 15:41:25 -0500 Subject: rpms/xterm/devel xterm-208-redhat-resources.patch, NONE, 1.1 xterm-208-root-grab-console.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 xterm.spec, 1.33, 1.34 Message-ID: <200601172041.k0HKfPZg003925@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/xterm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3893 Modified Files: .cvsignore sources xterm.spec Added Files: xterm-208-redhat-resources.patch xterm-208-root-grab-console.patch Log Message: Upgrade to upstream version 208 xterm-208-redhat-resources.patch: XTerm.ad | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE xterm-208-redhat-resources.patch --- --- xterm-208/XTerm.ad.redhat-resources 2006-01-03 21:10:17.000000000 -0500 +++ xterm-208/XTerm.ad 2006-01-17 15:05:24.000000000 -0500 @@ -186,3 +186,8 @@ ! Here is a pattern that is useful for double-clicking on a URL: *charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,126:48 + +! Red Hat Defaults: +*VT100*eightBitInput: 0 +*VT100*backarrowKey: 0 +*VT100*scrollBar: 1 xterm-208-root-grab-console.patch: main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE xterm-208-root-grab-console.patch --- --- xterm-208/main.c.root-grab-console 2006-01-03 21:10:25.000000000 -0500 +++ xterm-208/main.c 2006-01-17 15:09:42.000000000 -0500 @@ -2055,11 +2055,12 @@ #ifndef __sgi { struct stat sbuf; + uid_t my_uid = getuid(); /* Must be owner and have read/write permission. xdm cooperates to give the console the right user. */ if (!stat("/dev/console", &sbuf) && - (sbuf.st_uid == getuid()) && + ((my_uid==0) || (sbuf.st_uid == my_uid)) && !access("/dev/console", R_OK | W_OK)) { Console = True; } else Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 15 Dec 2005 00:47:38 -0000 1.9 +++ .cvsignore 17 Jan 2006 20:41:21 -0000 1.10 @@ -7,3 +7,4 @@ ctlseqs.txt.gz UnicodeData-Latest.txt.gz 16colors.txt +xterm-208.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 15 Dec 2005 00:47:38 -0000 1.9 +++ sources 17 Jan 2006 20:41:21 -0000 1.10 @@ -1,4 +1,4 @@ -3de8a3756c284a46a08c6d0308909486 xterm-207.tgz +a062d0b398918015d07c31ecdcc5111a xterm-208.tgz 0048925cb45d60429bc2f7665d563680 ctlseqs.txt.gz 92826989d4f4aa610cf6222359f3f83a UnicodeData-Latest.txt.gz 6093439b8d79089f4ff1cdfed358b401 16colors.txt Index: xterm.spec =================================================================== RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- xterm.spec 21 Dec 2005 22:23:11 -0000 1.33 +++ xterm.spec 17 Jan 2006 20:41:21 -0000 1.34 @@ -1,7 +1,7 @@ Summary: xterm terminal emulator for the X Window System Name: xterm -Version: 207 -Release: 10 +Version: 208 +Release: 1 URL: http://dickey.his.com/xterm License: MIT Group: User Interface/X @@ -17,6 +17,8 @@ Patch4: xterm-206-appsdir.patch Patch5: xterm-207-freetype.patch Patch6: xterm-207-eightBitInput_false.patch +Patch7: xterm-208-redhat-resources.patch +Patch8: xterm-208-root-grab-console.patch BuildRequires: libXft-devel BuildRequires: freetype-devel BuildRequires: libXrender-devel @@ -53,8 +55,11 @@ #%patch1 -p1 -b .resources-redhat %patch3 -p1 -b .tty-group-name %patch4 -p1 -b .appsdir -%patch5 -p1 -b .freetype -%patch6 -p1 -b .eightBitInput_false +#%patch5 -p1 -b .freetype +#^- now fixed upstream in 208 +#%patch6 -p1 -b .eightBitInput_false +%patch7 -p1 -b .redhat-resources +%patch8 -p1 -b .root-grab-console %build RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'" @@ -100,6 +105,12 @@ %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n %changelog +* Tue Jan 17 2006 Jason Vas Dias - 208-1 +- Upgrade to upstream version 208 +- Allow root user to grab the console, even if /dev/console + not owned by root +- restore Red Hat '*VT100*scrollBar:1' default Xresource + * Wed Dec 21 2005 Jason Vas Dias - 207-10 - Fix bug 164210: tek4014 support should be enabled by default From fedora-cvs-commits at redhat.com Tue Jan 17 21:02:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 16:02:03 -0500 Subject: rpms/gnome-utils/devel gnome-utils.spec,1.81,1.82 Message-ID: <200601172102.k0HL23x3024141@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24066 Modified Files: gnome-utils.spec Log Message: gdict.schemas got renamed Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- gnome-utils.spec 17 Jan 2006 16:01:27 -0000 1.81 +++ gnome-utils.spec 17 Jan 2006 21:01:49 -0000 1.82 @@ -20,7 +20,7 @@ Summary: GNOME utility programs. Name: gnome-utils Version: 2.13.5 -Release: 1 +Release: 2 Epoch: 1 License: GPL Group: Applications/System @@ -173,7 +173,7 @@ /sbin/ldconfig update-desktop-database %{_datadir}/applications export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -SCHEMAS="gdict.schemas gfloppy.schemas logview.schemas gcalctool.schemas gnome-search-tool.schemas gnome-screenshot.schemas" +SCHEMAS="gnome-dictionary.schemas gfloppy.schemas logview.schemas gcalctool.schemas gnome-search-tool.schemas gnome-screenshot.schemas" for S in $SCHEMAS; do gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null done @@ -211,6 +211,9 @@ %{_sysconfdir}/pam.d/gnome-system-log %changelog +* Tue Jan 17 2006 Matthias Clasen 2.13.5-2 +- gdict.schemas got renamed + * Mon Jan 16 2006 Matthias Clasen 2.13.5 - Update to gnome-utils 2.13.5 - Update to zenity 2.13.5 From fedora-cvs-commits at redhat.com Tue Jan 17 21:18:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 16:18:49 -0500 Subject: rpms/kernel/devel/configs config-generic,1.134,1.135 Message-ID: <200601172118.k0HLInQ9008293@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv8205/configs Modified Files: config-generic Log Message: rc1 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- config-generic 16 Jan 2006 02:40:18 -0000 1.134 +++ config-generic 17 Jan 2006 21:18:45 -0000 1.135 @@ -2377,6 +2377,8 @@ # CONFIG_ULTRIX_PARTITION is not set CONFIG_SUN_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_KARMA_PARTITION=y + CONFIG_NLS=y # From fedora-cvs-commits at redhat.com Tue Jan 17 21:18:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 16:18:48 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.327, 1.328 kernel-2.6.spec, 1.1859, 1.1860 linux-2.6-execshield-fixes.patch, 1.2, 1.3 linux-2.6-execshield.patch, 1.8, 1.9 linux-2.6-modsign-core.patch, 1.1, 1.2 sources, 1.269, 1.270 upstream, 1.245, 1.246 patch-2.6.15-git12.bz2.sign, 1.1, NONE Message-ID: <200601172118.k0HLImB8008270@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8205 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-execshield-fixes.patch linux-2.6-execshield.patch linux-2.6-modsign-core.patch sources upstream Added Files: patch-2.6.16-rc1.bz2.sign Removed Files: patch-2.6.15-git12.bz2.sign Log Message: rc1 --- NEW FILE patch-2.6.16-rc1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDzKrJyGugalF9Dw4RAhIyAJ9QOGkXgvpArr3KJ6UHwFCgREaaAwCgj7YH C9biYpTvr7a9Y5gMjg+sH9U= =CXIo -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.327 retrieving revision 1.328 diff -u -r1.327 -r1.328 --- .cvsignore 17 Jan 2006 00:58:29 -0000 1.327 +++ .cvsignore 17 Jan 2006 21:18:44 -0000 1.328 @@ -2,5 +2,5 @@ temp-* kernel-2.6.15 linux-2.6.15.tar.bz2 +patch-2.6.16-rc1.bz2 bcm43xx-20060114.tar.bz2 -patch-2.6.15-git12.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1859 retrieving revision 1.1860 diff -u -r1.1859 -r1.1860 --- kernel-2.6.spec 17 Jan 2006 05:58:08 -0000 1.1859 +++ kernel-2.6.spec 17 Jan 2006 21:18:44 -0000 1.1860 @@ -207,7 +207,7 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -Patch1: patch-2.6.15-git12.bz2 +Patch1: patch-2.6.16-rc1.bz2 Patch2: drm.patch #Patch2: patch-2.6.16-rc1-git1.bz2 @@ -1352,6 +1352,7 @@ %changelog * Tue Jan 17 2006 Dave Jones +- 2.6.16-rc1 - Revert changes that broke named, ifconfig, radvd etc * Mon Jan 16 2006 Dave Jones linux-2.6-execshield-fixes.patch: arch/i386/kernel/traps.c | 2 +- fs/proc/base.c | 2 +- include/asm-i386/desc.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6-execshield-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield-fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-execshield-fixes.patch 9 Jan 2006 23:30:57 -0000 1.2 +++ linux-2.6-execshield-fixes.patch 17 Jan 2006 21:18:44 -0000 1.3 @@ -17,19 +17,6 @@ if (desc1->a != desc2->a || desc1->b != desc2->b) { /* -Index: linux-exec-shield-curr.q/arch/x86_64/ia32/ia32_binfmt.c -=================================================================== ---- linux-exec-shield-curr.q.orig/arch/x86_64/ia32/ia32_binfmt.c -+++ linux-exec-shield-curr.q/arch/x86_64/ia32/ia32_binfmt.c -@@ -388,7 +388,7 @@ int ia32_setup_arg_pages(struct linux_bi - EXPORT_SYMBOL(ia32_setup_arg_pages); - - static unsigned long --elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type) -+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused) - { - unsigned long map_addr; - struct task_struct *me = current; Index: linux-exec-shield-curr.q/fs/proc/base.c =================================================================== --- linux-exec-shield-curr.q.orig/fs/proc/base.c linux-2.6-execshield.patch: arch/i386/kernel/asm-offsets.c | 1 arch/i386/kernel/cpu/common.c | 7 + arch/i386/kernel/entry.S | 8 +- arch/i386/kernel/process.c | 59 +++++++++++++++ arch/i386/kernel/signal.c | 4 - arch/i386/kernel/smp.c | 3 arch/i386/kernel/sysenter.c | 56 ++++++++++++++- arch/i386/kernel/traps.c | 93 ++++++++++++++++++++++++- arch/i386/kernel/vsyscall-sysenter.S | 6 - arch/i386/kernel/vsyscall.lds.S | 4 - arch/i386/mm/init.c | 6 + arch/i386/mm/mmap.c | 6 + arch/ia64/ia32/binfmt_elf32.c | 2 arch/x86_64/ia32/ia32_binfmt.c | 4 - arch/x86_64/kernel/process.c | 6 - arch/x86_64/kernel/setup64.c | 23 ------ arch/x86_64/mm/fault.c | 2 drivers/char/random.c | 7 + fs/binfmt_elf.c | 130 ++++++++++++++++++++++++++++------- fs/proc/array.c | 8 +- fs/proc/base.c | 4 - fs/proc/task_mmu.c | 25 +++++- include/asm-i386/desc.h | 14 +++ include/asm-i386/elf.h | 42 +++++++---- include/asm-i386/mmu.h | 6 + include/asm-i386/pgalloc.h | 1 include/asm-i386/processor.h | 7 + include/asm-i386/thread_info.h | 1 include/asm-ia64/pgalloc.h | 4 + include/asm-powerpc/pgalloc.h | 5 + include/asm-ppc/pgalloc.h | 5 + include/asm-s390/pgalloc.h | 4 + include/asm-sparc/pgalloc.h | 4 + include/asm-sparc64/pgalloc.h | 4 + include/asm-x86_64/pgalloc.h | 7 + include/asm-x86_64/pgtable.h | 2 include/asm-x86_64/processor.h | 4 + include/linux/mm.h | 11 ++ include/linux/resource.h | 5 + include/linux/sched.h | 9 ++ include/linux/sysctl.h | 3 kernel/signal.c | 38 ++++++++++ kernel/sysctl.c | 39 ++++++++++ mm/fremap.c | 16 ++-- mm/mmap.c | 105 ++++++++++++++++++++++++++-- mm/mprotect.c | 5 + mm/mremap.c | 4 - 47 files changed, 686 insertions(+), 123 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- linux-2.6-execshield.patch 11 Jan 2006 01:03:33 -0000 1.8 +++ linux-2.6-execshield.patch 17 Jan 2006 21:18:44 -0000 1.9 @@ -631,19 +631,6 @@ /* * Great future plan: -Index: linux/arch/x86_64/mm/Makefile -=================================================================== ---- linux.orig/arch/x86_64/mm/Makefile -+++ linux/arch/x86_64/mm/Makefile -@@ -2,7 +2,7 @@ - # Makefile for the linux x86_64-specific parts of the memory manager. - # - --obj-y := init.o fault.o ioremap.o extable.o pageattr.o -+obj-y := init.o fault.o ioremap.o extable.o pageattr.o mmap.o - obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o - obj-$(CONFIG_NUMA) += numa.o - obj-$(CONFIG_K8_NUMA) += k8topology.o Index: linux/arch/x86_64/mm/fault.c =================================================================== --- linux.orig/arch/x86_64/mm/fault.c @@ -657,98 +644,6 @@ return 0; while (scan_more && instr < max_instr) { -Index: linux/arch/x86_64/mm/mmap.c -=================================================================== ---- /dev/null -+++ linux/arch/x86_64/mm/mmap.c -@@ -0,0 +1,87 @@ -+/* -+ * linux/arch/x86-64/mm/mmap.c -+ * -+ * flexible mmap layout support -+ * -+ * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. -+ * All Rights Reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * -+ * Started by Ingo Molnar -+ */ -+ -+#include -+#include -+#include -+ -+/* -+ * Top of mmap area (just below the process stack). -+ * -+ * Leave an at least ~128 MB hole. -+ */ -+#define MIN_GAP (128*1024*1024) -+#define MAX_GAP (TASK_SIZE/6*5) -+ -+static inline unsigned long mmap_base(void) -+{ -+ unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; -+ -+ if (gap < MIN_GAP) -+ gap = MIN_GAP; -+ else if (gap > MAX_GAP) -+ gap = MAX_GAP; -+ -+ return TASK_SIZE - (gap & PAGE_MASK); -+} -+ -+static inline int mmap_is_legacy(void) -+{ -+ /* -+ * Force standard allocation for 64 bit programs. -+ */ -+ if (!test_thread_flag(TIF_IA32)) -+ return 1; -+ -+ if (current->personality & ADDR_COMPAT_LAYOUT) -+ return 1; -+ -+ if (current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) -+ return 1; -+ -+ return sysctl_legacy_va_layout; -+} -+ -+/* -+ * This function, called very early during the creation of a new -+ * process VM image, sets up which VM layout function to use: -+ */ -+void arch_pick_mmap_layout(struct mm_struct *mm) -+{ -+ /* -+ * Fall back to the standard layout if the personality -+ * bit is set, or if the expected stack growth is unlimited: -+ */ -+ if (mmap_is_legacy()) { -+ mm->mmap_base = TASK_UNMAPPED_BASE; -+ mm->get_unmapped_area = arch_get_unmapped_area; -+ mm->unmap_area = arch_unmap_area; -+ } else { -+ mm->mmap_base = mmap_base(); -+ mm->get_unmapped_area = arch_get_unmapped_area_topdown; -+ mm->unmap_area = arch_unmap_area_topdown; -+ } -+} Index: linux/drivers/char/random.c =================================================================== --- linux.orig/drivers/char/random.c linux-2.6-modsign-core.patch: linux-2.6.12/kernel/module-verify.c | 2 linux-900/include/linux/module.h | 3 linux-900/init/Kconfig | 16 + linux-900/kernel/Makefile | 3 linux-900/kernel/module-verify-sig.c | 442 +++++++++++++++++++++++++++++++++++ linux-900/kernel/module-verify.c | 340 ++++++++++++++++++++++++++ linux-900/kernel/module-verify.h | 37 ++ linux-900/kernel/module.c | 19 + 8 files changed, 857 insertions(+), 5 deletions(-) Index: linux-2.6-modsign-core.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-modsign-core.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-modsign-core.patch 16 Oct 2005 22:23:45 -0000 1.1 +++ linux-2.6-modsign-core.patch 17 Jan 2006 21:18:44 -0000 1.2 @@ -47,9 +47,9 @@ -obj-$(CONFIG_MODULES) += module.o +obj-$(CONFIG_MODULES) += module.o module-verify.o +obj-$(CONFIG_MODULE_SIG) += module-verify-sig.o + obj-$(CONFIG_OBSOLETE_INTERMODULE) += intermodule.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_PM) += power/ - obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module.c linux-900/kernel/module.c --- linux-811/kernel/module.c +++ linux-900/kernel/module.c Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.269 retrieving revision 1.270 diff -u -r1.269 -r1.270 --- sources 17 Jan 2006 00:58:30 -0000 1.269 +++ sources 17 Jan 2006 21:18:44 -0000 1.270 @@ -1,3 +1,3 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 +fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2 ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 -71e0d170ea951b1b453335bbdac91c24 patch-2.6.15-git12.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.245 retrieving revision 1.246 diff -u -r1.245 -r1.246 --- upstream 17 Jan 2006 00:58:30 -0000 1.245 +++ upstream 17 Jan 2006 21:18:44 -0000 1.246 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 -patch-2.6.15-git12.bz2 +patch-2.6.16-rc1.bz2 --- patch-2.6.15-git12.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 17 21:40:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 16:40:38 -0500 Subject: rpms/dhcdbd/devel .cvsignore, 1.15, 1.16 dhcdbd.spec, 1.24, 1.25 sources, 1.25, 1.26 Message-ID: <200601172140.k0HLeckb015092@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/dhcdbd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15070 Modified Files: .cvsignore dhcdbd.spec sources Log Message: fix unexercised (but broken) code in dbus_service.c Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dhcdbd/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 2 Dec 2005 00:12:40 -0000 1.15 +++ .cvsignore 17 Jan 2006 21:40:34 -0000 1.16 @@ -12,3 +12,4 @@ dhcdbd.spec dhcdbd-1.10.tar.gz dhcdbd-1.11.tar.gz +dhcdbd-1.12.tar.gz Index: dhcdbd.spec =================================================================== RCS file: /cvs/dist/rpms/dhcdbd/devel/dhcdbd.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- dhcdbd.spec 9 Dec 2005 22:40:11 -0000 1.24 +++ dhcdbd.spec 17 Jan 2006 21:40:34 -0000 1.25 @@ -8,8 +8,8 @@ # Summary: DHCP D-BUS daemon (dhcdbd) controls dhclient sessions with D-BUS, stores and presents DHCP options. Name: dhcdbd -Version: 1.11 -Release: 1.FC5.1 +Version: 1.12 +Release: 1.FC5 License: GPL Group: System Environment/Daemons URL: http://people.redhat.com/~jvdias/%{name}/%{name}-%{version}.tar.gz @@ -79,8 +79,9 @@ %doc README LICENSE CHANGES dhcp_options.h dhcdbd.h dbus_service.h %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Tue Jan 17 2006 Jason Vas Dias 1.12-1 +- Cleanup un-exercised code in dbus_service.c, lines 381 & 391 + (pointed out by David Binderman) * Thu Dec 01 2005 Jason Vas Dias 1.11-1 - Rebuild for new dbus-0.6 dependency; remove use of Index: sources =================================================================== RCS file: /cvs/dist/rpms/dhcdbd/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 2 Dec 2005 00:12:40 -0000 1.25 +++ sources 17 Jan 2006 21:40:34 -0000 1.26 @@ -1 +1 @@ -355f45069168bf44a242dabb6302f5eb dhcdbd-1.11.tar.gz +f84f00d10643193fb5e6ee08ccfc0b09 dhcdbd-1.12.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 17 22:26:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 17:26:38 -0500 Subject: rpms/perl-RPM-Specfile/devel perl-RPM-Specfile.spec,1.9,1.10 Message-ID: <200601172226.k0HMQcnr010883@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-RPM-Specfile/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10873 Modified Files: perl-RPM-Specfile.spec Log Message: 176721 Index: perl-RPM-Specfile.spec =================================================================== RCS file: /cvs/dist/rpms/perl-RPM-Specfile/devel/perl-RPM-Specfile.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-RPM-Specfile.spec 10 Jan 2006 16:39:47 -0000 1.9 +++ perl-RPM-Specfile.spec 17 Jan 2006 22:26:35 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-RPM-Specfile Version: 1.19 -Release: 1 +Release: 2 Summary: Perl extension for creating RPM specfiles Group: Development/Libraries @@ -46,7 +46,7 @@ %defattr(-,root,root,-) %doc Changes %{_bindir}/cpanflute2 -%{perl_vendorlib}/RPM/* +%{perl_vendorlib}/RPM %{_mandir}/man3/RPM::Specfile.3* From fedora-cvs-commits at redhat.com Tue Jan 17 22:30:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 17:30:54 -0500 Subject: rpms/mesa/devel mesa-6.4.1-texture-from-drawable.patch, NONE, 1.1 mesa.spec, 1.32, 1.33 Message-ID: <200601172230.k0HMUsac010987@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/mesa/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10978 Modified Files: mesa.spec Added Files: mesa-6.4.1-texture-from-drawable.patch Log Message: Add support for GLX_EXT_texture_from_drawable. mesa-6.4.1-texture-from-drawable.patch: include/GL/glxext.h | 17 ++++++++ src/glx/x11/glxcmds.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ src/glx/x11/glxextensions.c | 1 src/glx/x11/glxextensions.h | 1 4 files changed, 104 insertions(+) --- NEW FILE mesa-6.4.1-texture-from-drawable.patch --- Index: include/GL/glxext.h =================================================================== RCS file: /cvs/mesa/Mesa/include/GL/glxext.h,v retrieving revision 1.12 diff -u -p -r1.12 glxext.h --- include/GL/glxext.h 15 Aug 2005 23:25:33 -0000 1.12 +++ include/GL/glxext.h 17 Jan 2006 21:55:38 -0000 @@ -177,6 +177,10 @@ extern "C" { #define GLX_SCREEN_EXT 0x800C #endif +#ifndef GLX_EXT_texture_from_drawable +#define GLX_FRONT_LEFT_EXT 0x6005 +#endif + #ifndef GLX_SGIX_fbconfig #define GLX_WINDOW_BIT_SGIX 0x00000001 #define GLX_PIXMAP_BIT_SGIX 0x00000002 @@ -481,6 +485,19 @@ typedef GLXContext ( * PFNGLXIMPORTCONTE typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context); #endif +#ifndef GLX_EXT_texture_from_drawable +#define GLX_EXT_texture_from_drawable 1 +#ifdef GLX_GLXEXT_PROTOTYPES +extern Bool glXBindTexImageEXT(Display *dpy, GLXDrawable draw, int buffer, const int *attrib_list); +extern Bool glXReleaseTexImageEXT(Display *dpy, GLXDrawable draw, int buffer); +extern Bool glXDrawableAttribEXT(Display *dpy, GLXDrawable draw, const int *attribList); +#endif +typedef Bool ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display *dpy, GLXDrawable draw, int buffer, const int *attrib_list); +typedef Bool (* PFNGLXRELEASETEXIMAGEEXTPROC) (Display *dpy, GLXDrawable draw, int buffer); +typedef Bool ( * PFNGLXDRAWABLEATTRIBEXTPROC) (Display *dpy, GLXDrawable draw, const int *attribList); +#endif /* GLX_EXT_texture_from_drawable */ + + #ifndef GLX_SGIX_fbconfig #define GLX_SGIX_fbconfig 1 #ifdef GLX_GLXEXT_PROTOTYPES Index: src/glx/x11/glxcmds.c =================================================================== RCS file: /cvs/mesa/Mesa/src/glx/x11/glxcmds.c,v retrieving revision 1.11 diff -u -p -r1.11 glxcmds.c --- src/glx/x11/glxcmds.c 11 Aug 2005 14:18:53 -0000 1.11 +++ src/glx/x11/glxcmds.c 17 Jan 2006 21:55:38 -0000 @@ -2589,7 +2589,88 @@ PUBLIC Bool glXSet3DfxModeMESA( int mode } /*@}*/ +PUBLIC Bool glXBindTexImageEXT(Display *dpy, + GLXDrawable drawable, + int buffer, + const int *attrib_list) +{ + xGLXVendorPrivateReq *req; + GLXContext gc = __glXGetCurrentContext(); + CARD32 *drawable_ptr; + INT32 *buffer_ptr; + CARD8 opcode; + + if (gc == NULL) + return False; + +#ifdef GLX_DIRECT_RENDERING + if (gc->isDirect) + return False; +#endif + + opcode = __glXSetupForCommand(dpy); + if (!opcode) + return False; + + LockDisplay(dpy); + GetReqExtra(GLXVendorPrivate, sizeof(GLXDrawable)+sizeof(int),req); + req->reqType = opcode; + req->glxCode = X_GLXVendorPrivate; + req->vendorCode = X_GLXvop_BindTexImageMESA; + req->contextTag = gc->currentContextTag; + + drawable_ptr = (CARD32 *) (req + 1); + buffer_ptr = (INT32 *) (drawable_ptr + 1); + *drawable_ptr = drawable; + *buffer_ptr = buffer; + + UnlockDisplay(dpy); + SyncHandle(); + + return True; +} + +PUBLIC Bool glXReleaseTexImageEXT(Display *dpy, + GLXDrawable drawable, + int buffer) +{ + xGLXVendorPrivateReq *req; + GLXContext gc = __glXGetCurrentContext(); + CARD32 *drawable_ptr; + INT32 *buffer_ptr; + CARD8 opcode; + + if (gc == NULL) + return False; + +#ifdef GLX_DIRECT_RENDERING + if (gc->isDirect) + return False; +#endif + + opcode = __glXSetupForCommand(dpy); + if (!opcode) + return False; + + LockDisplay(dpy); + GetReqExtra(GLXVendorPrivate, sizeof(GLXDrawable)+sizeof(int),req); + req->reqType = opcode; + req->glxCode = X_GLXVendorPrivate; + req->vendorCode = X_GLXvop_ReleaseTexImageMESA; + req->contextTag = gc->currentContextTag; + + drawable_ptr = (CARD32 *) (req + 1); + buffer_ptr = (INT32 *) (drawable_ptr + 1); + + *drawable_ptr = drawable; + *buffer_ptr = buffer; + + UnlockDisplay(dpy); + SyncHandle(); + + return True; +} /** * \c strdup is actually not a standard ANSI C or POSIX routine. @@ -2771,6 +2852,10 @@ static const struct name_address_pair GL GLX_FUNCTION( glXGetMscRateOML ), GLX_FUNCTION( glXGetSyncValuesOML ), + /*** GLX_EXT_texture_from_drawable ***/ + GLX_FUNCTION( glXBindTexImageEXT ), + GLX_FUNCTION( glXReleaseTexImageEXT ), + #ifdef GLX_DIRECT_RENDERING /*** DRI configuration ***/ GLX_FUNCTION( glXGetScreenDriver ), Index: src/glx/x11/glxextensions.c =================================================================== RCS file: /cvs/mesa/Mesa/src/glx/x11/glxextensions.c,v retrieving revision 1.11 diff -u -p -r1.11 glxextensions.c --- src/glx/x11/glxextensions.c 11 Aug 2005 14:18:53 -0000 1.11 +++ src/glx/x11/glxextensions.c 17 Jan 2006 21:55:38 -0000 @@ -77,6 +77,7 @@ static const struct extension_info known { GLX(EXT_import_context), VER(0,0), Y, Y, N, N }, { GLX(EXT_visual_info), VER(0,0), Y, Y, N, N }, { GLX(EXT_visual_rating), VER(0,0), Y, Y, N, N }, + { GLX(EXT_texture_from_drawable), VER(0,0), Y, N, N, N }, { GLX(MESA_agp_offset), VER(0,0), N, N, N, Y }, /* Deprecated */ { GLX(MESA_allocate_memory), VER(0,0), Y, N, N, Y }, { GLX(MESA_copy_sub_buffer), VER(0,0), N, N, N, N }, /* Deprecated? */ Index: src/glx/x11/glxextensions.h =================================================================== RCS file: /cvs/mesa/Mesa/src/glx/x11/glxextensions.h,v retrieving revision 1.8 diff -u -p -r1.8 glxextensions.h --- src/glx/x11/glxextensions.h 26 Jul 2005 22:53:38 -0000 1.8 +++ src/glx/x11/glxextensions.h 17 Jan 2006 21:55:38 -0000 @@ -39,6 +39,7 @@ enum { EXT_visual_info_bit, EXT_visual_rating_bit, EXT_import_context_bit, + EXT_texture_from_drawable_bit, MESA_agp_offset_bit, MESA_allocate_memory_bit, /* Replaces MESA_agp_offset & NV_vertex_array_range */ MESA_copy_sub_buffer_bit, Index: mesa.spec =================================================================== RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- mesa.spec 24 Dec 2005 09:12:21 -0000 1.32 +++ mesa.spec 17 Jan 2006 22:30:50 -0000 1.33 @@ -70,6 +70,8 @@ # branch and can be dropped when we update to 6.4.2. Patch100: mesa-6.4.1-amd64-assyntax-fix.patch +Patch200: mesa-6.4.1-texture-from-drawable.patch + BuildRequires: pkgconfig BuildRequires: libdrm-devel >= 2.0-1 BuildRequires: libXxf86vm-devel @@ -216,6 +218,8 @@ %patch100 -p1 -b .amd64-assyntax-fix +%patch200 -p0 -b .texture-from-drawable + # WARNING: The following files are copyright "Mark J. Kilgard" under the GLUT # license and are not open source/free software, so we remove them. rm include/GL/uglglutshapes.h @@ -393,6 +397,10 @@ %defattr(-,root,root,-) %changelog +* Tue Jan 17 2006 Kristian H??gsberg 6.4.1-3 +- Add mesa-6.4.1-texture-from-drawable.patch to implement protocol + support for GLX_EXT_texture_from_drawable extension. + * Sat Dec 24 2005 Mike A. Harris 6.4.1-3 - Manually copy libGLw headers that Mesa forgets to install, to fix (#173879). - Added mesa-6.4.1-libGLw-enable-motif-support.patch to fix (#175251). From fedora-cvs-commits at redhat.com Tue Jan 17 22:31:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 17:31:47 -0500 Subject: rpms/mesa/devel mesa.spec,1.33,1.34 Message-ID: <200601172231.k0HMVlMw011030@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/mesa/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11015 Modified Files: mesa.spec Log Message: Bump version. Index: mesa.spec =================================================================== RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- mesa.spec 17 Jan 2006 22:30:50 -0000 1.33 +++ mesa.spec 17 Jan 2006 22:31:43 -0000 1.34 @@ -49,7 +49,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 6.4.1 -Release: 3 +%Release: 4 License: MIT/X11 Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -397,7 +397,7 @@ %defattr(-,root,root,-) %changelog -* Tue Jan 17 2006 Kristian H??gsberg 6.4.1-3 +* Tue Jan 17 2006 Kristian H??gsberg 6.4.1-4 - Add mesa-6.4.1-texture-from-drawable.patch to implement protocol support for GLX_EXT_texture_from_drawable extension. From fedora-cvs-commits at redhat.com Tue Jan 17 22:32:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 17:32:33 -0500 Subject: rpms/mesa/devel mesa.spec,1.34,1.35 Message-ID: <200601172232.k0HMWX1q011080@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/mesa/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11067 Modified Files: mesa.spec Log Message: Fix typo. Index: mesa.spec =================================================================== RCS file: /cvs/dist/rpms/mesa/devel/mesa.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- mesa.spec 17 Jan 2006 22:31:43 -0000 1.34 +++ mesa.spec 17 Jan 2006 22:32:30 -0000 1.35 @@ -49,7 +49,7 @@ Summary: Mesa graphics libraries Name: mesa Version: 6.4.1 -%Release: 4 +Release: 4 License: MIT/X11 Group: System Environment/Libraries URL: http://www.mesa3d.org From fedora-cvs-commits at redhat.com Tue Jan 17 22:32:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 17:32:51 -0500 Subject: rpms/perl-HTML-Tagset/devel perl-HTML-Tagset.spec,1.11,1.12 Message-ID: <200601172232.k0HMWpYW011109@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-HTML-Tagset/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11095 Modified Files: perl-HTML-Tagset.spec Log Message: bug 176720 Index: perl-HTML-Tagset.spec =================================================================== RCS file: /cvs/dist/rpms/perl-HTML-Tagset/devel/perl-HTML-Tagset.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-HTML-Tagset.spec 10 Jan 2006 17:10:44 -0000 1.11 +++ perl-HTML-Tagset.spec 17 Jan 2006 22:32:47 -0000 1.12 @@ -1,7 +1,7 @@ Name: perl-HTML-Tagset Version: 3.10 -Release: 1 -Summary: HTML::Tagset - data tables useful in parsing HTML. +Release: 2 +Summary: HTML::Tagset - data tables useful in parsing HTML Group: Development/Libraries License: Artistic or GPL @@ -21,26 +21,27 @@ %setup -q -n HTML-Tagset-%{version} %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" +%{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} -make test %install rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* +%check +make test + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README -%{perl_vendorlib}/HTML/* -%{_mandir}/man?/HTML::Tagset* +%{perl_vendorlib}/HTML/ +%{_mandir}/man?/HTML::Tagset.3* %changelog * Tue Jan 10 2006 Jason Vas Dias - 3.10-1 From fedora-cvs-commits at redhat.com Tue Jan 17 22:37:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 17:37:00 -0500 Subject: rpms/perl-Devel-Symdump/devel perl-Devel-Symdump.spec,1.11,1.12 Message-ID: <200601172237.k0HMb00h011241@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-Devel-Symdump/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11228 Modified Files: perl-Devel-Symdump.spec Log Message: bug 176718 Index: perl-Devel-Symdump.spec =================================================================== RCS file: /cvs/dist/rpms/perl-Devel-Symdump/devel/perl-Devel-Symdump.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Devel-Symdump.spec 10 Jan 2006 17:18:59 -0000 1.11 +++ perl-Devel-Symdump.spec 17 Jan 2006 22:36:46 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Devel-Symdump Version: 2.05 -Release: 1 +Release: 2 Summary: A Perl module for inspecting Perl's symbol table Group: Development/Libraries @@ -29,7 +29,6 @@ rm -rf $RPM_BUILD_ROOT make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' -find $RPM_BUILD_ROOT -type f -name '*.bs' -a -size 0 -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' chmod -R u+w $RPM_BUILD_ROOT/* @@ -43,7 +42,7 @@ %files %defattr(-,root,root,-) %doc ChangeLog README -%{perl_vendorlib}/Devel/* +%{perl_vendorlib}/Devel/ %{_mandir}/man3/*.3* From fedora-cvs-commits at redhat.com Tue Jan 17 22:42:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 17:42:38 -0500 Subject: rpms/perl-File-MMagic/devel perl-File-MMagic.spec,1.12,1.13 Message-ID: <200601172242.k0HMgc08011328@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-File-MMagic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11315 Modified Files: perl-File-MMagic.spec Log Message: bug 176717 Index: perl-File-MMagic.spec =================================================================== RCS file: /cvs/dist/rpms/perl-File-MMagic/devel/perl-File-MMagic.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- perl-File-MMagic.spec 10 Jan 2006 17:27:06 -0000 1.12 +++ perl-File-MMagic.spec 17 Jan 2006 22:42:34 -0000 1.13 @@ -1,10 +1,10 @@ Name: perl-File-MMagic Version: 1.25 -Release: 1 +Release: 2 Summary: A Perl module emulating the file(1) command Group: Development/Libraries -License: GPL or Artistic +License: Distributable URL: http://search.cpan.org/dist/File-MMagic/ Source0: http://www.cpan.org/authors/id/K/KN/KNOK/File-MMagic-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-cvs-commits at redhat.com Tue Jan 17 22:47:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 17:47:15 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.25, 1.26 policy-20060104.patch, 1.15, 1.16 selinux-policy.spec, 1.86, 1.87 sources, 1.27, 1.28 Message-ID: <200601172247.k0HMlFol023574@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23560 Modified Files: .cvsignore policy-20060104.patch selinux-policy.spec sources Log Message: * Tue Jan 17 2006 Dan Walsh 2.1.13-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 17 Jan 2006 19:40:15 -0000 1.25 +++ .cvsignore 17 Jan 2006 22:47:11 -0000 1.26 @@ -26,3 +26,4 @@ serefpolicy-2.1.10.tgz serefpolicy-2.1.11.tgz serefpolicy-2.1.12.tgz +serefpolicy-2.1.13.tgz policy-20060104.patch: Changelog | 1 - Makefile | 2 +- policy/modules/apps/wine.fc | 2 ++ policy/modules/apps/wine.if | 23 +++++++++++++++++++++++ policy/modules/apps/wine.te | 27 +++++++++++++++++++++++++++ policy/modules/kernel/files.if | 4 ++-- policy/modules/kernel/kernel.if | 1 + policy/modules/services/dovecot.te | 1 + policy/modules/services/fetchmail.te | 6 ++++++ policy/modules/services/hal.te | 4 ++++ policy/modules/services/procmail.te | 2 +- policy/modules/services/rpc.te | 1 + policy/modules/system/selinuxutil.te | 1 + policy/users | 8 +++++--- 14 files changed, 75 insertions(+), 8 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- policy-20060104.patch 17 Jan 2006 20:02:54 -0000 1.15 +++ policy-20060104.patch 17 Jan 2006 22:47:11 -0000 1.16 @@ -1,6 +1,14 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.12/Makefile +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-2.1.13/Changelog +--- nsaserefpolicy/Changelog 2006-01-17 17:08:50.000000000 -0500 ++++ serefpolicy-2.1.13/Changelog 2006-01-17 17:43:28.000000000 -0500 +@@ -1,4 +1,3 @@ +-* Tue Jan 17 2006 Chris PeBenito - 20060117 + - Adds support for generating corenetwork interfaces based on attributes + in addition to types. + - Permits the listing of multiple nodes in a network_node() that will be +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.13/Makefile --- nsaserefpolicy/Makefile 2006-01-13 09:48:25.000000000 -0500 -+++ serefpolicy-2.1.12/Makefile 2006-01-17 14:23:22.000000000 -0500 ++++ serefpolicy-2.1.13/Makefile 2006-01-17 17:43:28.000000000 -0500 @@ -92,7 +92,7 @@ # enable MLS if requested. @@ -10,15 +18,15 @@ override CHECKPOLICY += -M override CHECKMODULE += -M endif -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.12/policy/modules/apps/wine.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.13/policy/modules/apps/wine.fc --- nsaserefpolicy/policy/modules/apps/wine.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.12/policy/modules/apps/wine.fc 2006-01-17 14:23:22.000000000 -0500 ++++ serefpolicy-2.1.13/policy/modules/apps/wine.fc 2006-01-17 17:43:28.000000000 -0500 @@ -0,0 +1,2 @@ +/usr/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.12/policy/modules/apps/wine.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.13/policy/modules/apps/wine.if --- nsaserefpolicy/policy/modules/apps/wine.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.12/policy/modules/apps/wine.if 2006-01-17 14:23:22.000000000 -0500 ++++ serefpolicy-2.1.13/policy/modules/apps/wine.if 2006-01-17 17:43:28.000000000 -0500 @@ -0,0 +1,23 @@ +## Load keyboard mappings. + @@ -43,9 +51,9 @@ + allow wine_t $1:fifo_file rw_file_perms; + allow wine_t $1:process sigchld; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.12/policy/modules/apps/wine.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.13/policy/modules/apps/wine.te --- nsaserefpolicy/policy/modules/apps/wine.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.12/policy/modules/apps/wine.te 2006-01-17 14:23:22.000000000 -0500 ++++ serefpolicy-2.1.13/policy/modules/apps/wine.te 2006-01-17 17:43:28.000000000 -0500 @@ -0,0 +1,27 @@ +policy_module(wine,1.0.0) + @@ -74,9 +82,25 @@ + allow wine_t file_type:file execmod; + +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.1.12/policy/modules/kernel/kernel.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.1.13/policy/modules/kernel/files.if +--- nsaserefpolicy/policy/modules/kernel/files.if 2006-01-13 17:06:04.000000000 -0500 ++++ serefpolicy-2.1.13/policy/modules/kernel/files.if 2006-01-17 17:46:02.000000000 -0500 +@@ -2135,10 +2135,10 @@ + interface(`files_search_tmp',` + gen_require(` + type tmp_t; +- class dir search; ++ class dir search_dir_perms; + ') + +- allow $1 tmp_t:dir search; ++ allow $1 tmp_t:dir search_dir_perms; + ') + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.1.13/policy/modules/kernel/kernel.if --- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.12/policy/modules/kernel/kernel.if 2006-01-17 14:27:12.000000000 -0500 ++++ serefpolicy-2.1.13/policy/modules/kernel/kernel.if 2006-01-17 17:45:26.000000000 -0500 @@ -1666,6 +1666,7 @@ typeattribute $1 kern_unconfined; @@ -85,9 +109,9 @@ ') ################################################################################ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.12/policy/modules/services/dovecot.te ---- nsaserefpolicy/policy/modules/services/dovecot.te 2006-01-13 17:06:05.000000000 -0500 -+++ serefpolicy-2.1.12/policy/modules/services/dovecot.te 2006-01-17 14:23:22.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.13/policy/modules/services/dovecot.te +--- nsaserefpolicy/policy/modules/services/dovecot.te 2006-01-17 17:08:53.000000000 -0500 ++++ serefpolicy-2.1.13/policy/modules/services/dovecot.te 2006-01-17 17:43:28.000000000 -0500 @@ -95,6 +95,7 @@ files_read_etc_files(dovecot_t) files_search_spool(dovecot_t) @@ -96,9 +120,48 @@ files_dontaudit_list_default(dovecot_t) init_use_fd(dovecot_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.12/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2006-01-17 13:22:13.000000000 -0500 -+++ serefpolicy-2.1.12/policy/modules/services/hal.te 2006-01-17 14:23:22.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.1.13/policy/modules/services/fetchmail.te +--- nsaserefpolicy/policy/modules/services/fetchmail.te 2006-01-13 17:06:05.000000000 -0500 ++++ serefpolicy-2.1.13/policy/modules/services/fetchmail.te 2006-01-17 17:44:58.000000000 -0500 +@@ -29,6 +29,7 @@ + allow fetchmail_t self:unix_stream_socket create_stream_socket_perms; + allow fetchmail_t self:tcp_socket create_socket_perms; + allow fetchmail_t self:udp_socket create_socket_perms; ++allow fetchmail_t self:netlink_route_socket r_netlink_socket_perms; + + allow fetchmail_t fetchmail_etc_t:file r_file_perms; + +@@ -41,6 +42,7 @@ + + kernel_read_kernel_sysctl(fetchmail_t) + kernel_list_proc(fetchmail_t) ++kernel_getattr_proc_files(fetchmail_t) + kernel_read_proc_symlinks(fetchmail_t) + + corenet_non_ipsec_sendrecv(fetchmail_t) +@@ -59,8 +61,11 @@ + corenet_tcp_connect_all_ports(fetchmail_t) + + dev_read_sysfs(fetchmail_t) ++dev_read_rand(fetchmail_t) ++dev_read_urand(fetchmail_t) + + files_read_etc_files(fetchmail_t) ++files_read_etc_runtime_files(fetchmail_t) + + fs_getattr_all_fs(fetchmail_t) + fs_search_auto_mountpoints(fetchmail_t) +@@ -78,6 +83,7 @@ + logging_send_syslog_msg(fetchmail_t) + + miscfiles_read_localization(fetchmail_t) ++miscfiles_read_certs(fetchmail_t) + + sysnet_read_config(fetchmail_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.13/policy/modules/services/hal.te +--- nsaserefpolicy/policy/modules/services/hal.te 2006-01-17 17:08:53.000000000 -0500 ++++ serefpolicy-2.1.13/policy/modules/services/hal.te 2006-01-17 17:45:44.000000000 -0500 @@ -48,8 +48,11 @@ kernel_read_network_state(hald_t) kernel_read_kernel_sysctl(hald_t) @@ -111,9 +174,29 @@ bootloader_getattr_boot_dir(hald_t) corecmd_exec_bin(hald_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.1.12/policy/modules/services/rpc.te +@@ -139,6 +142,7 @@ + term_dontaudit_use_unallocated_tty(hald_t) + term_dontaudit_use_generic_pty(hald_t) + files_dontaudit_read_root_file(hald_t) ++ files_dontaudit_getattr_home_dir(hald_t) + ') + + optional_policy(`apm',` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.1.13/policy/modules/services/procmail.te +--- nsaserefpolicy/policy/modules/services/procmail.te 2005-12-09 23:35:06.000000000 -0500 ++++ serefpolicy-2.1.13/policy/modules/services/procmail.te 2006-01-17 17:43:28.000000000 -0500 +@@ -99,7 +99,7 @@ + + optional_policy(`spamassassin',` + corenet_udp_bind_generic_port(procmail_t) +- ++ corenet_tcp_connect_spamd_port(procmail_t) + files_getattr_tmp_dir(procmail_t) + + spamassassin_exec(procmail_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.1.13/policy/modules/services/rpc.te --- nsaserefpolicy/policy/modules/services/rpc.te 2006-01-13 17:06:07.000000000 -0500 -+++ serefpolicy-2.1.12/policy/modules/services/rpc.te 2006-01-17 14:57:16.000000000 -0500 ++++ serefpolicy-2.1.13/policy/modules/services/rpc.te 2006-01-17 17:43:28.000000000 -0500 @@ -48,6 +48,7 @@ kernel_search_network_state(rpcd_t) # for rpc.rquotad @@ -122,9 +205,9 @@ corenet_udp_bind_generic_port(rpcd_t) corenet_udp_bind_reserved_port(rpcd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.12/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-17 13:22:14.000000000 -0500 -+++ serefpolicy-2.1.12/policy/modules/system/selinuxutil.te 2006-01-17 14:23:22.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.13/policy/modules/system/selinuxutil.te +--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-17 17:08:57.000000000 -0500 ++++ serefpolicy-2.1.13/policy/modules/system/selinuxutil.te 2006-01-17 17:43:28.000000000 -0500 @@ -415,6 +415,7 @@ allow run_init_t self:capability setuid; allow run_init_t self:fifo_file rw_file_perms; @@ -133,9 +216,9 @@ # often the administrator runs such programs from a directory that is owned # by a different user or has restrictive SE permissions, do not want to audit -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.12/policy/users +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.13/policy/users --- nsaserefpolicy/policy/users 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.12/policy/users 2006-01-17 14:23:22.000000000 -0500 ++++ serefpolicy-2.1.13/policy/users 2006-01-17 17:43:28.000000000 -0500 @@ -26,7 +26,9 @@ ifdef(`targeted_policy',` gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- selinux-policy.spec 17 Jan 2006 20:02:54 -0000 1.86 +++ selinux-policy.spec 17 Jan 2006 22:47:12 -0000 1.87 @@ -6,8 +6,8 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.1.12 -Release: 2 +Version: 2.1.13 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -262,7 +262,11 @@ %endif %changelog -* Tue Jan 17 2006 Dan Walsh 2.1.12-2 +* Tue Jan 17 2006 Dan Walsh 2.1.13-1 +- Update to upstream + +* Tue Jan 17 2006 Dan Walsh 2.1.12-3 +- Fix for procmail/spamassasin - Update to upstream - Add rules to allow rpcd to work with unlabeled_networks. Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 17 Jan 2006 19:40:15 -0000 1.27 +++ sources 17 Jan 2006 22:47:12 -0000 1.28 @@ -1 +1 @@ -77f907adaeff94135c3d410cd26dcb8f serefpolicy-2.1.12.tgz +a745ed3d3ffc029e59bf246eb1e60d1f serefpolicy-2.1.13.tgz From fedora-cvs-commits at redhat.com Tue Jan 17 22:56:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 17:56:44 -0500 Subject: rpms/gdm/devel .cvsignore, 1.18, 1.19 gdm.spec, 1.115, 1.116 sources, 1.20, 1.21 Message-ID: <200601172256.k0HMuiR4032611@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32550 Modified Files: .cvsignore gdm.spec sources Log Message: - update to 2.13.0.5 (bug 178099) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 9 Jan 2006 10:17:40 -0000 1.18 +++ .cvsignore 17 Jan 2006 22:56:41 -0000 1.19 @@ -1,4 +1 @@ -gdm-2.13.0.4.tar.bz2 -gdm-allow-login.init -gdm-early-login.init -zzz-bootup-complete.init +gdm-2.13.0.5.tar.bz2 Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- gdm.spec 17 Jan 2006 18:41:14 -0000 1.115 +++ gdm.spec 17 Jan 2006 22:56:41 -0000 1.116 @@ -14,7 +14,7 @@ Summary: The GNOME Display Manager. Name: gdm -Version: 2.13.0.4 +Version: 2.13.0.5 Release: 5 Epoch: 1 License: LGPL/GPL @@ -307,6 +307,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Tue Jan 17 2006 Ray Strode - 1:2.13.0.5-1 +- update to 2.13.0.5 (bug 178099) + * Tue Jan 17 2006 Ray Strode - 1:2.13.0.4-5 - add new theme by Diana Fong, M?ir?n Duffy, and me Index: sources =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 9 Jan 2006 10:17:40 -0000 1.20 +++ sources 17 Jan 2006 22:56:41 -0000 1.21 @@ -1,4 +1 @@ -91dc905826a5ec78774df1cf0f1f8173 gdm-2.13.0.4.tar.bz2 -565fe41afc00943d07a59df6aaa21b09 gdm-allow-login.init -6faa704d32a73754f9d1658f888a80a0 gdm-early-login.init -c887b142b08c6faec6e9be74f4efad33 zzz-bootup-complete.init +d46aff99287f93eeb466a9bdd9e0d4c6 gdm-2.13.0.5.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 17 23:00:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 18:00:05 -0500 Subject: rpms/gdm/devel gdm.spec,1.116,1.117 Message-ID: <200601172300.k0HN05U9001524@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1450 Modified Files: gdm.spec Log Message: - remove selinux patch Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- gdm.spec 17 Jan 2006 22:56:41 -0000 1.116 +++ gdm.spec 17 Jan 2006 23:00:02 -0000 1.117 @@ -27,7 +27,6 @@ Patch1: gdm-2.13.0.4-change-defaults.patch Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch -Patch3: gdm-2.13.0.4-fix-selinux-check.patch Patch4: gdm-2.8.0.2-session-errors-in-tmp.patch Patch5: gdm-2.13.0.4-update-switchdesk-location.patch Patch6: gdm-2.6.0.7-wait-for-bootup.patch @@ -100,7 +99,6 @@ %patch1 -p1 -b .change-defaults %patch2 -p1 -b .add-pam-timestamp-module -%patch3 -p1 -b .fix-selinux-check %patch4 -p1 -b .session-errors-in-tmp %patch5 -p1 -b .update-switchdesk-location ##%patch6 -p1 -b .wait-for-bootup From fedora-cvs-commits at redhat.com Tue Jan 17 23:12:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 18:12:43 -0500 Subject: rpms/mesa/devel mesa-6.4.1-texture-from-drawable.patch,1.1,1.2 Message-ID: <200601172312.k0HNCh4r004476@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/mesa/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4453 Modified Files: mesa-6.4.1-texture-from-drawable.patch Log Message: Update mesa-6.4.1-texture-from-drawable.patch to not include GLX_FRONT_LEFT_EXT #define. mesa-6.4.1-texture-from-drawable.patch: include/GL/glxext.h | 13 ++++++ src/glx/x11/glxcmds.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ src/glx/x11/glxextensions.c | 1 src/glx/x11/glxextensions.h | 1 4 files changed, 100 insertions(+) Index: mesa-6.4.1-texture-from-drawable.patch =================================================================== RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.4.1-texture-from-drawable.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mesa-6.4.1-texture-from-drawable.patch 17 Jan 2006 22:30:50 -0000 1.1 +++ mesa-6.4.1-texture-from-drawable.patch 17 Jan 2006 23:12:37 -0000 1.2 @@ -5,17 +5,6 @@ diff -u -p -r1.12 glxext.h --- include/GL/glxext.h 15 Aug 2005 23:25:33 -0000 1.12 +++ include/GL/glxext.h 17 Jan 2006 21:55:38 -0000 -@@ -177,6 +177,10 @@ extern "C" { - #define GLX_SCREEN_EXT 0x800C - #endif - -+#ifndef GLX_EXT_texture_from_drawable -+#define GLX_FRONT_LEFT_EXT 0x6005 -+#endif -+ - #ifndef GLX_SGIX_fbconfig - #define GLX_WINDOW_BIT_SGIX 0x00000001 - #define GLX_PIXMAP_BIT_SGIX 0x00000002 @@ -481,6 +485,19 @@ typedef GLXContext ( * PFNGLXIMPORTCONTE typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context); #endif From fedora-cvs-commits at redhat.com Tue Jan 17 23:16:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 18:16:54 -0500 Subject: rpms/fontconfig/devel fontconfig-2.3.93-defaultconfig.patch, NONE, 1.1 50-no-hint-fonts.conf, 1.2, 1.3 fontconfig.spec, 1.58, 1.59 fontconfig-2.3.91-defaultconfig.patch, 1.2, NONE Message-ID: <200601172316.k0HNGsmZ012101@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/fontconfig/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11526 Modified Files: 50-no-hint-fonts.conf fontconfig.spec Added Files: fontconfig-2.3.93-defaultconfig.patch Removed Files: fontconfig-2.3.91-defaultconfig.patch Log Message: - apply patch from Tim Mayberry to correct aliasing and disable hinting for the two Chinese font names AR PL ShanHeiSun Uni and AR PL Zenkai Uni fontconfig-2.3.93-defaultconfig.patch: fonts.conf.in | 103 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 82 insertions(+), 21 deletions(-) --- NEW FILE fontconfig-2.3.93-defaultconfig.patch --- --- fontconfig-2.3.93/fonts.conf.in.defaultconfig 2005-11-03 14:48:59.000000000 +1000 +++ fontconfig-2.3.93/fonts.conf.in 2006-01-17 12:27:51.000000000 +1000 @@ -78,7 +78,9 @@ Times Nimbus Roman No9 L Luxi Serif + Sazanami Mincho Kochi Mincho + AR PL ZenKai Uni AR PL SungtiL GB AR PL Mingti2L Big5 ???????????? ???????????? @@ -98,7 +100,9 @@ Albany AMT Nimbus Sans L Luxi Sans + Sazanami Gothic Kochi Gothic + AR PL ShanHeiSun Uni AR PL KaitiM GB AR PL KaitiM Big5 ???????????? ??????????????????????????? @@ -146,15 +150,37 @@ --> Times - Nimbus Roman No9 L + + Nimbus Roman No9 L + Thorndale AMT + Times New Roman + Helvetica - Nimbus Sans L + + Nimbus Sans L + Albany AMT + Arial + Courier - Nimbus Mono L + + Cumberland AMT + Courier New + Nimbus Mono L + + + + + ZapfDingbats + Dingbats + + + + Symbol + Open Symbols L Times New Roman - Thorndale AMT + + Thorndale AMT + Nimbus Roman No9 L + Arial - Albany AMT + + Albany AMT + Nimbus Sans L + Arial + Courier New @@ -260,16 +293,25 @@ serif + Nimbus Roman No9 L + Thorndale AMT Bitstream Vera Serif Times New Roman - Thorndale AMT Luxi Serif - Nimbus Roman No9 L Times - Frank Ruehl + KacstQura + Frank Ruehl CLM + Lohit Bengali + Lohit Gujarati + Lohit Hindi + Lohit Punjabi + Lohit Tamil + Sazanami Mincho + Kochi Mincho + ZYSong18030 MgOpen Canonica FreeSerif - Kochi Mincho + AR PL Zenkai Uni AR PL SungtiL GB AR PL Mingti2L Big5 ???????????? ???????????? @@ -279,39 +321,58 @@ sans-serif + Luxi Sans + Albany AMT Bitstream Vera Sans Verdana Arial - Albany AMT - Luxi Sans Nimbus Sans L Helvetica + KacstQura Nachlieli - MgOpen Modata - FreeSans + Lohit Bengali + Lohit Gujarati + Lohit Hindi + Lohit Punjabi + Lohit Tamil + Sazanami Gothic Kochi Gothic - AR PL KaitiM GB - AR PL KaitiM Big5 ???????????? ??????????????????????????? - Baekmuk Dotum + MgOpen Modata + FreeSans + ZYSong18030 + AR PL ShanHeiSun Uni + AR PL SungtiL GB + AR PL Mingti2L Big5 + Baekmuk Gulim SimSun monospace + Luxi Mono Bitstream Vera Sans Mono Andale Mono Courier New Cumberland AMT - Luxi Mono + KacstQura + Miriam Mono CLM + Lohit Bengali + Lohit Gujarati + Lohit Hindi + Lohit Punjabi + Lohit Tamil Nimbus Mono L Courier - Miriam Mono + Sazanami Gothic + Kochi Gothic + ZYSong18030 + AR PL ShanHeiSun Uni + AR PL SungtiL GB + AR PL Mingti2L Big5 + Baekmuk Gulim FreeMono - Kochi Gothic - AR PL KaitiM GB - Baekmuk Dotum Index: 50-no-hint-fonts.conf =================================================================== RCS file: /cvs/dist/rpms/fontconfig/devel/50-no-hint-fonts.conf,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 50-no-hint-fonts.conf 13 Dec 2005 23:35:56 -0000 1.2 +++ 50-no-hint-fonts.conf 17 Jan 2006 23:16:50 -0000 1.3 @@ -12,12 +12,7 @@ false - - + false @@ -28,7 +23,7 @@ false - + false @@ -39,7 +34,7 @@ false - + false @@ -50,7 +45,7 @@ false - + false @@ -94,9 +89,28 @@ false + + + AR PL ShanHeiSun Uni + + + false + + + true + + + + + AR PL KaitiM Big5 + + + false + + - AR PL KaitiM Big5 + AR PL ZenKai Uni false Index: fontconfig.spec =================================================================== RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- fontconfig.spec 10 Jan 2006 20:31:37 -0000 1.58 +++ fontconfig.spec 17 Jan 2006 23:16:50 -0000 1.59 @@ -3,7 +3,7 @@ Summary: Font configuration and customization library Name: fontconfig Version: 2.3.93 -Release: 3 +Release: 4 License: MIT Group: System Environment/Libraries Source: http://fontconfig.org/release/fontconfig-%{version}.tar.gz @@ -12,7 +12,7 @@ Source1: 40-blacklist-fonts.conf Source2: 50-no-hint-fonts.conf -Patch1: fontconfig-2.3.91-defaultconfig.patch +Patch1: fontconfig-2.3.93-defaultconfig.patch Patch2: fontconfig-2.3.91-crosscheck.patch BuildRequires: freetype-devel >= %{freetype_version} @@ -134,6 +134,11 @@ %{_mandir}/man3/* %changelog +* Tue Jan 17 2006 Ray Strode - 2.3.93-4 +- apply patch from Tim Mayberry to correct aliasing and disable + hinting for the two Chinese font names AR PL ShanHeiSun Uni + and AR PL Zenkai Uni + * Tue Jan 10 2006 Bill Nottingham - 2.3.93-3 - prereq coreutils for mkdir/touch in %%post --- fontconfig-2.3.91-defaultconfig.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 18 01:35:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 20:35:34 -0500 Subject: rpms/fontconfig/devel fontconfig-2.3.93-defaultconfig.patch, 1.1, 1.2 Message-ID: <200601180135.k0I1ZYAl010052@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/fontconfig/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9951 Modified Files: fontconfig-2.3.93-defaultconfig.patch Log Message: - fix encoding issue in last patch fontconfig-2.3.93-defaultconfig.patch: fonts.conf.in | 103 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 82 insertions(+), 21 deletions(-) Index: fontconfig-2.3.93-defaultconfig.patch =================================================================== RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig-2.3.93-defaultconfig.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fontconfig-2.3.93-defaultconfig.patch 17 Jan 2006 23:16:50 -0000 1.1 +++ fontconfig-2.3.93-defaultconfig.patch 18 Jan 2006 01:35:26 -0000 1.2 @@ -1,5 +1,5 @@ ---- fontconfig-2.3.93/fonts.conf.in.defaultconfig 2005-11-03 14:48:59.000000000 +1000 -+++ fontconfig-2.3.93/fonts.conf.in 2006-01-17 12:27:51.000000000 +1000 +--- fontconfig-2.3.93/fonts.conf.in.defaultconfig 2005-11-02 23:48:59.000000000 -0500 ++++ fontconfig-2.3.93/fonts.conf.in 2006-01-17 20:33:53.000000000 -0500 @@ -78,7 +78,9 @@ Times Nimbus Roman No9 L @@ -9,7 +9,7 @@ + AR PL ZenKai Uni AR PL SungtiL GB AR PL Mingti2L Big5 - ???????????? ???????????? + ?????? ?????? @@ -98,7 +100,9 @@ Albany AMT Nimbus Sans L @@ -19,7 +19,7 @@ + AR PL ShanHeiSun Uni AR PL KaitiM GB AR PL KaitiM Big5 - ???????????? ??????????????????????????? + ?????? ???????????? @@ -146,15 +150,37 @@ --> @@ -111,7 +111,7 @@ + AR PL Zenkai Uni AR PL SungtiL GB AR PL Mingti2L Big5 - ???????????? ???????????? + ?????? ?????? @@ -279,39 +321,58 @@ sans-serif @@ -125,7 +125,7 @@ - Luxi Sans Nimbus Sans L Helvetica -+ KacstQura ++ KacstQura Nachlieli - MgOpen Modata - FreeSans @@ -138,7 +138,7 @@ Kochi Gothic - AR PL KaitiM GB - AR PL KaitiM Big5 - ???????????? ??????????????????????????? + ?????? ???????????? - Baekmuk Dotum + MgOpen Modata + FreeSans @@ -165,7 +165,7 @@ + Lohit Gujarati + Lohit Hindi + Lohit Punjabi -+ Lohit Tamil ++ Lohit Tamil Nimbus Mono L Courier - Miriam Mono @@ -183,4 +183,3 @@ - From fedora-cvs-commits at redhat.com Wed Jan 18 02:49:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 21:49:04 -0500 Subject: rpms/xorg-x11-fonts/devel xorg-x11-fonts.spec,1.8,1.9 Message-ID: <200601180249.k0I2n4tJ027296@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-fonts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27284 Modified Files: xorg-x11-fonts.spec Log Message: * Tue Jan 17 2006 Mike A. Harris 1.0.0-3 - Added missing post/postun scripts for ISO8859-1-75dpi and ISO8859-1-100dpi font packages. (#174416) Index: xorg-x11-fonts.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xorg-x11-fonts.spec 10 Jan 2006 06:10:36 -0000 1.8 +++ xorg-x11-fonts.spec 18 Jan 2006 02:48:59 -0000 1.9 @@ -30,7 +30,7 @@ Summary: X.Org X11 fonts Name: xorg-x11-fonts Version: 1.0.0 -Release: 2 +Release: 3 License: Various licenses Group: User Interface/X URL: http://www.x.org @@ -692,6 +692,20 @@ } # &> /dev/null || : +%post ISO8859-1-75dpi +{ + mkfontdir %{_x11fontdir}/75dpi + /usr/sbin/chkfontpath -q -a %{_x11fontdir}/75dpi:unscaled +} +# &> /dev/null || : + +%post ISO8859-1-100dpi +{ + mkfontdir %{_x11fontdir}/100dpi + /usr/sbin/chkfontpath -q -a %{_x11fontdir}/100dpi:unscaled +} +# &> /dev/null || : + %post ISO8859-2-75dpi { mkfontdir %{_x11fontdir}/75dpi @@ -771,6 +785,22 @@ } # &> /dev/null || : +%postun ISO8859-1-75dpi +{ + if [ "$1" = "0" ]; then + mkfontdir %{_x11fontdir}/75dpi + fi +} +# &> /dev/null || : + +%postun ISO8859-1-100dpi +{ + if [ "$1" = "0" ]; then + mkfontdir %{_x11fontdir}/100dpi + fi +} +# &> /dev/null || : + %postun ISO8859-2-75dpi { if [ "$1" = "0" ]; then @@ -1494,6 +1524,10 @@ %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-* %changelog +* Tue Jan 17 2006 Mike A. Harris 1.0.0-3 +- Added missing post/postun scripts for ISO8859-1-75dpi and ISO8859-1-100dpi + font packages. (#174416) + * Tue Jan 10 2006 Bill Nottingham 1.0.0-2 - fix obsoletes (#177377) From fedora-cvs-commits at redhat.com Wed Jan 18 02:51:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 21:51:17 -0500 Subject: rpms/gnome-power-manager/devel .cvsignore, 1.7, 1.8 gnome-power-manager.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200601180251.k0I2pHwd027420@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27406 Modified Files: .cvsignore gnome-power-manager.spec sources Log Message: - update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 7 Jan 2006 02:25:38 -0000 1.7 +++ .cvsignore 18 Jan 2006 02:51:13 -0000 1.8 @@ -1 +1 @@ -gnome-power-manager-0.3.3-cvs20060106.tar.gz +gnome-power-manager-0.3.4.tar.gz Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnome-power-manager.spec 7 Jan 2006 02:25:38 -0000 1.9 +++ gnome-power-manager.spec 18 Jan 2006 02:51:13 -0000 1.10 @@ -4,8 +4,8 @@ Summary: GNOME Power Manager Name: gnome-power-manager -Version: 0.3.3 -Release: 0.cvs.20060106 +Version: 0.3.4 +Release: 1 License: GPL Group: Applications/System Source: gnome-power-manager-%{version}-cvs20060106.tar.gz @@ -72,6 +72,9 @@ %{_datadir}/dbus-1/services/gnome-power-manager.service %changelog +* Tue Jan 17 2006 Ray Strode - 0.3.4-1 +- update to 0.3.4 + * Fri Jan 6 2006 Jeremy Katz - 0.3.3-0.cvs.20060106 - update to a cvs snap so that it works with hal cvs snap - make sure we use libnotify Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 7 Jan 2006 02:25:38 -0000 1.7 +++ sources 18 Jan 2006 02:51:13 -0000 1.8 @@ -1 +1 @@ -6adaaab186f0e00414ce31cb1a9deb69 gnome-power-manager-0.3.3-cvs20060106.tar.gz +72f207999130f2830a4ce65ec3015257 gnome-power-manager-0.3.4.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 18 03:14:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 22:14:51 -0500 Subject: rpms/pyOpenSSL/devel pyOpenSSL-threadsafe.patch,1.1,1.2 Message-ID: <200601180314.k0I3EpLY027626@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/pyOpenSSL/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27612 Modified Files: pyOpenSSL-threadsafe.patch Log Message: Include pthread.h to grab pthread prototypes pyOpenSSL-threadsafe.patch: crypto/crypto.c | 72 +++++++++++++++++++++++++++++++++++++++++ ssl/context.c | 97 +++++++++++++++++++++++--------------------------------- 2 files changed, 113 insertions(+), 56 deletions(-) Index: pyOpenSSL-threadsafe.patch =================================================================== RCS file: /cvs/dist/rpms/pyOpenSSL/devel/pyOpenSSL-threadsafe.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pyOpenSSL-threadsafe.patch 13 Jul 2005 03:14:08 -0000 1.1 +++ pyOpenSSL-threadsafe.patch 18 Jan 2006 03:14:47 -0000 1.2 @@ -170,13 +170,15 @@ MY_END_ALLOW_THREADS(self->tstate); --- pyOpenSSL-0.6/src/crypto/crypto.c.threadsafe 2004-08-09 10:56:05.000000000 -0400 +++ pyOpenSSL-0.6/src/crypto/crypto.c 2005-07-12 22:29:32.000000000 -0400 -@@ -668,6 +668,72 @@ +@@ -668,6 +668,74 @@ { NULL, NULL } }; + +#ifdef WITH_THREAD + ++#include ++ +#define MUTEX_TYPE pthread_mutex_t +#define MUTEX_SETUP(x) pthread_mutex_init(&(x), NULL) +#define MUTEX_CLEANUP(x) pthread_mutex_destroy(&(x)) From fedora-cvs-commits at redhat.com Wed Jan 18 03:19:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 22:19:34 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.10,1.11 Message-ID: <200601180319.k0I3JYYA007365@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7352 Modified Files: gnome-power-manager.spec Log Message: change source line to match tarball name Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gnome-power-manager.spec 18 Jan 2006 02:51:13 -0000 1.10 +++ gnome-power-manager.spec 18 Jan 2006 03:19:31 -0000 1.11 @@ -8,7 +8,7 @@ Release: 1 License: GPL Group: Applications/System -Source: gnome-power-manager-%{version}-cvs20060106.tar.gz +Source: gnome-power-manager-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome-power.sourceforge.net/ BuildPrereq: libgnomeui-devel From fedora-cvs-commits at redhat.com Wed Jan 18 03:37:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 22:37:25 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.11,1.12 Message-ID: <200601180337.k0I3bP7P019227@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19142 Modified Files: gnome-power-manager.spec Log Message: - update to 0.3.4 - disable updating scrollkeeper database in buildroot (move to %%post) Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnome-power-manager.spec 18 Jan 2006 03:19:31 -0000 1.11 +++ gnome-power-manager.spec 18 Jan 2006 03:37:17 -0000 1.12 @@ -32,7 +32,7 @@ %setup -q %build -%configure +%configure --disable-scrollkeeper make %install @@ -58,7 +58,7 @@ for S in $SCHEMAS; do gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null done - +scrollkeeper-update %files -f %{name}.lang %defattr(-,root,root) @@ -70,10 +70,16 @@ %{_sysconfdir}/gconf/schemas/*.schemas %{_sysconfdir}/dbus-1/system.d/gnome-power-manager.conf %{_datadir}/dbus-1/services/gnome-power-manager.service +%{_datadir}/gnome/help/gnome-power-manager/C/figures/pref-main.png +%{_datadir}/gnome/help/gnome-power-manager/C/gnome-power-manager.xml +%{_datadir}/gnome/help/gnome-power-manager/C/legal.xml +%{_datadir}/omf/gnome-power-manager/gnome-power-manager-C.omf %changelog * Tue Jan 17 2006 Ray Strode - 0.3.4-1 - update to 0.3.4 +- disable updating scrollkeeper database in buildroot + (move to %%post) * Fri Jan 6 2006 Jeremy Katz - 0.3.3-0.cvs.20060106 - update to a cvs snap so that it works with hal cvs snap From fedora-cvs-commits at redhat.com Wed Jan 18 03:48:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 22:48:01 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.12,1.13 Message-ID: <200601180348.k0I3m1Lg031281@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29772 Modified Files: gnome-power-manager.spec Log Message: - add a postun scrollkeeper-update and some scrollkeeper buildreq/req's for the next rebuild Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnome-power-manager.spec 18 Jan 2006 03:37:17 -0000 1.12 +++ gnome-power-manager.spec 18 Jan 2006 03:47:57 -0000 1.13 @@ -17,10 +17,12 @@ BuildPrereq: hal-devel >= %{hal_version} BuildPrereq: dbus-devel >= %{dbus_version} BuildPrereq: libnotify +BuildRequires: scrollkeeper Requires: gnome-mime-data Requires: gnome-icon-theme Requires: hal >= %{hal_version} Requires: dbus-glib >= %{dbus_version} +Requires: scrollkeeper %description GNOME Power Manager uses the information and facilities provided by HAL @@ -60,6 +62,9 @@ done scrollkeeper-update +%postun +scrollkeeper-update + %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README From fedora-cvs-commits at redhat.com Wed Jan 18 04:21:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 23:21:15 -0500 Subject: rpms/gnome-icon-theme/devel .cvsignore, 1.21, 1.22 gnome-icon-theme.spec, 1.30, 1.31 sources, 1.21, 1.22 Message-ID: <200601180421.k0I4LFFV024818@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-icon-theme/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24766 Modified Files: .cvsignore gnome-icon-theme.spec sources Log Message: 2.13.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 17 Jan 2006 13:57:47 -0000 1.21 +++ .cvsignore 18 Jan 2006 04:21:08 -0000 1.22 @@ -12,3 +12,4 @@ gnome-icon-theme-2.13.2.tar.bz2 gnome-icon-theme-2.13.4.tar.bz2 gnome-icon-theme-2.13.5.tar.bz2 +gnome-icon-theme-2.13.5.1.tar.bz2 Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gnome-icon-theme.spec 17 Jan 2006 13:58:18 -0000 1.30 +++ gnome-icon-theme.spec 18 Jan 2006 04:21:08 -0000 1.31 @@ -1,6 +1,6 @@ Summary: Base gnome icons Name: gnome-icon-theme -Version: 2.13.5 +Version: 2.13.5.1 Release: 1 Source0: %{name}-%{version}.tar.bz2 Source1: external-icons-2.10.1-2.tar.gz @@ -8,6 +8,7 @@ BuildArch: noarch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-root +BuildRequires: icon-naming-utils Requires: hicolor-icon-theme Prereq: gtk2 >= 2.6.2 @@ -87,8 +88,9 @@ %{_datadir}/pkgconfig/gnome-icon-theme.pc %changelog -* Tue Jan 17 2006 Matthias Clasen 2.13.5-1 -- Update to 2.13.5 +* Tue Jan 17 2006 Matthias Clasen 2.13.5.1-1 +- Update to 2.13.5.1 +- BuildRequire icon-naming-utils * Tue Jan 03 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 17 Jan 2006 13:57:47 -0000 1.21 +++ sources 18 Jan 2006 04:21:08 -0000 1.22 @@ -1,2 +1,2 @@ e6c3328995f2ce73ee91d1a654198f3f external-icons-2.10.1-2.tar.gz -d2d5ceb38d29e5edbb8a70585ff41e27 gnome-icon-theme-2.13.5.tar.bz2 +2cf2407a9c964a84129853a133d38086 gnome-icon-theme-2.13.5.1.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 18 04:34:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 23:34:20 -0500 Subject: rpms/gnome-icon-theme/devel gnome-icon-theme.spec,1.31,1.32 Message-ID: <200601180434.k0I4YKIA028695@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-icon-theme/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28645 Modified Files: gnome-icon-theme.spec Log Message: Fix file lists Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gnome-icon-theme.spec 18 Jan 2006 04:21:08 -0000 1.31 +++ gnome-icon-theme.spec 18 Jan 2006 04:34:12 -0000 1.32 @@ -84,7 +84,6 @@ %files %defattr(-,root,root) %{_datadir}/icons/gnome -%{_datadir}/icons/hicolor %{_datadir}/pkgconfig/gnome-icon-theme.pc %changelog From fedora-cvs-commits at redhat.com Wed Jan 18 04:35:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 23:35:51 -0500 Subject: rpms/gdm/devel gdm.spec,1.117,1.118 Message-ID: <200601180435.k0I4ZpMj029086@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29057 Modified Files: gdm.spec Log Message: UTF8! Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- gdm.spec 17 Jan 2006 23:00:02 -0000 1.117 +++ gdm.spec 18 Jan 2006 04:35:48 -0000 1.118 @@ -309,7 +309,7 @@ - update to 2.13.0.5 (bug 178099) * Tue Jan 17 2006 Ray Strode - 1:2.13.0.4-5 -- add new theme by Diana Fong, M?ir?n Duffy, and me +- add new theme by Diana Fong, M??ir??n Duffy, and me * Mon Jan 16 2006 Ray Strode - 1:2.13.0.4-4 - improve migration snippet (bug 177443). @@ -934,7 +934,7 @@ * Mon Mar 5 2001 Preston Brown - don't screw up color map on 8 bit displays -* Fri Feb 23 2001 Trond Eivind Glomsr?d +* Fri Feb 23 2001 Trond Eivind Glomsr??d - langify - Don't define and use "ver" and "nam" at the top of the spec file - use %%{_tmppath} From fedora-cvs-commits at redhat.com Wed Jan 18 04:41:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 23:41:44 -0500 Subject: rpms/gnome-icon-theme/devel gnome-icon-theme.spec,1.32,1.33 Message-ID: <200601180441.k0I4fhvV030761@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-icon-theme/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30675 Modified Files: gnome-icon-theme.spec Log Message: More fixage Index: gnome-icon-theme.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-icon-theme/devel/gnome-icon-theme.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gnome-icon-theme.spec 18 Jan 2006 04:34:12 -0000 1.32 +++ gnome-icon-theme.spec 18 Jan 2006 04:41:36 -0000 1.33 @@ -38,6 +38,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/locale/* ## create symlinks so the gnome theme covers some extra icons we've added +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps ln -s gnome-util.png redhat-accessories.png @@ -56,6 +57,7 @@ ln -s gnome-system.png redhat-system_tools.png #ln -s %{_datadir}/pixmaps/.png redhat-tools.png +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/filesystems cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/filesystems rm -f gnome-fs-locally-shared.png @@ -63,6 +65,7 @@ ln -s ../stock/net/stock_shared-by-me.png gnome-fs-locally-shared.png ln -s ../stock/net/stock_shared-to-me.png gnome-fs-share-private.png +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/filesystems cd $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/filesystems rm -f gnome-fs-locally-shared.png rm -f gnome-fs-share-private.png @@ -84,6 +87,7 @@ %files %defattr(-,root,root) %{_datadir}/icons/gnome +%{_datadir}/icons/hicolor %{_datadir}/pkgconfig/gnome-icon-theme.pc %changelog From fedora-cvs-commits at redhat.com Wed Jan 18 04:45:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 23:45:35 -0500 Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.24, 1.25 nautilus-cd-burner.spec, 1.42, 1.43 sources, 1.24, 1.25 Message-ID: <200601180445.k0I4jZ4W031807@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/nautilus-cd-burner/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31764 Modified Files: .cvsignore nautilus-cd-burner.spec sources Log Message: 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 3 Jan 2006 19:14:44 -0000 1.24 +++ .cvsignore 18 Jan 2006 04:45:31 -0000 1.25 @@ -15,3 +15,4 @@ nautilus-cd-burner-2.13.2.tar.bz2 nautilus-cd-burner-2.13.3.tar.bz2 nautilus-cd-burner-2.13.4.tar.bz2 +nautilus-cd-burner-2.13.5.tar.bz2 Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- nautilus-cd-burner.spec 3 Jan 2006 19:14:44 -0000 1.42 +++ nautilus-cd-burner.spec 18 Jan 2006 04:45:31 -0000 1.43 @@ -1,6 +1,6 @@ Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner -Version: 2.13.4 +Version: 2.13.5 Release: 1 Source0: %{name}-%{version}.tar.bz2 License: LGPL/GPL @@ -99,6 +99,9 @@ %changelog +* Tue Jan 17 2006 Matthias Clasen 2.13.5-1 +- Update to 2.13.5 + * Tue Jan 03 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 3 Jan 2006 19:14:44 -0000 1.24 +++ sources 18 Jan 2006 04:45:31 -0000 1.25 @@ -1 +1 @@ -c22bcff40fc463c83de71983169c7ff5 nautilus-cd-burner-2.13.4.tar.bz2 +2a6fe015089663f99da665ba0e193655 nautilus-cd-burner-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 18 04:48:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 23:48:18 -0500 Subject: rpms/atk/devel .cvsignore, 1.18, 1.19 atk.spec, 1.26, 1.27 sources, 1.18, 1.19 Message-ID: <200601180448.k0I4mIBM005773@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/atk/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5509 Modified Files: .cvsignore atk.spec sources Log Message: 1.11.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/atk/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 17 Jan 2006 01:05:35 -0000 1.18 +++ .cvsignore 18 Jan 2006 04:48:15 -0000 1.19 @@ -5,3 +5,4 @@ atk-1.10.1.tar.bz2 atk-1.10.3.tar.bz2 atk-1.11.0.tar.bz2 +atk-1.11.2.tar.bz2 Index: atk.spec =================================================================== RCS file: /cvs/dist/rpms/atk/devel/atk.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- atk.spec 17 Jan 2006 01:12:59 -0000 1.26 +++ atk.spec 18 Jan 2006 04:48:16 -0000 1.27 @@ -2,7 +2,7 @@ Summary: Interfaces for accessibility support. Name: atk -Version: 1.11.0 +Version: 1.11.2 Release: 1 License: LGPL Group: System Environment/Libraries @@ -10,8 +10,6 @@ URL: http://developer.gnome.org/projects/gap/ BuildRoot: %{_tmppath}/atk-%{PACKAGE_VERSION}-root BuildPreReq: glib2-devel >= %{glib2_version} -# 1.11.0 tarball is missing api docs -BuildRequires: gtk-doc %description The ATK library provides a set of interfaces for adding accessibility @@ -37,7 +35,7 @@ %build -%configure --enable-gtk-doc +%configure --disable-gtk-doc make %install @@ -70,6 +68,9 @@ %{_datadir}/gtk-doc/ %changelog +* Tue Jan 17 2006 Matthias Clasen - 1.11.2-1 +- Update to 1.11.2 + * Mon Jan 16 2006 Matthias Clasen - 1.11.0-1 - Update to 1.11.0 Index: sources =================================================================== RCS file: /cvs/dist/rpms/atk/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 17 Jan 2006 01:05:35 -0000 1.18 +++ sources 18 Jan 2006 04:48:16 -0000 1.19 @@ -1 +1 @@ -5b320d6eae88d76ef7fb89595cf26a3b atk-1.11.0.tar.bz2 +fd1f2349ece8a63257c7ffedfa6316af atk-1.11.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 18 04:50:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 23:50:44 -0500 Subject: rpms/nautilus-cd-burner/devel nautilus-cd-burner.spec,1.43,1.44 Message-ID: <200601180450.k0I4oiW2010280@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/nautilus-cd-burner/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10033 Modified Files: nautilus-cd-burner.spec Log Message: Fix file lists Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- nautilus-cd-burner.spec 18 Jan 2006 04:45:31 -0000 1.43 +++ nautilus-cd-burner.spec 18 Jan 2006 04:50:40 -0000 1.44 @@ -90,6 +90,7 @@ %{_bindir}/nautilus-cd-burner %{_libexecdir}/mapping-daemon %{_datadir}/nautilus-cd-burner +%{_datadir}/applications/nautilus-cd-burner.desktop %files devel %defattr(-, root, root) From fedora-cvs-commits at redhat.com Wed Jan 18 04:53:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 23:53:22 -0500 Subject: rpms/at-spi/devel .cvsignore, 1.16, 1.17 at-spi.spec, 1.23, 1.24 sources, 1.16, 1.17 Message-ID: <200601180453.k0I4rMSK013898@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/at-spi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13846 Modified Files: .cvsignore at-spi.spec sources Log Message: 1.7.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 17 Jan 2006 17:36:03 -0000 1.16 +++ .cvsignore 18 Jan 2006 04:53:16 -0000 1.17 @@ -6,3 +6,4 @@ at-spi-1.6.6.tar.bz2 at-spi-1.7.0.tar.bz2 at-spi-1.7.1.tar.bz2 +at-spi-1.7.2.tar.bz2 Index: at-spi.spec =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- at-spi.spec 17 Jan 2006 17:36:03 -0000 1.23 +++ at-spi.spec 18 Jan 2006 04:53:16 -0000 1.24 @@ -6,7 +6,7 @@ Summary: Assistive Technology Service Provider Interface Name: at-spi -Version: 1.7.1 +Version: 1.7.2 Release: 1 URL: http://developer.gnome.org/projects/gap/ Source0: %{name}-%{version}.tar.bz2 @@ -51,7 +51,7 @@ %setup -q %build -%configure --enable-gtk-doc +%configure --disable-gtk-doc make %install @@ -87,8 +87,8 @@ %{_includedir}/* %changelog -* Tue Jan 17 2006 Matthias Clasen 1.7.1-1 -- Update to 1.7.1 +* Tue Jan 17 2006 Matthias Clasen 1.7.2-1 +- Update to 1.7.2 * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 17 Jan 2006 17:36:03 -0000 1.16 +++ sources 18 Jan 2006 04:53:16 -0000 1.17 @@ -1 +1 @@ -12fe91d821ae88ee2a4dff807094b5dc at-spi-1.7.1.tar.bz2 +6b470020c760697bc188dd5903c7a0fb at-spi-1.7.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 18 04:59:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 17 Jan 2006 23:59:25 -0500 Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.11, 1.12 gnome-doc-utils.spec, 1.14, 1.15 sources, 1.11, 1.12 Message-ID: <200601180459.k0I4xPBO015919@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-doc-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15873 Modified Files: .cvsignore gnome-doc-utils.spec sources Log Message: 0.5.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 21 Dec 2005 03:45:31 -0000 1.11 +++ .cvsignore 18 Jan 2006 04:59:19 -0000 1.12 @@ -8,3 +8,4 @@ gnome-doc-utils-0.4.3.tar.bz2 gnome-doc-utils-0.5.1.tar.bz2 gnome-doc-utils-0.5.2.tar.bz2 +gnome-doc-utils-0.5.3.tar.bz2 Index: gnome-doc-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnome-doc-utils.spec 21 Dec 2005 03:45:31 -0000 1.14 +++ gnome-doc-utils.spec 18 Jan 2006 04:59:19 -0000 1.15 @@ -1,6 +1,6 @@ Summary: Documentation utilities for the GNOME project Name: gnome-doc-utils -Version: 0.5.2 +Version: 0.5.3 Release: 1 License: LGPL Group: Development/Tools @@ -53,6 +53,9 @@ %{_datadir}/gnome-doc-utils %changelog +* Tue Jan 13 2006 Matthias Clasen - 0.5.3-1 +- Update to 0.5.3 + * Wed Dec 20 2005 Matthias Clasen - 0.5.2-1 - Update to 0.5.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 21 Dec 2005 03:45:31 -0000 1.11 +++ sources 18 Jan 2006 04:59:19 -0000 1.12 @@ -1 +1 @@ -87ed7a6cd37a872f4a6f99245a08ed3d gnome-doc-utils-0.5.2.tar.bz2 +54c01d6cc947d3b0d50ea3a6b0e5d00d gnome-doc-utils-0.5.3.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 18 06:03:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 01:03:18 -0500 Subject: rpms/kernel/devel linux-2.6-execshield.patch,1.9,1.10 Message-ID: <200601180603.k0I63H2i016225@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16115 Modified Files: linux-2.6-execshield.patch Log Message: fix warning linux-2.6-execshield.patch: arch/i386/kernel/asm-offsets.c | 1 arch/i386/kernel/cpu/common.c | 7 + arch/i386/kernel/entry.S | 8 +- arch/i386/kernel/process.c | 59 +++++++++++++++ arch/i386/kernel/signal.c | 4 - arch/i386/kernel/smp.c | 3 arch/i386/kernel/sysenter.c | 56 ++++++++++++++- arch/i386/kernel/traps.c | 93 ++++++++++++++++++++++++- arch/i386/kernel/vsyscall-sysenter.S | 6 - arch/i386/kernel/vsyscall.lds.S | 4 - arch/i386/mm/init.c | 6 + arch/i386/mm/mmap.c | 6 + arch/ia64/ia32/binfmt_elf32.c | 2 arch/x86_64/ia32/ia32_binfmt.c | 4 - arch/x86_64/kernel/process.c | 6 - arch/x86_64/kernel/setup64.c | 23 ------ arch/x86_64/mm/fault.c | 2 drivers/char/random.c | 7 + fs/binfmt_elf.c | 130 ++++++++++++++++++++++++++++------- fs/proc/array.c | 8 +- fs/proc/base.c | 4 - fs/proc/task_mmu.c | 25 +++++- include/asm-i386/desc.h | 14 +++ include/asm-i386/elf.h | 42 +++++++---- include/asm-i386/mmu.h | 6 + include/asm-i386/pgalloc.h | 1 include/asm-i386/processor.h | 7 + include/asm-i386/thread_info.h | 1 include/asm-ia64/pgalloc.h | 4 + include/asm-powerpc/pgalloc.h | 5 + include/asm-ppc/pgalloc.h | 5 + include/asm-s390/pgalloc.h | 4 + include/asm-sparc/pgalloc.h | 4 + include/asm-sparc64/pgalloc.h | 4 + include/asm-x86_64/pgalloc.h | 7 + include/asm-x86_64/pgtable.h | 2 include/asm-x86_64/processor.h | 2 include/linux/mm.h | 11 ++ include/linux/resource.h | 5 + include/linux/sched.h | 9 ++ include/linux/sysctl.h | 3 kernel/signal.c | 38 ++++++++++ kernel/sysctl.c | 39 ++++++++++ mm/fremap.c | 16 ++-- mm/mmap.c | 105 ++++++++++++++++++++++++++-- mm/mprotect.c | 5 + mm/mremap.c | 4 - 47 files changed, 684 insertions(+), 123 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-execshield.patch,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- linux-2.6-execshield.patch 17 Jan 2006 21:18:44 -0000 1.9 +++ linux-2.6-execshield.patch 18 Jan 2006 06:03:01 -0000 1.10 @@ -1332,14 +1332,12 @@ =================================================================== --- linux.orig/include/asm-x86_64/processor.h +++ linux/include/asm-x86_64/processor.h -@@ -164,6 +164,10 @@ static inline void clear_in_cr4 (unsigne +@@ -164,6 +164,8 @@ static inline void clear_in_cr4 (unsigne */ #define TASK_SIZE64 (0x800000000000UL - 4096) +#define __HAVE_ARCH_ALIGN_STACK + -+#define HAVE_ARCH_PICK_MMAP_LAYOUT -+ /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ From fedora-cvs-commits at redhat.com Wed Jan 18 09:07:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 04:07:14 -0500 Subject: rpms/net-snmp/devel net-snmp-5.3-5.3.0.1.patch, NONE, 1.1 net-snmp.spec, 1.61, 1.62 Message-ID: <200601180907.k0I97E6q026964@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26841 Modified Files: net-snmp.spec Added Files: net-snmp-5.3-5.3.0.1.patch Log Message: Security fix. Bug granting write access to read-only users or communities which were configured using the "rocommunity" or "rouser" snmpd.conf tokens fixed net-snmp-5.3-5.3.0.1.patch: agent/mibgroup/mibII/vacm_conf.c | 6 +++--- testing/tests/T030snmpv3usercreation | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE net-snmp-5.3-5.3.0.1.patch --- diff -rdu net-snmp-5.3/agent/mibgroup/mibII/vacm_conf.c net-snmp-5.3.0.1/agent/mibgroup/mibII/vacm_conf.c --- net-snmp-5.3/agent/mibgroup/mibII/vacm_conf.c 2005-12-20 02:46:11.000000000 +0100 +++ net-snmp-5.3.0.1/agent/mibgroup/mibII/vacm_conf.c 2006-01-14 00:23:36.000000000 +0100 @@ -927,7 +927,7 @@ view_ptr = NULL; } - if (viewtypes & VACM_VIEW_WRITE) + if (viewtypes & VACM_VIEW_WRITE_BIT) rw = viewname; commcount++; @@ -1008,8 +1008,8 @@ /* * map everything together */ - if (viewtypes == VACM_VIEW_READ || - viewtypes == (VACM_VIEW_READ || VACM_VIEW_WRITE)) { + if ((viewtypes == VACM_VIEW_READ_BIT) || + (viewtypes == (VACM_VIEW_READ_BIT | VACM_VIEW_WRITE_BIT))) { /* Use the simple line access command */ /* * access anonymousGroupNameNUM "" MODEL AUTHTYPE prefix anonymousViewNUM [none/anonymousViewNUM] [none/anonymousViewNUM] diff -rdu net-snmp-5.3/testing/tests/T030snmpv3usercreation net-snmp-5.3.0.1/testing/tests/T030snmpv3usercreation --- net-snmp-5.3/testing/tests/T030snmpv3usercreation 2005-11-25 00:14:38.000000000 +0100 +++ net-snmp-5.3.0.1/testing/tests/T030snmpv3usercreation 2006-01-14 02:05:18.000000000 +0100 @@ -24,7 +24,7 @@ NEWAUTHPRIVPASS=newauthprivpass # configure agent -CONFIGAGENT rouser $NEWUSER +CONFIGAGENT rwuser $NEWUSER # Start the agent STARTAGENT Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- net-snmp.spec 2 Jan 2006 12:00:12 -0000 1.61 +++ net-snmp.spec 18 Jan 2006 09:06:56 -0000 1.62 @@ -3,7 +3,7 @@ Summary: A collection of SNMP protocol tools and libraries. Name: net-snmp Version: 5.3 -Release: 1 +Release: 2 License: BSDish Group: System Environment/Daemons URL: http://net-snmp.sourceforge.net/ @@ -25,6 +25,7 @@ #Patch10: net-snmp-5.1.1-ipAdEntIfIndex.patch Patch12: net-snmp-5.1.2-dir-fix.patch Patch19: net-snmp-5.2.1-file_offset.patch +Patch20: net-snmp-5.3-5.3.0.1.patch Prereq: /sbin/chkconfig Obsoletes: ucd-snmp @@ -124,6 +125,7 @@ %patch9 -b .64bit %patch12 -p1 -b .dir-fix %patch19 -p1 -b .file_offset +%patch20 -p1 -b .5.3.0.1 # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh @@ -307,6 +309,11 @@ %{_libdir}/*.a %changelog +* Wed Jan 18 2006 Radek Vokal 5.3-2 +- Security fix. Bug granting write access to read-only users + or communities which were configured using the "rocommunity" + or "rouser" snmpd.conf tokens fixed + * Fri Dec 30 2005 Radek Vokal - upgrade to 5.3 From fedora-cvs-commits at redhat.com Wed Jan 18 10:21:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 05:21:38 -0500 Subject: rpms/tcpdump/FC-4 arpwatch.sysconfig, 1.2, 1.3 tcpdump.spec, 1.36, 1.37 Message-ID: <200601181021.k0IALcJW018367@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/tcpdump/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18339 Modified Files: arpwatch.sysconfig tcpdump.spec Log Message: fix for #178023 - arpwatch will not start Index: arpwatch.sysconfig =================================================================== RCS file: /cvs/dist/rpms/tcpdump/FC-4/arpwatch.sysconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- arpwatch.sysconfig 9 Sep 2004 13:15:43 -0000 1.2 +++ arpwatch.sysconfig 18 Jan 2006 10:21:33 -0000 1.3 @@ -1,4 +1,4 @@ # -u : defines with what user id arpwatch should run # -e : the where to send the reports # -s : the -address -OPTIONS="-u pcap -e root -s 'root (Arpwatch)'" +OPTIONS="-u pcap -e root -s root" Index: tcpdump.spec =================================================================== RCS file: /cvs/dist/rpms/tcpdump/FC-4/tcpdump.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- tcpdump.spec 8 Jun 2005 07:58:27 -0000 1.36 +++ tcpdump.spec 18 Jan 2006 10:21:33 -0000 1.37 @@ -2,7 +2,7 @@ %define PCAP_UID 77 %define PCAP_GID 77 -%define releaseno 13.FC4 +%define releaseno 14.FC4 %define arpwatch_release %{releaseno} %define pcap_release %{releaseno} %define tcpdump_release %{releaseno} @@ -319,6 +319,9 @@ %{_vararpwatch}/massagevendor-old %changelog +* Wed Jan 18 2006 Martin Stransky - 14:3.8.2-14.FC4 +- fix for #178023 - arpwatch will not start + * Tue Jun 7 2005 Martin Stransky - 14:3.8.2-13.FC4 - fix for CAN-2005-1267 - BGP DoS, #159209 From fedora-cvs-commits at redhat.com Wed Jan 18 10:40:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 05:40:50 -0500 Subject: rpms/flex/devel flex-2.5.4a2-shapwarn.patch, NONE, 1.1 flex.spec, 1.18, 1.19 Message-ID: <200601181040.k0IAenAX024220@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24184 Modified Files: flex.spec Added Files: flex-2.5.4a2-shapwarn.patch Log Message: Applying Jonathan S. Shapiro's bugfix-fixing patch. More std:: fixes and better way to silent warnings under gcc. flex-2.5.4a2-shapwarn.patch: gen.c | 10 +++++----- skel.c | 21 ++++++++++----------- 2 files changed, 15 insertions(+), 16 deletions(-) --- NEW FILE flex-2.5.4a2-shapwarn.patch --- diff -Burp flex-2.5.4/gen.c flex-2.5.4shap/gen.c --- flex-2.5.4/gen.c 1997-07-26 22:32:18.000000000 -0400 +++ flex-2.5.4shap/gen.c 2006-01-15 11:49:20.000000000 -0500 @@ -1437,7 +1437,7 @@ void make_tables() indent_puts( "if ( yy_act == 0 )" ); indent_up(); indent_puts( C_plus_plus ? - "cerr << \"--scanner backing up\\n\";" : + "std::cerr << \"--scanner backing up\\n\";" : "fprintf( stderr, \"--scanner backing up\\n\" );" ); indent_down(); @@ -1448,7 +1448,7 @@ void make_tables() if ( C_plus_plus ) { indent_puts( - "cerr << \"--accepting rule at line \" << yy_rule_linenum[yy_act] <<" ); + "std::cerr << \"--accepting rule at line \" << yy_rule_linenum[yy_act] <<" ); indent_puts( " \"(\\\"\" << yytext << \"\\\")\\n\";" ); } @@ -1470,7 +1470,7 @@ void make_tables() if ( C_plus_plus ) { indent_puts( -"cerr << \"--accepting default rule (\\\"\" << yytext << \"\\\")\\n\";" ); +"std::cerr << \"--accepting default rule (\\\"\" << yytext << \"\\\")\\n\";" ); } else { @@ -1486,7 +1486,7 @@ void make_tables() indent_up(); indent_puts( C_plus_plus ? - "cerr << \"--(end of buffer or a NUL)\\n\";" : + "std::cerr << \"--(end of buffer or a NUL)\\n\";" : "fprintf( stderr, \"--(end of buffer or a NUL)\\n\" );" ); indent_down(); @@ -1498,7 +1498,7 @@ void make_tables() if ( C_plus_plus ) { indent_puts( - "cerr << \"--EOF (start condition \" << YY_START << \")\\n\";" ); + "std::cerr << \"--EOF (start condition \" << YY_START << \")\\n\";" ); } else { diff -Burp flex-2.5.4/skel.c flex-2.5.4shap/skel.c --- flex-2.5.4/skel.c 2006-01-14 22:53:17.000000000 -0500 +++ flex-2.5.4shap/skel.c 2006-01-15 11:56:59.000000000 -0500 @@ -146,6 +146,15 @@ const char *skel[] = { "", "#define unput(c) yyunput( c, yytext_ptr )", "", + "/* Some routines like yy_flex_realloc() are emitted as static but are", + " not called by all lexers. This generates warnings in some compilers,", + " notably GCC. Arrange to suppress these. */", + "#ifdef __GNUC__", + "#define YY_MAY_BE_UNUSED __attribute__((unused))", + "#else", + "#define YY_MAY_BE_UNUSED", + "#endif", + "", "/* The following is because we cannot portably get our hands on size_t", " * (without autoconf's help, which isn't available because we want", " * flex-generated scanners to compile on their own).", @@ -260,7 +269,7 @@ const char *skel[] = { "%*", "", "static void *yy_flex_alloc YY_PROTO(( yy_size_t ));", - "static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));", + "static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;", "static void yy_flex_free YY_PROTO(( void * ));", "", "#define yy_new_buffer yy_create_buffer", @@ -1541,15 +1550,5 @@ const char *skel[] = { " return 0;", " }", "#endif", - "", - "/* Some people want warning-free code, and under certain #define", - " conditions, gcc will warn for unusedness of some functions. This", - " function is provided merely to silent these warnings. It's not", - " static itself, so it will clutter exports, but it has at least", - " urandom name so that clashes won't occur.*/", - "void _yy_dummy_uses_of_static_functions_b2f4_517d_02ff_b30c_3e5a_47d7_aaa3_3b5d_()", - "{", - " yy_flex_realloc ((void*)0, 0);", - "}", 0 }; Index: flex.spec =================================================================== RCS file: /cvs/dist/rpms/flex/devel/flex.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- flex.spec 13 Jan 2006 16:18:07 -0000 1.18 +++ flex.spec 18 Jan 2006 10:40:44 -0000 1.19 @@ -1,7 +1,7 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex Version: 2.5.4a -Release: 35 +Release: 36 License: BSD Group: Development/Tools URL: http://www.gnu.org/software/flex/ @@ -15,6 +15,7 @@ Patch5: flex-pic.patch Patch6: flex-2.5.4a2-std.patch Patch7: flex-2.5.4a2-warn.patch +Patch8: flex-2.5.4a2-shapwarn.patch BuildRequires: autoconf, byacc %description @@ -41,6 +42,7 @@ %patch5 -p1 -b .pic %patch6 -p1 -b .std %patch7 -p1 -b .warn +%patch8 -p1 -b .shapwarn %build autoconf @@ -74,6 +76,10 @@ %{_includedir}/FlexLexer.h %changelog +* Wed Jan 18 2006 Petr Machata 2.5.4a-36 +- Applying Jonathan S. Shapiro's bugfix-fixing patch. More std:: fixes + and better way to silent warnings under gcc. + * Fri Jan 13 2006 Petr Machata 2.5.4a-35 - Adding `std::' prefixes, got rid of `using namespace std'. (#115354) - Dummy use of `yy_flex_realloc' to silent warnings. (#30943) From fedora-cvs-commits at redhat.com Wed Jan 18 10:52:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 05:52:53 -0500 Subject: rpms/flex/FC-4 flex-2.5.4a2-shapwarn.patch, NONE, 1.1 flex.spec, 1.15, 1.16 Message-ID: <200601181052.k0IAqriU001389@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/flex/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv28650 Modified Files: flex.spec Added Files: flex-2.5.4a2-shapwarn.patch Log Message: Applying Jonathan S. Shapiro's bugfix-fixing patch. More std:: fixes and better way to silent warnings under gcc. flex-2.5.4a2-shapwarn.patch: gen.c | 10 +++++----- skel.c | 21 ++++++++++----------- 2 files changed, 15 insertions(+), 16 deletions(-) --- NEW FILE flex-2.5.4a2-shapwarn.patch --- diff -Burp flex-2.5.4/gen.c flex-2.5.4shap/gen.c --- flex-2.5.4/gen.c 1997-07-26 22:32:18.000000000 -0400 +++ flex-2.5.4shap/gen.c 2006-01-15 11:49:20.000000000 -0500 @@ -1437,7 +1437,7 @@ void make_tables() indent_puts( "if ( yy_act == 0 )" ); indent_up(); indent_puts( C_plus_plus ? - "cerr << \"--scanner backing up\\n\";" : + "std::cerr << \"--scanner backing up\\n\";" : "fprintf( stderr, \"--scanner backing up\\n\" );" ); indent_down(); @@ -1448,7 +1448,7 @@ void make_tables() if ( C_plus_plus ) { indent_puts( - "cerr << \"--accepting rule at line \" << yy_rule_linenum[yy_act] <<" ); + "std::cerr << \"--accepting rule at line \" << yy_rule_linenum[yy_act] <<" ); indent_puts( " \"(\\\"\" << yytext << \"\\\")\\n\";" ); } @@ -1470,7 +1470,7 @@ void make_tables() if ( C_plus_plus ) { indent_puts( -"cerr << \"--accepting default rule (\\\"\" << yytext << \"\\\")\\n\";" ); +"std::cerr << \"--accepting default rule (\\\"\" << yytext << \"\\\")\\n\";" ); } else { @@ -1486,7 +1486,7 @@ void make_tables() indent_up(); indent_puts( C_plus_plus ? - "cerr << \"--(end of buffer or a NUL)\\n\";" : + "std::cerr << \"--(end of buffer or a NUL)\\n\";" : "fprintf( stderr, \"--(end of buffer or a NUL)\\n\" );" ); indent_down(); @@ -1498,7 +1498,7 @@ void make_tables() if ( C_plus_plus ) { indent_puts( - "cerr << \"--EOF (start condition \" << YY_START << \")\\n\";" ); + "std::cerr << \"--EOF (start condition \" << YY_START << \")\\n\";" ); } else { diff -Burp flex-2.5.4/skel.c flex-2.5.4shap/skel.c --- flex-2.5.4/skel.c 2006-01-14 22:53:17.000000000 -0500 +++ flex-2.5.4shap/skel.c 2006-01-15 11:56:59.000000000 -0500 @@ -146,6 +146,15 @@ const char *skel[] = { "", "#define unput(c) yyunput( c, yytext_ptr )", "", + "/* Some routines like yy_flex_realloc() are emitted as static but are", + " not called by all lexers. This generates warnings in some compilers,", + " notably GCC. Arrange to suppress these. */", + "#ifdef __GNUC__", + "#define YY_MAY_BE_UNUSED __attribute__((unused))", + "#else", + "#define YY_MAY_BE_UNUSED", + "#endif", + "", "/* The following is because we cannot portably get our hands on size_t", " * (without autoconf's help, which isn't available because we want", " * flex-generated scanners to compile on their own).", @@ -260,7 +269,7 @@ const char *skel[] = { "%*", "", "static void *yy_flex_alloc YY_PROTO(( yy_size_t ));", - "static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t ));", + "static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;", "static void yy_flex_free YY_PROTO(( void * ));", "", "#define yy_new_buffer yy_create_buffer", @@ -1541,15 +1550,5 @@ const char *skel[] = { " return 0;", " }", "#endif", - "", - "/* Some people want warning-free code, and under certain #define", - " conditions, gcc will warn for unusedness of some functions. This", - " function is provided merely to silent these warnings. It's not", - " static itself, so it will clutter exports, but it has at least", - " urandom name so that clashes won't occur.*/", - "void _yy_dummy_uses_of_static_functions_b2f4_517d_02ff_b30c_3e5a_47d7_aaa3_3b5d_()", - "{", - " yy_flex_realloc ((void*)0, 0);", - "}", 0 }; Index: flex.spec =================================================================== RCS file: /cvs/dist/rpms/flex/FC-4/flex.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- flex.spec 13 Jan 2006 16:42:25 -0000 1.15 +++ flex.spec 18 Jan 2006 10:52:48 -0000 1.16 @@ -1,7 +1,7 @@ Summary: A tool for creating scanners (text pattern recognizers). Name: flex Version: 2.5.4a -Release: 35.fc4 +Release: 36.fc4 License: BSD Group: Development/Tools URL: http://www.gnu.org/software/flex/ @@ -15,6 +15,7 @@ Patch5: flex-pic.patch Patch6: flex-2.5.4a2-std.patch Patch7: flex-2.5.4a2-warn.patch +Patch8: flex-2.5.4a2-shapwarn.patch BuildRequires: autoconf, byacc %description @@ -41,6 +42,7 @@ %patch5 -p1 -b .pic %patch6 -p1 -b .std %patch7 -p1 -b .warn +%patch8 -p1 -b .shapwarn %build autoconf @@ -74,6 +76,10 @@ %{_includedir}/FlexLexer.h %changelog +* Wed Jan 18 2006 Petr Machata 2.5.4a-36.fc4 +- Applying Jonathan S. Shapiro's bugfix-fixing patch. More std:: fixes + and better way to silent warnings under gcc. + * Fri Jan 13 2006 Petr Machata 2.5.4a-35.fc4 - Adding `std::' prefixes, got rid of `using namespace std'. (#115354) - Dummy use of `yy_flex_realloc' to silent warnings. (#30943) From fedora-cvs-commits at redhat.com Wed Jan 18 11:12:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 06:12:13 -0500 Subject: rpms/tetex/devel tetex.spec,1.81,1.82 Message-ID: <200601181112.k0IBCDSB001638@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/tetex/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1624 Modified Files: tetex.spec Log Message: * Tue Jan 17 2006 Jindrich Novy 3.0-16 - add missing libXaw-devel dependency Index: tetex.spec =================================================================== RCS file: /cvs/dist/rpms/tetex/devel/tetex.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- tetex.spec 17 Jan 2006 13:40:43 -0000 1.81 +++ tetex.spec 18 Jan 2006 11:12:06 -0000 1.82 @@ -11,7 +11,7 @@ Summary: The TeX text formatting system. Name: tetex Version: 3.0 -Release: 15 +Release: 16 License: distributable Group: Applications/Publishing Requires: tmpwatch, dialog, ed @@ -789,7 +789,7 @@ %defattr(-,root,root) %changelog -* Tue Jan 17 2006 Jindrich Novy +* Tue Jan 17 2006 Jindrich Novy 3.0-16 - add missing libXaw-devel dependency * Tue Jan 17 2006 Jindrich Novy 3.0-15 From fedora-cvs-commits at redhat.com Wed Jan 18 11:49:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 06:49:43 -0500 Subject: rpms/apr-util/devel apr-util.spec,1.20,1.21 Message-ID: <200601181149.k0IBnhho009706@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/apr-util/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9680 Modified Files: apr-util.spec Log Message: * Wed Jan 18 2006 Joe Orton 1.2.2-3 - disable sqlite2 support - BuildRequire e2fsprogs-devel - enable malloc paranoia in %check Index: apr-util.spec =================================================================== RCS file: /cvs/dist/rpms/apr-util/devel/apr-util.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- apr-util.spec 3 Jan 2006 20:14:15 -0000 1.20 +++ apr-util.spec 18 Jan 2006 11:49:39 -0000 1.21 @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.2.2 -Release: 2.2 +Release: 3 License: Apache Software License 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -13,7 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: autoconf, doxygen, apr-devel >= 1.2.0 BuildRequires: openldap-devel, db4-devel, expat-devel -BuildRequires: postgresql-devel, sqlite-devel +BuildRequires: postgresql-devel, sqlite-devel >= 3.0.0 +BuildRequires: e2fsprogs-devel Conflicts: subversion < 0.20.1-2 %description @@ -44,7 +45,8 @@ %configure --with-apr=%{_prefix} \ --includedir=%{_includedir}/apr-%{apuver} \ --with-ldap --without-gdbm \ - --with-sqlite3 --with-pgsql + --with-sqlite3 --with-pgsql \ + --without-sqlite2 make %{?_smp_mflags} && make dox %install @@ -69,6 +71,7 @@ %check # Run the less verbose test suites +export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1)) cd test make %{?_smp_mflags} testall testrmm testdbm ./testall -v -q @@ -98,6 +101,11 @@ %doc --parents html %changelog +* Wed Jan 18 2006 Joe Orton 1.2.2-3 +- disable sqlite2 support +- BuildRequire e2fsprogs-devel +- enable malloc paranoia in %%check + * Tue Jan 3 2006 Jesse Keating 1.2.2-2.2 - rebuilt again From fedora-cvs-commits at redhat.com Wed Jan 18 11:50:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 06:50:47 -0500 Subject: rpms/hplip/devel hplip.spec,1.40,1.41 Message-ID: <200601181150.k0IBoluc010131@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/hplip/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10102 Modified Files: hplip.spec Log Message: * Wed Jan 18 2006 Tim Waugh 0.9.7-8 - Don't package PPD files. Index: hplip.spec =================================================================== RCS file: /cvs/dist/rpms/hplip/devel/hplip.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- hplip.spec 5 Jan 2006 11:18:01 -0000 1.40 +++ hplip.spec 18 Jan 2006 11:50:42 -0000 1.41 @@ -1,7 +1,7 @@ Summary: HP Linux Imaging and Printing Project Name: hplip Version: 0.9.7 -Release: 7 +Release: 8 License: GPL/MIT/BSD Group: System Environment/Daemons Conflicts: system-config-printer < 0.6.132 @@ -72,7 +72,7 @@ %patch5 -p1 -b .initscript %build -%configure +%configure --disable-foomatic-install --disable-cups-install make %install @@ -156,6 +156,9 @@ fi %changelog +* Wed Jan 18 2006 Tim Waugh 0.9.7-8 +- Don't package PPD files. + * Thu Jan 5 2006 Tim Waugh 0.9.7-7 - Fix initscript (bug #176966). From fedora-cvs-commits at redhat.com Wed Jan 18 11:59:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 06:59:30 -0500 Subject: rpms/foomatic/devel foomatic.spec,1.129,1.130 Message-ID: <200601181159.k0IBxUpT013668@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/foomatic/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13634 Modified Files: foomatic.spec Log Message: * Wed Jan 18 2006 Tim Waugh 3.0.2-33 - Make build self-hosting. Index: foomatic.spec =================================================================== RCS file: /cvs/dist/rpms/foomatic/devel/foomatic.spec,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- foomatic.spec 17 Jan 2006 14:08:51 -0000 1.129 +++ foomatic.spec 18 Jan 2006 11:59:27 -0000 1.130 @@ -8,7 +8,7 @@ Summary: Foomatic printer database. Name: foomatic Version: 3.0.2 -Release: 32 +Release: 33 License: GPL Group: System Environment/Libraries @@ -215,7 +215,7 @@ # Remove drivers with no command line. pushd foomatic-db-engine-%{enginever} -./foomatic-cleanupdrivers %{buildroot}%{_datadir}/foomatic +perl -Ilib ./foomatic-cleanupdrivers %{buildroot}%{_datadir}/foomatic popd # Update any old-style printer IDs still left around. @@ -275,6 +275,9 @@ %{_var}/cache/foomatic %changelog +* Wed Jan 18 2006 Tim Waugh 3.0.2-33 +- Make build self-hosting. + * Tue Jan 17 2006 Tim Waugh 3.0.2-32 - Fix foomatic-cleanupdrivers. - Updated db-engine to 3.0-20060117. From fedora-cvs-commits at redhat.com Wed Jan 18 13:11:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 08:11:39 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-1.2.14-text.patch, NONE, 1.1 system-config-soundcard.spec, 1.24, 1.25 Message-ID: <200601181311.k0IDBdtJ019664@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19651 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-1.2.14-text.patch Log Message: text clean-up system-config-soundcard-1.2.14-text.patch: soundcard.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE system-config-soundcard-1.2.14-text.patch --- --- system-config-soundcard-1.2.14/src/soundcard.py.old 2006-01-18 12:52:41.000000000 +0100 +++ system-config-soundcard-1.2.14/src/soundcard.py 2006-01-18 12:52:27.000000000 +0100 @@ -182,7 +182,7 @@ deviceTopBox.pack_start(deviceBox) #Create a check-box for hw/sw config - button = gtk.CheckButton(_("Use only the hardware device")) + button = gtk.CheckButton(_("Disable software mixing (dmix, dsnoop)")) button.set_active(self.soundcardBackend.getHardwareDevice()) button.connect("toggled", self.changeHW) button.show() @@ -190,7 +190,7 @@ deviceTopBox.pack_start(button) #Create a check-box for key config - button = gtk.CheckButton(_("Dynamic keys for dmix and dsnoop")) + button = gtk.CheckButton(_("Dynamic keys for software mixer (more secure)")) button.set_active(self.soundcardBackend.getDynamicKeys()) button.connect("toggled", self.changeDynKeys) button.show() Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- system-config-soundcard.spec 17 Jan 2006 14:13:15 -0000 1.24 +++ system-config-soundcard.spec 18 Jan 2006 13:11:34 -0000 1.25 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard Version: 1.2.14 -Release: 3 +Release: 4 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html License: GPL ExclusiveOS: Linux @@ -11,6 +11,7 @@ Source0: %{name}-%{version}.tar.bz2 Patch1: system-config-soundcard-1.2.14-desktop.patch Patch2: system-config-soundcard-1.2.14-dyn-keys.patch +Patch3: system-config-soundcard-1.2.14-text.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -32,6 +33,7 @@ %setup -q %patch1 -p1 %patch2 -p1 -b .dyn +%patch3 -p1 -b .text %build make @@ -85,6 +87,9 @@ %ghost /root/scsound.log %changelog +* Tue Jan 18 2006 Martin Stransky 1.2.14-4 +- text clean-up + * Tue Jan 17 2006 Martin Stransky 1.2.14-3 - added ainit configuration From fedora-cvs-commits at redhat.com Wed Jan 18 13:14:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 08:14:06 -0500 Subject: rpms/system-config-date/devel .cvsignore, 1.36, 1.37 sources, 1.39, 1.40 system-config-date.spec, 1.44, 1.45 Message-ID: <200601181314.k0IDE6n3019768@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-date/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19756 Modified Files: .cvsignore sources system-config-date.spec Log Message: don't crash when selecting a timezone (#178086, patch by Chris Lumens) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 17 Jan 2006 08:34:15 -0000 1.36 +++ .cvsignore 18 Jan 2006 13:14:04 -0000 1.37 @@ -1 +1 @@ -system-config-date-1.7.99.15.tar.bz2 +system-config-date-1.7.99.16.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 17 Jan 2006 08:34:15 -0000 1.39 +++ sources 18 Jan 2006 13:14:04 -0000 1.40 @@ -1 +1 @@ -7591b09fc66ae88a759aead6b94974b3 system-config-date-1.7.99.15.tar.bz2 +2161b2e0a0f0758d6f92e27d54d6a99a system-config-date-1.7.99.16.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- system-config-date.spec 17 Jan 2006 08:34:15 -0000 1.44 +++ system-config-date.spec 18 Jan 2006 13:14:04 -0000 1.45 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.7.99.15 +Version: 1.7.99.16 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -93,6 +93,9 @@ %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template %changelog +* Wed Jan 18 2006 Nils Philippsen 1.7.99.16 +- don't crash when selecting a timezone (#178086, patch by Chris Lumens) + * Tue Jan 17 2006 Nils Philippsen 1.7.99.15 - fix setting timezone from firstboot (#177779, patch by Chris Lumens) From fedora-cvs-commits at redhat.com Wed Jan 18 13:26:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 08:26:25 -0500 Subject: rpms/logwatch/devel logwatch-7.1-pam_unix.patch, NONE, 1.1 logwatch.spec, 1.32, 1.33 logwatch-4.3.2-nounicode.patch, 1.1, NONE Message-ID: <200601181326.k0IDQPJl032050@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/logwatch/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32035 Modified Files: logwatch.spec Added Files: logwatch-7.1-pam_unix.patch Removed Files: logwatch-4.3.2-nounicode.patch Log Message: - removed nounicode patch - added patch to fix pam_unix logs parsing (#178058) logwatch-7.1-pam_unix.patch: pam_unix | 7 +++++-- secure | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) --- NEW FILE logwatch-7.1-pam_unix.patch --- --- logwatch-7.1/scripts/services/pam_unix.pom 2005-09-26 20:19:03.000000000 +0200 +++ logwatch-7.1/scripts/services/pam_unix 2006-01-18 14:08:34.033899064 +0100 @@ -78,12 +78,15 @@ } elsif ( $line =~ s/^... .. ..:..:.. .+ [^\s:\[\]]+: [0-9:\[\]\.]+ \(pam_unix\) //) { $service =~ s/^... .. ..:..:.. .+ ([^\s:\[\]]+): [0-9:\[\]\.]+ \(pam_unix\) .*$/$1/; #for debian woody - } elsif ( ( $line =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \((.*?)\) // )) { + } elsif ( $line =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \((.*?)\) // ) { $service =~ s/^... .. ..:..:.. .+ PAM_unix\[\d+\]: \(([^ ]*)\) .*/$1/; + } elsif ( $line =~ s/^... .. ..:..:.. .+ pam_unix(.+:.+): // ) { + $service =~ s/^... .. ..:..:.. .+ pam_unix\((.+):.+\): .*$/$1/; + #new version } else { next; } - #lowercase the service + #lowercase the service $service = lc($service); if (($service eq 'sshd') or ($service eq 'login') or ($service eq 'ftp') or ($service eq 'rsh')) { if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) { --- logwatch-7.1/scripts/services/secure.pom 2006-01-18 14:07:00.784075192 +0100 +++ logwatch-7.1/scripts/services/secure 2006-01-18 14:07:01.042035976 +0100 @@ -105,6 +105,7 @@ ( $ThisLine =~ /pam_succeed_if: requirement "uid < 100" (was|not) met by user /) or ( $ThisLine =~ /pam_rhosts_auth\[\d+\]: allowed to [^ ]+ as \w+/) or ( $ThisLine =~ /^(.*)\(pam_unix\)/) or + ( $ThisLine =~ /pam_unix\(.*:.*\)/) or ( $ThisLine =~ m/^[^ ]+\[\d+\]: connect from localhost$/ ) or ( $ThisLine =~ /^\/usr\/bin\/sudo:/) or ( $ThisLine =~ /^halt:/) or Index: logwatch.spec =================================================================== RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- logwatch.spec 23 Dec 2005 09:45:24 -0000 1.32 +++ logwatch.spec 18 Jan 2006 13:26:23 -0000 1.33 @@ -1,12 +1,11 @@ Summary: A log file analysis program. Name: logwatch Version: 7.1 -Release: 5 +Release: 6 License: MIT Group: Applications/System URL: http://www.logwatch.org/ Source: ftp://ftp.kaybee.org/pub/linux/logwatch-%{version}.tar.gz -Patch1: logwatch-4.3.2-nounicode.patch Patch2: logwatch-7.0-nosegfault.patch Patch3: logwatch-7.1-sshd.patch Patch4: logwatch-7.1-samba.patch @@ -15,6 +14,7 @@ Patch7: logwatch-7.1-iptables.patch Patch8: logwatch-7.1-audit.patch Patch9: logwatch-7.1-http.patch +Patch10: logwatch-7.1-pam_unix.patch Requires: textutils sh-utils grep mailx BuildRoot: %{_tmppath}/logwatch-build @@ -28,7 +28,6 @@ %prep %setup -q -%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -37,6 +36,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 -b .pom %install @@ -138,6 +138,10 @@ %doc License project/CHANGES project/TODO %changelog +* Wed Dec 18 2006 Ivana Varekova 7.1-6 +- removed nounicode patch +- added patch to fix pam_unix logs parsing (#178058) + * Fri Dec 23 2005 Ivana Varekova 7.1-5 - fix http exploits problem (bug 176324 - comment 2) --- logwatch-4.3.2-nounicode.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 18 13:40:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 08:40:44 -0500 Subject: rpms/netpbm/devel netpbm.spec,1.49,1.50 Message-ID: <200601181340.k0IDeiTN032172@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/netpbm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32161 Modified Files: netpbm.spec Log Message: * Wed Jan 18 2006 Jindrich Novy 10.31-2 - rebuild to have greater version than in FC4 (#177698) Index: netpbm.spec =================================================================== RCS file: /cvs/dist/rpms/netpbm/devel/netpbm.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- netpbm.spec 30 Dec 2005 14:10:19 -0000 1.49 +++ netpbm.spec 18 Jan 2006 13:40:38 -0000 1.50 @@ -1,7 +1,7 @@ Summary: A library for handling different graphics file formats. Name: netpbm Version: 10.31 -Release: 1 +Release: 2 License: freeware Group: System Environment/Libraries URL: http://netpbm.sourceforge.net/ @@ -174,6 +174,9 @@ %{_mandir}/man5/* %changelog +* Wed Jan 18 2006 Jindrich Novy 10.31-2 +- rebuild to have greater version than in FC4 (#177698) + * Fri Dec 30 2005 Jindrich Novy 10.31-1 - update to 10.31 - update security patch From fedora-cvs-commits at redhat.com Wed Jan 18 13:47:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 08:47:04 -0500 Subject: rpms/gnome-applets/devel gnome-applets.spec,1.100,1.101 Message-ID: <200601181347.k0IDl4fl011963@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11952 Modified Files: gnome-applets.spec Log Message: BuildRequire gnome-doc-utils Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- gnome-applets.spec 17 Jan 2006 05:23:27 -0000 1.100 +++ gnome-applets.spec 18 Jan 2006 13:47:01 -0000 1.101 @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.13.2 -Release: 1 +Release: 2 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -49,6 +49,7 @@ BuildRequires: gnome-desktop-devel >= %{libgnome_desktop_version} BuildRequires: gnome-utils >= %{gnome_utils_version} BuildRequires: dbus-devel >= %{dbus_version} +BuildRequires: gnome-doc-utils Requires: gnome-panel >= %{gnome_panel_version} Requires: libxklavier >= %{libxklavier_version} @@ -169,6 +170,9 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Wed Jan 18 2006 Matthias Clasen 2.13.2-2 +- BuildRequire gnome-doc-utils + * Tue Jan 17 2006 Matthias Clasen 2.13.2-1 - Update to 2.13.2 From fedora-cvs-commits at redhat.com Wed Jan 18 13:53:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 08:53:03 -0500 Subject: rpms/yelp/devel yelp.spec,1.43,1.44 Message-ID: <200601181353.k0IDr3vg012155@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/yelp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12142 Modified Files: yelp.spec Log Message: Enable search Index: yelp.spec =================================================================== RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- yelp.spec 16 Dec 2005 17:42:38 -0000 1.43 +++ yelp.spec 18 Jan 2006 13:53:00 -0000 1.44 @@ -13,7 +13,7 @@ Summary: A system documentation reader from the Gnome project. Name: yelp Version: 2.13.2 -Release: 2 +Release: 3 Source: %{name}-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=319096 Patch1: yelp-2.12.1-fedora-docs.patch @@ -51,6 +51,7 @@ BuildRequires: GConf2-devel BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: gnome-doc-utils +BuildRequires: libbeagle %description Yelp is the Gnome 2 help/documentation browser. It is designed @@ -64,7 +65,12 @@ %patch3 -p1 -b .new-mimetype-for-docbook-xml %build -%configure --with-mozilla=mozilla --disable-man --disable-info --disable-schemas-install +%configure \ + --enable-search \ + --with-mozilla=mozilla \ + --disable-man \ + --disable-info \ + --disable-schemas-install make %install @@ -109,6 +115,9 @@ %{_datadir}/yelp %changelog +* Wed Jan 18 2006 Matthias Clasen - 2.13.2-3 +- Enable search + * Thu Dec 15 2005 David Malcolm - 2.13.2-2 - Patched to include DocBook mimetype in desktop file, and added preun and post hooks to update-desktop-database (#175880) From fedora-cvs-commits at redhat.com Wed Jan 18 14:15:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 09:15:49 -0500 Subject: rpms/yelp/devel yelp.spec,1.44,1.45 Message-ID: <200601181415.k0IEFnvc026905@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/yelp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26678 Modified Files: yelp.spec Log Message: Fix requires Index: yelp.spec =================================================================== RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- yelp.spec 18 Jan 2006 13:53:00 -0000 1.44 +++ yelp.spec 18 Jan 2006 14:15:47 -0000 1.45 @@ -51,7 +51,10 @@ BuildRequires: GConf2-devel BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: gnome-doc-utils -BuildRequires: libbeagle + +%ifnarch s390 s390x ppc64 +BuildRequires: libbeagle-devel +%endif %description Yelp is the Gnome 2 help/documentation browser. It is designed @@ -66,7 +69,6 @@ %build %configure \ - --enable-search \ --with-mozilla=mozilla \ --disable-man \ --disable-info \ From fedora-cvs-commits at redhat.com Wed Jan 18 14:44:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 09:44:18 -0500 Subject: rpms/yelp/devel yelp.spec,1.45,1.46 Message-ID: <200601181444.k0IEiIg5014361@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/yelp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14311 Modified Files: yelp.spec Log Message: Disable search Index: yelp.spec =================================================================== RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- yelp.spec 18 Jan 2006 14:15:47 -0000 1.45 +++ yelp.spec 18 Jan 2006 14:44:15 -0000 1.46 @@ -52,9 +52,10 @@ BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: gnome-doc-utils -%ifnarch s390 s390x ppc64 -BuildRequires: libbeagle-devel -%endif +# beagle search will be fixed in 2.13.3 +#%ifnarch s390 s390x ppc64 +#BuildRequires: libbeagle-devel +#%endif %description Yelp is the Gnome 2 help/documentation browser. It is designed @@ -68,7 +69,9 @@ %patch3 -p1 -b .new-mimetype-for-docbook-xml %build +# beagle search will be fixed in 2.13.3 %configure \ + --disable-search \ --with-mozilla=mozilla \ --disable-man \ --disable-info \ @@ -118,7 +121,8 @@ %changelog * Wed Jan 18 2006 Matthias Clasen - 2.13.2-3 -- Enable search +- Disable search, since it doesn't compile against + current beagle * Thu Dec 15 2005 David Malcolm - 2.13.2-2 - Patched to include DocBook mimetype in desktop file, and added preun and post From fedora-cvs-commits at redhat.com Wed Jan 18 15:23:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 10:23:15 -0500 Subject: rpms/bash/devel bash.spec,1.104,1.105 Message-ID: <200601181523.k0IFNFiK014887@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/bash/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14852 Modified Files: bash.spec Log Message: * Wed Jan 18 2006 Tim Waugh - Removed inaccuracies from %description (bug #178189). Index: bash.spec =================================================================== RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- bash.spec 13 Jan 2006 17:06:27 -0000 1.104 +++ bash.spec 18 Jan 2006 15:23:09 -0000 1.105 @@ -49,10 +49,7 @@ incorporates useful features from the Korn shell (ksh) and the C shell (csh). Most sh scripts can be run by bash without modification. This package (bash) contains bash version %{version}, which improves POSIX -compliance over previous versions. However, many old shell scripts -will depend upon the behavior of bash 1.14, which is included in the -bash1 package. Bash is the default shell for Red Hat Linux. It is -popular and powerful, and you'll probably end up using it. +compliance over previous versions. %prep %setup -q -a 2 @@ -213,6 +210,9 @@ %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %changelog +* Wed Jan 18 2006 Tim Waugh +- Removed inaccuracies from %%description (bug #178189). + * Fri Jan 13 2006 Tim Waugh 3.1-5 - Fix 'exec -l /bin/bash'. From fedora-cvs-commits at redhat.com Wed Jan 18 15:48:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 10:48:23 -0500 Subject: rpms/pam_ccreds/devel pam_ccreds-3-inst-no-root.patch, NONE, 1.1 pam_ccreds-3-chkpwd.patch, 1.2, 1.3 pam_ccreds.spec, 1.11, 1.12 Message-ID: <200601181548.k0IFmNCp025555@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/pam_ccreds/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25380 Modified Files: pam_ccreds-3-chkpwd.patch pam_ccreds.spec Added Files: pam_ccreds-3-inst-no-root.patch Log Message: * Wed Jan 18 2006 Tomas Mraz - 3-3 - don't change ownership in make install - build ccreds_validate as PIE pam_ccreds-3-inst-no-root.patch: Makefile.am | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE pam_ccreds-3-inst-no-root.patch --- --- pam_ccreds-3/Makefile.am.inst-no-root 2005-10-29 03:21:50.000000000 +0200 +++ pam_ccreds-3/Makefile.am 2006-01-18 16:35:32.000000000 +0100 @@ -29,12 +29,12 @@ @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libdir)/security if EXTENSION_SO - $(INSTALL_PROGRAM) -o root -g root pam_ccreds.so $(DESTDIR)$(libdir)/security/pam_ccreds.so + $(INSTALL_PROGRAM) pam_ccreds.so $(DESTDIR)$(libdir)/security/pam_ccreds.so else if EXTENSION_1 - $(INSTALL_PROGRAM) -o root -g root pam_ccreds.so $(DESTDIR)$(libdir)/security/libpam_ccreds.1 + $(INSTALL_PROGRAM) pam_ccreds.so $(DESTDIR)$(libdir)/security/libpam_ccreds.1 else - $(INSTALL_PROGRAM) -o root -g root pam_ccreds.so $(DESTDIR)$(libdir)/security/pam_ccreds.so.1 + $(INSTALL_PROGRAM) pam_ccreds.so $(DESTDIR)$(libdir)/security/pam_ccreds.so.1 (cd $(DESTDIR)$(libdir)/security; rm -f pam_ccreds.so; ln -s pam_ccreds.so.1 pam_ccreds.so) endif endif pam_ccreds-3-chkpwd.patch: Makefile.am | 6 + README | 13 +- cc.h | 4 cc_lib.c | 79 +++++++++++++++++ cc_pam.c | 121 +++++++++++++++----------- cc_validate.c | 268 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 434 insertions(+), 57 deletions(-) Index: pam_ccreds-3-chkpwd.patch =================================================================== RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds-3-chkpwd.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pam_ccreds-3-chkpwd.patch 4 Jan 2006 15:28:43 -0000 1.2 +++ pam_ccreds-3-chkpwd.patch 18 Jan 2006 15:48:19 -0000 1.3 @@ -1,5 +1,5 @@ ---- /dev/null 2006-01-04 08:54:02.552773000 +0100 -+++ pam_ccreds-3/cc_validate.c 2006-01-04 15:22:31.000000000 +0100 +--- /dev/null 2006-01-18 09:11:26.108932750 +0100 ++++ pam_ccreds-3/cc_validate.c 2006-01-04 16:21:15.000000000 +0100 @@ -0,0 +1,268 @@ +/* + * This program is designed to run setuid(root) or with sufficient @@ -270,7 +270,7 @@ + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ --- pam_ccreds-3/Makefile.am.chkpwd 2005-10-29 03:21:50.000000000 +0200 -+++ pam_ccreds-3/Makefile.am 2006-01-04 15:22:31.000000000 +0100 ++++ pam_ccreds-3/Makefile.am 2006-01-18 16:30:58.000000000 +0100 @@ -1,8 +1,10 @@ noinst_PROGRAMS = pam_ccreds.so cc_test cc_dump +sbin_PROGRAMS = ccreds_validate @@ -282,18 +282,19 @@ pam_ccreds_so_SOURCES = cc_db.c cc_lib.c cc_pam.c cc.h pam_ccreds_so_LDFLAGS = @pam_ccreds_so_LDFLAGS@ -@@ -13,6 +15,9 @@ +@@ -13,6 +15,10 @@ cc_dump_SOURCES = cc_dump.c cc_dump_LDFLAGS = -Wl,-rpath -Wl,$(libdir)/security pam_ccreds.so -lpam -lpam_misc +ccreds_validate_SOURCES = cc_validate.c -+ccreds_validate_LDFLAGS = -Wl,-rpath -Wl,$(libdir)/security pam_ccreds.so -lpam -lpam_misc ++ccreds_validate_CFLAGS = -fPIE $(AM_CFLAGS) ++ccreds_validate_LDFLAGS = -pie -Wl,-rpath -Wl,$(libdir)/security pam_ccreds.so -lpam -lpam_misc + DEFS = @DEFS@ if USE_NATIVE_LINKER --- pam_ccreds-3/cc_pam.c.chkpwd 2005-10-29 03:21:50.000000000 +0200 -+++ pam_ccreds-3/cc_pam.c 2006-01-04 15:22:31.000000000 +0100 ++++ pam_ccreds-3/cc_pam.c 2006-01-04 16:21:15.000000000 +0100 @@ -131,10 +131,12 @@ const char *authtok; pam_cc_handle_t *pamcch; @@ -478,7 +479,7 @@ return rc; } --- pam_ccreds-3/README.chkpwd 2005-10-29 03:21:50.000000000 +0200 -+++ pam_ccreds-3/README 2006-01-04 15:27:51.000000000 +0100 ++++ pam_ccreds-3/README 2006-01-04 16:21:15.000000000 +0100 @@ -35,14 +35,13 @@ These are configured by the "action=" module option. The following module options are also recognized: @@ -501,7 +502,7 @@ this specific service --- pam_ccreds-3/cc_lib.c.chkpwd 2005-10-29 03:21:50.000000000 +0200 -+++ pam_ccreds-3/cc_lib.c 2006-01-04 15:22:31.000000000 +0100 ++++ pam_ccreds-3/cc_lib.c 2006-01-04 16:21:15.000000000 +0100 @@ -15,6 +15,10 @@ #include #include @@ -593,7 +594,7 @@ + return retval; +} --- pam_ccreds-3/cc.h.chkpwd 2005-10-29 03:21:50.000000000 +0200 -+++ pam_ccreds-3/cc.h 2006-01-04 15:22:31.000000000 +0100 ++++ pam_ccreds-3/cc.h 2006-01-04 16:21:15.000000000 +0100 @@ -89,5 +89,9 @@ /* Dump contents - for debugging only */ int pam_cc_dump(pam_cc_handle_t *pamcch, FILE *fp); Index: pam_ccreds.spec =================================================================== RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- pam_ccreds.spec 4 Jan 2006 15:28:43 -0000 1.11 +++ pam_ccreds.spec 18 Jan 2006 15:48:19 -0000 1.12 @@ -5,7 +5,8 @@ License: GPL Group: System Environment/Base Source0: %{name}-%{version}.tar.gz -Patch1: pam_ccreds-3-chkpwd.patch +Patch1: pam_ccreds-3-inst-no-root.patch +Patch2: pam_ccreds-3-chkpwd.patch BuildPrereq: automake db4-devel openssl-devel pam-devel Requires: db4 pam @@ -22,7 +23,9 @@ %prep %setup -q -%patch1 -p1 -b .chkpwd +%patch1 -p1 -b .inst-no-root +%patch2 -p1 -b .chkpwd +touch compile autoreconf %build @@ -43,6 +46,10 @@ %attr(4755,root,root) %{_sbindir}/ccreds_validate %changelog +* Wed Jan 18 2006 Tomas Mraz - 3-3 +- don't change ownership in make install +- build ccreds_validate as PIE + * Wed Jan 4 2006 Tomas Mraz - 3-2 - the path to ccreds_validate helper was wrong From fedora-cvs-commits at redhat.com Wed Jan 18 15:51:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 10:51:30 -0500 Subject: rpms/pam_ccreds/devel pam_ccreds.spec,1.12,1.13 Message-ID: <200601181551.k0IFpUwK000583@cvs.devel.redhat.com> Author: tmraz Update of /cvs/dist/rpms/pam_ccreds/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv523 Modified Files: pam_ccreds.spec Log Message: - bump release Index: pam_ccreds.spec =================================================================== RCS file: /cvs/dist/rpms/pam_ccreds/devel/pam_ccreds.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- pam_ccreds.spec 18 Jan 2006 15:48:19 -0000 1.12 +++ pam_ccreds.spec 18 Jan 2006 15:51:27 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Pam module to cache login credentials Name: pam_ccreds Version: 3 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source0: %{name}-%{version}.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 18 16:10:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:10:18 -0500 Subject: rpms/libogg/devel .cvsignore, 1.8, 1.9 libogg.spec, 1.17, 1.18 sources, 1.8, 1.9 Message-ID: <200601181610.k0IGAInV031370@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/libogg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31357 Modified Files: .cvsignore libogg.spec sources Log Message: - Update to 1.1.3 - doc/ogg changed to doc/libogg Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libogg/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 30 Sep 2004 03:44:11 -0000 1.8 +++ .cvsignore 18 Jan 2006 16:10:13 -0000 1.9 @@ -1,2 +1,3 @@ libogg-1.1.tar.gz libogg-1.1.2.tar.gz +libogg-1.1.3.tar.gz Index: libogg.spec =================================================================== RCS file: /cvs/dist/rpms/libogg/devel/libogg.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libogg.spec 10 Dec 2005 09:37:35 -0000 1.17 +++ libogg.spec 18 Jan 2006 16:10:13 -0000 1.18 @@ -1,7 +1,7 @@ Summary: The Ogg bitstream file format library. Name: libogg -Version: 1.1.2 -Release: 2.1 +Version: 1.1.3 +Release: 1 Epoch: 2 Group: System Environment/Libraries License: BSD @@ -52,7 +52,7 @@ %doc doc/*.html %doc doc/*.txt %doc doc/*.png -%doc doc/ogg +%doc doc/libogg %dir %{_includedir}/ogg %{_includedir}/ogg/ogg.h %{_includedir}/ogg/os_types.h @@ -70,6 +70,10 @@ %postun -p /sbin/ldconfig %changelog +* Wed Jan 18 2006 John (J5) Palmieri 2:1.1.3-1 +- Update to 1.1.3 +- doc/ogg changed to doc/libogg + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/libogg/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 30 Sep 2004 03:44:11 -0000 1.8 +++ sources 18 Jan 2006 16:10:13 -0000 1.9 @@ -1,2 +1 @@ -461d7097bf47864b872085a94ff94e10 libogg-1.1.tar.gz -4d82996517bf33bb912c97e9d0b635c4 libogg-1.1.2.tar.gz +eaf7dc6ebbff30975de7527a80831585 libogg-1.1.3.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 18 16:12:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:12:00 -0500 Subject: rpms/libvorbis/devel .cvsignore, 1.7, 1.8 libvorbis.spec, 1.20, 1.21 sources, 1.7, 1.8 Message-ID: <200601181612.k0IGC0LM031455@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/libvorbis/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31444 Modified Files: .cvsignore libvorbis.spec sources Log Message: - Update to 1.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libvorbis/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Nov 2005 21:06:01 -0000 1.7 +++ .cvsignore 18 Jan 2006 16:11:58 -0000 1.8 @@ -1,3 +1,4 @@ libvorbis-1.0.1.tar.gz libvorbis-1.1.0.tar.gz libvorbis-1.1.1.tar.gz +libvorbis-1.1.2.tar.gz Index: libvorbis.spec =================================================================== RCS file: /cvs/dist/rpms/libvorbis/devel/libvorbis.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libvorbis.spec 10 Dec 2005 09:37:30 -0000 1.20 +++ libvorbis.spec 18 Jan 2006 16:11:58 -0000 1.21 @@ -1,7 +1,7 @@ Summary: The Vorbis General Audio Compression Codec. Name: libvorbis -Version: 1.1.1 -Release: 1.1 +Version: 1.1.2 +Release: 1 Epoch: 1 Group: System Environment/Libraries License: BSD @@ -82,6 +82,9 @@ %postun -p /sbin/ldconfig %changelog +* Wed Jan 18 2006 John (J5) Palmieri 1:1.1.2-1 +- Update to 1.1.2 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/libvorbis/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Nov 2005 21:06:01 -0000 1.7 +++ sources 18 Jan 2006 16:11:58 -0000 1.8 @@ -1 +1 @@ -b77270c24840af4de54bea5ad1c0b252 libvorbis-1.1.1.tar.gz +37847626b8e1b53ae79a34714c7b3211 libvorbis-1.1.2.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 18 16:14:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:14:57 -0500 Subject: rpms/libselinux/devel .cvsignore, 1.99, 1.100 libselinux.spec, 1.176, 1.177 sources, 1.101, 1.102 Message-ID: <200601181614.k0IGEv7V031550@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31537 Modified Files: .cvsignore libselinux.spec sources Log Message: * Wed Jan 18 2006 Dan Walsh 1.29.6-1 - Upgrade to latest from NSA * Merged pywrap Makefile patch from Dan Walsh. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- .cvsignore 13 Jan 2006 22:14:28 -0000 1.99 +++ .cvsignore 18 Jan 2006 16:14:55 -0000 1.100 @@ -73,3 +73,4 @@ libselinux-1.29.3.tgz libselinux-1.29.4.tgz libselinux-1.29.5.tgz +libselinux-1.29.6.tgz Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- libselinux.spec 14 Jan 2006 05:05:19 -0000 1.176 +++ libselinux.spec 18 Jan 2006 16:14:55 -0000 1.177 @@ -1,9 +1,9 @@ %define libsepolver 1.11.9-1 -%define libsetransver 0.1.17-1 +%define libsetransver 0.1.18-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 1.29.5 -Release: 2 +Version: 1.29.6 +Release: 1 License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz @@ -110,6 +110,10 @@ %{_libdir}/python2.4/site-packages/selinux.py* %changelog +* Wed Jan 18 2006 Dan Walsh 1.29.6-1 +- Upgrade to latest from NSA + * Merged pywrap Makefile patch from Dan Walsh. + * Fri Jan 13 2006 Dan Walsh 1.29.5-2 - Split out pywrap in Makefile Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/sources,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- sources 13 Jan 2006 22:14:28 -0000 1.101 +++ sources 18 Jan 2006 16:14:55 -0000 1.102 @@ -1 +1 @@ -a35322febc094bbf201ddf313c6fd2b2 libselinux-1.29.5.tgz +63cfada61ab3182ac76648b7683cc37a libselinux-1.29.6.tgz From fedora-cvs-commits at redhat.com Wed Jan 18 16:16:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:16:33 -0500 Subject: rpms/libselinux/devel libselinux.spec,1.177,1.178 Message-ID: <200601181616.k0IGGXNS003125@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2921 Modified Files: libselinux.spec Log Message: * Wed Jan 18 2006 Dan Walsh 1.29.6-1 - Upgrade to latest from NSA * Merged pywrap Makefile patch from Dan Walsh. Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- libselinux.spec 18 Jan 2006 16:14:55 -0000 1.177 +++ libselinux.spec 18 Jan 2006 16:16:30 -0000 1.178 @@ -7,7 +7,6 @@ License: Public domain (uncopyrighted) Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz -Patch: libselinux-rhat.patch BuildRequires: libsepol-devel >= %{libsepolver} Requires: libsepol >= %{libsepolver} @@ -50,7 +49,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make clean From fedora-cvs-commits at redhat.com Wed Jan 18 16:27:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:27:17 -0500 Subject: rpms/gstreamer/devel .cvsignore, 1.17, 1.18 gstreamer.spec, 1.42, 1.43 sources, 1.18, 1.19 Message-ID: <200601181627.k0IGRH0x011534@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11521 Modified Files: .cvsignore gstreamer.spec sources Log Message: - Upgrade to 0.10.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 6 Jan 2006 16:56:04 -0000 1.17 +++ .cvsignore 18 Jan 2006 16:27:15 -0000 1.18 @@ -1,2 +1,3 @@ gstreamer-0.10.0.tar.bz2 gstreamer-0.10.1.tar.bz2 +gstreamer-0.10.2.tar.bz2 Index: gstreamer.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/gstreamer.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- gstreamer.spec 6 Jan 2006 16:57:18 -0000 1.42 +++ gstreamer.spec 18 Jan 2006 16:27:15 -0000 1.43 @@ -5,7 +5,7 @@ %define _libxml2 2.4.0 Name: %{gstreamer} -Version: 0.10.1 +Version: 0.10.2 Release: 1 Summary: GStreamer streaming media framework runtime @@ -199,6 +199,9 @@ %doc %{_datadir}/gtk-doc/html/gstreamer-plugins-%{majorminor}/* %changelog +* Wed Jan 18 2006 John (J5) Palmieri - 0.10.2-1 +- Upgrade to 0.10.2 + * Fri Jan 06 2006 John (J5) Palmieri - 0.10.1-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/dist/rpms/gstreamer/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 6 Jan 2006 16:56:04 -0000 1.18 +++ sources 18 Jan 2006 16:27:15 -0000 1.19 @@ -1 +1 @@ -2a56154a6636a404ab9107524d4b7a89 gstreamer-0.10.1.tar.bz2 +870206cef20bcc6fce8f3531b64a818b gstreamer-0.10.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 18 16:29:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:29:47 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.45, 1.46 libsemanage.spec, 1.65, 1.66 sources, 1.47, 1.48 Message-ID: <200601181629.k0IGTlGg011653@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11640 Modified Files: .cvsignore libsemanage.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 13 Jan 2006 22:31:44 -0000 1.45 +++ .cvsignore 18 Jan 2006 16:29:44 -0000 1.46 @@ -48,3 +48,4 @@ libsemanage-1.5.9.tgz libsemanage-1.5.11.tgz libsemanage-1.5.14.tgz +libsemanage-1.5.15.tgz Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- libsemanage.spec 14 Jan 2006 04:52:47 -0000 1.65 +++ libsemanage.spec 18 Jan 2006 16:29:44 -0000 1.66 @@ -1,13 +1,12 @@ %define libsepolver 1.11.9-1 -%define libselinuxver 1.29.5-1 +%define libselinuxver 1.29.6-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.5.14 -Release: 2 +Version: 1.5.15 +Release: 1 License: GPL Group: System Environment/Libraries Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz -Patch: libsemanage-rhat.patch BuildRoot: %{_tmppath}/%{name}-buildroot BuildRequires: libselinux-devel >= %{libselinuxver} @@ -40,7 +39,6 @@ %prep %setup -q -%patch -p1 -b .rhat %build make clean @@ -78,6 +76,18 @@ %changelog +* Fri Jan 13 2006 Dan Walsh 1.5.15-1 +- Upgrade to latest from NSA + * Merged pywrap Makefile diff from Dan Walsh. + * Merged cache management patch from Ivan Gyurdiev. + * Merged bugfix for dbase_llist_clear from Ivan Gyurdiev. + * Merged remove apply_local function patch from Ivan Gyurdiev. + * Merged only do read locking in direct case patch from Ivan Gyurdiev. + * Merged cache error path memory leak fix from Ivan Gyurdiev. + * Merged auto-generated file header patch from Ivan Gyurdiev. + * Merged pywrap test update from Ivan Gyurdiev. + * Merged hidden defs update from Ivan Gyurdiev. + * Fri Jan 13 2006 Dan Walsh 1.5.14-2 - Break out python out of regular Makefile Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- sources 13 Jan 2006 22:31:44 -0000 1.47 +++ sources 18 Jan 2006 16:29:44 -0000 1.48 @@ -1 +1 @@ -6a136bd40751507a05a6a6f0996cb4cc libsemanage-1.5.14.tgz +9242b303cb348fee508ad3f3d827db4d libsemanage-1.5.15.tgz From fedora-cvs-commits at redhat.com Wed Jan 18 16:29:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:29:51 -0500 Subject: rpms/gstreamer-plugins-base/devel .cvsignore, 1.3, 1.4 gstreamer-plugins-base.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200601181629.k0IGTp7U011707@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer-plugins-base/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11639 Modified Files: .cvsignore gstreamer-plugins-base.spec sources Log Message: - Upgrade to 0.10.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 6 Jan 2006 17:02:57 -0000 1.3 +++ .cvsignore 18 Jan 2006 16:29:49 -0000 1.4 @@ -1,2 +1,3 @@ gst-plugins-base-0.10.0.tar.bz2 gst-plugins-base-0.10.1.tar.bz2 +gst-plugins-base-0.10.2.tar.bz2 Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gstreamer-plugins-base.spec 6 Jan 2006 21:00:15 -0000 1.3 +++ gstreamer-plugins-base.spec 18 Jan 2006 16:29:49 -0000 1.4 @@ -4,7 +4,7 @@ %define _gst 0.10.1 Name: %{gstreamer}-plugins-base -Version: 0.10.1 +Version: 0.10.2 Release: 1 Summary: GStreamer streaming media framework base plug-ins @@ -177,6 +177,9 @@ %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Wed Jan 18 2006 John (J5) Palmieri - 0.10.2-1 +- Upgrade to 0.10.2 + * Fri Jan 06 2006 John (J5) Palmieri - 0.10.1-1 - New upstream version - gst-launch removed from upstream Index: sources =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Jan 2006 17:02:57 -0000 1.3 +++ sources 18 Jan 2006 16:29:49 -0000 1.4 @@ -1 +1 @@ -303fc88af1eed2ec2fd094bee98113d2 gst-plugins-base-0.10.1.tar.bz2 +08b1f541e81baa67aeab6df90cfe61d5 gst-plugins-base-0.10.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 18 16:29:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:29:55 -0500 Subject: rpms/selinux-policy-strict/FC-4 policy-20050916.patch, 1.18, 1.19 selinux-policy-strict.spec, 1.335, 1.336 Message-ID: <200601181629.k0IGTt1r011737@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-strict/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv11702 Modified Files: policy-20050916.patch selinux-policy-strict.spec Log Message: * Wed Jan 18 2006 Dan Walsh 1.27.1-2.19 - Add support for labeled networking in upcoming kernel - Fix man page and booleans file policy-20050916.patch: Makefile | 26 +- attrib.te | 100 +++++++++- domains/admin.te | 2 domains/misc/kernel.te | 2 domains/program/crond.te | 2 domains/program/fsadm.te | 9 domains/program/getty.te | 2 domains/program/hostname.te | 2 domains/program/ifconfig.te | 10 - domains/program/init.te | 2 domains/program/initrc.te | 26 ++ domains/program/ldconfig.te | 3 domains/program/load_policy.te | 11 - domains/program/login.te | 23 +- domains/program/logrotate.te | 2 domains/program/modutil.te | 27 +- domains/program/mount.te | 6 domains/program/netutils.te | 3 domains/program/newrole.te | 4 domains/program/passwd.te | 2 domains/program/restorecon.te | 6 domains/program/setfiles.te | 4 domains/program/ssh.te | 6 domains/program/su.te | 12 + domains/program/syslogd.te | 7 domains/program/tmpreaper.te | 2 domains/program/unused/NetworkManager.te | 13 + domains/program/unused/alsa.te | 2 domains/program/unused/amanda.te | 74 +------ domains/program/unused/anaconda.te | 5 domains/program/unused/apache.te | 25 +- domains/program/unused/apmd.te | 25 ++ domains/program/unused/auditd.te | 9 domains/program/unused/automount.te | 4 domains/program/unused/avahi.te | 31 +++ domains/program/unused/bluetooth.te | 72 +++++++ domains/program/unused/cups.te | 24 +- domains/program/unused/cvs.te | 2 domains/program/unused/cyrus.te | 10 - domains/program/unused/dbusd.te | 4 domains/program/unused/dcc.te | 5 domains/program/unused/dhcpc.te | 6 domains/program/unused/dhcpd.te | 4 domains/program/unused/dovecot.te | 6 domains/program/unused/exim.te | 309 +++++++++++++++++++++++++++++++ domains/program/unused/ftpd.te | 6 domains/program/unused/hald.te | 5 domains/program/unused/hotplug.te | 10 - domains/program/unused/hwclock.te | 1 domains/program/unused/ipsec.te | 2 domains/program/unused/kudzu.te | 5 domains/program/unused/mta.te | 7 domains/program/unused/mysqld.te | 10 - domains/program/unused/named.te | 27 ++ domains/program/unused/nscd.te | 1 domains/program/unused/ntpd.te | 10 - domains/program/unused/openct.te | 16 + domains/program/unused/pamconsole.te | 4 domains/program/unused/pegasus.te | 36 +++ domains/program/unused/ping.te | 2 domains/program/unused/postfix.te | 63 ++++-- domains/program/unused/postgresql.te | 11 - domains/program/unused/pppd.te | 23 +- domains/program/unused/privoxy.te | 2 domains/program/unused/procmail.te | 16 + domains/program/unused/radius.te | 3 domains/program/unused/readahead.te | 21 ++ domains/program/unused/rlogind.te | 4 domains/program/unused/roundup.te | 29 ++ domains/program/unused/rpcd.te | 18 + domains/program/unused/rpm.te | 4 domains/program/unused/rsync.te | 3 domains/program/unused/samba.te | 15 + domains/program/unused/saslauthd.te | 1 domains/program/unused/sendmail.te | 3 domains/program/unused/slapd.te | 28 ++ domains/program/unused/snmpd.te | 6 domains/program/unused/spamd.te | 28 -- domains/program/unused/squid.te | 4 domains/program/unused/udev.te | 10 - domains/program/unused/utempter.te | 2 domains/program/unused/webalizer.te | 3 domains/program/unused/winbind.te | 1 domains/program/unused/xdm.te | 3 domains/program/unused/yppasswdd.te | 40 ++++ domains/program/unused/ypserv.te | 9 domains/program/unused/zebra.te | 2 domains/program/useradd.te | 5 file_contexts/distros.fc | 2 file_contexts/program/apache.fc | 3 file_contexts/program/bluetooth.fc | 3 file_contexts/program/compat.fc | 4 file_contexts/program/dhcpc.fc | 2 file_contexts/program/dhcpd.fc | 5 file_contexts/program/ftpd.fc | 5 file_contexts/program/games.fc | 11 - file_contexts/program/innd.fc | 15 - file_contexts/program/ipsec.fc | 1 file_contexts/program/openct.fc | 2 file_contexts/program/pegasus.fc | 9 file_contexts/program/pppd.fc | 2 file_contexts/program/privoxy.fc | 1 file_contexts/program/readahead.fc | 1 file_contexts/program/roundup.fc | 2 file_contexts/program/rpm.fc | 4 file_contexts/program/rshd.fc | 1 file_contexts/program/rsync.fc | 2 file_contexts/program/slapd.fc | 12 + file_contexts/program/squid.fc | 3 file_contexts/program/xdm.fc | 2 file_contexts/program/yppasswdd.fc | 2 file_contexts/program/ypserv.fc | 1 file_contexts/types.fc | 6 genfs_contexts | 3 macros/base_user_macros.te | 7 macros/core_macros.te | 9 macros/global_macros.te | 35 ++- macros/home_macros.te | 9 macros/network_macros.te | 19 + macros/program/apache_macros.te | 13 + macros/program/bonobo_macros.te | 2 macros/program/cdrecord_macros.te | 6 macros/program/chkpwd_macros.te | 8 macros/program/crontab_macros.te | 2 macros/program/dbusd_macros.te | 7 macros/program/gconf_macros.te | 2 macros/program/gift_macros.te | 2 macros/program/gpg_macros.te | 2 macros/program/i18n_input_macros.te | 21 ++ macros/program/lpr_macros.te | 2 macros/program/mta_macros.te | 4 macros/program/newrole_macros.te | 2 macros/program/pyzor_macros.te | 2 macros/program/razor_macros.te | 2 macros/program/su_macros.te | 4 macros/program/uml_macros.te | 2 macros/program/xdm_macros.te | 2 macros/program/ypbind_macros.te | 1 macros/user_macros.te | 7 man/man8/ftpd_selinux.8 | 19 + man/man8/httpd_selinux.8 | 9 man/man8/rsync_selinux.8 | 12 - man/man8/samba_selinux.8 | 9 mcs | 210 ++++++++------------- mls | 270 ++++++++++----------------- net_contexts | 13 + targeted/appconfig/root_default_contexts | 4 targeted/assert.te | 2 targeted/domains/program/compat.te | 1 targeted/domains/program/sendmail.te | 1 targeted/domains/program/ssh.te | 3 targeted/domains/program/xdm.te | 4 targeted/domains/unconfined.te | 15 + tunables/distro.tun | 2 tunables/tunable.tun | 4 types/device.te | 4 types/devpts.te | 4 types/file.te | 48 +--- types/network.te | 13 - types/nfs.te | 1 types/security.te | 6 161 files changed, 1672 insertions(+), 688 deletions(-) Index: policy-20050916.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/policy-20050916.patch,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- policy-20050916.patch 3 Jan 2006 03:51:32 -0000 1.18 +++ policy-20050916.patch 18 Jan 2006 16:29:52 -0000 1.19 @@ -3571,7 +3571,7 @@ ') diff --exclude-from=exclude -N -u -r nsapolicy/macros/global_macros.te policy-1.27.1/macros/global_macros.te --- nsapolicy/macros/global_macros.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/macros/global_macros.te 2005-11-30 16:42:28.000000000 -0500 ++++ policy-1.27.1/macros/global_macros.te 2006-01-18 11:23:58.000000000 -0500 @@ -157,6 +157,11 @@ r_dir_file($1, locale_t) ') @@ -3655,7 +3655,16 @@ # Mount/unmount any filesystem. allow $1 fs_type:filesystem *; -@@ -653,7 +666,7 @@ +@@ -636,6 +649,8 @@ + # pseudo filesystem types that are applied to both the filesystem + # and its files. + allow $1 { unlabeled_t fs_type }:dir_file_class_set *; ++allow $1 unlabeled_t:association { sendto recvfrom }; ++ + allow $1 proc_fs:{ dir file } *; + + # For /proc/pid +@@ -653,7 +668,7 @@ allow $1 port_type:tcp_socket name_connect; # Bind to any network address. @@ -3664,7 +3673,7 @@ allow $1 node_type:{ tcp_socket udp_socket rawip_socket } node_bind; allow $1 file_type:{ unix_stream_socket unix_dgram_socket } name_bind; -@@ -695,8 +708,10 @@ +@@ -695,8 +710,10 @@ allow $1 domain:msg { send receive }; # Access the security API. @@ -3675,7 +3684,7 @@ # Perform certain system operations that lacked individual capabilities. allow $1 kernel_t:system *; -@@ -750,4 +765,8 @@ +@@ -750,4 +767,8 @@ allow $1 { random_device_t urandom_device_t }:chr_file { getattr read }; allow $1 self:capability { audit_write audit_control }; dontaudit $1 shadow_t:file { getattr read }; @@ -3714,8 +3723,17 @@ #################################################################### diff --exclude-from=exclude -N -u -r nsapolicy/macros/network_macros.te policy-1.27.1/macros/network_macros.te --- nsapolicy/macros/network_macros.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/macros/network_macros.te 2005-11-30 16:42:28.000000000 -0500 -@@ -153,7 +153,8 @@ ++++ policy-1.27.1/macros/network_macros.te 2006-01-18 11:23:25.000000000 -0500 +@@ -12,6 +12,8 @@ + # Other kinds of sockets must be separately authorized for use. + allow $1 self:$2_socket connected_socket_perms; + ++allow $1 unlabeled_t:association { sendto recvfrom }; ++ + # + # Allow the domain to send or receive using any network interface. + # netif_type is a type attribute for all network interface types. +@@ -153,7 +155,8 @@ ')dnl end can_network definition define(`can_resolve',` @@ -3725,7 +3743,7 @@ ') define(`can_portmap',` -@@ -173,3 +174,17 @@ +@@ -173,3 +176,17 @@ allow $1 winbind_var_run_t:sock_file { getattr read write }; ') ') @@ -4125,13 +4143,14 @@ +MLSENABLED := $(shell cat /selinux/mls) POLICYVER := policy.$(VERS) TOPDIR = $(DESTDIR)/etc/selinux - TYPE=strict +-TYPE=strict -ifeq ($(MLS),y) -TYPE=mls -endif -ifeq ($(MCS),y) -TYPE=mcs -endif ++TYPE=strict INSTALLDIR = $(TOPDIR)/$(TYPE) POLICYPATH = $(INSTALLDIR)/policy @@ -4197,7 +4216,7 @@ @mv Makefile.new Makefile diff --exclude-from=exclude -N -u -r nsapolicy/man/man8/ftpd_selinux.8 policy-1.27.1/man/man8/ftpd_selinux.8 --- nsapolicy/man/man8/ftpd_selinux.8 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/man/man8/ftpd_selinux.8 2005-11-30 16:42:28.000000000 -0500 ++++ policy-1.27.1/man/man8/ftpd_selinux.8 2006-01-14 00:36:07.000000000 -0500 @@ -8,23 +8,24 @@ .SH FILE_CONTEXTS SELinux requires files to have an extended attribute to define the file type. @@ -4217,9 +4236,9 @@ - +chcon -t public_content_rw_t /var/ftp/incoming +.TP -+You must also turn on the boolean allow_ftp_anon_write. ++You must also turn on the boolean allow_ftpd_anon_write. +.TP -+setsebool -P allow_ftp_anon_write=1 ++setsebool -P allow_ftpd_anon_write=1 .TP If you want to make this permanant, i.e. survive a relabel, you must add an entry to the file_contexts.local file. .TP Index: selinux-policy-strict.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-strict/FC-4/selinux-policy-strict.spec,v retrieving revision 1.335 retrieving revision 1.336 diff -u -r1.335 -r1.336 --- selinux-policy-strict.spec 3 Jan 2006 03:41:57 -0000 1.335 +++ selinux-policy-strict.spec 18 Jan 2006 16:29:52 -0000 1.336 @@ -11,7 +11,7 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} Version: 1.27.1 -Release: 2.18 +Release: 2.19 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz @@ -229,6 +229,10 @@ exit 0 %changelog +* Wed Jan 18 2006 Dan Walsh 1.27.1-2.19 +- Add support for labeled networking in upcoming kernel +- Fix man page and booleans file + * Mon Jan 2 2006 Dan Walsh 1.27.1-2.18 - Allow pam_module to work with apache From fedora-cvs-commits at redhat.com Wed Jan 18 16:30:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:30:01 -0500 Subject: rpms/selinux-policy-targeted/FC-4 booleans, 1.11, 1.12 policy-20050916.patch, 1.21, 1.22 selinux-policy-targeted.spec, 1.354, 1.355 Message-ID: <200601181630.k0IGU1TG011797@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy-targeted/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv11775 Modified Files: booleans policy-20050916.patch selinux-policy-targeted.spec Log Message: * Wed Jan 18 2006 Dan Walsh 1.27.1-2.19 - Add support for labeled networking in upcoming kernel - Fix man page and booleans file Index: booleans =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/booleans,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- booleans 4 Apr 2005 15:41:47 -0000 1.11 +++ booleans 18 Jan 2006 16:29:57 -0000 1.12 @@ -1,4 +1,4 @@ -# This file should not not be modified. +# This file should not be modified. # If you want to customize your booleans, make changes to booleans.local # or use "setsebool -P" # This file will be replaced with the next rpm upgrade. policy-20050916.patch: Makefile | 26 +- attrib.te | 100 +++++++++- domains/admin.te | 2 domains/misc/kernel.te | 2 domains/program/crond.te | 2 domains/program/fsadm.te | 9 domains/program/getty.te | 2 domains/program/hostname.te | 2 domains/program/ifconfig.te | 10 - domains/program/init.te | 2 domains/program/initrc.te | 26 ++ domains/program/ldconfig.te | 3 domains/program/load_policy.te | 11 - domains/program/login.te | 23 +- domains/program/logrotate.te | 2 domains/program/modutil.te | 27 +- domains/program/mount.te | 6 domains/program/netutils.te | 3 domains/program/newrole.te | 4 domains/program/passwd.te | 2 domains/program/restorecon.te | 6 domains/program/setfiles.te | 4 domains/program/ssh.te | 6 domains/program/su.te | 12 + domains/program/syslogd.te | 7 domains/program/tmpreaper.te | 2 domains/program/unused/NetworkManager.te | 13 + domains/program/unused/alsa.te | 2 domains/program/unused/amanda.te | 74 +------ domains/program/unused/anaconda.te | 5 domains/program/unused/apache.te | 25 +- domains/program/unused/apmd.te | 25 ++ domains/program/unused/auditd.te | 9 domains/program/unused/automount.te | 4 domains/program/unused/avahi.te | 31 +++ domains/program/unused/bluetooth.te | 72 +++++++ domains/program/unused/cups.te | 24 +- domains/program/unused/cvs.te | 2 domains/program/unused/cyrus.te | 10 - domains/program/unused/dbusd.te | 4 domains/program/unused/dcc.te | 5 domains/program/unused/dhcpc.te | 6 domains/program/unused/dhcpd.te | 4 domains/program/unused/dovecot.te | 6 domains/program/unused/exim.te | 309 +++++++++++++++++++++++++++++++ domains/program/unused/ftpd.te | 6 domains/program/unused/hald.te | 5 domains/program/unused/hotplug.te | 10 - domains/program/unused/hwclock.te | 1 domains/program/unused/ipsec.te | 2 domains/program/unused/kudzu.te | 5 domains/program/unused/mta.te | 7 domains/program/unused/mysqld.te | 10 - domains/program/unused/named.te | 27 ++ domains/program/unused/nscd.te | 1 domains/program/unused/ntpd.te | 10 - domains/program/unused/openct.te | 16 + domains/program/unused/pamconsole.te | 4 domains/program/unused/pegasus.te | 36 +++ domains/program/unused/ping.te | 2 domains/program/unused/postfix.te | 63 ++++-- domains/program/unused/postgresql.te | 11 - domains/program/unused/pppd.te | 23 +- domains/program/unused/privoxy.te | 2 domains/program/unused/procmail.te | 16 + domains/program/unused/radius.te | 3 domains/program/unused/readahead.te | 21 ++ domains/program/unused/rlogind.te | 4 domains/program/unused/roundup.te | 29 ++ domains/program/unused/rpcd.te | 18 + domains/program/unused/rpm.te | 4 domains/program/unused/rsync.te | 3 domains/program/unused/samba.te | 15 + domains/program/unused/saslauthd.te | 1 domains/program/unused/sendmail.te | 3 domains/program/unused/slapd.te | 28 ++ domains/program/unused/snmpd.te | 6 domains/program/unused/spamd.te | 28 -- domains/program/unused/squid.te | 4 domains/program/unused/udev.te | 10 - domains/program/unused/utempter.te | 2 domains/program/unused/webalizer.te | 3 domains/program/unused/winbind.te | 1 domains/program/unused/xdm.te | 3 domains/program/unused/yppasswdd.te | 40 ++++ domains/program/unused/ypserv.te | 9 domains/program/unused/zebra.te | 2 domains/program/useradd.te | 5 file_contexts/distros.fc | 2 file_contexts/program/apache.fc | 3 file_contexts/program/bluetooth.fc | 3 file_contexts/program/compat.fc | 4 file_contexts/program/dhcpc.fc | 2 file_contexts/program/dhcpd.fc | 5 file_contexts/program/ftpd.fc | 5 file_contexts/program/games.fc | 11 - file_contexts/program/innd.fc | 15 - file_contexts/program/ipsec.fc | 1 file_contexts/program/openct.fc | 2 file_contexts/program/pegasus.fc | 9 file_contexts/program/pppd.fc | 2 file_contexts/program/privoxy.fc | 1 file_contexts/program/readahead.fc | 1 file_contexts/program/roundup.fc | 2 file_contexts/program/rpm.fc | 4 file_contexts/program/rshd.fc | 1 file_contexts/program/rsync.fc | 2 file_contexts/program/slapd.fc | 12 + file_contexts/program/squid.fc | 3 file_contexts/program/xdm.fc | 2 file_contexts/program/yppasswdd.fc | 2 file_contexts/program/ypserv.fc | 1 file_contexts/types.fc | 6 genfs_contexts | 3 macros/base_user_macros.te | 7 macros/core_macros.te | 9 macros/global_macros.te | 35 ++- macros/home_macros.te | 9 macros/network_macros.te | 19 + macros/program/apache_macros.te | 13 + macros/program/bonobo_macros.te | 2 macros/program/cdrecord_macros.te | 6 macros/program/chkpwd_macros.te | 8 macros/program/crontab_macros.te | 2 macros/program/dbusd_macros.te | 7 macros/program/gconf_macros.te | 2 macros/program/gift_macros.te | 2 macros/program/gpg_macros.te | 2 macros/program/i18n_input_macros.te | 21 ++ macros/program/lpr_macros.te | 2 macros/program/mta_macros.te | 4 macros/program/newrole_macros.te | 2 macros/program/pyzor_macros.te | 2 macros/program/razor_macros.te | 2 macros/program/su_macros.te | 4 macros/program/uml_macros.te | 2 macros/program/xdm_macros.te | 2 macros/program/ypbind_macros.te | 1 macros/user_macros.te | 7 man/man8/ftpd_selinux.8 | 19 + man/man8/httpd_selinux.8 | 9 man/man8/rsync_selinux.8 | 12 - man/man8/samba_selinux.8 | 9 mcs | 210 ++++++++------------- mls | 270 ++++++++++----------------- net_contexts | 13 + targeted/appconfig/root_default_contexts | 4 targeted/assert.te | 2 targeted/domains/program/compat.te | 1 targeted/domains/program/sendmail.te | 1 targeted/domains/program/ssh.te | 3 targeted/domains/program/xdm.te | 4 targeted/domains/unconfined.te | 15 + tunables/distro.tun | 2 tunables/tunable.tun | 4 types/device.te | 4 types/devpts.te | 4 types/file.te | 48 +--- types/network.te | 13 - types/nfs.te | 1 types/security.te | 6 161 files changed, 1672 insertions(+), 688 deletions(-) Index: policy-20050916.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/policy-20050916.patch,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- policy-20050916.patch 2 Jan 2006 19:05:01 -0000 1.21 +++ policy-20050916.patch 18 Jan 2006 16:29:57 -0000 1.22 @@ -3571,7 +3571,7 @@ ') diff --exclude-from=exclude -N -u -r nsapolicy/macros/global_macros.te policy-1.27.1/macros/global_macros.te --- nsapolicy/macros/global_macros.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/macros/global_macros.te 2005-11-30 16:42:28.000000000 -0500 ++++ policy-1.27.1/macros/global_macros.te 2006-01-18 11:23:58.000000000 -0500 @@ -157,6 +157,11 @@ r_dir_file($1, locale_t) ') @@ -3655,7 +3655,16 @@ # Mount/unmount any filesystem. allow $1 fs_type:filesystem *; -@@ -653,7 +666,7 @@ +@@ -636,6 +649,8 @@ + # pseudo filesystem types that are applied to both the filesystem + # and its files. + allow $1 { unlabeled_t fs_type }:dir_file_class_set *; ++allow $1 unlabeled_t:association { sendto recvfrom }; ++ + allow $1 proc_fs:{ dir file } *; + + # For /proc/pid +@@ -653,7 +668,7 @@ allow $1 port_type:tcp_socket name_connect; # Bind to any network address. @@ -3664,7 +3673,7 @@ allow $1 node_type:{ tcp_socket udp_socket rawip_socket } node_bind; allow $1 file_type:{ unix_stream_socket unix_dgram_socket } name_bind; -@@ -695,8 +708,10 @@ +@@ -695,8 +710,10 @@ allow $1 domain:msg { send receive }; # Access the security API. @@ -3675,7 +3684,7 @@ # Perform certain system operations that lacked individual capabilities. allow $1 kernel_t:system *; -@@ -750,4 +765,8 @@ +@@ -750,4 +767,8 @@ allow $1 { random_device_t urandom_device_t }:chr_file { getattr read }; allow $1 self:capability { audit_write audit_control }; dontaudit $1 shadow_t:file { getattr read }; @@ -3714,8 +3723,17 @@ #################################################################### diff --exclude-from=exclude -N -u -r nsapolicy/macros/network_macros.te policy-1.27.1/macros/network_macros.te --- nsapolicy/macros/network_macros.te 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/macros/network_macros.te 2005-11-30 16:42:28.000000000 -0500 -@@ -153,7 +153,8 @@ ++++ policy-1.27.1/macros/network_macros.te 2006-01-18 11:23:25.000000000 -0500 +@@ -12,6 +12,8 @@ + # Other kinds of sockets must be separately authorized for use. + allow $1 self:$2_socket connected_socket_perms; + ++allow $1 unlabeled_t:association { sendto recvfrom }; ++ + # + # Allow the domain to send or receive using any network interface. + # netif_type is a type attribute for all network interface types. +@@ -153,7 +155,8 @@ ')dnl end can_network definition define(`can_resolve',` @@ -3725,7 +3743,7 @@ ') define(`can_portmap',` -@@ -173,3 +174,17 @@ +@@ -173,3 +176,17 @@ allow $1 winbind_var_run_t:sock_file { getattr read write }; ') ') @@ -4198,7 +4216,7 @@ @mv Makefile.new Makefile diff --exclude-from=exclude -N -u -r nsapolicy/man/man8/ftpd_selinux.8 policy-1.27.1/man/man8/ftpd_selinux.8 --- nsapolicy/man/man8/ftpd_selinux.8 2005-09-16 11:17:27.000000000 -0400 -+++ policy-1.27.1/man/man8/ftpd_selinux.8 2005-11-30 16:42:28.000000000 -0500 ++++ policy-1.27.1/man/man8/ftpd_selinux.8 2006-01-14 00:36:07.000000000 -0500 @@ -8,23 +8,24 @@ .SH FILE_CONTEXTS SELinux requires files to have an extended attribute to define the file type. @@ -4218,9 +4236,9 @@ - +chcon -t public_content_rw_t /var/ftp/incoming +.TP -+You must also turn on the boolean allow_ftp_anon_write. ++You must also turn on the boolean allow_ftpd_anon_write. +.TP -+setsebool -P allow_ftp_anon_write=1 ++setsebool -P allow_ftpd_anon_write=1 .TP If you want to make this permanant, i.e. survive a relabel, you must add an entry to the file_contexts.local file. .TP Index: selinux-policy-targeted.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy-targeted/FC-4/selinux-policy-targeted.spec,v retrieving revision 1.354 retrieving revision 1.355 diff -u -r1.354 -r1.355 --- selinux-policy-targeted.spec 2 Jan 2006 19:05:12 -0000 1.354 +++ selinux-policy-targeted.spec 18 Jan 2006 16:29:57 -0000 1.355 @@ -9,7 +9,7 @@ Summary: SELinux %{type} policy configuration Name: selinux-policy-%{type} Version: 1.27.1 -Release: 2.18 +Release: 2.19 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policy-%{version}.tgz @@ -234,6 +234,10 @@ exit 0 %changelog +* Wed Jan 18 2006 Dan Walsh 1.27.1-2.19 +- Add support for labeled networking in upcoming kernel +- Fix man page and booleans file + * Mon Jan 2 2006 Dan Walsh 1.27.1-2.18 - Allow pam_module to work with apache From fedora-cvs-commits at redhat.com Wed Jan 18 16:32:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:32:57 -0500 Subject: rpms/gstreamer-plugins-good/devel .cvsignore, 1.2, 1.3 gstreamer-plugins-good.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200601181632.k0IGWv5d012015@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer-plugins-good/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11978 Modified Files: .cvsignore gstreamer-plugins-good.spec sources Log Message: - Upgrade to 0.10.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Jan 2006 20:09:48 -0000 1.2 +++ .cvsignore 18 Jan 2006 16:32:52 -0000 1.3 @@ -1 +1,2 @@ gst-plugins-good-0.10.0.tar.bz2 +gst-plugins-good-0.10.1.tar.bz2 Index: gstreamer-plugins-good.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gstreamer-plugins-good.spec 4 Jan 2006 22:32:26 -0000 1.2 +++ gstreamer-plugins-good.spec 18 Jan 2006 16:32:52 -0000 1.3 @@ -5,8 +5,8 @@ %define _gstpb 0.10.0 Name: %{gstreamer}-plugins-good -Version: 0.10.0 -Release: 2 +Version: 0.10.1 +Release: 1 Summary: GStreamer plug-ins with good code and licensing Group: Applications/Multimedia @@ -172,6 +172,9 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gstreamer-%{majorminor}.schemas > /dev/null %changelog +* Wed Jan 18 2006 John (J5) Palmieri 0.10.1-1 +- Upgrade to 0.10.1 + * Wed Jan 04 2006 Warren Togami 0.10.0-2 - exclude 1394 stuff from s390 and s390x Index: sources =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Jan 2006 20:09:48 -0000 1.2 +++ sources 18 Jan 2006 16:32:52 -0000 1.3 @@ -1 +1 @@ -4365aa89494a65c54e22d5a9d68f39fc gst-plugins-good-0.10.0.tar.bz2 +be5ba72454a1df6e4e6d5deeeec88e59 gst-plugins-good-0.10.1.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 18 16:34:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:34:40 -0500 Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.4, 1.5 Message-ID: <200601181634.k0IGYehX012091@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer-plugins-base/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12063 Modified Files: gstreamer-plugins-base.spec Log Message: - require gstreamer 0.10.2 Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gstreamer-plugins-base.spec 18 Jan 2006 16:29:49 -0000 1.4 +++ gstreamer-plugins-base.spec 18 Jan 2006 16:34:37 -0000 1.5 @@ -1,7 +1,7 @@ %define gstreamer gstreamer %define majorminor 0.10 -%define _gst 0.10.1 +%define _gst 0.10.2 Name: %{gstreamer}-plugins-base Version: 0.10.2 @@ -179,6 +179,7 @@ %changelog * Wed Jan 18 2006 John (J5) Palmieri - 0.10.2-1 - Upgrade to 0.10.2 +- Require gstreamer-0.10.2 * Fri Jan 06 2006 John (J5) Palmieri - 0.10.1-1 - New upstream version From fedora-cvs-commits at redhat.com Wed Jan 18 16:35:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:35:16 -0500 Subject: rpms/rpm/devel rpm-4.4.2-perlmainprov.patch, NONE, 1.1 rpm.spec, 1.191, 1.192 Message-ID: <200601181635.k0IGZGAo012148@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12132 Modified Files: rpm.spec Added Files: rpm-4.4.2-perlmainprov.patch Log Message: Don't emit perl(main) rpm-4.4.2-perlmainprov.patch: perl.prov | 10 +++++++--- perldeps.pl | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) --- NEW FILE rpm-4.4.2-perlmainprov.patch --- --- rpm-4.4.2/scripts/perl.prov.main 2006-01-18 11:32:28.000000000 -0500 +++ rpm-4.4.2/scripts/perl.prov 2006-01-18 11:32:44.000000000 -0500 @@ -121,13 +121,17 @@ } # not everyone puts the package name of the file as the first - # package name so we report all namespaces as if they were - # provided packages (really ugly). + # package name so we report all namespaces except some common + # false positives as if they were provided packages (really ugly). if (m/^\s*package\s+([_:a-zA-Z0-9]+)\s*;/) { $package=$1; undef $version; - $require{$package}=undef; + if ($package eq 'main') { + undef $package; + } else { + $require{$package}=undef; + } } # after we found the package name take the first assignment to --- rpm-4.4.2/scripts/perldeps.pl.main 2006-01-18 11:32:37.000000000 -0500 +++ rpm-4.4.2/scripts/perldeps.pl 2006-01-18 11:32:44.000000000 -0500 @@ -150,6 +150,10 @@ return if(exists($self->{'provides_check'}->{$params{'-provide'}})); # + # Skip some common false positives + return if $params{'-provide'} eq 'main'; + + # # Created dependency object my $dep = new Dependency "provide", $params{-provide}; $dep->filename($params{-filename}); Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- rpm.spec 12 Jan 2006 13:01:01 -0000 1.191 +++ rpm.spec 18 Jan 2006 16:35:14 -0000 1.192 @@ -20,7 +20,7 @@ %define version 4.4.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 13 +Release: 14 Group: System Environment/Base Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz Source1: mono-find-provides @@ -43,6 +43,7 @@ Patch15: rpm-4.4.2-mono.patch Patch16: rpm-4.4.2-file-softmagic.patch Patch17: rpm-4.4.2-no-large-mmap.patch +Patch18: rpm-4.4.2-perlmainprov.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -172,6 +173,7 @@ %patch15 -p1 -b .mono %patch16 -p1 -b .magic %patch17 -p1 -b .no_large_mmap +%patch18 -p1 -b .perlmainprov %build @@ -564,6 +566,9 @@ %{__includedir}/popt.h %changelog +* Wed Jan 18 2006 Paul Nasrat - 4.4.2-14 +- Don't emit perl(main) (#177960) + * Wed Jan 11 2006 Paul Nasrat - 4.4.2-13 - Don't mmap large files From fedora-cvs-commits at redhat.com Wed Jan 18 16:40:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:40:00 -0500 Subject: rpms/sound-juicer/devel .cvsignore, 1.15, 1.16 sound-juicer.spec, 1.33, 1.34 sources, 1.15, 1.16 Message-ID: <200601181640.k0IGe08a012317@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/sound-juicer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12305 Modified Files: .cvsignore sound-juicer.spec sources Log Message: - Upgrade to 2.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 9 Nov 2005 21:11:00 -0000 1.15 +++ .cvsignore 18 Jan 2006 16:39:48 -0000 1.16 @@ -5,3 +5,4 @@ sound-juicer-2.11.3.tar.bz2 sound-juicer-2.11.91.tar.bz2 sound-juicer-2.13.1.tar.bz2 +sound-juicer-2.13.2.tar.bz2 Index: sound-juicer.spec =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sound-juicer.spec 9 Jan 2006 19:26:16 -0000 1.33 +++ sound-juicer.spec 18 Jan 2006 16:39:48 -0000 1.34 @@ -12,8 +12,8 @@ Name: sound-juicer Summary: Clean and lean CD ripper -Version: 2.13.1 -Release: 4 +Version: 2.13.2 +Release: 1 License: GPL Group: Applications/Multimedia Source: %{name}-%{version}.tar.bz2 @@ -93,10 +93,13 @@ %{_datadir}/omf/sound-juicer %changelog -* Mon Jan 09 2006 John (J5) Palmieir 2.13.1-4 +* Mon Jan 09 2006 John (J5) Palmieri 2.13.2-1 +- Upgrade to 2.13.2 + +* Mon Jan 09 2006 John (J5) Palmieri 2.13.1-4 - Add a patch that adds -Wl,--export-dynamic to the build -* Thu Jan 05 2006 John (J5) Palmieir 2.13.1-3 +* Thu Jan 05 2006 John (J5) Palmieri 2.13.1-3 - GStreamer has been split into gstreamer08 and gstreamer (0.10) packages we need gstreamer08 for now Index: sources =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 9 Nov 2005 21:11:00 -0000 1.15 +++ sources 18 Jan 2006 16:39:48 -0000 1.16 @@ -1 +1 @@ -ceed8f8c104963b7af926bccf2a8946f sound-juicer-2.13.1.tar.bz2 +65664fe2f38260c32f3be9a1f6593e4c sound-juicer-2.13.2.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 18 16:42:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:42:31 -0500 Subject: rpms/gstreamer-plugins-good/devel gstreamer-plugins-good.spec, 1.3, 1.4 Message-ID: <200601181642.k0IGgVqo012502@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer-plugins-good/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12489 Modified Files: gstreamer-plugins-good.spec Log Message: - Add libgstid3demux.so to the files section Index: gstreamer-plugins-good.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-good/devel/gstreamer-plugins-good.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gstreamer-plugins-good.spec 18 Jan 2006 16:32:52 -0000 1.3 +++ gstreamer-plugins-good.spec 18 Jan 2006 16:42:28 -0000 1.4 @@ -137,6 +137,7 @@ %{_libdir}/gstreamer-%{majorminor}/libgstvideomixer.so %{_libdir}/gstreamer-%{majorminor}/libgstwavenc.so %{_libdir}/gstreamer-%{majorminor}/libgstwavparse.so +%{_libdir}/gstreamer-%{majorminor}/libgstid3demux.so # gstreamer-plugins with external dependencies but in the main package #%{_libdir}/gstreamer-%{majorminor}/libgstcacasink.so @@ -174,6 +175,7 @@ %changelog * Wed Jan 18 2006 John (J5) Palmieri 0.10.1-1 - Upgrade to 0.10.1 +- Add libgstid3demux.so to the files section * Wed Jan 04 2006 Warren Togami 0.10.0-2 - exclude 1394 stuff from s390 and s390x From fedora-cvs-commits at redhat.com Wed Jan 18 16:50:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 11:50:17 -0500 Subject: rpms/gnome-media/devel .cvsignore, 1.22, 1.23 gnome-media.spec, 1.49, 1.50 sources, 1.22, 1.23 Message-ID: <200601181650.k0IGoHcW024821@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-media/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24807 Modified Files: .cvsignore gnome-media.spec sources Log Message: -Upgrade to 2.13.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 8 Sep 2005 14:28:14 -0000 1.22 +++ .cvsignore 18 Jan 2006 16:50:14 -0000 1.23 @@ -1,2 +1,3 @@ gnome-media-2.11.91.tar.bz2 gnome-media-2.12.0.tar.bz2 +gnome-media-2.13.5.tar.bz2 Index: gnome-media.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gnome-media.spec 9 Dec 2005 22:40:40 -0000 1.49 +++ gnome-media.spec 18 Jan 2006 16:50:14 -0000 1.50 @@ -10,8 +10,8 @@ Summary: GNOME media programs. Name: gnome-media -Version: 2.12.0 -Release: 3.1 +Version: 2.13.5 +Release: 1 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2 @@ -153,6 +153,9 @@ %{_libdir}/pkgconfig/* %changelog +* Wed Jan 18 2006 John (J5) Palmieri - 2.13.5-1 +- Upgrade to 2.13.5 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 8 Sep 2005 14:28:14 -0000 1.22 +++ sources 18 Jan 2006 16:50:14 -0000 1.23 @@ -1 +1 @@ -74d9a78f7269602e033ab1a4a144afdf gnome-media-2.12.0.tar.bz2 +455c613e317347c546ce940b32bb79d1 gnome-media-2.13.5.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 18 17:01:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 12:01:51 -0500 Subject: rpms/gstreamer-plugins-base/devel gstreamer-plugins-base.spec, 1.5, 1.6 Message-ID: <200601181701.k0IH1pZx002963@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gstreamer-plugins-base/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2894 Modified Files: gstreamer-plugins-base.spec Log Message: - Add libgstcdda and libcdparanoia to the %files section Index: gstreamer-plugins-base.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer-plugins-base/devel/gstreamer-plugins-base.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gstreamer-plugins-base.spec 18 Jan 2006 16:34:37 -0000 1.5 +++ gstreamer-plugins-base.spec 18 Jan 2006 17:01:34 -0000 1.6 @@ -86,6 +86,8 @@ %{_libdir}/libgstnetbuffer-%{majorminor}.so.* %{_libdir}/libgstrtp-%{majorminor}.so.* %{_libdir}/libgstvideo-%{majorminor}.so.* +%{_libdir}/libgstcdda-0.10.so.* + # base plugins without external dependencies %{_libdir}/gstreamer-%{majorminor}/libgstadder.so @@ -104,6 +106,7 @@ %{_libdir}/gstreamer-%{majorminor}/libgsttcp.so %{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux.so %{_libdir}/gstreamer-%{majorminor}/libgstaudioresample.so +%{_libdir}/gstreamer-%{majorminor}/libgstcdparanoia.so # base plugins with dependencies %{_libdir}/gstreamer-%{majorminor}/libgstalsa.so @@ -114,7 +117,9 @@ %{_libdir}/gstreamer-%{majorminor}/libgstvorbis.so %{_libdir}/gstreamer-%{majorminor}/libgstximagesink.so %{_libdir}/gstreamer-%{majorminor}/libgstxvimagesink.so - + + + %package devel Summary: GStreamer Base Plugins Development files Group: Development/Libraries @@ -160,6 +165,9 @@ %{_includedir}/gstreamer-%{majorminor}/gst/tag/tag.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstbasertpdepayload.h %{_includedir}/gstreamer-%{majorminor}/gst/rtp/gstbasertppayload.h +%{_includedir}/gstreamer-%{majorminor}/gst/audio/mixerutils.h +%{_includedir}/gstreamer-%{majorminor}/gst/cdda/gstcddabasesrc.h + %{_libdir}/libgstaudio-%{majorminor}.so %{_libdir}/libgstinterfaces-%{majorminor}.so @@ -168,6 +176,8 @@ %{_libdir}/libgstrtp-%{majorminor}.so %{_libdir}/libgsttag-%{majorminor}.so %{_libdir}/libgstvideo-%{majorminor}.so +%{_libdir}/libgstcdda-0.10.so + # pkg-config files %{_libdir}/pkgconfig/gstreamer-plugins-base-%{majorminor}.pc @@ -180,6 +190,7 @@ * Wed Jan 18 2006 John (J5) Palmieri - 0.10.2-1 - Upgrade to 0.10.2 - Require gstreamer-0.10.2 +- Add libgstcdda and libcdparanoia to the %files section * Fri Jan 06 2006 John (J5) Palmieri - 0.10.1-1 - New upstream version From fedora-cvs-commits at redhat.com Wed Jan 18 17:03:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 12:03:59 -0500 Subject: rpms/gnome-media/devel gnome-media.spec,1.50,1.51 Message-ID: <200601181703.k0IH3xv9003330@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-media/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3277 Modified Files: gnome-media.spec Log Message: - Pull in gstreamer08 not gstreamer Index: gnome-media.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gnome-media.spec 18 Jan 2006 16:50:14 -0000 1.50 +++ gnome-media.spec 18 Jan 2006 17:03:56 -0000 1.51 @@ -31,8 +31,8 @@ BuildRequires: gail-devel >= %{gail_version} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: /usr/bin/automake-1.4 -BuildRequires: gstreamer-devel >= %{gstreamer_version} -BuildRequires: gstreamer-plugins-devel +BuildRequires: gstreamer08-devel >= %{gstreamer_version} +BuildRequires: gstreamer08-plugins-devel BuildRequires: scrollkeeper %description @@ -155,6 +155,7 @@ %changelog * Wed Jan 18 2006 John (J5) Palmieri - 2.13.5-1 - Upgrade to 2.13.5 +- Pull in gstreamer08 not gstreamer * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 18 17:15:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 12:15:23 -0500 Subject: rpms/poppler/devel poppler.spec,1.18,1.19 Message-ID: <200601181715.k0IHFNpD005920@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/poppler/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5821 Modified Files: poppler.spec Log Message: - update conflicts: xpdf line to be versioned Index: poppler.spec =================================================================== RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- poppler.spec 11 Jan 2006 20:23:18 -0000 1.18 +++ poppler.spec 18 Jan 2006 17:15:10 -0000 1.19 @@ -30,7 +30,7 @@ Summary: Command line utilities for converting PDF files. Group: Applications/Text Requires: %name = %{version} -Conflicts: xpdf +Conflicts: xpdf < 1:3.01-8 %description utils Poppler, a PDF rendering library, it's a fork of the xpdf PDF @@ -72,6 +72,9 @@ %{_mandir}/man1/* %changelog +* Wed Jan 18 2006 Ray Strode - 0.5.0-3 +- update conflicts: xpdf line to be versioned + * Wed Jan 11 2006 Kristian H??gsberg - 0.5.0-2.0 - Update to 0.5.0 and add poppler-utils subpackage. - Flesh out poppler-utils subpackage. From fedora-cvs-commits at redhat.com Wed Jan 18 17:22:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 12:22:41 -0500 Subject: rpms/poppler/devel poppler.spec,1.19,1.20 Message-ID: <200601181722.k0IHMfWO020656@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/poppler/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20609 Modified Files: poppler.spec Log Message: rev release Index: poppler.spec =================================================================== RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- poppler.spec 18 Jan 2006 17:15:10 -0000 1.19 +++ poppler.spec 18 Jan 2006 17:22:39 -0000 1.20 @@ -1,7 +1,7 @@ Summary: Pdf rendering library Name: poppler Version: 0.5.0 -Release: 2.0 +Release: 3 License: GPL Group: Development/Libraries Source0: %{name}-%{version}.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 18 17:35:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 12:35:50 -0500 Subject: rpms/indent/devel indent-2.2.9-explicits.patch, NONE, 1.1 indent.spec, 1.15, 1.16 Message-ID: <200601181735.k0IHZo7A024623@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/indent/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24526 Modified Files: indent.spec Added Files: indent-2.2.9-explicits.patch Log Message: Silenting some warnings, voidifying some functions that were implicitly int but didn't actually return anything (#114376). indent-2.2.9-explicits.patch: man/texinfo2man.c | 1 + src/indent.c | 3 --- src/io.h | 1 + src/output.c | 3 ++- src/output.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE indent-2.2.9-explicits.patch --- diff -Burp indent-2.2.9/man/texinfo2man.c indent-2.2.9-explicits/man/texinfo2man.c --- indent-2.2.9/man/texinfo2man.c 2006-01-18 18:18:00.000000000 +0100 +++ indent-2.2.9-explicits/man/texinfo2man.c 2006-01-18 18:15:14.000000000 +0100 @@ -163,6 +163,7 @@ int start_line[256]; static char value_updated[64], value_edition[64], value_version[64]; +void process_texi (FILE * in) { char buf[1024]; diff -Burp indent-2.2.9/src/indent.c indent-2.2.9-explicits/src/indent.c --- indent-2.2.9/src/indent.c 2006-01-18 18:17:57.000000000 +0100 +++ indent-2.2.9-explicits/src/indent.c 2006-01-18 18:16:50.000000000 +0100 @@ -373,8 +373,6 @@ static void handle_token_lparen( BOOLEAN * sp_sw, int * dec_ind) { - char lparen = *token; - /* Braces in initializer lists should be put on new lines. This is * necessary so that -gnu does not cause things like char * *this_is_a_string_array[] = { "foo", "this_string_does_not_fit", @@ -3058,7 +3056,6 @@ int main ( int argc, char ** argv) { - int i; char *profile_pathname = 0; BOOLEAN using_stdin = false; exit_values_ty exit_status; diff -Burp indent-2.2.9/src/io.h indent-2.2.9-explicits/src/io.h --- indent-2.2.9/src/io.h 2002-08-04 19:08:41.000000000 +0200 +++ indent-2.2.9-explicits/src/io.h 2006-01-18 18:12:56.000000000 +0100 @@ -73,5 +73,6 @@ extern void fill_buffer (void); extern int compute_code_target (int paren_targ); extern int compute_label_target (void); extern void skip_buffered_space(void); +extern void dump_line (int force_nl, int *paren_targ); #endif /* INDENT_IO_H */ diff -Burp indent-2.2.9/src/output.c indent-2.2.9-explicits/src/output.c --- indent-2.2.9/src/output.c 2006-01-18 18:18:00.000000000 +0100 +++ indent-2.2.9-explicits/src/output.c 2006-01-18 18:14:02.000000000 +0100 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include "indent.h" @@ -1207,7 +1208,7 @@ extern void close_output( } } -extern inhibit_indenting( +extern void inhibit_indenting( BOOLEAN flag) { inhibited = flag; diff -Burp indent-2.2.9/src/output.h indent-2.2.9-explicits/src/output.h --- indent-2.2.9/src/output.h 2002-08-04 19:08:41.000000000 +0200 +++ indent-2.2.9-explicits/src/output.h 2006-01-18 17:55:07.000000000 +0100 @@ -47,7 +47,7 @@ extern void close_output( struct stat * file_stats, const char * filename); -extern inhibit_indenting( +extern void inhibit_indenting( BOOLEAN flag); Index: indent.spec =================================================================== RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- indent.spec 9 Dec 2005 22:40:59 -0000 1.15 +++ indent.spec 18 Jan 2006 17:35:44 -0000 1.16 @@ -1,13 +1,14 @@ Summary: A GNU program for formatting C code. Name: indent Version: 2.2.9 -Release: 8.1 +Release: 9 License: GPL Group: Applications/Text URL: http://www.gnu.org/software/indent/ Source: ftp://ftp.gnu.org/pub/gnu/indent/indent-%{version}.tar.gz Patch: indent-2.2.9-fix.patch Patch2: indent-2.2.9-gcc4.patch +Patch3: indent-2.2.9-explicits.patch Prereq: /sbin/install-info BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -24,6 +25,7 @@ %setup -q %patch -p1 %patch2 -p1 +%patch3 -p1 %build @@ -62,6 +64,10 @@ %changelog +* Wed Jan 18 2006 Petr Machata +- Silenting some warnings, voidifying some functions that were + implicitly int but didn't actually return anything. (#114376) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 18 17:43:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 12:43:25 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.94, 1.95 policycoreutils-rhat.patch, 1.148, 1.149 policycoreutils.spec, 1.217, 1.218 sources, 1.98, 1.99 Message-ID: <200601181743.k0IHhPD5026664@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26633 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Wed Jan 18 2006 Dan Walsh 1.29.8-1 - Update to match NSA * Merged semanage fixes from Ivan Gyurdiev. * Merged semanage fixes from Russell Coker. * Merged chcat, genhomedircon, and semanage diffs from Dan Walsh. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- .cvsignore 14 Jan 2006 03:51:29 -0000 1.94 +++ .cvsignore 18 Jan 2006 17:43:23 -0000 1.95 @@ -80,3 +80,4 @@ policycoreutils-1.29.4.tgz policycoreutils-1.29.5.tgz policycoreutils-1.29.7.tgz +policycoreutils-1.29.8.tgz policycoreutils-rhat.patch: scripts/chcat | 12 ++++++++++-- semanage/seobject.py | 42 ++++++++++++++++++++++++++++++++---------- 2 files changed, 42 insertions(+), 12 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.148 retrieving revision 1.149 diff -u -r1.148 -r1.149 --- policycoreutils-rhat.patch 15 Jan 2006 15:31:28 -0000 1.148 +++ policycoreutils-rhat.patch 18 Jan 2006 17:43:23 -0000 1.149 @@ -1,1277 +1,109 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.7/scripts/genhomedircon ---- nsapolicycoreutils/scripts/genhomedircon 2006-01-13 09:47:40.000000000 -0500 -+++ policycoreutils-1.29.7/scripts/genhomedircon 2006-01-15 08:42:38.000000000 -0500 -@@ -327,6 +327,9 @@ - sys.stderr.write("%s: %s\n" % ( sys.argv[0], error )) - - -+if os.getuid() > 0 or os.geteuid() > 0: -+ print "You must be root to run %s." % sys.argv[0] -+ sys.exit(0) - - # - # This script will generate home dir file context -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.7/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2006-01-13 09:47:40.000000000 -0500 -+++ policycoreutils-1.29.7/semanage/semanage 2006-01-15 09:04:05.000000000 -0500 -@@ -20,23 +20,27 @@ - # 02111-1307 USA - # - # --import sys, getopt -+import os, sys, getopt - import seobject - - if __name__ == '__main__': -+ if os.getuid() > 0 or os.geteuid() > 0: -+ print "You must be root to run %s." % sys.argv[0] -+ sys.exit(0) - - def usage(message = ""): - print '\ --semanage user [-admsRrh] SELINUX_USER\n\ --semanage login [-admsrh] LOGIN_NAME\n\ --semanage port [-admth] PORT | PORTRANGE\n\ --semanage interface [-admth] INTERFACE\n\ --semanage fcontext [-admhfst] INTERFACE\n\ -+semanage user [-admLRr] SELINUX_USER\n\ -+semanage login [-admsr] LOGIN_NAME\n\ -+semanage port [-admtpr] PORT | PORTRANGE\n\ -+semanage interface [-admtr] INTERFACE\n\ -+semanage fcontext [-admhfrst] INTERFACE\n\ - -a, --add Add a OBJECT record NAME\n\ - -d, --delete Delete a OBJECT record NAME\n\ - -f, --ftype File Type of OBJECT \n\ - -h, --help display this message\n\ - -l, --list List the OBJECTS\n\ -+ -L, --level Default SELinux Level\n\ - -n, --noheading Do not print heading when listing OBJECTS\n\ - -m, --modify Modify a OBJECT record NAME\n\ - -r, --range MLS/MCS Security Range\n\ -@@ -84,7 +88,7 @@ - - args = sys.argv[2:] - gopts, cmds = getopt.getopt(args, -- 'adf:lhmnp:P:s:R:r:t:v', -+ 'adf:lhmnp:P:s:R:L:r:t:v', - ['add', - 'delete', - 'ftype=', -@@ -96,6 +100,7 @@ - 'proto=', - 'seuser=', - 'range=', -+ 'level=', - 'roles=', - 'type=', - 'verbose' -@@ -106,7 +111,7 @@ - usage() - add = 1 - -- if o == "-d" or o == "--delese": -+ if o == "-d" or o == "--delete": - if modify or add: - usage() - delete = 1 -@@ -126,21 +131,24 @@ - if o == "-r" or o == '--range': - serange = a - -+ if o == "-l" or o == "--list": -+ list = 1 -+ -+ if o == "-L" or o == '--level': -+ selevel = a -+ - if o == "-P" or o == '--proto': - proto = a - - if o == "-R" or o == '--roles': - roles = a - -- if o == "-t" or o == "--type": -- setype = a -- -- if o == "-l" or o == "--list": -- list = 1 -- - if o == "-s" or o == "--seuser": - seuser = a - -+ if o == "-t" or o == "--type": -+ setype = a -+ - if o == "-v" or o == "--verbose": - verbose = 1 - -@@ -210,8 +218,13 @@ - if delete: - if object == "port": - OBJECT.delete(target, proto) -+ -+ if object == "fcontext": -+ OBJECT.delete(target, ftype) -+ - else: - OBJECT.delete(target) -+ - sys.exit(0); - usage() - -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.7/semanage/semanage.8 ---- nsapolicycoreutils/semanage/semanage.8 2005-11-29 10:55:01.000000000 -0500 -+++ policycoreutils-1.29.7/semanage/semanage.8 2006-01-15 09:04:56.000000000 -0500 -@@ -3,55 +3,71 @@ - semanage \- SELinux Policy Management tool - - .SH "SYNOPSIS" --.B semanage OBJECTTYPE [\-admsrh] OBJECT --.B semanage login [\-admsrh] login_name -+.B semanage {login|user|port|interface|fcontext} \-l - .br --.B semanage seuser [\-admsrh] selinux_name -+.B semanage login \-{a|d|m} [\-sr] login_name - .br --.B semanage port [\-admth] port_number -+.B semanage user \-{a|d|m} [\-LrR] selinux_name -+.br -+.B semanage port \-{a|d|m} [\-tp] port_number -+.br -+.B semanage interface \-{a|d|m} [\-tr] interface_spec -+.br -+.B semanage fcontext \-{a|d|m} [\-frst] file_spec - .P --This tool is used to manage configuration of the SELinux policy -+ -+This tool is used to configure SELinux policy - - .SH "DESCRIPTION" - This manual page describes the - .BR semanage - program. - .br --This tool is used to manage configuration of SELinux Policy. You can configure SELinux User Mappings, SELinux Port Mappings, SELinux Users. -- -+This tool is used to configure SELinux Policy. You can configure SELinux User Mappings, SELinux Port Mappings, SELinux Users. File Context and Network Interfaces. - - .SH "OPTIONS" --.TP -- \-a, \-\-add --.P -+.TP -+.I \-a, \-\-add - Add a OBJECT record NAME --.B \-d, \-\-delete --.P -+.TP -+.I \-d, \-\-delete - Delete a OBJECT record NAME --.B \-h, \-\-help --.P -+.TP -+.I \-h, \-\-help - display this message --.B \-l, \-\-list --.P -+.TP -+.I \-f, \-\-ftype -+File Type. This is used with fcontext. -+Requires a file type as shown in the mode field by ls, e.g. use -d to match only directories or -- to match only regular files. -+.TP -+.I \-l, \-\-list - List the OBJECTS --.B \-m, \-\-modify --.P -+.TP -+.I \-L, \-\-level -+Default SELinux Level for SELinux use. (s0) -+.TP -+.I \-m, \-\-modify - Modify a OBJECT record NAME --.B \-r, \-\-range --.P -+.TP -+.I \-p, \-\-proto -+Protocol for the specified port (tcp|udp). -+.TP -+.I \-R, \-\-role -+SELinux Roles (Separate by spaces) -+.TP -+.I \-r, \-\-range - MLS/MCS Security Range --.B \-s, \-\-seuser --.P -+.TP -+.I \-s, \-\-seuser - SELinux user name --.B \-t, \-\-type --.P -+.TP -+.I \-t, \-\-type - SELinux Type for the object --.B \-v, \-\-verbose --.P -+.TP -+.I \-v, \-\-verbose - verbose output - - .SH "AUTHOR" --This man page was written by Daniel Walsh . -- -- -+This man page was written by Daniel Walsh and -+Russell Coker . - +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.7/scripts/chcat +--- nsapolicycoreutils/scripts/chcat 2006-01-18 11:12:43.000000000 -0500 ++++ policycoreutils-1.29.7/scripts/chcat 2006-01-18 10:31:40.000000000 -0500 +@@ -281,6 +282,7 @@ + print "Usage %s -d File ..." % sys.argv[0] + print "Usage %s -l -d user ..." % sys.argv[0] + print "Usage %s -L" % sys.argv[0] ++ print "Usage %s -L -l user" % sys.argv[0] + print "Use -- to end option list. For example" + print "chcat -- -CompanyConfidential /docs/businessplan.odt" + print "chcat -l +CompanyConfidential juser" +@@ -350,10 +352,17 @@ + if delete_ind: + sys.exit(chcat_replace(["s0"], ["s0"], cmds, login_ind)) + ++ if login_ind: ++ if len(cmds) >= 1: ++ for u in cmds: ++ try: ++ pwd.getpwnam(u) ++ except KeyError, e: ++ error( "User %s does not exist" % u) ++ else: ++ cmds.append(os.getlogin()) + if list_ind: + if login_ind: +- if len(cmds) < 1: +- usage() + sys.exit(listusercats(cmds)) + else: + if len(cmds) > 0: diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.7/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2006-01-13 08:39:11.000000000 -0500 -+++ policycoreutils-1.29.7/semanage/seobject.py 2006-01-15 09:50:28.000000000 -0500 -@@ -21,8 +21,39 @@ - # - # - --import pwd, string -+import pwd, string, selinux - from semanage import *; -+ -+def translate(raw, prepend=1): -+ if prepend == 1: -+ context="a:b:c:%s" % raw -+ else: -+ context=raw -+ (rc, trans)=selinux.selinux_raw_to_trans_context(context) -+ if rc != 0: -+ return raw -+ if prepend: -+ trans = trans.strip("a:b:c") -+ if trans == "": -+ return raw -+ else: -+ return trans -+ -+def untranslate(trans, prepend=1): -+ if prepend == 1: -+ context="a:b:c:%s" % trans -+ else: -+ context=raw -+ (rc, raw)=selinux.selinux_trans_to_raw_context(context) -+ if rc != 0: -+ return trans -+ if prepend: -+ raw = raw.strip("a:b:c") -+ if raw == "": -+ return trans -+ else: -+ return raw -+ - class semanageRecords: - def __init__(self): - self.sh = semanage_handle_create() -@@ -37,6 +68,9 @@ - def add(self, name, sename, serange): - if serange == "": - serange = "s0" -+ else: -+ serange = untranslate(serange) -+ - if sename == "": - sename = "user_u" - -@@ -46,7 +80,7 @@ - - (rc,exists) = semanage_seuser_exists(self.sh, k) - if exists: -- raise ValueError("SELinux User %s mapping already defined" % name) -+ raise ValueError("Login mapping for %s is already defined" % name) - try: - pwd.getpwnam(name) - except: -@@ -54,40 +88,65 @@ - - (rc,u) = semanage_seuser_create(self.sh) - if rc < 0: -- raise ValueError("Could not create seuser for %s" % name) -+ raise ValueError("Could not create login mapping for %s" % name) - -- semanage_seuser_set_name(self.sh, u, name) -- semanage_seuser_set_mlsrange(self.sh, u, serange) -- semanage_seuser_set_sename(self.sh, u, sename) -- semanage_begin_transaction(self.sh) -- semanage_seuser_add(self.sh, k, u) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to add SELinux user mapping") -+ rc = semanage_seuser_set_name(self.sh, u, name) -+ if rc < 0: -+ raise ValueError("Could not set name for %s" % name) -+ -+ rc = semanage_seuser_set_mlsrange(self.sh, u, serange) -+ if rc < 0: -+ raise ValueError("Could not set MLS range for %s" % name) -+ -+ rc = semanage_seuser_set_sename(self.sh, u, sename) -+ if rc < 0: -+ raise ValueError("Could not set SELinux user for %s" % name) -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_seuser_modify(self.sh, k, u) -+ if rc < 0: -+ raise ValueError("Failed to add login mapping for %s" % name) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to add login mapping for %s" % name) - - def modify(self, name, sename = "", serange = ""): -+ if sename == "" and serange == "": -+ raise ValueError("Requires seuser or serange") -+ - (rc,k) = semanage_seuser_key_create(self.sh, name) - if rc < 0: - raise ValueError("Could not create a key for %s" % name) - -- if sename == "" and serange == "": -- raise ValueError("Requires, seuser or serange") -- - (rc,exists) = semanage_seuser_exists(self.sh, k) -- if exists: -- (rc,u) = semanage_seuser_query(self.sh, k) -- if rc < 0: -- raise ValueError("Could not query seuser for %s" % name) -- else: -- raise ValueError("SELinux user %s mapping is not defined." % name) -+ if not exists: -+ raise ValueError("Login mapping for %s is not defined" % name) -+ -+ (rc,u) = semanage_seuser_query(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not query seuser for %s" % name) +--- nsapolicycoreutils/semanage/seobject.py 2006-01-18 11:12:43.000000000 -0500 ++++ policycoreutils-1.29.7/semanage/seobject.py 2006-01-18 11:12:01.000000000 -0500 +@@ -421,11 +421,11 @@ - if serange != "": -- semanage_seuser_set_mlsrange(self.sh, u, serange) -+ semanage_seuser_set_mlsrange(self.sh, u, untranslate(serange)) - if sename != "": - semanage_seuser_set_sename(self.sh, u, sename) -- semanage_begin_transaction(self.sh) -- semanage_seuser_modify_local(self.sh, k, u) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to modify SELinux user mapping") -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not srart semanage transaction") -+ -+ rc = semanage_seuser_modify(self.sh, k, u) -+ if rc < 0: -+ raise ValueError("Failed to modify login mapping for %s" % name) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to modify login mapping for %s" % name) -+ - def delete(self, name): - (rc,k) = semanage_seuser_key_create(self.sh, name) + rc = semanage_port_modify_local(self.sh, k, p) if rc < 0: -@@ -95,15 +154,26 @@ - - (rc,exists) = semanage_seuser_exists(self.sh, k) - if not exists: -- raise ValueError("SELinux user %s mapping is not defined." % name) -- semanage_begin_transaction(self.sh) -- semanage_seuser_del(self.sh, k) -- if semanage_commit(self.sh) < 0: -- raise ValueError("SELinux User %s mapping not defined" % name) -+ raise ValueError("Login mapping for %s is not defined" % name) -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_seuser_del(self.sh, k) -+ if rc < 0: -+ raise ValueError("Failed to delete login mapping for %s" % name) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to delete login mapping for %s" % name) - - def get_all(self): - dict={} -- (status, self.ulist, self.usize) = semanage_seuser_list(self.sh) -+ (rc, self.ulist, self.usize) = semanage_seuser_list(self.sh) -+ if rc < 0: -+ raise ValueError("Could not list login mappings") -+ - for idx in range(self.usize): - u = semanage_seuser_by_idx(self.ulist, idx) - name = semanage_seuser_get_name(u) -@@ -117,7 +187,7 @@ - keys=dict.keys() - keys.sort() - for k in keys: -- print "%-25s %-25s %-25s" % (k, dict[k][0], dict[k][1]) -+ print "%-25s %-25s %-25s" % (k, dict[k][0], translate(dict[k][1])) - - class seluserRecords(semanageRecords): - def __init__(self): -@@ -126,87 +196,134 @@ - def add(self, name, roles, selevel, serange): - if serange == "": - serange = "s0" -+ else: -+ serange = untranslate(serange) -+ - if selevel == "": - selevel = "s0" -+ else: -+ selevel = untranslate(selevel) - - (rc,k) = semanage_user_key_create(self.sh, name) - if rc < 0: - raise ValueError("Could not create a key for %s" % name) - - (rc,exists) = semanage_user_exists(self.sh, k) -- if not exists: -- raise ValueError("SELinux user %s is already defined." % name) -+ if exists: -+ raise ValueError("SELinux user %s is already defined" % name) - - (rc,u) = semanage_user_create(self.sh) - if rc < 0: -- raise ValueError("Could not create login mapping for %s" % name) -+ raise ValueError("Could not create SELinux user for %s" % name) -+ -+ rc = semanage_user_set_name(self.sh, u, name) -+ if rc < 0: -+ raise ValueError("Could not set name for %s" % name) - -- semanage_user_set_name(self.sh, u, name) - for r in roles: -- semanage_user_add_role(self.sh, u, r) -- semanage_user_set_mlsrange(self.sh, u, serange) -- semanage_user_set_mlslevel(self.sh, u, selevel) -+ rc = semanage_user_add_role(self.sh, u, r) -+ if rc < 0: -+ raise ValueError("Could not add role %s for %s" % (r, name)) -+ -+ rc = semanage_user_set_mlsrange(self.sh, u, serange) -+ if rc < 0: -+ raise ValueError("Could not set MLS range for %s" % name) -+ -+ rc = semanage_user_set_mlslevel(self.sh, u, selevel) -+ if rc < 0: -+ raise ValueError("Could not set MLS level for %s" % name) -+ - (rc,key) = semanage_user_key_extract(self.sh,u) - if rc < 0: - raise ValueError("Could not extract key for %s" % name) - -- semanage_begin_transaction(self.sh) -- semanage_user_modify_local(self.sh, k, u) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to add SELinux user") -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_user_modify_local(self.sh, k, u) -+ if rc < 0: -+ raise ValueError("Failed to add SELinux user %s" % name) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to add SELinux user %s" % name) - - def modify(self, name, roles = [], selevel = "", serange = ""): - if len(roles) == 0 and serange == "" and selevel == "": -- raise ValueError("Requires, roles, level or range") -+ raise ValueError("Requires roles, level or range") - - (rc,k) = semanage_user_key_create(self.sh, name) - if rc < 0: - raise ValueError("Could not create a key for %s" % name) - - (rc,exists) = semanage_user_exists(self.sh, k) -- if exists: -- (rc,u) = semanage_user_query(self.sh, k) -- else: -- raise ValueError("SELinux user %s mapping is not defined locally." % name) -+ if not exists: -+ raise ValueError("SELinux user %s is not defined" % name) -+ -+ (rc,u) = semanage_user_query(self.sh, k) - if rc < 0: - raise ValueError("Could not query user for %s" % name) - - if serange != "": -- semanage_user_set_mlsrange(self.sh, u, serange) -+ semanage_user_set_mlsrange(self.sh, u, untranslate(serange)) - if selevel != "": -- semanage_user_set_mlslevel(self.sh, u, selevel) -+ semanage_user_set_mlslevel(self.sh, u, untranslate(selevel)) -+ - if len(roles) != 0: - for r in roles: - semanage_user_add_role(self.sh, u, r) -- semanage_begin_transaction(self.sh) -- semanage_user_modify_local(self.sh, k, u) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to modify SELinux user") -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_user_modify_local(self.sh, k, u) -+ if rc < 0: -+ raise ValueError("Failed to modify SELinux user %s" % name) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to modify SELinux user %s" % name) - - def delete(self, name): - (rc,k) = semanage_user_key_create(self.sh, name) - if rc < 0: -- raise ValueError("Could not crpppeate a key for %s" % name) -+ raise ValueError("Could not create a key for %s" % name) -+ - (rc,exists) = semanage_user_exists(self.sh, k) - if not exists: -- raise ValueError("user %s is not defined" % name) -- else: -- (rc,exists) = semanage_user_exists_local(self.sh, k) -- if not exists: -- raise ValueError("user %s is not defined locally, can not delete " % name) -- -- semanage_begin_transaction(self.sh) -- semanage_user_del_local(self.sh, k) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Login User %s not defined" % name) -+ raise ValueError("SELinux user %s is not defined" % name) -+ -+ (rc,exists) = semanage_user_exists_local(self.sh, k) -+ if not exists: -+ raise ValueError("SELinux user %s is defined in policy, cannot be deleted" % name) -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_user_del_local(self.sh, k) -+ if rc < 0: -+ raise ValueError("Failed to delete SELinux user %s" % name) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to delete SELinux user %s" % name) - - def get_all(self): - dict={} -- (status, self.ulist, self.usize) = semanage_user_list(self.sh) -+ (rc, self.ulist, self.usize) = semanage_user_list(self.sh) -+ if rc < 0: -+ raise ValueError("Could not list SELinux users") -+ - for idx in range(self.usize): - u = semanage_user_by_idx(self.ulist, idx) - name = semanage_user_get_name(u) -- (status, rlist, rlist_size) = semanage_user_get_roles(self.sh, u) -+ (rc, rlist, rlist_size) = semanage_user_get_roles(self.sh, u) -+ if rc < 0: -+ raise ValueError("Could not list roles for user %s" % name) -+ - roles = "" - - if rlist_size: -@@ -219,13 +336,13 @@ - - def list(self, heading=1): - if heading: -- print "\n%-15s %-10s %-20s" % ("", "MLS/", "MLS/") -- print "%-15s %-10s %-15s %-20s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") -+ print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/") -+ print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") - dict=self.get_all() - keys=dict.keys() - keys.sort() - for k in keys: -- print "%-15s %-10s %-15s %s" % (k, dict[k][0], dict[k][1], dict[k][2]) -+ print "%-15s %-10s %-30s %s" % (k, translate(dict[k][0]), translate(dict[k][1]), dict[k][2]) - - class portRecords(semanageRecords): - def __init__(self): -@@ -258,6 +375,8 @@ - def add(self, port, proto, serange, type): - if serange == "": - serange="s0" -+ else: -+ serange=untranslate(serange) - - if type == "": - raise ValueError("Type is required") -@@ -278,62 +397,97 @@ +- raise ValueError("Failed to add port %s/%s" % (proto, port)) ++ raise ValueError("Failed to modify port %s/%s" % (proto, port)) + + rc = semanage_commit(self.sh) if rc < 0: - raise ValueError("Could not create context for %s/%s" % (proto, port)) - -- semanage_context_set_user(self.sh, con, "system_u") -- semanage_context_set_role(self.sh, con, "object_r") -- semanage_context_set_type(self.sh, con, type) -- semanage_context_set_mls(self.sh, con, serange) -- semanage_begin_transaction(self.sh) -+ rc = semanage_context_set_user(self.sh, con, "system_u") -+ if rc < 0: -+ raise ValueError("Could not set user in port context for %s/%s" % (proto, port)) -+ -+ rc = semanage_context_set_role(self.sh, con, "object_r") -+ if rc < 0: -+ raise ValueError("Could not set role in port context for %s/%s" % (proto, port)) -+ -+ rc = semanage_context_set_type(self.sh, con, type) -+ if rc < 0: -+ raise ValueError("Could not set type in port context for %s/%s" % (proto, port)) -+ -+ rc = semanage_context_set_mls(self.sh, con, serange) -+ if rc < 0: -+ raise ValueError("Could not set mls fields in port context for %s/%s" % (proto, port)) -+ - semanage_port_set_con(p, con) -- semanage_port_modify_local(self.sh, k, p) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to add port") -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_port_modify_local(self.sh, k, p) -+ if rc < 0: -+ raise ValueError("Failed to add port %s/%s" % (proto, port)) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to add port %s/%s" % (proto, port)) +- raise ValueError("Failed to add port %s/%s" % (proto, port)) ++ raise ValueError("Failed to modify port %s/%s" % (proto, port)) def modify(self, port, proto, serange, setype): if serange == "" and setype == "": -- raise ValueError("Requires, setype or serange") -+ raise ValueError("Requires setype or serange") - - ( k, proto_d, low, high ) = self.__genkey(port, proto) +@@ -458,7 +458,7 @@ - (rc,exists) = semanage_port_exists(self.sh, k) -- if exists: -- (rc,p) = semanage_port_query(self.sh, k) -- else: -- raise ValueError("port %s/%s is not defined." % (proto,port)) -- -+ if not exists: -+ raise ValueError("Port %s/%s is not defined" % (proto,port)) -+ -+ (rc,p) = semanage_port_query(self.sh, k) + rc = semanage_commit(self.sh) if rc < 0: -- raise ValueError("Could not query port for %s/%s" % (proto, port)) -+ raise ValueError("Could not query port %s/%s" % (proto, port)) - - con = semanage_port_get_con(p) -- if rc < 0: -- raise ValueError("Could not get port context for %s/%s" % (proto, port)) - - if serange != "": -- semanage_context_set_mls(self.sh, con, serange) -+ semanage_context_set_mls(self.sh, con, untranslate(serange)) - if setype != "": - semanage_context_set_type(self.sh, con, setype) -- semanage_begin_transaction(self.sh) -- semanage_port_modify_local(self.sh, k, p) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to add port") -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_port_modify_local(self.sh, k, p) -+ if rc < 0: +- raise ValueError("Failed to add port %s/%s" % (proto, port)) + raise ValueError("Failed to modify port %s/%s" % (proto, port)) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to add port %s/%s" % (proto, port)) def delete(self, port, proto): ( k, proto_d, low, high ) = self.__genkey(port, proto) - (rc,exists) = semanage_port_exists(self.sh, k) - if not exists: -- raise ValueError("port %s/%s is not defined." % (proto,port)) -- else: -- (rc,exists) = semanage_port_exists_local(self.sh, k) -- if not exists: -- raise ValueError("port %s/%s is not defined localy, can not be deleted." % (proto,port)) -- -- semanage_begin_transaction(self.sh) -- semanage_port_del_local(self.sh, k) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Port %s/%s not defined" % (proto,port)) -+ raise ValueError("Port %s/%s is not defined" % (proto, port)) -+ -+ (rc,exists) = semanage_port_exists_local(self.sh, k) -+ if not exists: -+ raise ValueError("Port %s/%s is defined in policy, cannot be deleted" % (proto, port)) -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_port_del_local(self.sh, k) -+ if rc < 0: -+ raise ValueError("Could not delete port %s/%s" % (proto, port)) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Could not delete port %s/%s" % (proto, port)) - - def get_all(self): - dict={} -- (status, self.plist, self.psize) = semanage_port_list(self.sh) -+ (rc, self.plist, self.psize) = semanage_port_list(self.sh) -+ if rc < 0: -+ raise ValueError("Could not list ports") -+ +@@ -491,22 +491,44 @@ for idx in range(self.psize): u = semanage_port_by_idx(self.plist, idx) con = semanage_port_get_con(u) -@@ -369,89 +523,130 @@ - def add(self, interface, serange, type): - if serange == "": - serange="s0" -+ else: -+ serange=untranslate(serange) - - if type == "": - raise ValueError("SELinux Type is required") - - (rc,k) = semanage_iface_key_create(self.sh, interface) - if rc < 0: -- raise ValueError("Can't create key for %s" % interface) -+ raise ValueError("Could not create key for %s" % interface) -+ - (rc,exists) = semanage_iface_exists(self.sh, k) - if exists: - raise ValueError("Interface %s already defined" % interface) - - (rc,iface) = semanage_iface_create(self.sh) - if rc < 0: -- raise ValueError("Could not create interface for %s" % (interface)) -+ raise ValueError("Could not create interface for %s" % interface) - - rc = semanage_iface_set_name(self.sh, iface, interface) - (rc, con) = semanage_context_create(self.sh) - if rc < 0: - raise ValueError("Could not create context for %s" % interface) - -- semanage_context_set_user(self.sh, con, "system_u") -- semanage_context_set_role(self.sh, con, "object_r") -- semanage_context_set_type(self.sh, con, type) -- semanage_context_set_mls(self.sh, con, serange) -- semanage_begin_transaction(self.sh) -+ rc = semanage_context_set_user(self.sh, con, "system_u") -+ if rc < 0: -+ raise ValueError("Could not set user in interface context for %s" % interface) -+ -+ rc = semanage_context_set_role(self.sh, con, "object_r") -+ if rc < 0: -+ raise ValueError("Could not set role in interface context for %s" % interface) -+ -+ rc = semanage_context_set_type(self.sh, con, type) -+ if rc < 0: -+ raise ValueError("Could not set type in interface context for %s" % interface) -+ -+ rc = semanage_context_set_mls(self.sh, con, serange) -+ if rc < 0: -+ raise ValueError("Could not set mls fields in interface context for %s" % interface) -+ -+ (rc, con2) = semanage_context_clone(self.sh, con) -+ if rc < 0: -+ raise ValueError("Could not clone interface context for %s" % interface) -+ - semanage_iface_set_ifcon(iface, con) -- semanage_iface_set_msgcon(iface, con) -- semanage_iface_add_local(self.sh, k, iface) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to add interface") -+ semanage_iface_set_msgcon(iface, con2) -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_iface_modify_local(self.sh, k, iface) -+ if rc < 0: -+ raise ValueError("Failed to add interface %s" % interface) +- name = semanage_context_get_type(con) ++ type = semanage_context_get_type(con) ++ if type == "reserved_port_t": ++ continue ++ level = semanage_context_get_mls(con) + proto=semanage_port_get_proto_str(u) + low=semanage_port_get_low(u) + high = semanage_port_get_high(u) +- if (name, proto) not in dict.keys(): +- dict[(name,proto)]=[] ++ dict[(low, high)]=(type, proto, level) ++ return dict + -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to add interface %s" % interface) - - def modify(self, interface, serange, setype): - if serange == "" and setype == "": -- raise ValueError("Requires, setype or serange") -+ raise ValueError("Requires setype or serange") - - (rc,k) = semanage_iface_key_create(self.sh, interface) - if rc < 0: -- raise ValueError("Can't creater key for %s" % interface) -- (rc,exists) = semanage_iface_exists(self.sh, k) -- if exists: -- (rc,p) = semanage_iface_query(self.sh, k) -- else: -- raise ValueError("interface %s is not defined." % interface) -+ raise ValueError("Could not create key for %s" % interface) - -+ (rc,exists) = semanage_iface_exists(self.sh, k) -+ if not exists: -+ raise ValueError("Interface %s is not defined" % interface) -+ -+ (rc,p) = semanage_iface_query(self.sh, k) - if rc < 0: -- raise ValueError("Could not query interface for %s" % interface) -+ raise ValueError("Could not query interface %s" % interface) - - con = semanage_iface_get_ifcon(p) -- if rc < 0: -- raise ValueError("Could not get interface context for %s" % interface) - - if serange != "": -- semanage_context_set_mls(self.sh, con, serange) -+ semanage_context_set_mls(self.sh, con, untranslate(serange)) - if setype != "": - semanage_context_set_type(self.sh, con, setype) - -- semanage_begin_transaction(self.sh) -- semanage_iface_modify_local(self.sh, k, p) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to add interface") -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_iface_modify_local(self.sh, k, p) -+ if rc < 0: -+ raise ValueError("Failed to modify interface %s" % interface) - -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to add interface %s" % interface) -+ - def delete(self, interface): - (rc,k) = semanage_iface_key_create(self.sh, interface) - if rc < 0: -- raise ValueError("Can't create key for %s" % interface) -+ raise ValueError("Could not create key for %s" % interface) -+ - (rc,exists) = semanage_iface_exists(self.sh, k) - if not exists: -- raise ValueError("interface %s is not defined." % interface) -- else: -- (rc,exists) = semanage_iface_exists_local(self.sh, k) -- if not exists: -- raise ValueError("interface %s is not defined localy, can not be deleted." % interface) -- -- semanage_begin_transaction(self.sh) -- semanage_iface_del_local(self.sh, k) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Interface %s not defined" % interface) -+ raise ValueError("Interface %s is not defined" % interface) -+ -+ (rc,exists) = semanage_iface_exists_local(self.sh, k) -+ if not exists: -+ raise ValueError("Interface %s is defined in policy, cannot be deleted" % interface) -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_iface_del_local(self.sh, k) -+ if rc < 0: -+ raise ValueError("Failed to delete interface %s" % interface) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to delete interface %s" % interface) - - def get_all(self): - dict={} -- (status, self.plist, self.psize) = semanage_iface_list(self.sh) -- if status < 0: -- raise ValueError("Unable to list interfaces") -+ (rc, self.plist, self.psize) = semanage_iface_list(self.sh) -+ if rc < 0: -+ raise ValueError("Could not list interfaces") -+ - for idx in range(self.psize): - interface = semanage_iface_by_idx(self.plist, idx) - con = semanage_iface_get_ifcon(interface) -@@ -466,7 +661,7 @@ - keys=dict.keys() - keys.sort() - for k in keys: -- print "%-30s %s:%s:%s:%s " % (k,dict[k][0], dict[k][1],dict[k][2], dict[k][3]) -+ print "%-30s %s:%s:%s:%s " % (k,dict[k][0], dict[k][1],dict[k][2], translate(dict[k][3], False)) - - class fcontextRecords(semanageRecords): - def __init__(self): -@@ -495,89 +690,127 @@ - - if serange == "": - serange="s0" -+ else: -+ serange=untranslate(serange) - - if type == "": - raise ValueError("SELinux Type is required") - - (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) - if rc < 0: -- raise ValueError("Can't create key for %s" % target) -+ raise ValueError("Could not create key for %s" % target) -+ - (rc,exists) = semanage_fcontext_exists(self.sh, k) -- print (rc, exists, target) - if exists: -- raise ValueError("fcontext %s already defined" % target) -+ raise ValueError("File context for %s already defined" % target) -+ - (rc,fcontext) = semanage_fcontext_create(self.sh) - if rc < 0: -- raise ValueError("Could not create fcontext for %s" % target) -+ raise ValueError("Could not create file context for %s" % target) - - rc = semanage_fcontext_set_expr(self.sh, fcontext, target) - (rc, con) = semanage_context_create(self.sh) - if rc < 0: - raise ValueError("Could not create context for %s" % target) - -- semanage_context_set_user(self.sh, con, seuser) -- semanage_context_set_role(self.sh, con, "object_r") -- semanage_context_set_type(self.sh, con, type) -- semanage_context_set_mls(self.sh, con, serange) -+ rc = semanage_context_set_user(self.sh, con, seuser) -+ if rc < 0: -+ raise ValueError("Could not set user in file context for %s" % target) -+ -+ rc = semanage_context_set_role(self.sh, con, "object_r") -+ if rc < 0: -+ raise ValueError("Could not set role in file context for %s" % target) -+ -+ rc = semanage_context_set_type(self.sh, con, type) -+ if rc < 0: -+ raise ValueError("Could not set type in file context for %s" % target) -+ -+ rc = semanage_context_set_mls(self.sh, con, serange) -+ if rc < 0: -+ raise ValueError("Could not set mls fields in file context for %s" % target) -+ - semanage_fcontext_set_type(fcontext, self.file_types[ftype]) -- semanage_begin_transaction(self.sh) - semanage_fcontext_set_con(fcontext, con) -- semanage_fcontext_add_local(self.sh, k, fcontext) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to add fcontext") -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_fcontext_modify_local(self.sh, k, fcontext) -+ if rc < 0: -+ raise ValueError("Failed to add file context for %s" % target) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to add file context for %s" % target) - - def modify(self, target, setype, ftype, serange, seuser): - if serange == "" and setype == "" and seuser == "": -- raise ValueError("Requires, setype, serange or seuser") -+ raise ValueError("Requires setype, serange or seuser") - - (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) - if rc < 0: -- raise ValueError("Can't creater key for %s" % target) -+ raise ValueError("Could not create a key for %s" % target) -+ - (rc,exists) = semanage_fcontext_exists(self.sh, k) -- if exists: -- (rc,p) = semanage_fcontext_query(self.sh, k) -- else: -- raise ValueError("fcontext %s is not defined." % target) -+ if not exists: -+ raise ValueError("File context for %s is not defined" % target) -+ -+ (rc,p) = semanage_fcontext_query(self.sh, k) - if rc < 0: -- raise ValueError("Could not query fcontext for %s" % target) -+ raise ValueError("Could not query file context for %s" % target) -+ - con = semanage_fcontext_get_con(p) -- if rc < 0: -- raise ValueError("Could not get fcontext context for %s" % target) - - if serange != "": -- semanage_context_set_mls(self.sh, con, serange) -+ semanage_context_set_mls(self.sh, con, untranslate(serange)) - if seuser != "": - semanage_context_set_user(self.sh, con, seuser) - if setype != "": - semanage_context_set_type(self.sh, con, setype) - -- semanage_begin_transaction(self.sh) -- semanage_fcontext_modify_local(self.sh, k, p) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to add fcontext") -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_fcontext_modify_local(self.sh, k, p) -+ if rc < 0: -+ raise ValueError("Failed to modify file context for %s" % target) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to add file context for %s" % target) - -- def delete(self, target): -+ def delete(self, target, ftype): - (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) - if rc < 0: -- raise ValueError("Can't create key for %s" % target) -+ raise ValueError("Could not create a key for %s" % target) -+ - (rc,exists) = semanage_fcontext_exists(self.sh, k) - if not exists: -- raise ValueError("fcontext %s is not defined." % target) -- else: -- (rc,exists) = semanage_fcontext_exists_local(self.sh, k) -- if not exists: -- raise ValueError("fcontext %s is not defined localy, can not be deleted." % target) -- -- semanage_begin_transaction(self.sh) -- semanage_fcontext_del_local(self.sh, k) -- if semanage_commit(self.sh) < 0: -- raise ValueError("fcontext %s not defined" % target) -+ raise ValueError("File context for %s is not defined" % target) -+ -+ (rc,exists) = semanage_fcontext_exists_local(self.sh, k) -+ if not exists: -+ raise ValueError("File context for %s is defined in policy, cannot be deleted" % target) -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_fcontext_del_local(self.sh, k) ++ def get_all_by_type(self): ++ dict={} ++ (rc, self.plist, self.psize) = semanage_port_list(self.sh) + if rc < 0: -+ raise ValueError("Failed to delete file context for %s" % target) ++ raise ValueError("Could not list ports") + -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to delete file context for %s" % target) - - def get_all(self): - dict={} -- (status, self.plist, self.psize) = semanage_fcontext_list(self.sh) -- if status < 0: -- raise ValueError("Unable to list fcontexts") -+ (rc, self.plist, self.psize) = semanage_fcontext_list(self.sh) -+ if rc < 0: -+ raise ValueError("Could not list file contexts") - - for idx in range(self.psize): - fcontext = semanage_fcontext_by_idx(self.plist, idx) -@@ -598,7 +831,7 @@ - keys=dict.keys() - for k in keys: - if dict[k]: -- print "%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], dict[k][0], dict[k][1],dict[k][2], dict[k][3]) -+ print "%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], dict[k][0], dict[k][1],dict[k][2], translate(dict[k][3],False)) ++ for idx in range(self.psize): ++ u = semanage_port_by_idx(self.plist, idx) ++ con = semanage_port_get_con(u) ++ type = semanage_context_get_type(con) ++ if type == "reserved_port_t": ++ continue ++ level = semanage_context_get_mls(con) ++ proto=semanage_port_get_proto_str(u) ++ low=semanage_port_get_low(u) ++ high = semanage_port_get_high(u) ++ if (type, proto) not in dict.keys(): ++ dict[(type,proto)]=[] + if low == high: +- dict[(name,proto)].append("%d" % low) ++ dict[(type,proto)].append("%d" % low) else: - print "%-50s %-18s <>" % (k[0], k[1]) - -@@ -606,117 +839,82 @@ - def __init__(self): - semanageRecords.__init__(self) - -- def add(self, target, type, ftype="", serange="s0", seuser="system_u"): -- if seuser == "": -- seuser="system_u" -- -- if serange == "": -- serange="s0" -- -- if type == "": -- raise ValueError("SELinux Type is required") -+ def modify(self, name, value = ""): -+ if value == "": -+ raise ValueError("Requires value") - -- (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) -- if rc < 0: -- raise ValueError("Can't create key for %s" % target) -- (rc,exists) = semanage_fcontext_exists(self.sh, k) -- print (rc, exists, target) -- if exists: -- raise ValueError("fcontext %s already defined" % target) -- (rc,fcontext) = semanage_fcontext_create(self.sh) -- if rc < 0: -- raise ValueError("Could not create fcontext for %s" % target) -- -- rc = semanage_fcontext_set_expr(self.sh, fcontext, target) -- (rc, con) = semanage_context_create(self.sh) -+ (rc,k) = semanage_bool_key_create(self.sh, name) - if rc < 0: -- raise ValueError("Could not create context for %s" % target) -- -- semanage_context_set_user(self.sh, con, seuser) -- semanage_context_set_role(self.sh, con, "object_r") -- semanage_context_set_type(self.sh, con, type) -- semanage_context_set_mls(self.sh, con, serange) -- semanage_fcontext_set_type(fcontext, self.file_types[ftype]) -- semanage_begin_transaction(self.sh) -- semanage_fcontext_set_con(fcontext, con) -- semanage_fcontext_add_local(self.sh, k, fcontext) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to add fcontext") -+ raise ValueError("Could not create a key for %s" % name) - -- def modify(self, target, setype, ftype, serange, seuser): -- if serange == "" and setype == "" and seuser == "": -- raise ValueError("Requires, setype, serange or seuser") -+ (rc,exists) = semanage_bool_exists(self.sh, k) -+ if not exists: -+ raise ValueError("Boolean %s is not defined" % name) - -- (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) -+ (rc,b) = semanage_bool_query(self.sh, k) - if rc < 0: -- raise ValueError("Can't creater key for %s" % target) -- (rc,exists) = semanage_fcontext_exists(self.sh, k) -- if exists: -- (rc,p) = semanage_fcontext_query(self.sh, k) -- else: -- raise ValueError("fcontext %s is not defined." % target) -+ raise ValueError("Could not query file context %s" % name) -+ -+ if value != "": -+ nvalue = string.atoi(value) -+ semanage_bool_set_value(b, nvalue) -+ -+ rc = semanage_begin_transaction(self.sh) - if rc < 0: -- raise ValueError("Could not query fcontext for %s" % target) -- con = semanage_fcontext_get_con(p) -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_bool_modify_local(self.sh, k, b) - if rc < 0: -- raise ValueError("Could not get fcontext context for %s" % target) -- -- if serange != "": -- semanage_context_set_mls(self.sh, con, serange) -- if seuser != "": -- semanage_context_set_user(self.sh, con, seuser) -- if setype != "": -- semanage_context_set_type(self.sh, con, setype) -+ raise ValueError("Failed to modify boolean %s" % name) - -- semanage_begin_transaction(self.sh) -- semanage_fcontext_modify_local(self.sh, k, p) -- if semanage_commit(self.sh) < 0: -- raise ValueError("Failed to add fcontext") -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to modify boolean %s" % name) - -- def delete(self, target): -- (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) -+ def delete(self, name): -+ (rc,k) = semanage_bool_key_create(self.sh, name) - if rc < 0: -- raise ValueError("Can't create key for %s" % target) -- (rc,exists) = semanage_fcontext_exists(self.sh, k) -+ raise ValueError("Could not create a key for %s" % name) -+ -+ (rc,exists) = semanage_bool_exists(self.sh, k) - if not exists: -- raise ValueError("fcontext %s is not defined." % target) -- else: -- (rc,exists) = semanage_fcontext_exists_local(self.sh, k) -- if not exists: -- raise ValueError("fcontext %s is not defined localy, can not be deleted." % target) -- -- semanage_begin_transaction(self.sh) -- semanage_fcontext_del_local(self.sh, k) -- if semanage_commit(self.sh) < 0: -- raise ValueError("fcontext %s not defined" % target) -+ raise ValueError("Boolean %s is not defined" % name) -+ -+ (rc,exists) = semanage_bool_exists_local(self.sh, k) -+ if not exists: -+ raise ValueError("Boolean %s is defined in policy, cannot be deleted" % name) -+ -+ rc = semanage_begin_transaction(self.sh) -+ if rc < 0: -+ raise ValueError("Could not start semanage transaction") -+ -+ rc = semanage_fcontext_del_local(self.sh, k) -+ if rc < 0: -+ raise ValueError("Failed to delete boolean %s" % name) -+ -+ rc = semanage_commit(self.sh) -+ if rc < 0: -+ raise ValueError("Failed to delete boolean %s" % name) - - def get_all(self): - dict={} -- (status, self.plist, self.psize) = semanage_fcontext_list(self.sh) -- if status < 0: -- raise ValueError("Unable to list fcontexts") -+ (rc, self.blist, self.bsize) = semanage_bool_list(self.sh) -+ if rc < 0: -+ raise ValueError("Could not list booleans") - -- for idx in range(self.psize): -- fcontext = semanage_fcontext_by_idx(self.plist, idx) -- expr=semanage_fcontext_get_expr(fcontext) -- ftype=semanage_fcontext_get_type_str(fcontext) -- con = semanage_fcontext_get_con(fcontext) -- if con: -- dict[expr, ftype]=(semanage_context_get_user(con), semanage_context_get_role(con), semanage_context_get_type(con), semanage_context_get_mls(con)) -- else: -- dict[expr, ftype]=con -+ for idx in range(self.bsize): -+ boolean = semanage_bool_by_idx(self.blist, idx) -+ name = semanage_bool_get_name(boolean) -+ value = semanage_bool_get_value(boolean) -+ dict[name] = value - +- dict[(name,proto)].append("%d-%d" % (low, high)) ++ dict[(type,proto)].append("%d-%d" % (low, high)) return dict - + def list(self, heading=1): if heading: -- print "%-50s %-18s %s\n" % ("SELinux fcontext", "type", "Context") -+ print "%-50s %-18s\n" % ("SELinux boolean", "value") - dict=self.get_all() +- print "%-30s %-8s %s\n" % ("SELinux Port Name", "Proto", "Port Number") +- dict=self.get_all() ++ print "%-30s %-8s %s\n" % ("SELinux Port Type", "Proto", "Port Number") ++ dict=self.get_all_by_type() keys=dict.keys() - for k in keys: - if dict[k]: -- print "%-50s %-18s %s:%s:%s:%s " % (k[0], k[1], dict[k][0], dict[k][1],dict[k][2], dict[k][3]) -- else: -- print "%-50s %-18s <>" % (k[0], k[1]) -- -- -+ print "%-50s %-18s " % (k[0], dict[k][0]) -Binary files nsapolicycoreutils/semanage/seobject.pyc and policycoreutils-1.29.7/semanage/seobject.pyc differ + keys.sort() + for i in keys: Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.217 retrieving revision 1.218 diff -u -r1.217 -r1.218 --- policycoreutils.spec 14 Jan 2006 13:54:25 -0000 1.217 +++ policycoreutils.spec 18 Jan 2006 17:43:23 -0000 1.218 @@ -1,10 +1,10 @@ %define libsepolver 1.11.9-1 -%define libsemanagever 1.5.14-1 -%define libselinuxver 1.29.5-1 +%define libsemanagever 1.5.15-1 +%define libselinuxver 1.29.6-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.29.7 -Release: 3 +Version: 1.29.8 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -97,6 +97,15 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Wed Jan 18 2006 Dan Walsh 1.29.8-1 +- Update to match NSA + * Merged semanage fixes from Ivan Gyurdiev. + * Merged semanage fixes from Russell Coker. + * Merged chcat, genhomedircon, and semanage diffs from Dan Walsh. + +* Tue Jan 14 2006 Dan Walsh 1.29.7-4 +- Update chcat to manage user categories also + * Sat Jan 14 2006 Dan Walsh 1.29.7-3 - Add check for root for semanage, genhomedircon Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- sources 14 Jan 2006 03:51:29 -0000 1.98 +++ sources 18 Jan 2006 17:43:23 -0000 1.99 @@ -1 +1 @@ -4bd38ec2ccaf8cc047dfdcb30876b9fb policycoreutils-1.29.7.tgz +c40bd665ecbb503adf1a8e8730fed32a policycoreutils-1.29.8.tgz From fedora-cvs-commits at redhat.com Wed Jan 18 18:05:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 13:05:32 -0500 Subject: rpms/glib2/devel .cvsignore, 1.43, 1.44 glib2.spec, 1.73, 1.74 sources, 1.43, 1.44 Message-ID: <200601181805.k0II5WTb013158@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/glib2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13106 Modified Files: .cvsignore glib2.spec sources Log Message: 2.9.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 17 Jan 2006 00:36:05 -0000 1.43 +++ .cvsignore 18 Jan 2006 18:05:27 -0000 1.44 @@ -28,3 +28,4 @@ glib-2.9.2.tar.gz glib-2.9.2.tar.bz2 glib-2.9.3.tar.bz2 +glib-2.9.4.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- glib2.spec 17 Jan 2006 00:36:05 -0000 1.73 +++ glib2.spec 18 Jan 2006 18:05:28 -0000 1.74 @@ -1,6 +1,6 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.9.3 +Version: 2.9.4 Release: 1 License: LGPL Group: System Environment/Libraries @@ -96,6 +96,9 @@ %{_mandir}/man1/* %changelog +* Wed Jan 18 2006 Matthias Clasen - 2.9.4-1 +- Update to 2.9.4 + * Mon Jan 16 2006 Matthias Clasen - 2.9.3-1 - Update to 2.9.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 17 Jan 2006 00:36:05 -0000 1.43 +++ sources 18 Jan 2006 18:05:28 -0000 1.44 @@ -1 +1 @@ -e33d4a886492541e793d22dc5bc6a3d0 glib-2.9.3.tar.bz2 +467d473c2fd43e124bcab02b6548c135 glib-2.9.4.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 18 18:15:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 13:15:27 -0500 Subject: rpms/xpdf/devel xpdf.spec,1.68,1.69 Message-ID: <200601181815.k0IIFRCQ015524@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xpdf/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15429 Modified Files: xpdf.spec Log Message: - remove pdf command-line utilities and require poppler ones instead (bug 177446). Index: xpdf.spec =================================================================== RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- xpdf.spec 18 Jan 2006 17:52:08 -0000 1.68 +++ xpdf.spec 18 Jan 2006 18:15:08 -0000 1.69 @@ -7,7 +7,7 @@ Summary: A PDF file viewer for the X Window System. Name: xpdf Version: 3.01 -Release: 8 +Release: 9 License: GPL Epoch: 1 Url: http://www.foolabs.com/xpdf/ @@ -39,6 +39,7 @@ Requires: urw-fonts Requires: htmlview +Requires: poppler-utils >= 0.5.0-4 BuildPrereq: openmotif-devel BuildPrereq: freetype-devel >= 2.1.7 @@ -75,11 +76,6 @@ Requires: %{name} >= 1.00 Group: Applications/Publishing -%package utils -Summary: Command line utilities for converting PDF files. -Group: Applications/Text -Requires: %name = %{version} - %description Xpdf is an X Window System based viewer for Portable Document Format (PDF) files. Xpdf is a small and efficient program which uses @@ -113,10 +109,6 @@ Contents include: Adobe-Korea1 character collection support and KSX1001 encoding -%description utils -This utils package installs a number of command line tools for -converting PDF files to a number of other formats - %prep %setup -q -a 1 -a 3 -a 4 -a 5 -a 6 %patch -p1 @@ -188,6 +180,22 @@ cp -rf xpdf-japanese/* $RPM_BUILD_ROOT%{_datadir}/xpdf/japanese/ cp -rf xpdf-korean/* $RPM_BUILD_ROOT%{_datadir}/xpdf/korean/ +# poppler provides these utilities now +# http://bugzilla.redhat.com/bugzillA/SHow_bug.cgi?id=177446 +rm -rf $RPM_BUILD_ROOT%{_bindir}/pdffonts +rm -rf $RPM_BUILD_ROOT%{_bindir}/pdfimages +rm -rf $RPM_BUILD_ROOT%{_bindir}/pdfinfo +rm -rf $RPM_BUILD_ROOT%{_bindir}/pdftohtml +rm -rf $RPM_BUILD_ROOT%{_bindir}/pdftops +rm -rf $RPM_BUILD_ROOT%{_bindir}/pdftotext + +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdffonts.1* +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdfimages.1* +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdfinfo.1* +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdftohtml.1* +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdftops.1* +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/pdftotext.1* + %clean rm -rf $RPM_BUILD_ROOT @@ -229,12 +237,11 @@ %endif %lang(ko) %{_datadir}/xpdf/korean -%files utils -%defattr(-, root, root) -%{_bindir}/pdf* -%{_mandir}/man1/pdf* - %changelog +* Wed Jan 18 2006 Ray Strode 3.01-9 +- remove pdf command-line utilities and require poppler ones + instead (bug 177446). + * Wed Jan 18 2006 Than Ngo 3.01-8 - add new subpackage xpdf-utils From fedora-cvs-commits at redhat.com Wed Jan 18 18:17:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 13:17:21 -0500 Subject: rpms/poppler/devel poppler.spec,1.20,1.21 Message-ID: <200601181817.k0IIHLgK020829@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/poppler/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20612 Modified Files: poppler.spec Log Message: - change xpdf conflict version to be <= instead of < Index: poppler.spec =================================================================== RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- poppler.spec 18 Jan 2006 17:22:39 -0000 1.20 +++ poppler.spec 18 Jan 2006 18:17:17 -0000 1.21 @@ -1,7 +1,7 @@ Summary: Pdf rendering library Name: poppler Version: 0.5.0 -Release: 3 +Release: 4 License: GPL Group: Development/Libraries Source0: %{name}-%{version}.tar.gz @@ -30,7 +30,7 @@ Summary: Command line utilities for converting PDF files. Group: Applications/Text Requires: %name = %{version} -Conflicts: xpdf < 1:3.01-8 +Conflicts: xpdf <= 1:3.01-8 %description utils Poppler, a PDF rendering library, it's a fork of the xpdf PDF @@ -72,6 +72,9 @@ %{_mandir}/man1/* %changelog +* Wed Jan 18 2006 Ray Strode - 0.5.0-4 +- change xpdf conflict version to be <= instead of < + * Wed Jan 18 2006 Ray Strode - 0.5.0-3 - update conflicts: xpdf line to be versioned From fedora-cvs-commits at redhat.com Wed Jan 18 18:27:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 13:27:47 -0500 Subject: rpms/xpdf/devel xpdf.spec,1.69,1.70 Message-ID: <200601181827.k0IIRlf9029958@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xpdf/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29917 Modified Files: xpdf.spec Log Message: - remove some of the pdf command-line utilities and require poppler ones instead (bug 177446). Index: xpdf.spec =================================================================== RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- xpdf.spec 18 Jan 2006 18:15:08 -0000 1.69 +++ xpdf.spec 18 Jan 2006 18:27:45 -0000 1.70 @@ -76,6 +76,11 @@ Requires: %{name} >= 1.00 Group: Applications/Publishing +%package utils +Summary: Command line utilities for converting PDF files. +Group: Applications/Text +Requires: %name = %{version} + %description Xpdf is an X Window System based viewer for Portable Document Format (PDF) files. Xpdf is a small and efficient program which uses @@ -109,6 +114,10 @@ Contents include: Adobe-Korea1 character collection support and KSX1001 encoding +%description utils +This utils package installs a number of command line tools for +converting PDF files to a number of other formats + %prep %setup -q -a 1 -a 3 -a 4 -a 5 -a 6 %patch -p1 @@ -237,6 +246,11 @@ %endif %lang(ko) %{_datadir}/xpdf/korean +%files utils +%defattr(-, root, root) +%{_bindir}/pdf* +%{_mandir}/man?/pdf* + %changelog * Wed Jan 18 2006 Ray Strode 3.01-9 - remove pdf command-line utilities and require poppler ones From fedora-cvs-commits at redhat.com Wed Jan 18 18:38:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 13:38:18 -0500 Subject: rpms/gnome-volume-manager/devel gvm-no-mount-ui-on-startup.patch, NONE, 1.1 gnome-volume-manager.spec, 1.28, 1.29 Message-ID: <200601181838.k0IIcIeA031981@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-volume-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31936 Modified Files: gnome-volume-manager.spec Added Files: gvm-no-mount-ui-on-startup.patch Log Message: - Add the no-ui patch from upstream. Next release should have this. gvm-no-mount-ui-on-startup.patch: manager.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) --- NEW FILE gvm-no-mount-ui-on-startup.patch --- Index: src/manager.c =================================================================== RCS file: /cvs/gnome/gnome-volume-manager/src/manager.c,v retrieving revision 1.115 diff -u -p -r1.115 manager.c --- src/manager.c 12 Jan 2006 21:33:50 -0000 1.115 +++ src/manager.c 17 Jan 2006 17:31:23 -0000 @@ -1291,7 +1291,7 @@ gvm_device_mounted (const char *udi) * @return TRUE iff the mount was succesful */ static gboolean -gvm_device_mount (const char *udi, int apply_policy) +gvm_device_mount (const char *udi, int apply_policy, gboolean no_ui) { char *mount_point, *fstype, *options[2], **poptions; struct _MountPolicy *policy; @@ -1315,8 +1315,12 @@ gvm_device_mount (const char *udi, int a policy->apply = apply_policy; g_hash_table_insert (mount_table, policy->udi, policy); - - command = g_strdup_printf ("%s --hal-udi=%%h", gnome_mount); + + if (no_ui) { + command = g_strdup_printf ("%s --no-ui --hal-udi=%%h", gnome_mount); + } else { + command = g_strdup_printf ("%s --hal-udi=%%h", gnome_mount); + } retval = gvm_run_command (command, udi, NULL, NULL); g_free (command); @@ -1456,7 +1460,7 @@ cda_extra_cb (GvmPromptCtx *ctx, int act switch (action) { case GVM_RESPONSE_BROWSE: if (!gvm_udi_is_subfs_mount (ctx->udi)) - gvm_device_mount (ctx->udi, TRUE); + gvm_device_mount (ctx->udi, TRUE, FALSE); break; case GVM_RESPONSE_PLAY: gvm_run_cdplayer (ctx->udi, ctx->device, NULL); @@ -1491,7 +1495,7 @@ gvm_ask_mixed (const char *udi) gvm_prompt (ctx, 0, NULL); } else if (config.automount_media) { if (!gvm_udi_is_subfs_mount (udi)) - gvm_device_mount (udi, TRUE); + gvm_device_mount (udi, TRUE, FALSE); } else if (config.autoplay_cda) { gvm_run_cdplayer (udi, device, NULL); } @@ -1626,7 +1630,7 @@ gvm_cdrom_policy (const char *udi) gvm_ask_mixed (udi); } else if (has_data) { if (config.automount_media && !gvm_udi_is_subfs_mount (udi)) - gvm_device_mount (udi, TRUE); + gvm_device_mount (udi, TRUE, FALSE); } else if (is_blank) { if ((type = gvm_cdrom_media_is_writable (udi))) gvm_run_cdburner (udi, type, device, NULL); @@ -1784,7 +1788,7 @@ block_device_added (const char *udi, con if (config.automount_drives && mountable) { if (!gvm_udi_is_subfs_mount (udi)) { if (gvm_automount_enabled (udi)) { - gvm_device_mount (udi, TRUE); + gvm_device_mount (udi, TRUE, FALSE); } else { dbg ("storage.automount_enabled_hint set to false on %s, not mounting\n", udi); } @@ -2340,7 +2344,8 @@ mount_all (LibHalContext *ctx) /* mount the device */ if ((dev = libhal_device_get_property_string (ctx, udi, "block.device", &error))) { dbg ("mount_all: mounting %s\n", dev); - gvm_device_mount (udi, FALSE); + /* don't make the mount program put up error dialogs */ + gvm_device_mount (udi, FALSE, TRUE); libhal_free_string (dev); } else { warn ("mount_all: no device for udi=%s: %s", udi, error.message); Index: gnome-volume-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gnome-volume-manager.spec 13 Jan 2006 23:24:36 -0000 1.28 +++ gnome-volume-manager.spec 18 Jan 2006 18:38:04 -0000 1.29 @@ -1,7 +1,7 @@ Summary: The GNOME Volume Manager Name: gnome-volume-manager Version: 1.5.9 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source0: gnome-volume-manager-%{version}.tar.bz2 @@ -11,6 +11,7 @@ Source4: cdda-url-handler.schemas Patch0: gnome-volume-manager-0.9.10.add-to-base.patch Patch1: gnome-volume-manager-1.5.1.rh-defaults.patch +Patch2: gvm-no-mount-ui-on-startup.patch BuildRoot: /var/tmp/%{name}-root BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.60 BuildPrereq: hal-devel >= 0.5.0 @@ -39,6 +40,8 @@ %setup -q %patch0 -p1 -b .add-to-base %patch1 -p1 -b .rh-defaults +%patch2 -p0 -b .no-ui + %build %configure make @@ -75,6 +78,9 @@ %{_libexecdir}/gnome-cdda-handler %changelog +* Wed Jan 18 2006 John (J5) Palmieri - 1.5.9-2 +- Add the no-ui patch from upstream. Next release should have this. + * Fri Jan 13 2006 Matthias Clasen - 1.5.9-1 - Update to 1.5.9 From fedora-cvs-commits at redhat.com Wed Jan 18 18:50:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 13:50:29 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.109,1.110 Message-ID: <200601181850.k0IIoTsp009581@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9099 Modified Files: gtk2.spec Log Message: Rebuild Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.109 retrieving revision 1.110 diff -u -r1.109 -r1.110 --- gtk2.spec 14 Jan 2006 04:20:38 -0000 1.109 +++ gtk2.spec 18 Jan 2006 18:50:14 -0000 1.110 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. Name: gtk2 Version: %{base_version} -Release: 2 +Release: 3 License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 @@ -259,6 +259,9 @@ %doc tmpdocs/examples %changelog +* Wed Jan 18 2006 Matthias Clasen 2.8.10-3 +- Rebuild against GLib 2.9.4 + * Fri Jan 13 2006 Matthias Clasen 2.8.10-2 - Run make check From fedora-cvs-commits at redhat.com Wed Jan 18 18:55:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 13:55:16 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.149, 1.150 policycoreutils.spec, 1.218, 1.219 Message-ID: <200601181855.k0IItG5B014784@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14749 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Wed Jan 18 2006 Dan Walsh 1.29.8-2 - Fix chcat -l -L to work while not root policycoreutils-rhat.patch: scripts/chcat | 18 +++++++++++------- semanage/seobject.py | 42 ++++++++++++++++++++++++++++++++---------- setsebool/setsebool.c | 7 ++++--- 3 files changed, 47 insertions(+), 20 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- policycoreutils-rhat.patch 18 Jan 2006 17:43:23 -0000 1.149 +++ policycoreutils-rhat.patch 18 Jan 2006 18:55:09 -0000 1.150 @@ -1,7 +1,7 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.7/scripts/chcat +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.8/scripts/chcat --- nsapolicycoreutils/scripts/chcat 2006-01-18 11:12:43.000000000 -0500 -+++ policycoreutils-1.29.7/scripts/chcat 2006-01-18 10:31:40.000000000 -0500 -@@ -281,6 +282,7 @@ ++++ policycoreutils-1.29.8/scripts/chcat 2006-01-18 13:52:39.000000000 -0500 +@@ -281,6 +281,7 @@ print "Usage %s -d File ..." % sys.argv[0] print "Usage %s -l -d user ..." % sys.argv[0] print "Usage %s -L" % sys.argv[0] @@ -9,7 +9,21 @@ print "Use -- to end option list. For example" print "chcat -- -CompanyConfidential /docs/businessplan.odt" print "chcat -l +CompanyConfidential juser" -@@ -350,10 +352,17 @@ +@@ -298,12 +299,8 @@ + return 0 + + def listusercats(users): +- seusers = seobject.loginRecords().get_all() + for u in users: +- if u in seusers.keys(): +- cats=seobject.translate(seusers[u][1]) +- else: +- cats=seobject.translate(seusers["__default__"][1]) ++ cats=seobject.translate(selinux.getseuserbyname(u)[2]) + cats=cats.split("-") + if len(cats) > 1 and cats[1] != "s0": + print "%s: %s" % (u, cats[1]) +@@ -350,10 +347,17 @@ if delete_ind: sys.exit(chcat_replace(["s0"], ["s0"], cmds, login_ind)) @@ -29,9 +43,9 @@ sys.exit(listusercats(cmds)) else: if len(cmds) > 0: -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.7/semanage/seobject.py +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.8/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-01-18 11:12:43.000000000 -0500 -+++ policycoreutils-1.29.7/semanage/seobject.py 2006-01-18 11:12:01.000000000 -0500 ++++ policycoreutils-1.29.8/semanage/seobject.py 2006-01-18 13:26:43.000000000 -0500 @@ -421,11 +421,11 @@ rc = semanage_port_modify_local(self.sh, k, p) @@ -107,3 +121,28 @@ keys=dict.keys() keys.sort() for i in keys: +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.c policycoreutils-1.29.8/setsebool/setsebool.c +--- nsapolicycoreutils/setsebool/setsebool.c 2006-01-04 13:07:46.000000000 -0500 ++++ policycoreutils-1.29.8/setsebool/setsebool.c 2006-01-18 13:27:42.000000000 -0500 +@@ -130,7 +130,7 @@ + + for (j = 0; j < boolcnt; j++) { + +- if (semanage_bool_create(handle, &boolean) < 0) ++ if (semanage_bool_create(handle, &boolean) < 0) + goto err; + + if (semanage_bool_set_name(handle, boolean, boollist[j].name) < 0) +@@ -144,9 +144,10 @@ + if (permanent && semanage_bool_modify_local(handle, bool_key, boolean) < 0) + goto err; + +- if (semanage_bool_set_active(handle, bool_key, boolean) < 0) ++ if (semanage_bool_set_active(handle, bool_key, boolean) < 0) { ++ fprintf(stderr, "Could not change boolean %s\n", boollist[j].name); + goto err; +- ++ } + semanage_bool_key_free(bool_key); + semanage_bool_free(boolean); + bool_key = NULL; Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- policycoreutils.spec 18 Jan 2006 17:43:23 -0000 1.218 +++ policycoreutils.spec 18 Jan 2006 18:55:10 -0000 1.219 @@ -4,7 +4,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.8 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -97,6 +97,9 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Wed Jan 18 2006 Dan Walsh 1.29.8-2 +- Fix chcat -l -L to work while not root + * Wed Jan 18 2006 Dan Walsh 1.29.8-1 - Update to match NSA * Merged semanage fixes from Ivan Gyurdiev. From fedora-cvs-commits at redhat.com Wed Jan 18 19:08:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 14:08:15 -0500 Subject: rpms/amanda/devel amanda.spec,1.25,1.26 Message-ID: <200601181908.k0IJ8C5Z018077@cvs.devel.redhat.com> Author: fenlason Update of /cvs/dist/rpms/amanda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17976 Modified Files: amanda.spec Log Message: - Fix spec file to use %%{_localstatedir} instead of hardcoding /var/lib - Add amanda_user and amanda_group defines, to make changing the username easier. - Add a BuildRequires on /usr/bin/Mail Index: amanda.spec =================================================================== RCS file: /cvs/dist/rpms/amanda/devel/amanda.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- amanda.spec 9 Dec 2005 22:39:33 -0000 1.25 +++ amanda.spec 18 Jan 2006 19:08:08 -0000 1.26 @@ -2,6 +2,8 @@ %{!?defconfig:%define defconfig DailySet1} %{!?indexserver:%define indexserver localhost} %{!?tapeserver:%define tapeserver %{indexserver}} +%{!?amanda_user:%define amanda_user amanda} +%{!?amanda_group:%define amanda_group disk} # XXX append lib to current _localstatedir setting %{expand: %%define _localstatedir %{_localstatedir}/lib} @@ -9,11 +11,11 @@ Summary: A network-capable tape backup solution. Name: amanda Version: 2.4.5p1 -Release: 2.1 +Release: 3 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz Source1: amanda.crontab # Source2: __README_QUICKSETUP__ -Source3: amanda.conf +#Source3: amanda.conf Source4: disklist Source5: amanda-xinetd Source6: amandaidx-xinetd @@ -26,7 +28,7 @@ URL: http://www.amanda.org Prereq: fileutils grep initscripts BuildRequires: dump gnuplot cups samba-client tar grep fileutils -BuildRequires: libtool automake autoconf gcc-c++ +BuildRequires: libtool automake autoconf gcc-c++ /usr/bin/Mail Requires: tar BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -99,9 +101,9 @@ --with-gnutar-listdir=%{_localstatedir}/amanda/gnutar-lists \ --with-smbclient=%{_bindir}/smbclient \ --with-amandahosts \ - --with-user=amanda \ - --with-group=disk \ - --with-tmpdir=/var/log/amanda \ + --with-user=%amanda_user \ + --with-group=%amanda_group \ + --with-tmpdir=/var/log/amanda \ --with-gnutar=/bin/tar make %{?_smp_mflags} @@ -123,8 +125,8 @@ perl -p -e "s,\@LIBDIR\@,%{_libexecdir},g" < %SOURCE7 > $RPM_BUILD_ROOT/etc/xinetd.d/amidxtape chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amidxtape mkdir -p $RPM_BUILD_ROOT/var/log/amanda -mkdir -p $RPM_BUILD_ROOT/var/lib/amanda -install -m 660 %SOURCE8 $RPM_BUILD_ROOT/var/lib/amanda/.amandahosts +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/amanda +install -m 660 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/amanda/.amandahosts mkdir -p examples cp example/* examples @@ -139,14 +141,15 @@ # cp ${RPM_SOURCE_DIR}/__README_QUICKSETUP__ docs/ pushd ${RPM_BUILD_ROOT} - mkdir -p .%{_sysconfdir}/amanda/DailySet1 + mkdir -p .%{_sysconfdir}/amanda/%defconfig cp ${RPM_SOURCE_DIR}/amanda.crontab .%{_sysconfdir}/amanda/crontab.sample - cp ${RPM_SOURCE_DIR}/amanda.conf .%{_sysconfdir}/amanda/DailySet1 - cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/DailySet1 +# cp ${RPM_SOURCE_DIR}/amanda.conf .%{_sysconfdir}/amanda/%defconfig +cp ${RPM_BUILD_DIR}/%{name}-%{version}/examples/amanda.conf .%{_sysconfdir}/amanda/%{defconfig} + cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig touch .%{_sysconfdir}/amandates mkdir -p .%{_localstatedir}/amanda/gnutar-lists - mkdir -p .%{_localstatedir}/amanda/DailySet1/index + mkdir -p .%{_localstatedir}/amanda/%defconfig/index # for i in libamanda libamtape libamclient libamserver ; do # mv .%{_libdir}/${i}.so .%{_libdir}/${i}-%{version}-19991216-beta1.so @@ -162,8 +165,8 @@ rm -rf ${RPM_BUILD_ROOT} %pre -useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \ - -c "Amanda user" -u 33 amanda >/dev/null 2>&1 || : +useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \ + -c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || : @@ -191,14 +194,14 @@ %defattr(-,root,root) %{_libdir}/libamanda*.so %{_libdir}/libamtape*.so -%attr(-,amanda,disk) %{_sbindir}/amrestore +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrestore %{_mandir}/man8/amrestore.8* -%attr(660,amanda,disk) %config(noreplace) /var/lib/amanda/.amandahosts +%attr(660,%amanda_user,%amanda_group) %config(noreplace) %{_localstatedir}/amanda/.amandahosts -%attr(02700,amanda,disk) %dir /var/log/amanda -%attr(-,amanda,disk) %dir %{_localstatedir}/amanda/ -%attr(-,amanda,disk) %dir %{_sysconfdir}/amanda/ -%attr(-,amanda,disk) %config(noreplace) %{_sysconfdir}/amandates +%attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda +%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/amanda/ +%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/ +%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amandates %{_mandir}/man5/amanda.conf* @@ -208,64 +211,64 @@ %{_libdir}/libamserver*.so %config(noreplace) /etc/xinetd.d/amandaidx %config(noreplace) /etc/xinetd.d/amidxtape -%attr(-,amanda,disk) %dir %{_libexecdir}/ -%attr(-,amanda,disk) %{_libexecdir}/amidxtaped -%attr(-,amanda,disk) %{_libexecdir}/amindexd -%attr(-,amanda,disk) %{_libexecdir}/amlogroll -%attr(-,amanda,disk) %{_libexecdir}/amtrmidx -%attr(-,amanda,disk) %{_libexecdir}/amtrmlog -%attr(-,amanda,disk) %{_libexecdir}/driver -%attr(4750,root,disk) %{_libexecdir}/dumper -%attr(4750,root,disk) %{_libexecdir}/planner -%attr(-,amanda,disk) %{_libexecdir}/taper -%attr(-,amanda,disk) %{_libexecdir}/amcleanupdisk -%attr(-,amanda,disk) %{_libexecdir}/chg-chio -%attr(-,amanda,disk) %{_libexecdir}/chg-chs -%attr(-,amanda,disk) %{_libexecdir}/chg-juke -%attr(-,amanda,disk) %{_libexecdir}/chg-manual -%attr(-,amanda,disk) %{_libexecdir}/chg-mcutil -%attr(-,amanda,disk) %{_libexecdir}/chg-mtx -%attr(-,amanda,disk) %{_libexecdir}/chg-multi -%attr(-,amanda,disk) %{_libexecdir}/chg-null -%attr(-,amanda,disk) %{_libexecdir}/chg-rait -%attr(-,amanda,disk) %{_libexecdir}/chg-rth -%attr(-,amanda,disk) %{_libexecdir}/chg-scsi -%attr(-,amanda,disk) %{_libexecdir}/chg-zd-mtx -%attr(-,amanda,disk) %{_libexecdir}/chg-disk -%attr(-,amanda,disk) %{_libexecdir}/chg-iomega -%attr(-,amanda,disk) %{_libexecdir}/amcat.awk -%attr(-,amanda,disk) %{_libexecdir}/amplot.awk -%attr(-,amanda,disk) %{_libexecdir}/amplot.g -%attr(-,amanda,disk) %{_libexecdir}/amplot.gp - -%attr(-,amanda,disk) %{_sbindir}/amadmin -%attr(4750,root,disk) %{_sbindir}/amcheck -%attr(-,amanda,disk) %{_sbindir}/amflush -%attr(-,amanda,disk) %{_sbindir}/amgetconf -%attr(-,amanda,disk) %{_sbindir}/amlabel -%attr(-,amanda,disk) %{_sbindir}/amtape -%attr(-,amanda,disk) %{_sbindir}/amreport -%attr(-,amanda,disk) %{_sbindir}/amcheckdb -%attr(-,amanda,disk) %{_sbindir}/amcleanup -%attr(-,amanda,disk) %{_sbindir}/amdump -%attr(-,amanda,disk) %{_sbindir}/amoverview -%attr(-,amanda,disk) %{_sbindir}/amrmtape -%attr(-,amanda,disk) %{_sbindir}/amtoc -%attr(-,amanda,disk) %{_sbindir}/amverify -%attr(-,amanda,disk) %{_sbindir}/amstatus -%attr(-,amanda,disk) %{_sbindir}/amplot -%attr(-,amanda,disk) %{_sbindir}/amtapetype -%attr(-,amanda,disk) %{_sbindir}/amdd -%attr(-,amanda,disk) %{_sbindir}/ammt -%attr(-,amanda,disk) %{_sbindir}/amverifyrun - -%attr(-,amanda,disk) %dir %{_localstatedir}/amanda/DailySet1/ -%attr(-,amanda,disk) %dir %{_localstatedir}/amanda/DailySet1/index -%attr(-,amanda,disk) %dir %{_sysconfdir}/amanda -%attr(-,amanda,disk) %dir %{_sysconfdir}/amanda/DailySet1 -%attr(-,amanda,disk) %config(noreplace) %{_sysconfdir}/amanda/DailySet1/amanda.conf -%attr(-,amanda,disk) %config(noreplace) %{_sysconfdir}/amanda/crontab.sample -%attr(-,amanda,disk) %config(noreplace) %{_sysconfdir}/amanda/DailySet1/disklist +%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/ +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amidxtaped +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amindexd +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amlogroll +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amtrmidx +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amtrmlog +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/driver +%attr(4750,root,%amanda_group) %{_libexecdir}/dumper +%attr(4750,root,%amanda_group) %{_libexecdir}/planner +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/taper +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amcleanupdisk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-chio +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-chs +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-juke +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-manual +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-mcutil +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-mtx +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-multi +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-null +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-rait +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-rth +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-scsi +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-zd-mtx +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-disk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/chg-iomega +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amcat.awk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amplot.awk +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amplot.g +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amplot.gp + +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amadmin +%attr(4750,root,%amanda_group) %{_sbindir}/amcheck +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amflush +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amgetconf +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amlabel +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtape +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amreport +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcheckdb +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amcleanup +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdump +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amoverview +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrmtape +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtoc +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amverify +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amstatus +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amplot +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amtapetype +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amdd +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/ammt +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amverifyrun + +%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/amanda/%defconfig/ +%attr(-,%amanda_user,%amanda_group) %dir %{_localstatedir}/amanda/%defconfig/index +%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda +%attr(-,%amanda_user,%amanda_group) %dir %{_sysconfdir}/amanda/%defconfig +%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda.conf +%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/crontab.sample +%attr(-,%amanda_user,%amanda_group) %config(noreplace) %{_sysconfdir}/amanda/%defconfig/disklist %{_mandir}/man8/amadmin.8* %{_mandir}/man8/amanda.8* @@ -290,25 +293,25 @@ %{_mandir}/man8/amverifyrun.8* %files client -%defattr(-,root,root) -%config /etc/xinetd.d/amanda -%{_libdir}/libamclient*.so -%attr(-,amanda,disk) %dir %{_libexecdir}/ -%attr(-,amanda,disk) %{_libexecdir}/amandad -%attr(4750,root,disk) %{_libexecdir}/calcsize -%attr(4750,root,disk) %{_libexecdir}/killpgrp -%attr(-,amanda,disk) %{_libexecdir}/patch-system -%attr(4750,root,disk) %{_libexecdir}/rundump -%attr(4750,root,disk) %{_libexecdir}/runtar -%attr(4750,root,disk) %{_libexecdir}/amqde -%attr(-,amanda,disk) %{_libexecdir}/selfcheck -%attr(-,amanda,disk) %{_libexecdir}/sendbackup -%attr(-,amanda,disk) %{_libexecdir}/sendsize -%attr(-,amanda,disk) %{_libexecdir}/versionsuffix -%attr(-,amanda,disk) %{_sbindir}/amrecover - %{_mandir}/man8/amrecover.8* -%attr(-,amanda,disk) %{_sbindir}/security -%attr(-,amanda,disk) %{_localstatedir}/amanda/gnutar-lists/ + %defattr(-,root,root) + %config /etc/xinetd.d/amanda + %{_libdir}/libamclient*.so +%attr(-,%amanda_user,%amanda_group) %dir %{_libexecdir}/ +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/amandad +%attr(4750,root,%amanda_group) %{_libexecdir}/calcsize +%attr(4750,root,%amanda_group) %{_libexecdir}/killpgrp +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/patch-system +%attr(4750,root,%amanda_group) %{_libexecdir}/rundump +%attr(4750,root,%amanda_group) %{_libexecdir}/runtar +%attr(4750,root,%amanda_group) %{_libexecdir}/amqde +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/selfcheck +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/sendbackup +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/sendsize +%attr(-,%amanda_user,%amanda_group) %{_libexecdir}/versionsuffix +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/amrecover + %{_mandir}/man8/amrecover.8* +%attr(-,%amanda_user,%amanda_group) %{_sbindir}/security +%attr(-,%amanda_user,%amanda_group) %{_localstatedir}/amanda/gnutar-lists/ %files devel %defattr(-,root,root) @@ -319,6 +322,12 @@ %{_libdir}/*.la %changelog +* Wed Jan 18 2006 Jay Fenlason 2.4.5p1-3 +- Fix spec file to use %%{_localstatedir} instead of hardcoding /var/lib +- Add amanda_user and amanda_group defines, to make changing the username + easier. +- Add a BuildRequires on /usr/bin/Mail + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 18 19:12:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 14:12:40 -0500 Subject: rpms/hal/devel 99-redhat-storage-policy-fixed-drives.fdi, NONE, 1.1 hal.spec, 1.77, 1.78 Message-ID: <200601181912.k0IJCep6017826@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17814 Modified Files: hal.spec Added Files: 99-redhat-storage-policy-fixed-drives.fdi Log Message: - Add policy file to ignore fixed disks. This is a temporary solution until upstream comes up with a more flexable option --- NEW FILE 99-redhat-storage-policy-fixed-drives.fdi --- true Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- hal.spec 17 Jan 2006 15:04:30 -0000 1.77 +++ hal.spec 18 Jan 2006 19:12:38 -0000 1.78 @@ -18,9 +18,10 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.6 -Release: 1 +Release: 2 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz +Source1: 99-redhat-storage-policy-fixed-drives.fdi License: AFL/GPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root @@ -87,6 +88,8 @@ %install make install DESTDIR=$RPM_BUILD_ROOT +cp -f %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/ + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %clean @@ -167,6 +170,10 @@ %{_bindir}/hal-device-manager %changelog +* Wed Jan 18 2006 John (J5) Palmieri - 0.5.6-2 +- Add policy file to ignore fixed disks. This is a temporary solution + until upstream comes up with a more flexable option + * Tue Jan 17 2006 John (J5) Palmieri - 0.5.6 - New upstream release - Remove match on capabilities patch (upstream already) From fedora-cvs-commits at redhat.com Wed Jan 18 19:34:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 14:34:15 -0500 Subject: rpms/beagle/devel beagle.spec,1.14,1.15 Message-ID: <200601181934.k0IJYEDY024794@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24782 Modified Files: beagle.spec Log Message: - depend on poppler for pdf utilities instead of xpdf (bug 177446) Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- beagle.spec 11 Jan 2006 09:10:10 -0000 1.14 +++ beagle.spec 18 Jan 2006 19:34:03 -0000 1.15 @@ -1,6 +1,6 @@ Name: beagle Version: 0.1.4 -Release: 3 +Release: 4 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -15,7 +15,7 @@ BuildRequires: gtk-sharp2-gapi sqlite2-devel mono-web zip libexif-devel BuildRequires: mozilla-devel gsf-sharp BuildRequires: evolution-sharp >= 0.10.2-3 -Requires: sqlite2 xpdf zip mono-core +Requires: sqlite2 zip mono-core poppler-utils # Mono only availible on these: (s390x disabled for now) ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x @@ -144,6 +144,10 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Wed Jan 18 2006 Ray Strode - 0.1.4-4 +- depend on poppler for pdf utilities instead of xpdf + (bug 177446) + * Wed Jan 11 2006 Alexander Larsson - 0.1.4-3 - Rebuild with fixed evolution-sharp From fedora-cvs-commits at redhat.com Wed Jan 18 19:54:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 14:54:03 -0500 Subject: rpms/avahi/devel avahi-0.6.3-MONO_SHARED_DIR.patch,1.1,1.2 Message-ID: <200601181954.k0IJs3OC004911@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4877 Modified Files: avahi-0.6.3-MONO_SHARED_DIR.patch Log Message: .wapi dir now created by gacutil also - needs MONO_SHARED_DIR=. avahi-0.6.3-MONO_SHARED_DIR.patch: Makefile.am | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Index: avahi-0.6.3-MONO_SHARED_DIR.patch =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi-0.6.3-MONO_SHARED_DIR.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avahi-0.6.3-MONO_SHARED_DIR.patch 12 Jan 2006 22:49:20 -0000 1.1 +++ avahi-0.6.3-MONO_SHARED_DIR.patch 18 Jan 2006 19:54:01 -0000 1.2 @@ -1,5 +1,5 @@ ---- avahi-0.6.3/avahi-sharp/Makefile.am.MONO_SHARED_DIR 2005-12-22 07:36:22.000000000 -0500 -+++ avahi-0.6.3/avahi-sharp/Makefile.am 2006-01-12 17:41:11.000000000 -0500 +--- avahi-0.6.4/avahi-sharp/Makefile.am.MONO_SHARED_DIR 2005-12-22 07:36:22.000000000 -0500 ++++ avahi-0.6.4/avahi-sharp/Makefile.am 2006-01-18 14:52:36.000000000 -0500 @@ -48,7 +48,7 @@ $(srcdir)/gencfg.sh @@ -9,3 +9,16 @@ $(ASSEMBLY).config: $(ASSEMBLY).config.in +@@ -73,10 +73,10 @@ + endif + + install-data-hook: $(ASSEMBLY) +- $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) ++ MONO_SHARED_DIR=. $(GACUTIL) /i $(ASSEMBLY) /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) + + uninstall-hook: $(ASSEMBLY) +- $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) ++ MONO_SHARED_DIR=. $(GACUTIL) /u avahi-sharp /package avahi-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) + + endif + endif From fedora-cvs-commits at redhat.com Wed Jan 18 20:00:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 15:00:11 -0500 Subject: rpms/yaboot/devel yaboot-1.3.12-bigtftp.patch,1.1,NONE Message-ID: <200601182000.k0IK0AC4015078@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/yaboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14938 Removed Files: yaboot-1.3.12-bigtftp.patch Log Message: Improved size upstream --- yaboot-1.3.12-bigtftp.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 18 20:12:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 15:12:54 -0500 Subject: rpms/avahi/devel avahi.spec,1.28,1.29 Message-ID: <200601182012.k0IKCsKc017634@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17603 Modified Files: avahi.spec Log Message: fix bugs 177610, 177609 Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- avahi.spec 16 Jan 2006 23:56:58 -0000 1.28 +++ avahi.spec 18 Jan 2006 20:12:49 -0000 1.29 @@ -277,9 +277,9 @@ %if %{WITH_MONO} %files sharp %defattr(0644, root, root, 0755) -/usr/lib/mono/avahi-sharp -/usr/lib/mono/gac/avahi-sharp -/usr/lib/pkgconfig/avahi-sharp.pc +%{_libdir}/mono/avahi-sharp +%{_libdir}/mono/gac/avahi-sharp +%{_libdir}/pkgconfig/avahi-sharp.pc %endif %changelog From fedora-cvs-commits at redhat.com Wed Jan 18 20:41:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 15:41:30 -0500 Subject: rpms/rhpxl/devel .cvsignore, 1.13, 1.14 rhpxl.spec, 1.15, 1.16 sources, 1.15, 1.16 Message-ID: <200601182041.k0IKfUFa005680@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/rhpxl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5603 Modified Files: .cvsignore rhpxl.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 11 Jan 2006 19:20:56 -0000 1.13 +++ .cvsignore 18 Jan 2006 20:41:26 -0000 1.14 @@ -1 +1,2 @@ rhpxl-0.10.tar.gz +rhpxl-0.11.tar.gz Index: rhpxl.spec =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/rhpxl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- rhpxl.spec 11 Jan 2006 19:20:56 -0000 1.15 +++ rhpxl.spec 18 Jan 2006 20:41:26 -0000 1.16 @@ -2,7 +2,7 @@ Summary: Python library for configuring and running X. Name: rhpxl -Version: 0.10 +Version: 0.11 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -43,6 +43,9 @@ %{_sbindir}/ddcprobe %changelog +* Wed Jan 18 2006 Chris Lumens 0.11-1 +- No ddcprobe output for mice, or for monitors unless on i386 or ppc. + * Wed Jan 11 2006 Peter Jones 0.10-1 - If we're on a Mac and can't get DDC/EDID, and our resolution is tiny, force 1024x768. Index: sources =================================================================== RCS file: /cvs/dist/rpms/rhpxl/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 11 Jan 2006 19:20:56 -0000 1.15 +++ sources 18 Jan 2006 20:41:26 -0000 1.16 @@ -1 +1 @@ -39e89c60e1b97621e9ca17e901d157d9 rhpxl-0.10.tar.gz +a47876927c3319da3d4262c9467ddd9e rhpxl-0.11.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 18 20:54:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 15:54:43 -0500 Subject: rpms/gnome-volume-manager/devel gnome-volume-manager-1.5.9-goption.patch, NONE, 1.1 gnome-volume-manager.spec, 1.29, 1.30 Message-ID: <200601182054.k0IKshQc022134@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/gnome-volume-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22085 Modified Files: gnome-volume-manager.spec Added Files: gnome-volume-manager-1.5.9-goption.patch Log Message: - Switch to using goptions instead of popt which is causing a crash gnome-volume-manager-1.5.9-goption.patch: manager.c | 63 +++++++++++++++++++++++++++++--------------------------------- 1 files changed, 30 insertions(+), 33 deletions(-) --- NEW FILE gnome-volume-manager-1.5.9-goption.patch --- --- gnome-volume-manager-1.5.9/src/manager.c.goption 2006-01-18 15:51:23.000000000 -0500 +++ gnome-volume-manager-1.5.9/src/manager.c 2006-01-18 15:48:51.000000000 -0500 @@ -2462,16 +2462,21 @@ #define POPT_TABLEEND { NULL, '\0', 0, NULL, '\0', NULL, NULL } #endif -static const struct poptOption options[] = { - { "version", 'v', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, 'v', +static gboolean print_version; +static char *make_daemon; +static gboolean no_daemon; +static gboolean secret_mode; + +static GOptionEntry options[] = { + { "version", 'v', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_NONE, &print_version, N_("Print version and exit"), NULL }, - { "daemon", 'd', POPT_ARG_STRING | POPT_ARGFLAG_ONEDASH, NULL, 'd', + { "daemon", 'd', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_STRING, &make_daemon, N_("Run as a daemon"), "" }, - { "no-daemon", 'n', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, 'n', + { "no-daemon", 'n', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_NONE, &no_daemon, N_("Don't run as a daemon"), NULL }, - { "secret-mode", 's', POPT_ARG_NONE | POPT_ARGFLAG_ONEDASH, NULL, 's', + { "secret-mode", 's', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_NONE, &secret_mode, N_("Run in secret mode"), NULL }, - POPT_TABLEEND + { NULL, '\0', 0, 0, NULL, NULL, NULL} }; int @@ -2480,41 +2485,34 @@ gboolean daemonize = TRUE; GnomeProgram *program; GnomeClient *client; - poptContext ctx; + GOptionContext *context; const char *arg; int rc; bindtextdomain (PACKAGE, GNOMELOCALEDIR); bind_textdomain_codeset (PACKAGE, "UTF-8"); textdomain (PACKAGE); + + context = g_option_context_new (PACKAGE); + g_option_context_add_main_entries (context, options, NULL); program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, - GNOME_PARAM_POPT_FLAGS, POPT_CONTEXT_POSIXMEHARDER, - GNOME_PARAM_POPT_TABLE, options, GNOME_PARAM_NONE); - - g_object_get ((GObject *) program, GNOME_PARAM_POPT_CONTEXT, &ctx, NULL); - - poptResetContext (ctx); - - while ((rc = poptGetNextOpt (ctx)) > 0) { - switch (rc) { - case 'v': - fprintf (stdout, "%s version %s\n", PACKAGE, VERSION); - poptFreeContext (ctx); - exit (0); - case 'd': - if (!(arg = poptGetOptArg (ctx)) || (!strcmp (arg, "true") || !strcmp (arg, "yes"))) { - daemonize = TRUE; - break; - } - case 'n': - daemonize = FALSE; - break; - case 's': - fprintf (stdout, "Managing volumes since the summer of '89\n"); - break; - } + GNOME_PARAM_GOPTION_CONTEXT, context, GNOME_PARAM_NONE); + + if (print_version) { + fprintf (stdout, "%s version %s\n", PACKAGE, VERSION); + exit (0); } + + daemonize = FALSE; + if (make_daemon == NULL || (strcmp (arg, "true") == 0) || (strcmp (arg, "yes") == 0)) + daemonize = TRUE; + + if (no_daemon) + daemonize = FALSE; + + if (secret_mode) + fprintf (stdout, "Managing volumes since the summer of '89\n"); if (daemonize && daemon (0, 0) < 0) { warn ("daemonizing failed: %s", g_strerror (errno)); @@ -2562,7 +2560,6 @@ gtk_main (); g_object_unref (program); - poptFreeContext (ctx); return 0; } Index: gnome-volume-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gnome-volume-manager.spec 18 Jan 2006 18:38:04 -0000 1.29 +++ gnome-volume-manager.spec 18 Jan 2006 20:54:38 -0000 1.30 @@ -1,7 +1,7 @@ Summary: The GNOME Volume Manager Name: gnome-volume-manager Version: 1.5.9 -Release: 2 +Release: 3 License: GPL Group: Applications/System Source0: gnome-volume-manager-%{version}.tar.bz2 @@ -12,6 +12,7 @@ Patch0: gnome-volume-manager-0.9.10.add-to-base.patch Patch1: gnome-volume-manager-1.5.1.rh-defaults.patch Patch2: gvm-no-mount-ui-on-startup.patch +Patch3: gnome-volume-manager-1.5.9-goption.patch BuildRoot: /var/tmp/%{name}-root BuildPrereq: libgnomeui-devel, libglade2-devel, dbus-devel >= 0.60 BuildPrereq: hal-devel >= 0.5.0 @@ -41,6 +42,7 @@ %patch0 -p1 -b .add-to-base %patch1 -p1 -b .rh-defaults %patch2 -p0 -b .no-ui +%patch3 -p1 -b .goption %build %configure @@ -78,6 +80,9 @@ %{_libexecdir}/gnome-cdda-handler %changelog +* Wed Jan 18 2006 John (J5) Palmieri - 1.5.9-3 +- Switch to using goptions instead of popt which is causing a crash + * Wed Jan 18 2006 John (J5) Palmieri - 1.5.9-2 - Add the no-ui patch from upstream. Next release should have this. From fedora-cvs-commits at redhat.com Wed Jan 18 21:34:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 16:34:53 -0500 Subject: rpms/xpdf/devel xpdf.spec,1.70,1.71 Message-ID: <200601182134.k0ILYrcH011370@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xpdf/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11311 Modified Files: xpdf.spec Log Message: - remove requires line in utils subpackage Index: xpdf.spec =================================================================== RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- xpdf.spec 18 Jan 2006 18:27:45 -0000 1.70 +++ xpdf.spec 18 Jan 2006 21:34:46 -0000 1.71 @@ -7,7 +7,7 @@ Summary: A PDF file viewer for the X Window System. Name: xpdf Version: 3.01 -Release: 9 +Release: 10 License: GPL Epoch: 1 Url: http://www.foolabs.com/xpdf/ @@ -40,6 +40,7 @@ Requires: urw-fonts Requires: htmlview Requires: poppler-utils >= 0.5.0-4 +Requires: xpdf-utils BuildPrereq: openmotif-devel BuildPrereq: freetype-devel >= 2.1.7 @@ -79,7 +80,6 @@ %package utils Summary: Command line utilities for converting PDF files. Group: Applications/Text -Requires: %name = %{version} %description Xpdf is an X Window System based viewer for Portable Document Format @@ -252,6 +252,9 @@ %{_mandir}/man?/pdf* %changelog +* Wed Jan 18 2006 Ray Strode 3.01-10 +- remove requires line in utils subpackage + * Wed Jan 18 2006 Ray Strode 3.01-9 - remove pdf command-line utilities and require poppler ones instead (bug 177446). From fedora-cvs-commits at redhat.com Wed Jan 18 22:06:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 17:06:30 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.150, 1.151 policycoreutils.spec, 1.219, 1.220 Message-ID: <200601182206.k0IM6UMj024557@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24544 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Wed Jan 18 2006 Dan Walsh 1.29.8-3 - Add management of translation file to semaange and seobject policycoreutils-rhat.patch: scripts/chcat | 18 ++++-- semanage/semanage | 26 ++++++++-- semanage/semanage.8 | 7 ++ semanage/seobject.py | 129 +++++++++++++++++++++++++++++++++++++++++++++----- setsebool/setsebool.c | 7 +- 5 files changed, 160 insertions(+), 27 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- policycoreutils-rhat.patch 18 Jan 2006 18:55:09 -0000 1.150 +++ policycoreutils-rhat.patch 18 Jan 2006 22:06:19 -0000 1.151 @@ -43,10 +43,245 @@ sys.exit(listusercats(cmds)) else: if len(cmds) > 0: +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.8/semanage/semanage +--- nsapolicycoreutils/semanage/semanage 2006-01-18 11:12:43.000000000 -0500 ++++ policycoreutils-1.29.8/semanage/semanage 2006-01-18 17:02:47.000000000 -0500 +@@ -30,11 +30,12 @@ + + def usage(message = ""): + print '\ +-semanage user [-admLRr] SELINUX_USER\n\ ++semanage fcontext [-admhfrst] INTERFACE\n\ ++semanage interface [-admtr] INTERFACE\n\ + semanage login [-admsr] LOGIN_NAME\n\ + semanage port [-admtpr] PORT | PORTRANGE\n\ +-semanage interface [-admtr] INTERFACE\n\ +-semanage fcontext [-admhfrst] INTERFACE\n\ ++semanage translation [-adm] LEVEL\n\ ++semanage user [-admLRr] SELINUX_USER\n\ + -a, --add Add a OBJECT record NAME\n\ + -d, --delete Delete a OBJECT record NAME\n\ + -f, --ftype File Type of OBJECT \n\ +@@ -47,6 +48,7 @@ + -R, --roles SELinux Roles (Separate by spaces)\n\ + -s, --seuser SELinux user name\n\ + -t, --type SELinux Type for the object\n\ ++ -T, --trans SELinux Level Translation\n\ + -v, --verbose verbose output\n\ + ' + print message +@@ -62,7 +64,7 @@ + # + # + try: +- objectlist = ("login", "user", "port", "interface", "fcontext") ++ objectlist = ("login", "user", "port", "interface", "fcontext", "translation") + input = sys.stdin + output = sys.stdout + serange = "" +@@ -71,6 +73,7 @@ + selevel = "" + setype = "" + ftype = "" ++ setrans = "" + roles = "" + seuser = "" + heading=1 +@@ -88,7 +91,7 @@ + + args = sys.argv[2:] + gopts, cmds = getopt.getopt(args, +- 'adf:lhmnp:P:s:R:L:r:t:v', ++ 'adf:lhmnp:P:s:R:L:r:t:vT:', + ['add', + 'delete', + 'ftype=', +@@ -103,6 +106,7 @@ + 'level=', + 'roles=', + 'type=', ++ 'trans=', + 'verbose' + ]) + for o,a in gopts: +@@ -149,6 +153,9 @@ + if o == "-t" or o == "--type": + setype = a + ++ if o == "-T" or o == "--trans": ++ setrans = a ++ + if o == "-v" or o == "--verbose": + verbose = 1 + +@@ -167,6 +174,9 @@ + if object == "fcontext": + OBJECT = seobject.fcontextRecords() + ++ if object == "translation": ++ OBJECT = seobject.setransRecords() ++ + if list: + OBJECT.list(heading) + sys.exit(0); +@@ -180,6 +190,9 @@ + if object == "login": + OBJECT.add(target, seuser, serange) + ++ if object == "translation": ++ OBJECT.add(target, setrans) ++ + if object == "user": + rlist = roles.split() + if len(rlist) == 0: +@@ -200,6 +213,9 @@ + if object == "login": + OBJECT.modify(target, seuser, serange) + ++ if object == "translation": ++ OBJECT.modify(target, setrans) ++ + if object == "user": + rlist = roles.split() + OBJECT.modify(target, rlist, selevel, serange) +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.8/semanage/semanage.8 +--- nsapolicycoreutils/semanage/semanage.8 2006-01-18 11:12:43.000000000 -0500 ++++ policycoreutils-1.29.8/semanage/semanage.8 2006-01-18 17:04:31.000000000 -0500 +@@ -13,6 +13,8 @@ + .br + .B semanage interface \-{a|d|m} [\-tr] interface_spec + .br ++.B semanage translation \-{a|d|m} [\-T] level ++.br + .B semanage fcontext \-{a|d|m} [\-frst] file_spec + .P + +@@ -23,7 +25,7 @@ + .BR semanage + program. + .br +-This tool is used to configure SELinux Policy. You can configure SELinux User Mappings, SELinux Port Mappings, SELinux Users. File Context and Network Interfaces. ++This tool is used to configure SELinux Policy. You can configure SELinux User Mappings, SELinux Port Mappings, SELinux Users. File Context and Network Interfaces and MLS/MCS Translations. + + .SH "OPTIONS" + .TP +@@ -64,6 +66,9 @@ + .I \-t, \-\-type + SELinux Type for the object + .TP ++.I \-T, \-\-trans ++SELinux Translation ++.TP + .I \-v, \-\-verbose + verbose output + diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.8/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-01-18 11:12:43.000000000 -0500 -+++ policycoreutils-1.29.8/semanage/seobject.py 2006-01-18 13:26:43.000000000 -0500 -@@ -421,11 +421,11 @@ ++++ policycoreutils-1.29.8/semanage/seobject.py 2006-01-18 17:03:01.000000000 -0500 +@@ -21,9 +21,18 @@ + # + # + +-import pwd, string, selinux ++import pwd, string, selinux, tempfile, os, re + from semanage import *; + ++def validate_level(raw): ++ sensitivity="s([0-9]|1[0-5])" ++ category="c(1?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])" ++ range=category + "(\." + category +")?" ++ categories = range + "(\," + range + ")*" ++ sensitivity + "(:categies)?" ++ reg = sensitivity + "(-" + sensitivity + ")?" + "(:" + categories + ")?" ++ return re.search("^" + reg +"$",raw) ++ + def translate(raw, prepend=1): + if prepend == 1: + context="a:b:c:%s" % raw +@@ -54,6 +63,82 @@ + else: + return raw + ++class setransRecords: ++ def __init__(self): ++ self.filename=selinux.selinux_translations_path() ++ fd=open(self.filename, "r") ++ translations=fd.read().split('\n') ++ fd.close() ++ self.dict={} ++ self.comments=[] ++ for r in translations: ++ if len(r) == 0: ++ continue ++ i=r.strip() ++ if i== "" or i[0] == "#": ++ self.comments.append(r) ++ continue ++ i=i.split("=") ++ if len(i) != 2: ++ self.comments.append(r) ++ continue ++ self.dict[i[0]] = i[1] ++ ++ def get_all(self): ++ return self.dict ++ ++ def out(self): ++ rec="" ++ for c in self.comments: ++ rec+=c +"\n" ++ keys=self.dict.keys() ++ keys.sort() ++ for k in keys: ++ rec += "%s=%s\n" % (k, self.dict[k]) ++ return rec ++ ++ def list(self,heading=1): ++ if heading: ++ print "\n%-25s %s\n" % ("Level", "Translation") ++ keys=self.dict.keys() ++ keys.sort() ++ for k in keys: ++ print "%-25s %s" % (k, self.dict[k]) ++ ++ def add(self, raw, trans): ++ if trans.find(" ") >= 0: ++ raise ValueError("Translations can not contain spaces '%s' " % trans) ++ ++ if validate_level(raw) == None: ++ raise ValueError("Invalid Level '%s' " % raw) ++ ++ if self.dict.has_key(raw): ++ raise ValueError("%s already defined in translations" % raw) ++ else: ++ self.dict[raw]=trans ++ self.save() ++ ++ def modify(self, raw, trans): ++ if trans.find(" ") >= 0: ++ ++ raise ValueError("Translations can not contain spaces '%s' " % trans) ++ if self.dict.has_key(raw): ++ self.dict[raw]=trans ++ else: ++ raise ValueError("%s not defined in translations" % raw) ++ self.save() ++ ++ def delete(self, raw): ++ self.dict.pop(raw) ++ self.save() ++ ++ def save(self): ++ newfilename = tempfile.mktemp('', self.filename) ++ fd=open(newfilename, "w") ++ fd.write(self.out()) ++ fd.close() ++ os.rename(newfilename, self.filename) ++ + class semanageRecords: + def __init__(self): + self.sh = semanage_handle_create() +@@ -421,11 +506,11 @@ rc = semanage_port_modify_local(self.sh, k, p) if rc < 0: @@ -60,7 +295,7 @@ def modify(self, port, proto, serange, setype): if serange == "" and setype == "": -@@ -458,7 +458,7 @@ +@@ -458,7 +543,7 @@ rc = semanage_commit(self.sh) if rc < 0: @@ -69,7 +304,7 @@ def delete(self, port, proto): ( k, proto_d, low, high ) = self.__genkey(port, proto) -@@ -491,22 +491,44 @@ +@@ -491,22 +576,44 @@ for idx in range(self.psize): u = semanage_port_by_idx(self.plist, idx) con = semanage_port_get_con(u) Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.219 retrieving revision 1.220 diff -u -r1.219 -r1.220 --- policycoreutils.spec 18 Jan 2006 18:55:10 -0000 1.219 +++ policycoreutils.spec 18 Jan 2006 22:06:24 -0000 1.220 @@ -4,7 +4,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.8 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -97,6 +97,9 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Wed Jan 18 2006 Dan Walsh 1.29.8-3 +- Add management of translation file to semaange and seobject + * Wed Jan 18 2006 Dan Walsh 1.29.8-2 - Fix chcat -l -L to work while not root From fedora-cvs-commits at redhat.com Wed Jan 18 22:15:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 17:15:59 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc1-git1.bz2.sign, NONE, 1.1 .cvsignore, 1.328, 1.329 kernel-2.6.spec, 1.1860, 1.1861 sources, 1.270, 1.271 upstream, 1.246, 1.247 linux-2.6-net-nip6_fmt.patch, 1.1, NONE Message-ID: <200601182215.k0IMFxJC024731@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24692 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc1-git1.bz2.sign Removed Files: linux-2.6-net-nip6_fmt.patch Log Message: git1 --- NEW FILE patch-2.6.16-rc1-git1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDzfffyGugalF9Dw4RAtVMAJ9sUn9M3uU4qqnfZ5T9BoswohL5TwCglEGf PzAbioyFkWELU/xI/WAKTo0= =bnwt -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.328 retrieving revision 1.329 diff -u -r1.328 -r1.329 --- .cvsignore 17 Jan 2006 21:18:44 -0000 1.328 +++ .cvsignore 18 Jan 2006 22:15:55 -0000 1.329 @@ -4,3 +4,4 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc1.bz2 bcm43xx-20060114.tar.bz2 +patch-2.6.16-rc1-git1.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1860 retrieving revision 1.1861 diff -u -r1.1860 -r1.1861 --- kernel-2.6.spec 17 Jan 2006 21:18:44 -0000 1.1860 +++ kernel-2.6.spec 18 Jan 2006 22:15:55 -0000 1.1861 @@ -208,8 +208,8 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc1.bz2 -Patch2: drm.patch -#Patch2: patch-2.6.16-rc1-git1.bz2 +Patch2: patch-2.6.16-rc1-git1.bz2 +Patch3: drm.patch # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -225,7 +225,7 @@ # 300 - 399 ppc(64) Patch301: linux-2.6.15-cell-numa-init.patch -Patch304: linux-2.6.15-mv643xx-fixes.patch +#Patch304: linux-2.6.15-mv643xx-fixes.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch Patch310: linux-2.6-cell-spiderpic-no-devtree.patch @@ -349,7 +349,6 @@ Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch Patch1850: linux-2.6-mv643xx-compile-fix.patch -Patch1860: linux-2.6-net-nip6_fmt.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -584,7 +583,8 @@ # Update to latest upstream. %patch1 -p1 -%patch2 -p1 -R +%patch2 -p1 +%patch3 -p1 -R # # Patches 10 through 100 are meant for core subsystem upgrades @@ -625,7 +625,7 @@ # Arnd says don't call cell_spumem_init() till he fixes it. %patch301 -p1 # Fix the MV643xx Gigabit Ethernet driver -%patch304 -p1 +#%patch304 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. %patch305 -p1 # Make HVC console generic; support simulator console device using it. @@ -826,8 +826,6 @@ %patch1840 -p1 # Fix compilation for MV643xx Ethernet %patch1850 -p1 -# Revert changes that broke named, ifconfig, radvd etc -%patch1860 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 %patch1901 -p1 @@ -1351,6 +1349,9 @@ %endif %changelog +* Wed Jan 18 2006 Dave Jones +- 2.6.16-rc1-git1 + * Tue Jan 17 2006 Dave Jones - 2.6.16-rc1 - Revert changes that broke named, ifconfig, radvd etc Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- sources 17 Jan 2006 21:18:44 -0000 1.270 +++ sources 18 Jan 2006 22:15:55 -0000 1.271 @@ -1,3 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2 ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 +7925416f53c62a3fb778d30e42e3853c patch-2.6.16-rc1-git1.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- upstream 17 Jan 2006 21:18:44 -0000 1.246 +++ upstream 18 Jan 2006 22:15:55 -0000 1.247 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc1.bz2 - +patch-2.6.16-rc1-git1.bz2 --- linux-2.6-net-nip6_fmt.patch DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 18 22:16:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 17:16:00 -0500 Subject: rpms/kernel/devel/configs config-generic,1.135,1.136 Message-ID: <200601182216.k0IMG0K0024740@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv24692/configs Modified Files: config-generic Log Message: git1 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.135 retrieving revision 1.136 diff -u -r1.135 -r1.136 --- config-generic 17 Jan 2006 21:18:45 -0000 1.135 +++ config-generic 18 Jan 2006 22:15:56 -0000 1.136 @@ -1107,6 +1107,7 @@ CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_CS=m # From fedora-cvs-commits at redhat.com Wed Jan 18 22:19:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 17:19:15 -0500 Subject: rpms/hal/devel hal-0.5.6-eject-audio-cd.patch, NONE, 1.1 hal.spec, 1.78, 1.79 Message-ID: <200601182219.k0IMJFFF004560@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/hal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4543 Modified Files: hal.spec Added Files: hal-0.5.6-eject-audio-cd.patch Log Message: - Patch storage-method policy so that the eject method is available to audio cd's hal-0.5.6-eject-audio-cd.patch: 0 files changed --- NEW FILE hal-0.5.6-eject-audio-cd.patch --- Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- hal.spec 18 Jan 2006 19:12:38 -0000 1.78 +++ hal.spec 18 Jan 2006 22:19:12 -0000 1.79 @@ -18,10 +18,11 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.6 -Release: 2 +Release: 3 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz Source1: 99-redhat-storage-policy-fixed-drives.fdi +Patch0: hal-0.5.6-eject-audio-cd.patch License: AFL/GPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-root @@ -80,6 +81,8 @@ %prep %setup -q +%patch0 -p1 -b .eject-audio-cd + %build %configure --disable-docbook-docs --with-os-type=redhat --enable-pcmcia-support --with-stab-file=/var/lib/pcmcia/stab @@ -170,6 +173,10 @@ %{_bindir}/hal-device-manager %changelog +* Wed Jan 18 2006 John (J5) Palmieri - 0.5.6-3 +- Patch storage-method policy so that the eject method is available + to audio cd's + * Wed Jan 18 2006 John (J5) Palmieri - 0.5.6-2 - Add policy file to ignore fixed disks. This is a temporary solution until upstream comes up with a more flexable option From fedora-cvs-commits at redhat.com Thu Jan 19 00:37:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 19:37:50 -0500 Subject: rpms/libbonobo/devel libbonobo-2.13.1-multishlib.patch, NONE, 1.1 libbonobo.spec, 1.23, 1.24 Message-ID: <200601190037.k0J0bo6e026421@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26357 Modified Files: libbonobo.spec Added Files: libbonobo-2.13.1-multishlib.patch Log Message: - Step one of the multi-bonoboshlib process (bug 156982) libbonobo-2.13.1-multishlib.patch: Makefile.am | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) --- NEW FILE libbonobo-2.13.1-multishlib.patch --- --- libbonobo-2.13.1/activation-server/Makefile.am.multishlib 2006-01-18 18:42:26.000000000 -0500 +++ libbonobo-2.13.1/activation-server/Makefile.am 2006-01-18 18:43:24.000000000 -0500 @@ -6,13 +6,19 @@ libexec_PROGRAMS=bonobo-activation-server noinst_PROGRAMS=test-performance +serverinfolibdir = $(libdir)/bonobo/servers + +ifneq ($(libdir), $(exec_prefix)/lib) +serverinfolibdir := $(serverinfolibdir):$(exec_prefix)/lib/bonobo/servers +endif + INCLUDES= \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_builddir)/bonobo-activation \ -I$(top_srcdir)/bonobo-activation \ -DPREFIX=\""$(prefix)"\" \ - -DSERVERINFODIR=\"$(libdir)/bonobo/servers\" \ + -DSERVERINFODIR=\"$(serverinfolibdir)\" \ -DSERVER_LOCALEDIR=\""${prefix}/${DATADIRNAME}/locale"\" \ $(SERVER_CFLAGS) \ -DSERVER_CONFDIR=\"$(sysconfdir)\" \ Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- libbonobo.spec 17 Jan 2006 02:52:56 -0000 1.23 +++ libbonobo.spec 19 Jan 2006 00:37:40 -0000 1.24 @@ -6,7 +6,7 @@ Summary: Bonobo component system Name: libbonobo Version: 2.13.1 -Release: 1 +Release: 2 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -21,6 +21,8 @@ Obsoletes: bonobo-activation Provides: bonobo-activation = %{version}-%{release} +Patch0: libbonobo-2.13.1-multishlib.patch + %description Bonobo is a component system based on CORBA, used by the GNOME desktop. @@ -44,6 +46,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .multishlib %build %configure --disable-gtk-doc @@ -100,6 +103,10 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Wed Jan 18 2006 Ray Strode 2.13.1-2 +- Step one of the multi-bonoboshlib process + (bug 156982) + * Mon Jan 16 2006 Matthias Clasen - Update to 2.13.1 From fedora-cvs-commits at redhat.com Thu Jan 19 00:39:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 19:39:57 -0500 Subject: rpms/libbonobo/devel libbonobo.spec,1.24,1.25 Message-ID: <200601190039.k0J0dvPf027076@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27012 Modified Files: libbonobo.spec Log Message: rev release Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- libbonobo.spec 19 Jan 2006 00:37:40 -0000 1.24 +++ libbonobo.spec 19 Jan 2006 00:39:52 -0000 1.25 @@ -6,7 +6,7 @@ Summary: Bonobo component system Name: libbonobo Version: 2.13.1 -Release: 2 +Release: 3 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -103,7 +103,7 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog -* Wed Jan 18 2006 Ray Strode 2.13.1-2 +* Wed Jan 18 2006 Ray Strode 2.13.1-3 - Step one of the multi-bonoboshlib process (bug 156982) From fedora-cvs-commits at redhat.com Thu Jan 19 01:23:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 20:23:53 -0500 Subject: rpms/autofs/FC-4 autofs-4.1.4-check-return-of-is-local-addr.patch, NONE, 1.1 autofs-4.1.4-configureable-locking.patch, NONE, 1.1 autofs-4.1.4-fix-sort-opts.patch, NONE, 1.1 autofs-4.1.4-keylen-length-check.patch, NONE, 1.1 autofs-4.1.4-locking-fix.patch, NONE, 1.1 autofs-4.1.4-multi-parse-fix.patch, NONE, 1.1 autofs-4.1.4-no-slash-misc.patch, NONE, 1.1 autofs-4.1.4-reentrant-syslog-copyright.patch, NONE, 1.1 autofs-4.1.4-reentrant-syslog.patch, NONE, 1.1 autofs-4.1.4-sockopt-len-type.patch, NONE, 1.1 autofs-4.1.4-sol10-schema.patch, NONE, 1.1 autofs-4.1.4-solaris-hosts-in-auto-master.patch, 1.1, 1.2 autofs-4.1.4-sun-parse-fixes.patch, NONE, 1.1 autofs-4.1.4-yp_order-order-type.patch, NONE, 1.1 autofs-4.1.4-check-nsswitch-submount.patch, 1.2, 1.3 autofs.spec, 1.64, 1.65 autofs-4.1.4-deferred-syslog.patch, 1.1, NONE autofs-4.1.4-init-redhat-only.patch, 1.1, NONE Message-ID: <200601190123.k0J1Nr1a015243@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv15225 Modified Files: autofs-4.1.4-check-nsswitch-submount.patch autofs.spec Added Files: autofs-4.1.4-check-return-of-is-local-addr.patch autofs-4.1.4-configureable-locking.patch autofs-4.1.4-fix-sort-opts.patch autofs-4.1.4-keylen-length-check.patch autofs-4.1.4-locking-fix.patch autofs-4.1.4-multi-parse-fix.patch autofs-4.1.4-no-slash-misc.patch autofs-4.1.4-reentrant-syslog-copyright.patch autofs-4.1.4-reentrant-syslog.patch autofs-4.1.4-sockopt-len-type.patch autofs-4.1.4-sol10-schema.patch autofs-4.1.4-solaris-hosts-in-auto-master.patch autofs-4.1.4-sun-parse-fixes.patch autofs-4.1.4-yp_order-order-type.patch Removed Files: autofs-4.1.4-deferred-syslog.patch autofs-4.1.4-init-redhat-only.patch Log Message: * Tue Jan 17 2006 Ian Kent - 1:4.1.4-15 - Sync patches with rawhide. - Replace deferred syslog patch with reentrant syslog patch. - Update copyright declaration for reentrant-syslog source. - Replace check-is-multi with more general multi-parse-fix. - Add fix for premature return when waiting for lock file. - Add patch for configure option to disable locking during mount. But don't disable locking by default. - Add ability to handle automount schema used in Sun directory server. - Quell compiler warning about getsockopt parameter. - Quell compiler warning about yp_order parameter. autofs-4.1.4-check-return-of-is-local-addr.patch: mount_nfs.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE autofs-4.1.4-check-return-of-is-local-addr.patch --- --- autofs-4.1.4/modules/mount_nfs.c.orig 2005-10-26 18:37:31.000000000 -0400 +++ autofs-4.1.4/modules/mount_nfs.c 2005-10-26 18:37:38.000000000 -0400 @@ -192,7 +192,7 @@ *pstrip = '\0'; /* Check if the host is the localhost */ - if (is_local_mount(p)) { + if (is_local_mount(p) > 0) { debug(MODPREFIX "host %s: is localhost", p); /* Strip off hostname and ':' */ autofs-4.1.4-configureable-locking.patch: configure | 18 ++++++++++++++++++ configure.in | 10 ++++++++++ daemon/spawn.c | 2 ++ include/automount.h | 8 ++++++-- include/config.h.in | 2 ++ patches/util-linux-2.12a-flock.patch | 26 ++++++++++++++++++++++++++ patches/util-linux-2.12q-flock.patch | 25 +++++++++++++++++++++++++ 7 files changed, 89 insertions(+), 2 deletions(-) --- NEW FILE autofs-4.1.4-configureable-locking.patch --- This patch provides a configure option to disable the use of a lock file when calling mount from autofs. It also adds a patch to the "patches" directory that needs to be used for mount to (hopefuully) prevent /etc/mtab corruption when rapidly mounting filesystems when autofs does not use locking. To disable the locking add the configure option --disable-mount-locking. diff -Nurp autofs-4.1.4.orig/configure autofs-4.1.4/configure --- autofs-4.1.4.orig/configure 2005-04-06 23:24:37.000000000 +0800 +++ autofs-4.1.4/configure 2005-10-23 11:33:44.000000000 +0800 @@ -842,6 +842,7 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-ext-env disable search in environment for substitution variable +--disable-mount-locking disable use of locking when spawning mount command Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -4308,6 +4309,23 @@ _ACEOF fi # +# Disable use of locking when spawning mount command +# +# Check whether --enable-mount-locking or --disable-mount-locking was given. +if test "${enable_mount_locking+set}" = set; then + enableval="$enable_mount_locking" + +else + enableval=yes +fi; +if test x$enable_mount_locking = xyes -o x$enableval = xyes; then + cat >>confdefs.h <<\_ACEOF +#define ENABLE_MOUNT_LOCKING 1 +_ACEOF + +fi + +# # Write Makefile.conf and include/config.h # ac_config_headers="$ac_config_headers include/config.h" diff -Nurp autofs-4.1.4.orig/configure.in autofs-4.1.4/configure.in --- autofs-4.1.4.orig/configure.in 2005-04-06 23:24:37.000000000 +0800 +++ autofs-4.1.4/configure.in 2005-10-23 11:33:35.000000000 +0800 @@ -167,6 +167,16 @@ if test x$enable_ext_env = xyes; then fi # +# Disable use of locking when spawning mount command +# +AC_ARG_ENABLE(mount-locking, +--disable-mount-locking disable use of locking when spawning mount command,, + enableval=yes) +if test x$enable_mount_locking = xyes -o x$enableval = xyes; then + AC_DEFINE(ENABLE_MOUNT_LOCKING, 1) +fi + +# # Write Makefile.conf and include/config.h # AC_CONFIG_HEADER(include/config.h) diff -Nurp autofs-4.1.4.orig/daemon/spawn.c autofs-4.1.4/daemon/spawn.c --- autofs-4.1.4.orig/daemon/spawn.c 2005-02-10 20:56:53.000000000 +0800 +++ autofs-4.1.4/daemon/spawn.c 2005-10-23 10:51:10.000000000 +0800 @@ -322,6 +322,7 @@ int spawnl(int logpri, const char *prog, return do_spawn(logpri, 0, prog, (const char **) argv); } +#ifdef ENABLE_MOUNT_LOCKING int spawnll(int logpri, const char *prog, ...) { va_list arg; @@ -342,3 +343,4 @@ int spawnll(int logpri, const char *prog return do_spawn(logpri, 1, prog, (const char **) argv); } +#endif diff -Nurp autofs-4.1.4.orig/include/automount.h autofs-4.1.4/include/automount.h --- autofs-4.1.4.orig/include/automount.h 2005-01-26 21:03:02.000000000 +0800 +++ autofs-4.1.4/include/automount.h 2005-10-23 10:51:10.000000000 +0800 @@ -121,9 +121,13 @@ extern struct autofs_point ap; int aquire_lock(void); void release_lock(void); -int spawnll(int logpri, const char *prog, ...); int spawnl(int logpri, const char *prog, ...); -int spawnv(int logpri, const char *prog, const char *const *argv); +#ifdef ENABLE_MOUNT_LOCKING +int spawnll(int logpri, const char *prog, ...); +#else +#define spawnll spawnl +#endif +int spawnv(int ogpri, const char *prog, const char *const *argv); void reset_signals(void); void ignore_signals(void); void discard_pending(int sig); diff -Nurp autofs-4.1.4.orig/include/config.h.in autofs-4.1.4/include/config.h.in --- autofs-4.1.4.orig/include/config.h.in 2004-02-03 23:23:21.000000000 +0800 +++ autofs-4.1.4/include/config.h.in 2005-10-23 10:51:10.000000000 +0800 @@ -25,3 +25,5 @@ #undef HAVE_SLOPPY_MOUNT #undef ENABLE_EXT_ENV + +#undef ENABLE_MOUNT_LOCKING diff -Nurp autofs-4.1.4.orig/patches/util-linux-2.12a-flock.patch autofs-4.1.4/patches/util-linux-2.12a-flock.patch --- autofs-4.1.4.orig/patches/util-linux-2.12a-flock.patch 1970-01-01 08:00:00.000000000 +0800 +++ autofs-4.1.4/patches/util-linux-2.12a-flock.patch 2005-10-23 10:51:10.000000000 +0800 @@ -0,0 +1,30 @@ +--- util-linux-2.12a/mount/fstab.c.flock 2005-09-17 01:36:03.000000000 +0800 ++++ util-linux-2.12a/mount/fstab.c 2005-09-17 01:41:12.000000000 +0800 +@@ -488,7 +488,7 @@ lock_mtab (void) { + } + /* proceed anyway */ + } +- we_created_lockfile = 1; ++ we_created_lockfile = fd; + } else { + static int tries = 0; + +@@ -510,9 +510,8 @@ lock_mtab (void) { + MOUNTED_LOCK); + sleep(1); + } ++ close(fd); + } +- +- close(fd); + } + } + +@@ -520,6 +519,7 @@ lock_mtab (void) { + void + unlock_mtab (void) { + if (we_created_lockfile) { ++ close(we_created_lockfile); + unlink (MOUNTED_LOCK); + we_created_lockfile = 0; + } diff -Nurp autofs-4.1.4.orig/patches/util-linux-2.12q-flock.patch autofs-4.1.4/patches/util-linux-2.12q-flock.patch --- autofs-4.1.4.orig/patches/util-linux-2.12q-flock.patch 1970-01-01 08:00:00.000000000 +0800 +++ autofs-4.1.4/patches/util-linux-2.12q-flock.patch 2005-10-23 10:51:10.000000000 +0800 @@ -0,0 +1,29 @@ +--- util-linux-2.12q/mount/fstab.c.flock 2005-09-17 01:10:37.000000000 +0800 ++++ util-linux-2.12q/mount/fstab.c 2005-09-17 01:16:51.000000000 +0800 +@@ -417,6 +417,7 @@ + unlock_mtab (void) { + if (we_created_lockfile) { + unlink (MOUNTED_LOCK); ++ close(we_created_lock_file); + we_created_lockfile = 0; + } + } +@@ -528,6 +529,7 @@ + } + /* proceed anyway */ + } ++ we_created_lock_file = fd; + } else { + static int tries = 0; + +@@ -549,9 +551,8 @@ + MOUNTED_LOCK); + sleep(1); + } ++ close(fd); + } +- +- close(fd); + } + } + autofs-4.1.4-fix-sort-opts.patch: auto.net | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE autofs-4.1.4-fix-sort-opts.patch --- --- autofs-4.1.4/samples/auto.net.orig 2005-11-03 19:15:10.000000000 -0500 +++ autofs-4.1.4/samples/auto.net 2005-11-03 19:15:19.000000000 -0500 @@ -37,7 +37,7 @@ done # Newer distributions get this right SHOWMOUNT="$SMNT --no-headers -e $key" -$SHOWMOUNT | LC_ALL=C sort +0 | \ +$SHOWMOUNT | LC_ALL=C sort -k 1 | \ awk -v key="$key" -v opts="$opts" -- ' BEGIN { ORS=""; first=1 } { if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 } autofs-4.1.4-keylen-length-check.patch: lookup_file.c | 4 ++++ 1 files changed, 4 insertions(+) --- NEW FILE autofs-4.1.4-keylen-length-check.patch --- Fix a buffer overflow with large key lengths. -Jeff diff -Nurp autofs-4.1.4.orig/modules/lookup_file.c autofs-4.1.4/modules/lookup_file.c --- autofs-4.1.4.orig/modules/lookup_file.c 2005-04-06 23:14:23.000000000 +0800 +++ autofs-4.1.4/modules/lookup_file.c 2005-05-07 17:27:30.000000000 +0800 @@ -157,6 +157,10 @@ static int read_one(FILE *f, char *key, break; case st_compare: + if (kptr - key > KEY_MAX_LEN) { + state = st_badent; + break; + } if (ch == '\n') state = st_begin; else if (isspace(ch) && !escape) { autofs-4.1.4-locking-fix.patch: daemon/spawn.c | 17 ++++++++++------- lib/lock.c | 8 ++++---- 2 files changed, 14 insertions(+), 11 deletions(-) --- NEW FILE autofs-4.1.4-locking-fix.patch --- This patch fixes two things. First, sloppy error handling when spawning a sub task. Second, if the process receives a signal while waiting on the lock file it will return a "timed out" error after only a little more than a tenth of a second. This was due to the wait time variable not being reset after each tenth of a second wait. diff -Nurp autofs-4.1.4.orig/daemon/spawn.c autofs-4.1.4/daemon/spawn.c --- autofs-4.1.4.orig/daemon/spawn.c 2005-02-10 20:56:53.000000000 +0800 +++ autofs-4.1.4/daemon/spawn.c 2005-11-01 18:36:35.000000000 +0800 @@ -214,14 +214,15 @@ static int do_spawn(int logpri, int use_ sigfillset(&allsignals); sigprocmask(SIG_BLOCK, &allsignals, &oldsig); - if (pipe(pipefd)) + if (pipe(pipefd)) { + if (use_lock) + release_lock(); + sigprocmask(SIG_SETMASK, &oldsig, NULL); return -1; + } f = fork(); - if (f < 0) { - sigprocmask(SIG_SETMASK, &oldsig, NULL); - return -1; - } else if (f == 0) { + if (f == 0) { reset_signals(); close(pipefd[0]); dup2(pipefd[1], STDOUT_FILENO); @@ -243,6 +244,8 @@ static int do_spawn(int logpri, int use_ if (f < 0) { close(pipefd[0]); + if (use_lock) + release_lock(); sigprocmask(SIG_SETMASK, &oldsig, NULL); return -1; } @@ -287,11 +290,11 @@ static int do_spawn(int logpri, int use_ if (waitpid(f, &status, 0) != f) status = -1; /* waitpid() failed */ - sigprocmask(SIG_SETMASK, &oldsig, NULL); - if (use_lock) release_lock(); + sigprocmask(SIG_SETMASK, &oldsig, NULL); + return status; } } diff -Nurp autofs-4.1.4.orig/lib/lock.c autofs-4.1.4/lib/lock.c --- autofs-4.1.4.orig/lib/lock.c 2005-01-17 23:09:28.000000000 +0800 +++ autofs-4.1.4/lib/lock.c 2005-11-01 20:12:28.000000000 +0800 @@ -208,9 +208,6 @@ void release_lock(void) */ static int wait_for_lockf(const char *lockf) { - struct timespec t = { 0, WAIT_INTERVAL }; - struct timespec r; - int ts_size = sizeof(struct timespec); int tries = WAIT_TRIES; int status = 0; struct stat st; @@ -218,10 +215,13 @@ static int wait_for_lockf(const char *lo while (tries-- && !status) { status = stat(lockf, &st); if (!status) { + struct timespec t = { 0, WAIT_INTERVAL }; + struct timespec r; + while (nanosleep(&t, &r) == -1 && errno == EINTR) { if (got_term) return 0; - memcpy(&t, &r, ts_size); + memcpy(&t, &r, sizeof(struct timespec)); } } } autofs-4.1.4-multi-parse-fix.patch: parse_sun.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) --- NEW FILE autofs-4.1.4-multi-parse-fix.patch --- diff -Nurp autofs-4.1.4.orig/modules/parse_sun.c autofs-4.1.4/modules/parse_sun.c --- autofs-4.1.4.orig/modules/parse_sun.c 2005-04-05 20:42:42.000000000 +0800 +++ autofs-4.1.4/modules/parse_sun.c 2005-04-25 10:00:13.000000000 +0800 @@ -766,7 +766,16 @@ static int check_is_multi(const char *ma { const char *p = (char *) mapent; int multi = 0; - int first_chunk = 0; + int not_first_chunk = 0; + + if (!p) { + crit("check_is_multi: unexpected NULL map entry pointer"); + return 0; + } + + /* If first character is "/" it's a multi-mount */ + if (*p == '/') + return 1; while (*p) { p = skipspace(p); @@ -779,7 +788,7 @@ static int check_is_multi(const char *ma * path that begins with '/' indicates a mutil-mount * entry. */ - if (first_chunk) { + if (not_first_chunk) { if (*p == '/' || *p == '-') { multi = 1; break; @@ -796,7 +805,7 @@ static int check_is_multi(const char *ma * after which it's a multi mount. */ p += chunklen(p, check_colon(p)); - first_chunk++; + not_first_chunk++; } return multi; @@ -883,7 +892,12 @@ int parse_mount(const char *root, const return 1; } - path = dequote(p, l = chunklen(p, 0)); + if (*p != '/') { + l = 0; + path = dequote("/", 1); + } else + path = dequote(p, l = chunklen(p, 0)); + if (!path) { error(MODPREFIX "out of memory"); free(myoptions); autofs-4.1.4-no-slash-misc.patch: auto.master | 1 - 1 files changed, 1 deletion(-) --- NEW FILE autofs-4.1.4-no-slash-misc.patch --- --- autofs-4.1.4/samples/auto.master.orig 2005-11-17 08:42:36.000000000 -0500 +++ autofs-4.1.4/samples/auto.master 2005-11-17 08:42:42.000000000 -0500 @@ -7,5 +7,4 @@ # For details of the format look at autofs(5). #/misc /etc/auto.misc --timeout=60 #/smb /etc/auto.smb -/misc /etc/auto.misc /net /etc/auto.net autofs-4.1.4-reentrant-syslog-copyright.patch: COPYRIGHT | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletion(-) --- NEW FILE autofs-4.1.4-reentrant-syslog-copyright.patch --- --- autofs-4.1.4/COPYRIGHT.reentrant-syslog-copyright 2006-01-15 23:24:04.000000000 -0500 +++ autofs-4.1.4/COPYRIGHT 2006-01-15 23:24:46.000000000 -0500 @@ -14,4 +14,38 @@ GNU General Public License for more details. Portions Copyright (C) 1999-2000 Jeremy Fitzhardinge -Portions Copyright (C) 2001-2003 Ian Kent +Portions Copyright (C) 2001-2005 Ian Kent + +The files lib/syslog.c and include/syslog.h are licenced under the +BSD License and require that a copy of the notice ibelow be included in +accompanying documentation and be distributed with binary distributions +of the code, so be sure to include this file along with any binary +distributions derived from this source package. + +Copyright (c) 1983, 1988, 1993 + The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + autofs-4.1.4-reentrant-syslog.patch: daemon/automount.c | 72 ++++-- include/automount.h | 27 ++ include/syslog.h | 201 ++++++++++++++++ lib/Makefile | 5 lib/syslog.c | 383 ++++++++++++++++++++++++++++++++ lib/vsprintf.c | 619 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1289 insertions(+), 18 deletions(-) --- NEW FILE autofs-4.1.4-reentrant-syslog.patch --- --- autofs-4.1.4/daemon/automount.c.orig 2005-03-06 04:43:55.000000000 -0500 +++ autofs-4.1.4/daemon/automount.c 2005-10-26 13:25:25.000000000 -0400 @@ -38,13 +38,32 @@ #include #include +#include "automount.h" + #ifndef NDEBUG -#define assert(x) do { if (!(x)) { syslog(LOG_CRIT, __FILE__ ":%d: assertion failed: " #x, __LINE__); } } while(0) +#define assert(x) \ + do { \ + if (!(x)) { \ + crit(__FILE__ ":%d: assertion failed: " #x, \ + __LINE__); \ + } \ + } while(0) #else #define assert(x) do { } while(0) #endif -#include "automount.h" +#ifndef NDEBUG +#define assert_r(context, x) \ + do { \ + if (!(x)) { \ + crit_r(context, \ + __FILE__ ":%d: assertion failed: ",\ + __LINE__); \ + } \ + } while(0) +#else +#define assert_r(context, x) do { } while(0) +#endif const char *program; /* Initialized with argv[0] */ const char *version = VERSION_STRING; /* Program version */ @@ -67,6 +86,9 @@ sigset_t sigchld_mask; struct autofs_point ap; +/* re-entrant syslog default context data */ +#define AUTOFS_SYSLOG_CONTEXT {-1, 0, 0, LOG_PID, (const char *)0, LOG_DAEMON, 0xff} + volatile struct pending_mount *junk_mounts = NULL; #define CHECK_RATIO 4 /* exp_runfreq = exp_timeout/CHECK_RATIO */ @@ -480,19 +502,25 @@ static int mount_autofs(char *path) static void nextstate(enum states next) { + static struct syslog_data syslog_context = AUTOFS_SYSLOG_CONTEXT; + static struct syslog_data *slc = &syslog_context; + if (write(ap.state_pipe[1], &next, sizeof(next)) != sizeof(next)) - error("nextstate: write failed %m"); + error_r(slc, "nextstate: write failed %m"); } /* Deal with all the signal-driven events in the state machine */ static void sig_statemachine(int sig) { + static struct syslog_data syslog_context = AUTOFS_SYSLOG_CONTEXT; + static struct syslog_data *slc = &syslog_context; int save_errno = errno; enum states next = ap.state; switch (sig) { default: /* all the "can't happen" signals */ - error("process %d got unexpected signal %d!", getpid(), sig); + error_r(slc, "process %d got unexpected signal %d!", + getpid(), sig); break; /* don't FALLTHROUGH */ @@ -518,18 +546,21 @@ static void sig_statemachine(int sig) break; } - debug("sig %d switching from %d to %d", sig, ap.state, next); + debug_r(slc, "sig %d switching from %d to %d", sig, ap.state, next); errno = save_errno; } static int send_ready(unsigned int wait_queue_token) { + static struct syslog_data syslog_context = AUTOFS_SYSLOG_CONTEXT; + static struct syslog_data *slc = &syslog_context; + if (wait_queue_token == 0) return 0; - debug("send_ready: token=%d\n", wait_queue_token); + debug_r(slc, "send_ready: token=%d\n", wait_queue_token); if (ioctl(ap.ioctlfd, AUTOFS_IOC_READY, wait_queue_token) < 0) { - error("AUTOFS_IOC_READY: %m"); + error_r(slc, "AUTOFS_IOC_READY: %m"); return 1; } return 0; @@ -537,11 +568,14 @@ static int send_ready(unsigned int wait_ static int send_fail(unsigned int wait_queue_token) { + static struct syslog_data syslog_context = AUTOFS_SYSLOG_CONTEXT; + static struct syslog_data *slc = &syslog_context; + if (wait_queue_token == 0) return 0; - debug("send_fail: token=%d\n", wait_queue_token); + debug_r(slc, "send_fail: token=%d\n", wait_queue_token); if (ioctl(ap.ioctlfd, AUTOFS_IOC_FAIL, wait_queue_token) < 0) { - syslog(LOG_ERR, "AUTOFS_IOC_FAIL: %m"); + error_r(slc, "AUTOFS_IOC_FAIL: %m"); return 1; } return 0; @@ -552,6 +586,8 @@ static int send_fail(unsigned int wait_q result. */ static enum states handle_child(int hang) { + static struct syslog_data syslog_context = AUTOFS_SYSLOG_CONTEXT; + static struct syslog_data *slc = &syslog_context; pid_t pid; int status; enum states next = ST_INVAL; @@ -559,7 +595,7 @@ static enum states handle_child(int hang while ((pid = waitpid(-1, &status, hang ? 0 : WNOHANG)) > 0) { struct pending_mount volatile *mt, *volatile *mtp; - debug("handle_child: got pid %d, sig %d (%d), stat %d\n", + debug_r(slc, "handle_child: got pid %d, sig %d (%d), stat %d", pid, WIFSIGNALED(status), WTERMSIG(status), WEXITSTATUS(status)); @@ -605,18 +641,19 @@ static enum states handle_child(int hang } /* Failed shutdown returns to ready */ - warn("can't shutdown: filesystem %s still busy", - ap.path); + warn_r(slc, + "can't shutdown: filesystem %s still busy", + ap.path); alarm(ap.exp_runfreq); next = ST_READY; break; default: - error("bad state %d", ap.state); + error_r(slc, "bad state %d", ap.state); } if (next != ST_INVAL) - debug("sigchld: exp " + debug_r(slc, "sigchld: exp " "%d finished, switching from %d to %d", pid, ap.state, next); @@ -632,7 +669,7 @@ static enum states handle_child(int hang if (!WIFEXITED(status) && !WIFSIGNALED(status)) break; - debug("sig_child: found pending iop pid %d: " + debug_r(slc, "sig_child: found pending iop pid %d: " "signalled %d (sig %d), exit status %d", pid, WIFSIGNALED(status), WTERMSIG(status), WEXITSTATUS(status)); @@ -1485,11 +1522,14 @@ static void setup_signals(__sighandler_t /* Deal with the signals recieved by direct mount supervisor */ static void sig_supervisor(int sig) { + static struct syslog_data syslog_context = AUTOFS_SYSLOG_CONTEXT; + static struct syslog_data *slc = &syslog_context; int save_errno = errno; switch (sig) { default: /* all the signals not handled */ - error("process %d got unexpected signal %d!", getpid(), sig); + error_r(slc, "process %d got unexpected signal %d!", + getpid(), sig); return; /* don't FALLTHROUGH */ --- autofs-4.1.4/include/automount.h.orig 2005-01-26 08:03:02.000000000 -0500 +++ autofs-4.1.4/include/automount.h 2005-10-26 13:24:14.000000000 -0400 @@ -15,6 +15,9 @@ #include #include "config.h" +/* OpenBSD re-entrant syslog */ +#include "syslog.h" + /* We MUST have the paths to mount(8) and umount(8) */ #ifndef HAVE_MOUNT #error Failed to locate mount(8)! @@ -302,5 +305,29 @@ if (do_verbose || do_debug) \ if (do_debug) \ syslog(LOG_DEBUG, msg, ##args); +/* Define reentrant logging macros for signal handlers */ + +#define debug_r(context, msg, args...) \ +do { \ + if (do_debug) \ + syslog_r(LOG_DEBUG, context, msg, ##args); \ +} while (0) + +#define warn_r(context, msg, args...) \ +do { \ + if (do_verbose || do_debug) \ + syslog_r(LOG_WARNING, context, msg, ##args); \ +} while (0) + +#define error_r(context, msg, args...) \ +do { \ + syslog_r(LOG_ERR, context, msg, ##args); \ +} while (0) + +#define crit_r(context, msg, args...) \ +do { \ + syslog_r(LOG_CRIT, context, msg, ##args); \ +} while (0) + #endif --- /dev/null 2005-10-26 07:34:27.808601500 -0400 +++ autofs-4.1.4/include/syslog.h 2005-10-26 13:24:14.000000000 -0400 @@ -0,0 +1,201 @@ +/* $OpenBSD: syslog.h,v 1.11 2003/08/24 01:27:07 avsm Exp $ */ +/* $NetBSD: syslog.h,v 1.14 1996/04/03 20:46:44 christos Exp $ */ + +/* + * Copyright (c) 1982, 1986, 1988, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * @(#)syslog.h 8.1 (Berkeley) 6/2/93 + */ + +#ifndef _SYS_SYSLOG_H_ +#define _SYS_SYSLOG_H_ + +#include +#define __need___va_list +#include + +#define _PATH_LOG "/dev/log" + +/* + * priorities/facilities are encoded into a single 32-bit quantity, where the + * bottom 3 bits are the priority (0-7) and the top 28 bits are the facility + * (0-big number). Both the priorities and the facilities map roughly + * one-to-one to strings in the syslogd(8) source code. This mapping is + * included in this file. + * + * priorities (these are ordered) + */ +#define LOG_EMERG 0 /* system is unusable */ +#define LOG_ALERT 1 /* action must be taken immediately */ +#define LOG_CRIT 2 /* critical conditions */ +#define LOG_ERR 3 /* error conditions */ +#define LOG_WARNING 4 /* warning conditions */ +#define LOG_NOTICE 5 /* normal but significant condition */ +#define LOG_INFO 6 /* informational */ +#define LOG_DEBUG 7 /* debug-level messages */ + +#define LOG_PRIMASK 0x07 /* mask to extract priority part (internal) */ + /* extract priority */ +#define LOG_PRI(p) ((p) & LOG_PRIMASK) +#define LOG_MAKEPRI(fac, pri) (((fac) << 3) | (pri)) + +#ifdef SYSLOG_NAMES +#define INTERNAL_NOPRI 0x10 /* the "no priority" priority */ + /* mark "facility" */ +#define INTERNAL_MARK LOG_MAKEPRI(LOG_NFACILITIES, 0) +typedef struct _code { + char *c_name; + int c_val; +} CODE; + +CODE prioritynames[] = { + { "alert", LOG_ALERT }, + { "crit", LOG_CRIT }, + { "debug", LOG_DEBUG }, + { "emerg", LOG_EMERG }, + { "err", LOG_ERR }, + { "error", LOG_ERR }, /* DEPRECATED */ + { "info", LOG_INFO }, + { "none", INTERNAL_NOPRI }, /* INTERNAL */ + { "notice", LOG_NOTICE }, + { "panic", LOG_EMERG }, /* DEPRECATED */ + { "warn", LOG_WARNING }, /* DEPRECATED */ + { "warning", LOG_WARNING }, + { NULL, -1 }, +}; +#endif + +/* facility codes */ +#define LOG_KERN (0<<3) /* kernel messages */ +#define LOG_USER (1<<3) /* random user-level messages */ +#define LOG_MAIL (2<<3) /* mail system */ +#define LOG_DAEMON (3<<3) /* system daemons */ +#define LOG_AUTH (4<<3) /* security/authorization messages */ +#define LOG_SYSLOG (5<<3) /* messages generated internally by syslogd */ +#define LOG_LPR (6<<3) /* line printer subsystem */ +#define LOG_NEWS (7<<3) /* network news subsystem */ +#define LOG_UUCP (8<<3) /* UUCP subsystem */ +#define LOG_CRON (9<<3) /* clock daemon */ +#define LOG_AUTHPRIV (10<<3) /* security/authorization messages (private) */ +#define LOG_FTP (11<<3) /* ftp daemon */ + + /* other codes through 15 reserved for system use */ +#define LOG_LOCAL0 (16<<3) /* reserved for local use */ +#define LOG_LOCAL1 (17<<3) /* reserved for local use */ +#define LOG_LOCAL2 (18<<3) /* reserved for local use */ +#define LOG_LOCAL3 (19<<3) /* reserved for local use */ +#define LOG_LOCAL4 (20<<3) /* reserved for local use */ +#define LOG_LOCAL5 (21<<3) /* reserved for local use */ +#define LOG_LOCAL6 (22<<3) /* reserved for local use */ +#define LOG_LOCAL7 (23<<3) /* reserved for local use */ + +#define LOG_NFACILITIES 24 /* current number of facilities */ +#define LOG_FACMASK 0x03f8 /* mask to extract facility part */ + /* facility of pri */ +#define LOG_FAC(p) (((p) & LOG_FACMASK) >> 3) + +#ifdef SYSLOG_NAMES +CODE facilitynames[] = { + { "auth", LOG_AUTH }, + { "authpriv", LOG_AUTHPRIV }, + { "cron", LOG_CRON }, + { "daemon", LOG_DAEMON }, + { "ftp", LOG_FTP }, + { "kern", LOG_KERN }, + { "lpr", LOG_LPR }, + { "mail", LOG_MAIL }, + { "mark", INTERNAL_MARK }, /* INTERNAL */ + { "news", LOG_NEWS }, + { "security", LOG_AUTH }, /* DEPRECATED */ + { "syslog", LOG_SYSLOG }, + { "user", LOG_USER }, + { "uucp", LOG_UUCP }, + { "local0", LOG_LOCAL0 }, + { "local1", LOG_LOCAL1 }, + { "local2", LOG_LOCAL2 }, + { "local3", LOG_LOCAL3 }, + { "local4", LOG_LOCAL4 }, + { "local5", LOG_LOCAL5 }, + { "local6", LOG_LOCAL6 }, + { "local7", LOG_LOCAL7 }, + { NULL, -1 }, +}; +#endif + +/* Used by reentrant functions */ + +struct syslog_data { + int log_file; + int connected; + int opened; + int log_stat; + const char *log_tag; + int log_fac; + int log_mask; +}; + +#define SYSLOG_DATA_INIT {-1, 0, 0, 0, (const char *)0, LOG_USER, 0xff} + +/* + * arguments to setlogmask. + */ +#define LOG_MASK(pri) (1 << (pri)) /* mask for one priority */ +#define LOG_UPTO(pri) ((1 << ((pri)+1)) - 1) /* all priorities through pri */ + +/* + * Option flags for openlog. + * + * LOG_ODELAY no longer does anything. + * LOG_NDELAY is the inverse of what it used to be. + */ +#define LOG_PID 0x01 /* log the pid with each message */ +#define LOG_CONS 0x02 /* log on the console if errors in sending */ +#define LOG_ODELAY 0x04 /* delay open until first syslog() (default) */ +#define LOG_NDELAY 0x08 /* don't delay open */ +#define LOG_NOWAIT 0x10 /* don't wait for console forks: DEPRECATED */ +#define LOG_PERROR 0x20 /* log to stderr as well */ + +__BEGIN_DECLS +void closelog(void); +void openlog(const char *__ident, int __option, int __facility); +int setlogmask(int __mask); +void syslog(int __pri, const char *__fmt, ...) + __attribute__((__format__(__printf__, 2, 3))); +void vsyslog(int __pri, const char *, __gnuc_va_list __ap) + __attribute__((__format__(__printf__, 2, 0))); +void closelog_r(struct syslog_data *__data); +void openlog_r(const char *__ident, int __option, int __facility, struct syslog_data *__data); +int setlogmask_r(int __mask, struct syslog_data *__data); +void syslog_r(int __pri, struct syslog_data *__data, const char *__fmt, ...) + __attribute__((__format__(__printf__, 3, 4))); +void vsyslog_r(int __pri, struct syslog_data *__data, const char *__fmt, __gnuc_va_list __ap) + __attribute__((__format__(__printf__, 3, 0))); +__END_DECLS + +#endif /* !_SYS_SYSLOG_H_ */ + --- autofs-4.1.4/lib/Makefile.orig 2005-01-09 04:16:43.000000000 -0500 +++ autofs-4.1.4/lib/Makefile 2005-10-26 13:26:59.000000000 -0400 @@ -9,10 +9,11 @@ include ../Makefile.rules RPCGEN = /usr/bin/rpcgen RANLIB = /usr/bin/ranlib -SRCS = cache.c listmount.c cat_path.c rpc_subs.c mounts.c lock.c +SRCS = cache.c listmount.c cat_path.c rpc_subs.c mounts.c lock.c syslog.c \ + vsprintf.c RPCS = mount.h mount_clnt.c mount_xdr.c OBJS = cache.o mount_clnt.o mount_xdr.o listmount.o \ - cat_path.o rpc_subs.o mounts.o lock.o + cat_path.o rpc_subs.o mounts.o lock.o syslog.o vsprintf.o LIB = autofs.a --- /dev/null 2005-10-26 07:34:27.808601500 -0400 +++ autofs-4.1.4/lib/syslog.c 2005-10-26 13:24:14.000000000 -0400 @@ -0,0 +1,383 @@ +#ident "$Id: syslog.c,v 1.1 2005/05/01 09:48:34 raven Exp $" +/* + * Copyright (c) 1983, 1988, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "syslog.h" + +#define TBUF_LEN 2048 +#define FMT_LEN 1024 +#define INTERNALLOG LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID + +#define DEC() \ + do { \ + if (prlen < 0) \ + prlen = 0; \ + if (prlen >= tbuf_left) \ + prlen = tbuf_left - 1; \ + p += prlen; \ + tbuf_left -= prlen; \ + } while (0) + +/* Use our internal printf routines */ +extern int snprintf_int(char * buf, size_t size, const char * fmt, ...) + __attribute__ ((format (printf, 3, 4))); +extern int vsnprintf_int(char *buf, size_t size, const char *fmt, va_list args) + __attribute__ ((format (printf, 3, 0))); + +static struct syslog_data sdata = SYSLOG_DATA_INIT; +static int LogType = SOCK_DGRAM; /* type of socket connection */ + +extern char *__progname; /* Program name, from crt0. */ + +static void disconnectlog_r(struct syslog_data *); /* disconnect from syslogd */ +static void connectlog_r(struct syslog_data *); /* (re)connect to syslogd */ + +/* + * syslog, vsyslog -- + * print message on log file; output is intended for syslogd(8). + */ +void +syslog(int pri, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vsyslog(pri, fmt, ap); + va_end(ap); +} + +void +vsyslog(int pri, const char *fmt, va_list ap) +{ + vsyslog_r(pri, &sdata, fmt, ap); +} + +void +openlog(const char *ident, int logstat, int logfac) +{ + openlog_r(ident, logstat, logfac, &sdata); +} + +void +closelog(void) +{ + closelog_r(&sdata); +} + +/* setlogmask -- set the log mask level */ +int +setlogmask(int pmask) +{ + return setlogmask_r(pmask, &sdata); +} + +/* Reentrant version of syslog, i.e. syslog_r() */ + +void +syslog_r(int pri, struct syslog_data *data, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + vsyslog_r(pri, data, fmt, ap); + va_end(ap); +} + +void +vsyslog_r(int pri, struct syslog_data *data, const char *fmt, va_list ap) +{ + int cnt; + char ch, *p, *t; + time_t now; + int fd, saved_errno, error; + char *stdp = NULL, tbuf[TBUF_LEN], fmt_cpy[FMT_LEN]; + int tbuf_left, fmt_left, prlen; + + /* Check for invalid bits. */ + if (pri & ~(LOG_PRIMASK|LOG_FACMASK)) { + if (data == &sdata) { + syslog(INTERNALLOG, + "syslog: unknown facility/priority: %x", pri); + } else { + syslog_r(INTERNALLOG, data, + "syslog_r: unknown facility/priority: %x", pri); + } + pri &= LOG_PRIMASK|LOG_FACMASK; + } + + /* Check priority against setlogmask values. */ + if (!(LOG_MASK(LOG_PRI(pri)) & data->log_mask)) + return; + + saved_errno = errno; + + /* Set default facility if none specified. */ + if ((pri & LOG_FACMASK) == 0) + pri |= data->log_fac; + + /* If we have been called through syslog(), no need for reentrancy. */ + if (data == &sdata) + (void)time(&now); + + p = tbuf; + tbuf_left = TBUF_LEN; + + prlen = snprintf_int(p, tbuf_left, "<%d>", pri); + DEC(); + + /* + * syslogd will expand time automagically for reentrant case, and + * for normal case, just do like before + */ + if (data == &sdata) { + prlen = strftime(p, tbuf_left, "%h %e %T ", localtime(&now)); + DEC(); + } + + if (data->log_stat & LOG_PERROR) + stdp = p; + if (data->log_tag == NULL) + data->log_tag = __progname; + if (data->log_tag != NULL) { + prlen = snprintf_int(p, tbuf_left, "%s", data->log_tag); + DEC(); + } + if (data->log_stat & LOG_PID) { + prlen = snprintf_int(p, tbuf_left, "[%ld]", (long)getpid()); + DEC(); + } + if (data->log_tag != NULL) { + if (tbuf_left > 1) { + *p++ = ':'; + tbuf_left--; + } + if (tbuf_left > 1) { + *p++ = ' '; + tbuf_left--; + } + } + + /* strerror() is not reentrant */ + + for (t = fmt_cpy, fmt_left = FMT_LEN; (ch = *fmt); ++fmt) { + if (ch == '%' && fmt[1] == 'm') { + ++fmt; + if (data == &sdata) { + prlen = snprintf_int(t, fmt_left, "%s", + strerror(saved_errno)); + } else { + prlen = snprintf_int(t, fmt_left, "Error %d", + saved_errno); + } + if (prlen < 0) + prlen = 0; + if (prlen >= fmt_left) + prlen = fmt_left - 1; + t += prlen; + fmt_left -= prlen; + } else if (ch == '%' && fmt[1] == '%' && fmt_left > 2) { + *t++ = '%'; + *t++ = '%'; + fmt++; + fmt_left -= 2; + } else { + if (fmt_left > 1) { + *t++ = ch; + fmt_left--; + } + } + } + *t = '\0'; + + prlen = vsnprintf_int(p, tbuf_left, fmt_cpy, ap); + DEC(); + cnt = p - tbuf; + + /* Output to stderr if requested. */ + if (data->log_stat & LOG_PERROR) { + struct iovec iov[2]; + + iov[0].iov_base = stdp; + iov[0].iov_len = cnt - (stdp - tbuf); + iov[1].iov_base = "\n"; + iov[1].iov_len = 1; + (void)writev(STDERR_FILENO, iov, 2); + } + + /* Get connected, output the message to the local logger. */ + if (!data->opened) + openlog_r(data->log_tag, data->log_stat, 0, data); + connectlog_r(data); + + /* If we have a SOCK_STREAM connection, also send ASCII NUL as + a record terminator. */ + if (LogType == SOCK_STREAM) + cnt++; + + /* + * If the send() failed, there are two likely scenarios: + * 1) syslogd was restarted + * 2) /dev/log is out of socket buffer space + * We attempt to reconnect to /dev/log to take care of + * case #1 and keep send()ing data to cover case #2 + * to give syslogd a chance to empty its socket buffer. + */ + if ((error = send(data->log_file, tbuf, cnt, 0)) < 0) { + if (errno != ENOBUFS) { + disconnectlog_r(data); + connectlog_r(data); + } + do { + usleep(1); + if ((error = send(data->log_file, tbuf, cnt, 0)) >= 0) + break; + } while (errno == ENOBUFS); + } + + /* + * Output the message to the console; try not to block + * as a blocking console should not stop other processes. + * Make sure the error reported is the one from the syslogd failure. + */ + if (error == -1 && (data->log_stat & LOG_CONS) && + (fd = open(_PATH_CONSOLE, O_WRONLY|O_NONBLOCK, 0)) >= 0) { + struct iovec iov[2]; + + p = strchr(tbuf, '>') + 1; + iov[0].iov_base = p; + iov[0].iov_len = cnt - (p - tbuf); + iov[1].iov_base = "\r\n"; + iov[1].iov_len = 2; + (void)writev(fd, iov, 2); + (void)close(fd); + } + + if (data != &sdata) + closelog_r(data); +} + +static void +disconnectlog_r(struct syslog_data *data) +{ + /* + * If the user closed the FD and opened another in the same slot, + * that's their problem. They should close it before calling on + * system services. + */ + if (data->log_file != -1) { + close(data->log_file); + data->log_file = -1; + } + data->connected = 0; /* retry connect */ +} + +static void +connectlog_r(struct syslog_data *data) +{ + struct sockaddr_un SyslogAddr; /* AF_UNIX address of local logger */ + +again: + if (data->log_file == -1) { + if ((data->log_file = socket(AF_UNIX, LogType, 0)) == -1) + return; + (void)fcntl(data->log_file, F_SETFD, 1); + } + if (data->log_file != -1 && !data->connected) { + int old_errno; + + memset(&SyslogAddr, '\0', sizeof(SyslogAddr)); + SyslogAddr.sun_family = AF_UNIX; + strncpy(SyslogAddr.sun_path, _PATH_LOG, + sizeof(SyslogAddr.sun_path)); + old_errno = errno; + if (connect(data->log_file, (struct sockaddr *)&SyslogAddr, + sizeof(SyslogAddr)) == -1) { + int save_errno = errno; + (void)close(data->log_file); + data->log_file = -1; + if (LogType == SOCK_DGRAM && save_errno == EPROTOTYPE) { + /* retry with SOCK_STREAM */ + LogType = SOCK_STREAM; + errno = old_errno; + goto again; + } + } else + data->connected = 1; + } +} + +void +openlog_r(const char *ident, int logstat, int logfac, struct syslog_data *data) +{ + if (ident != NULL) + data->log_tag = ident; + data->log_stat = logstat; + if (logfac != 0 && (logfac &~ LOG_FACMASK) == 0) + data->log_fac = logfac; + + if (data->log_stat & LOG_NDELAY) /* open immediately */ + connectlog_r(data); + + data->opened = 1; /* ident and facility has been set */ +} + +void +closelog_r(struct syslog_data *data) +{ + (void)close(data->log_file); + data->log_file = -1; + data->connected = 0; + data->log_tag = NULL; +} + +/* setlogmask -- set the log mask level */ +int +setlogmask_r(int pmask, struct syslog_data *data) +{ + int omask; + + omask = data->log_mask; + if (pmask != 0) + data->log_mask = pmask; + return (omask); +} --- /dev/null 2005-10-26 07:34:27.808601500 -0400 +++ autofs-4.1.4/lib/vsprintf.c 2005-10-26 13:24:14.000000000 -0400 @@ -0,0 +1,619 @@ +#ident "$Id: vsprintf.c,v 1.1 2005/05/01 09:48:34 raven Exp $" +/* + * Stolen from the linux kernel. + * + * License: GPL + */ +/*------------------ Original Copyright -----------------*/ +/* + * linux/lib/vsprintf.c + * + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ +/* + * Wirzenius wrote this portably, Torvalds fucked it up :-) + */ + +/* + * Fri Jul 13 2001 Crutcher Dunnavant + * - changed to provide snprintf and vsnprintf functions + * So Feb 1 16:51:32 CET 2004 Juergen Quade + * - scnprintf and vscnprintf + */ + +/* Also copied from: */ + +/* + * linux/lib/string.c + * + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +/* + * stupid library routines.. The optimized versions should generally be found + * as inline code in + * + * These are buggy as well.. + * + * * Fri Jun 25 1999, Ingo Oeser + * - Added strsep() which will replace strtok() soon (because strsep() is + * reentrant and should be faster). Use only strsep() in new code, please. + * + * * Sat Feb 09 2002, Jason Thomas , + * Matthew Hawkins + * - Kissed strtok() goodbye + */ +/*-------------------------------------------------------*/ + +#include +#include +#include +#include +#include +#include + +#define BITS_PER_LONG __WORDSIZE +#define PAGE_SIZE getpagesize() + + +#if BITS_PER_LONG == 64 + +# define do_div(n,base) ({ \ + uint32_t __base = (base); \ + uint32_t __rem; \ + __rem = ((uint64_t)(n)) % __base; \ + (n) = ((uint64_t)(n)) / __base; \ + __rem; \ + }) + +#elif BITS_PER_LONG == 32 + +/* Not needed on 64bit architectures */ +uint32_t __div64_32(uint64_t *n, uint32_t base) +{ + uint64_t rem = *n; + uint64_t b = base; + uint64_t res, d = 1; + uint32_t high = rem >> 32; + + /* Reduce the thing a bit first */ + res = 0; + if (high >= base) { + high /= base; + res = (uint64_t) high << 32; + rem -= (uint64_t) (high*base) << 32; + } + + while ((int64_t)b > 0 && b < rem) { + b = b+b; + d = d+d; + } + + do { + if (rem >= b) { + rem -= b; + res += d; + } + b >>= 1; + d >>= 1; + } while (d); + + *n = res; + return rem; +} + +/* The unnecessary pointer compare is there + * to check for type safety (n must be 64bit) + */ +# define do_div(n,base) ({ \ + uint32_t __base = (base); \ + uint32_t __rem; \ + (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \ + if (((n) >> 32) == 0) { \ + __rem = (uint32_t)(n) % __base; \ + (n) = (uint32_t)(n) / __base; \ + } else \ + __rem = __div64_32(&(n), __base); \ + __rem; \ + }) + +# else + +# error do_div() does not yet support the C64 + +#endif /* BITS_PER_LONG */ + + +/** + * strnlen - Find the length of a length-limited string + * @s: The string to be sized + * @count: The maximum number of bytes to search + */ +size_t strnlen(const char * s, size_t count) +{ + const char *sc; + + for (sc = s; count-- && *sc != '\0'; ++sc) + /* nothing */; + return sc - s; +} + +/** + * simple_strtoul - convert a string to an unsigned long + * @cp: The start of the string + * @endp: A pointer to the end of the parsed string will be placed here + * @base: The number base to use + */ +unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base) +{ + unsigned long result = 0,value; + + if (!base) { + base = 10; + if (*cp == '0') { + base = 8; + cp++; + if ((toupper(*cp) == 'X') && isxdigit(cp[1])) { + cp++; + base = 16; + } + } + } else if (base == 16) { + if (cp[0] == '0' && toupper(cp[1]) == 'X') + cp += 2; + } + while (isxdigit(*cp) && + (value = isdigit(*cp) ? *cp-'0' : toupper(*cp)-'A'+10) < base) { + result = result*base + value; + cp++; + } + if (endp) + *endp = (char *)cp; + return result; +} + +/** + * simple_strtol - convert a string to a signed long + * @cp: The start of the string + * @endp: A pointer to the end of the parsed string will be placed here + * @base: The number base to use + */ +long simple_strtol(const char *cp,char **endp,unsigned int base) +{ + if(*cp=='-') + return -simple_strtoul(cp+1,endp,base); + return simple_strtoul(cp,endp,base); +} + +/** + * simple_strtoull - convert a string to an unsigned long long + * @cp: The start of the string + * @endp: A pointer to the end of the parsed string will be placed here + * @base: The number base to use + */ +unsigned long long simple_strtoull(const char *cp,char **endp,unsigned int base) +{ + unsigned long long result = 0,value; + + if (!base) { + base = 10; + if (*cp == '0') { + base = 8; + cp++; + if ((toupper(*cp) == 'X') && isxdigit(cp[1])) { + cp++; + base = 16; + } + } + } else if (base == 16) { + if (cp[0] == '0' && toupper(cp[1]) == 'X') + cp += 2; + } + while (isxdigit(*cp) && (value = isdigit(*cp) ? *cp-'0' : (islower(*cp) + ? toupper(*cp) : *cp)-'A'+10) < base) { + result = result*base + value; + cp++; + } + if (endp) + *endp = (char *)cp; + return result; +} + +/** + * simple_strtoll - convert a string to a signed long long + * @cp: The start of the string + * @endp: A pointer to the end of the parsed string will be placed here + * @base: The number base to use + */ +long long simple_strtoll(const char *cp,char **endp,unsigned int base) +{ + if(*cp=='-') + return -simple_strtoull(cp+1,endp,base); + return simple_strtoull(cp,endp,base); +} + +static int skip_atoi(const char **s) +{ + int i=0; + + while (isdigit(**s)) + i = i*10 + *((*s)++) - '0'; + return i; +} + +#define ZEROPAD 1 /* pad with zero */ +#define SIGN 2 /* unsigned/signed long */ +#define PLUS 4 /* show plus */ +#define SPACE 8 /* space if plus */ +#define LEFT 16 /* left justified */ +#define SPECIAL 32 /* 0x */ +#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ + +static char * number(char * buf, char * end, unsigned long long num, int base, int size, int precision, int type) +{ + char c,sign,tmp[66]; + const char *digits; + static const char small_digits[] = "0123456789abcdefghijklmnopqrstuvwxyz"; + static const char large_digits[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + int i; + + digits = (type & LARGE) ? large_digits : small_digits; + if (type & LEFT) + type &= ~ZEROPAD; + if (base < 2 || base > 36) + return NULL; + c = (type & ZEROPAD) ? '0' : ' '; + sign = 0; + if (type & SIGN) { + if ((signed long long) num < 0) { + sign = '-'; + num = - (signed long long) num; + size--; + } else if (type & PLUS) { + sign = '+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; + } + } + if (type & SPECIAL) { + if (base == 16) + size -= 2; + else if (base == 8) + size--; + } + i = 0; + if (num == 0) + tmp[i++]='0'; + else while (num != 0) + tmp[i++] = digits[do_div(num,base)]; + if (i > precision) + precision = i; + size -= precision; + if (!(type&(ZEROPAD+LEFT))) { + while(size-->0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + } + if (sign) { + if (buf <= end) + *buf = sign; + ++buf; + } + if (type & SPECIAL) { + if (base==8) { + if (buf <= end) + *buf = '0'; + ++buf; + } else if (base==16) { + if (buf <= end) + *buf = '0'; + ++buf; + if (buf <= end) + *buf = digits[33]; + ++buf; + } + } + if (!(type & LEFT)) { + while (size-- > 0) { + if (buf <= end) + *buf = c; + ++buf; + } + } + while (i < precision--) { + if (buf <= end) + *buf = '0'; + ++buf; + } + while (i-- > 0) { + if (buf <= end) + *buf = tmp[i]; + ++buf; + } + while (size-- > 0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + return buf; +} + +/** + * vsnprintf_int - Format a string and place it in a buffer + * @buf: The buffer to place the result into + * @size: The size of the buffer, including the trailing null space + * @fmt: The format string to use + * @args: Arguments for the format string + * + * The return value is the number of characters which would + * be generated for the given input, excluding the trailing + * '\0', as per ISO C99. If you want to have the exact + * number of characters written into @buf as return value + * (not including the trailing '\0'), use vscnprintf. If the + * return is greater than or equal to @size, the resulting + * string is truncated. + * + * Call this function if you are already dealing with a va_list. + * You probably want snprintf instead. + */ +int vsnprintf_int(char *buf, size_t size, const char *fmt, va_list args) +{ + int len; + unsigned long long num; + int i, base; + char *str, *end, c; + const char *s; + + int flags; /* flags to number() */ + + int field_width; /* width of output field */ + int precision; /* min. # of digits for integers; max + number of chars for from string */ + int qualifier; /* 'h', 'l', or 'L' for integer fields */ + /* 'z' support added 23/7/1999 S.H. */ + /* 'z' changed to 'Z' --davidm 1/25/99 */ + + /* Reject out-of-range values early */ + if ((int) size < 0) + return 0; + + str = buf; + end = buf + size - 1; + + if (end < buf - 1) { + end = ((void *) -1); + size = end - buf + 1; + } + + for (; *fmt ; ++fmt) { + if (*fmt != '%') { + if (str <= end) + *str = *fmt; + ++str; + continue; + } + + /* process flags */ + flags = 0; + repeat: + ++fmt; /* this also skips first '%' */ + switch (*fmt) { + case '-': flags |= LEFT; goto repeat; + case '+': flags |= PLUS; goto repeat; + case ' ': flags |= SPACE; goto repeat; + case '#': flags |= SPECIAL; goto repeat; + case '0': flags |= ZEROPAD; goto repeat; + } + + /* get field width */ + field_width = -1; + if (isdigit(*fmt)) + field_width = skip_atoi(&fmt); + else if (*fmt == '*') { + ++fmt; + /* it's the next argument */ + field_width = va_arg(args, int); + if (field_width < 0) { + field_width = -field_width; + flags |= LEFT; + } + } + + /* get the precision */ + precision = -1; + if (*fmt == '.') { + ++fmt; + if (isdigit(*fmt)) + precision = skip_atoi(&fmt); + else if (*fmt == '*') { + ++fmt; + /* it's the next argument */ + precision = va_arg(args, int); + } + if (precision < 0) + precision = 0; + } + + /* get the conversion qualifier */ + qualifier = -1; + if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || + *fmt =='Z' || *fmt == 'z') { + qualifier = *fmt; + ++fmt; + if (qualifier == 'l' && *fmt == 'l') { + qualifier = 'L'; + ++fmt; + } + } + + /* default base */ + base = 10; + + switch (*fmt) { + case 'c': + if (!(flags & LEFT)) { + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + } + c = (unsigned char) va_arg(args, int); + if (str <= end) + *str = c; + ++str; + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + continue; + + case 's': + s = va_arg(args, char *); + if ((unsigned long)s < PAGE_SIZE) + s = ""; + + len = strnlen(s, precision); + + if (!(flags & LEFT)) { + while (len < field_width--) { + if (str <= end) + *str = ' '; + ++str; + } + } + for (i = 0; i < len; ++i) { + if (str <= end) + *str = *s; + ++str; ++s; + } + while (len < field_width--) { + if (str <= end) + *str = ' '; + ++str; + } + continue; + + case 'p': + if (field_width == -1) { + field_width = 2*sizeof(void *); + flags |= ZEROPAD; + } + str = number(str, end, + (unsigned long) va_arg(args, void *), + 16, field_width, precision, flags); + continue; + + + case 'n': + /* FIXME: + * What does C99 say about the overflow case here? */ + if (qualifier == 'l') { + long * ip = va_arg(args, long *); + *ip = (str - buf); + } else if (qualifier == 'Z' || qualifier == 'z') { + size_t * ip = va_arg(args, size_t *); + *ip = (str - buf); + } else { + int * ip = va_arg(args, int *); + *ip = (str - buf); + } + continue; + + case '%': + if (str <= end) + *str = '%'; + ++str; + continue; + + /* integer number formats - set up the flags and "break" */ + case 'o': + base = 8; + break; + + case 'X': + flags |= LARGE; + case 'x': + base = 16; + break; + + case 'd': + case 'i': + flags |= SIGN; + case 'u': + break; + + default: + if (str <= end) + *str = '%'; + ++str; + if (*fmt) { + if (str <= end) + *str = *fmt; + ++str; + } else { + --fmt; + } + continue; + } + if (qualifier == 'L') + num = va_arg(args, long long); + else if (qualifier == 'l') { + num = va_arg(args, unsigned long); + if (flags & SIGN) + num = (signed long) num; + } else if (qualifier == 'Z' || qualifier == 'z') { + num = va_arg(args, size_t); + } else if (qualifier == 'h') { + num = (unsigned short) va_arg(args, int); + if (flags & SIGN) + num = (signed short) num; + } else { + num = va_arg(args, unsigned int); + if (flags & SIGN) + num = (signed int) num; + } + str = number(str, end, num, base, + field_width, precision, flags); + } + if (str <= end) + *str = '\0'; + else if (size > 0) + /* don't write out a null byte if the buf size is zero */ + *end = '\0'; + /* the trailing null byte doesn't count towards the total + * ++str; + */ + return str-buf; +} + +/** + * snprintf_int - Format a string and place it in a buffer + * @buf: The buffer to place the result into + * @size: The size of the buffer, including the trailing null space + * @fmt: The format string to use + * @...: Arguments for the format string + * + * The return value is the number of characters which would be + * generated for the given input, excluding the trailing null, + * as per ISO C99. If the return is greater than or equal to + * @size, the resulting string is truncated. + */ +int snprintf_int(char * buf, size_t size, const char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i=vsnprintf_int(buf,size,fmt,args); + va_end(args); + return i; +} + autofs-4.1.4-sockopt-len-type.patch: lib/rpc_subs.c | 3 ++- modules/mount_nfs.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) --- NEW FILE autofs-4.1.4-sockopt-len-type.patch --- --- autofs-4.1.4/lib/rpc_subs.c.sockopt-len-type 2006-01-18 06:51:52.000000000 -0500 +++ autofs-4.1.4/lib/rpc_subs.c 2006-01-18 06:55:17.000000000 -0500 @@ -105,7 +105,8 @@ */ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout) { - int flags, ret, len; + int flags, ret; + socklen_t len; fd_set wset, rset; flags = fcntl(fd, F_GETFL, 0); --- autofs-4.1.4/modules/mount_nfs.c.sockopt-len-type 2006-01-18 06:51:03.000000000 -0500 +++ autofs-4.1.4/modules/mount_nfs.c 2006-01-18 06:54:30.000000000 -0500 @@ -71,7 +71,7 @@ { struct sockaddr_in src_addr, local_addr; int src_len = sizeof(src_addr); - int local_len = sizeof(local_addr); + socklen_t local_len = sizeof(local_addr); int sock, ret; sock = socket(AF_INET, SOCK_DGRAM, udpproto); autofs-4.1.4-sol10-schema.patch: modules/lookup_ldap.c | 52 ++++++++++++++++++++++--------- samples/autofs-ldap-auto-master.c | 62 ++++++++++++++++++++++---------------- 2 files changed, 73 insertions(+), 41 deletions(-) --- NEW FILE autofs-4.1.4-sol10-schema.patch --- --- autofs-4.1.4/modules/lookup_ldap.c.sol10-schema 2005-02-27 00:37:14.000000000 -0500 +++ autofs-4.1.4/modules/lookup_ldap.c 2006-01-16 21:39:59.000000000 -0500 @@ -201,6 +201,7 @@ char **values = NULL; char *attrs[] = { key, type, NULL }; LDAP *ldap; + int found_entry = 0; if (ctxt == NULL) { crit(MODPREFIX "context was NULL"); @@ -267,6 +268,8 @@ continue; } + found_entry = 1; + values = ldap_get_values(ldap, e, type); if (!values) { info(MODPREFIX "no %s defined for %s", type, query); @@ -297,28 +300,42 @@ ldap_msgfree(result); ldap_unbind(ldap); - return 1; + if (found_entry) + return 1; + else + return 0; } static int read_map(const char *root, struct lookup_context *ctxt, const char *key, int keyvallen, time_t age, int *result_ldap) { - int rv1 = LDAP_SUCCESS, rv2 = LDAP_SUCCESS; + int rv = LDAP_SUCCESS; int ret; /* all else fails read entire map */ ret = read_one_map(root, "nisObject", "cn", - key, keyvallen, "nisMapEntry", ctxt, age, &rv1); - if (ret) - goto ret_ok; + key, keyvallen, "nisMapEntry", ctxt, age, &rv); + if (ret) { + if (rv == LDAP_SUCCESS) + goto ret_ok; + } ret = read_one_map(root, "automount", "cn", key, keyvallen, - "automountInformation", ctxt, age, &rv2); - if (ret) - goto ret_ok; + "automountInformation", ctxt, age, &rv); + if (ret) { + if (rv == LDAP_SUCCESS) + goto ret_ok; + } + + ret = read_one_map(root, "automount", "automountKey", key, keyvallen, + "automountInformation", ctxt, age, &rv); + if (ret) { + if (rv == LDAP_SUCCESS) + goto ret_ok; + } if (result_ldap) - *result_ldap = (rv1 == LDAP_SUCCESS ? rv2 : rv1); + *result_ldap = rv; return 0; @@ -593,7 +610,7 @@ int lookup_mount(const char *root, const char *name, int name_len, void *context) { struct lookup_context *ctxt = (struct lookup_context *) context; - int ret, ret2; + int ret, ret2, ret3; char key[KEY_MAX_LEN + 1]; int key_len; char mapent[MAPENT_MAX_LEN + 1]; @@ -614,10 +631,12 @@ ret = lookup_one(root, key, "nisObject", "cn", "nisMapEntry", ctxt); ret2 = lookup_one(root, key, "automount", "cn", "automountInformation", ctxt); + ret3 = lookup_one(root, key, + "automount", "automountKey", "automountInformation", ctxt); - debug("ret = %d, ret2 = %d", ret, ret2); + debug("ret = %d, ret2 = %d ret3 = %d", ret, ret2, ret3); - if (!ret && !ret2) + if (!ret && !ret2 && ret3) return 1; me = cache_lookup_first(); @@ -625,10 +644,11 @@ if (t_last_read > ap.exp_runfreq) if ((ret & (CHE_MISSING | CHE_UPDATED)) && - (ret2 & (CHE_MISSING | CHE_UPDATED))) + (ret2 & (CHE_MISSING | CHE_UPDATED)) && + (ret3 & (CHE_MISSING | CHE_UPDATED))) need_hup = 1; - if (ret == CHE_MISSING && ret2 == CHE_MISSING) { + if (ret == CHE_MISSING && ret2 == CHE_MISSING && ret3 == CHE_MISSING) { int wild = CHE_MISSING; /* Maybe update wild card map entry */ @@ -637,10 +657,12 @@ "cn", "nisMapEntry", ctxt); ret2 = lookup_wild(root, "automount", "cn", "automountInformation", ctxt); + ret3 = lookup_wild(root, "automount", "automountKey", + "automountInformation", ctxt); wild = (ret & (CHE_MISSING | CHE_FAIL)) && (ret2 & (CHE_MISSING | CHE_FAIL)); - if (ret & CHE_MISSING && ret2 & CHE_MISSING) + if (ret & CHE_MISSING && ret2 & CHE_MISSING && ret3 & CHE_MISSING) cache_delete(root, "*", 0); } --- autofs-4.1.4/samples/autofs-ldap-auto-master.c.sol10-schema 2006-01-16 21:35:07.000000000 -0500 +++ autofs-4.1.4/samples/autofs-ldap-auto-master.c 2006-01-16 21:36:07.000000000 -0500 @@ -159,7 +159,7 @@ { LDAP *ld = NULL; int result; - int c, mapset = 0; + int c, mapset = 0, default_schema = 1; const char *map_key = MAPKEY, *entry_key = ENTRYKEY, *value = VALUE; const char *map_oc = MAPOC, *entry_oc = ENTRYOC; const char *map = MAP; @@ -173,23 +173,27 @@ /* This is the object class we expect maps to * have. The default is MAPOC. */ map_oc = optarg; + default_schema = 0; break; case 'e': /* This is the object class we entries in the * map to be in. The default is ENTRYOC. */ entry_oc = optarg; + default_schema = 0; break; case 'n': /* This is the attribute which we use as the * key when looking up maps. Usually we use * MAP_KEY. */ map_key = optarg; + default_schema = 0; break; case 'k': /* This is the attribute which we use as the * key when looking up entries. Usually we use * ENTRY_KEY. */ entry_key = optarg; + default_schema = 0; break; case 'v': /* This is the attribute which we treat as @@ -197,6 +201,7 @@ * look up a map. Usually this is the * VALUE attribute. */ value = optarg; + default_schema = 0; break; default: fprintf(stderr, "syntax: %s\n" @@ -245,31 +250,36 @@ return 2; } - /* Try to dump the map given the preferred or user-supplied schema. */ - if(!dump_map(ld, map, map_oc, entry_oc, map_key, entry_key, value) && - (mapset || !dump_map(ld, "auto_master", map_oc, entry_oc, map_key, - entry_key, value))) { - if(strcmp(map_oc, "automountMap") || - strcmp(entry_oc, "automount") || - strcmp(map_key, "ou") || - strcmp(entry_key, "cn") || - strcmp(value, "automountInformation")) { - if (!dump_map(ld, - map, - "automountMap", - "automount", - "ou", - "cn", - "automountInformation") && !mapset) - dump_map(ld, - "auto_master", - "automountMap", - "automount", - "ou", - "cn", - "automountInformation"); - } - } + /* Try to dump the map given the preferred or user-supplied schema. + + Behavior should be as follows: + If the user specifies their own schema (ie. setting the map + object class) we try to obtain a map for their settings and if they + don't specify a map key, we also check 'auto_master' as the map key. + If we don't find a map, then we return nothing. + + If the user doesn't specify their own schema, we try all known + schemas with map names of 'auto.master' & 'auto_master', unless + a map name has been specified on the command line. If a map name + is specified on the command line then we try all known schemas + with that map name. + */ + + if (dump_map(ld, map, map_oc, entry_oc, map_key, + entry_key, value)); + else if (!mapset && dump_map(ld, "auto_master", map_oc, entry_oc, + map_key, entry_key, value)); + else if (!default_schema); + else if (dump_map(ld, map, "automountMap","automount","ou", + "cn","automountInformation")); + else if (!mapset && dump_map(ld, "auto_master", "automountMap", + "automount","ou","cn", + "automountInformation")); + else if (dump_map(ld, map, "automountMap","automount","automountMapName", + "automountKey","automountInformation")); + else if (!mapset && dump_map(ld, "auto_master", "automountMap", + "automount","automountMapName", + "automountKey", "automountInformation")); /* Close the connection to the server and quit. */ ldap_unbind(ld); autofs-4.1.4-solaris-hosts-in-auto-master.patch: rc.autofs.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: autofs-4.1.4-solaris-hosts-in-auto-master.patch =================================================================== RCS file: autofs-4.1.4-solaris-hosts-in-auto-master.patch diff -N autofs-4.1.4-solaris-hosts-in-auto-master.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ autofs-4.1.4-solaris-hosts-in-auto-master.patch 19 Jan 2006 01:23:50 -0000 1.2 @@ -0,0 +1,11 @@ +--- autofs-4.1.4/samples/rc.autofs.in.orig 2005-04-27 09:58:55.000000000 -0400 ++++ autofs-4.1.4/samples/rc.autofs.in 2005-04-27 09:59:18.000000000 -0400 +@@ -233,7 +233,7 @@ function getmounts() + dir=`echo "$dir" | sed -e "s/\/*$//"` + + if [ ! -z "$map" -a "$map" = "-hosts" ] ; then +- continue ++ map="/etc/auto.net" + fi + + if [ $DISABLE_DIRECT -eq 1 \ autofs-4.1.4-sun-parse-fixes.patch: parse_sun.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+) --- NEW FILE autofs-4.1.4-sun-parse-fixes.patch --- diff -Nurp autofs-4.1.4.orig/modules/parse_sun.c autofs-4.1.4/modules/parse_sun.c --- autofs-4.1.4.orig/modules/parse_sun.c 2005-05-07 17:39:44.000000000 +0800 +++ autofs-4.1.4/modules/parse_sun.c 2005-05-07 17:35:27.000000000 +0800 @@ -680,6 +680,10 @@ static int sun_mount(const char *root, c "mounting root %s, mountpoint %s, what %s, fstype %s, options %s\n", root, mountpoint, what, fstype, options); + /* A malformed entry of the form key /xyz will trigger this case */ + if (!what || *what == '\0') + return 1; + if (!strcmp(fstype, "nfs")) { rv = mount_nfs->mount_mount(root, mountpoint, strlen(mountpoint), what, fstype, options, mount_nfs->context); @@ -695,6 +699,18 @@ static int sun_mount(const char *root, c return rv; } +static int key_exists(struct multi_mnt *list, char *path, int pathlen) +{ + struct multi_mnt *mmptr = list; + + while (mmptr && pathlen == strlen(mmptr->path)) { + if (!strncmp(mmptr->path, path, pathlen)) + return 1; + mmptr = mmptr->next; + } + return 0; +} + /* * Build list of mounts in shortest -> longest order. * Pass in list head and return list head. @@ -725,6 +741,12 @@ struct multi_mnt *multi_add_list(struct mmptr = mmptr->next; } + /* if a multimount entry has duplicate keys, it is invalid */ + if (key_exists(mmptr, path, plen)) { + free(new); + return NULL; + } + if (old) old->next = new; new->next = mmptr; autofs-4.1.4-yp_order-order-type.patch: nsswitch.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE autofs-4.1.4-yp_order-order-type.patch --- --- autofs-4.1.4/lib/nsswitch.c.yp_order-order-type 2006-01-17 05:53:25.000000000 -0500 +++ autofs-4.1.4/lib/nsswitch.c 2006-01-17 05:53:37.000000000 -0500 @@ -138,7 +138,7 @@ { int err; char *domainname; - int order; + unsigned int order; if ((err = yp_get_default_domain(&domainname)) != YPERR_SUCCESS) { error (MODPREFIX "unable to get default yp domain"); autofs-4.1.4-check-nsswitch-submount.patch: include/automount.h | 8 ++ lib/Makefile | 4 - lib/nsswitch.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++++++++ modules/Makefile | 4 + modules/parse_sun.c | 32 +++++----- 5 files changed, 183 insertions(+), 19 deletions(-) Index: autofs-4.1.4-check-nsswitch-submount.patch =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-4/autofs-4.1.4-check-nsswitch-submount.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- autofs-4.1.4-check-nsswitch-submount.patch 14 Apr 2005 02:30:56 -0000 1.2 +++ autofs-4.1.4-check-nsswitch-submount.patch 19 Jan 2006 01:23:50 -0000 1.3 @@ -1,6 +1,6 @@ ---- autofs-4.1.4/include/automount.h.orig 2005-04-13 20:54:52.749944144 -0400 -+++ autofs-4.1.4/include/automount.h 2005-04-13 20:56:21.850398816 -0400 -@@ -282,6 +282,14 @@ int is_mounted(const char *table, const +--- autofs-4.1.4/include/automount.h.orig 2005-10-26 15:05:08.000000000 -0400 ++++ autofs-4.1.4/include/automount.h 2005-10-26 15:05:25.000000000 -0400 +@@ -285,6 +285,14 @@ int is_mounted(const char *table, const int has_fstab_option(const char *path, const char *opt); int allow_owner_mount(const char *); @@ -15,8 +15,8 @@ /* log notification */ extern int do_verbose; extern int do_debug; ---- autofs-4.1.4/lib/nsswitch.c.orig 2005-04-13 20:54:25.405101192 -0400 -+++ autofs-4.1.4/lib/nsswitch.c 2005-04-13 20:54:07.827773352 -0400 +--- autofs-4.1.4/lib/nsswitch.c.orig 2005-10-26 15:05:08.000000000 -0400 ++++ autofs-4.1.4/lib/nsswitch.c 2005-10-26 15:05:25.000000000 -0400 @@ -0,0 +1,154 @@ +#include +#include @@ -172,23 +172,23 @@ + + return 1; +} ---- autofs-4.1.4/lib/Makefile.orig 2005-04-13 20:55:00.260802320 -0400 -+++ autofs-4.1.4/lib/Makefile 2005-04-13 20:56:21.850398816 -0400 -@@ -9,10 +9,10 @@ include ../Makefile.rules - RPCGEN = /usr/bin/rpcgen +--- autofs-4.1.4/lib/Makefile.orig 2005-10-26 15:05:08.000000000 -0400 ++++ autofs-4.1.4/lib/Makefile 2005-10-26 15:05:36.000000000 -0400 +@@ -10,10 +10,10 @@ RPCGEN = /usr/bin/rpcgen RANLIB = /usr/bin/ranlib --SRCS = cache.c listmount.c cat_path.c rpc_subs.c mounts.c lock.c -+SRCS = cache.c listmount.c cat_path.c rpc_subs.c mounts.c lock.c nsswitch.c + SRCS = cache.c listmount.c cat_path.c rpc_subs.c mounts.c lock.c syslog.c \ +- vsprintf.c ++ vsprintf.c nsswitch.c RPCS = mount.h mount_clnt.c mount_xdr.c OBJS = cache.o mount_clnt.o mount_xdr.o listmount.o \ -- cat_path.o rpc_subs.o mounts.o lock.o -+ cat_path.o rpc_subs.o mounts.o lock.o nsswitch.o +- cat_path.o rpc_subs.o mounts.o lock.o syslog.o vsprintf.o ++ cat_path.o rpc_subs.o mounts.o lock.o syslog.o vsprintf.o nsswitch.o LIB = autofs.a ---- autofs-4.1.4/modules/parse_sun.c.orig 2005-04-13 20:55:18.508028320 -0400 -+++ autofs-4.1.4/modules/parse_sun.c 2005-04-13 20:56:21.852398512 -0400 +--- autofs-4.1.4/modules/parse_sun.c.orig 2005-10-26 15:05:08.000000000 -0400 ++++ autofs-4.1.4/modules/parse_sun.c 2005-10-26 15:05:25.000000000 -0400 @@ -566,6 +566,8 @@ static int sun_mount(const char *root, c int rv; char *mountpoint; @@ -237,8 +237,8 @@ } else { what = alloca(loclen + 1); memcpy(what, loc, loclen); ---- autofs-4.1.4/modules/Makefile.orig 2005-04-13 20:55:31.997977536 -0400 -+++ autofs-4.1.4/modules/Makefile 2005-04-13 20:56:21.851398664 -0400 +--- autofs-4.1.4/modules/Makefile.orig 2005-10-26 15:05:08.000000000 -0400 ++++ autofs-4.1.4/modules/Makefile 2005-10-26 15:05:25.000000000 -0400 @@ -86,3 +86,7 @@ lookup_ldap.so: lookup_ldap.c $(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \ lookup_ldap.c $(AUTOFS_LIB) $(LIBLDAP) Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/FC-4/autofs.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- autofs.spec 4 May 2005 19:31:39 -0000 1.64 +++ autofs.spec 19 Jan 2006 01:23:50 -0000 1.65 @@ -4,24 +4,35 @@ Summary: A tool for automatically mounting and unmounting filesystems. Name: autofs %define version 4.1.4 -%define release 8 +%define release 15 Version: %{version} Release: %{release} Epoch: 1 License: GPL Group: System Environment/Daemons Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2 -Patch1: autofs-4.1.4-init-redhat-only.patch -Patch2: autofs-4.1.4-init-nsswitch-comment.patch -Patch3: autofs-4.1.4-init-one-auto-master.patch -Patch4: autofs-4.1.4-init-browse-as-non-first-option.patch -Patch5: autofs-4.1.4-hesiod-bind.patch -Patch6: autofs-4.1.4-non-replicated-ping.patch -Patch7: autofs-4.1.4-check-nsswitch-submount.patch -Patch8: autofs-4.1.3-alt-master-ldap.patch -Patch9: autofs-4.1.4-check-is-multi.patch -Patch10: autofs-4.1.4-cache-update-race-fix.patch -Patch11: autofs-4.1.4-deferred-syslog.patch +Patch1: autofs-4.1.4-reentrant-syslog.patch +Patch2: autofs-4.1.4-reentrant-syslog-copyright.patch +Patch3: autofs-4.1.4-init-nsswitch-comment.patch +Patch4: autofs-4.1.4-init-one-auto-master.patch +Patch5: autofs-4.1.4-init-browse-as-non-first-option.patch +Patch6: autofs-4.1.4-hesiod-bind.patch +Patch7: autofs-4.1.4-non-replicated-ping.patch +Patch8: autofs-4.1.4-check-nsswitch-submount.patch +Patch9: autofs-4.1.3-alt-master-ldap.patch +Patch10: autofs-4.1.4-multi-parse-fix.patch +Patch11: autofs-4.1.4-cache-update-race-fix.patch +Patch12: autofs-4.1.4-solaris-hosts-in-auto-master.patch +Patch13: autofs-4.1.4-keylen-length-check.patch +Patch14: autofs-4.1.4-sun-parse-fixes.patch +Patch15: autofs-4.1.4-check-return-of-is-local-addr.patch +Patch16: autofs-4.1.4-fix-sort-opts.patch +Patch17: autofs-4.1.4-no-slash-misc.patch +Patch18: autofs-4.1.4-locking-fix.patch +Patch19: autofs-4.1.4-configureable-locking.patch +Patch20: autofs-4.1.4-sol10-schema.patch +Patch21: autofs-4.1.4-sockopt-len-type.patch +Patch22: autofs-4.1.4-yp_order-order-type.patch Buildroot: /var/tmp/autofs-tmp BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl @@ -72,6 +83,17 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -125,6 +147,18 @@ %{_libdir}/autofs/* %changelog +* Tue Jan 17 2006 Ian Kent - 1:4.1.4-15 +- Sync patches with rawhide. +- Replace deferred syslog patch with reentrant syslog patch. +- Update copyright declaration for reentrant-syslog source. +- Replace check-is-multi with more general multi-parse-fix. +- Add fix for premature return when waiting for lock file. +- Add patch for configure option to disable locking during mount. + But don't disable locking by default. +- Add ability to handle automount schema used in Sun directory server. +- Quell compiler warning about getsockopt parameter. +- Quell compiler warning about yp_order parameter. + * Wed May 4 2005 Jeff Moyer - 1:4.1.4-8 - Add in the deferred syslog patch. This fixes a hung automounter issue related to unsafe calls to syslog in signal handler context. --- autofs-4.1.4-deferred-syslog.patch DELETED --- --- autofs-4.1.4-init-redhat-only.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 19 04:14:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 23:14:43 -0500 Subject: rpms/gdm/devel gdm-2.13.0.5-clock-format.patch, NONE, 1.1 gdm.spec, 1.118, 1.119 Message-ID: <200601190414.k0J4EgV9026694@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26662 Modified Files: gdm.spec Added Files: gdm-2.13.0.5-clock-format.patch Log Message: * Wed Jan 18 2006 Christopher Aillon - 1:2.13.0.5-6 - Add patch to fix clock to default to 24h in locales that expect it (175453) gdm-2.13.0.5-clock-format.patch: daemon/gdm.h | 2 +- daemon/gdmconfig.c | 4 ++-- gui/gdmcommon.c | 15 +++++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) --- NEW FILE gdm-2.13.0.5-clock-format.patch --- --- gdm-2.13.0.5/daemon/gdmconfig.c.clock-format 2006-01-05 18:16:08.000000000 -0500 +++ gdm-2.13.0.5/daemon/gdmconfig.c 2006-01-18 22:44:30.705078000 -0500 @@ -242,7 +242,7 @@ static gboolean GdmShowGnomeFailsafe; static gboolean GdmShowXtermFailsafe; static gboolean GdmShowLastSession; -static gboolean GdmUse24Clock; +static gchar * GdmUse24Clock; static gboolean GdmEntryCircles; static gboolean GdmEntryInvisible; static gboolean GdmGraphicalThemeRand; @@ -405,7 +405,7 @@ &GdmShowXtermFailsafe, &bool_type); gdm_config_add_hash (GDM_KEY_SHOW_LAST_SESSION, &GdmShowLastSession, &bool_type); - gdm_config_add_hash (GDM_KEY_USE_24_CLOCK, &GdmUse24Clock, &bool_type); + gdm_config_add_hash (GDM_KEY_USE_24_CLOCK, &GdmUse24Clock, &string_type); gdm_config_add_hash (GDM_KEY_ENTRY_CIRCLES, &GdmEntryCircles, &bool_type); gdm_config_add_hash (GDM_KEY_ENTRY_INVISIBLE, &GdmEntryInvisible, &bool_type); gdm_config_add_hash (GDM_KEY_GRAPHICAL_THEME_RAND, --- gdm-2.13.0.5/daemon/gdm.h.clock-format 2006-01-05 18:16:08.000000000 -0500 +++ gdm-2.13.0.5/daemon/gdm.h 2006-01-18 22:44:30.712071000 -0500 @@ -345,7 +345,7 @@ #define GDM_KEY_SET_POSITION "greeter/SetPosition=false" #define GDM_KEY_POSITION_X "greeter/PositionX=0" #define GDM_KEY_POSITION_Y "greeter/PositionY=0" -#define GDM_KEY_USE_24_CLOCK "greeter/Use24Clock=false" +#define GDM_KEY_USE_24_CLOCK "greeter/Use24Clock=auto" #define GDM_KEY_ENTRY_CIRCLES "greeter/UseCirclesInEntry=false" #define GDM_KEY_ENTRY_INVISIBLE "greeter/UseInvisibleInEntry=false" #define GDM_KEY_GRAPHICAL_THEME "greeter/GraphicalTheme=circles" --- gdm-2.13.0.5/gui/gdmcommon.c.clock-format 2006-01-05 18:16:09.000000000 -0500 +++ gdm-2.13.0.5/gui/gdmcommon.c 2006-01-18 23:10:35.161624000 -0500 @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -294,13 +295,15 @@ } else { /* Value is "auto" (default), thus select according to "locale" settings. */ + char outstr[20]; + time_t t; + struct tm *tmp; - /* Translators: Translate this to '12-hour', or - '24-hour'. Meaning of the translation is the - default time format in your locale. */ - return strcmp ("12-hour", _("24-hour")) != 0; - /* Logic is that if translator does not understand the - comment, then 24 hour format is selected. */ + t = time(NULL); + tmp = localtime (&t); + + /* if the locale does not have an AM/PM string, use 24h time */ + return (strftime (outstr, sizeof(outstr), "%p", tmp) == 0); } /* NOTREACHED */ return TRUE; Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- gdm.spec 18 Jan 2006 04:35:48 -0000 1.118 +++ gdm.spec 19 Jan 2006 04:14:35 -0000 1.119 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager. Name: gdm Version: 2.13.0.5 -Release: 5 +Release: 6 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -44,6 +44,7 @@ Patch19: gdm-2.13.0.4-add-gnome-cflags.patch Patch20: gdm-2.13.0.4-add-locale-header.patch Patch21: gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch +Patch22: gdm-2.13.0.5-clock-format.patch BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root @@ -116,6 +117,7 @@ %patch19 -p1 -b .add-gnome-cflags %patch20 -p1 -b .add-locale-header %patch21 -p1 -b .fix-gdm-safe-restart-conf-path +%patch22 -p1 -b .clock-format # fix the time format for ja perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po @@ -305,6 +307,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Wed Jan 18 2006 Christopher Aillon - 1:2.13.0.5-6 +- Add patch to fix clock to default to 24h in locales that expect it (175453) + * Tue Jan 17 2006 Ray Strode - 1:2.13.0.5-1 - update to 2.13.0.5 (bug 178099) From fedora-cvs-commits at redhat.com Thu Jan 19 04:23:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 23:23:39 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.202, 1.203 anaconda.spec, 1.321, 1.322 sources, 1.321, 1.322 Message-ID: <200601190423.k0J4NdIS009665@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9498 Modified Files: .cvsignore anaconda.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- .cvsignore 11 Jan 2006 20:56:25 -0000 1.202 +++ .cvsignore 19 Jan 2006 04:23:36 -0000 1.203 @@ -1 +1,2 @@ anaconda-10.91.4.tar.bz2 +anaconda-10.91.5.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.321 retrieving revision 1.322 diff -u -r1.321 -r1.322 --- anaconda.spec 11 Jan 2006 20:56:25 -0000 1.321 +++ anaconda.spec 19 Jan 2006 04:23:36 -0000 1.322 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.91.4 +Version: 10.91.5 Release: 1 License: GPL Summary: Graphical system installer @@ -78,6 +78,20 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Jan 18 2006 David Cantrell - 10.91.5-1 +- i386 and ppc rescue image script fixes (jkeating) +- fix kickstart package deselection (clumens, #177530) +- fix header download issues (pnasrat, #177596) +- interface improvements on scp exception dialog (clumens, #177738) +- rescue image additions (pjones, dcantrell, #155399) +- misc kickstart fixes (clumens, #178041, #177519) +- fix fetching repo data on http installs (clumens, #178001) +- add gdk-pixbuf handler for XPM images (#177994) +- timezone screen fixes (clumens, #178140) +- add LSI mptsas driver to module-info (#178130) +- dmraid fixes for kickstart installs (pjones) +- add sr at Latn to lang-table (katzj, #175611) + * Wed Jan 11 2006 Jeremy Katz - 10.91.4-1 - Add xen kernels Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.321 retrieving revision 1.322 diff -u -r1.321 -r1.322 --- sources 11 Jan 2006 20:56:25 -0000 1.321 +++ sources 19 Jan 2006 04:23:36 -0000 1.322 @@ -1 +1 @@ -64c2336649b282e471aa0ab01430ab7c anaconda-10.91.4.tar.bz2 +6ee831e64257ce2667881136382d196d anaconda-10.91.5.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 19 04:36:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 23:36:06 -0500 Subject: rpms/spamassassin/devel spamassassin.spec,1.59,1.60 Message-ID: <200601190436.k0J4a6ZH013580@cvs.devel.redhat.com> Author: wtogami Update of /cvs/dist/rpms/spamassassin/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13521 Modified Files: spamassassin.spec Log Message: include SPAM_PID dir (#177788) remove redundant sysconfig dir Index: spamassassin.spec =================================================================== RCS file: /cvs/dist/rpms/spamassassin/devel/spamassassin.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- spamassassin.spec 14 Jan 2006 07:38:05 -0000 1.59 +++ spamassassin.spec 19 Jan 2006 04:36:03 -0000 1.60 @@ -6,7 +6,7 @@ Summary: Spam filter for email which can be invoked from mail delivery agents. Name: spamassassin Version: 3.1.0 -Release: 4.fc5 +Release: 5.fc5 License: Apache License Group: Applications/Internet URL: http://spamassassin.apache.org/ @@ -89,8 +89,6 @@ install -m 0644 %{SOURCE4} %buildroot/etc/mail/spamassassin install -m 0755 %{SOURCE10} %buildroot/etc/mail/spamassassin -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig - [ -x /usr/lib/rpm/brp-compress ] && /usr/lib/rpm/brp-compress find $RPM_BUILD_ROOT \( -name perllocal.pod -o -name .packlist \) -exec rm -v {} \; @@ -107,6 +105,8 @@ find $RPM_BUILD_ROOT%{perl_vendorlib}/* -type d -print | sed "s@^$RPM_BUILD_ROOT@%dir @g" >> %{name}-%{version}-filelist +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/spamassassin + %files -f %{name}-%{version}-filelist %defattr(-,root,root) %doc BUGS LICENSE NOTICE CREDITS Changes README STATUS TRADEMARK UPGRADE @@ -149,8 +149,8 @@ exit 0 %changelog -* Sat Jan 14 2006 Warren Togami - 3.1.0-4 -- include SPAM_PID dir (#177788 Roy-Magne Mo) +* Wed Jan 18 2006 Warren Togami - 3.1.0-5 +- include SPAM_PID dir (#177788) * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 19 04:59:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 23:59:02 -0500 Subject: rpms/evolution/devel evolution.spec,1.115,1.116 Message-ID: <200601190459.k0J4x2pi001874@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1797 Modified Files: evolution.spec Log Message: - fix multilib issue with shlib bonobo components (bug 156982) Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- evolution.spec 13 Jan 2006 05:05:05 -0000 1.115 +++ evolution.spec 19 Jan 2006 04:58:56 -0000 1.116 @@ -33,7 +33,7 @@ Name: evolution Version: 2.5.4 -Release: 8 +Release: 9 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -349,7 +349,9 @@ # evolution link ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution - +for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile +done %find_lang %name-%{evo_major} %post @@ -512,6 +514,9 @@ %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Wed Jan 18 2006 Ray Strode - 2.5.4-9 +- fix multilib issue with shlib bonobo components (bug 156982) + * Thu Jan 12 2006 David Malcolm - 2.5.4-8 - avoid multiple initialization of NetworkManager connections (patch 807, gnome bug #326875) From fedora-cvs-commits at redhat.com Thu Jan 19 04:59:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 18 Jan 2006 23:59:58 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.203, 1.204 anaconda.spec, 1.322, 1.323 sources, 1.322, 1.323 Message-ID: <200601190459.k0J4xw7G002279@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2209 Modified Files: .cvsignore anaconda.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- .cvsignore 19 Jan 2006 04:23:36 -0000 1.203 +++ .cvsignore 19 Jan 2006 04:59:54 -0000 1.204 @@ -1,2 +1,3 @@ anaconda-10.91.4.tar.bz2 anaconda-10.91.5.tar.bz2 +anaconda-10.91.6.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.322 retrieving revision 1.323 diff -u -r1.322 -r1.323 --- anaconda.spec 19 Jan 2006 04:23:36 -0000 1.322 +++ anaconda.spec 19 Jan 2006 04:59:54 -0000 1.323 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.91.5 +Version: 10.91.6 Release: 1 License: GPL Summary: Graphical system installer @@ -78,6 +78,9 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Wed Jan 18 2006 David Cantrell - 10.91.6-1 +- i18n fixes (katzj) + * Wed Jan 18 2006 David Cantrell - 10.91.5-1 - i386 and ppc rescue image script fixes (jkeating) - fix kickstart package deselection (clumens, #177530) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.322 retrieving revision 1.323 diff -u -r1.322 -r1.323 --- sources 19 Jan 2006 04:23:36 -0000 1.322 +++ sources 19 Jan 2006 04:59:54 -0000 1.323 @@ -1 +1 @@ -6ee831e64257ce2667881136382d196d anaconda-10.91.5.tar.bz2 +9aa62660fabf76a7bd57ab3e9e5263cb anaconda-10.91.6.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 19 05:04:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 00:04:58 -0500 Subject: rpms/gnome-spell/devel gnome-spell.spec,1.14,1.15 Message-ID: <200601190504.k0J54wSZ003192@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-spell/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3140 Modified Files: gnome-spell.spec Log Message: - fix multilib issue with shlib bonobo components (bug 156982) Index: gnome-spell.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-spell/devel/gnome-spell.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnome-spell.spec 9 Dec 2005 22:40:43 -0000 1.14 +++ gnome-spell.spec 19 Jan 2006 05:04:54 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Bonobo component for spell checking Name: gnome-spell Version: 1.0.5 -Release: 10.1 +Release: 11 Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-spell/%{name}-%{version}.tar.bz2 Patch0: gnome-spell-1.0.2-pspell-compat.patch Patch1: gnome-spell-1.0.2-langlist.patch @@ -46,6 +46,11 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-spell/*.a rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-spell/*.la +for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do +sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile +done + + %{find_lang} %{name}-%{version} %clean @@ -61,6 +66,9 @@ %{_datadir}/idl/* %changelog +* Thu Jan 19 2006 Ray Strode 1.0.5-11 +- fix multilib issue with shlib bonobo components (bug 156982) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 19 05:08:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 00:08:30 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.86,1.87 Message-ID: <200601190508.k0J58UU4003957@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3877 Modified Files: gnome-vfs2.spec Log Message: - fix bonobo shlib multilib issue (bug 156982) Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- gnome-vfs2.spec 17 Jan 2006 20:41:08 -0000 1.86 +++ gnome-vfs2.spec 19 Jan 2006 05:08:27 -0000 1.87 @@ -10,7 +10,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.13.4 -Release: 2 +Release: 3 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -124,6 +124,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la} +for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile +done + + %find_lang %{po_package} %clean @@ -175,6 +180,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Thu Jan 19 2006 Ray Strode 2.13.4-3 +- fix bonobo shlib multilib issue (bug 156982) + * Tue Jan 17 2006 John (J5) Palmieri 2.13.4-2 - Add a BuildRequires on gnome-mount-devel so we build with gnome-mount support From fedora-cvs-commits at redhat.com Thu Jan 19 05:16:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 00:16:40 -0500 Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.45,1.46 Message-ID: <200601190516.k0J5GeDo005987@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5432 Modified Files: gtkhtml3.spec Log Message: - fix multlib shlib bonobo problem (bug 156982) Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gtkhtml3.spec 3 Jan 2006 20:05:25 -0000 1.45 +++ gtkhtml3.spec 19 Jan 2006 05:16:30 -0000 1.46 @@ -5,7 +5,7 @@ Summary: gtkhtml library Name: gtkhtml3 Version: 3.9.4 -Release: 1 +Release: 2 License: LGPL/GPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2 @@ -67,6 +67,12 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gtkhtml/*.la rm -f $RPM_BUILD_ROOT/%{_libdir}/gtkhtml/*.a +for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile +done + + + %find_lang gtkhtml-%{gtkhtml_major} %clean @@ -92,6 +98,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 19 2006 Ray Strode - 3.9.4-2 +- fix multlib shlib bonobo problem (bug 156982) + * Tue Jan 3 2006 David Malcolm - 3.9.4-1 - 3.9.4 From fedora-cvs-commits at redhat.com Thu Jan 19 05:19:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 00:19:30 -0500 Subject: rpms/libbonobo/devel libbonobo.spec,1.25,1.26 Message-ID: <200601190519.k0J5JUYT010220@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9965 Modified Files: libbonobo.spec Log Message: - Step two (bug 156982) Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libbonobo.spec 19 Jan 2006 00:39:52 -0000 1.25 +++ libbonobo.spec 19 Jan 2006 05:19:25 -0000 1.26 @@ -6,7 +6,7 @@ Summary: Bonobo component system Name: libbonobo Version: 2.13.1 -Release: 3 +Release: 4 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -67,6 +67,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.*a rm $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.*a +for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile +done + + %find_lang %{po_package} %clean @@ -103,6 +108,9 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Thu Jan 19 2006 Ray Strode 2.13.1-4 +- Step two (bug 156982) + * Wed Jan 18 2006 Ray Strode 2.13.1-3 - Step one of the multi-bonoboshlib process (bug 156982) From fedora-cvs-commits at redhat.com Thu Jan 19 05:22:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 00:22:54 -0500 Subject: rpms/libbonoboui/devel libbonoboui.spec,1.31,1.32 Message-ID: <200601190522.k0J5MsXj014451@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonoboui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14252 Modified Files: libbonoboui.spec Log Message: - fix shlib multilib bonobo issue (bug 156982) Index: libbonoboui.spec =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- libbonoboui.spec 17 Jan 2006 02:55:33 -0000 1.31 +++ libbonoboui.spec 19 Jan 2006 05:22:48 -0000 1.32 @@ -14,7 +14,7 @@ Summary: Bonobo user interface components Name: libbonoboui Version: 2.13.1 -Release: 1 +Release: 2 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: ta.po @@ -95,6 +95,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.a rm -f $RPM_BUILD_ROOT%{_datadir}/applications/bonobo-browser.desktop +for serverfile in +$RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile +done + + %find_lang %{po_package} %clean @@ -127,6 +133,9 @@ %{_datadir}/gtk-doc %changelog +* Thu Jan 19 2006 Ray Strode +- fix shlib multilib bonobo issue (bug 156982) + * Mon Jan 16 2006 Matthias Clasen - Update to 2.13.1 From fedora-cvs-commits at redhat.com Thu Jan 19 05:32:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 00:32:10 -0500 Subject: rpms/libbonoboui/devel libbonoboui.spec,1.32,1.33 Message-ID: <200601190532.k0J5WAnS020041@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonoboui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19709 Modified Files: libbonoboui.spec Log Message: remove newline Index: libbonoboui.spec =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- libbonoboui.spec 19 Jan 2006 05:22:48 -0000 1.32 +++ libbonoboui.spec 19 Jan 2006 05:32:05 -0000 1.33 @@ -95,8 +95,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.a rm -f $RPM_BUILD_ROOT%{_datadir}/applications/bonobo-browser.desktop -for serverfile in -$RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do +for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile done From fedora-cvs-commits at redhat.com Thu Jan 19 05:40:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 00:40:48 -0500 Subject: rpms/cdicconf/FC-4 cdicconf.spec,1.9,1.10 Message-ID: <200601190540.k0J5emEW022583@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/cdicconf/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22548 Modified Files: cdicconf.spec Log Message: * Thu Jan 19 2005 Akira TAGOH - 0.2-12 - added gtk-devel to BuildRequires. (#176496) Index: cdicconf.spec =================================================================== RCS file: /cvs/dist/rpms/cdicconf/FC-4/cdicconf.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cdicconf.spec 17 Mar 2005 12:56:13 -0000 1.9 +++ cdicconf.spec 19 Jan 2006 05:40:44 -0000 1.10 @@ -1,14 +1,14 @@ Summary: Canna dictionary maintainance tool Name: cdicconf Version: 0.2 -Release: 11 +Release: 12 URL: http://www.redhat.com/ License: GPL ExclusiveOS: Linux Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-root Source0: %{name}-%{version}.tar.gz -BuildRequires: gtk+ xorg-x11-devel +BuildRequires: gtk+-devel xorg-x11-devel %description Cdicconf is a set of maintainance tools for Japanese kana-kanji conversion @@ -35,6 +35,9 @@ %{_datadir}/cdicconf/* %changelog +* Thu Jan 19 2005 Akira TAGOH - 0.2-12 +- added gtk+-devel to BuildRequires. (#176496) + * Thu Mar 17 2005 Akira TAGOH - 0.2-11 - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 19 05:41:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 00:41:21 -0500 Subject: rpms/cdicconf/FC-4 cdicconf.spec,1.10,1.11 Message-ID: <200601190541.k0J5fLPs022791@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/cdicconf/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22753 Modified Files: cdicconf.spec Log Message: Index: cdicconf.spec =================================================================== RCS file: /cvs/dist/rpms/cdicconf/FC-4/cdicconf.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cdicconf.spec 19 Jan 2006 05:40:44 -0000 1.10 +++ cdicconf.spec 19 Jan 2006 05:41:16 -0000 1.11 @@ -35,7 +35,7 @@ %{_datadir}/cdicconf/* %changelog -* Thu Jan 19 2005 Akira TAGOH - 0.2-12 +* Thu Jan 19 2006 Akira TAGOH - 0.2-12 - added gtk+-devel to BuildRequires. (#176496) * Thu Mar 17 2005 Akira TAGOH - 0.2-11 From fedora-cvs-commits at redhat.com Thu Jan 19 05:42:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 00:42:09 -0500 Subject: rpms/rhythmbox/devel rhythmbox.spec,1.37,1.38 Message-ID: <200601190542.k0J5g9F0023156@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23053 Modified Files: rhythmbox.spec Log Message: - bonobo multilib issue (bug 156982) Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- rhythmbox.spec 4 Jan 2006 19:52:34 -0000 1.37 +++ rhythmbox.spec 19 Jan 2006 05:42:05 -0000 1.38 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.2 -Release: 5 +Release: 6 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2 @@ -50,6 +50,13 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL rm -f %{buildroot}%{_libdir}/bonobo/*.{a,la} rm -f %{buildroot}%{_libdir}/bonobo/librb-nautilus-context-menu.so + +for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile +done + + + %find_lang %name # Default internet radio stations use mp3 @@ -93,6 +100,9 @@ %{_libdir}/pkgconfig/rhythmbox.pc %changelog +* Thu Jan 19 2006 Ray Strode 0.9.2-6 +- bonobo multilib issue (bug 156982) + * Wed Jan 04 2006 John (J5) Palmieri 0.9.2-5 - rebuild with ipod support From fedora-cvs-commits at redhat.com Thu Jan 19 05:42:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 00:42:54 -0500 Subject: rpms/cdicconf/FC-4 cdicconf.spec,1.11,1.12 Message-ID: <200601190542.k0J5gs0Q023506@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/cdicconf/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv23474 Modified Files: cdicconf.spec Log Message: Index: cdicconf.spec =================================================================== RCS file: /cvs/dist/rpms/cdicconf/FC-4/cdicconf.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cdicconf.spec 19 Jan 2006 05:41:16 -0000 1.11 +++ cdicconf.spec 19 Jan 2006 05:42:51 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Canna dictionary maintainance tool Name: cdicconf Version: 0.2 -Release: 12 +Release: 11.1.fc4 URL: http://www.redhat.com/ License: GPL ExclusiveOS: Linux @@ -35,7 +35,7 @@ %{_datadir}/cdicconf/* %changelog -* Thu Jan 19 2006 Akira TAGOH - 0.2-12 +* Thu Jan 19 2006 Akira TAGOH - 0.2-11.1.fc4 - added gtk+-devel to BuildRequires. (#176496) * Thu Mar 17 2005 Akira TAGOH - 0.2-11 From fedora-cvs-commits at redhat.com Thu Jan 19 05:48:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 00:48:11 -0500 Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.46,1.47 Message-ID: <200601190548.k0J5mBB2002196@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1322 Modified Files: gtkhtml3.spec Log Message: remove mysterious .servere file Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gtkhtml3.spec 19 Jan 2006 05:16:30 -0000 1.46 +++ gtkhtml3.spec 19 Jan 2006 05:48:07 -0000 1.47 @@ -70,8 +70,7 @@ for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile done - - +rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/GNOME_GtkHTML_Editor-3.8.servere %find_lang gtkhtml-%{gtkhtml_major} From fedora-cvs-commits at redhat.com Thu Jan 19 07:10:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 02:10:20 -0500 Subject: rpms/libxklavier/devel libxklavier.spec,1.13,1.14 Message-ID: <200601190710.k0J7AK2w014271@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/libxklavier/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14242 Modified Files: libxklavier.spec Log Message: * Thu Jan 19 2006 Christopher Aillon 2.1-3 - Add missing BR: libX11-devel libxml2-devel libxkbfile-devel Index: libxklavier.spec =================================================================== RCS file: /cvs/dist/rpms/libxklavier/devel/libxklavier.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- libxklavier.spec 28 Dec 2005 22:05:52 -0000 1.13 +++ libxklavier.spec 19 Jan 2006 07:10:16 -0000 1.14 @@ -1,11 +1,14 @@ Summary: library providing high-level API for X Keyboard Extension Name: libxklavier Version: 2.1 -Release: 2 +Release: 3 License: LGPL Group: Development/Libraries Url: http://gswitchit.sourceforge.net/ BuildRequires: doxygen +BuildRequires: libxml2-devel +BuildRequires: libxkbfile-devel +BuildRequires: libX11-devel Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -68,6 +71,9 @@ %{_includedir}/* %changelog +* Thu Jan 19 2006 Christopher Aillon 2.1-3 +- Add missing BR: libX11-devel libxml2-devel libxkbfile-devel + * Tue Dec 27 2005 Christopher Aillon 2.1-2 - Pull in latest version and get rid of the annoying XKB error dialog From fedora-cvs-commits at redhat.com Thu Jan 19 10:18:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 05:18:08 -0500 Subject: rpms/gtk-sharp/devel gtk-sharp.spec,1.7,1.8 Message-ID: <200601191018.k0JAI8bB010055@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/gtk-sharp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9511 Modified Files: gtk-sharp.spec Log Message: Mono now exists on s390x Index: gtk-sharp.spec =================================================================== RCS file: /cvs/dist/rpms/gtk-sharp/devel/gtk-sharp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtk-sharp.spec 9 Jan 2006 16:31:09 -0000 1.7 +++ gtk-sharp.spec 19 Jan 2006 10:18:05 -0000 1.8 @@ -1,6 +1,6 @@ Name: gtk-sharp Version: 1.0.10 -Release: 3 +Release: 4 Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries @@ -13,8 +13,8 @@ BuildRequires: libglade2-devel librsvg2-devel gtkhtml3-devel vte-devel BuildRequires: libgnomeprintui22-devel -# Mono only availible on these: (s390x disabled for now) -ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x +# Mono only availible on these: +ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x %description This package provides a library that allows you to build @@ -71,6 +71,9 @@ %{_prefix}/share/gapi %changelog +* Thu Jan 19 2006 Alexander Larsson 1.0.10-4 +- mono now builds on s390x + * Mon Jan 9 2006 Alexander Larsson 1.0.10-3 - Add s390 From fedora-cvs-commits at redhat.com Thu Jan 19 10:20:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 05:20:29 -0500 Subject: rpms/libwmf/devel libwmf.spec,1.15,1.16 Message-ID: <200601191020.k0JAKTCG015593@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/libwmf/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15519 Modified Files: libwmf.spec Log Message: match libsrvg2 _host usage Index: libwmf.spec =================================================================== RCS file: /cvs/dist/rpms/libwmf/devel/libwmf.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libwmf.spec 3 Jan 2006 13:04:35 -0000 1.15 +++ libwmf.spec 19 Jan 2006 10:20:26 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Windows Metafile Library Name: libwmf Version: 0.2.8.4 -Release: 3 +Release: 4 Group: System Environment/Libraries License: LGPL Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz @@ -63,11 +63,11 @@ %post /sbin/ldconfig -%{_bindir}/update-gdk-pixbuf-loaders %{_arch}-%{_host_vendor}-%{_host_os} +%{_bindir}/update-gdk-pixbuf-loaders %{_host} &>/dev/null || : %postun /sbin/ldconfig -%{_bindir}/update-gdk-pixbuf-loaders %{_arch}-%{_host_vendor}-%{_host_os} +%{_bindir}/update-gdk-pixbuf-loaders %{_host} &>/dev/null || : %files %defattr(-,root,root) @@ -98,6 +98,9 @@ rm -r $RPM_BUILD_ROOT %changelog +* Tue Jan 19 2006 Caolan McNamara 0.2.8.4-4 +- rh#178275# match srvg gtk2 %{_host} usage for pixbuf loaders + * Tue Jan 03 2006 Caolan McNamara 0.2.8.4-3 - add libwmf-0.2.8.4-fallbackfont.patch for rh#176620# From fedora-cvs-commits at redhat.com Thu Jan 19 10:47:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 05:47:21 -0500 Subject: rpms/dbus/devel dbus.spec,1.64,1.65 Message-ID: <200601191047.k0JAlLKX027839@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/dbus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27827 Modified Files: dbus.spec Log Message: Add s390x -sharp package Index: dbus.spec =================================================================== RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- dbus.spec 9 Jan 2006 19:15:58 -0000 1.64 +++ dbus.spec 19 Jan 2006 10:47:16 -0000 1.65 @@ -13,13 +13,13 @@ %define dbus_user_uid 81 -# Mono only availible on these: (s390x disabled for now) -%define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x +# Mono only availible on these: +%define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x Summary: D-BUS message bus Name: dbus Version: 0.60 -Release: 3 +Release: 4 URL: http://www.freedesktop.org/software/dbus/ Source0: %{name}-%{version}.tar.gz License: AFL/GPL @@ -288,6 +288,9 @@ %endif %changelog +* Thu Jan 19 2006 Alexander Larsson 0.60-4 +- mono now built on s390x + * Mon Jan 9 2006 Alexander Larsson 0.60-3 - Don't exclude non-mono arches From fedora-cvs-commits at redhat.com Thu Jan 19 10:48:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 05:48:40 -0500 Subject: rpms/gtk-sharp2/devel gtk-sharp2.spec,1.7,1.8 Message-ID: <200601191048.k0JAmeHq027912@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/gtk-sharp2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27897 Modified Files: gtk-sharp2.spec Log Message: build on s390x Index: gtk-sharp2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtk-sharp2.spec 9 Jan 2006 17:07:02 -0000 1.7 +++ gtk-sharp2.spec 19 Jan 2006 10:48:38 -0000 1.8 @@ -1,6 +1,6 @@ Name: gtk-sharp2 Version: 2.4.0 -Release: 2 +Release: 3 Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries @@ -16,8 +16,8 @@ BuildRequires: libgnomeprintui22-devel BuildRequires: automake, libtool -# Mono only availible on these: (s390x disabled for now) -ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x +# Mono only availible on these: +ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x %description This package provides a library that allows you to build @@ -92,6 +92,9 @@ %{_prefix}/share/gapi-2.0 %changelog +* Thu Jan 19 2006 Alexander Larsson 2.4.0-3 +- Mono now builds on s390x + * Mon Jan 9 2006 Alexander Larsson - 2.4.0-2 - Fix vte build From fedora-cvs-commits at redhat.com Thu Jan 19 11:28:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 06:28:31 -0500 Subject: rpms/gmime/devel gmime.spec,1.4,1.5 Message-ID: <200601191128.k0JBSV05026388@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/gmime/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26325 Modified Files: gmime.spec Log Message: Build on s390x Index: gmime.spec =================================================================== RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gmime.spec 9 Jan 2006 19:42:18 -0000 1.4 +++ gmime.spec 19 Jan 2006 11:28:28 -0000 1.5 @@ -1,6 +1,6 @@ Name: gmime Version: 2.1.17 -Release: 2 +Release: 3 Summary: Library for creating and parsing MIME messages Group: System Environment/Libraries @@ -12,8 +12,8 @@ BuildRequires: glib2-devel >= 2.0.0 BuildRequires: zlib-devel >= 1.2.1.1 -# Mono only availible on these: (s390x disabled for now) -%define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x +# Mono only availible on these: +%define mono_archs %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x %ifarch %mono_archs BuildRequires: mono-devel gtk-sharp2-gapi @@ -109,6 +109,9 @@ %endif %changelog +* Thu Jan 19 2006 Alexander Larsson 2.1.17-3 +- Build on s390x + * Mon Jan 9 2006 Alexander Larsson 2.1.17-2 - build gmime-sharp conditionally on mono arches From fedora-cvs-commits at redhat.com Thu Jan 19 12:09:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 07:09:28 -0500 Subject: rpms/docbook-style-xsl/devel docbook-xsl-sp.patch, NONE, 1.1 docbook-style-xsl.spec, 1.23, 1.24 Message-ID: <200601191209.k0JC9SU2018945@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/docbook-style-xsl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18892 Modified Files: docbook-style-xsl.spec Added Files: docbook-xsl-sp.patch Log Message: * Thu Jan 19 2006 Tim Waugh 1.69.1-3 - Apply patch to fix simpara manpage output, which asciidoc tends to use (bug #175592). docbook-xsl-sp.patch: block.xsl | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE docbook-xsl-sp.patch --- --- docbook-xsl-1.69.1/manpages/block.xsl.sp 2005-08-09 10:11:02.000000000 +0100 +++ docbook-xsl-1.69.1/manpages/block.xsl 2006-01-19 12:07:47.000000000 +0000 @@ -37,7 +37,7 @@ - .sp + .sp Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- docbook-style-xsl.spec 3 Jan 2006 13:51:32 -0000 1.23 +++ docbook-style-xsl.spec 19 Jan 2006 12:09:11 -0000 1.24 @@ -1,6 +1,6 @@ Name: docbook-style-xsl Version: 1.69.1 -Release: 2 +Release: 3 Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML. @@ -25,6 +25,7 @@ Patch1: docbook-xsl-pagesetup.patch Patch2: docbook-xsl-marginleft.patch Patch3: docbook-xsl-lists.patch +Patch4: docbook-xsl-sp.patch %description @@ -40,6 +41,7 @@ %patch1 -p1 -b .pagesetup %patch2 -p1 -b .marginleft %patch3 -p1 -b .lists +%patch4 -p1 -b .sp cp %{SOURCE1} Makefile for f in $(find -name "*'*") do @@ -98,6 +100,10 @@ %changelog +* Thu Jan 19 2006 Tim Waugh 1.69.1-3 +- Apply patch to fix simpara manpage output, which asciidoc tends to use + (bug #175592). + * Tue Jan 3 2006 Tim Waugh 1.69.1-2 - Patches from W. Michael Petullo: - Fix lists blocking (bug #161371). From fedora-cvs-commits at redhat.com Thu Jan 19 12:39:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 07:39:35 -0500 Subject: rpms/autofs/devel autofs-4.1.4-configureable-locking.patch, NONE, 1.1 autofs-4.1.4-locking-fix.patch, NONE, 1.1 autofs-4.1.4-multi-parse-fix.patch, NONE, 1.1 autofs-4.1.4-reentrant-syslog-copyright.patch, NONE, 1.1 autofs-4.1.4-sockopt-len-type.patch, NONE, 1.1 autofs-4.1.4-sol10-schema.patch, NONE, 1.1 autofs-4.1.4-yp_order-order-type.patch, NONE, 1.1 autofs.spec, 1.71, 1.72 autofs-4.1.4-check-is-multi.patch, 1.1, NONE Message-ID: <200601191239.k0JCdZ6D001158@cvs.devel.redhat.com> Author: ikent Update of /cvs/dist/rpms/autofs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1144 Modified Files: autofs.spec Added Files: autofs-4.1.4-configureable-locking.patch autofs-4.1.4-locking-fix.patch autofs-4.1.4-multi-parse-fix.patch autofs-4.1.4-reentrant-syslog-copyright.patch autofs-4.1.4-sockopt-len-type.patch autofs-4.1.4-sol10-schema.patch autofs-4.1.4-yp_order-order-type.patch Removed Files: autofs-4.1.4-check-is-multi.patch Log Message: * Mon Jan 17 2006 Ian Kent - 1:4.1.4-16 - Replace check-is-multi with more general multi-parse-fix. - Add fix for premature return when waiting for lock file. - Update copyright declaration for reentrant-syslog source. - Add patch for configure option to disable locking during mount. But don't disable locking by default. - Add ability to handle automount schema used in Sun directory server. - Quell compiler warning about getsockopt parameter. - Quell compiler warning about yp_order parameter. autofs-4.1.4-configureable-locking.patch: configure | 18 ++++++++++++++++++ configure.in | 10 ++++++++++ daemon/spawn.c | 2 ++ include/automount.h | 8 ++++++-- include/config.h.in | 2 ++ patches/util-linux-2.12a-flock.patch | 26 ++++++++++++++++++++++++++ patches/util-linux-2.12q-flock.patch | 25 +++++++++++++++++++++++++ 7 files changed, 89 insertions(+), 2 deletions(-) --- NEW FILE autofs-4.1.4-configureable-locking.patch --- This patch provides a configure option to disable the use of a lock file when calling mount from autofs. It also adds a patch to the "patches" directory that needs to be used for mount to (hopefuully) prevent /etc/mtab corruption when rapidly mounting filesystems when autofs does not use locking. To disable the locking add the configure option --disable-mount-locking. diff -Nurp autofs-4.1.4.orig/configure autofs-4.1.4/configure --- autofs-4.1.4.orig/configure 2005-04-06 23:24:37.000000000 +0800 +++ autofs-4.1.4/configure 2005-10-23 11:33:44.000000000 +0800 @@ -842,6 +842,7 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-ext-env disable search in environment for substitution variable +--disable-mount-locking disable use of locking when spawning mount command Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -4308,6 +4309,23 @@ _ACEOF fi # +# Disable use of locking when spawning mount command +# +# Check whether --enable-mount-locking or --disable-mount-locking was given. +if test "${enable_mount_locking+set}" = set; then + enableval="$enable_mount_locking" + +else + enableval=yes +fi; +if test x$enable_mount_locking = xyes -o x$enableval = xyes; then + cat >>confdefs.h <<\_ACEOF +#define ENABLE_MOUNT_LOCKING 1 +_ACEOF + +fi + +# # Write Makefile.conf and include/config.h # ac_config_headers="$ac_config_headers include/config.h" diff -Nurp autofs-4.1.4.orig/configure.in autofs-4.1.4/configure.in --- autofs-4.1.4.orig/configure.in 2005-04-06 23:24:37.000000000 +0800 +++ autofs-4.1.4/configure.in 2005-10-23 11:33:35.000000000 +0800 @@ -167,6 +167,16 @@ if test x$enable_ext_env = xyes; then fi # +# Disable use of locking when spawning mount command +# +AC_ARG_ENABLE(mount-locking, +--disable-mount-locking disable use of locking when spawning mount command,, + enableval=yes) +if test x$enable_mount_locking = xyes -o x$enableval = xyes; then + AC_DEFINE(ENABLE_MOUNT_LOCKING, 1) +fi + +# # Write Makefile.conf and include/config.h # AC_CONFIG_HEADER(include/config.h) diff -Nurp autofs-4.1.4.orig/daemon/spawn.c autofs-4.1.4/daemon/spawn.c --- autofs-4.1.4.orig/daemon/spawn.c 2005-02-10 20:56:53.000000000 +0800 +++ autofs-4.1.4/daemon/spawn.c 2005-10-23 10:51:10.000000000 +0800 @@ -322,6 +322,7 @@ int spawnl(int logpri, const char *prog, return do_spawn(logpri, 0, prog, (const char **) argv); } +#ifdef ENABLE_MOUNT_LOCKING int spawnll(int logpri, const char *prog, ...) { va_list arg; @@ -342,3 +343,4 @@ int spawnll(int logpri, const char *prog return do_spawn(logpri, 1, prog, (const char **) argv); } +#endif diff -Nurp autofs-4.1.4.orig/include/automount.h autofs-4.1.4/include/automount.h --- autofs-4.1.4.orig/include/automount.h 2005-01-26 21:03:02.000000000 +0800 +++ autofs-4.1.4/include/automount.h 2005-10-23 10:51:10.000000000 +0800 @@ -121,9 +121,13 @@ extern struct autofs_point ap; int aquire_lock(void); void release_lock(void); -int spawnll(int logpri, const char *prog, ...); int spawnl(int logpri, const char *prog, ...); -int spawnv(int logpri, const char *prog, const char *const *argv); +#ifdef ENABLE_MOUNT_LOCKING +int spawnll(int logpri, const char *prog, ...); +#else +#define spawnll spawnl +#endif +int spawnv(int ogpri, const char *prog, const char *const *argv); void reset_signals(void); void ignore_signals(void); void discard_pending(int sig); diff -Nurp autofs-4.1.4.orig/include/config.h.in autofs-4.1.4/include/config.h.in --- autofs-4.1.4.orig/include/config.h.in 2004-02-03 23:23:21.000000000 +0800 +++ autofs-4.1.4/include/config.h.in 2005-10-23 10:51:10.000000000 +0800 @@ -25,3 +25,5 @@ #undef HAVE_SLOPPY_MOUNT #undef ENABLE_EXT_ENV + +#undef ENABLE_MOUNT_LOCKING diff -Nurp autofs-4.1.4.orig/patches/util-linux-2.12a-flock.patch autofs-4.1.4/patches/util-linux-2.12a-flock.patch --- autofs-4.1.4.orig/patches/util-linux-2.12a-flock.patch 1970-01-01 08:00:00.000000000 +0800 +++ autofs-4.1.4/patches/util-linux-2.12a-flock.patch 2005-10-23 10:51:10.000000000 +0800 @@ -0,0 +1,30 @@ +--- util-linux-2.12a/mount/fstab.c.flock 2005-09-17 01:36:03.000000000 +0800 ++++ util-linux-2.12a/mount/fstab.c 2005-09-17 01:41:12.000000000 +0800 +@@ -488,7 +488,7 @@ lock_mtab (void) { + } + /* proceed anyway */ + } +- we_created_lockfile = 1; ++ we_created_lockfile = fd; + } else { + static int tries = 0; + +@@ -510,9 +510,8 @@ lock_mtab (void) { + MOUNTED_LOCK); + sleep(1); + } ++ close(fd); + } +- +- close(fd); + } + } + +@@ -520,6 +519,7 @@ lock_mtab (void) { + void + unlock_mtab (void) { + if (we_created_lockfile) { ++ close(we_created_lockfile); + unlink (MOUNTED_LOCK); + we_created_lockfile = 0; + } diff -Nurp autofs-4.1.4.orig/patches/util-linux-2.12q-flock.patch autofs-4.1.4/patches/util-linux-2.12q-flock.patch --- autofs-4.1.4.orig/patches/util-linux-2.12q-flock.patch 1970-01-01 08:00:00.000000000 +0800 +++ autofs-4.1.4/patches/util-linux-2.12q-flock.patch 2005-10-23 10:51:10.000000000 +0800 @@ -0,0 +1,29 @@ +--- util-linux-2.12q/mount/fstab.c.flock 2005-09-17 01:10:37.000000000 +0800 ++++ util-linux-2.12q/mount/fstab.c 2005-09-17 01:16:51.000000000 +0800 +@@ -417,6 +417,7 @@ + unlock_mtab (void) { + if (we_created_lockfile) { + unlink (MOUNTED_LOCK); ++ close(we_created_lock_file); + we_created_lockfile = 0; + } + } +@@ -528,6 +529,7 @@ + } + /* proceed anyway */ + } ++ we_created_lock_file = fd; + } else { + static int tries = 0; + +@@ -549,9 +551,8 @@ + MOUNTED_LOCK); + sleep(1); + } ++ close(fd); + } +- +- close(fd); + } + } + autofs-4.1.4-locking-fix.patch: daemon/spawn.c | 17 ++++++++++------- lib/lock.c | 8 ++++---- 2 files changed, 14 insertions(+), 11 deletions(-) --- NEW FILE autofs-4.1.4-locking-fix.patch --- This patch fixes two things. First, sloppy error handling when spawning a sub task. Second, if the process receives a signal while waiting on the lock file it will return a "timed out" error after only a little more than a tenth of a second. This was due to the wait time variable not being reset after each tenth of a second wait. diff -Nurp autofs-4.1.4.orig/daemon/spawn.c autofs-4.1.4/daemon/spawn.c --- autofs-4.1.4.orig/daemon/spawn.c 2005-02-10 20:56:53.000000000 +0800 +++ autofs-4.1.4/daemon/spawn.c 2005-11-01 18:36:35.000000000 +0800 @@ -214,14 +214,15 @@ static int do_spawn(int logpri, int use_ sigfillset(&allsignals); sigprocmask(SIG_BLOCK, &allsignals, &oldsig); - if (pipe(pipefd)) + if (pipe(pipefd)) { + if (use_lock) + release_lock(); + sigprocmask(SIG_SETMASK, &oldsig, NULL); return -1; + } f = fork(); - if (f < 0) { - sigprocmask(SIG_SETMASK, &oldsig, NULL); - return -1; - } else if (f == 0) { + if (f == 0) { reset_signals(); close(pipefd[0]); dup2(pipefd[1], STDOUT_FILENO); @@ -243,6 +244,8 @@ static int do_spawn(int logpri, int use_ if (f < 0) { close(pipefd[0]); + if (use_lock) + release_lock(); sigprocmask(SIG_SETMASK, &oldsig, NULL); return -1; } @@ -287,11 +290,11 @@ static int do_spawn(int logpri, int use_ if (waitpid(f, &status, 0) != f) status = -1; /* waitpid() failed */ - sigprocmask(SIG_SETMASK, &oldsig, NULL); - if (use_lock) release_lock(); + sigprocmask(SIG_SETMASK, &oldsig, NULL); + return status; } } diff -Nurp autofs-4.1.4.orig/lib/lock.c autofs-4.1.4/lib/lock.c --- autofs-4.1.4.orig/lib/lock.c 2005-01-17 23:09:28.000000000 +0800 +++ autofs-4.1.4/lib/lock.c 2005-11-01 20:12:28.000000000 +0800 @@ -208,9 +208,6 @@ void release_lock(void) */ static int wait_for_lockf(const char *lockf) { - struct timespec t = { 0, WAIT_INTERVAL }; - struct timespec r; - int ts_size = sizeof(struct timespec); int tries = WAIT_TRIES; int status = 0; struct stat st; @@ -218,10 +215,13 @@ static int wait_for_lockf(const char *lo while (tries-- && !status) { status = stat(lockf, &st); if (!status) { + struct timespec t = { 0, WAIT_INTERVAL }; + struct timespec r; + while (nanosleep(&t, &r) == -1 && errno == EINTR) { if (got_term) return 0; - memcpy(&t, &r, ts_size); + memcpy(&t, &r, sizeof(struct timespec)); } } } autofs-4.1.4-multi-parse-fix.patch: parse_sun.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) --- NEW FILE autofs-4.1.4-multi-parse-fix.patch --- diff -Nurp autofs-4.1.4.orig/modules/parse_sun.c autofs-4.1.4/modules/parse_sun.c --- autofs-4.1.4.orig/modules/parse_sun.c 2005-04-05 20:42:42.000000000 +0800 +++ autofs-4.1.4/modules/parse_sun.c 2005-04-25 10:00:13.000000000 +0800 @@ -766,7 +766,16 @@ static int check_is_multi(const char *ma { const char *p = (char *) mapent; int multi = 0; - int first_chunk = 0; + int not_first_chunk = 0; + + if (!p) { + crit("check_is_multi: unexpected NULL map entry pointer"); + return 0; + } + + /* If first character is "/" it's a multi-mount */ + if (*p == '/') + return 1; while (*p) { p = skipspace(p); @@ -779,7 +788,7 @@ static int check_is_multi(const char *ma * path that begins with '/' indicates a mutil-mount * entry. */ - if (first_chunk) { + if (not_first_chunk) { if (*p == '/' || *p == '-') { multi = 1; break; @@ -796,7 +805,7 @@ static int check_is_multi(const char *ma * after which it's a multi mount. */ p += chunklen(p, check_colon(p)); - first_chunk++; + not_first_chunk++; } return multi; @@ -883,7 +892,12 @@ int parse_mount(const char *root, const return 1; } - path = dequote(p, l = chunklen(p, 0)); + if (*p != '/') { + l = 0; + path = dequote("/", 1); + } else + path = dequote(p, l = chunklen(p, 0)); + if (!path) { error(MODPREFIX "out of memory"); free(myoptions); autofs-4.1.4-reentrant-syslog-copyright.patch: COPYRIGHT | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 insertions(+), 1 deletion(-) --- NEW FILE autofs-4.1.4-reentrant-syslog-copyright.patch --- --- autofs-4.1.4/COPYRIGHT.reentrant-syslog-copyright 2006-01-15 23:24:04.000000000 -0500 +++ autofs-4.1.4/COPYRIGHT 2006-01-15 23:24:46.000000000 -0500 @@ -14,4 +14,38 @@ GNU General Public License for more details. Portions Copyright (C) 1999-2000 Jeremy Fitzhardinge -Portions Copyright (C) 2001-2003 Ian Kent +Portions Copyright (C) 2001-2005 Ian Kent + +The files lib/syslog.c and include/syslog.h are licenced under the +BSD License and require that a copy of the notice ibelow be included in +accompanying documentation and be distributed with binary distributions +of the code, so be sure to include this file along with any binary +distributions derived from this source package. + +Copyright (c) 1983, 1988, 1993 + The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + autofs-4.1.4-sockopt-len-type.patch: lib/rpc_subs.c | 3 ++- modules/mount_nfs.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) --- NEW FILE autofs-4.1.4-sockopt-len-type.patch --- --- autofs-4.1.4/lib/rpc_subs.c.sockopt-len-type 2006-01-18 06:51:52.000000000 -0500 +++ autofs-4.1.4/lib/rpc_subs.c 2006-01-18 06:55:17.000000000 -0500 @@ -105,7 +105,8 @@ */ static int connect_nb(int fd, struct sockaddr_in *addr, struct timeval *tout) { - int flags, ret, len; + int flags, ret; + socklen_t len; fd_set wset, rset; flags = fcntl(fd, F_GETFL, 0); --- autofs-4.1.4/modules/mount_nfs.c.sockopt-len-type 2006-01-18 06:51:03.000000000 -0500 +++ autofs-4.1.4/modules/mount_nfs.c 2006-01-18 06:54:30.000000000 -0500 @@ -71,7 +71,7 @@ { struct sockaddr_in src_addr, local_addr; int src_len = sizeof(src_addr); - int local_len = sizeof(local_addr); + socklen_t local_len = sizeof(local_addr); int sock, ret; sock = socket(AF_INET, SOCK_DGRAM, udpproto); autofs-4.1.4-sol10-schema.patch: modules/lookup_ldap.c | 52 ++++++++++++++++++++++--------- samples/autofs-ldap-auto-master.c | 62 ++++++++++++++++++++++---------------- 2 files changed, 73 insertions(+), 41 deletions(-) --- NEW FILE autofs-4.1.4-sol10-schema.patch --- --- autofs-4.1.4/modules/lookup_ldap.c.sol10-schema 2005-02-27 00:37:14.000000000 -0500 +++ autofs-4.1.4/modules/lookup_ldap.c 2006-01-16 21:39:59.000000000 -0500 @@ -201,6 +201,7 @@ char **values = NULL; char *attrs[] = { key, type, NULL }; LDAP *ldap; + int found_entry = 0; if (ctxt == NULL) { crit(MODPREFIX "context was NULL"); @@ -267,6 +268,8 @@ continue; } + found_entry = 1; + values = ldap_get_values(ldap, e, type); if (!values) { info(MODPREFIX "no %s defined for %s", type, query); @@ -297,28 +300,42 @@ ldap_msgfree(result); ldap_unbind(ldap); - return 1; + if (found_entry) + return 1; + else + return 0; } static int read_map(const char *root, struct lookup_context *ctxt, const char *key, int keyvallen, time_t age, int *result_ldap) { - int rv1 = LDAP_SUCCESS, rv2 = LDAP_SUCCESS; + int rv = LDAP_SUCCESS; int ret; /* all else fails read entire map */ ret = read_one_map(root, "nisObject", "cn", - key, keyvallen, "nisMapEntry", ctxt, age, &rv1); - if (ret) - goto ret_ok; + key, keyvallen, "nisMapEntry", ctxt, age, &rv); + if (ret) { + if (rv == LDAP_SUCCESS) + goto ret_ok; + } ret = read_one_map(root, "automount", "cn", key, keyvallen, - "automountInformation", ctxt, age, &rv2); - if (ret) - goto ret_ok; + "automountInformation", ctxt, age, &rv); + if (ret) { + if (rv == LDAP_SUCCESS) + goto ret_ok; + } + + ret = read_one_map(root, "automount", "automountKey", key, keyvallen, + "automountInformation", ctxt, age, &rv); + if (ret) { + if (rv == LDAP_SUCCESS) + goto ret_ok; + } if (result_ldap) - *result_ldap = (rv1 == LDAP_SUCCESS ? rv2 : rv1); + *result_ldap = rv; return 0; @@ -593,7 +610,7 @@ int lookup_mount(const char *root, const char *name, int name_len, void *context) { struct lookup_context *ctxt = (struct lookup_context *) context; - int ret, ret2; + int ret, ret2, ret3; char key[KEY_MAX_LEN + 1]; int key_len; char mapent[MAPENT_MAX_LEN + 1]; @@ -614,10 +631,12 @@ ret = lookup_one(root, key, "nisObject", "cn", "nisMapEntry", ctxt); ret2 = lookup_one(root, key, "automount", "cn", "automountInformation", ctxt); + ret3 = lookup_one(root, key, + "automount", "automountKey", "automountInformation", ctxt); - debug("ret = %d, ret2 = %d", ret, ret2); + debug("ret = %d, ret2 = %d ret3 = %d", ret, ret2, ret3); - if (!ret && !ret2) + if (!ret && !ret2 && ret3) return 1; me = cache_lookup_first(); @@ -625,10 +644,11 @@ if (t_last_read > ap.exp_runfreq) if ((ret & (CHE_MISSING | CHE_UPDATED)) && - (ret2 & (CHE_MISSING | CHE_UPDATED))) + (ret2 & (CHE_MISSING | CHE_UPDATED)) && + (ret3 & (CHE_MISSING | CHE_UPDATED))) need_hup = 1; - if (ret == CHE_MISSING && ret2 == CHE_MISSING) { + if (ret == CHE_MISSING && ret2 == CHE_MISSING && ret3 == CHE_MISSING) { int wild = CHE_MISSING; /* Maybe update wild card map entry */ @@ -637,10 +657,12 @@ "cn", "nisMapEntry", ctxt); ret2 = lookup_wild(root, "automount", "cn", "automountInformation", ctxt); + ret3 = lookup_wild(root, "automount", "automountKey", + "automountInformation", ctxt); wild = (ret & (CHE_MISSING | CHE_FAIL)) && (ret2 & (CHE_MISSING | CHE_FAIL)); - if (ret & CHE_MISSING && ret2 & CHE_MISSING) + if (ret & CHE_MISSING && ret2 & CHE_MISSING && ret3 & CHE_MISSING) cache_delete(root, "*", 0); } --- autofs-4.1.4/samples/autofs-ldap-auto-master.c.sol10-schema 2006-01-16 21:35:07.000000000 -0500 +++ autofs-4.1.4/samples/autofs-ldap-auto-master.c 2006-01-16 21:36:07.000000000 -0500 @@ -159,7 +159,7 @@ { LDAP *ld = NULL; int result; - int c, mapset = 0; + int c, mapset = 0, default_schema = 1; const char *map_key = MAPKEY, *entry_key = ENTRYKEY, *value = VALUE; const char *map_oc = MAPOC, *entry_oc = ENTRYOC; const char *map = MAP; @@ -173,23 +173,27 @@ /* This is the object class we expect maps to * have. The default is MAPOC. */ map_oc = optarg; + default_schema = 0; break; case 'e': /* This is the object class we entries in the * map to be in. The default is ENTRYOC. */ entry_oc = optarg; + default_schema = 0; break; case 'n': /* This is the attribute which we use as the * key when looking up maps. Usually we use * MAP_KEY. */ map_key = optarg; + default_schema = 0; break; case 'k': /* This is the attribute which we use as the * key when looking up entries. Usually we use * ENTRY_KEY. */ entry_key = optarg; + default_schema = 0; break; case 'v': /* This is the attribute which we treat as @@ -197,6 +201,7 @@ * look up a map. Usually this is the * VALUE attribute. */ value = optarg; + default_schema = 0; break; default: fprintf(stderr, "syntax: %s\n" @@ -245,31 +250,36 @@ return 2; } - /* Try to dump the map given the preferred or user-supplied schema. */ - if(!dump_map(ld, map, map_oc, entry_oc, map_key, entry_key, value) && - (mapset || !dump_map(ld, "auto_master", map_oc, entry_oc, map_key, - entry_key, value))) { - if(strcmp(map_oc, "automountMap") || - strcmp(entry_oc, "automount") || - strcmp(map_key, "ou") || - strcmp(entry_key, "cn") || - strcmp(value, "automountInformation")) { - if (!dump_map(ld, - map, - "automountMap", - "automount", - "ou", - "cn", - "automountInformation") && !mapset) - dump_map(ld, - "auto_master", - "automountMap", - "automount", - "ou", - "cn", - "automountInformation"); - } - } + /* Try to dump the map given the preferred or user-supplied schema. + + Behavior should be as follows: + If the user specifies their own schema (ie. setting the map + object class) we try to obtain a map for their settings and if they + don't specify a map key, we also check 'auto_master' as the map key. + If we don't find a map, then we return nothing. + + If the user doesn't specify their own schema, we try all known + schemas with map names of 'auto.master' & 'auto_master', unless + a map name has been specified on the command line. If a map name + is specified on the command line then we try all known schemas + with that map name. + */ + + if (dump_map(ld, map, map_oc, entry_oc, map_key, + entry_key, value)); + else if (!mapset && dump_map(ld, "auto_master", map_oc, entry_oc, + map_key, entry_key, value)); + else if (!default_schema); + else if (dump_map(ld, map, "automountMap","automount","ou", + "cn","automountInformation")); + else if (!mapset && dump_map(ld, "auto_master", "automountMap", + "automount","ou","cn", + "automountInformation")); + else if (dump_map(ld, map, "automountMap","automount","automountMapName", + "automountKey","automountInformation")); + else if (!mapset && dump_map(ld, "auto_master", "automountMap", + "automount","automountMapName", + "automountKey", "automountInformation")); /* Close the connection to the server and quit. */ ldap_unbind(ld); autofs-4.1.4-yp_order-order-type.patch: nsswitch.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE autofs-4.1.4-yp_order-order-type.patch --- --- autofs-4.1.4/lib/nsswitch.c.yp_order-order-type 2006-01-17 05:53:25.000000000 -0500 +++ autofs-4.1.4/lib/nsswitch.c 2006-01-17 05:53:37.000000000 -0500 @@ -138,7 +138,7 @@ { int err; char *domainname; - int order; + unsigned int order; if ((err = yp_get_default_domain(&domainname)) != YPERR_SUCCESS) { error (MODPREFIX "unable to get default yp domain"); Index: autofs.spec =================================================================== RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- autofs.spec 9 Dec 2005 22:39:43 -0000 1.71 +++ autofs.spec 19 Jan 2006 12:39:22 -0000 1.72 @@ -4,29 +4,35 @@ Summary: A tool for automatically mounting and unmounting filesystems. Name: autofs %define version 4.1.4 -%define release 14.1 +%define release 16 Version: %{version} -Release: %{release}.1 +Release: %{release} Epoch: 1 License: GPL Group: System Environment/Daemons Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v4/autofs-%{version}.tar.bz2 Patch1: autofs-4.1.4-reentrant-syslog.patch -Patch2: autofs-4.1.4-init-nsswitch-comment.patch -Patch3: autofs-4.1.4-init-one-auto-master.patch -Patch4: autofs-4.1.4-init-browse-as-non-first-option.patch -Patch5: autofs-4.1.4-hesiod-bind.patch -Patch6: autofs-4.1.4-non-replicated-ping.patch -Patch7: autofs-4.1.4-check-nsswitch-submount.patch -Patch8: autofs-4.1.3-alt-master-ldap.patch -Patch9: autofs-4.1.4-check-is-multi.patch -Patch10: autofs-4.1.4-cache-update-race-fix.patch -Patch11: autofs-4.1.4-solaris-hosts-in-auto-master.patch -Patch12: autofs-4.1.4-keylen-length-check.patch -Patch13: autofs-4.1.4-sun-parse-fixes.patch -Patch14: autofs-4.1.4-check-return-of-is-local-addr.patch -Patch15: autofs-4.1.4-fix-sort-opts.patch -Patch16: autofs-4.1.4-no-slash-misc.patch +Patch2: autofs-4.1.4-reentrant-syslog-copyright.patch +Patch3: autofs-4.1.4-init-nsswitch-comment.patch +Patch4: autofs-4.1.4-init-one-auto-master.patch +Patch5: autofs-4.1.4-init-browse-as-non-first-option.patch +Patch6: autofs-4.1.4-hesiod-bind.patch +Patch7: autofs-4.1.4-non-replicated-ping.patch +Patch8: autofs-4.1.4-check-nsswitch-submount.patch +Patch9: autofs-4.1.3-alt-master-ldap.patch +Patch10: autofs-4.1.4-multi-parse-fix.patch +Patch11: autofs-4.1.4-cache-update-race-fix.patch +Patch12: autofs-4.1.4-solaris-hosts-in-auto-master.patch +Patch13: autofs-4.1.4-keylen-length-check.patch +Patch14: autofs-4.1.4-sun-parse-fixes.patch +Patch15: autofs-4.1.4-check-return-of-is-local-addr.patch +Patch16: autofs-4.1.4-fix-sort-opts.patch +Patch17: autofs-4.1.4-no-slash-misc.patch +Patch18: autofs-4.1.4-locking-fix.patch +Patch19: autofs-4.1.4-configureable-locking.patch +Patch20: autofs-4.1.4-sol10-schema.patch +Patch21: autofs-4.1.4-sockopt-len-type.patch +Patch22: autofs-4.1.4-yp_order-order-type.patch Buildroot: /var/tmp/autofs-tmp BuildPrereq: autoconf, hesiod-devel, openldap-devel, perl @@ -82,6 +88,13 @@ %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 + %build #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir} @@ -135,6 +148,16 @@ %{_libdir}/autofs/* %changelog +* Mon Jan 17 2006 Ian Kent - 1:4.1.4-16 +- Replace check-is-multi with more general multi-parse-fix. +- Add fix for premature return when waiting for lock file. +- Update copyright declaration for reentrant-syslog source. +- Add patch for configure option to disable locking during mount. + But don't disable locking by default. +- Add ability to handle automount schema used in Sun directory server. +- Quell compiler warning about getsockopt parameter. +- Quell compiler warning about yp_order parameter. + * Fri Dec 09 2005 Jesse Keating - rebuilt --- autofs-4.1.4-check-is-multi.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 19 13:02:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:02:39 -0500 Subject: rpms/libbonoboui/devel libbonoboui.spec,1.33,1.34 Message-ID: <200601191302.k0JD2cqP024204@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonoboui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24144 Modified Files: libbonoboui.spec Log Message: - s/$(LIB)/$LIB/g Index: libbonoboui.spec =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- libbonoboui.spec 19 Jan 2006 05:32:05 -0000 1.33 +++ libbonoboui.spec 19 Jan 2006 13:02:30 -0000 1.34 @@ -14,7 +14,7 @@ Summary: Bonobo user interface components Name: libbonoboui Version: 2.13.1 -Release: 2 +Release: 3 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: ta.po @@ -96,7 +96,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applications/bonobo-browser.desktop for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done @@ -133,6 +133,9 @@ %changelog * Thu Jan 19 2006 Ray Strode +- s/$(LIB)/$LIB/g + +* Thu Jan 19 2006 Ray Strode - fix shlib multilib bonobo issue (bug 156982) * Mon Jan 16 2006 Matthias Clasen From fedora-cvs-commits at redhat.com Thu Jan 19 13:03:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:03:52 -0500 Subject: rpms/libbonobo/devel libbonobo.spec,1.26,1.27 Message-ID: <200601191303.k0JD3q0E024473@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24415 Modified Files: libbonobo.spec Log Message: - Step three (unbreak the step two breakage) Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libbonobo.spec 19 Jan 2006 05:19:25 -0000 1.26 +++ libbonobo.spec 19 Jan 2006 13:03:50 -0000 1.27 @@ -6,7 +6,7 @@ Summary: Bonobo component system Name: libbonobo Version: 2.13.1 -Release: 4 +Release: 5 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -68,7 +68,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.*a for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done @@ -108,6 +108,9 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Thu Jan 19 2006 Ray Strode 2.13.1-5 +- Step three (unbreak the step two breakage) + * Thu Jan 19 2006 Ray Strode 2.13.1-4 - Step two (bug 156982) From fedora-cvs-commits at redhat.com Thu Jan 19 13:12:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:12:07 -0500 Subject: rpms/libgnome/devel libgnome.spec,1.44,1.45 Message-ID: <200601191312.k0JDC6rG026583@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libgnome/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26515 Modified Files: libgnome.spec Log Message: - fix multilib bonobo shlib problem Index: libgnome.spec =================================================================== RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- libgnome.spec 17 Jan 2006 03:09:49 -0000 1.44 +++ libgnome.spec 19 Jan 2006 13:12:02 -0000 1.45 @@ -12,7 +12,7 @@ Summary: GNOME base library Name: libgnome Version: 2.13.7 -Release: 1 +Release: 2 URL: ftp://ftp.gnome.org/ Source0: %{name}-%{version}.tar.bz2 Source1: desktop_gnome_peripherals_monitor.schemas @@ -119,6 +119,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la} +for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile +done + %find_lang %{po_package} %clean @@ -153,6 +157,9 @@ %{_datadir}/gtk-doc %changelog +* Thu Jan 19 2006 Ray Strode - 2.13.7-2 +- fix multilib bonobo shlib problem + * Mon Jan 16 2006 Matthias Clasen - 2.13.7-1 - Update to 2.13.7 From fedora-cvs-commits at redhat.com Thu Jan 19 13:17:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:17:13 -0500 Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.47,1.48 Message-ID: <200601191317.k0JDHDTc004558@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2844 Modified Files: gtkhtml3.spec Log Message: - fix broken fix in 3.9.4-2 Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gtkhtml3.spec 19 Jan 2006 05:48:07 -0000 1.47 +++ gtkhtml3.spec 19 Jan 2006 13:17:10 -0000 1.48 @@ -5,7 +5,7 @@ Summary: gtkhtml library Name: gtkhtml3 Version: 3.9.4 -Release: 2 +Release: 3 License: LGPL/GPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2 @@ -68,7 +68,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gtkhtml/*.a for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/GNOME_GtkHTML_Editor-3.8.servere @@ -98,6 +98,9 @@ %changelog * Thu Jan 19 2006 Ray Strode - 3.9.4-2 +- fix broken fix in 3.9.4-2 + +* Thu Jan 19 2006 Ray Strode - 3.9.4-2 - fix multlib shlib bonobo problem (bug 156982) * Tue Jan 3 2006 David Malcolm - 3.9.4-1 From fedora-cvs-commits at redhat.com Thu Jan 19 13:18:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:18:42 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.87,1.88 Message-ID: <200601191318.k0JDIgSk008499@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8430 Modified Files: gnome-vfs2.spec Log Message: - fix fix for bonobo shlib multilib issue (bug 156982) Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- gnome-vfs2.spec 19 Jan 2006 05:08:27 -0000 1.87 +++ gnome-vfs2.spec 19 Jan 2006 13:18:38 -0000 1.88 @@ -10,7 +10,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.13.4 -Release: 3 +Release: 4 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -125,7 +125,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la} for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done @@ -180,6 +180,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Thu Jan 19 2006 Ray Strode 2.13.4-4 +- fix fix for bonobo shlib multilib issue (bug 156982) + * Thu Jan 19 2006 Ray Strode 2.13.4-3 - fix bonobo shlib multilib issue (bug 156982) From fedora-cvs-commits at redhat.com Thu Jan 19 13:20:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:20:23 -0500 Subject: rpms/docbook-style-xsl/devel docbook-style-xsl.spec, 1.24, 1.25 docbook-xsl-lists.patch, 1.1, 1.2 Message-ID: <200601191320.k0JDKNEv009182@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/docbook-style-xsl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9150 Modified Files: docbook-style-xsl.spec docbook-xsl-lists.patch Log Message: * Thu Jan 19 2006 Tim Waugh 1.69.1-4 - Better 'lists' patch (bug #161371). Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-style-xsl.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- docbook-style-xsl.spec 19 Jan 2006 12:09:11 -0000 1.24 +++ docbook-style-xsl.spec 19 Jan 2006 13:20:18 -0000 1.25 @@ -1,6 +1,6 @@ Name: docbook-style-xsl Version: 1.69.1 -Release: 3 +Release: 4 Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML. @@ -100,6 +100,9 @@ %changelog +* Thu Jan 19 2006 Tim Waugh 1.69.1-4 +- Better 'lists' patch (bug #161371). + * Thu Jan 19 2006 Tim Waugh 1.69.1-3 - Apply patch to fix simpara manpage output, which asciidoc tends to use (bug #175592). docbook-xsl-lists.patch: lists.xsl | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 61 insertions(+), 7 deletions(-) Index: docbook-xsl-lists.patch =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/devel/docbook-xsl-lists.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- docbook-xsl-lists.patch 3 Jan 2006 13:50:54 -0000 1.1 +++ docbook-xsl-lists.patch 19 Jan 2006 13:20:18 -0000 1.2 @@ -1,46 +1,123 @@ ---- docbook-xsl-1.69.1/fo/lists.xsl.orig 2006-01-01 20:00:44.000000000 -0600 -+++ docbook-xsl-1.69.1/fo/lists.xsl 2006-01-01 20:01:54.000000000 -0600 -@@ -125,9 +125,18 @@ +--- docbook-xsl-1.69.1/fo/lists.xsl.orig 2006-01-19 02:36:22.000000000 -0800 ++++ docbook-xsl-1.69.1/fo/lists.xsl 2006-01-19 02:34:54.000000000 -0800 +@@ -125,9 +130,18 @@ -- ++ ++ ++ ++ ++ + - -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++ + ++ ++ -@@ -288,9 +297,18 @@ +@@ -287,9 +301,18 @@ -- ++ ++ ++ ++ ++ + - -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ++ + ++ ++ +@@ -486,9 +509,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -906,9 +938,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -932,9 +973,18 @@ + + + ++ ++ ++ ++ ++ + +- ++ + ++ ++ + + + +@@ -1112,10 +1162,19 @@ + + + ++ ++ ++ ++ ++ + +- ++ + +- ++ ++ ++ + + From fedora-cvs-commits at redhat.com Thu Jan 19 13:22:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:22:23 -0500 Subject: rpms/gnome-spell/devel gnome-spell.spec,1.15,1.16 Message-ID: <200601191322.k0JDMNcS010012@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-spell/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9945 Modified Files: gnome-spell.spec Log Message: - fix fix for multilib issue with shlib bonobo components (bug 156982) Index: gnome-spell.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-spell/devel/gnome-spell.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnome-spell.spec 19 Jan 2006 05:04:54 -0000 1.15 +++ gnome-spell.spec 19 Jan 2006 13:22:19 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Bonobo component for spell checking Name: gnome-spell Version: 1.0.5 -Release: 11 +Release: 12 Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-spell/%{name}-%{version}.tar.bz2 Patch0: gnome-spell-1.0.2-pspell-compat.patch Patch1: gnome-spell-1.0.2-langlist.patch @@ -47,7 +47,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-spell/*.la for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do -sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile +sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done @@ -66,6 +66,9 @@ %{_datadir}/idl/* %changelog +* Thu Jan 19 2006 Ray Strode 1.0.5-12 +- fix fix for multilib issue with shlib bonobo components (bug 156982) + * Thu Jan 19 2006 Ray Strode 1.0.5-11 - fix multilib issue with shlib bonobo components (bug 156982) From fedora-cvs-commits at redhat.com Thu Jan 19 13:23:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:23:06 -0500 Subject: rpms/gtk2-engines/devel gtk2-engines.spec,1.31,1.32 Message-ID: <200601191323.k0JDN6AQ010350@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2-engines/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10293 Modified Files: gtk2-engines.spec Log Message: 2.7.3 Index: gtk2-engines.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- gtk2-engines.spec 10 Jan 2006 22:17:52 -0000 1.31 +++ gtk2-engines.spec 19 Jan 2006 13:23:03 -0000 1.32 @@ -1,7 +1,7 @@ Summary: Theme engines for GTK+ 2.0 Name: gtk2-engines -Version: 2.7.2 -Release: 2 +Version: 2.7.3 +Release: 1 License: GPL Group: System Environment/Libraries Source: gtk-engines-%{version}.tar.bz2 @@ -14,8 +14,6 @@ URL: ftp://ftp.gnome.org/pub/GNOME/sources/gtk-engines BuildRoot: /var/tmp/%{name}-%{version}-root -Patch0: gtk-engines-2.7.2-handles.patch - %description The gtk2-engines package contains shared objects and configuration files that implement a number of GTK+ theme engines. Theme engines @@ -26,8 +24,6 @@ %prep %setup -q -n gtk-engines-%{version} -%patch0 -p1 -b .handles - %build %configure make @@ -64,6 +60,9 @@ %{_datadir}/themes %changelog +* Thu Jan 19 2006 Matthias Clasen 2.7.3-1 +- Update to 2.7.3 + * Tue Jan 10 2006 Ray Strode 2.7.2-2 - fix handle drawing bugs from F-Spot and gnome-panel - change %%makeinstall to make install DESTDIR=... From fedora-cvs-commits at redhat.com Thu Jan 19 13:24:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:24:09 -0500 Subject: rpms/evolution/devel evolution.spec,1.116,1.117 Message-ID: <200601191324.k0JDO9tJ010790@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10728 Modified Files: evolution.spec Log Message: - fix fix for multilib issue with shlib bonobo components (bug 156982) Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- evolution.spec 19 Jan 2006 04:58:56 -0000 1.116 +++ evolution.spec 19 Jan 2006 13:24:04 -0000 1.117 @@ -33,7 +33,7 @@ Name: evolution Version: 2.5.4 -Release: 9 +Release: 10 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -350,7 +350,7 @@ ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done %find_lang %name-%{evo_major} @@ -514,6 +514,9 @@ %{_libdir}/evolution/%{evo_major}/*.so %changelog +* Wed Jan 18 2006 Ray Strode - 2.5.4-10 +- fix fix for multilib issue with shlib bonobo components (bug 156982) + * Wed Jan 18 2006 Ray Strode - 2.5.4-9 - fix multilib issue with shlib bonobo components (bug 156982) From fedora-cvs-commits at redhat.com Thu Jan 19 13:25:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:25:48 -0500 Subject: rpms/rhythmbox/devel rhythmbox.spec,1.38,1.39 Message-ID: <200601191325.k0JDPmIO011468@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11397 Modified Files: rhythmbox.spec Log Message: - fix to fix for bonobo multilib issue (bug 156982) Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- rhythmbox.spec 19 Jan 2006 05:42:05 -0000 1.38 +++ rhythmbox.spec 19 Jan 2006 13:25:44 -0000 1.39 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.2 -Release: 6 +Release: 7 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2 @@ -52,7 +52,7 @@ rm -f %{buildroot}%{_libdir}/bonobo/librb-nautilus-context-menu.so for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$(LIB)/|' $serverfile + sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done @@ -100,6 +100,9 @@ %{_libdir}/pkgconfig/rhythmbox.pc %changelog +* Thu Jan 19 2006 Ray Strode 0.9.2-7 +- fix to fix for bonobo multilib issue (bug 156982) + * Thu Jan 19 2006 Ray Strode 0.9.2-6 - bonobo multilib issue (bug 156982) From fedora-cvs-commits at redhat.com Thu Jan 19 13:35:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:35:20 -0500 Subject: rpms/gtk2-engines/devel .cvsignore,1.16,1.17 sources,1.17,1.18 Message-ID: <200601191335.k0JDZK7p014287@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2-engines/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14265 Modified Files: .cvsignore sources Log Message: forgotten source Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 3 Jan 2006 14:45:49 -0000 1.16 +++ .cvsignore 19 Jan 2006 13:35:17 -0000 1.17 @@ -12,3 +12,4 @@ gtk-engines-2.7.0.cvs20051211.tar.gz gtk-engines-2.7.1.tar.bz2 gtk-engines-2.7.2.tar.bz2 +gtk-engines-2.7.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 3 Jan 2006 14:45:49 -0000 1.17 +++ sources 19 Jan 2006 13:35:17 -0000 1.18 @@ -1 +1 @@ -5840bcaa86092d133258905630f4212c gtk-engines-2.7.2.tar.bz2 +ec3c57550c673c6f96e11099a29e187a gtk-engines-2.7.3.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 19 13:38:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:38:50 -0500 Subject: rpms/rhythmbox/devel rhythmbox.spec,1.39,1.40 Message-ID: <200601191338.k0JDcoPD015178@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15101 Modified Files: rhythmbox.spec Log Message: - bonobo multilib issue (bug 156982) Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- rhythmbox.spec 19 Jan 2006 13:25:44 -0000 1.39 +++ rhythmbox.spec 19 Jan 2006 13:38:47 -0000 1.40 @@ -17,7 +17,7 @@ BuildRequires: libgpod-devel BuildRequires: libgnomeui-devel >= 2.6.0 BuildRequires: nautilus-cd-burner-devel -BuildRequires: gstreamer-plugins-devel >= 0.8.1 +BuildRequires: gstreamer08-plugins-devel >= 0.8.1 BuildRequires: gettext, scrollkeeper BuildRequires: totem-devel >= 1.1.5 BuildRequires: gnome-vfs2 >= 2.7.4 @@ -101,9 +101,6 @@ %changelog * Thu Jan 19 2006 Ray Strode 0.9.2-7 -- fix to fix for bonobo multilib issue (bug 156982) - -* Thu Jan 19 2006 Ray Strode 0.9.2-6 - bonobo multilib issue (bug 156982) * Wed Jan 04 2006 John (J5) Palmieri 0.9.2-5 From fedora-cvs-commits at redhat.com Thu Jan 19 13:49:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:49:07 -0500 Subject: rpms/rhythmbox/devel rhythmbox.spec,1.40,1.41 Message-ID: <200601191349.k0JDn7AD030538@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29547 Modified Files: rhythmbox.spec Log Message: - bonobo multilib issue (bug 156982) Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- rhythmbox.spec 19 Jan 2006 13:38:47 -0000 1.40 +++ rhythmbox.spec 19 Jan 2006 13:49:03 -0000 1.41 @@ -52,11 +52,9 @@ rm -f %{buildroot}%{_libdir}/bonobo/librb-nautilus-context-menu.so for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile + sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done - - %find_lang %name # Default internet radio stations use mp3 From fedora-cvs-commits at redhat.com Thu Jan 19 13:57:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 08:57:39 -0500 Subject: rpms/gdm/devel gdm.spec,1.119,1.120 Message-ID: <200601191357.k0JDvd3H001643@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1587 Modified Files: gdm.spec Log Message: - sed -ie isn't the same as sed -i -e (we want the latter) Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- gdm.spec 19 Jan 2006 04:14:35 -0000 1.119 +++ gdm.spec 19 Jan 2006 13:57:36 -0000 1.120 @@ -15,7 +15,7 @@ Summary: The GNOME Display Manager. Name: gdm Version: 2.13.0.5 -Release: 6 +Release: 7 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -229,30 +229,30 @@ # Comment out some entries from the custom config file that may have changed # locations in the update - sed -ie 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^GraphicalTheme=Bluecurve@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^BackgroundColor=#20305a@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^HostImageDir=/usr/share/hosts/@#HostImageDir=/usr/share/pixmaps/faces/@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^LogDir=/var/log/gdm@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^PostLoginScriptDir=/etc/X11/gdm/PostLogin@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^PreLoginScriptDir=/etc/X11/gdm/PreLogin@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^PreSessionScriptDir=/etc/X11/gdm/PreSession@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^PostSessionScriptDir=/etc/X11/gdm/PostSession@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^DisplayInitDir=/var/run/gdm.pid@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff@#&@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^ServAuthDir=/var/gdm@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^command=/usr/X11R6/bin/X@#command=/usr/bin/Xorg@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^Xnest=/usr/X11R6/bin/Xnest@#Xnest=/usr/X11R6/bin/Xnest@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^BaseXsession=/etc/X11/xdm/Xsession@#BaseXsession=/etc/X11/xinit/Xsession@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^Greeter=/usr/bin/gdmgreeter@#Greeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^RemoteGreeter=/usr/bin/gdmlogin@#RemoteGreeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^GraphicalTheme=Bluecurve@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^BackgroundColor=#20305a@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^HostImageDir=/usr/share/hosts/@#HostImageDir=/usr/share/pixmaps/faces/@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^LogDir=/var/log/gdm@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^PostLoginScriptDir=/etc/X11/gdm/PostLogin@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^PreLoginScriptDir=/etc/X11/gdm/PreLogin@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^PreSessionScriptDir=/etc/X11/gdm/PreSession@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^PostSessionScriptDir=/etc/X11/gdm/PostSession@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^DisplayInitDir=/var/run/gdm.pid@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff@#&@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^ServAuthDir=/var/gdm@#&@' %{_datadir}/gdm/config/gdm.conf-custom # Someone might be trying to use different greeters for the local/remote cases # so migrate them to their new locations. - sed -ie 's@^Greeter=/usr/bin/gdmlogin at Greeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom - sed -ie 's@^RemoteGreeter=/usr/bin/gdmgreeter at RemoteGreeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^Greeter=/usr/bin/gdmlogin at Greeter=/usr/libexec/gdmlogin@' %{_datadir}/gdm/config/gdm.conf-custom + sed -i -e 's@^RemoteGreeter=/usr/bin/gdmgreeter at RemoteGreeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom fi %{_sbindir}/gdm-safe-restart || : @@ -307,6 +307,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Tue Jan 17 2006 Ray Strode - 1:2.13.0.5-7 +- sed -ie isn't the same as sed -i -e (we want the latter) + * Wed Jan 18 2006 Christopher Aillon - 1:2.13.0.5-6 - Add patch to fix clock to default to 24h in locales that expect it (175453) From fedora-cvs-commits at redhat.com Thu Jan 19 14:01:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 09:01:25 -0500 Subject: rpms/gnome-spell/devel gnome-spell.spec,1.16,1.17 Message-ID: <200601191401.k0JE1PHf002989@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-spell/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2881 Modified Files: gnome-spell.spec Log Message: - s/sed -ie/sed -i -e/ Index: gnome-spell.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-spell/devel/gnome-spell.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnome-spell.spec 19 Jan 2006 13:22:19 -0000 1.16 +++ gnome-spell.spec 19 Jan 2006 14:01:21 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Bonobo component for spell checking Name: gnome-spell Version: 1.0.5 -Release: 12 +Release: 13 Source0: ftp://ftp.gnome.org/pub/gnome/sources/gnome-spell/%{name}-%{version}.tar.bz2 Patch0: gnome-spell-1.0.2-pspell-compat.patch Patch1: gnome-spell-1.0.2-langlist.patch @@ -47,7 +47,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-spell/*.la for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do -sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile +sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done @@ -66,6 +66,9 @@ %{_datadir}/idl/* %changelog +* Thu Jan 19 2006 Ray Strode 1.0.5-13 +- s/sed -ie/sed -i -e/ + * Thu Jan 19 2006 Ray Strode 1.0.5-12 - fix fix for multilib issue with shlib bonobo components (bug 156982) From fedora-cvs-commits at redhat.com Thu Jan 19 14:03:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 09:03:10 -0500 Subject: rpms/gdm/devel gdm.spec,1.120,1.121 Message-ID: <200601191403.k0JE3Aaj003292@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3239 Modified Files: gdm.spec Log Message: - sed -ie isn't the same as sed -i -e (we want the latter) Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- gdm.spec 19 Jan 2006 13:57:36 -0000 1.120 +++ gdm.spec 19 Jan 2006 14:03:07 -0000 1.121 @@ -307,7 +307,7 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog -* Tue Jan 17 2006 Ray Strode - 1:2.13.0.5-7 +* Thu Jan 19 2006 Ray Strode - 1:2.13.0.5-7 - sed -ie isn't the same as sed -i -e (we want the latter) * Wed Jan 18 2006 Christopher Aillon - 1:2.13.0.5-6 From fedora-cvs-commits at redhat.com Thu Jan 19 14:06:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 09:06:31 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.88,1.89 Message-ID: <200601191406.k0JE6VPr003996@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3956 Modified Files: gnome-vfs2.spec Log Message: - s/sed -ie/sed -i -e/ Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- gnome-vfs2.spec 19 Jan 2006 13:18:38 -0000 1.88 +++ gnome-vfs2.spec 19 Jan 2006 14:06:25 -0000 1.89 @@ -10,7 +10,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.13.4 -Release: 4 +Release: 5 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -125,7 +125,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la} for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile + sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done @@ -180,6 +180,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Thu Jan 19 2006 Ray Strode 2.13.4-5 +- s/sed -ie/sed -i -e/ + * Thu Jan 19 2006 Ray Strode 2.13.4-4 - fix fix for bonobo shlib multilib issue (bug 156982) From fedora-cvs-commits at redhat.com Thu Jan 19 14:08:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 09:08:29 -0500 Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.48,1.49 Message-ID: <200601191408.k0JE8TjW004411@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4225 Modified Files: gtkhtml3.spec Log Message: - s/sed -ie/sed -i -e/ Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- gtkhtml3.spec 19 Jan 2006 13:17:10 -0000 1.48 +++ gtkhtml3.spec 19 Jan 2006 14:08:26 -0000 1.49 @@ -5,7 +5,7 @@ Summary: gtkhtml library Name: gtkhtml3 Version: 3.9.4 -Release: 3 +Release: 4 License: LGPL/GPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2 @@ -68,7 +68,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gtkhtml/*.a for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile + sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/GNOME_GtkHTML_Editor-3.8.servere @@ -97,7 +97,10 @@ %{_libdir}/pkgconfig/*.pc %changelog -* Thu Jan 19 2006 Ray Strode - 3.9.4-2 +* Thu Jan 19 2006 Ray Strode - 3.9.4-3 +- s/sed -ie/sed -i -e/ + +* Thu Jan 19 2006 Ray Strode - 3.9.4-3 - fix broken fix in 3.9.4-2 * Thu Jan 19 2006 Ray Strode - 3.9.4-2 From fedora-cvs-commits at redhat.com Thu Jan 19 14:09:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 09:09:03 -0500 Subject: rpms/libbonobo/devel libbonobo.spec,1.27,1.28 Message-ID: <200601191409.k0JE934M004594@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4515 Modified Files: libbonobo.spec Log Message: - s/sed -ie/sed -i -e/ Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- libbonobo.spec 19 Jan 2006 13:03:50 -0000 1.27 +++ libbonobo.spec 19 Jan 2006 14:09:01 -0000 1.28 @@ -6,7 +6,7 @@ Summary: Bonobo component system Name: libbonobo Version: 2.13.1 -Release: 5 +Release: 6 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -68,7 +68,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/orbit-2.0/*.*a for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile + sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done @@ -108,6 +108,9 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Thu Jan 19 2006 Ray Strode 2.13.1-6 +- s/sed -ie/sed -i -e/ + * Thu Jan 19 2006 Ray Strode 2.13.1-5 - Step three (unbreak the step two breakage) From fedora-cvs-commits at redhat.com Thu Jan 19 14:09:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 09:09:47 -0500 Subject: rpms/libbonoboui/devel libbonoboui.spec,1.34,1.35 Message-ID: <200601191409.k0JE9liV004782@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonoboui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4695 Modified Files: libbonoboui.spec Log Message: - change sed -ie to sed -i -e Index: libbonoboui.spec =================================================================== RCS file: /cvs/dist/rpms/libbonoboui/devel/libbonoboui.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- libbonoboui.spec 19 Jan 2006 13:02:30 -0000 1.34 +++ libbonoboui.spec 19 Jan 2006 14:09:44 -0000 1.35 @@ -14,7 +14,7 @@ Summary: Bonobo user interface components Name: libbonoboui Version: 2.13.1 -Release: 3 +Release: 4 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 Source1: ta.po @@ -96,7 +96,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/applications/bonobo-browser.desktop for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile + sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done @@ -132,6 +132,9 @@ %{_datadir}/gtk-doc %changelog +* Thu Jan 19 2006 Ray Strode 2.13.1-4 +- change sed -ie to sed -i -e + * Thu Jan 19 2006 Ray Strode - s/$(LIB)/$LIB/g From fedora-cvs-commits at redhat.com Thu Jan 19 14:10:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 09:10:44 -0500 Subject: rpms/libgnome/devel libgnome.spec,1.45,1.46 Message-ID: <200601191410.k0JEAinx005030@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libgnome/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4957 Modified Files: libgnome.spec Log Message: - s/sed -ie/sed -i -e/ Index: libgnome.spec =================================================================== RCS file: /cvs/dist/rpms/libgnome/devel/libgnome.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- libgnome.spec 19 Jan 2006 13:12:02 -0000 1.45 +++ libgnome.spec 19 Jan 2006 14:10:39 -0000 1.46 @@ -12,7 +12,7 @@ Summary: GNOME base library Name: libgnome Version: 2.13.7 -Release: 2 +Release: 3 URL: ftp://ftp.gnome.org/ Source0: %{name}-%{version}.tar.bz2 Source1: desktop_gnome_peripherals_monitor.schemas @@ -120,7 +120,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo/monikers/*.{a,la} for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile + sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done %find_lang %{po_package} @@ -157,6 +157,9 @@ %{_datadir}/gtk-doc %changelog +* Thu Jan 19 2006 Ray Strode - 2.13.7-3 +- s/sed -ie/sed -i -e/ + * Thu Jan 19 2006 Ray Strode - 2.13.7-2 - fix multilib bonobo shlib problem From fedora-cvs-commits at redhat.com Thu Jan 19 14:42:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 09:42:53 -0500 Subject: rpms/nss/devel nss.spec,1.6,1.7 Message-ID: <200601191442.k0JEgr76024367@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/nss/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24297 Modified Files: nss.spec Log Message: - rebuild Index: nss.spec =================================================================== RCS file: /cvs/dist/rpms/nss/devel/nss.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nss.spec 17 Dec 2005 05:27:19 -0000 1.6 +++ nss.spec 19 Jan 2006 14:42:48 -0000 1.7 @@ -3,7 +3,7 @@ Summary: Network Security Services Name: nss Version: 3.11 -Release: 2 +Release: 3 License: MPL/GPL/LGPL URL: http://www.mozilla.org/projects/security/pki/nss/ Group: System Environment/Libraries @@ -308,6 +308,9 @@ %changelog +* Thu Jan 19 2006 Ray Strode 3.11-3 +- rebuild + * Fri Dec 16 2005 Christopher Aillon 3.11-2 - Update file list for the devel packages From fedora-cvs-commits at redhat.com Thu Jan 19 14:45:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 09:45:29 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.151, 1.152 policycoreutils.spec, 1.220, 1.221 Message-ID: <200601191445.k0JEjT01025132@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25083 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Thu Jan 19 2006 Dan Walsh 1.29.8-4 - Fixes for "add"-"modify" error messages - Fixes for chcat policycoreutils-rhat.patch: scripts/chcat | 24 ++++++--- semanage/semanage | 26 ++++++++-- semanage/semanage.8 | 7 ++ semanage/seobject.py | 129 +++++++++++++++++++++++++++++++++++++++++++++----- setsebool/setsebool.c | 7 +- 5 files changed, 166 insertions(+), 27 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- policycoreutils-rhat.patch 18 Jan 2006 22:06:19 -0000 1.151 +++ policycoreutils-rhat.patch 19 Jan 2006 14:45:25 -0000 1.152 @@ -1,7 +1,43 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.8/scripts/chcat --- nsapolicycoreutils/scripts/chcat 2006-01-18 11:12:43.000000000 -0500 -+++ policycoreutils-1.29.8/scripts/chcat 2006-01-18 13:52:39.000000000 -0500 -@@ -281,6 +281,7 @@ ++++ policycoreutils-1.29.8/scripts/chcat 2006-01-19 09:41:13.000000000 -0500 +@@ -25,11 +25,19 @@ + import commands, sys, os, pwd, string, getopt, re, selinux + import seobject + ++def verify_users(users): ++ for u in users: ++ try: ++ pwd.getpwnam(u) ++ except KeyError, e: ++ error( "User %s does not exist" % u) ++ + def chcat_user_add(orig, newcat, users): + errors=0 + logins = seobject.loginRecords() + seusers=logins.get_all() + add_ind=0 ++ verify_users(users) + for u in users: + if u in seusers.keys(): + user=seusers[u] +@@ -98,6 +106,7 @@ + logins = seobject.loginRecords() + seusers=logins.get_all() + add_ind=0 ++ verify_users(users) + for u in users: + if u in seusers.keys(): + user=seusers[u] +@@ -174,6 +183,7 @@ + logins = seobject.loginRecords() + seusers=logins.get_all() + add_ind=0 ++ verify_users(users) + for u in users: + if u in seusers.keys(): + user=seusers[u] +@@ -281,6 +291,7 @@ print "Usage %s -d File ..." % sys.argv[0] print "Usage %s -l -d user ..." % sys.argv[0] print "Usage %s -L" % sys.argv[0] @@ -9,11 +45,17 @@ print "Use -- to end option list. For example" print "chcat -- -CompanyConfidential /docs/businessplan.odt" print "chcat -l +CompanyConfidential juser" -@@ -298,12 +299,8 @@ +@@ -297,13 +308,14 @@ + fd.close() return 0 ++ def listusercats(users): - seusers = seobject.loginRecords().get_all() ++ if len(users) == 0: ++ users.append(os.getlogin()) ++ ++ verify_users(users) for u in users: - if u in seusers.keys(): - cats=seobject.translate(seusers[u][1]) @@ -23,19 +65,8 @@ cats=cats.split("-") if len(cats) > 1 and cats[1] != "s0": print "%s: %s" % (u, cats[1]) -@@ -350,10 +347,17 @@ - if delete_ind: - sys.exit(chcat_replace(["s0"], ["s0"], cmds, login_ind)) - -+ if login_ind: -+ if len(cmds) >= 1: -+ for u in cmds: -+ try: -+ pwd.getpwnam(u) -+ except KeyError, e: -+ error( "User %s does not exist" % u) -+ else: -+ cmds.append(os.getlogin()) +@@ -352,8 +364,6 @@ + if list_ind: if login_ind: - if len(cmds) < 1: @@ -177,7 +208,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.8/semanage/seobject.py --- nsapolicycoreutils/semanage/seobject.py 2006-01-18 11:12:43.000000000 -0500 -+++ policycoreutils-1.29.8/semanage/seobject.py 2006-01-18 17:03:01.000000000 -0500 ++++ policycoreutils-1.29.8/semanage/seobject.py 2006-01-19 09:43:38.000000000 -0500 @@ -21,9 +21,18 @@ # # @@ -281,20 +312,6 @@ class semanageRecords: def __init__(self): self.sh = semanage_handle_create() -@@ -421,11 +506,11 @@ - - rc = semanage_port_modify_local(self.sh, k, p) - if rc < 0: -- raise ValueError("Failed to add port %s/%s" % (proto, port)) -+ raise ValueError("Failed to modify port %s/%s" % (proto, port)) - - rc = semanage_commit(self.sh) - if rc < 0: -- raise ValueError("Failed to add port %s/%s" % (proto, port)) -+ raise ValueError("Failed to modify port %s/%s" % (proto, port)) - - def modify(self, port, proto, serange, setype): - if serange == "" and setype == "": @@ -458,7 +543,7 @@ rc = semanage_commit(self.sh) @@ -313,11 +330,9 @@ + if type == "reserved_port_t": + continue + level = semanage_context_get_mls(con) - proto=semanage_port_get_proto_str(u) - low=semanage_port_get_low(u) - high = semanage_port_get_high(u) -- if (name, proto) not in dict.keys(): -- dict[(name,proto)]=[] ++ proto=semanage_port_get_proto_str(u) ++ low=semanage_port_get_low(u) ++ high = semanage_port_get_high(u) + dict[(low, high)]=(type, proto, level) + return dict + @@ -334,9 +349,11 @@ + if type == "reserved_port_t": + continue + level = semanage_context_get_mls(con) -+ proto=semanage_port_get_proto_str(u) -+ low=semanage_port_get_low(u) -+ high = semanage_port_get_high(u) + proto=semanage_port_get_proto_str(u) + low=semanage_port_get_low(u) + high = semanage_port_get_high(u) +- if (name, proto) not in dict.keys(): +- dict[(name,proto)]=[] + if (type, proto) not in dict.keys(): + dict[(type,proto)]=[] if low == high: @@ -356,6 +373,24 @@ keys=dict.keys() keys.sort() for i in keys: +@@ -614,7 +721,7 @@ + + rc = semanage_commit(self.sh) + if rc < 0: +- raise ValueError("Failed to add interface %s" % interface) ++ raise ValueError("Failed to modify interface %s" % interface) + + def delete(self, interface): + (rc,k) = semanage_iface_key_create(self.sh, interface) +@@ -779,7 +886,7 @@ + + rc = semanage_commit(self.sh) + if rc < 0: +- raise ValueError("Failed to add file context for %s" % target) ++ raise ValueError("Failed to modify file context for %s" % target) + + def delete(self, target, ftype): + (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.c policycoreutils-1.29.8/setsebool/setsebool.c --- nsapolicycoreutils/setsebool/setsebool.c 2006-01-04 13:07:46.000000000 -0500 +++ policycoreutils-1.29.8/setsebool/setsebool.c 2006-01-18 13:27:42.000000000 -0500 Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.220 retrieving revision 1.221 diff -u -r1.220 -r1.221 --- policycoreutils.spec 18 Jan 2006 22:06:24 -0000 1.220 +++ policycoreutils.spec 19 Jan 2006 14:45:25 -0000 1.221 @@ -4,7 +4,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.8 -Release: 3 +Release: 4 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -97,6 +97,10 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Thu Jan 19 2006 Dan Walsh 1.29.8-4 +- Fixes for "add"-"modify" error messages +- Fixes for chcat + * Wed Jan 18 2006 Dan Walsh 1.29.8-3 - Add management of translation file to semaange and seobject From fedora-cvs-commits at redhat.com Thu Jan 19 17:50:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 12:50:58 -0500 Subject: rpms/gnome-mag/devel .cvsignore, 1.15, 1.16 gnome-mag.spec, 1.20, 1.21 sources, 1.15, 1.16 Message-ID: <200601191750.k0JHow5l011969@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-mag/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11955 Modified Files: .cvsignore gnome-mag.spec sources Log Message: 0.12.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 6 Oct 2005 03:21:52 -0000 1.15 +++ .cvsignore 19 Jan 2006 17:50:55 -0000 1.16 @@ -5,3 +5,4 @@ gnome-mag-0.12.0.tar.bz2 gnome-mag-0.12.1.tar.bz2 gnome-mag-0.12.2.tar.bz2 +gnome-mag-0.12.3.tar.bz2 Index: gnome-mag.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- gnome-mag.spec 9 Dec 2005 22:40:40 -0000 1.20 +++ gnome-mag.spec 19 Jan 2006 17:50:55 -0000 1.21 @@ -2,8 +2,8 @@ Summary: GNOME Magnifier Name: gnome-mag -Version: 0.12.2 -Release: 2.1 +Version: 0.12.3 +Release: 1 License: LGPL Group: Desktop/Accessibility URL: http://www.gnome.org/ @@ -73,6 +73,9 @@ %{_datadir}/idl/gnome-mag-1.0 %changelog +* Thu Jan 19 2006 Matthias Clasen +- Update to 0.12.3 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 6 Oct 2005 03:21:52 -0000 1.15 +++ sources 19 Jan 2006 17:50:55 -0000 1.16 @@ -1 +1 @@ -14d0915a0174861312f98106e2d7fbd2 gnome-mag-0.12.2.tar.bz2 +f04ccfa081a9433538300ca07e8be1a2 gnome-mag-0.12.3.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 19 17:56:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 12:56:54 -0500 Subject: rpms/gnome-terminal/devel .cvsignore, 1.18, 1.19 gnome-terminal.spec, 1.28, 1.29 sources, 1.18, 1.19 Message-ID: <200601191756.k0JHusTs012355@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12341 Modified Files: .cvsignore gnome-terminal.spec sources Log Message: 2.13.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 17 Jan 2006 05:03:15 -0000 1.18 +++ .cvsignore 19 Jan 2006 17:56:51 -0000 1.19 @@ -3,3 +3,4 @@ gnome-terminal-2.13.0.tar.bz2 gnome-terminal-2.13.1.tar.bz2 gnome-terminal-2.13.2.tar.bz2 +gnome-terminal-2.13.3.tar.bz2 Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- gnome-terminal.spec 17 Jan 2006 05:03:16 -0000 1.28 +++ gnome-terminal.spec 19 Jan 2006 17:56:51 -0000 1.29 @@ -12,7 +12,7 @@ Summary: GNOME Terminal Name: gnome-terminal -Version: 2.13.2 +Version: 2.13.3 Release: 1 URL: http://www.gnome.org/ Source0: gnome-terminal-%{version}.tar.bz2 @@ -101,6 +101,9 @@ %{_libdir}/bonobo %changelog +* Thu Jan 19 2006 Matthias Clasen 2.13.3-1 +- Update to 2.13.3 + * Tue Jan 17 2006 Matthias Clasen 2.13.2-1 - Update to 2.13.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 17 Jan 2006 05:03:16 -0000 1.18 +++ sources 19 Jan 2006 17:56:51 -0000 1.19 @@ -1 +1 @@ -a7e43c966c0c871386a91b790c03a560 gnome-terminal-2.13.2.tar.bz2 +0b25b5962fa7a74fa19b020d5bfdd310 gnome-terminal-2.13.3.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 19 17:58:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 12:58:46 -0500 Subject: rpms/gnome-mag/devel gnome-mag.spec,1.21,1.22 Message-ID: <200601191758.k0JHwkL7012459@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-mag/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12446 Modified Files: gnome-mag.spec Log Message: Fix build Index: gnome-mag.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gnome-mag.spec 19 Jan 2006 17:50:55 -0000 1.21 +++ gnome-mag.spec 19 Jan 2006 17:58:42 -0000 1.22 @@ -36,7 +36,7 @@ %patch0 -p1 -b .lib64 %build -automake-1.4 +automake-1.9 autoconf %configure make From fedora-cvs-commits at redhat.com Thu Jan 19 18:05:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 13:05:31 -0500 Subject: rpms/krb5/devel krb5.sh,1.1,1.2 krb5.spec,1.64,1.65 Message-ID: <200601191805.k0JI5VoT012689@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/krb5/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12675 Modified Files: krb5.sh krb5.spec Log Message: Use full paths in krb5.sh to avoid path lookups Index: krb5.sh =================================================================== RCS file: /cvs/dist/rpms/krb5/devel/krb5.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- krb5.sh 9 Sep 2004 07:05:48 -0000 1.1 +++ krb5.sh 19 Jan 2006 18:05:28 -0000 1.2 @@ -1,8 +1,8 @@ -if ! echo ${PATH} | grep -q /usr/kerberos/bin ; then +if ! echo ${PATH} | /bin/grep -q /usr/kerberos/bin ; then PATH=/usr/kerberos/bin:${PATH} fi -if ! echo ${PATH} | grep -q /usr/kerberos/sbin ; then - if [ `id -u` = 0 ] ; then +if ! echo ${PATH} | /bin/grep -q /usr/kerberos/sbin ; then + if [ `/usr/bin/id -u` = 0 ] ; then PATH=/usr/kerberos/sbin:${PATH} fi fi Index: krb5.spec =================================================================== RCS file: /cvs/dist/rpms/krb5/devel/krb5.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- krb5.spec 9 Dec 2005 22:41:14 -0000 1.64 +++ krb5.spec 19 Jan 2006 18:05:28 -0000 1.65 @@ -10,7 +10,7 @@ Summary: The Kerberos network authentication system. Name: krb5 Version: 1.4.3 -Release: 1.1 +Release: 2 # Maybe we should explode from the now-available-to-everybody tarball instead? # http://web.mit.edu/kerberos/dist/krb5/1.4/krb5-1.4.2-signed.tar Source0: krb5-%{version}.tar.gz @@ -135,6 +135,9 @@ workstation. %changelog +* Thu Jan 19 2006 Matthias Clasen 1.4.3-2 +- Use full paths in krb5.sh to avoid path lookups + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 19 18:07:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 13:07:09 -0500 Subject: rpms/gnome-mag/devel gnome-mag.spec,1.22,1.23 Message-ID: <200601191807.k0JI79ki012755@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-mag/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12742 Modified Files: gnome-mag.spec Log Message: Fix build even more Index: gnome-mag.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gnome-mag.spec 19 Jan 2006 17:58:42 -0000 1.22 +++ gnome-mag.spec 19 Jan 2006 18:07:07 -0000 1.23 @@ -36,6 +36,7 @@ %patch0 -p1 -b .lib64 %build +aclocal automake-1.9 autoconf %configure From fedora-cvs-commits at redhat.com Thu Jan 19 18:13:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 13:13:35 -0500 Subject: rpms/yelp/devel .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 yelp.spec, 1.46, 1.47 Message-ID: <200601191813.k0JIDZll012942@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/yelp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12929 Modified Files: .cvsignore sources yelp.spec Log Message: 2.13.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/yelp/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 15 Dec 2005 06:19:30 -0000 1.20 +++ .cvsignore 19 Jan 2006 18:13:32 -0000 1.21 @@ -9,3 +9,4 @@ yelp-2.12.1.tar.bz2 yelp-2.13.1.tar.bz2 yelp-2.13.2.tar.bz2 +yelp-2.13.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/yelp/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 15 Dec 2005 06:19:30 -0000 1.20 +++ sources 19 Jan 2006 18:13:32 -0000 1.21 @@ -1 +1 @@ -5ce481181869fb0b36774c7c8a81d97a yelp-2.13.2.tar.bz2 +402ec144f9de53c16a5ecce137048a70 yelp-2.13.3.tar.bz2 Index: yelp.spec =================================================================== RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- yelp.spec 18 Jan 2006 14:44:15 -0000 1.46 +++ yelp.spec 19 Jan 2006 18:13:32 -0000 1.47 @@ -12,8 +12,8 @@ Summary: A system documentation reader from the Gnome project. Name: yelp -Version: 2.13.2 -Release: 3 +Version: 2.13.3 +Release: 1 Source: %{name}-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=319096 Patch1: yelp-2.12.1-fedora-docs.patch @@ -52,10 +52,9 @@ BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: gnome-doc-utils -# beagle search will be fixed in 2.13.3 -#%ifnarch s390 s390x ppc64 -#BuildRequires: libbeagle-devel -#%endif +%ifnarch s390 s390x ppc64 +BuildRequires: libbeagle-devel +%endif %description Yelp is the Gnome 2 help/documentation browser. It is designed @@ -71,7 +70,7 @@ %build # beagle search will be fixed in 2.13.3 %configure \ - --disable-search \ + --enable-search \ --with-mozilla=mozilla \ --disable-man \ --disable-info \ @@ -120,6 +119,10 @@ %{_datadir}/yelp %changelog +* Thu Jan 19 2006 Matthias Clasen - 2.13.3-1 +- Update to 2.13.3 +- enable search + * Wed Jan 18 2006 Matthias Clasen - 2.13.2-3 - Disable search, since it doesn't compile against current beagle From fedora-cvs-commits at redhat.com Thu Jan 19 18:20:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 13:20:08 -0500 Subject: rpms/gnome-mag/devel gnome-mag.spec,1.23,1.24 Message-ID: <200601191820.k0JIK8Nu025808@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-mag/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25792 Modified Files: gnome-mag.spec Log Message: Fix file lists Index: gnome-mag.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-mag/devel/gnome-mag.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- gnome-mag.spec 19 Jan 2006 18:07:07 -0000 1.23 +++ gnome-mag.spec 19 Jan 2006 18:20:05 -0000 1.24 @@ -72,6 +72,7 @@ %{_libdir}/pkgconfig/*pc %{_libdir}/*.so %{_datadir}/idl/gnome-mag-1.0 +%{_datadir}/doc/gnome-mag* %changelog * Thu Jan 19 2006 Matthias Clasen From fedora-cvs-commits at redhat.com Thu Jan 19 18:24:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 13:24:03 -0500 Subject: rpms/yelp/devel yelp.spec,1.47,1.48 Message-ID: <200601191824.k0JIO36r025856@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/yelp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25835 Modified Files: yelp.spec Log Message: Remove upstreamed bug Index: yelp.spec =================================================================== RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- yelp.spec 19 Jan 2006 18:13:32 -0000 1.47 +++ yelp.spec 19 Jan 2006 18:24:00 -0000 1.48 @@ -18,7 +18,6 @@ # http://bugzilla.gnome.org/show_bug.cgi?id=319096 Patch1: yelp-2.12.1-fedora-docs.patch Patch2: yelp-2.13.2-add-mime-handling.patch -Patch3: yelp-2.13.2-new-mimetype-for-docbook-xml.patch License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-root @@ -65,7 +64,6 @@ %setup -q %patch1 -p1 -b .fedora-docs %patch2 -p1 -b .add-mime-handling -%patch3 -p1 -b .new-mimetype-for-docbook-xml %build # beagle search will be fixed in 2.13.3 From fedora-cvs-commits at redhat.com Thu Jan 19 18:40:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 13:40:06 -0500 Subject: rpms/gstreamer08-plugins/devel gstreamer08-plugins.spec,1.5,1.6 Message-ID: <200601191840.k0JIe6rg005854@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/gstreamer08-plugins/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5809 Modified Files: gstreamer08-plugins.spec Log Message: * Thu Jan 19 2006 Christopher Aillon - 0.8.11-6 - Rebuild Index: gstreamer08-plugins.spec =================================================================== RCS file: /cvs/dist/rpms/gstreamer08-plugins/devel/gstreamer08-plugins.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gstreamer08-plugins.spec 9 Jan 2006 18:33:32 -0000 1.5 +++ gstreamer08-plugins.spec 19 Jan 2006 18:39:59 -0000 1.6 @@ -8,7 +8,7 @@ Name: %{gstreamer}-plugins Version: 0.8.11 -Release: 5 +Release: 6 Summary: GStreamer Streaming media framework plug-ins Group: Applications/Multimedia @@ -24,7 +24,7 @@ Requires: glib2 >= %_glib2 -Requires: %{name} >= %_gst +Requires: %{gstreamer} >= %_gst Requires(post): /sbin/ldconfig Requires(post): /usr/bin/gst-register-%{majmin} @@ -61,7 +61,6 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libmng-devel -BuildRequires: gstreamer-devel >= 0.5.2-8 BuildRequires: SDL-devel >= 1.2.0 BuildRequires: libogg-devel >= 1.0 BuildRequires: libvorbis-devel >= 0:1.0beta4 @@ -318,8 +317,11 @@ %{_libdir}/*so %changelog +* Thu Jan 19 2006 Christopher Aillon - 0.8.11-6 +- Rebuild + * Mon Jan 9 2006 John (J5) Palmieri - 0.8.11-5 -- requier gstreamer08-plugins-devel not gstreamer-devel +- require gstreamer08-plugins-devel not gstreamer-devel - obsolete gstreamer-plugins-devel not gstreamer08-plugins-devel * Mon Jan 9 2006 Jeremy Katz - 0.8.11-4 From fedora-cvs-commits at redhat.com Thu Jan 19 18:48:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 13:48:03 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec, 1.46, 1.47 sources, 1.13, 1.14 Message-ID: <200601191848.k0JIm3me017884@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17216 Modified Files: gnome-screensaver.spec sources Log Message: Slight improvements to the Fedora lock dialog Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- gnome-screensaver.spec 17 Jan 2006 17:48:59 -0000 1.46 +++ gnome-screensaver.spec 19 Jan 2006 18:48:00 -0000 1.47 @@ -14,7 +14,7 @@ Summary: GNOME Sreensaver Name: gnome-screensaver Version: 2.13.5 -Release: 1 +Release: 2 License: GPL Group: Amusement/Graphics Source0: %{name}-%{version}.tar.bz2 @@ -122,6 +122,9 @@ %{_sysconfdir}/pam.d/* %changelog +* Thu Jan 19 2006 Matthias Clasen - 2.13.5-2 +- Slight improvements to the Fedora lock dialog + * Tue Jan 17 2006 Matthias Clasen - 2.13.5-1 - Update to 2.13.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 17 Jan 2006 17:31:07 -0000 1.13 +++ sources 19 Jan 2006 18:48:00 -0000 1.14 @@ -1,2 +1,2 @@ -3f0250f7f2b0de901ddc3760a4f942b6 fedoralogo-floaters-lock-dialog.tar.gz 2ab5b1c5b432f6b763f40c3a4a2b1c94 gnome-screensaver-2.13.5.tar.bz2 +05af491aed0f172d36d8b024dcfc9536 fedoralogo-floaters-lock-dialog.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 19 18:48:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 13:48:13 -0500 Subject: rpms/hal/FC-4 hal-0.5.2-translate-to-utf8.patch, NONE, 1.1 hal.spec, 1.55, 1.56 Message-ID: <200601191848.k0JImDn9018096@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/hal/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv17902 Modified Files: hal.spec Added Files: hal-0.5.2-translate-to-utf8.patch Log Message: - attempt to address unicode encoding issues for thumb drives (bug 144551). hal-0.5.2-translate-to-utf8.patch: 10-storage-policy.fdi | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE hal-0.5.2-translate-to-utf8.patch --- --- hal-0.5.2/fdi/policy/10osvendor/10-storage-policy.fdi.translate-to-utf8 2006-01-19 13:39:51.000000000 -0500 +++ hal-0.5.2/fdi/policy/10osvendor/10-storage-policy.fdi 2006-01-19 13:44:06.000000000 -0500 @@ -130,6 +130,12 @@ false + + + + true + Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/FC-4/hal.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- hal.spec 23 May 2005 14:01:36 -0000 1.55 +++ hal.spec 19 Jan 2006 18:48:09 -0000 1.56 @@ -17,7 +17,7 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.2 -Release: 2 +Release: 2.fc4 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz License: AFL/GPL @@ -50,6 +50,7 @@ Patch0: hal-0.5.2-dont-mount-sync.patch Patch1: hal-0.5.2-fixup-fstab-sync-man-page.patch Patch2: hal-0.5.2-fix-doublefree.patch +Patch3: hal-0.5.2-translate-to-utf8.patch %description @@ -84,6 +85,7 @@ %patch0 -p0 -b .dont-mount-sync %patch1 -p0 -b .fixup-fstab-sync-man-page %patch2 -p0 -b .fix-doublefree +%patch3 -p1 -b .translate-to-utf8 %build @@ -171,6 +173,10 @@ %{_bindir}/hal-device-manager %changelog +* Thu Jan 19 2006 Ray Strode 0.5.2-2.fc4 +- attempt to address unicode encoding issues for thumb drives + (bug 144551). + * Mon May 23 2005 David Zeuthen 0.5.2-2 - Fix doublefree when locking (#158474) - Never use the 'sync' mount option (#157674) From fedora-cvs-commits at redhat.com Thu Jan 19 19:08:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 14:08:49 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.26, 1.27 modules-targeted.conf, 1.11, 1.12 policy-20060104.patch, 1.16, 1.17 selinux-policy.spec, 1.87, 1.88 sources, 1.28, 1.29 Message-ID: <200601191908.k0JJ8ng2027378@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27348 Modified Files: .cvsignore modules-targeted.conf policy-20060104.patch selinux-policy.spec sources Log Message: * Wed Jan 18 2006 Dan Walsh 2.2.2-1 - Update to upstream - Turn off execheap execstack for unconfined users - Add mono/wine policy to allow execheap and execstack for them - Add execheap for Xdm policy Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 17 Jan 2006 22:47:11 -0000 1.26 +++ .cvsignore 19 Jan 2006 19:08:32 -0000 1.27 @@ -27,3 +27,4 @@ serefpolicy-2.1.11.tgz serefpolicy-2.1.12.tgz serefpolicy-2.1.13.tgz +serefpolicy-2.2.2.tgz Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- modules-targeted.conf 9 Jan 2006 20:14:17 -0000 1.11 +++ modules-targeted.conf 19 Jan 2006 19:08:32 -0000 1.12 @@ -1001,3 +1001,10 @@ # wine = base +# Layer: apps +# Module: mono +# +# mono executable +# +mono = base + policy-20060104.patch: Makefile | 2 +- policy/global_tunables | 4 ++++ policy/modules/admin/logwatch.te | 7 +++++++ policy/modules/apps/java.te | 1 + policy/modules/apps/mono.fc | 2 ++ policy/modules/apps/mono.if | 23 +++++++++++++++++++++++ policy/modules/apps/mono.te | 25 +++++++++++++++++++++++++ policy/modules/apps/wine.fc | 2 ++ policy/modules/apps/wine.if | 23 +++++++++++++++++++++++ policy/modules/apps/wine.te | 25 +++++++++++++++++++++++++ policy/modules/kernel/domain.if | 2 +- policy/modules/kernel/filesystem.if | 16 ++++++++++++++++ policy/modules/services/bind.if | 1 + policy/modules/services/xdm.te | 2 +- policy/modules/system/libraries.fc | 2 +- policy/modules/system/unconfined.if | 6 ++++++ policy/modules/system/unconfined.te | 15 ++++++++------- policy/users | 8 +++++--- 18 files changed, 152 insertions(+), 14 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- policy-20060104.patch 17 Jan 2006 22:47:11 -0000 1.16 +++ policy-20060104.patch 19 Jan 2006 19:08:32 -0000 1.17 @@ -1,14 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Changelog serefpolicy-2.1.13/Changelog ---- nsaserefpolicy/Changelog 2006-01-17 17:08:50.000000000 -0500 -+++ serefpolicy-2.1.13/Changelog 2006-01-17 17:43:28.000000000 -0500 -@@ -1,4 +1,3 @@ --* Tue Jan 17 2006 Chris PeBenito - 20060117 - - Adds support for generating corenetwork interfaces based on attributes - in addition to types. - - Permits the listing of multiple nodes in a network_node() that will be -diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.1.13/Makefile ---- nsaserefpolicy/Makefile 2006-01-13 09:48:25.000000000 -0500 -+++ serefpolicy-2.1.13/Makefile 2006-01-17 17:43:28.000000000 -0500 +diff --exclude-from=exclude -N -u -r nsaserefpolicy/Makefile serefpolicy-2.2.2/Makefile +--- nsaserefpolicy/Makefile 2006-01-19 10:00:35.000000000 -0500 ++++ serefpolicy-2.2.2/Makefile 2006-01-19 10:42:14.000000000 -0500 @@ -92,7 +92,7 @@ # enable MLS if requested. @@ -18,15 +10,130 @@ override CHECKPOLICY += -M override CHECKMODULE += -M endif -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.1.13/policy/modules/apps/wine.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/global_tunables serefpolicy-2.2.2/policy/global_tunables +--- nsaserefpolicy/policy/global_tunables 2006-01-13 09:48:26.000000000 -0500 ++++ serefpolicy-2.2.2/policy/global_tunables 2006-01-19 10:55:45.000000000 -0500 +@@ -22,6 +22,10 @@ + + ## Allow making the stack executable via mprotect. + ## Also requires allow_execmem. ++gen_tunable(allow_execheap,false) ++ ++## Allow making the stack executable via mprotect. ++## Also requires allow_execmem. + gen_tunable(allow_execstack,false) + + ## Allow ftp servers to modify public files +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/logwatch.te serefpolicy-2.2.2/policy/modules/admin/logwatch.te +--- nsaserefpolicy/policy/modules/admin/logwatch.te 2006-01-13 17:06:02.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/admin/logwatch.te 2006-01-19 11:23:59.000000000 -0500 +@@ -38,6 +38,7 @@ + kernel_read_kernel_sysctl(logwatch_t) + kernel_read_system_state(logwatch_t) + ++corecmd_read_sbin_symlink(logwatch_t) + corecmd_read_sbin_file(logwatch_t) + corecmd_exec_bin(logwatch_t) + corecmd_exec_shell(logwatch_t) +@@ -68,6 +69,8 @@ + + miscfiles_read_localization(logwatch_t) + ++selinux_dontaudit_getattr_dir(logwatch_t) ++ + userdom_dontaudit_search_sysadm_home_dir(logwatch_t) + userdom_dontaudit_getattr_sysadm_home_dir(logwatch_t) + +@@ -94,6 +97,10 @@ + nscd_use_socket(logwatch_t) + ') + ++optional_policy(`ntp',` ++ ntp_domtrans(logwatch_t) ++') ++ + optional_policy(`rpc',` + rpc_search_nfs_state_data(logwatch_t) + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/java.te serefpolicy-2.2.2/policy/modules/apps/java.te +--- nsaserefpolicy/policy/modules/apps/java.te 2006-01-12 18:28:45.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/apps/java.te 2006-01-19 13:05:16.000000000 -0500 +@@ -8,3 +8,4 @@ + + type java_exec_t; + files_type(java_exec_t) ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.fc serefpolicy-2.2.2/policy/modules/apps/mono.fc +--- nsaserefpolicy/policy/modules/apps/mono.fc 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/apps/mono.fc 2006-01-19 12:46:09.000000000 -0500 +@@ -0,0 +1,2 @@ ++/usr/bin/mono -- gen_context(system_u:object_r:mono_exec_t,s0) ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.if serefpolicy-2.2.2/policy/modules/apps/mono.if +--- nsaserefpolicy/policy/modules/apps/mono.if 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/apps/mono.if 2006-01-19 12:46:09.000000000 -0500 +@@ -0,0 +1,23 @@ ++## Load keyboard mappings. ++ ++######################################## ++## ++## Execute the mono program in the mono domain. ++## ++## ++## The type of the process performing this action. ++## ++# ++interface(`mono_domtrans',` ++ gen_require(` ++ type mono_t, mono_exec_t; ++ ') ++ ++ corecmd_search_bin($1) ++ domain_auto_trans($1, mono_exec_t, mono_t) ++ ++ allow $1 mono_t:fd use; ++ allow mono_t $1:fd use; ++ allow mono_t $1:fifo_file rw_file_perms; ++ allow mono_t $1:process sigchld; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.2/policy/modules/apps/mono.te +--- nsaserefpolicy/policy/modules/apps/mono.te 1969-12-31 19:00:00.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/apps/mono.te 2006-01-19 13:29:46.000000000 -0500 +@@ -0,0 +1,25 @@ ++policy_module(mono,1.0.0) ++ ++######################################## ++# ++# Declarations ++# ++ ++type mono_t; ++domain_type(mono_t) ++ ++type mono_exec_t; ++domain_entry_file(mono_t,mono_exec_t) ++ ++ ++######################################## ++# ++# Local policy ++# ++ ++ifdef(`targeted_policy',` ++ allow mono_t self:process execheap; ++ unconfined_domain_template(mono_t) ++ role system_r types mono_t; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.fc serefpolicy-2.2.2/policy/modules/apps/wine.fc --- nsaserefpolicy/policy/modules/apps/wine.fc 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.13/policy/modules/apps/wine.fc 2006-01-17 17:43:28.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/apps/wine.fc 2006-01-19 10:58:16.000000000 -0500 @@ -0,0 +1,2 @@ +/usr/bin/wine -- gen_context(system_u:object_r:wine_exec_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.1.13/policy/modules/apps/wine.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.if serefpolicy-2.2.2/policy/modules/apps/wine.if --- nsaserefpolicy/policy/modules/apps/wine.if 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.13/policy/modules/apps/wine.if 2006-01-17 17:43:28.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/apps/wine.if 2006-01-19 10:58:17.000000000 -0500 @@ -0,0 +1,23 @@ +## Load keyboard mappings. + @@ -51,10 +158,10 @@ + allow wine_t $1:fifo_file rw_file_perms; + allow wine_t $1:process sigchld; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.1.13/policy/modules/apps/wine.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/wine.te serefpolicy-2.2.2/policy/modules/apps/wine.te --- nsaserefpolicy/policy/modules/apps/wine.te 1969-12-31 19:00:00.000000000 -0500 -+++ serefpolicy-2.1.13/policy/modules/apps/wine.te 2006-01-17 17:43:28.000000000 -0500 -@@ -0,0 +1,27 @@ ++++ serefpolicy-2.2.2/policy/modules/apps/wine.te 2006-01-19 13:30:34.000000000 -0500 +@@ -0,0 +1,25 @@ +policy_module(wine,1.0.0) + +######################################## @@ -75,150 +182,133 @@ +# + +ifdef(`targeted_policy',` -+ allow wine_t self:process execmem; ++ allow wine_t self:process { execstack execmem }; + unconfined_domain_template(wine_t) -+ unconfined_domtrans(wine_t) + role system_r types wine_t; + allow wine_t file_type:file execmod; ++') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.2.2/policy/modules/kernel/domain.if +--- nsaserefpolicy/policy/modules/kernel/domain.if 2006-01-19 10:00:40.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/kernel/domain.if 2006-01-19 10:42:31.000000000 -0500 +@@ -1122,7 +1122,7 @@ + allow $1 domain:fifo_file rw_file_perms; + + # Act upon any other process. +- allow $1 domain:process ~{ transition dyntransition execmem }; ++ allow $1 domain:process ~{ transition dyntransition execmem execheap execstack }; + + # Create/access any System V IPC objects. + allow $1 domain:{ sem msgq shm } *; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.2/policy/modules/kernel/filesystem.if +--- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-19 10:00:41.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/kernel/filesystem.if 2006-01-19 10:42:14.000000000 -0500 +@@ -1826,6 +1826,22 @@ + + ######################################## + ## ++## Dontaudit Search directories on a ramfs ++## ++## ++## Domain allowed access. ++## ++# ++interface(`fs_dontaudit_search_ramfs',` ++ gen_require(` ++ type ramfs_t; ++ ') + ++ dontaudit $1 ramfs_t:dir search; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.1.13/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.13/policy/modules/kernel/files.if 2006-01-17 17:46:02.000000000 -0500 -@@ -2135,10 +2135,10 @@ - interface(`files_search_tmp',` - gen_require(` - type tmp_t; -- class dir search; -+ class dir search_dir_perms; ++ ++######################################## ++## + ## Write to named pipe on a ramfs filesystem. + ## + ## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/bind.if serefpolicy-2.2.2/policy/modules/services/bind.if +--- nsaserefpolicy/policy/modules/services/bind.if 2006-01-13 09:48:26.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/services/bind.if 2006-01-19 13:58:34.000000000 -0500 +@@ -165,6 +165,7 @@ ') -- allow $1 tmp_t:dir search; -+ allow $1 tmp_t:dir search_dir_perms; + files_search_var($1) ++ allow $1 named_conf_t:dir search_dir_perms; + allow $1 named_zone_t:dir search_dir_perms; + allow $1 named_cache_t:dir search_dir_perms; ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xdm.te serefpolicy-2.2.2/policy/modules/services/xdm.te +--- nsaserefpolicy/policy/modules/services/xdm.te 2006-01-19 10:00:41.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/services/xdm.te 2006-01-19 13:56:19.000000000 -0500 +@@ -74,7 +74,7 @@ + files_read_etc_runtime_files(xdm_t) - ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/kernel.if serefpolicy-2.1.13/policy/modules/kernel/kernel.if ---- nsaserefpolicy/policy/modules/kernel/kernel.if 2006-01-13 17:06:04.000000000 -0500 -+++ serefpolicy-2.1.13/policy/modules/kernel/kernel.if 2006-01-17 17:45:26.000000000 -0500 -@@ -1666,6 +1666,7 @@ - typeattribute $1 kern_unconfined; - - kernel_rw_all_sysctl($1) -+ kernel_sendrecv_unlabeled_association($1) - ') - - ################################################################################ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dovecot.te serefpolicy-2.1.13/policy/modules/services/dovecot.te ---- nsaserefpolicy/policy/modules/services/dovecot.te 2006-01-17 17:08:53.000000000 -0500 -+++ serefpolicy-2.1.13/policy/modules/services/dovecot.te 2006-01-17 17:43:28.000000000 -0500 -@@ -95,6 +95,7 @@ - files_read_etc_files(dovecot_t) - files_search_spool(dovecot_t) - files_search_tmp(dovecot_t) -+files_search_tmp(dovecot_auth_t) - files_dontaudit_list_default(dovecot_t) - - init_use_fd(dovecot_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/fetchmail.te serefpolicy-2.1.13/policy/modules/services/fetchmail.te ---- nsaserefpolicy/policy/modules/services/fetchmail.te 2006-01-13 17:06:05.000000000 -0500 -+++ serefpolicy-2.1.13/policy/modules/services/fetchmail.te 2006-01-17 17:44:58.000000000 -0500 -@@ -29,6 +29,7 @@ - allow fetchmail_t self:unix_stream_socket create_stream_socket_perms; - allow fetchmail_t self:tcp_socket create_socket_perms; - allow fetchmail_t self:udp_socket create_socket_perms; -+allow fetchmail_t self:netlink_route_socket r_netlink_socket_perms; - - allow fetchmail_t fetchmail_etc_t:file r_file_perms; - -@@ -41,6 +42,7 @@ - - kernel_read_kernel_sysctl(fetchmail_t) - kernel_list_proc(fetchmail_t) -+kernel_getattr_proc_files(fetchmail_t) - kernel_read_proc_symlinks(fetchmail_t) - - corenet_non_ipsec_sendrecv(fetchmail_t) -@@ -59,8 +61,11 @@ - corenet_tcp_connect_all_ports(fetchmail_t) - - dev_read_sysfs(fetchmail_t) -+dev_read_rand(fetchmail_t) -+dev_read_urand(fetchmail_t) - - files_read_etc_files(fetchmail_t) -+files_read_etc_runtime_files(fetchmail_t) - - fs_getattr_all_fs(fetchmail_t) - fs_search_auto_mountpoints(fetchmail_t) -@@ -78,6 +83,7 @@ - logging_send_syslog_msg(fetchmail_t) - - miscfiles_read_localization(fetchmail_t) -+miscfiles_read_certs(fetchmail_t) - - sysnet_read_config(fetchmail_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.1.13/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2006-01-17 17:08:53.000000000 -0500 -+++ serefpolicy-2.1.13/policy/modules/services/hal.te 2006-01-17 17:45:44.000000000 -0500 -@@ -48,8 +48,11 @@ - kernel_read_network_state(hald_t) - kernel_read_kernel_sysctl(hald_t) - kernel_read_fs_sysctl(hald_t) -+ - kernel_write_proc_file(hald_t) - -+mls_file_read_up(hald_t) -+ - bootloader_getattr_boot_dir(hald_t) - - corecmd_exec_bin(hald_t) -@@ -139,6 +142,7 @@ - term_dontaudit_use_unallocated_tty(hald_t) - term_dontaudit_use_generic_pty(hald_t) - files_dontaudit_read_root_file(hald_t) -+ files_dontaudit_getattr_home_dir(hald_t) - ') - - optional_policy(`apm',` -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.1.13/policy/modules/services/procmail.te ---- nsaserefpolicy/policy/modules/services/procmail.te 2005-12-09 23:35:06.000000000 -0500 -+++ serefpolicy-2.1.13/policy/modules/services/procmail.te 2006-01-17 17:43:28.000000000 -0500 -@@ -99,7 +99,7 @@ - - optional_policy(`spamassassin',` - corenet_udp_bind_generic_port(procmail_t) -- -+ corenet_tcp_connect_spamd_port(procmail_t) - files_getattr_tmp_dir(procmail_t) - - spamassassin_exec(procmail_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/rpc.te serefpolicy-2.1.13/policy/modules/services/rpc.te ---- nsaserefpolicy/policy/modules/services/rpc.te 2006-01-13 17:06:07.000000000 -0500 -+++ serefpolicy-2.1.13/policy/modules/services/rpc.te 2006-01-17 17:43:28.000000000 -0500 -@@ -48,6 +48,7 @@ - kernel_search_network_state(rpcd_t) - # for rpc.rquotad - kernel_read_sysctl(rpcd_t) -+kernel_sendrecv_unlabeled_association(rpcd_t) - - corenet_udp_bind_generic_port(rpcd_t) - corenet_udp_bind_reserved_port(rpcd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.1.13/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-17 17:08:57.000000000 -0500 -+++ serefpolicy-2.1.13/policy/modules/system/selinuxutil.te 2006-01-17 17:43:28.000000000 -0500 -@@ -415,6 +415,7 @@ - allow run_init_t self:capability setuid; - allow run_init_t self:fifo_file rw_file_perms; - allow run_init_t self:netlink_audit_socket { create bind write nlmsg_read read }; -+ domain_auto_trans(run_init_t,initrc_exec_t,initrc_t) - - # often the administrator runs such programs from a directory that is owned - # by a different user or has restrictive SE permissions, do not want to audit -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.1.13/policy/users + ifdef(`targeted_policy',` +- allow xdm_t self:process execmem; ++ allow xdm_t self:process { execheap execmem }; + unconfined_domain_template(xdm_t) + unconfined_domtrans(xdm_t) + ',` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/libraries.fc serefpolicy-2.2.2/policy/modules/system/libraries.fc +--- nsaserefpolicy/policy/modules/system/libraries.fc 2006-01-17 13:22:14.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/system/libraries.fc 2006-01-19 13:00:21.000000000 -0500 +@@ -166,7 +166,7 @@ + /usr/lib(64)?/libdivxencore.so.0 -- gen_context(system_u:object_r:textrel_shlib_t,s0) + + # Java, Sun Microsystems (JPackage SRPM) +-/usr/.*/jre/lib/i386/libdeploy.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) ++/usr/.*/jre.*/lib/i386/libdeploy.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) + + /usr(/.*)?/Reader/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:shlib_t,s0) + /usr(/.*)?/Reader/intellinux/plug_ins/AcroForm\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.2/policy/modules/system/unconfined.if +--- nsaserefpolicy/policy/modules/system/unconfined.if 2006-01-17 13:22:14.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/system/unconfined.if 2006-01-19 10:56:11.000000000 -0500 +@@ -45,6 +45,12 @@ + auditallow $1 self:process execmem; + ') + ++ tunable_policy(`allow_execheap',` ++ # Allow making the stack executable via mprotect. ++ allow $1 self:process execheap; ++ auditallow $1 self:process execheap; ++ ') ++ + tunable_policy(`allow_execmem && allow_execstack',` + # Allow making the stack executable via mprotect. + allow $1 self:process execstack; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.2/policy/modules/system/unconfined.te +--- nsaserefpolicy/policy/modules/system/unconfined.te 2006-01-17 17:08:57.000000000 -0500 ++++ serefpolicy-2.2.2/policy/modules/system/unconfined.te 2006-01-19 13:44:58.000000000 -0500 +@@ -97,6 +97,10 @@ + modutils_domtrans_update_mods(unconfined_t) + ') + ++ optional_policy(`mono',` ++ mono_domtrans(unconfined_t) ++ ') ++ + optional_policy(`netutils',` + netutils_domtrans_ping(unconfined_t) + ') +@@ -141,11 +145,8 @@ + webalizer_domtrans(unconfined_t) + ') + +- ifdef(`TODO',` +- ifdef(`use_mcs',` +- rw_dir_create_file(sysadm_su_t, home_dir_type) +- ') +- allow unconfined_t initrc_t : dbus { send_msg acquire_svc }; +- allow initrc_t unconfined_t : dbus { send_msg acquire_svc }; +- ') dnl end TODO ++ optional_policy(`wine',` ++ wine_domtrans(unconfined_t) ++ ') ++ + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.2/policy/users --- nsaserefpolicy/policy/users 2005-12-05 22:35:02.000000000 -0500 -+++ serefpolicy-2.1.13/policy/users 2006-01-17 17:43:28.000000000 -0500 ++++ serefpolicy-2.2.2/policy/users 2006-01-19 10:42:14.000000000 -0500 @@ -26,7 +26,9 @@ ifdef(`targeted_policy',` gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- selinux-policy.spec 17 Jan 2006 22:47:12 -0000 1.87 +++ selinux-policy.spec 19 Jan 2006 19:08:33 -0000 1.88 @@ -6,7 +6,7 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.1.13 +Version: 2.2.2 Release: 1 License: GPL Group: System Environment/Base @@ -262,6 +262,16 @@ %endif %changelog +* Wed Jan 18 2006 Dan Walsh 2.2.2-1 +- Update to upstream +- Turn off execheap execstack for unconfined users +- Add mono/wine policy to allow execheap and execstack for them +- Add execheap for Xdm policy + +* Wed Jan 18 2006 Dan Walsh 2.2.1-1 +- Update to upstream +- Fixes to fetchmail, + * Tue Jan 17 2006 Dan Walsh 2.1.13-1 - Update to upstream Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 17 Jan 2006 22:47:12 -0000 1.28 +++ sources 19 Jan 2006 19:08:33 -0000 1.29 @@ -1 +1 @@ -a745ed3d3ffc029e59bf246eb1e60d1f serefpolicy-2.1.13.tgz +63242331a275d209ef381bb16b7e3cc0 serefpolicy-2.2.2.tgz From fedora-cvs-commits at redhat.com Thu Jan 19 19:10:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 14:10:51 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch, 1.17, 1.18 sources, 1.29, 1.30 Message-ID: <200601191910.k0JJApIN027949@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27920 Modified Files: policy-20060104.patch sources Log Message: * Wed Jan 18 2006 Dan Walsh 2.2.2-1 - Update to upstream - Turn off execheap execstack for unconfined users - Add mono/wine policy to allow execheap and execstack for them - Add execheap for Xdm policy policy-20060104.patch: Makefile | 2 +- policy/global_tunables | 4 ++++ policy/modules/admin/logwatch.te | 7 +++++++ policy/modules/apps/java.te | 1 + policy/modules/apps/mono.fc | 2 ++ policy/modules/apps/mono.if | 23 +++++++++++++++++++++++ policy/modules/apps/mono.te | 25 +++++++++++++++++++++++++ policy/modules/apps/wine.fc | 2 ++ policy/modules/apps/wine.if | 23 +++++++++++++++++++++++ policy/modules/apps/wine.te | 25 +++++++++++++++++++++++++ policy/modules/kernel/filesystem.if | 16 ++++++++++++++++ policy/modules/services/bind.if | 1 + policy/modules/services/xdm.te | 2 +- policy/modules/system/libraries.fc | 2 +- policy/modules/system/unconfined.if | 6 ++++++ policy/modules/system/unconfined.te | 15 ++++++++------- policy/users | 8 +++++--- 17 files changed, 151 insertions(+), 13 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- policy-20060104.patch 19 Jan 2006 19:08:32 -0000 1.17 +++ policy-20060104.patch 19 Jan 2006 19:10:47 -0000 1.18 @@ -187,18 +187,6 @@ + role system_r types wine_t; + allow wine_t file_type:file execmod; +') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/domain.if serefpolicy-2.2.2/policy/modules/kernel/domain.if ---- nsaserefpolicy/policy/modules/kernel/domain.if 2006-01-19 10:00:40.000000000 -0500 -+++ serefpolicy-2.2.2/policy/modules/kernel/domain.if 2006-01-19 10:42:31.000000000 -0500 -@@ -1122,7 +1122,7 @@ - allow $1 domain:fifo_file rw_file_perms; - - # Act upon any other process. -- allow $1 domain:process ~{ transition dyntransition execmem }; -+ allow $1 domain:process ~{ transition dyntransition execmem execheap execstack }; - - # Create/access any System V IPC objects. - allow $1 domain:{ sem msgq shm } *; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.2/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-19 10:00:41.000000000 -0500 +++ serefpolicy-2.2.2/policy/modules/kernel/filesystem.if 2006-01-19 10:42:14.000000000 -0500 Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 19 Jan 2006 19:08:33 -0000 1.29 +++ sources 19 Jan 2006 19:10:47 -0000 1.30 @@ -1 +1 @@ -63242331a275d209ef381bb16b7e3cc0 serefpolicy-2.2.2.tgz +03fb99f3d053bbf734843c84ba8e3d9b serefpolicy-2.2.2.tgz From fedora-cvs-commits at redhat.com Thu Jan 19 19:47:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 14:47:16 -0500 Subject: rpms/firstboot/devel .cvsignore, 1.42, 1.43 firstboot.spec, 1.61, 1.62 sources, 1.58, 1.59 Message-ID: <200601191947.k0JJlGbu026188@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/firstboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25461 Modified Files: .cvsignore firstboot.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 9 Jan 2006 23:37:35 -0000 1.42 +++ .cvsignore 19 Jan 2006 19:47:13 -0000 1.43 @@ -14,3 +14,4 @@ firstboot-1.3.55.tar.bz2 firstboot-1.3.56.tar.bz2 firstboot-1.3.57.tar.bz2 +firstboot-1.4.0.tar.bz2 Index: firstboot.spec =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- firstboot.spec 9 Jan 2006 23:37:35 -0000 1.61 +++ firstboot.spec 19 Jan 2006 19:47:13 -0000 1.62 @@ -1,6 +1,6 @@ Summary: Initial system configuration utility Name: firstboot -Version: 1.3.57 +Version: 1.4.0 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -13,31 +13,46 @@ Prereq: chkconfig, /etc/init.d BuildPreReq: gettext Requires: pygtk2 -Requires: python -Requires: usermode >= 1.36 Requires: metacity -Requires: rhpl Requires: rhpxl -Requires: system-config-date >= 1.7.9 Requires: system-config-display Requires: system-config-language -Requires: system-config-keyboard Requires: system-config-soundcard Requires: system-config-securitylevel -Requires: system-config-rootpassword Requires: system-config-network Requires: system-config-users Requires: authconfig-gtk Requires: libuser Requires: redhat-logos Requires: redhat-artwork +Requires: firstboot-tui ExcludeArch: s390 s390x ppc64 %description -The firstboot utility runs after installation. It -guides the user through a series of steps that allows for easier +The firstboot utility runs after installation. It guides the +user through a series of steps that allows for easier configuration of the machine. +%package tui +Summary: A text interface for firstboot +Group: System Environment/Base +Prereq: chkconfig, /etc/init.d +BuildPreReq: gettext +Requires: python +Requires: usermode >= 1.36 +Requires: rhpl +Requires: system-config-date >= 1.7.9 +Requires: system-config-keyboard +Requires: system-config-securitylevel-tui +Requires: system-config-rootpassword +Requires: netconfig +Requires: system-config-printer +Requires: ntsysv +Requires: authconfig + +%description tui +firstboot-tui is a text interface for initial system configuration. + %prep %setup -q @@ -52,7 +67,7 @@ %clean rm -rf $RPM_BUILD_ROOT -%post +%post tui if ! [ -f /etc/sysconfig/firstboot ] then chkconfig --add firstboot @@ -62,19 +77,42 @@ if [ $1 = 0 ]; then rm -rf /usr/share/firstboot/*.pyc rm -rf /usr/share/firstboot/modules/*.pyc +fi + +%preun tui +if [ $1 = 0 ]; then chkconfig --del firstboot fi %files -f %{name}.lang %defattr(-,root,root) -#%doc COPYING -#%doc doc/* +%dir /usr/share/firstboot/ +%dir /usr/share/firstboot/modules/ +%dir /usr/share/firstboot/pixmaps/ +/usr/share/firstboot/exceptionWindow.py* +/usr/share/firstboot/firstbootWindow.py* +/usr/share/firstboot/firstboot_module_window.py* +/usr/share/firstboot/xfirstboot.py* +/usr/share/firstboot/modules/* +/usr/share/firstboot/pixmaps/* + +%files -f %{name}.lang tui +%defattr(-,root,root) %config /etc/rc.d/init.d/firstboot %dir /usr/share/firstboot/ -/usr/share/firstboot/* /usr/sbin/firstboot +/usr/share/firstboot/constants_text.py* +/usr/share/firstboot/eula_strings.py* +/usr/share/firstboot/firstboot.py* +/usr/share/firstboot/firstbootBackend.py* +/usr/share/firstboot/functions.py* +/usr/share/firstboot/textWindow.py* + %changelog +* Thu Jan 19 2006 Chris Lumens 1.4.0-1 +- Split into separate packages for X and no X (#178216). + * Mon Jan 09 2006 Chris Lumens 1.3.57-1 - Use scdMainWindow instead of mainWindow to fix random python import tracebacks. Index: sources =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 9 Jan 2006 23:37:35 -0000 1.58 +++ sources 19 Jan 2006 19:47:13 -0000 1.59 @@ -1 +1 @@ -3b55d62ca631035e45cfb04aab202cbe firstboot-1.3.57.tar.bz2 +3a10d6fb3f696274586e20942fa4c272 firstboot-1.4.0.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 19 19:51:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 14:51:47 -0500 Subject: rpms/rhythmbox/devel rhythmbox.spec,1.41,1.42 Message-ID: <200601191951.k0JJplx5000772@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/rhythmbox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv745 Modified Files: rhythmbox.spec Log Message: * Thu Jan 19 2006 Christopher Aillon 0.9.2-8 - Rebuild, now that gstreamer08-plugins has been fixed Index: rhythmbox.spec =================================================================== RCS file: /cvs/dist/rpms/rhythmbox/devel/rhythmbox.spec,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- rhythmbox.spec 19 Jan 2006 13:49:03 -0000 1.41 +++ rhythmbox.spec 19 Jan 2006 19:51:43 -0000 1.42 @@ -3,7 +3,7 @@ Name: rhythmbox Summary: Music Management Application Version: 0.9.2 -Release: 7 +Release: 8 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/%{name}-%{version}.tar.bz2 @@ -98,6 +98,9 @@ %{_libdir}/pkgconfig/rhythmbox.pc %changelog +* Thu Jan 19 2006 Christopher Aillon 0.9.2-8 +- Rebuild, now that gstreamer08-plugins has been fixed + * Thu Jan 19 2006 Ray Strode 0.9.2-7 - bonobo multilib issue (bug 156982) From fedora-cvs-commits at redhat.com Thu Jan 19 20:00:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 15:00:28 -0500 Subject: rpms/perl-String-CRC32/devel perl-String-CRC32.spec,1.2,1.3 Message-ID: <200601192000.k0JK0S5M004190@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl-String-CRC32/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4162 Modified Files: perl-String-CRC32.spec Log Message: fix addenda to bug 176175: license should be "Public Domain" Index: perl-String-CRC32.spec =================================================================== RCS file: /cvs/dist/rpms/perl-String-CRC32/devel/perl-String-CRC32.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-String-CRC32.spec 13 Jan 2006 16:35:46 -0000 1.2 +++ perl-String-CRC32.spec 19 Jan 2006 20:00:15 -0000 1.3 @@ -1,11 +1,11 @@ Name: perl-String-CRC32 Version: 1.3 -Release: 1.4.FC5 +Release: 2.FC5 Summary: Perl interface for cyclic redundency check generation Group: Development/Libraries -License: GPL or Artistic +License: Public Domain URL: http://search.cpan.org/dist/String-CRC32/ Source0: http://search.cpan.org/CPAN/authors/id/S/SO/SOENKE/String-CRC32-1.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -53,6 +53,9 @@ %{_mandir}/man3/*.3* %changelog +* Thu Jan 19 2006 Jason Vas Dias - 0:1.03-2.FC5 +- bug 176175 addendum: license should be 'Public Domain' + * Fri Jan 13 2006 Jason Vas Dias - 0.1.03-1.4.FC5 - fix bug 177700: differentiate version from FE4, FE dev versions From fedora-cvs-commits at redhat.com Thu Jan 19 20:08:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 15:08:34 -0500 Subject: rpms/gnome-menus/devel gnome-menus.spec,1.21,1.22 Message-ID: <200601192008.k0JK8YIK005883@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-menus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5834 Modified Files: gnome-menus.spec Log Message: BuildRequire gamin Index: gnome-menus.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- gnome-menus.spec 17 Jan 2006 05:07:41 -0000 1.21 +++ gnome-menus.spec 19 Jan 2006 20:08:31 -0000 1.22 @@ -7,7 +7,7 @@ Summary: A menu system for the GNOME project Name: gnome-menus Version: 2.13.5 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries URL: http://www.gnome.org/ @@ -17,6 +17,7 @@ Requires: python-abi = %{pyver} BuildRequires: glib2-devel >= 2.6.0 BuildRequires: %{python}-devel >= 2.3.0 +BuildRequires: gamin-devel %description gnome-menus is an implementation of the draft "Desktop @@ -87,6 +88,9 @@ %{_bindir}/gnome-menu-spec-test %changelog +* Thu Jan 19 2006 Matthias Clasen 2.13.5-2 +- Add a BuildRequires for gamin + * Tue Jan 17 2006 Matthias Clasen 2.13.5-1 - Update to 2.13.5 From fedora-cvs-commits at redhat.com Thu Jan 19 20:46:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 15:46:04 -0500 Subject: rpms/gtk2/devel gtk+-2.8.10-set-invisible-char-to-bullet.patch, NONE, 1.1 gtk2.spec, 1.110, 1.111 Message-ID: <200601192046.k0JKk40O018102@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17859 Modified Files: gtk2.spec Added Files: gtk+-2.8.10-set-invisible-char-to-bullet.patch Log Message: * Thu Jan 19 2006 Christopher Aillon 2.8.10-4 - Use Unicode character 2022 for the default invisible character gtk+-2.8.10-set-invisible-char-to-bullet.patch: gtkentry.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- NEW FILE gtk+-2.8.10-set-invisible-char-to-bullet.patch --- --- gtk+-2.8.10/gtk/gtkentry.c.set-invisible-char-to-bullet 2006-01-19 15:12:18.000000000 -0500 +++ gtk+-2.8.10/gtk/gtkentry.c 2006-01-19 15:36:51.000000000 -0500 @@ -542,7 +542,7 @@ g_param_spec_unichar ("invisible-char", P_("Invisible character"), P_("The character to use when masking entry contents (in \"password mode\")"), - '*', + (gunichar) 0x2022, GTK_PARAM_READWRITE)); g_object_class_install_property (gobject_class, @@ -1000,7 +1000,7 @@ entry->editable = TRUE; entry->visible = TRUE; - entry->invisible_char = '*'; + entry->invisible_char = (gunichar) 0x2022; entry->dnd_position = -1; entry->width_chars = -1; entry->is_cell_renderer = FALSE; @@ -4019,9 +4019,9 @@ * gtk_entry_set_visibility() has been called to set text visibility * to %FALSE. i.e. this is the character used in "password mode" to * show the user how many characters have been typed. The default - * invisible char is an asterisk ('*'). If you set the invisible char - * to 0, then the user will get no feedback at all; there will be - * no text on the screen as they type. + * invisible char is a small bullet (Unicode character 2022). If you + * set the invisible char to 0, then the user will get no feedback at + * all; there will be no text on the screen as they type. * **/ void Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- gtk2.spec 18 Jan 2006 18:50:14 -0000 1.110 +++ gtk2.spec 19 Jan 2006 20:46:01 -0000 1.111 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. Name: gtk2 Version: %{base_version} -Release: 3 +Release: 4 License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 @@ -27,6 +27,7 @@ # Backported from 2.10 Patch1: gtk+-2.8.6-inputmethod.patch Patch2: gtk+-2.8.10-abicheck.patch +Patch3: gtk+-2.8.10-set-invisible-char-to-bullet.patch BuildPrereq: atk-devel >= %{atk_version} BuildPrereq: pango-devel >= %{pango_version} @@ -90,6 +91,7 @@ %patch0 -p1 -b .lib64 %patch1 -p1 -b .inputmethod %patch2 -p1 -b .abicheck +%patch3 -p1 -b .set-invisible-char-to-bullet for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -259,6 +261,9 @@ %doc tmpdocs/examples %changelog +* Thu Jan 19 2006 Christopher Aillon 2.8.10-4 +- Use Unicode character 2022 for the default invisible character + * Wed Jan 18 2006 Matthias Clasen 2.8.10-3 - Rebuild against GLib 2.9.4 From fedora-cvs-commits at redhat.com Thu Jan 19 20:48:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 15:48:07 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.89,1.90 Message-ID: <200601192048.k0JKm7d4025809@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25797 Modified Files: gnome-vfs2.spec Log Message: TRest build Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- gnome-vfs2.spec 19 Jan 2006 14:06:25 -0000 1.89 +++ gnome-vfs2.spec 19 Jan 2006 20:48:03 -0000 1.90 @@ -10,7 +10,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.13.4 -Release: 5 +Release: 2 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -180,6 +180,43 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Thu Jan 19 2006 Matthias Clasen 2.13.4-2 +- Test build + +* Mon Jan 16 2006 Matthias Clasen 2.13.4-1 +- Update to 2.13.4 + +* Mon Jan 09 2006 John (J5) Palmieri 2.13.3-3 +- Add patch so --hal-udi is sent in when mounting and unmounting + +* Mon Jan 09 2006 John (J5) Palmieri 2.13.3-2 +- Add dependency on gnome-mount +- Add configure options for gnome-mount + +* Thu Dec 15 2005 Matthias Clasen 2.13.3-1 +- Update to 2.13.3 +- Drop upstreamed patches + +* Tue Dec 13 2005 Alexander Larsson 2.13.2-1 +- update to 2.13.2 + +* Fri Dec 09 2005 Jesse Keating - 2.13.1-1.1 +- rebuilt + +* Fri Dec 2 2005 Matthias Clasen - 2.13.1-1 +- Update to 2.13.1 + +* Thu Dec 01 2005 John (J5) Palmieri - 2.12.1.1-7 +- rebuild for new dbus + +* Tue Nov 22 2005 Alexander Larsson - 2.12.1.1-6 +- Update to use avahi 0.6 + +* Wed Nov 9 2005 Tomas Mraz 2.12.1.1-5 +- rebuilt with new openssl + +* Tue Nov 1 2005 Alexander Larsson 2.12.1.1-4 +======= * Thu Jan 19 2006 Ray Strode 2.13.4-5 - s/sed -ie/sed -i -e/ @@ -193,6 +230,7 @@ - Add a BuildRequires on gnome-mount-devel so we build with gnome-mount support +>>>>>>> 1.89 * Mon Jan 16 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 From fedora-cvs-commits at redhat.com Thu Jan 19 20:50:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 15:50:30 -0500 Subject: rpms/gnome-vfs2/devel gnome-vfs2.spec,1.90,1.91 Message-ID: <200601192050.k0JKoUnO026007@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-vfs2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25993 Modified Files: gnome-vfs2.spec Log Message: Test build Index: gnome-vfs2.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-vfs2/devel/gnome-vfs2.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- gnome-vfs2.spec 19 Jan 2006 20:48:03 -0000 1.90 +++ gnome-vfs2.spec 19 Jan 2006 20:50:28 -0000 1.91 @@ -10,7 +10,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.13.4 -Release: 2 +Release: 6 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -180,43 +180,9 @@ %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog -* Thu Jan 19 2006 Matthias Clasen 2.13.4-2 +* Thu Jan 19 2006 Matthias Clasen 2.13.4-6 - Test build -* Mon Jan 16 2006 Matthias Clasen 2.13.4-1 -- Update to 2.13.4 - -* Mon Jan 09 2006 John (J5) Palmieri 2.13.3-3 -- Add patch so --hal-udi is sent in when mounting and unmounting - -* Mon Jan 09 2006 John (J5) Palmieri 2.13.3-2 -- Add dependency on gnome-mount -- Add configure options for gnome-mount - -* Thu Dec 15 2005 Matthias Clasen 2.13.3-1 -- Update to 2.13.3 -- Drop upstreamed patches - -* Tue Dec 13 2005 Alexander Larsson 2.13.2-1 -- update to 2.13.2 - -* Fri Dec 09 2005 Jesse Keating - 2.13.1-1.1 -- rebuilt - -* Fri Dec 2 2005 Matthias Clasen - 2.13.1-1 -- Update to 2.13.1 - -* Thu Dec 01 2005 John (J5) Palmieri - 2.12.1.1-7 -- rebuild for new dbus - -* Tue Nov 22 2005 Alexander Larsson - 2.12.1.1-6 -- Update to use avahi 0.6 - -* Wed Nov 9 2005 Tomas Mraz 2.12.1.1-5 -- rebuilt with new openssl - -* Tue Nov 1 2005 Alexander Larsson 2.12.1.1-4 -======= * Thu Jan 19 2006 Ray Strode 2.13.4-5 - s/sed -ie/sed -i -e/ @@ -230,7 +196,6 @@ - Add a BuildRequires on gnome-mount-devel so we build with gnome-mount support ->>>>>>> 1.89 * Mon Jan 16 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 From fedora-cvs-commits at redhat.com Thu Jan 19 21:06:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 16:06:31 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec, 1.47, 1.48 sources, 1.14, 1.15 Message-ID: <200601192106.k0JL6VgK005226@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5174 Modified Files: gnome-screensaver.spec sources Log Message: More theme fixups Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- gnome-screensaver.spec 19 Jan 2006 18:48:00 -0000 1.47 +++ gnome-screensaver.spec 19 Jan 2006 21:06:28 -0000 1.48 @@ -14,7 +14,7 @@ Summary: GNOME Sreensaver Name: gnome-screensaver Version: 2.13.5 -Release: 2 +Release: 3 License: GPL Group: Amusement/Graphics Source0: %{name}-%{version}.tar.bz2 @@ -122,7 +122,7 @@ %{_sysconfdir}/pam.d/* %changelog -* Thu Jan 19 2006 Matthias Clasen - 2.13.5-2 +* Thu Jan 19 2006 Matthias Clasen - 2.13.5-3 - Slight improvements to the Fedora lock dialog * Tue Jan 17 2006 Matthias Clasen - 2.13.5-1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 19 Jan 2006 18:48:00 -0000 1.14 +++ sources 19 Jan 2006 21:06:28 -0000 1.15 @@ -1,2 +1,2 @@ 2ab5b1c5b432f6b763f40c3a4a2b1c94 gnome-screensaver-2.13.5.tar.bz2 -05af491aed0f172d36d8b024dcfc9536 fedoralogo-floaters-lock-dialog.tar.gz +661b1551a16e6aa948248b2443bad117 fedoralogo-floaters-lock-dialog.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 19 21:14:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 16:14:43 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.95, 1.96 policycoreutils-rhat.patch, 1.152, 1.153 policycoreutils.spec, 1.221, 1.222 sources, 1.99, 1.100 Message-ID: <200601192114.k0JLEhJU007470@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7445 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Thu Jan 19 2006 Dan Walsh 1.29.9-1 - Update to match NSA * Merged chcat, semanage, and setsebool patches from Dan Walsh. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- .cvsignore 18 Jan 2006 17:43:23 -0000 1.95 +++ .cvsignore 19 Jan 2006 21:14:38 -0000 1.96 @@ -81,3 +81,4 @@ policycoreutils-1.29.5.tgz policycoreutils-1.29.7.tgz policycoreutils-1.29.8.tgz +policycoreutils-1.29.9.tgz policycoreutils-rhat.patch: chcat.8 | 5 +++++ 1 files changed, 5 insertions(+) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.152 retrieving revision 1.153 diff -u -r1.152 -r1.153 --- policycoreutils-rhat.patch 19 Jan 2006 14:45:25 -0000 1.152 +++ policycoreutils-rhat.patch 19 Jan 2006 21:14:38 -0000 1.153 @@ -1,418 +1,15 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.8/scripts/chcat ---- nsapolicycoreutils/scripts/chcat 2006-01-18 11:12:43.000000000 -0500 -+++ policycoreutils-1.29.8/scripts/chcat 2006-01-19 09:41:13.000000000 -0500 -@@ -25,11 +25,19 @@ - import commands, sys, os, pwd, string, getopt, re, selinux - import seobject - -+def verify_users(users): -+ for u in users: -+ try: -+ pwd.getpwnam(u) -+ except KeyError, e: -+ error( "User %s does not exist" % u) +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat.8 policycoreutils-1.29.8/scripts/chcat.8 +--- nsapolicycoreutils/scripts/chcat.8 2006-01-18 11:12:43.000000000 -0500 ++++ policycoreutils-1.29.8/scripts/chcat.8 2006-01-19 10:48:59.000000000 -0500 +@@ -27,6 +27,11 @@ + Change/Remove the security CATEGORY for each FILE/USER. + .PP + Use +/- to add/remove categories from a FILE/USER. ++.PP ++.B ++Note: ++When removing a category you must specify '--' on the command line before using the -Category syntax. This tells the shell that you have finished entering options. + - def chcat_user_add(orig, newcat, users): - errors=0 - logins = seobject.loginRecords() - seusers=logins.get_all() - add_ind=0 -+ verify_users(users) - for u in users: - if u in seusers.keys(): - user=seusers[u] -@@ -98,6 +106,7 @@ - logins = seobject.loginRecords() - seusers=logins.get_all() - add_ind=0 -+ verify_users(users) - for u in users: - if u in seusers.keys(): - user=seusers[u] -@@ -174,6 +183,7 @@ - logins = seobject.loginRecords() - seusers=logins.get_all() - add_ind=0 -+ verify_users(users) - for u in users: - if u in seusers.keys(): - user=seusers[u] -@@ -281,6 +291,7 @@ - print "Usage %s -d File ..." % sys.argv[0] - print "Usage %s -l -d user ..." % sys.argv[0] - print "Usage %s -L" % sys.argv[0] -+ print "Usage %s -L -l user" % sys.argv[0] - print "Use -- to end option list. For example" - print "chcat -- -CompanyConfidential /docs/businessplan.odt" - print "chcat -l +CompanyConfidential juser" -@@ -297,13 +308,14 @@ - fd.close() - return 0 - -+ - def listusercats(users): -- seusers = seobject.loginRecords().get_all() -+ if len(users) == 0: -+ users.append(os.getlogin()) -+ -+ verify_users(users) - for u in users: -- if u in seusers.keys(): -- cats=seobject.translate(seusers[u][1]) -- else: -- cats=seobject.translate(seusers["__default__"][1]) -+ cats=seobject.translate(selinux.getseuserbyname(u)[2]) - cats=cats.split("-") - if len(cats) > 1 and cats[1] != "s0": - print "%s: %s" % (u, cats[1]) -@@ -352,8 +364,6 @@ - - if list_ind: - if login_ind: -- if len(cmds) < 1: -- usage() - sys.exit(listusercats(cmds)) - else: - if len(cmds) > 0: -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.8/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2006-01-18 11:12:43.000000000 -0500 -+++ policycoreutils-1.29.8/semanage/semanage 2006-01-18 17:02:47.000000000 -0500 -@@ -30,11 +30,12 @@ - - def usage(message = ""): - print '\ --semanage user [-admLRr] SELINUX_USER\n\ -+semanage fcontext [-admhfrst] INTERFACE\n\ -+semanage interface [-admtr] INTERFACE\n\ - semanage login [-admsr] LOGIN_NAME\n\ - semanage port [-admtpr] PORT | PORTRANGE\n\ --semanage interface [-admtr] INTERFACE\n\ --semanage fcontext [-admhfrst] INTERFACE\n\ -+semanage translation [-adm] LEVEL\n\ -+semanage user [-admLRr] SELINUX_USER\n\ - -a, --add Add a OBJECT record NAME\n\ - -d, --delete Delete a OBJECT record NAME\n\ - -f, --ftype File Type of OBJECT \n\ -@@ -47,6 +48,7 @@ - -R, --roles SELinux Roles (Separate by spaces)\n\ - -s, --seuser SELinux user name\n\ - -t, --type SELinux Type for the object\n\ -+ -T, --trans SELinux Level Translation\n\ - -v, --verbose verbose output\n\ - ' - print message -@@ -62,7 +64,7 @@ - # - # - try: -- objectlist = ("login", "user", "port", "interface", "fcontext") -+ objectlist = ("login", "user", "port", "interface", "fcontext", "translation") - input = sys.stdin - output = sys.stdout - serange = "" -@@ -71,6 +73,7 @@ - selevel = "" - setype = "" - ftype = "" -+ setrans = "" - roles = "" - seuser = "" - heading=1 -@@ -88,7 +91,7 @@ - - args = sys.argv[2:] - gopts, cmds = getopt.getopt(args, -- 'adf:lhmnp:P:s:R:L:r:t:v', -+ 'adf:lhmnp:P:s:R:L:r:t:vT:', - ['add', - 'delete', - 'ftype=', -@@ -103,6 +106,7 @@ - 'level=', - 'roles=', - 'type=', -+ 'trans=', - 'verbose' - ]) - for o,a in gopts: -@@ -149,6 +153,9 @@ - if o == "-t" or o == "--type": - setype = a - -+ if o == "-T" or o == "--trans": -+ setrans = a -+ - if o == "-v" or o == "--verbose": - verbose = 1 - -@@ -167,6 +174,9 @@ - if object == "fcontext": - OBJECT = seobject.fcontextRecords() - -+ if object == "translation": -+ OBJECT = seobject.setransRecords() -+ - if list: - OBJECT.list(heading) - sys.exit(0); -@@ -180,6 +190,9 @@ - if object == "login": - OBJECT.add(target, seuser, serange) - -+ if object == "translation": -+ OBJECT.add(target, setrans) -+ - if object == "user": - rlist = roles.split() - if len(rlist) == 0: -@@ -200,6 +213,9 @@ - if object == "login": - OBJECT.modify(target, seuser, serange) - -+ if object == "translation": -+ OBJECT.modify(target, setrans) -+ - if object == "user": - rlist = roles.split() - OBJECT.modify(target, rlist, selevel, serange) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.8/semanage/semanage.8 ---- nsapolicycoreutils/semanage/semanage.8 2006-01-18 11:12:43.000000000 -0500 -+++ policycoreutils-1.29.8/semanage/semanage.8 2006-01-18 17:04:31.000000000 -0500 -@@ -13,6 +13,8 @@ - .br - .B semanage interface \-{a|d|m} [\-tr] interface_spec - .br -+.B semanage translation \-{a|d|m} [\-T] level -+.br - .B semanage fcontext \-{a|d|m} [\-frst] file_spec - .P - -@@ -23,7 +25,7 @@ - .BR semanage - program. - .br --This tool is used to configure SELinux Policy. You can configure SELinux User Mappings, SELinux Port Mappings, SELinux Users. File Context and Network Interfaces. -+This tool is used to configure SELinux Policy. You can configure SELinux User Mappings, SELinux Port Mappings, SELinux Users. File Context and Network Interfaces and MLS/MCS Translations. - - .SH "OPTIONS" - .TP -@@ -64,6 +66,9 @@ - .I \-t, \-\-type - SELinux Type for the object .TP -+.I \-T, \-\-trans -+SELinux Translation -+.TP - .I \-v, \-\-verbose - verbose output - -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.8/semanage/seobject.py ---- nsapolicycoreutils/semanage/seobject.py 2006-01-18 11:12:43.000000000 -0500 -+++ policycoreutils-1.29.8/semanage/seobject.py 2006-01-19 09:43:38.000000000 -0500 -@@ -21,9 +21,18 @@ - # - # - --import pwd, string, selinux -+import pwd, string, selinux, tempfile, os, re - from semanage import *; - -+def validate_level(raw): -+ sensitivity="s([0-9]|1[0-5])" -+ category="c(1?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])" -+ range=category + "(\." + category +")?" -+ categories = range + "(\," + range + ")*" -+ sensitivity + "(:categies)?" -+ reg = sensitivity + "(-" + sensitivity + ")?" + "(:" + categories + ")?" -+ return re.search("^" + reg +"$",raw) -+ - def translate(raw, prepend=1): - if prepend == 1: - context="a:b:c:%s" % raw -@@ -54,6 +63,82 @@ - else: - return raw - -+class setransRecords: -+ def __init__(self): -+ self.filename=selinux.selinux_translations_path() -+ fd=open(self.filename, "r") -+ translations=fd.read().split('\n') -+ fd.close() -+ self.dict={} -+ self.comments=[] -+ for r in translations: -+ if len(r) == 0: -+ continue -+ i=r.strip() -+ if i== "" or i[0] == "#": -+ self.comments.append(r) -+ continue -+ i=i.split("=") -+ if len(i) != 2: -+ self.comments.append(r) -+ continue -+ self.dict[i[0]] = i[1] -+ -+ def get_all(self): -+ return self.dict -+ -+ def out(self): -+ rec="" -+ for c in self.comments: -+ rec+=c +"\n" -+ keys=self.dict.keys() -+ keys.sort() -+ for k in keys: -+ rec += "%s=%s\n" % (k, self.dict[k]) -+ return rec -+ -+ def list(self,heading=1): -+ if heading: -+ print "\n%-25s %s\n" % ("Level", "Translation") -+ keys=self.dict.keys() -+ keys.sort() -+ for k in keys: -+ print "%-25s %s" % (k, self.dict[k]) -+ -+ def add(self, raw, trans): -+ if trans.find(" ") >= 0: -+ raise ValueError("Translations can not contain spaces '%s' " % trans) -+ -+ if validate_level(raw) == None: -+ raise ValueError("Invalid Level '%s' " % raw) -+ -+ if self.dict.has_key(raw): -+ raise ValueError("%s already defined in translations" % raw) -+ else: -+ self.dict[raw]=trans -+ self.save() -+ -+ def modify(self, raw, trans): -+ if trans.find(" ") >= 0: -+ -+ raise ValueError("Translations can not contain spaces '%s' " % trans) -+ if self.dict.has_key(raw): -+ self.dict[raw]=trans -+ else: -+ raise ValueError("%s not defined in translations" % raw) -+ self.save() -+ -+ def delete(self, raw): -+ self.dict.pop(raw) -+ self.save() -+ -+ def save(self): -+ newfilename = tempfile.mktemp('', self.filename) -+ fd=open(newfilename, "w") -+ fd.write(self.out()) -+ fd.close() -+ os.rename(newfilename, self.filename) -+ - class semanageRecords: - def __init__(self): - self.sh = semanage_handle_create() -@@ -458,7 +543,7 @@ - - rc = semanage_commit(self.sh) - if rc < 0: -- raise ValueError("Failed to add port %s/%s" % (proto, port)) -+ raise ValueError("Failed to modify port %s/%s" % (proto, port)) - - def delete(self, port, proto): - ( k, proto_d, low, high ) = self.__genkey(port, proto) -@@ -491,22 +576,44 @@ - for idx in range(self.psize): - u = semanage_port_by_idx(self.plist, idx) - con = semanage_port_get_con(u) -- name = semanage_context_get_type(con) -+ type = semanage_context_get_type(con) -+ if type == "reserved_port_t": -+ continue -+ level = semanage_context_get_mls(con) -+ proto=semanage_port_get_proto_str(u) -+ low=semanage_port_get_low(u) -+ high = semanage_port_get_high(u) -+ dict[(low, high)]=(type, proto, level) -+ return dict -+ -+ def get_all_by_type(self): -+ dict={} -+ (rc, self.plist, self.psize) = semanage_port_list(self.sh) -+ if rc < 0: -+ raise ValueError("Could not list ports") -+ -+ for idx in range(self.psize): -+ u = semanage_port_by_idx(self.plist, idx) -+ con = semanage_port_get_con(u) -+ type = semanage_context_get_type(con) -+ if type == "reserved_port_t": -+ continue -+ level = semanage_context_get_mls(con) - proto=semanage_port_get_proto_str(u) - low=semanage_port_get_low(u) - high = semanage_port_get_high(u) -- if (name, proto) not in dict.keys(): -- dict[(name,proto)]=[] -+ if (type, proto) not in dict.keys(): -+ dict[(type,proto)]=[] - if low == high: -- dict[(name,proto)].append("%d" % low) -+ dict[(type,proto)].append("%d" % low) - else: -- dict[(name,proto)].append("%d-%d" % (low, high)) -+ dict[(type,proto)].append("%d-%d" % (low, high)) - return dict - - def list(self, heading=1): - if heading: -- print "%-30s %-8s %s\n" % ("SELinux Port Name", "Proto", "Port Number") -- dict=self.get_all() -+ print "%-30s %-8s %s\n" % ("SELinux Port Type", "Proto", "Port Number") -+ dict=self.get_all_by_type() - keys=dict.keys() - keys.sort() - for i in keys: -@@ -614,7 +721,7 @@ - - rc = semanage_commit(self.sh) - if rc < 0: -- raise ValueError("Failed to add interface %s" % interface) -+ raise ValueError("Failed to modify interface %s" % interface) - - def delete(self, interface): - (rc,k) = semanage_iface_key_create(self.sh, interface) -@@ -779,7 +886,7 @@ - - rc = semanage_commit(self.sh) - if rc < 0: -- raise ValueError("Failed to add file context for %s" % target) -+ raise ValueError("Failed to modify file context for %s" % target) - - def delete(self, target, ftype): - (rc,k) = semanage_fcontext_key_create(self.sh, target, self.file_types[ftype]) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/setsebool/setsebool.c policycoreutils-1.29.8/setsebool/setsebool.c ---- nsapolicycoreutils/setsebool/setsebool.c 2006-01-04 13:07:46.000000000 -0500 -+++ policycoreutils-1.29.8/setsebool/setsebool.c 2006-01-18 13:27:42.000000000 -0500 -@@ -130,7 +130,7 @@ - - for (j = 0; j < boolcnt; j++) { - -- if (semanage_bool_create(handle, &boolean) < 0) -+ if (semanage_bool_create(handle, &boolean) < 0) - goto err; - - if (semanage_bool_set_name(handle, boolean, boollist[j].name) < 0) -@@ -144,9 +144,10 @@ - if (permanent && semanage_bool_modify_local(handle, bool_key, boolean) < 0) - goto err; - -- if (semanage_bool_set_active(handle, bool_key, boolean) < 0) -+ if (semanage_bool_set_active(handle, bool_key, boolean) < 0) { -+ fprintf(stderr, "Could not change boolean %s\n", boollist[j].name); - goto err; -- -+ } - semanage_bool_key_free(bool_key); - semanage_bool_free(boolean); - bool_key = NULL; + \fB\-d\fR + delete the category from each FILE/USER. Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.221 retrieving revision 1.222 diff -u -r1.221 -r1.222 --- policycoreutils.spec 19 Jan 2006 14:45:25 -0000 1.221 +++ policycoreutils.spec 19 Jan 2006 21:14:38 -0000 1.222 @@ -3,8 +3,8 @@ %define libselinuxver 1.29.6-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.29.8 -Release: 4 +Version: 1.29.9 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -97,6 +97,10 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Thu Jan 19 2006 Dan Walsh 1.29.9-1 +- Update to match NSA + * Merged chcat, semanage, and setsebool patches from Dan Walsh. + * Thu Jan 19 2006 Dan Walsh 1.29.8-4 - Fixes for "add"-"modify" error messages - Fixes for chcat Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- sources 18 Jan 2006 17:43:23 -0000 1.99 +++ sources 19 Jan 2006 21:14:38 -0000 1.100 @@ -1 +1 @@ -c40bd665ecbb503adf1a8e8730fed32a policycoreutils-1.29.8.tgz +f9a8e2b1f33895ef25ad9eeb52dec04e policycoreutils-1.29.9.tgz From fedora-cvs-commits at redhat.com Thu Jan 19 21:41:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 16:41:38 -0500 Subject: rpms/fedora-logos/devel .cvsignore, 1.20, 1.21 fedora-logos.spec, 1.22, 1.23 sources, 1.21, 1.22 Message-ID: <200601192141.k0JLfcrM028046@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/fedora-logos/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27974 Modified Files: .cvsignore fedora-logos.spec sources Log Message: - give rhgb a new look from Diana Fong Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 17 Jan 2006 18:27:11 -0000 1.20 +++ .cvsignore 19 Jan 2006 21:41:34 -0000 1.21 @@ -1 +1 @@ -fedora-logos-1.1.38.tar.bz2 +fedora-logos-1.1.39.tar.bz2 Index: fedora-logos.spec =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fedora-logos.spec 17 Jan 2006 18:27:11 -0000 1.22 +++ fedora-logos.spec 19 Jan 2006 21:41:34 -0000 1.23 @@ -1,6 +1,6 @@ Name: fedora-logos Summary: Red Hat-related icons and pictures. -Version: 1.1.38 +Version: 1.1.39 Release: 1 Group: System Environment/Base Source0: fedora-logos-%{version}.tar.bz2 @@ -135,6 +135,9 @@ # end i386 bits %changelog +* Thu Jan 19 2006 Ray Strode - 1.1.39-1 +- give rhgb a new look from Diana Fong + * Tue Jan 17 2006 Ray Strode - 1.1.38-1 - add logo bits of new gdm theme Index: sources =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 17 Jan 2006 18:27:11 -0000 1.21 +++ sources 19 Jan 2006 21:41:34 -0000 1.22 @@ -1 +1 @@ -75faf02ce5382a6e308390cb2c84867d fedora-logos-1.1.38.tar.bz2 +03bd2590527151ddc3e85d54efd119b2 fedora-logos-1.1.39.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 19 21:46:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 16:46:00 -0500 Subject: rpms/pykickstart/devel .cvsignore, 1.13, 1.14 pykickstart.spec, 1.13, 1.14 sources, 1.14, 1.15 Message-ID: <200601192146.k0JLk0tn031758@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31165 Modified Files: .cvsignore pykickstart.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 9 Jan 2006 20:48:33 -0000 1.13 +++ .cvsignore 19 Jan 2006 21:45:57 -0000 1.14 @@ -2,3 +2,4 @@ pykickstart-0.10.tar.gz pykickstart-0.11.tar.gz pykickstart-0.12.tar.gz +pykickstart-0.13.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pykickstart.spec 9 Jan 2006 20:48:33 -0000 1.13 +++ pykickstart.spec 19 Jan 2006 21:45:57 -0000 1.14 @@ -2,7 +2,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart -Version: 0.12 +Version: 0.13 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -36,6 +36,10 @@ /usr/bin/ksvalidator %changelog +* Thu Jan 19 2006 Chris Lumens 0.13-1 +- Recognize the --eject parameter to shutdown/halt. +- Store the exact post-installation action in ksdata. + * Mon Jan 09 2006 Chris Lumens 0.12-1 - Clean up output quoting. - Finish removing monitor-related stuff from xconfig. Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 9 Jan 2006 20:48:33 -0000 1.14 +++ sources 19 Jan 2006 21:45:57 -0000 1.15 @@ -1 +1 @@ -4f806d6bdb3d7aad0f7fb02a810d94c4 pykickstart-0.12.tar.gz +41fcb5aff2268f62efa367d5ff92bed1 pykickstart-0.13.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 19 21:49:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 16:49:52 -0500 Subject: rpms/avahi/devel avahi-0.6.4-initscript-i18n.patch,NONE,1.1 Message-ID: <200601192149.k0JLnqDG010799@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10760 Added Files: avahi-0.6.4-initscript-i18n.patch Log Message: fix bug 178217 - initscript localization avahi-0.6.4-initscript-i18n.patch: avahi-daemon.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE avahi-0.6.4-initscript-i18n.patch --- --- avahi-0.6.4/initscript/fedora/avahi-daemon.in.i18n 2006-01-16 18:48:50.000000000 -0500 +++ avahi-0.6.4/initscript/fedora/avahi-daemon.in 2006-01-19 16:41:21.000000000 -0500 @@ -40,7 +40,7 @@ } stop() { - echo -n "Shutting down Avahi daemon: " + echo -n $"Shutting down Avahi daemon: " $AVAHI_BIN -k RETVAL=$? [ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown" @@ -49,7 +49,7 @@ } reload() { - echo -n "Reloading Avahi daemon... " + echo -n $"Reloading Avahi daemon... " $AVAHI_BIN -r RETVAL=$? [ $RETVAL = 0 ] && success $"$base reload" || failure $"$base reload" @@ -74,7 +74,7 @@ ;; status) $AVAHI_BIN -c - [ $? = 0 ] && echo "Avahi daemon is running" || echo "Avahi daemon is not running" + [ $? = 0 ] && echo $"Avahi daemon is running" || echo $"Avahi daemon is not running" ;; restart) restart From fedora-cvs-commits at redhat.com Thu Jan 19 21:50:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 16:50:23 -0500 Subject: rpms/rhgb/devel rhgb-0.16.2-change-colors.patch, NONE, 1.1 rhgb.spec, 1.42, 1.43 Message-ID: <200601192150.k0JLoNsl011030@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/rhgb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10928 Modified Files: rhgb.spec Added Files: rhgb-0.16.2-change-colors.patch Log Message: - change color scheme and use new images by Diana Fong rhgb-0.16.2-change-colors.patch: splash.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) --- NEW FILE rhgb-0.16.2-change-colors.patch --- --- rhgb-0.16.2/src/splash.c 15 Sep 2004 18:35:52 -0000 1.23 +++ rhgb-0.16.2/src/splash.c 19 Jan 2006 19:57:54 -0000 @@ -38,9 +38,9 @@ static const char *init_redirect[] = { "/sbin/change_console", "-f", NULL }; static GdkColor start_color = {0, 0xFFFF, 0xFFFF, 0xFFFF}; -static GdkColor end_color = {0, 0x5c5c, 0x5c5c, 0x5c5c}; -static GdkColor background = {0, 0x4c4c, 0x4c4c, 0x4c4c}; -static GdkColor highlight = {0, 0x5c5c, 0x5c5c, 0x5c5c}; +static GdkColor end_color = {0, 0x0000, 0x2020, 0x4444}; +static GdkColor background = {0, 0x0000, 0x2525, 0x4d4d}; +static GdkColor highlight = {0, 0x0000, 0x2020, 0x4444}; #define N_STEPS 20 @@ -270,9 +270,9 @@ splash_new (void) vbox2 = gtk_vbox_new (FALSE, 25); gtk_container_add (GTK_CONTAINER (align), vbox2); #ifdef SPLASH_MAIN - image = gtk_image_new_from_file ("large-computer.png"); + image = gtk_image_new_from_file ("main-logo.png"); #else - image = gtk_image_new_from_file ("/usr/share/rhgb/large-computer.png"); + image = gtk_image_new_from_file ("/usr/share/rhgb/main-logo.png"); #endif gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0); @@ -366,7 +366,12 @@ splash_new (void) align = gtk_alignment_new (1.0, 0.5, 1.0, 1.0); gtk_box_pack_end (GTK_BOX (vbox), align, FALSE, FALSE, 0); + +#ifdef SPLASH_MAIN + splash->system_logo = gtk_image_new_from_file ("system-logo.png"); +#else splash->system_logo = gtk_image_new_from_file ("/usr/share/rhgb/system-logo.png"); +#endif gtk_misc_set_alignment (GTK_MISC (splash->system_logo), 1.0, 0.5); gtk_container_add (GTK_CONTAINER (align), splash->system_logo); Index: rhgb.spec =================================================================== RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- rhgb.spec 9 Jan 2006 09:13:37 -0000 1.42 +++ rhgb.spec 19 Jan 2006 21:50:19 -0000 1.43 @@ -3,7 +3,7 @@ Summary: Red Hat Graphical Boot Name: rhgb Version: 0.16.2 -Release: 18 +Release: 19 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL @@ -23,6 +23,7 @@ Patch5: rhgb-modularx.patch Patch6: rhgb-0.16.2-kill-more-zombies.patch Patch7: rhgb-0.16.2-dont-call-chvt.patch +Patch8: rhgb-0.16.2-change-colors.patch %description Red Hat Graphical Boot provides a clean and simple interface to the boot process @@ -37,6 +38,7 @@ %patch5 -p1 -b .modularx %patch6 -p1 -b .kill-more-zombies %patch7 -p1 -b .dont-call-chvt +%patch8 -p1 -b .change-colors %build %configure @@ -65,6 +67,9 @@ %doc doc/HOW_IT_WORKS %changelog +* Thu Jan 19 2006 Ray Strode 0.16.2-19 +- change color scheme and use new images by Diana Fong + * Sun Jan 8 2006 Ray Strode 0.16.2-18 - rebuild against modular X From fedora-cvs-commits at redhat.com Thu Jan 19 21:51:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 16:51:16 -0500 Subject: rpms/avahi/devel avahi.spec,1.29,1.30 Message-ID: <200601192151.k0JLpGIc011367@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11341 Modified Files: avahi.spec Log Message: fix bug 178127: fully localize the initscript Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- avahi.spec 18 Jan 2006 20:12:49 -0000 1.29 +++ avahi.spec 19 Jan 2006 21:51:13 -0000 1.30 @@ -4,7 +4,7 @@ %endif Name: avahi Version: 0.6.4 -Release: 1 +Release: 2 Summary: Local network service discovery Group: System Environment/Base License: LGPL @@ -24,6 +24,7 @@ Patch5: avahi-0.6.3-bz177148.patch # enable mono's mcs to work in beehive buildroot: Patch6: avahi-0.6.3-MONO_SHARED_DIR.patch +Patch7: avahi-0.6.4-initscript-i18n.patch %description Avahi is a system which facilitates service discovery on @@ -118,6 +119,7 @@ %if %{WITH_MONO} %patch6 -p1 -b .MONO_SHARED_DIR %endif +%patch7 -p1 -b .i18n %build # auto* update needed for avahi-0.5.2-fedora.patch @@ -283,6 +285,9 @@ %endif %changelog +* Thu Jan 19 2006 Jason Vas Dias - 0.6.4-2 +- fix bug 178127: fully localize the initscript + * Mon Jan 16 2006 Jason Vas Dias - 0.6.4-1 - Upgrade to upstream version 0.6.4 From fedora-cvs-commits at redhat.com Thu Jan 19 21:52:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 16:52:20 -0500 Subject: rpms/rhgb/devel rhgb.spec,1.43,1.44 Message-ID: <200601192152.k0JLqKxf011795@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/rhgb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11742 Modified Files: rhgb.spec Log Message: add a req for fedora-logos Index: rhgb.spec =================================================================== RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- rhgb.spec 19 Jan 2006 21:50:19 -0000 1.43 +++ rhgb.spec 19 Jan 2006 21:52:16 -0000 1.44 @@ -14,6 +14,7 @@ BuildRequires: gettext BuildRequires: libxf86config-devel >= 1.0.0-3 Requires: initscripts >= 7.22-1 +Requires: fedora-logos >= 1.1.39-1 Patch0: rhgb-0.16.2-reap-child.patch Patch1: rhgb-0.16.2-init-utf8.patch From fedora-cvs-commits at redhat.com Thu Jan 19 22:08:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 17:08:24 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc1-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.329, 1.330 kernel-2.6.spec, 1.1861, 1.1862 sources, 1.271, 1.272 upstream, 1.247, 1.248 linux-2.6.15-tif-restore-sigmask.patch, 1.2, NONE Message-ID: <200601192208.k0JM8OOK016488@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16439 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc1-git2.bz2.sign Removed Files: linux-2.6.15-tif-restore-sigmask.patch Log Message: git2 --- NEW FILE patch-2.6.16-rc1-git2.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD4DBQBDz0llyGugalF9Dw4RAjQkAJURDELCvQIviPlH+A84buf57mhiAJ9nKj1v PPZ7u5XfNCdPZbXTQkYDaQ== =eW23 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.329 retrieving revision 1.330 diff -u -r1.329 -r1.330 --- .cvsignore 18 Jan 2006 22:15:55 -0000 1.329 +++ .cvsignore 19 Jan 2006 22:08:18 -0000 1.330 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc1.bz2 bcm43xx-20060114.tar.bz2 -patch-2.6.16-rc1-git1.bz2 +patch-2.6.16-rc1-git2.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1861 retrieving revision 1.1862 diff -u -r1.1861 -r1.1862 --- kernel-2.6.spec 18 Jan 2006 22:15:55 -0000 1.1861 +++ kernel-2.6.spec 19 Jan 2006 22:08:18 -0000 1.1862 @@ -208,7 +208,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc1.bz2 -Patch2: patch-2.6.16-rc1-git1.bz2 +Patch2: patch-2.6.16-rc1-git2.bz2 Patch3: drm.patch # Patches 100 through 500 are meant for architecture patches @@ -365,9 +365,6 @@ # ACPI patches. Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch -# TIF_RESTORE_SIGMASK (for pselect) -Patch2200: linux-2.6.15-tif-restore-sigmask.patch - # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx.patch @@ -846,9 +843,6 @@ # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. %patch2100 -p1 -# TIF_RESTORE_SIGMASK -%patch2200 -p1 - # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream @@ -1349,6 +1343,9 @@ %endif %changelog +* Thu Jan 19 2006 Dave Jones +- 2.6.16-rc1-git2 + * Wed Jan 18 2006 Dave Jones - 2.6.16-rc1-git1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.271 retrieving revision 1.272 diff -u -r1.271 -r1.272 --- sources 18 Jan 2006 22:15:55 -0000 1.271 +++ sources 19 Jan 2006 22:08:20 -0000 1.272 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2 ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 -7925416f53c62a3fb778d30e42e3853c patch-2.6.16-rc1-git1.bz2 +b88c7585bed8b514d7016ad07bb93fa7 patch-2.6.16-rc1-git2.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.247 retrieving revision 1.248 diff -u -r1.247 -r1.248 --- upstream 18 Jan 2006 22:15:55 -0000 1.247 +++ upstream 19 Jan 2006 22:08:20 -0000 1.248 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc1.bz2 -patch-2.6.16-rc1-git1.bz2 +patch-2.6.16-rc1-git2.bz2 --- linux-2.6.15-tif-restore-sigmask.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 19 22:08:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 17:08:24 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.136, 1.137 config-x86-generic, 1.29, 1.30 config-x86_64-generic, 1.27, 1.28 Message-ID: <200601192208.k0JM8O0L016514@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv16439/configs Modified Files: config-generic config-x86-generic config-x86_64-generic Log Message: git2 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.136 retrieving revision 1.137 diff -u -r1.136 -r1.137 --- config-generic 18 Jan 2006 22:15:56 -0000 1.136 +++ config-generic 19 Jan 2006 22:08:20 -0000 1.137 @@ -1010,6 +1010,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- config-x86-generic 11 Jan 2006 00:19:04 -0000 1.29 +++ config-x86-generic 19 Jan 2006 22:08:21 -0000 1.30 @@ -272,3 +272,14 @@ CONFIG_LATENCY_TRACE=y CONFIG_MCOUNT=y CONFIG_CS5535_GPIO=m + +CONFIG_EDAC=y +CONFIG_EDAC_DEBUG=y +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m + Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86_64-generic,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- config-x86_64-generic 6 Jan 2006 23:33:19 -0000 1.27 +++ config-x86_64-generic 19 Jan 2006 22:08:21 -0000 1.28 @@ -148,3 +148,13 @@ CONFIG_NVRAM=m +CONFIG_EDAC=y +CONFIG_EDAC_DEBUG=y +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m + From fedora-cvs-commits at redhat.com Thu Jan 19 22:25:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 17:25:28 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.153, 1.154 policycoreutils.spec, 1.222, 1.223 Message-ID: <200601192225.k0JMPSBI001648@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1616 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Thu Jan 19 2006 Dan Walsh 1.29.9-2 - Fix genhomedircon to work on MLS policy policycoreutils-rhat.patch: chcat.8 | 5 +++++ genhomedircon | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.153 retrieving revision 1.154 diff -u -r1.153 -r1.154 --- policycoreutils-rhat.patch 19 Jan 2006 21:14:38 -0000 1.153 +++ policycoreutils-rhat.patch 19 Jan 2006 22:25:24 -0000 1.154 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat.8 policycoreutils-1.29.8/scripts/chcat.8 +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat.8 policycoreutils-1.29.9/scripts/chcat.8 --- nsapolicycoreutils/scripts/chcat.8 2006-01-18 11:12:43.000000000 -0500 -+++ policycoreutils-1.29.8/scripts/chcat.8 2006-01-19 10:48:59.000000000 -0500 ++++ policycoreutils-1.29.9/scripts/chcat.8 2006-01-19 17:23:42.000000000 -0500 @@ -27,6 +27,11 @@ Change/Remove the security CATEGORY for each FILE/USER. .PP @@ -13,3 +13,57 @@ .TP \fB\-d\fR delete the category from each FILE/USER. +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.9/scripts/genhomedircon +--- nsapolicycoreutils/scripts/genhomedircon 2006-01-18 11:12:43.000000000 -0500 ++++ policycoreutils-1.29.9/scripts/genhomedircon 2006-01-19 17:23:54.000000000 -0500 +@@ -199,10 +199,11 @@ + sys.stderr.write("The user \"%s\" is not present in the passwd file, skipping...\n" % user) + return + prefs = {} ++ prefs["seuser"] = seuser + prefs["role"] = role + prefs["home"] = home +- udict[seuser] = prefs +- ++ udict[user] = prefs ++ + def getUsers(self): + udict = {} + if self.semanaged: +@@ -233,14 +234,14 @@ + + return udict + +- def getHomeDirContext(self, user, home, role): ++ def getHomeDirContext(self, user, seuser, home, role): + ret="\n\n#\n# Home Context for user %s\n#\n\n" % user + fd=open(self.getHomeDirTemplate(), 'r') + for i in fd.read().split('\n'): + if i.startswith("HOME_DIR") == 1: + i=i.replace("HOME_DIR", home) + i=i.replace("ROLE", role) +- i=i.replace("system_u", user) ++ i=i.replace("system_u", seuser) + ret = ret+i+"\n" + fd.close() + return ret +@@ -265,8 +266,8 @@ + ret="" + # Fill in HOME and ROLE for users that are defined + for u in users.keys(): +- ret += self.getHomeDirContext (u, users[u]["home"], users[u]["role"]) +- ret += self.getUserContext (u, u, users[u]["role"]) ++ ret += self.getHomeDirContext (u, users[u]["seuser"], users[u]["home"], users[u]["role"]) ++ ret += self.getUserContext (u, users[u]["seuser"], users[u]["role"]) + return ret+"\n" + + def checkExists(self, home): +@@ -309,7 +310,7 @@ + def genoutput(self): + ret= self.heading() + for h in self.getHomeDirs(): +- ret += self.getHomeDirContext ("user_u" , h+'/[^/]*', "user") ++ ret += self.getHomeDirContext ("user_u", "user_u" , h+'/[^/]*', "user") + ret += self.getHomeRootContext(h) + ret += self.getUserContext(".*", "user_u", "user") + "\n" + ret += self.genHomeDirContext() Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.222 retrieving revision 1.223 diff -u -r1.222 -r1.223 --- policycoreutils.spec 19 Jan 2006 21:14:38 -0000 1.222 +++ policycoreutils.spec 19 Jan 2006 22:25:24 -0000 1.223 @@ -4,7 +4,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.9 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -97,6 +97,9 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Thu Jan 19 2006 Dan Walsh 1.29.9-2 +- Fix genhomedircon to work on MLS policy + * Thu Jan 19 2006 Dan Walsh 1.29.9-1 - Update to match NSA * Merged chcat, semanage, and setsebool patches from Dan Walsh. From fedora-cvs-commits at redhat.com Fri Jan 20 00:07:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 19:07:09 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1862, 1.1863 linux-2.6-compile-fixes.patch, 1.45, 1.46 Message-ID: <200601200007.k0K079b5028009@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27955 Modified Files: kernel-2.6.spec linux-2.6-compile-fixes.patch Log Message: fix ia64 unresolved syms Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1862 retrieving revision 1.1863 diff -u -r1.1862 -r1.1863 --- kernel-2.6.spec 19 Jan 2006 22:08:18 -0000 1.1862 +++ kernel-2.6.spec 20 Jan 2006 00:07:05 -0000 1.1863 @@ -1345,6 +1345,7 @@ %changelog * Thu Jan 19 2006 Dave Jones - 2.6.16-rc1-git2 +- Fix IA64 unresolved symbols. * Wed Jan 18 2006 Dave Jones - 2.6.16-rc1-git1 linux-2.6-compile-fixes.patch: linux-2.6.15/arch/s390/kernel/setup.c | 2 ++ linux-2.6.15/drivers/net/spider_net.c | 1 + linux-2.6.15/include/asm-generic/signal.h | 1 + linux-2.6/arch/ia64/Kconfig | 3 +++ linux-2.6/drivers/Makefile | 2 +- 5 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.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- linux-2.6-compile-fixes.patch 11 Jan 2006 00:35:05 -0000 1.45 +++ linux-2.6-compile-fixes.patch 20 Jan 2006 00:07:07 -0000 1.46 @@ -29,3 +29,43 @@ static void __init add_memory_hole(unsigned long start, unsigned long end) { + + +Include drivers/sn when CONFIG_IA64_SGI_SN2 or CONFIG_IA64_GENERIC +is enabled. + +Signed-off-by: Jes Sorensen +---- + + arch/ia64/Kconfig | 3 +++ + drivers/Makefile | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +Index: linux-2.6/arch/ia64/Kconfig +=================================================================== +--- linux-2.6.orig/arch/ia64/Kconfig ++++ linux-2.6/arch/ia64/Kconfig +@@ -374,6 +374,9 @@ + To use this option, you have to ensure that the "/proc file system + support" (CONFIG_PROC_FS) is enabled, too. + ++config SGI_SN ++ def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) ++ + source "drivers/firmware/Kconfig" + + source "fs/Kconfig.binfmt" +Index: linux-2.6/drivers/Makefile +=================================================================== +--- linux-2.6.orig/drivers/Makefile ++++ linux-2.6/drivers/Makefile +@@ -69,7 +69,7 @@ + obj-$(CONFIG_CPU_FREQ) += cpufreq/ + obj-$(CONFIG_MMC) += mmc/ + obj-$(CONFIG_INFINIBAND) += infiniband/ +-obj-$(CONFIG_SGI_IOC4) += sn/ ++obj-$(CONFIG_SGI_SN) += sn/ + obj-y += firmware/ + obj-$(CONFIG_CRYPTO) += crypto/ + obj-$(CONFIG_SUPERH) += sh/ + From fedora-cvs-commits at redhat.com Fri Jan 20 03:19:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 22:19:50 -0500 Subject: rpms/util-linux/devel util-linux-2.13-nfsv4.patch, 1.2, 1.3 util-linux.spec, 1.102, 1.103 Message-ID: <200601200319.k0K3Jo9m028421@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/util-linux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27677 Modified Files: util-linux-2.13-nfsv4.patch util-linux.spec Log Message: Updated the gssd_check() and idmapd_check(), used with nfsv4 mounts, to looked for the correct file in /var/lock/subsys which stops bogus warnings. util-linux-2.13-nfsv4.patch: Makefile.am | 4 mount.8 | 75 +++ mount.c | 10 nfs.5 | 219 +++++++++ nfs4_mount.h | 82 +++ nfs4mount.c | 433 ++++++++++++++++++ nfs_mount4.h | 22 nfsmount.c | 1361 +++++++++++++++++++++++++++++++++++++++-------------------- sundries.h | 4 umount.c | 7 10 files changed, 1757 insertions(+), 460 deletions(-) Index: util-linux-2.13-nfsv4.patch =================================================================== RCS file: /cvs/dist/rpms/util-linux/devel/util-linux-2.13-nfsv4.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- util-linux-2.13-nfsv4.patch 17 Aug 2005 11:53:18 -0000 1.2 +++ util-linux-2.13-nfsv4.patch 20 Jan 2006 03:19:45 -0000 1.3 @@ -491,7 +491,7 @@ +#define DEFAULT_DIR "/var/lock/subsys" +#endif + -+char *IDMAPLCK = DEFAULT_DIR "/rpc.idmapd"; ++char *IDMAPLCK = DEFAULT_DIR "/rpcidmapd"; +#define idmapd_check() do { \ + if (access(IDMAPLCK, F_OK)) { \ + printf(_("Warning: rpc.idmapd appears not to be running.\n" \ @@ -499,7 +499,7 @@ + } \ +} while(0); + -+char *GSSDLCK = DEFAULT_DIR "/rpc.gssd"; ++char *GSSDLCK = DEFAULT_DIR "/rpcgssd"; +#define gssd_check() do { \ + if (access(GSSDLCK, F_OK)) { \ + printf(_("Warning: rpc.gssd appears not to be running.\n")); \ Index: util-linux.spec =================================================================== RCS file: /cvs/dist/rpms/util-linux/devel/util-linux.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- util-linux.spec 3 Jan 2006 17:50:20 -0000 1.102 +++ util-linux.spec 20 Jan 2006 03:19:45 -0000 1.103 @@ -25,7 +25,7 @@ Summary: A collection of basic system utilities. Name: util-linux Version: 2.13 -Release: 0.13 +Release: 0.14 License: distributable Group: System Environment/Base @@ -624,6 +624,11 @@ /sbin/losetup %changelog +* Thu Jan 19 2006 Steve Dickson 2.13-0.14 +- Updated the gssd_check() and idmapd_check(), used with + nfsv4 mounts, to looked for the correct file in /var/lock/subsys + which stops bogus warnings. + * Tue Jan 3 2006 Karel Zak 2.13-0.13 - fix #174676 - hwclock audit return code mismatch - fix #176441: col truncates data From fedora-cvs-commits at redhat.com Fri Jan 20 04:25:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 19 Jan 2006 23:25:44 -0500 Subject: rpms/glibc-kernheaders/devel glibc-kernheaders-2.4-unistd.patch, 1.1, 1.2 glibc-kernheaders.spec, 1.99, 1.100 Message-ID: <200601200425.k0K4PiL7030476@cvs.devel.redhat.com> Author: dwmw2 Update of /cvs/dist/rpms/glibc-kernheaders/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30432 Modified Files: glibc-kernheaders-2.4-unistd.patch glibc-kernheaders.spec Log Message: New syscalls glibc-kernheaders-2.4-unistd.patch: asm-alpha/unistd.h | 32 ++++++++++++++++++++++++++------ asm-i386/unistd.h | 27 +++++++++++++++++++++++++++ asm-ia64/unistd.h | 17 +++++++++++++++-- asm-ppc/unistd.h | 24 ++++++++++++++++++++++-- asm-ppc64/unistd.h | 26 ++++++++++++++++++++++++-- asm-s390/unistd.h | 14 ++++++++++++-- asm-s390x/unistd.h | 15 +++++++++++++-- asm-x86_64/unistd.h | 28 ++++++++++++++++++++++++++-- 8 files changed, 165 insertions(+), 18 deletions(-) Index: glibc-kernheaders-2.4-unistd.patch =================================================================== RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders-2.4-unistd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- glibc-kernheaders-2.4-unistd.patch 15 Apr 2005 16:21:57 -0000 1.1 +++ glibc-kernheaders-2.4-unistd.patch 20 Jan 2006 04:25:37 -0000 1.2 @@ -1,15 +1,71 @@ --- glibc-kernheaders-2.4/usr/include/asm-alpha/unistd.h~ 2004-07-29 09:41:03.000000000 +0100 +++ glibc-kernheaders-2.4/usr/include/asm-alpha/unistd.h 2005-04-15 17:12:34.000000000 +0100 -@@ -363,5 +363,6 @@ +@@ -286,8 +286,8 @@ + #define __NR_pciconfig_write 346 + #define __NR_query_module 347 + #define __NR_prctl 348 +-#define __NR_pread 349 +-#define __NR_pwrite 350 ++#define __NR_pread64 349 ++#define __NR_pwrite64 350 + #define __NR_rt_sigreturn 351 + #define __NR_rt_sigaction 352 + #define __NR_rt_sigprocmask 353 +@@ -332,7 +332,7 @@ + #define __NR_lremovexattr 392 + #define __NR_fremovexattr 393 + #define __NR_futex 394 +-#define __NR_sched_setaffinity 395 ++#define __NR_sched_setaffinity 395 + #define __NR_sched_getaffinity 396 + #define __NR_tuxcall 397 + #define __NR_io_setup 398 +@@ -342,13 +342,23 @@ + #define __NR_io_cancel 402 + #define __NR_exit_group 405 + #define __NR_lookup_dcookie 406 +-#define __NR_epoll_create 407 +-#define __NR_epoll_ctl 408 +-#define __NR_epoll_wait 409 ++#define __NR_sys_epoll_create 407 ++#define __NR_sys_epoll_ctl 408 ++#define __NR_sys_epoll_wait 409 + #define __NR_remap_file_pages 410 + #define __NR_set_tid_address 411 + #define __NR_restart_syscall 412 + #define __NR_fadvise64 413 ++#define __NR_timer_create 414 ++#define __NR_timer_settime 415 ++#define __NR_timer_gettime 416 ++#define __NR_timer_getoverrun 417 ++#define __NR_timer_delete 418 ++#define __NR_clock_settime 419 ++#define __NR_clock_gettime 420 ++#define __NR_clock_getres 421 ++#define __NR_clock_nanosleep 422 ++#define __NR_semtimedop 423 + #define __NR_tgkill 424 + #define __NR_stat64 425 + #define __NR_lstat64 426 +@@ -363,5 +363,15 @@ #define __NR_mq_timedreceive 435 #define __NR_mq_notify 436 #define __NR_mq_getsetattr 437 +#define __NR_waitid 438 ++#define __NR_waitid 438 ++#define __NR_add_key 439 ++#define __NR_request_key 440 ++#define __NR_keyctl 441 ++#define __NR_ioprio_set 442 ++#define __NR_ioprio_get 443 ++#define __NR_inotify_init 444 ++#define __NR_inotify_add_watch 445 ++#define __NR_inotify_rm_watch 446 #endif /* _ALPHA_UNISTD_H */ --- glibc-kernheaders-2.4/usr/include/asm-i386/unistd.h~ 2004-04-16 22:07:05.000000000 +0100 +++ glibc-kernheaders-2.4/usr/include/asm-i386/unistd.h 2005-04-15 17:11:56.000000000 +0100 -@@ -288,5 +288,11 @@ +@@ -288,5 +288,32 @@ #define __NR_mq_timedreceive (__NR_mq_open+3) #define __NR_mq_notify (__NR_mq_open+4) #define __NR_mq_getsetattr (__NR_mq_open+5) @@ -19,11 +75,52 @@ +#define __NR_add_key 286 +#define __NR_request_key 287 +#define __NR_keyctl 288 ++#define __NR_ioprio_set 289 ++#define __NR_ioprio_get 290 ++#define __NR_inotify_init 291 ++#define __NR_inotify_add_watch 292 ++#define __NR_inotify_rm_watch 293 ++#define __NR_migrate_pages 294 ++#define __NR_openat 295 ++#define __NR_mkdirat 296 ++#define __NR_mknodat 297 ++#define __NR_fchownat 298 ++#define __NR_futimesat 299 ++#define __NR_newfstatat 300 ++#define __NR_unlinkat 301 ++#define __NR_renameat 302 ++#define __NR_linkat 303 ++#define __NR_symlinkat 304 ++#define __NR_readlinkat 305 ++#define __NR_fchmodat 306 ++#define __NR_faccessat 307 ++#define __NR_pselect6 308 ++#define __NR_ppoll 309 #endif /* _ASM_I386_UNISTD_H_ */ --- glibc-kernheaders-2.4/usr/include/asm-ia64/unistd.h~ 2004-07-29 09:41:03.000000000 +0100 +++ glibc-kernheaders-2.4/usr/include/asm-ia64/unistd.h 2005-04-15 17:11:30.000000000 +0100 -@@ -256,5 +256,9 @@ +@@ -137,8 +137,8 @@ + #define __NR_flock 1145 + #define __NR_readv 1146 + #define __NR_writev 1147 +-#define __NR_pread 1148 +-#define __NR_pwrite 1149 ++#define __NR_pread64 1148 ++#define __NR_pwrite64 1149 + #define __NR__sysctl 1150 + #define __NR_mmap 1151 + #define __NR_munmap 1152 +@@ -246,6 +246,8 @@ + #define __NR_clock_gettime 1254 + #define __NR_clock_getres 1255 + #define __NR_clock_nanosleep 1256 ++#define __NR_fstatfs64 1257 ++#define __NR_statfs64 1258 + #define __NR_mbind 1259 + #define __NR_get_mempolicy 1260 + #define __NR_set_mempolicy 1261 +@@ -256,5 +256,16 @@ #define __NR_mq_notify 1266 #define __NR_mq_getsetattr 1267 #define __NR_vserver 1269 @@ -31,11 +128,48 @@ +#define __NR_add_key 1271 +#define __NR_request_key 1272 +#define __NR_keyctl 1273 ++#define __NR_ioprio_set 1274 ++#define __NR_ioprio_get 1275 ++/* 1276 is available for reuse (was briefly sys_set_zone_reclaim) */ ++#define __NR_inotify_init 1277 ++#define __NR_inotify_add_watch 1278 ++#define __NR_inotify_rm_watch 1279 ++#define __NR_migrate_pages 1280 #endif /* _ASM_IA64_UNISTD_H */ --- glibc-kernheaders-2.4/usr/include/asm-ppc/unistd.h~ 2004-04-21 17:44:25.000000000 +0100 +++ glibc-kernheaders-2.4/usr/include/asm-ppc/unistd.h 2005-04-15 17:11:03.000000000 +0100 -@@ -269,5 +269,10 @@ +@@ -188,8 +189,8 @@ + #define __NR_rt_sigtimedwait 176 + #define __NR_rt_sigqueueinfo 177 + #define __NR_rt_sigsuspend 178 +-#define __NR_pread 179 +-#define __NR_pwrite 180 ++#define __NR_pread64 179 ++#define __NR_pwrite64 180 + #define __NR_chown 181 + #define __NR_getcwd 182 + #define __NR_capget 183 +@@ -257,18 +265,38 @@ + #define __NR_clock_gettime 246 + #define __NR_clock_getres 247 + #define __NR_clock_nanosleep 248 + #define __NR_swapcontext 249 + #define __NR_tgkill 250 + #define __NR_utimes 251 + #define __NR_statfs64 252 + #define __NR_fstatfs64 253 + #define __NR_fadvise64_64 254 + #define __NR_rtas 255 ++#define __NR_sys_debug_setcontext 256 ++/* Number 257 is reserved for vserver */ ++/* 258 currently unused */ ++#define __NR_mbind 259 ++#define __NR_get_mempolicy 260 ++#define __NR_set_mempolicy 261 + #define __NR_mq_open 262 + #define __NR_mq_unlink 263 + #define __NR_mq_timedsend 264 #define __NR_mq_timedreceive 265 #define __NR_mq_notify 266 #define __NR_mq_getsetattr 267 @@ -44,24 +178,77 @@ +#define __NR_request_key 270 +#define __NR_keyctl 271 +#define __NR_waitid 272 ++#define __NR_ioprio_set 273 ++#define __NR_ioprio_get 274 ++#define __NR_inotify_init 275 ++#define __NR_inotify_add_watch 276 ++#define __NR_inotify_rm_watch 277 ++#define __NR_spu_run 278 ++#define __NR_spu_create 279 ++#define __NR_pselect6 280 ++#define __NR_ppoll 281 #endif /* _ASM_PPC_UNISTD_H_ */ --- glibc-kernheaders-2.4/usr/include/asm-ppc64/unistd.h~ 2004-04-21 17:44:25.000000000 +0100 +++ glibc-kernheaders-2.4/usr/include/asm-ppc64/unistd.h 2005-04-15 17:11:14.000000000 +0100 -@@ -266,5 +266,10 @@ +@@ -186,8 +189,8 @@ + #define __NR_rt_sigtimedwait 176 + #define __NR_rt_sigqueueinfo 177 + #define __NR_rt_sigsuspend 178 +-#define __NR_pread 179 +-#define __NR_pwrite 180 ++#define __NR_pread64 179 ++#define __NR_pwrite64 180 + #define __NR_chown 181 + #define __NR_getcwd 182 + #define __NR_capget 183 +@@ -261,10 +270,32 @@ + #define __NR_utimes 251 ++#define __NR_statfs64 252 ++#define __NR_fstatfs64 253 + #define __NR_rtas 255 ++#define __NR_sys_debug_setcontext 256 ++/* Number 257 is reserved for vserver */ ++/* 258 currently unused */ ++#define __NR_mbind 259 ++#define __NR_get_mempolicy 260 ++#define __NR_set_mempolicy 261 + #define __NR_mq_open 262 + #define __NR_mq_unlink 263 + #define __NR_mq_timedsend 264 #define __NR_mq_timedreceive 265 #define __NR_mq_notify 266 #define __NR_mq_getsetattr 267 -+#define __NR_kexec_load 268 -+#define __NR_add_key 269 -+#define __NR_request_key 270 -+#define __NR_keyctl 271 -+#define __NR_waitid 272 ++#define __NR_kexec_load 268 ++#define __NR_add_key 269 ++#define __NR_request_key 270 ++#define __NR_keyctl 271 ++#define __NR_waitid 272 ++#define __NR_ioprio_set 273 ++#define __NR_ioprio_get 274 ++#define __NR_inotify_init 275 ++#define __NR_inotify_add_watch 276 ++#define __NR_inotify_rm_watch 277 ++#define __NR_spu_run 278 ++#define __NR_spu_create 279 ++#define __NR_pselect6 280 ++#define __NR_ppoll 281 #endif /* _ASM_PPC_UNISTD_H_ */ --- glibc-kernheaders-2.4/usr/include/asm-s390/unistd.h~ 2004-04-16 22:07:05.000000000 +0100 +++ glibc-kernheaders-2.4/usr/include/asm-s390/unistd.h 2005-04-15 17:10:27.000000000 +0100 -@@ -271,5 +271,10 @@ +@@ -170,8 +172,8 @@ + #define __NR_rt_sigtimedwait 177 + #define __NR_rt_sigqueueinfo 178 + #define __NR_rt_sigsuspend 179 +-#define __NR_pread 180 +-#define __NR_pwrite 181 ++#define __NR_pread64 180 ++#define __NR_pwrite64 181 + #define __NR_chown 182 + #define __NR_getcwd 183 + #define __NR_capget 184 +@@ -271,5 +271,15 @@ #define __NR_mq_timedreceive 274 #define __NR_mq_notify 275 #define __NR_mq_getsetattr 276 @@ -70,11 +257,27 @@ +#define __NR_request_key 279 +#define __NR_keyctl 280 +#define __NR_waitid 281 ++#define __NR_ioprio_set 282 ++#define __NR_ioprio_get 283 ++#define __NR_inotify_init 284 ++#define __NR_inotify_add_watch 285 ++#define __NR_inotify_rm_watch 286 #endif /* _ASM_S390_UNISTD_H_ */ --- glibc-kernheaders-2.4/usr/include/asm-s390x/unistd.h~ 2004-04-16 22:07:05.000000000 +0100 +++ glibc-kernheaders-2.4/usr/include/asm-s390x/unistd.h 2005-04-15 17:10:12.000000000 +0100 -@@ -238,5 +238,10 @@ +@@ -170,7 +172,8 @@ + #define __NR_rt_sigtimedwait 177 + #define __NR_rt_sigqueueinfo 178 + #define __NR_rt_sigsuspend 179 +-#define __NR_pread 180 +-#define __NR_pwrite 181 ++#define __NR_pread64 180 ++#define __NR_pwrite64 181 ++#define __NR_chown 182 + #define __NR_getcwd 183 + #define __NR_capget 184 +@@ -238,5 +238,15 @@ #define __NR_mq_timedreceive 274 #define __NR_mq_notify 275 #define __NR_mq_getsetattr 276 @@ -83,11 +286,27 @@ +#define __NR_request_key 279 +#define __NR_keyctl 280 +#define __NR_waitid 281 ++#define __NR_ioprio_set 282 ++#define __NR_ioprio_get 283 ++#define __NR_inotify_init 284 ++#define __NR_inotify_add_watch 285 ++#define __NR_inotify_rm_watch 286 #endif /* _ASM_S390_UNISTD_H_ */ --- glibc-kernheaders-2.4/usr/include/asm-x86_64/unistd.h~ 2005-04-15 17:06:55.000000000 +0100 +++ glibc-kernheaders-2.4/usr/include/asm-x86_64/unistd.h 2005-04-15 17:09:35.000000000 +0100 -@@ -283,6 +283,11 @@ +@@ -27,8 +29,8 @@ + #define __NR_rt_sigreturn 15 + + #define __NR_ioctl 16 +-#define __NR_pread 17 +-#define __NR_pwrite 18 ++#define __NR_pread64 17 ++#define __NR_pwrite64 18 + #define __NR_readv 19 + #define __NR_writev 20 + #define __NR_access 21 +@@ -283,6 +283,30 @@ #define __NR_mq_timedreceive 243 #define __NR_mq_notify 244 #define __NR_mq_getsetattr 245 @@ -96,6 +315,25 @@ +#define __NR_add_key 248 +#define __NR_request_key 249 +#define __NR_keyctl 250 ++#define __NR_ioprio_set 251 ++#define __NR_ioprio_get 252 ++#define __NR_inotify_init 253 ++#define __NR_inotify_add_watch 254 ++#define __NR_inotify_rm_watch 255 ++#define __NR_migrate_pages 256 ++#define __NR_openat 257 ++#define __NR_mkdirat 258 ++#define __NR_mknodat 259 ++#define __NR_fchownat 260 ++#define __NR_futimesat 261 ++#define __NR_newfstatat 262 ++#define __NR_unlinkat 263 ++#define __NR_renameat 264 ++#define __NR_linkat 265 ++#define __NR_symlinkat 266 ++#define __NR_readlinkat 267 ++#define __NR_fchmodat 268 ++#define __NR_faccessat 269 #define __NR_syscall_max __NR_mq_getsetattr Index: glibc-kernheaders.spec =================================================================== RCS file: /cvs/dist/rpms/glibc-kernheaders/devel/glibc-kernheaders.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- glibc-kernheaders.spec 25 Oct 2005 07:56:53 -0000 1.99 +++ glibc-kernheaders.spec 20 Jan 2006 04:25:37 -0000 1.100 @@ -1,7 +1,7 @@ Summary: Header files for the Linux kernel for use by glibc Name: glibc-kernheaders Version: 3.0 -Release: 2 +Release: 3 License: GPL Group: Development/System ExclusiveOS: Linux @@ -175,6 +175,9 @@ %changelog +* Fri Jan 20 2006 David Woodhouse 3.0-3 +- Add new syscalls up to 2006-01-20 + * Tue Oct 25 2005 David Woodhouse 3.0-2 - Fix order of version and ihl in struct iphdr. (#171678) From fedora-cvs-commits at redhat.com Fri Jan 20 09:56:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 04:56:39 -0500 Subject: rpms/logwatch/FC-4 logwatch-7.0-man_page.patch, NONE, 1.1 logwatch-7.0-named.patch, NONE, 1.1 logwatch-7.0-smartd2.patch, NONE, 1.1 logwatch.spec, 1.20, 1.21 Message-ID: <200601200956.k0K9udYh025259@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/logwatch/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv25014 Modified Files: logwatch.spec Added Files: logwatch-7.0-man_page.patch logwatch-7.0-named.patch logwatch-7.0-smartd2.patch Log Message: - fix bug 172073 (man page problem) - fix bug 171631 (named service problem) - fix smartd service logwatch-7.0-man_page.patch: logwatch.8 | 106 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 53 insertions(+), 53 deletions(-) --- NEW FILE logwatch-7.0-man_page.patch --- --- logwatch-7.0/logwatch.8.pom 2005-05-04 21:21:37.000000000 +0200 +++ logwatch-7.0/logwatch.8 2005-11-12 19:35:49.000000000 +0100 @@ -1,7 +1,7 @@ .\" Process this file with .\" groff -man -Tascii foo.1 .\" -.TH LOGWATCH 8 "MARCH 1998" Linux "User Manuals" +.TH LOGWATCH 8 "October 2005" Linux "User Manuals" .SH NAME logwatch \- system log analyzer and reporter .SH SYNOPSIS @@ -23,26 +23,29 @@ .I directory .B ] [--hostname .I hostname -.B ] [--numeric] [--help|--usage] +.B ] [--splithosts] [--multiemail] [--output +.I output-type +.B ] [--numeric] [--version] [--help|--usage] .SH DESCRIPTION .B LogWatch is a customizable, pluggable log-monitoring system. It will go through your logs for a given period of time and make a report in the areas -that you wish with the detail that you wish. Easy to use - works right out -of the package on almost all systems. +that you wish with the detail that you wish. Logwatch is being used for +Linux and many types of UNIX. .SH OPTIONS -.IP "--detail level" +.IP "\fB--detail\fR level" This is the detail level of the report. .I level -can be high, med, low. -.IP "--logfile log-file-group" +can be a positive integer, or high, med, low, which correspond to the +integers 10, 5, and 0, repectively. +.IP "\fB--logfile\fR log-file-group" This will force LogWatch to process only the set of logfiles defined by .I log-file-group (i.e. messages, xferlog, ...). LogWatch will therefore process all services that use those logfiles. This option can be specified more than once to specify multiple logfile-groups. -.IP "--service service-name" +.IP "\fB--service\fR service-name" This will force LogWatch to process only the service specified in .I service-name (i.e. login, pam, identd, ...). LogWatch will therefore also process @@ -54,12 +57,12 @@ .I All which will process all services (and logfile-groups) for which you have filters installed. -.IP --print +.IP "\fB--print\fR" Print the results to stdout (i.e. the screen). -.IP "--mailto address" +.IP "\fB--mailto\fR address" Mail the results to the email address or user specified in .I address. -.IP "--range range" +.IP "\fB--range\fR range" You can specify a date-range to process. Common ranges are .I Yesterday, Today, All, and @@ -67,70 +70,50 @@ Additional options are listed when invoked with the .I Help parameter. -.IP --archives +.IP "\fB--archives\fR" Each log-file-group has basic logfiles (i.e. /var/log/messages) as well as archives (i.e. /var/log/messages.? or /var/log/messages.?.gz). When used with "--range all", this option will make LogWatch search through the archives in addition to the regular logfiles. For other values of --range, LogWatch will search the appropriate archived logs. -.IP "--debug level" +.IP "\fB--debug\fR level" For debugging purposes. .I level can range from 0 to 100. This will .I really clutter up your output. You probably don't want to use this. -.IP "--save file-name" +.IP "\fB--save\fR file-name" Save the output to .I file-name instead of displaying or mailing it. -.IP "--logdir directory" +.IP "\fB--logdir\fR directory" Look in .I directory for log files instead of the default directory. -.IP "--hostname hostname" +.IP "\fB--hostname\fR hostname" Use .I hostname for the reports instead of this system's hostname. In addition, -if HostLimit is set in -.I /etc/log.d/logwatch.conf, +if HostLimit is set in the logwatch.conf configuration file (see +\fBMORE INFORMATION\fR, below), then only logs from this hostname will be processed (where appropriate). -.IP "--numeric" +.IP "\fB--numeric\fR" Inhibits additional name lookups, displaying IP addresses numerically. -.IP --usage +.IP "\fB--usage\fR" Displays usage information -.IP --help +.IP "\fB--help\fR" same as --usage. .SH FILES -.I /etc/log.d/logwatch.conf +.IP /usr/share/logwatch/ .RS -Really a symlink to /etc/log.d/conf/logwatch.conf. -This file sets the default values of all the above -options. These defaults are used when LogWatch is -called without any parameters (i.e. from cron.daily). -The file is well-documented, but the explanations above -also apply to this config file. +This directory contains all the perl executables and +configuration files shipped with the logwatch distribution. .RE -.I /etc/log.d/conf/services/* +.IP /etc/logwatch .RS -Configuration files for the various services whose log -entries LogWatch can process. -.RE -.I /etc/log.d/conf/logfiles/* -.RS -Configuration files for the various logfiles that the -above service's log entries are stored in. -.RE -.I /etc/log.d/scripts/shared/* -.RS -Filters common to many services and/or logfiles. -.RE -.I /etc/log.d/scripts/logfiles/* -.RS -Filters specific to just particular logfiles. -.RE -.I /etc/log.d/scripts/services/* -.RS -Actual filter programs for the various services. +This directory contains local configuration files that override +the default configuration. See \fBMORE INFORMATION\fR below for more +information. .RE .SH EXAMPLES .B logwatch --service ftpd-xferlog --range all --detail high --print --archives @@ -143,12 +126,29 @@ This will print out login information for the previous day... .RE .SH MORE INFORMATION -For information on adding your own filter, please see the file HOWTO-Make-Filter -which should have been included with Logwatch. If you installed from an RPM, -it is probably under /usr/share/doc/logwatch-XXX. +The directory /usr/share/doc/logwatch-* contains several files with additional +documentation: +.RE +.I HOWTO-Customize-Configuration +.I HOWTO-Make-Filter +.RS +Documents the directory structure of LogWatch configuration and executable +files, and describes how to customize LogWatch by overriding these default +files. +.RE +.I License +.RS +Describes the License under which LogWatch is distributed. Additional +clauses may be specified in individual files. +.RE +.I README +.RS +Describes how to install, where to find it, mailing lists, and +other useful information. .SH AUTHOR +.RE Kirk Bauer - +.RE http://www.kaybee.org/~kirk - +.RE ftp://ftp.kaybee.org/pub/redhat/RPMS logwatch-7.0-named.patch: named | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+) --- NEW FILE logwatch-7.0-named.patch --- --- logwatch-7.1/scripts/services/named.pom 2005-09-29 17:02:52.000000000 +0200 +++ logwatch-7.1/scripts/services/named 2005-11-23 14:29:41.640084088 +0100 @@ -195,6 +195,15 @@ $MasterFailure{"$Zone from $Host"}{$Reason}++; } elsif ( ($Zone) = ($ThisLine =~ /zone ([^\/]+)\/.+: refresh: non-authoritative answer from master/)) { $NonAuthoritative{$Zone}++; + } elsif ( ($ThisLine =~ /unexpected RCODE ([^ ]+) resolving '[^ ]+': [0-9.#]+/) ){ + chomp($ThisLine); + $DisallClient{$ThisLine}++; + } elsif ( ($ThisLine =~ /FORMERR resolving '[^ ]+: [0-9.#]+/) ) { + chomp($ThisLine); + $FormErr{$ThisLine}++; + } elsif ( ($ThisLine =~ /found 1 CPU, using 1 worker thread/) ) { + chomp($ThisLine); + $StartLog{$ThisLine}++; } else { # Report any unmatched entries... # remove PID from named messages @@ -366,6 +375,28 @@ } } +if (($Detail >= 5) and (keys %DisallClient)) { + print "\n Query form disallowed client:\n"; + foreach $ThisOne (keys %DisallClient) { + print " " . $ThisOne . ": " . $DisallClient{$ThisOne} . " Time(s)\n"; + } +} + +if (($Detail >= 5) and (keys %FormErr)) { + print "\n Incorrect response format:\n"; + foreach $ThisOne (keys %FormErr) { + print " " . $ThisOne . ": " . $FormErr{$ThisOne} . " Time(s)\n"; + } +} + +if (($Detail >= 10) and (keys %StartLog)) { + print "\n Named startup logs:\n"; + foreach $ThisOne (keys %StartLog) { + print " " . $ThisOne . ": " . $StartLog{$ThisOne} . " Time(s)\n"; + } +} + + if (keys %OtherList) { print "\n**Unmatched Entries**\n"; foreach $line (sort {$a cmp $b} keys %OtherList) { logwatch-7.0-smartd2.patch: smartd | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletion(-) --- NEW FILE logwatch-7.0-smartd2.patch --- --- logwatch-7.0/scripts/services/smartd.ppp 2006-01-20 09:59:35.000000000 +0100 +++ logwatch-7.0/scripts/services/smartd 2006-01-20 10:23:13.411151344 +0100 @@ -19,7 +19,16 @@ # ignore } elsif ( ($ThisLine =~ /^smartd version/) || ($ThisLine =~ /^Home page/) || ($ThisLine =~ /configuration file/i) || ($ThisLine =~ /^Monitoring/) || ($ThisLine =~ /smartd has fork/) || ($ThisLine =~ /smartd startup succeeded/) ) { # ignore - + } elsif ( ($ThisLine =~ /^smartd version/) + || ($ThisLine =~ /^Home page/) + || ($ThisLine =~ /configuration file/i) + || ($ThisLine =~ /\[trip Temperature is \d+ Celsius\]/) + || ($ThisLine =~ /^Monitoring/) + || ($ThisLine =~ /smartd received signal 15: Terminated/) + || ($ThisLine =~ /smartd is exiting \(exit status 0\)/) + || ($ThisLine =~ /smartd has fork/) + || ($ThisLine =~ /smartd startup succeeded/) ) { # ignore + # } elsif ( ($Device,$Msg) = ($ThisLine =~ /^Device: ([^,]+), (.*)$/)) { # $ParamChanges{$Device}{$Msg}++; } elsif ( ($Device,$AttribType,$Code,$Name,undef,undef,$NewVal) = ($ThisLine =~ /^Device: ([^,]+), SMART ([A-Za-z]+) Attribute: ([0-9]+) ([A-Za-z_]+) changed from ([0-9]+) (\[Raw [0-9]+\] )?to ([0-9]+)/)) { Index: logwatch.spec =================================================================== RCS file: /cvs/dist/rpms/logwatch/FC-4/logwatch.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- logwatch.spec 24 Oct 2005 10:06:03 -0000 1.20 +++ logwatch.spec 20 Jan 2006 09:56:30 -0000 1.21 @@ -1,7 +1,7 @@ Summary: A log file analysis program. Name: logwatch Version: 7.0 -Release: 1.fc4 +Release: 2.fc4 License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -12,6 +12,9 @@ Patch4: logwatch-7.0-smartd.patch Patch5: logwatch-7.0-zz-disk_space.patch Patch6: logwatch-7.0-secure.patch +Patch7: logwatch-7.0-man_page.patch +Patch8: logwatch-7.0-named.patch +Patch9: logwatch-7.0-smartd2.patch Requires: textutils sh-utils grep mailx BuildRoot: %{_tmppath}/logwatch-build BuildArchitectures: noarch @@ -32,6 +35,9 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %install @@ -130,6 +136,11 @@ %doc License project/CHANGES project/TODO %changelog +* Fri Jan 20 2006 Ivana Varekova 7.0-2.fc4 +- fix bug 172073 (man page problem) +- fix bug 171631 (named service problem) +- fix smartd service + * Mon Oct 24 2005 Ivana Varekova 7.0-1.fc4 - Update to 7.0 - add smart, zz-disk_space patch, secure and audit2 patches From fedora-cvs-commits at redhat.com Fri Jan 20 11:40:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 06:40:14 -0500 Subject: rpms/system-config-date/devel .cvsignore, 1.37, 1.38 sources, 1.40, 1.41 system-config-date.spec, 1.45, 1.46 Message-ID: <200601201140.k0KBeEua024364@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-date/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24350 Modified Files: .cvsignore sources system-config-date.spec Log Message: zoom out in TZ map on Escape (#178093) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 18 Jan 2006 13:14:04 -0000 1.37 +++ .cvsignore 20 Jan 2006 11:40:10 -0000 1.38 @@ -1 +1 @@ -system-config-date-1.7.99.16.tar.bz2 +system-config-date-1.7.99.17.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 18 Jan 2006 13:14:04 -0000 1.40 +++ sources 20 Jan 2006 11:40:10 -0000 1.41 @@ -1 +1 @@ -2161b2e0a0f0758d6f92e27d54d6a99a system-config-date-1.7.99.16.tar.bz2 +8f9ba9d468cb648cd3e29aaed97d8957 system-config-date-1.7.99.17.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- system-config-date.spec 18 Jan 2006 13:14:04 -0000 1.45 +++ system-config-date.spec 20 Jan 2006 11:40:10 -0000 1.46 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.7.99.16 +Version: 1.7.99.17 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -93,6 +93,9 @@ %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template %changelog +* Fri Jan 20 2006 Nils Philippsen 1.7.99.17 +- zoom out in TZ map on Escape (#178093) + * Wed Jan 18 2006 Nils Philippsen 1.7.99.16 - don't crash when selecting a timezone (#178086, patch by Chris Lumens) From fedora-cvs-commits at redhat.com Fri Jan 20 12:03:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 07:03:47 -0500 Subject: rpms/logwatch/devel logwatch-7.1-pam_unix.patch, 1.1, 1.2 logwatch.spec, 1.33, 1.34 Message-ID: <200601201203.k0KC3lXJ012484@cvs.devel.redhat.com> Author: varekova Update of /cvs/dist/rpms/logwatch/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12407 Modified Files: logwatch-7.1-pam_unix.patch logwatch.spec Log Message: - extended pam_unix patch (fix sshd service) logwatch-7.1-pam_unix.patch: pam_unix | 7 +++++-- secure | 1 + sshd | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) Index: logwatch-7.1-pam_unix.patch =================================================================== RCS file: /cvs/dist/rpms/logwatch/devel/logwatch-7.1-pam_unix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- logwatch-7.1-pam_unix.patch 18 Jan 2006 13:26:22 -0000 1.1 +++ logwatch-7.1-pam_unix.patch 20 Jan 2006 12:03:30 -0000 1.2 @@ -1,5 +1,15 @@ +--- logwatch-7.1/scripts/services/sshd.pom 2006-01-20 11:09:16.000000000 +0100 ++++ logwatch-7.1/scripts/services/sshd 2006-01-20 12:04:41.000000000 +0100 +@@ -176,6 +176,7 @@ + ($ThisLine =~ m/^nss_ldap: reconnect/) or + ($ThisLine =~ m/^pam_ldap: error trying to bind as user "[^"]+" \(Invalid credentials\)/) or + ($ThisLine =~ m/^\(pam_unix\) .*/) or ++ ($ThisLine =~ m/^pam_unix\(.*:.*\)/) or + # We won't count the following two because they're always followed by a + # failed login entry... + ($ThisLine =~ /^input_userauth_request: (illegal|invalid) user (.*)$/ ) or --- logwatch-7.1/scripts/services/pam_unix.pom 2005-09-26 20:19:03.000000000 +0200 -+++ logwatch-7.1/scripts/services/pam_unix 2006-01-18 14:08:34.033899064 +0100 ++++ logwatch-7.1/scripts/services/pam_unix 2006-01-20 11:09:16.689069248 +0100 @@ -78,12 +78,15 @@ } elsif ( $line =~ s/^... .. ..:..:.. .+ [^\s:\[\]]+: [0-9:\[\]\.]+ \(pam_unix\) //) { $service =~ s/^... .. ..:..:.. .+ ([^\s:\[\]]+): [0-9:\[\]\.]+ \(pam_unix\) .*$/$1/; @@ -18,8 +28,8 @@ $service = lc($service); if (($service eq 'sshd') or ($service eq 'login') or ($service eq 'ftp') or ($service eq 'rsh')) { if ($line =~ s/^session opened for user (.+) by \(uid=\d+\)/$1/) { ---- logwatch-7.1/scripts/services/secure.pom 2006-01-18 14:07:00.784075192 +0100 -+++ logwatch-7.1/scripts/services/secure 2006-01-18 14:07:01.042035976 +0100 +--- logwatch-7.1/scripts/services/secure.pom 2006-01-20 11:09:16.478101320 +0100 ++++ logwatch-7.1/scripts/services/secure 2006-01-20 11:09:16.732062712 +0100 @@ -105,6 +105,7 @@ ( $ThisLine =~ /pam_succeed_if: requirement "uid < 100" (was|not) met by user /) or ( $ThisLine =~ /pam_rhosts_auth\[\d+\]: allowed to [^ ]+ as \w+/) or Index: logwatch.spec =================================================================== RCS file: /cvs/dist/rpms/logwatch/devel/logwatch.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- logwatch.spec 18 Jan 2006 13:26:23 -0000 1.33 +++ logwatch.spec 20 Jan 2006 12:03:31 -0000 1.34 @@ -1,7 +1,7 @@ Summary: A log file analysis program. Name: logwatch Version: 7.1 -Release: 6 +Release: 7 License: MIT Group: Applications/System URL: http://www.logwatch.org/ @@ -36,7 +36,7 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 -b .pom +%patch10 -p1 %install @@ -138,7 +138,10 @@ %doc License project/CHANGES project/TODO %changelog -* Wed Dec 18 2006 Ivana Varekova 7.1-6 +* Fri Jan 20 2006 Ivana Varekova 7.1-7 +- extended pam_unix patch (fix sshd service) + +* Wed Jan 18 2006 Ivana Varekova 7.1-6 - removed nounicode patch - added patch to fix pam_unix logs parsing (#178058) From fedora-cvs-commits at redhat.com Fri Jan 20 12:24:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 07:24:36 -0500 Subject: rpms/docbook-style-xsl/FC-4 docbook-xsl-lists.patch, NONE, 1.1 docbook-xsl-pagesetup.patch, NONE, 1.1 docbook-style-xsl.spec, 1.17, 1.18 Message-ID: <200601201224.k0KCOakK031168@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/docbook-style-xsl/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv31136 Modified Files: docbook-style-xsl.spec Added Files: docbook-xsl-lists.patch docbook-xsl-pagesetup.patch Log Message: * Fri Jan 20 2006 Tim Waugh 1.68.1-1.1 - Fix lists blocking (bug #161371). - Avoid proportional-column-width for passivetex (bug #176766). docbook-xsl-lists.patch: lists.xsl | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 61 insertions(+), 7 deletions(-) --- NEW FILE docbook-xsl-lists.patch --- --- docbook-xsl-1.68.1/fo/lists.xsl.lists 2006-01-20 12:14:09.000000000 +0000 +++ docbook-xsl-1.68.1/fo/lists.xsl 2006-01-20 12:15:02.000000000 +0000 @@ -125,9 +125,18 @@ + + + + + - + + + @@ -287,9 +296,18 @@ + + + + + - + + + @@ -486,9 +504,18 @@ + + + + + - + + + @@ -906,9 +933,18 @@ + + + + + - + + + @@ -932,9 +968,18 @@ + + + + + - + + + @@ -1112,10 +1157,19 @@ + + + + + - + - + + + docbook-xsl-pagesetup.patch: pagesetup.xsl | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) --- NEW FILE docbook-xsl-pagesetup.patch --- --- docbook-xsl-1.68.1/fo/pagesetup.xsl.pagesetup 2006-01-20 12:18:13.000000000 +0000 +++ docbook-xsl-1.68.1/fo/pagesetup.xsl 2006-01-20 12:22:08.000000000 +0000 @@ -1491,32 +1491,29 @@ - proportional-column-width( header - ) + % - proportional-column-width( header - ) + % - proportional-column-width( header - ) + % @@ -1812,32 +1809,29 @@ - proportional-column-width( footer - ) + % - proportional-column-width( footer - ) + % - proportional-column-width( footer - ) + % Index: docbook-style-xsl.spec =================================================================== RCS file: /cvs/dist/rpms/docbook-style-xsl/FC-4/docbook-style-xsl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- docbook-style-xsl.spec 14 Feb 2005 15:24:11 -0000 1.17 +++ docbook-style-xsl.spec 20 Jan 2006 12:24:33 -0000 1.18 @@ -1,6 +1,6 @@ Name: docbook-style-xsl Version: 1.68.1 -Release: 1 +Release: 1.1 Group: Applications/Text Summary: Norman Walsh's XSL stylesheets for DocBook XML. @@ -21,7 +21,9 @@ Source0: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.bz2 Source1: %{name}.Makefile +Patch1: docbook-xsl-pagesetup.patch Patch2: docbook-xsl-marginleft.patch +Patch3: docbook-xsl-lists.patch %description @@ -31,7 +33,9 @@ %prep %setup -q -n docbook-xsl-%{version} +%patch1 -p1 -b .pagesetup %patch2 -p1 -b .marginleft +%patch3 -p1 -b .lists cp %{SOURCE1} Makefile for f in $(find -name "*'*") do @@ -91,6 +95,10 @@ %changelog +* Fri Jan 20 2006 Tim Waugh 1.68.1-1.1 +- Fix lists blocking (bug #161371). +- Avoid proportional-column-width for passivetex (bug #176766). + * Mon Feb 14 2005 Tim Waugh 1.68.1-1 - 1.68.1. From fedora-cvs-commits at redhat.com Fri Jan 20 12:44:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 07:44:34 -0500 Subject: rpms/gd/devel gd-2.0.33-security.patch,NONE,1.1 gd.spec,1.26,1.27 Message-ID: <200601201244.k0KCiXd0028594@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/gd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28578 Modified Files: gd.spec Added Files: gd-2.0.33-security.patch Log Message: - Included a few more overflow checks. gd-2.0.33-security.patch: gd.c | 8 ++++++++ gdxpm.c | 3 +++ 2 files changed, 11 insertions(+) --- NEW FILE gd-2.0.33-security.patch --- diff -u gd-2.0.28/gd.c gd-2.0.28/gd.c --- gd-2.0.28/gd.c 2004-11-02 17:47:12.977824069 +0100 +++ gd-2.0.28/gd.c 2006-01-20 11:14:42.000000000 +0100 @@ -73,6 +73,11 @@ gdImagePtr im; im = (gdImage *) gdMalloc (sizeof (gdImage)); memset (im, 0, sizeof (gdImage)); + if (overflow2(sizeof (unsigned char *), sy)) + { + gdFree(im); + return NULL; + } /* Row-major ever since gd 1.3 */ im->pixels = (unsigned char **) gdMalloc (sizeof (unsigned char *) * sy); im->polyInts = 0; @@ -2586,6 +2591,9 @@ { im->polyAllocated *= 2; } + if (overflow2(sizeof (int), im->polyAllocated)) { + return; + } im->polyInts = (int *) gdRealloc (im->polyInts, sizeof (int) * im->polyAllocated); } only in patch2: unchanged: --- gd-2.0.28/gdxpm.c.security 2006-01-20 11:14:52.000000000 +0100 +++ gd-2.0.28/gdxpm.c 2006-01-20 11:15:26.000000000 +0100 @@ -48,6 +48,9 @@ return 0; number = image.ncolors; + if (overflow2(sizeof (int), number)) { + return 0; + } colors = (int *) gdMalloc (sizeof (int) * number); if (colors == NULL) return (0); Index: gd.spec =================================================================== RCS file: /cvs/dist/rpms/gd/devel/gd.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- gd.spec 9 Dec 2005 22:40:31 -0000 1.26 +++ gd.spec 20 Jan 2006 12:44:28 -0000 1.27 @@ -1,13 +1,14 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.0.33 -Release: 5.1 +Release: 6 Group: System Environment/Libraries License: BSD-style URL: http://www.boutell.com/gd/ Source0: http://www.boutell.com/gd/http/%{name}-%{version}.tar.gz Patch0: gd-2.0.33-freetype.patch Patch1: gd-2.0.33-SetAAPixel.patch +Patch2: gd-2.0.33-security.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel, fontconfig-devel, libX11-devel, libXpm-devel BuildRequires: libjpeg-devel, libpng-devel, zlib-devel @@ -48,6 +49,7 @@ %setup -q %patch0 -p1 -b .freetype %patch1 -p1 -b .SetAAPixel +%patch2 -p1 -b .security %build %configure --disable-rpath @@ -86,6 +88,9 @@ %changelog +* Fri Jan 20 2006 Phil Knirsch 2.0.33-6 +- Included a few more overflow checks. + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Fri Jan 20 12:48:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 07:48:04 -0500 Subject: rpms/gd/devel gd.spec,1.27,1.28 Message-ID: <200601201248.k0KCm4QK008410@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/gd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8394 Modified Files: gd.spec Log Message: - Included bugzilla number. Index: gd.spec =================================================================== RCS file: /cvs/dist/rpms/gd/devel/gd.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gd.spec 20 Jan 2006 12:44:28 -0000 1.27 +++ gd.spec 20 Jan 2006 12:48:01 -0000 1.28 @@ -89,7 +89,7 @@ %changelog * Fri Jan 20 2006 Phil Knirsch 2.0.33-6 -- Included a few more overflow checks. +- Included a few more overflow checks (#177907) * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Fri Jan 20 13:07:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 08:07:43 -0500 Subject: rpms/nfs-utils-lib/devel libnfsidmap-0.12-set_debug.patch, NONE, 1.1 nfs-utils-lib.spec, 1.1, 1.2 Message-ID: <200601201307.k0KD7h6m020202@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils-lib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20127 Modified Files: nfs-utils-lib.spec Added Files: libnfsidmap-0.12-set_debug.patch Log Message: - Added debugging routines to libnfsidmap libnfsidmap-0.12-set_debug.patch: libnfsidmap.c | 34 +++++++++++++++++++++++++++++++--- nfsidmap.h | 1 + nfsidmap_internal.h | 1 + nss.c | 21 ++++++++++++++++++++- 4 files changed, 53 insertions(+), 4 deletions(-) --- NEW FILE libnfsidmap-0.12-set_debug.patch --- --- libnfsidmap-0.12/nss.c.orig 2005-11-01 10:04:45.000000000 -0500 +++ libnfsidmap-0.12/nss.c 2006-01-19 17:03:17.515117000 -0500 @@ -47,6 +47,12 @@ #include "nfsidmap.h" #include "nfsidmap_internal.h" #include "cfg.h" +#include + +static void (*nss_logfunc)(const char *, ...) = NULL; +static int nss_verbose = 0; +#define NSS_LOG(FMT, ...) \ + if (nss_verbose && nss_logfunc) (*nss_logfunc)(FMT, ##__VA_ARGS__) /* * NSS Translation Methods @@ -159,8 +165,11 @@ err = EINVAL; localname = strip_domain(name, domain); - if (localname == NULL) + if (localname == NULL) { + NSS_LOG("nss_getpwnam failed: name '%s' does not map" + " into '%s' domain\n", name, domain); goto err_free_buf; + } err = getpwnam_r(localname, &buf->pwbuf, buf->buf, buflen, &pw); free(localname); @@ -168,6 +177,9 @@ *err_p = 0; return &buf->pwbuf; } + NSS_LOG("nss_getpwnam failed: name '%s' not found in '%s' domain\n", + localname, domain); + err_free_buf: free(buf); err: @@ -259,6 +271,12 @@ return ret; } +void nss_set_debug(int verbose, void (*logger)(const char *, ...)) +{ + if (logger) + nss_logfunc = logger; + nss_verbose = verbose; +} struct trans_func nss_trans = { .name = "nsswitch", @@ -269,4 +287,5 @@ .uid_to_name = nss_uid_to_name, .gid_to_name = nss_gid_to_name, .gss_princ_to_grouplist = nss_gss_princ_to_grouplist, + .set_debug = nss_set_debug, }; --- libnfsidmap-0.12/nfsidmap.h.orig 2004-11-14 19:03:05.000000000 -0500 +++ libnfsidmap-0.12/nfsidmap.h 2006-01-19 15:19:01.391867000 -0500 @@ -46,3 +46,4 @@ int nfs4_name_to_gid(char *name, gid_t *gid); int nfs4_gss_princ_to_ids(char *secname, char *princ, uid_t *uid, gid_t *gid); int nfs4_gss_princ_to_grouplist(char *secname, char *princ, gid_t *groups, int *ngroups); +void nfs4_set_debug(int verbose, void (*logger)(const char *, ...)); --- libnfsidmap-0.12/libnfsidmap.c.orig 2004-12-16 11:35:02.000000000 -0500 +++ libnfsidmap-0.12/libnfsidmap.c 2006-01-19 17:04:35.044067000 -0500 @@ -45,10 +45,13 @@ #include #include #include +#include +#include #include "nfsidmap.h" #include "nfsidmap_internal.h" #include "cfg.h" + /* forward declarations */ int set_trans_method(char *); @@ -57,6 +60,23 @@ #ifndef PATH_IDMAPDCONF #define PATH_IDMAPDCONF "/etc/idmapd.conf" #endif +static void nfs4_log(const char *fmt, ...) +{ + va_list vp; + + va_start(vp, fmt); + vsyslog(LOG_WARNING, fmt, vp); + va_end(vp); +} +static void (*logfunc)(char *, ...) = nfs4_log; +static int beverbose = 0; + +void nfs4_set_debug(int verbose, void (*logger)(const char *, ...)) +{ + if (logger) + logfunc = logger; + beverbose = verbose; +} static int domain_from_dns(char **domain) { @@ -92,18 +112,26 @@ if (default_domain == NULL) { ret = domain_from_dns(&default_domain); if (ret) { - warnx("unable to determine a default nfsv4 domain; " + (*logfunc)("Unable to determine a default nfsv4 domain; " " consider specifying one in idmapd.conf\n"); return ret; } } + if (beverbose) + (*logfunc)("default domain: %s\n", default_domain); + method = conf_get_str("Translation", "Method"); if (method == NULL) method = "nsswitch"; if (set_trans_method(method) == -1) { - warnx("Error in translation table setup"); + (*logfunc)("Error in translation table setup"); return -1; } + if (beverbose) + (*logfunc)("translation method: %s\n", method); + + if (trans->set_debug) + trans->set_debug(beverbose, logfunc); if (trans->init) { ret = trans->init(); @@ -124,7 +152,7 @@ return default_domain; ret = domain_from_dns(&default_domain); if (ret) { - warnx("unable to determine a default nfsv4 domain; " + (*logfunc)("Unable to determine a default nfsv4 domain; " " consider specifying one in idmapd.conf\n"); default_domain = ""; } --- libnfsidmap-0.12/nfsidmap_internal.h.orig 2004-12-20 12:23:26.000000000 -0500 +++ libnfsidmap-0.12/nfsidmap_internal.h 2006-01-19 15:52:45.110420000 -0500 @@ -46,6 +46,7 @@ int (*uid_to_name)(uid_t uid, char *domain, char *name, size_t len); int (*gid_to_name)(gid_t gid, char *domain, char *name, size_t len); int (*gss_princ_to_grouplist)(char *secname, char *princ, gid_t *groups, int *ngroups); + void (*set_debug)(int verbose, void (*logger)(const char *, ...)); }; typedef enum { Index: nfs-utils-lib.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nfs-utils-lib.spec 6 Jan 2006 22:45:21 -0000 1.1 +++ nfs-utils-lib.spec 20 Jan 2006 13:07:35 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Network File System Support Library Name: nfs-utils-lib Version: 1.0.8 -Release: 1 +Release: 2 URL: http://www.citi.umich.edu/projects/nfsv4/linux/ License: GPL @@ -22,6 +22,8 @@ Requires(pre): /sbin/ldconfig PreReq: libgssapi +Patch1: libnfsidmap-0.12-set_debug.patch + %description Support libaries that are needed by the commands and daemons the nfs-utils rpm. @@ -38,6 +40,9 @@ %prep %setup -c -q -a1 + +%patch1 -p0 + top=`pwd` for dir in %{libs} ; do pushd $dir @@ -126,5 +131,8 @@ %{_libdir}/libnfsidmap.a %changelog +* Thu Jan 19 2006 Steve Dickson 1.0.8-2 +- Added debugging routines to libnfsidmap + * Fri Jan 6 2006 Steve Dickson 1.0.8-1 - Initial commit From fedora-cvs-commits at redhat.com Fri Jan 20 13:52:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 08:52:24 -0500 Subject: rpms/nfs-utils-lib/devel libnfsidmap-0.12-set_debug.patch, 1.1, 1.2 nfs-utils-lib.spec, 1.2, 1.3 Message-ID: <200601201352.k0KDqOo9026748@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils-lib/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26132 Modified Files: libnfsidmap-0.12-set_debug.patch nfs-utils-lib.spec Log Message: Recreated set_debug.patch with the -p argument so procedures are shown Fixed a typo in the make prep rules. libnfsidmap-0.12-set_debug.patch: libnfsidmap.c | 34 +++++++++++++++++++++++++++++++--- nfsidmap.h | 1 + nfsidmap_internal.h | 1 + nss.c | 21 ++++++++++++++++++++- 4 files changed, 53 insertions(+), 4 deletions(-) Index: libnfsidmap-0.12-set_debug.patch =================================================================== RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/libnfsidmap-0.12-set_debug.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libnfsidmap-0.12-set_debug.patch 20 Jan 2006 13:07:35 -0000 1.1 +++ libnfsidmap-0.12-set_debug.patch 20 Jan 2006 13:52:17 -0000 1.2 @@ -1,5 +1,5 @@ ---- libnfsidmap-0.12/nss.c.orig 2005-11-01 10:04:45.000000000 -0500 -+++ libnfsidmap-0.12/nss.c 2006-01-19 17:03:17.515117000 -0500 +--- nfs-utils-lib-1.0.8/libnfsidmap-0.12/nss.c.orig 2005-11-01 10:04:45.000000000 -0500 ++++ nfs-utils-lib-1.0.8/libnfsidmap-0.12/nss.c 2006-01-20 08:41:59.623145000 -0500 @@ -47,6 +47,12 @@ #include "nfsidmap.h" #include "nfsidmap_internal.h" @@ -13,7 +13,7 @@ /* * NSS Translation Methods -@@ -159,8 +165,11 @@ +@@ -159,8 +165,11 @@ static struct passwd *nss_getpwnam(const err = EINVAL; localname = strip_domain(name, domain); @@ -26,7 +26,7 @@ err = getpwnam_r(localname, &buf->pwbuf, buf->buf, buflen, &pw); free(localname); -@@ -168,6 +177,9 @@ +@@ -168,6 +177,9 @@ static struct passwd *nss_getpwnam(const *err_p = 0; return &buf->pwbuf; } @@ -36,7 +36,7 @@ err_free_buf: free(buf); err: -@@ -259,6 +271,12 @@ +@@ -259,6 +271,12 @@ out: return ret; } @@ -49,21 +49,21 @@ struct trans_func nss_trans = { .name = "nsswitch", -@@ -269,4 +287,5 @@ +@@ -269,4 +287,5 @@ struct trans_func nss_trans = { .uid_to_name = nss_uid_to_name, .gid_to_name = nss_gid_to_name, .gss_princ_to_grouplist = nss_gss_princ_to_grouplist, + .set_debug = nss_set_debug, }; ---- libnfsidmap-0.12/nfsidmap.h.orig 2004-11-14 19:03:05.000000000 -0500 -+++ libnfsidmap-0.12/nfsidmap.h 2006-01-19 15:19:01.391867000 -0500 -@@ -46,3 +46,4 @@ +--- nfs-utils-lib-1.0.8/libnfsidmap-0.12/nfsidmap.h.orig 2004-11-14 19:03:05.000000000 -0500 ++++ nfs-utils-lib-1.0.8/libnfsidmap-0.12/nfsidmap.h 2006-01-20 08:41:59.665145000 -0500 +@@ -46,3 +46,4 @@ int nfs4_name_to_uid(char *name, uid_t * int nfs4_name_to_gid(char *name, gid_t *gid); int nfs4_gss_princ_to_ids(char *secname, char *princ, uid_t *uid, gid_t *gid); int nfs4_gss_princ_to_grouplist(char *secname, char *princ, gid_t *groups, int *ngroups); +void nfs4_set_debug(int verbose, void (*logger)(const char *, ...)); ---- libnfsidmap-0.12/libnfsidmap.c.orig 2004-12-16 11:35:02.000000000 -0500 -+++ libnfsidmap-0.12/libnfsidmap.c 2006-01-19 17:04:35.044067000 -0500 +--- nfs-utils-lib-1.0.8/libnfsidmap-0.12/libnfsidmap.c.orig 2004-12-16 11:35:02.000000000 -0500 ++++ nfs-utils-lib-1.0.8/libnfsidmap-0.12/libnfsidmap.c 2006-01-20 08:41:59.672145000 -0500 @@ -45,10 +45,13 @@ #include #include @@ -78,7 +78,7 @@ /* forward declarations */ int set_trans_method(char *); -@@ -57,6 +60,23 @@ +@@ -57,6 +60,23 @@ static char *default_domain; #ifndef PATH_IDMAPDCONF #define PATH_IDMAPDCONF "/etc/idmapd.conf" #endif @@ -102,7 +102,7 @@ static int domain_from_dns(char **domain) { -@@ -92,18 +112,26 @@ +@@ -92,18 +112,26 @@ int nfs4_init_name_mapping(char *conffil if (default_domain == NULL) { ret = domain_from_dns(&default_domain); if (ret) { @@ -131,7 +131,7 @@ if (trans->init) { ret = trans->init(); -@@ -124,7 +152,7 @@ +@@ -124,7 +152,7 @@ char * get_default_domain(void) return default_domain; ret = domain_from_dns(&default_domain); if (ret) { @@ -140,9 +140,9 @@ " consider specifying one in idmapd.conf\n"); default_domain = ""; } ---- libnfsidmap-0.12/nfsidmap_internal.h.orig 2004-12-20 12:23:26.000000000 -0500 -+++ libnfsidmap-0.12/nfsidmap_internal.h 2006-01-19 15:52:45.110420000 -0500 -@@ -46,6 +46,7 @@ +--- nfs-utils-lib-1.0.8/libnfsidmap-0.12/nfsidmap_internal.h.orig 2004-12-20 12:23:26.000000000 -0500 ++++ nfs-utils-lib-1.0.8/libnfsidmap-0.12/nfsidmap_internal.h 2006-01-20 08:41:59.678145000 -0500 +@@ -46,6 +46,7 @@ struct trans_func { int (*uid_to_name)(uid_t uid, char *domain, char *name, size_t len); int (*gid_to_name)(gid_t gid, char *domain, char *name, size_t len); int (*gss_princ_to_grouplist)(char *secname, char *princ, gid_t *groups, int *ngroups); Index: nfs-utils-lib.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils-lib/devel/nfs-utils-lib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nfs-utils-lib.spec 20 Jan 2006 13:07:35 -0000 1.2 +++ nfs-utils-lib.spec 20 Jan 2006 13:52:17 -0000 1.3 @@ -41,8 +41,9 @@ %prep %setup -c -q -a1 -%patch1 -p0 +%patch1 -p1 +%build top=`pwd` for dir in %{libs} ; do pushd $dir @@ -50,7 +51,6 @@ popd done -%build for dir in %{libs} ; do pushd $dir %configure --prefix=$RPM_BUILD_ROOT From fedora-cvs-commits at redhat.com Fri Jan 20 14:37:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 09:37:22 -0500 Subject: rpms/nfs-utils/devel nfs-utils-1.0.8-rc2-nfs4_setdebug.patch, NONE, 1.1 nfs-utils.spec, 1.82, 1.83 Message-ID: <200601201437.k0KEbMwQ019115@cvs.devel.redhat.com> Author: steved Update of /cvs/dist/rpms/nfs-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19049 Modified Files: nfs-utils.spec Added Files: nfs-utils-1.0.8-rc2-nfs4_setdebug.patch Log Message: Added new libnfsidmap call, nfs4_set_debug(), to rpc.idmapd which turns on debugging in the libarary. nfs-utils-1.0.8-rc2-nfs4_setdebug.patch: idmapd.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletion(-) --- NEW FILE nfs-utils-1.0.8-rc2-nfs4_setdebug.patch --- --- nfs-utils-1.0.8-rc2/utils/idmapd/idmapd.c.orig 2005-12-16 00:24:46.000000000 -0500 +++ nfs-utils-1.0.8-rc2/utils/idmapd/idmapd.c 2006-01-20 09:10:58.515833000 -0500 @@ -287,6 +287,7 @@ main(int argc, char **argv) if (stat(conf_path, &sb) == -1 && (errno == ENOENT || errno == EACCES)) { warn("Skipping configuration file \"%s\"", conf_path); + conf_path = NULL; } else { conf_init(); verbose = conf_get_num("General", "Verbosity", 0); @@ -295,7 +296,6 @@ main(int argc, char **argv) strlcpy(pipefsdir, xpipefsdir, sizeof(pipefsdir)); CONF_SAVE(nobodyuser, conf_get_str("Mapping", "Nobody-User")); CONF_SAVE(nobodygroup, conf_get_str("Mapping", "Nobody-Group")); - nfs4_init_name_mapping(conf_path); } while ((opt = getopt(argc, argv, GETOPTSTR)) != -1) @@ -337,6 +337,12 @@ main(int argc, char **argv) errx(1, "Could not find group \"%s\"", nobodygroup); nobodygid = gr->gr_gid; + nfs4_set_debug(verbose, idmapd_warnx); + if (conf_path == NULL) + conf_path = _PATH_IDMAPDCONF; + if (nfs4_init_name_mapping(conf_path)) + errx(1, "Unable to create name to user id mappings."); + if (!fg) mydaemon(0, 0); Index: nfs-utils.spec =================================================================== RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- nfs-utils.spec 16 Jan 2006 13:53:39 -0000 1.82 +++ nfs-utils.spec 20 Jan 2006 14:37:19 -0000 1.83 @@ -1,7 +1,7 @@ Summary: NFS utlilities and supporting daemons for the kernel NFS server. Name: nfs-utils Version: 1.0.8.rc2 -Release: 3.FC5 +Release: 4.FC5 # group all 32bit related archs %define all_32bit_archs i386 i686 athlon @@ -23,6 +23,7 @@ Patch55: nfs-utils-1.0.7-nfsd-ctlbits.patch Patch56: nfs-utils-1.0.8-rc2-Makefileam.patch Patch57: nfs-utils-1.0.8-rc2-innetgr.patch +Patch58: nfs-utils-1.0.8-rc2-nfs4_setdebug.patch Patch100: nfs-utils-1.0.8-compile.patch @@ -43,10 +44,11 @@ Requires: modutils >= 2.4.26-9 BuildPrereq: nfs-utils-lib-devel libevent-devel libgssapi-devel BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2 -BuildRequires: nfs-utils-lib-devel libevent-devel libgssapi-devel +BuildRequires: nfs-utils-lib-devel >= 1.0.8-2 +BuildRequires: libevent-devel libgssapi-devel PreReq: shadow-utils >= 4.0.3-25 PreReq: /sbin/chkconfig /sbin/nologin -PreReq: nfs-utils-lib libevent libgssapi +PreReq: nfs-utils-lib >= 1.0.8-2 libevent libgssapi %description The nfs-utils package provides a daemon for the kernel NFS server and @@ -68,6 +70,7 @@ %patch55 -p1 -b .ctlbits %patch56 -p1 -b .makeam %patch57 -p1 -b .innetgr +%patch58 -p1 -b .setdebug # Do the magic to get things to compile %patch100 -p1 -b .compile @@ -220,6 +223,10 @@ %config /etc/rc.d/init.d/nfslock %changelog +* Fri Jan 20 2006 Steve Dickson 1.0.8.rc2-4.FC5 +- Added new libnfsidmap call, nfs4_set_debug(), to rpc.idmapd + which turns on debugging in the libarary. + * Mon Jan 16 2006 Steve Dickson 1.0.8.rc2-3.FC5 - Added innetgr patch that changes configure scripts to check for the innetgr function. (bz 177899) From fedora-cvs-commits at redhat.com Fri Jan 20 14:46:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 09:46:38 -0500 Subject: rpms/gnome-panel/devel gnome-panel-2.13.5-switch-user.patch, NONE, 1.1 gnome-panel.spec, 1.104, 1.105 Message-ID: <200601201446.k0KEkcxi021383@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20152 Modified Files: gnome-panel.spec Added Files: gnome-panel-2.13.5-switch-user.patch Log Message: Remove switch user gnome-panel-2.13.5-switch-user.patch: panel-logout.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE gnome-panel-2.13.5-switch-user.patch --- --- gnome-panel-2.13.5/gnome-panel/panel-logout.c.switch-user 2006-01-20 09:43:52.000000000 -0500 +++ gnome-panel-2.13.5/gnome-panel/panel-logout.c 2006-01-20 09:44:26.000000000 -0500 @@ -205,10 +205,12 @@ // FIXME set default button logout_dialog->priv->default_response = PANEL_LOGOUT_DIALOG_LOGOUT; +#if 0 //FIXME is gdm running? gtk_dialog_add_button (GTK_DIALOG (logout_dialog), _("_Switch User"), PANEL_LOGOUT_RESPONSE_SWITCH_USER); +#endif gtk_dialog_add_button (GTK_DIALOG (logout_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- gnome-panel.spec 17 Jan 2006 05:28:16 -0000 1.104 +++ gnome-panel.spec 20 Jan 2006 14:46:34 -0000 1.105 @@ -16,7 +16,7 @@ Summary: GNOME panel Name: gnome-panel Version: 2.13.5 -Release: 1 +Release: 2 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2 Source1: redhat-panel-default-setup.entries @@ -59,6 +59,7 @@ Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch Patch4: gnome-panel-2.13.2-rename-system-menu.patch Patch5: gnome-panel-2.12.1-about-fedora.patch +Patch6: gnome-panel-2.13.5-switch-user.patch %description The GNOME panel provides the window list, workspace switcher, menus, and other @@ -84,6 +85,8 @@ %patch2 -p1 -b .speak-to-us-ye-old-wise-fish %patch4 -p1 -b .rename-system-menu %patch5 -p1 -b .about-fedora +%patch6 -p1 -b .switch-user + cp -f %{SOURCE1} gnome-panel/panel-default-setup.entries cp -f %{SOURCE3} gnome-panel/panel-compatibility.schemas @@ -194,6 +197,9 @@ %{_datadir}/gtk-doc %changelog +* Fri Jan 20 2006 Matthias Clasen 2.13.5-2 +- Remove "Switch user" button + * Tue Jan 17 2006 Matthias Clasen 2.13.5-1 - Update to 2.13.5 From fedora-cvs-commits at redhat.com Fri Jan 20 14:51:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 09:51:21 -0500 Subject: rpms/umb-scheme/FC-4 umb-scheme-3.2-define.patch, NONE, 1.1 umb-scheme-3.2-forwarding.patch, NONE, 1.1 umb-scheme-3.2.spec, 1.17, 1.18 Message-ID: <200601201451.k0KEpL5U026797@cvs.devel.redhat.com> Author: mlichvar Update of /cvs/dist/rpms/umb-scheme/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26783 Modified Files: umb-scheme-3.2.spec Added Files: umb-scheme-3.2-define.patch umb-scheme-3.2-forwarding.patch Log Message: - fix crash when "(define name expr)" causes garbage collection - fix forwarding objects, assumption that stack and heap are both in the same half of memory space is changed to more reasonable assumption that objects are at least two byte aligned; that should make umb-scheme usable again (#167017) umb-scheme-3.2-define.patch: compiler.c | 6 +----- 1 files changed, 1 insertion(+), 5 deletions(-) --- NEW FILE umb-scheme-3.2-define.patch --- --- scheme-3.2/compiler.c.orig 2006-01-20 15:11:27.000000000 +0100 +++ scheme-3.2/compiler.c 2006-01-20 15:13:33.000000000 +0100 @@ -147,15 +147,11 @@ { /* Basic form: (define name expr) */ - Object expr ; - if ( Length( form ) != 3 ) { Display_Error("Bad syntax to define in: ", form); } - expr = Third( form ); - if ( !Is_Symbol( name ) ) { Display_Error("Bad syntax to define in: ", form); @@ -191,7 +187,7 @@ Push( Value_Register ); - Push( expr ); + Push( Third( Top( 2 ) ) ); /* expr */ Compile_Object( Top( 1 )); Push( Value_Register ); umb-scheme-3.2-forwarding.patch: architecture.h | 13 ++++--------- portable.h | 23 +---------------------- 2 files changed, 5 insertions(+), 31 deletions(-) --- NEW FILE umb-scheme-3.2-forwarding.patch --- --- scheme-3.2/portable.h.orig 2006-01-19 10:58:00.000000000 +0100 +++ scheme-3.2/portable.h 2006-01-19 10:58:28.000000000 +0100 @@ -57,28 +57,7 @@ #define ALIGNMENT 8 -/* Processors (eg the Alpha) having 64-bit addresses require special casting - in the architecture module. */ - -#if defined(__alpha__) -typedef long int Integral_Pointer; -#else -typedef int Integral_Pointer; -#endif - - -/* NEGATIVE_ADDRESSES is defined to be 1 iff memory addresses have a 1 in the - highest bit; otherwise it is defined to be 0. This is the usual case. */ - -/* IF YOUR MACHINE HAS ADDRESSES WITH 1 IN THE HIGH-ORDER BIT THEN - CHANGE THIS: */ - -#ifdef u3b2 -#define NEGATIVE_ADDRESSES 1 -#else -#define NEGATIVE_ADDRESSES 0 -#endif - +typedef unsigned long Integral_Pointer; /* The following declarations ought not to be necessary for C environments that support the ANSI C Standard. */ --- scheme-3.2/architecture.h.orig 1996-01-21 23:15:48.000000000 +0100 +++ scheme-3.2/architecture.h 2006-01-19 10:58:22.000000000 +0100 @@ -95,16 +95,11 @@ Import Object Move_Object(); Import void Relocate(); -#if NEGATIVE_ADDRESSES - /* NEGATIVE_ADDRESSES defined in portable.h */ -#define Is_Forwarded(o) (((Integral_Pointer) Get_Type(o)) > 0) -#else -#define Is_Forwarded(o) (((Integral_Pointer) Get_Type(o)) < 0) -#endif - -#define Get_Forwarding_Address(o) ((Object) (-((Integral_Pointer) Get_Type(o)))) +#define Is_Forwarded(o) (((Integral_Pointer) Get_Type(o)) & 1) +#define Get_Forwarding_Address(o) \ + ((Object) (((Integral_Pointer) Get_Type(o)) & ~1)) #define Set_Forwarding_Address(old,new) \ - Get_Type(old) = (Scheme_Type) (-((Integral_Pointer)(new))) + Get_Type(old) = (Scheme_Type) ((Integral_Pointer)(new) | 1) /* General */ Import Object Copy_Object(); Index: umb-scheme-3.2.spec =================================================================== RCS file: /cvs/dist/rpms/umb-scheme/FC-4/umb-scheme-3.2.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- umb-scheme-3.2.spec 8 Sep 2005 07:57:29 -0000 1.17 +++ umb-scheme-3.2.spec 20 Jan 2006 14:51:19 -0000 1.18 @@ -1,7 +1,7 @@ Summary: An implementation of the Scheme programming language. Name: umb-scheme Version: 3.2 -Release: 39.fc4 +Release: 39.fc4.1 License: GPL SLIB Group: Development/Languages Source: ftp://ftp.cs.umb.edu/pub/scheme/umb-scheme-3.2.tar.bz2 @@ -15,6 +15,8 @@ Patch5: umb-scheme-3.2-slib2c7.patch Patch6: umb-scheme-3.2-share.patch Patch7: umb-scheme-3.2-vi.patch +Patch8: umb-scheme-3.2-forwarding.patch +Patch9: umb-scheme-3.2-define.patch BuildRoot: %{_tmppath}/umb-scheme-root Prereq: /sbin/install-info BuildPrereq: texinfo @@ -38,6 +40,8 @@ %patch5 -p1 -b .slib2c7 %patch6 -p1 -b .sharepatch %patch7 -p1 -b .vipatch +%patch8 -p1 -b .forwardingpatch +%patch9 -p1 -b .definepatch %build make CFLAGS="$RPM_OPT_FLAGS" @@ -85,6 +89,13 @@ %{_infodir}/umb-scheme.info.gz %changelog +* Fri Jan 20 2006 Miroslav Lichvar 3.2-39.fc4.1 +- fix crash when "(define name expr)" causes garbage collection +- fix forwarding objects, assumption that stack and heap are both in the same + half of memory space is changed to more reasonable assumption that objects + are at least two byte aligned; that should make umb-scheme usable again + (#167017) + * Thu Sep 8 2005 Jindrich Novy 3.2-39.fc4 - don't install slib.info to avoid conflict with slib package From fedora-cvs-commits at redhat.com Fri Jan 20 15:39:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 10:39:05 -0500 Subject: rpms/texinfo/FC-4 texi2pdf.man, NONE, 1.1 texinfo-4.8-zlib.patch, NONE, 1.1 texinfo.spec, 1.26, 1.27 texinfo-4.3-zlib.patch, 1.3, NONE Message-ID: <200601201539.k0KFd50V016587@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/texinfo/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16535 Modified Files: texinfo.spec Added Files: texi2pdf.man texinfo-4.8-zlib.patch Removed Files: texinfo-4.3-zlib.patch Log Message: * Fri Jan 20 2006 Miloslav Trmac - 4.8-8.fc4.1 - Build for FC 4 --- NEW FILE texi2pdf.man --- .TH "texi2pdf" "1" "September 2000" "teTeX" "teTeX" .PP .SH "NAME" texi2pdf \- create a PDF file from a Texinfo file .PP .SH "SYNOPSIS" .PP \fBtexi2pdf\fP [ \fIOPTION\fP\&.\&.\&. ] \fIFILE\fP\&.\&.\&. .PP .SH "DESCRIPTION" .PP \fBtexi2pdf\fP sets the \fBTEX\fP environment variable to \fBpdftex\fP(1) and runs \fBtexi2dvi\fP(1), passing all options to \fBtexi2dvi\fP(1)\&. .PP .SH "OPTIONS" .PP See \fBtexi2dvi\fP(1) for relevant options\&. .PP .SH "ENVIRONMENT" .PP .IP .IP "\fBTEX\fP" set to \fBpdftex\fP(1) by the script .IP .PP .SH "SEE ALSO" .PP \fBpdftex\fP(1), \fBtexi2dvi\fP(1), \fBtexinfo\fP(5)\&. .PP .SH "BUGS" .PP Problems with this script should be reported to the author or to the teTeX list, (mailing list)\&. .PP Problems with \fBtexi2dvi\fP(1) should be reported to Karl Berry, the texinfo maintainer, at (mailing list) .PP .SH "AUTHOR" .PP Written by Thomas Esser \&. .PP This manual page was written by C\&.M\&. Connelly , for the Debian GNU/Linux system\&. It may be used by other distributions without contacting the author\&. Any mistakes or omissions in the manual page are my fault; inquiries about or corrections to this manual page should be directed to me (and not to the primary author)\&. texinfo-4.8-zlib.patch: Makefile.in | 2 +- install-info.c | 46 +++++++++++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 20 deletions(-) --- NEW FILE texinfo-4.8-zlib.patch --- --- texinfo-4.8/util/Makefile.in.zlib 2006-01-16 05:53:28.000000000 +0100 +++ texinfo-4.8/util/Makefile.in 2006-01-16 05:53:45.000000000 +0100 @@ -83,7 +83,7 @@ PROGRAMS = $(bin_PROGRAMS) am_ginstall_info_OBJECTS = install-info.$(OBJEXT) ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS) -ginstall_info_LDADD = $(LDADD) +ginstall_info_LDADD = $(LDADD) -lz am__DEPENDENCIES_1 = ginstall_info_DEPENDENCIES = ../lib/libtxi.a $(am__DEPENDENCIES_1) texindex_SOURCES = texindex.c --- texinfo-4.8/util/install-info.c.zlib 2006-01-16 05:55:00.000000000 +0100 +++ texinfo-4.8/util/install-info.c 2006-01-16 06:03:40.000000000 +0100 @@ -20,6 +20,7 @@ #include "system.h" #include +#include static char *progname = "install-info"; @@ -529,7 +530,7 @@ COMPRESSION_PROGRAM. The compression program is determined by the magic number, not the filename. */ -FILE * +void * open_possibly_compressed_file (char *filename, void (*create_callback) (char *), char **opened_filename, char **compression_program, int *is_pipe) @@ -537,7 +538,7 @@ char *local_opened_filename, *local_compression_program; int nread; char data[4]; - FILE *f; + gzFile *f; /* We let them pass NULL if they don't want this info, but it's easier to always determine it. */ @@ -545,16 +546,16 @@ opened_filename = &local_opened_filename; *opened_filename = filename; - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); if (!f) { *opened_filename = concat (filename, ".gz", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); if (!f) { free (*opened_filename); *opened_filename = concat (filename, ".bz2", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); } #ifdef __MSDOS__ @@ -562,13 +563,13 @@ { free (*opened_filename); *opened_filename = concat (filename, ".igz", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); } if (!f) { free (*opened_filename); *opened_filename = concat (filename, ".inz", ""); - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); } #endif if (!f) @@ -580,7 +581,7 @@ /* And try opening it again. */ free (*opened_filename); *opened_filename = filename; - f = fopen (*opened_filename, FOPEN_RBIN); + f = gzopen (*opened_filename, FOPEN_RBIN); if (!f) pfatal_with_name (filename); } @@ -591,12 +592,12 @@ /* Read first few bytes of file rather than relying on the filename. If the file is shorter than this it can't be usable anyway. */ - nread = fread (data, sizeof (data), 1, f); - if (nread != 1) + nread = gzread (f, data, sizeof (data)); + if (nread != sizeof (data)) { /* Empty files don't set errno, so we get something like "install-info: No error for foo", which is confusing. */ - if (nread == 0) + if (nread >= 0) fatal (_("%s: empty file"), *opened_filename, 0); pfatal_with_name (*opened_filename); } @@ -629,20 +630,22 @@ if (*compression_program) { /* It's compressed, so fclose the file and then open a pipe. */ + FILE *p; char *command = concat (*compression_program," -cd <", *opened_filename); - if (fclose (f) < 0) + if (gzclose (f) < 0) pfatal_with_name (*opened_filename); - f = popen (command, "r"); - if (f) + p = popen (command, "r"); + if (p) *is_pipe = 1; else pfatal_with_name (command); + return p; } else { /* It's a plain file, seek back over the magic bytes. */ - if (fseek (f, 0, 0) < 0) + if (gzseek (f, 0, SEEK_SET) < 0) pfatal_with_name (*opened_filename); -#if O_BINARY +#if 0 && O_BINARY /* Since this is a text file, and we opened it in binary mode, switch back to text mode. */ f = freopen (*opened_filename, "r", f); @@ -667,7 +670,7 @@ char **compression_program) { char *real_name; - FILE *f; + void *f; int pipe_p; int filled = 0; int data_size = 8192; @@ -681,7 +684,12 @@ for (;;) { - int nread = fread (data + filled, 1, data_size - filled, f); + int nread; + + if (pipe_p) + nread = fread (data + filled, 1, data_size - filled, f); + else + nread = gzread (f, data + filled, data_size - filled); if (nread < 0) pfatal_with_name (real_name); if (nread == 0) @@ -703,7 +711,7 @@ if (pipe_p) pclose (f); else - fclose (f); + gzclose (f); *sizep = filled; return data; Index: texinfo.spec =================================================================== RCS file: /cvs/dist/rpms/texinfo/FC-4/texinfo.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- texinfo.spec 14 Oct 2005 09:55:27 -0000 1.26 +++ texinfo.spec 20 Jan 2006 15:39:00 -0000 1.27 @@ -1,13 +1,14 @@ Summary: Tools needed to create Texinfo format documentation files. Name: texinfo Version: 4.8 -Release: 4.1 +Release: 8.fc4.1 License: GPL Group: Applications/Publishing Url: http://www.gnu.org/software/texinfo/ Source0: ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.bz2 Source1: info-dir -Patch1: texinfo-4.3-zlib.patch +Source2: texi2pdf.man +Patch1: texinfo-4.8-zlib.patch Patch2: texinfo-CAN-2005-3011.patch Prereq: /sbin/install-info Prefix: %{_prefix} @@ -37,7 +38,7 @@ # ugly method of doing it (triggers which fire on set intersection would # be better), but it's the best we can do for now. Talk to Erik before # removing this. -Prereq: bash +Prereq: bash %description -n info The GNU project uses the texinfo file format for much of its @@ -54,15 +55,14 @@ %configure make %{?_smp_mflags} -make -C util LIBS=%{_libdir}/libz.a - %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}/sbin -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT pushd ${RPM_BUILD_ROOT} + install -m644 %{SOURCE2} .%{_mandir}/man1/texi2pdf.1 gzip -n -9f .%{_infodir}/*info* gzip -n -9f .%{_mandir}/*/* install -m644 $RPM_SOURCE_DIR/info-dir .%{_infodir}/dir @@ -70,7 +70,6 @@ popd rm -f $RPM_BUILD_ROOT%{_datadir}/texinfo/texinfo.{xsl,dtd} -rm -f $RPM_BUILD_ROOT%{_bindir}/texi2pdf %find_lang %name @@ -78,19 +77,20 @@ rm -rf ${RPM_BUILD_ROOT} %post -/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir || : %preun if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir || : fi %post -n info -/sbin/install-info %{_infodir}/info-stnd.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/info-stnd.info.gz %{_infodir}/dir || : %preun -n info if [ $1 = 0 ]; then - /sbin/install-info --delete %{_infodir}/info-stnd.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/info-stnd.info.gz %{_infodir}/dir \ + || : fi %files -f %{name}.lang @@ -100,16 +100,17 @@ %{_bindir}/makeinfo %{_bindir}/texindex %{_bindir}/texi2dvi +%{_bindir}/texi2pdf %{_datadir}/texinfo %{_infodir}/texinfo* %{_mandir}/man1/makeinfo.1* %{_mandir}/man1/texindex.1* %{_mandir}/man1/texi2dvi.1* +%{_mandir}/man1/texi2pdf.1* %{_mandir}/man5/texinfo.5* %files -n info %defattr(-,root,root) -#%config(missingok) /etc/X11/applnk/Utilities/info.desktop %config(noreplace) %verify(not md5 size mtime) %{_infodir}/dir %{_bindir}/info %{_bindir}/infokey @@ -122,9 +123,28 @@ %{_mandir}/man5/info.5* %changelog -* Fri Oct 14 2005 Tim Waugh 4.8-4.1 +* Fri Jan 20 2006 Miloslav Trmac - 4.8-8.fc4.1 +- Build for FC 4 + +* Mon Jan 16 2006 Miloslav Trmac - 4.8-9 +- Fix handling of bzip2'ed files (#128637) + +* Mon Jan 16 2006 Miloslav Trmac - 4.8-8 +- Ignore scriptlet failures with --excludedocs (#166958) +- Don't link texindex to zlib, don't pretend to link to zlib statically + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Fri Oct 14 2005 Tim Waugh 4.8-7 - Apply patch to fix CAN-2005-3011 (bug #169585). +* Thu Jun 9 2005 Tim Waugh 4.8-6 +- Ship texi2pdf man page, taken from tetex-2.0.2 RPM. + +* Tue Jun 7 2005 Tim Waugh 4.8-5 +- Ship texi2pdf (bug #147271). + * Mon Mar 14 2005 Tim Waugh 4.8-4 - Requires tetex (bug #151075). --- texinfo-4.3-zlib.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 20 15:42:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 10:42:22 -0500 Subject: rpms/evince/devel .cvsignore, 1.19, 1.20 evince.spec, 1.36, 1.37 sources, 1.19, 1.20 Message-ID: <200601201542.k0KFgMmG017270@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/evince/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17237 Modified Files: .cvsignore evince.spec sources Log Message: Update to 0.5.0. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evince/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 26 Aug 2005 16:28:29 -0000 1.19 +++ .cvsignore 20 Jan 2006 15:42:19 -0000 1.20 @@ -1,3 +1 @@ -evince-0.3.4.tar.bz2 -evince-0.4.0.tar.gz -evince-0.4.0.tar.bz2 +evince-0.5.0.tar.bz2 Index: evince.spec =================================================================== RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- evince.spec 10 Dec 2005 16:49:01 -0000 1.36 +++ evince.spec 20 Jan 2006 15:42:19 -0000 1.37 @@ -1,11 +1,11 @@ -%define poppler_version 0.4.0 +%define poppler_version 0.5.0 %define gtk2_version 2.6.0 %define dbus_version 0.60 Summary: Document viewer Name: evince -Version: 0.4.0 -Release: 3.1 +Version: 0.5.0 +Release: 1 License: GPL Group: Applications/Publishing Source0: %{name}-%{version}.tar.bz2 @@ -14,6 +14,8 @@ BuildRequires: poppler-devel >= %{poppler_version} BuildRequires: libgnomeprintui22-devel BuildRequires: libgnomeui-devel +BuildRequires: gnome-vfs2-devel +BuildRequires: libglade2-devel BuildRequires: libtiff-devel BuildRequires: gcc BuildRequires: gcc-c++ @@ -78,6 +80,12 @@ %{_datadir}/omf/evince %changelog +* Fri Jan 20 2006 Kristian H??gsberg 0.5.0-1 +- Update to 0.5.0 release. + +* Tue Dec 13 2005 Kristian H??gsberg 0.4.0-4 +- Added a couple of missing build requires. + * Fri Dec 09 2005 Jesse Keating - 0.4.0-3.1 - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/evince/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 26 Aug 2005 16:28:00 -0000 1.19 +++ sources 20 Jan 2006 15:42:19 -0000 1.20 @@ -1 +1 @@ -cc41e30108bc54a345bd6ca2556ab857 evince-0.4.0.tar.bz2 +9d4507c9370eec37fa96cabf80926f15 evince-0.5.0.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 20 16:17:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 11:17:48 -0500 Subject: rpms/libselinux/devel .cvsignore, 1.100, 1.101 libselinux.spec, 1.178, 1.179 sources, 1.102, 1.103 Message-ID: <200601201617.k0KGHmJl009596@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libselinux/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9344 Modified Files: .cvsignore libselinux.spec sources Log Message: * Fri Jan 20 2006 Dan Walsh 1.29.7-1 - Upgrade to latest from NSA * Merged install-pywrap Makefile patch from Joshua Brindle. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/.cvsignore,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- .cvsignore 18 Jan 2006 16:14:55 -0000 1.100 +++ .cvsignore 20 Jan 2006 16:17:43 -0000 1.101 @@ -74,3 +74,4 @@ libselinux-1.29.4.tgz libselinux-1.29.5.tgz libselinux-1.29.6.tgz +libselinux-1.29.7.tgz Index: libselinux.spec =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/libselinux.spec,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- libselinux.spec 18 Jan 2006 16:16:30 -0000 1.178 +++ libselinux.spec 20 Jan 2006 16:17:43 -0000 1.179 @@ -2,7 +2,7 @@ %define libsetransver 0.1.18-1 Summary: SELinux library and simple utilities Name: libselinux -Version: 1.29.6 +Version: 1.29.7 Release: 1 License: Public domain (uncopyrighted) Group: System Environment/Libraries @@ -108,6 +108,10 @@ %{_libdir}/python2.4/site-packages/selinux.py* %changelog +* Fri Jan 20 2006 Dan Walsh 1.29.7-1 +- Upgrade to latest from NSA + * Merged install-pywrap Makefile patch from Joshua Brindle. + * Wed Jan 18 2006 Dan Walsh 1.29.6-1 - Upgrade to latest from NSA * Merged pywrap Makefile patch from Dan Walsh. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libselinux/devel/sources,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- sources 18 Jan 2006 16:14:55 -0000 1.102 +++ sources 20 Jan 2006 16:17:43 -0000 1.103 @@ -1 +1 @@ -63cfada61ab3182ac76648b7683cc37a libselinux-1.29.6.tgz +880560e5229cbf090b0f4608a5c3b95e libselinux-1.29.7.tgz From fedora-cvs-commits at redhat.com Fri Jan 20 16:27:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 11:27:43 -0500 Subject: rpms/hal/FC-4 hal-0.5.2-translate-to-utf8.patch, 1.1, 1.2 hal.spec, 1.56, 1.57 Message-ID: <200601201627.k0KGRhOQ020455@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/hal/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv20396 Modified Files: hal-0.5.2-translate-to-utf8.patch hal.spec Log Message: - attempt to address unicode encoding issues for floppy disks (bug 144551). hal-0.5.2-translate-to-utf8.patch: 10-storage-policy.fdi | 7 +++++++ 1 files changed, 7 insertions(+) Index: hal-0.5.2-translate-to-utf8.patch =================================================================== RCS file: /cvs/dist/rpms/hal/FC-4/hal-0.5.2-translate-to-utf8.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hal-0.5.2-translate-to-utf8.patch 19 Jan 2006 18:48:09 -0000 1.1 +++ hal-0.5.2-translate-to-utf8.patch 20 Jan 2006 16:27:41 -0000 1.2 @@ -1,5 +1,19 @@ --- hal-0.5.2/fdi/policy/10osvendor/10-storage-policy.fdi.translate-to-utf8 2006-01-19 13:39:51.000000000 -0500 +++ hal-0.5.2/fdi/policy/10osvendor/10-storage-policy.fdi 2006-01-19 13:44:06.000000000 -0500 +@@ -74,12 +74,13 @@ + + + + + auto + floppy ++ true + + + + + auto + zip @@ -130,6 +130,12 @@ false Index: hal.spec =================================================================== RCS file: /cvs/dist/rpms/hal/FC-4/hal.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- hal.spec 19 Jan 2006 18:48:09 -0000 1.56 +++ hal.spec 20 Jan 2006 16:27:41 -0000 1.57 @@ -17,7 +17,7 @@ Summary: Hardware Abstraction Layer Name: hal Version: 0.5.2 -Release: 2.fc4 +Release: 2.fc4.1 URL: http://www.freedesktop.org/Software/hal Source0: %{name}-%{version}.tar.gz License: AFL/GPL @@ -173,6 +173,10 @@ %{_bindir}/hal-device-manager %changelog +* Thu Jan 19 2006 Ray Strode 0.5.2-2.fc4.1 +- attempt to address unicode encoding issues for floppy disks + (bug 144551). + * Thu Jan 19 2006 Ray Strode 0.5.2-2.fc4 - attempt to address unicode encoding issues for thumb drives (bug 144551). From fedora-cvs-commits at redhat.com Fri Jan 20 16:55:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 11:55:52 -0500 Subject: rpms/control-center/devel .cvsignore, 1.32, 1.33 control-center.spec, 1.112, 1.113 sources, 1.35, 1.36 Message-ID: <200601201655.k0KGtqxO009302@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8340 Modified Files: .cvsignore control-center.spec sources Log Message: 2.13.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 17 Jan 2006 05:51:52 -0000 1.32 +++ .cvsignore 20 Jan 2006 16:55:49 -0000 1.33 @@ -5,3 +5,4 @@ control-center-2.13.3.tar.bz2 control-center-2.13.4.tar.bz2 control-center-2.13.5.tar.bz2 +control-center-2.13.5.1.tar.bz2 Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- control-center.spec 17 Jan 2006 14:11:39 -0000 1.112 +++ control-center.spec 20 Jan 2006 16:55:49 -0000 1.113 @@ -20,7 +20,7 @@ Summary: GNOME Control Center. Name: control-center -Version: 2.13.5 +Version: 2.13.5.1 Release: 1 Epoch: 1 License: GPL/LGPL @@ -219,6 +219,9 @@ # (also its headers) %changelog +* Fri Jan 20 2006 Matthias Clasen - 1:2.13.5.1-1 +- Update to 2.13.5.1 + * Tue Jan 17 2006 Matthias Clasen - 1:2.13.5-1 - Update to 2.13.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 17 Jan 2006 05:51:52 -0000 1.35 +++ sources 20 Jan 2006 16:55:49 -0000 1.36 @@ -1 +1 @@ -9e2797c56d6cd4bf96a6114b7f7b18b9 control-center-2.13.5.tar.bz2 +52c8d95f85dee21a152c1a6b4b32721c control-center-2.13.5.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 20 17:25:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 12:25:52 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc1-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.330, 1.331 kernel-2.6.spec, 1.1863, 1.1864 sources, 1.272, 1.273 upstream, 1.248, 1.249 patch-2.6.16-rc1-git1.bz2.sign, 1.1, NONE patch-2.6.16-rc1-git2.bz2.sign, 1.1, NONE Message-ID: <200601201725.k0KHPq9O030723@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30675 Modified Files: .cvsignore kernel-2.6.spec sources upstream Added Files: patch-2.6.16-rc1-git3.bz2.sign Removed Files: patch-2.6.16-rc1-git1.bz2.sign patch-2.6.16-rc1-git2.bz2.sign Log Message: git3 --- NEW FILE patch-2.6.16-rc1-git3.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBD0JrmyGugalF9Dw4RAlFhAJ9ybsD+meJp1wNrHpAgfMMciWH30wCfegpD yhJ080UgVlYoqozAxgrB2us= =0f48 -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.330 retrieving revision 1.331 diff -u -r1.330 -r1.331 --- .cvsignore 19 Jan 2006 22:08:18 -0000 1.330 +++ .cvsignore 20 Jan 2006 17:25:49 -0000 1.331 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc1.bz2 bcm43xx-20060114.tar.bz2 -patch-2.6.16-rc1-git2.bz2 +patch-2.6.16-rc1-git3.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1863 retrieving revision 1.1864 diff -u -r1.1863 -r1.1864 --- kernel-2.6.spec 20 Jan 2006 00:07:05 -0000 1.1863 +++ kernel-2.6.spec 20 Jan 2006 17:25:49 -0000 1.1864 @@ -208,7 +208,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc1.bz2 -Patch2: patch-2.6.16-rc1-git2.bz2 +Patch2: patch-2.6.16-rc1-git3.bz2 Patch3: drm.patch # Patches 100 through 500 are meant for architecture patches @@ -1343,7 +1343,10 @@ %endif %changelog -* Thu Jan 19 2006 Dave Jones +* Fri Jan 20 2006 Dave Jones +- 2.6.16-rc1-git3 + +-* Thu Jan 19 2006 Dave Jones - 2.6.16-rc1-git2 - Fix IA64 unresolved symbols. Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- sources 19 Jan 2006 22:08:20 -0000 1.272 +++ sources 20 Jan 2006 17:25:50 -0000 1.273 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2 ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 -b88c7585bed8b514d7016ad07bb93fa7 patch-2.6.16-rc1-git2.bz2 +aa30f390f4c6a5e2a6cc32142f46ccd6 patch-2.6.16-rc1-git3.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- upstream 19 Jan 2006 22:08:20 -0000 1.248 +++ upstream 20 Jan 2006 17:25:50 -0000 1.249 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc1.bz2 -patch-2.6.16-rc1-git2.bz2 +patch-2.6.16-rc1-git3.bz2 --- patch-2.6.16-rc1-git1.bz2.sign DELETED --- --- patch-2.6.16-rc1-git2.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 20 17:58:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 12:58:15 -0500 Subject: rpms/kbd/devel kbd.spec,1.26,1.27 keytable.init,1.4,NONE Message-ID: <200601201758.k0KHwFEi016412@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/kbd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16348 Modified Files: kbd.spec Removed Files: keytable.init Log Message: * Fri Jan 20 2006 Miloslav Trmac - 1.12-13 - Fix build with new coreutils - Hardcode paths in unicode_start to avoid a few file lookups (#178329) - Drop unnecessary Prereq: sed mktemp Index: kbd.spec =================================================================== RCS file: /cvs/dist/rpms/kbd/devel/kbd.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- kbd.spec 9 Dec 2005 22:41:07 -0000 1.26 +++ kbd.spec 20 Jan 2006 17:58:10 -0000 1.27 @@ -1,15 +1,14 @@ Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Name: kbd Version: 1.12 -Release: 12.1 +Release: 13 License: GPL Group: System Environment/Base Source0: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2 Source1: ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2.sign Source2: kbdrate.apps Source3: kbdrate.pam -Source4: keytable.init -Source5: kbd-latsun-fonts.tar.bz2 +Source4: kbd-latsun-fonts.tar.bz2 Requires: pam >= 0.66-4, /etc/pam.d/system-auth, usermode BuildRoot: %{_tmppath}/%{name}-root Patch0: kbd-1.08-sparc.patch @@ -25,7 +24,7 @@ Obsoletes: console-tools Provides: console-tools Conflicts: util-linux < 2.11r-9 -Prereq: sed mktemp initscripts >= 5.86-1 +Prereq: initscripts >= 5.86-1 ExcludeArch: s390 s390x %description @@ -35,7 +34,7 @@ %prep -%setup -q -a 5 +%setup -q -a 4 %patch0 -p1 -b .sparc %patch1 -p1 %patch2 -p1 -b .terminal @@ -69,7 +68,7 @@ # We don't use % {configure} because the ./configure included here does not # understand most of the options. CFLAGS="$RPM_OPT_FLAGS"; export CFLAGS -./configure --prefix=/ --datadir=/lib/kbd --mandir=%{_mandir} +./configure --prefix=%{_prefix} --datadir=/lib/kbd --mandir=%{_mandir} # Override CFLAGS because this configure ignores them anyway, and LDFLAGS # because it defaults to -s, but that's a build policy decision. @@ -79,29 +78,27 @@ rm -rf $RPM_BUILD_ROOT # Basic install. -make install \ - BINDIR=$RPM_BUILD_ROOT/%{_bindir} \ - LOADKEYS_BINDIR=$RPM_BUILD_ROOT/bin \ - MANDIR=$RPM_BUILD_ROOT/%{_mandir} \ - datadir=$RPM_BUILD_ROOT/lib/kbd \ - DATADIR=$RPM_BUILD_ROOT/lib/kbd \ - gnulocaledir=$RPM_BUILD_ROOT/%{_datadir}/locale \ - localedir=$RPM_BUILD_ROOT/%{_datadir}/locale +make install DESTDIR=$RPM_BUILD_ROOT # Move binaries which we use before /usr is mounted from %{_bindir} to /bin. for binary in setfont dumpkeys kbd_mode unicode_start unicode_stop ; do mv $RPM_BUILD_ROOT%{_bindir}/$binary $RPM_BUILD_ROOT/bin done +# Some microoptimization +sed -i -e 's,\,/bin/kbd_mode,g;s,\,/bin/setfont,g' \ + $RPM_BUILD_ROOT/bin/unicode_start + + # Set up kbdrate to be userhelpered. mkdir -p $RPM_BUILD_ROOT%{_sbindir} mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d mv $RPM_BUILD_ROOT%{_bindir}/kbdrate $RPM_BUILD_ROOT%{_sbindir} ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/kbdrate -install -c -m644 $RPM_SOURCE_DIR/kbdrate.apps \ +install -c -m644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/kbdrate -install -c -m644 $RPM_SOURCE_DIR/kbdrate.pam \ +install -c -m644 %{SOURCE3} \ $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/kbdrate %find_lang %{name} @@ -124,6 +121,11 @@ %config %{_sysconfdir}/pam.d/* %changelog +* Fri Jan 20 2006 Miloslav Trmac - 1.12-13 +- Fix build with new coreutils +- Hardcode paths in unicode_start to avoid a few file lookups (#178329) +- Drop unnecessary Prereq: sed mktemp + * Fri Dec 09 2005 Jesse Keating - rebuilt --- keytable.init DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 20 18:12:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 13:12:46 -0500 Subject: rpms/avahi/devel avahi-0.6.3-lockfile.patch, NONE, 1.1 avahi.spec, 1.30, 1.31 Message-ID: <200601201812.k0KICk05020001@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19895 Modified Files: avahi.spec Added Files: avahi-0.6.3-lockfile.patch Log Message: - fix subsystem locking so this doesn't run on every runlevel change, etc. avahi-0.6.3-lockfile.patch: avahi-daemon.in | 20 ++++++++++++-------- avahi-dnsconfd.in | 17 +++++++++++++---- 2 files changed, 25 insertions(+), 12 deletions(-) --- NEW FILE avahi-0.6.3-lockfile.patch --- --- avahi-0.6.3/initscript/fedora/avahi-dnsconfd.in.lockfile 2006-01-19 09:53:11.000000000 -0500 +++ avahi-0.6.3/initscript/fedora/avahi-dnsconfd.in 2006-01-19 09:59:20.000000000 -0500 @@ -23,11 +23,18 @@ AVAHI_BIN=@sbindir@/avahi-dnsconfd test -x $AVAHI_BIN || exit 5 +LOCKFILE=/var/lock/subsys/avahi-daemon + start() { echo -n $"Starting Avahi DNS daemon... " $AVAHI_BIN -D RETVAL=$? - [ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup" + if [ $RETVAL = 0 ]; then + touch $LOCKFILE + success $"$base startup" + else + failure $"$base startup" + fi echo return $RETVAL } @@ -36,6 +43,8 @@ echo -n "Shutting down Avahi DNS daemon: " $AVAHI_BIN -k RETVAL=$? + [ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown" + rm -f $LOCKFILE echo return $RETVAL } @@ -76,9 +85,9 @@ reload ;; condrestart) - $AVAHI_BIN -c - [ $? = 0 ] && restart || : - ;; + if [ -f $LOCKFILE ]; then + restart + fi *) echo $"Usage: $0 {start|stop|status|restart|condrestart}" exit 1 --- avahi-0.6.3/initscript/fedora/avahi-daemon.in.lockfile 2006-01-19 09:53:05.000000000 -0500 +++ avahi-0.6.3/initscript/fedora/avahi-daemon.in 2006-01-19 09:59:20.000000000 -0500 @@ -23,18 +23,20 @@ AVAHI_BIN=@sbindir@/avahi-daemon test -x $AVAHI_BIN || exit 5 +LOCKFILE=/var/lock/subsys/avahi-daemon + base=${0##*/} start() { echo -n $"Starting Avahi daemon... " - if [ -f /var/run/avahi-daemon/pid ] && avpid=`cat /var/run/avahi-daemon/pid` && [ -d /proc/$avpid ] && [ `readlink /proc/$avpid/exe` = '/usr/sbin/avahi-daemon' ]; then - success; - echo; - return 0; - fi; $AVAHI_BIN -D RETVAL=$? - [ $RETVAL = 0 ] && success $"$base startup" || failure $"$base startup" + if [ $RETVAL = 0 ]; then + touch $LOCKFILE + success $"$base startup" + else + failure $"$base startup" + fi echo return $RETVAL } @@ -44,6 +46,7 @@ $AVAHI_BIN -k RETVAL=$? [ $RETVAL = 0 ] && success $"$base shutdown" || failure $"$base shutdown" + rm -f $LOCKFILE echo return $RETVAL } @@ -83,8 +86,9 @@ reload ;; condrestart) - $AVAHI_BIN -c - [ $? = 0 ] && restart || : + if [ -f $LOCKFILE ]; then + restart + fi ;; *) echo $"Usage: $0 {start|stop|status|restart|condrestart}" Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- avahi.spec 19 Jan 2006 21:51:13 -0000 1.30 +++ avahi.spec 20 Jan 2006 18:12:43 -0000 1.31 @@ -4,7 +4,7 @@ %endif Name: avahi Version: 0.6.4 -Release: 2 +Release: 3 Summary: Local network service discovery Group: System Environment/Base License: LGPL @@ -25,6 +25,7 @@ # enable mono's mcs to work in beehive buildroot: Patch6: avahi-0.6.3-MONO_SHARED_DIR.patch Patch7: avahi-0.6.4-initscript-i18n.patch +Patch8: avahi-0.6.3-lockfile.patch %description Avahi is a system which facilitates service discovery on @@ -120,6 +121,7 @@ %patch6 -p1 -b .MONO_SHARED_DIR %endif %patch7 -p1 -b .i18n +%patch8 -p1 -b .lockfile %build # auto* update needed for avahi-0.5.2-fedora.patch @@ -285,6 +287,9 @@ %endif %changelog +* Fri Jan 20 2006 Peter Jones - 0.6.4-3 +- fix subsystem locking in the initscript + * Thu Jan 19 2006 Jason Vas Dias - 0.6.4-2 - fix bug 178127: fully localize the initscript From fedora-cvs-commits at redhat.com Fri Jan 20 18:13:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 13:13:08 -0500 Subject: rpms/totem/devel .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 totem.spec, 1.46, 1.47 Message-ID: <200601201813.k0KID8Xe020114@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20063 Modified Files: .cvsignore sources totem.spec Log Message: 1.3.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/totem/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 21 Dec 2005 03:35:08 -0000 1.16 +++ .cvsignore 20 Jan 2006 18:13:04 -0000 1.17 @@ -10,3 +10,4 @@ totem-1.2.0.tar.bz2 totem-1.2.1.tar.bz2 totem-1.3.0.tar.bz2 +totem-1.3.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/totem/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 21 Dec 2005 03:35:08 -0000 1.16 +++ sources 20 Jan 2006 18:13:04 -0000 1.17 @@ -1 +1 @@ -185c086e0d8eb265d31a7f35fcad11df totem-1.3.0.tar.bz2 +3201390ea4a74027e8bab32fa383f4e4 totem-1.3.1.tar.bz2 Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- totem.spec 6 Jan 2006 22:39:18 -0000 1.46 +++ totem.spec 20 Jan 2006 18:13:04 -0000 1.47 @@ -4,8 +4,8 @@ Summary: Movie player for GNOME 2 Name: totem -Version: 1.3.0 -Release: 3 +Version: 1.3.1 +Release: 1 License: GPL Group: Applications/Multimedia URL: http://www.hadess.net/totem.php3 @@ -136,6 +136,9 @@ %{_libdir}/*so %changelog +* Fri Jan 20 2006 Matthias Clasen - 1.3.1-1 +- Update to 1.3.1 + * Fri Jan 06 2006 John (J5) Palmieri 1.3.0-3 - Build with gstreamer 0.10 - Enable the mozilla plugin From fedora-cvs-commits at redhat.com Fri Jan 20 18:35:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 13:35:32 -0500 Subject: rpms/epiphany/devel .cvsignore, 1.32, 1.33 epiphany.spec, 1.77, 1.78 sources, 1.32, 1.33 Message-ID: <200601201835.k0KIZWFp007437@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/epiphany/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7411 Modified Files: .cvsignore epiphany.spec sources Log Message: 1.9.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 2 Jan 2006 17:36:52 -0000 1.32 +++ .cvsignore 20 Jan 2006 18:35:28 -0000 1.33 @@ -19,3 +19,4 @@ epiphany-1.9.2.tar.bz2 epiphany-1.9.3.1.tar.bz2 epiphany-1.9.4.tar.bz2 +epiphany-1.9.5.1.tar.bz2 Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- epiphany.spec 2 Jan 2006 17:36:52 -0000 1.77 +++ epiphany.spec 20 Jan 2006 18:35:28 -0000 1.78 @@ -9,7 +9,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany -Version: 1.9.4 +Version: 1.9.5.1 Release: 1 License: GPL Group: Applications/Internet @@ -124,6 +124,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Fri Jan 20 2006 Matthias Clasen 1.9.5.1-1 +- Update to 1.9.5.1 + * Mon Jan 2 2006 Christopher Aillon 1.9.4-1 - Update to 1.9.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 2 Jan 2006 17:36:52 -0000 1.32 +++ sources 20 Jan 2006 18:35:28 -0000 1.33 @@ -1 +1 @@ -186d211a155a7706abe13514eb84c311 epiphany-1.9.4.tar.bz2 +c3552c387129d44d1aa2cce507d15f21 epiphany-1.9.5.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 20 18:44:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 13:44:44 -0500 Subject: rpms/epiphany/devel epiphany.spec,1.78,1.79 Message-ID: <200601201844.k0KIiiXX010432@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/epiphany/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10385 Modified Files: epiphany.spec Log Message: Fix file lists Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- epiphany.spec 20 Jan 2006 18:35:28 -0000 1.78 +++ epiphany.spec 20 Jan 2006 18:44:39 -0000 1.79 @@ -106,14 +106,12 @@ %{_sysconfdir}/gconf/schemas/* %{_bindir}/epiphany %{_libdir}/epiphany -%{_libdir}/bonobo/servers/* %{_datadir}/applications/*.desktop %{_datadir}/epiphany %{_datadir}/gnome/help/epiphany %{_datadir}/man/man*/* %{_datadir}/omf/epiphany %{_datadir}/pixmaps/*png -%{_datadir}/application-registry/epiphany.applications %files devel %defattr(-, root, root) From fedora-cvs-commits at redhat.com Fri Jan 20 18:45:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 13:45:50 -0500 Subject: rpms/fedora-logos/devel .cvsignore, 1.21, 1.22 fedora-logos.spec, 1.23, 1.24 sources, 1.22, 1.23 Message-ID: <200601201845.k0KIjoS4011941@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/fedora-logos/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11025 Modified Files: .cvsignore fedora-logos.spec sources Log Message: - update the logo in the corner Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 19 Jan 2006 21:41:34 -0000 1.21 +++ .cvsignore 20 Jan 2006 18:45:47 -0000 1.22 @@ -1 +1 @@ -fedora-logos-1.1.39.tar.bz2 +fedora-logos-1.1.40.tar.bz2 Index: fedora-logos.spec =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- fedora-logos.spec 19 Jan 2006 21:41:34 -0000 1.23 +++ fedora-logos.spec 20 Jan 2006 18:45:48 -0000 1.24 @@ -1,6 +1,6 @@ Name: fedora-logos Summary: Red Hat-related icons and pictures. -Version: 1.1.39 +Version: 1.1.40 Release: 1 Group: System Environment/Base Source0: fedora-logos-%{version}.tar.bz2 @@ -135,6 +135,9 @@ # end i386 bits %changelog +* Fri Jan 20 2006 Ray Strode - 1.1.40-1 +- update the logo in the corner + * Thu Jan 19 2006 Ray Strode - 1.1.39-1 - give rhgb a new look from Diana Fong Index: sources =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 19 Jan 2006 21:41:34 -0000 1.22 +++ sources 20 Jan 2006 18:45:48 -0000 1.23 @@ -1 +1 @@ -03bd2590527151ddc3e85d54efd119b2 fedora-logos-1.1.39.tar.bz2 +23a11e9d8880990f7b8084e68b8f479e fedora-logos-1.1.40.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 20 18:47:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 13:47:25 -0500 Subject: rpms/rhgb/devel rhgb.spec,1.44,1.45 Message-ID: <200601201847.k0KIlPPL018256@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/rhgb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18092 Modified Files: rhgb.spec Log Message: - update the logo in the corner Index: rhgb.spec =================================================================== RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- rhgb.spec 19 Jan 2006 21:52:16 -0000 1.44 +++ rhgb.spec 20 Jan 2006 18:47:21 -0000 1.45 @@ -3,7 +3,7 @@ Summary: Red Hat Graphical Boot Name: rhgb Version: 0.16.2 -Release: 19 +Release: 20 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL @@ -14,7 +14,7 @@ BuildRequires: gettext BuildRequires: libxf86config-devel >= 1.0.0-3 Requires: initscripts >= 7.22-1 -Requires: fedora-logos >= 1.1.39-1 +Requires: fedora-logos >= 1.1.40-1 Patch0: rhgb-0.16.2-reap-child.patch Patch1: rhgb-0.16.2-init-utf8.patch @@ -68,6 +68,9 @@ %doc doc/HOW_IT_WORKS %changelog +* Fri Jan 20 2006 Ray Strode 0.16.2-20 +- update the logo in the corner + * Thu Jan 19 2006 Ray Strode 0.16.2-19 - change color scheme and use new images by Diana Fong From fedora-cvs-commits at redhat.com Fri Jan 20 19:32:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 14:32:59 -0500 Subject: rpms/epiphany/devel epiphany.spec,1.79,1.80 Message-ID: <200601201932.k0KJWxQX018258@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/epiphany/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18233 Modified Files: epiphany.spec Log Message: Fix file lists some more Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- epiphany.spec 20 Jan 2006 18:44:39 -0000 1.79 +++ epiphany.spec 20 Jan 2006 19:32:56 -0000 1.80 @@ -112,6 +112,8 @@ %{_datadir}/man/man*/* %{_datadir}/omf/epiphany %{_datadir}/pixmaps/*png +%{_datadir}/pixmaps/*png +%{_datadir}/dbus-1/services/org.gnome.Epiphany.service %files devel %defattr(-, root, root) From fedora-cvs-commits at redhat.com Fri Jan 20 20:18:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 15:18:23 -0500 Subject: rpms/pirut/devel .cvsignore, 1.4, 1.5 pirut.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200601202018.k0KKIND7016388@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/pirut/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16252/devel Modified Files: .cvsignore pirut.spec sources Log Message: auto-import pirut-0.9.5-1 on branch devel from pirut-0.9.5-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 14 Jan 2006 21:25:49 -0000 1.4 +++ .cvsignore 20 Jan 2006 20:18:18 -0000 1.5 @@ -1 +1 @@ -pirut-0.9.4.tar.gz +pirut-0.9.5.tar.gz Index: pirut.spec =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/pirut.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pirut.spec 14 Jan 2006 21:25:49 -0000 1.4 +++ pirut.spec 20 Jan 2006 20:18:18 -0000 1.5 @@ -2,7 +2,7 @@ Summary: Package Installation, Removal and Update Tools Name: pirut -Version: 0.9.4 +Version: 0.9.5 Release: 1 License: GPL Group: Applications/System @@ -10,6 +10,8 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: pygtk2, pygtk2-libglade, yum >= 2.5.1 +Requires(post): desktop-file-utils >= 0.8 +Requires(postun): desktop-file-utils >= 0.8 Obsoletes: system-config-packages, redhat-config-packages, pup BuildArch: noarch @@ -31,6 +33,12 @@ %clean rm -rf $RPM_BUILD_ROOT +%post +/usr/bin/update-desktop-database %{_datadir}/applications + +%postun +/usr/bin/update-desktop-database %{_datadir}/applications + %files %defattr(-,root,root,-) @@ -54,6 +62,17 @@ %changelog +* Fri Jan 20 2006 Jeremy Katz - 0.9.5-1 +- Fix a traceback (#177826) +- "Reboot later" instead of "Cancel" (#177909) +- Fix traceback for not importing pango (#177973) +- Add new system-install-packages + +* Sat Jan 14 2006 Jeremy Katz - 0.9.4-1 +- add pup here +- fix file logging +- dialog to say that updates/installs completed successfully + * Mon Jan 9 2006 Jeremy Katz - 0.9.2-1 - noarch - actually add the __init__.py Index: sources =================================================================== RCS file: /cvs/dist/rpms/pirut/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 14 Jan 2006 21:25:49 -0000 1.4 +++ sources 20 Jan 2006 20:18:18 -0000 1.5 @@ -1 +1 @@ -271dd45be0188fc8948b561f140db1a6 pirut-0.9.4.tar.gz +4d9b89013fe0638499df6ea1f4ce8057 pirut-0.9.5.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 20 20:28:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 15:28:54 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.46, 1.47 libsemanage.spec, 1.66, 1.67 sources, 1.48, 1.49 Message-ID: <200601202028.k0KKSs06024282@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24254 Modified Files: .cvsignore libsemanage.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- .cvsignore 18 Jan 2006 16:29:44 -0000 1.46 +++ .cvsignore 20 Jan 2006 20:28:52 -0000 1.47 @@ -49,3 +49,4 @@ libsemanage-1.5.11.tgz libsemanage-1.5.14.tgz libsemanage-1.5.15.tgz +libsemanage-1.5.16.tgz Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- libsemanage.spec 18 Jan 2006 16:29:44 -0000 1.66 +++ libsemanage.spec 20 Jan 2006 20:28:52 -0000 1.67 @@ -2,7 +2,7 @@ %define libselinuxver 1.29.6-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.5.15 +Version: 1.5.16 Release: 1 License: GPL Group: System Environment/Libraries @@ -76,6 +76,10 @@ %changelog +* Fri Jan 13 2006 Dan Walsh 1.5.16-1 +- Upgrade to latest from NSA + * Regenerate python wrappers. + * Fri Jan 13 2006 Dan Walsh 1.5.15-1 - Upgrade to latest from NSA * Merged pywrap Makefile diff from Dan Walsh. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- sources 18 Jan 2006 16:29:44 -0000 1.48 +++ sources 20 Jan 2006 20:28:52 -0000 1.49 @@ -1 +1 @@ -9242b303cb348fee508ad3f3d827db4d libsemanage-1.5.15.tgz +fa20e01bfeec864dcca040f188ea489b libsemanage-1.5.16.tgz From fedora-cvs-commits at redhat.com Fri Jan 20 20:48:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 15:48:28 -0500 Subject: rpms/eclipse-bugzilla/FC-4 .cvsignore, 1.2, 1.3 eclipse-bugzilla.spec, 1.17, 1.18 sources, 1.10, 1.11 Message-ID: <200601202048.k0KKmRKB009258@cvs.devel.redhat.com> Author: ifoox Update of /cvs/dist/rpms/eclipse-bugzilla/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv9226 Modified Files: .cvsignore eclipse-bugzilla.spec sources Log Message: * Fri Jan 20 2006 Igor Foox 0.1.2-1 - Various bug fixes and small enhancements. - Changing release to be numerical instead of _fcX. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eclipse-bugzilla/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2005 20:06:02 -0000 1.2 +++ .cvsignore 20 Jan 2006 20:48:23 -0000 1.3 @@ -1 +1 @@ -eclipse-bugzilla.tar.gz +eclipse-bugzilla-fetched-HEAD-0.1.2.tar.gz Index: eclipse-bugzilla.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-bugzilla/FC-4/eclipse-bugzilla.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- eclipse-bugzilla.spec 18 May 2005 18:17:43 -0000 1.17 +++ eclipse-bugzilla.spec 20 Jan 2006 20:48:23 -0000 1.18 @@ -1,16 +1,16 @@ Epoch: 1 ExclusiveArch: i386 ppc x86_64 -%define gcj_support 1 +%define gcj_support 1 %define pkg_summary Eclipse Bugzilla plug-in %define section free -%define eclipse_name eclipse +%define eclipse_name eclipse %define version_major 0 %define version_minor 1 -%define version_majmin %{version_major}.%{version_minor} -%define version_micro 0 -%define eclipse_base %{_datadir}/%{eclipse_name} -%define eclipse_lib_base %{_libdir}/%{eclipse_name} +%define version_majmin %{version_major}.%{version_minor} +%define version_micro 2 +%define eclipse_base %{_datadir}/%{eclipse_name} +%define eclipse_lib_base %{_libdir}/%{eclipse_name} # All arches line up except i386 -> x86 %ifarch %{ix86} @@ -21,8 +21,8 @@ Summary: %{pkg_summary} Name: %{eclipse_name}-bugzilla -Version: %{version_majmin}.%{version_micro}_fc -Release: 16 +Version: %{version_majmin}.%{version_micro} +Release: 1 License: Common Public License v1.0 Group: Text Editors/Integrated Development Environments (IDE) #URL: @@ -31,11 +31,16 @@ # Note that following the Eclipse Releng process we do not distribute a # real .tar.gz file. Instead, you must build it by hand. The way to do # this is to check out org.eclipse.team.bugzilla.releng. Edit maps/bugzilla.map -# to refer to the# tag appropriate to the release. Then run the "fetch" +# to refer to the tag appropriate to the release. Then run the "fetch" # target to fetch everything. Package this up, such that the tar # file unpacks a new "org.eclipse.team.bugzilla.releng" directory with all the -# contents. See the java command to see how to invoke -# things in the releng build.xml. +# contents. +# Here's an example of how to invoke that command: +# java -cp /usr/share/eclipse/startup.jar -Duser.home=/tmp/buildhome +# org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner +# -buildfile build.xml -Dbasedir=`pwd` +# -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build_3.1.0/scripts/ +# -DdontUnzip=true fetch Source0: eclipse-bugzilla.tar.gz @@ -178,6 +183,10 @@ %endif %changelog +* Fri Jan 20 2006 Igor Foox 0.1.2-1 +- Various bug fixes and small enhancements. +- Changing release to be numerical instead of _fcX. + * Wed May 18 2005 Jeff Pound 0.1.0_fc-16 - Fix bug in query option parser (see comment 1 from bz#151443). - Parse icons from bugzilla sites (bz#151441). Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-bugzilla/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 18 May 2005 18:17:43 -0000 1.10 +++ sources 20 Jan 2006 20:48:23 -0000 1.11 @@ -1 +1 @@ -1b44560cdb6da791b170f3bb60771faf eclipse-bugzilla.tar.gz +d0f88e3c4f0b5d0a075380cf1580e7e9 eclipse-bugzilla-fetched-HEAD-0.1.2.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 20 20:54:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 15:54:18 -0500 Subject: rpms/eclipse-bugzilla/FC-4 .cvsignore, 1.3, 1.4 eclipse-bugzilla.spec, 1.18, 1.19 sources, 1.11, 1.12 Message-ID: <200601202054.k0KKsI0p011542@cvs.devel.redhat.com> Author: ifoox Update of /cvs/dist/rpms/eclipse-bugzilla/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv11514 Modified Files: .cvsignore eclipse-bugzilla.spec sources Log Message: Fixed problem with source file name. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eclipse-bugzilla/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Jan 2006 20:48:23 -0000 1.3 +++ .cvsignore 20 Jan 2006 20:54:15 -0000 1.4 @@ -1 +1 @@ -eclipse-bugzilla-fetched-HEAD-0.1.2.tar.gz +eclipse-bugzilla-fetched-0.1.2.tar.gz Index: eclipse-bugzilla.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-bugzilla/FC-4/eclipse-bugzilla.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- eclipse-bugzilla.spec 20 Jan 2006 20:48:23 -0000 1.18 +++ eclipse-bugzilla.spec 20 Jan 2006 20:54:15 -0000 1.19 @@ -42,7 +42,7 @@ # -Dpde.build.scripts=/usr/share/eclipse/plugins/org.eclipse.pde.build_3.1.0/scripts/ # -DdontUnzip=true fetch -Source0: eclipse-bugzilla.tar.gz +Source0: eclipse-bugzilla-fetched-%{version}.tar.gz BuildRequires: eclipse-platform BuildRequires: eclipse-jdt @@ -186,6 +186,7 @@ * Fri Jan 20 2006 Igor Foox 0.1.2-1 - Various bug fixes and small enhancements. - Changing release to be numerical instead of _fcX. +- Changed source file name to eclipse-bugzilla-fetched-version.tar.gz. * Wed May 18 2005 Jeff Pound 0.1.0_fc-16 - Fix bug in query option parser (see comment 1 from bz#151443). Index: sources =================================================================== RCS file: /cvs/dist/rpms/eclipse-bugzilla/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 20 Jan 2006 20:48:23 -0000 1.11 +++ sources 20 Jan 2006 20:54:15 -0000 1.12 @@ -1 +1 @@ -d0f88e3c4f0b5d0a075380cf1580e7e9 eclipse-bugzilla-fetched-HEAD-0.1.2.tar.gz +d0f88e3c4f0b5d0a075380cf1580e7e9 eclipse-bugzilla-fetched-0.1.2.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 20 21:09:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 16:09:01 -0500 Subject: rpms/eclipse-bugzilla/FC-4 eclipse-bugzilla.spec,1.19,1.20 Message-ID: <200601202109.k0KL91X9015744@cvs.devel.redhat.com> Author: ifoox Update of /cvs/dist/rpms/eclipse-bugzilla/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv15712 Modified Files: eclipse-bugzilla.spec Log Message: - Fixed files section to point to gcj-4.0.2. Index: eclipse-bugzilla.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse-bugzilla/FC-4/eclipse-bugzilla.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- eclipse-bugzilla.spec 20 Jan 2006 20:54:15 -0000 1.19 +++ eclipse-bugzilla.spec 20 Jan 2006 21:08:55 -0000 1.20 @@ -179,7 +179,7 @@ %if %{gcj_support} %{eclipse_lib_base}/plugins/org.eclipse.team.bugzilla* %{eclipse_lib_base}/plugins/org.eclipse.team.bugs* -%{_libdir}/gcj-4.0.0/classmap.db.d/%{name}.db +%{_libdir}/gcj-4.0.2/classmap.db.d/%{name}.db %endif %changelog @@ -187,6 +187,7 @@ - Various bug fixes and small enhancements. - Changing release to be numerical instead of _fcX. - Changed source file name to eclipse-bugzilla-fetched-version.tar.gz. +- Fixed files section to point to gcj-4.0.2. * Wed May 18 2005 Jeff Pound 0.1.0_fc-16 - Fix bug in query option parser (see comment 1 from bz#151443). From fedora-cvs-commits at redhat.com Fri Jan 20 21:58:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 16:58:25 -0500 Subject: rpms/notify-daemon/devel notify-daemon-0.3.1-message-markup.patch, NONE, 1.1 notify-daemon.spec, 1.5, 1.6 Message-ID: <200601202158.k0KLwP3c011992@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/notify-daemon/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11975 Modified Files: notify-daemon.spec Added Files: notify-daemon-0.3.1-message-markup.patch Log Message: * Fri Jan 20 2006 Christopher Aillon - 0.3.1-5 - Make it so that marked-up messages appear with markup notify-daemon-0.3.1-message-markup.patch: eggnotificationbubblewidget.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE notify-daemon-0.3.1-message-markup.patch --- --- notify-daemon-0.3.1/src/eggnotificationbubblewidget.c.markup 2006-01-20 12:42:33.000000000 -0500 +++ notify-daemon-0.3.1/src/eggnotificationbubblewidget.c 2006-01-20 13:59:03.000000000 -0500 @@ -561,7 +561,7 @@ len = strlen (text); pango_layout_set_width(layout, -1); - pango_layout_set_text (layout, text, len); + pango_layout_set_markup (layout, text, len); pango_layout_get_pixel_size (layout, &w, &h); Index: notify-daemon.spec =================================================================== RCS file: /cvs/dist/rpms/notify-daemon/devel/notify-daemon.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- notify-daemon.spec 12 Jan 2006 16:32:47 -0000 1.5 +++ notify-daemon.spec 20 Jan 2006 21:58:23 -0000 1.6 @@ -4,7 +4,7 @@ Summary: Notification Daemon Name: notify-daemon Version: 0.3.1 -Release: 4 +Release: 5 URL: http://www.galago-project.org/specs/notification/ License: GPL Group: System Environment/Libraries @@ -18,6 +18,7 @@ Source0: %{name}-%{version}.tar.gz Patch0: notify-daemon-0.3.1-position.patch +Patch1: notify-daemon-0.3.1-message-markup.patch %description @@ -27,6 +28,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p1 %build @@ -53,6 +55,9 @@ %{_datadir}/dbus-1/services/notify-daemon.service %changelog +* Fri Jan 20 2006 Christopher Aillon - 0.3.1-5 +- Make it so that marked-up messages appear with markup + * Thu Jan 12 2006 Christopher Aillon - 0.3.1-4 - Provide desktop-notification-daemon, since libnotify requires a notification deamon, but not this specific one. Other notification From fedora-cvs-commits at redhat.com Fri Jan 20 22:14:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 17:14:39 -0500 Subject: rpms/dbus/devel dbus-0.60-start-early.patch, NONE, 1.1 dbus.spec, 1.65, 1.66 Message-ID: <200601202214.k0KMEd4t012380@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/dbus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12366 Modified Files: dbus.spec Added Files: dbus-0.60-start-early.patch Log Message: - move base libraries and binaries to /bin and /lib so they can be started before /usr is mounted on network mounted /usr systems - have D-Bus start early dbus-0.60-start-early.patch: messagebus.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE dbus-0.60-start-early.patch --- --- dbus-0.60/bus/messagebus.in.start-early 2006-01-20 16:39:46.000000000 -0500 +++ dbus-0.60/bus/messagebus.in 2006-01-20 16:42:06.000000000 -0500 @@ -2,7 +2,7 @@ # # messagebus: The D-BUS systemwide message bus # -# chkconfig: 345 97 03 +# chkconfig: 345 22 85 # description: This is a daemon which broadcasts notifications of system events \ # and other messages. See http://www.freedesktop.org/software/dbus/ # Index: dbus.spec =================================================================== RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- dbus.spec 19 Jan 2006 10:47:16 -0000 1.65 +++ dbus.spec 20 Jan 2006 22:14:27 -0000 1.66 @@ -19,7 +19,7 @@ Summary: D-BUS message bus Name: dbus Version: 0.60 -Release: 4 +Release: 5 URL: http://www.freedesktop.org/software/dbus/ Source0: %{name}-%{version}.tar.gz License: AFL/GPL @@ -47,6 +47,7 @@ Patch1: dbus-0.32-selinux_chroot_workaround.patch Patch2: dbus-0.60-selinux-avc-audit.patch +Patch3: dbus-0.60-start-early.patch %description @@ -132,6 +133,7 @@ %patch1 -p1 -b .selinux_chroot_workaround %patch2 -p1 -b .selinux-avc-audit +%patch3 -p1 -b .start-early autoreconf -f -i @@ -187,12 +189,41 @@ perl -pi -e "s,/usr/lib64,/usr/lib,g" dbus-sharp.pc mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/mono -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT + +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/dbus/*.*a +# move the base dbus libraries and executables to /bin and /lib +mkdir -p $RPM_BUILD_ROOT/bin +mkdir -p $RPM_BUILD_ROOT/%{_lib} + +mv -f $RPM_BUILD_ROOT%{_libdir}/*dbus-1*.so.* $RPM_BUILD_ROOT/%{_lib} +mv -f $RPM_BUILD_ROOT%{_bindir}/dbus-daemon $RPM_BUILD_ROOT/bin +mv -f $RPM_BUILD_ROOT%{_bindir}/dbus-send $RPM_BUILD_ROOT/bin +mv -f $RPM_BUILD_ROOT%{_bindir}/dbus-cleanup-sockets $RPM_BUILD_ROOT/bin + +# We need to make relative links to the moved libaries +# Create a dummy file so that no matter how deep %%{_libdir} is, we can +# find the root directory. +touch $RPM_BUILD_ROOT/rootfile +# Search for the file relative to the location of %%{_libdir}. +root=.. +while [ ! -e $RPM_BUILD_ROOT/%{_libdir}/${root}/rootfile ] ; do + root=${root}/.. + done + # Actually create the link. + pushd $RPM_BUILD_ROOT/%{_libdir} + for so_file in *dbus-1*.so ; do + ln -f -s ${root}/%{_lib}/$so_file.? $so_file + done + popd + # Clean it up. + rm $RPM_BUILD_ROOT/rootfile + ## %find_lang %{gettext_package} %clean @@ -229,17 +260,16 @@ %dir %{_sysconfdir}/dbus-1/system.d %dir %{_localstatedir}/run/dbus %dir %{_libdir}/dbus-1.0 -%{_bindir}/dbus-daemon -%{_bindir}/dbus-send -%{_bindir}/dbus-cleanup-sockets -%{_libdir}/*dbus-1*.so.* +/bin/dbus-daemon +/bin/dbus-send +/bin/dbus-cleanup-sockets +/%{_lib}/*dbus-1*.so.* %{_datadir}/man/man*/* %{_datadir}/dbus-1/services %files devel %defattr(-,root,root) -%{_libdir}/lib*.a %{_libdir}/lib*.so %{_libdir}/dbus-1.0/include %{_libdir}/pkgconfig/dbus-1.pc @@ -288,6 +318,11 @@ %endif %changelog +* Fri Jan 20 2006 John (J5) Palmieri 0.60-5 +- move base libraries and binaries to /bin and /lib so they can be started + before /usr is mounted on network mounted /usr systems +- have D-Bus start early + * Thu Jan 19 2006 Alexander Larsson 0.60-4 - mono now built on s390x From fedora-cvs-commits at redhat.com Fri Jan 20 22:16:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 17:16:47 -0500 Subject: rpms/perl/devel perl-5.8.8-perlbug-tag.patch, NONE, 1.1.2.1 perl-5.8.8-dashI.patch, NONE, 1.1.2.1 perl-5.8.8-links.patch, NONE, 1.1.2.1 perl-5.8.8-CAN-2004-0976.patch, NONE, 1.1.2.1 perl-5.8.8-USE_MM_LD_RUN_PATH.patch, NONE, 1.1.2.1 perl-5.8.8-rpath-make.patch, NONE, 1.1.2.1 Message-ID: <200601202216.k0KMGlT8018629@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18336 Added Files: Tag: perl-5_8_8-0_RC1 perl-5.8.8-perlbug-tag.patch perl-5.8.8-dashI.patch perl-5.8.8-links.patch perl-5.8.8-CAN-2004-0976.patch perl-5.8.8-USE_MM_LD_RUN_PATH.patch perl-5.8.8-rpath-make.patch Log Message: regenerated patches for upgrade to 5.8.8 perl-5.8.8-perlbug-tag.patch: perlbug.PL | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) --- NEW FILE perl-5.8.8-perlbug-tag.patch --- --- perl-5.8.8-RC1/utils/perlbug.PL.perlbug 2006-01-03 14:07:41.000000000 -0500 +++ perl-5.8.8-RC1/utils/perlbug.PL 2006-01-20 14:33:26.000000000 -0500 @@ -71,7 +71,7 @@ eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}' if \$running_under_some_shell; -my \$config_tag1 = '$extract_version - $Config{cf_time}'; +my \$config_tag1 = '$extract_version'; my \$patchlevel_date = $patchlevel_date; my \$patch_tags = '$patch_tags'; @@ -287,18 +287,9 @@ # OK - send "OK" report for build on this system $ok = 0; if ($::opt_o) { - if ($::opt_o eq 'k' or $::opt_o eq 'kay') { - my $age = time - $patchlevel_date; - if ($::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) { - my $date = localtime $patchlevel_date; - print <<"EOF"; -"perlbug -ok" and "perlbug -nok" do not report on Perl versions which -are more than 60 days old. This Perl version was constructed on -$date. If you really want to report this, use -"perlbug -okay" or "perlbug -nokay". -EOF - exit(); - } + # + # Red Hat modification: remove -ok / -nok refusal to report due to age + # # force these options unless ($::opt_n) { $::opt_S = 1; # don't prompt for send @@ -605,7 +596,7 @@ print OUT <import(); -} else { - *catfile = sub { join '/', @_ }; -} -$tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp'; -$file = catfile($tmpdir, "storable$$"); +$file = "storable$$"; 1 while unlink $file; tryout('Memoize::Storable', $file, 1); # Test 1..4 1 while unlink $file; --- perl-5.8.8-RC1/lib/Memoize/t/tie_ndbm.t.CAN-2004-0976 2005-04-22 07:36:58.000000000 -0400 +++ perl-5.8.8-RC1/lib/Memoize/t/tie_ndbm.t 2006-01-20 15:51:09.000000000 -0500 @@ -28,14 +28,7 @@ print "1..4\n"; - -if (eval {require File::Spec::Functions}) { - File::Spec::Functions->import(); -} else { - *catfile = sub { join '/', @_ }; -} -$tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp'; -$file = catfile($tmpdir, "md$$"); +$file = "md$$"; 1 while unlink $file, "$file.dir", "$file.pag", "$file.db"; tryout('Memoize::NDBM_File', $file, 1); # Test 1..4 1 while unlink $file, "$file.dir", "$file.pag", "$file.db"; --- perl-5.8.8-RC1/lib/Memoize/t/tie.t.CAN-2004-0976 2002-07-12 15:56:19.000000000 -0400 +++ perl-5.8.8-RC1/lib/Memoize/t/tie.t 2006-01-20 15:51:09.000000000 -0500 @@ -29,14 +29,7 @@ $_[0]+1; } -if (eval {require File::Spec::Functions}) { - File::Spec::Functions->import('tmpdir', 'catfile'); - $tmpdir = tmpdir(); -} else { - *catfile = sub { join '/', @_ }; - $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp'; -} -$file = catfile($tmpdir, "md$$"); +$file = "md$$"; @files = ($file, "$file.db", "$file.dir", "$file.pag"); 1 while unlink @files; --- perl-5.8.8-RC1/lib/Memoize/t/tie_sdbm.t.CAN-2004-0976 2002-07-12 15:56:19.000000000 -0400 +++ perl-5.8.8-RC1/lib/Memoize/t/tie_sdbm.t 2006-01-20 15:51:09.000000000 -0500 @@ -28,14 +28,7 @@ print "1..4\n"; -if (eval {require File::Spec::Functions}) { - File::Spec::Functions->import('tmpdir', 'catfile'); - $tmpdir = tmpdir(); -} else { - *catfile = sub { join '/', @_ }; - $tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp'; -} -$file = catfile($tmpdir, "md$$"); +$file = "md$$"; 1 while unlink $file, "$file.dir", "$file.pag"; tryout('Memoize::SDBM_File', $file, 1); # Test 1..4 1 while unlink $file, "$file.dir", "$file.pag"; --- perl-5.8.8-RC1/lib/Memoize/t/tie_gdbm.t.CAN-2004-0976 2002-07-12 15:56:19.000000000 -0400 +++ perl-5.8.8-RC1/lib/Memoize/t/tie_gdbm.t 2006-01-20 15:51:09.000000000 -0500 @@ -26,13 +26,7 @@ print "1..4\n"; -if (eval {require File::Spec::Functions}) { - File::Spec::Functions->import(); -} else { - *catfile = sub { join '/', @_ }; -} -$tmpdir = $ENV{TMP} || $ENV{TMPDIR} || '/tmp'; -$file = catfile($tmpdir, "md$$"); +$file = "md$$"; 1 while unlink $file, "$file.dir", "$file.pag"; tryout('GDBM_File', $file, 1); # Test 1..4 1 while unlink $file, "$file.dir", "$file.pag"; --- perl-5.8.8-RC1/lib/Shell.pm.CAN-2004-0976 2004-06-01 05:42:17.000000000 -0400 +++ perl-5.8.8-RC1/lib/Shell.pm 2006-01-20 15:51:09.000000000 -0500 @@ -127,7 +127,7 @@ use Shell qw(cat ps cp); $passwd = cat('new; perl-5.8.8-USE_MM_LD_RUN_PATH.patch: Liblist.pm | 5 ++++ MM_Unix.pm | 2 - MakeMaker.pm | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 65 insertions(+), 6 deletions(-) --- NEW FILE perl-5.8.8-USE_MM_LD_RUN_PATH.patch --- --- perl-5.8.8-RC1/lib/ExtUtils/MakeMaker.pm.USE_MM_LD_RUN_PATH 2006-01-20 15:51:09.000000000 -0500 +++ perl-5.8.8-RC1/lib/ExtUtils/MakeMaker.pm 2006-01-20 16:25:43.000000000 -0500 @@ -233,7 +233,7 @@ PERL_SRC PERM_RW PERM_RWX PL_FILES PM PM_FILTER PMLIBDIRS POLLUTE PPM_INSTALL_EXEC PPM_INSTALL_SCRIPT PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ - SIGN SKIP TYPEMAPS VERSION VERSION_FROM XS XSOPT XSPROTOARG + SKIP TYPEMAPS USE_MM_LD_RUN_PATH VERSION VERSION_FROM XS XSOPT XSPROTOARG XS_VERSION clean depend dist dynamic_lib linkext macro realclean tool_autosplit @@ -369,7 +369,27 @@ print join(" ", map { "perl($_)>=$self->{PREREQ_PM}->{$_} " } sort keys %{$self->{PREREQ_PM}}), "\n"; exit 0; - } + } + + # USE_MM_LD_RUN_PATH - another RedHatism to disable automatic RPATH generation + if ( ( ! $self->{USE_MM_LD_RUN_PATH} ) + &&( ("@ARGV" =~ /\bUSE_MM_LD_RUN_PATH(=([01]))?\b/) + ||( exists( $ENV{USE_MM_LD_RUN_PATH} ) + &&( $ENV{USE_MM_LD_RUN_PATH} =~ /([01])?$/ ) + ) + ) + ) + { + my $v = $1; + if( $v ) + { + $v = ($v=~/=([01])$/)[0]; + }else + { + $v = 1; + }; + $self->{USE_MM_LD_RUN_PATH}=$v; + }; print STDOUT "MakeMaker (v$VERSION)\n" if $Verbose; if (-f "MANIFEST" && ! -f "Makefile"){ @@ -1373,13 +1393,13 @@ This is the root directory into which the code will be installed. It I. For example, if your code -would normally go into F you could set DESTDIR=~/tmp/ -and installation would go into F<~/tmp/usr/local/lib/perl>. +would normally go into /usr/local/lib/perl you could set DESTDIR=~/myperl/ +and installation would go into ~/myperl/usr/local/lib/perl. This is primarily of use for people who repackage Perl modules. NOTE: Due to the nature of make, it is important that you put the trailing -slash on your DESTDIR. F<~/tmp/> not F<~/tmp>. +slash on your DESTDIR. F<"~/myperl/"> not F<"~/myperl">. =item DIR @@ -2057,6 +2077,40 @@ precedence, even if it isn't listed in TYPEMAPS. The default system typemap has lowest precedence. +=item USE_MM_LD_RUN_PATH + +boolean +The Red Hat perl MakeMaker distribution differs from the standard +upstream release in that it disables use of the MakeMaker generated +LD_RUN_PATH by default, UNLESS this attribute is specified , or the +USE_MM_LD_RUN_PATH environment variable is set during the MakeMaker run. + +The upstream MakeMaker will set the ld(1) environment variable LD_RUN_PATH +to the concatenation of every -L ld(1) option directory in which a -l ld(1) +option library is found, which is used as the ld(1) -rpath option if none +is specified. This means that, if your application builds shared libraries +and your MakeMaker application links to them, that the absolute paths of the +libraries in the build tree will be inserted into the RPATH header of all +MakeMaker generated binaries, and that such binaries will be unable to link +to these libraries if they do not still reside in the build tree directories +(unlikely) or in the system library directories (/lib or /usr/lib), regardless +of any LD_LIBRARY_PATH setting. So if you specified -L../mylib -lmylib , and + your 'libmylib.so' gets installed into /some_directory_other_than_usr_lib, + your MakeMaker application will be unable to link to it, even if LD_LIBRARY_PATH +is set to include /some_directory_other_than_usr_lib, because RPATH overrides +LD_LIBRARY_PATH. + +So for Red Hat MakeMaker builds LD_RUN_PATH is NOT generated by default for +every link. You can still use explicit -rpath ld options or the LD_RUN_PATH +environment variable during the build to generate an RPATH for the binaries. + +You can set the USE_MM_LD_RUN_PATH attribute to 1 on the MakeMaker command +line or in the WriteMakefile arguments to enable generation of LD_RUN_PATH +for every link command. + +USE_MM_LD_RUN_PATH will default to 1 (LD_RUN_PATH will be used) IF the +$USE_MM_LD_RUN_PATH environment variable is set during a MakeMaker run. + =item VENDORPREFIX Like PERLPREFIX, but only for the vendor install locations. --- perl-5.8.8-RC1/lib/ExtUtils/MM_Unix.pm.USE_MM_LD_RUN_PATH 2005-10-21 10:11:03.000000000 -0400 +++ perl-5.8.8-RC1/lib/ExtUtils/MM_Unix.pm 2006-01-20 16:20:25.000000000 -0500 @@ -941,7 +941,7 @@ } my $ld_run_path_shell = ""; - if ($self->{LD_RUN_PATH} ne "") { + if (($self->{LD_RUN_PATH} ne "") && ($self->{USE_MM_LD_RUN_PATH})) { $ld_run_path_shell = 'LD_RUN_PATH="$(LD_RUN_PATH)" '; } --- perl-5.8.8-RC1/lib/ExtUtils/Liblist.pm.USE_MM_LD_RUN_PATH 2003-04-07 14:58:17.000000000 -0400 +++ perl-5.8.8-RC1/lib/ExtUtils/Liblist.pm 2006-01-20 16:21:57.000000000 -0500 @@ -87,6 +87,11 @@ in LDLOADLIBS. It is passed as an environment variable to the process that links the shared library. +Red Hat extension: This generation of LD_RUN_PATH is disabled by default. +To use the generated LD_RUN_PATH for all links, set the USE_MM_LD_RUN_PATH +MakeMaker object attribute / argument, (or set the $USE_MM_LD_RUN_PATH +environment variable). + =head2 BSLOADLIBS List of those libraries that are needed but can be linked in perl-5.8.8-rpath-make.patch: Makefile.SH | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) --- NEW FILE perl-5.8.8-rpath-make.patch --- --- perl-5.8.8-RC1/Makefile.SH.makerpath 2006-01-20 16:41:26.000000000 -0500 +++ perl-5.8.8-RC1/Makefile.SH 2006-01-20 16:41:57.000000000 -0500 @@ -125,26 +125,10 @@ esac case "$osname" in - linux) - # If there is a pre-existing $libperl from a previous - # installation, Linux needs to use LD_PRELOAD to - # override the LD_LIBRARY_PATH setting. See the - # INSTALL file, under "Building a shared perl library". - # If there is no pre-existing $libperl, we don't need - # to do anything further. - if test -f $archlib/CORE/$libperl; then - rm -f preload - cat <<'EOT' > preload -#! /bin/sh -lib=$1 -shift -test -r $lib && export LD_PRELOAD="$lib $LD_PRELOAD" -exec "$@" -EOT - chmod 755 preload - ldlibpth="$ldlibpth `pwd`/preload `pwd`/$libperl" - fi + linux*) + ldlibpth="LD_PRELOAD=`pwd`/libperl.so $ldlibpth" ;; + os390) test -f /bin/env && ldlibpth="/bin/env $ldlibpth" ;; esac From fedora-cvs-commits at redhat.com Fri Jan 20 22:21:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 17:21:47 -0500 Subject: rpms/perl/devel .cvsignore, 1.13, 1.13.2.1 perl.spec, 1.79, 1.79.2.1 sources, 1.13, 1.13.2.1 Message-ID: <200601202221.k0KMLlZL024739@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24726 Modified Files: Tag: perl-5_8_8-0_RC1 .cvsignore perl.spec sources Log Message: upgrade to 5.8.8 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/perl/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -r1.13 -r1.13.2.1 --- .cvsignore 28 Aug 2005 22:56:18 -0000 1.13 +++ .cvsignore 20 Jan 2006 22:21:44 -0000 1.13.2.1 @@ -1 +1,2 @@ perl-5.8.7.tar.bz2 +perl-5.8.8-RC1.tar.bz2 Index: perl.spec =================================================================== RCS file: /cvs/dist/rpms/perl/devel/perl.spec,v retrieving revision 1.79 retrieving revision 1.79.2.1 diff -u -r1.79 -r1.79.2.1 --- perl.spec 14 Dec 2005 18:00:31 -0000 1.79 +++ perl.spec 20 Jan 2006 22:21:45 -0000 1.79.2.1 @@ -4,11 +4,16 @@ %define multilib_64_archs x86_64 s390x ppc64 sparc64 -%define perlver 5.8.7 -%define perlrel 8.1 -%define perlepoch 3 +%define perlver 5.8.8 +%define perlrel 0 +%define perlepoch 3 +%define perlsrcrel RC1 + +%{?!perl_debugging: %define perl_debugging 1} +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +# perl_debugging enabled until 5.8.8 final release! +#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -%{?!perl_debugging: %define perl_debugging 0} %if %{perl_debugging} %define debug_package %{nil} # don't build debuginfo and disable stripping @@ -26,7 +31,7 @@ Provides: perl(:WITHOUT_THREADS) %endif -%define perlmodcompat 5.8.6 5.8.5 5.8.4 5.8.3 +%define perlmodcompat 5.8.7 5.8.6 5.8.5 5.8.4 5.8.3 Provides: perl(:MODULE_COMPAT_5.8.3) Provides: perl(:MODULE_COMPAT_5.8.4) Provides: perl(:MODULE_COMPAT_5.8.5) @@ -39,10 +44,9 @@ Provides: perl(:WITHOUT_LARGEFILES) %endif - Name: perl Version: %{perlver} -Release: %{perlrel} +Release: %{perlrel}_%{perlsrcrel} Epoch: %{perlepoch} Summary: The Perl programming language @@ -50,25 +54,25 @@ License: Artistic or GPL Url: http://www.perl.org/ -Source0: http://www.cpan.org/authors/id/N/NW/NWCLARK/perl-5.8.7.tar.bz2 +Source0: http://www.cpan.org/authors/id/N/NW/NWCLARK/%{name}-%{version}-%{perlsrcrel}.tar.bz2 Source11: filter-depends.sh Source12: perl-5.8.0-libnet.cfg Patch5: perl-5.8.0-root.patch # Patch6: perl-5.8.0-fhs.patch -Patch7: perl-5.6.0-buildroot.patch +# Patch7: perl-5.6.0-buildroot.patch # Patch8: perl-5.8.0-errno.patch -Patch9: perl-5.7.3-syslog.patch +# Patch9: perl-5.7.3-syslog.patch # Patch10: perl-5.8.0-notty.patch -Patch11: perl-5.8.3-fullinc.patch +# Patch11: perl-5.8.3-fullinc.patch Patch12: perl-5.8.7-incpush.patch -Patch13: perl-5.8.3-perlbug-tag.patch -Patch14: perl-5.8.5-dashI.patch +Patch13: perl-5.8.8-perlbug-tag.patch +Patch14: perl-5.8.8-dashI.patch Patch15: perl-5.8.5-incorder.patch # Configure doesn't listen well when we say no ndbm. When it links in, # it then conflicts with berkeley db. oops. -Patch16: perl-5.8.0-nondbm.patch +# Patch16: perl-5.8.0-nondbm.patch # make sure we get the proper ldflags on libperl.so Patch17: perl-5.8.0-sharedlinker.patch @@ -76,35 +80,37 @@ # perl 5.8.0 likes to use man3ext for BOTH directories AND files. not kosher. # Patch18: perl-5.8.0-manext.patch -# lynx is depracated, use links instead -Patch19: perl-5.8.0-links.patch +# lynx is deprecated, use links instead +Patch19: perl-5.8.8-links.patch # work around annoying rpath issue -Patch21: perl-5.8.0-rpath-make.patch +Patch21: perl-5.8.8-rpath-make.patch # bugzilla 101767, make sure threads.so links directly to -lpthread -Patch22: perl-5.8.1-lpthread-link.patch +# Patch22: perl-5.8.1-lpthread-link.patch -# fix empty RPATH security issue -Patch24: perl-5.8.3-empty-rpath.patch +# fix empty RPATH security issue (now fixed with USE_MM_LD_RUN_PATH patch ) +# Patch24: perl-5.8.3-empty-rpath.patch # CAN-2004-0452 fix (now in 5.8.7!) -Patch26: perl-5.8.0-rmtree.patch +# Patch26: perl-5.8.0-rmtree.patch # CAN-2005-0155 and CAN-2005-0156 fix (now in 5.8.7!) -Patch27: perl-5.8.5-CAN-2005-0155+0156.patch +# Patch27: perl-5.8.5-CAN-2005-0155+0156.patch -# bugzilla 118877, 127023 -Patch28: perl-5.8.6-findbin-selinux.patch +# bugzilla 118877, 127023 (now in 5.8.8!) +# Patch28: perl-5.8.6-findbin-selinux.patch # Update the core module version (matching the external package perl-Filter-Simple) -Patch30: perl-5.8.6-filter-simple-update.patch +# (now 0.82 in 5.8.8) +# Patch30: perl-5.8.6-filter-simple-update.patch # Disable -DDEBUGGING and allow -g to do its job (#156113) Patch31: perl-5.8.7-no-debugging.patch # Fix for bug 171111: missing IOCPARM_LEN -Patch32: perl-5.8.7-IOC_SIZE.patch +# (now in 5.8.8!) +# Patch32: perl-5.8.7-IOC_SIZE.patch # arch-specific patches Patch100: perl-5.8.1-fpic.patch @@ -114,25 +120,29 @@ Patch32003: perl-5.8.6-libresolv.patch -Patch172236: perl-5.8.7-bz172236.patch +# now in 5.8.8: +# Patch172236: perl-5.8.7-bz172236.patch # fix for bug 163958 / upstream bug 37056 : -# backport of perl-5.9's patch 25084 : +# backport of perl-5.9's patch 25084 (bug still in 5.8.8!): Patch25084: perl-5.8.7-25084.patch Patch172396: perl-5.8.7-172396.patch -Patch172587: perl-5.8.7-bz172587.patch +# now in 5.8.8: +# Patch172587: perl-5.8.7-bz172587.patch -Patch040976: perl-5.8.7-CAN-2004-0976.patch +Patch040976: perl-5.8.8-CAN-2004-0976.patch -Patch172739: perl-5.8.7-bz172739_obz36521.patch +# now in 5.8.8: +# Patch172739: perl-5.8.7-bz172739_obz36521.patch -Patch136009: perl-5.8.7-MM_Unix-rpath-136009.patch +#Patch136009: perl-5.8.7-MM_Unix-rpath-136009.patch -Patch174684: perl-5.8.7-CVE-2005-3962-bz174684.patch +# now in 5.8.8: +#Patch174684: perl-5.8.7-CVE-2005-3962-bz174684.patch -Patch1360090: perl-5.8.7-USE_MM_LD_RUN_PATH.patch +Patch1360090: perl-5.8.8-USE_MM_LD_RUN_PATH.patch # module updatesd # Patch202: perl-5.8.0-Safe2.09.patch @@ -245,7 +255,7 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}-%perlsrcrel %patch5 -p1 # %%patch8 -p1 @@ -259,46 +269,49 @@ %patch17 -p1 %patch19 -p1 + %patch21 -p1 -%patch24 -p1 +# %patch24 -p1 # perl 5.8.7: reject # %patch26 -p1 # perl 5.8.7: Already in ? # %patch27 -p0 -%patch28 -p1 +# %patch28 -p1 -%patch30 -p1 +# %patch30 -p1 %if !%{perl_debugging} %patch31 -p1 %endif -%patch32 -p1 +# %patch32 -p1 %patch100 -p1 + %ifarch %{multilib_64_archs} %patch101 -p1 %endif %patch32002 -p1 + %patch32003 -p1 -%patch172236 -p1 +# %patch172236 -p1 %patch25084 -p1 %patch172396 -p1 -%patch172587 -p1 +# %patch172587 -p1 %patch040976 -p1 -%patch172739 -p1 +# %patch172739 -p1 -%patch136009 -p1 +# %patch136009 -p1 -%patch174684 -p1 +# %patch174684 -p1 %patch1360090 -p1 @@ -511,7 +524,10 @@ %changelog -* Wed Dec 14 2005 Jason Vas Dias - 3:5.6.7-8.1 +* Fri Dec 20 2006 Jason Vas Dias - 3.5.8.8-0_RC1 +- Upgrade to new upstream release candidate 5.8.8-RC1 + +* Wed Dec 14 2005 Jason Vas Dias - 3:5.8.7-8.1 - Updated upstream patches for CVE-2005-3962: 26322 , 26331, 26333 * Thu Dec 08 2005 Jason Vas Dias - 3:5.8.7-8 Index: sources =================================================================== RCS file: /cvs/dist/rpms/perl/devel/sources,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -u -r1.13 -r1.13.2.1 --- sources 28 Aug 2005 22:56:18 -0000 1.13 +++ sources 20 Jan 2006 22:21:45 -0000 1.13.2.1 @@ -1 +1 @@ -9a175d6ccbb5d9b41ffac5073ff9cc3c perl-5.8.7.tar.bz2 +1d7ca5a1059d91af7f6e613130c0334b perl-5.8.8-RC1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 20 22:33:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 17:33:15 -0500 Subject: rpms/initscripts/devel .cvsignore, 1.86, 1.87 initscripts.spec, 1.99, 1.100 sources, 1.93, 1.94 Message-ID: <200601202233.k0KMXESv003185@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/initscripts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3097 Modified Files: .cvsignore initscripts.spec sources Log Message: *docs* The hotplug package is no longer included. Things that use the /etc/hotplug.d directory need to be converted to udev rules. Please see http://www.reactivated.net/writing_udev_rules.html for examples. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- .cvsignore 21 Dec 2005 22:54:47 -0000 1.86 +++ .cvsignore 20 Jan 2006 22:33:11 -0000 1.87 @@ -1 +1 @@ -initscripts-8.20.tar.bz2 +initscripts-8.21.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- initscripts.spec 21 Dec 2005 22:54:47 -0000 1.99 +++ initscripts.spec 20 Jan 2006 22:33:11 -0000 1.100 @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.20 +Version: 8.21 License: GPL Group: System Environment/Base Release: 1 @@ -22,8 +22,10 @@ Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14 Conflicts: dhclient < 3.0.3-7 Conflicts: tcsh < 6.13-5 +Conflicts: xorg-x11 #Conflicts: diskdumputils < 1.1.0 Obsoletes: rhsound sapinit +Obsoletes: hotplug Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, mktemp, fileutils, sh-utils BuildPrereq: glib2-devel popt gettext pkgconfig @@ -33,7 +35,6 @@ cleanly. Initscripts also contains the scripts that activate and deactivate most network interfaces. - %prep %setup -q %ifarch s390 s390x @@ -154,10 +155,12 @@ %config /etc/sysconfig/network-scripts/ifup-wireless /etc/sysconfig/network-scripts/ifup-isdn /etc/sysconfig/network-scripts/ifdown-isdn +/etc/sysconfig/network-scripts/net.hotplug %ifarch s390 s390x %config /etc/sysconfig/network-scripts/ifup-ctc %config /etc/sysconfig/network-scripts/ifup-iucv %endif +/etc/udev/rules.d/* %config /etc/X11/prefdm %config(noreplace) /etc/inittab %dir /etc/rc.d @@ -205,6 +208,16 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Fri Jan 20 2006 Bill Nottingham 8.21-1 +- move handling of network hotplug events here, add appropriate udev + rules, obsolete hotplug +- get rid of some path lookups (#178321, ) +- get hwaddrs from sysfs as opposed to ip | sed +- translation updates +- lang.sh: don't run unicode_start for subshells (#176832) +- halt: ignore sysfs but not /sys (#177612, ) +- add service(8) man page (#44857) + * Wed Dec 21 2005 Bill Nottingham 8.20-1 - remove kmodule. udev handles module loading now - require appropriate udev Index: sources =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/sources,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- sources 21 Dec 2005 22:54:47 -0000 1.93 +++ sources 20 Jan 2006 22:33:11 -0000 1.94 @@ -1 +1 @@ -9c97b78079f108f525b5144c3ac0f08b initscripts-8.20.tar.bz2 +0113adb3e2da17aa89f1f9254fc32cba initscripts-8.21.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 20 23:05:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 20 Jan 2006 18:05:56 -0500 Subject: rpms/dbus/devel dbus-0.60-start-early.patch, 1.1, 1.2 dbus.spec, 1.66, 1.67 Message-ID: <200601202305.k0KN5uY5025651@cvs.devel.redhat.com> Author: johnp Update of /cvs/dist/rpms/dbus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25538 Modified Files: dbus-0.60-start-early.patch dbus.spec Log Message: - Fix up patch to init script so it refrences /bin not /usr/bin dbus-0.60-start-early.patch: messagebus.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: dbus-0.60-start-early.patch =================================================================== RCS file: /cvs/dist/rpms/dbus/devel/dbus-0.60-start-early.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dbus-0.60-start-early.patch 20 Jan 2006 22:14:27 -0000 1.1 +++ dbus-0.60-start-early.patch 20 Jan 2006 23:05:51 -0000 1.2 @@ -1,5 +1,5 @@ ---- dbus-0.60/bus/messagebus.in.start-early 2006-01-20 16:39:46.000000000 -0500 -+++ dbus-0.60/bus/messagebus.in 2006-01-20 16:42:06.000000000 -0500 +--- dbus-0.60/bus/messagebus.in.start-early 2005-01-18 17:20:38.000000000 -0500 ++++ dbus-0.60/bus/messagebus.in 2006-01-20 18:03:33.000000000 -0500 @@ -2,7 +2,7 @@ # # messagebus: The D-BUS systemwide message bus @@ -9,3 +9,12 @@ # description: This is a daemon which broadcasts notifications of system events \ # and other messages. See http://www.freedesktop.org/software/dbus/ # +@@ -11,7 +11,7 @@ + # + + # Sanity checks. +-[ -x @EXPANDED_BINDIR@/dbus-daemon ] || exit 0 ++[ -x /bin/dbus-daemon ] || exit 0 + + # Source function library. + . @EXPANDED_SYSCONFDIR@/rc.d/init.d/functions Index: dbus.spec =================================================================== RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- dbus.spec 20 Jan 2006 22:14:27 -0000 1.66 +++ dbus.spec 20 Jan 2006 23:05:51 -0000 1.67 @@ -19,7 +19,7 @@ Summary: D-BUS message bus Name: dbus Version: 0.60 -Release: 5 +Release: 6 URL: http://www.freedesktop.org/software/dbus/ Source0: %{name}-%{version}.tar.gz License: AFL/GPL @@ -318,6 +318,9 @@ %endif %changelog +* Fri Jan 20 2006 John (J5) Palmieri 0.60-6 +- Fix up patch to init script so it refrences /bin not /usr/bin + * Fri Jan 20 2006 John (J5) Palmieri 0.60-5 - move base libraries and binaries to /bin and /lib so they can be started before /usr is mounted on network mounted /usr systems From fedora-cvs-commits at redhat.com Sat Jan 21 11:38:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 21 Jan 2006 06:38:46 -0500 Subject: rpms/gcc/devel .cvsignore, 1.126, 1.127 gcc41-pr25717.patch, 1.1, 1.2 gcc41.spec, 1.17, 1.18 sources, 1.128, 1.129 gcc41-ppc-libffi.patch, 1.1, NONE gcc41-rh177918.patch, 1.1, NONE Message-ID: <200601211138.k0LBckTN029591@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29578 Modified Files: .cvsignore gcc41-pr25717.patch gcc41.spec sources Removed Files: gcc41-ppc-libffi.patch gcc41-rh177918.patch Log Message: 4.1.0-0.16 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- .cvsignore 17 Jan 2006 18:05:12 -0000 1.126 +++ .cvsignore 21 Jan 2006 11:38:40 -0000 1.127 @@ -1 +1 @@ -gcc-4.1.0-20060117.tar.bz2 +gcc-4.1.0-20060121.tar.bz2 gcc41-pr25717.patch: init.c | 8 +++++++- macro.c | 14 +++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) Index: gcc41-pr25717.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41-pr25717.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-pr25717.patch 17 Jan 2006 18:05:12 -0000 1.1 +++ gcc41-pr25717.patch 21 Jan 2006 11:38:40 -0000 1.2 @@ -1,19 +1,3 @@ -Hi! - -PR25717 complains that gcc -E -dD -xc /dev/null doesn't print __STDC__ macro -definition like it used to do up to GCC 3.2. -__STDC__ macro still won't be printed on Solaris/Interix with -dD/-dM and -when not using one of the pedantic standards (-std=c89, -std=c99, etc.), -but in that case it is IMHO desirable, because __STDC__ doesn't act as a -normal macro in that case, and it also matches GCC 3.2 behaviour which had: -#ifdef STDC_0_IN_SYSTEM_HEADERS - B("__STDC__", BT_STDC), -#else - C("__STDC__", "1"), -#endif - -Ok for 4.0/4.1/trunk? - 2006-01-16 Jakub Jelinek PR preprocessor/25717 @@ -65,5 +49,3 @@ break; case BT_DATE: - - Jakub Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gcc41.spec 17 Jan 2006 18:05:12 -0000 1.17 +++ gcc41.spec 21 Jan 2006 11:38:40 -0000 1.18 @@ -1,6 +1,6 @@ -%define DATE 20060117 +%define DATE 20060121 %define gcc_version 4.1.0 -%define gcc_release 0.15 +%define gcc_release 0.16 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 @@ -95,10 +95,8 @@ Patch14: gcc41-ppc64-sync.patch Patch15: gcc41-ppc32-retaddr.patch Patch16: gcc41-s390-atomic1.patch -Patch17: gcc41-ppc-libffi.patch -Patch18: gcc41-pr25717.patch -Patch19: gcc41-pr25324.patch -Patch20: gcc41-rh177918.patch +Patch17: gcc41-pr25717.patch +Patch18: gcc41-pr25324.patch %define _gnu %{nil} %ifarch sparc @@ -445,10 +443,8 @@ %patch14 -p0 -b .ppc64-sync~ %patch15 -p0 -b .ppc32-retaddr~ %patch16 -p0 -b .s390-atomic1~ -%patch17 -p0 -b .ppc-libffi~ -%patch18 -p0 -b .pr25717~ -%patch19 -p0 -b .pr25324~ -%patch20 -p0 -b .rh177918~ +%patch17 -p0 -b .pr25717~ +%patch18 -p0 -b .pr25324~ sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1534,6 +1530,15 @@ %endif %changelog +* Sat Jan 21 2006 Jakub Jelinek 4.1.0-0.16 +- update from gcc-4_1-branch (-r109815:110062) + - PRs ada/24533, c++/16829, c++/22136, c++/25836, c++/25854, c/25805, + classpath/20198, fortran/20869, fortran/20875, fortran/25024, + fortran/25631, fortran/25697, fortran/25785, libgcj/25840, + libgfortran/25631, libgfortran/25697, libstdc++/25823, + libstdc++/25824, target/25731, testsuite/25171 + - fix X509Certificate.java (#174708, #177733) + * Tue Jan 17 2006 Jakub Jelinek 4.1.0-0.15 - update from gcc-4_1-branch (-r109401:109815) - PRs c++/24824, c++/25386, c++/25663, c/25682, classpath/25803, Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- sources 17 Jan 2006 18:05:12 -0000 1.128 +++ sources 21 Jan 2006 11:38:40 -0000 1.129 @@ -1 +1 @@ -893769a66a2abbeda6d0bbacace7f9c2 gcc-4.1.0-20060117.tar.bz2 +429a46ed48d114066429682803e970aa gcc-4.1.0-20060121.tar.bz2 --- gcc41-ppc-libffi.patch DELETED --- --- gcc41-rh177918.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 21 22:32:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 21 Jan 2006 17:32:31 -0500 Subject: rpms/kernel/devel .cvsignore, 1.331, 1.332 kernel-2.6.spec, 1.1864, 1.1865 sources, 1.273, 1.274 upstream, 1.249, 1.250 patch-2.6.16-rc1-git3.bz2.sign, 1.1, NONE Message-ID: <200601212232.k0LMWVCh002075@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2033 Modified Files: .cvsignore kernel-2.6.spec sources upstream Removed Files: patch-2.6.16-rc1-git3.bz2.sign Log Message: git4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.331 retrieving revision 1.332 diff -u -r1.331 -r1.332 --- .cvsignore 20 Jan 2006 17:25:49 -0000 1.331 +++ .cvsignore 21 Jan 2006 22:31:56 -0000 1.332 @@ -4,4 +4,4 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc1.bz2 bcm43xx-20060114.tar.bz2 -patch-2.6.16-rc1-git3.bz2 +patch-2.6.16-rc1-git4.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1864 retrieving revision 1.1865 diff -u -r1.1864 -r1.1865 --- kernel-2.6.spec 20 Jan 2006 17:25:49 -0000 1.1864 +++ kernel-2.6.spec 21 Jan 2006 22:32:12 -0000 1.1865 @@ -208,7 +208,7 @@ # Patches 0 through 100 are meant for core subsystem upgrades # Patch1: patch-2.6.16-rc1.bz2 -Patch2: patch-2.6.16-rc1-git3.bz2 +Patch2: patch-2.6.16-rc1-git4.bz2 Patch3: drm.patch # Patches 100 through 500 are meant for architecture patches @@ -1343,6 +1343,9 @@ %endif %changelog +* Sat Jan 21 2006 Dave Jones +- 2.6.16-rc1-git4 + * Fri Jan 20 2006 Dave Jones - 2.6.16-rc1-git3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- sources 20 Jan 2006 17:25:50 -0000 1.273 +++ sources 21 Jan 2006 22:32:12 -0000 1.274 @@ -1,4 +1,4 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2 ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 -aa30f390f4c6a5e2a6cc32142f46ccd6 patch-2.6.16-rc1-git3.bz2 +a247c21e1202f514283ba928d9382353 patch-2.6.16-rc1-git4.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/upstream,v retrieving revision 1.249 retrieving revision 1.250 diff -u -r1.249 -r1.250 --- upstream 20 Jan 2006 17:25:50 -0000 1.249 +++ upstream 21 Jan 2006 22:32:12 -0000 1.250 @@ -1,3 +1,3 @@ linux-2.6.15.tar.bz2 patch-2.6.16-rc1.bz2 -patch-2.6.16-rc1-git3.bz2 +patch-2.6.16-rc1-git4.bz2 --- patch-2.6.16-rc1-git3.bz2.sign DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 21 23:29:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 21 Jan 2006 18:29:03 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.204, 1.205 anaconda.spec, 1.323, 1.324 sources, 1.323, 1.324 Message-ID: <200601212329.k0LNT3ab006013@cvs.devel.redhat.com> Author: dcantrel Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5998 Modified Files: .cvsignore anaconda.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.204 retrieving revision 1.205 diff -u -r1.204 -r1.205 --- .cvsignore 19 Jan 2006 04:59:54 -0000 1.204 +++ .cvsignore 21 Jan 2006 23:29:01 -0000 1.205 @@ -1,3 +1,4 @@ anaconda-10.91.4.tar.bz2 anaconda-10.91.5.tar.bz2 anaconda-10.91.6.tar.bz2 +anaconda-10.91.7.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.323 retrieving revision 1.324 diff -u -r1.323 -r1.324 --- anaconda.spec 19 Jan 2006 04:59:54 -0000 1.323 +++ anaconda.spec 21 Jan 2006 23:29:01 -0000 1.324 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.91.6 +Version: 10.91.7 Release: 1 License: GPL Summary: Graphical system installer @@ -78,6 +78,14 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Fri Jan 20 2006 David Cantrell - 10.91.7-1 +- Save state when moving back to "upgrade or install" window (#178095). +- Eject CD when in kickstart and given --eject parameter (clumens, #177554). +- Translate combo box and comments (clumens, #178250). +- Disable backend debugging mode for writeKS(). +- Added a PYTHONSTARTUP file to autoload readline, etc. (pjones). +- Write %packages section in template kickstart file (clumens, pnasrat). + * Wed Jan 18 2006 David Cantrell - 10.91.6-1 - i18n fixes (katzj) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.323 retrieving revision 1.324 diff -u -r1.323 -r1.324 --- sources 19 Jan 2006 04:59:54 -0000 1.323 +++ sources 21 Jan 2006 23:29:01 -0000 1.324 @@ -1 +1 @@ -9aa62660fabf76a7bd57ab3e9e5263cb anaconda-10.91.6.tar.bz2 +17119f38765dd1031f94523ba43bbb33 anaconda-10.91.7.tar.bz2 From fedora-cvs-commits at redhat.com Sun Jan 22 07:16:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 02:16:36 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1865,1.1866 Message-ID: <200601220716.k0M7GaPF015174@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13570 Modified Files: kernel-2.6.spec Log Message: disable block-stack patch as an experiment Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1865 retrieving revision 1.1866 diff -u -r1.1865 -r1.1866 --- kernel-2.6.spec 21 Jan 2006 22:32:12 -0000 1.1865 +++ kernel-2.6.spec 22 Jan 2006 07:16:33 -0000 1.1866 @@ -802,7 +802,7 @@ # Silence noisy CD drive spew %patch1730 -p1 # Reduce stack usage in block layer -%patch1740 -p1 +#%patch1740 -p1 # Enable USB storage,UB & libusual magick. #%patch1750 -p1 # Enable SATA ATAPI by default. From fedora-cvs-commits at redhat.com Sun Jan 22 07:33:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 02:33:40 -0500 Subject: rpms/gnome-media/devel gnome-media-2.13.5-hide-help-button.patch, NONE, 1.1 gnome-media.spec, 1.51, 1.52 Message-ID: <200601220733.k0M7Xetm011592@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/gnome-media/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11577 Modified Files: gnome-media.spec Added Files: gnome-media-2.13.5-hide-help-button.patch Log Message: * Sun Jan 22 2006 Christopher Aillon - 2.13.5-2 - Disable the help button in gnome-audio-profiles-properties since it isn't yet hooked up to anything. gnome-media-2.13.5-hide-help-button.patch: audio-profiles-edit.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE gnome-media-2.13.5-hide-help-button.patch --- Index: gnome-media/profiles/audio-profiles-edit.c =================================================================== RCS file: /cvs/gnome/gnome-media/profiles/audio-profiles-edit.c,v retrieving revision 1.9 diff -d -u -p -r1.9 audio-profiles-edit.c --- gnome-media/profiles/audio-profiles-edit.c 24 Jul 2005 08:55:30 -0000 1.9 +++ gnome-media/profiles/audio-profiles-edit.c 22 Jan 2006 07:12:47 -0000 @@ -605,8 +605,10 @@ gm_audio_profiles_edit_init (GMAudioProf // FIXME: GTK_DIALOG_DESTROY_WITH_PARENT, gtk_window_set_title (GTK_WINDOW (dialog), _("Edit GMAudio Profiles")); gtk_dialog_add_buttons (GTK_DIALOG (dialog), +#if 0 GTK_STOCK_HELP, GTK_RESPONSE_HELP, +#endif GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL); Index: gnome-media.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- gnome-media.spec 18 Jan 2006 17:03:56 -0000 1.51 +++ gnome-media.spec 22 Jan 2006 07:33:38 -0000 1.52 @@ -11,12 +11,13 @@ Summary: GNOME media programs. Name: gnome-media Version: 2.13.5 -Release: 1 +Release: 2 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2 Patch3: gnome-media-2.9.90-no-oss-mixer.patch -Patch4: gnome-media-2.12.0-settings.patch +Patch4: gnome-media-2.12.0-settings.patch +Patch5: gnome-media-2.13.5-hide-help-button.patch Requires: scrollkeeper >= 0.1.4 BuildRoot: %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root @@ -64,6 +65,7 @@ %setup -q %patch3 -p1 -b .no-oss-mixer %patch4 -p1 -b .settings +%patch5 -p1 -b .hide-help-button %build %configure @@ -153,6 +155,10 @@ %{_libdir}/pkgconfig/* %changelog +* Sun Jan 22 2006 Christopher Aillon - 2.13.5-2 +- Disable the help button in gnome-audio-profiles-properties since + it isn't yet hooked up to anything. + * Wed Jan 18 2006 John (J5) Palmieri - 2.13.5-1 - Upgrade to 2.13.5 - Pull in gstreamer08 not gstreamer From fedora-cvs-commits at redhat.com Sun Jan 22 07:58:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 02:58:18 -0500 Subject: rpms/kernel/devel/configs config-generic, 1.137, 1.138 config-x86-generic, 1.30, 1.31 Message-ID: <200601220758.k0M7wIOF001192@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv1092/configs Modified Files: config-generic config-x86-generic Log Message: another experiment, turn on some more debugging. Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- config-generic 19 Jan 2006 22:08:20 -0000 1.137 +++ config-generic 22 Jan 2006 07:58:16 -0000 1.138 @@ -2444,13 +2444,13 @@ # CONFIG_FRAME_POINTER is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_VM is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_DEBUG_RODATA is not set # Turn off these debug options for production kernels. CONFIG_DEBUG_SLAB=y CONFIG_DEBUG_MUTEXES=y +CONFIG_DEBUG_VM=y CONFIG_KMALLOC_ACCOUNTING=y # CONFIG_WAKEUP_TIMING is not set Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- config-x86-generic 19 Jan 2006 22:08:21 -0000 1.30 +++ config-x86-generic 22 Jan 2006 07:58:16 -0000 1.31 @@ -204,10 +204,12 @@ CONFIG_DEBUG_RODATA=y CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_DEBUG_STACK_USAGE=y -# CONFIG_DEBUG_PAGEALLOC is not set CONFIG_4KSTACKS=y CONFIG_KPROBES=y +# FIXME: Disable before release. +CONFIG_DEBUG_PAGEALLOC=y + CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_BIOS=y From fedora-cvs-commits at redhat.com Sun Jan 22 07:58:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 02:58:56 -0500 Subject: rpms/libusb/devel libusb.spec,1.18,1.19 Message-ID: <200601220758.k0M7wuAm001525@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/libusb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1301 Modified Files: libusb.spec Log Message: * Fri Jan 20 2006 Jindrich Novy 0.1.11-1 - 0.1.11 - require pkgconfig, package libusb.pc Index: libusb.spec =================================================================== RCS file: /cvs/dist/rpms/libusb/devel/libusb.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- libusb.spec 19 Dec 2005 16:11:10 -0000 1.18 +++ libusb.spec 22 Jan 2006 07:58:53 -0000 1.19 @@ -1,13 +1,13 @@ Summary: A library which allows userspace access to USB devices. Name: libusb -Version: 0.1.10a -Release: 3 +Version: 0.1.11 +Release: 1 Source0: http://prdownloads.sourceforge.net/libusb/%{name}-%{version}.tar.gz License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://sourceforge.net/projects/libusb/ -BuildRequires: docbook-utils +BuildRequires: docbook-utils, pkgconfig BuildRequires: docbook-dtds >= 1.0-5 ExcludeArch: s390 s390x @@ -25,6 +25,10 @@ %prep %setup -q +# Fix libdir in configure.in. +mv -f configure.in configure.in.old +sed -e 's|\${libdir}|$RPM_BUILD_ROOT%{_libdir}|' < configure.in.old > configure.in + aclocal automake --add-missing --copy libtoolize --copy --force @@ -56,6 +60,7 @@ %defattr(-,root,root) %doc AUTHORS README INSTALL.libusb NEWS ChangeLog doc/manual.ps doc/html %{_bindir}/libusb-config +%{_libdir}/pkgconfig/libusb.pc %{_includedir}/* %{_libdir}/*.so %{_libdir}/*.a @@ -63,6 +68,10 @@ %changelog +* Fri Jan 20 2006 Jindrich Novy 0.1.11-1 +- 0.1.11 +- require pkgconfig, package libusb.pc + * Mon Dec 19 2005 Tim Waugh 0.1.10a-3 - Rebuild. From fedora-cvs-commits at redhat.com Sun Jan 22 08:05:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 03:05:16 -0500 Subject: rpms/libusb/devel .cvsignore,1.8,1.9 sources,1.8,1.9 Message-ID: <200601220805.k0M85GwW002417@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/libusb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2360 Modified Files: .cvsignore sources Log Message: Upload new source tarball. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libusb/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 9 Mar 2005 13:00:02 -0000 1.8 +++ .cvsignore 22 Jan 2006 08:04:53 -0000 1.9 @@ -2,3 +2,4 @@ libusb-0.1.9.tar.gz libusb-0.1.10.tar.gz libusb-0.1.10a.tar.gz +libusb-0.1.11.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/libusb/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 9 Mar 2005 13:00:02 -0000 1.8 +++ sources 22 Jan 2006 08:04:53 -0000 1.9 @@ -1 +1 @@ -c6062b29acd2cef414bcc34e0decbdd1 libusb-0.1.10a.tar.gz +df79951a36333104a663c30cb598df37 libusb-0.1.11.tar.gz From fedora-cvs-commits at redhat.com Sun Jan 22 10:12:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 05:12:45 -0500 Subject: rpms/libusb/devel libusb-0.1.11-format.patch, NONE, 1.1 libusb.spec, 1.19, 1.20 Message-ID: <200601221012.k0MACjal025336@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/libusb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25244 Modified Files: libusb.spec Added Files: libusb-0.1.11-format.patch Log Message: - fix printf format in linux.c so that libusb can be built with -Werror (default) libusb-0.1.11-format.patch: linux.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE libusb-0.1.11-format.patch --- --- libusb-0.1.11/linux.c.format 2006-01-20 00:25:05.000000000 +0100 +++ libusb-0.1.11/linux.c 2006-01-22 09:48:05.000000000 +0100 @@ -564,7 +564,7 @@ int usb_os_determine_children(struct usb dev->children = malloc(sizeof(struct usb_device *) * dev->num_children); if (!dev->children) { if (usb_debug > 1) - fprintf(stderr, "error allocating %d bytes memory for dev->children\n", + fprintf(stderr, "error allocating %lu bytes memory for dev->children\n", sizeof(struct usb_device *) * dev->num_children); dev->num_children = 0; Index: libusb.spec =================================================================== RCS file: /cvs/dist/rpms/libusb/devel/libusb.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- libusb.spec 22 Jan 2006 07:58:53 -0000 1.19 +++ libusb.spec 22 Jan 2006 10:12:43 -0000 1.20 @@ -3,6 +3,7 @@ Version: 0.1.11 Release: 1 Source0: http://prdownloads.sourceforge.net/libusb/%{name}-%{version}.tar.gz +Patch0: libusb-0.1.11-format.patch License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -25,6 +26,8 @@ %prep %setup -q +%patch0 -p1 -b .format + # Fix libdir in configure.in. mv -f configure.in configure.in.old sed -e 's|\${libdir}|$RPM_BUILD_ROOT%{_libdir}|' < configure.in.old > configure.in @@ -71,6 +74,7 @@ * Fri Jan 20 2006 Jindrich Novy 0.1.11-1 - 0.1.11 - require pkgconfig, package libusb.pc +- fix printf format in linux.c so that libusb can be built with -Werror (default) * Mon Dec 19 2005 Tim Waugh 0.1.10a-3 - Rebuild. From fedora-cvs-commits at redhat.com Sun Jan 22 13:26:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 08:26:00 -0500 Subject: rpms/libusb/devel libusb-0.1.11-format.patch,1.1,1.2 Message-ID: <200601221326.k0MDQ05x001807@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/libusb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1792 Modified Files: libusb-0.1.11-format.patch Log Message: - explicitely cast type after format libusb-0.1.11-format.patch: linux.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: libusb-0.1.11-format.patch =================================================================== RCS file: /cvs/dist/rpms/libusb/devel/libusb-0.1.11-format.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libusb-0.1.11-format.patch 22 Jan 2006 10:12:43 -0000 1.1 +++ libusb-0.1.11-format.patch 22 Jan 2006 13:25:57 -0000 1.2 @@ -1,11 +1,13 @@ --- libusb-0.1.11/linux.c.format 2006-01-20 00:25:05.000000000 +0100 -+++ libusb-0.1.11/linux.c 2006-01-22 09:48:05.000000000 +0100 -@@ -564,7 +564,7 @@ int usb_os_determine_children(struct usb ++++ libusb-0.1.11/linux.c 2006-01-22 11:20:33.000000000 +0100 +@@ -564,8 +564,8 @@ int usb_os_determine_children(struct usb dev->children = malloc(sizeof(struct usb_device *) * dev->num_children); if (!dev->children) { if (usb_debug > 1) - fprintf(stderr, "error allocating %d bytes memory for dev->children\n", +- sizeof(struct usb_device *) * dev->num_children); + fprintf(stderr, "error allocating %lu bytes memory for dev->children\n", - sizeof(struct usb_device *) * dev->num_children); ++ (long unsigned int) sizeof(struct usb_device *) * dev->num_children); dev->num_children = 0; + close(fd); From fedora-cvs-commits at redhat.com Sun Jan 22 14:29:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 09:29:34 -0500 Subject: rpms/gmime/devel .cvsignore, 1.3, 1.4 gmime.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200601221429.k0METYJX014293@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/gmime/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14182 Modified Files: .cvsignore gmime.spec sources Log Message: * Sun Jan 22 2006 Alexander Larsson - 2.1.19-1 - Update to 2.1.19 (needed by beagle 0.2.0) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gmime/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jan 2006 11:11:59 -0000 1.3 +++ .cvsignore 22 Jan 2006 14:29:30 -0000 1.4 @@ -1,2 +1 @@ -gmime-2.1.15.tar.gz -gmime-2.1.17.tar.gz +gmime-2.1.19.tar.gz Index: gmime.spec =================================================================== RCS file: /cvs/dist/rpms/gmime/devel/gmime.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gmime.spec 19 Jan 2006 11:28:28 -0000 1.5 +++ gmime.spec 22 Jan 2006 14:29:30 -0000 1.6 @@ -1,6 +1,6 @@ Name: gmime -Version: 2.1.17 -Release: 3 +Version: 2.1.19 +Release: 1 Summary: Library for creating and parsing MIME messages Group: System Environment/Libraries @@ -109,6 +109,9 @@ %endif %changelog +* Sun Jan 22 2006 Alexander Larsson - 2.1.19-1 +- Update to 2.1.19 (needed by beagle 0.2.0) + * Thu Jan 19 2006 Alexander Larsson 2.1.17-3 - Build on s390x Index: sources =================================================================== RCS file: /cvs/dist/rpms/gmime/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2006 11:11:59 -0000 1.3 +++ sources 22 Jan 2006 14:29:30 -0000 1.4 @@ -1 +1 @@ -9a3075219597d461f153c4c34056f553 gmime-2.1.17.tar.gz +81475ea1a2074a3c402e31651ea357df gmime-2.1.19.tar.gz From fedora-cvs-commits at redhat.com Sun Jan 22 14:32:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 09:32:32 -0500 Subject: rpms/beagle/devel .cvsignore, 1.4, 1.5 beagle.spec, 1.15, 1.16 sources, 1.4, 1.5 Message-ID: <200601221432.k0MEWWD7015176@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15121 Modified Files: .cvsignore beagle.spec sources Log Message: * Sun Jan 22 2006 Alexander Larsson - 0.2.0-1 - update to 0.2.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Jan 2006 18:20:08 -0000 1.4 +++ .cvsignore 22 Jan 2006 14:32:29 -0000 1.5 @@ -1 +1 @@ -beagle-0.1.4.tar.bz2 +beagle-0.2.0.tar.bz2 Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- beagle.spec 18 Jan 2006 19:34:03 -0000 1.15 +++ beagle.spec 22 Jan 2006 14:32:29 -0000 1.16 @@ -1,6 +1,6 @@ Name: beagle -Version: 0.1.4 -Release: 4 +Version: 0.2.0 +Release: 1 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -9,19 +9,16 @@ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: beagle-mono-1.1.12.patch - -BuildRequires: mono-devel mono-data mono-data-sqlite gmime-sharp gecko-sharp2 +BuildRequires: mono-devel mono-data mono-data-sqlite BuildRequires: gtk-sharp2-gapi sqlite2-devel mono-web zip libexif-devel -BuildRequires: mozilla-devel gsf-sharp -BuildRequires: evolution-sharp >= 0.10.2-3 +BuildRequires: gsf-sharp +BuildRequires: gmime-sharp >= 2.1.19 +BuildRequires: evolution-sharp >= 0.10.2-3 +BuildRequires: libXScrnSaver-devel Requires: sqlite2 zip mono-core poppler-utils -# Mono only availible on these: (s390x disabled for now) -ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x - -# Some build issue on s390: -ExcludeArch: s390 +# Mono only availible on these: +ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x %description A general infrastructure for making your data easy to find. @@ -52,7 +49,6 @@ %prep %setup -q -%patch1 -p0 -b .mono1_1_12_1 %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -82,7 +78,7 @@ desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Red-Hat-Base \ - $RPM_BUILD_ROOT%{_datadir}/applications/best.desktop + $RPM_BUILD_ROOT%{_datadir}/applications/beagle-search.desktop desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -144,6 +140,9 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Sun Jan 22 2006 Alexander Larsson - 0.2.0-1 +- update to 0.2.0 + * Wed Jan 18 2006 Ray Strode - 0.1.4-4 - depend on poppler for pdf utilities instead of xpdf (bug 177446) Index: sources =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Jan 2006 18:20:08 -0000 1.4 +++ sources 22 Jan 2006 14:32:29 -0000 1.5 @@ -1 +1 @@ -52a1d2ca08e9350d368c18b90b1d7604 beagle-0.1.4.tar.bz2 +faa236b812db1a8ee72c58d2cb810010 beagle-0.2.0.tar.bz2 From fedora-cvs-commits at redhat.com Sun Jan 22 14:38:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 09:38:45 -0500 Subject: rpms/gsf-sharp/devel gsf-sharp.spec,1.5,1.6 Message-ID: <200601221438.k0MEcjjs017045@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/gsf-sharp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16980 Modified Files: gsf-sharp.spec Log Message: build on s390x Index: gsf-sharp.spec =================================================================== RCS file: /cvs/dist/rpms/gsf-sharp/devel/gsf-sharp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gsf-sharp.spec 9 Jan 2006 18:14:10 -0000 1.5 +++ gsf-sharp.spec 22 Jan 2006 14:38:43 -0000 1.6 @@ -1,6 +1,6 @@ Name: gsf-sharp Version: 0.6 -Release: 4 +Release: 5 Summary: Mono bindings for libgsf Group: System Environment/Libraries @@ -12,8 +12,8 @@ BuildRequires: mono-devel libgsf-devel gtk-sharp2-gapi Requires: libgsf -# Mono only availible on these: (s390x disabled for now) -ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x +# Mono only availible on these: +ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x %description Mono bindings for libgsf @@ -50,6 +50,9 @@ %{_prefix}/share/gapi-2.0/gsf-api.xml %changelog +* Sun Jan 22 2006 Alexander Larsson 0.6-5 +- Build on s390x + * Mon Jan 9 2006 Alexander Larsson - 0.6-4 - Add s390 target From fedora-cvs-commits at redhat.com Sun Jan 22 14:44:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 09:44:23 -0500 Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.7,1.8 Message-ID: <200601221444.k0MEiNbp019600@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/evolution-sharp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19526 Modified Files: evolution-sharp.spec Log Message: build on s390x Index: evolution-sharp.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- evolution-sharp.spec 11 Jan 2006 08:51:39 -0000 1.7 +++ evolution-sharp.spec 22 Jan 2006 14:44:20 -0000 1.8 @@ -1,6 +1,6 @@ Name: evolution-sharp Version: 0.10.2 -Release: 3 +Release: 4 Summary: Evolution Data Server Mono Bindings Group: System Environment/Libraries @@ -17,8 +17,8 @@ Requires: evolution-data-server -# Mono only availible on these: (s390x disabled for now) -ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 #s390x +# Mono only availible on these: +ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x %description Mono/C# bindings for the Evolution addressbook. @@ -57,6 +57,9 @@ %{_prefix}/share/gapi-2.0/* %changelog +* Sun Jan 22 2006 Alexander Larsson 0.10.2-4 +- Build on s390x + * Tue Jan 10 2006 Alexander Larsson - 0.10.2-3 - Fix evo 2.6 patch - Add evolibdir pkg-config variable patch from cvs (modified for evo 2.6) From fedora-cvs-commits at redhat.com Sun Jan 22 18:48:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 13:48:00 -0500 Subject: rpms/udev/devel udev.spec,1.137,1.138 Message-ID: <200601221848.k0MIm0EZ004592@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4537 Modified Files: udev.spec Log Message: * Sun Jan 22 2006 Kristian H??gsberg 078-5 - Drop udev dependency (#178621). Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- udev.spec 11 Jan 2006 12:11:24 -0000 1.137 +++ udev.spec 22 Jan 2006 18:47:58 -0000 1.138 @@ -5,7 +5,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 078 -Release: 4 +Release: 5 License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -25,7 +25,7 @@ ExclusiveOS: Linux URL: http://kernel.org/pub/linux/utils/kernel/hotplug/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Prereq: /bin/sh fileutils hotplug +Prereq: /bin/sh fileutils Prereq: MAKEDEV >= 0:3.11 BuildRequires: sed libselinux-devel >= 0:1.17.9-2 flex libsepol-devel BuildRequires: pam-devel glib2-devel bison @@ -277,6 +277,9 @@ %attr(0644,root,root) %{_mandir}/man8/vol_id*.8* %changelog +* Sun Jan 22 2006 Kristian H??gsberg 078-5 +- Drop udev dependency (#178621). + * Tue Jan 11 2006 Harald Hoyer - 078-4 - removed group "video" from the rules - fixed specfile From fedora-cvs-commits at redhat.com Sun Jan 22 20:22:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 15:22:25 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver-2.13.5-use-less-cpu.patch, NONE, 1.1 gnome-screensaver.spec, 1.48, 1.49 Message-ID: <200601222022.k0MKMPqQ032542@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32449 Modified Files: gnome-screensaver.spec Added Files: gnome-screensaver-2.13.5-use-less-cpu.patch Log Message: - throttle cpu usage in floaters screensaver to allow things like background compiles to be faster (bug 178496). gnome-screensaver-2.13.5-use-less-cpu.patch: floaters.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) --- NEW FILE gnome-screensaver-2.13.5-use-less-cpu.patch --- --- gnome-screensaver-2.13.5/savers/floaters.c.use-less-cpu 2006-01-22 15:07:10.000000000 -0500 +++ gnome-screensaver-2.13.5/savers/floaters.c 2006-01-22 15:08:55.000000000 -0500 @@ -39,7 +39,7 @@ #include "gs-theme-window.h" #ifndef OPTIMAL_FRAME_RATE -#define OPTIMAL_FRAME_RATE (30.0) +#define OPTIMAL_FRAME_RATE (25.0) #endif #ifndef STAT_PRINT_FREQUENCY @@ -148,7 +148,7 @@ gdouble updates_per_second; gdouble frames_per_second; - guint state_update_idle_id; + guint state_update_timeout_id; guint stats_update_timeout_id; GList *floaters; @@ -828,8 +828,9 @@ screen_saver_get_initial_state (screen_saver); - screen_saver->state_update_idle_id = - g_idle_add ((GSourceFunc) screen_saver_do_update_state, screen_saver); + screen_saver->state_update_timeout_id = + g_timeout_add (1000 / (2.0 * OPTIMAL_FRAME_RATE), + (GSourceFunc) screen_saver_do_update_state, screen_saver); screen_saver->stats_update_timeout_id = g_timeout_add (1000, (GSourceFunc) screen_saver_do_update_stats, @@ -848,8 +849,8 @@ g_hash_table_destroy (screen_saver->cached_sources); - if (screen_saver->state_update_idle_id != 0) - g_source_remove (screen_saver->state_update_idle_id); + if (screen_saver->state_update_timeout_id != 0) + g_source_remove (screen_saver->state_update_timeout_id); if (screen_saver->stats_update_timeout_id != 0) g_source_remove (screen_saver->stats_update_timeout_id); Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- gnome-screensaver.spec 19 Jan 2006 21:06:28 -0000 1.48 +++ gnome-screensaver.spec 22 Jan 2006 20:22:22 -0000 1.49 @@ -14,7 +14,7 @@ Summary: GNOME Sreensaver Name: gnome-screensaver Version: 2.13.5 -Release: 3 +Release: 4 License: GPL Group: Amusement/Graphics Source0: %{name}-%{version}.tar.bz2 @@ -25,6 +25,7 @@ Patch0: gnome-screensaver-0.0.22-lock-dialog.patch Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch +Patch2: gnome-screensaver-2.13.5-use-less-cpu.patch BuildRoot: %{_tmppath}/%{name}-root URL: http://www.gnome.org @@ -57,11 +58,10 @@ simple, sane, secure defaults and be well integrated with the desktop. %prep -%setup -q +%setup -q -a2 %patch0 -p1 -b .lock-dialog %patch1 -p1 -b .use-floaters-by-default - -tar xzf %{SOURCE2} +%patch2 -p1 -b .use-less-cpu %build intltoolize --force @@ -122,6 +122,10 @@ %{_sysconfdir}/pam.d/* %changelog +* Sun Jan 22 2006 Ray Strode - 2.13.5-4 +- throttle cpu usage in floaters screensaver to allow things + like background compiles to be faster (bug 178496). + * Thu Jan 19 2006 Matthias Clasen - 2.13.5-3 - Slight improvements to the Fedora lock dialog From fedora-cvs-commits at redhat.com Sun Jan 22 20:49:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 15:49:54 -0500 Subject: rpms/dhcp/devel dhcp-3.0.2-dhclient-script-dhcdbd.patch, 1.1, 1.2 dhcp.spec, 1.82, 1.83 Message-ID: <200601222049.k0MKnsPX023130@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/dhcp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23055 Modified Files: dhcp-3.0.2-dhclient-script-dhcdbd.patch dhcp.spec Log Message: * Sun Jan 22 2006 Dan Williams - 11:3.0.3-21 - Fix dhclient-script to use /bin/dbus-send now that all dbus related binaries are in /bin rather than /usr/bin dhcp-3.0.2-dhclient-script-dhcdbd.patch: linux | 306 ++++++++++++++++++++++++++++++++++++------------------------------ 1 files changed, 167 insertions(+), 139 deletions(-) Index: dhcp-3.0.2-dhclient-script-dhcdbd.patch =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp-3.0.2-dhclient-script-dhcdbd.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dhcp-3.0.2-dhclient-script-dhcdbd.patch 25 Apr 2005 16:37:49 -0000 1.1 +++ dhcp-3.0.2-dhclient-script-dhcdbd.patch 22 Jan 2006 20:49:50 -0000 1.2 @@ -5,7 +5,7 @@ # by the dhclient C code, and passed on. +if [ -n "${dhc_dbus}" ]; then -+ /usr/bin/dbus-send \ ++ /bin/dbus-send \ + --system \ + --dest=com.redhat.dhcp \ + --type=method_call \ Index: dhcp.spec =================================================================== RCS file: /cvs/dist/rpms/dhcp/devel/dhcp.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- dhcp.spec 16 Jan 2006 21:18:31 -0000 1.82 +++ dhcp.spec 22 Jan 2006 20:49:50 -0000 1.83 @@ -2,7 +2,7 @@ Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent. Name: dhcp Version: 3.0.3 -Release: 20 +Release: 21 Epoch: 11 License: distributable Group: System Environment/Daemons @@ -325,6 +325,10 @@ %{_mandir}/man3/* %changelog +* Sun Jan 22 2006 Dan Williams - 11:3.0.3-21 +- Fix dhclient-script to use /bin/dbus-send now that all dbus related + binaries are in /bin rather than /usr/bin + * Mon Jan 16 2006 Jason Vas Dias - 11:3.0.3-20 - fix bug 177845: allow client ip-address as default router - fix bug 176615: fix DDNS update when Windows-NT client sends From fedora-cvs-commits at redhat.com Sun Jan 22 20:56:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 15:56:32 -0500 Subject: rpms/desktop-file-utils/devel desktop-file-utils-0.10-dont-use-unintialized-memory.patch, NONE, 1.1 desktop-file-utils.spec, 1.21, 1.22 Message-ID: <200601222056.k0MKuWiX026154@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/desktop-file-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26062 Modified Files: desktop-file-utils.spec Added Files: desktop-file-utils-0.10-dont-use-unintialized-memory.patch Log Message: - don't use uninitialized memory (bug 178591) desktop-file-utils-0.10-dont-use-unintialized-memory.patch: update-desktop-database.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE desktop-file-utils-0.10-dont-use-unintialized-memory.patch --- --- desktop-file-utils-0.10/src/update-desktop-database.c.dont-use-uninitialized-memory 2006-01-22 15:53:08.000000000 -0500 +++ desktop-file-utils-0.10/src/update-desktop-database.c 2006-01-22 15:53:17.000000000 -0500 @@ -444,7 +444,7 @@ for (i = 0; data_dirs[i] != NULL; i++); - args = g_new (char *, i + 1); + args = g_new0 (char *, i + 1); for (i = 0; data_dirs[i] != NULL; i++) args[i] = g_build_filename (data_dirs[i], "applications", NULL); Index: desktop-file-utils.spec =================================================================== RCS file: /cvs/dist/rpms/desktop-file-utils/devel/desktop-file-utils.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- desktop-file-utils.spec 9 Dec 2005 22:40:10 -0000 1.21 +++ desktop-file-utils.spec 22 Jan 2006 20:56:29 -0000 1.22 @@ -1,10 +1,11 @@ Summary: Utilities for manipulating .desktop files Name: desktop-file-utils Version: 0.10 -Release: 3.1 +Release: 4 URL: http://www.freedesktop.org/software/desktop-file-utils Source0: %{name}-%{version}.tar.gz Patch0: desktop-file-utils-0.9-nogroup.patch +Patch1: desktop-file-utils-0.10-dont-use-unintialized-memory.patch License: GPL Group: Development/Tools BuildRoot: %{_tmppath}/%{name}-root @@ -26,6 +27,7 @@ %prep %setup -q %patch0 -p1 -b .nogroup +%patch1 -p1 -b .dont-use-uninitialized-memory %build @@ -49,6 +51,9 @@ %{_datadir}/emacs/site-lisp/ %changelog +* Sun Jan 22 2006 Ray Strode - 0.10-4 +- don't use uninitialized memory (bug 178591) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Sun Jan 22 21:14:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 16:14:29 -0500 Subject: rpms/dmraid/devel dmraid.spec,1.29,1.30 Message-ID: <200601222114.k0MLEToT031967@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/dmraid/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31402 Modified Files: dmraid.spec Log Message: Fix build deps Index: dmraid.spec =================================================================== RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- dmraid.spec 9 Dec 2005 22:40:13 -0000 1.29 +++ dmraid.spec 22 Jan 2006 21:14:26 -0000 1.30 @@ -7,12 +7,13 @@ Summary: dmraid (Device-mapper RAID tool and library) Name: dmraid Version: 1.0.0.rc9 -Release: FC5_4.1 +Release: FC5_5 +>>>>>>> 1.29 License: GPL Group: System Environment/Base URL: http://people.redhat.com/heinzm/sw/dmraid BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -BuildRequires: device-mapper >= 1.02.02-2 +BuildRequires: device-mapper >= 1.02.02-2, libselinux-devel, libsepol-devel Source: ftp://people.redhat.com/heinzm/sw/dmraid/src/dmraid-%{version}.tar.bz2 Patch0: dmraid-1.0.0.rc9-selinux.patch Patch1: dmraid-1.0.0.rc9-install.patch @@ -102,7 +103,10 @@ %endif %changelog -* Fri Dec 09 2005 Jesse Keating +* Sun Jan 22 2006 Peter Jones 1.0.0.rc9-FC5_5 +- Add selinux build deps + +* Fri Dec 9 2005 Jesse Keating 1.0.0.rc9-FC5_4.1 - rebuilt * Sun Dec 3 2005 Peter Jones 1.0.0.rc9-FC5_4 From fedora-cvs-commits at redhat.com Sun Jan 22 21:18:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 16:18:29 -0500 Subject: rpms/dmraid/devel dmraid.spec,1.30,1.31 Message-ID: <200601222118.k0MLITwY013471@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/dmraid/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13432 Modified Files: dmraid.spec Log Message: fix typo Index: dmraid.spec =================================================================== RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- dmraid.spec 22 Jan 2006 21:14:26 -0000 1.30 +++ dmraid.spec 22 Jan 2006 21:18:26 -0000 1.31 @@ -8,7 +8,6 @@ Name: dmraid Version: 1.0.0.rc9 Release: FC5_5 ->>>>>>> 1.29 License: GPL Group: System Environment/Base URL: http://people.redhat.com/heinzm/sw/dmraid From fedora-cvs-commits at redhat.com Sun Jan 22 21:34:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 16:34:13 -0500 Subject: rpms/dmraid/devel dmraid-1.0.0.rc9-owner.patch, NONE, 1.1 dmraid.spec, 1.31, 1.32 Message-ID: <200601222134.k0MLYDHW007838@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/dmraid/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7807 Modified Files: dmraid.spec Added Files: dmraid-1.0.0.rc9-owner.patch Log Message: Fix 'make install' for non-root users dmraid-1.0.0.rc9-owner.patch: include/Makefile.in | 2 +- lib/Makefile.in | 5 ++--- man/Makefile.in | 2 +- tools/Makefile.in | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) --- NEW FILE dmraid-1.0.0.rc9-owner.patch --- --- dmraid/1.0.0.rc9/man/Makefile.in.owner 2006-01-22 16:27:20.000000000 -0500 +++ dmraid/1.0.0.rc9/man/Makefile.in 2006-01-22 16:27:45.000000000 -0500 @@ -21,7 +21,7 @@ for f in $(MAN8); \ do \ $(RM) $(MAN8DIR)/$$f; \ - @INSTALL@ -D -o $(OWNER) -g $(GROUP) -m 444 $$f $(MAN8DIR)/$$f; \ + @INSTALL@ -D -m 444 $$f $(MAN8DIR)/$$f; \ done install: install_dmraid_man --- dmraid/1.0.0.rc9/tools/Makefile.in.owner 2006-01-22 16:27:20.000000000 -0500 +++ dmraid/1.0.0.rc9/tools/Makefile.in 2006-01-22 16:27:51.000000000 -0500 @@ -55,7 +55,7 @@ install_dmraid_tools: $(TARGETS) @echo "Installing $(TARGETS) in $(sbindir)"; \ mkdir -p $(sbindir); \ - $(INSTALL) -o $(OWNER) -g $(GROUP) $(STRIP) $(TARGETS) $(sbindir) + $(INSTALL) $(STRIP) $(TARGETS) $(sbindir) install: install_dmraid_tools --- dmraid/1.0.0.rc9/include/Makefile.in.owner 2006-01-22 16:27:20.000000000 -0500 +++ dmraid/1.0.0.rc9/include/Makefile.in 2006-01-22 16:27:57.000000000 -0500 @@ -18,7 +18,7 @@ install_dmraid_headers: $(HEADERS) @echo "Installing $(HEADERS) in $(includedir)/dmraid" mkdir -p $(includedir)/dmraid - $(INSTALL) -o $(OWNER) -g $(GROUP) $(STRIP) $(HEADERS) $(includedir)/dmraid + $(INSTALL) $(STRIP) $(HEADERS) $(includedir)/dmraid install: install_dmraid_headers --- dmraid/1.0.0.rc9/lib/Makefile.in.owner 2006-01-22 16:27:20.000000000 -0500 +++ dmraid/1.0.0.rc9/lib/Makefile.in 2006-01-22 16:28:23.000000000 -0500 @@ -64,12 +64,11 @@ do \ n=$$(basename $${f}) ; \ if [[ "$$n" =~ '.so$$' ]]; then \ - $(INSTALL) -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) \ + $(INSTALL) -m 555 $(STRIP) \ $$f $(libdir)/$${n}. at DMRAID_LIB_VERSION@; \ $(LN_S) -f $${n}. at DMRAID_LIB_VERSION@ $(libdir)/$${n}; \ else \ - $(INSTALL) -o $(OWNER) -g $(GROUP) -m 555 $(STRIP) \ - $$f $(libdir)/$${n}; \ + $(INSTALL) -m 555 $(STRIP) $$f $(libdir)/$${n}; \ fi \ done Index: dmraid.spec =================================================================== RCS file: /cvs/dist/rpms/dmraid/devel/dmraid.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- dmraid.spec 22 Jan 2006 21:18:26 -0000 1.31 +++ dmraid.spec 22 Jan 2006 21:34:11 -0000 1.32 @@ -21,6 +21,7 @@ Patch4: dmraid-1.0.0.rc9-table.patch Patch5: dmraid-1.0.0.rc9-destdir.patch Patch6: dmraid-1.0.0.rc9-counts.patch +Patch7: dmraid-1.0.0.rc9-owner.patch ExcludeArch: s390 ExcludeArch: s390x @@ -48,6 +49,7 @@ %patch4 -p2 -b .table %patch5 -p2 -b .destdir %patch6 -p2 -b .counts +%patch7 -p2 -b .owner %build %configure --prefix=${RPM_BUILD_ROOT}/usr --sbindir=${RPM_BUILD_ROOT}/sbin --libdir=${RPM_BUILD_ROOT}/%{_libdir} --mandir=${RPM_BUILD_ROOT}/%{_mandir} --includedir=${RPM_BUILD_ROOT}/%{_includedir} --enable-debug --enable-static_link @@ -104,6 +106,7 @@ %changelog * Sun Jan 22 2006 Peter Jones 1.0.0.rc9-FC5_5 - Add selinux build deps +- Don't set owner during make install * Fri Dec 9 2005 Jesse Keating 1.0.0.rc9-FC5_4.1 - rebuilt From fedora-cvs-commits at redhat.com Sun Jan 22 22:40:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 17:40:45 -0500 Subject: rpms/kernel/devel/configs config-generic,1.138,1.139 Message-ID: <200601222240.k0MMejii024885@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv24803/configs Modified Files: config-generic Log Message: make peoples modems work again Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v retrieving revision 1.138 retrieving revision 1.139 diff -u -r1.138 -r1.139 --- config-generic 22 Jan 2006 07:58:16 -0000 1.138 +++ config-generic 22 Jan 2006 22:40:42 -0000 1.139 @@ -1430,7 +1430,7 @@ CONFIG_SERIAL_8250_CS=m # CONFIG_SERIAL_8250_ACPI is not set CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y From fedora-cvs-commits at redhat.com Sun Jan 22 22:44:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 17:44:20 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1866,1.1867 Message-ID: <200601222244.k0MMiKgY026523@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26468 Modified Files: kernel-2.6.spec Log Message: Add missing .kernelrelease to kernel-devel (#178491) Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1866 retrieving revision 1.1867 diff -u -r1.1866 -r1.1867 --- kernel-2.6.spec 22 Jan 2006 07:16:33 -0000 1.1866 +++ kernel-2.6.spec 22 Jan 2006 22:44:17 -0000 1.1867 @@ -1024,6 +1024,8 @@ ln -sf ../../../include/asm-ppc* asm popd fi + cp .kernelrelease $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + # Make sure the Makefile and version.h have a matching timestamp so that # external modules can be built touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h @@ -1343,6 +1345,10 @@ %endif %changelog +* Sun Jan 22 2006 Dave Jones +- Add missing .kernelrelease to kernel-devel (#178491) +- Make serial /dev nodes get created for pci modems again. + * Sat Jan 21 2006 Dave Jones - 2.6.16-rc1-git4 From fedora-cvs-commits at redhat.com Sun Jan 22 22:44:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 17:44:33 -0500 Subject: rpms/kernel/devel patch-2.6.16-rc1-git4.bz2.sign,NONE,1.1 Message-ID: <200601222244.k0MMiXjn026645@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26590 Added Files: patch-2.6.16-rc1-git4.bz2.sign Log Message: sign --- NEW FILE patch-2.6.16-rc1-git4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBD0exdyGugalF9Dw4RAnfNAKCTy5g745oBer9YVfbrqZ2iDO+y+ACbBp5C iemK/VSL067J5hjAaJ/9+qw= =EgKq -----END PGP SIGNATURE----- From fedora-cvs-commits at redhat.com Mon Jan 23 01:09:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 20:09:37 -0500 Subject: rpms/festival/devel festival-1.95-fix-localhost-connections.patch, NONE, 1.1 festival.spec, 1.14, 1.15 Message-ID: <200601230109.k0N19bLl032463@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/festival/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32360 Modified Files: festival.spec Added Files: festival-1.95-fix-localhost-connections.patch Log Message: - get gnopernicus again. Patch from Fernando Herrera (bug 178312) festival-1.95-fix-localhost-connections.patch: server.cc | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE festival-1.95-fix-localhost-connections.patch --- --- festival-1.95/src/arch/festival/server.cc.orig 2003-01-20 13:07:58.000000000 +0100 +++ festival-1.95/src/arch/festival/server.cc 2005-08-02 04:03:35.000000000 +0200 @@ -213,7 +213,7 @@ clienthost = gethostbyaddr((char *)&peer.sin_addr, sizeof(peer.sin_addr),AF_INET); client_hostnum = inet_ntoa(peer.sin_addr); - if (streq(client_hostnum,"0.0.0.0")) // its me ! + if (streq(client_hostnum,"0.0.0.0") || streq(client_hostnum,"127.0.0.1")) // its me ! client_hostname = "localhost"; else if (clienthost == 0) // failed to get a name client_hostname = client_hostnum; Index: festival.spec =================================================================== RCS file: /cvs/dist/rpms/festival/devel/festival.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- festival.spec 9 Dec 2005 22:40:23 -0000 1.14 +++ festival.spec 23 Jan 2006 01:09:35 -0000 1.15 @@ -1,7 +1,7 @@ Name: festival Summary: A free speech synthesizer Version: 1.95 -Release: 4.1 +Release: 5 # we ship the 1.4.2 docs for now. %define docversion 1.4.2 @@ -66,6 +66,9 @@ Patch4: speech_tools-1.2.95-gcc4.patch Patch5: festival-1.95-gcc4.patch +# Get gnopernicus working again: bug 178312 +Patch6: festival-1.95-fix-localhost-connections.patch + # mattdm: this is a hack to make the shared libraries build with actual # sonames. I'm not sure I'm doing the right thing here, but this *does* # make it work. Someone should double check me. @@ -117,6 +120,7 @@ %patch3 -p1 %patch4 -p0 %patch5 -p1 +%patch6 -p1 -b .fix-localhost-connections %patch30 -p1 -b .soname # zero length @@ -287,6 +291,10 @@ %{_includedir}/festival/* %changelog +* Sun Jan 22 2006 Ray Strode - 1.95-5 +- get gnopernicus again. Patch from + Fernando Herrera (bug 178312) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Mon Jan 23 01:25:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 20:25:16 -0500 Subject: rpms/festival/devel festival.spec,1.15,1.16 Message-ID: <200601230125.k0N1PG0N010848@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/festival/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10835 Modified Files: festival.spec Log Message: - silence compiler Index: festival.spec =================================================================== RCS file: /cvs/dist/rpms/festival/devel/festival.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- festival.spec 23 Jan 2006 01:09:35 -0000 1.15 +++ festival.spec 23 Jan 2006 01:25:14 -0000 1.16 @@ -136,6 +136,7 @@ CFLAGS="$RPM_OPT_FLAGS -O0" export CFLAGS %endif +export CFLAGS="$CFLAGS -fno-strict-aliasing" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/speech_tools/lib:$PATH export PATH=`pwd`/bin:$PATH From fedora-cvs-commits at redhat.com Mon Jan 23 01:29:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 20:29:36 -0500 Subject: rpms/festival/devel festival.spec,1.16,1.17 Message-ID: <200601230129.k0N1TaR3010977@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/festival/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10964 Modified Files: festival.spec Log Message: s/CFLAGS/CXXFLAGS/ Index: festival.spec =================================================================== RCS file: /cvs/dist/rpms/festival/devel/festival.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- festival.spec 23 Jan 2006 01:25:14 -0000 1.16 +++ festival.spec 23 Jan 2006 01:29:34 -0000 1.17 @@ -136,7 +136,7 @@ CFLAGS="$RPM_OPT_FLAGS -O0" export CFLAGS %endif -export CFLAGS="$CFLAGS -fno-strict-aliasing" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/speech_tools/lib:$PATH export PATH=`pwd`/bin:$PATH From fedora-cvs-commits at redhat.com Mon Jan 23 02:17:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 21:17:41 -0500 Subject: rpms/festival/devel festival.spec,1.17,1.18 Message-ID: <200601230217.k0N2HfmB015594@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/festival/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13970 Modified Files: festival.spec Log Message: try again to kluge this to compile Index: festival.spec =================================================================== RCS file: /cvs/dist/rpms/festival/devel/festival.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- festival.spec 23 Jan 2006 01:29:34 -0000 1.17 +++ festival.spec 23 Jan 2006 02:17:38 -0000 1.18 @@ -136,14 +136,13 @@ CFLAGS="$RPM_OPT_FLAGS -O0" export CFLAGS %endif -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/speech_tools/lib:$PATH export PATH=`pwd`/bin:$PATH pushd speech_tools %configure -make +make CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-error" CFLAGS="$RPM_OPT_FLAGS -fno-string-aliasing -Wno-error" #g++ -shared -L../../../speech_tools/lib -lestools -lestbase -leststring -ltermcap -Wl,-soname -Wl,libFestival.so.1 -Wl,--rpath -Wl,/usr/lib -o ../libFestival.so.1.4.1 * From fedora-cvs-commits at redhat.com Mon Jan 23 02:51:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 21:51:49 -0500 Subject: rpms/xscreensaver/devel xscreensaver-4.22-use-hackdirname.patch, NONE, 1.1 xscreensaver-4.22-use-manname.patch, NONE, 1.1 xscreensaver-4.22-write-explicit-dirname.patch, NONE, 1.1 xscreensaver.spec, 1.71, 1.72 xscreensaver-4.22-allow-zero-dpms-timeout.patch, 1.1, NONE xscreensaver-4.22-dont-use-invalid-iters.patch, 1.1, NONE xscreensaver-4.22-ignore-unprintable-characters.patch, 1.1, NONE xscreensaver-4.22-make-hack-paths-absolute.patch, 1.2, NONE xscreensaver-4.22-realpath-heap-allocate.patch, 1.1, NONE xscreensaver-4.22-remove-density-option.patch, 1.1, NONE xscreensaver-4.22-signal-handler-fun.patch, 1.1, NONE Message-ID: <200601230251.k0N2pnrb011667@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xscreensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11553 Modified Files: xscreensaver.spec Added Files: xscreensaver-4.22-use-hackdirname.patch xscreensaver-4.22-use-manname.patch xscreensaver-4.22-write-explicit-dirname.patch Removed Files: xscreensaver-4.22-allow-zero-dpms-timeout.patch xscreensaver-4.22-dont-use-invalid-iters.patch xscreensaver-4.22-ignore-unprintable-characters.patch xscreensaver-4.22-make-hack-paths-absolute.patch xscreensaver-4.22-realpath-heap-allocate.patch xscreensaver-4.22-remove-density-option.patch xscreensaver-4.22-signal-handler-fun.patch Log Message: - update to 4.23 - add a BuildRequires on imake (spotted by Mamoru Tasaka) - add a lot of patches and fixes from Mamoru Tasaka xscreensaver-4.22-use-hackdirname.patch: configure.in | 6 ++++++ 1 files changed, 6 insertions(+) --- NEW FILE xscreensaver-4.22-use-hackdirname.patch --- --- xscreensaver-4.22/configure.in.usehackdir 2005-06-05 04:50:54.000000000 +0900 +++ xscreensaver-4.22/configure.in 2005-09-17 17:20:56.000000000 +0900 @@ -1257,6 +1257,11 @@ # canonicalize slashes. HACKDIR=`echo "${HACKDIR}" | sed 's@/$@@;s@//*@/@g'` +# Expand HACKDIR as HACKDIR_FULL +eval HACKDIR_FULL=${HACKDIR} +eval HACKDIR_FULL=${HACKDIR_FULL} +eval HACKDIR_FULL=${HACKDIR_FULL} + # This option used to be called --enable-subdir; make sure that is no longer # used, since configure brain-damagedly ignores unknown --enable options. @@ -3607,6 +3612,7 @@ AC_SUBST(GNOME22) AC_SUBST(NOGNOME) AC_SUBST(HACKDIR) +AC_SUBST(HACKDIR_FULL) AC_SUBST(GTK_DATADIR) AC_SUBST(PO_DATADIR) AC_SUBST(HACK_CONF_DIR) xscreensaver-4.22-use-manname.patch: driver/Makefile.in | 2 ++ hacks/Makefile.in | 2 ++ hacks/glx/Makefile.in | 2 ++ 3 files changed, 6 insertions(+) --- NEW FILE xscreensaver-4.22-use-manname.patch --- --- xscreensaver-4.22/driver/Makefile.in.manname 2005-09-07 16:57:18.000000000 +0900 +++ xscreensaver-4.22/driver/Makefile.in 2005-09-07 16:59:19.000000000 +0900 @@ -377,6 +377,8 @@ \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ + manbase=`echo $$man | sed 's/\.man$$//'` ; \ + TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ; \ sed -e "s/^\.TH.*/$$TH/" \ -e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/' \ < $(srcdir)/$$man > $$T ; \ --- xscreensaver-4.22/hacks/Makefile.in.manname 2005-09-07 16:57:18.000000000 +0900 +++ xscreensaver-4.22/hacks/Makefile.in 2005-09-07 17:01:19.000000000 +0900 @@ -322,6 +322,8 @@ \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ + manbase=`echo $$man | sed 's/\.man$$//'` ; \ + TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ; \ sed -e "s/^\.TH.*/$$TH/" \ -e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/' \ < $(srcdir)/$$man > $$T ; \ --- xscreensaver-4.22/hacks/glx/Makefile.in.manname 2005-09-07 16:57:18.000000000 +0900 +++ xscreensaver-4.22/hacks/glx/Makefile.in 2005-09-07 17:01:42.000000000 +0900 @@ -246,6 +246,8 @@ \ for man in $$men; do \ instname=`echo $$man | sed 's/\.man$$/\.$(mansuffix)/'` ; \ + manbase=`echo $$man | sed 's/\.man$$//'` ; \ + TH=".TH $$manbase $(mansuffix) \"$$V\" \"X Version 11\" \"XScreenSaver manual\"" ; \ sed -e "s/^\.TH.*/$$TH/" \ -e 's/^\(\.BR xscr.*(\)[^()]\(.*\)/\1$(mansuffix)\2/' \ < $(srcdir)/$$man > $$T ; \ xscreensaver-4.22-write-explicit-dirname.patch: driver/Makefile.in | 33 +++++++++++++++++++++++++++++++++ hacks/Makefile.in | 3 +++ hacks/glx/Makefile.in | 4 ++++ 3 files changed, 40 insertions(+) --- NEW FILE xscreensaver-4.22-write-explicit-dirname.patch --- --- xscreensaver-4.22/driver/Makefile.in.rpm-add-dir 2005-09-15 16:36:09.000000000 +0900 +++ xscreensaver-4.22/driver/Makefile.in 2005-09-15 16:55:40.000000000 +0900 @@ -26,6 +26,7 @@ GTK_DATADIR = @GTK_DATADIR@ GTK_APPDIR = $(GTK_DATADIR)/applications GTK_ICONDIR = $(GTK_DATADIR)/pixmaps +SAVER_DATADIR = $(GTK_DATADIR)/xscreensaver GTK_GLADEDIR = $(GTK_DATADIR)/xscreensaver/glade HACK_CONF_DIR = @HACK_CONF_DIR@ @@ -286,6 +287,7 @@ $$e "" ;\ fi ; \ fi ; \ + echo "Installing driver programs in the directory $(install_prefix)$(bindir)" ;\ echo $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver ; \ $$inst xscreensaver $(install_prefix)$(bindir)/xscreensaver @for exe in xscreensaver-command xscreensaver-demo \ @@ -298,6 +300,7 @@ @if [ ! -d $(install_prefix)$(AD_DIR) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(AD_DIR) ; \ fi + @echo "Installing XScreenSaver.ad in the directory $(install_prefix)$(AD_DIR)" @-echo $(INSTALL_DATA) XScreenSaver.ad \ $(install_prefix)$(AD_DIR)/XScreenSaver ; \ if $(INSTALL_DATA) XScreenSaver.ad \ @@ -371,6 +374,7 @@ TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ echo "installing man pages: $$TH" ; \ \ + echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ; \ if [ ! -d $(install_prefix)$(manNdir) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ fi ; \ @@ -413,7 +417,15 @@ dir="$(install_prefix)$(PAM_DIR)" ; \ conf="$(PAM_CONF)" ; \ \ + \ + if [ ! -d $$dir -a ! -f $$conf ] ; then \ + echo $(INSTALL_DIRS) $$dir ; \ + $(INSTALL_DIRS) $$dir ; \ + fi ; \ + \ + \ if [ -d $$dir ] ; then \ + echo "Installing pam script file in the directory $(install_prefix)$(PAM_DIR)" ;\ \ if [ -f $$dir/xdm ]; then \ src2=$$dir/xdm ; \ @@ -486,6 +498,7 @@ # into /usr/share/applications/ install-gnome:: screensaver-properties.desktop @if [ "$(GTK_DATADIR)" != "" ]; then \ + echo "Installing desktop text in the directory $(install_prefix)$(GTK_APPDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_APPDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_APPDIR)" ;\ @@ -502,6 +515,7 @@ # into /usr/share/pixmaps/ install-gnome:: $(LOGO) @if [ "$(GTK_DATADIR)" != "" ]; then \ + echo "Installing X pixmap image file in the directory $(install_prefix)$(GTK_ICONDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_ICONDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_ICONDIR)" ;\ @@ -517,6 +531,15 @@ # into /usr/share/xscreensaver/glade/ install-gnome:: @if [ "$(GTK_GLADEDIR)" != "" ]; then \ + \ + \ + echo "Creating the directory $(install_prefix)$(SAVER_DATADIR)" ;\ + if [ ! -d "$(install_prefix)$(SAVER_DATADIR)" ] ; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + fi ; \ + \ + echo "Installing PNG image file in the directory $(install_prefix)$(GTK_GLADEDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ @@ -534,6 +557,15 @@ # into /usr/share/xscreensaver/glade/ install-gnome:: xscreensaver-demo.glade2 @if [ "$(GTK_GLADEDIR)" != "" ]; then \ + \ + \ + echo "Creating the directory $(install_prefix)$(SAVER_DATADIR)" ;\ + if [ ! -d "$(install_prefix)$(SAVER_DATADIR)" ] ; then \ + echo $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + $(INSTALL_DIRS) "$(install_prefix)$(SAVER_DATADIR)" ;\ + fi ; \ + \ + echo "Installing XML glade2 file in the directory $(install_prefix)$(GTK_GLADEDIR)" ;\ if [ ! -d "$(install_prefix)$(GTK_GLADEDIR)" ]; then \ echo $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)" ;\ @@ -600,6 +632,7 @@ # /usr/share/xscreensaver/config/README install-xml: @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + echo "Installing README text in the directory $(install_prefix)$(HACK_CONF_DIR)" ;\ if [ ! -d $$dest ]; then \ $(INSTALL_DIRS) $$dest ; \ fi ; \ --- xscreensaver-4.22/hacks/glx/Makefile.in.rpm-add-dir 2005-09-15 16:36:09.000000000 +0900 +++ xscreensaver-4.22/hacks/glx/Makefile.in 2005-09-15 17:00:08.000000000 +0900 @@ -201,6 +201,7 @@ install-program:: $(EXES) @exes="$(HACK_EXES)" ; \ idir="$(install_prefix)$(HACKDIR)" ; \ + echo "Installing hack programs in the directory $(install_prefix)$(HACKDIR)" ;\ if [ "$$exes" != "" ]; then \ if [ ! -d $$idir ]; then \ $(INSTALL_DIRS) $$idir ; \ @@ -214,6 +215,7 @@ # the xscreensaver-gl-helper program, in $bindir install-program:: $(EXES) @exes="@GL_UTIL_EXES@" ; \ + echo "Installing gl-helper program in the directory $(install_prefix)$(bindir)" ;\ idir="$(install_prefix)$(bindir)" ; \ if [ "$$exes" != "" ]; then \ if [ ! -d $$idir ]; then \ @@ -240,6 +242,7 @@ TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ echo "installing man pages: $$TH" ; \ \ + echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ; \ if [ ! -d $(install_prefix)$(manNdir) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ fi ; \ @@ -260,6 +263,7 @@ install-xml: @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + echo "Installing XML config files in the directory $(install_prefix)$(HACK_CONF_DIR)" ;\ if [ ! -d $$dest ]; then \ $(INSTALL_DIRS) $$dest ; \ fi ; \ --- xscreensaver-4.22/hacks/Makefile.in.rpm-add-dir 2005-09-15 16:36:09.000000000 +0900 +++ xscreensaver-4.22/hacks/Makefile.in 2005-09-15 16:56:03.000000000 +0900 @@ -243,6 +243,7 @@ @if [ ! -d $(install_prefix)$(HACKDIR) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(HACKDIR) ; \ fi ; \ + echo "Installing hack programs in the directory $(install_prefix)$(HACKDIR)" ;\ for program in $(NEXES); do \ echo $(INSTALL_PROGRAM) $$program \ $(install_prefix)$(HACKDIR)/$$program ; \ @@ -316,6 +317,7 @@ TH=".TH XScreenSaver $(mansuffix) \"$$V\" \"X Version 11\"" ; \ echo "installing man pages: $$TH" ; \ \ + echo "Installing manual pages in the directory $(install_prefix)$(manNdir)" ;\ if [ ! -d $(install_prefix)$(manNdir) ]; then \ $(INSTALL_DIRS) $(install_prefix)$(manNdir) ; \ fi ; \ @@ -336,6 +338,7 @@ install-xml: @dest=$(install_prefix)$(HACK_CONF_DIR) ; \ + echo "Installing XML config documents in the directory $(HACK_CONF_DIR)" ;\ if [ ! -d $$dest ]; then \ $(INSTALL_DIRS) $$dest ; \ fi ; \ Index: xscreensaver.spec =================================================================== RCS file: /cvs/dist/rpms/xscreensaver/devel/xscreensaver.spec,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- xscreensaver.spec 17 Dec 2005 20:52:03 -0000 1.71 +++ xscreensaver.spec 23 Jan 2006 02:51:46 -0000 1.72 @@ -1,10 +1,12 @@ %define name xscreensaver -%define version 4.22 +%define version 4.23 + +%define default_text %{_datadir}/doc/fedora-release-4/RELEASE-NOTES Summary: X screen saver and locker Name: %{name} Version: %{version} -Release: 21.2 +Release: 1 Epoch: 1 License: BSD Group: Amusements/Graphics @@ -13,26 +15,36 @@ Source1: removed-display-modes Patch0: xscreensaver-4.22-change-defaults.patch Patch1: xscreensaver-4.16-sanitize-hacks.patch -Patch2: xscreensaver-4.21-dont-ping-if-not-root.patch -Patch3: xscreensaver-4.22-make-hack-paths-absolute.patch -Patch4: xscreensaver-4.21-use-hack-basename.patch -Patch5: xscreensaver-4.22-signal-handler-fun.patch -Patch6: xscreensaver-4.22-dont-use-invalid-iters.patch -Patch7: xscreensaver-4.22-realpath-heap-allocate.patch -Patch8: xscreensaver-4.22-ignore-unprintable-characters.patch -Patch9: xscreensaver-4.22-remove-density-option.patch -Patch10: xscreensaver-4.22-fix-man-pages.patch -Patch11: xscreensaver-4.22-dont-allow-root.patch -Patch12: xscreensaver-4.22-allow-zero-dpms-timeout.patch -Patch13: xscreensaver-4.22-pam-include.patch +Patch2: xscreensaver-4.21-dont-ping-if-not-root.patch +Patch3: xscreensaver-4.21-use-hack-basename.patch +Patch4: xscreensaver-4.22-fix-man-pages.patch +Patch5: xscreensaver-4.22-dont-allow-root.patch +Patch6: xscreensaver-4.22-pam-include.patch +Patch7: xscreensaver-4.22-use-manname.patch +Patch8: xscreensaver-4.22-write-explicit-dirname.patch +Patch9: xscreensaver-4.22-use-hackdirname.patch +Patch10: xscreensaver-4.22-show-uname.patch +Patch11: xscreensaver-4.22-make-hackdir-absolute-path-new.patch +Patch12: xscreensaver-4.23-manfile-entry-fix.patch +Patch13: xscreensaver-4.22-mandir-fix-against10.patch +Patch14: xscreensaver-4.23-fix-inconsistency.patch +Patch15: xscreensaver-4.23-allow-zero-dpms-timeout-MOREFIX.patch +Patch16: xscreensaver-4.23-realpath-heap-allocate.patch +Patch17: xscreensaver-4.23-default-text.patch +Patch18: xscreensaver-4.23-modularX-addoption.patch +Patch19: xscreensaver-4.23-remove-gccwarn-pointer.patch +Patch20: xscreensaver-4.23-fix-free-demoGtk.patch + Buildroot: %{_tmppath}/%{name}-root # find_lang BuildRequires: gettext BuildRequires: desktop-file-utils +BuildRequires: imake # /sbin/pidof Requires: SysVinit +Requires: fedora-release %package base Summary: A minimal installation of xscreensaver. @@ -58,7 +70,7 @@ %description A modular screen saver and locker for the X Window System. -More than 190 display modes are included in this package. +More than 200 display modes are included in this package. %description base A modular screen saver and locker for the X Window System. @@ -83,17 +95,25 @@ %patch0 -p1 -b .change-defaults %patch1 -p1 -b .sanitize-hacks %patch2 -p1 -b .dont-ping-if-not-root -%patch3 -p1 -b .make-hack-paths-absolute -%patch4 -p1 -b .use-hack-basename -%patch5 -p1 -b .signal-handler-fun -%patch6 -p1 -b .dont-use-invalid-iters -%patch7 -p1 -b .realpath-heap-allocate -%patch8 -p1 -b .ignore-unprintable-characters -%patch9 -p1 -b .rmeove-density-option -%patch10 -p1 -b .fix-man-pages -%patch11 -p1 -b .dont-allow-root -%patch12 -p1 -b .allow-zero-dpms-timeout -%patch13 -p1 -b .pam-include +%patch3 -p1 -b .use-hack-basename +%patch4 -p1 -b .fix-man-pages +%patch5 -p1 -b .dont-allow-root +%patch6 -p1 -b .pam-include +%patch7 -p1 -b .use-manname +%patch8 -p1 -b .write-explicit-dirname +%patch9 -p1 -b .use-hackdirname +%patch10 -p1 -b .show-uname +%patch11 -p1 -b .make-hackdir-absolute-path-new +%patch12 -p1 -b .manfile-entry-fix +%patch13 -p1 -b .mandir-fix-against10 +%patch14 -p1 -b .fix-inconsistency +%patch15 -p1 -b .allow-zero-dpms-timeout-MOREFIX +%patch16 -p1 -b .realpath-heap-allocate +%patch17 -p1 -b .default-text +%patch18 -p1 -b .modularX-addoption +%patch19 -p1 -b .remove-gccwarn-pointer +%patch20 -p1 -b .fix-free-demoGtk + if [ -x %{_datadir}/libtool/config.guess ]; then # use system-wide copy @@ -101,6 +121,7 @@ fi %build +autoconf archdir=`./config.guess` mkdir $archdir cd $archdir @@ -110,6 +131,9 @@ CONFIG_OPTS="--with-pam --without-shadow --without-kerberos" CONFIG_OPTS="$CONFIG_OPTS --without-setuid-hacks" CONFIG_OPTS="$CONFIG_OPTS --with-fortune=%{fortune}" +CONFIG_OPTS="$CONFIG_OPTS --with-text-file=%{default_text}" +CONFIG_OPTS="$CONFIG_OPTS --with-x-app-defaults=%{_datadir}/X11/app-defaults" + # This is flaky: # CONFIG_OPTS="$CONFIG_OPTS --with-login-manager" @@ -129,15 +153,15 @@ # We have to make sure these directories exist, # or nothing will be installed into them. # -mkdir -p $RPM_BUILD_ROOT%{_bindir} \ - $RPM_BUILD_ROOT%{_datadir}/xscreensaver \ - $RPM_BUILD_ROOT%{_libexecdir}/xscreensaver \ - $RPM_BUILD_ROOT%{_mandir}/man1/xscreensaver \ - $RPM_BUILD_ROOT/etc/pam.d +#mkdir -p $RPM_BUILD_ROOT%{_bindir} \ +# $RPM_BUILD_ROOT%{_datadir}/xscreensaver \ +# $RPM_BUILD_ROOT%{_libexecdir}/xscreensaver \ +# $RPM_BUILD_ROOT%{_mandir}/man1/xscreensaver \ +# $RPM_BUILD_ROOT/etc/pam.d make install_prefix=$RPM_BUILD_ROOT install -mv $RPM_BUILD_ROOT%{_mandir}/man1 $RPM_BUILD_ROOT%{_mandir}/man6 +#mv $RPM_BUILD_ROOT%{_mandir}/man1 $RPM_BUILD_ROOT%{_mandir}/man6 desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -229,6 +253,11 @@ %defattr(-,root,root) %changelog +* Fri Jan 13 2006 Ray Strode 1:4.23-1 +- update to 4.23 +- add a BuildRequires on imake (spotted by Mamoru Tasaka) +- add a lot of patches and fixes from Mamoru Tasaka + * Sat Dec 17 2005 Jesse Keating - rebuilt --- xscreensaver-4.22-allow-zero-dpms-timeout.patch DELETED --- --- xscreensaver-4.22-dont-use-invalid-iters.patch DELETED --- --- xscreensaver-4.22-ignore-unprintable-characters.patch DELETED --- --- xscreensaver-4.22-make-hack-paths-absolute.patch DELETED --- --- xscreensaver-4.22-realpath-heap-allocate.patch DELETED --- --- xscreensaver-4.22-remove-density-option.patch DELETED --- --- xscreensaver-4.22-signal-handler-fun.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 23 03:19:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 22:19:51 -0500 Subject: rpms/xscreensaver/devel .cvsignore,1.12,1.13 sources,1.13,1.14 Message-ID: <200601230319.k0N3JpZ8001533@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xscreensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1454 Modified Files: .cvsignore sources Log Message: update source file Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xscreensaver/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 3 Aug 2005 21:15:59 -0000 1.12 +++ .cvsignore 23 Jan 2006 03:19:48 -0000 1.13 @@ -1 +1 @@ -xscreensaver-4.22.tar.gz +xscreensaver-4.23.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/xscreensaver/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 3 Aug 2005 21:15:59 -0000 1.13 +++ sources 23 Jan 2006 03:19:48 -0000 1.14 @@ -1 +1 @@ -9f37c428f034e581026e243445378195 xscreensaver-4.22.tar.gz +27491d117a8f7ae57d1fdf5f15d61ac6 xscreensaver-4.23.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 23 03:26:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 22 Jan 2006 22:26:51 -0500 Subject: rpms/xscreensaver/devel xscreensaver-4.22-make-hackdir-absolute-path-new.patch, NONE, 1.1 xscreensaver-4.22-mandir-fix-against10.patch, NONE, 1.1 xscreensaver-4.22-show-uname.patch, NONE, 1.1 xscreensaver-4.23-allow-zero-dpms-timeout-MOREFIX.patch, NONE, 1.1 xscreensaver-4.23-default-text.patch, NONE, 1.1 xscreensaver-4.23-fix-free-demoGtk.patch, NONE, 1.1 xscreensaver-4.23-fix-inconsistency.patch, NONE, 1.1 xscreensaver-4.23-manfile-entry-fix.patch, NONE, 1.1 xscreensaver-4.23-modularX-addoption.patch, NONE, 1.1 xscreensaver-4.23-realpath-heap-allocate.patch, NONE, 1.1 xscreensaver-4.23-remove-gccwarn-pointer.patch, NONE, 1.1 Message-ID: <200601230326.k0N3QpH4028907@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/xscreensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28889 Added Files: xscreensaver-4.22-make-hackdir-absolute-path-new.patch xscreensaver-4.22-mandir-fix-against10.patch xscreensaver-4.22-show-uname.patch xscreensaver-4.23-allow-zero-dpms-timeout-MOREFIX.patch xscreensaver-4.23-default-text.patch xscreensaver-4.23-fix-free-demoGtk.patch xscreensaver-4.23-fix-inconsistency.patch xscreensaver-4.23-manfile-entry-fix.patch xscreensaver-4.23-modularX-addoption.patch xscreensaver-4.23-realpath-heap-allocate.patch xscreensaver-4.23-remove-gccwarn-pointer.patch Log Message: add files i thought I already added xscreensaver-4.22-make-hackdir-absolute-path-new.patch: driver/Makefile.in | 24 ++++++++++++++++++++---- hacks/Makefile.in | 17 +++++++++++++++++ hacks/glx/Makefile.in | 15 +++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) --- NEW FILE xscreensaver-4.22-make-hackdir-absolute-path-new.patch --- --- xscreensaver-4.22/hacks/glx/Makefile.in.make-hack-paths-absolute 2005-10-06 18:01:00.000000000 +0900 +++ xscreensaver-4.22/hacks/glx/Makefile.in 2005-10-06 18:04:56.000000000 +0900 @@ -61,6 +61,10 @@ UTILS_SRC = $(HACK_SRC)/../utils UTILS_BIN = $(HACK_BIN)/../utils +DRIVER_DIR = ../../driver +ADFILE = XScreenSaver.ad +HACKDIR_FULL = @HACKDIR_FULL@ + INCLUDES = -I. -I$(srcdir) -I$(UTILS_SRC) -I$(HACK_SRC) -I../.. @INCLUDES@ UTIL_SRCS = $(UTILS_SRC)/colors.c $(UTILS_SRC)/hsv.c \ @@ -191,6 +195,17 @@ default: all all: $(EXES) +$(ADFILE).gl-extras : ../$(ADFILE).extras $(EXES) + @echo "Creating $(ADFILE).gl-extras"; \ + cp -p ../$(ADFILE).extras $(ADFILE).tmp ; \ + for f in $(EXES) ; do \ + mv $(ADFILE).tmp $(ADFILE).tmp2 ; \ + eval sed -e \ + \'s\|\\\(\[ \\t\]\\\)$$f\\\(\[ \\t\]\\\)\|\\1$(HACKDIR_FULL)/$$f\\2\|g\' \ + $(ADFILE).tmp2 > $(ADFILE).tmp ; \ + done ; \ + cp -p $(ADFILE).tmp $(ADFILE).gl-extras + install: install-program install-xml install-man uninstall: uninstall-program uninstall-xml uninstall-man --- xscreensaver-4.22/hacks/Makefile.in.make-hack-paths-absolute 2005-10-06 18:01:00.000000000 +0900 +++ xscreensaver-4.22/hacks/Makefile.in 2005-10-06 18:04:39.000000000 +0900 @@ -63,6 +63,12 @@ UTILS_SRC = $(srcdir)/../utils UTILS_BIN = ../utils +DRIVER_DIR = ../driver +ADFILE = XScreenSaver.ad +ADFILEIN = $(ADFILE).in + +HACKDIR_FULL = @HACKDIR_FULL@ + INCLUDES = -I. -I$(srcdir) -I$(UTILS_SRC) -I.. @INCLUDES@ UTIL_SRCS = $(UTILS_SRC)/alpha.c $(UTILS_SRC)/colors.c \ @@ -231,6 +237,17 @@ default: all all: $(EXES) +$(ADFILE).extras : $(DRIVER_DIR)/$(ADFILEIN) $(EXES) + @echo "Creating $(ADFILE).extras"; \ + cp -p $(DRIVER_DIR)/$(ADFILEIN) $(ADFILE).tmp ; \ + for f in $(EXES) $(SCRIPTS) ; do \ + mv $(ADFILE).tmp $(ADFILE).tmp2 ; \ + eval sed -e \ + \'s\|\\\(\[ \\t\]\\\)$$f\\\(\[ \\t\]\\\)\|\\1$(HACKDIR_FULL)/$$f\\2\|g\' \ + $(ADFILE).tmp2 > $(ADFILE).tmp ; \ + done ; \ + cp -p $(ADFILE).tmp $(ADFILE).extras + install: install-program install-scripts install-xml install-man uninstall: uninstall-program uninstall-xml uninstall-man --- xscreensaver-4.22/driver/Makefile.in.make-hack-paths-absolute 2005-10-06 18:01:00.000000000 +0900 +++ xscreensaver-4.22/driver/Makefile.in 2005-10-06 18:01:01.000000000 +0900 @@ -142,6 +142,9 @@ GL_OBJS = @SAVER_GL_OBJS@ GL_LIBS = @SAVER_GL_LIBS@ +ADFILE = XScreenSaver.ad +ADFILEIN = $(ADFILE).in + ICON_SRC = $(UTILS_SRC)/images LOGO = $(ICON_SRC)/logo-50.xpm GTK_ICONS = $(ICON_SRC)/screensaver-*.png @@ -249,8 +252,21 @@ $(TEST_SRCS) -default: $(EXES) -all: $(EXES) $(EXES2) +default: $(EXES) $(ADFILEIN) $(ADFILE).new +all: $(EXES) $(EXES2) $(ADFILEIN) $(ADFILE) + +$(ADFILEIN): $(ADFILE) + @if [ -e $(ADFILE) -a ! -e $(ADFILEIN) ] ; then \ + mv -f $(ADFILE) $(ADFILEIN) ; \ + fi + +$(ADFILE).new: ../hacks/Makefile ../hacks/glx/Makefile $(ADFILEIN) + @(cd ../hacks; make $(ADFILE).extras) ; \ + (cd ../hacks/glx; make $(ADFILE).gl-extras) ; \ + echo "Creating $(ADFILE)" ; \ + cp -p ../hacks/glx/$(ADFILE).gl-extras $(ADFILE) ; \ + cp -p $(ADFILE) $(ADFILE).new + tests: $(TEST_EXES) install: install-program install-ad install-scripts \ @@ -781,8 +797,8 @@ # How we build the default app-defaults file into the program. # -XScreenSaver_ad.h: XScreenSaver.ad - $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver.ad > XScreenSaver_ad.h +XScreenSaver_ad.h: $(ADFILEIN) + $(SHELL) $(UTILS_SRC)/ad2c $(ADFILEIN) > XScreenSaver_ad.h XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver-Xm.ad > XScreenSaver_Xm_ad.h xscreensaver-4.22-mandir-fix-against10.patch: Makefile.in | 4 +++- XScreenSaver.ad.in | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) --- NEW FILE xscreensaver-4.22-mandir-fix-against10.patch --- --- xscreensaver-4.22/driver/Makefile.in.patch10 2005-10-07 00:37:53.000000000 +0900 +++ xscreensaver-4.22/driver/Makefile.in 2005-10-07 00:44:18.000000000 +0900 @@ -264,7 +264,9 @@ @(cd ../hacks; make $(ADFILE).extras) ; \ (cd ../hacks/glx; make $(ADFILE).gl-extras) ; \ echo "Creating $(ADFILE)" ; \ - cp -p ../hacks/glx/$(ADFILE).gl-extras $(ADFILE) ; \ + cp -p ../hacks/glx/$(ADFILE).gl-extras $(ADFILE).tmp ; \ + sed -e 's|$$(mansuffix)|$(mansuffix)|g' $(ADFILE).tmp > \ + $(ADFILE) ; \ cp -p $(ADFILE) $(ADFILE).new tests: $(TEST_EXES) --- xscreensaver-4.22/driver/XScreenSaver.ad.in.patch10 2005-10-07 00:37:52.000000000 +0900 +++ xscreensaver-4.22/driver/XScreenSaver.ad.in 2005-10-07 00:41:55.000000000 +0900 @@ -95,12 +95,12 @@ ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3) ! @GNOME24@*manualCommand: gnome-terminal --title '%s manual' \ - at GNOME24@ --command '/bin/sh -c "man 6 `basename %s`; read foo"' + at GNOME24@ --command '/bin/sh -c "man $(mansuffix) `basename %s`; read foo"' ! ! Gnome 2.2: ! @GNOME22@*manualCommand: gnome-terminal --title '%s manual' \ - at GNOME22@ --command '/bin/sh -c "man 6 `basename %s`; read foo"' + at GNOME22@ --command '/bin/sh -c "man $(mansuffix) `basename %s`; read foo"' ! ! Gnome 1.4: ! @@ -110,7 +110,7 @@ ! non-Gnome systems: ! @NOGNOME@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \ - at NOGNOME@ -e /bin/sh -c 'man 6 `basename %s`; read foo' + at NOGNOME@ -e /bin/sh -c 'man $(mansuffix) `basename %s`; read foo' loadURL: htmlview '%s' xscreensaver-4.22-show-uname.patch: XScreenSaver.ad.in | 2 + lock.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) --- NEW FILE xscreensaver-4.22-show-uname.patch --- --- xscreensaver-4.22/driver/XScreenSaver.ad.in.showuname 2005-10-07 00:46:53.000000000 +0900 +++ xscreensaver-4.22/driver/XScreenSaver.ad.in 2005-10-07 00:48:25.000000000 +0900 @@ -441,6 +441,7 @@ *Dialog.headingFont: *-helvetica-bold-r-*-*-*-180-*-*-*-iso8859-1 *Dialog.bodyFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 *Dialog.labelFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 +*Dialog.unameFont: *-helvetica-bold-r-*-*-*-120-*-*-*-iso8859-1 *Dialog.buttonFont: *-helvetica-bold-r-*-*-*-140-*-*-*-iso8859-1 *Dialog.dateFont: *-helvetica-medium-r-*-*-*-80-*-*-*-iso8859-1 ! Helvetica asterisks look terrible. @@ -472,6 +473,7 @@ *passwd.passwd.label: Password: *passwd.thermometer.width: 8 *passwd.asterisks: True +*passwd.uname: True *splash.heading.label: XScreenSaver %s *splash.body.label: Copyright ? 1991-2005 by --- xscreensaver-4.22/driver/lock.c.showuname 2005-10-07 00:46:53.000000000 +0900 +++ xscreensaver-4.22/driver/lock.c 2005-10-07 00:46:53.000000000 +0900 @@ -58,6 +58,11 @@ ERROR! You must not include vroot.h in this file. #endif +#ifdef HAVE_UNAME +# include /* for hostname info */ +#endif /* HAVE_UNAME */ +#include + #ifndef VMS # include #else /* VMS */ @@ -108,6 +113,9 @@ char *user_string; char *passwd_string; char *login_label; + char *uname_label; + + Bool show_uname_p; XFontStruct *heading_font; XFontStruct *body_font; @@ -115,6 +123,7 @@ XFontStruct *passwd_font; XFontStruct *date_font; XFontStruct *button_font; + XFontStruct *uname_font; Pixel foreground; Pixel background; @@ -226,6 +235,30 @@ pw->heading_label = s; } + /* Get hostname info */ + pw->uname_label = strdup(""); /* Initialy, write nothing */ + +# ifdef HAVE_UNAME + { + struct utsname uts; + + if (uname (&uts) == 0) + { +#if 0 /* Get the full hostname */ + { + char *s; + if ((s = strchr(uts.nodename, '.'))) + *s = 0; + } +#endif + char *s = (char *) malloc(strlen(uts.nodename) + 13); + sprintf(s, "On %s", uts.nodename); + free (pw->uname_label); + pw->uname_label = s; + } + } +# endif + pw->user_string = strdup (p && p->pw_name ? p->pw_name : "???"); pw->passwd_string = strdup(""); @@ -259,6 +292,13 @@ if (!pw->date_font) pw->date_font = XLoadQueryFont (si->dpy, "fixed"); if (f) free (f); + f = get_string_resource("passwd.unameFont", "Dialog.Font"); + pw->uname_font = XLoadQueryFont (si->dpy, (f ? f : "fixed")); + if (!pw->uname_font) pw->uname_font = XLoadQueryFont (si->dpy, "fixed"); + if (f) free (f); + + pw->show_uname_p = get_boolean_resource("passwd.uname", "Boolean"); + pw->foreground = get_pixel_resource ("passwd.foreground", "Dialog.Foreground", si->dpy, cmap); @@ -329,6 +369,16 @@ if (overall.width > pw->width) pw->width = overall.width; pw->height += ascent + descent; + /* Measure the uname_label. */ + if ((strlen(pw->uname_label)) && pw->show_uname_p) + { + XTextExtents (pw->uname_font, + pw->uname_label, strlen(pw->uname_label), + &direction, &ascent, &descent, &overall); + if (overall.width > pw->width) pw->width = overall.width; + pw->height += ascent + descent; + } + /* Measure the body_label. */ XTextExtents (pw->body_font, pw->body_label, strlen(pw->body_label), @@ -552,6 +602,9 @@ (pw->shadow_width * 4)))) + pw->date_font->ascent + pw->date_font->descent); + if ((strlen(pw->uname_label)) && pw->show_uname_p) + height += (pw->uname_font->ascent + pw->uname_font->descent); /* for uname */ + if (pw->login_button_p) height += ((pw->button_font->ascent + pw->button_font->descent) * 2 + 2 * pw->shadow_width); @@ -579,7 +632,19 @@ XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y1, pw->heading_label, strlen(pw->heading_label)); - /* text below top heading + /* uname below top heading + */ + if ((strlen(pw->uname_label)) && pw->show_uname_p) + { + XSetFont (si->dpy, gc1, pw->uname_font->fid); + y1 += spacing + pw->uname_font->ascent + pw->uname_font->descent; + sw = string_width (pw->uname_font, pw->uname_label); + x2 = (x1 + ((x3 - x1 - sw) / 2)); + XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y1, + pw->uname_label, strlen(pw->uname_label)); + } + + /* text below uname */ XSetFont (si->dpy, gc1, pw->body_font->fid); y1 += spacing + pw->body_font->ascent + pw->body_font->descent; @@ -994,6 +1059,7 @@ if (pw->login_label) free (pw->login_label); if (pw->user_string) free (pw->user_string); if (pw->passwd_string) free (pw->passwd_string); + if (pw->uname_label) free (pw->uname_label); if (pw->heading_font) XFreeFont (si->dpy, pw->heading_font); if (pw->body_font) XFreeFont (si->dpy, pw->body_font); @@ -1001,6 +1067,7 @@ if (pw->passwd_font) XFreeFont (si->dpy, pw->passwd_font); if (pw->date_font) XFreeFont (si->dpy, pw->date_font); if (pw->button_font) XFreeFont (si->dpy, pw->button_font); + if (pw->uname_font) XFreeFont (si->dpy, pw->uname_font); if (pw->foreground != black && pw->foreground != white) XFreeColors (si->dpy, cmap, &pw->foreground, 1, 0L); xscreensaver-4.23-allow-zero-dpms-timeout-MOREFIX.patch: prefs.c | 7 +++++++ 1 files changed, 7 insertions(+) --- NEW FILE xscreensaver-4.23-allow-zero-dpms-timeout-MOREFIX.patch --- --- xscreensaver-4.23/driver/prefs.c.dpms 2005-08-25 11:08:04.000000000 +0900 +++ xscreensaver-4.23/driver/prefs.c 2005-10-24 01:29:00.000000000 +0900 @@ -1593,6 +1593,13 @@ p->dpms_standby > p->dpms_suspend) p->dpms_standby = p->dpms_suspend; + /* These fixes above ignores the case + suspend = 0 and standby > off ... + */ + if (p->dpms_off != 0 && + p->dpms_standby > p->dpms_off) + p->dpms_standby = p->dpms_off; + if (p->dpms_standby == 0 && /* if *all* are 0, then DPMS is disabled */ p->dpms_suspend == 0 && xscreensaver-4.23-default-text.patch: configure.in | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE xscreensaver-4.23-default-text.patch --- --- xscreensaver-4.23/configure.in.default-text 2005-12-02 16:04:54.000000000 +0900 +++ xscreensaver-4.23/configure.in 2005-12-02 16:18:22.000000000 +0900 @@ -3336,8 +3336,8 @@ case "$with_textfile" in /*) # absolute path - AC_MSG_CHECKING([for image directory $with_textfile]) - if test -d "$with_textfile" ; then + AC_MSG_CHECKING([for default text file $with_textfile]) + if test -f "$with_textfile" ; then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) @@ -3370,7 +3370,7 @@ ;; *) - echo "error: must be an absolute path: --with-image-directory=$with_textfile_req" + echo "error: must be an absolute path: --with-text-file=$with_textfile_req" exit 1 ;; esac xscreensaver-4.23-fix-free-demoGtk.patch: demo-Gtk.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) --- NEW FILE xscreensaver-4.23-fix-free-demoGtk.patch --- --- xscreensaver-4.23/driver/demo-Gtk.c.free-document 2005-12-21 01:44:46.000000000 +0900 +++ xscreensaver-4.23/driver/demo-Gtk.c 2005-12-21 03:10:56.000000000 +0900 @@ -1038,6 +1038,7 @@ int list_elt = selected_list_element (s); int hack_number; char *name, *name2, *cmd, *str; + char *oname; if (list_elt < 0) return; hack_number = s->list_elt_to_hack_number[list_elt]; @@ -1046,6 +1047,7 @@ name = strdup (p->screenhacks[hack_number]->command); name2 = name; + oname = name; while (isspace (*name2)) name2++; str = name2; while (*str && !isspace (*str)) str++; @@ -1073,7 +1075,7 @@ False, 100); } - free (name); + free (oname); } xscreensaver-4.23-fix-inconsistency.patch: attraction.man | 2 +- bubbles.man | 8 ++++++-- celtic.man | 2 +- cloudlife.man | 6 +----- config/anemotaxis.xml | 2 +- config/atlantis.xml | 5 ++--- config/blinkbox.xml | 2 +- config/boing.xml | 4 ++-- config/bouncingcow.xml | 2 +- config/cloudlife.xml | 2 +- config/coral.xml | 2 +- config/crystal.xml | 2 +- config/flyingtoasters.xml | 2 +- config/glforestfire.xml | 2 +- config/glhanoi.xml | 2 +- config/glsnake.xml | 2 +- config/jigglypuff.xml | 4 ++-- config/juggle.xml | 2 +- config/juggler3d.xml | 2 +- config/lightning.xml | 2 +- config/lissie.xml | 4 ++-- config/lmorph.xml | 2 +- config/mirrorblob.xml | 3 +-- config/mountain.xml | 2 +- config/pinion.xml | 2 +- config/pong.xml | 2 +- config/rd-bomb.xml | 2 +- config/rotzoomer.xml | 2 +- config/sierpinski3d.xml | 2 +- config/spheremonics.xml | 2 +- config/substrate.xml | 2 +- config/tangram.xml | 2 +- config/timetunnel.xml | 2 +- config/whirlwindwarp.xml | 2 +- config/wormhole.xml | 6 +++--- config/zoom.xml | 4 ++-- coral.man | 2 +- crystal.man | 2 +- deco.man | 1 - forest.man | 2 +- glx/antmaze.man | 5 +---- glx/atlantis.man | 4 ++-- glx/blinkbox.man | 2 +- glx/cubenetic.man | 2 +- glx/glhanoi.man | 8 +------- glx/glknots.man | 2 +- glx/glplanet.man | 10 +++++++--- glx/glsnake.man | 12 ++++++------ glx/hypertorus.man | 4 ++-- glx/jigglypuff.man | 2 +- glx/juggler3d.man | 2 +- glx/mirrorblob.man | 15 ++++++--------- glx/pipes.man | 2 +- glx/polytopes.man | 4 ++-- glx/pulsar.man | 4 ++-- glx/sballs.man | 10 ---------- glx/sierpinski3d.man | 2 +- glx/spheremonics.man | 2 +- glx/tangram.man | 3 ++- glx/timetunnel.man | 4 ++-- goop.man | 6 +++--- grav.man | 4 ++-- helix.man | 8 -------- hyperball.man | 8 ++++---- hypercube.man | 6 +++--- ifs.man | 3 --- interaggregate.man | 22 +++++++++------------- jigsaw.man | 2 +- juggle.man | 2 +- lissie.man | 4 ++-- metaballs.man | 2 +- mountain.man | 2 +- munch.man | 6 +++--- penrose.man | 6 +----- pyro.man | 4 ++-- qix.man | 2 +- rd-bomb.man | 14 ++++++-------- rorschach.man | 6 +----- rotzoomer.man | 6 +++--- shadebobs.man | 2 +- slidescreen.man | 2 +- slip.man | 2 +- strange.man | 2 +- substrate.man | 2 +- t3d.man | 2 +- truchet.man | 8 ++++---- vines.man | 2 +- whirlygig.man | 4 ++-- worm.man | 2 +- wormhole.man | 4 ++-- xanalogtv.man | 6 ------ xlyap.man | 22 ++++++---------------- 92 files changed, 158 insertions(+), 219 deletions(-) --- NEW FILE xscreensaver-4.23-fix-inconsistency.patch --- --- xscreensaver-4.23/hacks/config/anemotaxis.xml.tmp 2004-07-13 19:21:19.000000000 +0900 +++ xscreensaver-4.23/hacks/config/anemotaxis.xml 2005-11-07 01:39:53.000000000 +0900 @@ -11,7 +11,7 @@ + low="10" high="250" default="40"/> - + low="0" high="1000" default="100"/> + _label="Box Size" low="1" high="8" default="2"/>
--- xscreensaver-4.23/hacks/config/boing.xml.tmp 2005-02-20 06:34:21.000000000 +0900 +++ xscreensaver-4.23/hacks/config/boing.xml 2005-11-07 01:39:53.000000000 +0900 @@ -15,9 +15,9 @@
+ _label="Meridians" low="1" high="90" default="16"/> + _label="Parallels" low="1" high="90" default="8"/>
--- xscreensaver-4.23/hacks/config/bouncingcow.xml.tmp 2004-07-10 13:27:18.000000000 +0900 +++ xscreensaver-4.23/hacks/config/bouncingcow.xml 2005-11-07 01:39:53.000000000 +0900 @@ -10,7 +10,7 @@ + low="1" high="99" default="30"/> + low="1" high="100" default="20"/> <_description> Simulates coral growth, albeit somewhat slowly. Written by Frederick Roeber. --- xscreensaver-4.23/hacks/config/crystal.xml.tmp 2004-04-26 15:46:40.000000000 +0900 +++ xscreensaver-4.23/hacks/config/crystal.xml 2005-11-07 01:39:53.000000000 +0900 @@ -17,7 +17,7 @@ _label="Horizontal Symmetries" low="-10" high="10" default="-3"/> + _label="Vertical Symmetries" low="-10" high="10" default="-3"/> --- xscreensaver-4.23/hacks/config/flyingtoasters.xml.tmp 2003-06-18 16:14:44.000000000 +0900 +++ xscreensaver-4.23/hacks/config/flyingtoasters.xml 2005-11-07 01:39:53.000000000 +0900 @@ -10,7 +10,7 @@ + low="0" high="20" default="5"/>
## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.5/policy/modules/kernel/mls.te +--- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-17 17:08:52.000000000 -0500 ++++ serefpolicy-2.2.5/policy/modules/kernel/mls.te 2006-01-25 09:51:52.000000000 -0500 +@@ -88,5 +88,6 @@ + ifdef(`enable_mls',` + # run init with maximum MLS range + range_transition kernel_t init_exec_t s0 - s15:c0.c255; ++range_transition kernel_t lvm_exec_t s0 - s15:c0.c255; + range_transition initrc_t auditd_exec_t s15:c0.c255; + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.fc serefpolicy-2.2.5/policy/modules/services/automount.fc --- nsaserefpolicy/policy/modules/services/automount.fc 2005-12-09 16:09:22.000000000 -0500 +++ serefpolicy-2.2.5/policy/modules/services/automount.fc 2006-01-24 11:56:59.000000000 -0500 @@ -354,6 +376,23 @@ term_use_all_terms(mount_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.5/policy/modules/system/unconfined.if +--- nsaserefpolicy/policy/modules/system/unconfined.if 2006-01-20 10:02:33.000000000 -0500 ++++ serefpolicy-2.2.5/policy/modules/system/unconfined.if 2006-01-25 10:24:04.000000000 -0500 +@@ -54,8 +54,13 @@ + tunable_policy(`allow_execmem && allow_execstack',` + # Allow making the stack executable via mprotect. + allow $1 self:process execstack; ++ ', ` ++ # These are fairly common but seem to be harmless ++ # caused by using shared libraries built with old tool chains ++ dontaudit $1 self:process execstack; + ') + ++ + optional_policy(`authlogin',` + auth_unconfined($1) + ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.5/policy/modules/system/userdomain.if --- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-23 08:26:51.000000000 -0500 +++ serefpolicy-2.2.5/policy/modules/system/userdomain.if 2006-01-24 13:20:21.000000000 -0500 From fedora-cvs-commits at redhat.com Wed Jan 25 16:45:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 11:45:56 -0500 Subject: rpms/selinux-policy/devel .cvsignore,1.28,1.29 sources,1.32,1.33 Message-ID: <200601251645.k0PGjuhB032152@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31704 Modified Files: .cvsignore sources Log Message: * Mon Jan 24 2006 Dan Walsh 2.2.4-1 - Many changes for MLS - Turn on strict policy Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 24 Jan 2006 15:39:53 -0000 1.28 +++ .cvsignore 25 Jan 2006 16:45:54 -0000 1.29 @@ -29,3 +29,4 @@ serefpolicy-2.1.13.tgz serefpolicy-2.2.2.tgz serefpolicy-2.2.4.tgz +serefpolicy-2.2.5.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- sources 24 Jan 2006 21:47:16 -0000 1.32 +++ sources 25 Jan 2006 16:45:54 -0000 1.33 @@ -0,0 +1 @@ +a9ae656bef62012a05b2ab9b8dcbc867 serefpolicy-2.2.5.tgz From fedora-cvs-commits at redhat.com Wed Jan 25 17:09:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 12:09:57 -0500 Subject: rpms/cups/devel cups-link.patch,1.1,1.2 cups.spec,1.130,1.131 Message-ID: <200601251709.k0PH9v4a018859@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18806 Modified Files: cups-link.patch cups.spec Log Message: * Wed Jan 25 2006 Tim Waugh - Fixed link patch. cups-link.patch: Makefile | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: cups-link.patch =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups-link.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cups-link.patch 15 Oct 2005 21:08:40 -0000 1.1 +++ cups-link.patch 25 Jan 2006 17:09:53 -0000 1.2 @@ -5,7 +5,7 @@ libcupsimage.so.2 libcupsimage.sl.2: $(IMAGEOBJS) ../Makedefs echo Linking $@... - $(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm -+ $(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm -lcups ++ $(DSO) $(DSOFLAGS) -o $@ $(IMAGEOBJS) $(DSOLIBS) -lm -L../cups -lcups $(RM) `basename $@ .2` $(LN) $@ `basename $@ .2` Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- cups.spec 17 Jan 2006 11:56:14 -0000 1.130 +++ cups.spec 25 Jan 2006 17:09:53 -0000 1.131 @@ -433,6 +433,9 @@ %{_libdir}/cups/daemon/cups-lpd %changelog +* Wed Jan 25 2006 Tim Waugh +- Fixed link patch. + * Tue Jan 17 2006 Tim Waugh 1:1.1.23-30 - Include 'Autodetected' tag for better integration with autodetection tools. From fedora-cvs-commits at redhat.com Wed Jan 25 19:02:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 14:02:12 -0500 Subject: rpms/java-1.4.2-gcj-compat/devel .cvsignore, 1.45, 1.46 java-1.4.2-gcj-compat.spec, 1.120, 1.121 sources, 1.49, 1.50 Message-ID: <200601251902.k0PJ2BcE003281@cvs.devel.redhat.com> Author: fitzsim Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3229 Modified Files: .cvsignore java-1.4.2-gcj-compat.spec sources Log Message: * Wed Jan 25 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_63rh - Import java-gcj-compat 1.0.52. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/.cvsignore,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- .cvsignore 16 Jan 2006 23:36:35 -0000 1.45 +++ .cvsignore 25 Jan 2006 19:01:53 -0000 1.46 @@ -1,3 +1,3 @@ bcprov-jdk14-127.tar.gz eclipse-ecj-3.1.0_fc-12.jar -java-gcj-compat-1.0.51.tar.gz +java-gcj-compat-1.0.52.tar.gz Index: java-1.4.2-gcj-compat.spec =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- java-1.4.2-gcj-compat.spec 16 Jan 2006 23:36:35 -0000 1.120 +++ java-1.4.2-gcj-compat.spec 25 Jan 2006 19:02:07 -0000 1.121 @@ -17,11 +17,11 @@ %define buildver 0 # the version-release string for the gcj rpms we require %define gccver 4.0.0-0.42 -%define jgcver 1.0.51 +%define jgcver 1.0.52 %define name java-%{javaver}-%{origin}-compat %define version %{javaver}.%{buildver} -%define release 40jpp_62rh +%define release 40jpp_63rh %define cname java-%{javaver}-%{origin} #%define bcarchivever 127 @@ -547,6 +547,9 @@ %defattr(-,root,root) %changelog +* Wed Jan 25 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_63rh +- Import java-gcj-compat 1.0.52. + * Mon Jan 16 2006 Thomas Fitzsimmons - 0:1.4.2.0-40jpp_62rh - Remove aot-compile-rpm and rebuild-gcj-db when building a custom RPM. - Import java-gcj-compat 1.0.51. Index: sources =================================================================== RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 16 Jan 2006 23:36:35 -0000 1.49 +++ sources 25 Jan 2006 19:02:08 -0000 1.50 @@ -1,3 +1,3 @@ d17b7fa532fc87fdf14d42c2d293ec3f bcprov-jdk14-127.tar.gz 95766e40c6ab6b641341f3a44dcf0b9e eclipse-ecj-3.1.0_fc-12.jar -ae0b2a3872d238da52b8c40d9c41f473 java-gcj-compat-1.0.51.tar.gz +40635fcbe7183ce72fdd45b8a3fc373e java-gcj-compat-1.0.52.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 25 19:08:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 14:08:00 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.155, 1.156 policycoreutils.spec, 1.225, 1.226 Message-ID: <200601251908.k0PJ80qw004191@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4163 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Wed Jan 25 2006 Dan Walsh 1.29.11-2 - Correct handling of symbolic links in restorecon policycoreutils-rhat.patch: restorecon/restorecon.c | 8 +- scripts/chcat | 2 semanage/semanage | 149 +++++++++++------------------------------------- semanage/semanage.8 | 26 ++++---- 4 files changed, 55 insertions(+), 130 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- policycoreutils-rhat.patch 25 Jan 2006 16:07:46 -0000 1.155 +++ policycoreutils-rhat.patch 25 Jan 2006 19:07:56 -0000 1.156 @@ -1,6 +1,39 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.10/scripts/chcat +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.29.11/restorecon/restorecon.c +--- nsapolicycoreutils/restorecon/restorecon.c 2006-01-13 09:47:40.000000000 -0500 ++++ policycoreutils-1.29.11/restorecon/restorecon.c 2006-01-25 14:03:12.000000000 -0500 +@@ -140,6 +140,7 @@ + fprintf(stderr,"Warning! %s refers to a symbolic link, not following last component.\n", filename); + char *p = NULL, *file_sep; + char *tmp_path = strdupa(filename); ++ size_t len=0; + if (!tmp_path) { + fprintf(stderr,"strdupa on %s failed: %s\n", filename,strerror(errno)); + return 1; +@@ -150,8 +151,11 @@ + *file_sep = 0; + file_sep++; + p = realpath(tmp_path, path); ++ } ++ else { ++ file_sep = tmp_path; ++ p = realpath("./", path); + } +- size_t len; + if(p) + len = strlen(p); + if (!p || len + strlen(file_sep) + 2 > PATH_MAX) { +@@ -162,7 +166,7 @@ + *p = '/'; + p++; + strcpy(p, file_sep); +- filename = p; ++ filename = path; + } else { + char *p; + p = realpath(filename, path); +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.11/scripts/chcat --- nsapolicycoreutils/scripts/chcat 2006-01-19 16:00:44.000000000 -0500 -+++ policycoreutils-1.29.10/scripts/chcat 2006-01-20 17:17:02.000000000 -0500 ++++ policycoreutils-1.29.11/scripts/chcat 2006-01-25 11:13:33.000000000 -0500 @@ -356,7 +356,7 @@ if list_ind==0 and len(cmds) < 1: @@ -10,9 +43,9 @@ usage() if delete_ind: -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.10/semanage/semanage +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.11/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2006-01-20 10:37:37.000000000 -0500 -+++ policycoreutils-1.29.10/semanage/semanage 2006-01-20 15:17:56.000000000 -0500 ++++ policycoreutils-1.29.11/semanage/semanage 2006-01-25 11:13:33.000000000 -0500 @@ -30,28 +30,27 @@ def usage(message = ""): @@ -264,9 +297,9 @@ if object == "port": OBJECT.delete(target, proto) -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.10/semanage/semanage.8 +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.11/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2006-01-20 10:37:37.000000000 -0500 -+++ policycoreutils-1.29.10/semanage/semanage.8 2006-01-20 15:10:15.000000000 -0500 ++++ policycoreutils-1.29.11/semanage/semanage.8 2006-01-25 11:13:33.000000000 -0500 @@ -3,19 +3,19 @@ semanage \- SELinux Policy Management tool Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- policycoreutils.spec 25 Jan 2006 16:18:51 -0000 1.225 +++ policycoreutils.spec 25 Jan 2006 19:07:56 -0000 1.226 @@ -4,7 +4,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.11 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -97,6 +97,9 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Wed Jan 25 2006 Dan Walsh 1.29.11-2 +- Correct handling of symbolic links in restorecon + * Wed Jan 25 2006 Dan Walsh 1.29.11-1 - Added translation support to semanage - Update from upstream From fedora-cvs-commits at redhat.com Wed Jan 25 20:03:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 15:03:17 -0500 Subject: rpms/rhgb/devel rhgb-0.16.2-scale-logos.patch, NONE, 1.1 rhgb.spec, 1.45, 1.46 Message-ID: <200601252003.k0PK3HAX017908@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/rhgb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17839 Modified Files: rhgb.spec Added Files: rhgb-0.16.2-scale-logos.patch Log Message: Ray Strode 0.16.2-21 - add lame hack to scale logos down if in low resolutions (bug 178737) rhgb-0.16.2-scale-logos.patch: splash.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 45 insertions(+), 8 deletions(-) --- NEW FILE rhgb-0.16.2-scale-logos.patch --- --- rhgb-0.16.2/src/splash.c.scale-logos 2006-01-25 14:06:59.000000000 -0500 +++ rhgb-0.16.2/src/splash.c 2006-01-25 14:45:20.000000000 -0500 @@ -273,6 +273,7 @@ GtkWidget *table, *hbox; GtkWidget *expander; GdkScreen *screen; + GdkPixbuf *pixbuf; GdkRectangle rect; gchar *text; @@ -326,12 +327,31 @@ /* Simple page */ vbox2 = gtk_vbox_new (FALSE, 25); gtk_container_add (GTK_CONTAINER (align), vbox2); + + if (screen_height < 768) + { +#ifdef SPLASH_MAIN + pixbuf = gdk_pixbuf_new_from_file_at_scale ("main-logo.png", -1, (int) (.50 * screen_height), TRUE, NULL); +#else + pixbuf = gdk_pixbuf_new_from_file_at_scale ("/usr/share/rhgb/main-logo.png", -1, (int) (.50 * screen_height), TRUE, NULL); +#endif + } + else + { #ifdef SPLASH_MAIN - image = gtk_image_new_from_file ("main-logo.png"); + pixbuf = gdk_pixbuf_new_from_file ("main-logo.png", NULL); #else - image = gtk_image_new_from_file ("/usr/share/rhgb/main-logo.png"); + pixbuf = gdk_pixbuf_new_from_file ("/usr/share/rhgb/main-logo.png", NULL); #endif - gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0); + } + + if (pixbuf != NULL) + { + image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + + gtk_box_pack_start (GTK_BOX (vbox2), image, FALSE, FALSE, 0); + } event_box = gtk_event_box_new (); gtk_widget_modify_bg (event_box, GTK_STATE_NORMAL, &highlight); @@ -424,13 +444,31 @@ align = gtk_alignment_new (1.0, 0.5, 1.0, 1.0); gtk_box_pack_end (GTK_BOX (vbox), align, FALSE, FALSE, 0); + if (screen_height < 768) + { +#ifdef SPLASH_MAIN + pixbuf = gdk_pixbuf_new_from_file_at_scale ("system-logo.png", -1, (int) (.075 * screen_height), TRUE, NULL); +#else + pixbuf = gdk_pixbuf_new_from_file_at_scale ("/usr/share/rhgb/system-logo.png", -1, (int) (.075 * screen_height), TRUE, NULL); +#endif + } + else + { #ifdef SPLASH_MAIN - splash->system_logo = gtk_image_new_from_file ("system-logo.png"); + pixbuf = gdk_pixbuf_new_from_file ("system-logo.png", NULL); #else - splash->system_logo = gtk_image_new_from_file ("/usr/share/rhgb/system-logo.png"); + pixbuf = gdk_pixbuf_new_from_file ("/usr/share/rhgb/system-logo.png", NULL); #endif - gtk_misc_set_alignment (GTK_MISC (splash->system_logo), 1.0, 0.5); - gtk_container_add (GTK_CONTAINER (align), splash->system_logo); + } + + if (pixbuf != NULL) + { + splash->system_logo = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + + gtk_misc_set_alignment (GTK_MISC (splash->system_logo), 1.0, 0.5); + gtk_container_add (GTK_CONTAINER (align), splash->system_logo); + } initialize_throbber (splash); gtk_widget_show_all (splash->window); @@ -438,7 +476,6 @@ return splash; } - static void get_fade_level (gint count, gint *r, Index: rhgb.spec =================================================================== RCS file: /cvs/dist/rpms/rhgb/devel/rhgb.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- rhgb.spec 20 Jan 2006 18:47:21 -0000 1.45 +++ rhgb.spec 25 Jan 2006 20:03:05 -0000 1.46 @@ -3,7 +3,7 @@ Summary: Red Hat Graphical Boot Name: rhgb Version: 0.16.2 -Release: 20 +Release: 21 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL @@ -25,6 +25,7 @@ Patch6: rhgb-0.16.2-kill-more-zombies.patch Patch7: rhgb-0.16.2-dont-call-chvt.patch Patch8: rhgb-0.16.2-change-colors.patch +Patch9: rhgb-0.16.2-scale-logos.patch %description Red Hat Graphical Boot provides a clean and simple interface to the boot process @@ -40,6 +41,7 @@ %patch6 -p1 -b .kill-more-zombies %patch7 -p1 -b .dont-call-chvt %patch8 -p1 -b .change-colors +%patch9 -p1 -b .scale-logos %build %configure @@ -68,6 +70,9 @@ %doc doc/HOW_IT_WORKS %changelog +* Wed Jan 25 2006 Ray Strode 0.16.2-21 +- add lame hack to scale logos down if in low resolutions (bug 178737) + * Fri Jan 20 2006 Ray Strode 0.16.2-20 - update the logo in the corner From fedora-cvs-commits at redhat.com Wed Jan 25 20:48:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 15:48:32 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.231,1.232 Message-ID: <200601252048.k0PKmW4w012040@cvs.devel.redhat.com> Author: overholt Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32239 Modified Files: eclipse.spec Log Message: * Wed Jan 25 2006 Andrew Overholt 3.1.1-1jpp_16fc - Rebuild against latest gcc to see if this fixes rh#178156. Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.231 retrieving revision 1.232 diff -u -r1.231 -r1.232 --- eclipse.spec 7 Jan 2006 16:06:17 -0000 1.231 +++ eclipse.spec 25 Jan 2006 20:48:30 -0000 1.232 @@ -23,7 +23,7 @@ Summary: %{pkg_summary} Name: eclipse Version: %{eclipse_majmin}.%{eclipse_micro} -Release: 1jpp_15fc +Release: 1jpp_16fc License: EPL Group: Text Editors/Integrated Development Environments (IDE) URL: http://www.eclipse.org/ @@ -1264,6 +1264,9 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1 %changelog +* Wed Jan 25 2006 Andrew Overholt 3.1.1-1jpp_16fc +- Rebuild against latest gcc to see if this fixes rh#178156. + * Wed Jan 04 2006 Andrew Overholt 3.1.1-1jpp_15fc - Update s390{,x} patches. - Use natively-compiled ecj during build. From fedora-cvs-commits at redhat.com Wed Jan 25 20:55:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 15:55:31 -0500 Subject: rpms/libbonobo/devel libbonobo.spec,1.28,1.29 Message-ID: <200601252055.k0PKtVPo020747@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20600 Modified Files: libbonobo.spec Log Message: - run automake in %%build so that shlib patch gets built - s/%%makeinstall/make install DESTDIR=$RPM_BUILD_ROOT/ Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- libbonobo.spec 19 Jan 2006 14:09:01 -0000 1.28 +++ libbonobo.spec 25 Jan 2006 20:55:28 -0000 1.29 @@ -6,7 +6,7 @@ Summary: Bonobo component system Name: libbonobo Version: 2.13.1 -Release: 6 +Release: 7 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -49,13 +49,14 @@ %patch0 -p1 -b .multishlib %build +automake %configure --disable-gtk-doc make %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT ## just kill this wherever it lives rm -f $RPM_BUILD_ROOT%{_libdir}/bonobo-2.0/samples/bonobo-echo-2 @@ -108,6 +109,11 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Wed Jan 25 2006 Ray Strode 2.13.1-7 +- run automake in %%build so that shlib patch gets + built +- s/%%makeinstall/make install DESTDIR=$RPM_BUILD_ROOT/ + * Thu Jan 19 2006 Ray Strode 2.13.1-6 - s/sed -ie/sed -i -e/ From fedora-cvs-commits at redhat.com Wed Jan 25 20:57:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 15:57:59 -0500 Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.48, 1.49 sources, 1.60, 1.61 system-config-securitylevel.spec, 1.69, 1.70 Message-ID: <200601252057.k0PKvxO4021977@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/system-config-securitylevel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21930 Modified Files: .cvsignore sources system-config-securitylevel.spec Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 8 Dec 2005 20:20:59 -0000 1.48 +++ .cvsignore 25 Jan 2006 20:57:55 -0000 1.49 @@ -36,3 +36,4 @@ system-config-securitylevel-1.6.10.tar.bz2 system-config-securitylevel-1.6.11.tar.bz2 system-config-securitylevel-1.6.12.tar.bz2 +system-config-securitylevel-1.6.13.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 8 Dec 2005 20:20:59 -0000 1.60 +++ sources 25 Jan 2006 20:57:55 -0000 1.61 @@ -1 +1 @@ -985994273b534658b088795fc498cd9f system-config-securitylevel-1.6.12.tar.bz2 +316adb08268ba45237bba3c9f58142f7 system-config-securitylevel-1.6.13.tar.bz2 Index: system-config-securitylevel.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- system-config-securitylevel.spec 9 Dec 2005 22:43:28 -0000 1.69 +++ system-config-securitylevel.spec 25 Jan 2006 20:57:55 -0000 1.70 @@ -1,7 +1,7 @@ Summary: A graphical interface for modifying the system security level Name: system-config-securitylevel -Version: 1.6.12 -Release: 1.1 +Version: 1.6.13 +Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -96,6 +96,11 @@ /usr/bin/system-config-securitylevel-tui %changelog +* Wed Jan 25 2006 Chris Lumens 1.6.13-1 +- Sort trusted services by service name (#178467). +- Use a combo box for the other services list instead of just a text entry + (#178108). + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Wed Jan 25 21:10:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 16:10:53 -0500 Subject: rpms/sane-backends/devel sane-backends.spec, 1.49, 1.50 libsane.usermap, 1.1, NONE libusbscanner, 1.11, NONE Message-ID: <200601252110.k0PLArK2025410@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/sane-backends/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25270 Modified Files: sane-backends.spec Removed Files: libsane.usermap libusbscanner Log Message: Add udev rules file, remove hotplug.d files (#177650) Index: sane-backends.spec =================================================================== RCS file: /cvs/dist/rpms/sane-backends/devel/sane-backends.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sane-backends.spec 23 Jan 2006 04:31:36 -0000 1.49 +++ sane-backends.spec 25 Jan 2006 21:10:50 -0000 1.50 @@ -4,12 +4,11 @@ Summary: Scanner access software Name: sane-backends Version: 1.0.17 -Release: 2 +Release: 3 License: GPL (programs), relaxed LGPL (libraries), and public domain (docs) Group: System Environment/Libraries Source0: ftp://ftp.sane-project.org/pub/sane/%{name}-%{version}/%{name}-%{version}.tar.gz Source1: sane.png -Source2: libusbscanner Patch1: sane-backends-1.0.11-rpath.patch Patch3: sane-backends-1.0.12-badcode.patch Patch5: sane-backends-multilib.patch @@ -20,7 +19,7 @@ BuildRequires: gphoto2-devel %endif Prereq: /sbin/ldconfig, /bin/mktemp, /bin/grep, /bin/cat, /bin/rm -Requires: pam >= 0.78-2 +Requires: pam >= 0.78-2, udev ExcludeArch: s390 s390x %description @@ -94,9 +93,11 @@ install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps rm -f %{buildroot}%{_bindir}/gamma4scanimage rm -f %{buildroot}%{_libdir}/sane/*.a %{buildroot}%{_libdir}/*.a -mkdir -p %{buildroot}%{_sysconfdir}/hotplug/usb -install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/hotplug/usb -install -m 644 tools/hotplug/libsane.usermap %{buildroot}%{_sysconfdir}/hotplug/usb +mkdir -p %{buildroot}/%{_sysconfdir}/udev/rules.d/ + +sh tools/udev/convert-usermap.sh tools/hotplug/libsane.usermap + +sed 's|MODE="660", GROUP="scanner"|SYMLINK+="scanner-%k"|g' libsane.rules > %{buildroot}/%{_sysconfdir}/udev/rules.d/60-libsane.rules %find_lang %name @@ -111,7 +112,7 @@ %defattr(-,root,root) %dir /etc/sane.d %config(noreplace) /etc/sane.d/* -%{_sysconfdir}/hotplug/usb/* +%{_sysconfdir}/udev/rules.d/* %{_bindir}/sane-find-scanner %{_bindir}/scanimage %{_sbindir}/* @@ -132,6 +133,9 @@ %{_libdir}/sane/*.so %changelog +* Wed Jan 25 2006 Bill Nottingham 1.0.17-3 +- ship udev rules for device creation (#177650). Require udev + * Sun Jan 22 2006 Bill Nottingham 1.0.17-2 - disable hotplug dep. More later pending (#177650) --- libsane.usermap DELETED --- --- libusbscanner DELETED --- From fedora-cvs-commits at redhat.com Wed Jan 25 21:12:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 16:12:32 -0500 Subject: rpms/kudzu/devel .cvsignore, 1.99, 1.100 kudzu.spec, 1.112, 1.113 sources, 1.110, 1.111 Message-ID: <200601252112.k0PLCWKr026207@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26164/devel Modified Files: .cvsignore kudzu.spec sources Log Message: auto-import kudzu-1.2.22-1 on branch devel from kudzu-1.2.22-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- .cvsignore 24 Jan 2006 18:07:45 -0000 1.99 +++ .cvsignore 25 Jan 2006 21:12:29 -0000 1.100 @@ -1 +1 @@ -kudzu-1.2.21.tar.gz +kudzu-1.2.22.tar.gz Index: kudzu.spec =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- kudzu.spec 24 Jan 2006 18:07:45 -0000 1.112 +++ kudzu.spec 25 Jan 2006 21:12:29 -0000 1.113 @@ -1,5 +1,5 @@ Name: kudzu -Version: 1.2.21 +Version: 1.2.22 Release: 1 License: GPL Summary: The Red Hat Linux hardware probing tool. @@ -79,6 +79,9 @@ %{_includedir}/kudzu %changelog +* Wed Jan 25 2006 Jeremy Katz - 1.2.22-1 +- fix xen device probing when modules aren't loaded + * Tue Jan 24 2006 Bill Nottingham - 1.2.21-1 - more forcedeth shenaningans (#178557) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- sources 24 Jan 2006 18:07:45 -0000 1.110 +++ sources 25 Jan 2006 21:12:29 -0000 1.111 @@ -1 +1 @@ -d462ea8afc98e5f9c1b7d65f062207f9 kudzu-1.2.21.tar.gz +5963ca46a4669a5b1ab14a60b87cc613 kudzu-1.2.22.tar.gz From fedora-cvs-commits at redhat.com Wed Jan 25 21:49:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 16:49:27 -0500 Subject: rpms/libbonobo/devel libbonobo-2.13.1-multishlib.patch, 1.1, 1.2 libbonobo.spec, 1.29, 1.30 Message-ID: <200601252149.k0PLnRfw000816@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv673 Modified Files: libbonobo-2.13.1-multishlib.patch libbonobo.spec Log Message: - run automake in %%build so that shlib patch gets built - change libdir logic to happen at configure time because automake's conditional support isn't that sophisticated - s/%%makeinstall/make install DESTDIR=$RPM_BUILD_ROOT/ libbonobo-2.13.1-multishlib.patch: activation-server/Makefile.am | 9 ++++++++- configure.in | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) Index: libbonobo-2.13.1-multishlib.patch =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo-2.13.1-multishlib.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libbonobo-2.13.1-multishlib.patch 19 Jan 2006 00:37:39 -0000 1.1 +++ libbonobo-2.13.1-multishlib.patch 25 Jan 2006 21:49:23 -0000 1.2 @@ -1,15 +1,27 @@ ---- libbonobo-2.13.1/activation-server/Makefile.am.multishlib 2006-01-18 18:42:26.000000000 -0500 -+++ libbonobo-2.13.1/activation-server/Makefile.am 2006-01-18 18:43:24.000000000 -0500 -@@ -6,13 +6,19 @@ +--- libbonobo-2.13.1/configure.in.multishlib 2006-01-25 16:38:53.000000000 -0500 ++++ libbonobo-2.13.1/configure.in 2006-01-25 16:46:03.000000000 -0500 +@@ -233,6 +233,8 @@ + AC_SUBST(IF_BSD_PS) + AC_SUBST(IF_POSIX_PS) + ++AM_CONDITIONAL(MULTILIB_SERVER_FILES, test "$libdir" != "$exec_prefix/lib") ++ + AC_OUTPUT([ + Makefile + libbonobo-zip +--- libbonobo-2.13.1/activation-server/Makefile.am.multishlib 2005-07-04 18:05:49.000000000 -0400 ++++ libbonobo-2.13.1/activation-server/Makefile.am 2006-01-25 16:44:26.000000000 -0500 +@@ -6,13 +6,20 @@ libexec_PROGRAMS=bonobo-activation-server noinst_PROGRAMS=test-performance +serverinfolibdir = $(libdir)/bonobo/servers + -+ifneq ($(libdir), $(exec_prefix)/lib) -+serverinfolibdir := $(serverinfolibdir):$(exec_prefix)/lib/bonobo/servers ++if MULTILIB_SERVER_FILES ++ serverinfolibdir := $(exec_prefix)/lib/bonobo/servers +endif + ++ INCLUDES= \ -I$(top_srcdir) \ -I$(top_builddir) \ Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- libbonobo.spec 25 Jan 2006 20:55:28 -0000 1.29 +++ libbonobo.spec 25 Jan 2006 21:49:23 -0000 1.30 @@ -49,7 +49,9 @@ %patch0 -p1 -b .multishlib %build +aclocal automake +autoconf %configure --disable-gtk-doc make @@ -112,6 +114,8 @@ * Wed Jan 25 2006 Ray Strode 2.13.1-7 - run automake in %%build so that shlib patch gets built +- change libdir logic to happen at configure time because + automake's conditional support isn't that sophisticated - s/%%makeinstall/make install DESTDIR=$RPM_BUILD_ROOT/ * Thu Jan 19 2006 Ray Strode 2.13.1-6 From fedora-cvs-commits at redhat.com Wed Jan 25 21:55:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 16:55:25 -0500 Subject: rpms/libbonobo/devel libbonobo.spec,1.30,1.31 Message-ID: <200601252155.k0PLtPSu003788@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3705 Modified Files: libbonobo.spec Log Message: - run automake in %%build so that shlib patch gets built - change libdir logic to happen at configure time because automake's conditional support isn't that sophisticated - s/%%makeinstall/make install DESTDIR=$RPM_BUILD_ROOT/ Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- libbonobo.spec 25 Jan 2006 21:49:23 -0000 1.30 +++ libbonobo.spec 25 Jan 2006 21:55:23 -0000 1.31 @@ -49,6 +49,7 @@ %patch0 -p1 -b .multishlib %build +intltoolize -f aclocal automake autoconf From fedora-cvs-commits at redhat.com Wed Jan 25 22:44:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 17:44:29 -0500 Subject: rpms/fedora-logos/devel .cvsignore, 1.22, 1.23 fedora-logos.spec, 1.24, 1.25 sources, 1.23, 1.24 Message-ID: <200601252244.k0PMiTTd019619@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/fedora-logos/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19604 Modified Files: .cvsignore fedora-logos.spec sources Log Message: Bump version for new firstboot artwork. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 20 Jan 2006 18:45:47 -0000 1.22 +++ .cvsignore 25 Jan 2006 22:44:27 -0000 1.23 @@ -1 +1,2 @@ fedora-logos-1.1.40.tar.bz2 +fedora-logos-1.1.41.tar.bz2 Index: fedora-logos.spec =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/fedora-logos.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- fedora-logos.spec 20 Jan 2006 18:45:48 -0000 1.24 +++ fedora-logos.spec 25 Jan 2006 22:44:27 -0000 1.25 @@ -1,6 +1,6 @@ Name: fedora-logos Summary: Red Hat-related icons and pictures. -Version: 1.1.40 +Version: 1.1.41 Release: 1 Group: System Environment/Base Source0: fedora-logos-%{version}.tar.bz2 @@ -135,6 +135,9 @@ # end i386 bits %changelog +* Wed Jan 25 2006 Chris Lumens 1.1.41-1 +- New artwork for firstboot from dfong (#178106). + * Fri Jan 20 2006 Ray Strode - 1.1.40-1 - update the logo in the corner Index: sources =================================================================== RCS file: /cvs/dist/rpms/fedora-logos/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 20 Jan 2006 18:45:48 -0000 1.23 +++ sources 25 Jan 2006 22:44:27 -0000 1.24 @@ -1 +1 @@ -23a11e9d8880990f7b8084e68b8f479e fedora-logos-1.1.40.tar.bz2 +2f5b8cb70afb62a49548ca2269c898d5 fedora-logos-1.1.41.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 25 22:48:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 17:48:03 -0500 Subject: rpms/firstboot/devel .cvsignore, 1.43, 1.44 firstboot.spec, 1.62, 1.63 sources, 1.59, 1.60 Message-ID: <200601252248.k0PMm3lg031939@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/firstboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31925 Modified Files: .cvsignore firstboot.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 19 Jan 2006 19:47:13 -0000 1.43 +++ .cvsignore 25 Jan 2006 22:48:01 -0000 1.44 @@ -15,3 +15,4 @@ firstboot-1.3.56.tar.bz2 firstboot-1.3.57.tar.bz2 firstboot-1.4.0.tar.bz2 +firstboot-1.4.1.tar.bz2 Index: firstboot.spec =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- firstboot.spec 19 Jan 2006 19:47:13 -0000 1.62 +++ firstboot.spec 25 Jan 2006 22:48:01 -0000 1.63 @@ -1,6 +1,6 @@ Summary: Initial system configuration utility Name: firstboot -Version: 1.4.0 +Version: 1.4.1 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -110,6 +110,10 @@ %changelog +* Wed Jan 25 2006 Chris Lumens 1.4.1-1 +- Fix debug mode. +- Use the new bubbly artwork (#178106). + * Thu Jan 19 2006 Chris Lumens 1.4.0-1 - Split into separate packages for X and no X (#178216). Index: sources =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/sources,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- sources 19 Jan 2006 19:47:13 -0000 1.59 +++ sources 25 Jan 2006 22:48:01 -0000 1.60 @@ -1 +1,2 @@ 3a10d6fb3f696274586e20942fa4c272 firstboot-1.4.0.tar.bz2 +92eedb85d83fe3093b96681da1c777c3 firstboot-1.4.1.tar.bz2 From fedora-cvs-commits at redhat.com Wed Jan 25 23:22:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 18:22:02 -0500 Subject: rpms/kudzu/devel .cvsignore, 1.100, 1.101 kudzu.spec, 1.113, 1.114 sources, 1.111, 1.112 Message-ID: <200601252322.k0PNM2sp030294@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30251/devel Modified Files: .cvsignore kudzu.spec sources Log Message: auto-import kudzu-1.2.23-1 on branch devel from kudzu-1.2.23-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- .cvsignore 25 Jan 2006 21:12:29 -0000 1.100 +++ .cvsignore 25 Jan 2006 23:22:00 -0000 1.101 @@ -1 +1 @@ -kudzu-1.2.22.tar.gz +kudzu-1.2.23.tar.gz Index: kudzu.spec =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- kudzu.spec 25 Jan 2006 21:12:29 -0000 1.113 +++ kudzu.spec 25 Jan 2006 23:22:00 -0000 1.114 @@ -1,5 +1,5 @@ Name: kudzu -Version: 1.2.22 +Version: 1.2.23 Release: 1 License: GPL Summary: The Red Hat Linux hardware probing tool. @@ -79,6 +79,9 @@ %{_includedir}/kudzu %changelog +* Wed Jan 25 2006 Jeremy Katz - 1.2.23-1 +- fix nvidia segfault + * Wed Jan 25 2006 Jeremy Katz - 1.2.22-1 - fix xen device probing when modules aren't loaded Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- sources 25 Jan 2006 21:12:29 -0000 1.111 +++ sources 25 Jan 2006 23:22:00 -0000 1.112 @@ -1 +1 @@ -5963ca46a4669a5b1ab14a60b87cc613 kudzu-1.2.22.tar.gz +66069f09a1d2e645ea73ff2b58df0e05 kudzu-1.2.23.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 26 00:11:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 19:11:44 -0500 Subject: rpms/kernel/FC-4/configs config-generic,1.50,1.51 Message-ID: <200601260011.k0Q0Bi6T028493@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv28407/configs Modified Files: config-generic Log Message: disable yealink Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- config-generic 25 Jan 2006 16:19:04 -0000 1.50 +++ config-generic 26 Jan 2006 00:11:42 -0000 1.51 @@ -2164,7 +2164,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_SPEEDTOUCH=m -CONFIG_USB_YEALINK=m +# CONFIG_USB_YEALINK is not set CONFIG_USB_ZD1201=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_GL620A=m From fedora-cvs-commits at redhat.com Thu Jan 26 00:11:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 19:11:44 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1580,1.1581 Message-ID: <200601260011.k0Q0BiXs028485@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv28407 Modified Files: kernel-2.6.spec Log Message: disable yealink Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1580 retrieving revision 1.1581 diff -u -r1.1580 -r1.1581 --- kernel-2.6.spec 25 Jan 2006 16:19:32 -0000 1.1580 +++ kernel-2.6.spec 26 Jan 2006 00:11:42 -0000 1.1581 @@ -1273,6 +1273,9 @@ %endif %changelog +* Wed Jan 25 2006 Dave Jones [2.6.15-1.1826_FC4] +- Disable yealink driver due to broken probing. + * Wed Jan 25 2006 Dave Jones [2.6.15-1.1825_FC4] - Temporarily flip on some debugging options again. From fedora-cvs-commits at redhat.com Thu Jan 26 01:39:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 20:39:58 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1581,1.1582 Message-ID: <200601260139.k0Q1dwfE022316@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22228 Modified Files: kernel-2.6.spec Log Message: disable debug again Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1581 retrieving revision 1.1582 diff -u -r1.1581 -r1.1582 --- kernel-2.6.spec 26 Jan 2006 00:11:42 -0000 1.1581 +++ kernel-2.6.spec 26 Jan 2006 01:39:55 -0000 1.1582 @@ -1275,6 +1275,7 @@ %changelog * Wed Jan 25 2006 Dave Jones [2.6.15-1.1826_FC4] - Disable yealink driver due to broken probing. +- Disable debug options again. * Wed Jan 25 2006 Dave Jones [2.6.15-1.1825_FC4] - Temporarily flip on some debugging options again. From fedora-cvs-commits at redhat.com Thu Jan 26 01:39:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 20:39:58 -0500 Subject: rpms/kernel/FC-4/configs config-generic, 1.51, 1.52 config-x86-generic, 1.18, 1.19 Message-ID: <200601260139.k0Q1dwiS022323@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv22228/configs Modified Files: config-generic config-x86-generic Log Message: disable debug again Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- config-generic 26 Jan 2006 00:11:42 -0000 1.51 +++ config-generic 26 Jan 2006 01:39:55 -0000 1.52 @@ -2519,7 +2519,7 @@ CONFIG_DEBUG_RODATA=y # Turn off these debug options for production kernels. -CONFIG_DEBUG_SLAB=y +# CONFIG_DEBUG_SLAB is not set # # Security options Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-x86-generic,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- config-x86-generic 25 Jan 2006 16:19:04 -0000 1.18 +++ config-x86-generic 26 Jan 2006 01:39:55 -0000 1.19 @@ -209,7 +209,7 @@ CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_DEBUG_STACK_USAGE=y -CONFIG_DEBUG_PAGEALLOC=y +# CONFIG_DEBUG_PAGEALLOC is not set CONFIG_4KSTACKS=y CONFIG_KPROBES=y From fedora-cvs-commits at redhat.com Thu Jan 26 03:40:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 22:40:35 -0500 Subject: rpms/kernel/devel/configs config-x86-generic,1.31,1.32 Message-ID: <200601260340.k0Q3eZDi008001@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv7874/configs Modified Files: config-x86-generic Log Message: disable pagealloc debug again Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/configs/config-x86-generic,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- config-x86-generic 22 Jan 2006 07:58:16 -0000 1.31 +++ config-x86-generic 26 Jan 2006 03:40:32 -0000 1.32 @@ -208,7 +208,7 @@ CONFIG_KPROBES=y # FIXME: Disable before release. -CONFIG_DEBUG_PAGEALLOC=y +# CONFIG_DEBUG_PAGEALLOC is not set CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y From fedora-cvs-commits at redhat.com Thu Jan 26 03:40:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Wed, 25 Jan 2006 22:40:34 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1871,1.1872 Message-ID: <200601260340.k0Q3eYeT007992@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7874 Modified Files: kernel-2.6.spec Log Message: disable pagealloc debug again Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1871 retrieving revision 1.1872 diff -u -r1.1871 -r1.1872 --- kernel-2.6.spec 23 Jan 2006 20:40:44 -0000 1.1871 +++ kernel-2.6.spec 26 Jan 2006 03:40:32 -0000 1.1872 @@ -1360,6 +1360,9 @@ %endif %changelog +* Wed Jan 25 2006 Dave Jones +- Disable page allocation debugging again. + * Tue Jan 24 2006 David Woidhouse - Fix snd_powermac I2C handling - Add pselect/ppoll on x86_64 From fedora-cvs-commits at redhat.com Thu Jan 26 05:37:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 00:37:04 -0500 Subject: rpms/gtkhtml3/devel .cvsignore, 1.28, 1.29 gtkhtml3.spec, 1.49, 1.50 sources, 1.28, 1.29 Message-ID: <200601260537.k0Q5b4Eg019991@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19905 Modified Files: .cvsignore gtkhtml3.spec sources Log Message: * Wed Jan 25 2006 David Malcolm - 3.9.5-1 - 3.9.5 - be more explicit about packaged bonobo server and so files, relying less on globbing Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 3 Jan 2006 20:05:24 -0000 1.28 +++ .cvsignore 26 Jan 2006 05:36:59 -0000 1.29 @@ -1 +1 @@ -gtkhtml-3.9.4.tar.bz2 +gtkhtml-3.9.5.tar.bz2 Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gtkhtml3.spec 19 Jan 2006 14:08:26 -0000 1.49 +++ gtkhtml3.spec 26 Jan 2006 05:36:59 -0000 1.50 @@ -4,8 +4,8 @@ Summary: gtkhtml library Name: gtkhtml3 -Version: 3.9.4 -Release: 4 +Version: 3.9.5 +Release: 1 License: LGPL/GPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2 @@ -84,19 +84,24 @@ %files -f gtkhtml-%{gtkhtml_major}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README COPYING TODO -%{_libdir}/*.so.* +%{_libdir}/libgtkhtml-%{gtkhtml_major}.so.* %dir %{_libdir}/gtkhtml %{_libdir}/gtkhtml/libgnome-gtkhtml-editor-%{gtkhtml_major}.so -%{_libdir}/bonobo/servers/*.server +%{_libdir}/bonobo/servers/GNOME_GtkHTML_Editor-%{gtkhtml_major}.server %{_datadir}/gtkhtml-%{gtkhtml_major} %files devel %defattr(-, root, root) %{_includedir}/libgtkhtml-%{gtkhtml_major} -%{_libdir}/*.so +%{_libdir}/libgtkhtml-%{gtkhtml_major}.so %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jan 25 2006 David Malcolm - 3.9.5-1 +- 3.9.5 +- be more explicit about packaged bonobo server and so files, relying less on + globbing + * Thu Jan 19 2006 Ray Strode - 3.9.4-3 - s/sed -ie/sed -i -e/ Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 3 Jan 2006 20:05:25 -0000 1.28 +++ sources 26 Jan 2006 05:36:59 -0000 1.29 @@ -1 +1 @@ -25096e3b8b9ad961e27f955f9db73fa3 gtkhtml-3.9.4.tar.bz2 +c49dc8a473e40417218454ae20b19ec3 gtkhtml-3.9.5.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 26 05:43:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 00:43:59 -0500 Subject: rpms/evolution-data-server/devel .cvsignore, 1.36, 1.37 evolution-data-server.spec, 1.79, 1.80 sources, 1.36, 1.37 Message-ID: <200601260543.k0Q5hxKQ022939@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22675 Modified Files: .cvsignore evolution-data-server.spec sources Log Message: * Wed Jan 25 2006 David Malcolm - 1.5.5-1 - 1.5.5 - added CalDAV backend to the list of packaged extensions Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 3 Jan 2006 20:56:28 -0000 1.36 +++ .cvsignore 26 Jan 2006 05:43:55 -0000 1.37 @@ -1 +1 @@ -evolution-data-server-1.5.4.tar.bz2 +evolution-data-server-1.5.5.tar.bz2 Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- evolution-data-server.spec 9 Jan 2006 22:31:25 -0000 1.79 +++ evolution-data-server.spec 26 Jan 2006 05:43:55 -0000 1.80 @@ -24,8 +24,8 @@ Summary: Backend data server for evolution Name: evolution-data-server -Version: 1.5.4 -Release: 4 +Version: 1.5.5 +Release: 1 License: LGPL Group: System Environment/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 @@ -280,6 +280,7 @@ %{eds_extensions_dir}/libecalbackendgroupwise.so %{eds_extensions_dir}/libecalbackendhttp.so %{eds_extensions_dir}/libecalbackendweather.so +%{eds_extensions_dir}/libecalbackendcaldav.so %files devel %defattr(-,root,root,-) @@ -290,7 +291,11 @@ %changelog -* Mon Jan 9 2006 David Malcolm - 1.5.4-4 +* Wed Jan 25 2006 David Malcolm - 1.5.5-1 +- 1.5.5 +- added CalDAV backend to the list of packaged extensions + +* Mon Jan 9 2006 David Malcolm - 1.5.4-4 - updated patch 300 to remove usage of GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools) Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 3 Jan 2006 20:56:28 -0000 1.36 +++ sources 26 Jan 2006 05:43:55 -0000 1.37 @@ -1 +1 @@ -d12bd29d433fcbaa7b18caf920e48015 evolution-data-server-1.5.4.tar.bz2 +9104c52697ccccfa55c039b9547effbd evolution-data-server-1.5.5.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 26 08:12:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 03:12:21 -0500 Subject: rpms/udev/devel udev-078-redhat.patch, 1.5, 1.6 udev.spec, 1.141, 1.142 Message-ID: <200601260812.k0Q8CL7C003698@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3657 Modified Files: udev-078-redhat.patch udev.spec Log Message: - changed usb device naming udev-078-redhat.patch: etc/udev/redhat/05-udev-early.rules | 8 + etc/udev/redhat/hotplug.rules | 13 ++ etc/udev/redhat/udev.rules | 98 +++++++++++---------- extras/check-cdrom.sh | 39 ++++++++ extras/floppy/create_floppy_devices.c | 6 + extras/ide-media.sh | 7 + extras/load_floppy_module.sh | 35 +++++++ extras/run_directory/MAKEDEV.dev | 38 ++++++++ extras/run_directory/dev.d/default/pam_console.dev | 18 --- extras/udevpermconv.sh | 94 ++++++++++++++++++++ 10 files changed, 292 insertions(+), 64 deletions(-) Index: udev-078-redhat.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-078-redhat.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- udev-078-redhat.patch 24 Jan 2006 12:37:12 -0000 1.5 +++ udev-078-redhat.patch 26 Jan 2006 08:12:17 -0000 1.6 @@ -1,5 +1,5 @@ --- udev-078/etc/udev/redhat/udev.rules.redhat 2005-12-17 16:40:29.000000000 +0100 -+++ udev-078/etc/udev/redhat/udev.rules 2006-01-24 12:48:17.000000000 +0100 ++++ udev-078/etc/udev/redhat/udev.rules 2006-01-26 08:40:10.000000000 +0100 @@ -3,6 +3,7 @@ # # default is OWNER="root" GROUP="root", MODE="0600" @@ -142,8 +142,13 @@ ####################################### # Persistent block device stuff - begin -@@ -301,19 +313,11 @@ +@@ -297,23 +309,14 @@ + # Persistent block device stuff - end + ##################################### +-ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" +- ++ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644" # Perhaps this should just be for all subsystems? +ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias" @@ -163,15 +168,15 @@ ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[07]", \ RUN+="/sbin/modprobe sd_mod" ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="14", \ -@@ -331,3 +335,6 @@ +@@ -331,3 +334,6 @@ ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \ RUN+="/sbin/firmware_helper" + +RUN+="socket:/org/kernel/udev/monitor" + ---- udev-078/etc/udev/redhat/05-udev-early.rules.redhat 2006-01-24 12:47:48.000000000 +0100 -+++ udev-078/etc/udev/redhat/05-udev-early.rules 2006-01-24 12:47:41.000000000 +0100 +--- /dev/null 2006-01-25 15:42:12.582274750 +0100 ++++ udev-078/etc/udev/redhat/05-udev-early.rules 2006-01-26 08:39:21.000000000 +0100 @@ -0,0 +1,8 @@ +# sysfs is populated after the event is sent +ACTION=="add", DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" @@ -182,7 +187,7 @@ +SUBSYSTEM=="module", OPTIONS="ignore_device" + --- udev-078/etc/udev/redhat/hotplug.rules.redhat 2005-12-17 16:40:29.000000000 +0100 -+++ udev-078/etc/udev/redhat/hotplug.rules 2006-01-23 11:21:53.000000000 +0100 ++++ udev-078/etc/udev/redhat/hotplug.rules 2006-01-26 08:39:21.000000000 +0100 @@ -1,8 +1,15 @@ # do not call hotplug.d and dev.d for "drivers" and "module" events -SUBSYSTEM=="drivers", OPTIONS="last_rule" @@ -202,8 +207,8 @@ + +LABEL="hotplug_end" ---- /dev/null 2006-01-20 06:37:43.888693712 +0100 -+++ udev-078/extras/ide-media.sh 2006-01-23 11:21:53.000000000 +0100 +--- /dev/null 2006-01-25 15:42:12.582274750 +0100 ++++ udev-078/extras/ide-media.sh 2006-01-26 08:39:21.000000000 +0100 @@ -0,0 +1,7 @@ +#!/bin/bash +i=0 @@ -212,8 +217,8 @@ + i=$[i+1]; +done +/bin/cat /proc/ide/$1/media ---- /dev/null 2006-01-20 06:37:43.888693712 +0100 -+++ udev-078/extras/run_directory/MAKEDEV.dev 2006-01-23 11:21:53.000000000 +0100 +--- /dev/null 2006-01-25 15:42:12.582274750 +0100 ++++ udev-078/extras/run_directory/MAKEDEV.dev 2006-01-26 08:39:21.000000000 +0100 @@ -0,0 +1,38 @@ +#!/bin/sh + @@ -254,7 +259,7 @@ + /sbin/pam_console_apply $DEVNAME* +fi --- udev-078/extras/run_directory/dev.d/default/pam_console.dev.redhat 2005-12-17 16:40:29.000000000 +0100 -+++ udev-078/extras/run_directory/dev.d/default/pam_console.dev 2006-01-23 11:21:53.000000000 +0100 ++++ udev-078/extras/run_directory/dev.d/default/pam_console.dev 2006-01-26 08:39:21.000000000 +0100 @@ -1,16 +1,11 @@ #!/bin/sh @@ -296,8 +301,8 @@ + debug_mesg "Restoring console permissions for $DEVNAME $DEVLINKS" + /sbin/pam_console_apply "$DEVNAME" $DEVLINKS fi ---- /dev/null 2006-01-20 06:37:43.888693712 +0100 -+++ udev-078/extras/check-cdrom.sh 2006-01-23 11:21:53.000000000 +0100 +--- /dev/null 2006-01-25 15:42:12.582274750 +0100 ++++ udev-078/extras/check-cdrom.sh 2006-01-26 08:39:21.000000000 +0100 @@ -0,0 +1,39 @@ +#!/bin/bash + @@ -338,8 +343,8 @@ + done + exit 1 +} ---- /dev/null 2006-01-20 06:37:43.888693712 +0100 -+++ udev-078/extras/udevpermconv.sh 2006-01-23 11:21:53.000000000 +0100 +--- /dev/null 2006-01-25 15:42:12.582274750 +0100 ++++ udev-078/extras/udevpermconv.sh 2006-01-26 08:39:21.000000000 +0100 @@ -0,0 +1,94 @@ +#!/bin/bash +# @@ -435,8 +440,8 @@ + +processInput +exit 0 ---- /dev/null 2006-01-20 06:37:43.888693712 +0100 -+++ udev-078/extras/load_floppy_module.sh 2006-01-23 11:21:53.000000000 +0100 +--- /dev/null 2006-01-25 15:42:12.582274750 +0100 ++++ udev-078/extras/load_floppy_module.sh 2006-01-26 08:39:21.000000000 +0100 @@ -0,0 +1,35 @@ +#!/bin/sh +######################################################################## @@ -474,7 +479,7 @@ + +exit $? --- udev-078/extras/floppy/create_floppy_devices.c.redhat 2005-12-17 16:40:29.000000000 +0100 -+++ udev-078/extras/floppy/create_floppy_devices.c 2006-01-23 11:21:53.000000000 +0100 ++++ udev-078/extras/floppy/create_floppy_devices.c 2006-01-26 08:39:21.000000000 +0100 @@ -116,8 +116,12 @@ minor = (table_sup[type][i] << 2) + fdnum; if (print_nodes) Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- udev.spec 24 Jan 2006 12:37:12 -0000 1.141 +++ udev.spec 26 Jan 2006 08:12:17 -0000 1.142 @@ -5,7 +5,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 078 -Release: 7 +Release: 8 License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -282,6 +282,9 @@ %attr(0644,root,root) %{_mandir}/man8/vol_id*.8* %changelog +* Thu Jan 26 2006 Harald Hoyer - 078-8 +- changed usb device naming + * Tue Jan 24 2006 Harald Hoyer - 078-7 - put WAIT_FOR_SYSFS rules in 05-udev-early.rules From fedora-cvs-commits at redhat.com Thu Jan 26 08:49:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 03:49:39 -0500 Subject: rpms/openoffice.org/devel openoffice.org-1.9.120.ooo52428.execshield.bridges.patch, 1.1, 1.2 openoffice.org.spec, 1.609, 1.610 Message-ID: <200601260849.k0Q8ndsU025228@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25213 Modified Files: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch openoffice.org.spec Log Message: execmem pain openoffice.org-1.9.120.ooo52428.execshield.bridges.patch: bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx | 18 ++++++++++++++++-- bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx | 17 ++++++++++++++--- sal/rtl/source/alloc.c | 2 +- source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx | 0 source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx | 0 5 files changed, 31 insertions(+), 6 deletions(-) Index: openoffice.org-1.9.120.ooo52428.execshield.bridges.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.120.ooo52428.execshield.bridges.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-1.9.120.ooo52428.execshield.bridges.patch 26 Jul 2005 11:55:13 -0000 1.1 +++ openoffice.org-1.9.120.ooo52428.execshield.bridges.patch 26 Jan 2006 08:49:35 -0000 1.2 @@ -40,3 +40,56 @@ *slots = mapBlockToVtable(block); (*slots)[-2] = 0; (*slots)[-1] = 0; +Index: source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx +=================================================================== +RCS file: /cvs/udk/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx,v +retrieving revision 1.7 +diff -u -p -u -r1.7 cpp2uno.cxx +--- openoffice.org.orig/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx 7 Sep 2005 22:22:31 -0000 1.7 ++++ openoffice.org/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx 26 Jan 2006 09:11:47 -0000 +@@ -44,7 +44,11 @@ + + #include "share.hxx" + // #include +- ++#include ++#include /* for PAGESIZE */ ++#ifndef PAGESIZE ++#define PAGESIZE 4096 ++#endif + + using namespace ::com::sun::star::uno; + +@@ -662,12 +666,19 @@ void ** bridges::cpp_uno::shared::Vtable + return reinterpret_cast< void ** >(block) + 2; + } + ++static char *create_executable_block(size_t nSize) ++{ ++ char * block = new char[nSize]; ++ char *p = (char *)(((int) block + PAGESIZE-1) & ~(PAGESIZE-1)); ++ mprotect(p, nSize, PROT_READ | PROT_WRITE | PROT_EXEC); ++ return block; ++} + + char * bridges::cpp_uno::shared::VtableFactory::createBlock( + sal_Int32 slotCount, void *** slots) + { +- char * block = new char[ +- (slotCount + 2) * sizeof (void *) + slotCount * codeSnippetSize]; ++ size_t nSize = (slotCount + 2) * sizeof (void *) + slotCount * codeSnippetSize; ++ char * block = create_executable_block(nSize); + *slots = mapBlockToVtable(block); + (*slots)[-2] = 0; + (*slots)[-1] = 0; +--- openoffice.org.orig/sal/rtl/source/alloc.c 2006-01-24 09:07:22.000000000 +0000 ++++ openoffice.org/sal/rtl/source/alloc.c 2006-01-24 09:07:37.000000000 +0000 +@@ -104,7 +104,7 @@ + #endif /* FREEBSD || NETBSD || MACOSX || IRIX || LINUX || SOLARIS */ + + #ifndef PROT_HEAP +-#define PROT_HEAP (PROT_READ | PROT_WRITE | PROT_EXEC) ++#define PROT_HEAP (PROT_READ | PROT_WRITE) + #endif + + /* #95880# building on Solaris 8 provides MAP_ANON, but it Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.609 retrieving revision 1.610 diff -u -r1.609 -r1.610 --- openoffice.org.spec 17 Jan 2006 16:51:26 -0000 1.609 +++ openoffice.org.spec 26 Jan 2006 08:49:35 -0000 1.610 @@ -1,6 +1,6 @@ %define oootag OOA680 %define ooomilestone 1 -%define rh_rpm_release 7 +%define rh_rpm_release 8 %define build_fc5 1 %define build_fc4 0 @@ -1010,7 +1010,7 @@ cd ../.. cd instsetoo_native/util -if ! build --dlv_switch link --all -P$MAXBUILDS; then +if ! build --dlv_switch link --since transex3 -P$MAXBUILDS; then echo parallel build failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build... unset MAXPROCESS build --dlv_switch link --all @@ -3374,6 +3374,9 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Thu Jan 26 2006 Caolan McNamara - 1:2.0.1.1-8 +- rh#178971# defer exec mem until bridge code + * Tue Jan 17 2006 Caolan McNamara - 1:2.0.1.1-7 - rh#177933# add Serbian sr_CS language pack - rh#178002# af_ZA dictionary in wrong encoding From fedora-cvs-commits at redhat.com Thu Jan 26 09:03:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 04:03:58 -0500 Subject: rpms/autorun/devel .cvsignore, 1.15, 1.16 autorun.spec, 1.23, 1.24 sources, 1.16, 1.17 Message-ID: <200601260903.k0Q93wcX003650@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/autorun/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3589 Modified Files: .cvsignore autorun.spec sources Log Message: - translation update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/autorun/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 14 Sep 2005 13:33:18 -0000 1.15 +++ .cvsignore 26 Jan 2006 09:03:35 -0000 1.16 @@ -1 +1 @@ -autorun-3.17.tar.gz +autorun-3.18.tar.gz Index: autorun.spec =================================================================== RCS file: /cvs/dist/rpms/autorun/devel/autorun.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- autorun.spec 25 Jan 2006 12:44:31 -0000 1.23 +++ autorun.spec 26 Jan 2006 09:03:44 -0000 1.24 @@ -2,8 +2,8 @@ %define KDEDIR /usr Summary: A CD-ROM mounting utility. Name: autorun -Version: 3.17 -Release: 2 +Version: 3.18 +Release: 1 License: GPL Group: Applications/System Source: %name-%{PACKAGE_VERSION}.tar.gz @@ -56,6 +56,9 @@ %{_datadir}/applications/*.desktop %changelog +* Thu Jan 26 2006 Harald Hoyer - 3.18 +- translation update + * Wed Jan 25 2006 Harald Hoyer - 3.17-2 - removed autorun vom /etc/skel Index: sources =================================================================== RCS file: /cvs/dist/rpms/autorun/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 14 Sep 2005 13:33:18 -0000 1.16 +++ sources 26 Jan 2006 09:03:44 -0000 1.17 @@ -1 +1 @@ -3d904d322b36f4b750be7784ce40a065 autorun-3.17.tar.gz +04285bf1d8dac05890a2191ae8ae1c09 autorun-3.18.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 26 09:21:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 04:21:33 -0500 Subject: rpms/udev/devel udev-078-redhat.patch,1.6,1.7 Message-ID: <200601260921.k0Q9LX50022732@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22680 Modified Files: udev-078-redhat.patch Log Message: removed MODE part from usb rule udev-078-redhat.patch: etc/udev/redhat/05-udev-early.rules | 8 + etc/udev/redhat/hotplug.rules | 13 ++ etc/udev/redhat/udev.rules | 98 +++++++++++---------- extras/check-cdrom.sh | 39 ++++++++ extras/floppy/create_floppy_devices.c | 6 + extras/ide-media.sh | 7 + extras/load_floppy_module.sh | 35 +++++++ extras/run_directory/MAKEDEV.dev | 38 ++++++++ extras/run_directory/dev.d/default/pam_console.dev | 18 --- extras/udevpermconv.sh | 94 ++++++++++++++++++++ 10 files changed, 292 insertions(+), 64 deletions(-) Index: udev-078-redhat.patch =================================================================== RCS file: /cvs/dist/rpms/udev/devel/udev-078-redhat.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- udev-078-redhat.patch 26 Jan 2006 08:12:17 -0000 1.6 +++ udev-078-redhat.patch 26 Jan 2006 09:21:30 -0000 1.7 @@ -148,7 +148,7 @@ -ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" - -+ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644" ++ACTION=="add", SUBSYSTEM=="usb_device", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c" # Perhaps this should just be for all subsystems? +ACTION=="add", SUBSYSTEM=="?*", MODALIAS=="?*", RUN+="/sbin/modprobe $modalias" From fedora-cvs-commits at redhat.com Thu Jan 26 09:42:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 04:42:38 -0500 Subject: rpms/hexedit/devel hexedit.spec,1.17,1.18 Message-ID: <200601260942.k0Q9gcoH030471@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/hexedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30123 Modified Files: hexedit.spec Log Message: - rebuilt (#178824) Index: hexedit.spec =================================================================== RCS file: /cvs/dist/rpms/hexedit/devel/hexedit.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- hexedit.spec 9 Dec 2005 22:40:54 -0000 1.17 +++ hexedit.spec 26 Jan 2006 09:42:34 -0000 1.18 @@ -1,7 +1,7 @@ Summary: A hexadecimal file viewer and editor. Name: hexedit Version: 1.2.12 -Release: 2.1 +Release: 3 License: GPL Group: Applications/Editors Url: http://merd.net/pixel @@ -39,6 +39,9 @@ %{_mandir}/*/* %changelog +* Thu Jan 26 2006 Jindrich Novy 1.2.12-3 +- rebuilt (#178824) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 26 12:46:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 07:46:03 -0500 Subject: rpms/system-config-printer/devel .cvsignore, 1.55, 1.56 printconf.spec, 1.58, 1.59 sources, 1.57, 1.58 Message-ID: <200601261246.k0QCk3Fo024810@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/system-config-printer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23498 Modified Files: .cvsignore printconf.spec sources Log Message: * Thu Jan 26 2006 Tim Waugh 0.6.150-1 - 0.6.150: - Handle ncopies in textonly filter (bug #178946). - Fix text-only driver options screen. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/.cvsignore,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- .cvsignore 17 Jan 2006 16:21:23 -0000 1.55 +++ .cvsignore 26 Jan 2006 12:46:01 -0000 1.56 @@ -35,3 +35,4 @@ printconf-0.6.147.tar.bz2 printconf-0.6.148.tar.bz2 printconf-0.6.149.tar.bz2 +printconf-0.6.150.tar.bz2 Index: printconf.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/printconf.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- printconf.spec 17 Jan 2006 16:21:23 -0000 1.58 +++ printconf.spec 26 Jan 2006 12:46:01 -0000 1.59 @@ -1,6 +1,6 @@ Summary: A printer configuration backend/frontend combination. Name: system-config-printer -Version: 0.6.149 +Version: 0.6.150 Release: 1 License: GPL Group: System Environment/Daemons @@ -174,6 +174,11 @@ %changelog +* Thu Jan 26 2006 Tim Waugh 0.6.150-1 +- 0.6.150: + - Handle ncopies in textonly filter (bug #178946). + - Fix text-only driver options screen. + * Tue Jan 17 2006 Tim Waugh 0.6.149-1 - 0.6.149: - Use better string for invalid name in UI. Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-printer/devel/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 17 Jan 2006 16:21:23 -0000 1.57 +++ sources 26 Jan 2006 12:46:01 -0000 1.58 @@ -1 +1 @@ -19442d322b3d7b0d71fa655e3062266f printconf-0.6.149.tar.bz2 +e07b9361061146ce3a16781922bd489e printconf-0.6.150.tar.bz2 From fedora-cvs-commits at redhat.com Thu Jan 26 13:53:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 08:53:38 -0500 Subject: rpms/SDL/FC-4 SDL-1.2.8-preferalsa.patch, NONE, 1.1 SDL.spec, 1.28, 1.29 Message-ID: <200601261353.k0QDrcS8020098@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/SDL/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv20007 Modified Files: SDL.spec Added Files: SDL-1.2.8-preferalsa.patch Log Message: [tw] - prefer alsa sound output, then artsd and esd SDL-1.2.8-preferalsa.patch: SDL_audio.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) --- NEW FILE SDL-1.2.8-preferalsa.patch --- --- SDL-1.2.8/src/audio/SDL_audio.c.prefer 2004-12-13 08:54:31.000000000 +0100 +++ SDL-1.2.8/src/audio/SDL_audio.c 2006-01-26 14:47:17.000000000 +0100 @@ -40,6 +40,15 @@ /* Available audio drivers */ static AudioBootStrap *bootstrap[] = { +#ifdef ALSA_SUPPORT + &ALSA_bootstrap, +#endif +#ifdef ARTSC_SUPPORT + &ARTSC_bootstrap, +#endif +#ifdef ESD_SUPPORT + &ESD_bootstrap, +#endif #ifdef OPENBSD_AUDIO_SUPPORT &OPENBSD_AUDIO_bootstrap, #endif @@ -47,9 +56,6 @@ &DSP_bootstrap, &DMA_bootstrap, #endif -#ifdef ALSA_SUPPORT - &ALSA_bootstrap, -#endif #ifdef QNXNTOAUDIO_SUPPORT &QNXNTOAUDIO_bootstrap, #endif @@ -59,12 +65,6 @@ #ifdef DMEDIA_SUPPORT &DMEDIA_bootstrap, #endif -#ifdef ARTSC_SUPPORT - &ARTSC_bootstrap, -#endif -#ifdef ESD_SUPPORT - &ESD_bootstrap, -#endif #ifdef NAS_SUPPORT &NAS_bootstrap, #endif Index: SDL.spec =================================================================== RCS file: /cvs/dist/rpms/SDL/FC-4/SDL.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- SDL.spec 26 May 2005 22:01:35 -0000 1.28 +++ SDL.spec 26 Jan 2006 13:53:36 -0000 1.29 @@ -1,10 +1,9 @@ Summary: A cross-platform multimedia library. Name: SDL Version: 1.2.8 -Release: 3.2 +Release: 4 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz Patch0: SDL-1.1.7-byteorder.patch -Patch4: SDL-1.2.3-prefersounddaemons.patch Patch5: SDL-1.2.3-c++.patch Patch8: SDL-1.2.6-no_rpath.patch Patch13: SDL-1.2.7-ppc_modes.patch @@ -12,6 +11,7 @@ Patch15: SDL-1.2.8-gcc4.patch Patch16: SDL-1.2.8-x86_64.patch Patch17: SDL-1.2.8-libdir.patch +Patch18: SDL-1.2.8-preferalsa.patch URL: http://www.libsdl.org/ License: LGPL Group: System Environment/Libraries @@ -40,7 +40,6 @@ %setup -q %patch0 -p1 -b .byte -%patch4 -p1 -b .prefer %patch5 -p1 -b .c++ %patch8 -p1 -b .no_rpath %patch13 -p1 -b .ppc_modes @@ -48,6 +47,7 @@ %patch15 -p1 -b .gcc4 %patch16 -p1 -b .x86_64 %patch17 -p1 -b .libdir +%patch18 -p1 -b .prefer %build #libtoolize --copy --force @@ -99,6 +99,9 @@ %{_mandir}/man3/SDL*.3* %changelog +* Thu Jan 26 2006 Thomas Woerner 1.2.8-4 +- prefer alsa sound output, then artsd and esd + * Thu May 26 2005 Bill Nottingham 1.2.8-3.2 - fix configure script for libdir so library deps are identical on all arches (#158346) From fedora-cvs-commits at redhat.com Thu Jan 26 13:57:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 08:57:06 -0500 Subject: rpms/SDL/devel SDL-1.2.8-preferalsa.patch, NONE, 1.1 SDL.spec, 1.33, 1.34 Message-ID: <200601261357.k0QDv6U3021690@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/SDL/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21599 Modified Files: SDL.spec Added Files: SDL-1.2.8-preferalsa.patch Log Message: [tw] - prefer alsa sound output, then artsd and esd SDL-1.2.8-preferalsa.patch: SDL_audio.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) --- NEW FILE SDL-1.2.8-preferalsa.patch --- --- SDL-1.2.8/src/audio/SDL_audio.c.prefer 2004-12-13 08:54:31.000000000 +0100 +++ SDL-1.2.8/src/audio/SDL_audio.c 2006-01-26 14:47:17.000000000 +0100 @@ -40,6 +40,15 @@ /* Available audio drivers */ static AudioBootStrap *bootstrap[] = { +#ifdef ALSA_SUPPORT + &ALSA_bootstrap, +#endif +#ifdef ARTSC_SUPPORT + &ARTSC_bootstrap, +#endif +#ifdef ESD_SUPPORT + &ESD_bootstrap, +#endif #ifdef OPENBSD_AUDIO_SUPPORT &OPENBSD_AUDIO_bootstrap, #endif @@ -47,9 +56,6 @@ &DSP_bootstrap, &DMA_bootstrap, #endif -#ifdef ALSA_SUPPORT - &ALSA_bootstrap, -#endif #ifdef QNXNTOAUDIO_SUPPORT &QNXNTOAUDIO_bootstrap, #endif @@ -59,12 +65,6 @@ #ifdef DMEDIA_SUPPORT &DMEDIA_bootstrap, #endif -#ifdef ARTSC_SUPPORT - &ARTSC_bootstrap, -#endif -#ifdef ESD_SUPPORT - &ESD_bootstrap, -#endif #ifdef NAS_SUPPORT &NAS_bootstrap, #endif Index: SDL.spec =================================================================== RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- SDL.spec 24 Jan 2006 13:41:09 -0000 1.33 +++ SDL.spec 26 Jan 2006 13:57:02 -0000 1.34 @@ -1,14 +1,14 @@ Summary: A cross-platform multimedia library. Name: SDL Version: 1.2.9 -Release: 3 +Release: 4 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz Patch0: SDL-1.1.7-byteorder.patch -Patch4: SDL-1.2.3-prefersounddaemons.patch Patch13: SDL-1.2.7-ppc_modes.patch Patch15: SDL-1.2.8-gcc4.patch Patch17: SDL-1.2.8-libdir.patch Patch18: SDL-1.2.9-yuv_mmx_gcc4.patch +Patch19: SDL-1.2.8-preferalsa.patch URL: http://www.libsdl.org/ License: LGPL Group: System Environment/Libraries @@ -40,11 +40,11 @@ %setup -q %patch0 -p1 -b .byte -%patch4 -p1 -b .prefer %patch13 -p1 -b .ppc_modes %patch15 -p1 -b .gcc4 %patch17 -p1 -b .libdir %patch18 -p1 -b .yuv_mmx_gcc4 +%patch19 -p1 -b .prefer %build #libtoolize --copy --force @@ -100,6 +100,9 @@ %{_mandir}/man3/SDL*.3* %changelog +* Thu Jan 26 2006 Thomas Woerner 1.2.9-4 +- prefer alsa sound output, then artsd and esd + * Tue Jan 24 2006 Thomas Woerner 1.2.9-3 - dropped libtool .la files from devel package From fedora-cvs-commits at redhat.com Thu Jan 26 14:05:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 09:05:02 -0500 Subject: rpms/s390utils/devel s390-tools-1.5.0-asmfix.patch, NONE, 1.1 s390utils.spec, 1.27, 1.28 Message-ID: <200601261405.k0QE52FK023387@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/s390utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23344 Modified Files: s390utils.spec Added Files: s390-tools-1.5.0-asmfix.patch Log Message: - Fixed some .macro errors in zipl/boot s390-tools-1.5.0-asmfix.patch: dumpcommon.S | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) --- NEW FILE s390-tools-1.5.0-asmfix.patch --- --- s390-tools-1.5.0/zipl/boot/dumpcommon.S.asmfix 2006-01-26 15:01:20.000000000 +0100 +++ s390-tools-1.5.0/zipl/boot/dumpcommon.S 2006-01-26 15:01:48.000000000 +0100 @@ -60,7 +60,7 @@ # MACRO: dump_header ################################################################################ -.macro dump_header: +.macro dump_header .align 8 # @@ -228,7 +228,7 @@ # - _copy_lowcore_64 ################################################################################ -.macro dump_common_fn_64: +.macro dump_common_fn_64 ################################################################################ # Take the dump @@ -472,7 +472,7 @@ # - _create_ida_list_64 ################################################################################ -.macro dump_idal_64: +.macro dump_idal_64 ################################################################################ # This function creates a indirect data addressing list # Parameters: @@ -660,7 +660,7 @@ # - _copy_lowcore_32 ################################################################################ -.macro dump_common_fn_32: +.macro dump_common_fn_32 ################################################################################ @@ -813,7 +813,7 @@ # - _create_ida_list_32 ################################################################################ -.macro dump_idal_32: +.macro dump_idal_32 ################################################################################ # This function creates a indirect data addressing list # Parameters: @@ -873,7 +873,7 @@ ################################################################################ -.macro dump_common_store_status_32: +.macro dump_common_store_status_32 ################################################################################ # store status of all cpus in their lowcores Index: s390utils.spec =================================================================== RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- s390utils.spec 9 Dec 2005 22:43:05 -0000 1.27 +++ s390utils.spec 26 Jan 2006 14:04:45 -0000 1.28 @@ -3,7 +3,7 @@ Summary: Linux/390 specific utilities. Name: s390utils Version: 1.5.0 -Release: 1.1 +Release: 2 Epoch: 2 License: GPL Group: System Environment/Base @@ -19,9 +19,9 @@ Patch4: s390-tools-1.5.0-subdirs.patch Patch5: s390-tools-1.5.0-automenu.patch Patch6: s390-tools-1.5.0-rhconf.patch -#Patch7: s390-tools-1.3.1-zfcpdump.patch -Patch8: s390-tools-1.3.1-kernheader.patch -Patch9: s390-tools-1.3.2-warnings.patch +Patch7: s390-tools-1.3.1-kernheader.patch +Patch8: s390-tools-1.3.2-warnings.patch +Patch9: s390-tools-1.5.0-asmfix.patch Patch20: cmsfs-1.1.8-kernel26.patch BuildRoot: /var/tmp/%{name}-root ExclusiveArch: s390 s390x @@ -72,15 +72,14 @@ # Makefile patches %patch6 -p1 -b .rhconf -# Patch to make zfcpdump build without getting tarballs from the internet. -# Disabled and unmaintained for now as we don't ship and support zfcpdump -# %patch7 -p1 -b .zfcpdump - # Patch to fix conflicting include of asm/statfs.h and bits/statfs.h -%patch8 -p1 -b .kernheader +%patch7 -p1 -b .kernheader # Patch to fix a couple of code bugs -%patch9 -p1 -b .warnings +%patch8 -p1 -b .warnings + +# Fix some assembler .macro errors +%patch8 -p1 -b .asmfix # build on kernel-2.6, too %patch20 -p0 -b .cmsfs26 @@ -146,6 +145,9 @@ %{_mandir}/man5/* %changelog +* Thu Jan 26 2006 Phil Knirsch 2:1.5.0-2 +- Fixed some .macro errors in zipl/boot + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Thu Jan 26 15:47:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 10:47:05 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.29, 1.30 policy-20060104.patch, 1.21, 1.22 selinux-policy.spec, 1.90, 1.91 sources, 1.33, 1.34 Message-ID: <200601261547.k0QFl5Jt001811@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1776 Modified Files: .cvsignore policy-20060104.patch selinux-policy.spec sources Log Message: * Thu Jan 26 2006 Dan Walsh 2.2.6-1 - Update to upstream - Put back in changes for pup/zen Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 25 Jan 2006 16:45:54 -0000 1.29 +++ .cvsignore 26 Jan 2006 15:47:02 -0000 1.30 @@ -30,3 +30,4 @@ serefpolicy-2.2.2.tgz serefpolicy-2.2.4.tgz serefpolicy-2.2.5.tgz +serefpolicy-2.2.6.tgz policy-20060104.patch: admin/rpm.fc | 4 +++- admin/rpm.te | 1 + apps/mono.te | 2 +- kernel/files.fc | 5 +++++ kernel/mls.te | 3 ++- kernel/storage.fc | 1 + services/cups.te | 1 + system/modutils.te | 2 ++ system/selinuxutil.te | 2 +- system/unconfined.if | 5 +++++ system/userdomain.te | 4 ++++ 11 files changed, 26 insertions(+), 4 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- policy-20060104.patch 25 Jan 2006 16:43:56 -0000 1.21 +++ policy-20060104.patch 26 Jan 2006 15:47:02 -0000 1.22 @@ -1,75 +1,20 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/alsa.te serefpolicy-2.2.5/policy/modules/admin/alsa.te ---- nsaserefpolicy/policy/modules/admin/alsa.te 2006-01-12 18:28:45.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/admin/alsa.te 2006-01-24 13:48:54.000000000 -0500 -@@ -34,6 +34,7 @@ - files_read_etc_files(alsa_t) - - term_use_generic_pty(alsa_t) -+term_dontaudit_use_unallocated_tty(alsa_t) - - libs_use_ld_so(alsa_t) - libs_use_shared_libs(alsa_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/kudzu.te serefpolicy-2.2.5/policy/modules/admin/kudzu.te ---- nsaserefpolicy/policy/modules/admin/kudzu.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/admin/kudzu.te 2006-01-24 13:54:24.000000000 -0500 -@@ -73,6 +73,7 @@ - storage_read_tape_device(kudzu_t) - storage_raw_write_fixed_disk(kudzu_t) - storage_raw_read_fixed_disk(kudzu_t) -+storage_raw_read_removable_device(kudzu_t) - - term_search_ptys(kudzu_t) - term_dontaudit_use_console(kudzu_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.fc serefpolicy-2.2.5/policy/modules/admin/prelink.fc ---- nsaserefpolicy/policy/modules/admin/prelink.fc 2006-01-11 18:41:32.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/admin/prelink.fc 2006-01-24 12:45:29.000000000 -0500 -@@ -4,3 +4,4 @@ - /usr/sbin/prelink(\.bin)? -- gen_context(system_u:object_r:prelink_exec_t,s0) - - /var/log/prelink\.log -- gen_context(system_u:object_r:prelink_log_t,s0) -+/var/lib/misc/prelink\.* -- gen_context(system_u:object_r:prelink_cache_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/prelink.te serefpolicy-2.2.5/policy/modules/admin/prelink.te ---- nsaserefpolicy/policy/modules/admin/prelink.te 2006-01-13 17:06:02.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/admin/prelink.te 2006-01-24 12:47:49.000000000 -0500 -@@ -28,6 +28,7 @@ - - allow prelink_t prelink_cache_t:file manage_file_perms; - files_filetrans_etc(prelink_t, prelink_cache_t, file) -+files_filetrans_var_lib(prelink_t, prelink_cache_t, file) - - allow prelink_t prelink_log_t:dir { setattr rw_dir_perms }; - allow prelink_t prelink_log_t:file { create ra_file_perms }; -@@ -58,6 +59,7 @@ - files_list_all(prelink_t) - files_getattr_all_files(prelink_t) - files_write_non_security_dir(prelink_t) -+files_read_etc_files(prelink_t) - files_read_etc_runtime_files(prelink_t) - - fs_getattr_xattr_fs(prelink_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/readahead.te serefpolicy-2.2.5/policy/modules/admin/readahead.te ---- nsaserefpolicy/policy/modules/admin/readahead.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/admin/readahead.te 2006-01-24 16:51:20.000000000 -0500 -@@ -27,7 +27,7 @@ - - kernel_read_kernel_sysctl(readahead_t) - kernel_read_system_state(readahead_t) --kernel_getattr_core(readahead_t) -+kernel_dontaudit_getattr_core(readahead_t) - - dev_read_sysfs(readahead_t) - dev_getattr_generic_chr_file(readahead_t) -@@ -48,6 +48,7 @@ - fs_getattr_all_pipes(readahead_t) - fs_getattr_all_files(readahead_t) - fs_search_ramfs(readahead_t) -+fs_read_tmpfs_symlinks(readahead_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.6/policy/modules/admin/rpm.fc +--- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-01-13 09:48:26.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/admin/rpm.fc 2006-01-26 10:41:32.000000000 -0500 +@@ -16,7 +16,9 @@ + /usr/bin/fedora-rmdevelrpms -- gen_context(system_u:object_r:rpm_exec_t,s0) + /usr/sbin/up2date -- gen_context(system_u:object_r:rpm_exec_t,s0) + /usr/sbin/rhn_check -- gen_context(system_u:object_r:rpm_exec_t,s0) +-') ++/usr/sbin/pup -- gen_context(system_u:object_r:rpm_exec_t,s0) ++/usr/sbin/pirut -- gen_context(system_u:object_r:rpm_exec_t,s0) ++- ')') - term_dontaudit_use_console(readahead_t) + /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.te serefpolicy-2.2.5/policy/modules/admin/rpm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.6/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/admin/rpm.te 2006-01-25 09:27:53.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/admin/rpm.te 2006-01-25 16:16:28.000000000 -0500 @@ -288,6 +288,7 @@ term_getattr_unallocated_ttys(rpm_script_t) @@ -78,119 +23,60 @@ auth_dontaudit_getattr_shadow(rpm_script_t) # ideally we would not need this -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/tmpreaper.te serefpolicy-2.2.5/policy/modules/admin/tmpreaper.te ---- nsaserefpolicy/policy/modules/admin/tmpreaper.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/admin/tmpreaper.te 2006-01-24 12:53:38.000000000 -0500 -@@ -44,6 +44,10 @@ - - cron_system_entry(tmpreaper_t,tmpreaper_exec_t) - -+optional_policy(`lpd',` -+ lpd_manage_spool(tmpreaper_t) -+') -+ - ifdef(`TODO',` - allow tmpreaper_t { home_type file_t }:notdevfile_class_set { getattr unlink }; - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/slocate.te serefpolicy-2.2.5/policy/modules/apps/slocate.te ---- nsaserefpolicy/policy/modules/apps/slocate.te 2006-01-16 13:55:42.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/apps/slocate.te 2006-01-24 13:16:12.000000000 -0500 -@@ -34,13 +34,16 @@ - - corecmd_exec_bin(locate_t) - -+libs_use_shared_libs(locate_t) -+libs_use_ld_so(locate_t) -+ - files_list_all(locate_t) - files_getattr_all_files(locate_t) - files_read_etc_runtime_files(locate_t) - files_read_etc_files(locate_t) - - fs_getattr_xattr_fs(locate_t) -- -+miscfiles_read_localization(locate_t) - optional_policy(`cron',` - cron_system_entry(locate_t, locate_exec_t) - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/bootloader.te serefpolicy-2.2.5/policy/modules/kernel/bootloader.te ---- nsaserefpolicy/policy/modules/kernel/bootloader.te 2006-01-19 10:00:40.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/kernel/bootloader.te 2006-01-24 12:28:24.000000000 -0500 -@@ -115,6 +115,7 @@ - dev_read_raw_memory(bootloader_t) - - fs_getattr_xattr_fs(bootloader_t) -+fs_read_tmpfs_symlinks(bootloader_t) - - term_getattr_all_user_ttys(bootloader_t) - term_dontaudit_manage_pty_dir(bootloader_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.5/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-01-19 10:00:40.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/kernel/files.if 2006-01-24 12:48:54.000000000 -0500 -@@ -354,10 +354,12 @@ - attribute file_type; - class dir search; - class file getattr; -+ class lnk_file getattr; - ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.6/policy/modules/apps/mono.te +--- nsaserefpolicy/policy/modules/apps/mono.te 2006-01-19 18:02:04.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/apps/mono.te 2006-01-25 16:17:35.000000000 -0500 +@@ -18,7 +18,7 @@ + # - allow $1 file_type:dir search; - allow $1 file_type:file getattr; -+ allow $1 file_type:lnk_file getattr; - ') + ifdef(`targeted_policy',` +- allow mono_t self:process execheap; ++ allow mono_t self:process { execheap execmem }; + unconfined_domain_template(mono_t) + role system_r types mono_t; + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.6/policy/modules/kernel/files.fc +--- nsaserefpolicy/policy/modules/kernel/files.fc 2006-01-25 15:58:58.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/kernel/files.fc 2006-01-25 16:23:35.000000000 -0500 +@@ -126,6 +126,11 @@ + /mnt/[^/]*/.* <> - ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.5/policy/modules/kernel/filesystem.if ---- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-20 10:02:32.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/kernel/filesystem.if 2006-01-24 13:39:15.000000000 -0500 -@@ -2295,6 +2295,23 @@ - - ######################################## - ## -+## Read tmpfs link files. -+## -+## -+## The type of the process performing this action. -+## + # ++# /net +# -+interface(`fs_read_tmpfs_symlinks',` -+ gen_require(` -+ type tmpfs_t; -+ ') -+ -+ fs_search_tmpfs($1) -+ allow $1 tmpfs_t:lnk_file read; -+') ++/net -d gen_context(system_u:object_r:mnt_t,s0) + -+######################################## -+## - ## Read and write character nodes on tmpfs filesystems. - ## - ## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.5/policy/modules/kernel/mls.te ++# + # /opt + # + /opt(/.*)? gen_context(system_u:object_r:usr_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.6/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/kernel/mls.te 2006-01-25 09:51:52.000000000 -0500 -@@ -88,5 +88,6 @@ ++++ serefpolicy-2.2.6/policy/modules/kernel/mls.te 2006-01-26 10:45:47.000000000 -0500 +@@ -86,7 +86,8 @@ + ') + ifdef(`enable_mls',` - # run init with maximum MLS range +-# run init with maximum MLS range range_transition kernel_t init_exec_t s0 - s15:c0.c255; +range_transition kernel_t lvm_exec_t s0 - s15:c0.c255; range_transition initrc_t auditd_exec_t s15:c0.c255; ++range_transition sysadm_t rpm_exec_t s0 - s15:c0.c255; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.fc serefpolicy-2.2.5/policy/modules/services/automount.fc ---- nsaserefpolicy/policy/modules/services/automount.fc 2005-12-09 16:09:22.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/services/automount.fc 2006-01-24 11:56:59.000000000 -0500 -@@ -14,3 +14,7 @@ - # - - /var/run/autofs(/.*)? gen_context(system_u:object_r:automount_var_run_t,s0) -+# -+# /misc -+# -+/misc -d gen_context(system_u:object_r:mnt_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.5/policy/modules/services/cups.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.2.6/policy/modules/kernel/storage.fc +--- nsaserefpolicy/policy/modules/kernel/storage.fc 2006-01-09 11:32:53.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/kernel/storage.fc 2006-01-26 10:42:28.000000000 -0500 +@@ -12,6 +12,7 @@ + /dev/cm20.* -b gen_context(system_u:object_r:removable_device_t,s0) + /dev/dasd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) + /dev/dm-[0-9]+ -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) ++/dev/xvd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) + /dev/fd[^/]+ -b gen_context(system_u:object_r:removable_device_t,s0) + /dev/flash[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) + /dev/gscd -b gen_context(system_u:object_r:removable_device_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.6/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-01-17 17:08:53.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/services/cups.te 2006-01-24 11:56:59.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/services/cups.te 2006-01-25 16:16:28.000000000 -0500 @@ -148,6 +148,7 @@ fs_search_auto_mountpoints(cupsd_t) @@ -199,163 +85,9 @@ auth_domtrans_chk_passwd(cupsd_t) auth_dontaudit_read_pam_pid(cupsd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/dbus.fc serefpolicy-2.2.5/policy/modules/services/dbus.fc ---- nsaserefpolicy/policy/modules/services/dbus.fc 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/services/dbus.fc 2006-01-24 11:56:59.000000000 -0500 -@@ -1,5 +1,6 @@ - /etc/dbus-1(/.*)? gen_context(system_u:object_r:dbusd_etc_t,s0) - -+# Sorting does not work correctly if I combine these next two roles - /usr/bin/dbus-daemon(-1)? -- gen_context(system_u:object_r:system_dbusd_exec_t,s0) -- -+/bin/dbus-daemon -- gen_context(system_u:object_r:system_dbusd_exec_t,s0) - /var/run/dbus(/.*)? gen_context(system_u:object_r:system_dbusd_var_run_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.5/policy/modules/services/procmail.te ---- nsaserefpolicy/policy/modules/services/procmail.te 2006-01-19 10:00:41.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/services/procmail.te 2006-01-24 13:19:41.000000000 -0500 -@@ -66,6 +66,7 @@ - userdom_priveleged_home_dir_manager(procmail_t) - # Do not audit attempts to access /root. - userdom_dontaudit_search_sysadm_home_dir(procmail_t) -+userdom_dontaudit_search_staff_home_dir(procmail_t) - - mta_manage_spool(procmail_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.5/policy/modules/services/xserver.if ---- nsaserefpolicy/policy/modules/services/xserver.if 2006-01-23 08:26:51.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/services/xserver.if 2006-01-24 11:56:59.000000000 -0500 -@@ -6,6 +6,9 @@ - # - # Declarations - # -+ gen_require(` -+ type xkb_var_lib_t, xserver_log_t; -+ ') - - type $1_xserver_t; - domain_type($1_xserver_t) -@@ -202,6 +205,12 @@ - # Declarations - # - -+ gen_require(` -+ type xauth_exec_t; -+ type xserver_exec_t; -+ type iceauth_exec_t; -+ ') -+ - xserver_common_domain_template($1) - role $3 types $1_xserver_t; - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/authlogin.te serefpolicy-2.2.5/policy/modules/system/authlogin.te ---- nsaserefpolicy/policy/modules/system/authlogin.te 2006-01-19 10:00:41.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/system/authlogin.te 2006-01-24 13:17:33.000000000 -0500 -@@ -221,10 +221,6 @@ - files_dontaudit_read_root_file(pam_console_t) - ') - --optional_policy(`alsa',` -- alsa_domtrans(pam_console_t) --') -- - optional_policy(`gpm',` - gpm_getattr_gpmctl(pam_console_t) - gpm_setattr_gpmctl(pam_console_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/fstools.te serefpolicy-2.2.5/policy/modules/system/fstools.te ---- nsaserefpolicy/policy/modules/system/fstools.te 2006-01-17 17:08:56.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/system/fstools.te 2006-01-24 13:39:56.000000000 -0500 -@@ -81,6 +81,7 @@ - # for /dev/shm - fs_search_tmpfs(fsadm_t) - fs_getattr_tmpfs_dir(fsadm_t) -+fs_read_tmpfs_symlinks(fsadm_t) - - mls_file_write_down(fsadm_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.5/policy/modules/system/locallogin.te ---- nsaserefpolicy/policy/modules/system/locallogin.te 2006-01-19 10:00:41.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/system/locallogin.te 2006-01-24 13:17:56.000000000 -0500 -@@ -210,13 +210,13 @@ - usermanage_read_crack_db(local_login_t) - ') - -+optional_policy(`alsa',` -+ alsa_domtrans(local_login_t) -+') -+ - ifdef(`TODO',` - # Login can polyinstantiate - polyinstantiater(local_login_t) -- --ifdef(`alsa.te', ` --domain_auto_trans($1_login_t, alsa_exec_t, alsa_t) --') - ') dnl endif TODO - - ################################# -@@ -266,6 +266,10 @@ - ifdef(`distro_suse', `define(`sulogin_no_pam')') - ifdef(`distro_debian', `define(`sulogin_no_pam')') - -+optional_policy(`nscd',` -+ nscd_use_socket(sulogin_t) -+') -+ - ifdef(`sulogin_no_pam', ` - allow sulogin_t self:capability sys_tty_config; - init_get_process_group(sulogin_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/logging.te serefpolicy-2.2.5/policy/modules/system/logging.te ---- nsaserefpolicy/policy/modules/system/logging.te 2006-01-19 10:00:41.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/system/logging.te 2006-01-24 11:56:59.000000000 -0500 -@@ -98,10 +98,12 @@ - audit_manager_domain(secadm_t) - - ifdef(`targeted_policy', `', ` --ifdef(`separate_secadm', `', ` -+ifdef(`enable_mls', ` -+audit_manager_domain(secadm_t) -+', ` - audit_manager_domain(sysadm_t) --allow auditctl_t admin_tty_type:chr_file rw_file_perms; - ') -+allow auditctl_t admin_tty_type:chr_file rw_file_perms; - ') - ') dnl end TODO - -@@ -272,9 +274,6 @@ - # Create and bind to /dev/log or /var/run/log. - allow syslogd_t devlog_t:sock_file create_file_perms; - files_filetrans_pid(syslogd_t,devlog_t,sock_file) --# cjp: I belive these are not needed: --allow syslogd_t devlog_t:unix_stream_socket name_bind; --allow syslogd_t devlog_t:unix_dgram_socket name_bind; - - # create/append log files. - allow syslogd_t var_log_t:dir rw_dir_perms; -@@ -325,8 +324,7 @@ - corenet_non_ipsec_sendrecv(syslogd_t) - corenet_udp_bind_all_nodes(syslogd_t) - corenet_tcp_bind_syslogd_port(syslogd_t) --#cjp: why? --corenet_tcp_connect_rsh_port(syslogd_t) -+corenet_udp_bind_syslogd_port(syslogd_t) - - fs_getattr_all_fs(syslogd_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/lvm.te serefpolicy-2.2.5/policy/modules/system/lvm.te ---- nsaserefpolicy/policy/modules/system/lvm.te 2006-01-17 17:08:57.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/system/lvm.te 2006-01-24 13:39:43.000000000 -0500 -@@ -198,6 +198,7 @@ - - fs_getattr_xattr_fs(lvm_t) - fs_search_auto_mountpoints(lvm_t) -+fs_read_tmpfs_symlinks(lvm_t) - - storage_relabel_fixed_disk(lvm_t) - # LVM creates block devices in /dev/mapper or /dev/ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.2.5/policy/modules/system/modutils.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.2.6/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/system/modutils.te 2006-01-24 13:41:16.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/system/modutils.te 2006-01-25 16:16:28.000000000 -0500 @@ -113,6 +113,8 @@ miscfiles_read_localization(insmod_t) @@ -365,20 +97,21 @@ if( ! secure_mode_insmod ) { kernel_userland_entry(insmod_t,insmod_exec_t) } -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/mount.te serefpolicy-2.2.5/policy/modules/system/mount.te ---- nsaserefpolicy/policy/modules/system/mount.te 2006-01-17 17:08:57.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/system/mount.te 2006-01-24 12:28:29.000000000 -0500 -@@ -46,6 +46,7 @@ - fs_relabelfrom_all_fs(mount_t) - fs_search_auto_mountpoints(mount_t) - fs_use_tmpfs_chr_dev(mount_t) -+fs_read_tmpfs_symlinks(mount_t) - - term_use_all_terms(mount_t) - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.5/policy/modules/system/unconfined.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.6/policy/modules/system/selinuxutil.te +--- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-19 10:00:41.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/system/selinuxutil.te 2006-01-25 16:26:04.000000000 -0500 +@@ -414,7 +414,7 @@ + allow run_init_t self:process setexec; + allow run_init_t self:capability setuid; + allow run_init_t self:fifo_file rw_file_perms; +- allow run_init_t self:netlink_audit_socket { create bind write nlmsg_read read }; ++ allow run_init_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; + + # often the administrator runs such programs from a directory that is owned + # by a different user or has restrictive SE permissions, do not want to audit +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.6/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2006-01-20 10:02:33.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/system/unconfined.if 2006-01-25 10:24:04.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/system/unconfined.if 2006-01-25 16:16:28.000000000 -0500 @@ -54,8 +54,13 @@ tunable_policy(`allow_execmem && allow_execstack',` # Allow making the stack executable via mprotect. @@ -393,70 +126,17 @@ optional_policy(`authlogin',` auth_unconfined($1) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.5/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-23 08:26:51.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/system/userdomain.if 2006-01-24 13:20:21.000000000 -0500 -@@ -219,7 +219,7 @@ - corecmd_exec_sbin($1_t) - corecmd_exec_ls($1_t) - -- domain_exec_all_entry_files($1_t) -+# domain_exec_all_entry_files($1_t) - domain_use_wide_inherit_fd($1_t) - # When the user domain runs ps, there will be a number of access - # denials when ps tries to search /proc. Do not audit these denials. -@@ -533,6 +533,7 @@ - - typeattribute $1_t unpriv_userdomain; - domain_wide_inherit_fd($1_t) -+ domain_exec_all_entry_files($1_t) - - typeattribute $1_devpts_t user_ptynode; - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.5/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-19 10:00:42.000000000 -0500 -+++ serefpolicy-2.2.5/policy/modules/system/userdomain.te 2006-01-24 13:52:39.000000000 -0500 -@@ -145,6 +145,8 @@ - allow sysadm_t user_home_dir_t:dir create_dir_perms; - files_filetrans_home(sysadm_t,user_home_dir_t) - -+ corecmd_exec_shell(sysadm_t) -+ - mls_process_read_up(sysadm_t) - - logging_read_audit_log(sysadm_t) -@@ -214,6 +216,10 @@ - hostname_run(sysadm_t,sysadm_r,admin_terminal) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.6/policy/modules/system/userdomain.te +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-25 15:59:01.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/system/userdomain.te 2006-01-25 16:51:38.000000000 -0500 +@@ -161,6 +161,10 @@ + domain_ptrace_all_domains(sysadm_t) ') -+ optional_policy(`consoletype',` -+ consoletype_exec(sysadm_t) ++ optional_policy(`dmesg',` ++ dmesg_exec(sysadm_t) + ') + - optional_policy(`ipsec',` - # allow system administrator to use the ipsec script to look - # at things (e.g., ipsec auto --status) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/users serefpolicy-2.2.5/policy/users ---- nsaserefpolicy/policy/users 2006-01-20 10:02:31.000000000 -0500 -+++ serefpolicy-2.2.5/policy/users 2006-01-24 11:56:59.000000000 -0500 -@@ -27,7 +27,7 @@ - gen_user(user_u, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) - ',` - gen_user(user_u, user_r, s0, s0) --gen_user(staff_u, staff_r secadm_r sysadm_r, s0, s0 - s15:c0.c255, c0.c255) -+gen_user(staff_u, staff_r ifdef(`enable_mls', `secadm_r') sysadm_r, s0, s0 - s15:c0.c255, c0.c255) - gen_user(sysadm_u, sysadm_r, s0, s0 - s15:c0.c255, c0.c255) - ') - -@@ -41,9 +41,6 @@ - ifdef(`targeted_policy',` - gen_user(root, user_r sysadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) - ',` -- ifdef(`direct_sysadm_daemon',` -- gen_user(root, sysadm_r staff_r secadm_r system_r, s0, s0 - s15:c0.c255, c0.c255) -- ',` -- gen_user(root, sysadm_r staff_r secadm_r , s0, s0 - s15:c0.c255, c0.c255) -- ') -+ -+ gen_user(root, sysadm_r staff_r ifdef(`enable_mls',`secadm_r') ifdef(`direct_sysadm_daemon',`system_r'), s0, s0 - s15:c0.c255, c0.c255) - ') + optional_policy(`amanda',` + amanda_run_recover(sysadm_t,sysadm_r,admin_terminal) + ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- selinux-policy.spec 24 Jan 2006 21:47:16 -0000 1.90 +++ selinux-policy.spec 26 Jan 2006 15:47:02 -0000 1.91 @@ -5,7 +5,7 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.5 +Version: 2.2.6 Release: 1 License: GPL Group: System Environment/Base @@ -263,7 +263,11 @@ %fileList strict %changelog -* Mon Jan 24 2006 Dan Walsh 2.2.4-1 +* Thu Jan 26 2006 Dan Walsh 2.2.6-1 +- Update to upstream +- Put back in changes for pup/zen + +* Tue Jan 24 2006 Dan Walsh 2.2.5-1 - Many changes for MLS - Turn on strict policy Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 25 Jan 2006 16:45:54 -0000 1.33 +++ sources 26 Jan 2006 15:47:02 -0000 1.34 @@ -1 +1 @@ -a9ae656bef62012a05b2ab9b8dcbc867 serefpolicy-2.2.5.tgz +b7fd295ab6917057c3f53702872d2984 serefpolicy-2.2.6.tgz From fedora-cvs-commits at redhat.com Thu Jan 26 15:48:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 10:48:29 -0500 Subject: rpms/cups/FC-4 cups-slow.patch,NONE,1.1 cups.spec,1.105,1.106 Message-ID: <200601261548.k0QFmTl6002544@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/cups/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv2478 Modified Files: cups.spec Added Files: cups-slow.patch Log Message: * Thu Jan 26 2006 Tim Waugh 1:1.1.23-15.4 - Make DeletePrinterFromClass faster (bug #160620). cups-slow.patch: classes.c | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) --- NEW FILE cups-slow.patch --- --- cups-1.1.23/scheduler/classes.c.slow 2005-06-16 09:30:40.000000000 +0100 +++ cups-1.1.23/scheduler/classes.c 2005-06-16 09:36:10.000000000 +0100 @@ -158,29 +158,29 @@ c->num_printers --; if (i < c->num_printers) - memcpy(c->printers + i, c->printers + i + 1, - (c->num_printers - i) * sizeof(printer_t *)); - } + memmove(c->printers + i, c->printers + i + 1, + (c->num_printers - i) * sizeof(printer_t *)); - /* - * Recompute the printer type mask as needed... - */ + /* + * Recompute the printer type mask as needed... + */ - if (c->num_printers > 0) - { - type = c->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT); - c->type = ~CUPS_PRINTER_REMOTE; + if (c->num_printers > 0) + { + type = c->type & (CUPS_PRINTER_CLASS | CUPS_PRINTER_IMPLICIT); + c->type = ~CUPS_PRINTER_REMOTE; - for (i = 0; i < c->num_printers; i ++) - c->type &= c->printers[i]->type; + for (i = 0; i < c->num_printers; i ++) + c->type &= c->printers[i]->type; - c->type |= type; + c->type |= type; - /* - * Update the IPP attributes... - */ + /* + * Update the IPP attributes... + */ - SetPrinterAttrs(c); + SetPrinterAttrs(c); + } } } Index: cups.spec =================================================================== RCS file: /cvs/dist/rpms/cups/FC-4/cups.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- cups.spec 4 Jan 2006 18:36:21 -0000 1.105 +++ cups.spec 26 Jan 2006 15:48:26 -0000 1.106 @@ -6,7 +6,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.1.23 -Release: 15.3 +Release: 15.4 License: GPL Group: System Environment/Daemons Source: ftp://ftp.easysw.com/pub/cups/test/cups-%{version}-source.tar.bz2 @@ -50,7 +50,8 @@ Patch34: cups-CAN-2005-2097.patch Patch35: cups-CVE-2005-3191_2_3.patch Patch36: cups-CVE-2005-3625,6,7.patch -Patch37: cups-dbus.patch +Patch37: cups-slow.patch +Patch38: cups-dbus.patch Epoch: 1 Url: http://www.cups.org/ BuildRoot: %{_tmppath}/%{name}-root @@ -145,8 +146,9 @@ %patch34 -p1 -b .CAN-2005-2097 %patch35 -p1 -b .CVE-2005-3191_2_3 %patch36 -p1 -b .CVE-2005-3625,6,7 +%patch37 -p1 -b .slow %if %use_dbus -%patch37 -p1 -b .dbus +%patch38 -p1 -b .dbus %endif perl -pi -e 's,^#(Printcap\s+/etc/printcap),$1,' conf/cupsd.conf.in aclocal -I config-scripts @@ -411,6 +413,9 @@ %{_libdir}/cups/daemon/cups-lpd %changelog +* Thu Jan 26 2006 Tim Waugh 1:1.1.23-15.4 +- Make DeletePrinterFromClass faster (bug #160620). + * Wed Jan 4 2006 Tim Waugh 1:1.1.23-15.3 - Apply patch to fix CVE-2005-3625, CVE-2005-3626, CVE-2005-3627 (bug #176868). From fedora-cvs-commits at redhat.com Thu Jan 26 15:50:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 10:50:28 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch,1.22,1.23 Message-ID: <200601261550.k0QFoSDQ003502@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3469 Modified Files: policy-20060104.patch Log Message: * Thu Jan 26 2006 Dan Walsh 2.2.6-1 - Update to upstream - Put back in changes for pup/zen policy-20060104.patch: admin/rpm.fc | 4 +++- admin/rpm.te | 1 + apps/mono.te | 2 +- kernel/files.fc | 5 +++++ kernel/mls.te | 3 ++- kernel/storage.fc | 1 + services/cups.te | 1 + services/hal.te | 2 ++ system/modutils.te | 2 ++ system/selinuxutil.te | 2 +- system/unconfined.if | 5 +++++ system/userdomain.te | 4 ++++ 12 files changed, 28 insertions(+), 4 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- policy-20060104.patch 26 Jan 2006 15:47:02 -0000 1.22 +++ policy-20060104.patch 26 Jan 2006 15:50:24 -0000 1.23 @@ -85,6 +85,18 @@ auth_domtrans_chk_passwd(cupsd_t) auth_dontaudit_read_pam_pid(cupsd_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.6/policy/modules/services/hal.te +--- nsaserefpolicy/policy/modules/services/hal.te 2006-01-19 10:00:41.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/services/hal.te 2006-01-26 10:49:57.000000000 -0500 +@@ -116,6 +116,8 @@ + init_use_fd(hald_t) + init_use_script_pty(hald_t) + init_domtrans_script(hald_t) ++init_write_initctl(hald_t) ++init_read_utmp(hald_t) + + libs_use_ld_so(hald_t) + libs_use_shared_libs(hald_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.2.6/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2006-01-13 17:06:08.000000000 -0500 +++ serefpolicy-2.2.6/policy/modules/system/modutils.te 2006-01-25 16:16:28.000000000 -0500 From fedora-cvs-commits at redhat.com Thu Jan 26 16:48:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 11:48:10 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1872,1.1873 Message-ID: <200601261648.k0QGmAFS001827@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1813 Modified Files: kernel-2.6.spec Log Message: make kdump kernels buildable again Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1872 retrieving revision 1.1873 diff -u -r1.1872 -r1.1873 --- kernel-2.6.spec 26 Jan 2006 03:40:32 -0000 1.1872 +++ kernel-2.6.spec 26 Jan 2006 16:48:08 -0000 1.1873 @@ -48,8 +48,7 @@ %ifarch i686 %define buildxen %{includexen} -# broken for now. -%define buildkdump 0 +%define buildkdump 1 %else %define buildxen 0 %endif @@ -982,7 +981,9 @@ cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || : fi %if "%{buildkdump}" == "1" - cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer + if [ `grep CONFIG_CRASH_DUMP=y .config` ]; then + cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer + fi %endif mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer @@ -1011,7 +1012,7 @@ rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cp arch/%{_arch}/kernel/asm-offsets.s $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/kernel || : cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build - cp .kernelrelease $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ + cp .kernelrelease $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build if [ -d arch/%{_arch}/scripts ]; then cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || : @@ -1360,6 +1361,9 @@ %endif %changelog +* Thu Jan 26 2006 Dave Jones +- Fix building of kdump kernels. + * Wed Jan 25 2006 Dave Jones - Disable page allocation debugging again. From fedora-cvs-commits at redhat.com Thu Jan 26 16:56:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 11:56:37 -0500 Subject: rpms/kernel/devel linux-2.6-net-fix-iptables.patch, NONE, 1.1 linux-2.6-net-slab-corruption.patch, NONE, 1.1 kernel-2.6.spec, 1.1873, 1.1874 Message-ID: <200601261656.k0QGubCj011028@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10924 Modified Files: kernel-2.6.spec Added Files: linux-2.6-net-fix-iptables.patch linux-2.6-net-slab-corruption.patch Log Message: two must-have networking fixes. linux-2.6-net-fix-iptables.patch: x_tables.h | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-net-fix-iptables.patch --- [NETFILTER] x_tables: Fix XT_ALIGN() macro on [at least] ppc32 To keep backwards compatibility with old iptables userspace programs, the new XT_ALIGN macro always has to return the same value as IPT_ALIGN, IP6T_ALIGN or ARPT_ALIGN in previous kernels. However, in those kernels the macro was defined in dependency to the respective layer3 specifi data structures, which we can no longer do with x_tables. The fix is an ugly kludge, but it has been tested to solve the problem. Yet another reason to move away from the current {ip,ip6,arp,eb}tables like data structures. Signed-off-by: Harald Welte --- commit 470faeb379560fe877b685ca69be6a7e4f0e91ed tree 5732ecd9bcab28469805752514e5c57ba26189a1 parent 44718bbfa186d58477163418d37df173aa2dd079 author Harald Welte Fri, 20 Jan 2006 01:44:24 +0100 committer Harald Welte Fri, 20 Jan 2006 01:44:24 +0100 include/linux/netfilter/x_tables.h | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 472f048..65f9cd8 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -19,8 +19,22 @@ struct xt_get_revision /* For standard target */ #define XT_RETURN (-NF_REPEAT - 1) -#define XT_ALIGN(s) (((s) + (__alignof__(u_int64_t)-1)) & ~(__alignof__(u_int64_t)-1)) +/* this is a dummy structure to find out the alignment requirement for a struct + * containing all the fundamental data types that are used in ipt_entry, ip6t_entry + * and arpt_entry. This sucks, and it is a hack. It will be my personal pleasure + * to remove it -HW */ +struct _xt_align +{ + u_int8_t u8; + u_int16_t u16; + u_int32_t u32; + u_int64_t u64; +}; + +#define XT_ALIGN(s) (((s) + (__alignof__(struct _xt_align)-1)) \ + & ~(__alignof__(struct _xt_align)-1)) + /* Standard return verdict, or do jump. */ #define XT_STANDARD_TARGET "" /* Error verdict. */ linux-2.6-net-slab-corruption.patch: skbuff.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-net-slab-corruption.patch --- diff --git a/net/core/skbuff.c b/net/core/skbuff.c --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -135,13 +135,15 @@ void skb_under_panic(struct sk_buff *skb struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, int fclone) { + kmem_cache_t *cache; struct skb_shared_info *shinfo; struct sk_buff *skb; u8 *data; + cache = fclone ? skbuff_fclone_cache : skbuff_head_cache; + /* Get the HEAD */ - skb = kmem_cache_alloc(fclone ? skbuff_fclone_cache : skbuff_head_cache, - gfp_mask & ~__GFP_DMA); + skb = kmem_cache_alloc(cache, gfp_mask & ~__GFP_DMA); if (!skb) goto out; @@ -180,7 +182,7 @@ struct sk_buff *__alloc_skb(unsigned int out: return skb; nodata: - kmem_cache_free(skbuff_head_cache, skb); + kmem_cache_free(cache, skb); skb = NULL; goto out; } Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1873 retrieving revision 1.1874 diff -u -r1.1873 -r1.1874 --- kernel-2.6.spec 26 Jan 2006 16:48:08 -0000 1.1873 +++ kernel-2.6.spec 26 Jan 2006 16:56:35 -0000 1.1874 @@ -353,6 +353,8 @@ Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch Patch1850: linux-2.6-mv643xx-compile-fix.patch +Patch1860: linux-2.6-net-fix-iptables.patch +Patch1870: linux-2.6-net-slab-corruption.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -837,6 +839,11 @@ %patch1840 -p1 # Fix compilation for MV643xx Ethernet %patch1850 -p1 +# Make iptables work again +%patch1860 -p1 +# Fix netlayer slab corruption +%patch1870 -p1 + # Warn about obsolete functionality usage. %patch1900 -p1 %patch1901 -p1 @@ -1363,6 +1370,8 @@ %changelog * Thu Jan 26 2006 Dave Jones - Fix building of kdump kernels. +- Fix slab corruption in network layer. +- Make iptables work again. * Wed Jan 25 2006 Dave Jones - Disable page allocation debugging again. From fedora-cvs-commits at redhat.com Thu Jan 26 17:03:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 12:03:01 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch, 1.23, 1.24 selinux-policy.spec, 1.91, 1.92 Message-ID: <200601261703.k0QH31iI012785@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12752 Modified Files: policy-20060104.patch selinux-policy.spec Log Message: * Thu Jan 26 2006 Dan Walsh 2.2.6-2 - Add inotifyfs handling policy-20060104.patch: admin/rpm.fc | 2 ++ admin/rpm.te | 1 + apps/mono.te | 2 +- kernel/files.fc | 5 +++++ kernel/filesystem.if | 19 +++++++++++++++++++ kernel/mls.te | 3 ++- kernel/storage.fc | 1 + services/cups.te | 1 + services/hal.te | 2 ++ system/locallogin.te | 2 ++ system/modutils.te | 2 ++ system/selinuxutil.te | 2 +- system/udev.te | 1 + system/unconfined.if | 5 +++++ system/userdomain.te | 4 ++++ 15 files changed, 49 insertions(+), 3 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- policy-20060104.patch 26 Jan 2006 15:50:24 -0000 1.23 +++ policy-20060104.patch 26 Jan 2006 17:02:32 -0000 1.24 @@ -1,17 +1,15 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.6/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-01-13 09:48:26.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/admin/rpm.fc 2006-01-26 10:41:32.000000000 -0500 -@@ -16,7 +16,9 @@ ++++ serefpolicy-2.2.6/policy/modules/admin/rpm.fc 2006-01-26 12:02:06.000000000 -0500 +@@ -16,6 +16,8 @@ /usr/bin/fedora-rmdevelrpms -- gen_context(system_u:object_r:rpm_exec_t,s0) /usr/sbin/up2date -- gen_context(system_u:object_r:rpm_exec_t,s0) /usr/sbin/rhn_check -- gen_context(system_u:object_r:rpm_exec_t,s0) --') +/usr/sbin/pup -- gen_context(system_u:object_r:rpm_exec_t,s0) +/usr/sbin/pirut -- gen_context(system_u:object_r:rpm_exec_t,s0) -+- ')') + ') /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.te serefpolicy-2.2.6/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2006-01-17 17:08:52.000000000 -0500 +++ serefpolicy-2.2.6/policy/modules/admin/rpm.te 2006-01-25 16:16:28.000000000 -0500 @@ -50,6 +48,32 @@ # /opt # /opt(/.*)? gen_context(system_u:object_r:usr_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.6/policy/modules/kernel/filesystem.if +--- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-25 15:58:59.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/kernel/filesystem.if 2006-01-26 11:15:19.000000000 -0500 +@@ -2855,3 +2855,22 @@ + # and its files. + allow $1 filesystem_type:{ dir file lnk_file sock_file fifo_file chr_file blk_file } *; + ') ++ ++ ++######################################## ++## ++## Search inotifyfs_t filesystem ++## ++## ++## The type of the domain performing this action. ++## ++# ++interface(`fs_search_inotifyfs',` ++ gen_require(` ++ type inotifyfs_t; ++ class dir search_dir_perms; ++ ') ++ ++ allow $1 inotifyfs_t:dir search_dir_perms; ++') ++ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.6/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-17 17:08:52.000000000 -0500 +++ serefpolicy-2.2.6/policy/modules/kernel/mls.te 2006-01-26 10:45:47.000000000 -0500 @@ -97,6 +121,18 @@ libs_use_ld_so(hald_t) libs_use_shared_libs(hald_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.6/policy/modules/system/locallogin.te +--- nsaserefpolicy/policy/modules/system/locallogin.te 2006-01-25 15:59:01.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/system/locallogin.te 2006-01-26 11:16:59.000000000 -0500 +@@ -27,6 +27,8 @@ + domain_subj_id_change_exempt(sulogin_t) + domain_role_change_exempt(sulogin_t) + domain_wide_inherit_fd(sulogin_t) ++fs_use_tmpfs_chr_dev(sulogin_t) ++ + init_domain(sulogin_t,sulogin_exec_t) + init_system_domain(sulogin_t,sulogin_exec_t) + role system_r types sulogin_t; diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.2.6/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2006-01-13 17:06:08.000000000 -0500 +++ serefpolicy-2.2.6/policy/modules/system/modutils.te 2006-01-25 16:16:28.000000000 -0500 @@ -121,6 +157,17 @@ # often the administrator runs such programs from a directory that is owned # by a different user or has restrictive SE permissions, do not want to audit +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.6/policy/modules/system/udev.te +--- nsaserefpolicy/policy/modules/system/udev.te 2006-01-19 10:00:41.000000000 -0500 ++++ serefpolicy-2.2.6/policy/modules/system/udev.te 2006-01-26 11:14:22.000000000 -0500 +@@ -90,6 +90,7 @@ + dev_delete_generic_file(udev_t) + + fs_getattr_all_fs(udev_t) ++fs_search_inotifyfs(udev_t) + + selinux_get_fs_mount(udev_t) + selinux_validate_context(udev_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.6/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2006-01-20 10:02:33.000000000 -0500 +++ serefpolicy-2.2.6/policy/modules/system/unconfined.if 2006-01-25 16:16:28.000000000 -0500 Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- selinux-policy.spec 26 Jan 2006 15:47:02 -0000 1.91 +++ selinux-policy.spec 26 Jan 2006 17:02:46 -0000 1.92 @@ -6,7 +6,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.6 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -263,6 +263,9 @@ %fileList strict %changelog +* Thu Jan 26 2006 Dan Walsh 2.2.6-2 +- Add inotifyfs handling + * Thu Jan 26 2006 Dan Walsh 2.2.6-1 - Update to upstream - Put back in changes for pup/zen From fedora-cvs-commits at redhat.com Thu Jan 26 17:22:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 12:22:08 -0500 Subject: rpms/policycoreutils/devel policycoreutils-rhat.patch, 1.156, 1.157 policycoreutils.spec, 1.226, 1.227 Message-ID: <200601261722.k0QHM8dV032133@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32095 Modified Files: policycoreutils-rhat.patch policycoreutils.spec Log Message: * Wed Jan 25 2006 Dan Walsh 1.29.11-3 - Cleanup of the patch policycoreutils-rhat.patch: restorecon/restorecon.c | 8 +- scripts/chcat | 2 semanage/semanage | 148 ++++++++++-------------------------------------- semanage/semanage.8 | 26 ++++---- 4 files changed, 52 insertions(+), 132 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.156 retrieving revision 1.157 diff -u -r1.156 -r1.157 --- policycoreutils-rhat.patch 25 Jan 2006 19:07:56 -0000 1.156 +++ policycoreutils-rhat.patch 26 Jan 2006 17:22:04 -0000 1.157 @@ -45,7 +45,7 @@ if delete_ind: diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.11/semanage/semanage --- nsapolicycoreutils/semanage/semanage 2006-01-20 10:37:37.000000000 -0500 -+++ policycoreutils-1.29.11/semanage/semanage 2006-01-25 11:13:33.000000000 -0500 ++++ policycoreutils-1.29.11/semanage/semanage 2006-01-26 12:17:30.000000000 -0500 @@ -30,28 +30,27 @@ def usage(message = ""): @@ -80,7 +80,7 @@ ' print message sys.exit(1) -@@ -62,35 +61,29 @@ +@@ -62,35 +61,27 @@ sys.stderr.flush() sys.exit(1) @@ -116,15 +116,13 @@ + valid_option["user"] = [] + valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles' ] + valid_option["port"] = [] -+ valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range'] -+ valid_option["port"] = [] + valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--protocol' ] + valid_option["interface"] = [] + valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range'] + valid_option["fcontext"] = [] + valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range'] + valid_option["translation"] = [] -+ valid_option["fcontext"] += valid_everyone + [ '-T', '--trans' ] ++ valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] + return valid_option + # @@ -135,7 +133,7 @@ input = sys.stdin output = sys.stdout serange = "" -@@ -112,12 +105,14 @@ +@@ -112,12 +103,14 @@ usage("Requires 2 or more arguments") object = sys.argv[1] @@ -148,11 +146,11 @@ + gopts, cmds = getopt.getopt(args, - 'adf:lhmnp:P:s:R:L:r:t:vT:', -+ 'adf:lhmnp:s:R:L:r:t:vT:', ++ 'adf:lhmnp:s:R:L:r:t:T:', ['add', 'delete', 'ftype=', -@@ -125,16 +120,18 @@ +@@ -125,16 +118,18 @@ 'list', 'modify', 'noheading', @@ -174,7 +172,7 @@ for o,a in gopts: if o == "-a" or o == "--add": if modify or delete: -@@ -167,11 +164,11 @@ +@@ -167,7 +162,7 @@ if o == "-L" or o == '--level': selevel = a @@ -183,15 +181,13 @@ proto = a if o == "-R" or o == '--roles': -- roles = roles + " " + a -+ roles = a - - if o == "-s" or o == "--seuser": - seuser = a -@@ -185,91 +182,25 @@ - if o == "-v" or o == "--verbose": - verbose = 1 - +@@ -182,94 +177,25 @@ + if o == "-T" or o == "--trans": + setrans = a + +- if o == "-v" or o == "--verbose": +- verbose = 1 +- -# Note in this section I intentionally leave the unwanted_*() functions for -# variabled which are wanted commented out and don't delete those lines. This -# will make it easier to modify the code when the list of wanted variables @@ -280,7 +276,7 @@ OBJECT.list(heading) sys.exit(0); -@@ -324,16 +255,6 @@ +@@ -324,16 +250,6 @@ sys.exit(0); if delete: @@ -299,7 +295,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.11/semanage/semanage.8 --- nsapolicycoreutils/semanage/semanage.8 2006-01-20 10:37:37.000000000 -0500 -+++ policycoreutils-1.29.11/semanage/semanage.8 2006-01-25 11:13:33.000000000 -0500 ++++ policycoreutils-1.29.11/semanage/semanage.8 2006-01-26 12:13:43.000000000 -0500 @@ -3,19 +3,19 @@ semanage \- SELinux Policy Management tool @@ -363,7 +359,7 @@ MLS/MCS Security Range .TP +.I \-R, \-\-role -+SELinux Roles. You must inclose multiple roles within quotes, separate by spaces. ++SELinux Roles. You must inclose multiple roles within quotes, separate by spaces. Or specify \-R multiple times. +.TP .I \-s, \-\-seuser SELinux user name Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- policycoreutils.spec 25 Jan 2006 19:07:56 -0000 1.226 +++ policycoreutils.spec 26 Jan 2006 17:22:04 -0000 1.227 @@ -4,7 +4,7 @@ Summary: SELinux policy core utilities. Name: policycoreutils Version: 1.29.11 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -97,6 +97,9 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Wed Jan 25 2006 Dan Walsh 1.29.11-3 +- Cleanup of the patch + * Wed Jan 25 2006 Dan Walsh 1.29.11-2 - Correct handling of symbolic links in restorecon From fedora-cvs-commits at redhat.com Thu Jan 26 18:11:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 13:11:36 -0500 Subject: rpms/avahi/devel .cvsignore, 1.6, 1.7 avahi-0.6.4-localtime.patch, 1.1, 1.2 avahi.spec, 1.32, 1.33 sources, 1.6, 1.7 Message-ID: <200601261811.k0QIBaf3029959@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/avahi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29819 Modified Files: .cvsignore avahi-0.6.4-localtime.patch avahi.spec sources Log Message: - Upgrade to upstream version 0.6.5 - Make /etc/avahi/etc and /etc/avahi/etc/localtime owned by avahi package; copy system localtime into chroot in post Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Jan 2006 23:56:58 -0000 1.6 +++ .cvsignore 26 Jan 2006 18:11:34 -0000 1.7 @@ -3,3 +3,4 @@ avahi-0.6.1.tar.gz avahi-0.6.3.tar.gz avahi-0.6.4.tar.gz +avahi-0.6.5.tar.gz avahi-0.6.4-localtime.patch: avahi-daemon.in | 3 +++ 1 files changed, 3 insertions(+) Index: avahi-0.6.4-localtime.patch =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi-0.6.4-localtime.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- avahi-0.6.4-localtime.patch 24 Jan 2006 00:51:30 -0000 1.1 +++ avahi-0.6.4-localtime.patch 26 Jan 2006 18:11:34 -0000 1.2 @@ -1,12 +1,12 @@ ---- avahi-0.6.4/initscript/fedora/avahi-daemon.in.localtime 2006-01-23 19:38:17.000000000 -0500 -+++ avahi-0.6.4/initscript/fedora/avahi-daemon.in 2006-01-23 19:43:55.000000000 -0500 +--- avahi-0.6.4/initscript/fedora/avahi-daemon.in.localtime 2006-01-23 19:44:16.000000000 -0500 ++++ avahi-0.6.4/initscript/fedora/avahi-daemon.in 2006-01-26 12:34:30.000000000 -0500 @@ -29,6 +29,9 @@ start() { echo -n $"Starting Avahi daemon... " -+ mkdir -p /etc/avahi/etc >/dev/null 2>&1 -+ cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1 -+ chcon system_u:object_r:locale_t /etc/avahi/etc/localtime >/dev/null 2>&1 ++ if [ -s /etc/localtime ]; then ++ cp -fp /etc/localtime /etc/avahi/etc >/dev/null 2>&1 ++ fi; $AVAHI_BIN -D RETVAL=$? if [ $RETVAL = 0 ]; then Index: avahi.spec =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/avahi.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- avahi.spec 24 Jan 2006 00:51:30 -0000 1.32 +++ avahi.spec 26 Jan 2006 18:11:34 -0000 1.33 @@ -3,8 +3,8 @@ %define WITH_MONO 0 %endif Name: avahi -Version: 0.6.4 -Release: 4 +Version: 0.6.5 +Release: 1 Summary: Local network service discovery Group: System Environment/Base License: LGPL @@ -169,6 +169,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d mv $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/* $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/* +# +# Make /etc/avahi/etc/localtime owned by avahi: +mkdir -p $RPM_BUILD_ROOT/etc/avahi/etc +touch $RPM_BUILD_ROOT/etc/avahi/etc/localtime :; %clean @@ -187,7 +191,10 @@ /sbin/chkconfig --add avahi-daemon >/dev/null 2>&1 fi; # We should realy make dbus reload the system.d config here. Dunno how though. -# kill -HUP `cat /var/run/messagebus.pid` ? +# kill -HUP `cat /var/run/messagebus.pid` ? + if [ -s /etc/localtime ]; then + cp -fp /etc/localtime /etc/avahi/etc/localtime || :; + fi; elif [ "$1" -gt 1 ]; then if ! /sbin/chkconfig --list avahi-daemon >/dev/null 2>&1 ; then # if user has not configured avahi service at all @@ -221,6 +228,8 @@ %doc docs/* avahi-daemon/example.service avahi-daemon/ssh.service %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/* %dir %{_sysconfdir}/avahi +%dir %{_sysconfdir}/avahi/etc +%ghost %{_sysconfdir}/avahi/etc/localtime %dir %{_sysconfdir}/avahi/services %dir %{_localstatedir}/run/avahi-daemon %config %{_sysconfdir}/avahi/avahi-daemon.conf @@ -291,6 +300,11 @@ %endif %changelog +* Thu Jan 26 2006 Jason Vas Dias - 0.6.5-1 +- Upgrade to upstream version 0.6.5 +- Make /etc/avahi/etc and /etc/avahi/etc/localtime owned by avahi + package; copy system localtime into chroot in post + * Mon Jan 23 2006 Jason Vas Dias - 0.6.4-4 - fix bug 178689: copy localtime to chroot - fix bug 178784: fix avahi-dnsconfd initscript Index: sources =================================================================== RCS file: /cvs/dist/rpms/avahi/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Jan 2006 23:56:58 -0000 1.6 +++ sources 26 Jan 2006 18:11:34 -0000 1.7 @@ -1 +1 @@ -12eb941043f26f82c51e99821ac52c44 avahi-0.6.4.tar.gz +1ecbc3534e3b45cf15269a3f4cfe1dca avahi-0.6.5.tar.gz From fedora-cvs-commits at redhat.com Thu Jan 26 19:05:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 14:05:17 -0500 Subject: rpms/vixie-cron/FC-4 vixie-cron-4.1-_42-bz178431.patch, 1.1, 1.2 vixie-cron-4.1-_43-bz173926.patch, 1.1, 1.2 vixie-cron.spec, 1.52, 1.53 Message-ID: <200601261905.k0QJ5HRu031574@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/vixie-cron/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv31519 Modified Files: vixie-cron-4.1-_42-bz178431.patch vixie-cron-4.1-_43-bz173926.patch vixie-cron.spec Log Message: fix bug 178931 / 178939: silence pam_krb5 debug messages vixie-cron-4.1-_42-bz178431.patch: do_command.c | 121 ++++++++++++++++++++++++++++------------------------------- 1 files changed, 59 insertions(+), 62 deletions(-) Index: vixie-cron-4.1-_42-bz178431.patch =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/FC-4/vixie-cron-4.1-_42-bz178431.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vixie-cron-4.1-_42-bz178431.patch 24 Jan 2006 00:03:55 -0000 1.1 +++ vixie-cron-4.1-_42-bz178431.patch 26 Jan 2006 19:05:00 -0000 1.2 @@ -1,5 +1,5 @@ ---- vixie-cron-4.1/do_command.c.bz178431 2006-01-23 17:16:54.000000000 -0500 -+++ vixie-cron-4.1/do_command.c 2006-01-23 18:43:24.000000000 -0500 +--- vixie-cron-4.1/do_command.c.bz178431 2006-01-23 18:59:37.000000000 -0500 ++++ vixie-cron-4.1/do_command.c 2006-01-26 13:53:20.000000000 -0500 @@ -107,7 +107,7 @@ #if defined(WITH_PAM) int retcode = 0; @@ -17,7 +17,24 @@ #endif /* fork again, this time so we can exec the user's command. -@@ -259,71 +260,40 @@ +@@ -218,6 +219,16 @@ + log_it(usernm, getpid(), "CMD", x); + free(x); + } ++ ++ time_t minutely_time = 0; ++ if((e->flags & MIN_STAR)==MIN_STAR) ++ { ++ /* "minute-ly" job: Every minute for given hour/dow/month/dom. ++ * Ensure that these jobs never run in the same minute: ++ */ ++ minutely_time = time(0); ++ Debug(DSCH, ("Minute-ly job. Recording time %lu\n", minutely_time)) ++ } + + /* that's the last thing we'll log. close the log files. + */ +@@ -259,71 +270,40 @@ /* set our directory, uid and gid. Set gid first, since once * we set uid, we've lost root privledges. */ @@ -114,7 +131,7 @@ # if DEBUGGING if (DebugFlags & DTEST) { -@@ -339,16 +309,17 @@ +@@ -339,16 +319,33 @@ if ((is_selinux_enabled() >0) && (u->scontext != 0L)) { if (setexeccon(u->scontext) < 0) { if (security_getenforce() > 0) { @@ -130,13 +147,29 @@ } } #endif ++ time_t job_run_time = time(0L); ++ ++ if( (minutely_time > 0) ++ &&((job_run_time / 60) != (minutely_time / 60)) ++ ) ++ { ++ struct tm tmS, tmN; ++ localtime_r(&job_run_time, &tmN); ++ localtime_r(&minutely_time,&tmS); ++ openlog(ProgramName, LOG_PID, LOG_CRON); ++ syslog(LOG_ERR, ++ "(%s) error: Job execution of per-minute job scheduled for " ++ "%.2u:%.2u delayed into subsequent minute %.2u:%.2u. Skipping job run.", ++ e->pwd->pw_name, tmS.tm_hour, tmS.tm_min, tmN.tm_hour, tmN.tm_min); ++ _exit(ERROR_EXIT); ++ } - execle(shell, shell, "-c", e->cmd, (char *)0, e->envp); + execle(shell, shell, "-c", e->cmd, (char *)0, jobenv); fprintf(stderr, "execl: couldn't exec `%s'\n", shell); perror("execl"); _exit(ERROR_EXIT); -@@ -513,7 +484,7 @@ +@@ -513,7 +510,7 @@ fprintf(mail, "Date: %s\n", arpadate(&StartTime)); #endif /*MAIL_DATE*/ vixie-cron-4.1-_43-bz173926.patch: crond.pam | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) Index: vixie-cron-4.1-_43-bz173926.patch =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/FC-4/vixie-cron-4.1-_43-bz173926.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vixie-cron-4.1-_43-bz173926.patch 24 Jan 2006 00:05:31 -0000 1.1 +++ vixie-cron-4.1-_43-bz173926.patch 26 Jan 2006 19:05:00 -0000 1.2 @@ -1,16 +1,15 @@ ---- vixie-cron-4.1/crond.pam.bz173926 2006-01-23 18:48:04.000000000 -0500 -+++ vixie-cron-4.1/crond.pam 2006-01-23 18:57:57.000000000 -0500 -@@ -7,10 +7,7 @@ +--- vixie-cron-4.1/crond.pam.bz173926 2006-01-23 18:59:37.000000000 -0500 ++++ vixie-cron-4.1/crond.pam 2006-01-26 13:57:00.000000000 -0500 +@@ -7,10 +7,6 @@ auth required pam_env.so account required pam_stack.so service=system-auth account required pam_access.so -session required pam_stack.so service=system-auth -+session required pam_limits.so ++session required pam_limits.so session required pam_loginuid.so -# To enable PAM user limits for cron jobs, -# configure /etc/security/limits.conf and -# uncomment this line: -# session required pam_limits.so -# -+session required pam_krb5.so + Index: vixie-cron.spec =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/FC-4/vixie-cron.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- vixie-cron.spec 24 Jan 2006 00:07:56 -0000 1.52 +++ vixie-cron.spec 26 Jan 2006 19:05:00 -0000 1.53 @@ -7,7 +7,7 @@ Summary: The Vixie cron daemon for executing specified programs at set times. Name: vixie-cron Version: 4.1 -Release: 40.FC4 +Release: 41.FC4 Epoch: 4 License: distributable Group: System Environment/Base @@ -188,6 +188,9 @@ %config(noreplace) /etc/sysconfig/crond %changelog +* Thu Jan 26 2006 Jason Vas Dias - 4.1-41.FC4 +- fix bug 178931 / 178939: silence pam_krb5 debug messages + * Mon Jan 23 2006 Jason Vas Dias - 4.1-40.FC4 - fix bug 178431: if a pam_limits hard nproc limit is exceeded, do not allow user's job to run From fedora-cvs-commits at redhat.com Thu Jan 26 19:34:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 14:34:07 -0500 Subject: rpms/gnome-power-manager/devel .cvsignore, 1.8, 1.9 gnome-power-manager.spec, 1.14, 1.15 sources, 1.8, 1.9 gnome-power-manager-0.3.4-left-click.patch, 1.1, NONE Message-ID: <200601261934.k0QJY7pP022338@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22311 Modified Files: .cvsignore gnome-power-manager.spec sources Removed Files: gnome-power-manager-0.3.4-left-click.patch Log Message: * Thu Jan 26 2006 Christopher Aillon 2.13.5-1 - Update to 2.13.5 Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gnome-power-manager.spec 24 Jan 2006 18:07:43 -0000 1.14 +++ gnome-power-manager.spec 26 Jan 2006 19:33:39 -0000 1.15 @@ -4,11 +4,11 @@ Summary: GNOME Power Manager Name: gnome-power-manager -Version: 0.3.4 -Release: 2 +Version: 2.13.5 +Release: 1 License: GPL Group: Applications/System -Source: gnome-power-manager-%{version}.tar.gz +Source: gnome-power-manager-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) URL: http://gnome-power.sourceforge.net/ BuildPrereq: libgnomeui-devel @@ -23,7 +23,6 @@ Requires: hal >= %{hal_version} Requires: dbus-glib >= %{dbus_version} Requires: scrollkeeper -Patch1: gnome-power-manager-0.3.4-left-click.patch %description GNOME Power Manager uses the information and facilities provided by HAL @@ -33,7 +32,6 @@ %prep %setup -q -%patch1 -p0 -b .left-click %build %configure --disable-scrollkeeper @@ -83,6 +81,9 @@ %{_datadir}/omf/gnome-power-manager/gnome-power-manager-C.omf %changelog +* Thu Jan 26 2006 Christopher Aillon 2.13.5-1 +- Update to 2.13.5 + * Tue Jan 24 2006 Christopher Aillon - 0.3.4-2 - Left clicking on the applet should bring up the menu Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 18 Jan 2006 02:51:13 -0000 1.8 +++ sources 26 Jan 2006 19:33:39 -0000 1.9 @@ -1 +1 @@ -72f207999130f2830a4ce65ec3015257 gnome-power-manager-0.3.4.tar.gz +beb9a4d1f7822ee2117503de4dd95a2e gnome-power-manager-2.13.5.tar.bz2 --- gnome-power-manager-0.3.4-left-click.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 26 19:51:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 14:51:54 -0500 Subject: rpms/vixie-cron/devel vixie-cron-4.1-_49-bz178436.patch, NONE, 1.1 vixie-cron-4.1-_50-bz178931.patch, NONE, 1.1 vixie-cron.spec, 1.62, 1.63 Message-ID: <200601261951.k0QJpsP2009924@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/vixie-cron/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9770 Modified Files: vixie-cron.spec Added Files: vixie-cron-4.1-_49-bz178436.patch vixie-cron-4.1-_50-bz178931.patch Log Message: - fix bug 178436: prevent per-minute jobs being delayed into next minute - fix bug 178931: remove pam_unix and pam_krb5 from pam session stack vixie-cron-4.1-_49-bz178436.patch: security.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+) --- NEW FILE vixie-cron-4.1-_49-bz178436.patch --- --- vixie-cron-4.1/security.c.bz178436 2006-01-26 14:26:55.000000000 -0500 +++ vixie-cron-4.1/security.c 2006-01-26 14:34:23.000000000 -0500 @@ -32,6 +32,16 @@ int cron_set_job_security_context( entry *e, user *u, char ***jobenv ) { + time_t minutely_time = 0; + if((e->flags & MIN_STAR)==MIN_STAR) + { + /* "minute-ly" job: Every minute for given hour/dow/month/dom. + * Ensure that these jobs never run in the same minute: + */ + minutely_time = time(0); + Debug(DSCH, ("Minute-ly job. Recording time %lu\n", minutely_time)) + } + if ( cron_open_security_session( e->pwd ) != 0 ) { syslog(LOG_INFO, "CRON (%s) ERROR: failed to open PAM security session: %s", @@ -57,12 +67,32 @@ *jobenv = build_env( e->envp ); + log_close(); + openlog(ProgramName, LOG_PID, LOG_CRON); + if ( chdir(env_get("HOME", *jobenv)) == -1 ) { log_it("CRON", getpid(), "chdir(HOME) failed:", strerror(errno)); return -1; } + time_t job_run_time = time(0L); + + if( (minutely_time > 0) + &&((job_run_time / 60) != (minutely_time / 60)) + ) + {/* if a per-minute job is delayed into the next minute + * (eg. by network authentication method timeouts), skip it. + */ + struct tm tmS, tmN; + localtime_r(&job_run_time, &tmN); + localtime_r(&minutely_time,&tmS); + syslog(LOG_ERR, + "(%s) error: Job execution of per-minute job scheduled for " + "%.2u:%.2u delayed into subsequent minute %.2u:%.2u. Skipping job run.", + e->pwd->pw_name, tmS.tm_hour, tmS.tm_min, tmN.tm_hour, tmN.tm_min); + return -1; + } return 0; } @@ -96,6 +126,7 @@ retcode = pam_setcred(pamh, PAM_ESTABLISH_CRED | PAM_SILENT); PAM_FAIL_CHECK; log_close(); /* PAM has now re-opened our log to auth.info ! */ + openlog(ProgramName, LOG_PID, LOG_CRON); #endif return retcode; vixie-cron-4.1-_50-bz178931.patch: crond.pam | 7 +------ 1 files changed, 1 insertion(+), 6 deletions(-) --- NEW FILE vixie-cron-4.1-_50-bz178931.patch --- --- vixie-cron-4.1/crond.pam.bz178931 2006-01-26 14:26:55.000000000 -0500 +++ vixie-cron-4.1/crond.pam 2006-01-26 14:33:04.000000000 -0500 @@ -7,10 +7,5 @@ auth include system-auth account required pam_access.so account include system-auth -session include system-auth session required pam_loginuid.so -# To enable PAM user limits for cron jobs, -# configure /etc/security/limits.conf and -# uncomment this line: -# session required pam_limits.so -# +session required pam_limits.so Index: vixie-cron.spec =================================================================== RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- vixie-cron.spec 10 Jan 2006 23:25:19 -0000 1.62 +++ vixie-cron.spec 26 Jan 2006 19:51:52 -0000 1.63 @@ -7,7 +7,7 @@ Summary: The Vixie cron daemon for executing specified programs at set times. Name: vixie-cron Version: 4.1 -Release: 44.FC5 +Release: 50.FC5 Epoch: 4 License: distributable Group: System Environment/Base @@ -63,6 +63,8 @@ Patch46: vixie-cron-4.1-_46-audit.patch Patch47: vixie-cron-4.1-_47-m_option.patch Patch48: vixie-cron-4.1-_48-security.patch +Patch49: vixie-cron-4.1-_49-bz178436.patch +Patch50: vixie-cron-4.1-_50-bz178931.patch Buildroot: %{_tmppath}/%{name}-%{version}-root Requires: syslog, bash >= 2.0 Conflicts: sysklogd < 1.4.1 @@ -142,6 +144,8 @@ %patch46 -p1 -b .audit_deny %patch47 -p1 -b .-m_option %patch48 -p1 -b .security +%patch49 -p1 -b .bz178436 +%patch50 -p1 -b .bz178931 %build make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -g -DLINT -Dlint -Werror" @@ -199,6 +203,10 @@ %config(noreplace) /etc/sysconfig/crond %changelog +* Thu Jan 26 2006 Jason Vas Dias - 4.1-50.FC5 +- fix bug 178436: prevent per-minute jobs being delayed into next minute +- fix bug 178931: remove pam_unix and pam_krb5 from pam session stack + * Tue Jan 10 2006 Jason Vas Dias - fix bug 177476: make minder/mailer process run as job user with user context; re-organize PAM and SELinux code @@ -209,12 +217,12 @@ * Fri Dec 09 2005 Jesse Keating - rebuilt -* Sun Nov 13 2005 Jason Vas Dias - 4.1-41-FC5 +* Sun Nov 13 2005 Jason Vas Dias - 4.1-41.FC5 - patches for IBM LSPP testing: - Steve Grubb's patch to emit audit log message on crontab denial - Use of sendmail unacceptable for LSPP: provide -m option -* Tue Oct 18 2005 Jason Vas Dias - 4.1-40-FC5 +* Tue Oct 18 2005 Jason Vas Dias - 4.1-40.FC5 - *** NOTE : please do not modify vixie-cron without contacting *** *** the package maintainer (me at the moment). *** *** Or at least test it first! *** From fedora-cvs-commits at redhat.com Thu Jan 26 20:37:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 15:37:22 -0500 Subject: rpms/libbonobo/devel libbonobo-2.13.1-multishlib.patch, 1.2, 1.3 libbonobo.spec, 1.31, 1.32 Message-ID: <200601262037.k0QKbMeA027058@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/libbonobo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27041 Modified Files: libbonobo-2.13.1-multishlib.patch libbonobo.spec Log Message: - one more iteration of the shlib patch libbonobo-2.13.1-multishlib.patch: activation-server/Makefile.am | 9 ++++++++- configure.in | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) Index: libbonobo-2.13.1-multishlib.patch =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo-2.13.1-multishlib.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libbonobo-2.13.1-multishlib.patch 25 Jan 2006 21:49:23 -0000 1.2 +++ libbonobo-2.13.1-multishlib.patch 26 Jan 2006 20:37:20 -0000 1.3 @@ -1,16 +1,48 @@ ---- libbonobo-2.13.1/configure.in.multishlib 2006-01-25 16:38:53.000000000 -0500 -+++ libbonobo-2.13.1/configure.in 2006-01-25 16:46:03.000000000 -0500 -@@ -233,6 +233,8 @@ +--- libbonobo-2.13.1/configure.in.multishlib 2006-01-16 13:58:48.000000000 -0500 ++++ libbonobo-2.13.1/configure.in 2006-01-26 14:40:41.000000000 -0500 +@@ -233,6 +233,40 @@ AC_SUBST(IF_BSD_PS) AC_SUBST(IF_POSIX_PS) -+AM_CONDITIONAL(MULTILIB_SERVER_FILES, test "$libdir" != "$exec_prefix/lib") ++multilib_server_files="no" ++AC_MSG_CHECKING(for multi-arch bonobo server paths) ++ ++# hack stolen from dbus to expand libdir out ++if test "x$prefix" = "xNONE"; then ++ deduced_prefix=$ac_default_prefix ++else ++ deduced_prefix=$prefix ++fi ++ ++old_prefix=$prefix ++prefix=$deduced_prefix ++ ++if test "x$exec_prefix" = xNONE ; then ++ deduced_exec_prefix=$deduced_prefix ++else ++ deduced_exec_prefix=$exec_prefix ++fi ++old_exec_prefix=$exec_prefix ++exec_prefix=$deduced_exec_prefix ++expanded_libdir=`eval echo $libdir` ++prefix=$old_prefix ++ ++if test "${exec_prefix}/lib" != "${expanded_libdir}"; then ++ multilib_server_files="yes" ++ AC_MSG_RESULT(yes) ++else ++ multilib_server_files="no" ++ AC_MSG_RESULT(no) ++fi ++exec_prefix=$old_exec_prefix ++ ++AM_CONDITIONAL(MULTILIB_SERVER_FILES, test "${multilib_server_files}" = "yes") + AC_OUTPUT([ Makefile libbonobo-zip --- libbonobo-2.13.1/activation-server/Makefile.am.multishlib 2005-07-04 18:05:49.000000000 -0400 -+++ libbonobo-2.13.1/activation-server/Makefile.am 2006-01-25 16:44:26.000000000 -0500 ++++ libbonobo-2.13.1/activation-server/Makefile.am 2006-01-26 14:39:22.000000000 -0500 @@ -6,13 +6,20 @@ libexec_PROGRAMS=bonobo-activation-server noinst_PROGRAMS=test-performance Index: libbonobo.spec =================================================================== RCS file: /cvs/dist/rpms/libbonobo/devel/libbonobo.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- libbonobo.spec 25 Jan 2006 21:55:23 -0000 1.31 +++ libbonobo.spec 26 Jan 2006 20:37:20 -0000 1.32 @@ -6,7 +6,7 @@ Summary: Bonobo component system Name: libbonobo Version: 2.13.1 -Release: 7 +Release: 8 URL: http://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -17,6 +17,7 @@ BuildPreReq: intltool >= 0.14-1 BuildPreReq: automake16 autoconf libtool BuildPreReq: gtk-doc +BuildPreReq: flex, bison, zlib-devel # From 2.3, libbonobo swallowed bonobo-activation Obsoletes: bonobo-activation Provides: bonobo-activation = %{version}-%{release} @@ -112,6 +113,9 @@ %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Wed Jan 25 2006 Ray Strode 2.13.1-8 +- one more iteration of the shlib patch + * Wed Jan 25 2006 Ray Strode 2.13.1-7 - run automake in %%build so that shlib patch gets built From fedora-cvs-commits at redhat.com Thu Jan 26 20:45:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 15:45:36 -0500 Subject: rpms/kernel/devel .cvsignore, 1.332, 1.333 kernel-2.6.spec, 1.1874, 1.1875 linux-2.6-crashdump-common.patch, 1.7, 1.8 sources, 1.274, 1.275 linux-2.6-acpi-thinkpad-c2c3.patch, 1.2, NONE Message-ID: <200601262045.k0QKja2x028722@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27415 Modified Files: .cvsignore kernel-2.6.spec linux-2.6-crashdump-common.patch sources Removed Files: linux-2.6-acpi-thinkpad-c2c3.patch Log Message: acpi de jour. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v retrieving revision 1.332 retrieving revision 1.333 diff -u -r1.332 -r1.333 --- .cvsignore 21 Jan 2006 22:31:56 -0000 1.332 +++ .cvsignore 26 Jan 2006 20:45:32 -0000 1.333 @@ -5,3 +5,4 @@ patch-2.6.16-rc1.bz2 bcm43xx-20060114.tar.bz2 patch-2.6.16-rc1-git4.bz2 +acpi-release-20060113-2.6.16-rc1.diff.bz2 Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1874 retrieving revision 1.1875 diff -u -r1.1874 -r1.1875 --- kernel-2.6.spec 26 Jan 2006 16:56:35 -0000 1.1874 +++ kernel-2.6.spec 26 Jan 2006 20:45:32 -0000 1.1875 @@ -209,6 +209,7 @@ Patch1: patch-2.6.16-rc1.bz2 Patch2: patch-2.6.16-rc1-git4.bz2 Patch3: drm.patch +Patch4: acpi-release-20060113-2.6.16-rc1.diff.bz2 # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -368,9 +369,6 @@ Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch Patch2002: linux-2.6-vm-clear-unreclaimable.patch -# ACPI patches. -Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch - # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx.patch @@ -587,7 +585,10 @@ # Update to latest upstream. %patch1 -p1 %patch2 -p1 +# Backout broken DRM changes. %patch3 -p1 -R +# Update ACPI +%patch4 -p1 # # Patches 10 through 100 are meant for core subsystem upgrades @@ -860,10 +861,6 @@ # VM oom killer tweaks. %patch2002 -p1 -# ACPI patches. -# Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. -%patch2100 -p1 - # # Patches 5000 to 6000 are reserved for new drivers that are about to # be merged upstream @@ -1372,6 +1369,7 @@ - Fix building of kdump kernels. - Fix slab corruption in network layer. - Make iptables work again. +- Update ACPI to latest acpi-git tree. * Wed Jan 25 2006 Dave Jones - Disable page allocation debugging again. linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/i386/mm/pgtable.c | 3 linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 32 files changed, 952 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- linux-2.6-crashdump-common.patch 11 Jan 2006 00:01:28 -0000 1.7 +++ linux-2.6-crashdump-common.patch 26 Jan 2006 20:45:32 -0000 1.8 @@ -396,10 +396,10 @@ /* Values used for system_state */ extern enum system_states { SYSTEM_BOOTING, -@@ -182,6 +193,7 @@ - SYSTEM_HALT, +@@ -197,6 +197,7 @@ extern enum system_states { SYSTEM_POWER_OFF, SYSTEM_RESTART, + SYSTEM_SUSPEND_DISK, + SYSTEM_DUMPING, } system_state; Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/sources,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- sources 21 Jan 2006 22:32:12 -0000 1.274 +++ sources 26 Jan 2006 20:45:32 -0000 1.275 @@ -2,3 +2,4 @@ fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2 ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 a247c21e1202f514283ba928d9382353 patch-2.6.16-rc1-git4.bz2 +3c236ca700ac76f28c2c4e25682541a4 acpi-release-20060113-2.6.16-rc1.diff.bz2 --- linux-2.6-acpi-thinkpad-c2c3.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 26 22:14:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 17:14:37 -0500 Subject: rpms/kernel-xen/devel/configs config-generic, 1.3, 1.4 config-i586, 1.2, 1.3 config-ia64-generic, 1.3, 1.4 config-powerpc-generic, 1.3, 1.4 config-powerpc32-generic, 1.2, 1.3 config-powerpc64, 1.2, 1.3 config-powerpc64-iseries, 1.3, 1.4 config-x86-generic, 1.4, 1.5 config-x86_64-generic, 1.4, 1.5 Message-ID: <200601262214.k0QMEbQf004205@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel-xen/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv4150/configs Modified Files: config-generic config-i586 config-ia64-generic config-powerpc-generic config-powerpc32-generic config-powerpc64 config-powerpc64-iseries config-x86-generic config-x86_64-generic Log Message: rebase with rawhide 1.1869 Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-generic,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-generic 9 Jan 2006 20:42:19 -0000 1.3 +++ config-generic 26 Jan 2006 22:14:35 -0000 1.4 @@ -5,7 +5,7 @@ CONFIG_SMP=y CONFIG_HOTPLUG_CPU=y CONFIG_LOCALVERSION="" - +# CONFIG_CRASH_DUMP is not set # # Code maturity level options # @@ -115,6 +115,8 @@ # CONFIG_FW_LOADER=y +# CONFIG_SPI is not set + # # Memory Technology Devices (MTD) # @@ -461,7 +463,8 @@ # CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set CONFIG_SCSI_DC390T=m -CONFIG_SCSI_QLA2XXX=m +CONFIG_SCSI_QLA_FC=m +# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set CONFIG_SCSI_QLA21XX=m CONFIG_SCSI_QLA22XX=m CONFIG_SCSI_QLA2300=m @@ -549,6 +552,7 @@ # I2O device support # # CONFIG_I2O is not set +# CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set # # Networking support @@ -630,6 +634,30 @@ CONFIG_NETFILTER_NETLINK=m CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_XTABLES=m +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m +CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m +CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m +CONFIG_NETFILTER_XT_MATCH_DCCP=m +CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_LENGTH=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MAC=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m +CONFIG_NETFILTER_XT_MATCH_REALM=m +CONFIG_NETFILTER_XT_MATCH_SCTP=m +CONFIG_NETFILTER_XT_MATCH_STATE=m +CONFIG_NETFILTER_XT_MATCH_STRING=m +CONFIG_NETFILTER_XT_MATCH_TCPMSS=m + # CONFIG_NETFILTER_DEBUG is not set CONFIG_BRIDGE_NETFILTER=y @@ -668,6 +696,7 @@ CONFIG_IP_NF_MATCH_DCCP=m CONFIG_IP_NF_MATCH_CONNBYTES=m CONFIG_IP_NF_MATCH_STRING=m +CONFIG_IP_NF_MATCH_POLICY=m CONFIG_IP_NF_TARGET_CONNMARK=m CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -729,6 +758,7 @@ CONFIG_IP6_NF_MATCH_LENGTH=m CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_MATCH_PHYSDEV=m +CONFIG_IP6_NF_MATCH_POLICY=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m @@ -795,6 +825,13 @@ CONFIG_IP_DCCP_UNLOAD_HACK=y # +# TIPC Configuration (EXPERIMENTAL) +# +CONFIG_TIPC=m +# CONFIG_TIPC_ADVANCED is not set +# CONFIG_TIPC_DEBUG is not set + +# # QoS and/or fair queueing # CONFIG_NET_SCHED=y @@ -973,6 +1010,7 @@ CONFIG_DL2K=m CONFIG_E1000=m CONFIG_E1000_NAPI=y +# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -982,6 +1020,7 @@ # CONFIG_SK98LIN is not set CONFIG_SKGE=m CONFIG_TIGON3=m +CONFIG_SKY2=m # # Ethernet (10000 Mbit) @@ -1041,8 +1080,9 @@ CONFIG_IEEE80211_SOFTMAC=m CONFIG_IEEE80211_SOFTMAC_DEBUG=y # CONFIG_IPW2100 is not set -# CONFIG_IPW_DEBUG is not set # CONFIG_IPW2200 is not set +# CONFIG_IPW2100_DEBUG is not set +# CONFIG_IPW2200_DEBUG is not set CONFIG_AIRO=m CONFIG_HERMES=m CONFIG_PLX_HERMES=m @@ -1068,6 +1108,7 @@ CONFIG_HOSTAP_PCI=m CONFIG_HOSTAP_PLX=m CONFIG_HOSTAP_FIRMWARE=y +CONFIG_HOSTAP_FIRMWARE_NVRAM=y CONFIG_HOSTAP_CS=m # @@ -1366,12 +1407,13 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y -CONFIG_SERIAL_NONSTANDARD=y -CONFIG_ROCKETPORT=m +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_ROCKETPORT is not set # CONFIG_SYNCLINK is not set # CONFIG_SYNCLINKMP is not set -CONFIG_N_HDLC=m -CONFIG_STALDRV=y +# CONFIG_SYNCLINK_GT is not set +# CONFIG_N_HDLC is not set +# CONFIG_STALDRV is not set # CONFIG_FTAPE is not set # CONFIG_IBM_ASM is not set # CONFIG_TCG_TPM is not set @@ -1388,7 +1430,7 @@ CONFIG_SERIAL_8250_CS=m # CONFIG_SERIAL_8250_ACPI is not set CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y @@ -1509,6 +1551,7 @@ CONFIG_SENSORS_SMSC47M1=m CONFIG_SENSORS_SMSC47B397=m CONFIG_SENSORS_VIA686A=m +CONFIG_SENSORS_VT8231=m CONFIG_SENSORS_W83627HF=m CONFIG_SENSORS_W83781D=m CONFIG_SENSORS_W83L785TS=m @@ -1571,6 +1614,7 @@ CONFIG_W83977F_WDT=m CONFIG_PCIPCWATCHDOG=m CONFIG_USBPCWATCHDOG=m +# CONFIG_SBC_EPX_C3_WATCHDOG is not set CONFIG_HW_RANDOM=m # CONFIG_NVRAM is not set @@ -1623,6 +1667,7 @@ # Multimedia devices # CONFIG_VIDEO_DEV=m +# CONFIG_VIDEO_ADV_DEBUG is not set # # Video For Linux @@ -1642,6 +1687,7 @@ CONFIG_VIDEO_CX88=m CONFIG_VIDEO_CX88_DVB=m CONFIG_VIDEO_CX88_DVB_ALL_FRONTENDS=y +CONFIG_VIDEO_CX88_ALSA=m CONFIG_VIDEO_DECODER=m CONFIG_VIDEO_DPC=m CONFIG_VIDEO_EM28XX=m @@ -1738,6 +1784,7 @@ # CONFIG_DVB_USB_DEBUG is not set CONFIG_DVB_USB_A800=m CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set CONFIG_DVB_USB_DIBUSB_MC=m CONFIG_DVB_USB_UMT_010=m CONFIG_DVB_USB_DIGITV=m @@ -1856,6 +1903,8 @@ CONFIG_SND_RTCTIMER=m # CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set +CONFIG_SND_DYNAMIC_MINORS=y +# CONFIG_SND_SUPPORT_OLD_API is not set # # Generic devices @@ -1880,12 +1929,14 @@ CONFIG_SND_CS46XX=m CONFIG_SND_CS46XX_NEW_DSP=y CONFIG_SND_CS4281=m +CONFIG_SND_CS5535AUDIO=m CONFIG_SND_EMU10K1=m CONFIG_SND_EMU10K1X=m CONFIG_SND_CA0106=m CONFIG_SND_KORG1212=m CONFIG_SND_NM256=m CONFIG_SND_RME32=m +CONFIG_SND_PCXHR=m CONFIG_SND_RME96=m CONFIG_SND_RME9652=m CONFIG_SND_HDSP=m @@ -1985,6 +2036,7 @@ CONFIG_USB_STORAGE_JUMPSHOT=y CONFIG_USB_STORAGE_USBAT=y CONFIG_USB_STORAGE_ONETOUCH=y +CONFIG_USB_STORAGE_ALAUDA=y CONFIG_USB_LIBUSUAL=y # @@ -2005,7 +2057,9 @@ # CONFIG_USB_KBD is not set # CONFIG_USB_MOUSE is not set CONFIG_USB_AIPTEK=m + CONFIG_USB_WACOM=m + CONFIG_USB_KBTAB=m CONFIG_USB_POWERMATE=m CONFIG_USB_XPAD=m @@ -2142,6 +2196,7 @@ # CONFIG_USB_FILE_STORAGE_TEST is not set CONFIG_USB_MTOUCH=m CONFIG_USB_ATI_REMOTE=m +CONFIG_USB_ATI_REMOTE2=m CONFIG_USB_ALI_M5632=y # CONFIG_USB_CYTHERM is not set CONFIG_USB_EGALAX=m @@ -2157,6 +2212,7 @@ CONFIG_USB_ATM=m CONFIG_USB_CXACRU=m CONFIG_USB_XUSBATM=m +CONFIG_USB_UEAGLEATM=m CONFIG_USB_KEYSPAN_REMOTE=m CONFIG_USB_LD=m CONFIG_USB_APPLETOUCH=m @@ -2301,6 +2357,9 @@ # CONFIG_AFS_FS is not set # CONFIG_RXRPC is not set +CONFIG_OCFS2_FS=m +CONFIG_CONFIGFS_FS=m + # # Partition Types # @@ -2320,6 +2379,8 @@ # CONFIG_ULTRIX_PARTITION is not set CONFIG_SUN_PARTITION=y CONFIG_EFI_PARTITION=y +CONFIG_KARMA_PARTITION=y + CONFIG_NLS=y # @@ -2383,12 +2444,13 @@ # CONFIG_FRAME_POINTER is not set CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_DEBUG_DRIVER is not set -# CONFIG_DEBUG_VM is not set # CONFIG_RCU_TORTURE_TEST is not set # CONFIG_DEBUG_RODATA is not set # Turn off these debug options for production kernels. CONFIG_DEBUG_SLAB=y +CONFIG_DEBUG_MUTEXES=y +CONFIG_DEBUG_VM=y CONFIG_KMALLOC_ACCOUNTING=y # CONFIG_WAKEUP_TIMING is not set @@ -2405,6 +2467,7 @@ # CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y +CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_CAPABILITIES=y # CONFIG_SECURITY_ROOTPLUG is not set CONFIG_SECURITY_SELINUX=y @@ -2631,3 +2694,9 @@ # CONFIG_SND_PDAUDIOCF is not set ## END of ISA options. + +# FIXME: This needs to be made to depend on PPC +# CONFIG_USB_HIDINPUT_POWERBOOK is not set + +# CONFIG_FORCED_INLINING is not set + Index: config-i586 =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-i586,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-i586 21 Dec 2005 11:24:56 -0000 1.2 +++ config-i586 26 Jan 2006 22:14:35 -0000 1.3 @@ -43,7 +43,6 @@ # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_SONYPI is not set -# CONFIG_AGP is not set # CONFIG_DRM is not set # CONFIG_HPET is not set # CONFIG_W1 is not set @@ -53,3 +52,15 @@ # CONFIG_MMC is not set # CONFIG_INFINIBAND is not set # CONFIG_KPROBES is not set +CONFIG_AGP=y +# CONFIG_AGP_ALI is not set +# CONFIG_AGP_ATI is not set +# CONFIG_AGP_AMD is not set +# CONFIG_AGP_AMD64 is not set +CONFIG_AGP_INTEL=y +# CONFIG_AGP_NVIDIA is not set +# CONFIG_AGP_SIS is not set +# CONFIG_AGP_SWORKS is not set +# CONFIG_AGP_VIA is not set +# CONFIG_AGP_EFFICEON is not set + Index: config-ia64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-ia64-generic,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-ia64-generic 9 Jan 2006 20:42:19 -0000 1.3 +++ config-ia64-generic 26 Jan 2006 22:14:35 -0000 1.4 @@ -157,3 +157,8 @@ CONFIG_IA64_ACPI_CPUFREQ=m # CONFIG_CRASH is not set + +CONFIG_SERIAL_SGI_IOC3=m +CONFIG_SGI_IOC3=m + + Index: config-powerpc-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc-generic,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-powerpc-generic 9 Jan 2006 20:42:19 -0000 1.3 +++ config-powerpc-generic 26 Jan 2006 22:14:35 -0000 1.4 @@ -40,7 +40,7 @@ CONFIG_ADB=y CONFIG_ADB_PMU=y CONFIG_WINDFARM=y -CONFIG_I2C_KEYWEST=y +CONFIG_I2C_POWERMAC=y CONFIG_APPLE_AIRPORT=m CONFIG_SERIAL_PMACZILOG=m CONFIG_AGP_UNINORTH=y @@ -80,3 +80,5 @@ # CONFIG_SCSI_DC390T is not set # CONFIG_SCSI_BUSLOGIC is not set +CONFIG_USB_HIDINPUT_POWERBOOK=y + Index: config-powerpc32-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc32-generic,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-powerpc32-generic 21 Dec 2005 11:24:56 -0000 1.2 +++ config-powerpc32-generic 26 Jan 2006 22:14:35 -0000 1.3 @@ -4,6 +4,7 @@ # CONFIG_RTAS_PROC is not set # CONFIG_PCMCIA_M8XX is not set # CONFIG_HOTPLUG_PCI is not set +CONFIG_CLASSIC32=y CONFIG_CPU_FREQ_PMAC=y CONFIG_PPC_MULTIPLATFORM=y CONFIG_PPC_CHRP=y Index: config-powerpc64 =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc64,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- config-powerpc64 21 Dec 2005 11:24:56 -0000 1.2 +++ config-powerpc64 26 Jan 2006 22:14:35 -0000 1.3 @@ -1,11 +1,13 @@ CONFIG_WINDFARM_PM81=y CONFIG_WINDFARM_PM91=y CONFIG_PPC_PMAC64=y -CONFIG_PPC_MAPLE=y +# CONFIG_PPC_MAPLE is not set CONFIG_PPC_CELL=y # CONFIG_PPC_ISERIES is not set CONFIG_PPC_PSERIES=y CONFIG_PPC_PMAC=y +CONFIG_IBMEBUS=y +CONFIG_SPU_FS=m CONFIG_RTAS_FLASH=y CONFIG_PPC_SPLPAR=y CONFIG_SCANLOG=y Index: config-powerpc64-iseries =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-powerpc64-iseries,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- config-powerpc64-iseries 9 Jan 2006 20:42:19 -0000 1.3 +++ config-powerpc64-iseries 26 Jan 2006 22:14:35 -0000 1.4 @@ -47,13 +47,6 @@ # CONFIG_SCHED_SMT is not set # CONFIG_XMON is not set # CONFIG_ROCKETPORT is not set - -# Disabled due to compile failure 2005-09-21 (dwmw2) -# drivers/infiniband/hw/mthca/mthca_cmd.c: In function 'mthca_cmd_poll': -# drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: syntax error before 'do' -# drivers/infiniband/hw/mthca/mthca_cmd.c:280: error: called object '"i"' is not a function -# CONFIG_INFINIBAND_MTHCA is not set - # CONFIG_WINDFARM is not set CONFIG_LPARCFG=y CONFIG_HOTPLUG_PCI=y @@ -66,6 +59,32 @@ CONFIG_SERIAL_ICOM=m # CONFIG_ISDN is not set # CONFIG_IEEE80211 is not set +# CONFIG_DVB is not set +# CONFIG_VIDEO_DEV is not set +# CONFIG_SND is not set +# CONFIG_IRDA is not set +# CONFIG_IEEE1394 is not set +# CONFIG_CPU_FREQ is not set +# CONFIG_PCCARD is not set +# CONFIG_CARDBUS is not set +# CONFIG_HOTPLUG_PCI is not set +# CONFIG_ATM is not set +# CONFIG_IPX is not set +# CONFIG_ATALK is not set +# CONFIG_WAN_ROUTER is not set +# CONFIG_BLK_DEV_SX8 is not set +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set +# CONFIG_I2C is not set +# CONFIG_W1 is not set +# CONFIG_HWMON is not set +# CONFIG_SOUND is not set +# CONFIG_MMC is not set +# CONFIG_INFINIBAND is not set # CONFIG_DVB is not set # CONFIG_VIDEO_DEV is not set Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86-generic,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config-x86-generic 9 Jan 2006 20:42:19 -0000 1.4 +++ config-x86-generic 26 Jan 2006 22:14:35 -0000 1.5 @@ -204,10 +204,12 @@ CONFIG_DEBUG_RODATA=y CONFIG_DEBUG_STACKOVERFLOW=y CONFIG_DEBUG_STACK_USAGE=y -# CONFIG_DEBUG_PAGEALLOC is not set CONFIG_4KSTACKS=y CONFIG_KPROBES=y +# FIXME: Disable before release. +CONFIG_DEBUG_PAGEALLOC=y + CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y CONFIG_PCI_BIOS=y @@ -263,7 +265,6 @@ # CONFIG_X86_REBOOTFIXUPS is not set CONFIG_PHYSICAL_START=0x100000 -# CONFIG_CRASH_DUMP is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m @@ -272,4 +273,15 @@ CONFIG_LATENCY_TIMING=y CONFIG_LATENCY_TRACE=y CONFIG_MCOUNT=y +CONFIG_CS5535_GPIO=m + +CONFIG_EDAC=y +CONFIG_EDAC_DEBUG=y +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m Index: config-x86_64-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86_64-generic,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- config-x86_64-generic 9 Jan 2006 20:42:19 -0000 1.4 +++ config-x86_64-generic 26 Jan 2006 22:14:35 -0000 1.5 @@ -148,3 +148,13 @@ CONFIG_NVRAM=m +CONFIG_EDAC=y +CONFIG_EDAC_DEBUG=y +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD76X=m +CONFIG_EDAC_E7XXX=m +CONFIG_EDAC_E752X=m +CONFIG_EDAC_I82875P=m +CONFIG_EDAC_I82860=m +CONFIG_EDAC_R82600=m + From fedora-cvs-commits at redhat.com Thu Jan 26 22:14:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 17:14:37 -0500 Subject: rpms/kernel-xen/devel drm.patch, NONE, 1.1 linux-2.6-execshield-fixes.patch, NONE, 1.1 linux-2.6-mv643xx-compile-fix.patch, NONE, 1.1 linux-2.6.15-cell-numa-init.patch, NONE, 1.1 patch-2.6.16-rc1-git4.bz2.sign, NONE, 1.1 patch-2.6.16-rc1.bz2.sign, NONE, 1.1 .cvsignore, 1.7, 1.8 kernel-xen.spec, 1.29, 1.30 linux-2.6-compile-fixes.patch, 1.2, 1.3 linux-2.6-crashdump-common.patch, 1.3, 1.4 linux-2.6-debug-dual-line-backtrace.patch, 1.2, 1.3 linux-2.6-debug-oops-pause.patch, 1.3, 1.4 linux-2.6-debug-singlebiterror.patch, 1.2, 1.3 linux-2.6-debug-spinlock-taint.patch, 1.3, 1.4 linux-2.6-debug-sysfs-crash-debugging.patch, 1.2, 1.3 linux-2.6-debug-taint-vm.patch, 1.2, 1.3 linux-2.6-devmem.patch, 1.2, 1.3 linux-2.6-diskdump.patch, 1.2, 1.3 linux-2.6-execshield-vdso.patch, 1.2, 1.3 linux-2.6-execshield.patch, 1.3, 1.4 linux-2.6-hvc-console.patch, 1.2, 1.3 linux-2.6-modsign-core.patch, 1.2, 1.3 linux-2.6-radeon-backlight.patch, 1.2, 1.3 linux-2.6-sleepon.patch, 1.2, 1.3 linux-2.6-softmac-git.patch, 1.1, 1.2 linux-2.6-tux.pat! ch, 1.2, 1.3 linux-2.6-vm-clear-unreclaimable.patch, 1.1, 1.2 linux-2.6-vm-oomkiller-debugging.patch, 1.2, 1.3 linux-2.6-vm-silence-atomic-alloc-failures.patch, 1.2, 1.3 linux-2.6-x86-tune-p4.patch, 1.2, 1.3 linux-2.6-xen-merge.patch, 1.3, 1.4 sources, 1.7, 1.8 upstream, 1.4, 1.5 linux-2.6-build-reference-discarded-opd.patch, 1.2, NONE linux-2.6-cell-idle-pmgt.patch, 1.2, NONE linux-2.6-cell-iommu.patch, 1.2, NONE linux-2.6-cell-no-legacy-io.patch, 1.2, NONE linux-2.6-cell-nvram-kmalloc.patch, 1.2, NONE linux-2.6-cell-platform-detect.patch, 1.2, NONE linux-2.6-cell-spidernet.patch, 1.2, NONE linux-2.6-debug-taint-check.patch, 1.2, NONE linux-2.6-debug-taint-proprietary-helpers.patch, 1.2, NONE linux-2.6-gcc41.patch, 1.3, NONE linux-2.6-ia64-spinlock-size.patch, 1.1, NONE linux-2.6-kdump-needs-not-embedded.patch, 1.2, NONE linux-2.6-powerpc-parport.patch, 1.2, NONE linux-2.6-proc-vmcore-needs-not-embedded.patch, 1.2, NONE linux-2.6-scsi-megaraid-legacy.patch, 1.2, NONE linux-2.6-serial-nrports.patch, 1.1, NONE linux-2.6-s! erial-of.patch,1.2,NONE linux-2.6-usbhid-wireless-security-loc! k.patch, Message-ID: <200601262214.k0QMEbsc004197@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4150 Modified Files: .cvsignore kernel-xen.spec linux-2.6-compile-fixes.patch linux-2.6-crashdump-common.patch linux-2.6-debug-dual-line-backtrace.patch linux-2.6-debug-oops-pause.patch linux-2.6-debug-singlebiterror.patch linux-2.6-debug-spinlock-taint.patch linux-2.6-debug-sysfs-crash-debugging.patch linux-2.6-debug-taint-vm.patch linux-2.6-devmem.patch linux-2.6-diskdump.patch linux-2.6-execshield-vdso.patch linux-2.6-execshield.patch linux-2.6-hvc-console.patch linux-2.6-modsign-core.patch linux-2.6-radeon-backlight.patch linux-2.6-sleepon.patch linux-2.6-softmac-git.patch linux-2.6-tux.patch linux-2.6-vm-clear-unreclaimable.patch linux-2.6-vm-oomkiller-debugging.patch linux-2.6-vm-silence-atomic-alloc-failures.patch linux-2.6-x86-tune-p4.patch linux-2.6-xen-merge.patch sources upstream Added Files: drm.patch linux-2.6-execshield-fixes.patch linux-2.6-mv643xx-compile-fix.patch linux-2.6.15-cell-numa-init.patch patch-2.6.16-rc1-git4.bz2.sign patch-2.6.16-rc1.bz2.sign Removed Files: linux-2.6-build-reference-discarded-opd.patch linux-2.6-cell-idle-pmgt.patch linux-2.6-cell-iommu.patch linux-2.6-cell-no-legacy-io.patch linux-2.6-cell-nvram-kmalloc.patch linux-2.6-cell-platform-detect.patch linux-2.6-cell-spidernet.patch linux-2.6-debug-taint-check.patch linux-2.6-debug-taint-proprietary-helpers.patch linux-2.6-gcc41.patch linux-2.6-ia64-spinlock-size.patch linux-2.6-kdump-needs-not-embedded.patch linux-2.6-powerpc-parport.patch linux-2.6-proc-vmcore-needs-not-embedded.patch linux-2.6-scsi-megaraid-legacy.patch linux-2.6-serial-nrports.patch linux-2.6-serial-of.patch linux-2.6-usbhid-wireless-security-lock.patch linux-2.6-vm-debug.patch linux-2.6-x86_64-ati-apic-timer.patch linux-2.6-x86_64-disable-hotplug-guessing.patch linux-2.6.15-default-powerpc.patch linux-2.6.15-rc1-ppc64-syscallpath.patch Log Message: rebase with rawhide 1.1869 drm.patch: b/drivers/char/drm/Makefile | 4 b/drivers/char/drm/ati_pcigart.c | 23 b/drivers/char/drm/drm.h | 4 b/drivers/char/drm/drmP.h | 122 +++-- b/drivers/char/drm/drm_agpsupport.c | 133 +++-- b/drivers/char/drm/drm_bufs.c | 49 +- b/drivers/char/drm/drm_context.c | 2 b/drivers/char/drm/drm_core.h | 4 b/drivers/char/drm/drm_drv.c | 152 +++--- b/drivers/char/drm/drm_fops.c | 317 +++++++------ b/drivers/char/drm/drm_ioc32.c | 1 b/drivers/char/drm/drm_ioctl.c | 27 - b/drivers/char/drm/drm_lock.c | 1 b/drivers/char/drm/drm_memory.c | 8 b/drivers/char/drm/drm_memory_debug.h | 269 +++++------ b/drivers/char/drm/drm_os_linux.h | 1 b/drivers/char/drm/drm_pciids.h | 12 b/drivers/char/drm/drm_proc.c | 16 b/drivers/char/drm/drm_stub.c | 63 -- b/drivers/char/drm/drm_sysfs.c | 66 +- b/drivers/char/drm/i810_dma.c | 49 +- b/drivers/char/drm/i810_drv.c | 60 -- b/drivers/char/drm/i810_drv.h | 10 b/drivers/char/drm/i830_dma.c | 47 + b/drivers/char/drm/i830_drv.c | 59 -- b/drivers/char/drm/i830_drv.h | 8 b/drivers/char/drm/i915_dma.c | 52 +- b/drivers/char/drm/i915_drm.h | 6 b/drivers/char/drm/i915_drv.c | 66 -- b/drivers/char/drm/i915_drv.h | 44 + b/drivers/char/drm/i915_ioc32.c | 1 b/drivers/char/drm/i915_irq.c | 48 +- b/drivers/char/drm/i915_mem.c | 5 b/drivers/char/drm/mga_dma.c | 160 ++++-- b/drivers/char/drm/mga_drv.c | 58 -- b/drivers/char/drm/mga_drv.h | 14 b/drivers/char/drm/mga_ioc32.c | 1 b/drivers/char/drm/mga_state.c | 26 - b/drivers/char/drm/r128_cce.c | 15 b/drivers/char/drm/r128_drm.h | 4 b/drivers/char/drm/r128_drv.c | 48 -- b/drivers/char/drm/r128_drv.h | 8 b/drivers/char/drm/r128_ioc32.c | 1 b/drivers/char/drm/r128_irq.c | 4 b/drivers/char/drm/r128_state.c | 44 - b/drivers/char/drm/r300_cmdbuf.c | 38 - b/drivers/char/drm/r300_reg.h | 1 b/drivers/char/drm/radeon_cp.c | 106 ++-- b/drivers/char/drm/radeon_drm.h | 6 b/drivers/char/drm/radeon_drv.c | 62 +- b/drivers/char/drm/radeon_drv.h | 41 - b/drivers/char/drm/radeon_ioc32.c | 1 b/drivers/char/drm/radeon_state.c | 246 ++++------ b/drivers/char/drm/savage_bci.c | 81 +-- b/drivers/char/drm/savage_drv.c | 50 -- b/drivers/char/drm/savage_drv.h | 29 - b/drivers/char/drm/savage_state.c | 324 ++++++------- b/drivers/char/drm/sis_drm.h | 25 + b/drivers/char/drm/sis_drv.c | 42 - b/drivers/char/drm/sis_drv.h | 4 b/drivers/char/drm/sis_ds.h | 7 b/drivers/char/drm/sis_mm.c | 30 - b/drivers/char/drm/tdfx_drv.c | 42 - b/drivers/char/drm/tdfx_drv.h | 7 b/drivers/char/drm/via_dma.c | 38 + b/drivers/char/drm/via_dmablit.c | 805 ++++++++++++++++++++++++++++++++++ b/drivers/char/drm/via_dmablit.h | 140 +++++ b/drivers/char/drm/via_drm.h | 58 +- b/drivers/char/drm/via_drv.c | 63 -- b/drivers/char/drm/via_drv.h | 56 +- b/drivers/char/drm/via_ds.c | 9 b/drivers/char/drm/via_irq.c | 53 +- b/drivers/char/drm/via_map.c | 47 + b/drivers/char/drm/via_mm.c | 20 b/drivers/char/drm/via_verifier.c | 6 b/drivers/char/drm/via_verifier.h | 4 b/drivers/char/drm/via_video.c | 7 drivers/char/drm/drm_init.c | 53 -- 78 files changed, 2795 insertions(+), 1818 deletions(-) --- NEW FILE drm.patch --- diff --git a/drivers/char/drm/Makefile b/drivers/char/drm/Makefile index e41060c..9d180c4 100644 --- a/drivers/char/drm/Makefile +++ b/drivers/char/drm/Makefile @@ -3,7 +3,7 @@ # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. drm-objs := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \ - drm_drv.o drm_fops.o drm_init.o drm_ioctl.o drm_irq.o \ + drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \ drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \ drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \ drm_sysfs.o @@ -18,7 +18,7 @@ radeon-objs := radeon_drv.o radeon_cp.o ffb-objs := ffb_drv.o ffb_context.o sis-objs := sis_drv.o sis_ds.o sis_mm.o savage-objs := savage_drv.o savage_bci.o savage_state.o -via-objs := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o +via-objs := via_irq.o via_drv.o via_ds.o via_map.o via_mm.o via_dma.o via_verifier.o via_video.o via_dmablit.o ifeq ($(CONFIG_COMPAT),y) drm-objs += drm_ioc32.o diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c index efff0ee..5485382 100644 --- a/drivers/char/drm/ati_pcigart.c +++ b/drivers/char/drm/ati_pcigart.c @@ -52,7 +52,7 @@ # define ATI_MAX_PCIGART_PAGES 8192 /**< 32 MB aperture, 4K pages */ # define ATI_PCIGART_PAGE_SIZE 4096 /**< PCI GART page size */ -static unsigned long drm_ati_alloc_pcigart_table(void) +static void *drm_ati_alloc_pcigart_table(void) { unsigned long address; struct page *page; @@ -72,27 +72,26 @@ static unsigned long drm_ati_alloc_pciga } DRM_DEBUG("%s: returning 0x%08lx\n", __FUNCTION__, address); - return address; + return (void *)address; } -static void drm_ati_free_pcigart_table(unsigned long address) +static void drm_ati_free_pcigart_table(void *address) { struct page *page; int i; DRM_DEBUG("%s\n", __FUNCTION__); - page = virt_to_page(address); + page = virt_to_page((unsigned long)address); for (i = 0; i < ATI_PCIGART_TABLE_PAGES; i++, page++) { __put_page(page); ClearPageReserved(page); } - free_pages(address, ATI_PCIGART_TABLE_ORDER); + free_pages((unsigned long)address, ATI_PCIGART_TABLE_ORDER); } -int drm_ati_pcigart_cleanup(drm_device_t * dev, - drm_ati_pcigart_info * gart_info) +int drm_ati_pcigart_cleanup(drm_device_t *dev, drm_ati_pcigart_info *gart_info) { drm_sg_mem_t *entry = dev->sg; unsigned long pages; @@ -136,10 +135,10 @@ int drm_ati_pcigart_cleanup(drm_device_t EXPORT_SYMBOL(drm_ati_pcigart_cleanup); -int drm_ati_pcigart_init(drm_device_t * dev, drm_ati_pcigart_info * gart_info) +int drm_ati_pcigart_init(drm_device_t *dev, drm_ati_pcigart_info *gart_info) { drm_sg_mem_t *entry = dev->sg; - unsigned long address = 0; + void *address = NULL; unsigned long pages; u32 *pci_gart, page_base, bus_address = 0; int i, j, ret = 0; @@ -163,7 +162,7 @@ int drm_ati_pcigart_init(drm_device_t * goto done; } - bus_address = pci_map_single(dev->pdev, (void *)address, + bus_address = pci_map_single(dev->pdev, address, ATI_PCIGART_TABLE_PAGES * PAGE_SIZE, PCI_DMA_TODEVICE); if (bus_address == 0) { @@ -176,7 +175,7 @@ int drm_ati_pcigart_init(drm_device_t * address = gart_info->addr; bus_address = gart_info->bus_addr; DRM_DEBUG("PCI: Gart Table: VRAM %08X mapped at %08lX\n", - bus_address, address); + bus_address, (unsigned long)address); } pci_gart = (u32 *) address; @@ -195,7 +194,7 @@ int drm_ati_pcigart_init(drm_device_t * if (entry->busaddr[i] == 0) { DRM_ERROR("unable to map PCIGART pages!\n"); drm_ati_pcigart_cleanup(dev, gart_info); - address = 0; + address = NULL; bus_address = 0; goto done; } diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h index 64d6237..9da0ddb 100644 --- a/drivers/char/drm/drm.h +++ b/drivers/char/drm/drm.h @@ -90,8 +90,8 @@ #define DRM_MAX_ORDER 22 /**< Up to 2^22 bytes = 4MB */ #define DRM_RAM_PERCENT 10 /**< How much system ram can we lock? */ -#define _DRM_LOCK_HELD 0x80000000 /**< Hardware lock is held */ -#define _DRM_LOCK_CONT 0x40000000 /**< Hardware lock is contended */ +#define _DRM_LOCK_HELD 0x80000000U /**< Hardware lock is held */ +#define _DRM_LOCK_CONT 0x40000000U /**< Hardware lock is contended */ #define _DRM_LOCK_IS_HELD(lock) ((lock) & _DRM_LOCK_HELD) #define _DRM_LOCK_IS_CONT(lock) ((lock) & _DRM_LOCK_CONT) #define _DRM_LOCKING_CONTEXT(lock) ((lock) & ~(_DRM_LOCK_HELD|_DRM_LOCK_CONT)) diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index 3dc3c9d..54b561e 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h @@ -144,20 +144,6 @@ /** \name Backward compatibility section */ /*@{*/ -#ifndef MODULE_LICENSE -#define MODULE_LICENSE(x) -#endif - -#ifndef preempt_disable -#define preempt_disable() -#define preempt_enable() -#endif - -#ifndef pte_offset_map -#define pte_offset_map pte_offset -#define pte_unmap(pte) -#endif - #define DRM_RPR_ARG(vma) vma, #define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT) @@ -286,10 +272,13 @@ typedef int drm_ioctl_t(struct inode *in typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd, unsigned long arg); +#define DRM_AUTH 0x1 +#define DRM_MASTER 0x2 +#define DRM_ROOT_ONLY 0x4 + typedef struct drm_ioctl_desc { drm_ioctl_t *func; - int auth_needed; - int root_only; + int flags; } drm_ioctl_desc_t; typedef struct drm_devstate { @@ -384,6 +373,7 @@ typedef struct drm_buf_entry { /** File private data */ typedef struct drm_file { int authenticated; + int master; int minor; pid_t pid; uid_t uid; @@ -532,8 +522,9 @@ typedef struct drm_vbl_sig { typedef struct ati_pcigart_info { int gart_table_location; int is_pcie; - unsigned long addr; + void *addr; dma_addr_t bus_addr; + drm_local_map_t mapping; } drm_ati_pcigart_info; /** @@ -544,16 +535,14 @@ typedef struct ati_pcigart_info { struct drm_device; struct drm_driver { - int (*preinit) (struct drm_device *, unsigned long flags); - void (*prerelease) (struct drm_device *, struct file * filp); - void (*pretakedown) (struct drm_device *); - int (*postcleanup) (struct drm_device *); - int (*presetup) (struct drm_device *); - int (*postsetup) (struct drm_device *); + int (*load) (struct drm_device *, unsigned long flags); + int (*firstopen) (struct drm_device *); + int (*open) (struct drm_device *, drm_file_t *); + void (*preclose) (struct drm_device *, struct file * filp); + void (*postclose) (struct drm_device *, drm_file_t *); + void (*lastclose) (struct drm_device *); [...8171 lines suppressed...] + via_dma_cleanup(dev); return 0; } @@ -107,3 +94,29 @@ int via_map_init(DRM_IOCTL_ARGS) return -EINVAL; } + +int via_driver_load(drm_device_t *dev, unsigned long chipset) +{ + drm_via_private_t *dev_priv; + + dev_priv = drm_calloc(1, sizeof(drm_via_private_t), DRM_MEM_DRIVER); + if (dev_priv == NULL) + return DRM_ERR(ENOMEM); + + dev->dev_private = (void *)dev_priv; + + if (chipset == VIA_PRO_GROUP_A) + dev_priv->pro_group_a = 1; + + return 0; +} + +int via_driver_unload(drm_device_t *dev) +{ + drm_via_private_t *dev_priv = dev->dev_private; + + drm_free(dev_priv, sizeof(drm_via_private_t), DRM_MEM_DRIVER); + + return 0; +} + diff --git a/drivers/char/drm/via_mm.c b/drivers/char/drm/via_mm.c index 3baddac..33e0cb1 100644 --- a/drivers/char/drm/via_mm.c +++ b/drivers/char/drm/via_mm.c @@ -42,7 +42,7 @@ static int via_agp_free(drm_via_mem_t * static int via_fb_alloc(drm_via_mem_t * mem); static int via_fb_free(drm_via_mem_t * mem); -static int add_alloc_set(int context, int type, unsigned int val) +static int add_alloc_set(int context, int type, unsigned long val) { int i, retval = 0; @@ -56,7 +56,7 @@ static int add_alloc_set(int context, in return retval; } -static int del_alloc_set(int context, int type, unsigned int val) +static int del_alloc_set(int context, int type, unsigned long val) { int i, retval = 0; @@ -199,13 +199,13 @@ int via_mem_alloc(DRM_IOCTL_ARGS) sizeof(mem)); switch (mem.type) { - case VIDEO: + case VIA_MEM_VIDEO: if (via_fb_alloc(&mem) < 0) return -EFAULT; DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem, sizeof(mem)); return 0; - case AGP: + case VIA_MEM_AGP: if (via_agp_alloc(&mem) < 0) return -EFAULT; DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem, @@ -232,7 +232,7 @@ static int via_fb_alloc(drm_via_mem_t * if (block) { fb.offset = block->ofs; fb.free = (unsigned long)block; - if (!add_alloc_set(fb.context, VIDEO, fb.free)) { + if (!add_alloc_set(fb.context, VIA_MEM_VIDEO, fb.free)) { DRM_DEBUG("adding to allocation set fails\n"); via_mmFreeMem((PMemBlock) fb.free); retval = -1; @@ -269,7 +269,7 @@ static int via_agp_alloc(drm_via_mem_t * if (block) { agp.offset = block->ofs; agp.free = (unsigned long)block; - if (!add_alloc_set(agp.context, AGP, agp.free)) { + if (!add_alloc_set(agp.context, VIA_MEM_AGP, agp.free)) { DRM_DEBUG("adding to allocation set fails\n"); via_mmFreeMem((PMemBlock) agp.free); retval = -1; @@ -297,11 +297,11 @@ int via_mem_free(DRM_IOCTL_ARGS) switch (mem.type) { - case VIDEO: + case VIA_MEM_VIDEO: if (via_fb_free(&mem) == 0) return 0; break; - case AGP: + case VIA_MEM_AGP: if (via_agp_free(&mem) == 0) return 0; break; @@ -329,7 +329,7 @@ static int via_fb_free(drm_via_mem_t * m via_mmFreeMem((PMemBlock) fb.free); - if (!del_alloc_set(fb.context, VIDEO, fb.free)) { + if (!del_alloc_set(fb.context, VIA_MEM_VIDEO, fb.free)) { retval = -1; } @@ -352,7 +352,7 @@ static int via_agp_free(drm_via_mem_t * via_mmFreeMem((PMemBlock) agp.free); - if (!del_alloc_set(agp.context, AGP, agp.free)) { + if (!del_alloc_set(agp.context, VIA_MEM_AGP, agp.free)) { retval = -1; } diff --git a/drivers/char/drm/via_verifier.c b/drivers/char/drm/via_verifier.c index 4ac495f..70c897c 100644 --- a/drivers/char/drm/via_verifier.c +++ b/drivers/char/drm/via_verifier.c @@ -237,7 +237,7 @@ static hazard_t table3[256]; static __inline__ int eat_words(const uint32_t ** buf, const uint32_t * buf_end, unsigned num_words) { - if ((*buf - buf_end) >= num_words) { + if ((buf_end - *buf) >= num_words) { *buf += num_words; return 0; } @@ -249,14 +249,14 @@ eat_words(const uint32_t ** buf, const u * Partially stolen from drm_memory.h */ -static __inline__ drm_map_t *via_drm_lookup_agp_map(drm_via_state_t * seq, +static __inline__ drm_local_map_t *via_drm_lookup_agp_map(drm_via_state_t *seq, unsigned long offset, unsigned long size, drm_device_t * dev) { struct list_head *list; drm_map_list_t *r_list; - drm_map_t *map = seq->map_cache; + drm_local_map_t *map = seq->map_cache; if (map && map->offset <= offset && (offset + size) <= (map->offset + map->size)) { diff --git a/drivers/char/drm/via_verifier.h b/drivers/char/drm/via_verifier.h index eb4eda3..256590f 100644 --- a/drivers/char/drm/via_verifier.h +++ b/drivers/char/drm/via_verifier.h @@ -47,7 +47,7 @@ typedef struct { int agp_texture; int multitex; drm_device_t *dev; - drm_map_t *map_cache; + drm_local_map_t *map_cache; uint32_t vertex_count; int agp; const uint32_t *buf_start; @@ -55,5 +55,7 @@ typedef struct { extern int via_verify_command_stream(const uint32_t * buf, unsigned int size, drm_device_t * dev, int agp); +extern int via_parse_command_stream(drm_device_t *dev, const uint32_t *buf, + unsigned int size); #endif diff --git a/drivers/char/drm/via_video.c b/drivers/char/drm/via_video.c index 7fab9fb..300ac61 100644 --- a/drivers/char/drm/via_video.c +++ b/drivers/char/drm/via_video.c @@ -50,8 +50,11 @@ void via_release_futex(drm_via_private_t unsigned int i; volatile int *lock; + if (!dev_priv->sarea_priv) + return; + for (i = 0; i < VIA_NR_XVMC_LOCKS; ++i) { - lock = (int *)XVMCLOCKPTR(dev_priv->sarea_priv, i); + lock = (volatile int *)XVMCLOCKPTR(dev_priv->sarea_priv, i); if ((_DRM_LOCKING_CONTEXT(*lock) == context)) { if (_DRM_LOCK_IS_HELD(*lock) && (*lock & _DRM_LOCK_CONT)) { @@ -79,7 +82,7 @@ int via_decoder_futex(DRM_IOCTL_ARGS) if (fx.lock > VIA_NR_XVMC_LOCKS) return -EFAULT; - lock = (int *)XVMCLOCKPTR(sAPriv, fx.lock); + lock = (volatile int *)XVMCLOCKPTR(sAPriv, fx.lock); switch (fx.func) { case VIA_FUTEX_WAIT: linux-2.6-execshield-fixes.patch: linux-2.6.15.i686/include/asm-i386/desc.h | 2 +- linux-exec-shield-curr.q/arch/i386/kernel/traps.c | 2 +- linux-exec-shield-curr.q/fs/proc/base.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-execshield-fixes.patch --- arch/i386/kernel/traps.c | 2 +- arch/x86_64/ia32/ia32_binfmt.c | 2 +- fs/proc/base.c | 2 +- include/asm-i386/desc.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Index: linux-exec-shield-curr.q/arch/i386/kernel/traps.c =================================================================== --- linux-exec-shield-curr.q.orig/arch/i386/kernel/traps.c +++ linux-exec-shield-curr.q/arch/i386/kernel/traps.c @@ -494,7 +494,7 @@ check_lazy_exec_limit(int cpu, struct pt set_user_cs(¤t->mm->context.user_cs, limit); desc1 = ¤t->mm->context.user_cs; - desc2 = per_cpu(cpu_gdt_table, cpu) + GDT_ENTRY_DEFAULT_USER_CS; + desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS; if (desc1->a != desc2->a || desc1->b != desc2->b) { /* Index: linux-exec-shield-curr.q/fs/proc/base.c =================================================================== --- linux-exec-shield-curr.q.orig/fs/proc/base.c +++ linux-exec-shield-curr.q/fs/proc/base.c @@ -201,7 +201,7 @@ static struct pid_entry tgid_base_stuff[ E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), #ifdef CONFIG_MMU - E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUGO), + E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUSR), #endif #ifdef CONFIG_SECURITY E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), diff -uNp linux-2.6.15.i686/include/asm-i386/desc.h.orig linux-2.6.15.i686/include/asm-i386/desc.h --- linux-2.6.15.i686/include/asm-i386/desc.h.orig 2006-01-25 17:57:49.000000000 -0500 +++ linux-2.6.15.i686/include/asm-i386/desc.h 2006-01-25 18:00:02.000000000 -0500 @@ -208,7 +208,7 @@ static inline void set_user_cs(struct de #ifndef CONFIG_X86_XEN #define load_user_cs_desc(cpu, mm) \ - per_cpu(cpu_gdt_table, (cpu))[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs + get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs #else #define load_user_cs_desc(cpu, mm) \ HYPERVISOR_update_descriptor(virt_to_machine(&get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS]), (u64)(mm)->context.user_cs.a | ((u64)(mm)->context.user_cs.b) << 32); linux-2.6-mv643xx-compile-fix.patch: mv643xx_eth.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6-mv643xx-compile-fix.patch --- --- linux-2.6.15/drivers/net/mv643xx_eth.c~ 2006-01-06 13:13:34.000000000 +0000 +++ linux-2.6.15/drivers/net/mv643xx_eth.c 2006-01-06 13:41:03.000000000 +0000 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include linux-2.6.15-cell-numa-init.patch: setup.c | 1 + 1 files changed, 1 insertion(+) --- NEW FILE linux-2.6.15-cell-numa-init.patch --- --- linux-2.6.15/arch/powerpc/platforms/cell/setup.c~ 2006-01-12 20:23:46.000000000 +0000 +++ linux-2.6.15/arch/powerpc/platforms/cell/setup.c 2006-01-13 00:17:51.000000000 +0000 @@ -126,6 +126,7 @@ static void __init cell_spuprop_present( static void __init cell_spumem_init(int early) { struct device_node *node; + return; for (node = of_find_node_by_type(NULL, "spe"); node; node = of_find_node_by_type(node, "spe")) { cell_spuprop_present(node, "local-store", early); --- NEW FILE patch-2.6.16-rc1-git4.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBD0exdyGugalF9Dw4RAnfNAKCTy5g745oBer9YVfbrqZ2iDO+y+ACbBp5C iemK/VSL067J5hjAaJ/9+qw= =EgKq -----END PGP SIGNATURE----- --- NEW FILE patch-2.6.16-rc1.bz2.sign --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info iD8DBQBDzKrJyGugalF9Dw4RAhIyAJ9QOGkXgvpArr3KJ6UHwFCgREaaAwCgj7YH C9biYpTvr7a9Y5gMjg+sH9U= =CXIo -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Jan 2006 20:42:13 -0000 1.7 +++ .cvsignore 26 Jan 2006 22:14:33 -0000 1.8 @@ -3,4 +3,6 @@ kernel-xen-2.6.15 linux-2.6.15.tar.bz2 xen-20060106.tar.bz2 -bcm43xx-20060106.tar.bz2 +bcm43xx-20060114.tar.bz2 +patch-2.6.16-rc1.bz2 +patch-2.6.16-rc1-git4.bz2 Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- kernel-xen.spec 11 Jan 2006 20:05:14 -0000 1.29 +++ kernel-xen.spec 26 Jan 2006 22:14:33 -0000 1.30 @@ -192,7 +192,7 @@ Source10: COPYING.modules Source11: genkey -%define BCMVER 20060106 +%define BCMVER 20060114 Source13: ftp://ftp.berlios.de/pub/bcm43xx/snapshots/bcm43xx/bcm43xx-%{BCMVER}.tar.bz2 Source20: kernel-%{kversion}-i586.config @@ -216,8 +216,9 @@ # # Patches 0 through 100 are meant for core subsystem upgrades # -#Patch1: patch-2.6.16-git1.bz2 -#Patch2: patch-2.6.16-rc1-git1.bz2 +Patch1: patch-2.6.16-rc1.bz2 +Patch2: patch-2.6.16-rc1-git4.bz2 +Patch3: drm.patch # Patches 100 through 500 are meant for architecture patches Patch100: linux-2.6-bzimage.patch @@ -229,38 +230,25 @@ Patch202: linux-2.6-x86-vga-vidfail.patch Patch203: linux-2.6.14-intel-cache-build.patch Patch204: linux-2.6-x86_64-silence-up-apic-errors.patch -Patch205: linux-2.6-x86_64-disable-hotplug-guessing.patch -Patch206: linux-2.6-x86_64-ati-apic-timer.patch -Patch207: linux-2.6-edid-check.patch +Patch205: linux-2.6-edid-check.patch # 300 - 399 ppc(64) -Patch300: linux-2.6.15-default-powerpc.patch -Patch302: linux-2.6-serial-of.patch -Patch303: linux-2.6.15-rc1-ppc64-syscallpath.patch -Patch304: linux-2.6.15-mv643xx-fixes.patch +Patch301: linux-2.6.15-cell-numa-init.patch +#Patch304: linux-2.6.15-mv643xx-fixes.patch Patch305: linux-2.6-cell-mambo-drivers.patch Patch306: linux-2.6-hvc-console.patch -Patch307: linux-2.6-cell-platform-detect.patch -Patch308: linux-2.6-cell-idle-pmgt.patch -Patch309: linux-2.6-cell-nvram-kmalloc.patch Patch310: linux-2.6-cell-spiderpic-no-devtree.patch -Patch311: linux-2.6-cell-spidernet.patch -Patch312: linux-2.6-cell-no-legacy-io.patch Patch313: linux-2.6-hvc-rtas-console.patch Patch314: linux-2.6-ppc-rtas-check.patch -Patch315: linux-2.6-powerpc-parport.patch -Patch316: linux-2.6-cell-iommu.patch Patch317: linux-2.6-ppc-iseries-input-layer.patch # 400 - 499 ia64 -Patch400: linux-2.6-ia64-spinlock-size.patch - # 500 - 599 s390(x) # 600 - 699 sparc(64) # 700 - 799 Xen Patch700: linux-2.6-xen-merge.patch -Patch701: linux-2.6.14-xen-compile-fixes.patch +#Patch701: linux-2.6.14-xen-compile-fixes.patch Patch702: linux-2.6-xen-no-tls-warn.patch Patch704: linux-2.6.14-xen-guest-enable-char-devices.patch Patch705: linux-2.6.14-xen_net_read_mac_export.patch @@ -272,15 +260,14 @@ # Patch800: linux-2.6-build-nonintconfig.patch Patch801: linux-2.6-build-userspace-headers-warning.patch -Patch802: linux-2.6-build-reference-discarded-opd.patch # Exec-shield. Patch810: linux-2.6-execshield.patch -Patch811: linux-2.6-execshield-vdso.patch -#Patch812: linux-2.6-vdso-xen.patch -Patch813: linux-2.6-execshield-xen.patch -Patch814: linux-2.6-xen-vdso-note.patch -Patch815: linux-2.6-write-protect-rodata.patch +Patch811: linux-2.6-execshield-xen.patch +Patch812: linux-2.6-execshield-vdso.patch +Patch813: linux-2.6-xen-vdso-note.patch +Patch814: linux-2.6-execshield-fixes.patch +Patch815: linux-2.6-vdso-xen.patch # Module signing infrastructure. Patch900: linux-2.6-modsign-core.patch @@ -300,7 +287,6 @@ Patch1011: linux-2.6-debug-slab-backtrace.patch Patch1012: linux-2.6-debug-list_head.patch Patch1013: linux-2.6-debug-taint-vm.patch -Patch1014: linux-2.6-debug-taint-check.patch Patch1015: linux-2.6-debug-singlebiterror.patch Patch1016: linux-2.6-debug-spinlock-taint.patch Patch1017: linux-2.6-debug-spinlock-panic.patch @@ -309,7 +295,6 @@ Patch1020: linux-2.6-debug-sleep-in-irq-warning.patch Patch1021: linux-2.6-debug-reference-discarded-return-result.patch Patch1022: linux-2.6-debug-panic-stackdump.patch -Patch1023: linux-2.6-debug-taint-proprietary-helpers.patch Patch1024: linux-2.6-debug-dual-line-backtrace.patch Patch1025: linux-2.6-debug-sysfs-crash-debugging.patch Patch1026: linux-2.6-debug-no-quiet.patch @@ -317,8 +302,6 @@ Patch1028: linux-2.6-debug-oops-pause.patch Patch1029: linux-2.6-debug-account-kmalloc.patch Patch1030: linux-2.6-debug-latency-tracing.patch -Patch1031: linux-2.6.15-usblp-fixes.patch -Patch1032: linux-2.6.15-usb-find-interface.patch # Restrict /dev/mem usage. Patch1050: linux-2.6-devmem.patch @@ -335,8 +318,7 @@ # SCSI bits. Patch1101: linux-2.6-scsi-advansys-enabler.patch -Patch1102: linux-2.6-scsi-megaraid-legacy.patch -Patch1103: linux-2.6-scsi-advansys-pcitable.patch +Patch1102: linux-2.6-scsi-advansys-pcitable.patch # NFS bits. Patch1200: linux-2.6-NFSD-non-null-getxattr.patch @@ -361,11 +343,9 @@ Patch1600: linux-2.6-procfs-i_nlink-miscalculate.patch Patch1610: linux-2.6-atkbd-dell-multimedia.patch Patch1630: linux-2.6-module_version.patch -Patch1640: linux-2.6-swsusp-nofreeze.patch Patch1650: linux-2.6-input-kill-stupid-messages.patch Patch1660: linux-2.6-input-usblegacy.patch Patch1670: linux-2.6-serial-tickle-nmi.patch -Patch1671: linux-2.6-serial-nrports.patch Patch1690: linux-2.6-radeon-backlight.patch Patch1700: linux-2.6-ide-tune-locking.patch Patch1710: linux-2.6-autofs-pathlookup.patch @@ -379,12 +359,9 @@ Patch1790: linux-2.6-softcursor-persistent-alloc.patch Patch1800: linux-2.6-pwc-powerup-by-default.patch Patch1810: linux-2.6-smsc-ircc2-pnp.patch -Patch1820: linux-2.6-usbhid-wireless-security-lock.patch Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch -Patch1860: linux-2.6-posix-timers-sched_time-accumulation.patch -Patch1870: linux-2.6-kill-blk_attempt_merge.patch -Patch1880: linux-2.6-dm-sync-overrun.patch +Patch1850: linux-2.6-mv643xx-compile-fix.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -396,8 +373,7 @@ # VM bits. Patch2000: linux-2.6-vm-oomkiller-debugging.patch Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch -Patch2002: linux-2.6-vm-debug.patch -Patch2003: linux-2.6-vm-clear-unreclaimable.patch +Patch2002: linux-2.6-vm-clear-unreclaimable.patch # ACPI patches. Patch2100: linux-2.6-acpi-thinkpad-c2c3.patch @@ -405,7 +381,6 @@ # Broadcom wireless driver Patch5000: linux-2.6-softmac-git.patch Patch5001: linux-2.6-bcm43xx.patch -Patch5002: linux-2.6-bcm43xx-resume.patch # # 10000 to 20000 is for stuff that has to come last due to the @@ -413,10 +388,7 @@ # Not patches you're too lazy for to put in the proper place. # -Patch10001: linux-2.6-kdump-needs-not-embedded.patch -Patch10002: linux-2.6-proc-vmcore-needs-not-embedded.patch -Patch10003: linux-2.6-gcc41.patch -Patch10004: linux-2.6-compile-fixes.patch +Patch10000: linux-2.6-compile-fixes.patch # END OF PATCH DEFINITIONS @@ -612,15 +584,18 @@ else # We already have a vanilla dir. cd kernel-%{kversion} - mv linux-%{kversion} deleteme - rm -rf deleteme & + if [ -d linux-%{kversion}.%{_target_cpu} ]; then + mv linux-%{kversion}.%{_target_cpu} deleteme + rm -rf deleteme & + fi fi -cp -rl vanilla linux-%{kversion} -cd linux-%{kversion} +cp -rl vanilla linux-%{kversion}.%{_target_cpu} +cd linux-%{kversion}.%{_target_cpu} # Update to latest upstream. -#%patch1 -p1 -#%patch2 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 -R # # Patches 10 through 100 are meant for core subsystem upgrades @@ -652,62 +627,36 @@ %patch203 -p1 # Suppress APIC errors on UP x86-64. %patch204 -p1 -# Disable guessing of how many hotplug cpus to add. -%patch205 -p1 -# ATI timer quirk. -%patch206 -p1 # Reboot thru bios on HP laptops. -%patch207 -p1 +%patch205 -p1 # # ppc64 # - -%patch300 -p1 -# Don't probe serial ports if they don't exist -%patch302 -p1 -# Updated ppc/ppc64 system call entry/exit path -%patch303 -p1 +# Arnd says don't call cell_spumem_init() till he fixes it. +%patch301 -p1 # Fix the MV643xx Gigabit Ethernet driver -%patch304 -p1 +#%patch304 -p1 # Support the IBM Mambo simulator; core as well as disk and network drivers. %patch305 -p1 # Make HVC console generic; support simulator console device using it. %patch306 -p1 -# Detect Cell platforms appropriately -%patch307 -p1 -# Use PAUSE_ZERO on Cell as appropriate -%patch308 -p1 -# Fix nvram driver to not kmalloc the entire size of a read() call -%patch309 -p1 # Hardcode PIC addresses for Cell spiderpic %patch310 -p1 -# Cell spidernet fixes; mostly to use firmware from devicetree. -%patch311 -p1 -# Cell has no legacy I/O -%patch312 -p1 # RTAS console support %patch313 -p1 # Check properly for successful RTAS instantiation %patch314 -p1 -# Check before using legacy I/O ports which might crash the machine -%patch315 -p1 -# Handle new Cell boards with >512MiB RAM -%patch316 -p1 # No input layer on iseries %patch317 -p1 -# IA64 -# Altix: Fix sn_flush_device_kernel & spinlock initialization -%patch400 -p1 - # # Xen # %if %{includexen} # Base Xen patch from linux-2.6-merge.hg %patch700 -p1 -%patch701 -p1 +#%patch701 -p1 %patch702 -p1 %patch704 -p1 %patch705 -p1 @@ -726,8 +675,6 @@ %patch800 -p1 # Warn if someone tries to build userspace using kernel headers %patch801 -p1 -# reference_discarded additions. -%patch802 -p1 # Exec shield %patch810 -p1 @@ -737,13 +684,13 @@ # Xen exec-shield bits %if %{includexen} -#%patch812 -p1 +%patch812 -p1 %patch813 -p1 -%patch814 -p1 +#%patch815 -p1 %endif -# Write protect rodata -%patch815 -p1 +# Final small execshield fixes. +%patch814 -p1 # # GPG signed kernel modules @@ -768,7 +715,6 @@ %patch1011 -p1 %patch1012 -p1 %patch1013 -p1 -%patch1014 -p1 %patch1015 -p1 %patch1016 -p1 %patch1017 -p1 @@ -777,16 +723,15 @@ %patch1020 -p1 %patch1021 -p1 %patch1022 -p1 -%patch1023 -p1 %patch1024 -p1 %patch1025 -p1 %patch1026 -p1 -%patch1027 -p1 +# Slab leak detector. +#%patch1027 -p1 %patch1028 -p1 #%patch1029 -p1 #%patch1030 -p1 -%patch1031 -p1 -%patch1032 -p1 + # # Make /dev/mem a need-to-know function # @@ -818,15 +763,13 @@ # # Enable Advansys driver %patch1101 -p1 -# Enable both new and old megaraid drivers. -%patch1102 -p1 # Add a pci table to advansys driver. -%patch1103 -p1 +%patch1102 -p1 # # Various upstream NFS/NFSD fixes. # -%patch1200 -p1 +#%patch1200 -p1 # kNFSD: fixed '-p port' arg to rpc.nfsd and enables the defining proto versions and transports %patch1201 -p1 # Fix badness. @@ -858,16 +801,12 @@ %patch1610 -p1 # Add missing MODULE_VERSION tags to some modules. %patch1630 -p1 -# Fix suspend to sbp devices. (166452) -%patch1640 -p1 # The input layer spews crap no-one cares about. %patch1650 -p1 # usb legacy workaround. %patch1660 -p1 # Tickle the NMI whilst doing serial writes. %patch1670 -p1 -# Limit number of serial ports registered. -%patch1671 -p1 # Radeon on thinkpad backlight power-management goodness. %patch1690 -p1 # Fix IDE locking bug. @@ -879,9 +818,9 @@ # Silence noisy CD drive spew %patch1730 -p1 # Reduce stack usage in block layer -%patch1740 -p1 +#%patch1740 -p1 # Enable USB storage,UB & libusual magick. -%patch1750 -p1 +#%patch1750 -p1 # Enable SATA ATAPI by default. %patch1760 -p1 # @@ -894,19 +833,12 @@ %patch1800 -p1 # PNP support for smsc-ircc2 %patch1810 -p1 -# don't mistake security lock as a mouse -%patch1820 -p1 # Silence debug messages in w1 %patch1830 -p1 # Reboot through BIOS on HP laptops. %patch1840 -p1 -# Fix posix-cpu-timers sched_time accumulation -%patch1860 -p1 -# kill blk_attempt_merge -%patch1870 -p1 -# dm: avoid ovvrun while syncing. -%patch1880 -p1 - +# Fix compilation for MV643xx Ethernet +%patch1850 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 %patch1901 -p1 @@ -920,10 +852,8 @@ %patch2000 -p1 # Silence GFP_ATOMIC failures. %patch2001 -p1 -# Try to trace some negative pagecount errors. -%patch2002 -p1 # VM oom killer tweaks. -%patch2003 -p1 +%patch2002 -p1 # ACPI patches. # Blacklist another 'No C2/C3 states' Thinkpad R40e BIOS. @@ -944,8 +874,6 @@ %patch5000 -p1 # Patch Kconfig and Makefiles to merge bcm43xx 'properly' %patch5001 -p1 -# Fix the reassociate on resume code -%patch5002 -p1 # # final stuff @@ -954,10 +882,7 @@ # # misc small stuff to make things compile or otherwise improve performance # -%patch10001 -p1 -%patch10002 -p1 -%patch10003 -p1 -#%patch10004 -p1 +%patch10000 -p1 # END OF PATCH APPLICATIONS @@ -1004,8 +929,8 @@ gpg --homedir . --batch --gen-key %{SOURCE11} gpg --homedir . --export --keyring ./kernel.pub Red > extract.pub -make linux-%{kversion}/scripts/bin2c -linux-%{kversion}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}/crypto/signature/key.h +make linux-%{kversion}.%{_target_cpu}/scripts/bin2c +linux-%{kversion}.%{_target_cpu}/scripts/bin2c ksign_def_public_key __initdata < extract.pub > linux-%{kversion}.%{_target_cpu}/crypto/signature/key.h %if %{buildxen} cd xen @@ -1013,7 +938,9 @@ cd .. %endif -cd linux-%{kversion} +cd linux-%{kversion}.%{_target_cpu} + + BuildKernel() { @@ -1051,7 +978,7 @@ # Start installing the results -%if "%{__debug_package}" == "1" +%if "%{_enable_debug_packages}" == "1" mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/boot %endif mkdir -p $RPM_BUILD_ROOT/%{image_install_path} @@ -1091,6 +1018,7 @@ rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cp arch/%{_arch}/kernel/asm-offsets.s $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/kernel || : cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + cp .kernelrelease $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build if [ -d arch/%{_arch}/scripts ]; then cp -a arch/%{_arch}/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || : @@ -1116,6 +1044,7 @@ ln -sf ../../../include/asm-ppc* asm popd fi + # Make sure the Makefile and version.h have a matching timestamp so that # external modules can be built touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/linux/version.h @@ -1125,7 +1054,7 @@ # # save the vmlinux file for kernel debugging into the kernel-debuginfo rpm # -%if "%{__debug_package}" == "1" +%if "%{_enable_debug_packages}" == "1" mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer cp vmlinux $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer %endif @@ -1213,7 +1142,7 @@ cd .. %endif -cd linux-%{kversion} +cd linux-%{kversion}.%{_target_cpu} %if %{buildxen} mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d @@ -1444,10 +1373,86 @@ %endif %changelog +* Wed Jan 25 2006 Juan Quintela +- merge with rawhide kernel 1.1869. + +* Sun Jan 22 2006 Dave Jones +- Add missing .kernelrelease to kernel-devel (#178491) +- Make serial /dev nodes get created for pci modems again. +- Re-add Intel AGP for 586 kernels. + +* Sat Jan 21 2006 Dave Jones +- 2.6.16-rc1-git4 + +* Fri Jan 20 2006 Dave Jones +- 2.6.16-rc1-git3 + +-* Thu Jan 19 2006 Dave Jones +- 2.6.16-rc1-git2 +- Fix IA64 unresolved symbols. + +* Wed Jan 18 2006 Dave Jones +- 2.6.16-rc1-git1 + +* Tue Jan 17 2006 Dave Jones +- 2.6.16-rc1 +- Revert changes that broke named, ifconfig, radvd etc + +* Mon Jan 16 2006 Dave Jones +- 2.6.15-git12 + +* Sun Jan 15 2006 Dave Jones +- 2.6.15-git11 +- Revert some DRM changes as an experiment. + +* Sat Jan 14 2006 David Woodhouse +- 2.6.15-git10 +- Re-enable Wacom driver on PPC + +* Sat Jan 14 2006 David Woodhouse +- Make CHRP build again + +* Fri Jan 13 2006 David Woodhouse +- Update softmac and add WPA support to bcm43xx driver +- 2.6.15-git9 + +* Fri Jan 13 2006 David Woodhouse +- Add TIF_RESTORE_SIGMASK patches. +- Fix I/O queue stalls + +* Fri Jan 13 2006 Dave Jones +- Disable more cruft from iseries config. + +* Fri Jan 13 2006 David Woodhouse +- Fix oops on Cell Broadband Engine with NUMA enabled. + +* Thu Jan 12 2006 Dave Jones +- 2.6.15-git8 + +* Thu Jan 12 2006 David Woodhouse +- 2.6.15-git7a -- another interim snapshot because stuff we care about + got fixed today +- Fix TCPv6 oops when sending RST or ACK packets + +* Wed Jan 11 2006 Dave Jones +- Make ATI chipset based x86-64 machines boot again. + +* Wed Jan 11 2006 David Woodhouse +- 2.6.15-git7 +- Turn off CONFIG_DEBUG_MUTEXES since it makes the G5 not boot +- Update bcm43xx and softmac + +* Wed Jan 11 2006 David Woodhouse +- 2.6.15-git6a (49cd619c69d643b30a24029e40eb5364c7a26b2e) +- Disable S390 + * Wed Jan 11 2006 - Fix up kevent usage for xen net backend - Fix %post to create mkinitrd for domU +* Tue Jan 10 2006 David Woodhouse +- 2.6.15-git5a (1fd5a46dd6bbca3a1275465120caf4748872c2a7) + * Mon Jan 9 2006 Stephen Tweedie - Rebase xen to hypervisor from 20060106 - Rebase xen kernel code to linux-2.6-merge.hg cset 16985 @@ -1464,11 +1469,29 @@ - Fix some usblp problems, add ieee1284_id to sysfs - update bcm43xx driver to version tested in -HEAD +* Mon Jan 9 2006 Dave Jones +- 2.6.15-git5 + * Sat Jan 7 2006 Dave Jones - Silence some iseries build warnings. +* Sat Jan 7 2006 Dave Jones +- 2.6.15-git3 + +* Fri Jan 6 2006 Dave Jones +- Enable nvram driver for x86-64 +- Fix posix-cpu-timers sched_time accumulation + +* Fri Jan 6 2006 David Woodhouse +- Fix mv643xx_eth and spider_net compilation +- Update Broadcom driver, switch to git tree for softmac +- Fix IA64 build (asm-generic/signal.h needs linux/compiler.h) + * Fri Jan 6 2006 Dave Jones - Branch CVS for test2. + +* Fri Jan 6 2006 Dave Jones +- 2.6.15-git2 - Add timer quirk for ATI chipsets. - Reboot through BIOS on HP laptops. - Additional check in x86 edid parser. linux-2.6-compile-fixes.patch: linux-2.6.15/arch/s390/kernel/setup.c | 2 ++ linux-2.6.15/drivers/net/spider_net.c | 1 + linux-2.6.15/include/asm-generic/signal.h | 1 + linux-2.6/arch/ia64/Kconfig | 3 +++ linux-2.6/drivers/Makefile | 2 +- 5 files changed, 8 insertions(+), 1 deletion(-) Index: linux-2.6-compile-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-compile-fixes.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-compile-fixes.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-compile-fixes.patch 26 Jan 2006 22:14:33 -0000 1.3 @@ -0,0 +1,71 @@ +--- linux-2.6.15/include/asm-generic/signal.h.orig 2006-01-06 16:05:09.000000000 +0000 ++++ linux-2.6.15/include/asm-generic/signal.h 2006-01-06 16:05:19.000000000 +0000 +@@ -9,6 +9,7 @@ + #endif + + #ifndef __ASSEMBLY__ ++#include + typedef void __signalfn_t(int); + typedef __signalfn_t __user *__sighandler_t; + +--- linux-2.6.15/drivers/net/spider_net.c.orig 2006-01-06 16:38:43.000000000 +0000 ++++ linux-2.6.15/drivers/net/spider_net.c 2006-01-06 16:39:10.000000000 +0000 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + #include "spider_net.h" + +--- linux-2.6.15/arch/s390/kernel/setup.c~ 2006-01-10 23:43:32.000000000 +0000 ++++ linux-2.6.15/arch/s390/kernel/setup.c 2006-01-11 00:34:18.000000000 +0000 +@@ -319,6 +319,8 @@ void machine_power_off(void) + _machine_power_off(); + } + ++void (*pm_power_off)(void) = machine_power_off; ++ + static void __init + add_memory_hole(unsigned long start, unsigned long end) + { + + +Include drivers/sn when CONFIG_IA64_SGI_SN2 or CONFIG_IA64_GENERIC +is enabled. + +Signed-off-by: Jes Sorensen +---- + + arch/ia64/Kconfig | 3 +++ + drivers/Makefile | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +Index: linux-2.6/arch/ia64/Kconfig +=================================================================== +--- linux-2.6.orig/arch/ia64/Kconfig ++++ linux-2.6/arch/ia64/Kconfig +@@ -374,6 +374,9 @@ + To use this option, you have to ensure that the "/proc file system + support" (CONFIG_PROC_FS) is enabled, too. + ++config SGI_SN ++ def_bool y if (IA64_SGI_SN2 || IA64_GENERIC) ++ + source "drivers/firmware/Kconfig" + + source "fs/Kconfig.binfmt" +Index: linux-2.6/drivers/Makefile +=================================================================== +--- linux-2.6.orig/drivers/Makefile ++++ linux-2.6/drivers/Makefile +@@ -69,7 +69,7 @@ + obj-$(CONFIG_CPU_FREQ) += cpufreq/ + obj-$(CONFIG_MMC) += mmc/ + obj-$(CONFIG_INFINIBAND) += infiniband/ +-obj-$(CONFIG_SGI_IOC4) += sn/ ++obj-$(CONFIG_SGI_SN) += sn/ + obj-y += firmware/ + obj-$(CONFIG_CRYPTO) += crypto/ + obj-$(CONFIG_SUPERH) += sh/ + linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/i386/mm/pgtable.c | 3 linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 32 files changed, 952 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-crashdump-common.patch 9 Jan 2006 20:42:13 -0000 1.3 +++ linux-2.6-crashdump-common.patch 26 Jan 2006 22:14:33 -0000 1.4 @@ -780,14 +780,14 @@ --- linux-2.6.12/kernel/Makefile.orig 2005-08-18 12:41:10.000000000 -0400 +++ linux-2.6.12/kernel/Makefile 2005-08-18 14:23:59.000000000 -0400 @@ -7,7 +7,7 @@ - sysctl.o capability.o ptrace.o timer.o user.o \ signal.o sys.o kmod.o workqueue.o pid.o \ rcupdate.o intermodule.o extable.o params.o posix-timers.o \ -- kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o -+ kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o dump.o + kthread.o wait.o kfifo.o sys_ni.o posix-cpu-timers.o mutex.o \ +- hrtimer.o ++ hrtimer.o dump.o + obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o obj-$(CONFIG_FUTEX) += futex.o - obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o --- linux-2.6.12/kernel/sched.c.orig 2005-08-18 12:41:14.000000000 -0400 +++ linux-2.6.12/kernel/sched.c 2005-08-18 14:32:27.000000000 -0400 @@ -4177,6 +4177,8 @@ linux-2.6-debug-dual-line-backtrace.patch: traps.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) Index: linux-2.6-debug-dual-line-backtrace.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-dual-line-backtrace.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-dual-line-backtrace.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-debug-dual-line-backtrace.patch 26 Jan 2006 22:14:33 -0000 1.3 @@ -1,29 +1,22 @@ ---- linux-2.6.14/arch/i386/kernel/traps.c~ 2005-12-01 04:25:36.000000000 -0500 -+++ linux-2.6.14/arch/i386/kernel/traps.c 2005-12-01 04:36:19.000000000 -0500 -@@ -116,6 +116,7 @@ static inline unsigned long print_contex - unsigned long *stack, unsigned long ebp) - { - unsigned long addr; -+ char space=0; +--- linux-2.6.15.noarch/arch/i386/kernel/traps.c~ 2006-01-17 01:46:02.000000000 -0500 ++++ linux-2.6.15.noarch/arch/i386/kernel/traps.c 2006-01-17 01:46:50.000000000 -0500 +@@ -114,10 +114,17 @@ static inline int valid_stack_ptr(struct - #ifdef CONFIG_FRAME_POINTER - while (valid_stack_ptr(tinfo, (void *)ebp)) { -@@ -131,9 +132,17 @@ static inline unsigned long print_contex - if (__kernel_text_address(addr)) { - printk(" [<%08lx>]", addr); - print_symbol(" %s", addr); -- printk("\n"); -+ if (space == 0) { -+ printk(" "); -+ space = 1; -+ } else { -+ printk("\n"); -+ space = 0; -+ } - } - } -+ if (space==1) + static void print_addr_and_symbol(unsigned long addr, char *log_lvl) + { +- printk(log_lvl); ++ static char space=0; ++ ++ if (space == 0) ++ printk(log_lvl); + printk(" [<%08lx>] ", addr); + print_symbol("%s", addr); +- printk("\n"); ++ if (space == 0) ++ printk(" "); ++ else + printk("\n"); - #endif - return ebp; ++ space = !space; } + + static inline unsigned long print_context_stack(struct thread_info *tinfo, linux-2.6-debug-oops-pause.patch: traps.c | 10 ++++++++++ 1 files changed, 10 insertions(+) Index: linux-2.6-debug-oops-pause.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-oops-pause.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-debug-oops-pause.patch 9 Jan 2006 20:42:13 -0000 1.3 +++ linux-2.6-debug-oops-pause.patch 26 Jan 2006 22:14:33 -0000 1.4 @@ -8,6 +8,14 @@ --- vanilla/arch/i386/kernel/traps.c 2006-01-02 22:21:10.000000000 -0500 +++ linux-2.6.15/arch/i386/kernel/traps.c 2006-01-04 23:42:46.000000000 -0500 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #ifdef CONFIG_EISA + #include @@ -256,6 +271,15 @@ void show_registers(struct pt_regs *regs } } linux-2.6-debug-singlebiterror.patch: slab.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+) Index: linux-2.6-debug-singlebiterror.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-singlebiterror.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-singlebiterror.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-debug-singlebiterror.patch 26 Jan 2006 22:14:33 -0000 1.3 @@ -1,18 +1,17 @@ ---- linux-2.6.11/mm/slab.c~ 2005-05-01 00:51:59.000000000 -0400 -+++ linux-2.6.11/mm/slab.c 2005-05-01 01:19:38.000000000 -0400 -@@ -1004,8 +1004,12 @@ static void poison_obj(kmem_cache_t *cac +--- linux-2.6.15/mm/slab.c~ 2006-01-09 13:25:17.000000000 -0500 ++++ linux-2.6.15/mm/slab.c 2006-01-09 13:26:01.000000000 -0500 +@@ -1313,8 +1313,11 @@ static void poison_obj(kmem_cache_t *cac static void dump_line(char *data, int offset, int limit) { int i; + unsigned char total=0; -+ printk(KERN_ERR "%03x:", offset); - for (i=0;iowner && lock->owner != SPINLOCK_OWNER_INIT) owner = lock->owner; -- printk("BUG: spinlock %s on CPU#%d, %s/%d\n", -+ printk("BUG: spinlock %s on CPU#%d, %s/%d (%s)\n", +- printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d\n", ++ printk(KERN_EMERG "BUG: spinlock %s on CPU#%d, %s/%d (%s)\n", msg, raw_smp_processor_id(), - current->comm, current->pid); -+ current->comm, current->pid, print_tainted()); - printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n", ++ current->comm, current->pid, print_tainted()); + printk(KERN_EMERG " lock: %p, .magic: %08x, .owner: %s/%d, " + ".owner_cpu: %d\n", lock, lock->magic, - owner ? owner->comm : "", -@@ -78,9 +78,9 @@ static void __spin_lock_debug(spinlock_t - /* lockup suspected: */ +@@ -80,9 +80,9 @@ static void __spin_lock_debug(spinlock_t if (print_once) { print_once = 0; -- printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n", -+ printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p (%s)\n", + printk(KERN_EMERG "BUG: spinlock lockup on CPU#%d, " +- "%s/%d, %p\n", ++ "%s/%d, %p (%s)\n", raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); dump_stack(); } } -@@ -120,9 +120,9 @@ static void rwlock_bug(rwlock_t *lock, c +@@ -122,9 +122,9 @@ static void rwlock_bug(rwlock_t *lock, c static long print_once = 1; if (xchg(&print_once, 0)) { -- printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg, -+ printk("BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n", msg, - raw_smp_processor_id(), current->comm, +- printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p\n", ++ printk(KERN_EMERG "BUG: rwlock %s on CPU#%d, %s/%d, %p (%s)\n", + msg, raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); dump_stack(); #ifdef CONFIG_SMP /* -@@ -149,9 +149,9 @@ static void __read_lock_debug(rwlock_t * - /* lockup suspected: */ +@@ -152,9 +152,9 @@ static void __read_lock_debug(rwlock_t * if (print_once) { print_once = 0; -- printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n", -+ printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p (%s)\n", + printk(KERN_EMERG "BUG: read-lock lockup on CPU#%d, " +- "%s/%d, %p\n", ++ "%s/%d, %p (%s)\n", raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); dump_stack(); } } -@@ -221,9 +221,9 @@ static void __write_lock_debug(rwlock_t - /* lockup suspected: */ +@@ -225,9 +225,9 @@ static void __write_lock_debug(rwlock_t if (print_once) { print_once = 0; -- printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n", -+ printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p (%s)\n", + printk(KERN_EMERG "BUG: write-lock lockup on CPU#%d, " +- "%s/%d, %p\n", ++ "%s/%d, %p (%s)\n", raw_smp_processor_id(), current->comm, - current->pid, lock); + current->pid, lock, print_tainted()); linux-2.6-debug-sysfs-crash-debugging.patch: devel-akpm/arch/i386/kernel/traps.c | 5 +++++ devel-akpm/fs/sysfs/file.c | 8 ++++++++ linux-2.6.14/arch/x86_64/kernel/traps.c | 5 +++++ 3 files changed, 18 insertions(+) Index: linux-2.6-debug-sysfs-crash-debugging.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-sysfs-crash-debugging.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-sysfs-crash-debugging.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-debug-sysfs-crash-debugging.patch 26 Jan 2006 22:14:33 -0000 1.3 @@ -75,13 +75,13 @@ int register_die_notifier(struct notifier_block *nb) { int err = 0; -@@ -385,6 +387,9 @@ void __die(const char * str, struct pt_r +@@ -416,6 +416,9 @@ void __die(const char * str, struct pt_r printk("DEBUG_PAGEALLOC"); #endif printk("\n"); +#ifdef CONFIG_SYSFS + printk(KERN_ALERT "last sysfs file: %s\n", last_sysfs_file); +#endif - notify_die(DIE_OOPS, (char *)str, regs, err, 255, SIGSEGV); + notify_die(DIE_OOPS, str, regs, err, current->thread.trap_no, SIGSEGV); show_registers(regs); /* Executive summary in case the oops scrolled away */ linux-2.6-debug-taint-vm.patch: linux-2.6.11/include/asm-generic/bug.h | 8 ++++++-- linux-2.6.15/mm/page_alloc.c | 4 ++-- linux-2.6.15/mm/slab.c | 4 ++-- linux-2000/kernel/panic.c | 1 + 4 files changed, 11 insertions(+), 6 deletions(-) Index: linux-2.6-debug-taint-vm.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-debug-taint-vm.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-debug-taint-vm.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-debug-taint-vm.patch 26 Jan 2006 22:14:33 -0000 1.3 @@ -36,31 +36,33 @@ void add_taint(unsigned flag) { ---- linux-2.6.14/mm/page_alloc.c~ 2005-11-15 12:09:41.000000000 -0500 -+++ linux-2.6.14/mm/page_alloc.c 2005-11-15 12:10:01.000000000 -0500 -@@ -126,9 +126,9 @@ static void bad_page(const char *functio +--- linux-2.6.15/mm/page_alloc.c~ 2006-01-07 20:48:33.000000000 -0500 ++++ linux-2.6.15/mm/page_alloc.c 2006-01-07 20:49:24.000000000 -0500 +@@ -137,12 +137,12 @@ static inline int bad_range(struct zone + static void bad_page(struct page *page) { - printk(KERN_EMERG "Bad page state at %s (in process '%s', page %p)\n", - function, current->comm, page); -- printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d\n", -+ printk(KERN_EMERG "flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n", - (int)(2*sizeof(unsigned long)), (unsigned long)page->flags, -- page->mapping, page_mapcount(page), page_count(page)); -+ page->mapping, page_mapcount(page), page_count(page), print_tainted()); - printk(KERN_EMERG "Backtrace:\n"); + printk(KERN_EMERG "Bad page state in process '%s'\n" +- KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d\n" ++ KERN_EMERG "page:%p flags:0x%0*lx mapping:%p mapcount:%d count:%d (%s)\n" + KERN_EMERG "Trying to fix it up, but a reboot is needed\n" + KERN_EMERG "Backtrace:\n", + current->comm, page, (int)(2*sizeof(unsigned long)), + (unsigned long)page->flags, page->mapping, +- page_mapcount(page), page_count(page)); ++ page_mapcount(page), page_count(page), print_tainted()); dump_stack(); - printk(KERN_EMERG "Trying to fix it up, but a reboot is needed\n"); -diff -urNp --exclude-from=/home/davej/.exclude linux-1740/mm/slab.c linux-2000/mm/slab.c ---- linux-1740/mm/slab.c -+++ linux-2000/mm/slab.c -@@ -1053,8 +1053,8 @@ static void check_poison_obj(kmem_cache_ - /* Mismatch ! */ + page->flags &= ~(1 << PG_lru | + 1 << PG_private | +--- linux-2.6.15/mm/slab.c~ 2006-01-09 13:19:33.000000000 -0500 ++++ linux-2.6.15/mm/slab.c 2006-01-09 13:19:55.000000000 -0500 +@@ -1371,8 +1371,8 @@ static void check_poison_obj(kmem_cache_ /* Print header */ if (lines == 0) { -- printk(KERN_ERR "Slab corruption: start=%p, len=%d\n", -- realobj, size); -+ printk(KERN_ERR "Slab corruption: (%s) start=%p, len=%d\n", -+ print_tainted(), realobj, size); + printk(KERN_ERR +- "Slab corruption: start=%p, len=%d\n", +- realobj, size); ++ "Slab corruption: (%s) start=%p, len=%d\n", ++ print_tainted(), realobj, size); print_objinfo(cachep, objp, 0); + dump_stack(); } - /* Hexdump the affected line */ linux-2.6-devmem.patch: arch/powerpc/mm/mem.c | 14 +++ linux-1050/arch/i386/mm/init.c | 19 ++++ linux-1050/arch/ia64/mm/init.c | 7 + linux-1050/arch/s390/mm/init.c | 5 + linux-1050/arch/x86_64/mm/init.c | 20 ++++ linux-1050/drivers/char/mem.c | 146 ++++---------------------------- linux-1050/fs/proc/kcore.c | 2 linux-1050/include/asm-alpha/page.h | 1 linux-1050/include/asm-arm/page.h | 2 linux-1050/include/asm-arm26/page.h | 2 linux-1050/include/asm-cris/page.h | 2 linux-1050/include/asm-h8300/page.h | 2 linux-1050/include/asm-i386/page.h | 4 linux-1050/include/asm-ia64/page.h | 2 linux-1050/include/asm-m68k/page.h | 2 linux-1050/include/asm-m68knommu/page.h | 2 linux-1050/include/asm-mips/page.h | 2 linux-1050/include/asm-parisc/page.h | 2 linux-1050/include/asm-ppc/page.h | 2 linux-1050/include/asm-s390/page.h | 2 linux-1050/include/asm-sh/page.h | 2 linux-1050/include/asm-sh64/page.h | 2 linux-1050/include/asm-sparc/page.h | 2 linux-1050/include/asm-sparc64/page.h | 2 linux-1050/include/asm-um/page.h | 1 linux-1050/include/asm-v850/page.h | 2 linux-1050/include/asm-x86_64/page.h | 4 linux-2.6.13/arch/x86_64/mm/init.c | 22 ++++ linux-2.6.14/include/asm-powerpc/page.h | 2 29 files changed, 154 insertions(+), 125 deletions(-) Index: linux-2.6-devmem.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-devmem.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-devmem.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-devmem.patch 26 Jan 2006 22:14:33 -0000 1.3 @@ -299,7 +299,7 @@ - return virtr + wrote; -} - - #if (defined(CONFIG_ISA) || !defined(__mc68000__)) && (!defined(CONFIG_PPC_ISERIES) || defined(CONFIG_PCI)) + #if defined(CONFIG_ISA) || !defined(__mc68000__) static ssize_t read_port(struct file * file, char __user * buf, size_t count, loff_t *ppos) @@ -717,7 +617,6 @@ static struct file_operations mem_fops = linux-2.6-diskdump.patch: drivers/block/Kconfig | 5 drivers/block/Makefile | 1 drivers/block/diskdump.c | 1121 +++++++++++++++++++++++++++++++++++++++++ include/asm-generic/diskdump.h | 13 include/asm-i386/diskdump.h | 55 ++ include/asm-ia64/diskdump.h | 63 ++ include/asm-powerpc/diskdump.h | 55 ++ include/asm-ppc/diskdump.h | 6 include/asm-s390/diskdump.h | 6 include/asm-x86_64/diskdump.h | 44 + include/linux/diskdump.h | 186 ++++++ include/linux/interrupt.h | 4 include/linux/timer.h | 3 include/linux/workqueue.h | 3 kernel/softirq.c | 32 + kernel/timer.c | 43 + kernel/workqueue.c | 34 + 17 files changed, 1670 insertions(+), 4 deletions(-) Index: linux-2.6-diskdump.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-diskdump.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-diskdump.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-diskdump.patch 26 Jan 2006 22:14:33 -0000 1.3 @@ -1233,11 +1233,10 @@ open_softirq(TASKLET_SOFTIRQ, tasklet_action, NULL); --- linux-2.6.12/kernel/timer.c.diskdump.orig 2005-08-19 16:44:27.502410144 -0400 +++ linux-2.6.12/kernel/timer.c 2005-08-19 16:49:13.988620772 -0400 -@@ -33,6 +33,8 @@ - #include +@@ -34,6 +34,7 @@ #include #include -+#include + #include +#include #include linux-2.6-execshield-vdso.patch: arch/i386/kernel/sysenter.c | 69 ++++++++++++++++++++++---------------- fs/binfmt_elf.c | 15 ++------ fs/proc/task_mmu.c | 9 +++-- include/asm-i386/elf.h | 7 +++ include/asm-i386/page.h | 5 ++ include/linux/mm.h | 5 ++ kernel/sysctl.c | 10 +++++ mm/mmap.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 155 insertions(+), 43 deletions(-) Index: linux-2.6-execshield-vdso.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-execshield-vdso.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-execshield-vdso.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-execshield-vdso.patch 26 Jan 2006 22:14:33 -0000 1.3 @@ -1,57 +1,125 @@ ---- linux-2.6.13/include/asm-i386/page.h.vdso -+++ linux-2.6.13/include/asm-i386/page.h -@@ -120,6 +120,11 @@ extern int devmem_is_allowed(unsigned lo - #endif - #define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START) + arch/i386/kernel/sysenter.c | 69 ++++++++++++++++++++++---------------- + fs/binfmt_elf.c | 15 ++------ + fs/proc/task_mmu.c | 9 +++-- + include/asm-i386/elf.h | 7 +++ + include/asm-i386/page.h | 5 ++ + include/linux/mm.h | 5 ++ + kernel/sysctl.c | 10 +++++ + mm/mmap.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 155 insertions(+), 43 deletions(-) + +Index: linux/arch/i386/kernel/sysenter.c +=================================================================== +--- linux.orig/arch/i386/kernel/sysenter.c ++++ linux/arch/i386/kernel/sysenter.c +@@ -47,20 +47,13 @@ void enable_sep_cpu(void) + extern const char vsyscall_int80_start, vsyscall_int80_end; + extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; + +-struct page *sysenter_page; ++static struct page *sysenter_pages[2]; + + int __init sysenter_setup(void) + { + void *page = (void *)get_zeroed_page(GFP_ATOMIC); +- /* +- * We keep this page mapped readonly, even though the executable +- * portion is randomized into a userspace vma - so that we dont +- * have to fix up the data within the VDSO page every time we +- * exec(). +- */ +- __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_KERNEL_RO); +- sysenter_page = virt_to_page(page); ++ sysenter_pages[0] = virt_to_page(page); + + if (!boot_cpu_has(X86_FEATURE_SEP)) { + memcpy(page, +@@ -78,42 +71,58 @@ int __init sysenter_setup(void) + + extern void SYSENTER_RETURN_OFFSET; + +-unsigned int vdso_enabled = 0; ++unsigned int vdso_enabled = 1; + +-void map_vsyscall(void) +/* -+ * Under exec-shield we don't use the generic fixmap gate area. -+ * The vDSO ("gate area") has a normal vma found the normal ways. ++ * This is called from binfmt_elf, we create the special vma for the ++ * vDSO and insert it into the mm struct tree. + */ -+#define __HAVE_ARCH_GATE_AREA 1 - - #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) - #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) ---- linux-2.6.13/include/asm-i386/elf.h.vdso -+++ linux-2.6.13/include/asm-i386/elf.h -@@ -146,6 +146,12 @@ do { \ - } \ - } while (0) ++int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack) + { + struct thread_info *ti = current_thread_info(); +- struct vm_area_struct *vma; +- unsigned long addr; ++ unsigned long addr, len; ++ int err; -+#define ARCH_HAS_SETUP_ADDITIONAL_PAGES -+struct linux_binprm; -+extern int arch_setup_additional_pages(struct linux_binprm *bprm, -+ int executable_stack); -+ -+#if 0 /* Disabled for exec-shield, where a normal vma holds the vDSO. */ - /* - * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out - * extra segments containing the vsyscall DSO contents. Dumping its -@@ -189,6 +195,7 @@ do { \ - PAGE_ALIGN(vsyscall_phdrs[i].p_memsz)); \ - } \ - } while (0) -+#endif +- if (unlikely(!vdso_enabled)) { + current->mm->context.vdso = NULL; +- return; +- } ++ if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0])) ++ return 0; - #endif + /* + * Map the vDSO (it will be randomized): + */ + down_write(¤t->mm->mmap_sem); +- addr = do_mmap(NULL, 0, 4096, PROT_READ | PROT_EXEC, MAP_PRIVATE, 0); +- current->mm->context.vdso = (void *)addr; +- ti->sysenter_return = (void *)addr + (long)&SYSENTER_RETURN_OFFSET; +- if (addr != -1) { +- vma = find_vma(current->mm, addr); +- if (vma) { +- pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; +- get_page(sysenter_page); +- install_page(current->mm, vma, addr, +- sysenter_page, vma->vm_page_prot); ++ len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE; ++ addr = get_unmapped_area_prot(NULL, 0, len, 0, ++ MAP_PRIVATE, PROT_READ | PROT_EXEC); ++ if (unlikely(addr & ~PAGE_MASK)) { ++ up_write(¤t->mm->mmap_sem); ++ return addr; + } ++ err = install_special_mapping(current->mm, addr, len, ++ VM_DONTEXPAND | VM_READ | VM_EXEC | ++ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC, ++ PAGE_READONLY_EXEC, ++ sysenter_pages); ++ if (likely(err == 0)) { ++ current->mm->context.vdso = (void *)addr; ++ ti->sysenter_return = &SYSENTER_RETURN_OFFSET + addr; + } + up_write(¤t->mm->mmap_sem); ++ return err; + } ---- linux-2.6.13/include/linux/mm.h.vdso -+++ linux-2.6.13/include/linux/mm.h -@@ -848,6 +848,11 @@ static inline unsigned long get_unmapped - return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); +-static int __init vdso_setup(char *str) ++int in_gate_area_no_task(unsigned long addr) + { +- vdso_enabled = simple_strtoul(str, NULL, 0); +- return 1; ++ return 0; } +-__setup("vdso=", vdso_setup); -+extern int install_special_mapping(struct mm_struct *mm, -+ unsigned long addr, unsigned long len, -+ unsigned long vm_flags, pgprot_t pgprot, -+ struct page **pages); ++int in_gate_area(struct task_struct *task, unsigned long addr) ++{ ++ return 0; ++} + - extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, - unsigned long len, unsigned long prot, - unsigned long flag, unsigned long pgoff); ---- linux-2.6.13/fs/binfmt_elf.c.vdso -+++ linux-2.6.13/fs/binfmt_elf.c -@@ -1001,8 +1001,6 @@ static int load_elf_binary(struct linux_ ++struct vm_area_struct *get_gate_vma(struct task_struct *tsk) ++{ ++ return NULL; ++} +Index: linux/fs/binfmt_elf.c +=================================================================== +--- linux.orig/fs/binfmt_elf.c ++++ linux/fs/binfmt_elf.c +@@ -1006,8 +1006,6 @@ static int load_elf_binary(struct linux_ elf_entry = loc->elf_ex.e_entry; } @@ -60,7 +128,7 @@ if (interpreter_type != INTERPRETER_AOUT) sys_close(elf_exec_fileno); -@@ -1012,17 +1010,11 @@ static int load_elf_binary(struct linux_ +@@ -1017,17 +1015,11 @@ static int load_elf_binary(struct linux_ retval = arch_setup_additional_pages(bprm, executable_stack); if (retval < 0) { send_sig(SIGKILL, current, 0); @@ -80,7 +148,7 @@ compute_creds(bprm); current->flags &= ~PF_FORKNOEXEC; -@@ -1227,6 +1219,9 @@ static int maydump(struct vm_area_struct +@@ -1231,6 +1223,9 @@ static int maydump(struct vm_area_struct if (vma->vm_flags & (VM_IO | VM_RESERVED)) return 0; @@ -90,9 +158,11 @@ /* Dump shared memory only if mapped from an anonymous file. */ if (vma->vm_flags & VM_SHARED) return vma->vm_file->f_dentry->d_inode->i_nlink == 0; ---- linux-2.6.13/fs/proc/task_mmu.c.vdso -+++ linux-2.6.13/fs/proc/task_mmu.c -@@ -156,14 +156,19 @@ static int show_map_internal(struct seq_ +Index: linux/fs/proc/task_mmu.c +=================================================================== +--- linux.orig/fs/proc/task_mmu.c ++++ linux/fs/proc/task_mmu.c +@@ -173,14 +173,19 @@ static int show_map_internal(struct seq_ if (vma->vm_end == mm->brk) { pad_len_spaces(m, len); seq_puts(m, "[heap]"); @@ -114,9 +184,96 @@ } else { pad_len_spaces(m, len); seq_puts(m, "[vdso]"); ---- linux-2.6.13/mm/mmap.c.vdso -+++ linux-2.6.13/mm/mmap.c -@@ -2155,3 +2155,81 @@ int may_expand_vm(struct mm_struct *mm, +Index: linux/include/asm-i386/elf.h +=================================================================== +--- linux.orig/include/asm-i386/elf.h ++++ linux/include/asm-i386/elf.h +@@ -148,6 +148,12 @@ do { \ + } \ + } while (0) + ++#define ARCH_HAS_SETUP_ADDITIONAL_PAGES ++struct linux_binprm; ++extern int arch_setup_additional_pages(struct linux_binprm *bprm, ++ int executable_stack); ++ ++#if 0 /* Disabled for exec-shield, where a normal vma holds the vDSO. */ + /* + * These macros parameterize elf_core_dump in fs/binfmt_elf.c to write out + * extra segments containing the vsyscall DSO contents. Dumping its +@@ -191,6 +197,7 @@ do { \ + PAGE_ALIGN(vsyscall_phdrs[i].p_memsz)); \ + } \ + } while (0) ++#endif + + #endif + +Index: linux/include/asm-i386/page.h +=================================================================== +--- linux.orig/include/asm-i386/page.h ++++ linux/include/asm-i386/page.h +@@ -118,6 +118,11 @@ extern int page_is_ram(unsigned long pag + #endif + #define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START) + ++/* ++ * Under exec-shield we don't use the generic fixmap gate area. ++ * The vDSO ("gate area") has a normal vma found the normal ways. ++ */ ++#define __HAVE_ARCH_GATE_AREA 1 + + #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) + #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) +Index: linux/include/linux/mm.h +=================================================================== +--- linux.orig/include/linux/mm.h ++++ linux/include/linux/mm.h +@@ -923,6 +923,11 @@ static inline unsigned long get_unmapped + return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); + } + ++extern int install_special_mapping(struct mm_struct *mm, ++ unsigned long addr, unsigned long len, ++ unsigned long vm_flags, pgprot_t pgprot, ++ struct page **pages); ++ + extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, + unsigned long len, unsigned long prot, + unsigned long flag, unsigned long pgoff); +Index: linux/kernel/sysctl.c +=================================================================== +--- linux.orig/kernel/sysctl.c ++++ linux/kernel/sysctl.c +@@ -77,7 +77,7 @@ extern int proc_unknown_nmi_panic(ctl_ta + void __user *, size_t *, loff_t *); + #endif + +-extern unsigned int vdso_enabled; ++extern unsigned int vdso_enabled, vdso_populate; + + int exec_shield = 1; + +@@ -317,6 +317,14 @@ static ctl_table kern_table[] = { + .mode = 0644, + .proc_handler = &proc_dointvec, + }, ++ { ++ .ctl_name = KERN_VDSO, ++ .procname = "vdso_populate", ++ .data = &vdso_populate, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = &proc_dointvec, ++ }, + #endif + { + .ctl_name = KERN_CORE_USES_PID, +Index: linux/mm/mmap.c +=================================================================== +--- linux.orig/mm/mmap.c ++++ linux/mm/mmap.c +@@ -2149,3 +2149,81 @@ int may_expand_vm(struct mm_struct *mm, return 0; return 1; } @@ -198,134 +355,3 @@ + + return err; +} ---- linux-2.6.13/arch/i386/kernel/sysenter.c.vdso -+++ linux-2.6.13/arch/i386/kernel/sysenter.c -@@ -47,20 +47,13 @@ void enable_sep_cpu(void) - extern const char vsyscall_int80_start, vsyscall_int80_end; - extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; - --struct page *sysenter_page; -+static struct page *sysenter_pages[2]; - - int __init sysenter_setup(void) - { - void *page = (void *)get_zeroed_page(GFP_ATOMIC); - -- /* -- * We keep this page mapped readonly, even though the executable -- * portion is randomized into a userspace vma - so that we dont -- * have to fix up the data within the VDSO page every time we -- * exec(). -- */ -- __set_fixmap(FIX_VSYSCALL, __pa(page), PAGE_KERNEL_RO); -- sysenter_page = virt_to_page(page); -+ sysenter_pages[0] = virt_to_page(page); - - if (!boot_cpu_has(X86_FEATURE_SEP)) { - memcpy(page, -@@ -78,37 +71,60 @@ int __init sysenter_setup(void) - - extern void SYSENTER_RETURN_OFFSET; - --unsigned int vdso_enabled = 0; -+unsigned int vdso_enabled = 1; - --void map_vsyscall(void) -+/* -+ * This is called from binfmt_elf, we create the special vma for the -+ * vDSO and insert it into the mm struct tree. -+ */ -+int arch_setup_additional_pages(struct linux_binprm *bprm, -+ int executable_stack) - { - struct thread_info *ti = current_thread_info(); -- struct vm_area_struct *vma; -- unsigned long addr; -+ unsigned long addr, len; -+ int err; - -- if (unlikely(!vdso_enabled)) { - current->mm->context.vdso = NULL; -- return; -- } -+ if (unlikely(!vdso_enabled) || unlikely(!sysenter_pages[0])) -+ return 0; - - /* - * Map the vDSO (it will be randomized): - */ - down_write(¤t->mm->mmap_sem); -- addr = do_mmap(NULL, 0, 4096, PROT_READ | PROT_EXEC, MAP_PRIVATE, 0); -- current->mm->context.vdso = (void *)addr; -- ti->sysenter_return = (void *)addr + (long)&SYSENTER_RETURN_OFFSET; -- if (addr != -1) { -- vma = find_vma(current->mm, addr); -- if (vma) { -- pgprot_val(vma->vm_page_prot) &= ~_PAGE_RW; -- get_page(sysenter_page); -- install_page(current->mm, vma, addr, -- sysenter_page, vma->vm_page_prot); -- -+ len = PAGE_SIZE > ELF_EXEC_PAGESIZE ? PAGE_SIZE : ELF_EXEC_PAGESIZE; -+ addr = get_unmapped_area_prot(NULL, 0, len, 0, -+ MAP_PRIVATE, PROT_READ | PROT_EXEC); -+ if (unlikely(addr & ~PAGE_MASK)) { -+ up_write(¤t->mm->mmap_sem); -+ return addr; - } -+ err = install_special_mapping(current->mm, addr, len, -+ VM_DONTEXPAND | VM_READ | VM_EXEC | -+ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC, -+ PAGE_READONLY_EXEC, -+ sysenter_pages); -+ if (likely(err == 0)) { -+ current->mm->context.vdso = (void *)addr; -+ ti->sysenter_return = &SYSENTER_RETURN_OFFSET + addr; - } - up_write(¤t->mm->mmap_sem); -+ return err; -+} -+ -+int in_gate_area_no_task(unsigned long addr) -+{ -+ return 0; -+} -+ -+int in_gate_area(struct task_struct *task, unsigned long addr) -+{ -+ return 0; -+} -+ -+struct vm_area_struct *get_gate_vma(struct task_struct *tsk) -+{ -+ return NULL; - } - - static int __init vdso_setup(char *str) ---- linux-2.6.13/kernel/sysctl.c -+++ linux-2.6.13/kernel/sysctl.c -@@ -74,7 +74,7 @@ extern int proc_unknown_nmi_panic(ctl_ta - void __user *, size_t *, loff_t *); - #endif - --extern unsigned int vdso_enabled; -+extern unsigned int vdso_enabled, vdso_populate; - - int exec_shield = 1; - -@@ -316,6 +316,14 @@ static ctl_table kern_table[] = { - .mode = 0644, - .proc_handler = &proc_dointvec, - }, -+ { -+ .ctl_name = KERN_VDSO, -+ .procname = "vdso_populate", -+ .data = &vdso_populate, -+ .maxlen = sizeof(int), -+ .mode = 0644, -+ .proc_handler = &proc_dointvec, -+ }, - #endif - { - .ctl_name = KERN_CORE_USES_PID, - linux-2.6-execshield.patch: arch/i386/kernel/asm-offsets.c | 1 arch/i386/kernel/cpu/common.c | 7 + arch/i386/kernel/entry.S | 8 +- arch/i386/kernel/process.c | 59 +++++++++++++++ arch/i386/kernel/signal.c | 4 - arch/i386/kernel/smp.c | 3 arch/i386/kernel/sysenter.c | 56 ++++++++++++++- arch/i386/kernel/traps.c | 93 ++++++++++++++++++++++++- arch/i386/kernel/vsyscall-sysenter.S | 6 - arch/i386/kernel/vsyscall.lds.S | 4 - arch/i386/mm/init.c | 6 + arch/i386/mm/mmap.c | 6 + arch/ia64/ia32/binfmt_elf32.c | 2 arch/x86_64/ia32/ia32_binfmt.c | 4 - arch/x86_64/kernel/process.c | 6 - arch/x86_64/kernel/setup64.c | 23 ------ arch/x86_64/mm/fault.c | 2 drivers/char/random.c | 7 + fs/binfmt_elf.c | 130 ++++++++++++++++++++++++++++------- fs/proc/array.c | 8 +- fs/proc/base.c | 4 - fs/proc/task_mmu.c | 25 +++++- include/asm-i386/desc.h | 14 +++ include/asm-i386/elf.h | 42 +++++++---- include/asm-i386/mmu.h | 6 + include/asm-i386/pgalloc.h | 1 include/asm-i386/processor.h | 7 + include/asm-i386/thread_info.h | 1 include/asm-ia64/pgalloc.h | 4 + include/asm-powerpc/pgalloc.h | 5 + include/asm-ppc/pgalloc.h | 5 + include/asm-s390/pgalloc.h | 4 + include/asm-sparc/pgalloc.h | 4 + include/asm-sparc64/pgalloc.h | 4 + include/asm-x86_64/pgalloc.h | 7 + include/asm-x86_64/pgtable.h | 2 include/asm-x86_64/processor.h | 2 include/linux/mm.h | 11 ++ include/linux/resource.h | 5 + include/linux/sched.h | 9 ++ include/linux/sysctl.h | 3 kernel/signal.c | 38 ++++++++++ kernel/sysctl.c | 39 ++++++++++ mm/fremap.c | 16 ++-- mm/mmap.c | 105 ++++++++++++++++++++++++++-- mm/mprotect.c | 5 + mm/mremap.c | 4 - 47 files changed, 684 insertions(+), 123 deletions(-) Index: linux-2.6-execshield.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-execshield.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-execshield.patch 9 Jan 2006 20:42:13 -0000 1.3 +++ linux-2.6-execshield.patch 26 Jan 2006 22:14:33 -0000 1.4 @@ -1,6 +1,58 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/asm-offsets.c linux-810/arch/i386/kernel/asm-offsets.c ---- linux-804/arch/i386/kernel/asm-offsets.c -+++ linux-810/arch/i386/kernel/asm-offsets.c + arch/i386/kernel/asm-offsets.c | 1 + arch/i386/kernel/cpu/common.c | 7 + + arch/i386/kernel/entry.S | 8 +- + arch/i386/kernel/process.c | 59 +++++++++++++++ + arch/i386/kernel/signal.c | 4 - + arch/i386/kernel/smp.c | 3 + arch/i386/kernel/sysenter.c | 56 ++++++++++++++- + arch/i386/kernel/traps.c | 93 ++++++++++++++++++++++++- + arch/i386/kernel/vsyscall-sysenter.S | 6 - + arch/i386/kernel/vsyscall.lds.S | 4 - + arch/i386/mm/init.c | 6 + + arch/i386/mm/mmap.c | 6 + + arch/ia64/ia32/binfmt_elf32.c | 2 + arch/x86_64/ia32/ia32_binfmt.c | 4 - + arch/x86_64/kernel/process.c | 6 - + arch/x86_64/kernel/setup64.c | 23 ------ + arch/x86_64/mm/Makefile | 2 + arch/x86_64/mm/fault.c | 2 + arch/x86_64/mm/mmap.c | 95 +++++++++++++++++++++++++ + drivers/char/random.c | 7 + + fs/binfmt_elf.c | 130 ++++++++++++++++++++++++++++------- + fs/proc/array.c | 8 +- + fs/proc/base.c | 4 - + fs/proc/task_mmu.c | 25 +++++- + include/asm-i386/desc.h | 14 +++ + include/asm-i386/elf.h | 42 +++++++---- + include/asm-i386/mmu.h | 6 + + include/asm-i386/pgalloc.h | 1 + include/asm-i386/processor.h | 8 +- + include/asm-i386/thread_info.h | 1 + include/asm-ia64/pgalloc.h | 4 + + include/asm-powerpc/pgalloc.h | 5 + + include/asm-ppc/pgalloc.h | 5 + + include/asm-s390/pgalloc.h | 4 + + include/asm-sparc/pgalloc.h | 4 + + include/asm-sparc64/pgalloc.h | 4 + + include/asm-x86_64/pgalloc.h | 7 + + include/asm-x86_64/pgtable.h | 2 + include/asm-x86_64/processor.h | 5 + + include/linux/mm.h | 11 ++ + include/linux/resource.h | 5 + + include/linux/sched.h | 9 ++ + include/linux/sysctl.h | 3 + kernel/signal.c | 38 ++++++++++ + kernel/sysctl.c | 39 ++++++++++ + mm/fremap.c | 16 ++-- + mm/mmap.c | 105 ++++++++++++++++++++++++++-- + mm/mprotect.c | 5 + + mm/mremap.c | 4 - + 49 files changed, 784 insertions(+), 124 deletions(-) + +Index: linux/arch/i386/kernel/asm-offsets.c +=================================================================== +--- linux.orig/arch/i386/kernel/asm-offsets.c ++++ linux/arch/i386/kernel/asm-offsets.c @@ -53,6 +53,7 @@ void foo(void) OFFSET(TI_preempt_count, thread_info, preempt_count); OFFSET(TI_addr_limit, thread_info, addr_limit); @@ -9,9 +61,28 @@ BLANK(); OFFSET(EXEC_DOMAIN_handler, exec_domain, handler); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/entry.S linux-810/arch/i386/kernel/entry.S ---- linux-804/arch/i386/kernel/entry.S -+++ linux-810/arch/i386/kernel/entry.S +Index: linux/arch/i386/kernel/cpu/common.c +=================================================================== +--- linux.orig/arch/i386/kernel/cpu/common.c ++++ linux/arch/i386/kernel/cpu/common.c +@@ -392,6 +392,13 @@ void __devinit identify_cpu(struct cpuin + if (disable_pse) + clear_bit(X86_FEATURE_PSE, c->x86_capability); + ++ if (exec_shield != 0) { ++#ifdef CONFIG_HIGHMEM64G /* NX implies PAE */ ++ if (!test_bit(X86_FEATURE_NX, c->x86_capability)) ++#endif ++ clear_bit(X86_FEATURE_SEP, c->x86_capability); ++ } ++ + /* If the model name is still unset, do table lookup. */ + if ( !c->x86_model_id[0] ) { + char *p; +Index: linux/arch/i386/kernel/entry.S +=================================================================== +--- linux.orig/arch/i386/kernel/entry.S ++++ linux/arch/i386/kernel/entry.S @@ -184,8 +184,12 @@ sysenter_past_esp: pushl %ebp pushfl @@ -27,10 +98,11 @@ /* * Load the potential sixth argument from user stack. * Careful about security. -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/process.c linux-810/arch/i386/kernel/process.c ---- linux-804/arch/i386/kernel/process.c -+++ linux-810/arch/i386/kernel/process.c -@@ -676,6 +676,8 @@ struct task_struct fastcall * __switch_t +Index: linux/arch/i386/kernel/process.c +=================================================================== +--- linux.orig/arch/i386/kernel/process.c ++++ linux/arch/i386/kernel/process.c +@@ -652,6 +652,8 @@ struct task_struct fastcall * __switch_t /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ __unlazy_fpu(prev_p); @@ -39,7 +111,7 @@ /* * Reload esp0. -@@ -949,3 +951,60 @@ unsigned long arch_align_stack(unsigned +@@ -925,3 +927,60 @@ unsigned long arch_align_stack(unsigned sp -= get_random_int() % 8192; return sp & ~0xf; } @@ -100,10 +172,11 @@ + current->mm->brk = new_brk; +} + -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/signal.c linux-810/arch/i386/kernel/signal.c ---- linux-804/arch/i386/kernel/signal.c -+++ linux-810/arch/i386/kernel/signal.c -@@ -380,7 +380,7 @@ static int setup_frame(int sig, struct k +Index: linux/arch/i386/kernel/signal.c +=================================================================== +--- linux.orig/arch/i386/kernel/signal.c ++++ linux/arch/i386/kernel/signal.c +@@ -384,7 +384,7 @@ static int setup_frame(int sig, struct k goto give_sigsegv; } @@ -112,7 +185,7 @@ if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; -@@ -476,7 +476,7 @@ static int setup_rt_frame(int sig, struc +@@ -480,7 +480,7 @@ static int setup_rt_frame(int sig, struc goto give_sigsegv; /* Set up to return from userspace. */ @@ -121,10 +194,11 @@ if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; err |= __put_user(restorer, &frame->pretcode); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/smp.c linux-810/arch/i386/kernel/smp.c ---- linux-804/arch/i386/kernel/smp.c -+++ linux-810/arch/i386/kernel/smp.c -@@ -24,6 +24,7 @@ +Index: linux/arch/i386/kernel/smp.c +=================================================================== +--- linux.orig/arch/i386/kernel/smp.c ++++ linux/arch/i386/kernel/smp.c +@@ -23,6 +23,7 @@ #include #include @@ -132,7 +206,7 @@ #include /* -@@ -315,6 +316,8 @@ fastcall void smp_invalidate_interrupt(s +@@ -314,6 +315,8 @@ fastcall void smp_invalidate_interrupt(s unsigned long cpu; cpu = get_cpu(); @@ -141,9 +215,10 @@ if (!cpu_isset(cpu, flush_cpumask)) goto out; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/sysenter.c linux-810/arch/i386/kernel/sysenter.c ---- linux-804/arch/i386/kernel/sysenter.c -+++ linux-810/arch/i386/kernel/sysenter.c +Index: linux/arch/i386/kernel/sysenter.c +=================================================================== +--- linux.orig/arch/i386/kernel/sysenter.c ++++ linux/arch/i386/kernel/sysenter.c @@ -13,6 +13,7 @@ #include #include @@ -152,6 +227,15 @@ #include #include +@@ -36,7 +37,7 @@ void enable_sep_cpu(void) + wrmsr(MSR_IA32_SYSENTER_CS, __KERNEL_CS, 0); + wrmsr(MSR_IA32_SYSENTER_ESP, tss->esp1, 0); + wrmsr(MSR_IA32_SYSENTER_EIP, (unsigned long) sysenter_entry, 0); +- put_cpu(); ++ put_cpu(); + } + + /* @@ -46,11 +47,20 @@ void enable_sep_cpu(void) extern const char vsyscall_int80_start, vsyscall_int80_end; extern const char vsyscall_sysenter_start, vsyscall_sysenter_end; @@ -174,7 +258,7 @@ if (!boot_cpu_has(X86_FEATURE_SEP)) { memcpy(page, -@@ -65,3 +75,46 @@ int __init sysenter_setup(void) +@@ -65,3 +75,45 @@ int __init sysenter_setup(void) return 0; } @@ -208,7 +292,6 @@ + get_page(sysenter_page); + install_page(current->mm, vma, addr, + sysenter_page, vma->vm_page_prot); -+ + } + } + up_write(¤t->mm->mmap_sem); @@ -221,10 +304,11 @@ +} +__setup("vdso=", vdso_setup); + -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/traps.c linux-810/arch/i386/kernel/traps.c ---- linux-804/arch/i386/kernel/traps.c -+++ linux-810/arch/i386/kernel/traps.c -@@ -458,13 +458,89 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv +Index: linux/arch/i386/kernel/traps.c +=================================================================== +--- linux.orig/arch/i386/kernel/traps.c ++++ linux/arch/i386/kernel/traps.c +@@ -461,7 +461,82 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", inv DO_ERROR(11, SIGBUS, "segment not present", segment_not_present) DO_ERROR(12, SIGBUS, "stack segment", stack_segment) DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0) @@ -308,14 +392,15 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs, long error_code) - { +@@ -469,6 +544,7 @@ fastcall void __kprobes do_general_prote int cpu = get_cpu(); struct tss_struct *tss = &per_cpu(init_tss, cpu); struct thread_struct *thread = ¤t->thread; + int ok; /* -@@ -490,7 +566,6 @@ fastcall void do_general_protection(stru + * Perform the lazy TSS's I/O bitmap copy. If the TSS has an +@@ -495,7 +571,6 @@ fastcall void __kprobes do_general_prote put_cpu(); return; } @@ -323,7 +408,7 @@ current->thread.error_code = error_code; current->thread.trap_no = 13; -@@ -501,17 +576,31 @@ fastcall void do_general_protection(stru +@@ -506,17 +581,31 @@ fastcall void __kprobes do_general_prote if (!user_mode(regs)) goto gp_in_kernel; @@ -355,9 +440,29 @@ if (!fixup_exception(regs)) { if (notify_die(DIE_GPF, "general protection fault", regs, error_code, 13, SIGSEGV) == NOTIFY_STOP) -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/vsyscall.lds.S linux-810/arch/i386/kernel/vsyscall.lds.S ---- linux-804/arch/i386/kernel/vsyscall.lds.S -+++ linux-810/arch/i386/kernel/vsyscall.lds.S +Index: linux/arch/i386/kernel/vsyscall-sysenter.S +=================================================================== +--- linux.orig/arch/i386/kernel/vsyscall-sysenter.S ++++ linux/arch/i386/kernel/vsyscall-sysenter.S +@@ -24,11 +24,11 @@ __kernel_vsyscall: + /* 7: align return point with nop's to make disassembly easier */ + .space 7,0x90 + +- /* 14: System call restart point is here! (SYSENTER_RETURN - 2) */ ++ /* 14: System call restart point is here! (SYSENTER_RETURN_OFFSET-2) */ + jmp .Lenter_kernel + /* 16: System call normal return point is here! */ +- .globl SYSENTER_RETURN /* Symbol used by entry.S. */ +-SYSENTER_RETURN: ++ .globl SYSENTER_RETURN_OFFSET /* Symbol used by sysenter.c */ ++SYSENTER_RETURN_OFFSET: + pop %ebp + .Lpop_ebp: + pop %edx +Index: linux/arch/i386/kernel/vsyscall.lds.S +=================================================================== +--- linux.orig/arch/i386/kernel/vsyscall.lds.S ++++ linux/arch/i386/kernel/vsyscall.lds.S @@ -7,7 +7,7 @@ SECTIONS @@ -376,28 +481,11 @@ .text : { *(.text) } :text =0x90909090 .note : { *(.note.*) } :text :note -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/kernel/vsyscall-sysenter.S linux-810/arch/i386/kernel/vsyscall-sysenter.S ---- linux-804/arch/i386/kernel/vsyscall-sysenter.S -+++ linux-810/arch/i386/kernel/vsyscall-sysenter.S -@@ -24,11 +24,11 @@ __kernel_vsyscall: - /* 7: align return point with nop's to make disassembly easier */ - .space 7,0x90 - -- /* 14: System call restart point is here! (SYSENTER_RETURN - 2) */ -+ /* 14: System call restart point is here! (SYSENTER_RETURN_OFFSET-2) */ - jmp .Lenter_kernel - /* 16: System call normal return point is here! */ -- .globl SYSENTER_RETURN /* Symbol used by entry.S. */ --SYSENTER_RETURN: -+ .globl SYSENTER_RETURN_OFFSET /* Symbol used by sysenter.c */ -+SYSENTER_RETURN_OFFSET: - pop %ebp - .Lpop_ebp: - pop %edx -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/mm/init.c linux-810/arch/i386/mm/init.c ---- linux-804/arch/i386/mm/init.c -+++ linux-810/arch/i386/mm/init.c -@@ -401,7 +401,7 @@ u64 __supported_pte_mask = ~_PAGE_NX; +Index: linux/arch/i386/mm/init.c +=================================================================== +--- linux.orig/arch/i386/mm/init.c ++++ linux/arch/i386/mm/init.c +@@ -432,7 +432,7 @@ u64 __supported_pte_mask __read_mostly = * Control non executable mappings. * * on Enable @@ -406,7 +494,7 @@ */ void __init noexec_setup(const char *str) { -@@ -411,6 +411,7 @@ void __init noexec_setup(const char *str +@@ -442,6 +442,7 @@ void __init noexec_setup(const char *str } else if (!strncmp(str,"off",3)) { disable_nx = 1; __supported_pte_mask &= ~_PAGE_NX; @@ -414,7 +502,7 @@ } } -@@ -475,7 +476,10 @@ void __init paging_init(void) +@@ -506,7 +507,10 @@ void __init paging_init(void) set_nx(); if (nx_enabled) printk("NX (Execute Disable) protection: active\n"); @@ -425,9 +513,10 @@ pagetable_init(); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/i386/mm/mmap.c linux-810/arch/i386/mm/mmap.c ---- linux-804/arch/i386/mm/mmap.c -+++ linux-810/arch/i386/mm/mmap.c +Index: linux/arch/i386/mm/mmap.c +=================================================================== +--- linux.orig/arch/i386/mm/mmap.c ++++ linux/arch/i386/mm/mmap.c @@ -62,15 +62,17 @@ void arch_pick_mmap_layout(struct mm_str * Fall back to the standard layout if the personality * bit is set, or if the expected stack growth is unlimited: @@ -448,10 +537,11 @@ mm->unmap_area = arch_unmap_area_topdown; } } -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/ia64/ia32/binfmt_elf32.c linux-810/arch/ia64/ia32/binfmt_elf32.c ---- linux-804/arch/ia64/ia32/binfmt_elf32.c -+++ linux-810/arch/ia64/ia32/binfmt_elf32.c -@@ -272,7 +272,7 @@ elf32_set_personality (void) +Index: linux/arch/ia64/ia32/binfmt_elf32.c +=================================================================== +--- linux.orig/arch/ia64/ia32/binfmt_elf32.c ++++ linux/arch/ia64/ia32/binfmt_elf32.c +@@ -264,7 +264,7 @@ elf32_set_personality (void) } static unsigned long @@ -460,36 +550,92 @@ { unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/ia32/ia32_binfmt.c linux-810/arch/x86_64/ia32/ia32_binfmt.c ---- linux-804/arch/x86_64/ia32/ia32_binfmt.c -+++ linux-810/arch/x86_64/ia32/ia32_binfmt.c -@@ -396,7 +396,7 @@ int setup_arg_pages(struct linux_binprm +Index: linux/arch/x86_64/ia32/ia32_binfmt.c +=================================================================== +--- linux.orig/arch/x86_64/ia32/ia32_binfmt.c ++++ linux/arch/x86_64/ia32/ia32_binfmt.c +@@ -248,8 +248,6 @@ elf_core_copy_task_xfpregs(struct task_s + #define elf_check_arch(x) \ + ((x)->e_machine == EM_386) + +-extern int force_personality32; +- + #define ELF_EXEC_PAGESIZE PAGE_SIZE + #define ELF_HWCAP (boot_cpu_data.x86_capability[0]) + #define ELF_PLATFORM ("i686") +@@ -263,8 +261,6 @@ do { \ + set_thread_flag(TIF_ABI_PENDING); \ + else \ + clear_thread_flag(TIF_ABI_PENDING); \ +- /* XXX This overwrites the user set personality */ \ +- current->personality |= force_personality32; \ + } while (0) + + /* Override some function names */ +Index: linux/arch/x86_64/kernel/process.c +=================================================================== +--- linux.orig/arch/x86_64/kernel/process.c ++++ linux/arch/x86_64/kernel/process.c +@@ -631,12 +631,6 @@ void set_personality_64bit(void) + + /* Make sure to be in 64bit mode */ + clear_thread_flag(TIF_IA32); +- +- /* TBD: overwrites user setup. Should have two bits. +- But 64bit processes have always behaved this way, +- so it's not too bad. The main problem is just that +- 32bit childs are affected again. */ +- current->personality &= ~READ_IMPLIES_EXEC; } - static unsigned long --elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type) -+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused) + asmlinkage long sys_fork(struct pt_regs *regs) +Index: linux/arch/x86_64/kernel/setup64.c +=================================================================== +--- linux.orig/arch/x86_64/kernel/setup64.c ++++ linux/arch/x86_64/kernel/setup64.c +@@ -45,7 +45,7 @@ Control non executable mappings for 64bi + on Enable(default) + off Disable + */ +-int __init nonx_setup(char *str) ++void __init nonx_setup(const char *str) { - unsigned long map_addr; - struct task_struct *me = current; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/kernel/process.c linux-810/arch/x86_64/kernel/process.c ---- linux-804/arch/x86_64/kernel/process.c -+++ linux-810/arch/x86_64/kernel/process.c -@@ -833,10 +833,3 @@ int dump_task_regs(struct task_struct *t - - return 1; - } + if (!strncmp(str, "on", 2)) { + __supported_pte_mask |= _PAGE_NX; +@@ -54,28 +54,7 @@ int __init nonx_setup(char *str) + do_not_nx = 1; + __supported_pte_mask &= ~_PAGE_NX; + } +- return 0; +-} +-__setup("noexec=", nonx_setup); /* parsed early actually */ - --unsigned long arch_align_stack(unsigned long sp) +-int force_personality32 = READ_IMPLIES_EXEC; +- +-/* noexec32=on|off +-Control non executable heap for 32bit processes. +-To control the stack too use noexec=off +- +-on PROT_READ does not imply PROT_EXEC for 32bit processes +-off PROT_READ implies PROT_EXEC (default) +-*/ +-static int __init nonx32_setup(char *str) -{ -- if (randomize_va_space) -- sp -= get_random_int() % 8192; -- return sp & ~0xf; --} -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/mm/fault.c linux-810/arch/x86_64/mm/fault.c ---- linux-804/arch/x86_64/mm/fault.c -+++ linux-810/arch/x86_64/mm/fault.c -@@ -73,7 +73,7 @@ static noinline int is_prefetch(struct p +- if (!strcmp(str, "on")) +- force_personality32 &= ~READ_IMPLIES_EXEC; +- else if (!strcmp(str, "off")) +- force_personality32 |= READ_IMPLIES_EXEC; +- return 0; + } +-__setup("noexec32=", nonx32_setup); + + /* + * Great future plan: +Index: linux/arch/x86_64/mm/fault.c +=================================================================== +--- linux.orig/arch/x86_64/mm/fault.c ++++ linux/arch/x86_64/mm/fault.c +@@ -74,7 +74,7 @@ static noinline int is_prefetch(struct p instr = (unsigned char *)convert_rip_to_linear(current, regs); max_instr = instr + 15; @@ -498,121 +644,11 @@ return 0; while (scan_more && instr < max_instr) { -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/mm/Makefile linux-810/arch/x86_64/mm/Makefile ---- linux-804/arch/x86_64/mm/Makefile -+++ linux-810/arch/x86_64/mm/Makefile -@@ -2,7 +2,7 @@ - # Makefile for the linux x86_64-specific parts of the memory manager. - # - --obj-y := init.o fault.o ioremap.o extable.o pageattr.o -+obj-y := init.o fault.o ioremap.o extable.o pageattr.o mmap.o - obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o - obj-$(CONFIG_NUMA) += numa.o - obj-$(CONFIG_K8_NUMA) += k8topology.o -diff -urNp --exclude-from=/home/davej/.exclude linux-804/arch/x86_64/mm/mmap.c linux-810/arch/x86_64/mm/mmap.c ---- linux-804/arch/x86_64/mm/mmap.c -+++ linux-810/arch/x86_64/mm/mmap.c -@@ -0,0 +1,95 @@ -+/* -+ * linux/arch/x86-64/mm/mmap.c -+ * -+ * flexible mmap layout support -+ * -+ * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. -+ * All Rights Reserved. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * -+ * Started by Ingo Molnar -+ */ -+ -+#include -+#include -+#include -+ -+/* -+ * Top of mmap area (just below the process stack). -+ * -+ * Leave an at least ~128 MB hole. -+ */ -+#define MIN_GAP (128*1024*1024) -+#define MAX_GAP (TASK_SIZE/6*5) -+ -+static inline unsigned long mmap_base(void) -+{ -+ unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur; -+ -+ if (gap < MIN_GAP) -+ gap = MIN_GAP; -+ else if (gap > MAX_GAP) -+ gap = MAX_GAP; -+ -+ return TASK_SIZE - (gap & PAGE_MASK); -+} -+ -+static inline int mmap_is_legacy(void) -+{ -+ /* -+ * Force standard allocation for 64 bit programs. -+ */ -+ if (!test_thread_flag(TIF_IA32)) -+ return 1; -+ -+ if (current->personality & ADDR_COMPAT_LAYOUT) -+ return 1; -+ -+ if (current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) -+ return 1; -+ -+ return sysctl_legacy_va_layout; -+} -+ -+/* -+ * This function, called very early during the creation of a new -+ * process VM image, sets up which VM layout function to use: -+ */ -+void arch_pick_mmap_layout(struct mm_struct *mm) -+{ -+ /* -+ * Fall back to the standard layout if the personality -+ * bit is set, or if the expected stack growth is unlimited: -+ */ -+ if (mmap_is_legacy()) { -+ mm->mmap_base = TASK_UNMAPPED_BASE; -+ mm->get_unmapped_area = arch_get_unmapped_area; -+ mm->unmap_area = arch_unmap_area; -+ } else { -+ mm->mmap_base = mmap_base(); -+ mm->get_unmapped_area = arch_get_unmapped_area_topdown; -+ mm->unmap_area = arch_unmap_area_topdown; -+ } -+} -+ -+unsigned long arch_align_stack(unsigned long sp) -+{ -+ if (current->flags & PF_RANDOMIZE) -+ sp -= get_random_int() % 8192; -+ return sp & ~0xf; -+} -+ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/drivers/char/random.c linux-810/drivers/char/random.c ---- linux-804/drivers/char/random.c -+++ linux-810/drivers/char/random.c -@@ -1634,13 +1634,18 @@ EXPORT_SYMBOL(secure_dccp_sequence_numbe +Index: linux/drivers/char/random.c +=================================================================== +--- linux.orig/drivers/char/random.c ++++ linux/drivers/char/random.c +@@ -1632,13 +1632,18 @@ EXPORT_SYMBOL(secure_dccp_sequence_numbe */ unsigned int get_random_int(void) { @@ -632,9 +668,10 @@ } /* -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/binfmt_elf.c linux-810/fs/binfmt_elf.c ---- linux-804/fs/binfmt_elf.c -+++ linux-810/fs/binfmt_elf.c +Index: linux/fs/binfmt_elf.c +=================================================================== +--- linux.orig/fs/binfmt_elf.c ++++ linux/fs/binfmt_elf.c @@ -47,7 +47,7 @@ static int load_elf_binary(struct linux_binprm * bprm, struct pt_regs * regs); @@ -644,7 +681,7 @@ extern int dump_fpu (struct pt_regs *, elf_fpregset_t *); #ifndef elf_addr_t -@@ -285,20 +285,59 @@ create_elf_tables(struct linux_binprm *b +@@ -285,26 +285,65 @@ create_elf_tables(struct linux_binprm *b #ifndef elf_map static unsigned long elf_map(struct file *filep, unsigned long addr, @@ -653,16 +690,26 @@ + unsigned long total_size) { unsigned long map_addr; +- unsigned long pageoffset = ELF_PAGEOFFSET(eppnt->p_vaddr); + unsigned long size = eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr); + unsigned long off = eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr); + + addr = ELF_PAGESTART(addr); + size = ELF_PAGEALIGN(size); - down_write(¤t->mm->mmap_sem); -- map_addr = do_mmap(filep, ELF_PAGESTART(addr), -- eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr), prot, type, -- eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr)); +- down_write(¤t->mm->mmap_sem); + /* mmap() will return -EINVAL if given a zero size, but a + * segment with zero filesize is perfectly valid */ +- if (eppnt->p_filesz + pageoffset) +- map_addr = do_mmap(filep, ELF_PAGESTART(addr), +- eppnt->p_filesz + pageoffset, prot, type, +- eppnt->p_offset - pageoffset); +- else +- map_addr = ELF_PAGESTART(addr); ++ if (!size) ++ return addr; ++ ++ down_write(¤t->mm->mmap_sem); + + /* + * total_size is the size of the ELF (interpreter) image. @@ -679,7 +726,7 @@ + do_munmap(current->mm, map_addr+size, total_size-size); + } else + map_addr = do_mmap(filep, addr, size, prot, type, off); -+ ++ up_write(¤t->mm->mmap_sem); - return(map_addr); + @@ -706,10 +753,11 @@ + ELF_PAGESTART(cmds[first_idx].p_vaddr); +} + ++ /* This is much more generalized than the library routine read function, so we keep this separate. Technically the library read function is only provided so that we can read a.out libraries that have -@@ -306,7 +345,8 @@ static unsigned long elf_map(struct file +@@ -312,7 +351,8 @@ static unsigned long elf_map(struct file static unsigned long load_elf_interp(struct elfhdr * interp_elf_ex, struct file * interpreter, @@ -719,7 +767,7 @@ { struct elf_phdr *elf_phdata; struct elf_phdr *eppnt; -@@ -314,6 +354,7 @@ static unsigned long load_elf_interp(str +@@ -320,6 +360,7 @@ static unsigned long load_elf_interp(str int load_addr_set = 0; unsigned long last_bss = 0, elf_bss = 0; unsigned long error = ~0UL; @@ -727,7 +775,7 @@ int retval, i, size; /* First of all, some simple consistency checks */ -@@ -352,6 +393,10 @@ static unsigned long load_elf_interp(str +@@ -358,6 +399,10 @@ static unsigned long load_elf_interp(str goto out_close; } @@ -738,7 +786,7 @@ eppnt = elf_phdata; for (i=0; ie_phnum; i++, eppnt++) { if (eppnt->p_type == PT_LOAD) { -@@ -366,8 +411,11 @@ static unsigned long load_elf_interp(str +@@ -372,8 +417,11 @@ static unsigned long load_elf_interp(str vaddr = eppnt->p_vaddr; if (interp_elf_ex->e_type == ET_EXEC || load_addr_set) elf_type |= MAP_FIXED; @@ -751,7 +799,7 @@ error = map_addr; if (BAD_ADDR(map_addr)) goto out_close; -@@ -527,7 +575,7 @@ static int load_elf_binary(struct linux_ +@@ -533,7 +581,7 @@ static int load_elf_binary(struct linux_ unsigned long reloc_func_desc = 0; char passed_fileno[6]; struct files_struct *files; @@ -760,7 +808,7 @@ unsigned long def_flags = 0; struct { struct elfhdr elf_ex; -@@ -683,6 +731,8 @@ static int load_elf_binary(struct linux_ +@@ -689,6 +737,8 @@ static int load_elf_binary(struct linux_ } elf_ppnt = elf_phdata; @@ -769,7 +817,7 @@ for (i = 0; i < loc->elf_ex.e_phnum; i++, elf_ppnt++) if (elf_ppnt->p_type == PT_GNU_STACK) { if (elf_ppnt->p_flags & PF_X) -@@ -693,6 +743,11 @@ static int load_elf_binary(struct linux_ +@@ -699,6 +749,11 @@ static int load_elf_binary(struct linux_ } have_pt_gnu_stack = (i < loc->elf_ex.e_phnum); @@ -781,7 +829,7 @@ /* Some simple consistency checks for the interpreter */ if (elf_interpreter) { interpreter_type = INTERPRETER_ELF | INTERPRETER_AOUT; -@@ -746,6 +801,15 @@ static int load_elf_binary(struct linux_ +@@ -752,6 +807,15 @@ static int load_elf_binary(struct linux_ if (retval) goto out_free_dentry; @@ -797,7 +845,7 @@ /* Discard our unneeded old files struct */ if (files) { steal_locks(files); -@@ -764,7 +828,8 @@ static int load_elf_binary(struct linux_ +@@ -770,7 +834,8 @@ static int load_elf_binary(struct linux_ /* Do this immediately, since STACK_TOP as used in setup_arg_pages may depend on the personality. */ SET_PERSONALITY(loc->elf_ex, ibcs2_interpreter); @@ -807,7 +855,7 @@ current->personality |= READ_IMPLIES_EXEC; if ( !(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space) -@@ -785,10 +850,10 @@ static int load_elf_binary(struct linux_ +@@ -790,10 +855,10 @@ static int load_elf_binary(struct linux_ current->mm->start_stack = bprm->p; @@ -821,7 +869,7 @@ for(i = 0, elf_ppnt = elf_phdata; i < loc->elf_ex.e_phnum; i++, elf_ppnt++) { int elf_prot = 0, elf_flags; -@@ -832,16 +897,16 @@ static int load_elf_binary(struct linux_ +@@ -837,16 +902,16 @@ static int load_elf_binary(struct linux_ elf_flags = MAP_PRIVATE|MAP_DENYWRITE|MAP_EXECUTABLE; vaddr = elf_ppnt->p_vaddr; @@ -845,7 +893,7 @@ if (BAD_ADDR(error)) { send_sig(SIGKILL, current, 0); goto out_free_dentry; -@@ -918,7 +983,8 @@ static int load_elf_binary(struct linux_ +@@ -923,7 +988,8 @@ static int load_elf_binary(struct linux_ else elf_entry = load_elf_interp(&loc->interp_elf_ex, interpreter, @@ -855,7 +903,7 @@ if (BAD_ADDR(elf_entry)) { printk(KERN_ERR "Unable to load interpreter %.128s\n", elf_interpreter); -@@ -950,6 +1016,14 @@ static int load_elf_binary(struct linux_ +@@ -955,6 +1021,14 @@ static int load_elf_binary(struct linux_ } #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */ @@ -870,7 +918,7 @@ compute_creds(bprm); current->flags &= ~PF_FORKNOEXEC; create_elf_tables(bprm, &loc->elf_ex, (interpreter_type == INTERPRETER_AOUT), -@@ -963,6 +1037,10 @@ static int load_elf_binary(struct linux_ +@@ -968,6 +1042,10 @@ static int load_elf_binary(struct linux_ current->mm->end_data = end_data; current->mm->start_stack = bprm->p; @@ -881,10 +929,11 @@ if (current->personality & MMAP_PAGE_ZERO) { /* Why this, you ask??? Well SVr4 maps page 0 as read-only, and some applications "depend" upon this behavior. -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/proc/array.c linux-810/fs/proc/array.c ---- linux-804/fs/proc/array.c -+++ linux-810/fs/proc/array.c -@@ -385,8 +385,12 @@ static int do_task_stat(struct task_stru +Index: linux/fs/proc/array.c +=================================================================== +--- linux.orig/fs/proc/array.c ++++ linux/fs/proc/array.c +@@ -391,8 +391,12 @@ static int do_task_stat(struct task_stru ppid = pid_alive(task) ? task->group_leader->real_parent->tgid : 0; read_unlock(&tasklist_lock); @@ -899,10 +948,11 @@ if (!whole) { min_flt = task->min_flt; maj_flt = task->maj_flt; -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/proc/base.c linux-810/fs/proc/base.c ---- linux-804/fs/proc/base.c -+++ linux-810/fs/proc/base.c -@@ -181,7 +181,7 @@ static struct pid_entry tgid_base_stuff[ +Index: linux/fs/proc/base.c +=================================================================== +--- linux.orig/fs/proc/base.c ++++ linux/fs/proc/base.c +@@ -188,7 +188,7 @@ static struct pid_entry tgid_base_stuff[ E(PROC_TGID_CMDLINE, "cmdline", S_IFREG|S_IRUGO), E(PROC_TGID_STAT, "stat", S_IFREG|S_IRUGO), E(PROC_TGID_STATM, "statm", S_IFREG|S_IRUGO), @@ -911,7 +961,7 @@ #ifdef CONFIG_NUMA E(PROC_TGID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO), #endif -@@ -221,7 +221,7 @@ static struct pid_entry tid_base_stuff[] +@@ -230,7 +230,7 @@ static struct pid_entry tid_base_stuff[] E(PROC_TID_CMDLINE, "cmdline", S_IFREG|S_IRUGO), E(PROC_TID_STAT, "stat", S_IFREG|S_IRUGO), E(PROC_TID_STATM, "statm", S_IFREG|S_IRUGO), @@ -920,9 +970,10 @@ #ifdef CONFIG_NUMA E(PROC_TID_NUMA_MAPS, "numa_maps", S_IFREG|S_IRUGO), #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/fs/proc/task_mmu.c linux-810/fs/proc/task_mmu.c ---- linux-804/fs/proc/task_mmu.c -+++ linux-810/fs/proc/task_mmu.c +Index: linux/fs/proc/task_mmu.c +=================================================================== +--- linux.orig/fs/proc/task_mmu.c ++++ linux/fs/proc/task_mmu.c @@ -43,7 +43,11 @@ char *task_mem(struct mm_struct *mm, cha "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -951,7 +1002,7 @@ return buffer; } -@@ -123,7 +133,13 @@ static int show_map_internal(struct seq_ +@@ -140,7 +150,13 @@ static int show_map_internal(struct seq_ vma->vm_end, flags & VM_READ ? 'r' : '-', flags & VM_WRITE ? 'w' : '-', @@ -966,7 +1017,7 @@ flags & VM_MAYSHARE ? 's' : 'p', vma->vm_pgoff << PAGE_SHIFT, MAJOR(dev), MINOR(dev), ino, &len); -@@ -137,8 +153,7 @@ static int show_map_internal(struct seq_ +@@ -154,8 +170,7 @@ static int show_map_internal(struct seq_ seq_path(m, file->f_vfsmnt, file->f_dentry, "\n"); } else { if (mm) { @@ -976,10 +1027,11 @@ pad_len_spaces(m, len); seq_puts(m, "[heap]"); } else { -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/desc.h linux-810/include/asm-i386/desc.h ---- linux-804/include/asm-i386/desc.h -+++ linux-810/include/asm-i386/desc.h -@@ -156,6 +156,20 @@ static inline unsigned long get_desc_bas +Index: linux/include/asm-i386/desc.h +=================================================================== +--- linux.orig/include/asm-i386/desc.h ++++ linux/include/asm-i386/desc.h +@@ -160,6 +160,20 @@ static inline unsigned long get_desc_bas return base; } @@ -1000,18 +1052,19 @@ #endif /* !__ASSEMBLY__ */ #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/elf.h linux-810/include/asm-i386/elf.h ---- linux-804/include/asm-i386/elf.h -+++ linux-810/include/asm-i386/elf.h -@@ -9,6 +9,7 @@ - #include +Index: linux/include/asm-i386/elf.h +=================================================================== +--- linux.orig/include/asm-i386/elf.h ++++ linux/include/asm-i386/elf.h +@@ -10,6 +10,7 @@ #include #include /* for savesegment */ #include +#include #include -@@ -133,15 +134,22 @@ extern int dump_task_extended_fpu (struc + +@@ -129,15 +130,22 @@ extern int dump_task_extended_fpu (struc #define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs) #define ELF_CORE_COPY_XFPREGS(tsk, elf_xfpregs) dump_task_extended_fpu(tsk, elf_xfpregs) @@ -1041,7 +1094,7 @@ } while (0) /* -@@ -152,15 +160,15 @@ do { \ +@@ -148,15 +156,15 @@ do { \ * Dumping its extra ELF program headers includes all the other information * a debugger needs to easily find how the vsyscall DSO was being used. */ @@ -1061,7 +1114,7 @@ struct elf_phdr phdr = vsyscall_phdrs[i]; \ if (phdr.p_type == PT_LOAD) { \ BUG_ON(ofs != 0); \ -@@ -178,10 +186,10 @@ do { \ +@@ -174,10 +182,10 @@ do { \ #define ELF_CORE_WRITE_EXTRA_DATA \ do { \ const struct elf_phdr *const vsyscall_phdrs = \ @@ -1075,7 +1128,7 @@ if (vsyscall_phdrs[i].p_type == PT_LOAD) \ DUMP_WRITE((void *) vsyscall_phdrs[i].p_vaddr, \ PAGE_ALIGN(vsyscall_phdrs[i].p_memsz)); \ -@@ -190,4 +198,10 @@ do { \ +@@ -186,4 +194,10 @@ do { \ #endif @@ -1086,9 +1139,10 @@ +extern void map_vsyscall(void); + #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/mmu.h linux-810/include/asm-i386/mmu.h ---- linux-804/include/asm-i386/mmu.h -+++ linux-810/include/asm-i386/mmu.h +Index: linux/include/asm-i386/mmu.h +=================================================================== +--- linux.orig/include/asm-i386/mmu.h ++++ linux/include/asm-i386/mmu.h @@ -7,11 +7,17 @@ * we put the segment information here. * @@ -1107,9 +1161,10 @@ } mm_context_t; #endif -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/pgalloc.h linux-810/include/asm-i386/pgalloc.h ---- linux-804/include/asm-i386/pgalloc.h -+++ linux-810/include/asm-i386/pgalloc.h +Index: linux/include/asm-i386/pgalloc.h +=================================================================== +--- linux.orig/include/asm-i386/pgalloc.h ++++ linux/include/asm-i386/pgalloc.h @@ -3,6 +3,7 @@ #include @@ -1118,10 +1173,11 @@ #include #include /* for struct page */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/processor.h linux-810/include/asm-i386/processor.h ---- linux-804/include/asm-i386/processor.h -+++ linux-810/include/asm-i386/processor.h -@@ -317,7 +317,10 @@ extern int bootloader_type; +Index: linux/include/asm-i386/processor.h +=================================================================== +--- linux.orig/include/asm-i386/processor.h ++++ linux/include/asm-i386/processor.h +@@ -319,7 +319,9 @@ extern int bootloader_type; /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ @@ -1129,11 +1185,10 @@ +#define TASK_UNMAPPED_BASE PAGE_ALIGN(TASK_SIZE/3) + +#define __HAVE_ARCH_ALIGN_STACK -+extern unsigned long arch_align_stack(unsigned long sp); #define HAVE_ARCH_PICK_MMAP_LAYOUT -@@ -499,6 +502,9 @@ static inline void load_esp0(struct tss_ +@@ -501,6 +504,9 @@ static inline void load_esp0(struct tss_ regs->xcs = __USER_CS; \ regs->eip = new_eip; \ regs->esp = new_esp; \ @@ -1143,9 +1198,10 @@ } while (0) /* -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-i386/thread_info.h linux-810/include/asm-i386/thread_info.h ---- linux-804/include/asm-i386/thread_info.h -+++ linux-810/include/asm-i386/thread_info.h +Index: linux/include/asm-i386/thread_info.h +=================================================================== +--- linux.orig/include/asm-i386/thread_info.h ++++ linux/include/asm-i386/thread_info.h @@ -38,6 +38,7 @@ struct thread_info { 0-0xBFFFFFFF for user-thead 0-0xFFFFFFFF for kernel-thread @@ -1154,9 +1210,10 @@ struct restart_block restart_block; unsigned long previous_esp; /* ESP of the previous stack in case -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-ia64/pgalloc.h linux-810/include/asm-ia64/pgalloc.h ---- linux-804/include/asm-ia64/pgalloc.h -+++ linux-810/include/asm-ia64/pgalloc.h +Index: linux/include/asm-ia64/pgalloc.h +=================================================================== +--- linux.orig/include/asm-ia64/pgalloc.h ++++ linux/include/asm-ia64/pgalloc.h @@ -1,6 +1,10 @@ #ifndef _ASM_IA64_PGALLOC_H #define _ASM_IA64_PGALLOC_H @@ -1168,9 +1225,26 @@ /* * This file contains the functions and defines necessary to allocate * page tables. -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-ppc/pgalloc.h linux-810/include/asm-ppc/pgalloc.h ---- linux-804/include/asm-ppc/pgalloc.h -+++ linux-810/include/asm-ppc/pgalloc.h +Index: linux/include/asm-powerpc/pgalloc.h +=================================================================== +--- linux.orig/include/asm-powerpc/pgalloc.h ++++ linux/include/asm-powerpc/pgalloc.h +@@ -23,6 +23,11 @@ extern kmem_cache_t *pgtable_cache[]; + #define PGD_CACHE_NUM 0 + #endif + ++/* Dummy functions since we don't support execshield on ppc */ ++#define arch_add_exec_range(mm, limit) do { ; } while (0) ++#define arch_flush_exec_range(mm) do { ; } while (0) ++#define arch_remove_exec_range(mm, limit) do { ; } while (0) ++ + /* + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License +Index: linux/include/asm-ppc/pgalloc.h +=================================================================== +--- linux.orig/include/asm-ppc/pgalloc.h ++++ linux/include/asm-ppc/pgalloc.h @@ -40,5 +40,10 @@ extern void pte_free(struct page *pte); #define check_pgt_cache() do { } while (0) @@ -1182,24 +1256,10 @@ + #endif /* _PPC_PGALLOC_H */ #endif /* __KERNEL__ */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-powerpc/pgalloc.h linux-810/include/asm-powerpc/pgalloc.h ---- linux-804/include/asm-powerpc/pgalloc.h -+++ linux-810/include/asm-powerpc/pgalloc.h -@@ -13,6 +13,11 @@ extern kmem_cache_t *pgtable_cache[]; - #define PUD_CACHE_NUM 1 - #define PGD_CACHE_NUM 0 - -+/* Dummy functions since we don't support execshield on ppc */ -+#define arch_add_exec_range(mm, limit) do { ; } while (0) -+#define arch_flush_exec_range(mm) do { ; } while (0) -+#define arch_remove_exec_range(mm, limit) do { ; } while (0) -+ - /* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-s390/pgalloc.h linux-810/include/asm-s390/pgalloc.h ---- linux-804/include/asm-s390/pgalloc.h -+++ linux-810/include/asm-s390/pgalloc.h +Index: linux/include/asm-s390/pgalloc.h +=================================================================== +--- linux.orig/include/asm-s390/pgalloc.h ++++ linux/include/asm-s390/pgalloc.h @@ -18,6 +18,10 @@ #include #include @@ -1211,9 +1271,10 @@ #define check_pgt_cache() do {} while (0) extern void diag10(unsigned long addr); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-sparc/pgalloc.h linux-810/include/asm-sparc/pgalloc.h ---- linux-804/include/asm-sparc/pgalloc.h -+++ linux-810/include/asm-sparc/pgalloc.h +Index: linux/include/asm-sparc/pgalloc.h +=================================================================== +--- linux.orig/include/asm-sparc/pgalloc.h ++++ linux/include/asm-sparc/pgalloc.h @@ -66,4 +66,8 @@ BTFIXUPDEF_CALL(void, pte_free, struct p #define pte_free(pte) BTFIXUP_CALL(pte_free)(pte) #define __pte_free_tlb(tlb, pte) pte_free(pte) @@ -1223,10 +1284,11 @@ +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #endif /* _SPARC_PGALLOC_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-sparc64/pgalloc.h linux-810/include/asm-sparc64/pgalloc.h ---- linux-804/include/asm-sparc64/pgalloc.h -+++ linux-810/include/asm-sparc64/pgalloc.h -@@ -180,4 +180,8 @@ static inline void pte_free(struct page +Index: linux/include/asm-sparc64/pgalloc.h +=================================================================== +--- linux.orig/include/asm-sparc64/pgalloc.h ++++ linux/include/asm-sparc64/pgalloc.h +@@ -181,4 +181,8 @@ static inline void pte_free(struct page #define pgd_free(pgd) free_pgd_fast(pgd) #define pgd_alloc(mm) get_pgd_fast() @@ -1235,9 +1297,10 @@ +#define arch_remove_exec_range(mm, limit) do { ; } while (0) + #endif /* _SPARC64_PGALLOC_H */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-x86_64/pgalloc.h linux-810/include/asm-x86_64/pgalloc.h ---- linux-804/include/asm-x86_64/pgalloc.h -+++ linux-810/include/asm-x86_64/pgalloc.h +Index: linux/include/asm-x86_64/pgalloc.h +=================================================================== +--- linux.orig/include/asm-x86_64/pgalloc.h ++++ linux/include/asm-x86_64/pgalloc.h @@ -6,6 +6,13 @@ #include #include @@ -1252,25 +1315,37 @@ #define pmd_populate_kernel(mm, pmd, pte) \ set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte))) #define pud_populate(mm, pud, pmd) \ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/asm-x86_64/processor.h linux-810/include/asm-x86_64/processor.h ---- linux-804/include/asm-x86_64/processor.h -+++ linux-810/include/asm-x86_64/processor.h -@@ -162,6 +162,11 @@ static inline void clear_in_cr4 (unsigne +Index: linux/include/asm-x86_64/pgtable.h +=================================================================== +--- linux.orig/include/asm-x86_64/pgtable.h ++++ linux/include/asm-x86_64/pgtable.h +@@ -21,7 +21,7 @@ extern unsigned long __supported_pte_mas + + #define swapper_pg_dir init_level4_pgt + +-extern int nonx_setup(char *str); ++extern void nonx_setup(const char *str); + extern void paging_init(void); + extern void clear_kernel_mapping(unsigned long addr, unsigned long size); + +Index: linux/include/asm-x86_64/processor.h +=================================================================== +--- linux.orig/include/asm-x86_64/processor.h ++++ linux/include/asm-x86_64/processor.h +@@ -164,6 +164,8 @@ static inline void clear_in_cr4 (unsigne */ #define TASK_SIZE64 (0x800000000000UL - 4096) +#define __HAVE_ARCH_ALIGN_STACK -+extern unsigned long arch_align_stack(unsigned long sp); -+ -+#define HAVE_ARCH_PICK_MMAP_LAYOUT + /* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/mm.h linux-810/include/linux/mm.h ---- linux-804/include/linux/mm.h -+++ linux-810/include/linux/mm.h -@@ -840,7 +840,14 @@ extern struct vm_area_struct *copy_vma(s +Index: linux/include/linux/mm.h +=================================================================== +--- linux.orig/include/linux/mm.h ++++ linux/include/linux/mm.h +@@ -914,7 +914,14 @@ extern struct vm_area_struct *copy_vma(s extern void exit_mmap(struct mm_struct *); extern int may_expand_vm(struct mm_struct *mm, unsigned long npages); @@ -1278,17 +1353,27 @@ +extern unsigned long get_unmapped_area_prot(struct file *, unsigned long, unsigned long, unsigned long, unsigned long, int); + + -+static inline unsigned long get_unmapped_area(struct file * file, unsigned long addr, ++static inline unsigned long get_unmapped_area(struct file * file, unsigned long addr, + unsigned long len, unsigned long pgoff, unsigned long flags) +{ -+ return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); ++ return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0); +} extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr, unsigned long len, unsigned long prot, -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/resource.h linux-810/include/linux/resource.h ---- linux-804/include/linux/resource.h -+++ linux-810/include/linux/resource.h +@@ -966,7 +973,7 @@ unsigned long page_cache_readahead(struc + struct file *filp, + pgoff_t offset, + unsigned long size); +-void handle_ra_miss(struct address_space *mapping, ++void handle_ra_miss(struct address_space *mapping, + struct file_ra_state *ra, pgoff_t offset); + unsigned long max_sane_readahead(unsigned long nr); + +Index: linux/include/linux/resource.h +=================================================================== +--- linux.orig/include/linux/resource.h ++++ linux/include/linux/resource.h @@ -52,8 +52,11 @@ struct rlimit { /* * Limit the stack by to some sane default: root can always @@ -1302,11 +1387,12 @@ /* * GPG wants 32kB of mlocked memory, to make sure pass phrases -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/sched.h linux-810/include/linux/sched.h ---- linux-804/include/linux/sched.h -+++ linux-810/include/linux/sched.h -@@ -36,6 +36,8 @@ - #include +Index: linux/include/linux/sched.h +=================================================================== +--- linux.orig/include/linux/sched.h ++++ linux/include/linux/sched.h +@@ -39,6 +39,8 @@ + #include /* For AT_VECTOR_SIZE */ struct exec_domain; +extern int exec_shield; @@ -1314,7 +1400,7 @@ /* * cloning flags: -@@ -197,6 +199,10 @@ extern int sysctl_max_map_count; +@@ -243,6 +245,10 @@ extern int sysctl_max_map_count; extern unsigned long arch_get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); @@ -1325,7 +1411,7 @@ extern unsigned long arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, -@@ -218,6 +224,9 @@ struct mm_struct { +@@ -295,6 +301,9 @@ struct mm_struct { unsigned long (*get_unmapped_area) (struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags); @@ -1335,9 +1421,10 @@ void (*unmap_area) (struct mm_struct *mm, unsigned long addr); unsigned long mmap_base; /* base of mmap area */ unsigned long cached_hole_size; /* if non-zero, the largest hole below free_area_cache */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/include/linux/sysctl.h linux-810/include/linux/sysctl.h ---- linux-804/include/linux/sysctl.h -+++ linux-810/include/linux/sysctl.h +Index: linux/include/linux/sysctl.h +=================================================================== +--- linux.orig/include/linux/sysctl.h ++++ linux/include/linux/sysctl.h @@ -92,6 +92,9 @@ enum KERN_CAP_BSET=14, /* int: capability bounding set */ @@ -1348,12 +1435,13 @@ KERN_REALROOTDEV=16, /* real root device to mount after initrd */ KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ -diff -urNp --exclude-from=/home/davej/.exclude linux-804/kernel/signal.c linux-810/kernel/signal.c ---- linux-804/kernel/signal.c -+++ linux-810/kernel/signal.c -@@ -1209,6 +1209,37 @@ kill_proc_info(int sig, struct siginfo * - return error; - } +Index: linux/kernel/signal.c +=================================================================== +--- linux.orig/kernel/signal.c ++++ linux/kernel/signal.c +@@ -868,6 +868,37 @@ out_set: + #define LEGACY_QUEUE(sigptr, sig) \ + (((sig) < SIGRTMIN) && sigismember(&(sigptr)->signal, (sig))) +int print_fatal_signals = 0; + @@ -1361,7 +1449,7 @@ +{ + printk("%s/%d: potentially unexpected fatal signal %d.\n", + current->comm, current->pid, signr); -+ ++ +#ifdef __i386__ + printk("code at %08lx: ", regs->eip); + { @@ -1373,7 +1461,7 @@ + printk("%02x ", insn); + } + } -+#endif ++#endif + printk("\n"); + show_regs(regs); +} @@ -1387,9 +1475,9 @@ + +__setup("print-fatal-signals=", setup_print_fatal_signals); - /* - * kill_something_info() interprets pid in interesting ways just like kill(2). -@@ -1859,6 +1890,11 @@ relock: + static int + specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) +@@ -1935,6 +1966,11 @@ relock: if (!signr) break; /* will return 0 */ @@ -1401,7 +1489,7 @@ if ((current->ptrace & PT_PTRACED) && signr != SIGKILL) { ptrace_signal_deliver(regs, cookie); -@@ -1954,6 +1990,8 @@ relock: +@@ -2030,6 +2066,8 @@ relock: * Anything else is fatal, maybe with a core dump. */ current->flags |= PF_SIGNALED; @@ -1410,10 +1498,11 @@ if (sig_kernel_coredump(signr)) { /* * If it was able to dump core, this kills all -diff -urNp --exclude-from=/home/davej/.exclude linux-804/kernel/sysctl.c linux-810/kernel/sysctl.c ---- linux-804/kernel/sysctl.c -+++ linux-810/kernel/sysctl.c -@@ -74,6 +74,19 @@ extern int proc_unknown_nmi_panic(ctl_ta +Index: linux/kernel/sysctl.c +=================================================================== +--- linux.orig/kernel/sysctl.c ++++ linux/kernel/sysctl.c +@@ -77,6 +77,19 @@ extern int proc_unknown_nmi_panic(ctl_ta void __user *, size_t *, loff_t *); #endif @@ -1433,7 +1522,7 @@ /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */ static int maxolduid = 65535; static int minolduid; -@@ -279,6 +292,32 @@ static ctl_table kern_table[] = { +@@ -280,6 +293,32 @@ static ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, { @@ -1466,9 +1555,11 @@ .ctl_name = KERN_CORE_USES_PID, .procname = "core_uses_pid", .data = &core_uses_pid, ---- linux-2.6.13/mm/fremap.c~ 2005-10-13 17:34:08.000000000 -0400 -+++ linux-2.6.13/mm/fremap.c 2005-10-13 17:34:58.000000000 -0400 -@@ -83,13 +83,15 @@ int install_page(struct mm_struct *mm, s +Index: linux/mm/fremap.c +=================================================================== +--- linux.orig/mm/fremap.c ++++ linux/mm/fremap.c +@@ -67,13 +67,15 @@ int install_page(struct mm_struct *mm, s * caller about it. */ err = -EINVAL; @@ -1491,9 +1582,10 @@ if (pte_none(*pte) || !zap_pte(mm, vma, addr, pte)) inc_mm_counter(mm, file_rss); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mmap.c linux-810/mm/mmap.c ---- linux-804/mm/mmap.c -+++ linux-810/mm/mmap.c +Index: linux/mm/mmap.c +=================================================================== +--- linux.orig/mm/mmap.c ++++ linux/mm/mmap.c @@ -24,6 +24,7 @@ #include #include @@ -1502,7 +1594,7 @@ #include #include -@@ -342,6 +343,8 @@ static inline void +@@ -341,6 +342,8 @@ static inline void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma, struct vm_area_struct *prev, struct rb_node *rb_parent) { @@ -1511,7 +1603,7 @@ if (prev) { vma->vm_next = prev->vm_next; prev->vm_next = vma; -@@ -446,6 +449,8 @@ __vma_unlink(struct mm_struct *mm, struc +@@ -445,6 +448,8 @@ __vma_unlink(struct mm_struct *mm, struc rb_erase(&vma->vm_rb, &mm->mm_rb); if (mm->mmap_cache == vma) mm->mmap_cache = prev; @@ -1520,7 +1612,7 @@ } /* -@@ -751,6 +756,8 @@ struct vm_area_struct *vma_merge(struct +@@ -750,6 +755,8 @@ struct vm_area_struct *vma_merge(struct } else /* cases 2, 5, 7 */ vma_adjust(prev, prev->vm_start, end, prev->vm_pgoff, NULL); @@ -1529,7 +1621,7 @@ return prev; } -@@ -922,7 +929,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -921,7 +928,7 @@ unsigned long do_mmap_pgoff(struct file /* Obtain the address to map to. we verify (or select) it and ensure * that it represents a valid section of the address space. */ @@ -1538,7 +1630,7 @@ if (addr & ~PAGE_MASK) return addr; -@@ -1328,16 +1335,21 @@ void arch_unmap_area_topdown(struct mm_s +@@ -1327,16 +1334,21 @@ void arch_unmap_area_topdown(struct mm_s mm->free_area_cache = mm->mmap_base; } @@ -1563,7 +1655,7 @@ if (file && file->f_op && file->f_op->get_unmapped_area) get_area = file->f_op->get_unmapped_area; addr = get_area(file, addr, len, pgoff, flags); -@@ -1368,7 +1380,71 @@ get_unmapped_area(struct file *file, uns +@@ -1367,7 +1379,71 @@ get_unmapped_area(struct file *file, uns return addr; } @@ -1636,7 +1728,7 @@ /* Look up the first VMA which satisfies addr < vm_end, NULL if none. */ struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr) -@@ -1443,6 +1519,14 @@ out: +@@ -1442,6 +1518,14 @@ out: return prev ? prev->vm_next : vma; } @@ -1651,7 +1743,7 @@ /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -1458,7 +1542,7 @@ static int acct_stack_growth(struct vm_a +@@ -1457,7 +1541,7 @@ static int acct_stack_growth(struct vm_a return -ENOMEM; /* Stack limit test */ @@ -1660,7 +1752,7 @@ return -ENOMEM; /* mlock limit tests */ -@@ -1740,10 +1824,14 @@ int split_vma(struct mm_struct * mm, str +@@ -1737,10 +1821,14 @@ int split_vma(struct mm_struct * mm, str if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); @@ -1677,7 +1769,7 @@ vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new); return 0; -@@ -2048,6 +2048,7 @@ void exit_mmap(struct mm_struct *mm) +@@ -1945,6 +2033,7 @@ void exit_mmap(struct mm_struct *mm) vm_unacct_memory(nr_accounted); free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0); tlb_finish_mmu(tlb, 0, end); @@ -1685,9 +1777,10 @@ /* * Walk the list again, actually closing and freeing it, -diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mprotect.c linux-810/mm/mprotect.c ---- linux-804/mm/mprotect.c -+++ linux-810/mm/mprotect.c +Index: linux/mm/mprotect.c +=================================================================== +--- linux.orig/mm/mprotect.c ++++ linux/mm/mprotect.c @@ -22,6 +22,7 @@ #include @@ -1696,7 +1789,7 @@ #include #include -@@ -106,7 +107,7 @@ mprotect_fixup(struct vm_area_struct *vm +@@ -105,7 +106,7 @@ mprotect_fixup(struct vm_area_struct *vm struct mm_struct *mm = vma->vm_mm; unsigned long oldflags = vma->vm_flags; long nrpages = (end - start) >> PAGE_SHIFT; @@ -1705,146 +1798,27 @@ pgprot_t newprot; pgoff_t pgoff; int error; -@@ -167,6 +168,8 @@ success: +@@ -166,6 +167,8 @@ success: */ vma->vm_flags = newflags; vma->vm_page_prot = newprot; + if (oldflags & VM_EXEC) + arch_remove_exec_range(current->mm, old_end); change_protection(vma, start, end, newprot); - __vm_stat_account(mm, oldflags, vma->vm_file, -nrpages); - __vm_stat_account(mm, newflags, vma->vm_file, nrpages); -diff -urNp --exclude-from=/home/davej/.exclude linux-804/mm/mremap.c linux-810/mm/mremap.c ---- linux-804/mm/mremap.c -+++ linux-810/mm/mremap.c -@@ -407,8 +407,8 @@ unsigned long do_mremap(unsigned long ad + vm_stat_account(mm, oldflags, vma->vm_file, -nrpages); + vm_stat_account(mm, newflags, vma->vm_file, nrpages); +Index: linux/mm/mremap.c +=================================================================== +--- linux.orig/mm/mremap.c ++++ linux/mm/mremap.c +@@ -386,8 +386,8 @@ unsigned long do_mremap(unsigned long ad if (vma->vm_flags & VM_MAYSHARE) map_flags |= MAP_SHARED; - new_addr = get_unmapped_area(vma->vm_file, 0, new_len, - vma->vm_pgoff, map_flags); -+ new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len, ++ new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len, + vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC); ret = new_addr; if (new_addr & ~PAGE_MASK) goto out; -diff -urNp --exclude-from=/home/davej/.exclude linux-812/arch/i386/kernel/cpu/common.c linux-813/arch/i386/kernel/cpu/common.c ---- linux-812/arch/i386/kernel/cpu/common.c -+++ linux-813/arch/i386/kernel/cpu/common.c -@@ -397,6 +397,13 @@ void __devinit identify_cpu(struct cpuin - if (disable_pse) - clear_bit(X86_FEATURE_PSE, c->x86_capability); - -+ if (exec_shield != 0) { -+#ifdef CONFIG_HIGHMEM64G /* NX implies PAE */ -+ if (!test_bit(X86_FEATURE_NX, c->x86_capability)) -+#endif -+ clear_bit(X86_FEATURE_SEP, c->x86_capability); -+ } -+ - /* If the model name is still unset, do table lookup. */ - if ( !c->x86_model_id[0] ) { - char *p; -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/arch/x86_64/ia32/ia32_binfmt.c linux-2.6.13-a/arch/x86_64/ia32/ia32_binfmt.c ---- linux-2.6.13/arch/x86_64/ia32/ia32_binfmt.c 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/arch/x86_64/ia32/ia32_binfmt.c 2005-10-14 20:56:15.000000000 -0400 -@@ -249,8 +249,6 @@ elf_core_copy_task_xfpregs(struct task_s - #define elf_check_arch(x) \ - ((x)->e_machine == EM_386) - --extern int force_personality32; -- - #define ELF_EXEC_PAGESIZE PAGE_SIZE - #define ELF_HWCAP (boot_cpu_data.x86_capability[0]) - #define ELF_PLATFORM ("i686") -@@ -264,8 +262,6 @@ do { \ - set_thread_flag(TIF_ABI_PENDING); \ - else \ - clear_thread_flag(TIF_ABI_PENDING); \ -- /* XXX This overwrites the user set personality */ \ -- current->personality |= force_personality32; \ - } while (0) - - /* Override some function names */ -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/arch/x86_64/kernel/process.c linux-2.6.13-a/arch/x86_64/kernel/process.c ---- linux-2.6.13/arch/x86_64/kernel/process.c 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/arch/x86_64/kernel/process.c 2005-10-14 20:56:15.000000000 -0400 -@@ -638,12 +638,6 @@ void set_personality_64bit(void) - - /* Make sure to be in 64bit mode */ - clear_thread_flag(TIF_IA32); -- -- /* TBD: overwrites user setup. Should have two bits. -- But 64bit processes have always behaved this way, -- so it's not too bad. The main problem is just that -- 32bit childs are affected again. */ -- current->personality &= ~READ_IMPLIES_EXEC; - } - - asmlinkage long sys_fork(struct pt_regs *regs) -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/arch/x86_64/kernel/setup64.c linux-2.6.13-a/arch/x86_64/kernel/setup64.c ---- linux-2.6.13/arch/x86_64/kernel/setup64.c 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/arch/x86_64/kernel/setup64.c 2005-10-14 20:56:15.000000000 -0400 -@@ -45,7 +45,7 @@ Control non executable mappings for 64bi - on Enable(default) - off Disable - */ --int __init nonx_setup(char *str) -+void __init nonx_setup(const char *str) - { - if (!strncmp(str, "on", 2)) { - __supported_pte_mask |= _PAGE_NX; -@@ -53,29 +53,8 @@ int __init nonx_setup(char *str) - } else if (!strncmp(str, "off", 3)) { - do_not_nx = 1; - __supported_pte_mask &= ~_PAGE_NX; -- } -- return 0; -+ } - } --__setup("noexec=", nonx_setup); /* parsed early actually */ -- --int force_personality32 = READ_IMPLIES_EXEC; -- --/* noexec32=on|off --Control non executable heap for 32bit processes. --To control the stack too use noexec=off -- --on PROT_READ does not imply PROT_EXEC for 32bit processes --off PROT_READ implies PROT_EXEC (default) --*/ --static int __init nonx32_setup(char *str) --{ -- if (!strcmp(str, "on")) -- force_personality32 &= ~READ_IMPLIES_EXEC; -- else if (!strcmp(str, "off")) -- force_personality32 |= READ_IMPLIES_EXEC; -- return 0; --} --__setup("noexec32=", nonx32_setup); - - /* - * Great future plan: -diff -urpN --exclude-from=/home/devel/davej/.exclude linux-2.6.13/include/asm-x86_64/pgtable.h linux-2.6.13-a/include/asm-x86_64/pgtable.h ---- linux-2.6.13/include/asm-x86_64/pgtable.h 2005-10-14 20:55:36.000000000 -0400 -+++ linux-2.6.13-a/include/asm-x86_64/pgtable.h 2005-10-14 20:56:15.000000000 -0400 -@@ -20,7 +20,7 @@ extern unsigned long __supported_pte_mas - - #define swapper_pg_dir init_level4_pgt - --extern int nonx_setup(char *str); -+extern void nonx_setup(const char *str); - extern void paging_init(void); - extern void clear_kernel_mapping(unsigned long addr, unsigned long size); - ---- linux-2.6.14/fs/proc/base.c~ 2005-12-29 19:25:42.000000000 -0500 -+++ linux-2.6.14/fs/proc/base.c 2005-12-29 19:26:20.000000000 -0500 -@@ -200,7 +200,7 @@ static struct pid_entry tgid_base_stuff[ - E(PROC_TGID_EXE, "exe", S_IFLNK|S_IRWXUGO), - E(PROC_TGID_MOUNTS, "mounts", S_IFREG|S_IRUGO), - #ifdef CONFIG_MMU -- E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUGO), -+ E(PROC_TGID_SMAPS, "smaps", S_IFREG|S_IRUSR), - #endif - #ifdef CONFIG_SECURITY - E(PROC_TGID_ATTR, "attr", S_IFDIR|S_IRUGO|S_IXUGO), linux-2.6-hvc-console.patch: drivers/char/Kconfig | 13 +++ drivers/char/Makefile | 6 + drivers/char/hvc_console.c | 25 ------ drivers/char/hvc_console.h | 83 ++++++++++++++++++++++ drivers/char/hvc_fss.c | 149 ++++++++++++++++++++++++++++++++++++++++ drivers/char/hvc_vio.c | 1 include/asm-powerpc/hvconsole.h | 21 ----- 7 files changed, 252 insertions(+), 46 deletions(-) Index: linux-2.6-hvc-console.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-hvc-console.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-hvc-console.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-hvc-console.patch 26 Jan 2006 22:14:34 -0000 1.3 @@ -1,31 +1,3 @@ -diff -uNr --exclude '*.orig' linux-2.6.14.cons/arch/powerpc/kernel/setup-common.c linux-2.6.14/arch/powerpc/kernel/setup-common.c ---- linux-2.6.14.cons/arch/powerpc/kernel/setup-common.c 2005-12-07 16:33:31.000000000 +0100 -+++ linux-2.6.14/arch/powerpc/kernel/setup-common.c 2005-12-07 16:34:00.000000000 +0100 -@@ -304,6 +304,15 @@ - - DBG(" -> set_preferred_console()\n"); - -+#ifdef CONFIG_HVC_FSS -+ /* if we're on the full system simulator just circumvent the whole -+ * picking process because there is no device tree in which we'll -+ * find the console device. */ -+ if(__onsim()) { -+ DBG("Found hvc_fss console\n"); -+ return add_preferred_console("hvc", 0, NULL); -+ } -+#endif - /* The user has requested a console so this is already set up. */ - if (strstr(saved_command_line, "console=")) { - DBG(" console was specified !\n"); -@@ -385,7 +393,7 @@ - } else { - /* pSeries LPAR virtual console */ - of_node_put(prom_stdout); -- DBG("Found hvc console\n"); -+ DBG("Found hvc_vio console\n"); - return add_preferred_console("hvc", 0, NULL); - } - } diff -uNr --exclude '*.orig' linux-2.6.14.cons/drivers/char/hvc_console.c linux-2.6.14/drivers/char/hvc_console.c --- linux-2.6.14.cons/drivers/char/hvc_console.c 2005-12-07 16:33:35.000000000 +0100 +++ linux-2.6.14/drivers/char/hvc_console.c 2005-12-07 16:33:56.000000000 +0100 @@ -382,9 +354,10 @@ diff -uNr --exclude '*.orig' linux-2.6.14.cons/include/asm-powerpc/hvconsole.h linux-2.6.14/include/asm-powerpc/hvconsole.h --- linux-2.6.14.cons/include/asm-powerpc/hvconsole.h 2005-12-07 16:33:35.000000000 +0100 +++ linux-2.6.14/include/asm-powerpc/hvconsole.h 2005-12-07 16:33:56.000000000 +0100 -@@ -22,28 +22,7 @@ +@@ -22,30 +22,9 @@ #ifndef _PPC64_HVCONSOLE_H #define _PPC64_HVCONSOLE_H + #ifdef __KERNEL__ -/* - * This is the max number of console adapters that can/will be found as @@ -410,6 +383,7 @@ - struct hv_ops *ops); -/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */ -extern int __devexit hvc_remove(struct hvc_struct *hp); + #endif /* __KERNEL__ */ #endif /* _PPC64_HVCONSOLE_H */ --- linux-2.6.14/drivers/char/hvc_vio.c~ 2005-12-07 17:46:48.000000000 +0100 +++ linux-2.6.14/drivers/char/hvc_vio.c 2005-12-07 18:03:23.000000000 +0100 linux-2.6-modsign-core.patch: linux-2.6.12/kernel/module-verify.c | 2 linux-900/include/linux/module.h | 3 linux-900/init/Kconfig | 16 + linux-900/kernel/Makefile | 3 linux-900/kernel/module-verify-sig.c | 442 +++++++++++++++++++++++++++++++++++ linux-900/kernel/module-verify.c | 340 ++++++++++++++++++++++++++ linux-900/kernel/module-verify.h | 37 ++ linux-900/kernel/module.c | 19 + 8 files changed, 857 insertions(+), 5 deletions(-) Index: linux-2.6-modsign-core.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-modsign-core.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-modsign-core.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-modsign-core.patch 26 Jan 2006 22:14:34 -0000 1.3 @@ -47,9 +47,9 @@ -obj-$(CONFIG_MODULES) += module.o +obj-$(CONFIG_MODULES) += module.o module-verify.o +obj-$(CONFIG_MODULE_SIG) += module-verify-sig.o + obj-$(CONFIG_OBSOLETE_INTERMODULE) += intermodule.o obj-$(CONFIG_KALLSYMS) += kallsyms.o obj-$(CONFIG_PM) += power/ - obj-$(CONFIG_BSD_PROCESS_ACCT) += acct.o diff -urNp --exclude-from=/home/davej/.exclude linux-811/kernel/module.c linux-900/kernel/module.c --- linux-811/kernel/module.c +++ linux-900/kernel/module.c linux-2.6-radeon-backlight.patch: radeon_base.c | 11 + radeon_pm.c | 557 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 567 insertions(+), 1 deletion(-) Index: linux-2.6-radeon-backlight.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-radeon-backlight.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-radeon-backlight.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-radeon-backlight.patch 26 Jan 2006 22:14:34 -0000 1.3 @@ -563,7 +563,7 @@ @@ -2779,6 +3311,29 @@ void radeonfb_pm_init(struct radeonfb_in #endif } - #endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_OF) */ + #endif /* defined(CONFIG_PM) && defined(CONFIG_PPC_PMAC) */ + +/* The PM code also works on some PC laptops. + * Only a few models are actually tested so Your mileage may vary. linux-2.6-sleepon.patch: drivers/block/DAC960.c | 12 +++++++++++- drivers/net/tokenring/ibmtr.c | 9 ++++++++- include/linux/wait.h | 6 +++--- kernel/sched.c | 28 +++++++++++++++------------- 4 files changed, 37 insertions(+), 18 deletions(-) Index: linux-2.6-sleepon.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-sleepon.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-sleepon.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-sleepon.patch 26 Jan 2006 22:14:34 -0000 1.3 @@ -140,32 +140,3 @@ current->state = TASK_UNINTERRUPTIBLE; SLEEP_ON_HEAD -diff -urNp --exclude-from=/home/davej/.exclude linux-1060/net/sunrpc/clnt.c linux-1070/net/sunrpc/clnt.c ---- linux-1060/net/sunrpc/clnt.c -+++ linux-1070/net/sunrpc/clnt.c -@@ -223,17 +223,24 @@ out_no_clnt: - int - rpc_shutdown_client(struct rpc_clnt *clnt) - { -+ wait_queue_t __wait; -+ init_waitqueue_entry(&__wait, current); - dprintk("RPC: shutting down %s client for %s, tasks=%d\n", - clnt->cl_protname, clnt->cl_server, - atomic_read(&clnt->cl_users)); - -+ add_wait_queue(&destroy_wait, &__wait); -+ set_current_state(TASK_UNINTERRUPTIBLE); - while (atomic_read(&clnt->cl_users) > 0) { - /* Don't let rpc_release_client destroy us */ - clnt->cl_oneshot = 0; - clnt->cl_dead = 0; - rpc_killall_tasks(clnt); -- sleep_on_timeout(&destroy_wait, 1*HZ); -+ schedule_timeout(1*HZ); -+ set_current_state(TASK_UNINTERRUPTIBLE); - } -+ current->state = TASK_RUNNING; -+ remove_wait_queue(&destroy_wait, &__wait); - - if (atomic_read(&clnt->cl_users) < 0) { - printk(KERN_ERR "RPC: rpc_shutdown_client clnt %p tasks=%d\n", linux-2.6-softmac-git.patch: include/net/ieee80211.h | 8 include/net/ieee80211softmac.h | 292 ++++++++++++++ include/net/ieee80211softmac_wx.h | 94 ++++ net/ieee80211/Kconfig | 1 net/ieee80211/Makefile | 1 net/ieee80211/ieee80211_module.c | 2 net/ieee80211/ieee80211_rx.c | 4 net/ieee80211/ieee80211_wx.c | 89 ++++ net/ieee80211/softmac/Kconfig | 10 net/ieee80211/softmac/Makefile | 9 net/ieee80211/softmac/ieee80211softmac_assoc.c | 392 +++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_auth.c | 376 +++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_event.c | 159 ++++++++ net/ieee80211/softmac/ieee80211softmac_io.c | 474 ++++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_module.c | 456 +++++++++++++++++++++++ net/ieee80211/softmac/ieee80211softmac_priv.h | 237 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_scan.c | 237 ++++++++++++ net/ieee80211/softmac/ieee80211softmac_wx.c | 412 ++++++++++++++++++++ 18 files changed, 3250 insertions(+), 3 deletions(-) Index: linux-2.6-softmac-git.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-softmac-git.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-softmac-git.patch 9 Jan 2006 20:42:13 -0000 1.1 +++ linux-2.6-softmac-git.patch 26 Jan 2006 22:14:34 -0000 1.2 @@ -1,33 +1,54 @@ diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h -index cde2f4f..df05f46 100644 +index df05f46..c1cb23a 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h -@@ -363,8 +363,9 @@ enum ieee80211_reasoncode { - #define IEEE80211_OFDM_SHIFT_MASK_A 4 +@@ -1122,6 +1122,14 @@ extern int ieee80211_wx_set_encodeext(st + extern int ieee80211_wx_get_encodeext(struct ieee80211_device *ieee, + struct iw_request_info *info, + union iwreq_data *wrqu, char *extra); ++extern int ieee80211_wx_set_auth(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, ++ char *extra); ++extern int ieee80211_wx_get_auth(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, ++ char *extra); - /* NOTE: This data is for statistical purposes; not all hardware provides this -- * information for frames received. Not setting these will not cause -- * any adverse affects. */ -+ * information for frames received. -+ * For ieee80211_rx_mgt, you need to set at least the 'len' parameter. -+ */ - struct ieee80211_rx_stats { - u32 mac_time; - s8 rssi; -@@ -1088,6 +1089,7 @@ extern int ieee80211_tx_frame(struct iee - /* ieee80211_rx.c */ - extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, - struct ieee80211_rx_stats *rx_stats); -+/* make sure to set stats->len */ - extern void ieee80211_rx_mgt(struct ieee80211_device *ieee, - struct ieee80211_hdr_4addr *header, - struct ieee80211_rx_stats *stats); + static inline void ieee80211_increment_scans(struct ieee80211_device *ieee) + { diff --git a/include/net/ieee80211softmac.h b/include/net/ieee80211softmac.h new file mode 100644 -index 0000000..7264bd8 +index 0000000..b971d8c --- /dev/null +++ b/include/net/ieee80211softmac.h -@@ -0,0 +1,266 @@ +@@ -0,0 +1,292 @@ ++/* ++ * ieee80211softmac.h - public interface to the softmac ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#ifndef IEEE80211SOFTMAC_H_ +#define IEEE80211SOFTMAC_H_ + @@ -296,10 +317,38 @@ +#endif /* IEEE80211SOFTMAC_H_ */ diff --git a/include/net/ieee80211softmac_wx.h b/include/net/ieee80211softmac_wx.h new file mode 100644 -index 0000000..165ea4c +index 0000000..3e0be45 --- /dev/null +++ b/include/net/ieee80211softmac_wx.h -@@ -0,0 +1,66 @@ +@@ -0,0 +1,94 @@ ++/* ++ * This file contains the prototypes for the wireless extension ++ * handlers that the softmac API provides. Include this file to ++ * use the wx handlers, you can assign these directly. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#ifndef _IEEE80211SOFTMAC_WX_H +#define _IEEE80211SOFTMAC_WX_H + @@ -384,99 +433,6 @@ ieee80211_geo.o +obj-$(CONFIG_IEEE80211_SOFTMAC) += softmac/ -diff --git a/net/ieee80211/ieee80211_crypt_wep.c b/net/ieee80211/ieee80211_crypt_wep.c -index 073aebd..f8dca31 100644 ---- a/net/ieee80211/ieee80211_crypt_wep.c -+++ b/net/ieee80211/ieee80211_crypt_wep.c -@@ -75,22 +75,14 @@ static void prism2_wep_deinit(void *priv - kfree(priv); - } - --/* Perform WEP encryption on given skb that has at least 4 bytes of headroom -- * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted, -- * so the payload length increases with 8 bytes. -- * -- * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data)) -- */ --static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) -+/* Add WEP IV/key info to a frame that has at least 4 bytes of headroom */ -+static int prism2_wep_build_iv(struct sk_buff *skb, int hdr_len, void *priv) - { - struct prism2_wep_data *wep = priv; -- u32 crc, klen, len; -- u8 key[WEP_KEY_LEN + 3]; -- u8 *pos, *icv; -- struct scatterlist sg; -- -- if (skb_headroom(skb) < 4 || skb_tailroom(skb) < 4 || -- skb->len < hdr_len) -+ u32 klen, len; -+ u8 *pos; -+ -+ if (skb_headroom(skb) < 4 || skb->len < hdr_len) - return -1; - - len = skb->len - hdr_len; -@@ -112,15 +104,47 @@ static int prism2_wep_encrypt(struct sk_ - } - - /* Prepend 24-bit IV to RC4 key and TX frame */ -- *pos++ = key[0] = (wep->iv >> 16) & 0xff; -- *pos++ = key[1] = (wep->iv >> 8) & 0xff; -- *pos++ = key[2] = wep->iv & 0xff; -+ *pos++ = (wep->iv >> 16) & 0xff; -+ *pos++ = (wep->iv >> 8) & 0xff; -+ *pos++ = wep->iv & 0xff; - *pos++ = wep->key_idx << 6; - -+ return 0; -+} -+ -+/* Perform WEP encryption on given skb that has at least 4 bytes of headroom -+ * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted, -+ * so the payload length increases with 8 bytes. -+ * -+ * WEP frame payload: IV + TX key idx, RC4(data), ICV = RC4(CRC32(data)) -+ */ -+static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv) -+{ -+ struct prism2_wep_data *wep = priv; -+ u32 crc, klen, len; -+ u8 *pos, *icv; -+ struct scatterlist sg; -+ u8 key[WEP_KEY_LEN + 3]; -+ -+ /* other checks are in prism2_wep_build_iv */ -+ if (skb_tailroom(skb) < 4) -+ return -1; -+ -+ /* add the IV to the frame */ -+ if (prism2_wep_build_iv(skb, hdr_len, priv)) -+ return -1; -+ -+ /* Copy the IV into the first 3 bytes of the key */ -+ memcpy(key, skb->data + hdr_len, 3); -+ - /* Copy rest of the WEP key (the secret part) */ - memcpy(key + 3, wep->key, wep->key_len); -+ -+ len = skb->len - hdr_len - 4; -+ pos = skb->data + hdr_len + 4; -+ klen = 3 + wep->key_len; - -- /* Append little-endian CRC32 and encrypt it to produce ICV */ -+ /* Append little-endian CRC32 over only the data and encrypt it to produce ICV */ - crc = ~crc32_le(~0, pos, len); - icv = skb_put(skb, 4); - icv[0] = crc; -@@ -231,6 +255,7 @@ static struct ieee80211_crypto_ops ieee8 - .name = "WEP", - .init = prism2_wep_init, - .deinit = prism2_wep_deinit, -+ .build_iv = prism2_wep_build_iv, - .encrypt_mpdu = prism2_wep_encrypt, - .decrypt_mpdu = prism2_wep_decrypt, - .encrypt_msdu = NULL, diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c index 321287b..22abfca 100644 --- a/net/ieee80211/ieee80211_module.c @@ -491,7 +447,7 @@ static int show_debug_level(char *page, char **start, off_t offset, int count, int *eof, void *data) diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c -index 4cc6f41..9943096 100644 +index 5e33803..64eceb7 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c @@ -1289,9 +1289,9 @@ static inline void update_network(struct @@ -506,32 +462,109 @@ } static inline void ieee80211_process_probe_response(struct ieee80211_device -diff --git a/net/ieee80211/ieee80211_tx.c b/net/ieee80211/ieee80211_tx.c -index 445f206..e5b33c8 100644 ---- a/net/ieee80211/ieee80211_tx.c -+++ b/net/ieee80211/ieee80211_tx.c -@@ -288,7 +288,7 @@ int ieee80211_xmit(struct sk_buff *skb, - /* Determine total amount of storage required for TXB packets */ - bytes = skb->len + SNAP_SIZE + sizeof(u16); - -- if (host_encrypt) -+ if (host_encrypt || host_build_iv) - fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA | - IEEE80211_FCTL_PROTECTED; - else diff --git a/net/ieee80211/ieee80211_wx.c b/net/ieee80211/ieee80211_wx.c -index 181755f..406d5b9 100644 +index 406d5b9..2f16cbe 100644 --- a/net/ieee80211/ieee80211_wx.c +++ b/net/ieee80211/ieee80211_wx.c -@@ -284,7 +284,7 @@ int ieee80211_wx_set_encode(struct ieee8 - }; - int i, key, key_provided, len; - struct ieee80211_crypt_data **crypt; -- int host_crypto = ieee->host_encrypt || ieee->host_decrypt; -+ int host_crypto = ieee->host_encrypt || ieee->host_decrypt || ieee->host_build_iv; +@@ -726,9 +726,98 @@ int ieee80211_wx_get_encodeext(struct ie + return 0; + } - IEEE80211_DEBUG_WX("SET_ENCODE\n"); ++int ieee80211_wx_set_auth(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, ++ char *extra) ++{ ++ struct ieee80211_device *ieee = netdev_priv(dev); ++ unsigned long flags; ++ int err = 0; ++ ++ spin_lock_irqsave(&ieee->lock, flags); ++ ++ switch (wrqu->param.flags & IW_AUTH_INDEX) { ++ case IW_AUTH_WPA_VERSION: ++ case IW_AUTH_CIPHER_PAIRWISE: ++ case IW_AUTH_CIPHER_GROUP: ++ case IW_AUTH_KEY_MGMT: ++ /* ++ * Host AP driver does not use these parameters and allows ++ * wpa_supplicant to control them internally. ++ */ ++ break; ++ case IW_AUTH_TKIP_COUNTERMEASURES: ++ break; /* FIXME */ ++ case IW_AUTH_DROP_UNENCRYPTED: ++ ieee->drop_unencrypted = !!wrqu->param.value; ++ break; ++ case IW_AUTH_80211_AUTH_ALG: ++ break; /* FIXME */ ++ case IW_AUTH_WPA_ENABLED: ++ ieee->privacy_invoked = ieee->wpa_enabled = !!wrqu->param.value; ++ break; ++ case IW_AUTH_RX_UNENCRYPTED_EAPOL: ++ ieee->ieee802_1x = !!wrqu->param.value; ++ break; ++ case IW_AUTH_PRIVACY_INVOKED: ++ ieee->privacy_invoked = !!wrqu->param.value; ++ break; ++ default: ++ err = -EOPNOTSUPP; ++ break; ++ } ++ spin_unlock_irqrestore(&ieee->lock, flags); ++ return err; ++} ++ ++int ieee80211_wx_get_auth(struct net_device *dev, ++ struct iw_request_info *info, ++ union iwreq_data *wrqu, ++ char *extra) ++{ ++ struct ieee80211_device *ieee = netdev_priv(dev); ++ unsigned long flags; ++ int err = 0; ++ ++ spin_lock_irqsave(&ieee->lock, flags); ++ ++ switch (wrqu->param.flags & IW_AUTH_INDEX) { ++ case IW_AUTH_WPA_VERSION: ++ case IW_AUTH_CIPHER_PAIRWISE: ++ case IW_AUTH_CIPHER_GROUP: ++ case IW_AUTH_KEY_MGMT: ++ case IW_AUTH_TKIP_COUNTERMEASURES: /* FIXME */ ++ case IW_AUTH_80211_AUTH_ALG: /* FIXME */ ++ /* ++ * Host AP driver does not use these parameters and allows ++ * wpa_supplicant to control them internally. ++ */ ++ err = -EOPNOTSUPP; ++ break; ++ case IW_AUTH_DROP_UNENCRYPTED: ++ wrqu->param.value = ieee->drop_unencrypted; ++ break; ++ case IW_AUTH_WPA_ENABLED: ++ wrqu->param.value = ieee->wpa_enabled; ++ break; ++ case IW_AUTH_RX_UNENCRYPTED_EAPOL: ++ wrqu->param.value = ieee->ieee802_1x; ++ break; ++ default: ++ err = -EOPNOTSUPP; ++ break; ++ } ++ spin_unlock_irqrestore(&ieee->lock, flags); ++ return err; ++} ++ + EXPORT_SYMBOL(ieee80211_wx_set_encodeext); + EXPORT_SYMBOL(ieee80211_wx_get_encodeext); + EXPORT_SYMBOL(ieee80211_wx_get_scan); + EXPORT_SYMBOL(ieee80211_wx_set_encode); + EXPORT_SYMBOL(ieee80211_wx_get_encode); ++ ++EXPORT_SYMBOL_GPL(ieee80211_wx_set_auth); ++EXPORT_SYMBOL_GPL(ieee80211_wx_get_auth); diff --git a/net/ieee80211/softmac/Kconfig b/net/ieee80211/softmac/Kconfig new file mode 100644 index 0000000..6cd9f34 @@ -565,10 +598,36 @@ + ieee80211softmac_event.o diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c new file mode 100644 -index 0000000..9848744 +index 0000000..b29fb1c --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c -@@ -0,0 +1,356 @@ +@@ -0,0 +1,392 @@ ++/* ++ * This file contains the softmac's association logic. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#include "ieee80211softmac_priv.h" + +/* @@ -735,9 +794,14 @@ + if (mac->associnfo.bssvalid) + found = ieee80211softmac_get_network_by_bssid(mac, mac->associnfo.bssid); + -+ /* Search the ieee80211 networks for this network if we didn't find it */ -+ if (!found) ++ /* Search the ieee80211 networks for this network if we didn't find it by bssid, ++ * but only if we've scanned at least once (to get a better list of networks to ++ * select from). If we have not scanned before, the !found logic below will be ++ * invoked and will scan. */ ++ if (!found && (mac->associnfo.scan_retry < IEEE80211SOFTMAC_ASSOC_SCAN_RETRY_LIMIT)) + { ++ s8 rssi = -128; /* if I don't initialise, gcc emits an invalid warning ++ because it cannot follow the best pointer logic. */ + spin_lock_irqsave(&mac->ieee->lock, flags); + list_for_each_entry(net, &mac->ieee->network_list, list) { + /* we're supposed to find the network with @@ -745,7 +809,7 @@ + * any network with a specific ESSID, and many + * different ones could have that. + * -+ * I'll for now implement just finding one at all ++ * I'll for now just go with the reported rssi. + * + * We also should take into account the rateset + * here to find the best BSSID to try. @@ -753,15 +817,17 @@ + if (network_matches_request(mac, net)) { + if (!best) { + best = net; ++ rssi = best->stats.rssi; + continue; + } + /* we already had a matching network, so + * compare their properties to get the + * better of the two ... (see above) + */ -+ /* TODO */ -+ /* for now, just */ -+ break; ++ if (rssi < net->stats.rssi) { ++ best = net; ++ rssi = best->stats.rssi; ++ } + } + } + /* if we unlock here, we might get interrupted and the `best' @@ -785,12 +851,10 @@ + * NB: this also happens if we had no memory to copy the network info... + * Maybe we can hope to have more memory after scanning finishes ;) + */ -+ dprintk(KERN_INFO PFX "Associate: Network not known, trying to initiate scan: "); ++ dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n"); + ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify, NULL); + if (ieee80211softmac_start_scan(mac)) -+ dprintk("failed.\n"); -+ else -+ dprintk("ok.\n"); ++ dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n"); + return; + } + else { @@ -799,7 +863,7 @@ + mac->associated = 0; + spin_unlock_irqrestore(&mac->lock, flags); + -+ dprintk(KERN_INFO PFX "Unable to find network after scan!\n"); ++ dprintk(KERN_INFO PFX "Unable to find matching network after scan!\n"); + ieee80211softmac_call_events(mac, IEEE80211SOFTMAC_EVENT_ASSOCIATE_NET_NOT_FOUND, NULL); + return; + } @@ -839,7 +903,7 @@ + if (mac->set_bssid_filter) + mac->set_bssid_filter(mac->dev, net->bssid); + memcpy(mac->ieee->bssid, net->bssid, ETH_ALEN); -+ mac->dev->flags |= IFF_RUNNING; ++ netif_carrier_on(mac->dev); + + mac->association_id = le16_to_cpup(&resp->aid); +} @@ -916,21 +980,52 @@ +{ + struct ieee80211softmac_device *mac = ieee80211_priv(dev); + unsigned long flags; ++ if (memcmp(disassoc->header.addr2, mac->associnfo.bssid, ETH_ALEN)) ++ return 0; ++ if (memcmp(disassoc->header.addr1, mac->dev->dev_addr, ETH_ALEN)) ++ return 0; + dprintk(KERN_INFO PFX "got disassoc frame\n"); -+ ++ netif_carrier_off(dev); + spin_lock_irqsave(&mac->lock, flags); + mac->associnfo.bssvalid = 0; + mac->associated = 0; ++ schedule_work(&mac->associnfo.work); + spin_unlock_irqrestore(&mac->lock, flags); + + return 0; +} diff --git a/net/ieee80211/softmac/ieee80211softmac_auth.c b/net/ieee80211/softmac/ieee80211softmac_auth.c new file mode 100644 -index 0000000..5a77352 +index 0000000..84ad029 --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_auth.c -@@ -0,0 +1,348 @@ +@@ -0,0 +1,376 @@ ++/* ++ * This file contains the softmac's authentication logic. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#include "ieee80211softmac_priv.h" + +static void ieee80211softmac_auth_queue(void *data); @@ -1211,6 +1306,8 @@ + kfree(net->challenge); + kfree(net); + ++ /* can't transmit data right now... */ ++ netif_carrier_off(mac->dev); + /* let's try to re-associate */ + schedule_work(&mac->associnfo.work); + spin_unlock_irqrestore(&mac->lock, flags); @@ -1281,16 +1378,40 @@ +} diff --git a/net/ieee80211/softmac/ieee80211softmac_event.c b/net/ieee80211/softmac/ieee80211softmac_event.c new file mode 100644 -index 0000000..b640a58 +index 0000000..0ed8e30 --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_event.c -@@ -0,0 +1,135 @@ -+#include "ieee80211softmac_priv.h" -+ +@@ -0,0 +1,159 @@ +/* + * Event system -+ * Also see comments in public header file ++ * Also see comments in public header file and longer explanation below. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA + * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ ++#include "ieee80211softmac_priv.h" ++ ++/* + * Each event has associated to it + * - an event type (see constants in public header) + * - an event context (see below) @@ -1422,7 +1543,7 @@ +} diff --git a/net/ieee80211/softmac/ieee80211softmac_io.c b/net/ieee80211/softmac/ieee80211softmac_io.c new file mode 100644 -index 0000000..a142dae +index 0000000..febc51d --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_io.c @@ -0,0 +1,474 @@ @@ -1736,7 +1857,7 @@ +{ + /* Allocate Packet */ + (*pkt) = (struct ieee80211_disassoc *)ieee80211softmac_alloc_mgt(2); -+ if (unlikely(pkt == NULL)) ++ if (unlikely((*pkt) == NULL)) + return 0; + ieee80211softmac_hdr_3addr(mac, &((*pkt)->header), type, net->bssid, net->bssid); + /* Reason */ @@ -1902,10 +2023,36 @@ +} diff --git a/net/ieee80211/softmac/ieee80211softmac_module.c b/net/ieee80211/softmac/ieee80211softmac_module.c new file mode 100644 -index 0000000..79ef959 +index 0000000..671f83b --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_module.c -@@ -0,0 +1,436 @@ +@@ -0,0 +1,456 @@ ++/* ++ * Contains some basic softmac functions along with module registration code etc. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#include "ieee80211softmac_priv.h" +#include + @@ -1948,22 +2095,12 @@ + softmac->txrates.default_rate = IEEE80211_CCK_RATE_1MB; + softmac->txrates.default_fallback = IEEE80211_CCK_RATE_1MB; + -+ /* should we also assign softmac->mgmt_xmit here so -+ * that it is always valid? If so, we probably want -+ * to define a new function for that which just -+ * wraps ieee80211_tx_frame -+ */ ++ /* to start with, we can't send anything ... */ ++ netif_carrier_off(dev); + -+ /* until associated, we're not ready */ -+ dev->flags &= ~IFF_RUNNING; -+ + return dev; -+ -+err_free_ieee80211: -+ free_ieee80211(dev); -+ -+ return NULL; +} ++EXPORT_SYMBOL_GPL(alloc_ieee80211softmac); + +/* Clears the pending work queue items, stops all scans, etc. */ +void @@ -1996,7 +2133,7 @@ + spin_unlock_irqrestore(&sm->lock, flags); + flush_scheduled_work(); + -+ // now we should be save and no longer need locking... ++ /* now we should be save and no longer need locking... */ + spin_lock_irqsave(&sm->lock, flags); + /* Free all pending auth work items */ + list_for_each_entry_safe(authptr, authtmp, &sm->auth_queue, list) { @@ -2020,6 +2157,7 @@ + + spin_unlock_irqrestore(&sm->lock, flags); +} ++EXPORT_SYMBOL_GPL(ieee80211softmac_clear_pending_work); + +void free_ieee80211softmac(struct net_device *dev) +{ @@ -2029,6 +2167,7 @@ + kfree(sm->wpa.IE); + free_ieee80211(dev); +} ++EXPORT_SYMBOL_GPL(free_ieee80211softmac); + +static void ieee80211softmac_start_check_rates(struct ieee80211softmac_device *mac) +{ @@ -2087,6 +2226,7 @@ + if (mac->txrates_change) + mac->txrates_change(dev, change, &oldrates); +} ++EXPORT_SYMBOL_GPL(ieee80211softmac_start); + +void ieee80211softmac_stop(struct net_device *dev) +{ @@ -2094,6 +2234,7 @@ + + ieee80211softmac_clear_pending_work(mac); +} ++EXPORT_SYMBOL_GPL(ieee80211softmac_stop); + +void ieee80211softmac_set_rates(struct net_device *dev, u8 count, u8 *rates) +{ @@ -2105,6 +2246,7 @@ + mac->ratesinfo.count = count; + spin_unlock_irqrestore(&mac->lock, flags); +} ++EXPORT_SYMBOL_GPL(ieee80211softmac_set_rates); + +static u8 raise_rate(struct ieee80211softmac_device *mac, u8 rate) +{ @@ -2187,6 +2329,7 @@ + + spin_unlock_irqrestore(&mac->lock, flags); +} ++EXPORT_SYMBOL_GPL(ieee80211softmac_fragment_lost); + +static int rate_cmp(const void *a_, const void *b_) { + u8 *a, *b; @@ -2334,20 +2477,44 @@ +} + +MODULE_LICENSE("GPL"); -+ -+EXPORT_SYMBOL_GPL(alloc_ieee80211softmac); -+EXPORT_SYMBOL_GPL(free_ieee80211softmac); -+EXPORT_SYMBOL_GPL(ieee80211softmac_set_rates); -+EXPORT_SYMBOL_GPL(ieee80211softmac_start); -+EXPORT_SYMBOL_GPL(ieee80211softmac_stop); -+EXPORT_SYMBOL_GPL(ieee80211softmac_fragment_lost); -+EXPORT_SYMBOL_GPL(ieee80211softmac_clear_pending_work); ++MODULE_AUTHOR("Johannes Berg"); ++MODULE_AUTHOR("Joseph Jezak"); ++MODULE_AUTHOR("Larry Finger"); ++MODULE_AUTHOR("Danny van Dyk"); ++MODULE_AUTHOR("Michael Buesch"); ++MODULE_DESCRIPTION("802.11 software MAC"); diff --git a/net/ieee80211/softmac/ieee80211softmac_priv.h b/net/ieee80211/softmac/ieee80211softmac_priv.h new file mode 100644 -index 0000000..44a8ba4 +index 0000000..5b98c3e --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_priv.h -@@ -0,0 +1,211 @@ +@@ -0,0 +1,237 @@ ++/* ++ * Internal softmac API definitions. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. ++ */ ++ +#ifndef IEEE80211SOFTMAC_PRIV_H_ +#define IEEE80211SOFTMAC_PRIV_H_ + @@ -2561,14 +2728,36 @@ +#endif /* IEEE80211SOFTMAC_PRIV_H_ */ diff --git a/net/ieee80211/softmac/ieee80211softmac_scan.c b/net/ieee80211/softmac/ieee80211softmac_scan.c new file mode 100644 -index 0000000..1a1eda4 +index 0000000..d90d31f --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_scan.c -@@ -0,0 +1,216 @@ +@@ -0,0 +1,237 @@ +/* + * Scanning routines. + * + * These are not exported because they're assigned to the function pointers. ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. + */ + +#include @@ -2651,7 +2840,6 @@ + + if (!invalid_channel) { + sm->set_channel(sm->dev, si->channels[current_channel_idx].channel); -+ //TODO: Probe the channel + // FIXME make this user configurable (active/passive) + if(ieee80211softmac_send_mgt_frame(sm, NULL, IEEE80211_STYPE_PROBE_REQ, 0)) + printkl(KERN_DEBUG PFX "Sending Probe Request Failed\n"); @@ -2783,12 +2971,34 @@ +EXPORT_SYMBOL_GPL(ieee80211softmac_scan_finished); diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c new file mode 100644 -index 0000000..ca11737 +index 0000000..17d30f4 --- /dev/null +++ b/net/ieee80211/softmac/ieee80211softmac_wx.c -@@ -0,0 +1,390 @@ +@@ -0,0 +1,412 @@ +/* + * This file contains our _wx handlers. Make sure you EXPORT_SYMBOL_GPL them ++ * ++ * Copyright (c) 2005 Johannes Berg ++ * Joseph Jezak ++ * Larry Finger ++ * Danny van Dyk ++ * Michael Buesch ++ * ++ * 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 St, Fifth Floor, Boston, MA 02110-1301 USA ++ * ++ * The full GNU General Public License is included in this distribution in the ++ * file called COPYING. + */ + +#include "ieee80211softmac_priv.h" linux-2.6-tux.patch: arch/alpha/kernel/systbls.S | 8 arch/i386/kernel/syscall_table.S | 10 arch/ia64/kernel/entry.S | 8 arch/ia64/kernel/ia64_ksyms.c | 5 arch/x86_64/ia32/ia32entry.S | 10 fs/dcache.c | 36 fs/exec.c | 2 fs/fcntl.c | 4 fs/namei.c | 18 fs/namespace.c | 2 fs/open.c | 4 fs/pipe.c | 2 fs/read_write.c | 2 include/asm-alpha/fcntl.h | 1 include/asm-generic/fcntl.h | 4 include/asm-i386/unistd.h | 5 include/asm-ia64/unistd.h | 2 include/asm-sparc/fcntl.h | 1 include/asm-sparc64/fcntl.h | 1 include/asm-x86_64/unistd.h | 10 include/linux/buffer_head.h | 1 include/linux/dcache.h | 8 include/linux/errno.h | 3 include/linux/file.h | 2 include/linux/fs.h | 7 include/linux/kmod.h | 2 include/linux/namei.h | 2 include/linux/net.h | 1 include/linux/sched.h | 5 include/linux/skbuff.h | 2 include/linux/socket.h | 5 include/linux/sysctl.h | 50 include/net/sock.h | 8 include/net/tcp.h | 3 include/net/tux.h | 804 ++++++++++++++ include/net/tux_u.h | 163 ++ kernel/exit.c | 7 kernel/fork.c | 1 kernel/kmod.c | 28 kernel/signal.c | 1 mm/filemap.c | 19 mm/truncate.c | 2 net/Kconfig | 1 net/Makefile | 1 net/core/sock.c | 5 net/ipv4/tcp.c | 3 net/ipv4/tcp_input.c | 1 net/ipv4/tcp_output.c | 3 net/socket.c | 197 ++- net/tux/Kconfig | 25 net/tux/Makefile | 12 net/tux/abuf.c | 190 +++ net/tux/accept.c | 863 +++++++++++++++ net/tux/cachemiss.c | 265 ++++ net/tux/cgi.c | 171 +++ net/tux/directory.c | 302 +++++ net/tux/extcgi.c | 329 +++++ net/tux/gzip.c | 40 net/tux/input.c | 641 +++++++++++ net/tux/logger.c | 837 ++++++++++++++ net/tux/main.c | 1417 +++++++++++++++++++++++++ net/tux/mod.c | 262 ++++ net/tux/output.c | 352 ++++++ net/tux/parser.h | 102 + net/tux/postpone.c | 77 + net/tux/proc.c | 1149 ++++++++++++++++++++ net/tux/proto_ftp.c | 1555 +++++++++++++++++++++++++++ net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++++++++ net/tux/redirect.c | 172 +++ net/tux/times.c | 392 ++++++ net/tux/times.h | 26 net/tux/userspace.c | 27 72 files changed, 12775 insertions(+), 98 deletions(-) Index: linux-2.6-tux.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-tux.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-tux.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-tux.patch 26 Jan 2006 22:14:34 -0000 1.3 @@ -1,76 +1,3 @@ - arch/alpha/kernel/systbls.S | 8 - arch/i386/kernel/syscall_table.S | 10 - arch/ia64/kernel/entry.S | 8 - arch/ia64/kernel/ia64_ksyms.c | 5 - arch/x86_64/ia32/ia32entry.S | 10 - fs/dcache.c | 36 - fs/exec.c | 2 - fs/fcntl.c | 4 - fs/namei.c | 18 - fs/namespace.c | 2 - fs/open.c | 4 - fs/pipe.c | 2 - fs/read_write.c | 2 - include/asm-alpha/fcntl.h | 1 - include/asm-generic/fcntl.h | 4 - include/asm-i386/unistd.h | 5 - include/asm-ia64/unistd.h | 2 - include/asm-sparc/fcntl.h | 1 - include/asm-sparc64/fcntl.h | 1 - include/asm-x86_64/unistd.h | 10 - include/linux/buffer_head.h | 1 - include/linux/dcache.h | 8 - include/linux/errno.h | 3 - include/linux/file.h | 2 - include/linux/fs.h | 7 - include/linux/kmod.h | 2 - include/linux/namei.h | 2 - include/linux/net.h | 1 - include/linux/sched.h | 5 - include/linux/skbuff.h | 2 - include/linux/socket.h | 5 - include/linux/sysctl.h | 50 - include/net/sock.h | 8 - include/net/tcp.h | 3 - include/net/tux.h | 804 ++++++++++++++ - include/net/tux_u.h | 163 ++ - kernel/exit.c | 7 - kernel/fork.c | 1 - kernel/kmod.c | 28 - kernel/signal.c | 1 - mm/filemap.c | 19 - mm/truncate.c | 2 - net/Kconfig | 1 - net/Makefile | 1 - net/core/sock.c | 5 - net/ipv4/tcp.c | 3 - net/ipv4/tcp_input.c | 1 - net/ipv4/tcp_output.c | 1 - net/socket.c | 197 ++- - net/tux/Kconfig | 25 - net/tux/Makefile | 12 - net/tux/abuf.c | 190 +++ - net/tux/accept.c | 863 +++++++++++++++ - net/tux/cachemiss.c | 265 ++++ - net/tux/cgi.c | 171 +++ - net/tux/directory.c | 302 +++++ - net/tux/extcgi.c | 329 +++++ - net/tux/gzip.c | 40 - net/tux/input.c | 641 +++++++++++ - net/tux/logger.c | 837 ++++++++++++++ - net/tux/main.c | 1417 +++++++++++++++++++++++++ - net/tux/mod.c | 262 ++++ - net/tux/output.c | 352 ++++++ - net/tux/parser.h | 102 + - net/tux/postpone.c | 77 + - net/tux/proc.c | 1149 ++++++++++++++++++++ - net/tux/proto_ftp.c | 1555 +++++++++++++++++++++++++++ - net/tux/proto_http.c | 2197 +++++++++++++++++++++++++++++++++++++++ - net/tux/redirect.c | 172 +++ - net/tux/times.c | 392 ++++++ - net/tux/times.h | 26 - net/tux/userspace.c | 27 - 72 files changed, 12773 insertions(+), 98 deletions(-) Index: linux/arch/alpha/kernel/systbls.S =================================================================== @@ -96,7 +23,7 @@ =================================================================== --- linux.orig/arch/i386/kernel/syscall_table.S +++ linux/arch/i386/kernel/syscall_table.S -@@ -222,7 +222,15 @@ ENTRY(sys_call_table) +@@ -221,7 +221,15 @@ ENTRY(sys_call_table) .long sys_madvise .long sys_getdents64 /* 220 */ .long sys_fcntl64 @@ -137,7 +64,7 @@ =================================================================== --- linux.orig/arch/ia64/kernel/ia64_ksyms.c +++ linux/arch/ia64/kernel/ia64_ksyms.c -@@ -58,6 +58,11 @@ EXPORT_SYMBOL(__strlen_user); +@@ -59,6 +59,11 @@ EXPORT_SYMBOL(__strlen_user); EXPORT_SYMBOL(__strncpy_from_user); EXPORT_SYMBOL(__strnlen_user); @@ -178,11 +105,11 @@ { if (dentry->d_op && dentry->d_op->d_release) dentry->d_op->d_release(dentry); -+ if (dentry->d_extra_attributes) { -+ kfree(dentry->d_extra_attributes); -+ dentry->d_extra_attributes = NULL; -+ } - call_rcu(&dentry->d_rcu, d_callback); ++ if (dentry->d_extra_attributes) { ++ kfree(dentry->d_extra_attributes); ++ dentry->d_extra_attributes = NULL; ++ } + call_rcu(&dentry->d_u.d_rcu, d_callback); } @@ -742,6 +746,7 @@ struct dentry *d_alloc(struct dentry * p @@ -197,18 +124,18 @@ /* Unhash the target: dput() will then get rid of it */ __d_drop(target); -+ /* flush any possible attributes */ -+ if (dentry->d_extra_attributes) { -+ kfree(dentry->d_extra_attributes); -+ dentry->d_extra_attributes = NULL; -+ } -+ if (target->d_extra_attributes) { -+ kfree(target->d_extra_attributes); -+ target->d_extra_attributes = NULL; -+ } -+ - list_del(&dentry->d_child); - list_del(&target->d_child); ++ /* flush any possible attributes */ ++ if (dentry->d_extra_attributes) { ++ kfree(dentry->d_extra_attributes); ++ dentry->d_extra_attributes = NULL; ++ } ++ if (target->d_extra_attributes) { ++ kfree(target->d_extra_attributes); ++ target->d_extra_attributes = NULL; ++ } ++ + list_del(&dentry->d_u.d_child); + list_del(&target->d_u.d_child); @@ -1353,7 +1368,7 @@ already_unhashed: * @@ -256,7 +183,7 @@ =================================================================== --- linux.orig/fs/exec.c +++ linux/fs/exec.c -@@ -1450,6 +1450,8 @@ int do_coredump(long signr, int exit_cod +@@ -1440,6 +1440,8 @@ int do_coredump(long signr, int exit_cod binfmt = current->binfmt; if (!binfmt || !binfmt->core_dump) goto fail; @@ -375,7 +302,7 @@ =================================================================== --- linux.orig/fs/open.c +++ linux/fs/open.c -@@ -542,6 +542,8 @@ out: +@@ -543,6 +543,8 @@ out: return error; } @@ -384,7 +311,7 @@ asmlinkage long sys_fchdir(unsigned int fd) { struct file *file; -@@ -598,6 +600,8 @@ out: +@@ -599,6 +601,8 @@ out: return error; } @@ -410,7 +337,7 @@ =================================================================== --- linux.orig/fs/read_write.c +++ linux/fs/read_write.c -@@ -360,6 +360,8 @@ asmlinkage ssize_t sys_write(unsigned in +@@ -374,6 +374,8 @@ asmlinkage ssize_t sys_write(unsigned in return ret; } @@ -450,15 +377,15 @@ =================================================================== --- linux.orig/include/asm-i386/unistd.h +++ linux/include/asm-i386/unistd.h -@@ -302,6 +302,7 @@ +@@ -303,6 +303,7 @@ - #define NR_syscalls 294 + #define NR_syscalls 295 +#ifndef __KERNEL_SYSCALLS_NO_ERRNO__ /* * user-visible error numbers are in the range -1 - -128: see * -@@ -315,6 +316,10 @@ do { \ +@@ -316,6 +317,10 @@ do { \ return (type) (res); \ } while (0) @@ -531,8 +458,8 @@ =================================================================== --- linux.orig/include/linux/buffer_head.h +++ linux/include/linux/buffer_head.h -@@ -200,6 +200,7 @@ int cont_prepare_write(struct page*, uns - int generic_cont_expand(struct inode *inode, loff_t size) ; +@@ -201,6 +201,7 @@ int generic_cont_expand(struct inode *in + int generic_cont_expand_simple(struct inode *inode, loff_t size); int block_commit_write(struct page *page, unsigned from, unsigned to); int block_sync_page(struct page *); +void flush_inode_pages (struct inode * inode); @@ -543,15 +470,15 @@ =================================================================== --- linux.orig/include/linux/dcache.h +++ linux/include/linux/dcache.h -@@ -102,6 +102,7 @@ struct dentry { +@@ -108,6 +108,7 @@ struct dentry { struct dentry_operations *d_op; struct super_block *d_sb; /* The root of the dentry tree */ void *d_fsdata; /* fs-specific data */ -+ void * d_extra_attributes; /* TUX-specific data */ - struct rcu_head d_rcu; ++ void *d_extra_attributes; /* TUX-specific data */ struct dcookie_struct *d_cookie; /* cookie, if any */ int d_mounted; -@@ -211,6 +212,7 @@ extern void shrink_dcache_sb(struct supe + unsigned char d_iname[DNAME_INLINE_LEN_MIN]; /* small names */ +@@ -216,6 +217,7 @@ extern void shrink_dcache_sb(struct supe extern void shrink_dcache_parent(struct dentry *); extern void shrink_dcache_anon(struct hlist_head *); extern int d_invalidate(struct dentry *); @@ -559,7 +486,7 @@ /* only used at mount-time */ extern struct dentry * d_alloc_root(struct inode *); -@@ -271,8 +273,12 @@ extern struct dentry * __d_lookup(struct +@@ -276,8 +278,12 @@ extern struct dentry * __d_lookup(struct /* validate "insecure" dentry pointer */ extern int d_validate(struct dentry *, struct dentry *); @@ -602,7 +529,7 @@ =================================================================== --- linux.orig/include/linux/fs.h +++ linux/include/linux/fs.h -@@ -1537,7 +1537,7 @@ ssize_t generic_file_write_nolock(struct +@@ -1570,7 +1570,7 @@ ssize_t generic_file_write_nolock(struct extern ssize_t generic_file_sendfile(struct file *, loff_t *, size_t, read_actor_t, void *); extern void do_generic_mapping_read(struct address_space *mapping, struct file_ra_state *, struct file *, @@ -611,7 +538,7 @@ extern void file_ra_state_init(struct file_ra_state *ra, struct address_space *mapping); extern ssize_t generic_file_readv(struct file *filp, const struct iovec *iov, -@@ -1569,14 +1569,15 @@ static inline int xip_truncate_page(stru +@@ -1602,14 +1602,15 @@ static inline int xip_truncate_page(stru static inline void do_generic_file_read(struct file * filp, loff_t *ppos, read_descriptor_t * desc, @@ -670,7 +597,7 @@ =================================================================== --- linux.orig/include/linux/sched.h +++ linux/include/linux/sched.h -@@ -807,6 +807,11 @@ struct task_struct { +@@ -804,6 +804,11 @@ struct task_struct { int (*notifier)(void *priv); void *notifier_data; sigset_t *notifier_mask; @@ -686,7 +613,7 @@ =================================================================== --- linux.orig/include/linux/skbuff.h +++ linux/include/linux/skbuff.h -@@ -1327,6 +1327,8 @@ static inline unsigned int skb_checksum_ +@@ -1328,6 +1328,8 @@ static inline unsigned int skb_checksum_ __skb_checksum_complete(skb); } @@ -699,7 +626,7 @@ =================================================================== --- linux.orig/include/linux/socket.h +++ linux/include/linux/socket.h -@@ -299,6 +299,11 @@ extern int move_addr_to_user(void *kaddr +@@ -298,6 +298,11 @@ extern int move_addr_to_user(void *kaddr extern int move_addr_to_kernel(void __user *uaddr, int ulen, void *kaddr); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data); @@ -715,7 +642,7 @@ =================================================================== --- linux.orig/include/linux/sysctl.h +++ linux/include/linux/sysctl.h -@@ -205,6 +205,7 @@ enum +@@ -207,6 +207,7 @@ enum NET_SCTP=17, NET_LLC=18, NET_NETFILTER=19, @@ -723,7 +650,7 @@ }; /* /proc/sys/kernel/random */ -@@ -725,6 +726,55 @@ enum { +@@ -731,6 +732,55 @@ enum { NET_BRIDGE_NF_FILTER_VLAN_TAGGED = 4, }; @@ -830,7 +757,7 @@ =================================================================== --- linux.orig/include/net/tcp.h +++ linux/include/net/tcp.h -@@ -310,6 +310,8 @@ extern void tcp_shutdown (struct sock +@@ -263,6 +263,8 @@ extern void tcp_shutdown (struct sock extern int tcp_v4_rcv(struct sk_buff *skb); @@ -839,7 +766,7 @@ extern int tcp_v4_remember_stamp(struct sock *sk); extern int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw); -@@ -467,6 +469,7 @@ extern int tcp_send_synack(struct sock +@@ -422,6 +424,7 @@ extern int tcp_send_synack(struct sock extern void tcp_push_one(struct sock *, unsigned int mss_now); extern void tcp_send_ack(struct sock *sk); extern void tcp_send_delayed_ack(struct sock *sk); @@ -1828,7 +1755,7 @@ =================================================================== --- linux.orig/kernel/exit.c +++ linux/kernel/exit.c -@@ -845,6 +845,13 @@ fastcall NORET_TYPE void do_exit(long co +@@ -844,6 +844,13 @@ fastcall NORET_TYPE void do_exit(long co del_timer_sync(&tsk->signal->real_timer); exit_itimers(tsk->signal); acct_process(code); @@ -1846,7 +1773,7 @@ =================================================================== --- linux.orig/kernel/fork.c +++ linux/kernel/fork.c -@@ -896,6 +896,7 @@ static task_t *copy_process(unsigned lon +@@ -901,6 +901,7 @@ static task_t *copy_process(unsigned lon p = dup_task_struct(current); if (!p) goto fork_out; @@ -1912,7 +1839,7 @@ =================================================================== --- linux.orig/kernel/signal.c +++ linux/kernel/signal.c -@@ -430,6 +430,7 @@ flush_signal_handlers(struct task_struct +@@ -440,6 +440,7 @@ flush_signal_handlers(struct task_struct } } @@ -1924,7 +1851,7 @@ =================================================================== --- linux.orig/mm/filemap.c +++ linux/mm/filemap.c -@@ -718,7 +718,8 @@ void do_generic_mapping_read(struct addr +@@ -733,7 +733,8 @@ void do_generic_mapping_read(struct addr struct file *filp, loff_t *ppos, read_descriptor_t *desc, @@ -1934,7 +1861,7 @@ { struct inode *inode = mapping->host; unsigned long index; -@@ -768,11 +769,21 @@ void do_generic_mapping_read(struct addr +@@ -783,11 +784,21 @@ void do_generic_mapping_read(struct addr find_page: page = find_get_page(mapping, index); if (unlikely(page == NULL)) { @@ -1957,7 +1884,7 @@ page_ok: /* If users can be writing to this page using arbitrary -@@ -1028,7 +1039,7 @@ __generic_file_aio_read(struct kiocb *io +@@ -1048,7 +1059,7 @@ __generic_file_aio_read(struct kiocb *io if (desc.count == 0) continue; desc.error = 0; @@ -1966,7 +1893,7 @@ retval += desc.written; if (desc.error) { retval = retval ?: desc.error; -@@ -1102,7 +1113,7 @@ ssize_t generic_file_sendfile(struct fil +@@ -1122,7 +1133,7 @@ ssize_t generic_file_sendfile(struct fil desc.arg.data = target; desc.error = 0; @@ -1979,7 +1906,7 @@ =================================================================== --- linux.orig/mm/truncate.c +++ linux/mm/truncate.c -@@ -224,6 +224,8 @@ unlock: +@@ -253,6 +253,8 @@ unlock: return ret; } @@ -2048,7 +1975,7 @@ { struct tcp_sock *tp = tcp_sk(sk); int time_to_ack = 0; -@@ -2144,3 +2144,4 @@ EXPORT_SYMBOL(tcp_sendpage); +@@ -2142,3 +2142,4 @@ EXPORT_SYMBOL(tcp_sendpage); EXPORT_SYMBOL(tcp_setsockopt); EXPORT_SYMBOL(tcp_shutdown); EXPORT_SYMBOL(tcp_statistics); @@ -2057,7 +1984,7 @@ =================================================================== --- linux.orig/net/ipv4/tcp_input.c +++ linux/net/ipv4/tcp_input.c -@@ -3433,6 +3433,7 @@ static int tcp_prune_queue(struct sock * +@@ -3473,6 +3473,7 @@ static int tcp_prune_queue(struct sock * return -1; } @@ -2069,7 +1996,16 @@ =================================================================== --- linux.orig/net/ipv4/tcp_output.c +++ linux/net/ipv4/tcp_output.c -@@ -1069,6 +1069,7 @@ void __tcp_push_pending_frames(struct so +@@ -791,6 +791,8 @@ unsigned int tcp_current_mss(struct sock + return mss_now; + } + ++EXPORT_SYMBOL_GPL(tcp_current_mss); ++ + /* Congestion window validation. (RFC2861) */ + + static void tcp_cwnd_validate(struct sock *sk, struct tcp_sock *tp) +@@ -1156,6 +1158,7 @@ void __tcp_push_pending_frames(struct so tcp_check_probe_timer(sk, tp); } } @@ -2273,7 +2209,7 @@ /* * In theory you can't get an open on this inode, but /proc provides * a back door. Remember to keep it shut otherwise you'll let the -@@ -1041,6 +1055,8 @@ static int sock_fasync(int fd, struct fi +@@ -1044,6 +1058,8 @@ static int sock_fasync(int fd, struct fi } out: @@ -2282,9 +2218,9 @@ release_sock(sock->sk); return 0; } -@@ -2067,6 +2083,51 @@ void __init sock_init(void) - #endif - } +@@ -2072,6 +2088,51 @@ static int __init sock_init(void) + + core_initcall(sock_init); /* early initcall */ +int tux_Dprintk; +int tux_TDprintk; @@ -5936,7 +5872,7 @@ + inode = log_filp->f_dentry->d_inode; + mapping = inode->i_mapping; + if (mapping->nrpages > 256) { /* batch stuff up */ -+ down(&inode->i_sem); ++ mutex_lock(&inode->i_mutex); + filemap_fdatawrite(inode->i_mapping); + + /* @@ -5946,7 +5882,7 @@ + */ + invalidate_mapping_pages(mapping, 0, log_filp_last_index); + log_filp_last_index = log_filp->f_pos >> PAGE_CACHE_SHIFT; -+ up(&inode->i_sem); ++ mutex_unlock(&inode->i_mutex); + } + +out_lock: @@ -13852,13 +13788,4 @@ + * + ****************************************************************/ + ---- linux-2.6.14/net/ipv4/tcp_output.c~ 2005-12-12 00:42:02.000000000 -0500 -+++ linux-2.6.14/net/ipv4/tcp_output.c 2005-12-12 00:42:17.000000000 -0500 -@@ -703,6 +703,7 @@ unsigned int tcp_current_mss(struct sock - - return mss_now; - } -+EXPORT_SYMBOL_GPL(tcp_current_mss); - - /* Congestion window validation. (RFC2861) */ - + linux-2.6-vm-clear-unreclaimable.patch: linux-2.6.14/mm/filemap.c | 7 +++++++ linux-2.6.15/mm/page_alloc.c | 5 +++++ 2 files changed, 12 insertions(+) Index: linux-2.6-vm-clear-unreclaimable.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-vm-clear-unreclaimable.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-vm-clear-unreclaimable.patch 9 Jan 2006 20:42:13 -0000 1.1 +++ linux-2.6-vm-clear-unreclaimable.patch 26 Jan 2006 22:14:34 -0000 1.2 @@ -19,18 +19,17 @@ wake_up_page(page, PG_writeback); } EXPORT_SYMBOL(end_page_writeback); ---- linux-2.6.14/mm/page_alloc.c~ 2005-12-10 01:47:51.000000000 -0500 -+++ linux-2.6.14/mm/page_alloc.c 2005-12-10 01:48:25.000000000 -0500 -@@ -657,6 +657,12 @@ static void fastcall free_hot_cold_page( - pcp->count++; - if (pcp->count >= pcp->high) - pcp->count -= free_pages_bulk(zone, pcp->batch, &pcp->list, 0); -+ else if (zone->all_unreclaimable) { +--- linux-2.6.15/mm/page_alloc.c~ 2006-01-09 13:40:03.000000000 -0500 ++++ linux-2.6.15/mm/page_alloc.c 2006-01-09 13:40:50.000000000 -0500 +@@ -722,6 +722,11 @@ static void fastcall free_hot_cold_page( + if (pcp->count >= pcp->high) { + free_pages_bulk(zone, pcp->batch, &pcp->list, 0); + pcp->count -= pcp->batch; ++ } else if (zone->all_unreclaimable) { + spin_lock(&zone->lock); + zone->all_unreclaimable = 0; + zone->pages_scanned = 0; + spin_unlock(&zone->lock); -+ } + } local_irq_restore(flags); put_cpu(); - } linux-2.6-vm-oomkiller-debugging.patch: oom_kill.c | 1 + 1 files changed, 1 insertion(+) Index: linux-2.6-vm-oomkiller-debugging.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-vm-oomkiller-debugging.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-vm-oomkiller-debugging.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-vm-oomkiller-debugging.patch 26 Jan 2006 22:14:34 -0000 1.3 @@ -1,9 +1,9 @@ ---- linux-2.6.12/mm/oom_kill.c~ 2005-06-22 14:16:57.000000000 -0400 -+++ linux-2.6.12/mm/oom_kill.c 2005-06-22 14:17:35.000000000 -0400 -@@ -272,6 +272,7 @@ retry: - /* Found nothing?!?! Either we hang forever, or we panic. */ +--- linux-2.6.15.noarch/mm/oom_kill.c~ 2006-01-15 20:48:36.000000000 -0500 ++++ linux-2.6.15.noarch/mm/oom_kill.c 2006-01-15 20:48:43.000000000 -0500 +@@ -286,6 +286,7 @@ retry: if (!p) { read_unlock(&tasklist_lock); + cpuset_unlock(); + show_mem(); panic("Out of memory and no killable processes...\n"); } linux-2.6-vm-silence-atomic-alloc-failures.patch: gfp.h | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: linux-2.6-vm-silence-atomic-alloc-failures.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-vm-silence-atomic-alloc-failures.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-vm-silence-atomic-alloc-failures.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-vm-silence-atomic-alloc-failures.patch 26 Jan 2006 22:14:34 -0000 1.3 @@ -1,12 +1,11 @@ Atomic failures aren't too interesting. -diff -urNp --exclude-from=/home/davej/.exclude linux-3022/include/linux/gfp.h linux-10000/include/linux/gfp.h ---- linux-3022/include/linux/gfp.h -+++ linux-10000/include/linux/gfp.h -@@ -47,7 +47,7 @@ struct vm_area_struct; - __GFP_COLD|__GFP_NOWARN|__GFP_REPEAT| \ - __GFP_NOFAIL|__GFP_NORETRY|__GFP_NO_GROW|__GFP_COMP) +--- linux-2.6.15/include/linux/gfp.h~ 2006-01-12 18:48:46.000000000 -0500 ++++ linux-2.6.15/include/linux/gfp.h 2006-01-12 18:48:57.000000000 -0500 +@@ -58,7 +58,7 @@ struct vm_area_struct; + __GFP_NOMEMALLOC|__GFP_HARDWALL) + /* GFP_ATOMIC means both !wait (__GFP_WAIT not set) and use emergency pool */ -#define GFP_ATOMIC (__GFP_HIGH) +#define GFP_ATOMIC (__GFP_HIGH | __GFP_NOWARN) #define GFP_NOIO (__GFP_WAIT) linux-2.6-x86-tune-p4.patch: linux-2.6.12/arch/x86_64/Makefile | 4 +--- linux-2.6.15/arch/i386/Makefile.cpu | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) Index: linux-2.6-x86-tune-p4.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-x86-tune-p4.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- linux-2.6-x86-tune-p4.patch 21 Dec 2005 11:24:51 -0000 1.2 +++ linux-2.6-x86-tune-p4.patch 26 Jan 2006 22:14:34 -0000 1.3 @@ -1,10 +1,9 @@ -diff -urNp --exclude-from=/home/davej/.exclude linux-1/arch/i386/Makefile linux-212/arch/i386/Makefile ---- linux-2.6.10/arch/i386/Makefile.cpu -+++ linux-2.6.10/arch/i386/Makefile.cpu -@@ -33,7 +33,7 @@ cflags-$(CONFIG_M486) += -march=i486 +--- linux-2.6.15/arch/i386/Makefile.cpu~ 2006-01-09 11:39:04.000000000 -0500 ++++ linux-2.6.15/arch/i386/Makefile.cpu 2006-01-09 11:39:36.000000000 -0500 +@@ -15,7 +15,7 @@ cflags-$(CONFIG_M486) += -march=i486 cflags-$(CONFIG_M586) += -march=i586 cflags-$(CONFIG_M586TSC) += -march=i586 - cflags-$(CONFIG_M586MMX) += $(call cc-option,-march=pentium-mmx,-march=i586) + cflags-$(CONFIG_M586MMX) += -march=pentium-mmx -cflags-$(CONFIG_M686) += -march=i686 +cflags-$(CONFIG_M686) += -march=i686 $(call tune,pentium4) cflags-$(CONFIG_MPENTIUMII) += -march=i686 $(call tune,pentium2) linux-2.6-xen-merge.patch: ./arch/i386/Kconfig | 76 ./arch/i386/boot-xen/Makefile | 24 ./arch/i386/kernel/Makefile | 26 ./arch/i386/kernel/acpi/Makefile | 4 ./arch/i386/kernel/acpi/boot-xen.c | 1160 ++++++++ ./arch/i386/kernel/apic-xen.c | 89 ./arch/i386/kernel/cpu/Makefile | 5 ./arch/i386/kernel/cpu/common-xen.c | 655 +++++ ./arch/i386/kernel/cpu/cpufreq/Kconfig | 2 ./arch/i386/kernel/cpu/mtrr/Makefile | 7 ./arch/i386/kernel/cpu/mtrr/main-xen.c | 187 + ./arch/i386/kernel/early_printk-xen.c | 2 ./arch/i386/kernel/entry-xen.S | 838 ++++++ ./arch/i386/kernel/fixup.c | 95 ./arch/i386/kernel/head-xen.S | 169 + ./arch/i386/kernel/init_task-xen.c | 49 ./arch/i386/kernel/io_apic-xen.c | 2725 +++++++++++++++++++++ ./arch/i386/kernel/ioport-xen.c | 121 ./arch/i386/kernel/irq-xen.c | 306 ++ ./arch/i386/kernel/ldt-xen.c | 262 ++ ./arch/i386/kernel/microcode-xen.c | 163 + ./arch/i386/kernel/mpparse-xen.c | 1167 ++++++++ ./arch/i386/kernel/pci-dma-xen.c | 302 ++ ./arch/i386/kernel/process-xen.c | 839 ++++++ ./arch/i386/kernel/quirks-xen.c | 49 ./arch/i386/kernel/setup-xen.c | 1868 ++++++++++++++ ./arch/i386/kernel/smp-xen.c | 617 ++++ ./arch/i386/kernel/smpalts.c | 85 ./arch/i386/kernel/smpboot.c | 10 ./arch/i386/kernel/swiotlb.c | 671 +++++ ./arch/i386/kernel/time-xen.c | 942 +++++++ ./arch/i386/kernel/traps-xen.c | 1063 ++++++++ ./arch/i386/kernel/vmlinux.lds.S | 7 ./arch/i386/kernel/vsyscall-note-xen.S | 32 ./arch/i386/mach-xen/Makefile | 7 ./arch/i386/mach-xen/setup.c | 37 ./arch/i386/mm/Makefile | 8 ./arch/i386/mm/fault-xen.c | 628 ++++ ./arch/i386/mm/highmem-xen.c | 123 ./arch/i386/mm/hypervisor.c | 459 +++ ./arch/i386/mm/init-xen.c | 833 ++++++ ./arch/i386/mm/ioremap-xen.c | 493 +++ ./arch/i386/mm/pgtable-xen.c | 597 ++++ ./arch/i386/pci/Makefile | 5 ./arch/i386/pci/i386-xen.c | 295 ++ ./arch/i386/pci/irq-xen.c | 1193 +++++++++ ./arch/i386/power/Makefile | 4 ./arch/um/kernel/physmem.c | 4 ./arch/x86_64/Makefile | 16 ./arch/x86_64/ia32/ia32entry-xen.S | 676 +++++ ./arch/x86_64/ia32/syscall32-xen.c | 128 ./arch/x86_64/ia32/syscall32_syscall-xen.S | 28 ./arch/x86_64/ia32/vsyscall-int80.S | 57 ./arch/x86_64/ia32/vsyscall-sigreturn.S | 2 ./arch/x86_64/kernel/acpi/Makefile | 2 ./arch/x86_64/kernel/apic-xen.c | 198 + ./arch/x86_64/kernel/e820-xen.c | 721 +++++ ./arch/x86_64/kernel/early_printk-xen.c | 308 ++ ./arch/x86_64/kernel/entry-xen.S | 1135 ++++++++ ./arch/x86_64/kernel/genapic-xen.c | 135 + ./arch/x86_64/kernel/genapic_xen.c | 162 + ./arch/x86_64/kernel/head-xen.S | 292 ++ ./arch/x86_64/kernel/head64-xen.c | 127 ./arch/x86_64/kernel/io_apic-xen.c | 2115 ++++++++++++++++ ./arch/x86_64/kernel/ioport-xen.c | 57 ./arch/x86_64/kernel/irq-xen.c | 158 + ./arch/x86_64/kernel/ldt-xen.c | 273 ++ ./arch/x86_64/kernel/mpparse-xen.c | 1000 +++++++ ./arch/x86_64/kernel/pci-nommu-xen.c | 95 ./arch/x86_64/kernel/process-xen.c | 775 +++++ ./arch/x86_64/kernel/setup-xen.c | 1548 +++++++++++ ./arch/x86_64/kernel/setup64-xen.c | 349 ++ ./arch/x86_64/kernel/signal-xen.c | 513 +++ ./arch/x86_64/kernel/smp-xen.c | 590 ++++ ./arch/x86_64/kernel/traps-xen.c | 967 +++++++ ./arch/x86_64/kernel/vsyscall-xen.c | 241 + ./arch/x86_64/kernel/x8664_ksyms-xen.c | 204 + ./arch/x86_64/kernel/xen_entry.S | 41 ./arch/x86_64/mm/Makefile | 10 ./arch/x86_64/mm/fault-xen.c | 594 ++++ ./arch/x86_64/mm/init-xen.c | 974 +++++++ ./arch/x86_64/mm/pageattr-xen.c | 380 ++ ./arch/x86_64/pci/Makefile | 8 ./drivers/Kconfig | 11 ./drivers/Makefile | 1 ./drivers/acpi/Kconfig | 2 ./drivers/acpi/tables.c | 7 ./drivers/char/mem.c | 6 ./drivers/char/tpm/Kconfig | 14 ./drivers/char/tpm/Makefile | 1 ./drivers/char/tpm/tpm.c | 48 ./drivers/char/tpm/tpm.h | 9 ./drivers/char/tpm/tpm_atmel.c | 102 ./drivers/char/tpm/tpm_nsc.c | 149 - ./drivers/char/tpm/tpm_xen.c | 525 ++++ ./drivers/char/tty_io.c | 7 ./drivers/firmware/Kconfig | 2 ./drivers/ide/legacy/hd.c | 2 ./drivers/pci/Kconfig | 1 ./drivers/video/fbmon.c | 2 ./drivers/xen/Kconfig | 175 + ./drivers/xen/Makefile | 20 ./drivers/xen/balloon/Makefile | 2 ./drivers/xen/balloon/balloon.c | 565 ++++ ./drivers/xen/blkback/Makefile | 2 ./drivers/xen/blkback/blkback.c | 590 ++++ ./drivers/xen/blkback/common.h | 131 + ./drivers/xen/blkback/interface.c | 164 + ./drivers/xen/blkback/vbd.c | 103 ./drivers/xen/blkback/xenbus.c | 425 +++ ./drivers/xen/blkfront/Kconfig | 6 ./drivers/xen/blkfront/Makefile | 5 ./drivers/xen/blkfront/blkfront.c | 842 ++++++ ./drivers/xen/blkfront/block.h | 166 + ./drivers/xen/blkfront/vbd.c | 323 ++ ./drivers/xen/blktap/Makefile | 3 ./drivers/xen/blktap/blktap.c | 910 +++++++ ./drivers/xen/blktap/common.h | 118 ./drivers/xen/blktap/interface.c | 146 + ./drivers/xen/blktap/xenbus.c | 234 + ./drivers/xen/char/Makefile | 2 ./drivers/xen/char/mem.c | 157 + ./drivers/xen/console/Makefile | 2 ./drivers/xen/console/console.c | 688 +++++ ./drivers/xen/console/xencons_ring.c | 125 ./drivers/xen/core/Makefile | 9 ./drivers/xen/core/evtchn.c | 820 ++++++ ./drivers/xen/core/gnttab.c | 480 +++ ./drivers/xen/core/reboot.c | 436 +++ ./drivers/xen/core/skbuff.c | 143 + ./drivers/xen/core/smpboot.c | 439 +++ ./drivers/xen/core/xen_proc.c | 29 ./drivers/xen/evtchn/Makefile | 2 ./drivers/xen/evtchn/evtchn.c | 459 +++ ./drivers/xen/net_driver_util.c | 67 ./drivers/xen/netback/Makefile | 2 ./drivers/xen/netback/common.h | 118 ./drivers/xen/netback/interface.c | 320 ++ ./drivers/xen/netback/loopback.c | 189 + ./drivers/xen/netback/netback.c | 824 ++++++ ./drivers/xen/netback/xenbus.c | 327 ++ ./drivers/xen/netfront/Kconfig | 6 ./drivers/xen/netfront/Makefile | 4 ./drivers/xen/netfront/netfront.c | 1492 +++++++++++ ./drivers/xen/privcmd/Makefile | 2 ./drivers/xen/privcmd/privcmd.c | 274 ++ ./drivers/xen/tpmback/Makefile | 4 ./drivers/xen/tpmback/common.h | 102 ./drivers/xen/tpmback/interface.c | 200 + ./drivers/xen/tpmback/tpmback.c | 1109 ++++++++ ./drivers/xen/tpmback/xenbus.c | 329 ++ ./drivers/xen/tpmfront/Makefile | 2 ./drivers/xen/tpmfront/tpmfront.c | 732 +++++ ./drivers/xen/tpmfront/tpmfront.h | 48 ./drivers/xen/util.c | 75 ./drivers/xen/xenbus/Makefile | 8 ./drivers/xen/xenbus/xenbus_client.c | 243 + ./drivers/xen/xenbus/xenbus_comms.c | 203 + ./drivers/xen/xenbus/xenbus_comms.h | 50 ./drivers/xen/xenbus/xenbus_dev.c | 241 + ./drivers/xen/xenbus/xenbus_probe.c | 1014 +++++++ ./drivers/xen/xenbus/xenbus_xs.c | 823 ++++++ ./fs/Kconfig | 1 ./include/asm-i386/agp.h | 15 ./include/asm-i386/atomic.h | 7 ./include/asm-i386/bitops.h | 19 ./include/asm-i386/fixmap.h | 20 ./include/asm-i386/floppy.h | 43 ./include/asm-i386/futex.h | 4 ./include/asm-i386/highmem.h | 5 ./include/asm-i386/hw_irq.h | 4 ./include/asm-i386/hypercall.h | 319 ++ ./include/asm-i386/hypervisor.h | 180 + ./include/asm-i386/io.h | 39 ./include/asm-i386/kmap_types.h | 3 ./include/asm-i386/mach-default/mach_dma_map.h | 80 ./include/asm-i386/mach-default/mach_fixmap.h | 15 ./include/asm-i386/mach-default/mach_io.h | 35 ./include/asm-i386/mach-default/mach_mmu.h | 18 ./include/asm-i386/mach-default/mach_mode.h | 7 ./include/asm-i386/mach-default/mach_page.h | 28 ./include/asm-i386/mach-default/mach_pgtable.h | 45 ./include/asm-i386/mach-default/mach_processor.h | 53 ./include/asm-i386/mach-default/mach_seg.h | 25 ./include/asm-i386/mach-default/mach_setup.h | 50 ./include/asm-i386/mach-default/mach_system.h | 85 ./include/asm-i386/mach-default/mach_tlbflush.h | 59 ./include/asm-i386/mach-xen/irq_vectors.h | 125 ./include/asm-i386/mach-xen/mach_dma_map.h | 47 ./include/asm-i386/mach-xen/mach_fixmap.h | 15 ./include/asm-i386/mach-xen/mach_io.h | 50 ./include/asm-i386/mach-xen/mach_mmu.h | 48 ./include/asm-i386/mach-xen/mach_mode.h | 7 ./include/asm-i386/mach-xen/mach_page.h | 154 + ./include/asm-i386/mach-xen/mach_pgtable.h | 154 + ./include/asm-i386/mach-xen/mach_processor.h | 61 ./include/asm-i386/mach-xen/mach_seg.h | 9 ./include/asm-i386/mach-xen/mach_setup.h | 11 ./include/asm-i386/mach-xen/mach_system.h | 149 + ./include/asm-i386/mach-xen/mach_tlbflush.h | 10 ./include/asm-i386/mach-xen/setup_arch_post.h | 40 ./include/asm-i386/mach-xen/setup_arch_pre.h | 5 ./include/asm-i386/mmu.h | 6 ./include/asm-i386/mmu_context.h | 17 ./include/asm-i386/page.h | 14 ./include/asm-i386/pci.h | 31 ./include/asm-i386/pgalloc.h | 31 ./include/asm-i386/pgtable-2level.h | 12 ./include/asm-i386/pgtable-3level.h | 35 ./include/asm-i386/pgtable.h | 22 ./include/asm-i386/processor.h | 48 ./include/asm-i386/ptrace.h | 5 ./include/asm-i386/rwsem.h | 17 ./include/asm-i386/scatterlist.h | 9 ./include/asm-i386/setup.h | 45 ./include/asm-i386/smp.h | 5 ./include/asm-i386/smp_alt.h | 32 ./include/asm-i386/spinlock.h | 43 ./include/asm-i386/swiotlb.h | 59 ./include/asm-i386/synch_bitops.h | 142 + ./include/asm-i386/tlbflush.h | 55 ./include/asm-i386/vga.h | 2 ./include/asm-um/page.h | 2 ./include/asm-x86_64/arch_hooks.h | 31 ./include/asm-x86_64/bootsetup.h | 10 ./include/asm-x86_64/fixmap.h | 21 ./include/asm-x86_64/floppy.h | 45 ./include/asm-x86_64/hw_irq.h | 14 ./include/asm-x86_64/hypercall.h | 320 ++ ./include/asm-x86_64/hypervisor.h | 2 ./include/asm-x86_64/io.h | 47 ./include/asm-x86_64/ipi.h | 8 ./include/asm-x86_64/irq.h | 39 ./include/asm-x86_64/mach-xen/asm/page.h | 257 + ./include/asm-x86_64/mach-xen/asm/param.h | 23 ./include/asm-x86_64/mach-xen/asm/pci.h | 177 + ./include/asm-x86_64/mach-xen/asm/pgalloc.h | 198 + ./include/asm-x86_64/mach-xen/asm/pgtable.h | 590 ++++ ./include/asm-x86_64/mach-xen/asm/processor.h | 505 +++ ./include/asm-x86_64/mach-xen/asm/ptrace.h | 125 ./include/asm-x86_64/mach-xen/asm/segment.h | 46 ./include/asm-x86_64/mach-xen/asm/smp.h | 150 + ./include/asm-x86_64/mach-xen/asm/system.h | 411 +++ ./include/asm-x86_64/mach-xen/asm/timer.h | 67 ./include/asm-x86_64/mach-xen/asm/tlbflush.h | 104 ./include/asm-x86_64/mach-xen/asm/vga.h | 20 ./include/asm-x86_64/mach-xen/asm/xor.h | 328 ++ ./include/asm-x86_64/mach-xen/mach_time.h | 122 ./include/asm-x86_64/mach-xen/mach_timer.h | 48 ./include/asm-x86_64/mach-xen/setup_arch_post.h | 47 ./include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 ./include/asm-x86_64/mmu.h | 13 ./include/asm-x86_64/synch_bitops.h | 1 ./include/linux/gfp.h | 6 ./include/linux/highmem.h | 6 ./include/linux/irq.h | 3 ./include/linux/mm.h | 13 ./include/linux/skbuff.h | 13 ./include/xen/balloon.h | 70 ./include/xen/driver_util.h | 26 ./include/xen/evtchn.h | 123 ./include/xen/foreign_page.h | 40 ./include/xen/gnttab.h | 98 ./include/xen/interface/acm.h | 181 + ./include/xen/interface/acm_ops.h | 96 ./include/xen/interface/arch-ia64.h | 279 ++ ./include/xen/interface/arch-x86_32.h | 152 + ./include/xen/interface/arch-x86_64.h | 221 + ./include/xen/interface/dom0_ops.h | 482 +++ ./include/xen/interface/event_channel.h | 203 + ./include/xen/interface/grant_table.h | 306 ++ ./include/xen/interface/hvm/hvm_info_table.h | 24 ./include/xen/interface/hvm/ioreq.h | 90 ./include/xen/interface/hvm/vmx_assist.h | 97 ./include/xen/interface/io/blkif.h | 85 ./include/xen/interface/io/console.h | 33 ./include/xen/interface/io/netif.h | 76 ./include/xen/interface/io/ring.h | 270 ++ ./include/xen/interface/io/tpmif.h | 56 ./include/xen/interface/io/vmx_vlapic.h | 58 ./include/xen/interface/io/vmx_vpic.h | 85 ./include/xen/interface/io/xenbus.h | 44 ./include/xen/interface/io/xs_wire.h | 97 ./include/xen/interface/memory.h | 101 ./include/xen/interface/physdev.h | 70 ./include/xen/interface/sched.h | 60 ./include/xen/interface/sched_ctl.h | 68 ./include/xen/interface/trace.h | 90 ./include/xen/interface/vcpu.h | 64 ./include/xen/interface/version.h | 52 ./include/xen/interface/xen.h | 441 +++ ./include/xen/net_driver_util.h | 56 ./include/xen/public/evtchn.h | 98 ./include/xen/public/privcmd.h | 91 ./include/xen/public/xenstored.h | 89 ./include/xen/tpmfe.h | 33 ./include/xen/xen_proc.h | 23 ./include/xen/xenbus.h | 252 + ./include/xen/xencons.h | 14 ./kernel/Kconfig.preempt | 1 ./kernel/irq/manage.c | 84 ./lib/Kconfig.debug | 2 ./lib/Makefile | 2 ./mm/Kconfig | 3 ./mm/highmem.c | 11 ./mm/memory.c | 118 ./mm/mmap.c | 4 ./net/core/dev.c | 50 ./net/core/skbuff.c | 41 ./scripts/Makefile.xen | 14 linux-2.6.15.i686/arch/i386/Makefile | 18 linux-2.6.15.i686/arch/x86_64/Kconfig | 40 linux-2.6.15.i686/arch/x86_64/ia32/Makefile | 18 linux-2.6.15.i686/arch/x86_64/kernel/Makefile | 21 linux-2.6.15.i686/arch/x86_64/kernel/pci-dma.c | 0 linux-2.6.15.i686/arch/x86_64/kernel/pci-gart.c | 10 linux-2.6.15.i686/drivers/acpi/processor_idle.c | 4 linux-2.6.15.i686/include/asm-i386/desc.h | 51 linux-2.6.15.i686/include/asm-i386/dma-mapping.h | 102 linux-2.6.15.i686/include/asm-i386/segment.h | 41 linux-2.6.15.i686/include/asm-i386/system.h | 138 - linux-2.6.15.i686/include/asm-x86_64/desc.h | 41 linux-2.6.15.i686/include/asm-x86_64/dma-mapping.h | 34 linux-2.6.15.i686/include/asm-x86_64/mmu_context.h | 97 linux-2.6.15.i686/include/asm-x86_64/swiotlb.h | 19 linux-2.6.15.i686/mm/page_alloc.c | 7 326 files changed, 64235 insertions(+), 721 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 linux-2.6-xen-merge.patch Index: linux-2.6-xen-merge.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-merge.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- linux-2.6-xen-merge.patch 9 Jan 2006 20:42:13 -0000 1.3 +++ linux-2.6-xen-merge.patch 26 Jan 2006 22:14:34 -0000 1.4 @@ -414,14 +414,6 @@ struct semaphore buffer_mutex; struct timer_list user_read_timer; /* user needs to claim result */ -@@ -105,5 +104,5 @@ - loff_t *); - extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *); - extern void tpm_remove_hardware(struct device *); --extern int tpm_pm_suspend(struct device *, pm_message_t); --extern int tpm_pm_resume(struct device *); -+extern int tpm_pm_suspend(struct pci_dev *, pm_message_t); -+extern int tpm_pm_resume(struct pci_dev *); --- /dev/null 2006-01-06 04:48:52.917188312 -0500 +++ ./drivers/char/tpm/tpm_xen.c 2006-01-06 16:04:34.000000000 -0500 @@ -0,0 +1,525 @@ @@ -5156,7 +5148,7 @@ +{ + loff_t ret; + -+ down(&file->f_dentry->d_inode->i_sem); ++ mutex_lock(&file->f_dentry->d_inode->i_mutex); + switch (orig) { + case 0: + file->f_pos = offset; @@ -5171,7 +5163,7 @@ + default: + ret = -EINVAL; + } -+ up(&file->f_dentry->d_inode->i_sem); ++ mutex_unlock(&file->f_dentry->d_inode->i_mutex); + return ret; +} + @@ -8560,7 +8552,7 @@ + req, (bret->status == BLKIF_RSP_OKAY), + req->hard_nr_sectors); + BUG_ON(ret); -+ end_that_request_last(req); ++ end_that_request_last(req, (bret->status == BLKIF_RSP_OKAY)); + break; + default: + BUG(); @@ -9337,14 +9329,14 @@ +static struct timer_list balloon_timer; + +/* Use the private and mapping fields of struct page as a list. */ -+#define PAGE_TO_LIST(p) ((struct list_head *)&p->u.private) ++#define PAGE_TO_LIST(p) (&(p)->ballooned) +#define LIST_TO_PAGE(l) \ -+ (list_entry(((unsigned long *)l), struct page, u.private)) ++ list_entry((l), struct page, ballooned) +#define UNLIST_PAGE(p) \ + do { \ + list_del(PAGE_TO_LIST(p)); \ -+ p->mapping = NULL; \ -+ p->u.private = 0; \ ++ PAGE_TO_LIST(p)->next = NULL; \ ++ PAGE_TO_LIST(p)->prev = NULL; \ + } while(0) + +#define IPRINTK(fmt, args...) \ @@ -19376,28 +19368,6 @@ } EXPORT_SYMBOL(free_irq); ---- ./mm/page_alloc.c.xenmerge 2006-01-06 16:03:16.000000000 -0500 -+++ ./mm/page_alloc.c 2006-01-06 16:04:34.000000000 -0500 -@@ -399,7 +399,8 @@ - int i; - int reserved = 0; - -- arch_free_page(page, order); -+ if (arch_free_page(page, order)) -+ return; - - #ifndef CONFIG_MMU - if (order > 0) -@@ -683,7 +684,8 @@ - struct per_cpu_pages *pcp; - unsigned long flags; - -- arch_free_page(page, 0); -+ if (arch_free_page(page, 0)) -+ return; - - if (PageAnon(page)) - page->mapping = NULL; --- ./mm/memory.c.xenmerge 2006-01-06 16:03:16.000000000 -0500 +++ ./mm/memory.c 2006-01-06 16:04:34.000000000 -0500 @@ -395,7 +395,8 @@ @@ -20466,35 +20436,6 @@ + .rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8 + .quad ni_syscall + .endr ---- ./arch/x86_64/ia32/Makefile.xenmerge 2005-10-27 20:02:08.000000000 -0400 -+++ ./arch/x86_64/ia32/Makefile 2006-01-06 16:04:32.000000000 -0500 -@@ -23,10 +23,24 @@ - -Wl,-soname=linux-gate.so.1 -o $@ \ - -Wl,-T,$(filter-out FORCE,$^) - -+$(obj)/vsyscall-int80.so \ - $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \ - $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE - $(call if_changed,syscall) - --AFLAGS_vsyscall-sysenter.o = -m32 --AFLAGS_vsyscall-syscall.o = -m32 -+AFLAGS_vsyscall-sysenter.o = -m32 -Iarch/i386/kernel -+AFLAGS_vsyscall-syscall.o = -m32 -Iarch/i386/kernel - CFLAGS_ia32_ioctl.o += -Ifs/ -+ -+ifdef CONFIG_XEN -+AFLAGS_vsyscall-int80.o = -m32 -Iarch/i386/kernel -+ -+$(obj)/syscall32_syscall-xen.o: \ -+ $(foreach F,int80 sysenter syscall,$(obj)/vsyscall-$F.so) -+ -+targets := $(foreach F,int80 sysenter syscall,vsyscall-$F.o vsyscall-$F.so) -+ -+include $(srctree)/scripts/Makefile.xen -+ -+obj-y := $(call cherrypickxen, $(obj-y)) -+endif --- /dev/null 2006-01-06 04:48:52.917188312 -0500 +++ ./arch/x86_64/ia32/syscall32_syscall-xen.S 2006-01-06 16:04:34.000000000 -0500 @@ -0,0 +1,28 @@ @@ -27441,47 +27382,6 @@ + .cpu_mask_to_apicid = xen_cpu_mask_to_apicid, + .phys_pkg_id = phys_pkg_id, +}; ---- ./arch/x86_64/kernel/pci-gart.c.xenmerge 2006-01-06 16:03:14.000000000 -0500 -+++ ./arch/x86_64/kernel/pci-gart.c 2006-01-06 16:04:32.000000000 -0500 -@@ -409,7 +409,8 @@ - } - - /* Map a single area into the IOMMU */ --dma_addr_t dma_map_single(struct device *dev, void *addr, size_t size, int dir) -+dma_addr_t dma_map_single(struct device *dev, void *addr, size_t size, -+ enum dma_data_direction dir) - { - unsigned long phys_mem, bus; - -@@ -515,7 +516,8 @@ - * DMA map all entries in a scatterlist. - * Merge chunks that have page aligned sizes into a continuous mapping. - */ --int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir) -+int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, -+ enum dma_data_direction dir) - { - int i; - int out; -@@ -587,7 +589,7 @@ - * Free a DMA mapping. - */ - void dma_unmap_single(struct device *dev, dma_addr_t dma_addr, -- size_t size, int direction) -+ size_t size, enum dma_data_direction direction) - { - unsigned long iommu_page; - int npages; -@@ -613,7 +615,8 @@ - /* - * Wrapper for pci_unmap_single working with scatterlists. - */ --void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, int dir) -+void dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, -+ enum dma_data_direction dir) - { - int i; - if (swiotlb) { --- /dev/null 2006-01-06 04:48:52.917188312 -0500 +++ ./arch/x86_64/kernel/smp-xen.c 2006-01-06 16:04:34.000000000 -0500 @@ -0,0 +1,590 @@ @@ -32364,68 +32264,6 @@ + pci_mem_start, gapstart, gapsize); +#endif +} ---- ./arch/x86_64/kernel/Makefile.xenmerge 2006-01-06 16:03:14.000000000 -0500 -+++ ./arch/x86_64/kernel/Makefile 2006-01-06 16:04:32.000000000 -0500 -@@ -19,15 +19,18 @@ - obj-$(CONFIG_X86_CPUID) += cpuid.o - obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o - obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o -+obj-$(CONFIG_X86_XEN_GENAPIC) += genapic.o genapic_xen.o - obj-$(CONFIG_X86_IO_APIC) += io_apic.o mpparse.o \ - genapic.o genapic_cluster.o genapic_flat.o - obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o --obj-$(CONFIG_PM) += suspend.o -+obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend.o -+obj-$(CONFIG_ACPI_SLEEP) += suspend.o - obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend_asm.o [...2583 lines suppressed...] + config X86_IO_APIC + bool ++ depends !XEN_UNPRIVILEGED_GUEST + default y + ++config X86_XEN_GENAPIC ++ bool ++ depends X86_64_XEN ++ default XEN_PRIVILEGED_GUEST || SMP ++ + config X86_LOCAL_APIC + bool ++ depends !XEN_UNPRIVILEGED_GUEST + default y + + config MTRR + bool "MTRR (Memory Type Range Register) support" ++ depends on !X86_64_XEN + ---help--- + On Intel P6 family processors (Pentium Pro, Pentium II and later) + the Memory Type Range Registers (MTRRs) may be used to control +@@ -238,7 +254,7 @@ config SMP + + config SCHED_SMT + bool "SMT (Hyperthreading) scheduler support" +- depends on SMP ++ depends on SMP && !X86_64_XEN + default n + help + SMT scheduler support improves the CPU scheduler's decision making +@@ -250,7 +266,7 @@ source "kernel/Kconfig.preempt" + + config NUMA + bool "Non Uniform Memory Access (NUMA) Support" +- depends on SMP ++ depends on SMP && !X86_64_XEN + help + Enable NUMA (Non Uniform Memory Access) support. The kernel + will try to allocate memory used by a CPU on the local memory +@@ -325,6 +341,7 @@ config NR_CPUS + int "Maximum number of CPUs (2-256)" + range 2 256 + depends on SMP ++ default "16" if X86_64_XEN + default "8" + help + This allows you to specify the maximum number of CPUs which this +@@ -345,6 +362,7 @@ config HOTPLUG_CPU + + config HPET_TIMER + bool ++ depends on !X86_64_XEN + default y + help + Use the IA-PC HPET (High Precision Event Timer) to manage +@@ -356,7 +374,7 @@ config HPET_TIMER + + config X86_PM_TIMER + bool "PM timer" if EMBEDDED +- depends on ACPI ++ depends on ACPI && !X86_64_XEN + default y + help + Support the ACPI PM timer for time keeping. This is slow, +@@ -377,7 +395,7 @@ config GART_IOMMU + bool "K8 GART IOMMU support" + default y + select SWIOTLB +- depends on PCI ++ depends on PCI && !X86_64_XEN + help + Support the IOMMU. Needed to run systems with more than 3GB of memory + properly with 32-bit PCI devices that do not support DAC (Double Address +@@ -395,6 +413,7 @@ config SWIOTLB + + config X86_MCE + bool "Machine check support" if EMBEDDED ++ depends on !X86_64_XEN + default y + help + Include a machine check error handler to report hardware errors. +@@ -420,7 +439,7 @@ config X86_MCE_AMD + + config KEXEC + bool "kexec system call (EXPERIMENTAL)" +- depends on EXPERIMENTAL ++ depends on EXPERIMENTAL && !X86_64_XEN + help + kexec is a system call that implements the ability to shutdown your + current kernel, and to start another kernel. It is like a reboot +@@ -503,12 +522,17 @@ config GENERIC_PENDING_IRQ + default y + + menu "Power management options" ++ depends on !XEN_UNPRIVILEGED_GUEST + ++if !X86_64_XEN + source kernel/power/Kconfig ++endif + + source "drivers/acpi/Kconfig" + ++if !X86_64_XEN + source "arch/x86_64/kernel/cpufreq/Kconfig" ++endif + + endmenu + +@@ -537,6 +561,7 @@ config UNORDERED_IO + from i386. Requires that the driver writer used memory barriers + properly. + ++if !X86_64_XEN + source "drivers/pci/pcie/Kconfig" + + source "drivers/pci/Kconfig" +@@ -544,6 +569,7 @@ source "drivers/pci/Kconfig" + source "drivers/pcmcia/Kconfig" + + source "drivers/pci/hotplug/Kconfig" ++endif + + endmenu + +@@ -606,4 +632,6 @@ source "security/Kconfig" + + source "crypto/Kconfig" + ++source "drivers/xen/Kconfig" ++ + source "lib/Kconfig" +diff -uNp linux-2.6.15.i686/arch/i386/Makefile.orig linux-2.6.15.i686/arch/i386/Makefile +--- linux-2.6.15.i686/arch/i386/Makefile.orig 2006-01-25 18:07:21.000000000 -0500 ++++ linux-2.6.15.i686/arch/i386/Makefile 2006-01-25 18:11:15.000000000 -0500 +@@ -68,6 +68,10 @@ mcore-$(CONFIG_X86_BIGSMP) := mach-defau + mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit + mcore-$(CONFIG_X86_SUMMIT) := mach-default + ++# Xen subarch support ++mflags-$(CONFIG_X86_XEN) := -Iinclude/asm-i386/mach-xen ++mcore-$(CONFIG_X86_XEN) := mach-xen ++ + # generic subarchitecture + mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic + mcore-$(CONFIG_X86_GENERICARCH) := mach-default +@@ -96,12 +100,25 @@ drivers-$(CONFIG_PM) += arch/i386/powe + + CFLAGS += $(mflags-y) + AFLAGS += $(mflags-y) ++CPPFLAGS += $(mflags-y) + + boot := arch/i386/boot + + .PHONY: zImage bzImage compressed zlilo bzlilo \ + zdisk bzdisk fdimage fdimage144 fdimage288 install + ++ifdef CONFIG_XEN ++head-y := arch/i386/kernel/head-xen.o arch/i386/kernel/init_task-xen.o ++boot := arch/i386/boot-xen ++.PHONY: vmlinuz ++all: vmlinuz ++ ++vmlinuz: vmlinux ++ $(Q)$(MAKE) $(build)=$(boot) $@ ++ ++install: vmlinux ++ $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@ ++else + all: bzImage + + # KBUILD_IMAGE specify target image being built +@@ -124,6 +141,7 @@ fdimage fdimage144 fdimage288: vmlinux + + install: + $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install ++endif + + archclean: + $(Q)$(MAKE) $(clean)=arch/i386/boot +diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/drivers/acpi/processor_idle.c linux-2.6.15.i686/drivers/acpi/processor_idle.c +--- linux-2.6.15.orig/drivers/acpi/processor_idle.c 2006-01-25 18:16:41.000000000 -0500 ++++ linux-2.6.15.i686/drivers/acpi/processor_idle.c 2006-01-26 09:45:56.000000000 -0500 +@@ -878,7 +879,7 @@ static int acpi_processor_power_verify(s + unsigned int i; + unsigned int working = 0; + +-#ifdef ARCH_APICTIMER_STOPS_ON_C3 ++#if defined(ARCH_APICTIMER_STOPS_ON_C3) && !defined(CONFIG_XEN) + struct cpuinfo_x86 *c = cpu_data + pr->id; + cpumask_t mask = cpumask_of_cpu(pr->id); + +@@ -901,7 +902,7 @@ static int acpi_processor_power_verify(s + + case ACPI_STATE_C3: + acpi_processor_power_verify_c3(pr, cx); +-#ifdef ARCH_APICTIMER_STOPS_ON_C3 ++#if defined(ARCH_APICTIMER_STOPS_ON_C3) && !defined(CONFIG_XEN) + if (c->x86_vendor == X86_VENDOR_INTEL) { + on_each_cpu(switch_APIC_timer_to_ipi, + &mask, 1, 1); Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Jan 2006 20:42:18 -0000 1.7 +++ sources 26 Jan 2006 22:14:35 -0000 1.8 @@ -1,3 +1,5 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 2f072f3527bb24f37b46f4622a4404fe xen-20060106.tar.bz2 -1e8dda938d8fb06863d7276b79d6e544 bcm43xx-20060106.tar.bz2 +ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 +fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2 +a247c21e1202f514283ba928d9382353 patch-2.6.16-rc1-git4.bz2 Index: upstream =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/upstream,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- upstream 9 Jan 2006 20:42:18 -0000 1.4 +++ upstream 26 Jan 2006 22:14:35 -0000 1.5 @@ -1 +1,3 @@ linux-2.6.15.tar.bz2 +patch-2.6.16-rc1.bz2 +patch-2.6.16-rc1-git4.bz2 --- linux-2.6-build-reference-discarded-opd.patch DELETED --- --- linux-2.6-cell-idle-pmgt.patch DELETED --- --- linux-2.6-cell-iommu.patch DELETED --- --- linux-2.6-cell-no-legacy-io.patch DELETED --- --- linux-2.6-cell-nvram-kmalloc.patch DELETED --- --- linux-2.6-cell-platform-detect.patch DELETED --- --- linux-2.6-cell-spidernet.patch DELETED --- --- linux-2.6-debug-taint-check.patch DELETED --- --- linux-2.6-debug-taint-proprietary-helpers.patch DELETED --- --- linux-2.6-gcc41.patch DELETED --- --- linux-2.6-ia64-spinlock-size.patch DELETED --- --- linux-2.6-kdump-needs-not-embedded.patch DELETED --- --- linux-2.6-powerpc-parport.patch DELETED --- --- linux-2.6-proc-vmcore-needs-not-embedded.patch DELETED --- --- linux-2.6-scsi-megaraid-legacy.patch DELETED --- --- linux-2.6-serial-nrports.patch DELETED --- --- linux-2.6-serial-of.patch DELETED --- --- linux-2.6-usbhid-wireless-security-lock.patch DELETED --- --- linux-2.6-vm-debug.patch DELETED --- --- linux-2.6-x86_64-ati-apic-timer.patch DELETED --- --- linux-2.6-x86_64-disable-hotplug-guessing.patch DELETED --- --- linux-2.6.15-default-powerpc.patch DELETED --- --- linux-2.6.15-rc1-ppc64-syscallpath.patch DELETED --- From fedora-cvs-commits at redhat.com Thu Jan 26 22:29:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 17:29:35 -0500 Subject: rpms/kernel-xen/devel kernel-xen.spec, 1.30, 1.31 linux-2.6-xen-merge.patch, 1.4, 1.5 Message-ID: <200601262229.k0QMTZxH013884@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13867 Modified Files: kernel-xen.spec linux-2.6-xen-merge.patch Log Message: fix type in patch hand-edited Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- kernel-xen.spec 26 Jan 2006 22:14:33 -0000 1.30 +++ kernel-xen.spec 26 Jan 2006 22:29:32 -0000 1.31 @@ -1373,6 +1373,9 @@ %endif %changelog +* Thu Jan 26 2006 Juan Quintela +- "don't edit patches by hand" release. + * Wed Jan 25 2006 Juan Quintela - merge with rawhide kernel 1.1869. linux-2.6-xen-merge.patch: ./arch/i386/Kconfig | 76 ./arch/i386/boot-xen/Makefile | 24 ./arch/i386/kernel/Makefile | 26 ./arch/i386/kernel/acpi/Makefile | 4 ./arch/i386/kernel/acpi/boot-xen.c | 1160 ++++++++ ./arch/i386/kernel/apic-xen.c | 89 ./arch/i386/kernel/cpu/Makefile | 5 ./arch/i386/kernel/cpu/common-xen.c | 655 +++++ ./arch/i386/kernel/cpu/cpufreq/Kconfig | 2 ./arch/i386/kernel/cpu/mtrr/Makefile | 7 ./arch/i386/kernel/cpu/mtrr/main-xen.c | 187 + ./arch/i386/kernel/early_printk-xen.c | 2 ./arch/i386/kernel/entry-xen.S | 838 ++++++ ./arch/i386/kernel/fixup.c | 95 ./arch/i386/kernel/head-xen.S | 169 + ./arch/i386/kernel/init_task-xen.c | 49 ./arch/i386/kernel/io_apic-xen.c | 2725 +++++++++++++++++++++ ./arch/i386/kernel/ioport-xen.c | 121 ./arch/i386/kernel/irq-xen.c | 306 ++ ./arch/i386/kernel/ldt-xen.c | 262 ++ ./arch/i386/kernel/microcode-xen.c | 163 + ./arch/i386/kernel/mpparse-xen.c | 1167 ++++++++ ./arch/i386/kernel/pci-dma-xen.c | 302 ++ ./arch/i386/kernel/process-xen.c | 839 ++++++ ./arch/i386/kernel/quirks-xen.c | 49 ./arch/i386/kernel/setup-xen.c | 1868 ++++++++++++++ ./arch/i386/kernel/smp-xen.c | 617 ++++ ./arch/i386/kernel/smpalts.c | 85 ./arch/i386/kernel/smpboot.c | 10 ./arch/i386/kernel/swiotlb.c | 671 +++++ ./arch/i386/kernel/time-xen.c | 942 +++++++ ./arch/i386/kernel/traps-xen.c | 1063 ++++++++ ./arch/i386/kernel/vmlinux.lds.S | 7 ./arch/i386/kernel/vsyscall-note-xen.S | 32 ./arch/i386/mach-xen/Makefile | 7 ./arch/i386/mach-xen/setup.c | 37 ./arch/i386/mm/Makefile | 8 ./arch/i386/mm/fault-xen.c | 628 ++++ ./arch/i386/mm/highmem-xen.c | 123 ./arch/i386/mm/hypervisor.c | 459 +++ ./arch/i386/mm/init-xen.c | 833 ++++++ ./arch/i386/mm/ioremap-xen.c | 493 +++ ./arch/i386/mm/pgtable-xen.c | 597 ++++ ./arch/i386/pci/Makefile | 5 ./arch/i386/pci/i386-xen.c | 295 ++ ./arch/i386/pci/irq-xen.c | 1193 +++++++++ ./arch/i386/power/Makefile | 4 ./arch/um/kernel/physmem.c | 4 ./arch/x86_64/Makefile | 16 ./arch/x86_64/ia32/ia32entry-xen.S | 676 +++++ ./arch/x86_64/ia32/syscall32-xen.c | 128 ./arch/x86_64/ia32/syscall32_syscall-xen.S | 28 ./arch/x86_64/ia32/vsyscall-int80.S | 57 ./arch/x86_64/ia32/vsyscall-sigreturn.S | 2 ./arch/x86_64/kernel/acpi/Makefile | 2 ./arch/x86_64/kernel/apic-xen.c | 198 + ./arch/x86_64/kernel/e820-xen.c | 721 +++++ ./arch/x86_64/kernel/early_printk-xen.c | 308 ++ ./arch/x86_64/kernel/entry-xen.S | 1135 ++++++++ ./arch/x86_64/kernel/genapic-xen.c | 135 + ./arch/x86_64/kernel/genapic_xen.c | 162 + ./arch/x86_64/kernel/head-xen.S | 292 ++ ./arch/x86_64/kernel/head64-xen.c | 127 ./arch/x86_64/kernel/io_apic-xen.c | 2115 ++++++++++++++++ ./arch/x86_64/kernel/ioport-xen.c | 57 ./arch/x86_64/kernel/irq-xen.c | 158 + ./arch/x86_64/kernel/ldt-xen.c | 273 ++ ./arch/x86_64/kernel/mpparse-xen.c | 1000 +++++++ ./arch/x86_64/kernel/pci-nommu-xen.c | 95 ./arch/x86_64/kernel/process-xen.c | 775 +++++ ./arch/x86_64/kernel/setup-xen.c | 1548 +++++++++++ ./arch/x86_64/kernel/setup64-xen.c | 349 ++ ./arch/x86_64/kernel/signal-xen.c | 513 +++ ./arch/x86_64/kernel/smp-xen.c | 590 ++++ ./arch/x86_64/kernel/traps-xen.c | 967 +++++++ ./arch/x86_64/kernel/vsyscall-xen.c | 241 + ./arch/x86_64/kernel/x8664_ksyms-xen.c | 204 + ./arch/x86_64/kernel/xen_entry.S | 41 ./arch/x86_64/mm/Makefile | 10 ./arch/x86_64/mm/fault-xen.c | 594 ++++ ./arch/x86_64/mm/init-xen.c | 974 +++++++ ./arch/x86_64/mm/pageattr-xen.c | 380 ++ ./arch/x86_64/pci/Makefile | 8 ./drivers/Kconfig | 11 ./drivers/Makefile | 1 ./drivers/acpi/Kconfig | 2 ./drivers/acpi/tables.c | 7 ./drivers/char/mem.c | 6 ./drivers/char/tpm/Kconfig | 14 ./drivers/char/tpm/Makefile | 1 ./drivers/char/tpm/tpm.c | 48 ./drivers/char/tpm/tpm.h | 9 ./drivers/char/tpm/tpm_atmel.c | 102 ./drivers/char/tpm/tpm_nsc.c | 149 - ./drivers/char/tpm/tpm_xen.c | 525 ++++ ./drivers/char/tty_io.c | 7 ./drivers/firmware/Kconfig | 2 ./drivers/ide/legacy/hd.c | 2 ./drivers/pci/Kconfig | 1 ./drivers/video/fbmon.c | 2 ./drivers/xen/Kconfig | 175 + ./drivers/xen/Makefile | 20 ./drivers/xen/balloon/Makefile | 2 ./drivers/xen/balloon/balloon.c | 565 ++++ ./drivers/xen/blkback/Makefile | 2 ./drivers/xen/blkback/blkback.c | 590 ++++ ./drivers/xen/blkback/common.h | 131 + ./drivers/xen/blkback/interface.c | 164 + ./drivers/xen/blkback/vbd.c | 103 ./drivers/xen/blkback/xenbus.c | 425 +++ ./drivers/xen/blkfront/Kconfig | 6 ./drivers/xen/blkfront/Makefile | 5 ./drivers/xen/blkfront/blkfront.c | 842 ++++++ ./drivers/xen/blkfront/block.h | 166 + ./drivers/xen/blkfront/vbd.c | 323 ++ ./drivers/xen/blktap/Makefile | 3 ./drivers/xen/blktap/blktap.c | 910 +++++++ ./drivers/xen/blktap/common.h | 118 ./drivers/xen/blktap/interface.c | 146 + ./drivers/xen/blktap/xenbus.c | 234 + ./drivers/xen/char/Makefile | 2 ./drivers/xen/char/mem.c | 157 + ./drivers/xen/console/Makefile | 2 ./drivers/xen/console/console.c | 688 +++++ ./drivers/xen/console/xencons_ring.c | 125 ./drivers/xen/core/Makefile | 9 ./drivers/xen/core/evtchn.c | 820 ++++++ ./drivers/xen/core/gnttab.c | 480 +++ ./drivers/xen/core/reboot.c | 436 +++ ./drivers/xen/core/skbuff.c | 143 + ./drivers/xen/core/smpboot.c | 439 +++ ./drivers/xen/core/xen_proc.c | 29 ./drivers/xen/evtchn/Makefile | 2 ./drivers/xen/evtchn/evtchn.c | 459 +++ ./drivers/xen/net_driver_util.c | 67 ./drivers/xen/netback/Makefile | 2 ./drivers/xen/netback/common.h | 118 ./drivers/xen/netback/interface.c | 320 ++ ./drivers/xen/netback/loopback.c | 189 + ./drivers/xen/netback/netback.c | 824 ++++++ ./drivers/xen/netback/xenbus.c | 327 ++ ./drivers/xen/netfront/Kconfig | 6 ./drivers/xen/netfront/Makefile | 4 ./drivers/xen/netfront/netfront.c | 1492 +++++++++++ ./drivers/xen/privcmd/Makefile | 2 ./drivers/xen/privcmd/privcmd.c | 274 ++ ./drivers/xen/tpmback/Makefile | 4 ./drivers/xen/tpmback/common.h | 102 ./drivers/xen/tpmback/interface.c | 200 + ./drivers/xen/tpmback/tpmback.c | 1109 ++++++++ ./drivers/xen/tpmback/xenbus.c | 329 ++ ./drivers/xen/tpmfront/Makefile | 2 ./drivers/xen/tpmfront/tpmfront.c | 732 +++++ ./drivers/xen/tpmfront/tpmfront.h | 48 ./drivers/xen/util.c | 75 ./drivers/xen/xenbus/Makefile | 8 ./drivers/xen/xenbus/xenbus_client.c | 243 + ./drivers/xen/xenbus/xenbus_comms.c | 203 + ./drivers/xen/xenbus/xenbus_comms.h | 50 ./drivers/xen/xenbus/xenbus_dev.c | 241 + ./drivers/xen/xenbus/xenbus_probe.c | 1014 +++++++ ./drivers/xen/xenbus/xenbus_xs.c | 823 ++++++ ./fs/Kconfig | 1 ./include/asm-i386/agp.h | 15 ./include/asm-i386/atomic.h | 7 ./include/asm-i386/bitops.h | 19 ./include/asm-i386/fixmap.h | 20 ./include/asm-i386/floppy.h | 43 ./include/asm-i386/futex.h | 4 ./include/asm-i386/highmem.h | 5 ./include/asm-i386/hw_irq.h | 4 ./include/asm-i386/hypercall.h | 319 ++ ./include/asm-i386/hypervisor.h | 180 + ./include/asm-i386/io.h | 39 ./include/asm-i386/kmap_types.h | 3 ./include/asm-i386/mach-default/mach_dma_map.h | 80 ./include/asm-i386/mach-default/mach_fixmap.h | 15 ./include/asm-i386/mach-default/mach_io.h | 35 ./include/asm-i386/mach-default/mach_mmu.h | 18 ./include/asm-i386/mach-default/mach_mode.h | 7 ./include/asm-i386/mach-default/mach_page.h | 28 ./include/asm-i386/mach-default/mach_pgtable.h | 45 ./include/asm-i386/mach-default/mach_processor.h | 53 ./include/asm-i386/mach-default/mach_seg.h | 25 ./include/asm-i386/mach-default/mach_setup.h | 50 ./include/asm-i386/mach-default/mach_system.h | 85 ./include/asm-i386/mach-default/mach_tlbflush.h | 59 ./include/asm-i386/mach-xen/irq_vectors.h | 125 ./include/asm-i386/mach-xen/mach_dma_map.h | 47 ./include/asm-i386/mach-xen/mach_fixmap.h | 15 ./include/asm-i386/mach-xen/mach_io.h | 50 ./include/asm-i386/mach-xen/mach_mmu.h | 48 ./include/asm-i386/mach-xen/mach_mode.h | 7 ./include/asm-i386/mach-xen/mach_page.h | 154 + ./include/asm-i386/mach-xen/mach_pgtable.h | 154 + ./include/asm-i386/mach-xen/mach_processor.h | 61 ./include/asm-i386/mach-xen/mach_seg.h | 9 ./include/asm-i386/mach-xen/mach_setup.h | 11 ./include/asm-i386/mach-xen/mach_system.h | 149 + ./include/asm-i386/mach-xen/mach_tlbflush.h | 10 ./include/asm-i386/mach-xen/setup_arch_post.h | 40 ./include/asm-i386/mach-xen/setup_arch_pre.h | 5 ./include/asm-i386/mmu.h | 6 ./include/asm-i386/mmu_context.h | 17 ./include/asm-i386/page.h | 14 ./include/asm-i386/pci.h | 31 ./include/asm-i386/pgalloc.h | 31 ./include/asm-i386/pgtable-2level.h | 12 ./include/asm-i386/pgtable-3level.h | 35 ./include/asm-i386/pgtable.h | 22 ./include/asm-i386/processor.h | 48 ./include/asm-i386/ptrace.h | 5 ./include/asm-i386/rwsem.h | 17 ./include/asm-i386/scatterlist.h | 9 ./include/asm-i386/setup.h | 45 ./include/asm-i386/smp.h | 5 ./include/asm-i386/smp_alt.h | 32 ./include/asm-i386/spinlock.h | 43 ./include/asm-i386/swiotlb.h | 59 ./include/asm-i386/synch_bitops.h | 142 + ./include/asm-i386/tlbflush.h | 55 ./include/asm-i386/vga.h | 2 ./include/asm-um/page.h | 2 ./include/asm-x86_64/arch_hooks.h | 31 ./include/asm-x86_64/bootsetup.h | 10 ./include/asm-x86_64/fixmap.h | 21 ./include/asm-x86_64/floppy.h | 45 ./include/asm-x86_64/hw_irq.h | 14 ./include/asm-x86_64/hypercall.h | 320 ++ ./include/asm-x86_64/hypervisor.h | 2 ./include/asm-x86_64/io.h | 47 ./include/asm-x86_64/ipi.h | 8 ./include/asm-x86_64/irq.h | 39 ./include/asm-x86_64/mach-xen/asm/page.h | 257 + ./include/asm-x86_64/mach-xen/asm/param.h | 23 ./include/asm-x86_64/mach-xen/asm/pci.h | 177 + ./include/asm-x86_64/mach-xen/asm/pgalloc.h | 198 + ./include/asm-x86_64/mach-xen/asm/pgtable.h | 590 ++++ ./include/asm-x86_64/mach-xen/asm/processor.h | 505 +++ ./include/asm-x86_64/mach-xen/asm/ptrace.h | 125 ./include/asm-x86_64/mach-xen/asm/segment.h | 46 ./include/asm-x86_64/mach-xen/asm/smp.h | 150 + ./include/asm-x86_64/mach-xen/asm/system.h | 411 +++ ./include/asm-x86_64/mach-xen/asm/timer.h | 67 ./include/asm-x86_64/mach-xen/asm/tlbflush.h | 104 ./include/asm-x86_64/mach-xen/asm/vga.h | 20 ./include/asm-x86_64/mach-xen/asm/xor.h | 328 ++ ./include/asm-x86_64/mach-xen/mach_time.h | 122 ./include/asm-x86_64/mach-xen/mach_timer.h | 48 ./include/asm-x86_64/mach-xen/setup_arch_post.h | 47 ./include/asm-x86_64/mach-xen/setup_arch_pre.h | 5 ./include/asm-x86_64/mmu.h | 13 ./include/asm-x86_64/synch_bitops.h | 1 ./include/linux/gfp.h | 6 ./include/linux/highmem.h | 6 ./include/linux/irq.h | 3 ./include/linux/mm.h | 13 ./include/linux/skbuff.h | 13 ./include/xen/balloon.h | 70 ./include/xen/driver_util.h | 26 ./include/xen/evtchn.h | 123 ./include/xen/foreign_page.h | 40 ./include/xen/gnttab.h | 98 ./include/xen/interface/acm.h | 181 + ./include/xen/interface/acm_ops.h | 96 ./include/xen/interface/arch-ia64.h | 279 ++ ./include/xen/interface/arch-x86_32.h | 152 + ./include/xen/interface/arch-x86_64.h | 221 + ./include/xen/interface/dom0_ops.h | 482 +++ ./include/xen/interface/event_channel.h | 203 + ./include/xen/interface/grant_table.h | 306 ++ ./include/xen/interface/hvm/hvm_info_table.h | 24 ./include/xen/interface/hvm/ioreq.h | 90 ./include/xen/interface/hvm/vmx_assist.h | 97 ./include/xen/interface/io/blkif.h | 85 ./include/xen/interface/io/console.h | 33 ./include/xen/interface/io/netif.h | 76 ./include/xen/interface/io/ring.h | 270 ++ ./include/xen/interface/io/tpmif.h | 56 ./include/xen/interface/io/vmx_vlapic.h | 58 ./include/xen/interface/io/vmx_vpic.h | 85 ./include/xen/interface/io/xenbus.h | 44 ./include/xen/interface/io/xs_wire.h | 97 ./include/xen/interface/memory.h | 101 ./include/xen/interface/physdev.h | 70 ./include/xen/interface/sched.h | 60 ./include/xen/interface/sched_ctl.h | 68 ./include/xen/interface/trace.h | 90 ./include/xen/interface/vcpu.h | 64 ./include/xen/interface/version.h | 52 ./include/xen/interface/xen.h | 441 +++ ./include/xen/net_driver_util.h | 56 ./include/xen/public/evtchn.h | 98 ./include/xen/public/privcmd.h | 91 ./include/xen/public/xenstored.h | 89 ./include/xen/tpmfe.h | 33 ./include/xen/xen_proc.h | 23 ./include/xen/xenbus.h | 252 + ./include/xen/xencons.h | 14 ./kernel/Kconfig.preempt | 1 ./kernel/irq/manage.c | 84 ./lib/Kconfig.debug | 2 ./lib/Makefile | 2 ./mm/Kconfig | 3 ./mm/highmem.c | 11 ./mm/memory.c | 118 ./mm/mmap.c | 4 ./net/core/dev.c | 50 ./net/core/skbuff.c | 41 ./scripts/Makefile.xen | 14 linux-2.6.15.i686/arch/i386/Makefile | 18 linux-2.6.15.i686/arch/x86_64/Kconfig | 40 linux-2.6.15.i686/arch/x86_64/ia32/Makefile | 18 linux-2.6.15.i686/arch/x86_64/kernel/Makefile | 21 linux-2.6.15.i686/arch/x86_64/kernel/pci-dma.c | 0 linux-2.6.15.i686/arch/x86_64/kernel/pci-gart.c | 10 linux-2.6.15.i686/drivers/acpi/processor_idle.c | 4 linux-2.6.15.i686/include/asm-i386/desc.h | 51 linux-2.6.15.i686/include/asm-i386/dma-mapping.h | 102 linux-2.6.15.i686/include/asm-i386/segment.h | 41 linux-2.6.15.i686/include/asm-i386/system.h | 138 - linux-2.6.15.i686/include/asm-x86_64/desc.h | 41 linux-2.6.15.i686/include/asm-x86_64/dma-mapping.h | 34 linux-2.6.15.i686/include/asm-x86_64/mmu_context.h | 97 linux-2.6.15.i686/include/asm-x86_64/swiotlb.h | 19 linux-2.6.15.i686/mm/page_alloc.c | 7 326 files changed, 64235 insertions(+), 721 deletions(-) Index: linux-2.6-xen-merge.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-merge.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-xen-merge.patch 26 Jan 2006 22:14:34 -0000 1.4 +++ linux-2.6-xen-merge.patch 26 Jan 2006 22:29:32 -0000 1.5 @@ -46228,7 +46228,7 @@ +__setup("kstack=", kstack_setup); --- /dev/null 2006-01-06 04:48:52.917188312 -0500 +++ ./arch/i386/kernel/irq-xen.c 2006-01-06 16:04:34.000000000 -0500 -@@ -0,1 +1,307 @@ +@@ -0,0 +1,306 @@ +/* + * linux/arch/i386/kernel/irq.c + * From fedora-cvs-commits at redhat.com Thu Jan 26 22:54:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 17:54:46 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1875,1.1876 Message-ID: <200601262254.k0QMskrR002258@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2203 Modified Files: kernel-2.6.spec Log Message: duhh Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1875 retrieving revision 1.1876 diff -u -r1.1875 -r1.1876 --- kernel-2.6.spec 26 Jan 2006 20:45:32 -0000 1.1875 +++ kernel-2.6.spec 26 Jan 2006 22:54:44 -0000 1.1876 @@ -1338,7 +1338,7 @@ %files kdump %defattr(-,root,root) -/%{image_install_path}/vmlinuz-%{KVERREL}kdump +/%{image_install_path}/vmlinux-%{KVERREL}kdump /boot/System.map-%{KVERREL}kdump /boot/config-%{KVERREL}kdump %dir /lib/modules/%{KVERREL}kdump From fedora-cvs-commits at redhat.com Thu Jan 26 23:34:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 18:34:33 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.205, 1.206 anaconda.spec, 1.324, 1.325 sources, 1.324, 1.325 Message-ID: <200601262334.k0QNYXQ3028491@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28444/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.91.8-1 on branch devel from anaconda-10.91.8-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.205 retrieving revision 1.206 diff -u -r1.205 -r1.206 --- .cvsignore 21 Jan 2006 23:29:01 -0000 1.205 +++ .cvsignore 26 Jan 2006 23:34:30 -0000 1.206 @@ -1,4 +1 @@ -anaconda-10.91.4.tar.bz2 -anaconda-10.91.5.tar.bz2 -anaconda-10.91.6.tar.bz2 -anaconda-10.91.7.tar.bz2 +anaconda-10.91.8.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- anaconda.spec 21 Jan 2006 23:29:01 -0000 1.324 +++ anaconda.spec 26 Jan 2006 23:34:30 -0000 1.325 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.91.7 +Version: 10.91.8 Release: 1 License: GPL Summary: Graphical system installer @@ -31,7 +31,7 @@ AutoReqProv: false Requires: libxml2-python, python, rpm-python >= 4.2-0.61, yum >= 2.4.0 Requires: anaconda = %{version}-%{release} -Requires: createrepo >= 0.4.3-3.1 +Requires: createrepo >= 0.4.3-3.1, squashfs-tools %description runtime The anaconda-runtime package contains parts of the installation system which @@ -78,13 +78,31 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Thu Jan 26 2006 Jeremy Katz - 10.91.8-1 +- Remove rpm whiteout (clumens, #178540) +- Fix text in upgrade continue button (dcantrel, #178096) +- Make %%packages in anaconda-ks.cfg shorter (pnasrat) +- Fix text-mode drawing (clumens, #178386) +- Release notes viewer fixes (dcantrel) +- Reset -> reboot (dcantrel, #178566) +- Create ia64 images again (prarit, #175632) +- Make sure boot loader screen gets skipped (clumens, #178815) +- Don't ask about VNC in kickstart +- Don't ask for keyboard under Xen if it fails +- Add more basic "task" selection screen +- Text mode group selection is better now +- Remove some dead code +- Require squashfs-tools (clumens) +- Fix rescue mode (dcantrel) +- Don't have devices disappear out from under us (Patrick Mansfield) + * Fri Jan 20 2006 David Cantrell - 10.91.7-1 - Save state when moving back to "upgrade or install" window (#178095). - Eject CD when in kickstart and given --eject parameter (clumens, #177554). - Translate combo box and comments (clumens, #178250). - Disable backend debugging mode for writeKS(). - Added a PYTHONSTARTUP file to autoload readline, etc. (pjones). -- Write %packages section in template kickstart file (clumens, pnasrat). +- Write %%packages section in template kickstart file (clumens, pnasrat). * Wed Jan 18 2006 David Cantrell - 10.91.6-1 - i18n fixes (katzj) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- sources 21 Jan 2006 23:29:01 -0000 1.324 +++ sources 26 Jan 2006 23:34:30 -0000 1.325 @@ -1 +1 @@ -17119f38765dd1031f94523ba43bbb33 anaconda-10.91.7.tar.bz2 +00e20cf33ebc05f8df2a8a67a95851b1 anaconda-10.91.8.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 01:49:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 20:49:48 -0500 Subject: rpms/kernel/FC-4 linux-2.6-debug-r8169.patch, NONE, 1.1 kernel-2.6.spec, 1.1582, 1.1583 Message-ID: <200601270149.k0R1nmiE001422@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv1357 Modified Files: kernel-2.6.spec Added Files: linux-2.6-debug-r8169.patch Log Message: Enable debugging in r8169 driver. linux-2.6-debug-r8169.patch: r8169.c | 2 ++ 1 files changed, 2 insertions(+) --- NEW FILE linux-2.6-debug-r8169.patch --- --- linux-2.6.15/drivers/net/r8169.c~ 2006-01-26 20:46:23.000000000 -0500 +++ linux-2.6.15/drivers/net/r8169.c 2006-01-26 20:47:37.000000000 -0500 @@ -79,6 +79,8 @@ VERSION 2.2LK <2005/01/25> #define MODULENAME "r8169" #define PFX MODULENAME ": " +#define RTL8169 1 + #ifdef RTL8169_DEBUG #define assert(expr) \ if(!(expr)) { \ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1582 retrieving revision 1.1583 diff -u -r1.1582 -r1.1583 --- kernel-2.6.spec 26 Jan 2006 01:39:55 -0000 1.1582 +++ kernel-2.6.spec 27 Jan 2006 01:49:45 -0000 1.1583 @@ -125,7 +125,7 @@ # First the general kernel 2.6 required versions as per # Documentation/Changes # -%define kernel_dot_org_conflicts ppp <= 2.3.15, pcmcia-cs <= 3.1.20, isdn4k-utils <= 3.0, mount < 2.10r-5, nfs-utils < 1.0.3, e2fsprogs < 1.29, util-linux < 2.10, jfsutils < 1.0.14, reiserfsprogs < 3.6.3, xfsprogs < 2.1.0, procps < 2.0.9, oprofile < 0.5.3 +%define kernel_dot_org_conflicts ppp <= 2.3.15, pcmcia-cs <= 3.1.20, isdn4k-utils <= 3.0, mount < 2.10r-5, nfs-utils < 1.0.3, e2fsprogs < 1.29, util-linux < 2.10, jfsutils < 1.0.14, reiserfsprogs < 3.6.3, xfsprogs < 2.1.0, procps < 2.0.9, oprofile < 0.5.3, udev >= 071-0.FC4.1 # # Then a series of requirements that are distribution specific, either @@ -285,6 +285,7 @@ Patch1026: linux-2.6-debug-no-quiet.patch Patch1027: linux-2.6-debug-slab-leak-detector.patch Patch1028: linux-2.6-debug-oops-pause.patch +Patch1029: linux-2.6-debug-r8169.patch # Restrict /dev/mem usage. Patch1050: linux-2.6-devmem.patch @@ -672,6 +673,7 @@ %patch1026 -p1 %patch1027 -p1 %patch1028 -p1 +%patch1029 -p1 # # Make /dev/mem a need-to-know function @@ -1273,7 +1275,13 @@ %endif %changelog -* Wed Jan 25 2006 Dave Jones [2.6.15-1.1826_FC4] +* Thu Jan 26 2006 Dave Jones [2.6.15-1.1826_FC4] +- Enable debugging in r8169 driver. + +* Wed Jan 25 2006 Dave Jones +- Add udev-071 minimum requirement. + +* Wed Jan 25 2006 Dave Jones - Disable yealink driver due to broken probing. - Disable debug options again. From fedora-cvs-commits at redhat.com Fri Jan 27 01:50:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 20:50:11 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1583,1.1584 Message-ID: <200601270150.k0R1oB81001622@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv1570 Modified Files: kernel-2.6.spec Log Message: bump From fedora-cvs-commits at redhat.com Fri Jan 27 02:11:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 21:11:33 -0500 Subject: rpms/kernel/devel linux-2.6-selinux-mprotect-checks.patch, NONE, 1.1 kernel-2.6.spec, 1.1876, 1.1877 Message-ID: <200601270211.k0R2BXIg008952@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8900 Modified Files: kernel-2.6.spec Added Files: linux-2.6-selinux-mprotect-checks.patch Log Message: Fix the SELinux mprotect checks on executable mappings. (#178747) linux-2.6-selinux-mprotect-checks.patch: devel-akpm/security/selinux/hooks.c | 50 +++++++++++++++--------------------- linux-2.6/security/selinux/hooks.c | 4 +- 2 files changed, 23 insertions(+), 31 deletions(-) --- NEW FILE linux-2.6-selinux-mprotect-checks.patch --- From: Stephen Smalley Fix the SELinux mprotect checks on executable mappings so that they are not re-applied when the mapping is already executable as well as cleaning up the code. This avoids a situation where e.g. an application is prevented from removing PROT_WRITE on an already executable mapping previously authorized via execmem permission due to an execmod denial. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton --- security/selinux/hooks.c | 50 +++++++++++++++---------------------- 1 files changed, 21 insertions(+), 29 deletions(-) diff -puN security/selinux/hooks.c~selinux-fix-and-cleanup-mprotect-checks security/selinux/hooks.c --- devel/security/selinux/hooks.c~selinux-fix-and-cleanup-mprotect-checks 2006-01-23 16:41:27.000000000 -0800 +++ devel-akpm/security/selinux/hooks.c 2006-01-23 16:41:27.000000000 -0800 @@ -2452,35 +2452,27 @@ static int selinux_file_mprotect(struct prot = reqprot; #ifndef CONFIG_PPC32 - if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXECUTABLE) && - (vma->vm_start >= vma->vm_mm->start_brk && - vma->vm_end <= vma->vm_mm->brk)) { - /* - * We are making an executable mapping in the brk region. - * This has an additional execheap check. - */ - rc = task_has_perm(current, current, PROCESS__EXECHEAP); - if (rc) - return rc; - } - if (vma->vm_file != NULL && vma->anon_vma != NULL && (prot & PROT_EXEC)) { - /* - * We are making executable a file mapping that has - * had some COW done. Since pages might have been written, - * check ability to execute the possibly modified content. - * This typically should only occur for text relocations. - */ - int rc = file_has_perm(current, vma->vm_file, FILE__EXECMOD); - if (rc) - return rc; - } - if (!vma->vm_file && (prot & PROT_EXEC) && - vma->vm_start <= vma->vm_mm->start_stack && - vma->vm_end >= vma->vm_mm->start_stack) { - /* Attempt to make the process stack executable. - * This has an additional execstack check. - */ - rc = task_has_perm(current, current, PROCESS__EXECSTACK); + if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) { + rc = 0; + if (vma->vm_start >= vma->vm_mm->start_brk && + vma->vm_end <= vma->vm_mm->brk) { + rc = task_has_perm(current, current, + PROCESS__EXECHEAP); + } else if (!vma->vm_file && + vma->vm_start <= vma->vm_mm->start_stack && + vma->vm_end >= vma->vm_mm->start_stack) { + rc = task_has_perm(current, current, PROCESS__EXECSTACK); + } else if (vma->vm_file && vma->anon_vma) { + /* + * We are making executable a file mapping that has + * had some COW done. Since pages might have been + * written, check ability to execute the possibly + * modified content. This typically should only + * occur for text relocations. + */ + rc = file_has_perm(current, vma->vm_file, + FILE__EXECMOD); + } if (rc) return rc; } _ Index: linux-2.6/security/selinux/hooks.c =================================================================== RCS file: /nfshome/pal/CVS/linux-2.6/security/selinux/hooks.c,v retrieving revision 1.178 diff -u -p -r1.178 hooks.c --- linux-2.6/security/selinux/hooks.c 19 Jan 2006 21:04:27 -0000 1.178 +++ linux-2.6/security/selinux/hooks.c 26 Jan 2006 19:16:22 -0000 @@ -2366,7 +2366,7 @@ static int selinux_file_ioctl(struct fil static int file_map_prot_check(struct file *file, unsigned long prot, int shared) { -#ifndef CONFIG_PPC32 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64) if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) { /* * We are making executable an anonymous mapping or a @@ -2424,7 +2424,7 @@ static int selinux_file_mprotect(struct if (selinux_checkreqprot) prot = reqprot; -#ifndef CONFIG_PPC32 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64) if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) { rc = 0; if (vma->vm_start >= vma->vm_mm->start_brk && Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1876 retrieving revision 1.1877 diff -u -r1.1876 -r1.1877 --- kernel-2.6.spec 26 Jan 2006 22:54:44 -0000 1.1876 +++ kernel-2.6.spec 27 Jan 2006 02:11:30 -0000 1.1877 @@ -342,6 +342,7 @@ Patch1700: linux-2.6-ide-tune-locking.patch Patch1710: linux-2.6-autofs-pathlookup.patch Patch1720: linux-2.6-selinux-hush.patch +Patch1721: linux-2.6-selinux-mprotect-checks.patch Patch1730: linux-2.6-ide-cd-shutup.patch Patch1740: linux-2.6-block-reduce-stack.patch Patch1750: linux-2.6-ub.patch @@ -816,6 +817,8 @@ %patch1710 -p1 # Silence some selinux messages. %patch1720 -p1 +# Fix the SELinux mprotect checks on executable mappings +%patch1721 -p1 # Silence noisy CD drive spew %patch1730 -p1 # Reduce stack usage in block layer @@ -1370,6 +1373,7 @@ - Fix slab corruption in network layer. - Make iptables work again. - Update ACPI to latest acpi-git tree. +- Fix the SELinux mprotect checks on executable mappings. (#178747) * Wed Jan 25 2006 Dave Jones - Disable page allocation debugging again. From fedora-cvs-commits at redhat.com Fri Jan 27 02:45:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 21:45:37 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1584,1.1585 Message-ID: <200601270245.k0R2jbR2021067@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv19818 Modified Files: kernel-2.6.spec Log Message: Fix udev dependancy. Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1584 retrieving revision 1.1585 diff -u -r1.1584 -r1.1585 --- kernel-2.6.spec 27 Jan 2006 01:50:09 -0000 1.1584 +++ kernel-2.6.spec 27 Jan 2006 02:45:34 -0000 1.1585 @@ -125,7 +125,7 @@ # First the general kernel 2.6 required versions as per # Documentation/Changes # -%define kernel_dot_org_conflicts ppp <= 2.3.15, pcmcia-cs <= 3.1.20, isdn4k-utils <= 3.0, mount < 2.10r-5, nfs-utils < 1.0.3, e2fsprogs < 1.29, util-linux < 2.10, jfsutils < 1.0.14, reiserfsprogs < 3.6.3, xfsprogs < 2.1.0, procps < 2.0.9, oprofile < 0.5.3, udev >= 071-0.FC4.1 +%define kernel_dot_org_conflicts ppp <= 2.3.15, pcmcia-cs <= 3.1.20, isdn4k-utils <= 3.0, mount < 2.10r-5, nfs-utils < 1.0.3, e2fsprogs < 1.29, util-linux < 2.10, jfsutils < 1.0.14, reiserfsprogs < 3.6.3, xfsprogs < 2.1.0, procps < 2.0.9, oprofile < 0.5.3, udev < 071-0.FC4.1 # # Then a series of requirements that are distribution specific, either @@ -1275,6 +1275,9 @@ %endif %changelog +* Thu Jan 26 2006 Dave Jones [2.6.15-1.1827_FC4] +- Fix udev dependancy. + * Thu Jan 26 2006 Dave Jones [2.6.15-1.1826_FC4] - Enable debugging in r8169 driver. From fedora-cvs-commits at redhat.com Fri Jan 27 03:11:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 22:11:09 -0500 Subject: rpms/xorg-x11-font-utils/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xorg-x11-font-utils.spec, 1.9, 1.10 Message-ID: <200601270311.k0R3B9Eb012079@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-font-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12024/devel Modified Files: .cvsignore sources xorg-x11-font-utils.spec Log Message: auto-import xorg-x11-font-utils-1.0.1-1 on branch devel from xorg-x11-font-utils-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Dec 2005 15:42:35 -0000 1.6 +++ .cvsignore 27 Jan 2006 03:11:07 -0000 1.7 @@ -1,5 +1,5 @@ bdftopcf-1.0.0.tar.bz2 font-util-1.0.0.tar.bz2 -fonttosfnt-1.0.0.tar.bz2 -mkfontdir-1.0.0.tar.bz2 -mkfontscale-1.0.0.tar.bz2 +fonttosfnt-1.0.1.tar.bz2 +mkfontdir-1.0.1.tar.bz2 +mkfontscale-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Dec 2005 15:42:35 -0000 1.6 +++ sources 27 Jan 2006 03:11:07 -0000 1.7 @@ -1,5 +1,5 @@ f489db67914ca4d9d2fa0331132f342b bdftopcf-1.0.0.tar.bz2 -51bd70c613eade783e16383c02c68c91 font-util-1.0.0.tar.bz2 -2e6d3ce38dde31e4c74d68560c13b68c fonttosfnt-1.0.0.tar.bz2 -18953929a9a0b713fe3bca9de4e95dd5 mkfontdir-1.0.0.tar.bz2 -f3476ef5896252173ed1f7a1003e3661 mkfontscale-1.0.0.tar.bz2 +0a537f95ee9d46f9e5b58c1a2c733dd4 font-util-1.0.0.tar.bz2 +efe452ec264ee0fddbe9300873164dec fonttosfnt-1.0.1.tar.bz2 +7bf7543a2af76c5f4376fcd18a86551e mkfontdir-1.0.1.tar.bz2 +1e74e68eb9e8e91c6b7b615d80dc5ee1 mkfontscale-1.0.1.tar.bz2 Index: xorg-x11-font-utils.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-font-utils.spec 16 Dec 2005 15:42:35 -0000 1.9 +++ xorg-x11-font-utils.spec 27 Jan 2006 03:11:07 -0000 1.10 @@ -4,18 +4,18 @@ Name: xorg-x11-%{pkgname} # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line! Epoch: 1 -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/bdftopcf-1.0.0.tar.bz2 -Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/fonttosfnt-1.0.0.tar.bz2 -Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/mkfontdir-1.0.0.tar.bz2 -Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/mkfontscale-1.0.0.tar.bz2 -Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/font-util-1.0.0.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/bdftopcf-1.0.0.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fonttosfnt-1.0.1.tar.bz2 +Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/mkfontdir-1.0.1.tar.bz2 +Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/mkfontscale-1.0.1.tar.bz2 +Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/font-util-1.0.0.tar.bz2 Patch0: font-util-1.0.0-mapdir-use-datadir-fix.patch Patch1: font-util-1.0.0-autoconf-add-with-fontdir-option.patch @@ -129,6 +129,9 @@ %{_mandir}/man1/ucs2any.1x* %changelog +* Wed Jan 18 2006 Mike A. Harris 1:1.0.1-1 +- Updated all utilities to the versions shipped in X11R7.0. + * Thu Dec 15 2005 Mike A. Harris 1:1.0.0-1 - Updated all utilities to version 1.0.0 from X11R7 RC4. - Updated font-util-1.0.0-mapdir-use-datadir-fix.patch to work with RC4. From fedora-cvs-commits at redhat.com Fri Jan 27 03:14:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 22:14:26 -0500 Subject: rpms/metacity/devel .cvsignore, 1.28, 1.29 metacity.spec, 1.48, 1.49 sources, 1.28, 1.29 Message-ID: <200601270314.k0R3EQme013665@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/metacity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13599 Modified Files: .cvsignore metacity.spec sources Log Message: 2.13.34 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 16 Jan 2006 19:37:00 -0000 1.28 +++ .cvsignore 27 Jan 2006 03:14:23 -0000 1.29 @@ -1 +1,2 @@ metacity-2.13.21.tar.bz2 +metacity-2.13.34.tar.bz2 Index: metacity.spec =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- metacity.spec 16 Jan 2006 19:37:00 -0000 1.48 +++ metacity.spec 27 Jan 2006 03:14:23 -0000 1.49 @@ -2,7 +2,7 @@ Summary: Metacity window manager Name: metacity -Version: 2.13.21 +Version: 2.13.34 Release: 1 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/ Source0: %{name}-%{version}.tar.bz2 @@ -106,6 +106,9 @@ %{_mandir}/man1/* %changelog +* Thu Jan 26 2006 Matthias Clasen 2.13.34-1 +- Update to 2.13.34 + * Mon Jan 16 2006 Ray Strode at redhat.com> 2.13.21-1 - Update to 2.13.21 Index: sources =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 16 Jan 2006 19:37:00 -0000 1.28 +++ sources 27 Jan 2006 03:14:23 -0000 1.29 @@ -1 +1 @@ -eacaa2aa7905e2294bdafe35d502b2a9 metacity-2.13.21.tar.bz2 +d6c8b2a8a8d205ffdaab76d348bd97b7 metacity-2.13.34.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 03:24:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 22:24:35 -0500 Subject: rpms/kernel/FC-4/configs config-generic,1.52,1.53 Message-ID: <200601270324.k0R3OZYS030480@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv30393/configs Modified Files: config-generic Log Message: bump nr serial ports to register Index: config-generic =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/configs/config-generic,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- config-generic 26 Jan 2006 01:39:55 -0000 1.52 +++ config-generic 27 Jan 2006 03:24:32 -0000 1.53 @@ -1470,7 +1470,7 @@ CONFIG_SERIAL_8250_CS=m # CONFIG_SERIAL_8250_ACPI is not set CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y From fedora-cvs-commits at redhat.com Fri Jan 27 03:24:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 22:24:35 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec,1.1585,1.1586 Message-ID: <200601270324.k0R3OZnS030472@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv30393 Modified Files: kernel-2.6.spec Log Message: bump nr serial ports to register Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/kernel-2.6.spec,v retrieving revision 1.1585 retrieving revision 1.1586 diff -u -r1.1585 -r1.1586 --- kernel-2.6.spec 27 Jan 2006 02:45:34 -0000 1.1585 +++ kernel-2.6.spec 27 Jan 2006 03:24:32 -0000 1.1586 @@ -1275,6 +1275,9 @@ %endif %changelog +* Thu Jan 26 2006 Dave Jones [2.6.15-1.1828_FC4] +- Bump default number of serial ports registered. + * Thu Jan 26 2006 Dave Jones [2.6.15-1.1827_FC4] - Fix udev dependancy. From fedora-cvs-commits at redhat.com Fri Jan 27 03:26:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 22:26:59 -0500 Subject: rpms/kernel/FC-4 kernel-2.6.spec, 1.1586, 1.1587 linux-2.6-debug-r8169.patch, 1.1, 1.2 Message-ID: <200601270326.k0R3QxE9031594@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv31542 Modified Files: kernel-2.6.spec linux-2.6-debug-r8169.patch Log Message: fix braino linux-2.6-debug-r8169.patch: r8169.c | 2 ++ 1 files changed, 2 insertions(+) Index: linux-2.6-debug-r8169.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/FC-4/linux-2.6-debug-r8169.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- linux-2.6-debug-r8169.patch 27 Jan 2006 01:49:45 -0000 1.1 +++ linux-2.6-debug-r8169.patch 27 Jan 2006 03:26:55 -0000 1.2 @@ -4,7 +4,7 @@ #define MODULENAME "r8169" #define PFX MODULENAME ": " -+#define RTL8169 1 ++#define RTL8169_DEBUG 1 + #ifdef RTL8169_DEBUG #define assert(expr) \ From fedora-cvs-commits at redhat.com Fri Jan 27 03:29:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 22:29:14 -0500 Subject: rpms/libgtop2/devel .cvsignore, 1.21, 1.22 libgtop2.spec, 1.27, 1.28 sources, 1.21, 1.22 Message-ID: <200601270329.k0R3TEBI032712@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgtop2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32657 Modified Files: .cvsignore libgtop2.spec sources Log Message: 2.13.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 3 Jan 2006 18:33:14 -0000 1.21 +++ .cvsignore 27 Jan 2006 03:29:10 -0000 1.22 @@ -13,3 +13,4 @@ libgtop-2.13.0.tar.bz2 libgtop-2.13.1.tar.bz2 libgtop-2.13.2.tar.bz2 +libgtop-2.13.3.tar.bz2 Index: libgtop2.spec =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/libgtop2.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- libgtop2.spec 3 Jan 2006 18:33:14 -0000 1.27 +++ libgtop2.spec 27 Jan 2006 03:29:10 -0000 1.28 @@ -6,7 +6,7 @@ Name: libgtop2 Summary: libgtop library (version 2) -Version: 2.13.2 +Version: 2.13.3 Release: 1 License: GPL URL: ftp://ftp.gnome.org/pub/GNOME/sources/libgtop/2.0 @@ -83,6 +83,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Jan 24 2006 Matthias Clasen +- Update to 2.13.3 + * Tue Jan 03 2006 Matthias Clasen - Update to 2.13.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgtop2/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 3 Jan 2006 18:33:14 -0000 1.21 +++ sources 27 Jan 2006 03:29:10 -0000 1.22 @@ -1 +1 @@ -a6f10cb2ac8d377bc8cf84dae5d89e8b libgtop-2.13.2.tar.bz2 +33781e3a3fef7fb2343f7328efdcaef7 libgtop-2.13.3.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 03:35:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 22:35:19 -0500 Subject: rpms/libgnomeui/devel .cvsignore, 1.20, 1.21 libgnomeui.spec, 1.33, 1.34 sources, 1.20, 1.21 Message-ID: <200601270335.k0R3ZJ7O001477@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgnomeui/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1234 Modified Files: .cvsignore libgnomeui.spec sources Log Message: 2.13.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgnomeui/devel/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 17 Jan 2006 03:17:47 -0000 1.20 +++ .cvsignore 27 Jan 2006 03:35:16 -0000 1.21 @@ -2,3 +2,4 @@ libgnomeui-2.12.0.tar.bz2 libgnomeui-2.13.0.tar.bz2 libgnomeui-2.13.2.tar.bz2 +libgnomeui-2.13.3.tar.bz2 Index: libgnomeui.spec =================================================================== RCS file: /cvs/dist/rpms/libgnomeui/devel/libgnomeui.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- libgnomeui.spec 17 Jan 2006 03:40:34 -0000 1.33 +++ libgnomeui.spec 27 Jan 2006 03:35:16 -0000 1.34 @@ -17,7 +17,7 @@ Summary: GNOME base GUI library Name: libgnomeui -Version: 2.13.2 +Version: 2.13.3 Release: 1 URL: ftp://ftp.gnome.org Source0: %{name}-%{version}.tar.bz2 @@ -160,6 +160,9 @@ %{_datadir}/gtk-doc %changelog +* Thu Jan 26 2006 Matthias Clasen +- Update to 2.13.3 + * Mon Jan 16 2006 Matthias Clasen - Update to 2.13.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgnomeui/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 17 Jan 2006 03:17:47 -0000 1.20 +++ sources 27 Jan 2006 03:35:16 -0000 1.21 @@ -1 +1 @@ -beee8d2e32ddb4b5647e8c5c950a42fa libgnomeui-2.13.2.tar.bz2 +b23459770a68a9f829bd407f5ff961a0 libgnomeui-2.13.3.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 03:35:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 22:35:24 -0500 Subject: rpms/firefox/devel .cvsignore, 1.18, 1.19 firefox-redhat-default-prefs.js, 1.5, 1.6 firefox.spec, 1.96, 1.97 sources, 1.20, 1.21 Message-ID: <200601270335.k0R3ZOFQ001544@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/firefox/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1502 Modified Files: .cvsignore firefox-redhat-default-prefs.js firefox.spec sources Log Message: * Thu Jan 26 2006 Christopher Aillon - 1.5-5 - Ship langpacks again from upstream - Stop providing MozillaFirebird and mozilla-firebird Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 30 Nov 2005 04:16:47 -0000 1.18 +++ .cvsignore 27 Jan 2006 03:35:21 -0000 1.19 @@ -15,3 +15,4 @@ firefox-1.5rc1-source.tar.bz2 firefox-1.5rc3-source.tar.bz2 firefox-1.5-source.tar.bz2 +firefox-langpacks-20060125.tar.bz2 Index: firefox-redhat-default-prefs.js =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox-redhat-default-prefs.js,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- firefox-redhat-default-prefs.js 23 Jul 2005 00:32:23 -0000 1.5 +++ firefox-redhat-default-prefs.js 27 Jan 2006 03:35:21 -0000 1.6 @@ -6,3 +6,4 @@ pref("general.smoothScroll", true); pref("general.useragent.vendor", "Fedora"); pref("general.useragent.vendorSub", "FIREFOX_RPM_VR"); +pref("intl.locale.matchOS", true); Index: firefox.spec =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- firefox.spec 3 Jan 2006 16:41:28 -0000 1.96 +++ firefox.spec 27 Jan 2006 03:35:21 -0000 1.97 @@ -9,7 +9,7 @@ Summary: Mozilla Firefox Web browser. Name: firefox Version: 1.5 -Release: 4 +Release: 5 URL: http://www.mozilla.org/projects/firefox/ License: MPL/LGPL Group: Applications/Internet @@ -20,7 +20,7 @@ %endif Source0: %{tarball} Source1: firefox-gnomestripe-0.1.tar.gz -Source2: firefox-1.0-locales.tar.bz2 +Source2: firefox-langpacks-20060125.tar.bz2 Source10: firefox-mozconfig Source11: firefox-mozconfig-branded @@ -83,7 +83,6 @@ Requires: nss >= %{nss_version} Requires: desktop-file-utils >= %{desktop_file_utils_version} Obsoletes: phoenix, mozilla-firebird, MozillaFirebird -Provides: mozilla-firebird = %{epoch}:%{version}, MozillaFirebird = %{epoch}:%{version} Provides: webclient %define ffdir %{_libdir}/firefox-%{version} @@ -141,18 +140,6 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/` MAKE="gmake %{?_smp_mflags}" make -f client.mk build -for locale in `cat browser/locales/all-locales` -do - if [ -d browser/locales/$locale ] ; then - %{__perl} -pi -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" \ - browser/locales/$locale/chrome/browser-region/region.properties - %{__make} -C browser/locales AB_CD=$locale - fi - if [ -d toolkit/locales/$locale ] ; then - %{__make} -C toolkit/locales AB_CD=$locale - fi -done - #--------------------------------------------------------------------- %install @@ -216,6 +203,26 @@ # own mozilla plugin dir (#135050) %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins +# Install langpacks +%{__mkdir_p} $RPM_BUILD_ROOT%{ffdir}/extensions +%{__tar} xjf %{SOURCE2} +for langpack in `ls firefox-langpacks/*.xpi`; do + language=`basename $langpack .xpi` + extensiondir=$RPM_BUILD_ROOT%{ffdir}/extensions/langpack-$language at firefox.mozilla.org + %{__mkdir_p} $extensiondir + unzip $langpack -d $extensiondir + + %{__rm} -rf locale + jarfile=$extensiondir/chrome/$language.jar + unzip $jarfile + sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" locale/browser-region/region.properties + %{__rm} -rf $jarfile + zip -r -D $jarfile locale + %{__rm} -rf locale + +done +%{__rm} -rf firefox-langpacks + # ghost files touch $RPM_BUILD_ROOT%{ffdir}/components/compreg.dat touch $RPM_BUILD_ROOT%{ffdir}/components/xpti.dat @@ -256,6 +263,10 @@ #--------------------------------------------------------------------- %changelog +* Thu Jan 26 2006 Christopher Aillon - 1.5-5 +- Ship langpacks again from upstream +- Stop providing MozillaFirebird and mozilla-firebird + * Tue Jan 3 2006 Christopher Aillon - 1.5-4 - Looks like we can build ppc64 again. Happy New Year! Index: sources =================================================================== RCS file: /cvs/dist/rpms/firefox/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 30 Nov 2005 04:16:47 -0000 1.20 +++ sources 27 Jan 2006 03:35:21 -0000 1.21 @@ -1,3 +1,3 @@ b628d5f24a49ab15d1943b7d694edd90 firefox-gnomestripe-0.1.tar.gz -2a9c2ae93baa98b96d28db380a805442 firefox-1.0-locales.tar.bz2 fa915ddcadecda30ed3e13694f26a779 firefox-1.5-source.tar.bz2 +1f39da3a36cb722973e21b724eb59d0b firefox-langpacks-20060125.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 03:58:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 22:58:52 -0500 Subject: rpms/gnome-volume-manager/devel .cvsignore, 1.16, 1.17 gnome-volume-manager.spec, 1.30, 1.31 sources, 1.16, 1.17 Message-ID: <200601270358.k0R3wqjC024351@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-volume-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24305 Modified Files: .cvsignore gnome-volume-manager.spec sources Log Message: 1.5.11 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 13 Jan 2006 23:24:36 -0000 1.16 +++ .cvsignore 27 Jan 2006 03:58:49 -0000 1.17 @@ -11,3 +11,4 @@ gnome-volume-manager-1.5.5.tar.bz2 gnome-volume-manager-1.5.7.tar.bz2 gnome-volume-manager-1.5.9.tar.bz2 +gnome-volume-manager-1.5.11.tar.bz2 Index: gnome-volume-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/gnome-volume-manager.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- gnome-volume-manager.spec 18 Jan 2006 20:54:38 -0000 1.30 +++ gnome-volume-manager.spec 27 Jan 2006 03:58:49 -0000 1.31 @@ -1,7 +1,7 @@ Summary: The GNOME Volume Manager Name: gnome-volume-manager -Version: 1.5.9 -Release: 3 +Version: 1.5.11 +Release: 1 License: GPL Group: Applications/System Source0: gnome-volume-manager-%{version}.tar.bz2 @@ -41,8 +41,6 @@ %setup -q %patch0 -p1 -b .add-to-base %patch1 -p1 -b .rh-defaults -%patch2 -p0 -b .no-ui -%patch3 -p1 -b .goption %build %configure @@ -80,6 +78,9 @@ %{_libexecdir}/gnome-cdda-handler %changelog +* Thu Jan 26 2006 Matthias Clasen - 1.5.11-1 +- Update 1.5.11 + * Wed Jan 18 2006 John (J5) Palmieri - 1.5.9-3 - Switch to using goptions instead of popt which is causing a crash Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-volume-manager/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 13 Jan 2006 23:24:36 -0000 1.16 +++ sources 27 Jan 2006 03:58:49 -0000 1.17 @@ -1 +1 @@ -bc16973d9870da8055c0299d3be9c08d gnome-volume-manager-1.5.9.tar.bz2 +5c0352da03ae2bc60cf1f3bf1a04c1a6 gnome-volume-manager-1.5.11.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 04:08:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 23:08:01 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1877,1.1878 Message-ID: <200601270408.k0R481cd026238@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26157 Modified Files: kernel-2.6.spec Log Message: dont install vmlinuz on kexec kernels Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1877 retrieving revision 1.1878 diff -u -r1.1877 -r1.1878 --- kernel-2.6.spec 27 Jan 2006 02:11:30 -0000 1.1877 +++ kernel-2.6.spec 27 Jan 2006 04:07:58 -0000 1.1878 @@ -990,6 +990,7 @@ %if "%{buildkdump}" == "1" if [ `grep CONFIG_CRASH_DUMP=y .config` ]; then cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer + rm -f $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer fi %endif From fedora-cvs-commits at redhat.com Fri Jan 27 04:17:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 23:17:32 -0500 Subject: rpms/xorg-x11-fonts/devel .cvsignore, 1.3, 1.4 font-alias-1.0.0-fonts-alias-fontdir-fix.patch, 1.1, 1.2 sources, 1.3, 1.4 xorg-x11-fonts.spec, 1.9, 1.10 Message-ID: <200601270417.k0R4HWfR010348@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-fonts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10307/devel Modified Files: .cvsignore font-alias-1.0.0-fonts-alias-fontdir-fix.patch sources xorg-x11-fonts.spec Log Message: auto-import xorg-x11-fonts-7.0-1 on branch devel from xorg-x11-fonts-7.0-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Dec 2005 15:53:35 -0000 1.3 +++ .cvsignore 27 Jan 2006 04:17:29 -0000 1.4 @@ -1,10 +1,10 @@ encodings-1.0.0.tar.bz2 font-adobe-100dpi-1.0.0.tar.bz2 font-adobe-75dpi-1.0.0.tar.bz2 -font-adobe-utopia-100dpi-1.0.0.tar.bz2 -font-adobe-utopia-75dpi-1.0.0.tar.bz2 -font-adobe-utopia-type1-1.0.0.tar.bz2 -font-alias-1.0.0.tar.bz2 +font-adobe-utopia-100dpi-1.0.1.tar.bz2 +font-adobe-utopia-75dpi-1.0.1.tar.bz2 +font-adobe-utopia-type1-1.0.1.tar.bz2 +font-alias-1.0.1.tar.bz2 font-arabic-misc-1.0.0.tar.bz2 font-bh-100dpi-1.0.0.tar.bz2 font-bh-75dpi-1.0.0.tar.bz2 @@ -24,6 +24,7 @@ font-jis-misc-1.0.0.tar.bz2 font-micro-misc-1.0.0.tar.bz2 font-misc-cyrillic-1.0.0.tar.bz2 +font-misc-ethiopic-1.0.0.tar.bz2 font-misc-meltho-1.0.0.tar.bz2 font-misc-misc-1.0.0.tar.bz2 font-mutt-misc-1.0.0.tar.bz2 font-alias-1.0.0-fonts-alias-fontdir-fix.patch: configure.ac | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: font-alias-1.0.0-fonts-alias-fontdir-fix.patch =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/font-alias-1.0.0-fonts-alias-fontdir-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- font-alias-1.0.0-fonts-alias-fontdir-fix.patch 16 Dec 2005 15:53:35 -0000 1.1 +++ font-alias-1.0.0-fonts-alias-fontdir-fix.patch 27 Jan 2006 04:17:29 -0000 1.2 @@ -1,5 +1,5 @@ ---- font-alias-1.0.0/configure.ac.fonts-alias-fontdir-fix 2005-12-16 01:53:02.000000000 -0500 -+++ font-alias-1.0.0/configure.ac 2005-12-16 01:53:41.000000000 -0500 +--- font-alias-1.0.1/configure.ac.fonts-alias-fontdir-fix 2005-12-16 01:53:02.000000000 -0500 ++++ font-alias-1.0.1/configure.ac 2005-12-16 01:53:41.000000000 -0500 @@ -30,7 +30,7 @@ m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Dec 2005 15:53:35 -0000 1.3 +++ sources 27 Jan 2006 04:17:29 -0000 1.4 @@ -1,35 +1,36 @@ -81b6d7e45f974946a798f17b1f79e5a3 encodings-1.0.0.tar.bz2 -3a36041b4e63fdcf155d238c611d21f1 font-adobe-100dpi-1.0.0.tar.bz2 -22517ec84e0c58853a70c53b50874c13 font-adobe-75dpi-1.0.0.tar.bz2 -f18801c7e70a4a27011b8deabc2692a8 font-adobe-utopia-100dpi-1.0.0.tar.bz2 -aaf8d2f4e9531a1fab26e45dacb05b7f font-adobe-utopia-75dpi-1.0.0.tar.bz2 -3d65e701a4bf3b06fd5de20f162f543e font-adobe-utopia-type1-1.0.0.tar.bz2 -3614b5f504f637f470dbce0476bf8315 font-alias-1.0.0.tar.bz2 -b71cc63ff8253f3059af75e96a179361 font-arabic-misc-1.0.0.tar.bz2 -a38fe26959bfca3bb4052516a7c2f906 font-bh-100dpi-1.0.0.tar.bz2 -589f8c5a69dc991c9c447777058a6c16 font-bh-75dpi-1.0.0.tar.bz2 -16afbb558c7f24a9c08be52da5a3d5c8 font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2 -2bf59944f760dac80d078b64b7be0254 font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2 -1e96c2cb8da66ea4e3df1f19bff8006e font-bh-ttf-1.0.0.tar.bz2 -f6bf214100752296426ba778714f057b font-bh-type1-1.0.0.tar.bz2 -a6f2c61ed43a8e5cb09dba2d0363fba8 font-bitstream-100dpi-1.0.0.tar.bz2 -be02e09d19683f2af83f566248a925d8 font-bitstream-75dpi-1.0.0.tar.bz2 -3bd6f98e0d137da76dda9efb38315cfd font-bitstream-type1-1.0.0.tar.bz2 -c66cb5ce26f24977adaf1f65360fcb45 font-cronyx-cyrillic-1.0.0.tar.bz2 -bf70e409ac182146581a525bb131c633 font-cursor-misc-1.0.0.tar.bz2 -634c64004d0ec8b8650f96fc80e83542 font-daewoo-misc-1.0.0.tar.bz2 -b2f79b65f8191e5082752646fc9904ae font-dec-misc-1.0.0.tar.bz2 -e3f122735299158a75199b5dddcf3205 font-ibm-type1-1.0.0.tar.bz2 -2c3f0d281abd6855cba55a1471262422 font-isas-misc-1.0.0.tar.bz2 -fbf76c0509bafca4b86547cd1173df51 font-jis-misc-1.0.0.tar.bz2 -a520709941e4e325097530ace57304ba font-micro-misc-1.0.0.tar.bz2 -91947d8241ac64d37bbb03e6d33dbb8a font-misc-cyrillic-1.0.0.tar.bz2 -dbae6c75b4c8108298cdffb0ba84a9fb font-misc-meltho-1.0.0.tar.bz2 -4d9ea506dafe32ffd235cf94e2b25c63 font-misc-misc-1.0.0.tar.bz2 -fe82b8d8df487d51309b449155e32f69 font-mutt-misc-1.0.0.tar.bz2 -480b90ee3d462bfeed66735897eaf4ae font-schumacher-misc-1.0.0.tar.bz2 -8a696edbcb55ebc00e8b829002faeaa1 font-screen-cyrillic-1.0.0.tar.bz2 -264ec16adafeb2470aab94ce5f5ab615 font-sony-misc-1.0.0.tar.bz2 -ec847f72d34d59b4139181e18321c3eb font-sun-misc-1.0.0.tar.bz2 -0f6aa8d87c1a3c15ba40efb255e4f125 font-winitzki-cyrillic-1.0.0.tar.bz2 -7ca54829c4d0f015f959ea0e1bb75195 font-xfree86-type1-1.0.0.tar.bz2 +c6d3fe9d5359349ceeab657f236c04d5 encodings-1.0.0.tar.bz2 +443acfe70e26716282f9068730fe92c4 font-adobe-100dpi-1.0.0.tar.bz2 +813b5d3723c84388a938ab6732e1329c font-adobe-75dpi-1.0.0.tar.bz2 +5d28a30efef966f8dbbaff9a6619f01a font-adobe-utopia-100dpi-1.0.1.tar.bz2 +dd912284e4750023f9682812532fa033 font-adobe-utopia-75dpi-1.0.1.tar.bz2 +aa7ff4bd20b961afda9c15d103b972a5 font-adobe-utopia-type1-1.0.1.tar.bz2 +c4776b6f0f2ecdb7670b6fe64b5d2a2d font-alias-1.0.1.tar.bz2 +81595016e2ff859716fc256ebb136ba6 font-arabic-misc-1.0.0.tar.bz2 +e5592de74a5c04e3a2608800dd079197 font-bh-100dpi-1.0.0.tar.bz2 +6e51cd02f4ce32e1393e34ab17a9b211 font-bh-75dpi-1.0.0.tar.bz2 +c44d3f730564da465993e9292a33c235 font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2 +fdd9be5b9db94ef363a33e39b7977e2b font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2 +ad43cf739b3d46ba1e7dc778a0608a52 font-bh-ttf-1.0.0.tar.bz2 +46588b22678e440741d6220bc3945cbf font-bh-type1-1.0.0.tar.bz2 +173352ddec3d26e2b91df1edcf1ae85b font-bitstream-100dpi-1.0.0.tar.bz2 +beb476657d50d07d17eef7c325a5ed08 font-bitstream-75dpi-1.0.0.tar.bz2 +6610475e2e231242f8f2122a709c3695 font-bitstream-type1-1.0.0.tar.bz2 +22b451e7230b8c003cfc496ee2d360cc font-cronyx-cyrillic-1.0.0.tar.bz2 +305fa22cdfefb8f80babd711051a534b font-cursor-misc-1.0.0.tar.bz2 +61f9eab48c619af5494d3e384d8d7d79 font-daewoo-misc-1.0.0.tar.bz2 +284e554db1c64fb7580a06df01444a2b font-dec-misc-1.0.0.tar.bz2 +8e8733051371e2b51123376b49f5d3ea font-ibm-type1-1.0.0.tar.bz2 +ec709a96b64b497a5cb5658c93bd38dc font-isas-misc-1.0.0.tar.bz2 +61febb49a71065723a1fba17cbf23c67 font-jis-misc-1.0.0.tar.bz2 +8c8bffd7540f05caa0dbb4e6e1d6c58e font-micro-misc-1.0.0.tar.bz2 +3596907d7a2a99c81d8de99bc4552b6a font-misc-cyrillic-1.0.0.tar.bz2 +0b271fc617087d77560bdca20c0cdbb0 font-misc-ethiopic-1.0.0.tar.bz2 +ccb212a7badf7aefdc9f9a92af428d32 font-misc-meltho-1.0.0.tar.bz2 +2a57f6188c41d4bc1b88ca3d08ad011d font-misc-misc-1.0.0.tar.bz2 +648b409b7eb78ad1cd5f6d7fac3eef88 font-mutt-misc-1.0.0.tar.bz2 +f1c6063d2fadc57e696a0aab69afd6e0 font-schumacher-misc-1.0.0.tar.bz2 +aea02d9dff03e0e1a3de85364367c0c6 font-screen-cyrillic-1.0.0.tar.bz2 +0dfddd1a946e4497f009094c0ae1bdd5 font-sony-misc-1.0.0.tar.bz2 +e17d43a7c6c0d862cfba0908ff132ffa font-sun-misc-1.0.0.tar.bz2 +b99b02aff36a88ca3379715423c60303 font-winitzki-cyrillic-1.0.0.tar.bz2 +e66f36a6d68203cc4cf7b56ebbb192dd font-xfree86-type1-1.0.0.tar.bz2 Index: xorg-x11-fonts.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-fonts/devel/xorg-x11-fonts.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-fonts.spec 18 Jan 2006 02:48:59 -0000 1.9 +++ xorg-x11-fonts.spec 27 Jan 2006 04:17:29 -0000 1.10 @@ -20,7 +20,7 @@ %define _ttf_fontdir %{_x11fontdir} # Configuration section -%define with_ethiopic_fonts 0 +%define with_ethiopic_fonts 1 %if %{with_ethiopic_fonts} %define ethiopic_fonts -a35 %else @@ -29,8 +29,8 @@ Summary: X.Org X11 fonts Name: xorg-x11-fonts -Version: 1.0.0 -Release: 3 +Version: 7.0 +Release: 1 License: Various licenses Group: User Interface/X URL: http://www.x.org @@ -39,12 +39,12 @@ BuildArch: noarch Source0: encodings-1.0.0.tar.bz2 -Source1: font-alias-1.0.0.tar.bz2 +Source1: font-alias-1.0.1.tar.bz2 Source10: font-adobe-100dpi-1.0.0.tar.bz2 Source11: font-adobe-75dpi-1.0.0.tar.bz2 -Source12: font-adobe-utopia-100dpi-1.0.0.tar.bz2 -Source13: font-adobe-utopia-75dpi-1.0.0.tar.bz2 -Source14: font-adobe-utopia-type1-1.0.0.tar.bz2 +Source12: font-adobe-utopia-100dpi-1.0.1.tar.bz2 +Source13: font-adobe-utopia-75dpi-1.0.1.tar.bz2 +Source14: font-adobe-utopia-type1-1.0.1.tar.bz2 Source15: font-arabic-misc-1.0.0.tar.bz2 @@ -412,7 +412,7 @@ # get considered to be included in upstream 7.1 release in which case I'll # turn it into a series of diffs instead and submit it. For now tho, perl # is my friend. -- mharris - perl -p -i -e 's#(^DEFAULT_FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac + perl -p -i -e 's#(^DEFAULT(_|_OTF|_TTF)FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac autoconf #3,4,6,10,11,12,13,16 %configure \ @@ -1524,6 +1524,11 @@ %ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-* %changelog +* Thu Jan 26 2006 Mike A. Harris 7.0-1 +- Bumped artificial package version to 7.0, to indicate that the font tarballs + are all from X11R7.0. +- Enabled the ethiopic font subpackage experimentally for bug (#176678) + * Tue Jan 17 2006 Mike A. Harris 1.0.0-3 - Added missing post/postun scripts for ISO8859-1-75dpi and ISO8859-1-100dpi font packages. (#174416) From fedora-cvs-commits at redhat.com Fri Jan 27 04:54:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Thu, 26 Jan 2006 23:54:54 -0500 Subject: rpms/gedit/devel .cvsignore, 1.32, 1.33 gedit.spec, 1.62, 1.63 sources, 1.34, 1.35 Message-ID: <200601270454.k0R4ssXC026403@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26348 Modified Files: .cvsignore gedit.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 17 Jan 2006 04:14:27 -0000 1.32 +++ .cvsignore 27 Jan 2006 04:54:51 -0000 1.33 @@ -7,3 +7,4 @@ gedit-2.13.1.tar.bz2 gedit-2.13.2.tar.bz2 gedit-2.13.3.tar.bz2 +gedit-2.13.4.tar.bz2 Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- gedit.spec 17 Jan 2006 04:58:29 -0000 1.62 +++ gedit.spec 27 Jan 2006 04:54:51 -0000 1.63 @@ -15,7 +15,7 @@ Summary: gEdit is a small but powerful text editor for GNOME. Name: gedit -Version: 2.13.3 +Version: 2.13.4 Release: 1 Epoch: 1 License: GPL @@ -150,6 +150,9 @@ %{_libdir}/pkgconfig/gedit-2.14.pc %changelog +* Thu Jan 26 2006 Matthias Clasen - 1:2.13.4-1 +- Update to 2.13.4 + * Mon Jan 16 2006 Matthias Clasen - 1:2.13.3-1 - Update to 2.13.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 17 Jan 2006 04:14:27 -0000 1.34 +++ sources 27 Jan 2006 04:54:51 -0000 1.35 @@ -1 +1 @@ -645a9fee4e4db0a1c52983e46e160129 gedit-2.13.3.tar.bz2 +4eca36638401b6e350546371753c332b gedit-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 05:25:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 00:25:03 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.15,1.16 Message-ID: <200601270525.k0R5P36v012552@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12447 Modified Files: gnome-power-manager.spec Log Message: - packaging tweaks Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnome-power-manager.spec 26 Jan 2006 19:33:39 -0000 1.15 +++ gnome-power-manager.spec 27 Jan 2006 05:24:58 -0000 1.16 @@ -44,10 +44,12 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL desktop-file-install --vendor gnome --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-only-show-in GNOME \ - --add-category X-Red-Hat-Base \ - $RPM_BUILD_ROOT%{_datadir}/applications/* + --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \ + $RPM_BUILD_ROOT%{_datadir}/autostart/gnome-power-manager.desktop + +# remove this line when we switch to autostart gnome-session and +# get the launching code out of gnome-settings-daemon +echo "Hidden=true" >> $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/gnome-power-manager.desktop %find_lang %name @@ -69,18 +71,22 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README %{_bindir}/* -%{_datadir}/applications/* %{_datadir}/gnome-power-manager/* %{_datadir}/man/* %{_sysconfdir}/gconf/schemas/*.schemas %{_sysconfdir}/dbus-1/system.d/gnome-power-manager.conf +%{_sysconfdir}/xdg/autostart/* %{_datadir}/dbus-1/services/gnome-power-manager.service %{_datadir}/gnome/help/gnome-power-manager/C/figures/pref-main.png %{_datadir}/gnome/help/gnome-power-manager/C/gnome-power-manager.xml %{_datadir}/gnome/help/gnome-power-manager/C/legal.xml %{_datadir}/omf/gnome-power-manager/gnome-power-manager-C.omf +%{_datadir}/applications/gnome-power-preferences.desktop %changelog +* Thu Jan 26 2006 Ray Strode - 2.13.5-1 +- packaging tweaks + * Thu Jan 26 2006 Christopher Aillon 2.13.5-1 - Update to 2.13.5 From fedora-cvs-commits at redhat.com Fri Jan 27 06:49:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 01:49:07 -0500 Subject: rpms/NetworkManager/devel .cvsignore, 1.25, 1.26 NetworkManager.spec, 1.76, 1.77 sources, 1.40, 1.41 NetworkManager-0.5.1-dbus-api.patch, 1.1, NONE Message-ID: <200601270649.k0R6n79H004270@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4254 Modified Files: .cvsignore NetworkManager.spec sources Removed Files: NetworkManager-0.5.1-dbus-api.patch Log Message: * Fri Jan 27 2006 Dan Williams 0.5.1-6.cvs20060127 - Snapshot from CVS - WPA Support! Woohoo! Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 20 Oct 2005 05:19:30 -0000 1.25 +++ .cvsignore 27 Jan 2006 06:49:05 -0000 1.26 @@ -4,3 +4,4 @@ NetworkManager-0.4.1.cvs20051010.tar.gz NetworkManager-0.5.0.tar.gz NetworkManager-0.5.1.tar.gz +NetworkManager-0.5.1.cvs20060127.tar.gz Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- NetworkManager.spec 9 Dec 2005 22:39:29 -0000 1.76 +++ NetworkManager.spec 27 Jan 2006 06:49:05 -0000 1.77 @@ -1,6 +1,6 @@ ExcludeArch: s390 s390x -%define cvs_snapshot 0 +%define cvs_snapshot 1 %define hal_version 0.5.0 %define dbus_version 0.60 @@ -9,18 +9,17 @@ %define bind_version 24:9.3.1-20 %if %{cvs_snapshot} -%define nm_cvs_version .cvs20051010 +%define nm_cvs_version .cvs20060127 %endif Name: NetworkManager Summary: Network connection manager and user applications Version: 0.5.1 -Release: 5%{?nm_cvs_version}.1 +Release: 6%{?nm_cvs_version} Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz -Patch0: NetworkManager-0.5.1-dbus-api.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root PreReq: chkconfig @@ -33,6 +32,7 @@ Requires: dhcdbd Requires: dhclient >= 3.0.2-12 Requires: bind >= %{bind_version} +Requires: wpa_supplicant BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: hal-devel >= %{hal_version} @@ -110,7 +110,6 @@ %prep %setup -q -%patch0 -p1 -b .dbus-api %build %configure --with-named=/usr/sbin/named --with-named-dir=/var/named/data --with-named-user=named @@ -194,6 +193,10 @@ %changelog +* Fri Jan 27 2006 Dan Williams 0.5.1-6.cvs20060127 +- Snapshot from CVS +- WPA Support! Woohoo! + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 20 Oct 2005 05:19:30 -0000 1.40 +++ sources 27 Jan 2006 06:49:05 -0000 1.41 @@ -1 +1 @@ -9b5876e2a5b9e5e65279c37cf9253d26 NetworkManager-0.5.1.tar.gz +3c13bb7e0ec2723fe6450913fc34afed NetworkManager-0.5.1.cvs20060127.tar.gz --- NetworkManager-0.5.1-dbus-api.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 27 06:55:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 01:55:58 -0500 Subject: rpms/NetworkManager/devel NetworkManager.spec,1.77,1.78 Message-ID: <200601270655.k0R6twue013181@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13144 Modified Files: NetworkManager.spec Log Message: Correct file locations Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- NetworkManager.spec 27 Jan 2006 06:49:05 -0000 1.77 +++ NetworkManager.spec 27 Jan 2006 06:55:55 -0000 1.78 @@ -163,8 +163,8 @@ %config %{_sysconfdir}/dbus-1/system.d/%{name}.conf %config %{_sysconfdir}/rc.d/init.d/%{name} %config %{_sysconfdir}/rc.d/init.d/%{name}Dispatcher -%{_bindir}/%{name} -%{_bindir}/NetworkManagerDispatcher +%{_sbindir}/%{name} +%{_sbindir}/NetworkManagerDispatcher %{_bindir}/nm-tool %files gnome From fedora-cvs-commits at redhat.com Fri Jan 27 07:06:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 02:06:25 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.30, 1.31 policy-20060104.patch, 1.24, 1.25 selinux-policy.spec, 1.92, 1.93 sources, 1.34, 1.35 Message-ID: <200601270706.k0R76PAX015937@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15912 Modified Files: .cvsignore policy-20060104.patch selinux-policy.spec sources Log Message: * Thu Jan 26 2006 Dan Walsh 2.2.7-1 - Update to upstream Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 26 Jan 2006 15:47:02 -0000 1.30 +++ .cvsignore 27 Jan 2006 07:06:17 -0000 1.31 @@ -31,3 +31,4 @@ serefpolicy-2.2.4.tgz serefpolicy-2.2.5.tgz serefpolicy-2.2.6.tgz +serefpolicy-2.2.7.tgz policy-20060104.patch: admin/rpm.fc | 2 ++ admin/rpm.if | 1 + admin/rpm.te | 1 + admin/usermanage.te | 3 +++ apps/mono.te | 2 +- kernel/files.fc | 5 +++++ kernel/files.if | 2 +- kernel/filesystem.if | 19 +++++++++++++++++++ kernel/mls.te | 3 ++- kernel/storage.fc | 1 + services/cups.te | 1 + services/hal.te | 2 ++ system/locallogin.te | 2 ++ system/modutils.te | 2 ++ system/selinuxutil.te | 2 +- system/udev.te | 1 + system/unconfined.if | 5 +++++ system/userdomain.if | 3 --- system/userdomain.te | 39 +++++++++++++++++++++++++++++++++------ 19 files changed, 83 insertions(+), 13 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- policy-20060104.patch 26 Jan 2006 17:02:32 -0000 1.24 +++ policy-20060104.patch 27 Jan 2006 07:06:17 -0000 1.25 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.6/policy/modules/admin/rpm.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.7/policy/modules/admin/rpm.fc --- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-01-13 09:48:26.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/admin/rpm.fc 2006-01-26 12:02:06.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/admin/rpm.fc 2006-01-27 01:40:13.000000000 -0500 @@ -16,6 +16,8 @@ /usr/bin/fedora-rmdevelrpms -- gen_context(system_u:object_r:rpm_exec_t,s0) /usr/sbin/up2date -- gen_context(system_u:object_r:rpm_exec_t,s0) @@ -10,9 +10,20 @@ ') /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.te serefpolicy-2.2.6/policy/modules/admin/rpm.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.if serefpolicy-2.2.7/policy/modules/admin/rpm.if +--- nsaserefpolicy/policy/modules/admin/rpm.if 2006-01-04 17:28:52.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/admin/rpm.if 2006-01-27 01:40:13.000000000 -0500 +@@ -71,6 +71,7 @@ + rpm_domtrans($1) + role $2 types rpm_t; + role $2 types rpm_script_t; ++ seutil_run_loadpol(rpm_script_t,$2,$3) + allow rpm_t $3:chr_file rw_term_perms; + ') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.7/policy/modules/admin/rpm.te --- nsaserefpolicy/policy/modules/admin/rpm.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/admin/rpm.te 2006-01-25 16:16:28.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/admin/rpm.te 2006-01-27 01:40:13.000000000 -0500 @@ -288,6 +288,7 @@ term_getattr_unallocated_ttys(rpm_script_t) @@ -21,9 +32,22 @@ auth_dontaudit_getattr_shadow(rpm_script_t) # ideally we would not need this -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.6/policy/modules/apps/mono.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.7/policy/modules/admin/usermanage.te +--- nsaserefpolicy/policy/modules/admin/usermanage.te 2006-01-19 10:00:40.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/admin/usermanage.te 2006-01-27 02:02:29.000000000 -0500 +@@ -328,6 +328,9 @@ + + miscfiles_read_localization(passwd_t) + ++mls_file_write_down(passwd_t) ++mls_file_downgrade(passwd_t) ++ + seutil_dontaudit_search_config(passwd_t) + + userdom_use_unpriv_users_fd(passwd_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.7/policy/modules/apps/mono.te --- nsaserefpolicy/policy/modules/apps/mono.te 2006-01-19 18:02:04.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/apps/mono.te 2006-01-25 16:17:35.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/apps/mono.te 2006-01-27 01:40:13.000000000 -0500 @@ -18,7 +18,7 @@ # @@ -33,9 +57,9 @@ unconfined_domain_template(mono_t) role system_r types mono_t; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.6/policy/modules/kernel/files.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.7/policy/modules/kernel/files.fc --- nsaserefpolicy/policy/modules/kernel/files.fc 2006-01-25 15:58:58.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/kernel/files.fc 2006-01-25 16:23:35.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/kernel/files.fc 2006-01-27 01:40:13.000000000 -0500 @@ -126,6 +126,11 @@ /mnt/[^/]*/.* <> @@ -48,9 +72,21 @@ # /opt # /opt(/.*)? gen_context(system_u:object_r:usr_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.6/policy/modules/kernel/filesystem.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.7/policy/modules/kernel/files.if +--- nsaserefpolicy/policy/modules/kernel/files.if 2006-01-25 15:58:59.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/kernel/files.if 2006-01-27 01:40:13.000000000 -0500 +@@ -321,7 +321,7 @@ + attribute file_type, security_file_type; + ') + +- dontaudit $1 { file_type -security_file_type }:dir r_dir_perms; ++ allow $1 { file_type -security_file_type }:dir r_dir_perms; + ') + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.7/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-25 15:58:59.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/kernel/filesystem.if 2006-01-26 11:15:19.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/kernel/filesystem.if 2006-01-27 01:40:13.000000000 -0500 @@ -2855,3 +2855,22 @@ # and its files. allow $1 filesystem_type:{ dir file lnk_file sock_file fifo_file chr_file blk_file } *; @@ -74,9 +110,9 @@ + allow $1 inotifyfs_t:dir search_dir_perms; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.6/policy/modules/kernel/mls.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.7/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/kernel/mls.te 2006-01-26 10:45:47.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/kernel/mls.te 2006-01-27 01:40:13.000000000 -0500 @@ -86,7 +86,8 @@ ') @@ -87,9 +123,9 @@ range_transition initrc_t auditd_exec_t s15:c0.c255; +range_transition sysadm_t rpm_exec_t s0 - s15:c0.c255; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.2.6/policy/modules/kernel/storage.fc +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.2.7/policy/modules/kernel/storage.fc --- nsaserefpolicy/policy/modules/kernel/storage.fc 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/kernel/storage.fc 2006-01-26 10:42:28.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/kernel/storage.fc 2006-01-27 01:40:13.000000000 -0500 @@ -12,6 +12,7 @@ /dev/cm20.* -b gen_context(system_u:object_r:removable_device_t,s0) /dev/dasd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) @@ -98,9 +134,9 @@ /dev/fd[^/]+ -b gen_context(system_u:object_r:removable_device_t,s0) /dev/flash[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) /dev/gscd -b gen_context(system_u:object_r:removable_device_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.6/policy/modules/services/cups.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.7/policy/modules/services/cups.te --- nsaserefpolicy/policy/modules/services/cups.te 2006-01-17 17:08:53.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/services/cups.te 2006-01-25 16:16:28.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/services/cups.te 2006-01-27 01:40:13.000000000 -0500 @@ -148,6 +148,7 @@ fs_search_auto_mountpoints(cupsd_t) @@ -109,9 +145,9 @@ auth_domtrans_chk_passwd(cupsd_t) auth_dontaudit_read_pam_pid(cupsd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.6/policy/modules/services/hal.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.7/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-01-19 10:00:41.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/services/hal.te 2006-01-26 10:49:57.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/services/hal.te 2006-01-27 01:40:13.000000000 -0500 @@ -116,6 +116,8 @@ init_use_fd(hald_t) init_use_script_pty(hald_t) @@ -121,9 +157,9 @@ libs_use_ld_so(hald_t) libs_use_shared_libs(hald_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.6/policy/modules/system/locallogin.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.7/policy/modules/system/locallogin.te --- nsaserefpolicy/policy/modules/system/locallogin.te 2006-01-25 15:59:01.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/system/locallogin.te 2006-01-26 11:16:59.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/system/locallogin.te 2006-01-27 01:40:13.000000000 -0500 @@ -27,6 +27,8 @@ domain_subj_id_change_exempt(sulogin_t) domain_role_change_exempt(sulogin_t) @@ -133,9 +169,9 @@ init_domain(sulogin_t,sulogin_exec_t) init_system_domain(sulogin_t,sulogin_exec_t) role system_r types sulogin_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.2.6/policy/modules/system/modutils.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.2.7/policy/modules/system/modutils.te --- nsaserefpolicy/policy/modules/system/modutils.te 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/system/modutils.te 2006-01-25 16:16:28.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/system/modutils.te 2006-01-27 01:40:13.000000000 -0500 @@ -113,6 +113,8 @@ miscfiles_read_localization(insmod_t) @@ -145,9 +181,9 @@ if( ! secure_mode_insmod ) { kernel_userland_entry(insmod_t,insmod_exec_t) } -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.6/policy/modules/system/selinuxutil.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.7/policy/modules/system/selinuxutil.te --- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-19 10:00:41.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/system/selinuxutil.te 2006-01-25 16:26:04.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/system/selinuxutil.te 2006-01-27 01:40:13.000000000 -0500 @@ -414,7 +414,7 @@ allow run_init_t self:process setexec; allow run_init_t self:capability setuid; @@ -157,9 +193,9 @@ # often the administrator runs such programs from a directory that is owned # by a different user or has restrictive SE permissions, do not want to audit -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.6/policy/modules/system/udev.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.7/policy/modules/system/udev.te --- nsaserefpolicy/policy/modules/system/udev.te 2006-01-19 10:00:41.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/system/udev.te 2006-01-26 11:14:22.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/system/udev.te 2006-01-27 01:40:13.000000000 -0500 @@ -90,6 +90,7 @@ dev_delete_generic_file(udev_t) @@ -168,9 +204,9 @@ selinux_get_fs_mount(udev_t) selinux_validate_context(udev_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.6/policy/modules/system/unconfined.if +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.7/policy/modules/system/unconfined.if --- nsaserefpolicy/policy/modules/system/unconfined.if 2006-01-20 10:02:33.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/system/unconfined.if 2006-01-25 16:16:28.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/system/unconfined.if 2006-01-27 01:40:13.000000000 -0500 @@ -54,8 +54,13 @@ tunable_policy(`allow_execmem && allow_execstack',` # Allow making the stack executable via mprotect. @@ -185,10 +221,43 @@ optional_policy(`authlogin',` auth_unconfined($1) ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.6/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-25 15:59:01.000000000 -0500 -+++ serefpolicy-2.2.6/policy/modules/system/userdomain.te 2006-01-25 16:51:38.000000000 -0500 -@@ -161,6 +161,10 @@ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.7/policy/modules/system/userdomain.if +--- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-26 16:54:28.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/system/userdomain.if 2006-01-27 01:40:13.000000000 -0500 +@@ -848,9 +848,6 @@ + fs_set_all_quotas($1_t) + fs_exec_noxattr($1_t) + +- selinux_set_enforce_mode($1_t) +- selinux_set_boolean($1_t) +- selinux_set_parameters($1_t) + # Get security policy decisions: + selinux_get_fs_mount($1_t) + selinux_validate_context($1_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.7/policy/modules/system/userdomain.te +--- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-26 16:54:28.000000000 -0500 ++++ serefpolicy-2.2.7/policy/modules/system/userdomain.te 2006-01-27 01:40:13.000000000 -0500 +@@ -154,10 +154,16 @@ + + corecmd_exec_shell(sysadm_t) + +- mls_process_read_up(sysadm_t) +- +- logging_read_audit_log(sysadm_t) ++ ifdef(`enable_mls',` ++ logging_read_audit_log(secadm_t) ++ logging_domtrans_auditctl(secadm_t) ++ mls_process_read_up(secadm_t) ++ ', ` ++ logging_domtrans_auditctl(sysadm_t) ++ logging_read_audit_log(sysadm_t) ++ ') + ++ mls_process_read_up(sysadm_t) + ifdef(`direct_sysadm_daemon',` + optional_policy(`init',` + init_run_daemon(sysadm_t,sysadm_r,admin_terminal) +@@ -168,6 +174,10 @@ domain_ptrace_all_domains(sysadm_t) ') @@ -199,3 +268,41 @@ optional_policy(`amanda',` amanda_run_recover(sysadm_t,sysadm_r,admin_terminal) ') +@@ -205,6 +215,9 @@ + + optional_policy(`consoletype',` + consoletype_exec(sysadm_t) ++ ifdef(`enable_mls',` ++ consoletype_exec(secadm_t) ++ ') + ') + + optional_policy(`ddcprobe',` +@@ -320,10 +333,24 @@ + ') + + optional_policy(`selinuxutil',` +- seutil_run_checkpol(sysadm_t,sysadm_r,admin_terminal) +- seutil_run_loadpol(sysadm_t,sysadm_r,admin_terminal) ++ ifdef(`enable_mls',` ++ seutil_manage_binary_pol(secadm_t) ++ seutil_run_checkpol(secadm_t,secadm_r,admin_terminal) ++ seutil_run_loadpol(secadm_t,secadm_r,admin_terminal) ++ seutil_run_setfiles(secadm_t,secadm_r,admin_terminal) ++ selinux_set_enforce_mode(secadm_t) ++ selinux_set_boolean(secadm_t) ++ selinux_set_parameters(secadm_t) ++ ', ` ++ seutil_manage_binary_pol(sysadm_t) ++ seutil_run_checkpol(sysadm_t,sysadm_r,admin_terminal) ++ seutil_run_loadpol(sysadm_t,sysadm_r,admin_terminal) ++ seutil_run_setfiles(sysadm_t,sysadm_r,admin_terminal) ++ selinux_set_enforce_mode(sysadm_t) ++ selinux_set_boolean(sysadm_t) ++ selinux_set_parameters(sysadm_t) ++ ') + seutil_run_restorecon(sysadm_t,sysadm_r,admin_terminal) +- seutil_run_setfiles(sysadm_t,sysadm_r,admin_terminal) + + ifdef(`targeted_policy',`',` + seutil_run_runinit(sysadm_t,sysadm_r,admin_terminal) Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- selinux-policy.spec 26 Jan 2006 17:02:46 -0000 1.92 +++ selinux-policy.spec 27 Jan 2006 07:06:21 -0000 1.93 @@ -5,8 +5,8 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.6 -Release: 2 +Version: 2.2.7 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -163,6 +163,10 @@ make conf %installCmds mls strict-mls n +# Install sources +make clean +make +make DESTDIR=$RPM_BUILD_ROOT install-headers %clean %{__rm} -fR $RPM_BUILD_ROOT @@ -262,7 +266,28 @@ %files strict %fileList strict +%package devel +Summary: SELinux policy devel sources +Group: System Environment/Base +Prereq: checkpolicy >= %{CHECKPOLICYVER} m4 policycoreutils >= %{POLICYCOREUTILSVER} make +Prereq: selinux-policy = %{version}-%{release} + +%description devel +SELinux Reference policy development files + +%files devel +%defattr(-,root,root) +%dir %{_usr}/share/selinux/refpolicy +%dir %{_usr}/share/selinux/refpolicy/include +%{_usr}/share/selinux/refpolicy/include/* + %changelog +* Thu Jan 26 2006 Dan Walsh 2.2.7-1 +- Update to upstream + +* Thu Jan 26 2006 Dan Walsh 2.2.6-3 +- Separate out role of secadm for mls + * Thu Jan 26 2006 Dan Walsh 2.2.6-2 - Add inotifyfs handling Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 26 Jan 2006 15:47:02 -0000 1.34 +++ sources 27 Jan 2006 07:06:21 -0000 1.35 @@ -1 +1 @@ -b7fd295ab6917057c3f53702872d2984 serefpolicy-2.2.6.tgz +825d6d14215bf8affdf73c577332c493 serefpolicy-2.2.7.tgz From fedora-cvs-commits at redhat.com Fri Jan 27 07:16:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 02:16:58 -0500 Subject: rpms/NetworkManager/devel NetworkManager.spec,1.78,1.79 Message-ID: <200601270716.k0R7Gw8G032680@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32644 Modified Files: NetworkManager.spec Log Message: Trap unpackaged files Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- NetworkManager.spec 27 Jan 2006 06:55:55 -0000 1.78 +++ NetworkManager.spec 27 Jan 2006 07:16:55 -0000 1.79 @@ -123,6 +123,8 @@ %{__rm} -f $RPM_BUILD_ROOT%{_bindir}/NMLoadModules %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_glib.la %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_glib.a +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_util.la +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_util.a %{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/ @@ -166,6 +168,9 @@ %{_sbindir}/%{name} %{_sbindir}/NetworkManagerDispatcher %{_bindir}/nm-tool +%{_libdir}/libnm_glib.so* +%{_mandir}/man1/NetworkManager.1.gz +%{_mandir}/man1/NetworkManagerDispatcher.1.gz %files gnome %defattr(-,root,root,0755) @@ -179,9 +184,9 @@ %files devel %defattr(-,root,root,0755) -%{_includedir}/%{name}/%{name}.h -%{_includedir}/%{name}/nm-vpn-ui-interface.h +%{_includedir}/%{name}/*.h %{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/libnm-util.pc %files glib %defattr(-,root,root,0755) From fedora-cvs-commits at redhat.com Fri Jan 27 07:20:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 02:20:58 -0500 Subject: rpms/NetworkManager/devel NetworkManager.spec,1.79,1.80 Message-ID: <200601270720.k0R7Kwoc002113@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2075 Modified Files: NetworkManager.spec Log Message: Trap more unpackaged files Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- NetworkManager.spec 27 Jan 2006 07:16:55 -0000 1.79 +++ NetworkManager.spec 27 Jan 2006 07:20:56 -0000 1.80 @@ -168,7 +168,7 @@ %{_sbindir}/%{name} %{_sbindir}/NetworkManagerDispatcher %{_bindir}/nm-tool -%{_libdir}/libnm_glib.so* +%{_libdir}/libnm_util.so* %{_mandir}/man1/NetworkManager.1.gz %{_mandir}/man1/NetworkManagerDispatcher.1.gz From fedora-cvs-commits at redhat.com Fri Jan 27 07:25:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 02:25:32 -0500 Subject: rpms/NetworkManager/devel NetworkManager.spec,1.80,1.81 Message-ID: <200601270725.k0R7PWbd004316@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4278 Modified Files: NetworkManager.spec Log Message: Trap more unpackaged files Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- NetworkManager.spec 27 Jan 2006 07:20:56 -0000 1.80 +++ NetworkManager.spec 27 Jan 2006 07:25:29 -0000 1.81 @@ -168,7 +168,7 @@ %{_sbindir}/%{name} %{_sbindir}/NetworkManagerDispatcher %{_bindir}/nm-tool -%{_libdir}/libnm_util.so* +%{_libdir}/libnm-util.so* %{_mandir}/man1/NetworkManager.1.gz %{_mandir}/man1/NetworkManagerDispatcher.1.gz From fedora-cvs-commits at redhat.com Fri Jan 27 07:28:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 02:28:40 -0500 Subject: rpms/NetworkManager/devel NetworkManager.spec,1.81,1.82 Message-ID: <200601270728.k0R7SeQC005820@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5779 Modified Files: NetworkManager.spec Log Message: Trap more unpackaged files Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- NetworkManager.spec 27 Jan 2006 07:25:29 -0000 1.81 +++ NetworkManager.spec 27 Jan 2006 07:28:38 -0000 1.82 @@ -123,8 +123,8 @@ %{__rm} -f $RPM_BUILD_ROOT%{_bindir}/NMLoadModules %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_glib.la %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_glib.a -%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_util.la -%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm_util.a +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm-util.la +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm-util.a %{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/ From fedora-cvs-commits at redhat.com Fri Jan 27 09:25:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 04:25:51 -0500 Subject: rpms/libusb/devel libusb-0.1.11-searchorder.patch, NONE, 1.1 libusb.spec, 1.20, 1.21 Message-ID: <200601270925.k0R9Ppo0022090@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/libusb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21948 Modified Files: libusb.spec Added Files: libusb-0.1.11-searchorder.patch Log Message: * Fri Jan 27 2006 Jindrich Novy 0.1.11-2 - change device search order, /dev/bus/usb is tried first, then /proc/bus/usb, and never try /sys/bus/usb (#178994) libusb-0.1.11-searchorder.patch: linux.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) --- NEW FILE libusb-0.1.11-searchorder.patch --- --- libusb-0.1.11.orig/linux.c +++ libusb-0.1.11/linux.c @@ -633,14 +633,11 @@ } if (!usb_path[0]) { - if (check_usb_vfs("/proc/bus/usb")) { - strncpy(usb_path, "/proc/bus/usb", sizeof(usb_path) - 1); - usb_path[sizeof(usb_path) - 1] = 0; - } else if (check_usb_vfs("/sys/bus/usb")) { /* 2.6 Kernel with sysfs */ - strncpy(usb_path, "/sys/bus/usb", sizeof(usb_path) -1); + if (check_usb_vfs("/dev/bus/usb")) { + strncpy(usb_path, "/dev/bus/usb", sizeof(usb_path) - 1); usb_path[sizeof(usb_path) - 1] = 0; - } else if (check_usb_vfs("/dev/usb")) { - strncpy(usb_path, "/dev/usb", sizeof(usb_path) - 1); + } else if (check_usb_vfs("/proc/bus/usb")) { + strncpy(usb_path, "/proc/bus/usb", sizeof(usb_path) - 1); usb_path[sizeof(usb_path) - 1] = 0; } else usb_path[0] = 0; /* No path, no USB support */ Index: libusb.spec =================================================================== RCS file: /cvs/dist/rpms/libusb/devel/libusb.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- libusb.spec 22 Jan 2006 10:12:43 -0000 1.20 +++ libusb.spec 27 Jan 2006 09:25:47 -0000 1.21 @@ -1,9 +1,10 @@ Summary: A library which allows userspace access to USB devices. Name: libusb Version: 0.1.11 -Release: 1 +Release: 2 Source0: http://prdownloads.sourceforge.net/libusb/%{name}-%{version}.tar.gz Patch0: libusb-0.1.11-format.patch +Patch1: libusb-0.1.11-searchorder.patch License: LGPL Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -27,6 +28,7 @@ %prep %setup -q %patch0 -p1 -b .format +%patch1 -p1 -b .searchorder # Fix libdir in configure.in. mv -f configure.in configure.in.old @@ -71,6 +73,10 @@ %changelog +* Fri Jan 27 2006 Jindrich Novy 0.1.11-2 +- change device search order, /dev/bus/usb is tried first, + then /proc/bus/usb, and never try /sys/bus/usb (#178994) + * Fri Jan 20 2006 Jindrich Novy 0.1.11-1 - 0.1.11 - require pkgconfig, package libusb.pc From fedora-cvs-commits at redhat.com Fri Jan 27 11:11:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 06:11:28 -0500 Subject: rpms/s390utils/devel s390utils.spec,1.28,1.29 Message-ID: <200601271111.k0RBBSwR022174@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/s390utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22058 Modified Files: s390utils.spec Log Message: - Applied wrong patch, fixed. Index: s390utils.spec =================================================================== RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- s390utils.spec 26 Jan 2006 14:04:45 -0000 1.28 +++ s390utils.spec 27 Jan 2006 11:11:25 -0000 1.29 @@ -79,7 +79,7 @@ %patch8 -p1 -b .warnings # Fix some assembler .macro errors -%patch8 -p1 -b .asmfix +%patch9 -p1 -b .asmfix # build on kernel-2.6, too %patch20 -p0 -b .cmsfs26 From fedora-cvs-commits at redhat.com Fri Jan 27 11:43:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 06:43:40 -0500 Subject: rpms/system-config-services/devel .cvsignore, 1.22, 1.23 sources, 1.26, 1.27 system-config-services.spec, 1.29, 1.30 Message-ID: <200601271143.k0RBheqT014829@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-services/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14703 Modified Files: .cvsignore sources system-config-services.spec Log Message: implement daemons and xinetd services on separate tabs separate daemons and xinetd based services enable Serbian translation files don't use pam_stack (#170645) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 16 Aug 2005 16:05:53 -0000 1.22 +++ .cvsignore 27 Jan 2006 11:43:37 -0000 1.23 @@ -1 +1 @@ -system-config-services-0.8.26.tar.gz +system-config-services-0.8.99.1.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 16 Aug 2005 16:05:53 -0000 1.26 +++ sources 27 Jan 2006 11:43:37 -0000 1.27 @@ -1 +1 @@ -07fcc6d8639eb0e962d645e157b5f8ed system-config-services-0.8.26.tar.gz +762bc8d9fb60ace97e3679f3a4fa2f32 system-config-services-0.8.99.1.tar.gz Index: system-config-services.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- system-config-services.spec 9 Dec 2005 22:43:29 -0000 1.29 +++ system-config-services.spec 27 Jan 2006 11:43:37 -0000 1.30 @@ -1,8 +1,8 @@ # -*- RPM-SPEC -*- Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.8.26 -Release: 1.1 +Version: 0.8.99.1 +Release: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz License: GPL @@ -71,8 +71,15 @@ %{_mandir}/*/system-config-services.8* %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Fri Jan 27 2006 Nils Philippsen - 0.8.99.1 +- implement daemons and xinetd services on separate tabs + +* Mon Jan 09 2006 Nils Philippsen +- separate daemons and xinetd based services +- enable Serbian translation files + +* Fri Oct 14 2005 Nils Philippsen +- don't use pam_stack (#170645) * Tue Aug 16 2005 Nils Philippsen - 0.8.26 - revamp getting output from external commands (#162884) From fedora-cvs-commits at redhat.com Fri Jan 27 11:47:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 06:47:38 -0500 Subject: rpms/ghostscript/devel ghostscript.spec,1.95,1.96 Message-ID: <200601271147.k0RBlcIY028824@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28769 Modified Files: ghostscript.spec Log Message: * Fri Jan 27 2006 Tim Waugh - Support reading a big cmap/post table from a TrueType font. Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- ghostscript.spec 9 Dec 2005 22:40:33 -0000 1.95 +++ ghostscript.spec 27 Jan 2006 11:47:35 -0000 1.96 @@ -26,6 +26,7 @@ Patch7: ghostscript-noopt.patch Patch8: ghostscript-use-external-freetype.patch Patch9: ghostscript-split-font-configuration.patch +Patch10: ghostscript-big-cmap-post.patch Requires: zlib, libpng, glib2 Requires: urw-fonts >= 1.1, ghostscript-fonts @@ -102,6 +103,9 @@ # Allow separated font configuration (bug #161187). %patch9 -p1 -b .split-font-configuration +# Support reading a big cmap/post table from a TrueType font. +%patch10 -p1 -b .big-cmap-post + # Convert manual pages to UTF-8 from8859_1() { iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_" @@ -259,6 +263,9 @@ %postun -p /sbin/ldconfig %changelog +* Fri Jan 27 2006 Tim Waugh +- Support reading a big cmap/post table from a TrueType font. + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Fri Jan 27 11:47:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 06:47:47 -0500 Subject: rpms/ghostscript/devel ghostscript-big-cmap-post.patch,NONE,1.1 Message-ID: <200601271147.k0RBll5j028923@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28885 Added Files: ghostscript-big-cmap-post.patch Log Message: * Fri Jan 27 2006 Tim Waugh - Support reading a big cmap/post table from a TrueType font. ghostscript-big-cmap-post.patch: gs_ttf.ps | 115 +++++++++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 85 insertions(+), 30 deletions(-) --- NEW FILE ghostscript-big-cmap-post.patch --- diff -ruN espgs-8.15.1.orig/lib/gs_ttf.ps espgs-8.15.1/lib/gs_ttf.ps --- espgs-8.15.1.orig/lib/gs_ttf.ps 2005-08-12 04:57:14.000000000 +0900 +++ espgs-8.15.1/lib/gs_ttf.ps 2006-01-26 13:28:18.000000000 +0900 @@ -261,6 +261,54 @@ } for pop exch pop } bind def +/.biglength { % | .biglength + dup type /arraytype eq { 0 exch { length add } forall } { length } ifelse +} bind def + +/concats { % [str ...] concats str + () exch dup length 1 sub -1 0 { + 1 index exch get dup type /stringtype ne { dup length string cvs } if + 3 -1 roll exch dup length 2 index length add string + dup dup 4 2 roll copy length 4 -1 roll putinterval exch + } for pop +} bind def + +% | .biggetinterval | +/.biggetinterval { + 3 dict begin + 2 index type /arraytype eq { + /c exch def + /i exch def + [ exch { + dup length /l exch def + i c add l gt { + i l lt { + i l i sub getinterval + /c i c add l sub def + /i 0 def + } { + pop + /i i l sub def + } ifelse + } { + i c getinterval exit + } ifelse + } forall + ] dup .biglength 65535 le { concats } if + } { getinterval } ifelse + end +} bind def + +% | getu16 +/.biggetu16 { + 2 .biggetinterval 0 getu16 +} bind def + +% | getu32 +/.biggetu32 { + 4 .biggetinterval 0 getu32 +} bind def + % Each procedure in this dictionary is called as follows: % proc /cmapformats mark @@ -351,14 +399,14 @@ } bind 4 { % Microsoft/Adobe segmented mapping. /etab exch def - /nseg2 etab 6 getu16 def - 14 /endc etab 2 index nseg2 getinterval def + /nseg2 etab 6 .biggetu16 def + 14 /endc etab 2 index nseg2 .biggetinterval def % The Apple TrueType documentation omits the 2-byte % 'reserved pad' that follows the endCount vector! 2 add - nseg2 add /startc etab 2 index nseg2 getinterval def - nseg2 add /iddelta etab 2 index nseg2 getinterval def - nseg2 add /idroff etab 2 index nseg2 getinterval def + nseg2 add /startc etab 2 index nseg2 .biggetinterval def + nseg2 add /iddelta etab 2 index nseg2 .biggetinterval def + nseg2 add /idroff etab 2 index nseg2 .biggetinterval def % The following hack allows us to properly handle % idiosyncratic fonts that start at 0xf000: pop @@ -370,8 +418,8 @@ /numcodes 0 def /glyphs 0 0 2 nseg2 3 sub { % Stack: /glyphs numglyphs i2 /i2 exch def - /scode startc i2 getu16 def - /ecode endc i2 getu16 def + /scode startc i2 .biggetu16 def + /ecode endc i2 .biggetu16 def numcodes scode firstcode sub % Hack for fonts that have only 0x0000 and 0xf000 ranges %dup 16#e000 ge { 255 and } if @@ -392,8 +440,8 @@ /numcodes 0 def /code 0 def 0 2 nseg2 3 sub { /i2 exch def - /scode startc i2 getu16 def - /ecode endc i2 getu16 def + /scode startc i2 .biggetu16 def + /ecode endc i2 .biggetu16 def numcodes scode firstcode sub % Hack for fonts that have only 0x0000 and 0xf000 ranges %dup 16#e000 ge { 255 and } if @@ -405,15 +453,15 @@ (scode=) print scode =only ( ecode=) print ecode =only ( delta=) print delta =only - ( droff=) print idroff i2 getu16 = + ( droff=) print idroff i2 .biggetu16 = } if - idroff i2 getu16 dup 0 eq { + idroff i2 .biggetu16 dup 0 eq { pop scode delta add 65535 and 1 ecode delta add 65535 and { putglyph } for } { % The +2 is for the 'reserved pad'. /gloff exch 14 nseg2 3 mul add 2 add i2 add add def 0 1 ecode scode sub { - 2 mul gloff add etab exch getu16 + 2 mul gloff add etab exch .biggetu16 dup 0 ne { delta add 65535 and } if putglyph } for } ifelse @@ -436,12 +484,12 @@ % cmaparray /cmaparray { - dup 0 getu16 cmapformats exch .knownget { + dup 0 .biggetu16 cmapformats exch .knownget { TTFDEBUG { - (cmap: format ) print 1 index 0 getu16 = flush + (cmap: format ) print 1 index 0 .biggetu16 = flush } if exec } { - (Can't handle format ) print 0 getu16 = flush + (Can't handle format ) print 0 .biggetu16 = flush 0 1 255 { } for 256 packedarray } ifelse TTFDEBUG { @@ -513,13 +561,13 @@ % Adobe requirement that each sfnts entry have even length. /readtables mark % Ordinary tables - (cmap) { .readtable } + (cmap) { .readbigtable } (head) 1 index (hhea) 1 index (maxp) 1 index (name) 1 index (OS/2) 1 index - (post) 1 index + (post) { .readbigtable } (vhea) 1 index % Big tables (glyf) { .readbigtable } @@ -860,10 +908,17 @@ } ifelse % Stack: ... /FontInfo mark key1 value1 ... post null ne { - /ItalicAngle post 4 gets32 65536.0 div - /isFixedPitch post 12 getu32 0 ne - /UnderlinePosition post 8 gets16 upem div - /UnderlineThickness post 10 gets16 upem div + post type /arraytype eq { + % this post table is a big table. /post should be [(...) ...] + % data we actually need here should be first one in array. + /posttable post 1 get def + } { + /posttable post def + } ifelse + /ItalicAngle posttable 4 gets32 65536.0 div + /isFixedPitch posttable 12 getu32 0 ne + /UnderlinePosition posttable 8 gets16 upem div + /UnderlineThickness posttable 10 gets16 upem div } if counttomark 0 ne { .dicttomark } { pop pop } ifelse /XUID [orgXUID 42 curxuid] @@ -922,22 +977,22 @@ } if tabdict /cmap get % bool [] i PlatID SpecID (cmap) dup /cmaptab exch def % temporary - 0 1 2 index 2 getu16 1 sub { % bool [] i PlatID SpecID (cmap) j - 8 mul 4 add 1 index exch 8 getinterval % bool [] i PlatID SpecID (cmap) (cmapsub) + 0 1 2 index 2 .biggetu16 1 sub { % bool [] i PlatID SpecID (cmap) j + 8 mul 4 add 1 index exch 8 .biggetinterval % bool [] i PlatID SpecID (cmap) (cmapsub) TTFDEBUG { - (cmap: platform ) print dup 0 getu16 =only - ( encoding ) print dup 2 getu16 = flush + (cmap: platform ) print dup 0 .biggetu16 =only + ( encoding ) print dup 2 .biggetu16 = flush } if - dup 0 getu16 4 index eq { - dup 2 getu16 3 index eq { % bool [] i PlatID SpecID (cmap) (cmapsub) + dup 0 .biggetu16 4 index eq { + dup 2 .biggetu16 3 index eq { % bool [] i PlatID SpecID (cmap) (cmapsub) TTFDEBUG { (Choosen a cmap for platform=) print 3 index =only ( encoding=) print 2 index = } if /cmapsub 1 index def - dup 4 getu32 % bool [] i PlatID SpecID (cmap) (cmapsub) p - cmaptab length 1 index sub % bool [] i PlatID SpecID (cmap) (cmapsub) p l - cmaptab 3 1 roll getinterval + dup 4 .biggetu32 % bool [] i PlatID SpecID (cmap) (cmapsub) p + cmaptab .biglength 1 index sub % bool [] i PlatID SpecID (cmap) (cmapsub) p l + cmaptab 3 1 roll .biggetinterval /cmaptab exch def % bool [] i PlatID SpecID (cmap) (cmapsub) 5 index 5 index 1 add get % bool [] i PlatID SpecID (cmap) (cmapsub) /Decoding /Decoding exch def % bool [] i PlatID SpecID (cmap) (cmapsub) From fedora-cvs-commits at redhat.com Fri Jan 27 11:59:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 06:59:08 -0500 Subject: rpms/ghostscript/devel ghostscript.spec,1.96,1.97 Message-ID: <200601271159.k0RBx8A1001572@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1528 Modified Files: ghostscript.spec Log Message: 8.15.1-4 Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- ghostscript.spec 27 Jan 2006 11:47:35 -0000 1.96 +++ ghostscript.spec 27 Jan 2006 11:59:04 -0000 1.97 @@ -6,7 +6,7 @@ Version: %{gs_ver} BuildRequires: libjpeg-devel -Release: 3.1 +Release: 4 License: GPL URL: http://www.cups.org/espgs/ @@ -263,7 +263,7 @@ %postun -p /sbin/ldconfig %changelog -* Fri Jan 27 2006 Tim Waugh +* Fri Jan 27 2006 Tim Waugh 8.15.1-4 - Support reading a big cmap/post table from a TrueType font. * Fri Dec 09 2005 Jesse Keating From fedora-cvs-commits at redhat.com Fri Jan 27 12:39:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 07:39:44 -0500 Subject: rpms/ncurses/devel ncurses-5.5-chtypeaslong.patch, NONE, 1.1 ncurses.spec, 1.48, 1.49 Message-ID: <200601271239.k0RCdiAA014652@cvs.devel.redhat.com> Author: praszyk Update of /cvs/dist/rpms/ncurses/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14637 Modified Files: ncurses.spec Added Files: ncurses-5.5-chtypeaslong.patch Log Message: Diff between the two versions of curses.h on x86_64, see #178824 ncurses-5.5-chtypeaslong.patch: configure.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ncurses-5.5-chtypeaslong.patch --- --- ncurses-5.5/configure.in.rasold 2006-01-27 13:22:31.000000000 +0100 +++ ncurses-5.5/configure.in 2006-01-27 13:23:28.000000000 +0100 @@ -673,7 +673,7 @@ ### use option --with-chtype to override chtype's type AC_MSG_CHECKING(for type of chtype) AC_ARG_WITH(chtype, - [ --with-chtype=TYPE override type of chtype], + [ --with-chtype=" unsigned long " [NCURSES_CHTYPE="$withval"], [NCURSES_CHTYPE=auto]) AC_MSG_RESULT($NCURSES_CHTYPE) Index: ncurses.spec =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- ncurses.spec 23 Dec 2005 10:36:18 -0000 1.48 +++ ncurses.spec 27 Jan 2006 12:39:42 -0000 1.49 @@ -2,7 +2,7 @@ Name: ncurses Version: 5.5 %define includedirw %{_includedir}/ncursesw -Release: 10 +Release: 11 License: distributable Group: System Environment/Libraries URL: http://dickey.his.com/ncurses/ncurses.html @@ -14,6 +14,7 @@ Patch1: ncurses-5.4-xterm-kbs.patch Patch2: ncurses-5.4-filter.patch Patch3: ncurses-5.4-endwinfilter.patch +Patch4: ncurses-5.5-chtypeaslong.patch BuildRequires: sharutils BuildRoot: %{_tmppath}/%{name}-root @@ -51,6 +52,7 @@ %patch1 -p1 -b .xterm-kbs %patch2 -p1 -b .filter %patch3 -p1 -b .endwinfilter +%patch4 -p1 -b .chtypeaslong %build CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES" @@ -163,6 +165,12 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jan 27 2006 Petr Raszyk 5.5-11 +- According Henrik Nordstrom (hno at squid-cache.org) + Diff between the two versions of curses.h on x86_64 + Patch ncurses-5.5-chtypeaslong.patch + See #178824 + * Fri Dec 23 2005 Petr Raszyk 5.5-10 - Rebuild. From fedora-cvs-commits at redhat.com Fri Jan 27 12:47:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 07:47:07 -0500 Subject: rpms/arts/FC-4 arts.spec,1.42,1.43 sources,1.21,1.22 Message-ID: <200601271247.k0RCl7Fh026948@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/arts/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26934 Modified Files: arts.spec sources Log Message: 1.5.1 Index: arts.spec =================================================================== RCS file: /cvs/dist/rpms/arts/FC-4/arts.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- arts.spec 20 Dec 2005 11:01:47 -0000 1.42 +++ arts.spec 27 Jan 2006 12:47:04 -0000 1.43 @@ -9,8 +9,8 @@ %define make_cvs 1 -Version: 1.5.0 -Release: 0.2.fc4 +Version: 1.5.1 +Release: 0.1.fc4 Summary: aRts (analog realtime synthesizer) - the KDE sound system Name: arts Group: System Environment/Daemons @@ -102,18 +102,16 @@ export CFLAGS="$FLAGS" export PATH=`pwd`:$PATH -%if %{disable_gcc_check_and_hidden_visibility} - # disable gcc check - perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in - # disable hidden visibility - perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in -%endif - %if %{make_cvs} make -f admin/Makefile.common cvs %endif %configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ +%if %{disable_gcc_check_and_hidden_visibility} + --disable-gcc-hidden-visibility \ +%endif %if %{alsa} --with-alsa \ %endif @@ -123,6 +121,7 @@ --includedir=%{_includedir}/kde \ --with-qt-libraries=$QTDIR/lib \ --disable-debug \ + --disable-warnings \ --disable-rpath make %{?_smp_mflags} @@ -173,6 +172,9 @@ %{_bindir}/artsc-config %changelog +* Fri Jan 27 2006 Than Ngo 8:1.5.1-0.1.fc4 +- 1.5.1 + * Tue Dec 20 2005 Than Ngo 8:1.5.0-0.2.fc4 - apply patch to fix a bug in creating a directory /tmp/ksocket-$USER Index: sources =================================================================== RCS file: /cvs/dist/rpms/arts/FC-4/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 30 Nov 2005 17:13:07 -0000 1.21 +++ sources 27 Jan 2006 12:47:04 -0000 1.22 @@ -1 +0,0 @@ -e90a32ee47d5cdc51fe1b7f6f6c0df63 arts-1.5.0.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 12:48:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 07:48:02 -0500 Subject: rpms/arts/FC-4 .cvsignore,1.20,1.21 sources,1.22,1.23 Message-ID: <200601271248.k0RCm2K8026978@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/arts/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26964 Modified Files: .cvsignore sources Log Message: 1.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/arts/FC-4/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 30 Nov 2005 17:13:07 -0000 1.20 +++ .cvsignore 27 Jan 2006 12:48:00 -0000 1.21 @@ -4,3 +4,4 @@ arts-1.4.0.tar.bz2 arts-1.4.1.tar.bz2 arts-1.5.0.tar.bz2 +arts-1.5.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/arts/FC-4/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 27 Jan 2006 12:47:04 -0000 1.22 +++ sources 27 Jan 2006 12:48:00 -0000 1.23 @@ -0,0 +1 @@ +71c4996de36aa7f8726e54bb3d5bf059 arts-1.5.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 13:21:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 08:21:34 -0500 Subject: rpms/SDL/devel SDL-1.2.9-no_exec_stack.patch, NONE, 1.1 SDL.spec, 1.34, 1.35 Message-ID: <200601271321.k0RDLYsb024918@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/SDL/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24784 Modified Files: SDL.spec Added Files: SDL-1.2.9-no_exec_stack.patch Log Message: [tw] - added upstream no exec stack patch SDL-1.2.9-no_exec_stack.patch: mmx_main.asm | 5 +++-- mmxp2_32.asm | 5 +++-- x86_main.asm | 4 ++++ x86p_16.asm | 3 +++ x86p_32.asm | 4 ++++ 5 files changed, 17 insertions(+), 4 deletions(-) --- NEW FILE SDL-1.2.9-no_exec_stack.patch --- --- SDL-1.2.9/src/hermes/x86p_16.asm.no_exec_stack 2001-04-26 18:45:45.000000000 +0200 +++ SDL-1.2.9/src/hermes/x86p_16.asm 2006-01-27 14:04:14.000000000 +0100 @@ -494,3 +494,6 @@ .L7 pop ebp jmp _x86return +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif --- SDL-1.2.9/src/hermes/x86_main.asm.no_exec_stack 2001-04-26 18:45:45.000000000 +0200 +++ SDL-1.2.9/src/hermes/x86_main.asm 2006-01-27 14:04:14.000000000 +0100 @@ -123,3 +123,7 @@ .L1: ret + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif --- SDL-1.2.9/src/hermes/mmx_main.asm.no_exec_stack 2001-04-26 18:45:45.000000000 +0200 +++ SDL-1.2.9/src/hermes/mmx_main.asm 2006-01-27 14:04:14.000000000 +0100 @@ -70,5 +70,6 @@ ret - - +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif --- SDL-1.2.9/src/hermes/mmxp2_32.asm.no_exec_stack 2002-03-01 19:01:16.000000000 +0100 +++ SDL-1.2.9/src/hermes/mmxp2_32.asm 2006-01-27 14:04:14.000000000 +0100 @@ -382,5 +382,6 @@ .L4: jmp _mmxreturn - - +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif --- SDL-1.2.9/src/hermes/x86p_32.asm.no_exec_stack 2001-04-26 18:45:45.000000000 +0200 +++ SDL-1.2.9/src/hermes/x86p_32.asm 2006-01-27 14:04:14.000000000 +0100 @@ -1041,3 +1041,7 @@ .L4: jmp _x86return + +%ifidn __OUTPUT_FORMAT__,elf +section .note.GNU-stack noalloc noexec nowrite progbits +%endif Index: SDL.spec =================================================================== RCS file: /cvs/dist/rpms/SDL/devel/SDL.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- SDL.spec 26 Jan 2006 13:57:02 -0000 1.34 +++ SDL.spec 27 Jan 2006 13:21:32 -0000 1.35 @@ -1,7 +1,7 @@ Summary: A cross-platform multimedia library. Name: SDL Version: 1.2.9 -Release: 4 +Release: 5 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz Patch0: SDL-1.1.7-byteorder.patch Patch13: SDL-1.2.7-ppc_modes.patch @@ -9,6 +9,7 @@ Patch17: SDL-1.2.8-libdir.patch Patch18: SDL-1.2.9-yuv_mmx_gcc4.patch Patch19: SDL-1.2.8-preferalsa.patch +Patch20: SDL-1.2.9-no_exec_stack.patch URL: http://www.libsdl.org/ License: LGPL Group: System Environment/Libraries @@ -45,6 +46,7 @@ %patch17 -p1 -b .libdir %patch18 -p1 -b .yuv_mmx_gcc4 %patch19 -p1 -b .prefer +%patch20 -p1 -b .no_exec_stack %build #libtoolize --copy --force @@ -100,6 +102,9 @@ %{_mandir}/man3/SDL*.3* %changelog +* Fri Jan 27 2006 Thomas Woerner 1.2.9-5 +- added upstream no exec stack patch + * Thu Jan 26 2006 Thomas Woerner 1.2.9-4 - prefer alsa sound output, then artsd and esd From fedora-cvs-commits at redhat.com Fri Jan 27 13:49:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 08:49:39 -0500 Subject: rpms/kdelibs/FC-4 kdelibs.spec, 1.98, 1.99 sources, 1.40, 1.41 kdelibs-3.5.0-kio-kdirlister.patch, 1.1, NONE Message-ID: <200601271349.k0RDndFe015907@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv15829 Modified Files: kdelibs.spec sources Removed Files: kdelibs-3.5.0-kio-kdirlister.patch Log Message: 3.5.1 Index: kdelibs.spec =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-4/kdelibs.spec,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- kdelibs.spec 21 Dec 2005 16:53:30 -0000 1.98 +++ kdelibs.spec 27 Jan 2006 13:49:36 -0000 1.99 @@ -21,8 +21,8 @@ %define alsa 1 %define arts 1 -Version: 3.5.0 -Release: 0.2.fc4 +Version: 3.5.1 +Release: 0.1.fc4 Summary: K Desktop Environment - Libraries Name: kdelibs Url: http://www.kde.org/ @@ -49,7 +49,6 @@ Patch33: kdelibs-3.3.2-ppc.patch Patch34: kdelibs-3.4.0-qtdoc.patch Patch35: kdelibs-3.4.92-inttype.patch -Patch36: kdelibs-3.5.0-kio-kdirlister.patch %if %{arts} Requires: arts >= %{arts_epoch}:%{arts_version} @@ -68,6 +67,7 @@ Requires: shadow-utils Requires: /sbin/ldconfig Requires: dev +Requires: xorg-x11 %if %{fam} BuildRequires: fam-devel @@ -166,7 +166,6 @@ %patch33 -p1 -b .ppc %patch34 -p1 -b .qtdoc %patch35 -p1 -b .inttype -%patch36 -p1 -b .kicker_crash # add redhat into KDE_VERSION_STRING %if %{redhatify} @@ -178,13 +177,6 @@ unset QTDIR && . /etc/profile.d/qt.sh export libltdl_cv_shlibext=".so" -%if %{disable_gcc_check_and_hidden_visibility} - # disable gcc check - perl -pi -e "s|KDE_CHECK_FOR_BAD_COMPILER$|dnl KDE_CHECK_FOR_BAD_COMPILER|" admin/acinclude.m4.in - # disable hidden visibility - perl -pi -e "s|KDE_ENABLE_HIDDEN_VISIBILITY$|dnl KDE_ENABLE_HIDDEN_VISIBILITY|" configure.in.in -%endif - %if %{make_cvs} make -f admin/Makefile.common cvs %endif @@ -229,12 +221,17 @@ fi %configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ --with-qt-libraries=$QTLIB \ --enable-libsuffix="$suffix" \ --enable-cups \ --enable-mitshm \ --with-xinerama \ --enable-pie \ +%if %{disable_gcc_check_and_hidden_visibility} + --disable-gcc-hidden-visibility \ +%endif %if %{arts} == 0 --without-arts \ %endif @@ -247,6 +244,7 @@ --includedir=%{_includedir}/kde \ %if %{debug} == 0 --disable-debug \ + --disable-warnings \ %endif %if %{final} --enable-final \ @@ -383,6 +381,16 @@ %doc %{_docdir}/HTML/en/kdelibs* %changelog +* Fri Jan 27 2006 Than Ngo 6:3.5.1-0.1.fc4 +- 3.5.1 + +* Wed Jan 18 2006 Than Ngo 6:3.5.0-0.4.fc4 +- apply patch to fix a printing problem +- add requires on iceauth #176571 + +* Wed Jan 11 2006 Karsten Hopp 6:3.5.0-0.3.fc4 +- fix kjs encodeuri/decodeuri heap overflow vulnerability, CVE-2006-0019 + * Wed Dec 21 2005 Than Ngo 6:3.5.0-0.2.fc4 - apply patch to fix crash in kicker on KDE logout - add Buildrequires on libacl-devel/libattr-devel Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-4/sources,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- sources 20 Dec 2005 14:13:12 -0000 1.40 +++ sources 27 Jan 2006 13:49:37 -0000 1.41 @@ -1 +0,0 @@ -2b11d654e2ea1a3cd16dcfdcbb7d1915 kdelibs-3.5.0.tar.bz2 --- kdelibs-3.5.0-kio-kdirlister.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 27 13:55:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 08:55:24 -0500 Subject: rpms/kdelibs/FC-4 .cvsignore,1.30,1.31 sources,1.41,1.42 Message-ID: <200601271355.k0RDtOe4018510@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv18436 Modified Files: .cvsignore sources Log Message: 3.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-4/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 20 Dec 2005 14:13:12 -0000 1.30 +++ .cvsignore 27 Jan 2006 13:55:21 -0000 1.31 @@ -6,3 +6,4 @@ kdelibs-3.4.1.tar.bz2 kdelibs-3.4.2.tar.bz2 kdelibs-3.5.0.tar.bz2 +kdelibs-3.5.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-4/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 27 Jan 2006 13:49:37 -0000 1.41 +++ sources 27 Jan 2006 13:55:21 -0000 1.42 @@ -0,0 +1 @@ +2a22193ae7c23f3759b02723dab02d30 kdelibs-3.5.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 14:53:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 09:53:29 -0500 Subject: rpms/glib2/devel .cvsignore, 1.44, 1.45 glib2.spec, 1.74, 1.75 sources, 1.44, 1.45 Message-ID: <200601271453.k0RErTVv013563@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/glib2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13548 Modified Files: .cvsignore glib2.spec sources Log Message: 2.9.5 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 18 Jan 2006 18:05:27 -0000 1.44 +++ .cvsignore 27 Jan 2006 14:53:27 -0000 1.45 @@ -29,3 +29,4 @@ glib-2.9.2.tar.bz2 glib-2.9.3.tar.bz2 glib-2.9.4.tar.bz2 +glib-2.9.5.tar.bz2 Index: glib2.spec =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/glib2.spec,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- glib2.spec 18 Jan 2006 18:05:28 -0000 1.74 +++ glib2.spec 27 Jan 2006 14:53:27 -0000 1.75 @@ -1,6 +1,6 @@ Summary: A library of handy utility functions Name: glib2 -Version: 2.9.4 +Version: 2.9.5 Release: 1 License: LGPL Group: System Environment/Libraries @@ -96,6 +96,9 @@ %{_mandir}/man1/* %changelog +* Fri Jan 27 2006 Matthias Clasen - 2.9.5-1 +- Update to 2.9.5 + * Wed Jan 18 2006 Matthias Clasen - 2.9.4-1 - Update to 2.9.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/glib2/devel/sources,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- sources 18 Jan 2006 18:05:28 -0000 1.44 +++ sources 27 Jan 2006 14:53:27 -0000 1.45 @@ -1 +1 @@ -467d473c2fd43e124bcab02b6548c135 glib-2.9.4.tar.bz2 +d92467e6a644341d704a5d0e3af8c06f glib-2.9.5.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 15:25:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 10:25:02 -0500 Subject: rpms/lesstif/FC-3 lesstif.spec,1.13,1.14 Message-ID: <200601271525.k0RFP2ES012598@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/lesstif/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv12537 Modified Files: lesstif.spec Log Message: [tw] - applied patches: - fixed possible libXpm overflows (#151640) - allow to write XPM files with absolute path names again (#140815) Index: lesstif.spec =================================================================== RCS file: /cvs/dist/rpms/lesstif/FC-3/lesstif.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lesstif.spec 6 May 2005 14:13:21 -0000 1.13 +++ lesstif.spec 27 Jan 2006 15:25:00 -0000 1.14 @@ -4,7 +4,7 @@ Summary: An OSF/Motif(R) clone. Name: lesstif Version: 0.93.36 -Release: 6.FC3.2 +Release: 6.FC3.3 License: LGPL Group: Development/Libraries Source: ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/lesstif-%{version}.tar.bz2 @@ -75,10 +75,12 @@ %patch0 -p1 -b .libtool %patch2 -p1 -b .CAN-2004-0687-0688 %patch3 -p1 -b .CAN-2004-0914 +%patch4 -p1 -b .CAN-2004-0914_sec8 +%patch5 -p1 -b .CAN-2005-0605 LESSTIFTOP=$PWD CFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=%{prefix} \ +./configure --prefix=%{prefix} \ 2005 Thomas Woerner 0.93-36-6.FC3.2 --libdir=%{prefix}/%{_lib} \ --enable-shared \ --enable-static \ @@ -212,6 +214,11 @@ %endif %changelog +* Fri Jan 27 2006 Thomas Woerner 0.93-36-6.FC3.3 +- applied patches: + - fixed possible libXpm overflows (#151640) + - allow to write XPM files with absolute path names again (#140815) + * Fri May 6 2005 Thomas Woerner 0.93-36-6.FC3.2 - fixed possible libXpm overflows (#151640) - allow to write XPM files with absolute path names again (#140815) From fedora-cvs-commits at redhat.com Fri Jan 27 15:27:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 10:27:21 -0500 Subject: rpms/lesstif/FC-3 lesstif.spec,1.14,1.15 Message-ID: <200601271527.k0RFRLkS013693@cvs.devel.redhat.com> Author: twoerner Update of /cvs/dist/rpms/lesstif/FC-3 In directory cvs.devel.redhat.com:/tmp/cvs-serv13284 Modified Files: lesstif.spec Log Message: [tw] removed drag'n'drop text Index: lesstif.spec =================================================================== RCS file: /cvs/dist/rpms/lesstif/FC-3/lesstif.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lesstif.spec 27 Jan 2006 15:25:00 -0000 1.14 +++ lesstif.spec 27 Jan 2006 15:27:19 -0000 1.15 @@ -80,7 +80,7 @@ LESSTIFTOP=$PWD CFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=%{prefix} \ 2005 Thomas Woerner 0.93-36-6.FC3.2 +./configure --prefix=%{prefix} \ --libdir=%{prefix}/%{_lib} \ --enable-shared \ --enable-static \ @@ -215,7 +215,7 @@ %changelog * Fri Jan 27 2006 Thomas Woerner 0.93-36-6.FC3.3 -- applied patches: +- applied patches from last update: - fixed possible libXpm overflows (#151640) - allow to write XPM files with absolute path names again (#140815) From fedora-cvs-commits at redhat.com Fri Jan 27 15:37:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 10:37:24 -0500 Subject: rpms/ncurses/devel ncurses-5.5-chtypeaslong.patch, 1.1, 1.2 ncurses.spec, 1.49, 1.50 Message-ID: <200601271537.k0RFbOwA016420@cvs.devel.redhat.com> Author: praszyk Update of /cvs/dist/rpms/ncurses/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16353 Modified Files: ncurses-5.5-chtypeaslong.patch ncurses.spec Log Message: Rebuild. ncurses-5.5-chtypeaslong.patch: narrowc/include/curses.h | 2 +- widec/include/curses.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: ncurses-5.5-chtypeaslong.patch =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/ncurses-5.5-chtypeaslong.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ncurses-5.5-chtypeaslong.patch 27 Jan 2006 12:39:42 -0000 1.1 +++ ncurses-5.5-chtypeaslong.patch 27 Jan 2006 15:37:21 -0000 1.2 @@ -1,11 +1,22 @@ ---- ncurses-5.5/configure.in.rasold 2006-01-27 13:22:31.000000000 +0100 -+++ ncurses-5.5/configure.in 2006-01-27 13:23:28.000000000 +0100 -@@ -673,7 +673,7 @@ - ### use option --with-chtype to override chtype's type - AC_MSG_CHECKING(for type of chtype) - AC_ARG_WITH(chtype, -- [ --with-chtype=TYPE override type of chtype], -+ [ --with-chtype=" unsigned long " - [NCURSES_CHTYPE="$withval"], - [NCURSES_CHTYPE=auto]) - AC_MSG_RESULT($NCURSES_CHTYPE) +--- ncurses-5.5/widec/include/curses.h.rasold 2006-01-27 16:27:26.000000000 +0100 ++++ ncurses-5.5/widec/include/curses.h 2006-01-27 16:27:35.000000000 +0100 +@@ -115,7 +115,7 @@ + typedef unsigned chtype; + typedef unsigned mmask_t; + #else +-typedef unsigned long chtype; ++typedef unsigned long int chtype; + typedef unsigned long mmask_t; + #endif + +--- ncurses-5.5/narrowc/include/curses.h.rasold 2006-01-27 16:26:29.000000000 +0100 ++++ ncurses-5.5/narrowc/include/curses.h 2006-01-27 16:27:00.000000000 +0100 +@@ -115,7 +115,7 @@ + typedef unsigned chtype; + typedef unsigned mmask_t; + #else +-typedef unsigned long chtype; ++typedef unsigned long int chtype; + typedef unsigned long mmask_t; + #endif + Index: ncurses.spec =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ncurses.spec 27 Jan 2006 12:39:42 -0000 1.49 +++ ncurses.spec 27 Jan 2006 15:37:21 -0000 1.50 @@ -2,7 +2,7 @@ Name: ncurses Version: 5.5 %define includedirw %{_includedir}/ncursesw -Release: 11 +Release: 12 License: distributable Group: System Environment/Libraries URL: http://dickey.his.com/ncurses/ncurses.html @@ -165,6 +165,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jan 27 2006 Petr Raszyk 5.5-12 +- Rebuild. + * Fri Jan 27 2006 Petr Raszyk 5.5-11 - According Henrik Nordstrom (hno at squid-cache.org) Diff between the two versions of curses.h on x86_64 From fedora-cvs-commits at redhat.com Fri Jan 27 15:49:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 10:49:19 -0500 Subject: rpms/ncurses/devel ncurses-5.5-chtypeaslongint.patch, NONE, 1.1 ncurses.spec, 1.50, 1.51 Message-ID: <200601271549.k0RFnJVa001496@cvs.devel.redhat.com> Author: praszyk Update of /cvs/dist/rpms/ncurses/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1429 Modified Files: ncurses.spec Added Files: ncurses-5.5-chtypeaslongint.patch Log Message: Rebuild. ncurses-5.5-chtypeaslongint.patch: narrowc/include/curses.h | 2 +- widec/include/curses.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE ncurses-5.5-chtypeaslongint.patch --- --- ncurses-5.5/widec/include/curses.h.rasold 2006-01-27 16:27:26.000000000 +0100 +++ ncurses-5.5/widec/include/curses.h 2006-01-27 16:27:35.000000000 +0100 @@ -115,7 +115,7 @@ typedef unsigned chtype; typedef unsigned mmask_t; #else -typedef unsigned long chtype; +typedef unsigned long int chtype; typedef unsigned long mmask_t; #endif --- ncurses-5.5/narrowc/include/curses.h.rasold 2006-01-27 16:26:29.000000000 +0100 +++ ncurses-5.5/narrowc/include/curses.h 2006-01-27 16:27:00.000000000 +0100 @@ -115,7 +115,7 @@ typedef unsigned chtype; typedef unsigned mmask_t; #else -typedef unsigned long chtype; +typedef unsigned long int chtype; typedef unsigned long mmask_t; #endif Index: ncurses.spec =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- ncurses.spec 27 Jan 2006 15:37:21 -0000 1.50 +++ ncurses.spec 27 Jan 2006 15:49:16 -0000 1.51 @@ -2,7 +2,7 @@ Name: ncurses Version: 5.5 %define includedirw %{_includedir}/ncursesw -Release: 12 +Release: 13 License: distributable Group: System Environment/Libraries URL: http://dickey.his.com/ncurses/ncurses.html @@ -14,7 +14,7 @@ Patch1: ncurses-5.4-xterm-kbs.patch Patch2: ncurses-5.4-filter.patch Patch3: ncurses-5.4-endwinfilter.patch -Patch4: ncurses-5.5-chtypeaslong.patch +Patch4: ncurses-5.5-chtypeaslongint.patch BuildRequires: sharutils BuildRoot: %{_tmppath}/%{name}-root @@ -52,7 +52,7 @@ %patch1 -p1 -b .xterm-kbs %patch2 -p1 -b .filter %patch3 -p1 -b .endwinfilter -%patch4 -p1 -b .chtypeaslong +%patch4 -p1 -b .chtypeaslongint %build CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES" @@ -165,6 +165,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jan 27 2006 Petr Raszyk 5.5-13 +- Rebuild. + * Fri Jan 27 2006 Petr Raszyk 5.5-12 - Rebuild. From fedora-cvs-commits at redhat.com Fri Jan 27 15:58:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 10:58:36 -0500 Subject: rpms/ncurses/devel ncurses.spec,1.51,1.52 Message-ID: <200601271558.k0RFwZ0h005528@cvs.devel.redhat.com> Author: praszyk Update of /cvs/dist/rpms/ncurses/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5462 Modified Files: ncurses.spec Log Message: Rebuild. Index: ncurses.spec =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ncurses.spec 27 Jan 2006 15:49:16 -0000 1.51 +++ ncurses.spec 27 Jan 2006 15:58:32 -0000 1.52 @@ -2,7 +2,7 @@ Name: ncurses Version: 5.5 %define includedirw %{_includedir}/ncursesw -Release: 13 +Release: 14 License: distributable Group: System Environment/Libraries URL: http://dickey.his.com/ncurses/ncurses.html @@ -14,7 +14,7 @@ Patch1: ncurses-5.4-xterm-kbs.patch Patch2: ncurses-5.4-filter.patch Patch3: ncurses-5.4-endwinfilter.patch -Patch4: ncurses-5.5-chtypeaslongint.patch +#Patch4: ncurses-5.5-chtypeaslongint.patch BuildRequires: sharutils BuildRoot: %{_tmppath}/%{name}-root @@ -52,7 +52,7 @@ %patch1 -p1 -b .xterm-kbs %patch2 -p1 -b .filter %patch3 -p1 -b .endwinfilter -%patch4 -p1 -b .chtypeaslongint +#%patch4 -p1 -b .chtypeaslongint %build CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES" @@ -165,6 +165,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jan 27 2006 Petr Raszyk 5.5-14 +- Rebuild. + * Fri Jan 27 2006 Petr Raszyk 5.5-13 - Rebuild. From fedora-cvs-commits at redhat.com Fri Jan 27 16:11:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 11:11:23 -0500 Subject: rpms/ncurses/devel ncurses-5.5-chtypeaslong2.patch, NONE, 1.1 ncurses.spec, 1.52, 1.53 Message-ID: <200601271611.k0RGBNTM009046@cvs.devel.redhat.com> Author: praszyk Update of /cvs/dist/rpms/ncurses/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8996 Modified Files: ncurses.spec Added Files: ncurses-5.5-chtypeaslong2.patch Log Message: Rebuild. ncurses-5.5-chtypeaslong2.patch: narrowc/include/curses.h | 2 +- widec/include/curses.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE ncurses-5.5-chtypeaslong2.patch --- --- ncurses-5.5/widec/include/curses.h.rasold 2006-01-27 17:05:32.000000000 +0100 +++ ncurses-5.5/widec/include/curses.h 2006-01-27 17:05:40.000000000 +0100 @@ -115,7 +115,7 @@ typedef unsigned chtype; typedef unsigned mmask_t; #else -typedef unsigned long chtype; +typedef unsigned long int chtype; typedef unsigned long mmask_t; #endif --- ncurses-5.5/narrowc/include/curses.h.rasold 2006-01-27 17:05:00.000000000 +0100 +++ ncurses-5.5/narrowc/include/curses.h 2006-01-27 17:05:09.000000000 +0100 @@ -115,7 +115,7 @@ typedef unsigned chtype; typedef unsigned mmask_t; #else -typedef unsigned long chtype; +typedef unsigned long int chtype; typedef unsigned long mmask_t; #endif Index: ncurses.spec =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- ncurses.spec 27 Jan 2006 15:58:32 -0000 1.52 +++ ncurses.spec 27 Jan 2006 16:11:21 -0000 1.53 @@ -2,7 +2,7 @@ Name: ncurses Version: 5.5 %define includedirw %{_includedir}/ncursesw -Release: 14 +Release: 15 License: distributable Group: System Environment/Libraries URL: http://dickey.his.com/ncurses/ncurses.html @@ -14,7 +14,7 @@ Patch1: ncurses-5.4-xterm-kbs.patch Patch2: ncurses-5.4-filter.patch Patch3: ncurses-5.4-endwinfilter.patch -#Patch4: ncurses-5.5-chtypeaslongint.patch +Patch4: ncurses-5.5-chtypeaslong2.patch BuildRequires: sharutils BuildRoot: %{_tmppath}/%{name}-root @@ -52,7 +52,7 @@ %patch1 -p1 -b .xterm-kbs %patch2 -p1 -b .filter %patch3 -p1 -b .endwinfilter -#%patch4 -p1 -b .chtypeaslongint +%patch4 -p1 -b .chtypeaslong2 %build CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES" @@ -165,6 +165,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jan 27 2006 Petr Raszyk 5.5-15 +- Rebuild. + * Fri Jan 27 2006 Petr Raszyk 5.5-14 - Rebuild. @@ -177,7 +180,7 @@ * Fri Jan 27 2006 Petr Raszyk 5.5-11 - According Henrik Nordstrom (hno at squid-cache.org) Diff between the two versions of curses.h on x86_64 - Patch ncurses-5.5-chtypeaslong.patch + Patch ncurses-5.5-chtypeaslong2.patch See #178824 * Fri Dec 23 2005 Petr Raszyk 5.5-10 From fedora-cvs-commits at redhat.com Fri Jan 27 16:14:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 11:14:50 -0500 Subject: rpms/system-config-services/devel .cvsignore, 1.23, 1.24 sources, 1.27, 1.28 system-config-services.spec, 1.30, 1.31 Message-ID: <200601271614.k0RGEo7j010532@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-services/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10485 Modified Files: .cvsignore sources system-config-services.spec Log Message: fix saving xinetd services Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 27 Jan 2006 11:43:37 -0000 1.23 +++ .cvsignore 27 Jan 2006 16:14:46 -0000 1.24 @@ -1 +1 @@ -system-config-services-0.8.99.1.tar.gz +system-config-services-0.8.99.2.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 27 Jan 2006 11:43:37 -0000 1.27 +++ sources 27 Jan 2006 16:14:46 -0000 1.28 @@ -1 +1 @@ -762bc8d9fb60ace97e3679f3a4fa2f32 system-config-services-0.8.99.1.tar.gz +30ac683a1d2fcc7e3782350635fa7147 system-config-services-0.8.99.2.tar.gz Index: system-config-services.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-services/devel/system-config-services.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- system-config-services.spec 27 Jan 2006 11:43:37 -0000 1.30 +++ system-config-services.spec 27 Jan 2006 16:14:46 -0000 1.31 @@ -1,7 +1,7 @@ # -*- RPM-SPEC -*- Summary: system-config-services is an initscript and xinetd configuration utility Name: system-config-services -Version: 0.8.99.1 +Version: 0.8.99.2 Release: 1 URL: http://www.redhat.com/ Source0: %{name}-%{version}.tar.gz @@ -71,6 +71,9 @@ %{_mandir}/*/system-config-services.8* %changelog +* Fri Jan 27 2006 Nils Philippsen - 0.8.99.2 +- fix saving xinetd services + * Fri Jan 27 2006 Nils Philippsen - 0.8.99.1 - implement daemons and xinetd services on separate tabs From fedora-cvs-commits at redhat.com Fri Jan 27 16:15:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 11:15:22 -0500 Subject: rpms/bind/devel keygen.c,1.2,1.3 Message-ID: <200601271615.k0RGFMT5010806@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10773 Modified Files: keygen.c Log Message: fix bug 178942: undefined dns-keygen exit status Index: keygen.c =================================================================== RCS file: /cvs/dist/rpms/bind/devel/keygen.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- keygen.c 9 Sep 2004 03:33:42 -0000 1.2 +++ keygen.c 27 Jan 2006 16:15:18 -0000 1.3 @@ -16,4 +16,5 @@ } puts(key); fclose(f); + return(0); } From fedora-cvs-commits at redhat.com Fri Jan 27 16:16:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 11:16:28 -0500 Subject: rpms/bind/FC-4 keygen.c,1.2,1.3 Message-ID: <200601271616.k0RGGS2v020081@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/bind/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv19680 Modified Files: keygen.c Log Message: fix bug 178942: undefined dns-keygen exit status Index: keygen.c =================================================================== RCS file: /cvs/dist/rpms/bind/FC-4/keygen.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- keygen.c 9 Sep 2004 03:33:42 -0000 1.2 +++ keygen.c 27 Jan 2006 16:16:25 -0000 1.3 @@ -16,4 +16,5 @@ } puts(key); fclose(f); + return(0); } From fedora-cvs-commits at redhat.com Fri Jan 27 16:21:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 11:21:52 -0500 Subject: rpms/ncurses/devel ncurses-5.5-chtypeaslong3.patch, NONE, 1.1 ncurses.spec, 1.53, 1.54 Message-ID: <200601271621.k0RGLqt6025831@cvs.devel.redhat.com> Author: praszyk Update of /cvs/dist/rpms/ncurses/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25750 Modified Files: ncurses.spec Added Files: ncurses-5.5-chtypeaslong3.patch Log Message: Rebuild. ncurses-5.5-chtypeaslong3.patch: curses.h.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE ncurses-5.5-chtypeaslong3.patch --- --- ncurses-5.5/include/curses.h.in.rasold 2006-01-27 17:20:05.000000000 +0100 +++ ncurses-5.5/include/curses.h.in 2006-01-27 17:20:35.000000000 +0100 @@ -115,7 +115,7 @@ typedef unsigned chtype; typedef unsigned mmask_t; #else -typedef unsigned @cf_cv_typeof_chtype@ chtype; +typedef unsigned long int chtype; typedef unsigned @cf_cv_typeof_mmask_t@ mmask_t; #endif Index: ncurses.spec =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- ncurses.spec 27 Jan 2006 16:11:21 -0000 1.53 +++ ncurses.spec 27 Jan 2006 16:21:50 -0000 1.54 @@ -2,7 +2,7 @@ Name: ncurses Version: 5.5 %define includedirw %{_includedir}/ncursesw -Release: 15 +Release: 16 License: distributable Group: System Environment/Libraries URL: http://dickey.his.com/ncurses/ncurses.html @@ -14,7 +14,7 @@ Patch1: ncurses-5.4-xterm-kbs.patch Patch2: ncurses-5.4-filter.patch Patch3: ncurses-5.4-endwinfilter.patch -Patch4: ncurses-5.5-chtypeaslong2.patch +#Patch4: ncurses-5.5-chtypeaslong2.patch BuildRequires: sharutils BuildRoot: %{_tmppath}/%{name}-root @@ -52,7 +52,7 @@ %patch1 -p1 -b .xterm-kbs %patch2 -p1 -b .filter %patch3 -p1 -b .endwinfilter -%patch4 -p1 -b .chtypeaslong2 +#%patch4 -p1 -b .chtypeaslong2 %build CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES" @@ -165,6 +165,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jan 27 2006 Petr Raszyk 5.5-16 +- Rebuild. + * Fri Jan 27 2006 Petr Raszyk 5.5-15 - Rebuild. From fedora-cvs-commits at redhat.com Fri Jan 27 16:27:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 11:27:38 -0500 Subject: rpms/elilo/devel elilo-3.6-makefile.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 elilo.spec, 1.16, 1.17 sources, 1.9, 1.10 Message-ID: <200601271627.k0RGRc2R021136@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/elilo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21119 Modified Files: .cvsignore elilo.spec sources Added Files: elilo-3.6-makefile.patch Log Message: Update to 3.6 elilo-3.6-makefile.patch: Make.defaults | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE elilo-3.6-makefile.patch --- --- ./Make.defaults.orig 2006-01-25 18:15:27.000000000 -0500 +++ ./Make.defaults 2006-01-25 18:17:54.000000000 -0500 @@ -56,7 +56,7 @@ EFIINC = /usr/include/efi GNUEFILIB = /usr/lib EFILIB = /usr/lib -EFICRT0 = /usr/lib +EFICRT0 = /usr/lib/gnuefi CDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) TOPDIR = @@ -67,7 +67,7 @@ OPTIMFLAGS = -O2 DEBUGFLAGS = -Wall -CFLAGS = $(OPTIMFLAGS) -fpic -fshort-wchar $(DEBUGFLAGS) +CFLAGS = $(OPTIMFLAGS) -fpic -fshort-wchar $(DEBUGFLAGS) -fno-merge-constants LDFLAGS = -nostdlib -znocombreloc INSTALL = install Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/elilo/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 28 Sep 2005 19:17:55 -0000 1.8 +++ .cvsignore 27 Jan 2006 16:27:36 -0000 1.9 @@ -1,3 +1,5 @@ efibootmgr-0.5.0-test4.tar.gz elilo-3.4.tar.gz efibootmgr-0.5.2.tar.gz +elilo-3.6.src.tgz +efibootmgr-0.5.3.tar.gz Index: elilo.spec =================================================================== RCS file: /cvs/dist/rpms/elilo/devel/elilo.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- elilo.spec 9 Dec 2005 22:40:18 -0000 1.16 +++ elilo.spec 27 Jan 2006 16:27:36 -0000 1.17 @@ -1,20 +1,16 @@ -%define efibootmgr_ver 0.5.2 +%define efibootmgr_ver 0.5.3 Name: elilo Summary: ELILO linux boot loader for EFI-based systems Group: System Environment/Base Obsoletes: eli -Version: 3.4 -Release: 12.1 +Version: 3.6 +Release: 1 License: GPL -Source: ftp://ftp.hpl.hp.com/pub/linux-ia64/elilo-%{version}.tar.gz +Source: elilo-%{version}.src.tgz Source1: http://domsch.com/linux/ia64/efibootmgr/efibootmgr-%{efibootmgr_ver}.tar.gz Source2: fpswa.efi -Patch1: elilo-3.3a-makefile.patch -Patch2: elilo-3.4-debug.patch -Patch3: elilo-initrd-size-fix.patch -Patch4: elilo-argv-fix.patch -Patch5: elilo-kill-warnings.patch +Patch1: elilo-3.6-makefile.patch BuildPrereq: gnu-efi, pciutils-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root ExclusiveArch: ia64 @@ -24,15 +20,12 @@ %prep -%setup -q -a 1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p2 -%patch4 -p1 -%patch5 -p1 +%setup -q -a 1 -n elilo +%patch1 -p0 %build -make +make + cd efibootmgr-%{efibootmgr_ver} make cp COPYING INSTALL README doc @@ -45,6 +38,7 @@ mkdir -p $RPM_BUILD_ROOT/boot/efi/EFI/{redhat,Intel\ Firmware} install -m 755 elilo.efi $RPM_BUILD_ROOT/boot/efi/EFI/redhat/elilo.efi install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/boot/efi/EFI/Intel\ Firmware/fpswa.efi +mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8 install -m 644 efibootmgr-%{efibootmgr_ver}/src/man/man8/efibootmgr.8 $RPM_BUILD_ROOT/usr/share/man/man8 mkdir -p $RPM_BUILD_ROOT/usr/sbin @@ -61,6 +55,9 @@ %{_mandir}/man*/* %changelog +* Wed Jan 25 2006 Paul Nasrat +- Update elilo and efibootmgr + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/elilo/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 28 Sep 2005 19:17:55 -0000 1.9 +++ sources 27 Jan 2006 16:27:36 -0000 1.10 @@ -1,2 +1,2 @@ -52b2ea392e86df747c46b9200319e3f9 elilo-3.4.tar.gz -ccdfcc810610a03cf1a02f08028fa22b efibootmgr-0.5.2.tar.gz +5fa5d3d1ac2f29e3b56a4e82b752ecd6 elilo-3.6.src.tgz +7021146c6634459ebd2fec84375754c6 efibootmgr-0.5.3.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 27 16:36:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 11:36:08 -0500 Subject: rpms/ncurses/devel ncurses.spec,1.54,1.55 Message-ID: <200601271636.k0RGa8AI021293@cvs.devel.redhat.com> Author: praszyk Update of /cvs/dist/rpms/ncurses/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21283 Modified Files: ncurses.spec Log Message: Rebuild. Index: ncurses.spec =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- ncurses.spec 27 Jan 2006 16:21:50 -0000 1.54 +++ ncurses.spec 27 Jan 2006 16:35:57 -0000 1.55 @@ -2,7 +2,7 @@ Name: ncurses Version: 5.5 %define includedirw %{_includedir}/ncursesw -Release: 16 +Release: 17 License: distributable Group: System Environment/Libraries URL: http://dickey.his.com/ncurses/ncurses.html @@ -14,7 +14,7 @@ Patch1: ncurses-5.4-xterm-kbs.patch Patch2: ncurses-5.4-filter.patch Patch3: ncurses-5.4-endwinfilter.patch -#Patch4: ncurses-5.5-chtypeaslong2.patch +Patch4: ncurses-5.5-chtypeaslong3.patch BuildRequires: sharutils BuildRoot: %{_tmppath}/%{name}-root @@ -52,7 +52,7 @@ %patch1 -p1 -b .xterm-kbs %patch2 -p1 -b .filter %patch3 -p1 -b .endwinfilter -#%patch4 -p1 -b .chtypeaslong2 +%patch4 -p1 -b .chtypeaslong3 %build CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES" @@ -165,6 +165,9 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Jan 27 2006 Petr Raszyk 5.5-17 +- Rebuild. + * Fri Jan 27 2006 Petr Raszyk 5.5-16 - Rebuild. From fedora-cvs-commits at redhat.com Fri Jan 27 16:42:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 11:42:31 -0500 Subject: rpms/indent/devel indent-2.2.9-cdw.patch, NONE, 1.1 indent.spec, 1.16, 1.17 Message-ID: <200601271642.k0RGgVtL021423@cvs.devel.redhat.com> Author: pmachata Update of /cvs/dist/rpms/indent/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21407 Modified Files: indent.spec Added Files: indent-2.2.9-cdw.patch Log Message: - Changed the placement of closing `while' of `do {} while' command under a -cdw option. It's now cuddled up to the brace. (#67781) - Changed the indentation of cuddled `else': the brace is lined up under opening brace. Let's see if people like it. It looks less strange than before, but still it looks strange. indent-2.2.9-cdw.patch: indent.c | 15 ++++++++++++--- indent.h | 3 +++ parse.c | 15 +++++++++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) --- NEW FILE indent-2.2.9-cdw.patch --- diff -burp indent-2.2.9/src/indent.c indent-2.2.9-cdw/src/indent.c --- indent-2.2.9/src/indent.c 2006-01-18 18:22:36.000000000 +0100 +++ indent-2.2.9-cdw/src/indent.c 2006-01-27 17:13:55.000000000 +0100 @@ -976,13 +976,10 @@ static void handle_token_semicolon( if (!*sp_sw) { /* if not if for (;;) */ - do - { if (parse (semicolon) != total_success) { *file_exit_value = indent_error; } - } while(0); *force_nl = true; /* force newline after a end of stmt */ } @@ -2625,6 +2622,18 @@ static exit_values_ty indent_main_loop(v return file_exit_value; /* RETURN */ } + if (type_code == sp_paren + && parser_state_tos->p_stack[parser_state_tos->tos] == dohead + && parser_state_tos->last_token == rbrace) + { + /* This is closing `while' of `do {stuff;} while' + statement (not `do stuff; while' command). In -cdw, we + want to suppress newline. */ + if (settings.cuddle_do_while) + force_nl = false; + parser_state_tos->in_closing_br_while = true; + } + if ((type_code != comment) && (type_code != cplus_comment) && (type_code != newline) && diff -burp indent-2.2.9/src/indent.h indent-2.2.9-cdw/src/indent.h --- indent-2.2.9/src/indent.h 2006-01-18 18:22:36.000000000 +0100 +++ indent-2.2.9-cdw/src/indent.h 2006-01-27 17:20:14.000000000 +0100 @@ -357,6 +357,9 @@ typedef struct parser_state BOOLEAN in_decl; /* set to true when we are in a declaration * statement. The processing of braces is then * slightly different */ + BOOLEAN in_closing_br_while; /* set to true when we are parsing + * closing while of do {} while + * statement*/ int in_stmt; /* set to 1 while in a stmt */ int in_parameter_declaration; int ind_level; /* the current indentation level in spaces */ diff -burp indent-2.2.9/src/parse.c indent-2.2.9-cdw/src/parse.c --- indent-2.2.9/src/parse.c 2002-08-04 19:08:41.000000000 +0200 +++ indent-2.2.9-cdw/src/parse.c 2006-01-27 17:18:52.000000000 +0100 @@ -38,6 +38,7 @@ void init_parser (void) parser_state_tos->cstk = (int *) xmalloc (INITIAL_STACK_SIZE * sizeof (int)); parser_state_tos->paren_indents_size = 8; parser_state_tos->paren_indents = (short *) xmalloc (parser_state_tos->paren_indents_size * sizeof (short)); + parser_state_tos->in_closing_br_while = false; /* Although these are supposed to grow if we reach the end, * I can find no place in the code which does this. */ @@ -380,6 +381,14 @@ exit_values_ty parse ( parser_state_tos->ind_level = parser_state_tos->i_l_follow; parser_state_tos->il[parser_state_tos->tos] = parser_state_tos->i_l_follow; + + if (parser_state_tos->in_closing_br_while + && settings.cuddle_do_while + && !settings.btype_2) + { + parser_state_tos->ind_level += settings.brace_indent; + } + parser_state_tos->in_closing_br_while = false; } else { /* it is a while loop */ @@ -409,6 +418,12 @@ exit_values_ty parse ( parser_state_tos->p_stack[parser_state_tos->tos] = elsehead; /* remember if with else */ parser_state_tos->search_brace = true; + + if (settings.cuddle_else + && !settings.btype_2) + { + parser_state_tos->ind_level += settings.brace_indent; + } } break; Index: indent.spec =================================================================== RCS file: /cvs/dist/rpms/indent/devel/indent.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- indent.spec 18 Jan 2006 17:35:44 -0000 1.16 +++ indent.spec 27 Jan 2006 16:42:29 -0000 1.17 @@ -1,7 +1,7 @@ Summary: A GNU program for formatting C code. Name: indent Version: 2.2.9 -Release: 9 +Release: 10 License: GPL Group: Applications/Text URL: http://www.gnu.org/software/indent/ @@ -9,6 +9,7 @@ Patch: indent-2.2.9-fix.patch Patch2: indent-2.2.9-gcc4.patch Patch3: indent-2.2.9-explicits.patch +Patch4: indent-2.2.9-cdw.patch Prereq: /sbin/install-info BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -26,6 +27,7 @@ %patch -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build @@ -64,7 +66,14 @@ %changelog -* Wed Jan 18 2006 Petr Machata +* Wed Jan 27 2006 Petr Machata 2.2.9-10 +- Changed the placement of closing `while' of `do {} while' command + under a -cdw option. It's now cuddled up to the brace. (#67781) +- Changed the indentation of cuddled `else': the brace is lined up + under opening brace. Let's see if people like it. It looks less + strange than before, but still it looks strange. + +* Wed Jan 18 2006 Petr Machata 2.2.9-9 - Silenting some warnings, voidifying some functions that were implicitly int but didn't actually return anything. (#114376) From fedora-cvs-commits at redhat.com Fri Jan 27 16:53:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 11:53:45 -0500 Subject: rpms/kdelibs/FC-4 kdelibs.spec,1.99,1.100 Message-ID: <200601271653.k0RGrjbC001540@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdelibs/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv1526 Modified Files: kdelibs.spec Log Message: add Buildrequires on libacl-devel/libattr-devel Index: kdelibs.spec =================================================================== RCS file: /cvs/dist/rpms/kdelibs/FC-4/kdelibs.spec,v retrieving revision 1.99 retrieving revision 1.100 diff -u -r1.99 -r1.100 --- kdelibs.spec 27 Jan 2006 13:49:36 -0000 1.99 +++ kdelibs.spec 27 Jan 2006 16:53:43 -0000 1.100 @@ -9,7 +9,7 @@ %define cups_epoch 1 %define qt_version 3.3.4 -%define arts_version 1.5.0 +%define arts_version 1.5.1 %define kde_major_version 3 %define qtdocdir %{_docdir}/qt-devel-%{qt_version} @@ -106,6 +106,8 @@ BuildRequires: libtiff-devel BuildRequires: pkgconfig BuildRequires: autoconf automake +Buildrequires: libacl-devel +Buildrequires: libattr-devel Obsoletes: %{name}2 Obsoletes: kdesupport From fedora-cvs-commits at redhat.com Fri Jan 27 17:02:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 12:02:49 -0500 Subject: rpms/ekiga/devel ekiga.spec,1.4,1.5 Message-ID: <200601271702.k0RH2nDj012601@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/ekiga/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12563 Modified Files: ekiga.spec Log Message: Use upstream .desktop file Index: ekiga.spec =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ekiga.spec 25 Jan 2006 02:57:31 -0000 1.4 +++ ekiga.spec 27 Jan 2006 17:02:46 -0000 1.5 @@ -1,7 +1,7 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga Version: 1.99.0 -Release: 1 +Release: 2 URL: http://www.ekiga.org/ Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz License: GPL @@ -53,10 +53,9 @@ rm -rf $RPM_BUILD_ROOT/var/scrollkeeper -%find_lang ekiga +desktop-file-install --vendor gnome --dir=$RPM_BUILD_ROOT%{_datadir}/applications --delete-original --copy-generic-name-to-name $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop -rm $RPM_BUILD_ROOT%{_datadir}/applications/ekiga.desktop -ln -s %{_datadir}/desktop-menu-patches/redhat-ekiga.desktop $RPM_BUILD_ROOT%{_datadir}/applications/redhat-ekiga.desktop +%find_lang ekiga %clean rm -rf $RPM_BUILD_ROOT @@ -85,5 +84,8 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog +* Fri Jan 27 2006 Matthias Clasen - 1.99.0-2 +- Use the upstream .desktop file + * Tue Jan 24 2006 Daniel Veillard - 1.99.0-1 - initial version based on the 1.99.0 beta and gnomemeeting spec file. From fedora-cvs-commits at redhat.com Fri Jan 27 17:12:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 12:12:13 -0500 Subject: rpms/ekiga/devel ekiga.spec,1.5,1.6 Message-ID: <200601271712.k0RHCD6W015476@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/ekiga/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15371 Modified Files: ekiga.spec Log Message: Fix file list Index: ekiga.spec =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ekiga.spec 27 Jan 2006 17:02:46 -0000 1.5 +++ ekiga.spec 27 Jan 2006 17:12:11 -0000 1.6 @@ -74,7 +74,7 @@ %{_bindir}/ekiga %{_bindir}/ekiga-config-tool %{_libdir}/bonobo/servers/ekiga.server -%{_datadir}/applications/redhat-ekiga.desktop +%{_datadir}/applications/gnome-ekiga.desktop %{_datadir}/gnome/help/ekiga #%{_datadir}/omf/ekiga %{_datadir}/pixmaps/* From fedora-cvs-commits at redhat.com Fri Jan 27 17:14:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 12:14:06 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.0.2.ooo61178.ucb.neon25.patch, NONE, 1.1 openoffice.org.spec, 1.610, 1.611 Message-ID: <200601271714.k0RHE6uV016491@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16459 Modified Files: openoffice.org.spec Added Files: openoffice.org-2.0.2.ooo61178.ucb.neon25.patch Log Message: missing defattr openoffice.org-2.0.2.ooo61178.ucb.neon25.patch: source/ucp/webdav/LinkSequence.cxx | 0 source/ucp/webdav/LockEntrySequence.cxx | 0 source/ucp/webdav/LockSequence.cxx | 0 source/ucp/webdav/NeonHeadRequest.cxx | 0 source/ucp/webdav/NeonSession.cxx | 0 source/ucp/webdav/NeonSession.hxx | 0 source/ucp/webdav/UCBDeadPropertyValue.cxx | 0 source/ucp/webdav/makefile.mk | 0 ucb/source/ucp/webdav/LinkSequence.cxx | 4 + ucb/source/ucp/webdav/LockEntrySequence.cxx | 4 + ucb/source/ucp/webdav/LockSequence.cxx | 4 + ucb/source/ucp/webdav/NeonHeadRequest.cxx | 59 +++++++++++++++++++++++++ ucb/source/ucp/webdav/NeonSession.cxx | 52 ++++++++++++++++++---- ucb/source/ucp/webdav/NeonSession.hxx | 4 + ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx | 4 + ucb/source/ucp/webdav/makefile.mk | 4 + 16 files changed, 127 insertions(+), 8 deletions(-) --- NEW FILE openoffice.org-2.0.2.ooo61178.ucb.neon25.patch --- Index: source/ucp/webdav/LinkSequence.cxx =================================================================== RCS file: /cvs/ucb/ucb/source/ucp/webdav/LinkSequence.cxx,v retrieving revision 1.7 diff -u -r1.7 LinkSequence.cxx --- openoffice.org.orig/ucb/source/ucp/webdav/LinkSequence.cxx 20 Jan 2006 14:19:24 -0000 1.7 +++ openoffice.org/ucb/source/ucp/webdav/LinkSequence.cxx 26 Jan 2006 09:51:37 -0000 @@ -181,7 +181,11 @@ rInData.getStr() + nStart, nEnd - nStart + TOKEN_LENGTH ); +#ifdef NEONTWOFIVE + success = !ne_xml_failed( parser ); +#else success = !!ne_xml_valid( parser ); +#endif ne_xml_destroy( parser ); Index: source/ucp/webdav/LockEntrySequence.cxx =================================================================== RCS file: /cvs/ucb/ucb/source/ucp/webdav/LockEntrySequence.cxx,v retrieving revision 1.7 diff -u -r1.7 LockEntrySequence.cxx --- openoffice.org.orig/ucb/source/ucp/webdav/LockEntrySequence.cxx 20 Jan 2006 14:19:37 -0000 1.7 +++ openoffice.org/ucb/source/ucp/webdav/LockEntrySequence.cxx 26 Jan 2006 09:51:38 -0000 @@ -206,7 +206,11 @@ rInData.getStr() + nStart, nEnd - nStart + TOKEN_LENGTH ); +#ifdef NEONTWOFIVE + success = !ne_xml_failed( parser ); +#else success = !!ne_xml_valid( parser ); +#endif ne_xml_destroy( parser ); Index: source/ucp/webdav/LockSequence.cxx =================================================================== RCS file: /cvs/ucb/ucb/source/ucp/webdav/LockSequence.cxx,v retrieving revision 1.8 diff -u -r1.8 LockSequence.cxx --- openoffice.org.orig/ucb/source/ucp/webdav/LockSequence.cxx 20 Jan 2006 14:19:52 -0000 1.8 +++ openoffice.org/ucb/source/ucp/webdav/LockSequence.cxx 26 Jan 2006 09:51:38 -0000 @@ -339,7 +339,11 @@ rInData.getStr() + nStart, nEnd - nStart + TOKEN_LENGTH ); +#ifdef NEONTWOFIVE + success = !ne_xml_failed( parser ); +#else success = !!ne_xml_valid( parser ); +#endif ne_xml_destroy( parser ); Index: source/ucp/webdav/NeonHeadRequest.cxx =================================================================== RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonHeadRequest.cxx,v retrieving revision 1.3 diff -u -r1.3 NeonHeadRequest.cxx --- openoffice.org.orig/ucb/source/ucp/webdav/NeonHeadRequest.cxx 9 Sep 2005 16:11:23 -0000 1.3 +++ openoffice.org/ucb/source/ucp/webdav/NeonHeadRequest.cxx 26 Jan 2006 09:51:38 -0000 @@ -51,6 +51,58 @@ using namespace webdav_ucp; using namespace com::sun::star; +#ifdef NEONTWOFIVE +static void process_headers(ne_request *req, + DAVResource &rResource, + const std::vector< ::rtl::OUString > &rHeaderNames) +{ + void *cursor = NULL; + const char *name, *value; + + while ((cursor = ne_response_header_iterate(req, cursor, + &name, &value)) != NULL) { + rtl::OUString aHeaderName( rtl::OUString::createFromAscii( name ) ); + rtl::OUString aHeaderValue( rtl::OUString::createFromAscii( value ) ); + + // Note: Empty vector means that all headers are requested. + bool bIncludeIt = ( rHeaderNames.size() == 0 ); + + if ( !bIncludeIt ) + { + // Check whether this header was requested. + std::vector< ::rtl::OUString >::const_iterator it( + rHeaderNames.begin() ); + const std::vector< ::rtl::OUString >::const_iterator end( + rHeaderNames.end() ); + + while ( it != end ) + { + if ( (*it) == aHeaderName ) + break; + + ++it; + } + + if ( it != end ) + bIncludeIt = true; + } + + if ( bIncludeIt ) + { + // Create & set the PropertyValue + beans::PropertyValue thePropertyValue; + thePropertyValue.Handle = -1; + thePropertyValue.Name = aHeaderName; + thePropertyValue.State = beans::PropertyState_DIRECT_VALUE; + + thePropertyValue.Value <<= aHeaderValue; + + // Add the newly created PropertyValue + rResource.properties.push_back( thePropertyValue ); + } + } +} +#else struct NeonHeadRequestContext { DAVResource * pResource; @@ -113,6 +165,7 @@ } } } +#endif // ------------------------------------------------------------------- @@ -137,11 +190,17 @@ inPath, RTL_TEXTENCODING_UTF8 ) ); +#ifndef NEONTWOFIVE NeonHeadRequestContext aCtx( &ioResource, &inHeaderNames ); ne_add_response_header_catcher( req, NHR_ResponseHeaderCatcher, &aCtx ); +#endif nError = ne_request_dispatch( req ); +#ifdef NEONTWOFIVE + process_headers(req, ioResource, inHeaderNames); +#endif + if ( nError == NE_OK && ne_get_status( req )->klass != 2 ) nError = NE_ERROR; Index: source/ucp/webdav/NeonSession.cxx =================================================================== RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonSession.cxx,v retrieving revision 1.37 diff -u -r1.37 NeonSession.cxx --- openoffice.org.orig/ucb/source/ucp/webdav/NeonSession.cxx 20 Jan 2006 14:20:06 -0000 1.37 +++ openoffice.org/ucb/source/ucp/webdav/NeonSession.cxx 26 Jan 2006 09:51:41 -0000 @@ -106,6 +106,10 @@ using namespace com::sun::star; using namespace webdav_ucp; +#ifndef EOL +# define EOL "\r\n" +#endif + // ------------------------------------------------------------------- // RequestData // ------------------------------------------------------------------- @@ -233,9 +237,12 @@ // ResponseBlockReader // A simple Neon response_block_reader for use with an XInputStream // ------------------------------------------------------------------- -extern "C" void NeonSession_ResponseBlockReader( void * inUserData, - const char * inBuf, - size_t inLen ) +#ifdef NEONTWOFIVE +extern "C" int NeonSession_ResponseBlockReader +#else +extern "C" void NeonSession_ResponseBlockReader +#endif + (void * inUserData, const char * inBuf, size_t inLen ) { // neon calls this function with (inLen == 0)... if ( inLen > 0 ) @@ -253,15 +260,21 @@ xInputStream->AddToStream( inBuf, inLen ); } } +#ifdef NEONTWOFIVE + return 0; +#endif } // ------------------------------------------------------------------- // ResponseBlockWriter // A simple Neon response_block_reader for use with an XOutputStream // ------------------------------------------------------------------- -extern "C" void NeonSession_ResponseBlockWriter( void * inUserData, - const char * inBuf, - size_t inLen ) +#ifdef NEONTWOFIVE +extern "C" int NeonSession_ResponseBlockWriter +#else +extern "C" void NeonSession_ResponseBlockWriter +#endif + ( void * inUserData, const char * inBuf, size_t inLen ) { // neon calls this function with (inLen == 0)... if ( inLen > 0 ) @@ -276,6 +289,9 @@ xOutputStream->writeBytes( aSeq ); } } +#ifdef NEONTWOFIVE + return 0; +#endif } // ------------------------------------------------------------------- @@ -1538,6 +1554,23 @@ } */ +#ifdef NEONTWOFIVE +static void run_header_handler(ne_request *req, ne_header_handler handler, void *userdata) +{ + void *cursor = NULL; + const char *name, *value; + + while ((cursor = ne_response_header_iterate(req, cursor, &name, &value)) != NULL) + { + char buffer[8192]; + + ne_snprintf(buffer, sizeof buffer, "%s: %s", name, value); + + handler(userdata, buffer); + } +} +#endif + // ------------------------------------------------------------------- // static int NeonSession::GET( ne_session * sess, @@ -1549,12 +1582,15 @@ //struct get_context ctx; ne_request * req = ne_request_create( sess, "GET", uri ); int ret; - +#ifndef NEONTWOFIVE ne_add_response_header_catcher( req, handler, userdata ); - +#endif ne_add_response_body_reader( req, ne_accept_2xx, reader, userdata ); ret = ne_request_dispatch( req ); +#ifdef NEONTWOFIVE + run_header_handler(req, handler, userdata); +#endif if ( ret == NE_OK && ne_get_status( req )->klass != 2 ) ret = NE_ERROR; Index: source/ucp/webdav/NeonSession.hxx =================================================================== RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonSession.hxx,v retrieving revision 1.23 diff -u -r1.23 NeonSession.hxx --- openoffice.org.orig/ucb/source/ucp/webdav/NeonSession.hxx 18 Oct 2005 08:47:16 -0000 1.23 +++ openoffice.org/ucb/source/ucp/webdav/NeonSession.hxx 26 Jan 2006 09:51:41 -0000 @@ -49,6 +49,10 @@ #include "NeonTypes.hxx" #endif +#ifdef NEONTWOFIVE +typedef void (*ne_header_handler)(void *userdata, const char *value); +#endif + namespace ucbhelper { class ProxyDecider; } namespace webdav_ucp Index: source/ucp/webdav/UCBDeadPropertyValue.cxx =================================================================== RCS file: /cvs/ucb/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx,v retrieving revision 1.8 diff -u -r1.8 UCBDeadPropertyValue.cxx --- openoffice.org.orig/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx 20 Jan 2006 14:20:45 -0000 1.8 +++ openoffice.org/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx 26 Jan 2006 09:51:42 -0000 @@ -394,7 +394,11 @@ ne_xml_parse( parser, rInData.getStr(), rInData.getLength() ); +#ifdef NEONTWOFIVE + success = !ne_xml_failed( parser ); +#else success = !!ne_xml_valid( parser ); +#endif ne_xml_destroy( parser ); Index: source/ucp/webdav/makefile.mk =================================================================== RCS file: /cvs/ucb/ucb/source/ucp/webdav/makefile.mk,v retrieving revision 1.26 diff -u -r1.26 makefile.mk --- openoffice.org.orig/ucb/source/ucp/webdav/makefile.mk 10 Nov 2005 16:43:55 -0000 1.26 +++ openoffice.org/ucb/source/ucp/webdav/makefile.mk 26 Jan 2006 09:51:42 -0000 @@ -59,6 +59,10 @@ .IF "$(SYSTEM_NEON)" == "YES" CFLAGS+= $(NEON_CFLAGS) +TWOFIVE:=$(shell pkg-config --atleast-version=0.25.0 neon && echo YES || echo NO) +.IF "$(TWOFIVE)" == "YES" +CFLAGS+=-DNEONTWOFIVE +.ENDIF .ELSE NEONINCDIR=external$/neon CFLAGS+= -I$(SOLARINCDIR)$/$(NEONINCDIR) Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.610 retrieving revision 1.611 diff -u -r1.610 -r1.611 --- openoffice.org.spec 26 Jan 2006 08:49:35 -0000 1.610 +++ openoffice.org.spec 27 Jan 2006 17:14:03 -0000 1.611 @@ -1,6 +1,6 @@ %define oootag OOA680 %define ooomilestone 1 -%define rh_rpm_release 8 +%define rh_rpm_release 9 %define build_fc5 1 %define build_fc4 0 @@ -215,6 +215,7 @@ Patch50: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch Patch51: openoffice.org-2.0.1-ooo59997.sw.defaultbullets.patch Patch52: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch +Patch53: openoffice.org-2.0.2.ooo61178.ucb.neon25.patch %define instdir %{_libdir}/openoffice.org2.0 @@ -895,6 +896,7 @@ %patch50 -p1 -b .ooo59675.sysui.rtfmimetype.patch %patch51 -p1 -b .ooo59997.sw.defaultbullets.patch %patch52 -p1 -b .ooo19976.framework.nofocussteal.patch +%patch53 -p1 -b .ooo61178.ucb.neon25.patch %if %{includingexternals} #start ludicrous workaround @@ -2943,6 +2945,7 @@ %if %{seperatebase} %files base +%defattr(-,root,root) %{instdir}/help/en/sdatabase.* %{instdir}/program/sbase %dir %{instdir}/share/registry @@ -3374,8 +3377,14 @@ %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu %changelog +* Fri Jan 27 2006 Caolan McNamara - 1:2.0.1.1-9 +- add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for future neon 0.25.X +- missing %defattr(-,root,root) + * Thu Jan 26 2006 Caolan McNamara - 1:2.0.1.1-8 - rh#178971# defer exec mem until bridge code +- add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for future neon 0.25.X +- missing %defattr(-,root,root) * Tue Jan 17 2006 Caolan McNamara - 1:2.0.1.1-7 - rh#177933# add Serbian sr_CS language pack From fedora-cvs-commits at redhat.com Fri Jan 27 17:43:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 12:43:56 -0500 Subject: rpms/gthumb/devel gthumb.spec,1.29,1.30 Message-ID: <200601271743.k0RHhu6H007813@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gthumb/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7717 Modified Files: gthumb.spec Log Message: - drop redhat-menus buildrequires - use make install DESTDIR instead %%makeinstall Index: gthumb.spec =================================================================== RCS file: /cvs/dist/rpms/gthumb/devel/gthumb.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gthumb.spec 5 Jan 2006 04:33:37 -0000 1.29 +++ gthumb.spec 27 Jan 2006 17:43:54 -0000 1.30 @@ -5,12 +5,11 @@ %define desktop_file_utils_version 0.9 %define libgnomeprint_version 2.6.0 %define libgnomeprintui_version 2.6.0 -%define redhat_menus_version 1.9 Summary: Image viewer, editor, organizer Name: gthumb Version: 2.7.2 -Release: 1 +Release: 2 URL: http://gthumb.sourceforge.net Source0: ftp://ftp.gnome.org/pub/GNOME/sources/gthumb/2.4/%{name}-%{version}.tar.bz2 License: GPL @@ -34,7 +33,6 @@ BuildRequires: libtiff-devel Requires: scrollkeeper -Requires: redhat-menus >= %{redhat_menus_version} %description gthumb is an application for viewing, editing, and organizing @@ -52,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL rm -rf $RPM_BUILD_ROOT/var/scrollkeeper @@ -94,6 +92,10 @@ %{_datadir}/pixmaps %changelog +* Fri Jan 27 2006 Ray Strode - 2.7.2-2 +- drop redhat-menus buildrequires +- use make install DESTDIR instead %%makeinstall + * Wed Jan 4 2006 Matthias Clasen - 2.7.2-1 - Update to 2.7.2 - Drop upstreamed patches From fedora-cvs-commits at redhat.com Fri Jan 27 18:24:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 13:24:01 -0500 Subject: rpms/gtk2/devel .cvsignore, 1.43, 1.44 gtk2.spec, 1.111, 1.112 sources, 1.46, 1.47 Message-ID: <200601271824.k0RIO1DH008546@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8519 Modified Files: .cvsignore gtk2.spec sources Log Message: 2.8.11 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- .cvsignore 12 Jan 2006 13:18:52 -0000 1.43 +++ .cvsignore 27 Jan 2006 18:23:58 -0000 1.44 @@ -26,3 +26,4 @@ gtk+-2.8.8.tar.bz2 gtk+-2.8.9.tar.bz2 gtk+-2.8.10.tar.bz2 +gtk+-2.8.11.tar.bz2 Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- gtk2.spec 19 Jan 2006 20:46:01 -0000 1.111 +++ gtk2.spec 27 Jan 2006 18:23:58 -0000 1.112 @@ -10,7 +10,7 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.8.10 +%define base_version 2.8.11 %define bin_version 2.4.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. @@ -261,6 +261,9 @@ %doc tmpdocs/examples %changelog +* Fri Jan 27 2006 Matthias Clasen 2.8.11-1 +- Update to 2.8.11 + * Thu Jan 19 2006 Christopher Aillon 2.8.10-4 - Use Unicode character 2022 for the default invisible character Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/sources,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- sources 12 Jan 2006 13:18:52 -0000 1.46 +++ sources 27 Jan 2006 18:23:58 -0000 1.47 @@ -1,2 +1,2 @@ d8c012f67a8f23fa9aa495fca5331784 update-scripts.tar.gz -c2c0318d4dcd64315486850907b8e78d gtk+-2.8.10.tar.bz2 +921ba85da341e52f0994f8fb569f1c61 gtk+-2.8.11.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 18:29:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 13:29:03 -0500 Subject: rpms/gtk2/devel gtk2.spec,1.112,1.113 Message-ID: <200601271829.k0RIT3wa008730@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8717 Modified Files: gtk2.spec Log Message: Drop upstreamed patch Index: gtk2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- gtk2.spec 27 Jan 2006 18:23:58 -0000 1.112 +++ gtk2.spec 27 Jan 2006 18:29:00 -0000 1.113 @@ -16,7 +16,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X. Name: gtk2 Version: %{base_version} -Release: 4 +Release: 1 License: LGPL Group: System Environment/Libraries Source: gtk+-%{version}.tar.bz2 @@ -26,7 +26,6 @@ Patch0: gtk+-2.4.1-lib64.patch # Backported from 2.10 Patch1: gtk+-2.8.6-inputmethod.patch -Patch2: gtk+-2.8.10-abicheck.patch Patch3: gtk+-2.8.10-set-invisible-char-to-bullet.patch BuildPrereq: atk-devel >= %{atk_version} @@ -90,7 +89,6 @@ %patch0 -p1 -b .lib64 %patch1 -p1 -b .inputmethod -%patch2 -p1 -b .abicheck %patch3 -p1 -b .set-invisible-char-to-bullet for i in config.guess config.sub ; do From fedora-cvs-commits at redhat.com Fri Jan 27 18:51:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 13:51:45 -0500 Subject: rpms/kernel/devel linux-2.6-audit-new-msg-types.patch, NONE, 1.1 kernel-2.6.spec, 1.1878, 1.1879 Message-ID: <200601271851.k0RIpjmY021162@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21147 Modified Files: kernel-2.6.spec Added Files: linux-2.6-audit-new-msg-types.patch Log Message: new audit msg types. linux-2.6-audit-new-msg-types.patch: include/linux/audit.h | 19 +++++++++++++++---- kernel/audit.c | 2 ++ security/selinux/nlmsgtab.c | 6 ++++-- 3 files changed, 21 insertions(+), 6 deletions(-) --- NEW FILE linux-2.6-audit-new-msg-types.patch --- --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -33,11 +33,20 @@ * 1200 - 1299 messages internal to the audit daemon * 1300 - 1399 audit event messages * 1400 - 1499 SE Linux use - * 1500 - 1999 future use - * 2000 is for otherwise unclassified kernel audit messages + * 1500 - 1599 kernel LSPP events + * 1600 - 1699 kernel crypto events + * 1700 - 1999 future kernel use (maybe integrity labels and related events) + * 2000 is for otherwise unclassified kernel audit messages (legacy) + * 2001 - 2099 unused (kernel) + * 2100 - 2199 user space anomaly records + * 2200 - 2299 user space actions taken in response to anomalies + * 2300 - 2399 user space generated LSPP events + * 2400 - 2499 user space crypto events + * 2500 - 2999 future user space (maybe integrity labels and related events) * - * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user - * space. Anything over that is kernel --> user space communication. + * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are + * exclusively user space. 1300-2099 is kernel --> user space + * communication. */ #define AUDIT_GET 1000 /* Get status */ #define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ @@ -54,6 +63,8 @@ #define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages mostly uninteresting to kernel */ #define AUDIT_USER_AVC 1107 /* We filter this differently */ #define AUDIT_LAST_USER_MSG 1199 +#define AUDIT_FIRST_USER_MSG2 2100 /* More user space messages */ +#define AUDIT_LAST_USER_MSG2 2999 #define AUDIT_DAEMON_START 1200 /* Daemon startup record */ #define AUDIT_DAEMON_END 1201 /* Daemon normal stop record */ --- a/kernel/audit.c +++ b/kernel/audit.c @@ -367,6 +367,7 @@ static int audit_netlink_ok(kernel_cap_t break; case AUDIT_USER: case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: + case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2: if (!cap_raised(eff_cap, CAP_AUDIT_WRITE)) err = -EPERM; break; @@ -447,6 +448,7 @@ static int audit_receive_msg(struct sk_b break; case AUDIT_USER: case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: + case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2: if (!audit_enabled && msg_type != AUDIT_USER_AVC) return 0; --- a/security/selinux/nlmsgtab.c +++ b/security/selinux/nlmsgtab.c @@ -145,8 +145,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16 break; case SECCLASS_NETLINK_AUDIT_SOCKET: - if (nlmsg_type >= AUDIT_FIRST_USER_MSG && - nlmsg_type <= AUDIT_LAST_USER_MSG) { + if ((nlmsg_type >= AUDIT_FIRST_USER_MSG && + nlmsg_type <= AUDIT_LAST_USER_MSG) || + (nlmsg_type >= AUDIT_FIRST_USER_MSG2 && + nlmsg_type <= AUDIT_LAST_USER_MSG2)) { *perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY; } else { err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms, Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1878 retrieving revision 1.1879 diff -u -r1.1878 -r1.1879 --- kernel-2.6.spec 27 Jan 2006 04:07:58 -0000 1.1878 +++ kernel-2.6.spec 27 Jan 2006 18:51:42 -0000 1.1879 @@ -352,6 +352,7 @@ Patch1790: linux-2.6-softcursor-persistent-alloc.patch Patch1800: linux-2.6-pwc-powerup-by-default.patch Patch1810: linux-2.6-smsc-ircc2-pnp.patch +Patch1820: linux-2.6-audit-new-msg-types.patch Patch1830: linux-2.6-w1-hush-debug.patch Patch1840: linux-2.6-x86-hp-reboot.patch Patch1850: linux-2.6-mv643xx-compile-fix.patch @@ -837,6 +838,7 @@ %patch1800 -p1 # PNP support for smsc-ircc2 %patch1810 -p1 +%patch1820 -p1 # Silence debug messages in w1 %patch1830 -p1 # Reboot through BIOS on HP laptops. @@ -1369,6 +1371,9 @@ %endif %changelog +* Fti Jan 27 2006 Dave Jones +- New userspace audit message types. + * Thu Jan 26 2006 Dave Jones - Fix building of kdump kernels. - Fix slab corruption in network layer. From fedora-cvs-commits at redhat.com Fri Jan 27 19:12:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 14:12:30 -0500 Subject: rpms/system-config-securitylevel/devel .cvsignore, 1.49, 1.50 sources, 1.61, 1.62 system-config-securitylevel.spec, 1.70, 1.71 Message-ID: <200601271912.k0RJCUMO002646@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/system-config-securitylevel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2591 Modified Files: .cvsignore sources system-config-securitylevel.spec Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/.cvsignore,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- .cvsignore 25 Jan 2006 20:57:55 -0000 1.49 +++ .cvsignore 27 Jan 2006 19:12:26 -0000 1.50 @@ -37,3 +37,4 @@ system-config-securitylevel-1.6.11.tar.bz2 system-config-securitylevel-1.6.12.tar.bz2 system-config-securitylevel-1.6.13.tar.bz2 +system-config-securitylevel-1.6.14.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/sources,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- sources 25 Jan 2006 20:57:55 -0000 1.61 +++ sources 27 Jan 2006 19:12:26 -0000 1.62 @@ -1 +1 @@ -316adb08268ba45237bba3c9f58142f7 system-config-securitylevel-1.6.13.tar.bz2 +65a9b4dc7a374df95e865d91d81d93ef system-config-securitylevel-1.6.14.tar.bz2 Index: system-config-securitylevel.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-securitylevel/devel/system-config-securitylevel.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- system-config-securitylevel.spec 25 Jan 2006 20:57:55 -0000 1.70 +++ system-config-securitylevel.spec 27 Jan 2006 19:12:26 -0000 1.71 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying the system security level Name: system-config-securitylevel -Version: 1.6.13 +Version: 1.6.14 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -96,6 +96,9 @@ /usr/bin/system-config-securitylevel-tui %changelog +* Fri Jan 27 2006 Chris Lumens 1.6.14-1 +- Fix sorting on trusted services list. + * Wed Jan 25 2006 Chris Lumens 1.6.13-1 - Sort trusted services by service name (#178467). - Use a combo box for the other services list instead of just a text entry From fedora-cvs-commits at redhat.com Fri Jan 27 19:19:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 14:19:15 -0500 Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.13, 1.14 Message-ID: <200601271919.k0RJJFJo017948@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17918 Modified Files: xorg-x11-proto-devel.spec Log Message: * Fri Jan 27 2006 Kristian H??gsberg 7.0-2 - Add glproto-texture-from-drawable.patch to add opcodes and tokens for GLX_texture_from_drawable extension. Index: xorg-x11-proto-devel.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- xorg-x11-proto-devel.spec 24 Dec 2005 04:54:48 -0000 1.13 +++ xorg-x11-proto-devel.spec 27 Jan 2006 19:19:13 -0000 1.14 @@ -6,7 +6,7 @@ Summary: X.Org X11 Protocol headers Name: xorg-x11-proto-devel Version: 7.0 -Release: 1 +Release: 2 License: The Open Group License Group: Development/System URL: http://www.x.org @@ -44,6 +44,8 @@ Source29: %{sourceurl}/xproto-7.0.4.tar.bz2 Source30: %{sourceurl}/xproxymanagementprotocol-1.0.2.tar.bz2 +Patch1: glproto-texture-from-drawable.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig @@ -67,6 +69,11 @@ %prep %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 +# Sigh... /me wants %patch to understand -d +pushd glproto-1.4.3 +%patch1 -p0 -b .glproto-texture-from-drawable +popd + %build #ls -al @@ -271,6 +278,10 @@ %{_libdir}/pkgconfig/xproxymngproto.pc %changelog +* Fri Jan 27 2006 Kristian H??gsberg 7.0-2 +- Add glproto-texture-from-drawable.patch to add opcodes and tokens + for GLX_texture_from_drawable extension. + * Fri Dec 23 2005 Mike A. Harris 7.0-1 - Update to damageproto-1.0.3, glproto-1.4.3, xf86driproto-2.0.2 from the X11R7.0 final release. From fedora-cvs-commits at redhat.com Fri Jan 27 19:36:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 14:36:17 -0500 Subject: rpms/firstboot/devel .cvsignore, 1.44, 1.45 firstboot.spec, 1.63, 1.64 sources, 1.60, 1.61 Message-ID: <200601271936.k0RJaHZQ023443@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/firstboot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23346 Modified Files: .cvsignore firstboot.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/.cvsignore,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- .cvsignore 25 Jan 2006 22:48:01 -0000 1.44 +++ .cvsignore 27 Jan 2006 19:36:14 -0000 1.45 @@ -16,3 +16,4 @@ firstboot-1.3.57.tar.bz2 firstboot-1.4.0.tar.bz2 firstboot-1.4.1.tar.bz2 +firstboot-1.4.2.tar.bz2 Index: firstboot.spec =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/firstboot.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- firstboot.spec 25 Jan 2006 22:48:01 -0000 1.63 +++ firstboot.spec 27 Jan 2006 19:36:14 -0000 1.64 @@ -1,6 +1,6 @@ Summary: Initial system configuration utility Name: firstboot -Version: 1.4.1 +Version: 1.4.2 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -110,6 +110,10 @@ %changelog +* Fri Jan 27 2006 Chris Lumens 1.4.2-1 +- Layout cleanups and simplification. +- Use GTK styles to display the new artwork in non-debug mode. + * Wed Jan 25 2006 Chris Lumens 1.4.1-1 - Fix debug mode. - Use the new bubbly artwork (#178106). Index: sources =================================================================== RCS file: /cvs/dist/rpms/firstboot/devel/sources,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- sources 25 Jan 2006 22:48:01 -0000 1.60 +++ sources 27 Jan 2006 19:36:14 -0000 1.61 @@ -1,2 +1 @@ -3a10d6fb3f696274586e20942fa4c272 firstboot-1.4.0.tar.bz2 -92eedb85d83fe3093b96681da1c777c3 firstboot-1.4.1.tar.bz2 +89721b1abb09412819c2355ab98e34be firstboot-1.4.2.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 19:36:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 14:36:20 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1879,1.1880 Message-ID: <200601271936.k0RJaKOn023466@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23333 Modified Files: kernel-2.6.spec Log Message: krenel hakcers cna't spel Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1879 retrieving revision 1.1880 diff -u -r1.1879 -r1.1880 --- kernel-2.6.spec 27 Jan 2006 18:51:42 -0000 1.1879 +++ kernel-2.6.spec 27 Jan 2006 19:36:15 -0000 1.1880 @@ -1371,7 +1371,7 @@ %endif %changelog -* Fti Jan 27 2006 Dave Jones +* Fri Jan 27 2006 Dave Jones - New userspace audit message types. * Thu Jan 26 2006 Dave Jones From fedora-cvs-commits at redhat.com Fri Jan 27 19:36:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 14:36:29 -0500 Subject: rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.14, 1.15 Message-ID: <200601271936.k0RJaR7J023517@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23484 Modified Files: xorg-x11-proto-devel.spec Log Message: Disable glproto-texture-from-drawable.patch for now. Index: xorg-x11-proto-devel.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xorg-x11-proto-devel.spec 27 Jan 2006 19:19:13 -0000 1.14 +++ xorg-x11-proto-devel.spec 27 Jan 2006 19:36:23 -0000 1.15 @@ -70,9 +70,9 @@ %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 # Sigh... /me wants %patch to understand -d -pushd glproto-1.4.3 -%patch1 -p0 -b .glproto-texture-from-drawable -popd +# pushd glproto-1.4.3 +# %patch1 -p0 -b .glproto-texture-from-drawable +# popd %build #ls -al From fedora-cvs-commits at redhat.com Fri Jan 27 20:13:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 15:13:01 -0500 Subject: rpms/mesa/devel mesa-6.4.1-texture-from-drawable.patch,1.2,1.3 Message-ID: <200601272013.k0RKD1Ab015885@cvs.devel.redhat.com> Author: krh Update of /cvs/dist/rpms/mesa/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15847 Modified Files: mesa-6.4.1-texture-from-drawable.patch Log Message: Add missing GLX_FRONT_LEFT_EXT token. mesa-6.4.1-texture-from-drawable.patch: include/GL/glxext.h | 17 ++++++++ src/glx/x11/glxcmds.c | 85 ++++++++++++++++++++++++++++++++++++++++++++ src/glx/x11/glxextensions.c | 1 src/glx/x11/glxextensions.h | 1 4 files changed, 104 insertions(+) Index: mesa-6.4.1-texture-from-drawable.patch =================================================================== RCS file: /cvs/dist/rpms/mesa/devel/mesa-6.4.1-texture-from-drawable.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mesa-6.4.1-texture-from-drawable.patch 17 Jan 2006 23:12:37 -0000 1.2 +++ mesa-6.4.1-texture-from-drawable.patch 27 Jan 2006 20:12:57 -0000 1.3 @@ -5,6 +5,17 @@ diff -u -p -r1.12 glxext.h --- include/GL/glxext.h 15 Aug 2005 23:25:33 -0000 1.12 +++ include/GL/glxext.h 17 Jan 2006 21:55:38 -0000 +@@ -177,6 +177,10 @@ extern "C" { + #define GLX_SCREEN_EXT 0x800C + #endif + ++#ifndef GLX_EXT_texture_from_drawable ++#define GLX_FRONT_LEFT_EXT 0x6005 ++#endif ++ + #ifndef GLX_SGIX_fbconfig + #define GLX_WINDOW_BIT_SGIX 0x00000001 + #define GLX_PIXMAP_BIT_SGIX 0x00000002 @@ -481,6 +485,19 @@ typedef GLXContext ( * PFNGLXIMPORTCONTE typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context); #endif @@ -63,7 +74,7 @@ + GetReqExtra(GLXVendorPrivate, sizeof(GLXDrawable)+sizeof(int),req); + req->reqType = opcode; + req->glxCode = X_GLXVendorPrivate; -+ req->vendorCode = X_GLXvop_BindTexImageMESA; ++ req->vendorCode = X_GLXvop_BindTexImageEXT; + req->contextTag = gc->currentContextTag; + + drawable_ptr = (CARD32 *) (req + 1); @@ -104,7 +115,7 @@ + GetReqExtra(GLXVendorPrivate, sizeof(GLXDrawable)+sizeof(int),req); + req->reqType = opcode; + req->glxCode = X_GLXVendorPrivate; -+ req->vendorCode = X_GLXvop_ReleaseTexImageMESA; ++ req->vendorCode = X_GLXvop_ReleaseTexImageEXT; + req->contextTag = gc->currentContextTag; + + drawable_ptr = (CARD32 *) (req + 1); From fedora-cvs-commits at redhat.com Fri Jan 27 20:44:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 15:44:34 -0500 Subject: rpms/kernel/devel linux-2.6-suspend-memhotplug-oops.patch, NONE, 1.1 kernel-2.6.spec, 1.1880, 1.1881 Message-ID: <200601272044.k0RKiYd5028114@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28096 Modified Files: kernel-2.6.spec Added Files: linux-2.6-suspend-memhotplug-oops.patch Log Message: Fix software suspend on kernels without memory hotplug. (#178339) linux-2.6-suspend-memhotplug-oops.patch: page_alloc.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-suspend-memhotplug-oops.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178339 pageset_cpuup_callback() is marked __meminit, but software suspend needs it. Unfortunatly, if you don't have CONFIG_MEMORY_HOTPLUG set, the __meminit translates to __init, resulting in this... Freezing cpus ... int3: 0000 [1] SMP last sysfs file: /power/state CPU 0 Modules linked in: radeon drm ipv6 ppdev autofs4 rfcomm l2cap sunrpc ip_conntrack_netbios_ns ipt_REJECT xt_state ip_conntrack nfnetlink xt_tcpudp iptable_filter ip_tables x_tables video battery ac lp parport_pc parport nvram hci_usb bluetooth ehci_hcd ohci1394 ieee1394 uhci_hcd snd_hda_intel saa7134 snd_hda_codec video_buf snd_seq_dummy compat_ioctl32 v4l2_common v4l1_compat snd_seq_oss snd_seq_midi_event ir_kbd_i2c snd_seq e100 snd_seq_device ir_common snd_pcm_oss snd_mixer_oss mii videodev snd_pcm snd_timer snd i2c_i801 hw_random soundcore i2c_core snd_page_alloc dm_snapshot dm_zero dm_mirror dm_mod ext3 jbd ahci libata sd_mod scsi_mod Pid: 3373, comm: pm-suspend Not tainted 2.6.15-1.1872_FC5 #1 RIP: 0010:[] {pageset_cpuup_callback+1} RSP: 0018:ffff81002802fdb0 EFLAGS: 00000286 RAX: 0000000000000001 RBX: ffffffff803c8560 RCX: 0000000000000001 RDX: 0000000000000001 RSI: 0000000000000005 RDI: ffffffff803c8560 RBP: 0000000000000001 R08: ffffffff8053cae8 R09: 0000000000000004 R10: 0000000000000002 R11: 0000000000000004 R12: 0000000000000005 R13: 0000000000000003 R14: 0000000000000003 R15: ffff81002802ff50 FS: 00002aee15c8cd30(0000) GS:ffffffff8051a000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 00002aee19023000 CR3: 00000000292a1000 CR4: 00000000000006e0 Process pm-suspend (pid: 3373, threadinfo ffff81002802e000, task +ffff810026b38040) Stack: ffffffff80341296 0000000000000001 0000000000000001 0000000000000003 ffffffff8014b803 ffff81002802fe38 ffffffff80146641 0000000000000296 0000000000000296 0000000000000000 Call Trace: {notifier_call_chain+28} {cpu_down+96} {remove_wait_queue+17} {vt_waitactive+150} {disable_nonboot_cpus+82} {enter_state+161} {state_store+113} {sysfs_write_file+201} +{vfs_write+206} {sys_write+69} {system_call+126} Code: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc Signed-off-by: Dave Jones --- linux-2.6.15.noarch/mm/page_alloc.c~ 2006-01-27 15:40:35.000000000 -0500 +++ linux-2.6.15.noarch/mm/page_alloc.c 2006-01-27 15:40:40.000000000 -0500 @@ -1939,7 +1939,7 @@ static inline void free_zone_pagesets(in } } -static int __meminit pageset_cpuup_callback(struct notifier_block *nfb, +static int pageset_cpuup_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1880 retrieving revision 1.1881 diff -u -r1.1880 -r1.1881 --- kernel-2.6.spec 27 Jan 2006 19:36:15 -0000 1.1880 +++ kernel-2.6.spec 27 Jan 2006 20:44:32 -0000 1.1881 @@ -358,6 +358,7 @@ Patch1850: linux-2.6-mv643xx-compile-fix.patch Patch1860: linux-2.6-net-fix-iptables.patch Patch1870: linux-2.6-net-slab-corruption.patch +Patch1880: linux-2.6-suspend-memhotplug-oops.patch # Warn about usage of various obsolete functionality that may go away. Patch1900: linux-2.6-obsolete-idescsi-warning.patch @@ -849,6 +850,8 @@ %patch1860 -p1 # Fix netlayer slab corruption %patch1870 -p1 +# Fix software suspend on kernels without memory hotplug. +%patch1880 -p1 # Warn about obsolete functionality usage. %patch1900 -p1 @@ -1373,6 +1376,7 @@ %changelog * Fri Jan 27 2006 Dave Jones - New userspace audit message types. +- Fix software suspend on kernels without memory hotplug. (#178339) * Thu Jan 26 2006 Dave Jones - Fix building of kdump kernels. From fedora-cvs-commits at redhat.com Fri Jan 27 21:10:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 16:10:48 -0500 Subject: rpms/frysk/FC-4 antlr.patch,1.1,1.2 frysk.spec,1.1,1.2 Message-ID: <200601272110.k0RLAmaq020897@cvs.devel.redhat.com> Author: cagney Update of /cvs/dist/rpms/frysk/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv20680 Modified Files: antlr.patch frysk.spec Log Message: * Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.6 - Add the macros build_glib2, build_glib_java, build_fontconfig, build_atk, build_cairo, build_cairo_java, build_pango, build_gtk2, build_libgtk_java, build_libglade2, build_libglade_java, build_libvte_java, and build_jdom. Wrap corresponding build code. * Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.5 - Update antlr.patch, update includes Wu Zhou's basename fix, and up-to-date config.guess and config.sub. * Thu Jan 26 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.4 - From Diego Novello : Add libglade-java-20060125-fix-64bit-miscompilation.patch. * Thu Jan 26 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.3 - From Wu Zhou : Add -m64 to ppc64 CC et.al. * Mon Jan 23 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.2 - In -files, only list frysk.desktop and fryskTrayIcon48.png when build_frysk. - Define all install paths in terms of macros. antlr.patch: .cvsignore | 1 ChangeLog | 40 + Makefile.in | 22 - antlr/Makefile.in | 7 configure | 28 - configure.in | 28 - scripts/config.guess | 1120 +++++++++++++++++++++++++++------------------------ scripts/config.sub | 498 ++++++++++++++++------ scripts/cpp.sh.in | 4 scripts/cxx.sh.in | 4 scripts/jar.sh.in | 4 scripts/javac.sh.in | 4 scripts/lib.sh.in | 6 scripts/link.sh.in | 4 14 files changed, 1079 insertions(+), 691 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 antlr.patch Index: antlr.patch =================================================================== RCS file: /cvs/dist/rpms/frysk/FC-4/antlr.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- antlr.patch 24 Jan 2006 00:33:58 -0000 1.1 +++ antlr.patch 27 Jan 2006 21:10:44 -0000 1.2 @@ -1,14 +1,28 @@ Index: frysk-imports/antlr/.cvsignore diff -u /dev/null frysk-imports/antlr/.cvsignore:1.1 ---- /dev/null Mon Jan 23 17:26:35 2006 +--- /dev/null Mon Jan 23 17:26:35 2006 +++ frysk-imports/antlr/.cvsignore Sat Nov 26 14:17:25 2005 @@ -0,0 +1 @@ +autom4te.cache Index: frysk-imports/antlr/ChangeLog -diff -u /dev/null frysk-imports/antlr/ChangeLog:1.5 ---- /dev/null Mon Jan 23 17:26:35 2006 -+++ frysk-imports/antlr/ChangeLog Tue Nov 29 02:40:39 2005 -@@ -0,0 +1,26 @@ +diff -u /dev/null frysk-imports/antlr/ChangeLog:1.7 +--- /dev/null Mon Jan 23 17:26:35 2006 ++++ frysk-imports/antlr/ChangeLog Fri Jan 27 04:46:36 2006 +@@ -0,0 +1,40 @@ ++2006-01-26 Andrew Cagney ++ ++ Fix from Wu Zhou : ++ * configure.in: Correctly quote basename applied to commands. ++ * scripts/cpp.sh.in: Ditto. ++ * scripts/cxx.sh.in: Ditto. ++ * scripts/jar.sh.in: Ditto. ++ * scripts/javac.sh.in: Ditto. ++ * scripts/lib.sh.in: Ditto. ++ * scripts/link.sh.in: Ditto. ++ * configure: Re-generate. ++ ++ * scripts/config.sub, scripts/config.guess: Import 2006-01-02. ++ +2005-11-28 Andrew Cagney + + * scripts/javac.sh.in: Accept gcj4. @@ -76,9 +90,9 @@ install :: echo "installation done" Index: frysk-imports/antlr/configure -diff -u frysk-imports/antlr/configure:1.1.1.1 frysk-imports/antlr/configure:1.3 +diff -u frysk-imports/antlr/configure:1.1.1.1 frysk-imports/antlr/configure:1.4 --- frysk-imports/antlr/configure:1.1.1.1 Fri Nov 25 22:29:25 2005 -+++ frysk-imports/antlr/configure Tue Nov 29 02:27:24 2005 ++++ frysk-imports/antlr/configure Fri Jan 27 04:46:36 2006 @@ -2320,7 +2320,7 @@ case $LANG_JAVA in 1) @@ -106,6 +120,15 @@ if test "x${JAR}" != "x" ; then ax_arg_list="${JAR}" fi +@@ -2575,7 +2575,7 @@ + + case $LANG_JAVA in + 1) +- jar="`basename $JAR`" ++ jar=`basename "$JAR"` + jar="`echo ${jar}|sed 's,\..*$,,'`" + + ## This macro tries to determine which javac compiler is @@ -2798,9 +2798,9 @@ ## of course GNU. If there's a GNU compiler around we prefer ## GNU. This avoids also a problem with vendors having CC @@ -118,10 +141,47 @@ ;; esac +@@ -3891,7 +3891,7 @@ + if test "x$GXX" = xyes; then + cxx="gcc" + else +- cxx=`basename $CXX` ++ cxx=`basename "$CXX"` + cxx=`echo ${cxx}|sed 's,\.[^.]*$,,'` + fi + +@@ -5999,8 +5999,8 @@ + ## get the basename of C# compiler. Depending on basename we try to + ## decide about the CLR. + test -n "${CSHARPC}" && { +- csharpc=`basename ${CSHARPC}` +- csharpc_d=`dirname ${CSHARPC}` ++ csharpc=`basename "${CSHARPC}"` ++ csharpc_d=`dirname "${CSHARPC}"` + } + + case $csharpc in +@@ -6490,11 +6490,11 @@ + esac + + ## compute basename of core libraries +-antlr_jar=`basename ${ANTLR_JAR}` +-antlr_net=`basename ${ANTLR_NET}` +-antlr_lib=`basename ${ANTLR_LIB}` +-antlr_py=`basename ${ANTLR_PY}` +-astframe_net=`basename ${ASTFRAME_NET}` ++antlr_jar=`basename "${ANTLR_JAR}"` ++antlr_net=`basename "${ANTLR_NET}"` ++antlr_lib=`basename "${ANTLR_LIB}"` ++antlr_py=`basename "${ANTLR_PY}"` ++astframe_net=`basename "${ASTFRAME_NET}"` + + test -z "${JAVA}" && { + JAVA=java Index: frysk-imports/antlr/configure.in -diff -u frysk-imports/antlr/configure.in:1.1.1.1 frysk-imports/antlr/configure.in:1.3 +diff -u frysk-imports/antlr/configure.in:1.1.1.1 frysk-imports/antlr/configure.in:1.4 --- frysk-imports/antlr/configure.in:1.1.1.1 Fri Nov 25 22:29:25 2005 -+++ frysk-imports/antlr/configure.in Tue Nov 29 02:27:24 2005 ++++ frysk-imports/antlr/configure.in Fri Jan 27 04:46:36 2006 @@ -493,17 +493,17 @@ AX_JAVA_PROGS( @@ -143,6 +203,15 @@ [ AX_VAR_HEAD([JAR]) ] +@@ -511,7 +511,7 @@ + + case $LANG_JAVA in + 1) +- jar="`basename $JAR`" ++ jar=`basename "$JAR"` + jar="`echo ${jar}|sed 's,\..*$,,'`" + + ## This macro tries to determine which javac compiler is @@ -644,9 +644,9 @@ ## of course GNU. If there's a GNU compiler around we prefer ## GNU. This avoids also a problem with vendors having CC @@ -155,6 +224,43 @@ ;; esac +@@ -671,7 +671,7 @@ + if test "x$GXX" = xyes; then + cxx="gcc" + else +- cxx=`basename $CXX` ++ cxx=`basename "$CXX"` + cxx=`echo ${cxx}|sed 's,\.@<:@^.@:>@*$,,'` + fi + +@@ -910,8 +910,8 @@ + ## get the basename of C# compiler. Depending on basename we try to + ## decide about the CLR. + test -n "${CSHARPC}" && { +- csharpc=`basename ${CSHARPC}` +- csharpc_d=`dirname ${CSHARPC}` ++ csharpc=`basename "${CSHARPC}"` ++ csharpc_d=`dirname "${CSHARPC}"` + } + + case $csharpc in +@@ -1169,11 +1169,11 @@ + esac + + ## compute basename of core libraries +-antlr_jar=`basename ${ANTLR_JAR}` +-antlr_net=`basename ${ANTLR_NET}` +-antlr_lib=`basename ${ANTLR_LIB}` +-antlr_py=`basename ${ANTLR_PY}` +-astframe_net=`basename ${ASTFRAME_NET}` ++antlr_jar=`basename "${ANTLR_JAR}"` ++antlr_net=`basename "${ANTLR_NET}"` ++antlr_lib=`basename "${ANTLR_LIB}"` ++antlr_py=`basename "${ANTLR_PY}"` ++astframe_net=`basename "${ASTFRAME_NET}"` + + test -z "${JAVA}" && { + JAVA=java Index: frysk-imports/antlr/antlr/Makefile.in diff -u frysk-imports/antlr/antlr/Makefile.in:1.1.1.1 frysk-imports/antlr/antlr/Makefile.in:1.2 --- frysk-imports/antlr/antlr/Makefile.in:1.1.1.1 Fri Nov 25 22:29:28 2005 @@ -173,10 +279,2709 @@ ## rule how to compile java files @ANTLR_JAR@ :: $(antlr_java_FILES) +Index: frysk-imports/antlr/scripts/config.guess +diff -u frysk-imports/antlr/scripts/config.guess:1.1.1.1 frysk-imports/antlr/scripts/config.guess:1.2 +--- frysk-imports/antlr/scripts/config.guess:1.1.1.1 Fri Nov 25 22:29:26 2005 ++++ frysk-imports/antlr/scripts/config.guess Fri Jan 27 03:21:35 2006 +@@ -1,9 +1,9 @@ + #! /bin/sh + # Attempt to guess a canonical system name. +-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +-# Free Software Foundation, Inc. ++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + +-timestamp='2001-04-20' ++timestamp='2006-01-02' + + # This file is free software; you can redistribute it and/or modify it [...2533 lines suppressed...] ++ ;; ++ # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; +- pdp11-*) ++ pdp11-*) + os=-none + ;; + *-dec | vax-*) +@@ -1184,6 +1410,9 @@ + mips*-*) + os=-elf + ;; ++ or32-*) ++ os=-coff ++ ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; +@@ -1193,9 +1422,15 @@ + *-be) + os=-beos + ;; ++ *-haiku) ++ os=-haiku ++ ;; + *-ibm) + os=-aix + ;; ++ *-knuth) ++ os=-mmixware ++ ;; + *-wec) + os=-proelf + ;; +@@ -1247,19 +1482,19 @@ + *-next) + os=-nextstep3 + ;; +- *-gould) ++ *-gould) + os=-sysv + ;; +- *-highlevel) ++ *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; +- *-sgi) ++ *-sgi) + os=-irix + ;; +- *-siemens) ++ *-siemens) + os=-sysv4 + ;; + *-masscomp) +@@ -1328,10 +1563,16 @@ + -mvs* | -opened*) + vendor=ibm + ;; ++ -os400*) ++ vendor=ibm ++ ;; + -ptx*) + vendor=sequent + ;; +- -vxsim* | -vxworks*) ++ -tpf*) ++ vendor=ibm ++ ;; ++ -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) +@@ -1346,13 +1587,16 @@ + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; ++ -vos*) ++ vendor=stratus ++ ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; + esac + + echo $basic_machine$os +-exit 0 ++exit + + # Local variables: + # eval: (add-hook 'write-file-hooks 'time-stamp) +Index: frysk-imports/antlr/scripts/cpp.sh.in +diff -u frysk-imports/antlr/scripts/cpp.sh.in:1.1.1.1 frysk-imports/antlr/scripts/cpp.sh.in:1.2 +--- frysk-imports/antlr/scripts/cpp.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005 ++++ frysk-imports/antlr/scripts/cpp.sh.in Fri Jan 27 04:46:36 2006 +@@ -16,8 +16,8 @@ + CXX="@CXX@" + cxx="@cxx@" + else +- cxx="`basename $CXX`" +- cxx="`echo $cxx|sed 's,\..*$,,'`" ++ cxx=`basename "$CXX"` ++ cxx=`echo $cxx|sed 's,\..*$,,'` + fi + + ## use whitespace to separate dirs, don't use compiler specific +Index: frysk-imports/antlr/scripts/cxx.sh.in +diff -u frysk-imports/antlr/scripts/cxx.sh.in:1.1.1.1 frysk-imports/antlr/scripts/cxx.sh.in:1.2 +--- frysk-imports/antlr/scripts/cxx.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005 ++++ frysk-imports/antlr/scripts/cxx.sh.in Fri Jan 27 04:46:36 2006 +@@ -16,8 +16,8 @@ + CXX="@CXX@" + cxx="@cxx@" + else +- cxx="`basename $CXX`" +- cxx="`echo $cxx|sed 's,\..*$,,'`" ++ cxx=`basename "$CXX"` ++ cxx=`echo $cxx|sed 's,\..*$,,'` + fi + + ## use whitespace to separate dirs, don't use compiler specific +Index: frysk-imports/antlr/scripts/jar.sh.in +diff -u frysk-imports/antlr/scripts/jar.sh.in:1.1.1.1 frysk-imports/antlr/scripts/jar.sh.in:1.2 +--- frysk-imports/antlr/scripts/jar.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005 ++++ frysk-imports/antlr/scripts/jar.sh.in Fri Jan 27 04:46:36 2006 +@@ -32,8 +32,8 @@ + JAR="@JAR@" + jar="@jar@" + else +- jar="`basename $JAR`" +- jar="`echo $jar|sed 's,\..*$,,'`" ++ jar=`basename "$JAR"` ++ jar=`echo $jar|sed 's,\..*$,,'` + fi + + test -z "${DEBUG}" && { Index: frysk-imports/antlr/scripts/javac.sh.in -diff -u frysk-imports/antlr/scripts/javac.sh.in:1.1.1.1 frysk-imports/antlr/scripts/javac.sh.in:1.2 +diff -u frysk-imports/antlr/scripts/javac.sh.in:1.1.1.1 frysk-imports/antlr/scripts/javac.sh.in:1.3 --- frysk-imports/antlr/scripts/javac.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005 -+++ frysk-imports/antlr/scripts/javac.sh.in Tue Nov 29 02:40:39 2005 ++++ frysk-imports/antlr/scripts/javac.sh.in Fri Jan 27 04:46:36 2006 +@@ -71,7 +71,7 @@ + JAVAC="@JAVAC@" + javac="@javac@" + else +- javac=`basename $JAVAC` ++ javac=`basename "$JAVAC"` + javac=`echo $javac|sed 's,\..*$,,'` + fi + @@ -100,7 +100,7 @@ javacflags="${javacflags} -sourcepath ${srcdir}" javacflags="${javacflags} -classpath ${classpath}" @@ -186,3 +2991,40 @@ javacflags="-d ." javacflags="${javacflags} -I${srcdir} -C" javacflags="${javacflags} -classpath ${classpath}" +Index: frysk-imports/antlr/scripts/lib.sh.in +diff -u frysk-imports/antlr/scripts/lib.sh.in:1.1.1.1 frysk-imports/antlr/scripts/lib.sh.in:1.2 +--- frysk-imports/antlr/scripts/lib.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005 ++++ frysk-imports/antlr/scripts/lib.sh.in Fri Jan 27 04:46:36 2006 +@@ -14,8 +14,8 @@ + AR="@AR@" + ar="@ar@" + else +- ar="`basename $AR`" +- ar="`echo $ar|sed 's,\..*$,,'`" ++ ar=`basename "$AR"` ++ ar=`echo $ar|sed 's,\..*$,,'` + fi + + test -z "${DEBUG}" && { +@@ -273,4 +273,4 @@ + } + } + +-exit 0 +\ No newline at end of file ++exit 0 +Index: frysk-imports/antlr/scripts/link.sh.in +diff -u frysk-imports/antlr/scripts/link.sh.in:1.1.1.1 frysk-imports/antlr/scripts/link.sh.in:1.2 +--- frysk-imports/antlr/scripts/link.sh.in:1.1.1.1 Fri Nov 25 22:29:26 2005 ++++ frysk-imports/antlr/scripts/link.sh.in Fri Jan 27 04:46:36 2006 +@@ -57,8 +57,8 @@ + LD="@CXX@" + ld="@cxx@" + else +- ld="`basename $LD`" +- ld="`echo $ld|sed 's,\..*$,,'`" ++ ld=`basename "$LD"` ++ ld=`echo $ld|sed 's,\..*$,,'` + fi + + ##xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx## Index: frysk.spec =================================================================== RCS file: /cvs/dist/rpms/frysk/FC-4/frysk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- frysk.spec 24 Jan 2006 00:33:58 -0000 1.1 +++ frysk.spec 27 Jan 2006 21:10:44 -0000 1.2 @@ -8,7 +8,20 @@ # Sometimes just the libraries are wanted; sometimes not everything # builds. Provide fine grained control. -%define build_antlr 1 +%define build_glib2 1 +%define build_glib_java 1 +%define build_fontconfig 1 +%define build_atk 1 +%define build_cairo 1 +%define build_cairo_java 1 +%define build_pango 1 +%define build_gtk2 1 +%define build_libgtk_java 1 +%define build_libglade2 1 +%define build_libglade_java 1 +%define build_libvte_java 1 +%define build_antlr 1 +%define build_jdom 1 %define build_frysk 0 #---- cairo/fontconfig/pango defines @@ -24,7 +37,7 @@ Summary: Frysk execution analysis tool Name: frysk Version: 0.0.1.2006.01.22 -Release: 0.FC4.1.1 +Release: 0.FC4.6 License: GPL + EXPLICIT EXCEPTION Group: Development/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -107,6 +120,8 @@ %define libglade_java_version 2.12.1 %define libglade_java libglade-java-%{libglade_java_version} Source1200: %{libglade_java}.tar.gz +# frysk local: frysk-2213: fix 64-bit miscompile. +Patch1290: libglade-java-20060125-fix-64bit-miscompilation.patch # frysk local: frysk-2022: allow overriding of datadir (containing .jars) Patch1299: libglade-java-pkg-dir.patch @@ -255,6 +270,7 @@ # autoconf %setup -n %{libglade_java} -q -T -b1200 +%patch1290 -p0 -b .fix-64bit-miscompilation %patch1299 -p1 -b .pkg-dir aclocal -I ../%{glib_java}/macros -I ../%{libgtk_java}/macros autoconf @@ -269,10 +285,6 @@ %setup -n %{antlr} -q -T -b100 %patch101 -p2 -# frysk local: Antlr's config.* is really really old. -for i in $(find . -name config.guess -o -name config.sub) ; do - [ -f /usr/lib/rpm/redhat/$(basename $i) ] && %{__rm} -f $i && %{__cp} -fv /usr/lib/rpm/redhat/$(basename $i) $i -done %setup -n %{jdom} -q -T -b1600 %patch1690 -p0 @@ -347,7 +359,7 @@ local p=%{frysk_gcc_prefix} local s=%{frysk_gcc_suffix} %ifarch ppc64 - local c=" -mminimal-toc" + local c=" -mminimal-toc -m64" %else local c="" %endif @@ -509,6 +521,8 @@ #-------------glib2---------------------------------------- +%if %{build_glib2} + %define glib2_builddir %{BUILDDIR}/%{glib2} CONFIG %{glib2} \ @@ -527,8 +541,12 @@ %define lib_gthread %{glib2_builddir}/gthread/libgthread-2.0.la %define lib_glib %{glib2_builddir}/glib/libglib-2.0.la +%endif + #------------glib-java------------------------------------- +%if %{build_glib_java} + %define glib_java_builddir %{BUILDDIR}/%{glib_java} %define glib_java_makeflags "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" @@ -557,8 +575,12 @@ %define lib_glibjava %{glib_java_builddir}/libglibjava.la %define lib_glibjni %{glib_java_builddir}/libglibjni.la +%endif + #-------------fontconfig----------------------------------- +%if %{build_fontconfig} + %define fontconfig_builddir %{BUILDDIR}/%{fontconfig} # Work around weird elinks bug where elinks refuses to open the @@ -582,8 +604,12 @@ %define lib_fontconfig %{fontconfig_builddir}/src/libfontconfig.la +%endif + #------------atk------------------------------------------- +%if %{build_atk} + %define atk_makeflags "DEP_CFLAGS = %{GLIB_CFLAGS}" "DEP_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_glib}" %define atk_builddir %{BUILDDIR}/%{atk} @@ -598,8 +624,12 @@ %define ATK_CFLAGS -I$RPM_BUILD_ROOT/%{__frysk_includedir}/atk-1.0 %define lib_atk %{atk_builddir}/atk/libatk-1.0.la +%endif + #------------cairo----------------------------------------- +%if %{build_cairo} + %define cairo_builddir %{BUILDDIR}/%{cairo} CONFIG %{cairo} \ @@ -619,8 +649,12 @@ %define lib_cairo %{cairo_builddir}/src/libcairo.la +%endif + #------------cairo-java------------------------------------ +%if %{build_cairo_java} + %define cairo_java_builddir %{BUILDDIR}/%{cairo_java} %define cairo_java_makeflags "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "%{cairo_cflags}" "CAIRO_LIBS = %{lib_cairo}" "%{jgjava_cflags}" "JGJAVA_LIBS = %{lib_glibjava}" "JGJNI_LIBS = %{lib_glibjni}" "%{jgjar}" @@ -639,8 +673,12 @@ %define lib_cairojava %{cairo_java_builddir}/libcairojava.la +%endif + #------------pango----------------------------------------- +%if %{build_pango} + %define pango_makeflags "%{glib_cflags}" "%{cairo_cflags}" "FONTCONFIG_LIBS = %{lib_fontconfig}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "CAIRO_LIBS = %{lib_cairo}" "XFT_CFLAGS = -I$RPM_BUILD_ROOT/%{__frysk_includedir} -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config" "XFT_LIBS = -L/usr/X11R6/%{_lib} -lXft -lX11 -lfreetype -lXrender %{lib_fontconfig}" %define pango_builddir %{BUILDDIR}/%{pango} @@ -662,8 +700,12 @@ %define lib_pangox %{pango_builddir}/pango/libpangox-1.0.la %define lib_pangoxft %{pango_builddir}/pango/libpangoxft-1.0.la +%endif + #------------gtk2------------------------------------------ +%if %{build_gtk2} + %define gtk2_makeflags "GDK_PIXBUF_DEP_CFLAGS = %{GLIB_CFLAGS} -I/usr/include/libpng12" "GDK_PIXBUF_DEP_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "GDK_DEP_CFLAGS = -DXTHREADS -D_REENTRANT -DXUSE_MTSAFE_API %{GLIB_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS}" "GDK_DEP_LIBS = -L/usr/X11R6/%{_lib} -lXrandr -lXrender -lXi -lXinerama -lXext -lX11 %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib} %{lib_fontconfig} -ldl -lXcursor -lXrender -lXext -lXfixes -lX11 -lm" "GTK_DEP_CFLAGS = %{GLIB_CFLAGS} %{PANGO_CFLAGS} %{CAIRO_CFLAGS} %{ATK_CFLAGS}" "GTK_DEP_LIBS = -L/usr/X11R6/%{_lib} -lX11 %{lib_pangocairo} %{lib_pango} %{lib_atk} %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib} %{lib_cairo} -ldl -lm" "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "%{cairo_cflags}" "GDK_PIXBUF_XLIB_DEP_CFLAGS = %{GLIB_CFLAGS} -I/usr/X11R6/include" %define gtk2_builddir %{BUILDDIR}/%{gtk2} @@ -693,8 +735,12 @@ %define lib_gdk_pixbuf %{gtk2_builddir}/gdk-pixbuf/libgdk_pixbuf-2.0.la %define lib_gtk_x11 %{gtk2_builddir}/gtk/libgtk-x11-2.0.la +%endif + #------------libgtk-java----------------------------------- +%if %{build_libgtk_java} + %define libgtk_java_builddir %{BUILDDIR}/%{libgtk_java} %define libgtk_java_makeflags "%{glib_cflags}" "GLIB_LIBS = %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib}" "%{cairo_cflags}" "CAIRO_LIBS = %{lib_cairo}" "%{jgjava_cflags}" "JGJAVA_LIBS = %{lib_glibjava}" "JGJNI_LIBS = %{lib_glibjni}" "%{jgjar}" "%{cairo_java_cflags}" "CAIRO_JAVA_LIBS = %{lib_cairojava}" "%{cairojar}" "GTK_CFLAGS = %{GTK_CFLAGS} %{GLIB_CFLAGS} %{ATK_CFLAGS} %{PANGO_CFLAGS}" "GTK_LIBS = -ldl %{lib_gdk_x11} %{lib_gdk_pixbuf} %{lib_gobject} %{lib_gmodule} %{lib_glib} %{lib_atk} %{libgpango} %{lib_pangocairo}" "ATK_CFLAGS = %{ATK_CFLAGS}" "ATK_LIBS = %{lib_atk}" "GTHREAD_CFLAGS = %{GLIB_CFLAGS}" "GTHREAD_LIBS = %{lib_gthread} %{lib_glib}" @@ -715,8 +761,12 @@ %define lib_gtk_java %{libgtk_java_builddir}/libgtkjava.la %define lib_gtkjni %{libgtk_java_builddir}/libgtkjni.la +%endif + #------------libglade2-------------------------------------- +%if %{build_libglade2} + %define libglade2_makeflags "LIBGLADE_CFLAGS = %{GLIB_CFLAGS} %{GTK_CFLAGS} %{CAIRO_CFLAGS} %{PANGO_CFLAGS} -I/usr/include/libxml2 %{ATK_CFLAGS}" "LIBGLADE_LIBS = -Wl,--export-dynamic -lxml2 -lpthread -lz %{lib_gtk_x11} %{lib_gdk_x11} %{lib_gdk_pixbuf} %{lib_atk} -lm %{lib_pangocairo} %{lib_pangoft2} %{lib_pango} %{lib_cairo} %{lib_gobject} %{lib_gmodule} %{lib_gthread} %{lib_glib} -ldl" %define libglade2_builddir %{BUILDDIR}/%{libglade2} @@ -734,8 +784,12 @@ %define lib_glade %{libglade2_builddir}/glade/libglade-2.0.la +%endif + #------------libglade-java--------------------------------- +%if %{build_libglade_java} + # REQUIRES: libgtk-java %define libglade_java_builddir %{BUILDDIR}/%{libglade_java} @@ -751,8 +805,12 @@ %define GLADE_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/glade2.12.jar +%endif + #------------libvte-java----------------------------------- +%if %{build_libvte_java} + %define libvte_java_builddir %{BUILDDIR}/%{libvte_java} %define libvte_java_makeflags %{libglade_java_makeflags} "GNOME_CFLAGS = -pthread -DORBIT2=1 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/gtk-2.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-2.0 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/glib-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/pango-1.0 -I/usr/include/ -I/usr/include/freetype2 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/gtk-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/atk-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo -I/usr/include/libgnomeui-2.0 -I/usr/include/libgnome-2.0 -I/usr/include/libgnomecanvas-2.0 -I/usr/include/libart-2.0 -I/usr/include/gconf/2 -I/usr/include/libbonoboui-2.0 -I/usr/include/orbit-2.0 -I/usr/include/libbonobo-2.0 -I/usr/include/gnome-vfs-2.0 -I/usr/lib/gnome-vfs-2.0/include -I/usr/include/bonobo-activation-2.0 -I/usr/include/libxml2" "GNOME_LIBS = -Wl,--export-dynamic -pthread -L/usr/X11R6/%{_lib} -lgnomeui-2 -lSM -lICE -lbonoboui-2 -lxml2 -lpthread -lz -lgnome-2 -lpopt -lbonobo-2 -lgconf-2! -lgnomevfs-2 -lbonobo-activation -lORBit-2 %{lib_gthread} -lgnomecanvas-2 -lart_lgpl_2 %{lib_pangoft2} %{lib_gtk_x11} %{lib_gdk_x11} %{lib_atk} -lgdk_pixbuf-2.0 -lm %{lib_pangocairo} %{lib_pango} %{lib_cairo} %{lib_gobject} %{lib_gmodule} -ldl %{lib_glib}" "VTE_CFLAGS = -I$RPM_BUILD_ROOT/%{__frysk_includedir}/glib-2.0 -I$RPM_BUILD_ROOT/%{__frysk_libdir}/glib-2.0/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/gtk-2.0 -I/usr/include -I$RPM_BUILD_ROOT/%{__frysk_includedir}/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I$RPM_BUILD_ROOT/%{__frysk_libdir}/gtk-2.0/include -I$RPM_BUILD_DIR/%{__frysk_includedir}/atk-1.0 -I$RPM_BUILD_ROOT/%{__frysk_includedir}/cairo" "VTE_LIBS = -L/usr/X11R6/%{_lib} -lvte -lz -lncurses -lSM -lICE -lXft -lX11 -lfreetype -lXrender %{lib_gtk_x11} %{lib_pangoxft} %{lib_pangox} %{lib_fontconfig} %{lib_gdk_x11} %{lib_atk} %{lib_gdk_pixbuf} -lm %{lib_pangocairo} %{lib_cairo} %{lib_pangoft2} %{lib_pango} %{lib_gobj! ect} %{lib_gmodule} -ldl %{lib_glib}" "JGJAVA_CFLAGS = %{JGJA! VA_CFLAG S} -I $RPM_BUILD_ROOT/%{__frysk_includedir}" @@ -765,6 +823,8 @@ %define VTE_JAVA_JAR $RPM_BUILD_ROOT/%{__frysk_datadir}/java/vte0.11.jar +%endif + #-----------antlr------------------------------------------ %if %{build_antlr} @@ -789,6 +849,8 @@ #-----------jdom------------------------------------------ +%if %{build_jdom} + %define jdom_builddir %{BUILDDIR}/%{jdom} export JDOM_JAR=$RPM_BUILD_ROOT/%{__frysk_datadir}/java/jdom.jar @@ -816,9 +878,12 @@ INSTALLED %{jdom} fi +%endif + #-----------frysk------------------------------------------ %if %{build_frysk} + %define frysk_builddir %{BUILDDIR}/%{frysk} %define frysk_rpaths -Djava.library.path=%{__frysk_libdir}: -Wl,-rpath,%{__frysk_libdir}: @@ -832,6 +897,7 @@ %{__frysk_configure} BUILD %{frysk} %{?_smp_mflags} %{frysk_makeflags} INSTALL %{frysk} %{frysk_makeflags} + %endif #-----------done------------------------------------------ @@ -853,23 +919,45 @@ %files %defattr(-,root,root) -/usr/bin/* +%{_bindir}/* +%{_mandir}/*/frysk-* +%{_includedir}/frysk/* +%{_libdir}/frysk/* +%{_datadir}/frysk/* +%{_sysconfdir}/* %if %{build_frysk} -/usr/%{_lib}/libEggTrayIcon.so -/usr/%{_lib}/libfrysk-*.so -/usr/%{_lib}/libftk*.so -/usr/share/java/frysk-*.jar -/usr/share/java/ftk.jar -/usr/share/applications/frysk.desktop -/usr/share/pixmaps/fryskTrayIcon48.png +%{_libdir}/libEggTrayIcon.so +%{_libdir}/libfrysk-*.so +%{_libdir}/libftk*.so +%{_datadir}/java/frysk-*.jar +%{_datadir}/java/ftk.jar +%{_datadir}/applications/frysk.desktop +%{_datadir}/pixmaps/fryskTrayIcon48.png %endif -/usr/share/man/*/frysk-* -/usr/include/frysk/* -/usr/%{_lib}/frysk/* -/usr/share/frysk/* -/etc/frysk/* %changelog +* Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.6 +- Add the macros build_glib2, build_glib_java, build_fontconfig, + build_atk, build_cairo, build_cairo_java, build_pango, build_gtk2, + build_libgtk_java, build_libglade2, build_libglade_java, + build_libvte_java, and build_jdom. Wrap corresponding build code. + +* Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.5 +- Update antlr.patch, update includes Wu Zhou's basename fix, and + up-to-date config.guess and config.sub. + +* Thu Jan 26 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.4 +- From Diego Novello : Add + libglade-java-20060125-fix-64bit-miscompilation.patch. + +* Thu Jan 26 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.3 +- From Wu Zhou : Add -m64 to ppc64 CC et.al. + +* Mon Jan 23 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.2 +- In -files, only list frysk.desktop and fryskTrayIcon48.png when + build_frysk. +- Define all install paths in terms of macros. + * Mon Jan 23 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.1 - Write pango.modules to %{_target_platform}, instead of %{_host} sub-directory. From fedora-cvs-commits at redhat.com Fri Jan 27 21:20:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 16:20:59 -0500 Subject: rpms/microcode_ctl/devel .cvsignore, 1.4, 1.5 microcode_ctl.patch, 1.5, 1.6 microcode_ctl.spec, 1.28, 1.29 sources, 1.4, 1.5 Message-ID: <200601272120.k0RLKxQ5005133@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/microcode_ctl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5089 Modified Files: .cvsignore microcode_ctl.patch microcode_ctl.spec sources Log Message: 1.13 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/microcode_ctl/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 14 Sep 2005 02:57:16 -0000 1.4 +++ .cvsignore 27 Jan 2006 21:20:55 -0000 1.5 @@ -1,2 +1,2 @@ -microcode_ctl-1.12 -microcode_ctl-1.12.tar.gz +microcode_ctl-1.13 +microcode_ctl-1.13.tar.gz microcode_ctl.patch: Makefile | 6 +++--- microcode_ctl.c | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) Index: microcode_ctl.patch =================================================================== RCS file: /cvs/dist/rpms/microcode_ctl/devel/microcode_ctl.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- microcode_ctl.patch 14 Sep 2005 02:57:16 -0000 1.5 +++ microcode_ctl.patch 27 Jan 2006 21:20:55 -0000 1.6 @@ -1,5 +1,5 @@ ---- microcode_ctl-1.12/Makefile~ Mon Jun 11 16:57:42 2001 -+++ microcode_ctl-1.12/Makefile Tue Jan 8 20:20:58 2002 +--- microcode_ctl-1.13/Makefile~ Mon Jun 11 16:57:42 2001 ++++ microcode_ctl-1.13/Makefile Tue Jan 8 20:20:58 2002 @@ -20,7 +20,7 @@ PREFIX = /usr/local @@ -19,8 +19,8 @@ $(INS) -m 644 $(MANPAGE) $(DESTDIR)$(MANDIR) gzip -9f $(DESTDIR)$(MANDIR)/$(MANPAGE) ---- microcode_ctl-1.12/microcode_ctl.c.org 2003-05-28 19:56:22.000000000 +0200 -+++ microcode_ctl-1.12/microcode_ctl.c 2003-05-28 19:57:01.000000000 +0200 +--- microcode_ctl-1.13/microcode_ctl.c.org 2003-05-28 19:56:22.000000000 +0200 ++++ microcode_ctl-1.13/microcode_ctl.c 2003-05-28 19:57:01.000000000 +0200 @@ -95,11 +95,13 @@ { FILE *fd; @@ -46,8 +46,8 @@ fprintf(stderr, "%s: error writing to '%s' errno=%d (%s)\n" "%s: there may be messages from the driver in your system log.\n", ---- microcode_ctl-1.12/microcode_ctl.c~ 2005-01-21 17:42:53.000000000 -0500 -+++ microcode_ctl-1.12/microcode_ctl.c 2005-01-21 17:43:03.000000000 -0500 +--- microcode_ctl-1.13/microcode_ctl.c~ 2005-01-21 17:42:53.000000000 -0500 ++++ microcode_ctl-1.13/microcode_ctl.c 2005-01-21 17:43:03.000000000 -0500 @@ -25,7 +25,7 @@ int print_error_messages=1; #define MAX_MICROCODE 2000000 Index: microcode_ctl.spec =================================================================== RCS file: /cvs/dist/rpms/microcode_ctl/devel/microcode_ctl.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- microcode_ctl.spec 17 Dec 2005 06:17:52 -0000 1.28 +++ microcode_ctl.spec 27 Jan 2006 21:20:55 -0000 1.29 @@ -1,6 +1,6 @@ Summary: Tool to update x86/x86-64 CPU microcode. Name: microcode_ctl -Version: 1.12 +Version: 1.13 Release: %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?}) Epoch: 1 Group: System Environment/Base @@ -82,6 +82,9 @@ exit 0 %changelog +* Fri Jan 27 2006 Dave Jones +- Update to upstream 1.13 + * Fri Dec 16 2005 Jesse Keating - rebuilt for new gcj Index: sources =================================================================== RCS file: /cvs/dist/rpms/microcode_ctl/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 14 Sep 2005 02:57:16 -0000 1.4 +++ sources 27 Jan 2006 21:20:55 -0000 1.5 @@ -1 +1 @@ -07d5f64b7c84a00663425089221d5fb0 microcode_ctl-1.12.tar.gz +929de086074e296e0918ea6c6aec777a microcode_ctl-1.13.tar.gz From fedora-cvs-commits at redhat.com Fri Jan 27 22:31:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 17:31:26 -0500 Subject: rpms/kernel-xen/devel .cvsignore, 1.8, 1.9 kernel-xen.spec, 1.31, 1.32 linux-2.6-xen-merge.patch, 1.5, 1.6 sources, 1.8, 1.9 linux-2.6.12-xen.patch, 1.7, NONE Message-ID: <200601272231.k0RMVQtd014941@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14910 Modified Files: .cvsignore kernel-xen.spec linux-2.6-xen-merge.patch sources Removed Files: linux-2.6.12-xen.patch Log Message: - Rebase to linux-2.6-merge.hg cset 19859 - Rebase to HV from xen-unstable.hg cset 8680 - Delete unused linux-2.6.12-xen.patch Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 26 Jan 2006 22:14:33 -0000 1.8 +++ .cvsignore 27 Jan 2006 22:30:20 -0000 1.9 @@ -2,7 +2,7 @@ temp-* kernel-xen-2.6.15 linux-2.6.15.tar.bz2 -xen-20060106.tar.bz2 bcm43xx-20060114.tar.bz2 patch-2.6.16-rc1.bz2 patch-2.6.16-rc1-git4.bz2 +xen-20060127.tar.bz2 Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- kernel-xen.spec 26 Jan 2006 22:29:32 -0000 1.31 +++ kernel-xen.spec 27 Jan 2006 22:30:20 -0000 1.32 @@ -186,7 +186,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source1: xen-20060106.tar.bz2 +Source1: xen-20060127.tar.bz2 Source2: Config.mk Source10: COPYING.modules @@ -1373,6 +1373,11 @@ %endif %changelog +* Fri Jan 27 2006 Stephen Tweedie +- Rebase to linux-2.6-merge.hg cset 19859 +- Rebase to HV from xen-unstable.hg cset 8680 +- Delete unused linux-2.6.12-xen.patch + * Thu Jan 26 2006 Juan Quintela - "don't edit patches by hand" release. linux-2.6-xen-merge.patch: arch/i386/Kconfig | 81 arch/i386/Makefile | 18 arch/i386/kernel/Makefile | 26 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/cpufreq/Kconfig | 2 arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/smpboot.c | 10 arch/i386/kernel/traps.c | 9 arch/i386/kernel/vmlinux.lds.S | 7 arch/i386/mm/Makefile | 8 arch/i386/pci/Makefile | 5 arch/i386/power/Makefile | 4 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 43 arch/x86_64/Makefile | 15 arch/x86_64/ia32/Makefile | 18 arch/x86_64/ia32/vsyscall-sigreturn.S | 2 arch/x86_64/kernel/Makefile | 20 arch/x86_64/kernel/acpi/Makefile | 2 arch/x86_64/kernel/i387.c | 5 arch/x86_64/kernel/pci-gart.c | 8 arch/x86_64/kernel/setup64.c | 2 arch/x86_64/mm/Makefile | 10 arch/x86_64/pci/Makefile | 8 b/arch/i386/boot-xen/Makefile | 21 b/arch/i386/kernel/acpi/boot-xen.c | 1157 +++++++++ b/arch/i386/kernel/apic-xen.c | 143 + b/arch/i386/kernel/cpu/common-xen.c | 659 +++++ b/arch/i386/kernel/cpu/mtrr/main-xen.c | 187 + b/arch/i386/kernel/early_printk-xen.c | 2 b/arch/i386/kernel/entry-xen.S | 853 +++++++ b/arch/i386/kernel/fixup.c | 95 b/arch/i386/kernel/head-xen.S | 170 + b/arch/i386/kernel/init_task-xen.c | 49 b/arch/i386/kernel/io_apic-xen.c | 2725 +++++++++++++++++++++++ b/arch/i386/kernel/ioport-xen.c | 122 + b/arch/i386/kernel/irq-xen.c | 306 ++ b/arch/i386/kernel/ldt-xen.c | 262 ++ b/arch/i386/kernel/microcode-xen.c | 164 + b/arch/i386/kernel/mpparse-xen.c | 1177 +++++++++ b/arch/i386/kernel/pci-dma-xen.c | 326 ++ b/arch/i386/kernel/process-xen.c | 821 ++++++ b/arch/i386/kernel/quirks-xen.c | 48 b/arch/i386/kernel/setup-xen.c | 1876 +++++++++++++++ b/arch/i386/kernel/smp-xen.c | 617 +++++ b/arch/i386/kernel/smpalts.c | 85 b/arch/i386/kernel/swiotlb.c | 677 +++++ b/arch/i386/kernel/time-xen.c | 1016 ++++++++ b/arch/i386/kernel/traps-xen.c | 1103 +++++++++ b/arch/i386/kernel/vsyscall-note-xen.S | 32 b/arch/i386/mach-xen/Makefile | 7 b/arch/i386/mach-xen/setup.c | 37 b/arch/i386/mm/fault-xen.c | 617 +++++ b/arch/i386/mm/highmem-xen.c | 123 + b/arch/i386/mm/hypervisor.c | 459 +++ b/arch/i386/mm/init-xen.c | 848 +++++++ b/arch/i386/mm/ioremap-xen.c | 493 ++++ b/arch/i386/mm/pgtable-xen.c | 597 +++++ b/arch/i386/pci/irq-xen.c | 1197 ++++++++++ b/arch/x86_64/ia32/ia32entry-xen.S | 718 ++++++ b/arch/x86_64/ia32/syscall32-xen.c | 128 + b/arch/x86_64/ia32/syscall32_syscall-xen.S | 28 b/arch/x86_64/ia32/vsyscall-int80.S | 58 b/arch/x86_64/kernel/apic-xen.c | 187 + b/arch/x86_64/kernel/e820-xen.c | 744 ++++++ b/arch/x86_64/kernel/early_printk-xen.c | 306 ++ b/arch/x86_64/kernel/entry-xen.S | 1160 +++++++++ b/arch/x86_64/kernel/genapic-xen.c | 135 + b/arch/x86_64/kernel/genapic_xen.c | 162 + b/arch/x86_64/kernel/head-xen.S | 247 ++ b/arch/x86_64/kernel/head64-xen.c | 137 + b/arch/x86_64/kernel/io_apic-xen.c | 2191 ++++++++++++++++++ b/arch/x86_64/kernel/ioport-xen.c | 58 b/arch/x86_64/kernel/irq-xen.c | 157 + b/arch/x86_64/kernel/ldt-xen.c | 275 ++ b/arch/x86_64/kernel/mpparse-xen.c | 1000 ++++++++ b/arch/x86_64/kernel/pci-nommu-xen.c | 99 b/arch/x86_64/kernel/process-xen.c | 798 ++++++ b/arch/x86_64/kernel/setup-xen.c | 1613 +++++++++++++ b/arch/x86_64/kernel/setup64-xen.c | 353 ++ b/arch/x86_64/kernel/smp-xen.c | 592 ++++ b/arch/x86_64/kernel/traps-xen.c | 1010 ++++++++ b/arch/x86_64/kernel/vsyscall-xen.c | 239 ++ b/arch/x86_64/kernel/x8664_ksyms-xen.c | 181 + b/arch/x86_64/kernel/xen_entry.S | 41 b/arch/x86_64/mm/fault-xen.c | 601 +++++ b/arch/x86_64/mm/init-xen.c | 1090 +++++++++ b/arch/x86_64/mm/pageattr-xen.c | 375 +++ b/drivers/char/tpm/tpm_xen.c | 525 ++++ b/drivers/xen/Kconfig | 175 + b/drivers/xen/Makefile | 20 b/drivers/xen/balloon/Makefile | 2 b/drivers/xen/balloon/balloon.c | 563 ++++ b/drivers/xen/blkback/Makefile | 2 b/drivers/xen/blkback/blkback.c | 590 ++++ b/drivers/xen/blkback/common.h | 123 + b/drivers/xen/blkback/interface.c | 164 + b/drivers/xen/blkback/vbd.c | 102 b/drivers/xen/blkback/xenbus.c | 421 +++ b/drivers/xen/blkfront/Kconfig | 6 b/drivers/xen/blkfront/Makefile | 5 b/drivers/xen/blkfront/blkfront.c | 835 +++++++ b/drivers/xen/blkfront/block.h | 162 + b/drivers/xen/blkfront/vbd.c | 323 ++ b/drivers/xen/blktap/Makefile | 3 b/drivers/xen/blktap/blktap.c | 910 +++++++ b/drivers/xen/blktap/common.h | 110 b/drivers/xen/blktap/interface.c | 146 + b/drivers/xen/blktap/xenbus.c | 234 + b/drivers/xen/char/Makefile | 2 b/drivers/xen/char/mem.c | 159 + b/drivers/xen/console/Makefile | 2 b/drivers/xen/console/console.c | 688 +++++ b/drivers/xen/console/xencons_ring.c | 125 + b/drivers/xen/core/Makefile | 9 b/drivers/xen/core/evtchn.c | 820 ++++++ b/drivers/xen/core/gnttab.c | 480 ++++ b/drivers/xen/core/reboot.c | 436 +++ b/drivers/xen/core/skbuff.c | 143 + b/drivers/xen/core/smpboot.c | 439 +++ b/drivers/xen/core/xen_proc.c | 29 b/drivers/xen/evtchn/Makefile | 2 b/drivers/xen/evtchn/evtchn.c | 459 +++ b/drivers/xen/net_driver_util.c | 67 b/drivers/xen/netback/Makefile | 2 b/drivers/xen/netback/common.h | 110 b/drivers/xen/netback/interface.c | 320 ++ b/drivers/xen/netback/loopback.c | 198 + b/drivers/xen/netback/netback.c | 829 ++++++ b/drivers/xen/netback/xenbus.c | 327 ++ b/drivers/xen/netfront/Kconfig | 6 b/drivers/xen/netfront/Makefile | 4 b/drivers/xen/netfront/netfront.c | 1487 ++++++++++++ b/drivers/xen/privcmd/Makefile | 2 b/drivers/xen/privcmd/privcmd.c | 274 ++ b/drivers/xen/tpmback/Makefile | 4 b/drivers/xen/tpmback/common.h | 89 b/drivers/xen/tpmback/interface.c | 200 + b/drivers/xen/tpmback/tpmback.c | 1109 +++++++++ b/drivers/xen/tpmback/xenbus.c | 328 ++ b/drivers/xen/tpmfront/Makefile | 2 b/drivers/xen/tpmfront/tpmfront.c | 703 +++++ b/drivers/xen/tpmfront/tpmfront.h | 43 b/drivers/xen/util.c | 75 b/drivers/xen/xenbus/Makefile | 8 b/drivers/xen/xenbus/xenbus_client.c | 238 ++ b/drivers/xen/xenbus/xenbus_comms.c | 203 + b/drivers/xen/xenbus/xenbus_comms.h | 50 b/drivers/xen/xenbus/xenbus_dev.c | 238 ++ b/drivers/xen/xenbus/xenbus_probe.c | 1015 ++++++++ b/drivers/xen/xenbus/xenbus_xs.c | 821 ++++++ b/include/asm-i386/hypercall.h | 328 ++ b/include/asm-i386/hypervisor.h | 180 + b/include/asm-i386/mach-default/mach_dma_map.h | 85 b/include/asm-i386/mach-default/mach_fixmap.h | 15 b/include/asm-i386/mach-default/mach_io.h | 35 b/include/asm-i386/mach-default/mach_mmu.h | 18 b/include/asm-i386/mach-default/mach_mode.h | 7 b/include/asm-i386/mach-default/mach_page.h | 28 b/include/asm-i386/mach-default/mach_pgtable.h | 45 b/include/asm-i386/mach-default/mach_processor.h | 53 b/include/asm-i386/mach-default/mach_seg.h | 39 b/include/asm-i386/mach-default/mach_setup.h | 50 b/include/asm-i386/mach-default/mach_system.h | 87 b/include/asm-i386/mach-default/mach_tlbflush.h | 59 b/include/asm-i386/mach-xen/irq_vectors.h | 125 + b/include/asm-i386/mach-xen/mach_dma_map.h | 47 b/include/asm-i386/mach-xen/mach_fixmap.h | 15 b/include/asm-i386/mach-xen/mach_io.h | 50 b/include/asm-i386/mach-xen/mach_mmu.h | 47 b/include/asm-i386/mach-xen/mach_mode.h | 7 b/include/asm-i386/mach-xen/mach_page.h | 154 + b/include/asm-i386/mach-xen/mach_pgtable.h | 154 + b/include/asm-i386/mach-xen/mach_processor.h | 59 b/include/asm-i386/mach-xen/mach_seg.h | 9 b/include/asm-i386/mach-xen/mach_setup.h | 11 b/include/asm-i386/mach-xen/mach_system.h | 157 + b/include/asm-i386/mach-xen/mach_tlbflush.h | 10 b/include/asm-i386/mach-xen/mach_traps.h | 33 b/include/asm-i386/mach-xen/setup_arch_post.h | 43 b/include/asm-i386/mach-xen/setup_arch_pre.h | 5 b/include/asm-i386/smp_alt.h | 32 b/include/asm-i386/swiotlb.h | 59 b/include/asm-i386/synch_bitops.h | 143 + b/include/asm-x86_64/arch_hooks.h | 31 b/include/asm-x86_64/hypercall.h | 328 ++ b/include/asm-x86_64/hypervisor.h | 2 b/include/asm-x86_64/mach-xen/asm/nmi.h | 75 b/include/asm-x86_64/synch_bitops.h | 1 b/include/xen/balloon.h | 70 b/include/xen/driver_util.h | 26 b/include/xen/evtchn.h | 123 + b/include/xen/foreign_page.h | 40 b/include/xen/gnttab.h | 98 b/include/xen/interface/acm.h | 181 + b/include/xen/interface/acm_ops.h | 96 b/include/xen/interface/arch-ia64.h | 279 ++ b/include/xen/interface/arch-x86_32.h | 158 + b/include/xen/interface/arch-x86_64.h | 243 ++ b/include/xen/interface/dom0_ops.h | 482 ++++ b/include/xen/interface/event_channel.h | 203 + b/include/xen/interface/grant_table.h | 306 ++ b/include/xen/interface/hvm/hvm_info_table.h | 24 b/include/xen/interface/hvm/ioreq.h | 90 b/include/xen/interface/hvm/vmx_assist.h | 97 b/include/xen/interface/io/blkif.h | 85 b/include/xen/interface/io/console.h | 33 b/include/xen/interface/io/netif.h | 76 b/include/xen/interface/io/ring.h | 270 ++ b/include/xen/interface/io/tpmif.h | 56 b/include/xen/interface/io/vmx_vlapic.h | 58 b/include/xen/interface/io/vmx_vpic.h | 85 b/include/xen/interface/io/xenbus.h | 44 b/include/xen/interface/io/xs_wire.h | 97 b/include/xen/interface/memory.h | 101 b/include/xen/interface/nmi.h | 54 b/include/xen/interface/physdev.h | 70 b/include/xen/interface/sched.h | 60 b/include/xen/interface/sched_ctl.h | 68 b/include/xen/interface/trace.h | 90 b/include/xen/interface/vcpu.h | 64 b/include/xen/interface/version.h | 52 b/include/xen/interface/xen.h | 449 +++ b/include/xen/net_driver_util.h | 56 b/include/xen/public/evtchn.h | 98 b/include/xen/public/privcmd.h | 91 b/include/xen/public/xenstored.h | 89 b/include/xen/tpmfe.h | 33 b/include/xen/xen_proc.h | 23 b/include/xen/xenbus.h | 254 ++ b/include/xen/xencons.h | 14 b/scripts/Makefile.xen | 14 drivers/Kconfig | 11 drivers/Makefile | 1 drivers/acpi/Kconfig | 2 drivers/acpi/tables.c | 7 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 14 drivers/char/tpm/Makefile | 1 drivers/char/tpm/tpm.c | 47 drivers/char/tpm/tpm.h | 13 drivers/char/tpm/tpm_atmel.c | 110 drivers/char/tpm/tpm_nsc.c | 155 - drivers/char/tty_io.c | 7 drivers/firmware/Kconfig | 2 drivers/ide/legacy/hd.c | 2 drivers/pci/Kconfig | 1 drivers/serial/Kconfig | 1 drivers/video/fbmon.c | 2 fs/Kconfig | 1 include/asm-i386/agp.h | 15 include/asm-i386/atomic.h | 7 include/asm-i386/bitops.h | 19 include/asm-i386/desc.h | 47 include/asm-i386/dma-mapping.h | 102 include/asm-i386/fixmap.h | 20 include/asm-i386/floppy.h | 43 include/asm-i386/futex.h | 4 include/asm-i386/highmem.h | 5 include/asm-i386/hw_irq.h | 4 include/asm-i386/io.h | 41 include/asm-i386/kmap_types.h | 3 include/asm-i386/mach-default/mach_traps.h | 12 include/asm-i386/mmu.h | 6 include/asm-i386/mmu_context.h | 17 include/asm-i386/page.h | 14 include/asm-i386/pci.h | 31 include/asm-i386/pgalloc.h | 31 include/asm-i386/pgtable-2level.h | 12 include/asm-i386/pgtable-3level.h | 35 include/asm-i386/pgtable.h | 22 include/asm-i386/processor.h | 48 include/asm-i386/ptrace.h | 5 include/asm-i386/rwsem.h | 17 include/asm-i386/scatterlist.h | 9 include/asm-i386/segment.h | 41 include/asm-i386/setup.h | 45 include/asm-i386/smp.h | 5 include/asm-i386/spinlock.h | 43 include/asm-i386/system.h | 138 - include/asm-i386/tlbflush.h | 55 include/asm-i386/vga.h | 2 include/asm-um/page.h | 2 include/asm-x86_64/bootsetup.h | 10 include/asm-x86_64/desc.h | 36 include/asm-x86_64/dma-mapping.h | 102 include/asm-x86_64/fixmap.h | 21 include/asm-x86_64/floppy.h | 45 include/asm-x86_64/hw_irq.h | 14 include/asm-x86_64/i387.h | 7 include/asm-x86_64/io.h | 49 include/asm-x86_64/ipi.h | 8 include/asm-x86_64/irq.h | 39 include/asm-x86_64/mmu.h | 13 include/asm-x86_64/mmu_context.h | 102 include/asm-x86_64/page.h | 155 + include/asm-x86_64/pci.h | 26 include/asm-x86_64/pda.h | 5 include/asm-x86_64/pgalloc.h | 156 + include/asm-x86_64/pgtable.h | 253 +- include/asm-x86_64/processor.h | 38 include/asm-x86_64/segment.h | 9 include/asm-x86_64/smp.h | 10 include/asm-x86_64/swiotlb.h | 18 include/asm-x86_64/system.h | 114 include/asm-x86_64/tlbflush.h | 14 include/asm-x86_64/vga.h | 2 include/asm-x86_64/xor.h | 23 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/irq.h | 3 include/linux/mm.h | 13 include/linux/skbuff.h | 13 init/Kconfig | 2 kernel/Kconfig.preempt | 1 kernel/irq/manage.c | 92 lib/Kconfig.debug | 2 lib/Makefile | 2 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 118 mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 50 net/core/skbuff.c | 45 326 files changed, 61778 insertions(+), 820 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 linux-2.6-xen-merge.patch Index: linux-2.6-xen-merge.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-merge.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- linux-2.6-xen-merge.patch 26 Jan 2006 22:29:32 -0000 1.5 +++ linux-2.6-xen-merge.patch 27 Jan 2006 22:30:20 -0000 1.6 @@ -1,995 +1,1349 @@ ---- ./fs/Kconfig.xenmerge 2006-01-06 16:03:15.000000000 -0500 -+++ ./fs/Kconfig 2006-01-06 16:04:34.000000000 -0500 -@@ -811,6 +811,7 @@ - config HUGETLBFS - bool "HugeTLB file system support" - depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN -+ depends !XEN +diff -r df46ccb05adf -r 328a491adf0b arch/i386/Kconfig +--- a/arch/i386/Kconfig Fri Jan 20 17:49:15 2006 +0800 ++++ b/arch/i386/Kconfig Fri Jan 27 20:45:25 2006 +0100 +@@ -50,6 +50,7 @@ config DOUBLEFAULT + config DOUBLEFAULT + default y + bool "Enable doublefault exception handler" if EMBEDDED ++ depends on !XEN + help + This option allows trapping of rare doublefault exceptions that + would otherwise cause a system to silently reboot. Disabling this +@@ -66,6 +67,15 @@ config X86_PC + bool "PC-compatible" + help + Choose this option if your computer is a standard PC or compatible. ++ ++config X86_XEN ++ bool "Xen-compatible" ++ select X86_UP_APIC if !SMP && XEN_PRIVILEGED_GUEST ++ select X86_UP_IOAPIC if !SMP && XEN_PRIVILEGED_GUEST ++ select SWIOTLB if XEN_PHYSDEV_ACCESS ++ help ++ Choose this option is you plan to run this kernel on top of Xen ++ Hypervisor. - config HUGETLB_PAGE - def_bool HUGETLBFS ---- ./drivers/char/mem.c.xenmerge 2006-01-06 16:03:14.000000000 -0500 -+++ ./drivers/char/mem.c 2006-01-06 16:04:32.000000000 -0500 -@@ -103,6 +103,7 @@ - } - #endif + config X86_ELAN + bool "AMD Elan" +@@ -168,6 +178,7 @@ source "arch/i386/Kconfig.cpu" -+#ifndef ARCH_HAS_DEV_MEM - /* - * This funcion reads the *physical* memory. The f_pos points directly to the - * memory location. -@@ -227,6 +228,7 @@ - *ppos += written; - return written; - } -+#endif + config HPET_TIMER + bool "HPET Timer Support" ++ depends on !X86_XEN + help + This enables the use of the HPET for the kernel's internal timer. + HPET is the next generation timer replacing legacy 8254s. +@@ -211,6 +222,19 @@ config SMP - static int mmap_mem(struct file * file, struct vm_area_struct * vma) - { -@@ -758,6 +760,7 @@ - #define open_kmem open_mem - #define open_oldmem open_mem + If you don't know what to do here, say N. -+#ifndef ARCH_HAS_DEV_MEM - static struct file_operations mem_fops = { - .llseek = memory_lseek, - .read = read_mem, -@@ -765,6 +768,9 @@ - .mmap = mmap_mem, - .open = open_mem, - }; -+#else -+extern struct file_operations mem_fops; -+#endif ++config SMP_ALTERNATIVES ++ bool "SMP alternatives support (EXPERIMENTAL)" ++ depends on SMP && EXPERIMENTAL ++ help ++ Try to reduce the overhead of running an SMP kernel on a uniprocessor ++ host slightly by replacing certain key instruction sequences ++ according to whether we currently have more than one CPU available. ++ This should provide a noticeable boost to performance when ++ running SMP kernels on UP machines, and have negligible impact ++ when running on an true SMP host. ++ ++ If unsure, say N. ++ + config NR_CPUS + int "Maximum number of CPUs (2-255)" + range 2 255 +@@ -227,7 +251,7 @@ config NR_CPUS - static struct file_operations kmem_fops = { - .llseek = memory_lseek, ---- ./drivers/char/tpm/tpm_nsc.c.xenmerge 2006-01-06 16:03:14.000000000 -0500 -+++ ./drivers/char/tpm/tpm_nsc.c 2006-01-06 16:04:32.000000000 -0500 -@@ -19,7 +19,6 @@ - * - */ + config SCHED_SMT + bool "SMT (Hyperthreading) scheduler support" +- depends on SMP ++ depends on SMP && !X86_XEN + default off + help + SMT scheduler support improves the CPU scheduler's decision making +@@ -239,7 +263,7 @@ source "kernel/Kconfig.preempt" --#include - #include "tpm.h" + config X86_UP_APIC + bool "Local APIC support on uniprocessors" +- depends on !SMP && !(X86_VISWS || X86_VOYAGER) ++ depends on !SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST) + help + A local APIC (Advanced Programmable Interrupt Controller) is an + integrated interrupt controller in the CPU. If you have a single-CPU +@@ -264,22 +288,27 @@ config X86_UP_IOAPIC - /* National definitions */ -@@ -245,7 +244,7 @@ - &dev_attr_pcrs.attr, - &dev_attr_caps.attr, - &dev_attr_cancel.attr, -- NULL, -+ 0, - }; + config X86_LOCAL_APIC + bool +- depends on X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) ++ depends on X86_UP_APIC || ((X86_VISWS || SMP) && !(X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) + default y - static struct attribute_group nsc_attr_grp = { .attrs = nsc_attrs }; -@@ -262,93 +261,55 @@ - .miscdev = { .fops = &nsc_ops, }, - }; + config X86_IO_APIC + bool +- depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)) ++ depends on X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER || XEN_UNPRIVILEGED_GUEST)) + default y --static struct platform_device *pdev = NULL; -- --static void __devexit tpm_nsc_remove(struct device *dev) --{ -- struct tpm_chip *chip = dev_get_drvdata(dev); -- if ( chip ) { -- release_region(chip->vendor->base, 2); -- tpm_remove_hardware(chip->dev); -- } --} -- --static struct device_driver nsc_drv = { -- .name = "tpm_nsc", -- .bus = &platform_bus_type, -- .owner = THIS_MODULE, -- .suspend = tpm_pm_suspend, -- .resume = tpm_pm_resume, --}; -- --static int __init init_nsc(void) -+static int __devinit tpm_nsc_init(struct pci_dev *pci_dev, -+ const struct pci_device_id *pci_id) - { - int rc = 0; - int lo, hi; - int nscAddrBase = TPM_ADDR; + config X86_VISWS_APIC + bool + depends on X86_VISWS ++ default y ++ ++config X86_TSC ++ bool ++ depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1) && !X86_NUMAQ && !X86_XEN + default y + config X86_MCE + bool "Machine Check Exception" +- depends on !X86_VOYAGER ++ depends on !(X86_VOYAGER || X86_XEN) + ---help--- + Machine Check Exception support allows the processor to notify the + kernel if it detects a problem (e.g. overheating, component failure). +@@ -369,6 +398,7 @@ config X86_REBOOTFIXUPS [...115951 lines suppressed...] -- depends on SMP -+ depends on SMP && !X86_64_XEN - default n - help - SMT scheduler support improves the CPU scheduler's decision making -@@ -250,7 +266,7 @@ source "kernel/Kconfig.preempt" - - config NUMA - bool "Non Uniform Memory Access (NUMA) Support" -- depends on SMP -+ depends on SMP && !X86_64_XEN - help - Enable NUMA (Non Uniform Memory Access) support. The kernel - will try to allocate memory used by a CPU on the local memory -@@ -325,6 +341,7 @@ config NR_CPUS - int "Maximum number of CPUs (2-256)" - range 2 256 - depends on SMP -+ default "16" if X86_64_XEN - default "8" - help - This allows you to specify the maximum number of CPUs which this -@@ -345,6 +362,7 @@ config HOTPLUG_CPU - - config HPET_TIMER - bool -+ depends on !X86_64_XEN - default y - help - Use the IA-PC HPET (High Precision Event Timer) to manage -@@ -356,7 +374,7 @@ config HPET_TIMER - - config X86_PM_TIMER - bool "PM timer" if EMBEDDED -- depends on ACPI -+ depends on ACPI && !X86_64_XEN - default y - help - Support the ACPI PM timer for time keeping. This is slow, -@@ -377,7 +395,7 @@ config GART_IOMMU - bool "K8 GART IOMMU support" - default y - select SWIOTLB -- depends on PCI -+ depends on PCI && !X86_64_XEN - help - Support the IOMMU. Needed to run systems with more than 3GB of memory - properly with 32-bit PCI devices that do not support DAC (Double Address -@@ -395,6 +413,7 @@ config SWIOTLB - - config X86_MCE - bool "Machine check support" if EMBEDDED -+ depends on !X86_64_XEN - default y - help - Include a machine check error handler to report hardware errors. -@@ -420,7 +439,7 @@ config X86_MCE_AMD - - config KEXEC - bool "kexec system call (EXPERIMENTAL)" -- depends on EXPERIMENTAL -+ depends on EXPERIMENTAL && !X86_64_XEN - help - kexec is a system call that implements the ability to shutdown your - current kernel, and to start another kernel. It is like a reboot -@@ -503,12 +522,17 @@ config GENERIC_PENDING_IRQ - default y - - menu "Power management options" -+ depends on !XEN_UNPRIVILEGED_GUEST - -+if !X86_64_XEN - source kernel/power/Kconfig -+endif - - source "drivers/acpi/Kconfig" - -+if !X86_64_XEN - source "arch/x86_64/kernel/cpufreq/Kconfig" -+endif - - endmenu - -@@ -537,6 +561,7 @@ config UNORDERED_IO - from i386. Requires that the driver writer used memory barriers - properly. - -+if !X86_64_XEN - source "drivers/pci/pcie/Kconfig" - - source "drivers/pci/Kconfig" -@@ -544,6 +569,7 @@ source "drivers/pci/Kconfig" - source "drivers/pcmcia/Kconfig" - - source "drivers/pci/hotplug/Kconfig" -+endif - - endmenu - -@@ -606,4 +632,6 @@ source "security/Kconfig" - - source "crypto/Kconfig" - -+source "drivers/xen/Kconfig" ++void xencons_force_flush(void); ++void xencons_resume(void); + - source "lib/Kconfig" -diff -uNp linux-2.6.15.i686/arch/i386/Makefile.orig linux-2.6.15.i686/arch/i386/Makefile ---- linux-2.6.15.i686/arch/i386/Makefile.orig 2006-01-25 18:07:21.000000000 -0500 -+++ linux-2.6.15.i686/arch/i386/Makefile 2006-01-25 18:11:15.000000000 -0500 -@@ -68,6 +68,10 @@ mcore-$(CONFIG_X86_BIGSMP) := mach-defau - mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit - mcore-$(CONFIG_X86_SUMMIT) := mach-default - -+# Xen subarch support -+mflags-$(CONFIG_X86_XEN) := -Iinclude/asm-i386/mach-xen -+mcore-$(CONFIG_X86_XEN) := mach-xen ++/* Interrupt work hooks. Receive data, or kick data out. */ ++void xencons_rx(char *buf, unsigned len, struct pt_regs *regs); ++void xencons_tx(void); + - # generic subarchitecture - mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic - mcore-$(CONFIG_X86_GENERICARCH) := mach-default -@@ -96,12 +100,25 @@ drivers-$(CONFIG_PM) += arch/i386/powe - - CFLAGS += $(mflags-y) - AFLAGS += $(mflags-y) -+CPPFLAGS += $(mflags-y) - - boot := arch/i386/boot - - .PHONY: zImage bzImage compressed zlilo bzlilo \ - zdisk bzdisk fdimage fdimage144 fdimage288 install - -+ifdef CONFIG_XEN -+head-y := arch/i386/kernel/head-xen.o arch/i386/kernel/init_task-xen.o -+boot := arch/i386/boot-xen -+.PHONY: vmlinuz -+all: vmlinuz ++int xencons_ring_init(void); ++int xencons_ring_send(const char *data, unsigned len); + -+vmlinuz: vmlinux -+ $(Q)$(MAKE) $(build)=$(boot) $@ ++#endif /* __ASM_XENCONS_H__ */ +diff -r df46ccb05adf -r 328a491adf0b scripts/Makefile.xen +--- /dev/null Thu Jan 1 00:00:00 1970 +0000 ++++ b/scripts/Makefile.xen Fri Jan 27 20:45:25 2006 +0100 +@@ -0,0 +1,14 @@ + -+install: vmlinux -+ $(Q)$(MAKE) $(build)=$(boot) XENGUEST=$(XENGUEST) $@ -+else - all: bzImage - - # KBUILD_IMAGE specify target image being built -@@ -124,6 +141,7 @@ fdimage fdimage144 fdimage288: vmlinux - - install: - $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install -+endif - - archclean: - $(Q)$(MAKE) $(clean)=arch/i386/boot -diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/drivers/acpi/processor_idle.c linux-2.6.15.i686/drivers/acpi/processor_idle.c ---- linux-2.6.15.orig/drivers/acpi/processor_idle.c 2006-01-25 18:16:41.000000000 -0500 -+++ linux-2.6.15.i686/drivers/acpi/processor_idle.c 2006-01-26 09:45:56.000000000 -0500 -@@ -878,7 +879,7 @@ static int acpi_processor_power_verify(s - unsigned int i; - unsigned int working = 0; - --#ifdef ARCH_APICTIMER_STOPS_ON_C3 -+#if defined(ARCH_APICTIMER_STOPS_ON_C3) && !defined(CONFIG_XEN) - struct cpuinfo_x86 *c = cpu_data + pr->id; - cpumask_t mask = cpumask_of_cpu(pr->id); - -@@ -901,7 +902,7 @@ static int acpi_processor_power_verify(s - - case ACPI_STATE_C3: - acpi_processor_power_verify_c3(pr, cx); --#ifdef ARCH_APICTIMER_STOPS_ON_C3 -+#if defined(ARCH_APICTIMER_STOPS_ON_C3) && !defined(CONFIG_XEN) - if (c->x86_vendor == X86_VENDOR_INTEL) { - on_each_cpu(switch_APIC_timer_to_ipi, - &mask, 1, 1); ++# cherrypickxen($1 = allobj) ++cherrypickxen = $(foreach var, $(1), \ ++ $(shell o=$(var); \ ++ c=$${o/%.o/-xen.c}; \ ++ s=$${o/%.o/-xen.S}; \ ++ oxen=$${o/%.o/-xen.o}; \ ++ [ -f $(srctree)/$(src)/$${c} ] || \ ++ [ -f $(srctree)/$(src)/$${s} ] \ ++ && echo $$oxen \ ++ || echo $(var) ) \ ++ ) ++# filterxen($1 = allobj, $2 = noobjs) ++filterxen = $(filter-out $(2), $(1)) Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 26 Jan 2006 22:14:35 -0000 1.8 +++ sources 27 Jan 2006 22:31:07 -0000 1.9 @@ -1,5 +1,5 @@ cdf95e00f5111e31f78e1d97304d9522 linux-2.6.15.tar.bz2 -2f072f3527bb24f37b46f4622a4404fe xen-20060106.tar.bz2 ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2 a247c21e1202f514283ba928d9382353 patch-2.6.16-rc1-git4.bz2 +6a61bb016042f108705ffb2efdce1053 xen-20060127.tar.bz2 --- linux-2.6.12-xen.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 27 22:56:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 17:56:12 -0500 Subject: rpms/system-config-display/devel .cvsignore, 1.24, 1.25 sources, 1.27, 1.28 system-config-display.spec, 1.30, 1.31 Message-ID: <200601272256.k0RMuCQO003878@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/system-config-display/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3839 Modified Files: .cvsignore sources system-config-display.spec Log Message: Update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 12 Jan 2006 18:45:26 -0000 1.24 +++ .cvsignore 27 Jan 2006 22:56:10 -0000 1.25 @@ -1,3 +1,4 @@ system-config-display-1.0.33.tar.bz2 system-config-display-1.0.34.tar.bz2 system-config-display-1.0.35.tar.bz2 +system-config-display-1.0.36.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 12 Jan 2006 18:47:43 -0000 1.27 +++ sources 27 Jan 2006 22:56:10 -0000 1.28 @@ -1 +1,2 @@ 504d385f7ebe2ed13ba0ae6267439170 system-config-display-1.0.35.tar.bz2 +f84d58d96d8094cd71d3d0d664ef14db system-config-display-1.0.36.tar.bz2 Index: system-config-display.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/system-config-display.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- system-config-display.spec 12 Jan 2006 18:45:26 -0000 1.30 +++ system-config-display.spec 27 Jan 2006 22:56:10 -0000 1.31 @@ -1,6 +1,6 @@ Summary: A graphical interface for configuring the X Window System display Name: system-config-display -Version: 1.0.35 +Version: 1.0.36 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -79,6 +79,10 @@ %attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-display.png %changelog +* Fri Jan 27 2006 Paul Nasrat - 1.0.36-1 +- Rebuild for translations +- Fix reconfig mode + * Thu Jan 12 2006 Soren Sandmann - 1.0.35-1 - Rebuild From fedora-cvs-commits at redhat.com Fri Jan 27 22:56:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 17:56:30 -0500 Subject: rpms/system-config-display/devel sources,1.28,1.29 Message-ID: <200601272256.k0RMuU35004031@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/system-config-display/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4001 Modified Files: sources Log Message: remove old src Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-display/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 27 Jan 2006 22:56:10 -0000 1.28 +++ sources 27 Jan 2006 22:56:27 -0000 1.29 @@ -1,2 +1 @@ -504d385f7ebe2ed13ba0ae6267439170 system-config-display-1.0.35.tar.bz2 f84d58d96d8094cd71d3d0d664ef14db system-config-display-1.0.36.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 23:25:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 18:25:21 -0500 Subject: rpms/kdebase/FC-4 kdebase-3.4.2-kdesktop-konsole.patch, NONE, 1.1 kdebase-3.5.1-redhat.patch, NONE, 1.1 kdebase.spec, 1.113, 1.114 sources, 1.57, 1.58 admin-visibility.patch, 1.3, NONE kdebase-3.1.1-usb.patch, 1.1, NONE kdebase-3.2.0-selinux.patch, 1.1, NONE kdebase-3.2.2-nedit.patch, 1.1, NONE kdebase-3.3.1-man.patch, 1.1, NONE kdebase-3.3.92-fstab.patch, 1.2, NONE kdebase-3.3.92-servicebutton-saveas.patch, 1.2, NONE kdebase-3.4.0-config.patch, 1.2, NONE kdebase-3.4.0-fonts.patch, 1.1, NONE kdebase-3.4.0-kdesktop-konsole.patch, 1.1, NONE kdebase-3.4.0-monospace.patch, 1.2, NONE kdebase-3.4.0rc1-konsole-keymap.patch, 1.4, NONE kdebase-3.4.1-redhat.patch, 1.1, NONE Message-ID: <200601272325.k0RNPLZl026911@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26774 Modified Files: kdebase.spec sources Added Files: kdebase-3.4.2-kdesktop-konsole.patch kdebase-3.5.1-redhat.patch Removed Files: admin-visibility.patch kdebase-3.1.1-usb.patch kdebase-3.2.0-selinux.patch kdebase-3.2.2-nedit.patch kdebase-3.3.1-man.patch kdebase-3.3.92-fstab.patch kdebase-3.3.92-servicebutton-saveas.patch kdebase-3.4.0-config.patch kdebase-3.4.0-fonts.patch kdebase-3.4.0-kdesktop-konsole.patch kdebase-3.4.0-monospace.patch kdebase-3.4.0rc1-konsole-keymap.patch kdebase-3.4.1-redhat.patch Log Message: 3.5.1 kdebase-3.4.2-kdesktop-konsole.patch: krootwm.cc | 19 +++++++++++++++++++ krootwm.h | 1 + 2 files changed, 20 insertions(+) --- NEW FILE kdebase-3.4.2-kdesktop-konsole.patch --- --- kdebase-3.4.2/kdesktop/krootwm.h.kdestop-konsole 2005-05-23 14:14:38.000000000 +0200 +++ kdebase-3.4.2/kdesktop/krootwm.h 2005-07-26 22:22:46.000000000 +0200 @@ -117,6 +117,7 @@ void slotSessionActivated( int ); void slotNewSession(); void slotLockNNewSession(); + void slotOpenTerminal(); private: KDesktop* m_pDesktop; --- kdebase-3.4.2/kdesktop/krootwm.cc.kdestop-konsole 2005-07-20 12:03:58.000000000 +0200 +++ kdebase-3.4.2/kdesktop/krootwm.cc 2005-09-05 14:41:33.000000000 +0200 @@ -50,6 +50,7 @@ #include #include +#include #include "krootwm.h" #include "kdiconview.h" #include "desktop.h" @@ -79,6 +80,9 @@ customMenu2 = 0; + new KAction(i18n("Konsole..." ), "openterm", 0, this, SLOT( slotOpenTerminal() ), + m_actionCollection, "open_terminal" ); + // Creates the new menu menuBar = 0; // no menubar yet menuNew = 0; @@ -131,6 +135,7 @@ { new KAction(i18n("Run Command..."), "run", 0, m_pDesktop, SLOT( slotExecuteCommand() ), m_actionCollection, "exec" ); } + if (!KGlobal::config()->isImmutable()) { new KAction(i18n("Configure Desktop..."), "configure", 0, this, SLOT( slotConfigureDesktop() ), @@ -366,6 +371,13 @@ desktopMenu->disconnect( this ); bool needSeparator = false; + action = m_actionCollection->action("open_terminal"); + if (action) + { + action->plug( desktopMenu ); + needSeparator = true; + } + if (menuNew) { menuNew->plug( desktopMenu ); @@ -693,6 +705,13 @@ return args; } +void KRootWm::slotOpenTerminal() +{ + KProcess proc; + proc << locate("exe", "konsole"); + proc.start(KProcess::DontCare); +} + void KRootWm::slotConfigureDesktop() { QStringList args = configModules(); args.prepend(i18n("Desktop")); kdebase-3.5.1-redhat.patch: kde.pamd | 14 ++++++++------ startkde | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 59 insertions(+), 9 deletions(-) --- NEW FILE kdebase-3.5.1-redhat.patch --- --- kdebase-3.5.0/startkde.redhat 2005-09-10 15:03:40.000000000 +0200 +++ kdebase-3.5.0/startkde 2005-09-29 16:16:19.000000000 +0200 @@ -1,8 +1,56 @@ #!/bin/sh # # DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.1 ) +# Modified for Red Hat Linux # +unset BLOCK_SIZE # breaks parsing of df output +shopt -u -o noclobber # allow overwriting of files with '>' + +# set up user environment if not present +# check for space on /tmp and "$HOME" and for write access +# error exit, if not +space_tmp=`df /tmp | xargs | cut -d" " -f11` +homedir_mount=`df "$HOME" | xargs | cut -d" " -f8` + +if [ "$homedir_mount" = "AFS" -a -x "`which fs 2>/dev/null`" ] ; then + # check for AFS + space_home=`fs df "$HOME" | xargs | cut -d" " -f10` +else + # check regular mounts + space_home=`df "$HOME" | xargs | cut -d" " -f11` +fi + +if [ $space_tmp -lt 50 ]; then + echo $"Not enough free disk space on /tmp" + exit 1 +fi + +if [ $space_home -lt 25 ]; then + echo $"Not enough free disk space on "$HOME"" + exit 1 +fi +testfile_tmp=`mktemp /tmp/KDE.startkde.XXXXXX` +testfile_home=`mktemp "$HOME"/KDE.startkde.XXXXXX` + +if ! echo TEST_TEXT >$testfile_tmp 2>/dev/null ; then + echo $"You don't have write permissions for /tmp" + exit 1 +fi +rm -f $testfile_tmp + +if ! echo TEST_TEXT >$testfile_home 2>/dev/null ; then + echo $"You don't have write permissions for "$HOME"" + exit 1 +fi +rm -f $testfile_home + +[ -d "$HOME"/.kde/share/config ] || mkdir -p "$HOME"/.kde/share/config + +if [ ! -e "$HOME"/.kde/share/config/emaildefaults ]; then + /usr/bin/mailsettings >"$HOME"/.kde/share/config/emaildefaults +fi + # When the X server dies we get a HUP signal from xinit. We must ignore it # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP @@ -14,12 +62,12 @@ exit 1 fi -# Set the background to plain grey. +# Set the background to the Red Hat default blue # The standard X background is nasty, causing moire effects and exploding # people's heads. We use colours from the standard KDE palette for those with # palettised displays. if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then - xsetroot -solid "#000000" + xsetroot -solid "#5477A0" fi # we have to unset this for Darwin since it will screw up KDE's dynamic-loading @@ -64,7 +112,7 @@ cat >$kdehome/share/config/startupconfigkeys <= 6:%{version} Requires: libxml2 >= 2.6.5 Requires: /etc/X11/xdm/Xaccess @@ -129,39 +117,25 @@ %patch0 -p1 -b .redhat %patch3 -p1 -b .vroot %patch4 -p1 -b .shortcuts -%patch5 -p1 -b .fonts -%patch13 -p1 -b .config -%patch33 -p1 -b .fontkonsole %patch40 -p1 -b .keymap %patch48 -p1 -b .kdesukonsole %patch56 -p1 -b .libtool %patch57 -p1 -%patch65 -p1 -b .usb %patch71 -p1 -b .konsole %patch74 -p1 -b .kper -%patch75 -p1 -b .selinux -%patch77 -p1 -b .nedit %patch80 -p1 -b .logo %patch81 -p1 -b .im %patch83 -p1 -b .altf2 -%patch85 -p1 -b .kioslave -%patch87 -p1 -b .man -%patch89 -p1 -b .saveas -%patch90 -p1 -b .konsole %patch91 -p1 -b .kdestop-konsole %patch92 -p1 -b .xdg %patch93 -p1 -b .loginuid -# gcc 4 workaround -%patch200 -p1 -b .gcc4 - %if %{rhel} rm -rf kdeprint/kdeprintfax perl -pi -e "s,kdeprintfax,," kdeprint/Makefile.am %endif %if %redhatify - cp %{SOURCE1} konsole # set Konqueror version perl -pi -e "s,^#define.*KONQUEROR_VERSION.*,#define KONQUEROR_VERSION \"%{version}-%{release} Red Hat\"," konqueror/version.h %endif @@ -175,20 +149,13 @@ export CFLAGS="$FLAGS" export KDEDIR=%{_prefix} -%if 0 -if pkg-config openssl ; then - CFLAGS="$CFLAGS `pkg-config --cflags openssl`" - CXXFLAGS="$CXXFLAGS `pkg-config --cflags openssl`" - CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`" - LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`" -fi -%endif - %if %{make_cvs} make -f admin/Makefile.common cvs %endif %configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ --with-qt-libraries=$QTDIR/lib \ --with-extra-libs=%{_libdir} \ --with-xdmdir=%{_sysconfdir}/X11/xdm \ @@ -210,6 +177,7 @@ %endif %if %{debug} == 0 --disable-debug \ + --disable-warnings \ %else --enable-debug \ %endif @@ -436,6 +404,24 @@ %{_includedir}/kde/ksplash/* %changelog +* Fri Jan 27 2006 Than Ngo 6:3.5.1-0.1.fc4 +- 3.5.1 + +* Wed Dec 07 2005 Than Ngo 6:3.5.0-0.1.fc4 +- 3.5 + +* Thu Sep 01 2005 Than Ngo 6:3.4.2-0.fc4.3 +- apply patch to fix local root vulnerability in kcheckpass #166997 +- apply upstream patch to fix kinfocenter opengl DRI/GLX crash +- apply patch to fix konqueror fails to enter directories + that begin with [ (#169067) + +* Wed Aug 17 2005 Than Ngo 6:3.4.2-0.fc4.2 +- enable switching users #166112 + +* Tue Jul 26 2005 Than Ngo 3.4.2-0.fc4.1 +- update to 3.4.2 + * Mon Jun 13 2005 Than Ngo 3.4.1-0.fc4.1 - 3.4.1 - update pam configuration for the new audit system #159333 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdebase/FC-4/sources,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- sources 13 Jun 2005 16:36:34 -0000 1.57 +++ sources 27 Jan 2006 23:25:17 -0000 1.58 @@ -1,2 +0,0 @@ -776b3f900740f021b4df3871e596aa6f kde-redhat-config-3.2.0-0.9.tar.bz2 -8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 --- admin-visibility.patch DELETED --- --- kdebase-3.1.1-usb.patch DELETED --- --- kdebase-3.2.0-selinux.patch DELETED --- --- kdebase-3.2.2-nedit.patch DELETED --- --- kdebase-3.3.1-man.patch DELETED --- --- kdebase-3.3.92-fstab.patch DELETED --- --- kdebase-3.3.92-servicebutton-saveas.patch DELETED --- --- kdebase-3.4.0-config.patch DELETED --- --- kdebase-3.4.0-fonts.patch DELETED --- --- kdebase-3.4.0-kdesktop-konsole.patch DELETED --- --- kdebase-3.4.0-monospace.patch DELETED --- --- kdebase-3.4.0rc1-konsole-keymap.patch DELETED --- --- kdebase-3.4.1-redhat.patch DELETED --- From fedora-cvs-commits at redhat.com Fri Jan 27 23:34:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 18:34:14 -0500 Subject: rpms/kdebase/FC-4 .cvsignore, 1.38, 1.39 sources, 1.58, 1.59 start-here.png, 1.1, NONE Message-ID: <200601272334.k0RNYEXx029265@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv29247 Modified Files: .cvsignore sources Removed Files: start-here.png Log Message: 3.5.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kdebase/FC-4/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 13 Jun 2005 16:36:34 -0000 1.38 +++ .cvsignore 27 Jan 2006 23:34:12 -0000 1.39 @@ -12,3 +12,5 @@ kde-redhat-config-3.2.0-0.8.tar.bz2 kde-redhat-config-3.2.0-0.9.tar.bz2 kdebase-3.4.1.tar.bz2 +kde-redhat-config-3.4.2-fc4-0.2.tar.bz2 +kdebase-3.5.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/kdebase/FC-4/sources,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- sources 27 Jan 2006 23:25:17 -0000 1.58 +++ sources 27 Jan 2006 23:34:12 -0000 1.59 @@ -0,0 +1,2 @@ +889e9b46e762950a4a78dec0d5cb91f4 kde-redhat-config-3.4.2-fc4-0.2.tar.bz2 +484c7b3895ce4f95173f4789571eb1cc kdebase-3.5.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 23:58:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 18:58:22 -0500 Subject: rpms/evolution/devel evolution-2.5.5.1-commit-enter-on-calendar.patch, NONE, 1.1 evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch, NONE, 1.1 .cvsignore, 1.41, 1.42 evolution-2.5.4-fix-missing-declarations.patch, 1.2, 1.3 evolution-2.5.4-port-to-new-libnotify-api.patch, 1.2, 1.3 evolution.spec, 1.117, 1.118 sources, 1.41, 1.42 Message-ID: <200601272358.k0RNwLFq019386@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19256 Modified Files: .cvsignore evolution-2.5.4-fix-missing-declarations.patch evolution-2.5.4-port-to-new-libnotify-api.patch evolution.spec sources Added Files: evolution-2.5.5.1-commit-enter-on-calendar.patch evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch Log Message: * Wed Jan 25 2006 David Malcolm - 2.5.5.1-1 - 2.5.5.1 - update patch 106 to track upstream, renaming from evolution-2.2.2-commit-enter-on-calendar.patch to evolution-2.5.5.1-commit-enter-on-calendar.patch - update patch 805 to track upstream - added patch to fix some newly missing declarations (patch 808) - replace evolution-2.5.4-port-to-new-libnotify-api.patch with evolution-2.5.5.1-notification-cleanups.patch, since much of this was duplicated by another patch that landed upstream; removing the actions code as it was crashing deep inside DBus (patch 806, #177666) - explicitly list various files to reduce reliance on globbing; organized the files into logical groups; comment them - added -Wno-sign-compare to CFLAGS - enabled parallel make - introduced require_function_declarations macro to make -Werror-implicit-function-declaration flag optional; turn it off for now - include the new CalDAV and mail-attachments-import plugins in the file list; add an XML UI file for the mail-to-task plugin. - use "sed -i -e" rather than "sed -ie" to avoid getting severe bonobo files evolution-2.5.5.1-commit-enter-on-calendar.patch: e-day-view.c | 106 ++++++++++++++++++++++++++++++++++++++-------------------- e-week-view.c | 71 +++++++++++++++++++++++++++----------- 2 files changed, 122 insertions(+), 55 deletions(-) --- NEW FILE evolution-2.5.5.1-commit-enter-on-calendar.patch --- --- evolution-2.5.5.1/calendar/gui/e-day-view.c.commit-enter-on-calendar 2006-01-16 09:42:17.000000000 -0500 +++ evolution-2.5.5.1/calendar/gui/e-day-view.c 2006-01-25 23:48:24.000000000 -0500 @@ -334,6 +334,10 @@ gint event_num, gchar *initial_text); static void e_day_view_stop_editing_event (EDayView *day_view); +static gboolean e_day_view_text_keypress (GnomeCanvasItem *item, + guint keyval, + guint state, + EDayView *day_view); static gboolean e_day_view_on_text_item_event (GnomeCanvasItem *item, GdkEvent *event, EDayView *day_view); @@ -4484,6 +4488,8 @@ G_CALLBACK (e_day_view_on_text_item_event), day_view); g_signal_emit_by_name (G_OBJECT(day_view), "event_added", event); + g_signal_connect (event->canvas_item, "keypress", + G_CALLBACK (e_day_view_text_keypress), day_view); e_day_view_update_long_event_label (day_view, event_num); } @@ -4667,6 +4673,8 @@ G_CALLBACK (e_day_view_on_text_item_event), day_view); g_signal_emit_by_name (G_OBJECT(day_view), "event_added", event); + g_signal_connect (event->canvas_item, "keypress", + G_CALLBACK (e_day_view_text_keypress), day_view); e_day_view_update_event_label (day_view, day, event_num); } @@ -5824,46 +5832,74 @@ } static gboolean +e_day_view_text_keypress (GnomeCanvasItem *item, + guint keyval, + guint state, + EDayView *day_view) +{ + gboolean retval = FALSE; + + tooltip_destroy (day_view, item); + + if (keyval == GDK_Return) { + EText *text = E_TEXT (item); + gint new_pos = 0; + + /* + * HACK: last character which should be \n needs to be deleted + * here so that GDK_Return was already processed on EText + * before E_TEXT_KEYPRESS event is emitted. + */ + if (text->selection_end >= 1) + new_pos = text->selection_end - 1; + + text->selection_end = e_text_model_validate_position (text->model, new_pos); + e_text_delete_selection (text); + + day_view->resize_event_num = -1; + + /* We set the keyboard focus to the EDayView, so the + EText item loses it and stops the edit. */ + gtk_widget_grab_focus (GTK_WIDGET (day_view)); + + /* Stop the signal last or we will also stop any + other events getting to the EText item. */ + gtk_signal_emit_stop_by_name (GTK_OBJECT (item), + "event"); + + retval = TRUE; + } else if (keyval == GDK_Escape) { + cancel_editing (day_view); + gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event"); + /* focus should go to day view when stop editing */ + gtk_widget_grab_focus (GTK_WIDGET (day_view)); + + retval = TRUE; + } else if ((keyval == GDK_Up) + && (state & GDK_SHIFT_MASK) + && (state & GDK_CONTROL_MASK) + && !(state & GDK_MOD1_MASK)) { + e_day_view_change_event_end_time_up (day_view); + + retval = TRUE; + } else if ((keyval == GDK_Down) + && (state & GDK_SHIFT_MASK) + && (state & GDK_CONTROL_MASK) + && !(state & GDK_MOD1_MASK)) { + e_day_view_change_event_end_time_down (day_view); + + retval = TRUE; + } + + return retval; +} + +static gboolean e_day_view_on_text_item_event (GnomeCanvasItem *item, GdkEvent *event, EDayView *day_view) { switch (event->type) { - case GDK_KEY_PRESS: - tooltip_destroy (day_view, item); - if (event && event->key.keyval == GDK_Return) { - day_view->resize_event_num = -1; - day_view->resize_event_num = -1; - - /* We set the keyboard focus to the EDayView, so the - EText item loses it and stops the edit. */ - gtk_widget_grab_focus (GTK_WIDGET (day_view)); - - /* Stop the signal last or we will also stop any - other events getting to the EText item. */ - gtk_signal_emit_stop_by_name (GTK_OBJECT (item), - "event"); - return TRUE; - } else if (event->key.keyval == GDK_Escape) { - cancel_editing (day_view); - gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event"); - /* focus should go to day view when stop editing */ - gtk_widget_grab_focus (GTK_WIDGET (day_view)); - return TRUE; - } else if ((event->key.keyval == GDK_Up) - && (event->key.state & GDK_SHIFT_MASK) - && (event->key.state & GDK_CONTROL_MASK) - && !(event->key.state & GDK_MOD1_MASK)) { - e_day_view_change_event_end_time_up (day_view); - return TRUE; - } else if ((event->key.keyval == GDK_Down) - && (event->key.state & GDK_SHIFT_MASK) - && (event->key.state & GDK_CONTROL_MASK) - && !(event->key.state & GDK_MOD1_MASK)) { - e_day_view_change_event_end_time_down (day_view); - return TRUE; - } - break; case GDK_2BUTTON_PRESS: #if 0 g_print ("Item got double-click\n"); --- evolution-2.5.5.1/calendar/gui/e-week-view.c.commit-enter-on-calendar 2006-01-16 09:42:17.000000000 -0500 +++ evolution-2.5.5.1/calendar/gui/e-week-view.c 2006-01-25 23:46:43.000000000 -0500 @@ -175,6 +175,10 @@ const gchar *uid, EWeekViewForeachEventCallback callback, gpointer data); +static gboolean e_week_view_text_keypress (GnomeCanvasItem *item, + guint keyval, + guint state, + EWeekView *week_view); static gboolean e_week_view_on_text_item_event (GnomeCanvasItem *item, GdkEvent *event, EWeekView *week_view); @@ -2771,6 +2775,8 @@ week_view); g_signal_emit_by_name (G_OBJECT(week_view), "event_added", event); + g_signal_connect (span->text_item, "keypress", + G_CALLBACK (e_week_view_text_keypress), week_view); } @@ -3028,6 +3034,51 @@ } static gboolean +e_week_view_text_keypress (GnomeCanvasItem *item, + guint keyval, + guint state, + EWeekView *week_view) +{ + gboolean retval = FALSE; + + tooltip_destroy (week_view, item); + + if (keyval == GDK_Return) { + EText *text = E_TEXT (item); + gint new_pos = 0; + + /* + * HACK: last charater which should be \n needs to be deleted + * here so that GDK_Return was already processed on EText + * before E_TEXT_KEYPRESS event is emitted. + */ + if (text->selection_end >= 1) + new_pos = text->selection_end - 1; + + text->selection_end = e_text_model_validate_position (text->model, new_pos); + e_text_delete_selection (text); + + /* We set the keyboard focus to the EDayView, so the + EText item loses it and stops the edit. */ + gtk_widget_grab_focus (GTK_WIDGET (week_view)); + + /* Stop the signal last or we will also stop any + other events getting to the EText item. */ + gtk_signal_emit_stop_by_name (GTK_OBJECT (item), + "event"); + retval = TRUE; + } else if (keyval == GDK_Escape) { + cancel_editing (week_view); + gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event"); + /* focus should go to week view when stop editing */ + gtk_widget_grab_focus (GTK_WIDGET (week_view)); + retval = TRUE; + } + + return retval; +} + +static gboolean e_week_view_on_text_item_event (GnomeCanvasItem *item, GdkEvent *gdkevent, EWeekView *week_view) @@ -3044,26 +3095,6 @@ #endif switch (gdkevent->type) { - case GDK_KEY_PRESS: - tooltip_destroy (week_view, item); - if (gdkevent && gdkevent->key.keyval == GDK_Return) { - /* We set the keyboard focus to the EDayView, so the - EText item loses it and stops the edit. */ - gtk_widget_grab_focus (GTK_WIDGET (week_view)); - - /* Stop the signal last or we will also stop any - other events getting to the EText item. */ - gtk_signal_emit_stop_by_name (GTK_OBJECT (item), - "event"); - return TRUE; - } else if (gdkevent->key.keyval == GDK_Escape) { - cancel_editing (week_view); - gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event"); - /* focus should go to week view when stop editing */ - gtk_widget_grab_focus (GTK_WIDGET (week_view)); - return TRUE; - } - break; case GDK_2BUTTON_PRESS: if (!e_week_view_find_event_from_item (week_view, item, &event_num, &span_num)) evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch: a11y/calendar/ea-gnome-calendar.c | 1 + calendar/gui/dialogs/alarm-dialog.c | 3 ++- calendar/gui/dialogs/comp-editor-page.h | 4 ++++ calendar/gui/e-calendar-view.c | 1 + mail/message-list.h | 2 ++ plugins/import-ics-attachments/icsimporter.c | 2 ++ widgets/table/e-tree-table-adapter.h | 3 ++- widgets/table/e-tree.h | 2 ++ 8 files changed, 16 insertions(+), 2 deletions(-) --- NEW FILE evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch --- --- evolution-2.5.5.1/calendar/gui/dialogs/comp-editor-page.h.fix-missing-declarations-2.5.5.1 2006-01-26 08:47:44.000000000 -0500 +++ evolution-2.5.5.1/calendar/gui/dialogs/comp-editor-page.h 2006-01-26 08:48:00.000000000 -0500 @@ -107,6 +107,10 @@ ECal *client); void comp_editor_page_set_summary (CompEditorPage *page, const char *summary); +void comp_editor_page_unset_focused_widget (CompEditorPage *page, + GtkWidget *widget); +void comp_editor_page_set_focused_widget (CompEditorPage *page, + GtkWidget *widget); void comp_editor_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates); void comp_editor_page_notify_changed (CompEditorPage *page); --- evolution-2.5.5.1/calendar/gui/dialogs/alarm-dialog.c.fix-missing-declarations-2.5.5.1 2006-01-26 08:37:02.000000000 -0500 +++ evolution-2.5.5.1/calendar/gui/dialogs/alarm-dialog.c 2006-01-26 08:39:20.000000000 -0500 @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -855,7 +856,7 @@ case E_CAL_COMPONENT_ALARM_AUDIO: dir = calendar_config_get_dir_path (); if ( dir && *dir ) - gnome_file_entry_set_default_path (dialog->aalarm_file_entry, dir); + gnome_file_entry_set_default_path ( GNOME_FILE_ENTRY(dialog->aalarm_file_entry), dir); check_custom_sound (dialog); break; --- evolution-2.5.5.1/calendar/gui/e-calendar-view.c.fix-missing-declarations-2.5.5.1 2006-01-26 08:49:54.000000000 -0500 +++ evolution-2.5.5.1/calendar/gui/e-calendar-view.c 2006-01-26 08:53:47.000000000 -0500 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include "e-calendar-marshal.h" #include --- evolution-2.5.5.1/plugins/import-ics-attachments/icsimporter.c.fix-missing-declarations-2.5.5.1 2006-01-26 09:08:09.000000000 -0500 +++ evolution-2.5.5.1/plugins/import-ics-attachments/icsimporter.c 2006-01-26 09:13:50.000000000 -0500 @@ -34,6 +34,7 @@ #include #include #include +#include #include "e-attachment-bar.h" #include #include "e-util/e-error.h" @@ -45,6 +46,7 @@ #include #include #include +#include "calendar/common/authentication.h" typedef struct { ECal *client; --- evolution-2.5.5.1/mail/message-list.h.fix-missing-declarations-2.5.5.1 2006-01-26 08:56:50.000000000 -0500 +++ evolution-2.5.5.1/mail/message-list.h 2006-01-26 08:58:05.000000000 -0500 @@ -182,6 +182,8 @@ GPtrArray *message_list_get_selected(MessageList *ml); void message_list_set_selected(MessageList *ml, GPtrArray *uids); void message_list_free_uids(MessageList *ml, GPtrArray *uids); +void message_list_set_threaded_expand_all (MessageList *ml); +void message_list_set_threaded_collapse_all (MessageList *ml); /* select next/prev message helpers */ gboolean message_list_select (MessageList *message_list, --- evolution-2.5.5.1/a11y/calendar/ea-gnome-calendar.c.fix-missing-declarations-2.5.5.1 2006-01-26 08:22:16.000000000 -0500 +++ evolution-2.5.5.1/a11y/calendar/ea-gnome-calendar.c 2006-01-26 08:24:29.000000000 -0500 @@ -29,6 +29,7 @@ #include #include #include +#include static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass); --- evolution-2.5.5.1/widgets/table/e-tree.h.fix-missing-declarations-2.5.5.1 2006-01-26 09:02:36.000000000 -0500 +++ evolution-2.5.5.1/widgets/table/e-tree.h 2006-01-26 09:04:08.000000000 -0500 @@ -287,6 +287,8 @@ char *filename); void e_tree_load_expanded_state (ETree *et, char *filename); +void e_tree_load_all_expanded_state (ETree *et, + gboolean state); int e_tree_row_count (ETree *et); GtkWidget *e_tree_get_tooltip (ETree *et); --- evolution-2.5.5.1/widgets/table/e-tree-table-adapter.h.fix-missing-declarations-2.5.5.1 2006-01-26 08:27:35.000000000 -0500 +++ evolution-2.5.5.1/widgets/table/e-tree-table-adapter.h 2006-01-26 08:27:37.000000000 -0500 @@ -86,7 +86,8 @@ const char *filename); void e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, const char *filename); - +void e_tree_table_adapter_load_all_expanded_state (ETreeTableAdapter *etta, + gboolean state); void e_tree_table_adapter_set_sort_info (ETreeTableAdapter *etta, ETableSortInfo *sort_info); Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- .cvsignore 4 Jan 2006 06:07:52 -0000 1.41 +++ .cvsignore 27 Jan 2006 23:58:18 -0000 1.42 @@ -1 +1 @@ -evolution-2.5.4.tar.bz2 +evolution-2.5.5.1.tar.bz2 evolution-2.5.4-fix-missing-declarations.patch: calendar/gui/e-meeting-list-view.c | 1 + plugins/publish-calendar/publish-format-fb.c | 1 + shell/e-shell.h | 1 + 3 files changed, 3 insertions(+) Index: evolution-2.5.4-fix-missing-declarations.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.4-fix-missing-declarations.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- evolution-2.5.4-fix-missing-declarations.patch 4 Jan 2006 19:49:28 -0000 1.2 +++ evolution-2.5.4-fix-missing-declarations.patch 27 Jan 2006 23:58:18 -0000 1.3 @@ -28,14 +28,3 @@ #ifdef __cplusplus } ---- evolution-2.5.4/mail/mail-tools.c.fix-missing-declarations-2-5-4 2006-01-02 06:38:59.000000000 -0500 -+++ evolution-2.5.4/mail/mail-tools.c 2006-01-04 14:40:40.000000000 -0500 -@@ -100,7 +100,7 @@ - return trash; - } - --#if 0 -+#if 1 - /* Not used */ - - static char * evolution-2.5.4-port-to-new-libnotify-api.patch: alarm-queue.c | 47 +++++++++++++++++++++-------------------------- 1 files changed, 21 insertions(+), 26 deletions(-) Index: evolution-2.5.4-port-to-new-libnotify-api.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.4-port-to-new-libnotify-api.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- evolution-2.5.4-port-to-new-libnotify-api.patch 12 Jan 2006 23:34:45 -0000 1.2 +++ evolution-2.5.4-port-to-new-libnotify-api.patch 27 Jan 2006 23:58:18 -0000 1.3 @@ -1,27 +1,6 @@ --- evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api 2006-01-02 06:38:57.000000000 -0500 -+++ evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c 2006-01-12 18:31:17.000000000 -0500 -@@ -1448,31 +1448,42 @@ - } - - #ifdef HAVE_LIBNOTIFY -+static void -+notify_cb_open_component (NotifyNotification *notification, gchar *user_data) -+{ -+ ECal *cal = E_CAL (g_object_get_data( G_OBJECT(notification), "cal")); -+ ECalComponent *comp = E_CAL_COMPONENT (g_object_get_data( G_OBJECT(notification), "comp")); -+ -+ edit_component (cal, comp); -+ -+ notify_notification_close (notification, NULL); -+} -+ - static void - popup_notification (time_t trigger, CompQueuedAlarms *cqa, - gpointer alarm_id, gboolean use_description) - { - QueuedAlarm *qa; -+ ECal *cal; - ECalComponent *comp; ++++ evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c 2006-01-13 19:09:29.000000000 -0500 +@@ -1457,22 +1457,21 @@ const char *summary, *location; GtkTooltips *tooltips; ECalComponentText text; @@ -33,13 +12,14 @@ - char *filename; + GdkPixbuf *icon; char *body; +- + NotifyNotification *notification; - -+ cal = cqa->parent_client->client; ++ comp = cqa->alarms->comp; qa = lookup_queued_alarm (cqa, alarm_id); if (!qa) return; ++ if (!notify_is_initted ()) notify_init("Evolution Alarm Notify"); - filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG); @@ -49,7 +29,7 @@ /* get a sensible description for the event */ e_cal_component_get_summary (comp, &text); -@@ -1495,9 +1506,6 @@ +@@ -1495,9 +1494,6 @@ end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone); time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end); @@ -59,7 +39,7 @@ if (organiser.cn) { if (location) body = g_strdup_printf ("%s\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str); -@@ -1508,28 +1516,45 @@ +@@ -1508,28 +1504,27 @@ if (location) body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str); else @@ -67,8 +47,6 @@ -} + body = g_strdup_printf ("%s %s", start_str, time_str); + } -+ -+ notification = notify_notification_new (summary, body, "", tray_event_box); - if (!notify_send_notification ( - NULL, "device", NOTIFY_URGENCY_NORMAL, @@ -80,6 +58,9 @@ - NULL, /* no user_data */ - 0)) /* no actions */ - g_warning ("Could not send notification to daemon\n"); ++ notification = notify_notification_new (summary, body, "", tray_event_box); + +- /* create the private structure */ + if (icon) { + notify_notification_set_icon_data_from_pixbuf (notification, icon); + g_object_unref (G_OBJECT(icon)); @@ -88,25 +69,6 @@ + /* Notifications don't timeout, require explicit user action: */ + notify_notification_set_timeout (notification, NOTIFY_TIMEOUT_NEVER); + -+ -+ g_object_ref (G_OBJECT(comp)); -+ g_object_set_data_full ( G_OBJECT(notification), -+ "comp", -+ comp, -+ g_object_unref); -+ -+ g_object_ref (G_OBJECT(cal)); -+ g_object_set_data_full ( G_OBJECT(notification), -+ "cal", -+ cal, -+ g_object_unref); - -- /* create the private structure */ -+ notify_notification_add_action (notification, -+ "open", -+ _("Open"), -+ notify_cb_open_component); -+ + if (!notify_notification_show_and_forget (notification, NULL)) + g_warning ("Error showing notification\n"); + Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- evolution.spec 19 Jan 2006 13:24:04 -0000 1.117 +++ evolution.spec 27 Jan 2006 23:58:18 -0000 1.118 @@ -27,13 +27,18 @@ %define nm_support 1 %define libnotify_support 1 +# Upstream tarballs often contain instances of undeclared functions; these tend +# to work on i386 but fail on 64-bit architectures. Leave this on to trap the +# warnings as errors (and ideally get the flag into the upstream build): +%define require_function_declarations 0 + %define redhat_menus_version 5.0.4 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins Name: evolution -Version: 2.5.4 -Release: 10 +Version: 2.5.5.1 +Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -56,7 +61,7 @@ #Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch # Fix for RH bug #154360: -Patch106: evolution-2.2.2-commit-enter-on-calendar.patch +Patch106: evolution-2.5.5.1-commit-enter-on-calendar.patch # Move autosave file Patch107: evolution-2.5.4-move-autosave-file.patch @@ -92,8 +97,9 @@ Patch804: evolution-2.4.1-fix-missing-declarations.patch Patch805: evolution-2.5.4-fix-missing-declarations.patch -Patch806: evolution-2.5.4-port-to-new-libnotify-api.patch +Patch806: evolution-2.5.5.1-notification-cleanups.patch Patch807: evolution-2.5.4-fix-nm-multiple-init.patch +Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -234,8 +240,9 @@ %patch803 -p1 -b .no-gnome-common %patch804 -p1 -b .fix-missing-declarations %patch805 -p1 -b .fix-missing-declarations-2-5-4 -%patch806 -p1 -b .port-to-new-libnotify-api +%patch806 -p1 -b .notification-cleanups %patch807 -p1 -b .fix-nm-multiple-init +%patch808 -p1 -b .fix-missing-declarations-2.5.5.1 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -287,7 +294,7 @@ %endif CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS -CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et"; export CFLAGS +CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS %if ! %{use_mozilla_nss} if pkg-config openssl ; then CFLAGS="$CFLAGS `pkg-config --cflags openssl`" @@ -303,6 +310,7 @@ intltoolize --force autoconf +# Configuration: %configure \ --enable-gtk-doc=yes \ --enable-ipv6 \ @@ -313,7 +321,13 @@ %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ --enable-plugins=all export tagname=CC -make LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration" + +# Do the make, with various flags: +%if %{require_function_declarations} +make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration" +%else +make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS" +%endif #cat /dev/null > default_user/local/Inbox/mbox @@ -350,7 +364,7 @@ ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile + sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done %find_lang %name-%{evo_major} @@ -373,39 +387,108 @@ %files -f %{name}-%{evo_major}.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README + +# GConf schemas: %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas -%{_bindir}/* + +# The main executable and a symlink: +%{_bindir}/evolution-%{evo_major} +%{_bindir}/evolution + +# Desktop files: %{_datadir}/applications/redhat-evolution-mail.desktop %{_datadir}/applications/redhat-evolution-calendar.desktop %{_datadir}/applications/redhat-evolution-contacts.desktop %{_datadir}/applications/redhat-evolution-tasks.desktop + +# Online help: %{_datadir}/gnome/help/evolution-%{evo_major} +%{_datadir}/omf/evolution + +# IDL files (should this be in devel subpackage?) %{_datadir}/idl/evolution-%{evo_major} -%{_datadir}/mime-info/* + +# mime-info data: +%{_datadir}/mime-info/evolution-%{evo_major}.keys +%{_datadir}/mime-info/evolution-%{evo_major}.mime + +# The main data directory +# (have not attempted to split this up into an explicit list) %dir %{_datadir}/evolution %{_datadir}/evolution/%{evo_major} -%{_datadir}/omf/evolution -%{_datadir}/pixmaps/* -%{_libdir}/bonobo/servers/* + +%{_datadir}/pixmaps/evolution-%{evo_major}.png + +# Bonobo components: +%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook_%{evo_major}.server +%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_%{evo_major}.server +%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%{evo_major}.server +%{_libdir}/bonobo/servers/GNOME_Evolution_Mail_%{evo_major}.server +%{_libdir}/bonobo/servers/GNOME_Evolution_Shell_%{evo_major}.server %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{evo_major} %dir %{_libdir}/evolution/%{evo_major}/components -%dir %{_libdir}/evolution/%{evo_major}/components/*.so -%dir %{evo_plugin_dir} -%{_libdir}/evolution/%{evo_major}/*.so.* +%{_libdir}/evolution/%{evo_major}/components/libevolution-addressbook.so +%{_libdir}/evolution/%{evo_major}/components/libevolution-calendar.so +%{_libdir}/evolution/%{evo_major}/components/libevolution-mail.so + +# Shared libraries: +%{_libdir}/evolution/%{evo_major}/libeabutil.so.* +%{_libdir}/evolution/%{evo_major}/libeconduit.so.* +%{_libdir}/evolution/%{evo_major}/libecontacteditor.so.* +%{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.* +%{_libdir}/evolution/%{evo_major}/libefilterbar.so.* +%{_libdir}/evolution/%{evo_major}/libemiscwidgets.so.* +%{_libdir}/evolution/%{evo_major}/libeshell.so.* +%{_libdir}/evolution/%{evo_major}/libessmime.so.* +%{_libdir}/evolution/%{evo_major}/libetable.so.* +%{_libdir}/evolution/%{evo_major}/libetext.so.* +%{_libdir}/evolution/%{evo_major}/libetimezonedialog.so.* +%{_libdir}/evolution/%{evo_major}/libeutil.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-a11y.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-smime.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.* +%{_libdir}/evolution/%{evo_major}/libfilter.so.* +%{_libdir}/evolution/%{evo_major}/libmenus.so.* + +# Various libexec programs: %dir %{_libexecdir}/evolution -%{_libexecdir}/evolution/%{evo_major} +%dir %{_libexecdir}/evolution/%{evo_major} +%{_libexecdir}/evolution/%{evo_major}/csv2vcard +%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean +%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export +%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify +%{_libexecdir}/evolution/%{evo_major}/killev +# Various conduits for gnome-pilot: %if %{pilot_support} %dir %{_libdir}/evolution/%{evo_major}/conduits -%{_libdir}/evolution/%{evo_major}/conduits/*.so -%{_libdir}/gnome-pilot/conduits/*.conduit + +%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so +%{_libdir}/gnome-pilot/conduits/e-address-%{evo_major}.conduit + +%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so +%{_libdir}/gnome-pilot/conduits/e-calendar-%{evo_major}.conduit + +%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so +%{_libdir}/gnome-pilot/conduits/e-memo-%{evo_major}.conduit + +%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so +%{_libdir}/gnome-pilot/conduits/e-todo-%{evo_major}.conduit %endif +# The plugin directory: +%dir %{evo_plugin_dir} + # The various plugins follow; they are all part of the main package: # (note that there are various resources such as glade and pixmap files that # are built as part of specific plugins but which are currently packaged using @@ -468,6 +551,7 @@ %{evo_plugin_dir}/org-gnome-mail-to-task.eplug %{evo_plugin_dir}/liborg-gnome-mail-to-task.so +%{evo_plugin_dir}/org-gnome-mail-to-task.xml %{evo_plugin_dir}/org-gnome-mark-all-read.eplug %{evo_plugin_dir}/liborg-gnome-mark-all-read.so @@ -506,14 +590,62 @@ %{evo_plugin_dir}/org-gnome-publish-calendar.xml %{evo_plugin_dir}/publish-calendar.glade +%{evo_plugin_dir}/org-gnome-evolution-caldav.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-caldav.so + +%{evo_plugin_dir}/org-gnome-evolution-mail-attachments-import-ics.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-mail-attachments-import-ics.so %files devel %defattr(-, root, root) %{_includedir}/evolution-%{evo_major} -%{_libdir}/pkgconfig/*.pc -%{_libdir}/evolution/%{evo_major}/*.so +%{_libdir}/pkgconfig/evolution-plugin-%{evo_major}.pc +%{_libdir}/pkgconfig/evolution-shell-%{evo_major}.pc +%{_libdir}/evolution/%{evo_major}/libeabutil.so +%{_libdir}/evolution/%{evo_major}/libeconduit.so +%{_libdir}/evolution/%{evo_major}/libecontacteditor.so +%{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so +%{_libdir}/evolution/%{evo_major}/libefilterbar.so +%{_libdir}/evolution/%{evo_major}/libemiscwidgets.so +%{_libdir}/evolution/%{evo_major}/libeshell.so +%{_libdir}/evolution/%{evo_major}/libessmime.so +%{_libdir}/evolution/%{evo_major}/libetable.so +%{_libdir}/evolution/%{evo_major}/libetext.so +%{_libdir}/evolution/%{evo_major}/libetimezonedialog.so +%{_libdir}/evolution/%{evo_major}/libeutil.so +%{_libdir}/evolution/%{evo_major}/libevolution-a11y.so +%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so +%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so +%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so +%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so +%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so +%{_libdir}/evolution/%{evo_major}/libevolution-smime.so +%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so +%{_libdir}/evolution/%{evo_major}/libfilter.so +%{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jan 25 2006 David Malcolm - 2.5.5.1-1 +- 2.5.5.1 +- update patch 106 to track upstream, renaming from + evolution-2.2.2-commit-enter-on-calendar.patch to + evolution-2.5.5.1-commit-enter-on-calendar.patch +- update patch 805 to track upstream +- added patch to fix some newly missing declarations (patch 808) +- replace evolution-2.5.4-port-to-new-libnotify-api.patch with + evolution-2.5.5.1-notification-cleanups.patch, since much of this was + duplicated by another patch that landed upstream; removing the actions code + as it was crashing deep inside DBus (patch 806, #177666) +- explicitly list various files to reduce reliance on globbing; organized the + files into logical groups; comment them +- added -Wno-sign-compare to CFLAGS +- enabled parallel make +- introduced require_function_declarations macro to make + -Werror-implicit-function-declaration flag optional; turn it off for now +- include the new CalDAV and mail-attachments-import plugins in the file list; + add an XML UI file for the mail-to-task plugin. +- use "sed -i -e" rather than "sed -ie" to avoid getting severe bonobo files + * Wed Jan 18 2006 Ray Strode - 2.5.4-10 - fix fix for multilib issue with shlib bonobo components (bug 156982) @@ -522,7 +654,7 @@ * Thu Jan 12 2006 David Malcolm - 2.5.4-8 - avoid multiple initialization of NetworkManager connections (patch 807, - gnome bug #326875) + gnome bug #326785) * Thu Jan 12 2006 David Malcolm - 2.5.4-7 - updated alarm notification patch(patch 806, #177546, #177666, #177667, Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 4 Jan 2006 06:07:52 -0000 1.41 +++ sources 27 Jan 2006 23:58:18 -0000 1.42 @@ -1 +1 @@ -1ffd40da2b98f727e18b4c3a22318ed1 evolution-2.5.4.tar.bz2 +307c20ef482dafe90c7f55843e473cda evolution-2.5.5.1.tar.bz2 From fedora-cvs-commits at redhat.com Fri Jan 27 23:59:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 18:59:05 -0500 Subject: rpms/evolution/devel evolution-2.5.4-port-to-new-libnotify-api.patch, 1.3, NONE Message-ID: <200601272359.k0RNx5Tt019703@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19620 Removed Files: evolution-2.5.4-port-to-new-libnotify-api.patch Log Message: remove unused patch --- evolution-2.5.4-port-to-new-libnotify-api.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 28 00:13:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 19:13:53 -0500 Subject: rpms/kernel-xen/devel .cvsignore, 1.9, 1.10 kernel-xen.spec, 1.32, 1.33 sources, 1.9, 1.10 Message-ID: <200601280013.k0S0Drtn023321@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23286 Modified Files: .cvsignore kernel-xen.spec sources Log Message: Update xen-20060127.tar.bz2 to version prepared from clean tree Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 27 Jan 2006 22:30:20 -0000 1.9 +++ .cvsignore 28 Jan 2006 00:13:50 -0000 1.10 @@ -5,4 +5,4 @@ bcm43xx-20060114.tar.bz2 patch-2.6.16-rc1.bz2 patch-2.6.16-rc1-git4.bz2 -xen-20060127.tar.bz2 +xen-20060127a.tar.bz2 Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- kernel-xen.spec 27 Jan 2006 22:30:20 -0000 1.32 +++ kernel-xen.spec 28 Jan 2006 00:13:50 -0000 1.33 @@ -186,7 +186,7 @@ Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source1: xen-20060127.tar.bz2 +Source1: xen-20060127a.tar.bz2 Source2: Config.mk Source10: COPYING.modules Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 27 Jan 2006 22:31:07 -0000 1.9 +++ sources 28 Jan 2006 00:13:50 -0000 1.10 @@ -2,4 +2,4 @@ ce5867f7e98d39c0e0e1ee102213b4c9 bcm43xx-20060114.tar.bz2 fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2 a247c21e1202f514283ba928d9382353 patch-2.6.16-rc1-git4.bz2 -6a61bb016042f108705ffb2efdce1053 xen-20060127.tar.bz2 +07de3270c9a5c63915a209cd36def02e xen-20060127a.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 28 00:37:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 19:37:33 -0500 Subject: rpms/evolution-connector/devel .cvsignore, 1.24, 1.25 evolution-connector.spec, 1.46, 1.47 regenerate-patch.sh, 1.12, 1.13 sources, 1.24, 1.25 ximian-connector-2.1.4-generated-autotool.patch, 1.11, 1.12 Message-ID: <200601280037.k0S0bXbD001274@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-connector/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1259 Modified Files: .cvsignore evolution-connector.spec regenerate-patch.sh sources ximian-connector-2.1.4-generated-autotool.patch Log Message: * Wed Jan 25 2006 David Malcolm - 2.5.5.1-1 - 2.5.5.1 - regenerate patch 200 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 4 Jan 2006 18:07:35 -0000 1.24 +++ .cvsignore 28 Jan 2006 00:37:28 -0000 1.25 @@ -1 +1 @@ -evolution-exchange-2.5.4.tar.bz2 +evolution-exchange-2.5.5.1.tar.bz2 Index: evolution-connector.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- evolution-connector.spec 4 Jan 2006 18:07:35 -0000 1.46 +++ evolution-connector.spec 28 Jan 2006 00:37:29 -0000 1.47 @@ -6,7 +6,7 @@ %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null) Name: evolution-connector -Version: 2.5.4 +Version: 2.5.5.1 Release: 1 License: GPL Group: Applications/Productivity @@ -94,6 +94,10 @@ %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml %changelog +* Wed Jan 25 2006 David Malcolm - 2.5.5.1-1 +- 2.5.5.1 +- regenerate patch 200 + * Wed Jan 4 2006 David Malcolm - 2.5.4-1 - 2.5.4 Index: regenerate-patch.sh =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/regenerate-patch.sh,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- regenerate-patch.sh 20 Dec 2005 04:43:55 -0000 1.12 +++ regenerate-patch.sh 28 Jan 2006 00:37:29 -0000 1.13 @@ -1,5 +1,5 @@ #!/bin/sh -BASE_NAME=evolution-exchange-2.5.3 +BASE_NAME=evolution-exchange-2.5.5.1 TARBALL_NAME=$BASE_NAME.tar.bz2 #INPUT_PATCHES="ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch ximian-connector-2.2.2-noinst-ltlibraries.patch ximian-connector-2.2.2-install-debug-utilities.patch" Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 4 Jan 2006 18:07:35 -0000 1.24 +++ sources 28 Jan 2006 00:37:29 -0000 1.25 @@ -1 +1 @@ -e96018d6edbab97a45a97578a6d210ef evolution-exchange-2.5.4.tar.bz2 +36a8dbcfc2b69c1899afe22480f0e760 evolution-exchange-2.5.5.1.tar.bz2 ximian-connector-2.1.4-generated-autotool.patch: evolution-exchange-2.5.5.1-patched/Makefile.in | 1 evolution-exchange-2.5.5.1-patched/acinclude.m4 | 22 evolution-exchange-2.5.5.1-patched/aclocal.m4 |10009 +++++----- evolution-exchange-2.5.5.1-patched/addressbook/Makefile.in | 1 evolution-exchange-2.5.5.1-patched/autom4te.cache |only evolution-exchange-2.5.5.1-patched/calendar/Makefile.in | 1 evolution-exchange-2.5.5.1-patched/camel/Makefile.in | 1 evolution-exchange-2.5.5.1-patched/configure | 5810 ++--- evolution-exchange-2.5.5.1-patched/docs/Makefile.in | 1 evolution-exchange-2.5.5.1-patched/docs/ietf/Makefile.in | 1 evolution-exchange-2.5.5.1-patched/docs/reference/Makefile.in | 1 evolution-exchange-2.5.5.1-patched/intltool-extract.in | 4 evolution-exchange-2.5.5.1-patched/intltool-merge.in | 4 evolution-exchange-2.5.5.1-patched/intltool-update.in | 26 evolution-exchange-2.5.5.1-patched/mail/Makefile.in | 1 evolution-exchange-2.5.5.1-patched/po/Makefile.in.in | 83 evolution-exchange-2.5.5.1-patched/storage/Makefile.in | 1 evolution-exchange-2.5.5.1-pristine/Makefile.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/acinclude.m4.autotool-results |only evolution-exchange-2.5.5.1-pristine/aclocal.m4.autotool-results |only evolution-exchange-2.5.5.1-pristine/addressbook/Makefile.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/calendar/Makefile.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/camel/Makefile.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/configure.autotool-results |only evolution-exchange-2.5.5.1-pristine/configure.rej |only evolution-exchange-2.5.5.1-pristine/docs/Makefile.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/docs/ietf/Makefile.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/docs/reference/Makefile.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/intltool-extract.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/intltool-merge.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/intltool-update.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/mail/Makefile.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/po/Makefile.in.in.autotool-results |only evolution-exchange-2.5.5.1-pristine/storage/Makefile.in.autotool-results |only 34 files changed, 7699 insertions(+), 8268 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.11 -r 1.12 ximian-connector-2.1.4-generated-autotool.patch Index: ximian-connector-2.1.4-generated-autotool.patch =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/ximian-connector-2.1.4-generated-autotool.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ximian-connector-2.1.4-generated-autotool.patch 20 Dec 2005 04:43:55 -0000 1.11 +++ ximian-connector-2.1.4-generated-autotool.patch 28 Jan 2006 00:37:29 -0000 1.12 @@ -1,6 +1,6 @@ -diff --recursive -up evolution-exchange-2.5.3-pristine/acinclude.m4 evolution-exchange-2.5.3-patched/acinclude.m4 ---- evolution-exchange-2.5.3-pristine/acinclude.m4 2004-08-13 14:16:45.000000000 -0400 -+++ evolution-exchange-2.5.3-patched/acinclude.m4 2005-12-19 22:24:50.000000000 -0500 +diff --recursive -up evolution-exchange-2.5.5.1-pristine/acinclude.m4 evolution-exchange-2.5.5.1-patched/acinclude.m4 +--- evolution-exchange-2.5.5.1-pristine/acinclude.m4 2004-08-13 14:16:45.000000000 -0400 ++++ evolution-exchange-2.5.5.1-patched/acinclude.m4 2006-01-25 14:56:17.000000000 -0500 @@ -34,6 +34,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [ AC_ARG_WITH(openldap, [ --with-openldap=[no/yes/PREFIX] Enable LDAP support in evolution]) AC_ARG_WITH(static-ldap, [ --with-static-ldap=[no/yes] Link LDAP support statically into evolution ]) @@ -54,10 +54,11 @@ else LDAP_LIBS="-lldap $LDAP_LIBS" fi], -diff --recursive -up evolution-exchange-2.5.3-pristine/aclocal.m4 evolution-exchange-2.5.3-patched/aclocal.m4 ---- evolution-exchange-2.5.3-pristine/aclocal.m4 2005-12-12 11:31:33.000000000 -0500 -+++ evolution-exchange-2.5.3-patched/aclocal.m4 2005-12-19 22:25:33.000000000 -0500 -@@ -11,3947 +11,3068 @@ +Only in evolution-exchange-2.5.5.1-pristine: acinclude.m4.autotool-results +diff --recursive -up evolution-exchange-2.5.5.1-pristine/aclocal.m4 evolution-exchange-2.5.5.1-patched/aclocal.m4 +--- evolution-exchange-2.5.5.1-pristine/aclocal.m4 2006-01-18 08:22:44.000000000 -0500 ++++ evolution-exchange-2.5.5.1-patched/aclocal.m4 2006-01-25 14:56:21.000000000 -0500 +@@ -11,3818 +11,3020 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @@ -2482,7 +2483,7 @@ -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) -+# serial 47 AC_PROG_LIBTOOL ++# serial 48 AC_PROG_LIBTOOL -dnl -dnl We go to great lengths to make sure that aclocal won't @@ -2972,6 +2973,7 @@ +test -z "$AS" && AS=as +test -z "$CC" && CC=cc +test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool +test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" @@ -3002,10 +3004,10 @@ +if test -n "$RANLIB"; then + case $host_os in + openbsd*) -+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) -+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" @@ -3100,8 +3102,6 @@ - WARN_CFLAGS="$warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -]) -- --dnl For C++, do basically the same thing. +AC_ARG_WITH([pic], + [AC_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], @@ -3109,17 +3109,19 @@ + [pic_mode=default]) +test -z "$pic_mode" && pic_mode=default --AC_DEFUN([GNOME_CXX_WARNINGS],[ -- AC_ARG_ENABLE(cxx-warnings, -- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] -- [Turn on compiler warnings.]),, -- [enable_cxx_warnings="m4_default([$1],[minimum])"]) +-dnl For C++, do basically the same thing. +# Use C for the default configuration in the libtool script +tagname= +AC_LIBTOOL_LANG_C_CONFIG +_LT_AC_TAGCONFIG +])# AC_LIBTOOL_SETUP +-AC_DEFUN([GNOME_CXX_WARNINGS],[ +- AC_ARG_ENABLE(cxx-warnings, +- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] +- [Turn on compiler warnings.]),, +- [enable_cxx_warnings="m4_default([$1],[minimum])"]) + - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GCC" != xyes; then @@ -3131,6 +3133,10 @@ - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac ++# _LT_AC_SYS_COMPILER ++# ------------------- ++AC_DEFUN([_LT_AC_SYS_COMPILER], ++[AC_REQUIRE([AC_PROG_CC])dnl - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall @@ -3140,17 +3146,15 @@ - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) -+# _LT_AC_SYS_COMPILER -+# ------------------- -+AC_DEFUN([_LT_AC_SYS_COMPILER], -+[AC_REQUIRE([AC_PROG_CC])dnl ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} - AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= @@ -3197,15 +3201,6 @@ - -if test -n "$1"; then - AC_MSG_CHECKING(for intltool >= $1) -- -- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 100 + $ 2; }'` -- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` -- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in` -- ] -- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) -- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || -- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) --fi +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with @@ -3213,11 +3208,20 @@ +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE +- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 100 + $ 2; }'` +- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` +- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in` +- ] +- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) +- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || +- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +-fi + - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' @@ -3236,6 +3240,17 @@ - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++AC_DEFUN([_LT_LINKER_BOILERPLATE], ++[ac_outfile=conftest.$ac_objext ++printf "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_LINKER_BOILERPLATE -AC_SUBST(INTLTOOL_DESKTOP_RULE) -AC_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -3255,38 +3270,11 @@ -AC_SUBST(INTLTOOL_SCHEMAS_RULE) -AC_SUBST(INTLTOOL_THEME_RULE) -AC_SUBST(INTLTOOL_SERVICE_RULE) -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+AC_DEFUN([_LT_LINKER_BOILERPLATE], -+[ac_outfile=conftest.$ac_objext -+printf "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` [...13806 lines suppressed...] fi -@@ -25735,8 +25990,9 @@ Usually this means the macro was only in +@@ -25743,8 +24915,9 @@ Usually this means the macro was only in { (exit 1); exit 1; }; } fi @@ -12633,7 +19275,7 @@ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. -@@ -26207,11 +26463,10 @@ cat >>$CONFIG_STATUS <<_ACEOF +@@ -26215,11 +25388,10 @@ cat >>$CONFIG_STATUS <<_ACEOF # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" @@ -12649,7 +19291,7 @@ _ACEOF -@@ -26236,7 +26491,6 @@ do +@@ -26245,7 +25417,6 @@ do "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; @@ -12657,7 +19299,7 @@ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -@@ -26411,7 +26665,6 @@ s, at INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_ +@@ -26421,7 +25592,6 @@ s, at INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_ s, at INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t s, at INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t s, at INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t @@ -12665,7 +19307,7 @@ s, at INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t s, at INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t s, at INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t -@@ -27174,51 +27427,47 @@ done +@@ -27184,51 +26354,47 @@ done ;; intltool ) @@ -12753,10 +19395,12 @@ esac done _ACEOF -diff --recursive -up evolution-exchange-2.5.3-pristine/docs/ietf/Makefile.in evolution-exchange-2.5.3-patched/docs/ietf/Makefile.in ---- evolution-exchange-2.5.3-pristine/docs/ietf/Makefile.in 2005-12-12 11:31:42.000000000 -0500 -+++ evolution-exchange-2.5.3-patched/docs/ietf/Makefile.in 2005-12-19 22:26:22.000000000 -0500 -@@ -141,7 +141,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE +Only in evolution-exchange-2.5.5.1-pristine: configure.autotool-results +Only in evolution-exchange-2.5.5.1-pristine: configure.rej +diff --recursive -up evolution-exchange-2.5.5.1-pristine/docs/ietf/Makefile.in evolution-exchange-2.5.5.1-patched/docs/ietf/Makefile.in +--- evolution-exchange-2.5.5.1-pristine/docs/ietf/Makefile.in 2006-01-18 08:36:47.000000000 -0500 ++++ evolution-exchange-2.5.5.1-patched/docs/ietf/Makefile.in 2006-01-25 14:56:29.000000000 -0500 +@@ -142,7 +142,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ @@ -12764,10 +19408,11 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -diff --recursive -up evolution-exchange-2.5.3-pristine/docs/Makefile.in evolution-exchange-2.5.3-patched/docs/Makefile.in ---- evolution-exchange-2.5.3-pristine/docs/Makefile.in 2005-12-12 11:31:42.000000000 -0500 -+++ evolution-exchange-2.5.3-patched/docs/Makefile.in 2005-12-19 22:26:19.000000000 -0500 -@@ -151,7 +151,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE +Only in evolution-exchange-2.5.5.1-pristine/docs/ietf: Makefile.in.autotool-results +diff --recursive -up evolution-exchange-2.5.5.1-pristine/docs/Makefile.in evolution-exchange-2.5.5.1-patched/docs/Makefile.in +--- evolution-exchange-2.5.5.1-pristine/docs/Makefile.in 2006-01-18 08:36:47.000000000 -0500 ++++ evolution-exchange-2.5.5.1-patched/docs/Makefile.in 2006-01-25 14:56:29.000000000 -0500 +@@ -152,7 +152,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ @@ -12775,10 +19420,11 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -diff --recursive -up evolution-exchange-2.5.3-pristine/docs/reference/Makefile.in evolution-exchange-2.5.3-patched/docs/reference/Makefile.in ---- evolution-exchange-2.5.3-pristine/docs/reference/Makefile.in 2005-12-12 11:31:42.000000000 -0500 -+++ evolution-exchange-2.5.3-patched/docs/reference/Makefile.in 2005-12-19 22:26:24.000000000 -0500 -@@ -148,7 +148,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE +Only in evolution-exchange-2.5.5.1-pristine/docs: Makefile.in.autotool-results +diff --recursive -up evolution-exchange-2.5.5.1-pristine/docs/reference/Makefile.in evolution-exchange-2.5.5.1-patched/docs/reference/Makefile.in +--- evolution-exchange-2.5.5.1-pristine/docs/reference/Makefile.in 2006-01-18 08:36:48.000000000 -0500 ++++ evolution-exchange-2.5.5.1-patched/docs/reference/Makefile.in 2006-01-25 14:56:30.000000000 -0500 +@@ -149,7 +149,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ @@ -12786,9 +19432,10 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -diff --recursive -up evolution-exchange-2.5.3-pristine/intltool-extract.in evolution-exchange-2.5.3-patched/intltool-extract.in ---- evolution-exchange-2.5.3-pristine/intltool-extract.in 2005-12-12 11:31:28.000000000 -0500 -+++ evolution-exchange-2.5.3-patched/intltool-extract.in 2005-08-04 14:47:54.000000000 -0400 +Only in evolution-exchange-2.5.5.1-pristine/docs/reference: Makefile.in.autotool-results +diff --recursive -up evolution-exchange-2.5.5.1-pristine/intltool-extract.in evolution-exchange-2.5.5.1-patched/intltool-extract.in +--- evolution-exchange-2.5.5.1-pristine/intltool-extract.in 2006-01-18 08:36:42.000000000 -0500 ++++ evolution-exchange-2.5.5.1-patched/intltool-extract.in 2005-12-11 05:22:12.000000000 -0500 @@ -485,12 +485,10 @@ sub parseTree sub intltool_tree_comment { @@ -12803,9 +19450,10 @@ push @$clist, 1 => $data; } -diff --recursive -up evolution-exchange-2.5.3-pristine/intltool-merge.in evolution-exchange-2.5.3-patched/intltool-merge.in ---- evolution-exchange-2.5.3-pristine/intltool-merge.in 2005-12-12 11:31:28.000000000 -0500 -+++ evolution-exchange-2.5.3-patched/intltool-merge.in 2005-08-04 14:47:54.000000000 -0400 +Only in evolution-exchange-2.5.5.1-pristine: intltool-extract.in.autotool-results +diff --recursive -up evolution-exchange-2.5.5.1-pristine/intltool-merge.in evolution-exchange-2.5.5.1-patched/intltool-merge.in +--- evolution-exchange-2.5.5.1-pristine/intltool-merge.in 2006-01-18 08:36:42.000000000 -0500 ++++ evolution-exchange-2.5.5.1-patched/intltool-merge.in 2005-12-11 05:22:12.000000000 -0500 @@ -91,7 +91,7 @@ my $OUTFILE; my %po_files_by_lang = (); @@ -12824,9 +19472,10 @@ # seek character encoding aliases in charset.alias (glib) -diff --recursive -up evolution-exchange-2.5.3-pristine/intltool-update.in evolution-exchange-2.5.3-patched/intltool-update.in ---- evolution-exchange-2.5.3-pristine/intltool-update.in 2005-12-12 11:31:28.000000000 -0500 -+++ evolution-exchange-2.5.3-patched/intltool-update.in 2005-08-04 14:47:54.000000000 -0400 +Only in evolution-exchange-2.5.5.1-pristine: intltool-merge.in.autotool-results +diff --recursive -up evolution-exchange-2.5.5.1-pristine/intltool-update.in evolution-exchange-2.5.5.1-patched/intltool-update.in +--- evolution-exchange-2.5.5.1-pristine/intltool-update.in 2006-01-18 08:36:42.000000000 -0500 ++++ evolution-exchange-2.5.5.1-patched/intltool-update.in 2005-12-11 05:22:12.000000000 -0500 @@ -80,8 +80,7 @@ my $ini_support = "directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec "soundlist(?:\\.in)+|". # GNOME specific @@ -12910,10 +19559,11 @@ $name = $domain if $domain; -diff --recursive -up evolution-exchange-2.5.3-pristine/mail/Makefile.in evolution-exchange-2.5.3-patched/mail/Makefile.in ---- evolution-exchange-2.5.3-pristine/mail/Makefile.in 2005-12-12 11:31:42.000000000 -0500 -+++ evolution-exchange-2.5.3-patched/mail/Makefile.in 2005-12-19 22:26:27.000000000 -0500 -@@ -160,7 +160,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE +Only in evolution-exchange-2.5.5.1-pristine: intltool-update.in.autotool-results +diff --recursive -up evolution-exchange-2.5.5.1-pristine/mail/Makefile.in evolution-exchange-2.5.5.1-patched/mail/Makefile.in +--- evolution-exchange-2.5.5.1-pristine/mail/Makefile.in 2006-01-18 08:36:48.000000000 -0500 ++++ evolution-exchange-2.5.5.1-patched/mail/Makefile.in 2006-01-25 14:56:30.000000000 -0500 +@@ -161,7 +161,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ @@ -12921,10 +19571,11 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -diff --recursive -up evolution-exchange-2.5.3-pristine/Makefile.in evolution-exchange-2.5.3-patched/Makefile.in ---- evolution-exchange-2.5.3-pristine/Makefile.in 2005-12-12 11:31:43.000000000 -0500 -+++ evolution-exchange-2.5.3-patched/Makefile.in 2005-12-19 22:26:35.000000000 -0500 -@@ -166,7 +166,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE +Only in evolution-exchange-2.5.5.1-pristine/mail: Makefile.in.autotool-results +diff --recursive -up evolution-exchange-2.5.5.1-pristine/Makefile.in evolution-exchange-2.5.5.1-patched/Makefile.in +--- evolution-exchange-2.5.5.1-pristine/Makefile.in 2006-01-18 08:36:48.000000000 -0500 ++++ evolution-exchange-2.5.5.1-patched/Makefile.in 2006-01-25 14:56:30.000000000 -0500 +@@ -167,7 +167,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ @@ -12932,9 +19583,10 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -diff --recursive -up evolution-exchange-2.5.3-pristine/po/Makefile.in.in evolution-exchange-2.5.3-patched/po/Makefile.in.in ---- evolution-exchange-2.5.3-pristine/po/Makefile.in.in 2005-12-12 11:31:28.000000000 -0500 -+++ evolution-exchange-2.5.3-patched/po/Makefile.in.in 2005-08-04 14:47:54.000000000 -0400 +Only in evolution-exchange-2.5.5.1-pristine: Makefile.in.autotool-results +diff --recursive -up evolution-exchange-2.5.5.1-pristine/po/Makefile.in.in evolution-exchange-2.5.5.1-patched/po/Makefile.in.in +--- evolution-exchange-2.5.5.1-pristine/po/Makefile.in.in 2006-01-18 08:36:42.000000000 -0500 ++++ evolution-exchange-2.5.5.1-patched/po/Makefile.in.in 2005-12-11 05:22:12.000000000 -0500 @@ -39,14 +39,13 @@ gnulocaledir = $(datadir)/locale gettextsrcdir = $(datadir)/glib-2.0/gettext/po subdir = po @@ -13105,10 +19757,11 @@ $(SHELL) ./config.status # Tell versions [3.59,3.63) of GNU make not to export all variables. -diff --recursive -up evolution-exchange-2.5.3-pristine/storage/Makefile.in evolution-exchange-2.5.3-patched/storage/Makefile.in ---- evolution-exchange-2.5.3-pristine/storage/Makefile.in 2005-12-12 11:31:43.000000000 -0500 -+++ evolution-exchange-2.5.3-patched/storage/Makefile.in 2005-12-19 22:26:33.000000000 -0500 -@@ -203,7 +203,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE +Only in evolution-exchange-2.5.5.1-pristine/po: Makefile.in.in.autotool-results +diff --recursive -up evolution-exchange-2.5.5.1-pristine/storage/Makefile.in evolution-exchange-2.5.5.1-patched/storage/Makefile.in +--- evolution-exchange-2.5.5.1-pristine/storage/Makefile.in 2006-01-18 08:36:48.000000000 -0500 ++++ evolution-exchange-2.5.5.1-patched/storage/Makefile.in 2006-01-25 14:56:30.000000000 -0500 +@@ -204,7 +204,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ @@ -13116,3 +19769,4 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ +Only in evolution-exchange-2.5.5.1-pristine/storage: Makefile.in.autotool-results From fedora-cvs-commits at redhat.com Sat Jan 28 01:38:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 20:38:13 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.47, 1.48 libsemanage.spec, 1.67, 1.68 sources, 1.49, 1.50 Message-ID: <200601280138.k0S1cDix017075@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17038 Modified Files: .cvsignore libsemanage.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- .cvsignore 20 Jan 2006 20:28:52 -0000 1.47 +++ .cvsignore 28 Jan 2006 01:38:10 -0000 1.48 @@ -50,3 +50,4 @@ libsemanage-1.5.14.tgz libsemanage-1.5.15.tgz libsemanage-1.5.16.tgz +libsemanage-1.5.18.tgz Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- libsemanage.spec 20 Jan 2006 20:28:52 -0000 1.67 +++ libsemanage.spec 28 Jan 2006 01:38:10 -0000 1.68 @@ -2,7 +2,7 @@ %define libselinuxver 1.29.6-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.5.16 +Version: 1.5.18 Release: 1 License: GPL Group: System Environment/Libraries @@ -76,6 +76,12 @@ %changelog +* Fri Jan 27 2006 Dan Walsh 1.5.18-1 +- Upgrade to latest from NSA + * Merged seuser -> seuser_local rename patch from Ivan Gyurdiev. + * Merged set_create_store, access_check, and is_connected interfaces + from Joshua Brindle. + * Fri Jan 13 2006 Dan Walsh 1.5.16-1 - Upgrade to latest from NSA * Regenerate python wrappers. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- sources 20 Jan 2006 20:28:52 -0000 1.49 +++ sources 28 Jan 2006 01:38:10 -0000 1.50 @@ -1 +1 @@ -fa20e01bfeec864dcca040f188ea489b libsemanage-1.5.16.tgz +603e43a76bef01568688b97e11a9bc24 libsemanage-1.5.18.tgz From fedora-cvs-commits at redhat.com Sat Jan 28 02:47:38 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 21:47:38 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.97, 1.98 policycoreutils-rhat.patch, 1.157, 1.158 policycoreutils.spec, 1.227, 1.228 sources, 1.101, 1.102 Message-ID: <200601280247.k0S2lcHf031736@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31720 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: * Fri Jan 27 2006 Dan Walsh 1.29.15-1 - Update from upstream * Merged newrole audit patch from Steve Grubb. * Merged seuser -> seuser local rename patch from Ivan Gyurdiev. * Merged semanage and semodule access check patches from Joshua Brindle. * Wed Jan 25 2006 Dan Walsh 1.29.12-1 - Add a default of /export/home Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- .cvsignore 25 Jan 2006 16:07:46 -0000 1.97 +++ .cvsignore 28 Jan 2006 02:47:35 -0000 1.98 @@ -84,3 +84,5 @@ policycoreutils-1.29.9.tgz policycoreutils-1.29.10.tgz policycoreutils-1.29.11.tgz +policycoreutils-1.29.12.tgz +policycoreutils-1.29.15.tgz policycoreutils-rhat.patch: genhomedircon | 6 ++++++ 1 files changed, 6 insertions(+) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- policycoreutils-rhat.patch 26 Jan 2006 17:22:04 -0000 1.157 +++ policycoreutils-rhat.patch 28 Jan 2006 02:47:35 -0000 1.158 @@ -1,366 +1,16 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.29.11/restorecon/restorecon.c ---- nsapolicycoreutils/restorecon/restorecon.c 2006-01-13 09:47:40.000000000 -0500 -+++ policycoreutils-1.29.11/restorecon/restorecon.c 2006-01-25 14:03:12.000000000 -0500 -@@ -140,6 +140,7 @@ - fprintf(stderr,"Warning! %s refers to a symbolic link, not following last component.\n", filename); - char *p = NULL, *file_sep; - char *tmp_path = strdupa(filename); -+ size_t len=0; - if (!tmp_path) { - fprintf(stderr,"strdupa on %s failed: %s\n", filename,strerror(errno)); - return 1; -@@ -150,8 +151,11 @@ - *file_sep = 0; - file_sep++; - p = realpath(tmp_path, path); -+ } -+ else { -+ file_sep = tmp_path; -+ p = realpath("./", path); - } -- size_t len; - if(p) - len = strlen(p); - if (!p || len + strlen(file_sep) + 2 > PATH_MAX) { -@@ -162,7 +166,7 @@ - *p = '/'; - p++; - strcpy(p, file_sep); -- filename = p; -+ filename = path; - } else { - char *p; - p = realpath(filename, path); -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/chcat policycoreutils-1.29.11/scripts/chcat ---- nsapolicycoreutils/scripts/chcat 2006-01-19 16:00:44.000000000 -0500 -+++ policycoreutils-1.29.11/scripts/chcat 2006-01-25 11:13:33.000000000 -0500 -@@ -356,7 +356,7 @@ - - if list_ind==0 and len(cmds) < 1: - usage() -- except: -+ except ValueError, e: - usage() - - if delete_ind: -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.29.11/semanage/semanage ---- nsapolicycoreutils/semanage/semanage 2006-01-20 10:37:37.000000000 -0500 -+++ policycoreutils-1.29.11/semanage/semanage 2006-01-26 12:17:30.000000000 -0500 -@@ -30,28 +30,27 @@ - - def usage(message = ""): - print '\ --semanage {login|user|port|interface|fcontext} -l\n\ -+semanage {login|user|port|interface|fcontext|translation} -l [-n] \n\ - semanage login -{a|d|m} [-sr] login_name\n\ - semanage user -{a|d|m} [-LrR] selinux_name\n\ --semanage port -{a|d|m} -p protocol [-t] port_number\n\ -+semanage port -{a|d|m} [-tr] [ -p protocol ] port | port_range\n\ - semanage interface -{a|d|m} [-tr] interface_spec\n\ --semanage translation -{a|d|m} [-T] level\n\ - semanage fcontext -{a|d|m} [-frst] file_spec\n\ -+semanage translation -{a|d|m} [-T] level\n\ - -a, --add Add a OBJECT record NAME\n\ - -d, --delete Delete a OBJECT record NAME\n\ - -f, --ftype File Type of OBJECT \n\ - -h, --help display this message\n\ - -l, --list List the OBJECTS\n\ - -L, --level Default SELinux Level\n\ -- -n, --noheading Do not print heading when listing OBJECTS\n\ - -m, --modify Modify a OBJECT record NAME\n\ -- -P, --proto Port protocol\n\ -+ -n, --noheading Do not print heading when listing OBJECTS\n\ -+ -p, --proto Port protocol\n\ - -r, --range MLS/MCS Security Range\n\ - -R, --roles SELinux Roles (Separate by spaces)\n\ - -s, --seuser SELinux user name\n\ - -t, --type SELinux Type for the object\n\ - -T, --trans SELinux Level Translation\n\ -- -v, --verbose verbose output\n\ - ' - print message - sys.exit(1) -@@ -62,35 +61,27 @@ - sys.stderr.flush() - sys.exit(1) - -- def unwanted_ftype(): -- if ftype != "": -- sys.stderr.write("ftype not used\n"); -- def unwanted_selevel(): -- if selevel != "": -- sys.stderr.write("level not used\n"); -- def unwanted_proto(): -- if proto != "": -- sys.stderr.write("proto not used\n"); -- def unwanted_roles(): -- if roles != "": -- sys.stderr.write("role not used\n"); -- def unwanted_serange(): -- if serange != "": -- sys.stderr.write("range not used\n"); -- def unwanted_seuser(): -- if seuser != "": -- sys.stderr.write("seuser not used\n"); -- def unwanted_setype(): -- if setype != "": -- sys.stderr.write("type not used\n"); -- def unwanted_setrans(): -- if setrans != "": -- sys.stderr.write("trans not used\n"); -+ def get_options(): -+ valid_option={} -+ valid_everyone=[ '-a', '--add', '-d', '--delete', '-m', '--modify', '-l', '--list', '-h', '--help', '-n', '--noheading' ] -+ valid_option["login"] = [] -+ valid_option["login"] += valid_everyone + [ '-s', '--seuser', '-r', '--range'] -+ valid_option["user"] = [] -+ valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles' ] -+ valid_option["port"] = [] -+ valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--protocol' ] -+ valid_option["interface"] = [] -+ valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range'] -+ valid_option["fcontext"] = [] -+ valid_option["fcontext"] += valid_everyone + [ '-f', '--ftype', '-s', '--seuser', '-t', '--type', '-r', '--range'] -+ valid_option["translation"] = [] -+ valid_option["translation"] += valid_everyone + [ '-T', '--trans' ] -+ return valid_option +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.11/scripts/genhomedircon +--- nsapolicycoreutils/scripts/genhomedircon 2006-01-20 10:37:37.000000000 -0500 ++++ policycoreutils-1.29.11/scripts/genhomedircon 2006-01-27 01:22:00.000000000 -0500 +@@ -87,6 +87,12 @@ + + if ret == []: + ret.append("/home") + - # - # - # - try: -- objectlist = ("login", "user", "port", "interface", "fcontext", "translation") - input = sys.stdin - output = sys.stdout - serange = "" -@@ -112,12 +103,14 @@ - usage("Requires 2 or more arguments") - - object = sys.argv[1] -- if object not in objectlist: -+ option_dict=get_options() -+ if object not in option_dict.keys(): - usage("%s not defined" % object) - - args = sys.argv[2:] ++ # Add /export/home if it exists ++ # Some customers use this for automounted homedirs ++ if os.path.exists("/export/home"): ++ ret.append("/export/home") + - gopts, cmds = getopt.getopt(args, -- 'adf:lhmnp:P:s:R:L:r:t:vT:', -+ 'adf:lhmnp:s:R:L:r:t:T:', - ['add', - 'delete', - 'ftype=', -@@ -125,16 +118,18 @@ - 'list', - 'modify', - 'noheading', -- 'port=', - 'proto=', - 'seuser=', - 'range=', - 'level=', - 'roles=', - 'type=', -- 'trans=', -- 'verbose' -+ 'trans=' - ]) -+ for o, a in gopts: -+ if o not in option_dict[object]: -+ sys.stderr.write("%s not valid for %s objects\n" % ( o, object) ); -+ - for o,a in gopts: - if o == "-a" or o == "--add": - if modify or delete: -@@ -167,7 +162,7 @@ - if o == "-L" or o == '--level': - selevel = a - -- if o == "-P" or o == '--proto': -+ if o == "-p" or o == '--proto': - proto = a - - if o == "-R" or o == '--roles': -@@ -182,94 +177,25 @@ - if o == "-T" or o == "--trans": - setrans = a - -- if o == "-v" or o == "--verbose": -- verbose = 1 -- --# Note in this section I intentionally leave the unwanted_*() functions for --# variabled which are wanted commented out and don't delete those lines. This --# will make it easier to modify the code when the list of wanted variables --# changes. - if object == "login": -- if not delete: -- unwanted_ftype() -- unwanted_selevel() -- unwanted_proto() -- unwanted_roles() --# unwanted_serange() --# unwanted_seuser() -- unwanted_setype() -- unwanted_setrans() - OBJECT = seobject.loginRecords() - - if object == "user": -- if not delete: -- unwanted_ftype() --# unwanted_selevel() -- unwanted_proto() --# unwanted_roles() --# unwanted_serange() -- unwanted_seuser() -- unwanted_setype() -- unwanted_setrans() - OBJECT = seobject.seluserRecords() - - if object == "port": -- if not delete: -- unwanted_ftype() -- unwanted_selevel() --# unwanted_proto() -- unwanted_roles() -- unwanted_serange() -- unwanted_seuser() --# unwanted_setype() -- unwanted_setrans() - OBJECT = seobject.portRecords() - - if object == "interface": -- if not delete: -- unwanted_ftype() -- unwanted_selevel() -- unwanted_proto() -- unwanted_roles() --# unwanted_serange() -- unwanted_seuser() --# unwanted_setype() -- unwanted_setrans() - OBJECT = seobject.interfaceRecords() - - if object == "fcontext": -- if not delete: --# unwanted_ftype() -- unwanted_selevel() -- unwanted_proto() -- unwanted_roles() --# unwanted_serange() --# unwanted_seuser() --# unwanted_setype() -- unwanted_setrans() - OBJECT = seobject.fcontextRecords() - - if object == "translation": -- if not delete: -- unwanted_ftype() -- unwanted_selevel() -- unwanted_proto() -- unwanted_roles() -- unwanted_serange() -- unwanted_seuser() -- unwanted_setype() --# unwanted_setrans() - OBJECT = seobject.setransRecords() - - if list: -- unwanted_ftype() -- unwanted_selevel() -- unwanted_proto() -- unwanted_roles() -- unwanted_serange() -- unwanted_seuser() -- unwanted_setype() -- unwanted_setrans() - OBJECT.list(heading) - sys.exit(0); - -@@ -324,16 +250,6 @@ - sys.exit(0); - - if delete: -- if object != "fcontext": -- unwanted_ftype() -- unwanted_selevel() -- if object == "port": -- unwanted_proto() -- unwanted_roles() -- unwanted_serange() -- unwanted_seuser() -- unwanted_setype() -- unwanted_setrans() - if object == "port": - OBJECT.delete(target, proto) - -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage.8 policycoreutils-1.29.11/semanage/semanage.8 ---- nsapolicycoreutils/semanage/semanage.8 2006-01-20 10:37:37.000000000 -0500 -+++ policycoreutils-1.29.11/semanage/semanage.8 2006-01-26 12:13:43.000000000 -0500 -@@ -3,19 +3,19 @@ - semanage \- SELinux Policy Management tool - - .SH "SYNOPSIS" --.B semanage {login|user|port|interface|fcontext} \-l [\-n] -+.B semanage {login|user|port|interface|fcontext|translation} \-l [\-n] - .br - .B semanage login \-{a|d|m} [\-sr] login_name - .br - .B semanage user \-{a|d|m} [\-LrR] selinux_name - .br --.B semanage port \-{a|d|m} \-p protocol [\-t] port_number -+.B semanage port \-{a|d|m} [\-tr] [\-p protocol] port | port_range - .br - .B semanage interface \-{a|d|m} [\-tr] interface_spec - .br --.B semanage translation \-{a|d|m} [\-T] level --.br - .B semanage fcontext \-{a|d|m} [\-frst] file_spec -+.br -+.B semanage translation \-{a|d|m} [\-T] level - .P + return ret - This tool is used to configure SELinux policy -@@ -35,34 +35,34 @@ - .I \-d, \-\-delete - Delete a OBJECT record NAME - .TP --.I \-h, \-\-help --display this message --.TP - .I \-f, \-\-ftype - File Type. This is used with fcontext. - Requires a file type as shown in the mode field by ls, e.g. use -d to match only directories or -- to match only regular files. - .TP -+.I \-h, \-\-help -+display this message -+.TP - .I \-l, \-\-list - List the OBJECTS - .TP --.I \-n, \-\-noheading --Do not print heading when listing OBJECTS --.TP - .I \-L, \-\-level - Default SELinux Level for SELinux use. (s0) - .TP - .I \-m, \-\-modify - Modify a OBJECT record NAME - .TP -+.I \-n, \-\-noheading -+Do not print heading when listing OBJECTS. -+.TP - .I \-p, \-\-proto - Protocol for the specified port (tcp|udp). - .TP --.I \-R, \-\-role --SELinux Roles (Separate by spaces) --.TP - .I \-r, \-\-range - MLS/MCS Security Range - .TP -+.I \-R, \-\-role -+SELinux Roles. You must inclose multiple roles within quotes, separate by spaces. Or specify \-R multiple times. -+.TP - .I \-s, \-\-seuser - SELinux user name - .TP + def getSELinuxType(directory): Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.227 retrieving revision 1.228 diff -u -r1.227 -r1.228 --- policycoreutils.spec 26 Jan 2006 17:22:04 -0000 1.227 +++ policycoreutils.spec 28 Jan 2006 02:47:35 -0000 1.228 @@ -1,10 +1,10 @@ %define libsepolver 1.11.9-1 -%define libsemanagever 1.5.15-1 +%define libsemanagever 1.5.18-1 %define libselinuxver 1.29.6-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.29.11 -Release: 3 +Version: 1.29.15 +Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz @@ -97,6 +97,14 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog +* Fri Jan 27 2006 Dan Walsh 1.29.15-1 +- Update from upstream + * Merged newrole audit patch from Steve Grubb. + * Merged seuser -> seuser local rename patch from Ivan Gyurdiev. + * Merged semanage and semodule access check patches from Joshua Brindle. +* Wed Jan 25 2006 Dan Walsh 1.29.12-1 +- Add a default of /export/home + * Wed Jan 25 2006 Dan Walsh 1.29.11-3 - Cleanup of the patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- sources 25 Jan 2006 16:07:46 -0000 1.101 +++ sources 28 Jan 2006 02:47:35 -0000 1.102 @@ -1 +1 @@ -51372837f3abaffa294b289c3acc89c4 policycoreutils-1.29.11.tgz +4630f6f9b6ce13585a58e6d1dc10fff7 policycoreutils-1.29.15.tgz From fedora-cvs-commits at redhat.com Sat Jan 28 03:22:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 22:22:22 -0500 Subject: rpms/frysk/FC-4 libglade-java-20060125-fix-64bit-miscompilation.patch, NONE, 1.1 frysk.spec, 1.2, 1.3 update.sh, 1.1, 1.2 Message-ID: <200601280322.k0S3MMQA029865@cvs.devel.redhat.com> Author: cagney Update of /cvs/dist/rpms/frysk/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv29555 Modified Files: frysk.spec update.sh Added Files: libglade-java-20060125-fix-64bit-miscompilation.patch Log Message: * Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.9 - For pango and gtk, store the config file in a path containing _host but canonicalized using config.sub. * Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.8 - Put pango.modules pack in the -host directory. - Delete conditional definition of frysk_gcc_prefix, and frysk_gcc_suffix. Doesn't work with older RPMs. * Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.7 - Conditionally define frysk_gcc_prefix and frysk_gcc_suffix. libglade-java-20060125-fix-64bit-miscompilation.patch: org_gnu_glade_LibGlade.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) --- NEW FILE libglade-java-20060125-fix-64bit-miscompilation.patch --- --- ./src/jni/org_gnu_glade_LibGlade.c.dist 2006-01-26 12:00:14.000000000 -0500 +++ ./src/jni/org_gnu_glade_LibGlade.c 2006-01-26 12:01:42.000000000 -0500 @@ -18,6 +18,7 @@ #include #include #include +#include #define LIBGLADE_DOMAIN "libglade" @@ -148,7 +149,7 @@ len = (*env)->GetArrayLength(env, buffer); buf = (*env)->GetByteArrayElements(env, buffer, NULL); if (buf == NULL) - return; + return NULL; rootname = root ? (char *)(*env)->GetStringUTFChars(env, root, 0) : NULL; @@ -159,7 +160,7 @@ (*env)->ReleaseByteArrayElements(env, buffer, buf, 0); if ((*env)->ExceptionCheck(env)) - return; + return NULL; //(*env)->SetObjectField(env, o, gladeFID, getHandleFromPointer(env, xml)); return getGObjectHandle(env, (GObject *) xml); @@ -190,7 +191,7 @@ remove_log_handler(handler_id); if ((*env)->ExceptionCheck(env)) - return; + return NULL; //(*env)->SetObjectField(env, o, gladeFID, getHandleFromPointer(env, xml)); return getGObjectHandle(env, (GObject *) xml); Index: frysk.spec =================================================================== RCS file: /cvs/dist/rpms/frysk/FC-4/frysk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- frysk.spec 27 Jan 2006 21:10:44 -0000 1.2 +++ frysk.spec 28 Jan 2006 03:22:19 -0000 1.3 @@ -22,7 +22,7 @@ %define build_libvte_java 1 %define build_antlr 1 %define build_jdom 1 -%define build_frysk 0 +%define build_frysk 1 #---- cairo/fontconfig/pango defines %define freetype_version 2.1.5 @@ -37,7 +37,7 @@ Summary: Frysk execution analysis tool Name: frysk Version: 0.0.1.2006.01.22 -Release: 0.FC4.6 +Release: 0.FC4.9 License: GPL + EXPLICIT EXCEPTION Group: Development/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -687,7 +687,10 @@ %{__frysk_libs_configure} BUILD %{pango} %{?_smp_mflags} %{pango_makeflags} if INSTALL_P ; then - MKUPDATE frysk-update-pango-modules frysk-pango-querymodules pango/%{_target_platform}/pango.modules + # The pango code uses _host, not _target_platform. + pango_host=`${RPM_BUILD_DIR}/%{pango}/config.sub %{_host}` + MKUPDATE frysk-update-pango-modules frysk-pango-querymodules \ + pango/${pango_host}/pango.modules INSTALL %{pango} %{pango_makeflags} fi @@ -725,7 +728,9 @@ # instead of /usr/lib/frysk, this generates paths that point # to the existing / installed immodules. XXX: Per rant with # pango's MKUPDATE call, _host should be _target_platform. - MKUPDATE frysk-update-gtk-immodules frysk-gtk-query-immodules-2.0 gtk-2.0/%{_host}/gtk.immodules + gtk2_host=`${RPM_BUILD_DIR}/%{gtk2}/config.sub %{_host}` + MKUPDATE frysk-update-gtk-immodules frysk-gtk-query-immodules-2.0 \ + gtk-2.0/${gtk2_host}/gtk.immodules INSTALL %{gtk2} %{gtk2_makeflags} fi @@ -936,6 +941,18 @@ %endif %changelog +* Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.9 +- For pango and gtk, store the config file in a path containing _host + but canonicalized using config.sub. + +* Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.8 +- Put pango.modules pack in the -host directory. +- Delete conditional definition of frysk_gcc_prefix, and + frysk_gcc_suffix. Doesn't work with older RPMs. + +* Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.7 +- Conditionally define frysk_gcc_prefix and frysk_gcc_suffix. + * Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.6 - Add the macros build_glib2, build_glib_java, build_fontconfig, build_atk, build_cairo, build_cairo_java, build_pango, build_gtk2, Index: update.sh =================================================================== RCS file: /cvs/dist/rpms/frysk/FC-4/update.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- update.sh 24 Jan 2006 00:33:58 -0000 1.1 +++ update.sh 28 Jan 2006 03:22:19 -0000 1.2 @@ -22,6 +22,5 @@ # Drag over the mashed frysk.spec file. sed < ../RHEL-4/frysk.spec > frysk.spec \ - -e 's,^\(%define build_frysk\).*$,\1 0,' \ -e 's,^\(Release:.*\).EL4.\(.*\)$,\1.FC4.\2,' \ -e 's,^\(%define frysk_gcc_suffix\).*,\1 %{nil},' From fedora-cvs-commits at redhat.com Sat Jan 28 04:50:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 23:50:23 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch, 1.25, 1.26 selinux-policy.spec, 1.93, 1.94 Message-ID: <200601280450.k0S4oM9p017361@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17344 Modified Files: policy-20060104.patch selinux-policy.spec Log Message: * Thu Jan 26 2006 Dan Walsh 2.2.7-1 - Update to upstream policy-20060104.patch: admin/usermanage.te | 3 +++ kernel/filesystem.if | 20 ++++++++++---------- kernel/filesystem.te | 1 + kernel/mls.te | 3 ++- services/automount.te | 1 + services/hal.te | 1 + services/irqbalance.te | 2 ++ services/xdm.fc | 4 ++++ 8 files changed, 24 insertions(+), 11 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- policy-20060104.patch 27 Jan 2006 07:06:17 -0000 1.25 +++ policy-20060104.patch 28 Jan 2006 04:50:20 -0000 1.26 @@ -1,40 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.fc serefpolicy-2.2.7/policy/modules/admin/rpm.fc ---- nsaserefpolicy/policy/modules/admin/rpm.fc 2006-01-13 09:48:26.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/admin/rpm.fc 2006-01-27 01:40:13.000000000 -0500 -@@ -16,6 +16,8 @@ - /usr/bin/fedora-rmdevelrpms -- gen_context(system_u:object_r:rpm_exec_t,s0) - /usr/sbin/up2date -- gen_context(system_u:object_r:rpm_exec_t,s0) - /usr/sbin/rhn_check -- gen_context(system_u:object_r:rpm_exec_t,s0) -+/usr/sbin/pup -- gen_context(system_u:object_r:rpm_exec_t,s0) -+/usr/sbin/pirut -- gen_context(system_u:object_r:rpm_exec_t,s0) - ') - - /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.2.7/policy/modules/admin/rpm.if ---- nsaserefpolicy/policy/modules/admin/rpm.if 2006-01-04 17:28:52.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/admin/rpm.if 2006-01-27 01:40:13.000000000 -0500 -@@ -71,6 +71,7 @@ - rpm_domtrans($1) - role $2 types rpm_t; - role $2 types rpm_script_t; -+ seutil_run_loadpol(rpm_script_t,$2,$3) - allow rpm_t $3:chr_file rw_term_perms; - ') - -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/rpm.te serefpolicy-2.2.7/policy/modules/admin/rpm.te ---- nsaserefpolicy/policy/modules/admin/rpm.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/admin/rpm.te 2006-01-27 01:40:13.000000000 -0500 -@@ -288,6 +288,7 @@ - - term_getattr_unallocated_ttys(rpm_script_t) - term_list_ptys(rpm_script_t) -+term_use_all_terms(rpm_script_t) - - auth_dontaudit_getattr_shadow(rpm_script_t) - # ideally we would not need this -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.7/policy/modules/admin/usermanage.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.8/policy/modules/admin/usermanage.te --- nsaserefpolicy/policy/modules/admin/usermanage.te 2006-01-19 10:00:40.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/admin/usermanage.te 2006-01-27 02:02:29.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/admin/usermanage.te 2006-01-27 23:48:28.000000000 -0500 @@ -328,6 +328,9 @@ miscfiles_read_localization(passwd_t) @@ -45,264 +11,165 @@ seutil_dontaudit_search_config(passwd_t) userdom_use_unpriv_users_fd(passwd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/apps/mono.te serefpolicy-2.2.7/policy/modules/apps/mono.te ---- nsaserefpolicy/policy/modules/apps/mono.te 2006-01-19 18:02:04.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/apps/mono.te 2006-01-27 01:40:13.000000000 -0500 -@@ -18,7 +18,7 @@ - # +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.8/policy/modules/kernel/filesystem.if +--- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-27 21:35:04.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/kernel/filesystem.if 2006-01-27 23:48:28.000000000 -0500 +@@ -154,7 +154,7 @@ + class filesystem unmount; + ') - ifdef(`targeted_policy',` -- allow mono_t self:process execheap; -+ allow mono_t self:process { execheap execmem }; - unconfined_domain_template(mono_t) - role system_r types mono_t; - ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.fc serefpolicy-2.2.7/policy/modules/kernel/files.fc ---- nsaserefpolicy/policy/modules/kernel/files.fc 2006-01-25 15:58:58.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/kernel/files.fc 2006-01-27 01:40:13.000000000 -0500 -@@ -126,6 +126,11 @@ - /mnt/[^/]*/.* <> +- allow $1 fs_t:filesystem mount; ++ allow $1 fs_t:filesystem unmount; + ') - # -+# /net -+# -+/net -d gen_context(system_u:object_r:mnt_t,s0) -+ -+# - # /opt - # - /opt(/.*)? gen_context(system_u:object_r:usr_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/files.if serefpolicy-2.2.7/policy/modules/kernel/files.if ---- nsaserefpolicy/policy/modules/kernel/files.if 2006-01-25 15:58:59.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/kernel/files.if 2006-01-27 01:40:13.000000000 -0500 -@@ -321,7 +321,7 @@ - attribute file_type, security_file_type; + ######################################## +@@ -320,7 +320,7 @@ + class filesystem unmount; ') -- dontaudit $1 { file_type -security_file_type }:dir r_dir_perms; -+ allow $1 { file_type -security_file_type }:dir r_dir_perms; +- allow $1 autofs_t:filesystem mount; ++ allow $1 autofs_t:filesystem unmount; ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.7/policy/modules/kernel/filesystem.if ---- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-25 15:58:59.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/kernel/filesystem.if 2006-01-27 01:40:13.000000000 -0500 -@@ -2855,3 +2855,22 @@ - # and its files. - allow $1 filesystem_type:{ dir file lnk_file sock_file fifo_file chr_file blk_file } *; - ') -+ -+ -+######################################## -+## -+## Search inotifyfs_t filesystem -+## -+## -+## The type of the domain performing this action. -+## -+# -+interface(`fs_search_inotifyfs',` -+ gen_require(` -+ type inotifyfs_t; -+ class dir search_dir_perms; -+ ') -+ -+ allow $1 inotifyfs_t:dir search_dir_perms; -+') -+ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.7/policy/modules/kernel/mls.te ---- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/kernel/mls.te 2006-01-27 01:40:13.000000000 -0500 -@@ -86,7 +86,8 @@ - ') +@@ -912,7 +912,7 @@ + class filesystem unmount; + ') - ifdef(`enable_mls',` --# run init with maximum MLS range - range_transition kernel_t init_exec_t s0 - s15:c0.c255; -+range_transition kernel_t lvm_exec_t s0 - s15:c0.c255; - range_transition initrc_t auditd_exec_t s15:c0.c255; -+range_transition sysadm_t rpm_exec_t s0 - s15:c0.c255; +- allow $1 dosfs_t:filesystem mount; ++ allow $1 dosfs_t:filesystem unmount; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/storage.fc serefpolicy-2.2.7/policy/modules/kernel/storage.fc ---- nsaserefpolicy/policy/modules/kernel/storage.fc 2006-01-09 11:32:53.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/kernel/storage.fc 2006-01-27 01:40:13.000000000 -0500 -@@ -12,6 +12,7 @@ - /dev/cm20.* -b gen_context(system_u:object_r:removable_device_t,s0) - /dev/dasd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) - /dev/dm-[0-9]+ -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) -+/dev/xvd[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) - /dev/fd[^/]+ -b gen_context(system_u:object_r:removable_device_t,s0) - /dev/flash[^/]* -b gen_context(system_u:object_r:fixed_disk_device_t,s15:c0.c255) - /dev/gscd -b gen_context(system_u:object_r:removable_device_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/cups.te serefpolicy-2.2.7/policy/modules/services/cups.te ---- nsaserefpolicy/policy/modules/services/cups.te 2006-01-17 17:08:53.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/services/cups.te 2006-01-27 01:40:13.000000000 -0500 -@@ -148,6 +148,7 @@ - fs_search_auto_mountpoints(cupsd_t) - - term_dontaudit_use_console(cupsd_t) -+term_write_unallocated_ttys(cupsd_t) - - auth_domtrans_chk_passwd(cupsd_t) - auth_dontaudit_read_pam_pid(cupsd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.7/policy/modules/services/hal.te ---- nsaserefpolicy/policy/modules/services/hal.te 2006-01-19 10:00:41.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/services/hal.te 2006-01-27 01:40:13.000000000 -0500 -@@ -116,6 +116,8 @@ - init_use_fd(hald_t) - init_use_script_pty(hald_t) - init_domtrans_script(hald_t) -+init_write_initctl(hald_t) -+init_read_utmp(hald_t) - - libs_use_ld_so(hald_t) - libs_use_shared_libs(hald_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/locallogin.te serefpolicy-2.2.7/policy/modules/system/locallogin.te ---- nsaserefpolicy/policy/modules/system/locallogin.te 2006-01-25 15:59:01.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/system/locallogin.te 2006-01-27 01:40:13.000000000 -0500 -@@ -27,6 +27,8 @@ - domain_subj_id_change_exempt(sulogin_t) - domain_role_change_exempt(sulogin_t) - domain_wide_inherit_fd(sulogin_t) -+fs_use_tmpfs_chr_dev(sulogin_t) -+ - init_domain(sulogin_t,sulogin_exec_t) - init_system_domain(sulogin_t,sulogin_exec_t) - role system_r types sulogin_t; -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/modutils.te serefpolicy-2.2.7/policy/modules/system/modutils.te ---- nsaserefpolicy/policy/modules/system/modutils.te 2006-01-13 17:06:08.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/system/modutils.te 2006-01-27 01:40:13.000000000 -0500 -@@ -113,6 +113,8 @@ - miscfiles_read_localization(insmod_t) + ######################################## +@@ -1037,7 +1037,7 @@ + class filesystem unmount; + ') -+seutil_read_file_contexts(insmod_t) -+ - if( ! secure_mode_insmod ) { - kernel_userland_entry(insmod_t,insmod_exec_t) - } -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/selinuxutil.te serefpolicy-2.2.7/policy/modules/system/selinuxutil.te ---- nsaserefpolicy/policy/modules/system/selinuxutil.te 2006-01-19 10:00:41.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/system/selinuxutil.te 2006-01-27 01:40:13.000000000 -0500 -@@ -414,7 +414,7 @@ - allow run_init_t self:process setexec; - allow run_init_t self:capability setuid; - allow run_init_t self:fifo_file rw_file_perms; -- allow run_init_t self:netlink_audit_socket { create bind write nlmsg_read read }; -+ allow run_init_t self:netlink_audit_socket { create_netlink_socket_perms nlmsg_relay }; - - # often the administrator runs such programs from a directory that is owned - # by a different user or has restrictive SE permissions, do not want to audit -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/udev.te serefpolicy-2.2.7/policy/modules/system/udev.te ---- nsaserefpolicy/policy/modules/system/udev.te 2006-01-19 10:00:41.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/system/udev.te 2006-01-27 01:40:13.000000000 -0500 -@@ -90,6 +90,7 @@ - dev_delete_generic_file(udev_t) - - fs_getattr_all_fs(udev_t) -+fs_search_inotifyfs(udev_t) - - selinux_get_fs_mount(udev_t) - selinux_validate_context(udev_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.if serefpolicy-2.2.7/policy/modules/system/unconfined.if ---- nsaserefpolicy/policy/modules/system/unconfined.if 2006-01-20 10:02:33.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/system/unconfined.if 2006-01-27 01:40:13.000000000 -0500 -@@ -54,8 +54,13 @@ - tunable_policy(`allow_execmem && allow_execstack',` - # Allow making the stack executable via mprotect. - allow $1 self:process execstack; -+ ', ` -+ # These are fairly common but seem to be harmless -+ # caused by using shared libraries built with old tool chains -+ dontaudit $1 self:process execstack; +- allow $1 iso9660_t:filesystem mount; ++ allow $1 iso9660_t:filesystem unmount; + ') + + ######################################## +@@ -1108,7 +1108,7 @@ + class filesystem unmount; ') -+ - optional_policy(`authlogin',` - auth_unconfined($1) +- allow $1 nfs_t:filesystem mount; ++ allow $1 nfs_t:filesystem unmount; + ') + + ######################################## +@@ -1696,7 +1696,7 @@ + class filesystem unmount; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.if serefpolicy-2.2.7/policy/modules/system/userdomain.if ---- nsaserefpolicy/policy/modules/system/userdomain.if 2006-01-26 16:54:28.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/system/userdomain.if 2006-01-27 01:40:13.000000000 -0500 -@@ -848,9 +848,6 @@ - fs_set_all_quotas($1_t) - fs_exec_noxattr($1_t) - -- selinux_set_enforce_mode($1_t) -- selinux_set_boolean($1_t) -- selinux_set_parameters($1_t) - # Get security policy decisions: - selinux_get_fs_mount($1_t) - selinux_validate_context($1_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdomain.te serefpolicy-2.2.7/policy/modules/system/userdomain.te ---- nsaserefpolicy/policy/modules/system/userdomain.te 2006-01-26 16:54:28.000000000 -0500 -+++ serefpolicy-2.2.7/policy/modules/system/userdomain.te 2006-01-27 01:40:13.000000000 -0500 -@@ -154,10 +154,16 @@ - - corecmd_exec_shell(sysadm_t) - -- mls_process_read_up(sysadm_t) -- -- logging_read_audit_log(sysadm_t) -+ ifdef(`enable_mls',` -+ logging_read_audit_log(secadm_t) -+ logging_domtrans_auditctl(secadm_t) -+ mls_process_read_up(secadm_t) -+ ', ` -+ logging_domtrans_auditctl(sysadm_t) -+ logging_read_audit_log(sysadm_t) -+ ') - -+ mls_process_read_up(sysadm_t) - ifdef(`direct_sysadm_daemon',` - optional_policy(`init',` - init_run_daemon(sysadm_t,sysadm_r,admin_terminal) -@@ -168,6 +174,10 @@ - domain_ptrace_all_domains(sysadm_t) + +- allow $1 nfsd_fs_t:filesystem mount; ++ allow $1 nfsd_fs_t:filesystem unmount; + ') + + ######################################## +@@ -1803,7 +1803,7 @@ + class filesystem unmount; ') -+ optional_policy(`dmesg',` -+ dmesg_exec(sysadm_t) -+ ') -+ - optional_policy(`amanda',` - amanda_run_recover(sysadm_t,sysadm_r,admin_terminal) +- allow $1 ramfs_t:filesystem mount; ++ allow $1 ramfs_t:filesystem unmount; + ') + + ######################################## +@@ -1953,7 +1953,7 @@ + class filesystem unmount; ') -@@ -205,6 +215,9 @@ - optional_policy(`consoletype',` - consoletype_exec(sysadm_t) -+ ifdef(`enable_mls',` -+ consoletype_exec(secadm_t) -+ ') +- allow $1 romfs_t:filesystem mount; ++ allow $1 romfs_t:filesystem unmount; + ') + + ######################################## +@@ -2024,7 +2024,7 @@ + class filesystem unmount; ') - optional_policy(`ddcprobe',` -@@ -320,10 +333,24 @@ +- allow $1 rpc_pipefs_t:filesystem mount; ++ allow $1 rpc_pipefs_t:filesystem unmount; + ') + + ######################################## +@@ -2094,7 +2094,7 @@ + class filesystem unmount; ') - optional_policy(`selinuxutil',` -- seutil_run_checkpol(sysadm_t,sysadm_r,admin_terminal) -- seutil_run_loadpol(sysadm_t,sysadm_r,admin_terminal) -+ ifdef(`enable_mls',` -+ seutil_manage_binary_pol(secadm_t) -+ seutil_run_checkpol(secadm_t,secadm_r,admin_terminal) -+ seutil_run_loadpol(secadm_t,secadm_r,admin_terminal) -+ seutil_run_setfiles(secadm_t,secadm_r,admin_terminal) -+ selinux_set_enforce_mode(secadm_t) -+ selinux_set_boolean(secadm_t) -+ selinux_set_parameters(secadm_t) -+ ', ` -+ seutil_manage_binary_pol(sysadm_t) -+ seutil_run_checkpol(sysadm_t,sysadm_r,admin_terminal) -+ seutil_run_loadpol(sysadm_t,sysadm_r,admin_terminal) -+ seutil_run_setfiles(sysadm_t,sysadm_r,admin_terminal) -+ selinux_set_enforce_mode(sysadm_t) -+ selinux_set_boolean(sysadm_t) -+ selinux_set_parameters(sysadm_t) -+ ') - seutil_run_restorecon(sysadm_t,sysadm_r,admin_terminal) -- seutil_run_setfiles(sysadm_t,sysadm_r,admin_terminal) +- allow $1 tmpfs_t:filesystem mount; ++ allow $1 tmpfs_t:filesystem unmount; + ') + + ######################################## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.8/policy/modules/kernel/filesystem.te +--- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-01-17 17:08:52.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/kernel/filesystem.te 2006-01-27 23:48:28.000000000 -0500 +@@ -134,6 +134,7 @@ + # + type dosfs_t, noxattrfs; + fs_type(dosfs_t) ++fs_associate(dosfs_t) + genfscon fat / gen_context(system_u:object_r:dosfs_t,s0) + genfscon msdos / gen_context(system_u:object_r:dosfs_t,s0) + genfscon ntfs / gen_context(system_u:object_r:dosfs_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.8/policy/modules/kernel/mls.te +--- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-17 17:08:52.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/kernel/mls.te 2006-01-27 23:48:28.000000000 -0500 +@@ -86,7 +86,8 @@ + ') - ifdef(`targeted_policy',`',` - seutil_run_runinit(sysadm_t,sysadm_r,admin_terminal) + ifdef(`enable_mls',` +-# run init with maximum MLS range + range_transition kernel_t init_exec_t s0 - s15:c0.c255; ++range_transition kernel_t lvm_exec_t s0 - s15:c0.c255; + range_transition initrc_t auditd_exec_t s15:c0.c255; ++range_transition sysadm_t rpm_exec_t s0 - s15:c0.c255; + ') +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.8/policy/modules/services/automount.te +--- nsaserefpolicy/policy/modules/services/automount.te 2006-01-17 17:08:53.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/services/automount.te 2006-01-27 23:48:28.000000000 -0500 +@@ -64,6 +64,7 @@ + kernel_list_proc(automount_t) + + bootloader_getattr_boot_dir(automount_t) ++bootloader_search_boot(automount_t) + + corecmd_exec_sbin(automount_t) + corecmd_exec_bin(automount_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.8/policy/modules/services/hal.te +--- nsaserefpolicy/policy/modules/services/hal.te 2006-01-27 21:35:04.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/services/hal.te 2006-01-27 23:48:28.000000000 -0500 +@@ -51,6 +51,7 @@ + kernel_write_proc_file(hald_t) + + bootloader_getattr_boot_dir(hald_t) ++bootloader_search_boot(hald_t) + + corecmd_exec_bin(hald_t) + corecmd_exec_sbin(hald_t) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.2.8/policy/modules/services/irqbalance.te +--- nsaserefpolicy/policy/modules/services/irqbalance.te 2006-01-13 17:06:07.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/services/irqbalance.te 2006-01-27 23:48:28.000000000 -0500 +@@ -31,6 +31,8 @@ + + dev_read_sysfs(irqbalance_t) + ++files_read_etc_runtime_files(irqbalance_t) ++ + fs_getattr_all_fs(irqbalance_t) + fs_search_auto_mountpoints(irqbalance_t) + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xdm.fc serefpolicy-2.2.8/policy/modules/services/xdm.fc +--- nsaserefpolicy/policy/modules/services/xdm.fc 2006-01-20 10:02:32.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/services/xdm.fc 2006-01-27 23:49:40.000000000 -0500 +@@ -30,3 +30,7 @@ + + /var/run/xdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) + /var/run/xdmctl(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) ++ifdef(`targeted_policy',` ++/usr/bin/rhgb -- gen_context(system_u:object_r:xdm_exec_t,s0) ++') ++ Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- selinux-policy.spec 27 Jan 2006 07:06:21 -0000 1.93 +++ selinux-policy.spec 28 Jan 2006 04:50:20 -0000 1.94 @@ -5,7 +5,7 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.7 +Version: 2.2.8 Release: 1 License: GPL Group: System Environment/Base From fedora-cvs-commits at redhat.com Sat Jan 28 04:51:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 23:51:09 -0500 Subject: rpms/selinux-policy/devel selinux-policy.spec,1.94,1.95 Message-ID: <200601280451.k0S4p9Tu017386@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17374 Modified Files: selinux-policy.spec Log Message: * Thu Jan 26 2006 Dan Walsh 2.2.8-1 - Update to upstream - Fix rhgb Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- selinux-policy.spec 28 Jan 2006 04:50:20 -0000 1.94 +++ selinux-policy.spec 28 Jan 2006 04:51:05 -0000 1.95 @@ -282,6 +282,10 @@ %{_usr}/share/selinux/refpolicy/include/* %changelog +* Thu Jan 26 2006 Dan Walsh 2.2.8-1 +- Update to upstream +- Fix rhgb + * Thu Jan 26 2006 Dan Walsh 2.2.7-1 - Update to upstream From fedora-cvs-commits at redhat.com Sat Jan 28 04:52:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 23:52:37 -0500 Subject: rpms/selinux-policy/devel .cvsignore,1.31,1.32 sources,1.35,1.36 Message-ID: <200601280452.k0S4qbfi017479@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17466 Modified Files: .cvsignore sources Log Message: * Thu Jan 26 2006 Dan Walsh 2.2.8-1 - Update to upstream - Fix rhgb Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 27 Jan 2006 07:06:17 -0000 1.31 +++ .cvsignore 28 Jan 2006 04:52:34 -0000 1.32 @@ -32,3 +32,4 @@ serefpolicy-2.2.5.tgz serefpolicy-2.2.6.tgz serefpolicy-2.2.7.tgz +serefpolicy-2.2.8.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 27 Jan 2006 07:06:21 -0000 1.35 +++ sources 28 Jan 2006 04:52:34 -0000 1.36 @@ -1 +1 @@ -825d6d14215bf8affdf73c577332c493 serefpolicy-2.2.7.tgz +96d857cdcb3f6ae275fc9aff59e5ed46 serefpolicy-2.2.8.tgz From fedora-cvs-commits at redhat.com Sat Jan 28 04:59:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Fri, 27 Jan 2006 23:59:00 -0500 Subject: rpms/gnome-panel/devel .cvsignore, 1.37, 1.38 gnome-panel.spec, 1.105, 1.106 sources, 1.37, 1.38 Message-ID: <200601280459.k0S4x0t0027637@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27582 Modified Files: .cvsignore gnome-panel.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 17 Jan 2006 05:28:16 -0000 1.37 +++ .cvsignore 28 Jan 2006 04:58:57 -0000 1.38 @@ -7,3 +7,4 @@ gnome-panel-2.13.3.tar.bz2 gnome-panel-2.13.4.tar.bz2 gnome-panel-2.13.5.tar.bz2 +gnome-panel-2.13.90.tar.bz2 Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- gnome-panel.spec 20 Jan 2006 14:46:34 -0000 1.105 +++ gnome-panel.spec 28 Jan 2006 04:58:57 -0000 1.106 @@ -15,8 +15,8 @@ Summary: GNOME panel Name: gnome-panel -Version: 2.13.5 -Release: 2 +Version: 2.13.90 +Release: 1 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2 Source1: redhat-panel-default-setup.entries @@ -197,6 +197,9 @@ %{_datadir}/gtk-doc %changelog +* Fri Jan 27 2006 Matthias Clasen 2.13.90-1 +- Update to 2.13.90 + * Fri Jan 20 2006 Matthias Clasen 2.13.5-2 - Remove "Switch user" button Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 17 Jan 2006 05:28:16 -0000 1.37 +++ sources 28 Jan 2006 04:58:57 -0000 1.38 @@ -1 +1 @@ -8578cd2af550b4bf64161eef95f8d3c8 gnome-panel-2.13.5.tar.bz2 +6ca7470ed881ff88fa91dd5540e92fa0 gnome-panel-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 28 05:04:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 00:04:43 -0500 Subject: rpms/gnome-panel/devel gnome-panel.spec,1.106,1.107 Message-ID: <200601280504.k0S54hRa028977@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-panel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28922 Modified Files: gnome-panel.spec Log Message: Remove upstreamed patch Index: gnome-panel.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-panel/devel/gnome-panel.spec,v retrieving revision 1.106 retrieving revision 1.107 diff -u -r1.106 -r1.107 --- gnome-panel.spec 28 Jan 2006 04:58:57 -0000 1.106 +++ gnome-panel.spec 28 Jan 2006 05:04:31 -0000 1.107 @@ -54,8 +54,6 @@ %endif Patch0: gnome-panel-2.12.1-vendor.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=311036 -Patch1: gnome-panel-2.12.1-remove-screenshot-menuitem.patch Patch2: gnome-panel-2.10.1-speak-to-us-ye-old-wise-fish.patch Patch4: gnome-panel-2.13.2-rename-system-menu.patch Patch5: gnome-panel-2.12.1-about-fedora.patch @@ -81,7 +79,6 @@ %setup -q %patch0 -p1 -b .vendor -%patch1 -p1 -b .remove-screenshot-menuitem %patch2 -p1 -b .speak-to-us-ye-old-wise-fish %patch4 -p1 -b .rename-system-menu %patch5 -p1 -b .about-fedora From fedora-cvs-commits at redhat.com Sat Jan 28 05:08:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 00:08:53 -0500 Subject: rpms/gnome-desktop/devel .cvsignore, 1.24, 1.25 gnome-desktop.spec, 1.45, 1.46 sources, 1.24, 1.25 Message-ID: <200601280508.k0S58rDg029784@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-desktop/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29735 Modified Files: .cvsignore gnome-desktop.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 17 Jan 2006 05:19:14 -0000 1.24 +++ .cvsignore 28 Jan 2006 05:08:50 -0000 1.25 @@ -12,3 +12,4 @@ gnome-desktop-2.13.3.tar.bz2 gnome-desktop-2.13.4.tar.bz2 gnome-desktop-2.13.5.tar.bz2 +gnome-desktop-2.13.90.tar.bz2 Index: gnome-desktop.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/gnome-desktop.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- gnome-desktop.spec 17 Jan 2006 05:19:14 -0000 1.45 +++ gnome-desktop.spec 28 Jan 2006 05:08:51 -0000 1.46 @@ -10,7 +10,7 @@ Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc. Name: gnome-desktop -Version: 2.13.5 +Version: 2.13.90 Release: 1 URL: http://www.gnome.org Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-desktop/%{name}-%{version}.tar.bz2 @@ -132,6 +132,9 @@ #%{_datadir}/gtk-doc %changelog +* Sat Jan 28 2006 Matthias Clasen - 2.13.90-1 +- Update to 2.13.90 + * Tue Jan 16 2006 Matthias Clasen - 2.13.5-1 - Update to 2.13.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-desktop/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 17 Jan 2006 05:19:14 -0000 1.24 +++ sources 28 Jan 2006 05:08:51 -0000 1.25 @@ -1 +1 @@ -dc80dcb7be0714edb11d1cbceaec96db gnome-desktop-2.13.5.tar.bz2 +cf3bfad911903ed215d0d938ceb81e9d gnome-desktop-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 28 05:13:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 00:13:08 -0500 Subject: rpms/gnome-session/devel .cvsignore, 1.17, 1.18 gnome-session.spec, 1.51, 1.52 sources, 1.17, 1.18 Message-ID: <200601280513.k0S5D8FM030604@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-session/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30562 Modified Files: .cvsignore gnome-session.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 17 Jan 2006 14:42:52 -0000 1.17 +++ .cvsignore 28 Jan 2006 05:13:05 -0000 1.18 @@ -2,3 +2,4 @@ gnome-session-2.12.0.tar.bz2 gnome-session-2.13.4.tar.bz2 gnome-session-2.13.5.tar.bz2 +gnome-session-2.13.90.tar.bz2 Index: gnome-session.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/gnome-session.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- gnome-session.spec 17 Jan 2006 14:42:53 -0000 1.51 +++ gnome-session.spec 28 Jan 2006 05:13:05 -0000 1.52 @@ -12,7 +12,7 @@ Summary: GNOME session manager Name: gnome-session -Version: 2.13.5 +Version: 2.13.90 Release: 1 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 @@ -152,6 +152,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Sat Jan 28 2006 Matthias Clasen - 2.13.90-1 +- Update to 2.13.90 + * Tue Jan 17 2006 Matthias Clasen - 2.13.5-1 - Update to 2.13.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-session/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 17 Jan 2006 14:42:53 -0000 1.17 +++ sources 28 Jan 2006 05:13:05 -0000 1.18 @@ -1 +1 @@ -a82550cdbefb2d9c43339fbf078c1ee1 gnome-session-2.13.5.tar.bz2 +f908dc6da3094a4b9fccd6f294828fb7 gnome-session-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 28 05:14:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 00:14:13 -0500 Subject: rpms/evolution/devel evolution-2.5.5.1-notification-cleanups.patch, NONE, 1.1 evolution.spec, 1.118, 1.119 Message-ID: <200601280514.k0S5EDBR030758@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30690 Modified Files: evolution.spec Added Files: evolution-2.5.5.1-notification-cleanups.patch Log Message: add missing patch evolution-2.5.5.1-notification-cleanups.patch: alarm-queue.c | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) --- NEW FILE evolution-2.5.5.1-notification-cleanups.patch --- --- evolution-2.5.5.1/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api 2006-01-16 09:42:17.000000000 -0500 +++ evolution-2.5.5.1/calendar/gui/alarm-notify/alarm-queue.c 2006-01-26 08:29:13.000000000 -0500 @@ -1459,11 +1459,13 @@ const char *summary, *location; GtkTooltips *tooltips; ECalComponentText text; - char *str, *start_str, *end_str, *alarm_str, *time_str; + char *start_str, *end_str, *alarm_str, *time_str; icaltimezone *current_zone; ECalComponentOrganizer organiser; char *filename; char *body; + GdkPixbuf *icon; + NotifyNotification *n; comp = cqa->alarms->comp; qa = lookup_queued_alarm (cqa, alarm_id); @@ -1471,7 +1473,7 @@ return; if (!notify_is_initted ()) notify_init("Evolution Alarm Notify"); - GdkPixbuf *icon = e_icon_factory_get_icon("stock_appointment-reminder", E_ICON_SIZE_DIALOG); + icon = e_icon_factory_get_icon("stock_appointment-reminder", E_ICON_SIZE_DIALOG); g_free (filename); /* get a sensible description for the event */ @@ -1495,9 +1497,6 @@ end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone); time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end); - str = g_strdup_printf ("%s %s", - start_str, time_str); - if (organiser.cn) { if (location) body = g_strdup_printf ("%s\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str); @@ -1509,21 +1508,25 @@ body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str); else body = g_strdup_printf ("%s %s", start_str, time_str); -} + } + + n = notify_notification_new (summary, body, "", NULL); + if (icon) { + notify_notification_set_icon_data_from_pixbuf (n, icon); + g_object_unref (G_OBJECT (icon)); + } - NotifyNotification *n = notify_notification_new (summary, body, "", NULL); - notify_notification_set_icon_data_from_pixbuf (n, icon); - if (!notify_notification_show(n, NULL)) - g_warning ("Could not send notification to daemon\n"); + /* Notifications don't timeout: require explicit user action: */ + notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER); - /* create the private structure */ + if (!notify_notification_show_and_forget (n, NULL)) + g_warning ("Could not send notification to daemon\n"); + + g_free (body); g_free (start_str); g_free (end_str); g_free (alarm_str); g_free (time_str); - g_free (str); - - } #endif Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- evolution.spec 27 Jan 2006 23:58:18 -0000 1.118 +++ evolution.spec 28 Jan 2006 05:14:10 -0000 1.119 @@ -38,7 +38,7 @@ Name: evolution Version: 2.5.5.1 -Release: 1 +Release: 2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -625,6 +625,9 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Sat Jan 28 2006 David Malcolm - 2.5.5.1-2 +- added missing patch + * Wed Jan 25 2006 David Malcolm - 2.5.5.1-1 - 2.5.5.1 - update patch 106 to track upstream, renaming from From fedora-cvs-commits at redhat.com Sat Jan 28 05:24:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 00:24:30 -0500 Subject: rpms/gnome-media/devel .cvsignore, 1.23, 1.24 gnome-media.spec, 1.52, 1.53 sources, 1.23, 1.24 Message-ID: <200601280524.k0S5OUwe011758@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-media/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10158 Modified Files: .cvsignore gnome-media.spec sources Log Message: 2.13.7 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 18 Jan 2006 16:50:14 -0000 1.23 +++ .cvsignore 28 Jan 2006 05:24:25 -0000 1.24 @@ -1,3 +1,4 @@ gnome-media-2.11.91.tar.bz2 gnome-media-2.12.0.tar.bz2 gnome-media-2.13.5.tar.bz2 +gnome-media-2.13.7.tar.bz2 Index: gnome-media.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- gnome-media.spec 22 Jan 2006 07:33:38 -0000 1.52 +++ gnome-media.spec 28 Jan 2006 05:24:25 -0000 1.53 @@ -10,8 +10,8 @@ Summary: GNOME media programs. Name: gnome-media -Version: 2.13.5 -Release: 2 +Version: 2.13.7 +Release: 1 License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2 @@ -155,6 +155,9 @@ %{_libdir}/pkgconfig/* %changelog +* Sat Jan 28 2006 Matthias Clasen - 2.13.7-1 +-Update to 2.13.7 + * Sun Jan 22 2006 Christopher Aillon - 2.13.5-2 - Disable the help button in gnome-audio-profiles-properties since it isn't yet hooked up to anything. Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 18 Jan 2006 16:50:14 -0000 1.23 +++ sources 28 Jan 2006 05:24:25 -0000 1.24 @@ -1 +1 @@ -455c613e317347c546ce940b32bb79d1 gnome-media-2.13.5.tar.bz2 +4336c4522da890ae5e73031040dc719f gnome-media-2.13.7.tar.bz2 From fedora-cvs-commits at redhat.com Sat Jan 28 05:24:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 00:24:57 -0500 Subject: rpms/control-center/devel control-center.spec,1.113,1.114 Message-ID: <200601280524.k0S5Ovdx012026@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11982 Modified Files: control-center.spec Log Message: rebuild against new e-d-s Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- control-center.spec 20 Jan 2006 16:55:49 -0000 1.113 +++ control-center.spec 28 Jan 2006 05:24:55 -0000 1.114 @@ -21,7 +21,7 @@ Summary: GNOME Control Center. Name: control-center Version: 2.13.5.1 -Release: 1 +Release: 2 Epoch: 1 License: GPL/LGPL Group: User Interface/Desktops @@ -219,6 +219,9 @@ # (also its headers) %changelog +* Sat Jan 28 2006 David Malcolm - 1:2.13.5.1-2 +- rebuild against new e-d-s + * Fri Jan 20 2006 Matthias Clasen - 1:2.13.5.1-1 - Update to 2.13.5.1 From fedora-cvs-commits at redhat.com Sat Jan 28 05:29:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 00:29:11 -0500 Subject: rpms/gaim/devel gaim.spec,1.110,1.111 Message-ID: <200601280529.k0S5TBRf013294@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/gaim/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13192 Modified Files: gaim.spec Log Message: rebuild for new e-d-s Index: gaim.spec =================================================================== RCS file: /cvs/dist/rpms/gaim/devel/gaim.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- gaim.spec 13 Jan 2006 19:05:29 -0000 1.110 +++ gaim.spec 28 Jan 2006 05:29:08 -0000 1.111 @@ -13,7 +13,7 @@ Name: gaim Version: 1.5.0 -Release: 13.fc5 +Release: 14.fc5 Epoch: 1 License: GPL Group: Applications/Internet @@ -273,6 +273,9 @@ %endif %changelog +* Sat Jan 28 2006 David Malcolm 1:1.5.0-14.fc5 +- rebuild for new e-d-s + * Fri Jan 13 2006 Warren Togami 1:1.5.0-13 - buildreq desktop-file-utils (ivazquez #176688) - detect NSS in a generic way and abort on failure From fedora-cvs-commits at redhat.com Sat Jan 28 05:35:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 00:35:08 -0500 Subject: rpms/gnome-media/devel gnome-media.spec,1.53,1.54 Message-ID: <200601280535.k0S5Z8Wc014808@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-media/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14755 Modified Files: gnome-media.spec Log Message: Drop obsolete patch Index: gnome-media.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- gnome-media.spec 28 Jan 2006 05:24:25 -0000 1.53 +++ gnome-media.spec 28 Jan 2006 05:35:04 -0000 1.54 @@ -15,7 +15,6 @@ License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2 -Patch3: gnome-media-2.9.90-no-oss-mixer.patch Patch4: gnome-media-2.12.0-settings.patch Patch5: gnome-media-2.13.5-hide-help-button.patch @@ -63,7 +62,6 @@ %prep %setup -q -%patch3 -p1 -b .no-oss-mixer %patch4 -p1 -b .settings %patch5 -p1 -b .hide-help-button From fedora-cvs-commits at redhat.com Sat Jan 28 05:39:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 00:39:56 -0500 Subject: rpms/selinux-policy/devel policy-20060104.patch, 1.26, 1.27 selinux-policy.spec, 1.95, 1.96 Message-ID: <200601280539.k0S5du1U016490@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16438 Modified Files: policy-20060104.patch selinux-policy.spec Log Message: * Fri Jan 27 2006 Dan Walsh 2.2.8-2 - Update to upstream - Fix rhgb, and other Xorg startups policy-20060104.patch: admin/usermanage.te | 3 +++ kernel/filesystem.if | 20 ++++++++++---------- kernel/filesystem.te | 1 + kernel/mls.te | 3 ++- services/automount.te | 1 + services/hal.te | 1 + services/irqbalance.te | 2 ++ services/xdm.fc | 4 ++++ services/xdm.if | 21 +++++++++++++++++++++ system/unconfined.te | 4 ++++ 10 files changed, 49 insertions(+), 11 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- policy-20060104.patch 28 Jan 2006 04:50:20 -0000 1.26 +++ policy-20060104.patch 28 Jan 2006 05:39:52 -0000 1.27 @@ -1,6 +1,6 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.8/policy/modules/admin/usermanage.te --- nsaserefpolicy/policy/modules/admin/usermanage.te 2006-01-19 10:00:40.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/admin/usermanage.te 2006-01-27 23:48:28.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/admin/usermanage.te 2006-01-28 00:05:06.000000000 -0500 @@ -328,6 +328,9 @@ miscfiles_read_localization(passwd_t) @@ -13,7 +13,7 @@ userdom_use_unpriv_users_fd(passwd_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.8/policy/modules/kernel/filesystem.if --- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-27 21:35:04.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/kernel/filesystem.if 2006-01-27 23:48:28.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/kernel/filesystem.if 2006-01-28 00:05:06.000000000 -0500 @@ -154,7 +154,7 @@ class filesystem unmount; ') @@ -106,7 +106,7 @@ ######################################## diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.8/policy/modules/kernel/filesystem.te --- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/kernel/filesystem.te 2006-01-27 23:48:28.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/kernel/filesystem.te 2006-01-28 00:05:06.000000000 -0500 @@ -134,6 +134,7 @@ # type dosfs_t, noxattrfs; @@ -117,7 +117,7 @@ genfscon ntfs / gen_context(system_u:object_r:dosfs_t,s0) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.8/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/kernel/mls.te 2006-01-27 23:48:28.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/kernel/mls.te 2006-01-28 00:05:06.000000000 -0500 @@ -86,7 +86,8 @@ ') @@ -130,7 +130,7 @@ ') diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.8/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2006-01-17 17:08:53.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/services/automount.te 2006-01-27 23:48:28.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/services/automount.te 2006-01-28 00:05:06.000000000 -0500 @@ -64,6 +64,7 @@ kernel_list_proc(automount_t) @@ -141,7 +141,7 @@ corecmd_exec_bin(automount_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.8/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-01-27 21:35:04.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/services/hal.te 2006-01-27 23:48:28.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/services/hal.te 2006-01-28 00:05:06.000000000 -0500 @@ -51,6 +51,7 @@ kernel_write_proc_file(hald_t) @@ -152,7 +152,7 @@ corecmd_exec_sbin(hald_t) diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.2.8/policy/modules/services/irqbalance.te --- nsaserefpolicy/policy/modules/services/irqbalance.te 2006-01-13 17:06:07.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/services/irqbalance.te 2006-01-27 23:48:28.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/services/irqbalance.te 2006-01-28 00:05:06.000000000 -0500 @@ -31,6 +31,8 @@ dev_read_sysfs(irqbalance_t) @@ -164,12 +164,50 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xdm.fc serefpolicy-2.2.8/policy/modules/services/xdm.fc --- nsaserefpolicy/policy/modules/services/xdm.fc 2006-01-20 10:02:32.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/services/xdm.fc 2006-01-27 23:49:40.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/services/xdm.fc 2006-01-28 00:28:26.000000000 -0500 @@ -30,3 +30,7 @@ /var/run/xdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) /var/run/xdmctl(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) +ifdef(`targeted_policy',` -+/usr/bin/rhgb -- gen_context(system_u:object_r:xdm_exec_t,s0) ++/usr/bin/Xorg -- gen_context(system_u:object_r:xdm_exec_t,s0) +') + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xdm.if serefpolicy-2.2.8/policy/modules/services/xdm.if +--- nsaserefpolicy/policy/modules/services/xdm.if 2005-11-14 18:24:08.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/services/xdm.if 2006-01-28 00:05:06.000000000 -0500 +@@ -1 +1,22 @@ + ## X windows login display manager ++######################################## ++## ++## Execute xdmd in the xdmd domain. ++## ++## ++## The type of the process performing this action. ++## ++# ++interface(`xdm_domtrans',` ++ gen_require(` ++ type xdm_t, xdm_exec_t; ++ ') ++ ++ domain_auto_trans($1,xdm_exec_t,xdm_t) ++ ++ allow $1 xdm_t:fd use; ++ allow xdm_t $1:fd use; ++ allow xdm_t $1:fifo_file rw_file_perms; ++ allow xdm_t $1:process sigchld; ++') ++ +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.8/policy/modules/system/unconfined.te +--- nsaserefpolicy/policy/modules/system/unconfined.te 2006-01-27 21:35:05.000000000 -0500 ++++ serefpolicy-2.2.8/policy/modules/system/unconfined.te 2006-01-28 00:05:06.000000000 -0500 +@@ -148,4 +148,8 @@ + optional_policy(`wine',` + wine_domtrans(unconfined_t) + ') ++ ++ optional_policy(`xdm',` ++ xdm_domtrans(unconfined_t) ++ ') + ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- selinux-policy.spec 28 Jan 2006 04:51:05 -0000 1.95 +++ selinux-policy.spec 28 Jan 2006 05:39:52 -0000 1.96 @@ -6,7 +6,7 @@ Summary: SELinux policy configuration Name: selinux-policy Version: 2.2.8 -Release: 1 +Release: 2 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz @@ -282,9 +282,9 @@ %{_usr}/share/selinux/refpolicy/include/* %changelog -* Thu Jan 26 2006 Dan Walsh 2.2.8-1 +* Fri Jan 27 2006 Dan Walsh 2.2.8-2 - Update to upstream -- Fix rhgb +- Fix rhgb, and other Xorg startups * Thu Jan 26 2006 Dan Walsh 2.2.7-1 - Update to upstream From fedora-cvs-commits at redhat.com Sat Jan 28 05:49:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 00:49:56 -0500 Subject: rpms/evolution-webcal/devel evolution-webcal.spec,1.19,1.20 Message-ID: <200601280549.k0S5nuAg000782@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-webcal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv661 Modified Files: evolution-webcal.spec Log Message: rebuild against new e-d-s Index: evolution-webcal.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-webcal/devel/evolution-webcal.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- evolution-webcal.spec 20 Dec 2005 15:37:57 -0000 1.19 +++ evolution-webcal.spec 28 Jan 2006 05:49:53 -0000 1.20 @@ -6,7 +6,7 @@ Name: evolution-webcal Summary: A handler for webcal URIs Version: 2.4.1 -Release: 2 +Release: 3 License: GPL Group: Applications/Internet Source0: %{name}-%{version}.tar.bz2 @@ -56,6 +56,9 @@ %changelog +* Sat Jan 28 2006 David Malcolm - 2.4.1-3 +- rebuild against new e-d-s + * Tue Dec 20 2005 Matthias Clasen 2.4.1-2 - Rebuild against new libedataserver From fedora-cvs-commits at redhat.com Sat Jan 28 05:50:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 00:50:56 -0500 Subject: rpms/evolution-sharp/devel evolution-sharp.spec,1.8,1.9 Message-ID: <200601280550.k0S5ouBG001281@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-sharp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1223 Modified Files: evolution-sharp.spec Log Message: rebuild Index: evolution-sharp.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-sharp/devel/evolution-sharp.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- evolution-sharp.spec 22 Jan 2006 14:44:20 -0000 1.8 +++ evolution-sharp.spec 28 Jan 2006 05:50:54 -0000 1.9 @@ -1,6 +1,6 @@ Name: evolution-sharp Version: 0.10.2 -Release: 4 +Release: 5 Summary: Evolution Data Server Mono Bindings Group: System Environment/Libraries @@ -57,6 +57,9 @@ %{_prefix}/share/gapi-2.0/* %changelog +* Sat Jan 28 2006 David Malcolm 0.10.2-5 +- rebuild + * Sun Jan 22 2006 Alexander Larsson 0.10.2-4 - Build on s390x From fedora-cvs-commits at redhat.com Sat Jan 28 06:15:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 01:15:19 -0500 Subject: rpms/thunderbird/devel .cvsignore, 1.9, 1.10 sources, 1.12, 1.13 thunderbird-redhat-default-prefs.js, 1.1, 1.2 thunderbird.spec, 1.60, 1.61 Message-ID: <200601280615.k0S6FJBc009805@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/thunderbird/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9767 Modified Files: .cvsignore sources thunderbird-redhat-default-prefs.js thunderbird.spec Log Message: * Fri Jan 27 2006 Christopher Aillon - 1.5-2 - Add some langpacks back in - Stop providing MozillaThunderbird Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 12 Jan 2006 08:57:15 -0000 1.9 +++ .cvsignore 28 Jan 2006 06:15:15 -0000 1.10 @@ -7,3 +7,4 @@ thunderbird-1.5b2-source.tar.bz2 thunderbird-1.5rc1-source.tar.bz2 thunderbird-1.5-source.tar.bz2 +thunderbird-langpacks-20060127.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 12 Jan 2006 08:57:15 -0000 1.12 +++ sources 28 Jan 2006 06:15:16 -0000 1.13 @@ -1 +1,2 @@ 781c1cd1a01583d9b666d8c2fe4288e6 thunderbird-1.5-source.tar.bz2 +df32df3b18b0f9af5687d8a0cab08782 thunderbird-langpacks-20060127.tar.bz2 Index: thunderbird-redhat-default-prefs.js =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird-redhat-default-prefs.js,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- thunderbird-redhat-default-prefs.js 16 Dec 2004 22:21:15 -0000 1.1 +++ thunderbird-redhat-default-prefs.js 28 Jan 2006 06:15:16 -0000 1.2 @@ -1,8 +1,10 @@ +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); pref("general.useragent.vendor", "Fedora"); pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR"); +pref("intl.locale.matchOS", true); # Make hyperlinks work pref("network.protocol-handler.app.http", "COMMAND"); pref("network.protocol-handler.app.https", "COMMAND"); pref("network.protocol-handler.app.ftp", "COMMAND"); - Index: thunderbird.spec =================================================================== RCS file: /cvs/dist/rpms/thunderbird/devel/thunderbird.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- thunderbird.spec 12 Jan 2006 08:57:15 -0000 1.60 +++ thunderbird.spec 28 Jan 2006 06:15:16 -0000 1.61 @@ -8,7 +8,7 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 1.5 -Release: 1 +Release: 2 Epoch: 0 URL: http://www.mozilla.org/projects/thunderbird/ License: MPL @@ -19,6 +19,7 @@ %define tarball thunderbird-1.5rc1-source.tar.bz2 %endif Source0: %{tarball} +Source1: thunderbird-langpacks-20060127.tar.bz2 Source10: thunderbird-mozconfig Source11: thunderbird-mozconfig-branded Source12: thunderbird-redhat-default-prefs.js @@ -65,7 +66,6 @@ BuildRequires: freetype-devel Prereq: desktop-file-utils >= %{desktop_file_utils_version} Obsoletes: MozillaThunderbird -Provides: MozillaThunderbird = %{epoch}:%{version} %define tbdir %{_libdir}/thunderbird-%{version} @@ -161,6 +161,18 @@ # own mozilla plugin dir (#135050) %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins +# Install langpacks +%{__mkdir_p} $RPM_BUILD_ROOT%{tbdir}/extensions +%{__tar} xjf %{SOURCE1} +for langpack in `ls thunderbird-langpacks/*.xpi`; do + language=`basename $langpack .xpi` + extensiondir=$RPM_BUILD_ROOT%{tbdir}/extensions/langpack-$language at thunderbird.mozilla.org + %{__mkdir_p} $extensiondir + unzip $langpack -d $extensiondir +done +%{__rm} -rf thunderbird-langpacks + + %{__rm} -f $RPM_BUILD_ROOT%{tbdir}/thunderbird-config cd $RPM_BUILD_ROOT%{tbdir}/chrome @@ -187,6 +199,10 @@ #=============================================================================== %changelog +* Fri Jan 27 2006 Christopher Aillon - 1.5-2 +- Add some langpacks back in +- Stop providing MozillaThunderbird + * Thu Jan 12 2006 Christopher Aillon - 1.5-1 - Official 1.5 release is out From fedora-cvs-commits at redhat.com Sat Jan 28 09:20:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 04:20:55 -0500 Subject: rpms/ekiga/devel ekiga.spec,1.6,1.7 Message-ID: <200601280920.k0S9KtR4019331@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/ekiga/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19200 Modified Files: ekiga.spec Log Message: Rebuilding following a libedataserver revision, daniel Index: ekiga.spec =================================================================== RCS file: /cvs/dist/rpms/ekiga/devel/ekiga.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ekiga.spec 27 Jan 2006 17:12:11 -0000 1.6 +++ ekiga.spec 28 Jan 2006 09:20:52 -0000 1.7 @@ -1,7 +1,7 @@ Summary: A Gnome based SIP/H323 teleconferencing application Name: ekiga Version: 1.99.0 -Release: 2 +Release: 3 URL: http://www.ekiga.org/ Source0: http://www.ekiga.org/ekiga-%{version}.tar.gz License: GPL @@ -84,6 +84,9 @@ %{_sysconfdir}/gconf/schemas/ekiga.schemas %changelog +* Sat Jan 28 2006 Daniel Veillard - 1.99.0-3 +- Rebuilt following a libedataserver revision + * Fri Jan 27 2006 Matthias Clasen - 1.99.0-2 - Use the upstream .desktop file From fedora-cvs-commits at redhat.com Sat Jan 28 09:41:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 04:41:20 -0500 Subject: rpms/kdebase/FC-4 kdebase.spec,1.114,1.115 Message-ID: <200601280941.k0S9fKnf026882@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv26556 Modified Files: kdebase.spec Log Message: remove unneeded patch Index: kdebase.spec =================================================================== RCS file: /cvs/dist/rpms/kdebase/FC-4/kdebase.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- kdebase.spec 27 Jan 2006 23:25:17 -0000 1.114 +++ kdebase.spec 28 Jan 2006 09:41:17 -0000 1.115 @@ -47,7 +47,6 @@ Patch74: kdebase-3.3.92-kpersonalizer.patch Patch80: kdebase-3.2.92-logo.patch Patch81: kdebase-3.2.2-konsole-setInputMethodEnabled-20040525.diff -Patch83: kdebase-3.3.0-altf2.patch Patch91: kdebase-3.4.2-kdesktop-konsole.patch Patch92: kdebase-3.4.0-xdg.patch Patch93: kdebase-3.4.1-pam.patch @@ -125,7 +124,6 @@ %patch74 -p1 -b .kper %patch80 -p1 -b .logo %patch81 -p1 -b .im -%patch83 -p1 -b .altf2 %patch91 -p1 -b .kdestop-konsole %patch92 -p1 -b .xdg %patch93 -p1 -b .loginuid From fedora-cvs-commits at redhat.com Sat Jan 28 10:00:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 05:00:04 -0500 Subject: rpms/gcc/devel gcc41-atomic-builtins.patch, NONE, 1.1 gcc41-ppc32-ldbl.patch, NONE, 1.1 gcc41-s390-ldbl.patch, NONE, 1.1 .cvsignore, 1.127, 1.128 gcc41.spec, 1.18, 1.19 sources, 1.129, 1.130 gcc41-ppc64-sync.patch, 1.1, NONE gcc41-pr25324.patch, 1.2, NONE gcc41-pr25717.patch, 1.2, NONE gcc41-s390-atomic1.patch, 1.1, NONE Message-ID: <200601281000.k0SA04Q6015081@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14987 Modified Files: .cvsignore gcc41.spec sources Added Files: gcc41-atomic-builtins.patch gcc41-ppc32-ldbl.patch gcc41-s390-ldbl.patch Removed Files: gcc41-ppc64-sync.patch gcc41-pr25324.patch gcc41-pr25717.patch gcc41-s390-atomic1.patch Log Message: 4.1.0-0.17 gcc41-atomic-builtins.patch: alias.c | 9 +++++++ alias.h | 6 ++++ builtins.c | 62 ++++++++++++++++++++++++--------------------------- config/s390/s390.c | 1 config/sparc/sparc.c | 1 5 files changed, 47 insertions(+), 32 deletions(-) --- NEW FILE gcc41-atomic-builtins.patch --- 2006-01-28 Jakub Jelinek * config/s390/s390.c (init_alignment_context): Set ALIAS_SET_MEMORY_BARRIER on the MEM. * config/sparc/sparc.c (sparc_expand_compare_and_swap_12): Likewise. 2006-01-25 Richard Henderson * alias.h (ALIAS_SET_MEMORY_BARRIER): New. * alias.c (true_dependence): Respect it. (canon_true_dependence, write_dependence_p): Likewise. * builtins.c (get_builtin_sync_mem): Set it. 2006-01-03 Adrian Straetling * gcc/builtins.c (get_builtin_sync_mem): New function. (expand_builtin_sync_operation, expand_builtin_compare_and_swap, expand_builtin_lock_test_and_set, expand_builtin_lock_release): Call get_builtin_sync_mem to generate mem rtx. --- gcc/config/s390/s390.c.jj 2006-01-28 09:54:03.000000000 +0100 +++ gcc/config/s390/s390.c 2006-01-28 10:29:03.000000000 +0100 @@ -4030,6 +4030,7 @@ init_alignment_context (struct alignment /* Generate MEM. */ ac->memsi = gen_rtx_MEM (SImode, align); MEM_VOLATILE_P (ac->memsi) = MEM_VOLATILE_P (mem); + set_mem_alias_set (ac->memsi, ALIAS_SET_MEMORY_BARRIER); set_mem_align (ac->memsi, GET_MODE_BITSIZE (SImode)); /* Calculate shiftcount. */ --- gcc/config/sparc/sparc.c.jj 2006-01-28 09:54:03.000000000 +0100 +++ gcc/config/sparc/sparc.c 2006-01-28 10:29:46.000000000 +0100 @@ -8734,6 +8734,7 @@ sparc_expand_compare_and_swap_12 (rtx re gen_rtx_AND (SImode, addr1, GEN_INT (3)))); memsi = gen_rtx_MEM (SImode, addr); + set_mem_alias_set (memsi, ALIAS_SET_MEMORY_BARRIER); MEM_VOLATILE_P (memsi) = MEM_VOLATILE_P (mem); val = force_reg (SImode, memsi); --- gcc/builtins.c.jj 2006-01-28 09:54:07.000000000 +0100 +++ gcc/builtins.c 2006-01-28 10:25:33.000000000 +0100 @@ -5425,6 +5425,28 @@ get_builtin_sync_mode (int fcode_diff) return mode_for_size (BITS_PER_UNIT << fcode_diff, MODE_INT, 0); } +/* Expand the memory expression LOC and return the appropriate memory operand + for the builtin_sync operations. */ + +static rtx +get_builtin_sync_mem (tree loc, enum machine_mode mode) +{ + rtx addr, mem; + + addr = expand_expr (loc, NULL, Pmode, EXPAND_SUM); + + /* Note that we explicitly do not want any alias information for this + memory, so that we kill all other live memories. Otherwise we don't + satisfy the full barrier semantics of the intrinsic. */ + mem = validize_mem (gen_rtx_MEM (mode, addr)); + + set_mem_align (mem, get_pointer_alignment (loc, BIGGEST_ALIGNMENT)); + set_mem_alias_set (mem, ALIAS_SET_MEMORY_BARRIER); + MEM_VOLATILE_P (mem) = 1; + + return mem; +} + /* Expand the __sync_xxx_and_fetch and __sync_fetch_and_xxx intrinsics. ARGLIST is the operands list to the function. CODE is the rtx code that corresponds to the arithmetic or logical operation from the name; @@ -5438,20 +5460,14 @@ expand_builtin_sync_operation (enum mach enum rtx_code code, bool after, rtx target, bool ignore) { - rtx addr, val, mem; + rtx val, mem; /* Expand the operands. */ - addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_SUM); + mem = get_builtin_sync_mem (TREE_VALUE (arglist), mode); arglist = TREE_CHAIN (arglist); val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL); - /* Note that we explicitly do not want any alias information for this - memory, so that we kill all other live memories. Otherwise we don't - satisfy the full barrier semantics of the intrinsic. */ - mem = validize_mem (gen_rtx_MEM (mode, addr)); - MEM_VOLATILE_P (mem) = 1; - if (ignore) return expand_sync_operation (mem, val, code); else @@ -5467,10 +5483,10 @@ static rtx expand_builtin_compare_and_swap (enum machine_mode mode, tree arglist, bool is_bool, rtx target) { - rtx addr, old_val, new_val, mem; + rtx old_val, new_val, mem; /* Expand the operands. */ - addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_SUM); + mem = get_builtin_sync_mem (TREE_VALUE (arglist), mode); arglist = TREE_CHAIN (arglist); old_val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL); @@ -5478,12 +5494,6 @@ expand_builtin_compare_and_swap (enum ma arglist = TREE_CHAIN (arglist); new_val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL); - /* Note that we explicitly do not want any alias information for this - memory, so that we kill all other live memories. Otherwise we don't - satisfy the full barrier semantics of the intrinsic. */ - mem = validize_mem (gen_rtx_MEM (mode, addr)); - MEM_VOLATILE_P (mem) = 1; - if (is_bool) return expand_bool_compare_and_swap (mem, old_val, new_val, target); else @@ -5500,20 +5510,14 @@ static rtx expand_builtin_lock_test_and_set (enum machine_mode mode, tree arglist, rtx target) { - rtx addr, val, mem; + rtx val, mem; /* Expand the operands. */ - addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_NORMAL); + mem = get_builtin_sync_mem (TREE_VALUE (arglist), mode); arglist = TREE_CHAIN (arglist); val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL); - /* Note that we explicitly do not want any alias information for this - memory, so that we kill all other live memories. Otherwise we don't - satisfy the barrier semantics of the intrinsic. */ - mem = validize_mem (gen_rtx_MEM (mode, addr)); - MEM_VOLATILE_P (mem) = 1; - return expand_sync_lock_test_and_set (mem, val, target); } @@ -5547,17 +5551,11 @@ static void expand_builtin_lock_release (enum machine_mode mode, tree arglist) { enum insn_code icode; - rtx addr, mem, insn; + rtx mem, insn; rtx val = const0_rtx; /* Expand the operands. */ - addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_NORMAL); - - /* Note that we explicitly do not want any alias information for this - memory, so that we kill all other live memories. Otherwise we don't - satisfy the barrier semantics of the intrinsic. */ - mem = validize_mem (gen_rtx_MEM (mode, addr)); - MEM_VOLATILE_P (mem) = 1; + mem = get_builtin_sync_mem (TREE_VALUE (arglist), mode); /* If there is an explicit operation in the md file, use it. */ icode = sync_lock_release[mode]; --- gcc/alias.c.jj 2006-01-28 09:54:07.000000000 +0100 +++ gcc/alias.c 2006-01-28 10:25:33.000000000 +0100 @@ -2209,6 +2209,9 @@ true_dependence (rtx mem, enum machine_m return 1; if (GET_MODE (mem) == BLKmode && GET_CODE (XEXP (mem, 0)) == SCRATCH) return 1; + if (MEM_ALIAS_SET (x) == ALIAS_SET_MEMORY_BARRIER + || MEM_ALIAS_SET (mem) == ALIAS_SET_MEMORY_BARRIER) + return 1; if (DIFFERENT_ALIAS_SETS_P (x, mem)) return 0; @@ -2282,6 +2285,9 @@ canon_true_dependence (rtx mem, enum mac return 1; if (GET_MODE (mem) == BLKmode && GET_CODE (XEXP (mem, 0)) == SCRATCH) return 1; + if (MEM_ALIAS_SET (x) == ALIAS_SET_MEMORY_BARRIER + || MEM_ALIAS_SET (mem) == ALIAS_SET_MEMORY_BARRIER) + return 1; if (DIFFERENT_ALIAS_SETS_P (x, mem)) return 0; @@ -2341,6 +2347,9 @@ write_dependence_p (rtx mem, rtx x, int return 1; if (GET_MODE (mem) == BLKmode && GET_CODE (XEXP (mem, 0)) == SCRATCH) return 1; + if (MEM_ALIAS_SET (x) == ALIAS_SET_MEMORY_BARRIER + || MEM_ALIAS_SET (mem) == ALIAS_SET_MEMORY_BARRIER) + return 1; if (DIFFERENT_ALIAS_SETS_P (x, mem)) return 0; --- gcc/alias.h.jj 2006-01-28 09:54:07.000000000 +0100 +++ gcc/alias.h 2006-01-28 10:25:33.000000000 +0100 @@ -27,4 +27,10 @@ extern HOST_WIDE_INT get_frame_alias_set extern void record_base_value (unsigned int, rtx, int); extern bool component_uses_parent_alias_set (tree); +/* This alias set can be used to force a memory to conflict with all + other memories, creating a barrier across which no memory reference + can move. Note that there are other legacy ways to create such + memory barriers, including an address of SCRATCH. */ +#define ALIAS_SET_MEMORY_BARRIER ((HOST_WIDE_INT) -1) + #endif /* GCC_ALIAS_H */ gcc41-ppc32-ldbl.patch: config/fp-bit.h | 4 + config/rs6000/aix.h | 2 config/rs6000/darwin-ldouble.c | 5 + config/rs6000/darwin.h | 2 config/rs6000/libgcc-ppc-glibc.ver | 31 ++++++++++ config/rs6000/linux.h | 2 config/rs6000/linux64.h | 2 config/rs6000/ppc64-fp.c | 1 config/rs6000/rs6000.c | 107 ++++++++++++++++++++++--------------- config/rs6000/rs6000.h | 6 +- config/rs6000/rs6000.md | 36 ++++++------ config/rs6000/sysv4.h | 7 ++ config/rs6000/t-linux64 | 14 ---- config/rs6000/t-ppccomm | 14 ++++ doc/invoke.texi | 32 +++++++---- libgcc-std.ver | 4 + mklibgcc.in | 2 17 files changed, 181 insertions(+), 90 deletions(-) --- NEW FILE gcc41-ppc32-ldbl.patch --- 2006-01-27 Jakub Jelinek PR target/25864 * libgcc-std.ver: Add GCC_4.1.0 symbol version. * config/rs6000/t-linux64 (TARGET_LIBGCC2_CFLAGS): Only append -mno-minimal-toc to previous content. (bispecs): Remove goal. * config/rs6000/ppc64-fp.c: Define TMODES before including fp-bit.h. * config/rs6000/darwin-ldouble.c: Don't provide _xlq*@GCC_3.4 compatibility aliases on powerpc-*-*gnu*. * config/rs6000/libgcc-ppc-glibc.ver: New file. * config/rs6000/t-ppccomm (SHLIB_MAPFILES): Append libgcc-ppc-glibc.ver on powerpc*-*-*gnu*. (TARGET_LIBGCC2_CFLAGS): Append -specs=ldblspecs. (ldblspecs): New goal. * config/rs6000/t-linux64 (SHLIB_MAPFILES): Removed. * mklibgcc.in: If $TPBIT is empty, don't compile _sf_to_tf and _df_to_tf. * config/fp-bit.h (TMODES): Don't define if none of TFLOAT, L_sf_to_tf or L_df_to_tf is defined. 2006-01-27 David Edelsohn Alan Modra PR target/25864 * config/rs6000/linux.h (POWERPC_LINUX): Define. * config/rs6000/linux64.h (POWERPC_LINUX): Define. * config/rs6000/darwin-ldouble.c: Build on 32-bit PowerPC. * config/rs6000/darwin.h (TARGET_IEEEQUAD): Define to zero. * config/rs6000/aix.h (TARGET_IEEEQUAD): Define to zero. * config/rs6000/rs6000.c (rs6000_ieeequad): New variable. (rs6000_override_options): Initialize rs6000_ieeequad. Initialize TFmode format to ibm_extended_format if not TARGET_IEEEQUAD. (rs6000_handle_option): Accept -mabi= ibmlongdouble and ieeelongdouble. (rs6000_emit_move): Move !TARGET_IEEEQUAD as two parts. (rs6000_return_in_memory): Only return IEEEQUAD in memory. (function_arg_advance): IBM long double passed in two FPRs, not split. (function_arg): IBM long double passed in FPRs. (rs6000_pass_by_reference): Only IEEEQUAD passed by reference. (rs6000_gimplify_va_arg): IBM long double passed in two FPRs. Only multireg GPR aligned. (rs6000_init_libfuncs): Enable IBM long double functions if not IEEEQUAD. (rs6000_generate_compare): Use IBM long double compare if not TARGET_IEEEQUAD. * config/rs6000/rs6000.h (rs6000_ieeequad): Declare. (TARGET_IEEEQUAD): Define. (CANNOT_CHANGE_MODE_CLASS): Any mode larger than doubleword if not TARGET_IEEEQUAD. * config/rs6000/rs6000.md: Enable TFmode patterns if !TARGET_IEEEQUAD. * config/rs6000/t-ppccomm (LIB2FUNCS_EXTRA): Add darwin-ldouble.c. * config/rs6000/svr4.h (SUBTARGET_OVERRIDE_OPTIONS): -msoft-float and -mlong-double-128 are incompatible. * doc/invoke.texi (-mabi): Collect options together. Add ibmlongdouble and ieeelongdouble. --- gcc/doc/invoke.texi.jj 2006-01-28 09:53:43.000000000 +0100 +++ gcc/doc/invoke.texi 2006-01-28 10:33:14.000000000 +0100 @@ -11032,16 +11032,6 @@ enhancements. @opindex mno-vrsave Generate VRSAVE instructions when generating AltiVec code. - at item -mabi=spe - at opindex mabi=spe -Extend the current ABI with SPE ABI extensions. This does not change -the default ABI, instead it adds the SPE ABI extensions to the current -ABI at . - - at item -mabi=no-spe - at opindex mabi=no-spe -Disable Booke SPE ABI extensions for the current ABI at . - @item -msecure-plt @opindex msecure-plt Generate code that allows ld and ld.so to build executables and shared @@ -11395,7 +11385,27 @@ SVR4 ABI)@. @opindex mabi Extend the current ABI with a particular extension, or remove such extension. Valid values are @var{altivec}, @var{no-altivec}, @var{spe}, - at var{no-spe}@. + at var{no-spe}, @var{ibmlongdouble}, @var{ieeelongdouble}@. + + at item -mabi=spe + at opindex mabi=spe +Extend the current ABI with SPE ABI extensions. This does not change +the default ABI, instead it adds the SPE ABI extensions to the current +ABI at . + + at item -mabi=no-spe + at opindex mabi=no-spe +Disable Booke SPE ABI extensions for the current ABI at . + + at item -mabi=ibmlongdouble + at opindex mabi=ibmlongdouble +Change the current ABI to use IBM extended precision long double. +This is a PowerPC 32-bit SYSV ABI option. + + at item -mabi=ieeelongdouble + at opindex mabi=ieeelongdouble +Change the current ABI to use IEEE extended precision long double. +This is a PowerPC 32-bit Linux ABI option. @item -mprototype @itemx -mno-prototype --- gcc/config/rs6000/darwin.h.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/darwin.h 2006-01-28 10:33:14.000000000 +0100 @@ -313,6 +313,8 @@ do { \ /* Darwin only runs on PowerPC, so short-circuit POWER patterns. */ #undef TARGET_POWER #define TARGET_POWER 0 +#undef TARGET_IEEEQUAD +#define TARGET_IEEEQUAD 0 /* Since Darwin doesn't do TOCs, stub this out. */ --- gcc/config/rs6000/libgcc-ppc-glibc.ver.jj 2006-01-28 10:33:14.000000000 +0100 +++ gcc/config/rs6000/libgcc-ppc-glibc.ver 2006-01-28 10:33:14.000000000 +0100 @@ -0,0 +1,31 @@ +%ifndef _SOFT_FLOAT +%ifndef __powerpc64__ +%exclude { + __multc3 + __divtc3 + __powitf2 + __fixtfdi + __fixunstfdi + __floatditf +} + +GCC_4.1.0 { + # long double support + __multc3 + __divtc3 + __powitf2 + __fixtfdi + __fixunstfdi + __floatditf + +%else +GCC_3.4.4 { +%endif + + # long double support + __gcc_qadd + __gcc_qsub + __gcc_qmul + __gcc_qdiv +} +%endif --- gcc/config/rs6000/rs6000.c.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/rs6000.c 2006-01-28 10:33:14.000000000 +0100 @@ -158,10 +158,13 @@ enum rs6000_nop_insertion rs6000_sched_i /* Support targetm.vectorize.builtin_mask_for_load. */ static GTY(()) tree altivec_builtin_mask_for_load; -/* Size of long double */ +/* Size of long double. */ int rs6000_long_double_type_size; -/* Whether -mabi=altivec has appeared */ +/* IEEE quad extended precision long double. */ +int rs6000_ieeequad; + +/* Whether -mabi=altivec has appeared. */ int rs6000_altivec_abi; /* Nonzero if we want SPE ABI extensions. */ @@ -1286,6 +1289,11 @@ rs6000_override_options (const char *def if (!rs6000_explicit_options.long_double) rs6000_long_double_type_size = RS6000_DEFAULT_LONG_DOUBLE_SIZE; +#ifndef POWERPC_LINUX + if (!rs6000_explicit_options.abi) + rs6000_ieeequad = 1; +#endif + /* Set Altivec ABI as default for powerpc64 linux. */ if (TARGET_ELF && TARGET_64BIT) { @@ -1399,8 +1407,7 @@ rs6000_override_options (const char *def if (!rs6000_explicit_options.aix_struct_ret) aix_struct_return = (DEFAULT_ABI != ABI_V4 || DRAFT_V4_STRUCT_RET); - if (TARGET_LONG_DOUBLE_128 - && (DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN)) + if (TARGET_LONG_DOUBLE_128 && !TARGET_IEEEQUAD) REAL_MODE_FORMAT (TFmode) = &ibm_extended_format; /* Allocate an alias set for register saves & restores from stack. */ @@ -1772,6 +1779,17 @@ rs6000_handle_option (size_t code, const warning (0, "Using old darwin ABI"); } + else if (! strcmp (arg, "ibmlongdouble")) + { + rs6000_ieeequad = 0; + warning (0, "Using IBM extended precision long double"); + } + else if (! strcmp (arg, "ieeelongdouble")) + { + rs6000_ieeequad = 1; + warning (0, "Using IEEE extended precision long double"); + } + else { error ("unknown ABI specified: '%s'", arg); @@ -3885,7 +3903,7 @@ rs6000_emit_move (rtx dest, rtx source, /* 128-bit constant floating-point values on Darwin should really be loaded as two parts. */ - if ((DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + if (!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128 && mode == TFmode && GET_CODE (operands[1]) == CONST_DOUBLE) { @@ -4209,7 +4227,7 @@ rs6000_return_in_memory (tree type, tree return true; } - if (DEFAULT_ABI == ABI_V4 && TYPE_MODE (type) == TFmode) + if (DEFAULT_ABI == ABI_V4 && TARGET_IEEEQUAD && TYPE_MODE (type) == TFmode) return true; return false; @@ -4596,13 +4614,15 @@ function_arg_advance (CUMULATIVE_ARGS *c else if (DEFAULT_ABI == ABI_V4) { if (TARGET_HARD_FLOAT && TARGET_FPRS - && (mode == SFmode || mode == DFmode)) + && (mode == SFmode || mode == DFmode + || (mode == TFmode && !TARGET_IEEEQUAD))) { - if (cum->fregno <= FP_ARG_V4_MAX_REG) - cum->fregno++; + if (cum->fregno + (mode == TFmode ? 1 : 0) <= FP_ARG_V4_MAX_REG) + cum->fregno += (GET_MODE_SIZE (mode) + 7) >> 3; else { - if (mode == DFmode) + cum->fregno = FP_ARG_V4_MAX_REG + 1; + if (mode == DFmode || mode == TFmode) cum->words += cum->words & 1; cum->words += rs6000_arg_size (mode, type); } @@ -5127,9 +5147,10 @@ function_arg (CUMULATIVE_ARGS *cum, enum else if (abi == ABI_V4) { if (TARGET_HARD_FLOAT && TARGET_FPRS - && (mode == SFmode || mode == DFmode)) + && (mode == SFmode || mode == DFmode + || (mode == TFmode && !TARGET_IEEEQUAD))) { - if (cum->fregno <= FP_ARG_V4_MAX_REG) + if (cum->fregno + (mode == TFmode ? 1 : 0) <= FP_ARG_V4_MAX_REG) return gen_rtx_REG (mode, cum->fregno); else return NULL_RTX; @@ -5332,7 +5353,7 @@ rs6000_pass_by_reference (CUMULATIVE_ARG enum machine_mode mode, tree type, bool named ATTRIBUTE_UNUSED) { - if (DEFAULT_ABI == ABI_V4 && mode == TFmode) + if (DEFAULT_ABI == ABI_V4 && TARGET_IEEEQUAD && mode == TFmode) { if (TARGET_DEBUG_ARG) fprintf (stderr, "function_arg_pass_by_reference: V4 long double\n"); @@ -5783,14 +5804,16 @@ rs6000_gimplify_va_arg (tree valist, tre align = 1; if (TARGET_HARD_FLOAT && TARGET_FPRS - && (TYPE_MODE (type) == SFmode || TYPE_MODE (type) == DFmode)) + && (TYPE_MODE (type) == SFmode + || TYPE_MODE (type) == DFmode + || TYPE_MODE (type) == TFmode)) { /* FP args go in FP registers, if present. */ reg = fpr; - n_reg = 1; + n_reg = (size + 7) / 8; sav_ofs = 8*4; sav_scale = 8; - if (TYPE_MODE (type) == DFmode) + if (TYPE_MODE (type) != SFmode) align = 8; } else @@ -5822,7 +5845,7 @@ rs6000_gimplify_va_arg (tree valist, tre As are any other 2 gpr item such as complex int due to a historical mistake. */ u = reg; - if (n_reg == 2) + if (n_reg == 2 && reg == gpr) { u = build2 (BIT_AND_EXPR, TREE_TYPE (reg), reg, size_int (n_reg - 1)); @@ -9028,33 +9051,32 @@ rs6000_init_libfuncs (void) if (!TARGET_HARD_FLOAT) return; - if (DEFAULT_ABI != ABI_V4) + if (DEFAULT_ABI != ABI_V4 && TARGET_XCOFF + && !TARGET_POWER2 && !TARGET_POWERPC) { - if (TARGET_XCOFF && ! TARGET_POWER2 && ! TARGET_POWERPC) - { - /* AIX library routines for float->int conversion. */ - set_conv_libfunc (sfix_optab, SImode, DFmode, "__itrunc"); - set_conv_libfunc (ufix_optab, SImode, DFmode, "__uitrunc"); - set_conv_libfunc (sfix_optab, SImode, TFmode, "_qitrunc"); - set_conv_libfunc (ufix_optab, SImode, TFmode, "_quitrunc"); - } + /* AIX library routines for float->int conversion. */ + set_conv_libfunc (sfix_optab, SImode, DFmode, "__itrunc"); + set_conv_libfunc (ufix_optab, SImode, DFmode, "__uitrunc"); + set_conv_libfunc (sfix_optab, SImode, TFmode, "_qitrunc"); + set_conv_libfunc (ufix_optab, SImode, TFmode, "_quitrunc"); + } + if (!TARGET_IEEEQUAD) /* AIX/Darwin/64-bit Linux quad floating point routines. */ - if (!TARGET_XL_COMPAT) - { - set_optab_libfunc (add_optab, TFmode, "__gcc_qadd"); - set_optab_libfunc (sub_optab, TFmode, "__gcc_qsub"); - set_optab_libfunc (smul_optab, TFmode, "__gcc_qmul"); - set_optab_libfunc (sdiv_optab, TFmode, "__gcc_qdiv"); - } - else - { - set_optab_libfunc (add_optab, TFmode, "_xlqadd"); - set_optab_libfunc (sub_optab, TFmode, "_xlqsub"); - set_optab_libfunc (smul_optab, TFmode, "_xlqmul"); - set_optab_libfunc (sdiv_optab, TFmode, "_xlqdiv"); - } - } + if (!TARGET_XL_COMPAT) + { + set_optab_libfunc (add_optab, TFmode, "__gcc_qadd"); + set_optab_libfunc (sub_optab, TFmode, "__gcc_qsub"); + set_optab_libfunc (smul_optab, TFmode, "__gcc_qmul"); + set_optab_libfunc (sdiv_optab, TFmode, "__gcc_qdiv"); + } + else + { + set_optab_libfunc (add_optab, TFmode, "_xlqadd"); + set_optab_libfunc (sub_optab, TFmode, "_xlqsub"); + set_optab_libfunc (smul_optab, TFmode, "_xlqmul"); + set_optab_libfunc (sdiv_optab, TFmode, "_xlqdiv"); + } else { /* 32-bit SVR4 quad floating point routines. */ @@ -11089,7 +11111,7 @@ rs6000_generate_compare (enum rtx_code c CLOBBERs to match cmptf_internal2 pattern. */ if (comp_mode == CCFPmode && TARGET_XL_COMPAT && GET_MODE (rs6000_compare_op0) == TFmode - && (DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + && !TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128) emit_insn (gen_rtx_PARALLEL (VOIDmode, gen_rtvec (9, @@ -18873,6 +18895,7 @@ rs6000_function_value (tree valtype, tre GP_ARG_RETURN + 3), GEN_INT (12)))); } + if ((INTEGRAL_TYPE_P (valtype) && TYPE_PRECISION (valtype) < BITS_PER_WORD) || POINTER_TYPE_P (valtype)) --- gcc/config/rs6000/linux64.h.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/linux64.h 2006-01-28 10:33:14.000000000 +0100 @@ -568,3 +568,5 @@ while (0) ppc64 glibc provides it at -0x7010(13). */ #define TARGET_THREAD_SSP_OFFSET (TARGET_64BIT ? -0x7010 : -0x7008) #endif + +#define POWERPC_LINUX --- gcc/config/rs6000/darwin-ldouble.c.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/darwin-ldouble.c 2006-01-28 10:33:14.000000000 +0100 @@ -48,7 +49,7 @@ Software Foundation, 51 Franklin Street, This code currently assumes big-endian. */ -#if !_SOFT_FLOAT && (defined (__MACH__) || defined (__powerpc64__) || defined (_AIX)) +#if !_SOFT_FLOAT && (defined (__MACH__) || defined (__powerpc64__) || defined (__powerpc__) || defined (_AIX)) #define fabs(x) __builtin_fabs(x) #define isless(x, y) __builtin_isless (x, y) @@ -67,7 +68,8 @@ extern long double __gcc_qsub (double, d extern long double __gcc_qmul (double, double, double, double); extern long double __gcc_qdiv (double, double, double, double); -#if defined __ELF__ && defined SHARED +#if defined __ELF__ && defined SHARED \ + && (defined __powerpc64__ || !(defined __linux__ || defined __gnu_hurd__)) /* Provide definitions of the old symbol names to satisfy apps and shared libs built against an older libgcc. To access the _xlq symbols an explicit version reference is needed, so these won't --- gcc/config/rs6000/t-linux64.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/t-linux64 2006-01-28 10:33:14.000000000 +0100 @@ -4,9 +4,7 @@ LIB2FUNCS_EXTRA = tramp.S $(srcdir)/config/rs6000/ppc64-fp.c \ $(srcdir)/config/rs6000/darwin-ldouble.c -TARGET_LIBGCC2_CFLAGS = -mno-minimal-toc -fPIC -specs=bispecs - -SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-ppc64.ver +TARGET_LIBGCC2_CFLAGS += -mno-minimal-toc MULTILIB_OPTIONS = m64/m32 msoft-float MULTILIB_DIRNAMES = 64 32 nof @@ -32,13 +30,3 @@ fp-bit32.c: $(srcdir)/config/fp-bit.c echo '#define FLOAT'; \ cat $(srcdir)/config/fp-bit.c; \ echo '#endif' ) > fp-bit32.c - -# Hack to use -mlong-double-128 just for compiling 64 bit libgcc -mklibgcc: bispecs - -bispecs: specs - if [ x`$(GCC_FOR_TARGET) -print-multi-os-directory` = x../lib ]; then \ - sed -e '/cc1_options/{ n; s/$$/ %{m64:-mlong-double-128}/; }' < specs > $@; \ - else \ - sed -e '/cc1_options/{ n; s/$$/ %{!m32:-mlong-double-128}/; }' < specs > $@; \ - fi --- gcc/config/rs6000/rs6000.h.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/rs6000.h 2006-01-28 10:33:14.000000000 +0100 @@ -291,6 +292,7 @@ extern const char *rs6000_traceback_name /* These are separate from target_flags because we've run out of bits there. */ extern int rs6000_long_double_type_size; +extern int rs6000_ieeequad; extern int rs6000_altivec_abi; extern int rs6000_spe_abi; extern int rs6000_float_gprs; @@ -316,6 +318,7 @@ extern enum rs6000_nop_insertion rs6000_ #endif #define TARGET_LONG_DOUBLE_128 (rs6000_long_double_type_size == 128) +#define TARGET_IEEEQUAD rs6000_ieeequad #define TARGET_ALTIVEC_ABI rs6000_altivec_abi #define TARGET_SPE_ABI 0 @@ -1214,8 +1217,8 @@ enum reg_class /* Return a class of registers that cannot change FROM mode to TO mode. */ #define CANNOT_CHANGE_MODE_CLASS(FROM, TO, CLASS) \ - (((DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) \ - && GET_MODE_SIZE (FROM) >= 8 && GET_MODE_SIZE (TO) >= 8) \ + (!TARGET_IEEEQUAD \ + && GET_MODE_SIZE (FROM) >= 8 && GET_MODE_SIZE (TO) >= 8 \ ? 0 \ : GET_MODE_SIZE (FROM) != GET_MODE_SIZE (TO) \ ? reg_classes_intersect_p (FLOAT_REGS, CLASS) \ --- gcc/config/rs6000/t-ppccomm.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/t-ppccomm 2006-01-28 10:33:14.000000000 +0100 @@ -1,6 +1,6 @@ # Common support for PowerPC ELF targets (both EABI and SVR4). -LIB2FUNCS_EXTRA = tramp.S +LIB2FUNCS_EXTRA = tramp.S $(srcdir)/config/rs6000/darwin-ldouble.c # This one can't end up in shared libgcc LIB2FUNCS_STATIC_EXTRA = eabi.S @@ -11,6 +11,18 @@ eabi.S: $(srcdir)/config/rs6000/eabi.asm tramp.S: $(srcdir)/config/rs6000/tramp.asm cat $(srcdir)/config/rs6000/tramp.asm > tramp.S +ifneq (,$findstring gnu,$(target)) +TARGET_LIBGCC2_CFLAGS += -specs=ldblspecs + +SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-ppc-glibc.ver + +# Hack to use -mlong-double-128 only when not compiling nof libgcc +mklibgcc: ldblspecs + +ldblspecs: specs + sed -e '/cc1_options/{ n; s/$$/ %{!msoft-float:-mlong-double-128}/; }' < specs > $@ +endif + # Switch synonyms MULTILIB_MATCHES_ENDIAN = mlittle=mlittle-endian mbig=mbig-endian MULTILIB_MATCHES_SYSV = mcall-sysv=mcall-sysv-eabi mcall-sysv=mcall-sysv-noeabi mcall-sysv=mcall-linux mcall-sysv=mcall-netbsd --- gcc/config/rs6000/ppc64-fp.c.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/ppc64-fp.c 2006-01-28 10:33:14.000000000 +0100 @@ -31,6 +31,7 @@ Software Foundation, 51 Franklin Street, 02110-1301, USA. */ #if defined(__powerpc64__) +#define TMODES #include "config/fp-bit.h" extern DItype __fixtfdi (TFtype); --- gcc/config/rs6000/rs6000.md.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/rs6000.md 2006-01-28 10:33:14.000000000 +0100 @@ -151,7 +152,7 @@ ; Any hardware-supported floating-point mode (define_mode_macro FP [(SF "TARGET_HARD_FLOAT") (DF "TARGET_HARD_FLOAT && (TARGET_FPRS || TARGET_E500_DOUBLE)") - (TF "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + (TF "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128")]) ; Various instructions that come in SI and DI forms. @@ -7785,7 +7786,7 @@ (define_expand "movtf" [(set (match_operand:TF 0 "general_operand" "") (match_operand:TF 1 "any_operand" ""))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "{ rs6000_emit_move (operands[0], operands[1], TFmode); DONE; }") @@ -7795,7 +7796,7 @@ (define_insn_and_split "*movtf_internal" [(set (match_operand:TF 0 "nonimmediate_operand" "=o,f,f,r,Y,r") (match_operand:TF 1 "input_operand" "f,o,f,YGHF,r,r"))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128 && (gpc_reg_operand (operands[0], TFmode) || gpc_reg_operand (operands[1], TFmode))" @@ -7809,7 +7810,7 @@ [(parallel [(set (match_operand:TF 0 "nonimmediate_operand" "") (float_extend:TF (match_operand:DF 1 "input_operand" ""))) (use (match_dup 2))])] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" { operands[2] = CONST0_RTX (DFmode); @@ -7819,7 +7820,7 @@ [(set (match_operand:TF 0 "nonimmediate_operand" "=o,f,&f,r") (float_extend:TF (match_operand:DF 1 "input_operand" "fr,mf,mf,rmGHF"))) (use (match_operand:DF 2 "zero_reg_mem_operand" "rf,m,f,n"))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "#" "&& reload_completed" @@ -7837,7 +7838,7 @@ (define_expand "extendsftf2" [(set (match_operand:TF 0 "nonimmediate_operand" "") (float_extend:TF (match_operand:SF 1 "gpc_reg_operand" "")))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" { rtx tmp = gen_reg_rtx (DFmode); @@ -7849,14 +7850,14 @@ (define_expand "trunctfdf2" [(set (match_operand:DF 0 "gpc_reg_operand" "") (float_truncate:DF (match_operand:TF 1 "gpc_reg_operand" "")))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "") (define_insn_and_split "trunctfdf2_internal1" [(set (match_operand:DF 0 "gpc_reg_operand" "=f,?f") (float_truncate:DF (match_operand:TF 1 "gpc_reg_operand" "0,f")))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) && !TARGET_XL_COMPAT + "!TARGET_IEEEQUAD && !TARGET_XL_COMPAT && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "@ # @@ -7872,7 +7873,7 @@ (define_insn "trunctfdf2_internal2" [(set (match_operand:DF 0 "gpc_reg_operand" "=f") (float_truncate:DF (match_operand:TF 1 "gpc_reg_operand" "f")))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) && TARGET_XL_COMPAT + "!TARGET_IEEEQUAD && TARGET_XL_COMPAT && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "fadd %0,%1,%L1" [(set_attr "type" "fp")]) @@ -7881,7 +7882,7 @@ [(set (match_operand:SF 0 "gpc_reg_operand" "=f") (float_truncate:SF (match_operand:TF 1 "gpc_reg_operand" "f"))) (clobber (match_scratch:DF 2 "=f"))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "#" "&& reload_completed" @@ -7894,7 +7895,7 @@ (define_expand "floatsitf2" [(set (match_operand:TF 0 "gpc_reg_operand" "=f") (float:TF (match_operand:SI 1 "gpc_reg_operand" "r")))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" { rtx tmp = gen_reg_rtx (DFmode); @@ -7922,7 +7923,7 @@ (clobber (match_dup 3)) (clobber (match_dup 4)) (clobber (match_dup 5))])] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && (TARGET_POWER2 || TARGET_POWERPC) && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" { @@ -7939,7 +7940,7 @@ (clobber (match_operand:DF 3 "gpc_reg_operand" "=&f")) (clobber (match_operand:DI 4 "gpc_reg_operand" "=f")) (clobber (match_operand:DI 5 "memory_operand" "=o"))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "#" "&& (!no_new_pseudos || offsettable_nonstrict_memref_p (operands[5]))" @@ -7960,7 +7961,7 @@ (define_insn "negtf2" [(set (match_operand:TF 0 "gpc_reg_operand" "=f") (neg:TF (match_operand:TF 1 "gpc_reg_operand" "f")))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "* { @@ -7975,7 +7976,7 @@ (define_expand "abstf2" [(set (match_operand:TF 0 "gpc_reg_operand" "=f") (abs:TF (match_operand:TF 1 "gpc_reg_operand" "f")))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" " { @@ -7995,7 +7996,7 @@ (label_ref (match_operand 2 "" "")) (pc))) (set (match_dup 6) (neg:DF (match_dup 6)))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) + "!TARGET_IEEEQUAD && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" " { @@ -10934,7 +10935,7 @@ [(set (match_operand:CCFP 0 "cc_reg_operand" "=y") (compare:CCFP (match_operand:TF 1 "gpc_reg_operand" "f") (match_operand:TF 2 "gpc_reg_operand" "f")))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) && !TARGET_XL_COMPAT + "!TARGET_IEEEQUAD && !TARGET_XL_COMPAT && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "fcmpu %0,%1,%2\;bne %0,$+8\;fcmpu %0,%L1,%L2" [(set_attr "type" "fpcompare") @@ -10952,7 +10953,7 @@ (clobber (match_scratch:DF 8 "=f")) (clobber (match_scratch:DF 9 "=f")) (clobber (match_scratch:DF 10 "=f"))] - "(DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_DARWIN) && TARGET_XL_COMPAT + "!TARGET_IEEEQUAD && TARGET_XL_COMPAT && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_LONG_DOUBLE_128" "#" "&& reload_completed" --- gcc/config/rs6000/aix.h.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/aix.h 2006-01-28 10:33:14.000000000 +0100 @@ -38,6 +38,8 @@ #define TARGET_ALTIVEC 0 #undef TARGET_ALTIVEC_ABI #define TARGET_ALTIVEC_ABI 0 +#undef TARGET_IEEEQUAD +#define TARGET_IEEEQUAD 0 /* The AIX linker will discard static constructors in object files before collect has a chance to see them, so scan the object files directly. */ --- gcc/config/rs6000/linux.h.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/linux.h 2006-01-28 10:33:14.000000000 +0100 @@ -118,3 +118,5 @@ /* ppc32 glibc provides __stack_chk_guard in -0x7008(2). */ #define TARGET_THREAD_SSP_OFFSET -0x7008 #endif + +#define POWERPC_LINUX --- gcc/config/rs6000/sysv4.h.jj 2006-01-28 09:54:04.000000000 +0100 +++ gcc/config/rs6000/sysv4.h 2006-01-28 10:33:14.000000000 +0100 @@ -215,6 +215,13 @@ do { \ error ("-msecure-plt not supported by your assembler"); \ } \ \ + if (TARGET_SOFT_FLOAT && TARGET_LONG_DOUBLE_128) \ + { \ + rs6000_long_double_type_size = 64; \ + if (rs6000_explicit_options.long_double) \ + warning (0, "soft-float and long-double-128 are incompatible"); \ + } \ + \ /* Treat -fPIC the same as -mrelocatable. */ \ if (flag_pic > 1 && DEFAULT_ABI != ABI_AIX) \ target_flags |= MASK_RELOCATABLE | MASK_MINIMAL_TOC | MASK_NO_FP_IN_TOC; \ --- gcc/config/fp-bit.h.jj 2006-01-28 09:54:06.000000000 +0100 +++ gcc/config/fp-bit.h 2006-01-28 10:33:14.000000000 +0100 @@ -87,7 +87,9 @@ Boston, MA 02110-1301, USA. */ #endif /* ! FINE_GRAINED_LIBRARIES */ #if __LDBL_MANT_DIG__ == 113 || __LDBL_MANT_DIG__ == 106 -# define TMODES +# if defined(TFLOAT) || defined(L_sf_to_tf) || defined(L_df_to_tf) +# define TMODES +# endif #endif typedef float SFtype __attribute__ ((mode (SF))); --- gcc/libgcc-std.ver.jj 2006-01-28 09:54:08.000000000 +0100 +++ gcc/libgcc-std.ver 2006-01-28 10:33:48.000000000 +0100 @@ -252,3 +252,7 @@ GCC_4.0.0 { __mulxc3 __multc3 } + +%inherit GCC_4.1.0 GCC_4.0.0 +GCC_4.1.0 { +} --- gcc/mklibgcc.in.jj 2006-01-28 09:54:07.000000000 +0100 +++ gcc/mklibgcc.in 2006-01-28 10:36:26.000000000 +0100 @@ -315,6 +316,7 @@ for ml in $MULTILIBS; do if [ "$FPBIT" ]; then for name in $FPBIT_FUNCS; do + [ "$name" = _sf_to_tf -a -z "$TPBIT" ] && continue if [ "$libgcc_s_so" ]; then out="libgcc/${dir}/${name}${objext}" outS="libgcc/${dir}/${name}_s${objext}" @@ -345,6 +347,7 @@ for ml in $MULTILIBS; do if [ "$DPBIT" ]; then for name in $DPBIT_FUNCS; do + [ "$name" = _df_to_tf -a -z "$TPBIT" ] && continue if [ "$libgcc_s_so" ]; then out="libgcc/${dir}/${name}${objext}" outS="libgcc/${dir}/${name}_s${objext}" gcc41-s390-ldbl.patch: 2084.md | 42 ++++- libgcc-glibc.ver | 33 +++ s390.c | 58 ++++++ s390.h | 46 ++++- s390.md | 457 ++++++++++++++++++++++++++++++++++++++++--------------- s390.opt | 8 t-crtstuff | 1 7 files changed, 506 insertions(+), 139 deletions(-) --- NEW FILE gcc41-s390-ldbl.patch --- 2006-01-27 Andreas Krebbel Ulrich Weigand * config/s390/2084.md ("x_fsimptf", "x_fmultf", "x_fdivtf", "x_floadtf", "x_ftrunctf", "x_ftruncdf"): New insn reservations. * config/s390/s390.c (struct processor_costs): Add mxbr, sqxbr, dxbr and dxr fields. (z900_cost, z990_cost, z9_109_cost): Values for the new fields added. (s390_rtx_costs): Use the new fields to calculate rtx costs. (s390_secondary_input_reload_class, s390_secondary_output_reload_class): Define secondary reloads for TFmode moves. (constant_modes): Add TFmode. (NR_C_MODES): Set to 8. * config/s390/s390.h (TARGET_CPU_CPP_BUILTINS): Add __LONG_DOUBLE_128__ builtin define. (LONG_DOUBLE_TYPE_SIZE): Set to 128 or 64. (LIBGCC2_LONG_DOUBLE_TYPE_SIZE, WIDEST_HARDWARE_FP_SIZE): Define. (HARD_REGNO_NREGS, HARD_REGNO_MODE_OK, CLASS_MAX_NREGS, CANNOT_CHANGE_MODE_CLASS): Consider TFmode. * config/s390/s390.md ("type" attribute): Add fsimptf, floadtf, fmultf, fdivtf, fsqrttf, ftrunctf, ftruncdf as possible values. (FPR mode macro): Add TFmode. (DSF mode macro): New. (, mode attributes): Removed. (, , , , mode attributes): New. ("*cmp_ccs_0", "*cmp_ccs_0_ibm", "*cmp_ccs", "*cmp_ccs_ibm", "fix_trunc2_ieee", "floatdi2", "floatsi2_ieee", "*add3", "*add3_cc", "*add3_cconly", "*add3_ibm", "*sub3", "*sub3_cc", "*sub3_cconly", "*sub3_ibm", "*mul3_ibm", "*fmadd", "*fmsub", "*div3", "*div3_ibm", "*neg2_cc", "*neg2_cconly", "*neg2", "*neg2_ibm", "*abs2_cc", "*abs2_cconly", "*abs2", "*abs2_ibm", "*negabs2_cc", "*negabs2_cconly", "*negabs2", "sqrt2"): Changed to . R constraint replaced by . ("*mul3"): Changed to . R constraint replaced by . ("fix_truncdi2"): 'FPR:' removed. ("*fmadd", "*fmsub"): FPR mode replaced by DSF. ("movtf"): New insn definition followed by 2 new splitters. ("reload_outtf", "reload_intf", "trunctfdf2", "trunctfsf2", "extenddftf2", "extendsftf2"): New expanders. ("*trunctfdf2_ieee", "*trunctfdf2_ibm", "*trunctfsf2_ieee", "*trunctfsf2_ibm", "*extenddftf2_ieee", "*extenddftf2_ibm", "*extendsftf2_ieee", "*extendsftf2_ibm"): New insn patterns. * config/s390/s390.opt (mlong-double-128, mlong-double-64): New options. * config/s390/t-crtstuff (TARGET_LIBGCC2_CFLAGS): Macro defined. * config/s390/libgcc-glibc.ver (__divtc3, __multc3, __powitf2, __fixtfti, __fixunstfti, __floattitf, __fixtfdi, __fixunstfdi, __floatditf): Add a GCC_4.1.0 symbol version tag. --- gcc/gcc/config/s390/2084.md.jj 2006-01-28 09:54:03.000000000 +0100 +++ gcc/gcc/config/s390/2084.md 2006-01-28 10:39:11.000000000 +0100 @@ -161,6 +161,11 @@ ;; Floating point insns ;; +(define_insn_reservation "x_fsimptf" 7 + (and (eq_attr "cpu" "z990,z9_109") + (eq_attr "type" "fsimptf")) + "x_e1_t*2,x-wr-fp") + (define_insn_reservation "x_fsimpdf" 6 (and (eq_attr "cpu" "z990,z9_109") (eq_attr "type" "fsimpdf,fmuldf")) @@ -171,6 +176,18 @@ (eq_attr "type" "fsimpsf,fmulsf")) "x_e1_t,x-wr-fp") + +(define_insn_reservation "x_fmultf" 33 + (and (eq_attr "cpu" "z990,z9_109") + (eq_attr "type" "fmultf")) + "x_e1_t*27,x-wr-fp") + + +(define_insn_reservation "x_fdivtf" 82 + (and (eq_attr "cpu" "z990,z9_109") + (eq_attr "type" "fdivtf,fsqrttf")) + "x_e1_t*76,x-wr-fp") + (define_insn_reservation "x_fdivdf" 36 (and (eq_attr "cpu" "z990,z9_109") (eq_attr "type" "fdivdf,fsqrtdf")) @@ -181,6 +198,12 @@ (eq_attr "type" "fdivsf,fsqrtsf")) "x_e1_t*30,x-wr-fp") + +(define_insn_reservation "x_floadtf" 6 + (and (eq_attr "cpu" "z990,z9_109") + (eq_attr "type" "floadtf")) + "x_e1_t,x-wr-fp") + (define_insn_reservation "x_floaddf" 6 (and (eq_attr "cpu" "z990,z9_109") (eq_attr "type" "floaddf")) @@ -191,6 +214,7 @@ (eq_attr "type" "floadsf")) "x_e1_t,x-wr-fp") + (define_insn_reservation "x_fstoredf" 1 (and (eq_attr "cpu" "z990,z9_109") (eq_attr "type" "fstoredf")) @@ -201,6 +225,18 @@ (eq_attr "type" "fstoresf")) "x_e1_t,x-wr-fp") + +(define_insn_reservation "x_ftrunctf" 16 + (and (eq_attr "cpu" "z990,z9_109") + (eq_attr "type" "ftrunctf")) + "x_e1_t*10,x-wr-fp") + +(define_insn_reservation "x_ftruncdf" 11 + (and (eq_attr "cpu" "z990,z9_109") + (eq_attr "type" "ftruncdf")) + "x_e1_t*5,x-wr-fp") + + (define_insn_reservation "x_ftoi" 1 (and (eq_attr "cpu" "z990,z9_109") (eq_attr "type" "ftoi")) @@ -234,7 +270,7 @@ "s390_agen_dep_p") (define_bypass 9 "x_int,x_agen,x_lr" - "x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ + "x_floadtf, x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ x_fsimpdf, x_fsimpsf, x_fdivdf, x_fdivsf" "s390_agen_dep_p") ;; @@ -247,7 +283,7 @@ "s390_agen_dep_p") (define_bypass 5 "x_load" - "x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ + "x_floadtf, x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ x_fsimpdf, x_fsimpsf, x_fdivdf, x_fdivsf" "s390_agen_dep_p") @@ -261,7 +297,7 @@ "s390_agen_dep_p") (define_bypass 5 "x_larl, x_la" - "x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ + "x_floadtf, x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ x_fsimpdf, x_fsimpsf, x_fdivdf, x_fdivsf" "s390_agen_dep_p") --- gcc/gcc/config/s390/s390.c.jj 2006-01-28 10:29:03.000000000 +0100 +++ gcc/gcc/config/s390/s390.c 2006-01-28 10:39:11.000000000 +0100 @@ -71,13 +71,17 @@ struct processor_costs const int msgr; /* cost of an MSGR instruction. */ const int msr; /* cost of an MSR instruction. */ const int mult_df; /* cost of multiplication in DFmode. */ + const int mxbr; /* square root */ + const int sqxbr; /* cost of square root in TFmode. */ const int sqdbr; /* cost of square root in DFmode. */ const int sqebr; /* cost of square root in SFmode. */ /* multiply and add */ const int madbr; /* cost of multiply and add in DFmode. */ const int maebr; /* cost of multiply and add in SFmode. */ /* division */ + const int dxbr; + const int dxr; const int ddbr; const int ddr; const int debr; @@ -107,10 +111,14 @@ struct processor_costs z900_cost = COSTS_N_INSNS (10), /* MSGR */ COSTS_N_INSNS (4), /* MSR */ COSTS_N_INSNS (7), /* multiplication in DFmode */ + COSTS_N_INSNS (13), /* MXBR */ + COSTS_N_INSNS (136), /* SQXBR */ COSTS_N_INSNS (44), /* SQDBR */ COSTS_N_INSNS (35), /* SQEBR */ COSTS_N_INSNS (18), /* MADBR */ COSTS_N_INSNS (13), /* MAEBR */ + COSTS_N_INSNS (134), /* DXBR */ + COSTS_N_INSNS (135), /* DXR */ COSTS_N_INSNS (30), /* DDBR */ COSTS_N_INSNS (30), /* DDR */ COSTS_N_INSNS (27), /* DEBR */ @@ -138,10 +146,14 @@ struct processor_costs z990_cost = COSTS_N_INSNS (4), /* MSGR */ COSTS_N_INSNS (4), /* MSR */ COSTS_N_INSNS (1), /* multiplication in DFmode */ + COSTS_N_INSNS (28), /* MXBR */ + COSTS_N_INSNS (130), /* SQXBR */ COSTS_N_INSNS (66), /* SQDBR */ COSTS_N_INSNS (38), /* SQEBR */ COSTS_N_INSNS (1), /* MADBR */ COSTS_N_INSNS (1), /* MAEBR */ + COSTS_N_INSNS (60), /* DXBR */ + COSTS_N_INSNS (72), /* DXR */ COSTS_N_INSNS (40), /* DDBR */ COSTS_N_INSNS (44), /* DDR */ COSTS_N_INSNS (26), /* DDBR */ @@ -169,10 +181,14 @@ struct processor_costs z9_109_cost = COSTS_N_INSNS (4), /* MSGR */ COSTS_N_INSNS (4), /* MSR */ COSTS_N_INSNS (1), /* multiplication in DFmode */ + COSTS_N_INSNS (28), /* MXBR */ + COSTS_N_INSNS (130), /* SQXBR */ COSTS_N_INSNS (66), /* SQDBR */ COSTS_N_INSNS (38), /* SQEBR */ COSTS_N_INSNS (1), /* MADBR */ COSTS_N_INSNS (1), /* MAEBR */ + COSTS_N_INSNS (60), /* DXBR */ + COSTS_N_INSNS (72), /* DXR */ COSTS_N_INSNS (40), /* DDBR */ COSTS_N_INSNS (37), /* DDR */ COSTS_N_INSNS (26), /* DDBR */ @@ -2154,6 +2170,9 @@ s390_rtx_costs (rtx x, int code, int out case DFmode: *total = s390_cost->mult_df; break; + case TFmode: + *total = s390_cost->mxbr; + break; default: return false; } @@ -2204,13 +2223,22 @@ s390_rtx_costs (rtx x, int code, int out else /* TARGET_IBM_FLOAT */ *total = s390_cost->ddr; } + else if (GET_MODE (x) == TFmode) + { + if (TARGET_IEEE_FLOAT) + *total = s390_cost->dxbr; + else /* TARGET_IBM_FLOAT */ + *total = s390_cost->dxr; + } return false; case SQRT: if (GET_MODE (x) == SFmode) *total = s390_cost->sqebr; - else /* DFmode */ + else if (GET_MODE (x) == DFmode) *total = s390_cost->sqdbr; + else /* TFmode */ + *total = s390_cost->sqxbr; return false; case SIGN_EXTEND: @@ -2565,6 +2593,18 @@ s390_secondary_input_reload_class (enum if (s390_plus_operand (in, mode)) return ADDR_REGS; + if (reg_classes_intersect_p (FP_REGS, class) + && mode == TFmode + && GET_CODE (in) == MEM) + { + rtx disp = const0_rtx; + + eliminate_constant_term (XEXP (in, 0), &disp); + + if (!DISP_IN_RANGE (INTVAL (disp) + GET_MODE_SIZE (mode) - 1)) + return ADDR_REGS; + } + if (reg_classes_intersect_p (CC_REGS, class)) return GENERAL_REGS; @@ -2592,6 +2632,18 @@ s390_secondary_output_reload_class (enum + GET_MODE_SIZE (mode) - 1)) return ADDR_REGS; + if (reg_classes_intersect_p (FP_REGS, class) + && mode == TFmode + && GET_CODE (out) == MEM) + { + rtx disp = const0_rtx; + + eliminate_constant_term (XEXP (out, 0), &disp); + + if (!DISP_IN_RANGE (INTVAL (disp) + GET_MODE_SIZE (mode) - 1)) + return ADDR_REGS; + } + if (reg_classes_intersect_p (CC_REGS, class)) return GENERAL_REGS; @@ -5164,10 +5216,10 @@ replace_ltrel_base (rtx *x) /* We keep a list of constants which we have to add to internal constant tables in the middle of large functions. */ -#define NR_C_MODES 7 +#define NR_C_MODES 8 enum machine_mode constant_modes[NR_C_MODES] = { - TImode, + TFmode, TImode, DFmode, DImode, SFmode, SImode, HImode, --- gcc/gcc/config/s390/s390.h.jj 2006-01-28 09:54:03.000000000 +0100 +++ gcc/gcc/config/s390/s390.h 2006-01-28 10:39:11.000000000 +0100 @@ -93,6 +93,8 @@ extern enum processor_flags s390_arch_fl builtin_define ("__s390__"); \ if (TARGET_64BIT) \ builtin_define ("__s390x__"); \ + if (TARGET_LONG_DOUBLE_128) \ + builtin_define ("__LONG_DOUBLE_128__"); \ } \ while (0) @@ -216,7 +218,18 @@ if (INTEGRAL_MODE_P (MODE) && #define LONG_LONG_TYPE_SIZE 64 #define FLOAT_TYPE_SIZE 32 #define DOUBLE_TYPE_SIZE 64 -#define LONG_DOUBLE_TYPE_SIZE 64 /* ??? Should support extended format. */ +#define LONG_DOUBLE_TYPE_SIZE (TARGET_LONG_DOUBLE_128 ? 128 : 64) + +/* Define this to set long double type size to use in libgcc2.c, which can + not depend on target_flags. */ +#ifdef __LONG_DOUBLE_128__ +#define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 128 +#else +#define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64 +#endif + +/* Work around target_flags dependency in ada/targtyps.c. */ +#define WIDEST_HARDWARE_FP_SIZE 64 /* We use "unsigned char" as default. */ #define DEFAULT_SIGNED_CHAR 0 @@ -334,28 +347,34 @@ if (INTEGRAL_MODE_P (MODE) && Floating point modes <= word size fit into any FPR or GPR. Floating point modes > word size (i.e. DFmode on 32-bit) fit into any FPR, or an even-odd GPR pair. + TFmode fits only into an even-odd FPR pair. Complex floating point modes fit either into two FPRs, or into successive GPRs (again starting with an even number). + TCmode fits only into two successive even-odd FPR pairs. Condition code modes fit only into the CC register. */ #define HARD_REGNO_NREGS(REGNO, MODE) \ (FP_REGNO_P(REGNO)? \ - (GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT ? 2 : 1) : \ + (GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT ? \ + 2 * ((GET_MODE_SIZE(MODE) / 2 + 8 - 1) / 8) : \ + ((GET_MODE_SIZE(MODE) + 8 - 1) / 8)) : \ GENERAL_REGNO_P(REGNO)? \ ((GET_MODE_SIZE(MODE)+UNITS_PER_WORD-1) / UNITS_PER_WORD) : \ ACCESS_REGNO_P(REGNO)? \ - ((GET_MODE_SIZE(MODE)+4-1) / 4) : \ + ((GET_MODE_SIZE(MODE) + 4 - 1) / 4) : \ 1) #define HARD_REGNO_MODE_OK(REGNO, MODE) \ (FP_REGNO_P(REGNO)? \ - ((MODE) == SImode || (MODE) == DImode || \ - GET_MODE_CLASS(MODE) == MODE_FLOAT || \ - GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT) : \ + (((MODE) == SImode || (MODE) == DImode \ + || GET_MODE_CLASS(MODE) == MODE_FLOAT \ + || GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT) \ + && (HARD_REGNO_NREGS(REGNO, MODE) == 1 || !((REGNO) & 1))) : \ GENERAL_REGNO_P(REGNO)? \ - (HARD_REGNO_NREGS(REGNO, MODE) == 1 || !((REGNO) & 1)) : \ + ((HARD_REGNO_NREGS(REGNO, MODE) == 1 || !((REGNO) & 1)) \ + && (MODE) != TFmode && (MODE) != TCmode) : \ CC_REGNO_P(REGNO)? \ GET_MODE_CLASS (MODE) == MODE_CC : \ FRAME_REGNO_P(REGNO)? \ @@ -376,7 +395,9 @@ if (INTEGRAL_MODE_P (MODE) && in a register of class CLASS. */ #define CLASS_MAX_NREGS(CLASS, MODE) \ ((CLASS) == FP_REGS ? \ - (GET_MODE_CLASS (MODE) == MODE_COMPLEX_FLOAT ? 2 : 1) : \ + (GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT ? \ + 2 * (GET_MODE_SIZE (MODE) / 2 + 8 - 1) / 8 : \ + (GET_MODE_SIZE (MODE) + 8 - 1) / 8) : \ (CLASS) == ACCESS_REGS ? \ (GET_MODE_SIZE (MODE) + 4 - 1) / 4 : \ (GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD) @@ -386,10 +407,11 @@ if (INTEGRAL_MODE_P (MODE) && cannot use SUBREGs to switch between modes in FP registers. Likewise for access registers, since they have only half the word size on 64-bit. */ -#define CANNOT_CHANGE_MODE_CLASS(FROM, TO, CLASS) \ - (GET_MODE_SIZE (FROM) != GET_MODE_SIZE (TO) \ - ? reg_classes_intersect_p (FP_REGS, CLASS) \ - || reg_classes_intersect_p (ACCESS_REGS, CLASS) : 0) +#define CANNOT_CHANGE_MODE_CLASS(FROM, TO, CLASS) \ + (GET_MODE_SIZE (FROM) != GET_MODE_SIZE (TO) \ + ? ((reg_classes_intersect_p (FP_REGS, CLASS) \ + && (GET_MODE_SIZE (FROM) < 8 || GET_MODE_SIZE (TO) < 8)) \ + || reg_classes_intersect_p (ACCESS_REGS, CLASS)) : 0) /* Register classes. */ --- gcc/gcc/config/s390/s390.md.jj 2006-01-28 09:54:03.000000000 +0100 +++ gcc/gcc/config/s390/s390.md 2006-01-28 10:39:11.000000000 +0100 @@ -199,11 +199,11 @@ (define_attr "type" "none,integer,load,lr,la,larl,lm,stm, cs,vs,store,sem,idiv, imulhi,imulsi,imuldi, - branch,jsr,fsimpdf,fsimpsf, - floaddf,floadsf,fstoredf,fstoresf, - fmuldf,fmulsf,fdivdf,fdivsf, - ftoi,itof,fsqrtdf,fsqrtsf, - other" + branch,jsr,fsimptf,fsimpdf,fsimpsf, + floadtf,floaddf,floadsf,fstoredf,fstoresf, + fmultf,fmuldf,fmulsf,fdivtf,fdivdf,fdivsf, + ftoi,itof,fsqrttf,fsqrtdf,fsqrtsf, + ftrunctf,ftruncdf,other" (cond [(eq_attr "op_type" "NN") (const_string "other") (eq_attr "op_type" "SS") (const_string "cs")] (const_string "integer"))) @@ -278,9 +278,10 @@ ;; Macros -;; This mode macro allows DF and SF patterns to be generated from the +;; This mode macro allows floating point patterns to be generated from the ;; same template. -(define_mode_macro FPR [DF SF]) +(define_mode_macro FPR [TF DF SF]) +(define_mode_macro DSF [DF SF]) ;; These mode macros allow 31-bit and 64-bit TDSI patterns to be generated ;; from the same template. @@ -321,13 +322,22 @@ (plus "add") (minus "sub") (mult "nand")]) -;; In FPR templates, a string like "ltbr" will expand to "ltdbr" in DFmode -;; and "ltebr" in SFmode. -(define_mode_attr de [(DF "d") (SF "e")]) - -;; In FPR templates, a string like "mbr" will expand to "mdbr" in DFmode -;; and "meebr" in SFmode. This is needed for the 'mul3' pattern. -(define_mode_attr dee [(DF "d") (SF "ee")]) +;; In FPR templates, a string like "ltbr" will expand to "ltxbr" in TFmode, +;; "ltdbr" in DFmode, and "ltebr" in SFmode. +(define_mode_attr xde [(TF "x") (DF "d") (SF "e")]) + +;; In FPR templates, a string like "mbr" will expand to "mxbr" in TFmode, +;; "mdbr" in DFmode, and "meebr" in SFmode. +(define_mode_attr xdee [(TF "x") (DF "d") (SF "ee")]) + +;; In FPR templates, "" will expand to "RRE" in TFmode and "RR" otherwise. +;; Likewise for "". +(define_mode_attr RRe [(TF "RRE") (DF "RR") (SF "RR")]) +(define_mode_attr RXe [(TF "RXE") (DF "RX") (SF "RX")]) + +;; In FPR templates, "" will expand to "f" in TFmode and "R" otherwise. +;; This is used to disable the memory alternative in TFmode patterns. +(define_mode_attr Rf [(TF "f") (DF "R") (SF "R")]) ;; In SHIFT templates, a string like "sdl" will expand to "sldl" in ;; 'ashift' and "srdl" in 'lshiftrt'. @@ -816,7 +826,7 @@ (compare (match_operand:FPR 0 "register_operand" "f") (match_operand:FPR 1 "const0_operand" "")))] "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "ltbr\t%0,%0" + "ltbr\t%0,%0" [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) @@ -825,30 +835,30 @@ (compare (match_operand:FPR 0 "register_operand" "f") (match_operand:FPR 1 "const0_operand" "")))] "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" - "ltr\t%0,%0" - [(set_attr "op_type" "RR") + "ltr\t%0,%0" + [(set_attr "op_type" "") (set_attr "type" "fsimp")]) (define_insn "*cmp_ccs" [(set (reg CC_REGNUM) (compare (match_operand:FPR 0 "register_operand" "f,f") - (match_operand:FPR 1 "general_operand" "f,R")))] + (match_operand:FPR 1 "general_operand" "f,")))] "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "@ - cbr\t%0,%1 - cb\t%0,%1" + cbr\t%0,%1 + cb\t%0,%1" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fsimp")]) (define_insn "*cmp_ccs_ibm" [(set (reg CC_REGNUM) (compare (match_operand:FPR 0 "register_operand" "f,f") - (match_operand:FPR 1 "general_operand" "f,R")))] + (match_operand:FPR 1 "general_operand" "f,")))] "s390_match_ccmode(insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" "@ - cr\t%0,%1 - c\t%0,%1" - [(set_attr "op_type" "RR,RX") + cr\t%0,%1 + c\t%0,%1" + [(set_attr "op_type" ",") (set_attr "type" "fsimp")]) @@ -1483,6 +1493,79 @@ (set_attr "type" "lr,load,load,*")]) ; +; movtf instruction pattern(s). +; + +(define_insn "movtf" + [(set (match_operand:TF 0 "nonimmediate_operand" "=f,f,f,o,Q") + (match_operand:TF 1 "general_operand" "G,f,o,f,Q"))] + "" + "@ + lzxr\t%0 + lxr\t%0,%1 + # + # + #" + [(set_attr "op_type" "RRE,RRE,*,*,*") + (set_attr "type" "fsimptf,fsimptf,*,*,*")]) + +(define_split + [(set (match_operand:TF 0 "register_operand" "") + (match_operand:TF 1 "memory_operand" ""))] + "reload_completed && offsettable_memref_p (operands[1])" + [(set (match_dup 2) (match_dup 4)) + (set (match_dup 3) (match_dup 5))] +{ + operands[2] = simplify_gen_subreg (DFmode, operands[0], TFmode, 0); + operands[3] = simplify_gen_subreg (DFmode, operands[0], TFmode, 8); + operands[4] = adjust_address_nv (operands[1], DFmode, 0); + operands[5] = adjust_address_nv (operands[1], DFmode, 8); +}) + +(define_split + [(set (match_operand:TF 0 "memory_operand" "") + (match_operand:TF 1 "register_operand" ""))] + "reload_completed && offsettable_memref_p (operands[0])" + [(set (match_dup 2) (match_dup 4)) + (set (match_dup 3) (match_dup 5))] +{ + operands[2] = adjust_address_nv (operands[0], DFmode, 0); + operands[3] = adjust_address_nv (operands[0], DFmode, 8); + operands[4] = simplify_gen_subreg (DFmode, operands[1], TFmode, 0); + operands[5] = simplify_gen_subreg (DFmode, operands[1], TFmode, 8); +}) + +(define_expand "reload_outtf" + [(parallel [(match_operand:TF 0 "" "") + (match_operand:TF 1 "register_operand" "f") + (match_operand:SI 2 "register_operand" "=&a")])] + "" +{ + rtx addr = gen_lowpart (Pmode, operands[2]); + + gcc_assert (MEM_P (operands[0])); + s390_load_address (addr, find_replacement (&XEXP (operands[0], 0))); + operands[0] = replace_equiv_address (operands[0], addr); + emit_move_insn (operands[0], operands[1]); + DONE; +}) + +(define_expand "reload_intf" + [(parallel [(match_operand:TF 0 "register_operand" "=f") + (match_operand:TF 1 "" "") + (match_operand:SI 2 "register_operand" "=&a")])] + "" +{ + rtx addr = gen_lowpart (Pmode, operands[2]); + + gcc_assert (MEM_P (operands[1])); + s390_load_address (addr, find_replacement (&XEXP (operands[1], 0))); + operands[1] = replace_equiv_address (operands[1], addr); + emit_move_insn (operands[0], operands[1]); + DONE; +}) + +; ; movdf instruction pattern(s). ; @@ -3083,13 +3166,13 @@ DONE; }) -(define_expand "fix_truncdi2" +(define_expand "fix_truncdi2" [(set (match_operand:DI 0 "register_operand" "") - (fix:DI (match_operand:FPR 1 "nonimmediate_operand" "")))] + (fix:DI (match_operand:DSF 1 "nonimmediate_operand" "")))] "TARGET_64BIT && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" { - operands[1] = force_reg (mode, operands[1]); - emit_insn (gen_fix_truncdi2_ieee (operands[0], operands[1], + operands[1] = force_reg (mode, operands[1]); + emit_insn (gen_fix_truncdi2_ieee (operands[0], operands[1], GEN_INT(5))); DONE; }) @@ -3100,11 +3183,23 @@ (unspec:GPR [(match_operand:GPR 2 "immediate_operand" "K")] UNSPEC_ROUND) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "cbr\t%0,%h2,%1" + "cbr\t%0,%h2,%1" [(set_attr "op_type" "RRE") (set_attr "type" "ftoi")]) ; +; fix_trunctf(si|di)2 instruction pattern(s). +; + +(define_expand "fix_trunctf2" + [(parallel [(set (match_operand:GPR 0 "register_operand" "") + (fix:GPR (match_operand:TF 1 "register_operand" ""))) + (unspec:GPR [(const_int 5)] UNSPEC_ROUND) + (clobber (reg:CC CC_REGNUM))])] + "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" + "") + +; ; fix_truncdfsi2 instruction pattern(s). ; @@ -3177,21 +3272,36 @@ }) ; -; floatdi(df|sf)2 instruction pattern(s). +; float(si|di)(tf|df|sf)2 instruction pattern(s). ; (define_insn "floatdi2" [(set (match_operand:FPR 0 "register_operand" "=f") (float:FPR (match_operand:DI 1 "register_operand" "d")))] "TARGET_64BIT && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "cgbr\t%0,%1" + "cgbr\t%0,%1" [(set_attr "op_type" "RRE") (set_attr "type" "itof" )]) +(define_insn "floatsi2_ieee" + [(set (match_operand:FPR 0 "register_operand" "=f") + (float:FPR (match_operand:SI 1 "register_operand" "d")))] + "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" + "cfbr\t%0,%1" + [(set_attr "op_type" "RRE") + (set_attr "type" "itof" )]) + + ; -; floatsidf2 instruction pattern(s). +; floatsi(tf|df)2 instruction pattern(s). ; +(define_expand "floatsitf2" + [(set (match_operand:TF 0 "register_operand" "") + (float:TF (match_operand:SI 1 "register_operand" "")))] + "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" + "") + (define_expand "floatsidf2" [(set (match_operand:DF 0 "register_operand" "") (float:DF (match_operand:SI 1 "register_operand" "")))] @@ -3209,14 +3319,6 @@ } }) -(define_insn "floatsidf2_ieee" - [(set (match_operand:DF 0 "register_operand" "=f") - (float:DF (match_operand:SI 1 "register_operand" "d")))] - "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "cdfbr\t%0,%1" - [(set_attr "op_type" "RRE") - (set_attr "type" "itof" )]) - (define_insn "floatsidf2_ibm" [(set (match_operand:DF 0 "register_operand" "=f") (float:DF (match_operand:SI 1 "register_operand" "d"))) @@ -3252,14 +3354,6 @@ } }) -(define_insn "floatsisf2_ieee" - [(set (match_operand:SF 0 "register_operand" "=f") - (float:SF (match_operand:SI 1 "register_operand" "d")))] - "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "cefbr\t%0,%1" - [(set_attr "op_type" "RRE") - (set_attr "type" "itof" )]) - ; ; truncdfsf2 instruction pattern(s). ; @@ -3275,7 +3369,8 @@ (float_truncate:SF (match_operand:DF 1 "register_operand" "f")))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "ledbr\t%0,%1" - [(set_attr "op_type" "RRE")]) + [(set_attr "op_type" "RRE") + (set_attr "type" "ftruncdf")]) (define_insn "truncdfsf2_ibm" [(set (match_operand:SF 0 "register_operand" "=f,f") @@ -3288,6 +3383,66 @@ (set_attr "type" "floadsf")]) ; +; trunctfdf2 instruction pattern(s). +; + +(define_expand "trunctfdf2" + [(parallel + [(set (match_operand:DF 0 "register_operand" "") + (float_truncate:DF (match_operand:TF 1 "register_operand" ""))) + (clobber (match_scratch:TF 2 "=f"))])] + "TARGET_HARD_FLOAT" + "") + +(define_insn "*trunctfdf2_ieee" + [(set (match_operand:DF 0 "register_operand" "=f") + (float_truncate:DF (match_operand:TF 1 "register_operand" "f"))) + (clobber (match_scratch:TF 2 "=f"))] + "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" + "ldxbr\t%2,%1\;ldr\t%0,%2" + [(set_attr "length" "6") + (set_attr "type" "ftrunctf")]) + +(define_insn "*trunctfdf2_ibm" + [(set (match_operand:DF 0 "register_operand" "=f") + (float_truncate:DF (match_operand:TF 1 "register_operand" "f"))) + (clobber (match_scratch:TF 2 "=f"))] + "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" + "ldxr\t%2,%1\;ldr\t%0,%2" + [(set_attr "length" "4") + (set_attr "type" "ftrunctf")]) + +; +; trunctfsf2 instruction pattern(s). +; + +(define_expand "trunctfsf2" + [(parallel + [(set (match_operand:SF 0 "register_operand" "=f") + (float_truncate:SF (match_operand:TF 1 "register_operand" "f"))) + (clobber (match_scratch:TF 2 "=f"))])] + "TARGET_HARD_FLOAT" + "") + +(define_insn "*trunctfsf2_ieee" + [(set (match_operand:SF 0 "register_operand" "=f") + (float_truncate:SF (match_operand:TF 1 "register_operand" "f"))) + (clobber (match_scratch:TF 2 "=f"))] + "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" + "lexbr\t%2,%1\;ler\t%0,%2" + [(set_attr "length" "6") + (set_attr "type" "ftrunctf")]) + +(define_insn "*trunctfsf2_ibm" + [(set (match_operand:SF 0 "register_operand" "=f") + (float_truncate:SF (match_operand:TF 1 "register_operand" "f"))) + (clobber (match_scratch:TF 2 "=f"))] + "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" + "lexr\t%2,%1\;ler\t%0,%2" + [(set_attr "length" "6") + (set_attr "type" "ftrunctf")]) + +; ; extendsfdf2 instruction pattern(s). ; @@ -3311,7 +3466,7 @@ ldebr\t%0,%1 ldeb\t%0,%1" [(set_attr "op_type" "RRE,RXE") - (set_attr "type" "floadsf")]) + (set_attr "type" "fsimpsf, floadsf")]) (define_insn "extendsfdf2_ibm" [(set (match_operand:DF 0 "register_operand" "=f,f") @@ -3324,6 +3479,66 @@ [(set_attr "length" "4,6") (set_attr "type" "floadsf")]) +; +; extenddftf2 instruction pattern(s). +; + +(define_expand "extenddftf2" + [(set (match_operand:TF 0 "register_operand" "") + (float_extend:TF (match_operand:DF 1 "nonimmediate_operand" "")))] + "TARGET_HARD_FLOAT" + "") + +(define_insn "*extenddftf2_ieee" + [(set (match_operand:TF 0 "register_operand" "=f,f") + (float_extend:TF (match_operand:DF 1 "nonimmediate_operand" "f,R")))] + "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" + "@ + lxdbr\t%0,%1 + lxdb\t%0,%1" + [(set_attr "op_type" "RRE,RXE") + (set_attr "type" "fsimptf, floadtf")]) + +(define_insn "*extenddftf2_ibm" + [(set (match_operand:TF 0 "register_operand" "=f,f") + (float_extend:TF (match_operand:DF 1 "nonimmediate_operand" "f,R")))] + "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" + "@ + lxdr\t%0,%1 + lxd\t%0,%1" + [(set_attr "op_type" "RRE,RXE") + (set_attr "type" "fsimptf, floadtf")]) + +; +; extendsftf2 instruction pattern(s). +; + +(define_expand "extendsftf2" + [(set (match_operand:TF 0 "register_operand" "") + (float_extend:TF (match_operand:SF 1 "nonimmediate_operand" "")))] + "TARGET_HARD_FLOAT" + "") + +(define_insn "*extendsftf2_ieee" + [(set (match_operand:TF 0 "register_operand" "=f,f") + (float_extend:TF (match_operand:SF 1 "nonimmediate_operand" "f,R")))] + "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" + "@ + lxebr\t%0,%1 + lxeb\t%0,%1" + [(set_attr "op_type" "RRE,RXE") + (set_attr "type" "fsimptf, floadtf")]) + +(define_insn "*extendsftf2_ibm" + [(set (match_operand:TF 0 "register_operand" "=f,f") + (float_extend:TF (match_operand:SF 1 "nonimmediate_operand" "f,R")))] + "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" + "@ + lxer\t%0,%1 + lxe\t%0,%1" + [(set_attr "op_type" "RRE,RXE") + (set_attr "type" "fsimptf, floadtf")]) + ;; ;; ARITHMETIC OPERATIONS @@ -3751,7 +3966,7 @@ [(parallel [(set (match_operand:FPR 0 "register_operand" "=f,f") (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0") - (match_operand:FPR 2 "general_operand" "f,R"))) + (match_operand:FPR 2 "general_operand" "f,"))) (clobber (reg:CC CC_REGNUM))])] "TARGET_HARD_FLOAT" "") @@ -3759,52 +3974,52 @@ (define_insn "*add3" [(set (match_operand:FPR 0 "register_operand" "=f,f") (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0") - (match_operand:FPR 2 "general_operand" "f,R"))) + (match_operand:FPR 2 "general_operand" "f,"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "@ - abr\t%0,%2 - ab\t%0,%2" + abr\t%0,%2 + ab\t%0,%2" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fsimp")]) (define_insn "*add3_cc" [(set (reg CC_REGNUM) (compare (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0") - (match_operand:FPR 2 "general_operand" "f,R")) + (match_operand:FPR 2 "general_operand" "f,")) (match_operand:FPR 3 "const0_operand" ""))) (set (match_operand:FPR 0 "register_operand" "=f,f") (plus:FPR (match_dup 1) (match_dup 2)))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "@ - abr\t%0,%2 - ab\t%0,%2" + abr\t%0,%2 + ab\t%0,%2" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fsimp")]) (define_insn "*add3_cconly" [(set (reg CC_REGNUM) (compare (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0") - (match_operand:FPR 2 "general_operand" "f,R")) + (match_operand:FPR 2 "general_operand" "f,")) (match_operand:FPR 3 "const0_operand" ""))) (clobber (match_scratch:FPR 0 "=f,f"))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "@ - abr\t%0,%2 - ab\t%0,%2" + abr\t%0,%2 + ab\t%0,%2" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fsimp")]) (define_insn "*add3_ibm" [(set (match_operand:FPR 0 "register_operand" "=f,f") (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0") - (match_operand:FPR 2 "general_operand" "f,R"))) + (match_operand:FPR 2 "general_operand" "f,"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" "@ - ar\t%0,%2 - a\t%0,%2" - [(set_attr "op_type" "RR,RX") + ar\t%0,%2 + a\t%0,%2" + [(set_attr "op_type" ",") (set_attr "type" "fsimp")]) @@ -4163,52 +4378,52 @@ (define_insn "*sub3" [(set (match_operand:FPR 0 "register_operand" "=f,f") (minus:FPR (match_operand:FPR 1 "register_operand" "0,0") - (match_operand:FPR 2 "general_operand" "f,R"))) + (match_operand:FPR 2 "general_operand" "f,"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "@ - sbr\t%0,%2 - sb\t%0,%2" + sbr\t%0,%2 + sb\t%0,%2" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fsimp")]) (define_insn "*sub3_cc" [(set (reg CC_REGNUM) (compare (minus:FPR (match_operand:FPR 1 "nonimmediate_operand" "0,0") - (match_operand:FPR 2 "general_operand" "f,R")) + (match_operand:FPR 2 "general_operand" "f,")) (match_operand:FPR 3 "const0_operand" ""))) (set (match_operand:FPR 0 "register_operand" "=f,f") (minus:FPR (match_dup 1) (match_dup 2)))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "@ - sbr\t%0,%2 - sb\t%0,%2" + sbr\t%0,%2 + sb\t%0,%2" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fsimp")]) (define_insn "*sub3_cconly" [(set (reg CC_REGNUM) (compare (minus:FPR (match_operand:FPR 1 "nonimmediate_operand" "0,0") - (match_operand:FPR 2 "general_operand" "f,R")) + (match_operand:FPR 2 "general_operand" "f,")) (match_operand:FPR 3 "const0_operand" ""))) (clobber (match_scratch:FPR 0 "=f,f"))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "@ - sbr\t%0,%2 - sb\t%0,%2" + sbr\t%0,%2 + sb\t%0,%2" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fsimp")]) (define_insn "*sub3_ibm" [(set (match_operand:FPR 0 "register_operand" "=f,f") (minus:FPR (match_operand:FPR 1 "register_operand" "0,0") - (match_operand:FPR 2 "general_operand" "f,R"))) + (match_operand:FPR 2 "general_operand" "f,"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" "@ - sr\t%0,%2 - s\t%0,%2" - [(set_attr "op_type" "RR,RX") + sr\t%0,%2 + s\t%0,%2" + [(set_attr "op_type" ",") (set_attr "type" "fsimp")]) @@ -4456,53 +4671,53 @@ (define_expand "mul3" [(set (match_operand:FPR 0 "register_operand" "=f,f") (mult:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0") - (match_operand:FPR 2 "general_operand" "f,R")))] + (match_operand:FPR 2 "general_operand" "f,")))] "TARGET_HARD_FLOAT" "") (define_insn "*mul3" [(set (match_operand:FPR 0 "register_operand" "=f,f") (mult:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0") - (match_operand:FPR 2 "general_operand" "f,R")))] + (match_operand:FPR 2 "general_operand" "f,")))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "@ - mbr\t%0,%2 - mb\t%0,%2" + mbr\t%0,%2 + mb\t%0,%2" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fmul")]) (define_insn "*mul3_ibm" [(set (match_operand:FPR 0 "register_operand" "=f,f") (mult:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0") - (match_operand:FPR 2 "general_operand" "f,R")))] + (match_operand:FPR 2 "general_operand" "f,")))] "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" "@ - mr\t%0,%2 - m\t%0,%2" - [(set_attr "op_type" "RR,RX") + mr\t%0,%2 + m\t%0,%2" + [(set_attr "op_type" ",") (set_attr "type" "fmul")]) (define_insn "*fmadd" - [(set (match_operand:FPR 0 "register_operand" "=f,f") - (plus:FPR (mult:FPR (match_operand:FPR 1 "register_operand" "%f,f") - (match_operand:FPR 2 "nonimmediate_operand" "f,R")) - (match_operand:FPR 3 "register_operand" "0,0")))] + [(set (match_operand:DSF 0 "register_operand" "=f,f") + (plus:DSF (mult:DSF (match_operand:DSF 1 "register_operand" "%f,f") + (match_operand:DSF 2 "nonimmediate_operand" "f,R")) + (match_operand:DSF 3 "register_operand" "0,0")))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT && TARGET_FUSED_MADD" "@ - mabr\t%0,%1,%2 - mab\t%0,%1,%2" + mabr\t%0,%1,%2 + mab\t%0,%1,%2" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fmul")]) (define_insn "*fmsub" - [(set (match_operand:FPR 0 "register_operand" "=f,f") - (minus:FPR (mult:FPR (match_operand:FPR 1 "register_operand" "f,f") - (match_operand:FPR 2 "nonimmediate_operand" "f,R")) - (match_operand:FPR 3 "register_operand" "0,0")))] + [(set (match_operand:DSF 0 "register_operand" "=f,f") + (minus:DSF (mult:DSF (match_operand:DSF 1 "register_operand" "f,f") + (match_operand:DSF 2 "nonimmediate_operand" "f,R")) + (match_operand:DSF 3 "register_operand" "0,0")))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT && TARGET_FUSED_MADD" "@ - msbr\t%0,%1,%2 - msb\t%0,%1,%2" + msbr\t%0,%1,%2 + msb\t%0,%1,%2" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fmul")]) @@ -4949,30 +5164,30 @@ (define_expand "div3" [(set (match_operand:FPR 0 "register_operand" "=f,f") (div:FPR (match_operand:FPR 1 "register_operand" "0,0") - (match_operand:FPR 2 "general_operand" "f,R")))] + (match_operand:FPR 2 "general_operand" "f,")))] "TARGET_HARD_FLOAT" "") (define_insn "*div3" [(set (match_operand:FPR 0 "register_operand" "=f,f") (div:FPR (match_operand:FPR 1 "register_operand" "0,0") - (match_operand:FPR 2 "general_operand" "f,R")))] + (match_operand:FPR 2 "general_operand" "f,")))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "@ - dbr\t%0,%2 - db\t%0,%2" + dbr\t%0,%2 + db\t%0,%2" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fdiv")]) (define_insn "*div3_ibm" [(set (match_operand:FPR 0 "register_operand" "=f,f") (div:FPR (match_operand:FPR 1 "register_operand" "0,0") - (match_operand:FPR 2 "general_operand" "f,R")))] + (match_operand:FPR 2 "general_operand" "f,")))] "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" "@ - dr\t%0,%2 - d\t%0,%2" - [(set_attr "op_type" "RR,RX") + dr\t%0,%2 + d\t%0,%2" + [(set_attr "op_type" ",") (set_attr "type" "fdiv")]) @@ -5955,7 +6170,7 @@ (set (match_operand:FPR 0 "register_operand" "=f") (neg:FPR (match_dup 1)))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "lcbr\t%0,%1" + "lcbr\t%0,%1" [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) @@ -5965,7 +6180,7 @@ (match_operand:FPR 2 "const0_operand" ""))) (clobber (match_scratch:FPR 0 "=f"))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "lcbr\t%0,%1" + "lcbr\t%0,%1" [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) @@ -5974,7 +6189,7 @@ (neg:FPR (match_operand:FPR 1 "register_operand" "f"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "lcbr\t%0,%1" + "lcbr\t%0,%1" [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) @@ -5983,8 +6198,8 @@ (neg:FPR (match_operand:FPR 1 "register_operand" "f"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" - "lcr\t%0,%1" - [(set_attr "op_type" "RR") + "lcr\t%0,%1" + [(set_attr "op_type" "") (set_attr "type" "fsimp")]) @@ -6062,7 +6277,7 @@ (set (match_operand:FPR 0 "register_operand" "=f") (abs:FPR (match_dup 1)))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "lpbr\t%0,%1" + "lpbr\t%0,%1" [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) @@ -6072,7 +6287,7 @@ (match_operand:FPR 2 "const0_operand" ""))) (clobber (match_scratch:FPR 0 "=f"))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "lpbr\t%0,%1" + "lpbr\t%0,%1" [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) @@ -6081,7 +6296,7 @@ (abs:FPR (match_operand:FPR 1 "register_operand" "f"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "lpbr\t%0,%1" + "lpbr\t%0,%1" [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) @@ -6090,8 +6305,8 @@ (abs:FPR (match_operand:FPR 1 "register_operand" "f"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" - "lpr\t%0,%1" - [(set_attr "op_type" "RR") + "lpr\t%0,%1" + [(set_attr "op_type" "") (set_attr "type" "fsimp")]) ;; @@ -6161,7 +6376,7 @@ (set (match_operand:FPR 0 "register_operand" "=f") (neg:FPR (abs:FPR (match_dup 1))))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "lnbr\t%0,%1" + "lnbr\t%0,%1" [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) @@ -6171,7 +6386,7 @@ (match_operand:FPR 2 "const0_operand" ""))) (clobber (match_scratch:FPR 0 "=f"))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "lnbr\t%0,%1" + "lnbr\t%0,%1" [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) @@ -6180,7 +6395,7 @@ (neg:FPR (abs:FPR (match_operand:FPR 1 "register_operand" "f")))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" - "lnbr\t%0,%1" + "lnbr\t%0,%1" [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) @@ -6194,11 +6409,11 @@ (define_insn "sqrt2" [(set (match_operand:FPR 0 "register_operand" "=f,f") - (sqrt:FPR (match_operand:FPR 1 "general_operand" "f,R")))] + (sqrt:FPR (match_operand:FPR 1 "general_operand" "f,")))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "@ - sqbr\t%0,%1 - sqb\t%0,%1" + sqbr\t%0,%1 + sqb\t%0,%1" [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fsqrt")]) --- gcc/gcc/config/s390/s390.opt.jj 2006-01-28 09:54:03.000000000 +0100 +++ gcc/gcc/config/s390/s390.opt 2006-01-28 10:39:11.000000000 +0100 @@ -51,6 +51,14 @@ mhard-float Target Report RejectNegative Mask(HARD_FLOAT) Use hardware fp +mlong-double-128 +Target Report RejectNegative Mask(LONG_DOUBLE_128) +Use 128-bit long double + +mlong-double-64 +Target Report RejectNegative InverseMask(LONG_DOUBLE_128) +Use 64-bit long double + mpacked-stack Target Report Mask(PACKED_STACK) Use packed stack layout --- gcc/gcc/config/s390/t-crtstuff.jj 2006-01-28 09:54:03.000000000 +0100 +++ gcc/gcc/config/s390/t-crtstuff 2006-01-28 10:39:11.000000000 +0100 @@ -2,3 +2,4 @@ # because then __FRAME_END__ might not be the last thing in .eh_frame # section. CRTSTUFF_T_CFLAGS = -fno-asynchronous-unwind-tables +TARGET_LIBGCC2_CFLAGS += -mlong-double-128 --- gcc/gcc/config/s390/libgcc-glibc.ver.jj 2006-01-28 09:54:03.000000000 +0100 +++ gcc/gcc/config/s390/libgcc-glibc.ver 2006-01-28 10:39:11.000000000 +0100 @@ -39,3 +39,36 @@ GLIBC_2.2 { } %endif +# With GCC 4.1.0 long double 128 bit support was introduced. The +# following symbols coming from libgcc are enabled when -mlong-double-128 +# is specified. These lines make the symbols to get a @@GCC_4.1.0 attached. + +%exclude { + __divtc3 + __multc3 + __powitf2 + __fixtfti + __fixunstfti + __floattitf + + __fixtfdi + __fixunstfdi + __floatditf +} + +GCC_4.1.0 { + __divtc3 + __multc3 + __powitf2 + +%ifdef __s390x__ + __fixtfti + __fixunstfti + __floattitf + +%else + __fixtfdi + __fixunstfdi + __floatditf +%endif +} Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- .cvsignore 21 Jan 2006 11:38:40 -0000 1.127 +++ .cvsignore 28 Jan 2006 10:00:01 -0000 1.128 @@ -1 +1 @@ -gcc-4.1.0-20060121.tar.bz2 +gcc-4.1.0-20060128.tar.bz2 Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gcc41.spec 21 Jan 2006 11:38:40 -0000 1.18 +++ gcc41.spec 28 Jan 2006 10:00:01 -0000 1.19 @@ -1,6 +1,6 @@ -%define DATE 20060121 +%define DATE 20060128 %define gcc_version 4.1.0 -%define gcc_release 0.16 +%define gcc_release 0.17 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 @@ -92,11 +92,10 @@ Patch11: gcc41-java-slow_pthread_self.patch Patch12: gcc41-libjava-libltdl.patch Patch13: gcc41-fortran-finclude.patch -Patch14: gcc41-ppc64-sync.patch +Patch14: gcc41-atomic-builtins.patch Patch15: gcc41-ppc32-retaddr.patch -Patch16: gcc41-s390-atomic1.patch -Patch17: gcc41-pr25717.patch -Patch18: gcc41-pr25324.patch +Patch16: gcc41-ppc32-ldbl.patch +Patch17: gcc41-s390-ldbl.patch %define _gnu %{nil} %ifarch sparc @@ -440,11 +439,10 @@ %patch11 -p0 -b .java-slow_pthread_self~ %patch12 -p0 -b .libjava-libltdl~ %patch13 -p0 -b .fortran-finclude~ -%patch14 -p0 -b .ppc64-sync~ +%patch14 -p0 -b .atomic-builtins~ %patch15 -p0 -b .ppc32-retaddr~ -%patch16 -p0 -b .s390-atomic1~ -%patch17 -p0 -b .pr25717~ -%patch18 -p0 -b .pr25324~ +%patch16 -p0 -b .ppc32-ldbl~ +%patch17 -p0 -b .s390-ldbl~ sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -1530,6 +1528,21 @@ %endif %changelog +* Sat Jan 28 2006 Jakub Jelinek 4.1.0-0.17 +- update from gcc-4_1-branch (-r110062:110317) + - PRs ada/20548, ada/21317, bootstrap/25859, c++/25552, c++/25856, + c++/25858, c++/25895, c/25892, fortran/18540, fortran/20852, + fortran/20881, fortran/23308, fortran/24276, fortran/25084, + fortran/25085, fortran/25086, fortran/25124, fortran/25416, + fortran/25538, fortran/25625, fortran/25710, fortran/25716, + fortran/25901, fortran/25964, java/25816, other/24829, + rtl-optimization/24626, rtl-optimization/25654, target/24831, + testsuite/24962, testsuite/25590 +- atomic builtin fixes (Richard Henderson) +- -mlong-double-128 support on ppc32 (David Edelsohn, Alan Modra) +- -mlong-double-128 support on s390 and s390x (Andreas Krebbel, + Ulrich Weigand) + * Sat Jan 21 2006 Jakub Jelinek 4.1.0-0.16 - update from gcc-4_1-branch (-r109815:110062) - PRs ada/24533, c++/16829, c++/22136, c++/25836, c++/25854, c/25805, Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.129 retrieving revision 1.130 diff -u -r1.129 -r1.130 --- sources 21 Jan 2006 11:38:40 -0000 1.129 +++ sources 28 Jan 2006 10:00:01 -0000 1.130 @@ -1 +1 @@ -429a46ed48d114066429682803e970aa gcc-4.1.0-20060121.tar.bz2 +dc997a74f17dccebeb7145a1849573b4 gcc-4.1.0-20060128.tar.bz2 --- gcc41-ppc64-sync.patch DELETED --- --- gcc41-pr25324.patch DELETED --- --- gcc41-pr25717.patch DELETED --- --- gcc41-s390-atomic1.patch DELETED --- From fedora-cvs-commits at redhat.com Sat Jan 28 10:06:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 05:06:44 -0500 Subject: rpms/gcc/devel gcc41-fortran-finclude.patch,1.1,1.2 Message-ID: <200601281006.k0SA6i1C016241@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16170 Modified Files: gcc41-fortran-finclude.patch Log Message: 4.1.0-0.17 gcc41-fortran-finclude.patch: lang-specs.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Index: gcc41-fortran-finclude.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41-fortran-finclude.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-fortran-finclude.patch 29 Nov 2005 19:55:44 -0000 1.1 +++ gcc41-fortran-finclude.patch 28 Jan 2006 10:06:39 -0000 1.2 @@ -9,8 +9,8 @@ %{E|M|MM:%(cpp_debug_options)}\ %{!M:%{!MM:%{!E: -o %|.f |\n\ f951 %|.f %{!ffree-form:-ffixed-form} %(cc1_options) %{J*} %{I*}\ -- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, -+ %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, +- -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ++ -fpreprocessed %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, {".F90", "@f95-cpp-input", 0, 0, 0}, {".F95", "@f95-cpp-input", 0, 0, 0}, {"@f95-cpp-input", @@ -18,8 +18,8 @@ %{E|M|MM:%(cpp_debug_options)}\ %{!M:%{!MM:%{!E: -o %|.f95 |\n\ f951 %|.f95 %(cc1_options) %{J*} %{I*}\ -- %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, -+ %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, +- -fpreprocessed %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ++ -fpreprocessed %{!nostdinc:-I finclude%s} %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, {".f90", "@f95", 0, 0, 0}, {".f95", "@f95", 0, 0, 0}, {"@f95", "%{!E:f951 %i %(cc1_options) %{J*} %{I*}\ From fedora-cvs-commits at redhat.com Sat Jan 28 10:10:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 05:10:51 -0500 Subject: rpms/gcc/devel gcc41-s390-ldbl.patch,1.1,1.2 Message-ID: <200601281010.k0SAApnL017820@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17750 Modified Files: gcc41-s390-ldbl.patch Log Message: 4.1.0-0.17 gcc41-s390-ldbl.patch: 2084.md | 42 ++++- libgcc-glibc.ver | 33 +++ s390.c | 58 ++++++ s390.h | 46 ++++- s390.md | 457 ++++++++++++++++++++++++++++++++++++++++--------------- s390.opt | 8 t-crtstuff | 1 7 files changed, 506 insertions(+), 139 deletions(-) Index: gcc41-s390-ldbl.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41-s390-ldbl.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-s390-ldbl.patch 28 Jan 2006 10:00:01 -0000 1.1 +++ gcc41-s390-ldbl.patch 28 Jan 2006 10:10:48 -0000 1.2 @@ -52,8 +52,8 @@ __fixtfti, __fixunstfti, __floattitf, __fixtfdi, __fixunstfdi, __floatditf): Add a GCC_4.1.0 symbol version tag. ---- gcc/gcc/config/s390/2084.md.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/gcc/config/s390/2084.md 2006-01-28 10:39:11.000000000 +0100 +--- gcc/config/s390/2084.md.jj 2006-01-28 09:54:03.000000000 +0100 ++++ gcc/config/s390/2084.md 2006-01-28 10:39:11.000000000 +0100 @@ -161,6 +161,11 @@ ;; Floating point insns ;; @@ -152,8 +152,8 @@ x_fsimpdf, x_fsimpsf, x_fdivdf, x_fdivsf" "s390_agen_dep_p") ---- gcc/gcc/config/s390/s390.c.jj 2006-01-28 10:29:03.000000000 +0100 -+++ gcc/gcc/config/s390/s390.c 2006-01-28 10:39:11.000000000 +0100 +--- gcc/config/s390/s390.c.jj 2006-01-28 10:29:03.000000000 +0100 ++++ gcc/config/s390/s390.c 2006-01-28 10:39:11.000000000 +0100 @@ -71,13 +71,17 @@ struct processor_costs const int msgr; /* cost of an MSGR instruction. */ const int msr; /* cost of an MSR instruction. */ @@ -302,8 +302,8 @@ DFmode, DImode, SFmode, SImode, HImode, ---- gcc/gcc/config/s390/s390.h.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/gcc/config/s390/s390.h 2006-01-28 10:39:11.000000000 +0100 +--- gcc/config/s390/s390.h.jj 2006-01-28 09:54:03.000000000 +0100 ++++ gcc/config/s390/s390.h 2006-01-28 10:39:11.000000000 +0100 @@ -93,6 +93,8 @@ extern enum processor_flags s390_arch_fl builtin_define ("__s390__"); \ if (TARGET_64BIT) \ @@ -401,8 +401,8 @@ /* Register classes. */ ---- gcc/gcc/config/s390/s390.md.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/gcc/config/s390/s390.md 2006-01-28 10:39:11.000000000 +0100 +--- gcc/config/s390/s390.md.jj 2006-01-28 09:54:03.000000000 +0100 ++++ gcc/config/s390/s390.md 2006-01-28 10:39:11.000000000 +0100 @@ -199,11 +199,11 @@ (define_attr "type" "none,integer,load,lr,la,larl,lm,stm, cs,vs,store,sem,idiv, @@ -1230,8 +1230,8 @@ [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fsqrt")]) ---- gcc/gcc/config/s390/s390.opt.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/gcc/config/s390/s390.opt 2006-01-28 10:39:11.000000000 +0100 +--- gcc/config/s390/s390.opt.jj 2006-01-28 09:54:03.000000000 +0100 ++++ gcc/config/s390/s390.opt 2006-01-28 10:39:11.000000000 +0100 @@ -51,6 +51,14 @@ mhard-float Target Report RejectNegative Mask(HARD_FLOAT) Use hardware fp @@ -1247,15 +1247,15 @@ mpacked-stack Target Report Mask(PACKED_STACK) Use packed stack layout ---- gcc/gcc/config/s390/t-crtstuff.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/gcc/config/s390/t-crtstuff 2006-01-28 10:39:11.000000000 +0100 +--- gcc/config/s390/t-crtstuff.jj 2006-01-28 09:54:03.000000000 +0100 ++++ gcc/config/s390/t-crtstuff 2006-01-28 10:39:11.000000000 +0100 @@ -2,3 +2,4 @@ # because then __FRAME_END__ might not be the last thing in .eh_frame # section. CRTSTUFF_T_CFLAGS = -fno-asynchronous-unwind-tables +TARGET_LIBGCC2_CFLAGS += -mlong-double-128 ---- gcc/gcc/config/s390/libgcc-glibc.ver.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/gcc/config/s390/libgcc-glibc.ver 2006-01-28 10:39:11.000000000 +0100 +--- gcc/config/s390/libgcc-glibc.ver.jj 2006-01-28 09:54:03.000000000 +0100 ++++ gcc/config/s390/libgcc-glibc.ver 2006-01-28 10:39:11.000000000 +0100 @@ -39,3 +39,36 @@ GLIBC_2.2 { } %endif From fedora-cvs-commits at redhat.com Sat Jan 28 16:36:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sat, 28 Jan 2006 11:36:18 -0500 Subject: rpms/nautilus-sendto/devel nautilus-sendto.spec,1.5,1.6 Message-ID: <200601281636.k0SGaIU5017421@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/nautilus-sendto/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17407 Modified Files: nautilus-sendto.spec Log Message: rebuild for new e-d-s Index: nautilus-sendto.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus-sendto/devel/nautilus-sendto.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nautilus-sendto.spec 20 Dec 2005 12:29:36 -0000 1.5 +++ nautilus-sendto.spec 28 Jan 2006 16:36:16 -0000 1.6 @@ -1,6 +1,6 @@ Name: nautilus-sendto Version: 0.4 -Release: 6 +Release: 7 Summary: Nautilus context menu for sending files Group: User Interface/Desktops @@ -75,6 +75,9 @@ %endif %changelog +* Sat Jan 28 2006 David Malcolm 0.4-7 +- rebuild for new e-d-s + * Tue Dec 20 2005 Alexander Larsson 0.4-6 - Rebuild From fedora-cvs-commits at redhat.com Sun Jan 29 11:05:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 29 Jan 2006 06:05:15 -0500 Subject: rpms/libvir/devel .cvsignore, 1.1, 1.2 libvir.spec, 1.2, 1.3 sources, 1.1, 1.2 Message-ID: <200601291105.k0TB5Ftd009776@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/libvir/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9741 Modified Files: .cvsignore libvir.spec sources Log Message: Upstream release 0.0.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libvir/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Dec 2005 18:11:03 -0000 1.1 +++ .cvsignore 29 Jan 2006 11:05:11 -0000 1.2 @@ -1 +1,2 @@ libvir-0.0.1.tar.gz +libvir-0.0.2.tar.gz Index: libvir.spec =================================================================== RCS file: /cvs/dist/rpms/libvir/devel/libvir.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libvir.spec 19 Dec 2005 18:11:03 -0000 1.2 +++ libvir.spec 29 Jan 2006 11:05:11 -0000 1.3 @@ -1,6 +1,6 @@ Summary: Library providing an API to use the Xen virtualization Name: libvir -Version: 0.0.1 +Version: 0.0.2 Release: 1 License: LGPL Group: Development/Libraries @@ -87,5 +87,9 @@ %doc python/libvirclass.txt %changelog +* Sun Jan 29 2006 Daniel Veillard 0.0.2-1 +- upstream release of 0.0.2, use xend, save and restore added, python bindings + fixed + * Wed Nov 2 2005 Daniel Veillard 0.0.1-1 -- First release 0.0.1 +- created Index: sources =================================================================== RCS file: /cvs/dist/rpms/libvir/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Dec 2005 18:11:03 -0000 1.1 +++ sources 29 Jan 2006 11:05:11 -0000 1.2 @@ -1 +1,2 @@ 2ac1d039e703784138db09146bae5c7e libvir-0.0.1.tar.gz +99ea0401920f5555dd06dbd89a658865 libvir-0.0.2.tar.gz From fedora-cvs-commits at redhat.com Sun Jan 29 11:06:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 29 Jan 2006 06:06:33 -0500 Subject: rpms/libvir/devel sources,1.2,1.3 Message-ID: <200601291106.k0TB6Xk6010090@cvs.devel.redhat.com> Author: veillard Update of /cvs/dist/rpms/libvir/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10020 Modified Files: sources Log Message: cleanup, Daniel Index: sources =================================================================== RCS file: /cvs/dist/rpms/libvir/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 29 Jan 2006 11:05:11 -0000 1.2 +++ sources 29 Jan 2006 11:06:31 -0000 1.3 @@ -1,2 +1 @@ -2ac1d039e703784138db09146bae5c7e libvir-0.0.1.tar.gz 99ea0401920f5555dd06dbd89a658865 libvir-0.0.2.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 02:04:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Sun, 29 Jan 2006 21:04:04 -0500 Subject: rpms/xorg-x11-server/devel .cvsignore, 1.7, 1.8 sources, 1.6, 1.7 xorg-x11-server.spec, 1.34, 1.35 Message-ID: <200601300204.k0U244Na018920@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18847/devel Modified Files: .cvsignore sources xorg-x11-server.spec Log Message: auto-import xorg-x11-server-1.0.1-1 on branch devel from xorg-x11-server-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Dec 2005 06:50:41 -0000 1.7 +++ .cvsignore 30 Jan 2006 02:03:29 -0000 1.8 @@ -1 +1 @@ -xorg-server-1.0.0.tar.bz2 +xorg-server-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Dec 2005 06:50:41 -0000 1.6 +++ sources 30 Jan 2006 02:03:29 -0000 1.7 @@ -1 +1 @@ -baca22f964ff51d4dc000794ba6f7ecb xorg-server-1.0.0.tar.bz2 +aa0ccb851ec5f7f9b132581d9a5827e4 xorg-server-1.0.1.tar.bz2 Index: xorg-x11-server.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- xorg-x11-server.spec 23 Dec 2005 03:03:59 -0000 1.34 +++ xorg-x11-server.spec 30 Jan 2006 02:03:29 -0000 1.35 @@ -3,14 +3,14 @@ Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.0.0 -Release: 3 +Version: 1.0.1 +Release: 1 URL: http://www.x.org License: MIT/X11 Group: User Interface/X BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/%{pkgname}-%{version}.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2 Patch0: xorg-x11-server-0.99.3-init-origins-fix.patch # https://bugs.freedesktop.org/show_bug.cgi?id=5093 @@ -526,6 +526,9 @@ # ------------------------------------------------------------------- %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated to xserver 1.0.1 from X11R7.0 + * Thu Dec 22 2005 Mike A. Harris 1.0.0-3 - Added "Provides: libxf86config-devel = %{version}-%{release}" to sdk package. From fedora-cvs-commits at redhat.com Mon Jan 30 08:59:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 03:59:05 -0500 Subject: rpms/scim-anthy/devel scim-anthy.spec, 1.18, 1.19 scim-anthy-wide-latin.diff, 1.1, NONE Message-ID: <200601300859.k0U8x5G4011634@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/scim-anthy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11596 Modified Files: scim-anthy.spec Removed Files: scim-anthy-wide-latin.diff Log Message: * Mon Jan 30 2006 Akira TAGOH - 0.9.0-1 - New upstream release. - scim-anthy-wide-latin.diff: removed. Index: scim-anthy.spec =================================================================== RCS file: /cvs/dist/rpms/scim-anthy/devel/scim-anthy.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- scim-anthy.spec 23 Jan 2006 04:44:23 -0000 1.18 +++ scim-anthy.spec 30 Jan 2006 08:59:02 -0000 1.19 @@ -1,6 +1,6 @@ Name: scim-anthy -Version: 0.8.0 -Release: 2.fc5 +Version: 0.9.0 +Release: 1.fc5 License: GPL URL: http://scim-imengine.sourceforge.jp/ @@ -8,7 +8,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: scim-devel BuildRequires: anthy-devel >= 6700b-1 -Patch0: scim-anthy-wide-latin.diff Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -20,7 +19,6 @@ %prep %setup -q -%patch0 -p0 %build @@ -49,6 +47,10 @@ %changelog +* Mon Jan 30 2006 Akira TAGOH - 0.9.0-1 +- New upstream release. +- scim-anthy-wide-latin.diff: removed. + * Mon Jan 23 2006 Akira TAGOH - 0.8.0-2 - scim-anthy-wide-latin.diff: applied to fix a problem that the input character appears twice with the full size alphanumeric mode. --- scim-anthy-wide-latin.diff DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 30 09:09:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 04:09:42 -0500 Subject: rpms/scim-anthy/devel .cvsignore,1.6,1.7 sources,1.6,1.7 Message-ID: <200601300909.k0U99g8H014442@cvs.devel.redhat.com> Author: tagoh Update of /cvs/dist/rpms/scim-anthy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14399 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/scim-anthy/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Dec 2005 11:36:20 -0000 1.6 +++ .cvsignore 30 Jan 2006 09:09:39 -0000 1.7 @@ -7,3 +7,4 @@ scim-anthy-0.7.0.tar.gz scim-anthy-0.7.1.tar.gz scim-anthy-0.8.0.tar.gz +scim-anthy-0.9.0.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/scim-anthy/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 1 Dec 2005 11:36:20 -0000 1.6 +++ sources 30 Jan 2006 09:09:39 -0000 1.7 @@ -1 +1,2 @@ 869df30ecbbbfe43b0758f3b074ed0c9 scim-anthy-0.8.0.tar.gz +5e4742d011cdbf3554cc276f74a11ea9 scim-anthy-0.9.0.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 09:13:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 04:13:42 -0500 Subject: rpms/tomboy/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tomboy.spec, 1.9, 1.10 Message-ID: <200601300913.k0U9DfMo016126@cvs.devel.redhat.com> Author: alexl Update of /cvs/dist/rpms/tomboy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16037 Modified Files: .cvsignore sources tomboy.spec Log Message: update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/tomboy/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Nov 2005 11:17:59 -0000 1.2 +++ .cvsignore 30 Jan 2006 09:13:38 -0000 1.3 @@ -1 +1 @@ -tomboy-0.3.3.tar.gz +tomboy-0.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/tomboy/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Nov 2005 11:17:59 -0000 1.2 +++ sources 30 Jan 2006 09:13:39 -0000 1.3 @@ -1 +1 @@ -7ad987216b484f747f53aa7f9055a46b tomboy-0.3.3.tar.gz +3828ef72f215b25db342afbff42a5742 tomboy-0.3.4.tar.gz Index: tomboy.spec =================================================================== RCS file: /cvs/dist/rpms/tomboy/devel/tomboy.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tomboy.spec 13 Jan 2006 09:02:17 -0000 1.9 +++ tomboy.spec 30 Jan 2006 09:13:39 -0000 1.10 @@ -1,6 +1,6 @@ Name: tomboy -Version: 0.3.3 -Release: 5 +Version: 0.3.4 +Release: 1 Summary: Tomboy is a desktop note-taking application for Linux and Unix. Group: User Interface/Desktops @@ -11,10 +11,9 @@ Source2: tomboy-32.png Source3: tomboy-24.png Source4: tomboy-16.png -Patch1: tomboy-0.3.3-trie.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.2.3 atk-devel >= 1.2.4 gtkspell-devel gtk-sharp dbus-sharp +BuildRequires: gtk2-devel >= 2.2.3 atk-devel >= 1.2.4 gnome-panel-devel gtkspell-devel gtk-sharp dbus-sharp gmime-sharp Requires: gtkspell @@ -32,7 +31,6 @@ %prep %setup -q -%patch1 -p1 -b .trie cp %SOURCE3 data/images/tintin.png %build @@ -95,6 +93,9 @@ %{_sysconfdir}/gconf/schemas/tomboy.schemas %changelog +* Mon Jan 30 2006 Alexander Larsson - 0.3.4-1 +- update to 0.3.4 + * Fri Jan 13 2006 Alexander Larsson 0.3.3-5 - Add gtkspell requirement From fedora-cvs-commits at redhat.com Mon Jan 30 10:11:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 05:11:28 -0500 Subject: rpms/glibc/devel .cvsignore, 1.132, 1.133 glibc-fedora.patch, 1.125, 1.126 glibc.spec, 1.211, 1.212 sources, 1.154, 1.155 glibc-ppc-assume.patch, 1.4, NONE glibc-rodata.patch, 1.1, NONE Message-ID: <200601301011.k0UABSnE029538@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29495/devel Modified Files: .cvsignore glibc-fedora.patch glibc.spec sources Removed Files: glibc-ppc-assume.patch glibc-rodata.patch Log Message: auto-import glibc-2.3.90-31 on branch devel from glibc-2.3.90-31.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- .cvsignore 9 Jan 2006 22:19:27 -0000 1.132 +++ .cvsignore 30 Jan 2006 10:11:25 -0000 1.133 @@ -1,2 +1,2 @@ -glibc-20060109T2152.tar.bz2 -glibc-fedora-20060109T2152.tar.bz2 +glibc-20060130T0922.tar.bz2 +glibc-fedora-20060130T0922.tar.bz2 glibc-fedora.patch: ChangeLog | 58 ++++ ChangeLog.11 | 21 + ChangeLog.12 | 12 ChangeLog.15 | 45 +++ csu/elf-init.c | 17 + debug/tst-chk1.c | 7 elf/ldconfig.c | 38 ++ elf/tst-stackguard1.c | 8 iconv/iconvconfig.c | 55 ++- include/features.h | 8 intl/locale.alias | 2 libio/bits/stdio2.h | 19 + libio/stdio.h | 2 locale/iso-4217.def | 13 locale/programs/3level.h | 36 ++ localedata/Makefile | 1 localedata/SUPPORTED | 6 localedata/locales/cy_GB | 7 localedata/locales/en_GB | 4 localedata/locales/no_NO | 69 ++++ localedata/locales/zh_TW | 6 malloc/mcheck.c | 30 +- malloc/mtrace.c | 20 + nptl/ChangeLog | 19 + nptl/Makefile | 8 nptl/sysdeps/unix/sysv/linux/kernel-features.h | 6 nptl/tst-stackguard1.c | 8 nscd/connections.c | 15 + nscd/nscd.c | 4 nscd/nscd.conf | 4 nscd/nscd.init | 19 - nscd/selinux.c | 2 posix/Makefile | 19 - posix/getconf.speclist.h | 15 + sysdeps/generic/dl-cache.h | 8 sysdeps/ia64/Makefile | 4 sysdeps/ia64/ia64libgcc.S | 350 ------------------------- sysdeps/ia64/libgcc-compat.c | 84 ++++++ sysdeps/unix/nice.c | 7 sysdeps/unix/sysv/linux/dl-osinfo.h | 29 ++ sysdeps/unix/sysv/linux/i386/dl-cache.h | 59 ++++ sysdeps/unix/sysv/linux/ia64/dl-cache.h | 27 + sysdeps/unix/sysv/linux/ia64/dl-procinfo.c | 5 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h | 5 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed | 2 sysdeps/unix/sysv/linux/paths.h | 2 sysdeps/unix/sysv/linux/tcsetattr.c | 32 ++ 47 files changed, 769 insertions(+), 448 deletions(-) Index: glibc-fedora.patch =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- glibc-fedora.patch 9 Jan 2006 22:19:27 -0000 1.125 +++ glibc-fedora.patch 30 Jan 2006 10:11:25 -0000 1.126 @@ -1,6 +1,6 @@ ---- glibc-20060109T2152/ChangeLog 9 Jan 2006 21:40:30 -0000 1.9888 -+++ glibc-20060109T2152-fedora/ChangeLog 9 Jan 2006 21:54:57 -0000 1.8782.2.150 -@@ -891,6 +891,10 @@ +--- glibc-20060130T0922/ChangeLog 28 Jan 2006 00:15:15 -0000 1.9958 ++++ glibc-20060130T0922-fedora/ChangeLog 30 Jan 2006 09:29:44 -0000 1.8782.2.151 +@@ -2275,6 +2275,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -11,7 +11,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -1174,6 +1178,26 @@ +@@ -2558,6 +2562,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -38,7 +38,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -4292,6 +4316,11 @@ +@@ -5676,6 +5700,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -50,7 +50,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -5286,6 +5315,12 @@ +@@ -6670,6 +6699,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -63,7 +63,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -5410,6 +5445,17 @@ +@@ -6794,6 +6829,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -81,7 +81,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -8470,6 +8516,18 @@ +@@ -9854,6 +9900,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -100,8 +100,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060109T2152/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060109T2152-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060130T0922/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060130T0922-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -151,8 +151,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20060109T2152/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060109T2152-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060130T0922/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060130T0922-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -179,8 +179,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060109T2152/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060109T2152-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060130T0922/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060130T0922-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -261,8 +261,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060109T2152/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060109T2152-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060130T0922/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060130T0922-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int, extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -287,8 +287,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060109T2152/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060109T2152-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060130T0922/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060130T0922-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -317,8 +317,8 @@ # define O 0 #else # define O 1 ---- glibc-20060109T2152/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 -+++ glibc-20060109T2152-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 +--- glibc-20060130T0922/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 ++++ glibc-20060130T0922-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr #endif !is_hwcap_platform (direntry->d_name))) @@ -420,8 +420,8 @@ } search_dirs (); ---- glibc-20060109T2152/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060109T2152-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060130T0922/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060130T0922-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -446,8 +446,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060109T2152/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060109T2152-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060130T0922/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060130T0922-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -524,8 +524,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060109T2152/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 -+++ glibc-20060109T2152-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 +--- glibc-20060130T0922/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 ++++ glibc-20060130T0922-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 @@ -275,7 +275,13 @@ #endif @@ -541,8 +541,8 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060109T2152/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060109T2152-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060130T0922/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060130T0922-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 @@ -58,8 +58,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -552,8 +552,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060109T2152/libio/stdio.h 5 Jan 2006 12:25:35 -0000 1.84 -+++ glibc-20060109T2152-fedora/libio/stdio.h 6 Jan 2006 09:23:23 -0000 1.78.2.7 +--- glibc-20060130T0922/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86 ++++ glibc-20060130T0922-fedora/libio/stdio.h 30 Jan 2006 09:29:46 -0000 1.78.2.8 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -567,8 +567,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060109T2152/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060109T2152-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060130T0922/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060130T0922-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -599,8 +599,8 @@ #endif ---- glibc-20060109T2152/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20060109T2152-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060130T0922/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060130T0922-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -692,8 +692,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060109T2152/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060109T2152-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060130T0922/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060130T0922-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -737,8 +737,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060109T2152/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20060109T2152-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060130T0922/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060130T0922-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -747,8 +747,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060109T2152/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20060109T2152-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060130T0922/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060130T0922-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -790,8 +790,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060109T2152/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060109T2152-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060130T0922/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060130T0922-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -806,8 +806,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060109T2152/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060109T2152-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060130T0922/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060130T0922-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -819,8 +819,8 @@ date_fmt "/ / " ---- glibc-20060109T2152/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060109T2152-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060130T0922/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060130T0922-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -891,8 +891,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060109T2152/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060109T2152-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060130T0922/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060130T0922-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -920,8 +920,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060109T2152/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060109T2152-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060130T0922/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060130T0922-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -997,8 +997,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060109T2152/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060109T2152-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060130T0922/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060130T0922-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1054,9 +1054,9 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060109T2152/nptl/ChangeLog 9 Jan 2006 21:28:07 -0000 1.848 -+++ glibc-20060109T2152-fedora/nptl/ChangeLog 9 Jan 2006 21:54:58 -0000 1.706.2.74 -@@ -443,6 +443,15 @@ +--- glibc-20060130T0922/nptl/ChangeLog 20 Jan 2006 16:49:36 -0000 1.857 ++++ glibc-20060130T0922-fedora/nptl/ChangeLog 30 Jan 2006 09:29:47 -0000 1.706.2.75 +@@ -497,6 +497,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1072,7 +1072,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1179,6 +1188,11 @@ +@@ -1233,6 +1242,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1084,7 +1084,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3253,6 +3267,11 @@ +@@ -3307,6 +3321,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1096,9 +1096,9 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060109T2152/nptl/Makefile 5 Jan 2006 08:16:20 -0000 1.175 -+++ glibc-20060109T2152-fedora/nptl/Makefile 6 Jan 2006 09:23:24 -0000 1.157.2.16 -@@ -507,15 +507,19 @@ $(addprefix $(objpfx), \ +--- glibc-20060130T0922/nptl/Makefile 9 Jan 2006 23:04:44 -0000 1.176 ++++ glibc-20060130T0922-fedora/nptl/Makefile 30 Jan 2006 09:29:47 -0000 1.157.2.17 +@@ -514,15 +514,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so @@ -1120,8 +1120,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060109T2152/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060109T2152-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060130T0922/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060130T0922-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1146,8 +1146,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060109T2152/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060109T2152-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060130T0922/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060130T0922-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 @@ -0,0 +1,6 @@ +#include_next + @@ -1155,8 +1155,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060109T2152/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 -+++ glibc-20060109T2152-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 +--- glibc-20060130T0922/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 ++++ glibc-20060130T0922-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void) exit (4); } @@ -1176,8 +1176,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060109T2152/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 -+++ glibc-20060109T2152-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +--- glibc-20060130T0922/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060130T0922-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1196,8 +1196,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060109T2152/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20060109T2152-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060130T0922/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060130T0922-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 @@ -32,8 +32,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1209,8 +1209,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060109T2152/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060109T2152-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060130T0922/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060130T0922-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1251,8 +1251,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060109T2152/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 -+++ glibc-20060109T2152-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 +--- glibc-20060130T0922/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 ++++ glibc-20060130T0922-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 @@ -147,7 +147,7 @@ audit_init (void) if (audit_fd < 0 /* If kernel doesn't support audit, bail out */ @@ -1262,8 +1262,8 @@ } #endif /* HAVE_LIBAUDIT */ ---- glibc-20060109T2152/posix/Makefile 8 Jan 2006 09:39:15 -0000 1.188 -+++ glibc-20060109T2152-fedora/posix/Makefile 9 Jan 2006 21:55:00 -0000 1.171.2.16 +--- glibc-20060130T0922/posix/Makefile 8 Jan 2006 09:39:15 -0000 1.188 ++++ glibc-20060130T0922-fedora/posix/Makefile 9 Jan 2006 21:55:00 -0000 1.171.2.16 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1297,8 +1297,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060109T2152/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060109T2152-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060130T0922/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060130T0922-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1315,8 +1315,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060109T2152/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060109T2152-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060130T0922/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060130T0922-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1332,8 +1332,8 @@ #define CACHEMAGIC "ld.so-1.7.0" /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another ---- glibc-20060109T2152/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060109T2152-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060130T0922/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060130T0922-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1345,8 +1345,8 @@ endif endif ---- glibc-20060109T2152/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060109T2152-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060130T0922/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060130T0922-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1698,8 +1698,8 @@ - .symver ___multi3, __multi3 at GLIBC_2.2 - -#endif ---- glibc-20060109T2152/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060109T2152-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060130T0922/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060130T0922-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1785,8 +1785,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060109T2152/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060109T2152-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060130T0922/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060130T0922-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -1801,8 +1801,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060109T2152/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 -+++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 +--- glibc-20060130T0922/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 ++++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -1851,8 +1851,8 @@ + ret ^= stk; return ret; } ---- glibc-20060109T2152/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060130T0922/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 @@ -61,7 +61,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -1862,8 +1862,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060109T2152/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060130T0922/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios { struct __kernel_termios k_termios; @@ -1909,8 +1909,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060109T2152/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060130T0922/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -1971,8 +1971,8 @@ + } while (0) + +#include_next ---- glibc-20060109T2152/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060130T0922/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2005,24 +2005,24 @@ + } while (0) + #include_next ---- glibc-20060109T2152/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060130T0922/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060109T2152/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060130T0922/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-20060109T2152/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060109T2152-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060130T0922/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060130T0922-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.211 retrieving revision 1.212 diff -u -r1.211 -r1.212 --- glibc.spec 9 Jan 2006 23:28:07 -0000 1.211 +++ glibc.spec 30 Jan 2006 10:11:25 -0000 1.212 @@ -1,9 +1,9 @@ -%define glibcdate 20060109T2152 +%define glibcdate 20060130T0922 %define glibcname glibc -%define glibcsrcdir glibc-20060109T2152 +%define glibcsrcdir glibc-20060130T0922 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 30 +%define glibcrelease 31 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -32,7 +32,6 @@ Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2 Patch0: %{glibcname}-fedora.patch Patch1: %{name}-ia64-lib64.patch -Patch2: glibc-rodata.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -71,6 +70,9 @@ # Need AS_NEEDED directive BuildRequires: binutils >= 2.15.94.0.2-1 BuildRequires: gcc >= 3.2.1-5 +%ifarch ppc s390 s390x +BuildRequires: gcc >= 4.1.0-0.17 +%endif %if "%{_enable_debug_packages}" == "1" BuildPreReq: elfutils >= 0.72 BuildPreReq: rpm >= 4.2-0.56 @@ -239,7 +241,6 @@ %patch1 -p1 %endif %endif -%patch2 -p1 # Hack till glibc-kernheaders get updated, argh mkdir -p override_headers/linux @@ -282,6 +283,25 @@ #ifndef __NR_waitid #define __NR_waitid 284 #endif +#ifndef __NR_openat +#define __NR_openat 295 +#define __NR_mkdirat 296 +#define __NR_mknodat 297 +#define __NR_fchownat 298 +#define __NR_futimesat 299 +#define __NR_newfstatat 300 +#define __NR_unlinkat 301 +#define __NR_renameat 302 +#define __NR_linkat 303 +#define __NR_symlinkat 304 +#define __NR_readlinkat 305 +#define __NR_fchmodat 306 +#define __NR_faccessat 307 +#endif +#ifndef __NR_pselect6 +#define __NR_pselect6 308 +#define __NR_ppoll 309 +#endif %endif %ifarch ia64 #ifndef __NR_timer_create @@ -329,6 +349,10 @@ #ifndef __NR_waitid #define __NR_waitid 272 #endif +#ifndef __NR_pselect6 +#define __NR_pselect6 280 +#define __NR_ppoll 281 +#endif %endif %ifarch ppc64 #ifndef __NR_utimes @@ -345,6 +369,10 @@ #ifndef __NR_waitid #define __NR_waitid 272 #endif +#ifndef __NR_pselect6 +#define __NR_pselect6 280 +#define __NR_ppoll 281 +#endif %endif %ifarch s390 #ifndef __NR_timer_create @@ -418,6 +446,25 @@ #define __NR_lstat64 132 #define __NR_stat64 139 #endif +#ifndef __NR_openat +#define __NR_openat 284 +#define __NR_mkdirat 285 +#define __NR_mknodat 286 +#define __NR_fchownat 287 +#define __NR_futimesat 288 +#define __NR_newfstatat 289 +#define __NR_unlinkat 290 +#define __NR_renameat 291 +#define __NR_linkat 292 +#define __NR_symlinkat 293 +#define __NR_readlinkat 294 +#define __NR_fchmodat 295 +#define __NR_faccessat 296 +#endif +#ifndef __NR_pselect6 +#define __NR_pselect6 297 +#define __NR_ppoll 298 +#endif %endif %ifarch x86_64 #ifndef __NR_mq_open @@ -431,6 +478,21 @@ #ifndef __NR_waitid #define __NR_waitid 247 #endif +#ifndef __NR_openat +#define __NR_openat 257 +#define __NR_mkdirat 258 +#define __NR_mknodat 259 +#define __NR_fchownat 260 +#define __NR_futimesat 261 +#define __NR_newfstatat 262 +#define __NR_unlinkat 263 +#define __NR_renameat 264 +#define __NR_linkat 265 +#define __NR_symlinkat 266 +#define __NR_readlinkat 267 +#define __NR_fchmodat 268 +#define __NR_faccessat 269 +#endif %endif #endif EOF @@ -1138,6 +1200,12 @@ %endif %changelog +* Mon Jan 30 2006 Jakub Jelinek 2.3.90-31 +- update from CVS + - 128-bit long double on ppc, ppc64, s390, s390x and sparc{,v9} +- add some new syscall numbers to the override + headers + * Mon Jan 9 2006 Jakub Jelinek 2.3.90-30 - update from CVS - initializer fixes for -std=c{8,9}9 on 32-bit Index: sources =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/sources,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- sources 9 Jan 2006 22:19:27 -0000 1.154 +++ sources 30 Jan 2006 10:11:25 -0000 1.155 @@ -1,2 +1,2 @@ -55117a80457a52c3005499570e38aa10 glibc-20060109T2152.tar.bz2 -a333fca94866e9a67589aa48c6caaeba glibc-fedora-20060109T2152.tar.bz2 +e7d2de8446c4af2083f06feb45c0c7dd glibc-20060130T0922.tar.bz2 +a628fbf8559d8a4d710b336422430f9a glibc-fedora-20060130T0922.tar.bz2 --- glibc-ppc-assume.patch DELETED --- --- glibc-rodata.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 30 10:14:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 05:14:37 -0500 Subject: rpms/shared-mime-info/devel defaults.list, 1.10, 1.11 shared-mime-info.spec, 1.30, 1.31 Message-ID: <200601301014.k0UAEbbM030990@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/shared-mime-info/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30960 Modified Files: defaults.list shared-mime-info.spec Log Message: prefer OOO for oasis formats Index: defaults.list =================================================================== RCS file: /cvs/dist/rpms/shared-mime-info/devel/defaults.list,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- defaults.list 2 Nov 2005 18:29:17 -0000 1.10 +++ defaults.list 30 Jan 2006 10:14:33 -0000 1.11 @@ -44,14 +44,22 @@ application/vnd.sun.xml.writer=openoffice.org-1.9-writer.desktop application/vnd.sun.xml.writer.global=openoffice.org-1.9-writer.desktop application/vnd.stardivision.writer=openoffice.org-1.9-writer.desktop +application/vnd.oasis.opendocument.text=openoffice.org-1.9-writer.desktop +application/vnd.oasis.opendocument.text-template=openoffice.org-1.9-writer.desktop +application/vnd.oasis.opendocument.text-web=openoffice.org-1.9-writer.desktop +application/vnd.oasis.opendocument.text-master=openoffice.org-1.9-writer.desktop application/vnd.ms-excel=openoffice.org-1.9-calc.desktop application/vnd.stardivision.calc=openoffice.org-1.9-calc.desktop application/vnd.sun.xml.calc=openoffice.org-1.9-calc.desktop application/vnd.sun.xml.calc.template=openoffice.org-1.9-calc.desktop +application/vnd.oasis.opendocument.spreadsheet=openoffice.org-1.9-calc.desktop +application/vnd.oasis.opendocument.spreadsheet-template=openoffice.org-1.9-calc.desktop application/vnd.ms-powerpoint=openoffice.org-1.9-impress.desktop application/vnd.stardivision.impress=openoffice.org-1.9-impress.desktop application/vnd.sun.xml.impress=openoffice.org-1.9-impress.desktop application/vnd.sun.xml.impress.template=openoffice.org-1.9-impress.desktop +application/vnd.oasis.opendocument.presentation=openoffice.org-1.9-impress.desktop +application/vnd.oasis.opendocument.presentation-template=openoffice.org-1.9-impress.desktop application/vnd.stardivision.draw=openoffice.org-1.9-draw.desktop application/vnd.sun.xml.draw=openoffice.org-1.9-draw.desktop application/vnd.sun.xml.draw.template=openoffice.org-1.9-draw.desktop Index: shared-mime-info.spec =================================================================== RCS file: /cvs/dist/rpms/shared-mime-info/devel/shared-mime-info.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- shared-mime-info.spec 19 Dec 2005 16:52:08 -0000 1.30 +++ shared-mime-info.spec 30 Jan 2006 10:14:34 -0000 1.31 @@ -1,7 +1,7 @@ Summary: Shared MIME information database Name: shared-mime-info Version: 0.16.cvs20051219 -Release: 1 +Release: 2 License: GPL Group: System Environment/Libraries URL: http://freedesktop.org/Software/shared-mime-info @@ -62,6 +62,9 @@ %{_mandir}/man*/* %changelog +* Mon Jan 30 2006 Caolan McNamara - 0.16.cvs20051219-2 +- rh#179138# add openoffice.org as preferred app for oasis formats + * Mon Dec 19 2005 Matthias Clasen - 0.16.cvs20051219-1 - Newer cvs snapshot From fedora-cvs-commits at redhat.com Mon Jan 30 10:15:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 05:15:53 -0500 Subject: rpms/system-config-soundcard/devel system-config-soundcard-1.2.14-kudzu-log.patch, NONE, 1.1 system-config-soundcard.spec, 1.25, 1.26 Message-ID: <200601301015.k0UAFruv002580@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2359 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-1.2.14-kudzu-log.patch Log Message: added kudzu-log system-config-soundcard-1.2.14-kudzu-log.patch: soundcardBackend.py | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE system-config-soundcard-1.2.14-kudzu-log.patch --- --- system-config-soundcard-1.2.14/src/soundcardBackend.py.old 2006-01-30 10:29:42.000000000 +0100 +++ system-config-soundcard-1.2.14/src/soundcardBackend.py 2006-01-30 10:27:26.000000000 +0100 @@ -127,6 +127,11 @@ list = kudzu.probe(kudzu.CLASS_AUDIO, kudzu.BUS_PCI | kudzu.BUS_MACIO, kudzu.PROBE_ALL) + print "----------- Kudzu -------------" + for card in list: + print card + print "----------- **** -------------" + for card in list: #Let's go through the list of cards. If the driver is 'unknown', #don't put the card in the list. Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/devel/system-config-soundcard.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- system-config-soundcard.spec 18 Jan 2006 13:11:34 -0000 1.25 +++ system-config-soundcard.spec 30 Jan 2006 10:15:50 -0000 1.26 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard Version: 1.2.14 -Release: 4 +Release: 5 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html License: GPL ExclusiveOS: Linux @@ -12,6 +12,7 @@ Patch1: system-config-soundcard-1.2.14-desktop.patch Patch2: system-config-soundcard-1.2.14-dyn-keys.patch Patch3: system-config-soundcard-1.2.14-text.patch +Patch4: system-config-soundcard-1.2.14-kudzu-log.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -34,6 +35,7 @@ %patch1 -p1 %patch2 -p1 -b .dyn %patch3 -p1 -b .text +%patch4 -p1 -b .log %build make @@ -87,6 +89,9 @@ %ghost /root/scsound.log %changelog +* Mon Jan 30 2006 Martin Stransky 1.2.14-5 +- added kudzu-log + * Tue Jan 18 2006 Martin Stransky 1.2.14-4 - text clean-up From fedora-cvs-commits at redhat.com Mon Jan 30 10:19:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 05:19:58 -0500 Subject: rpms/glibc/devel glibc-ppc-fpu.patch, NONE, 1.1 glibc-ppc-ulps.patch, NONE, 1.1 glibc-s390-ldbl.patch, NONE, 1.1 glibc.spec, 1.212, 1.213 Message-ID: <200601301019.k0UAJwGa013263@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13153 Modified Files: glibc.spec Added Files: glibc-ppc-fpu.patch glibc-ppc-ulps.patch glibc-s390-ldbl.patch Log Message: 2.3.90-31 glibc-ppc-fpu.patch: powerpc/Implies | 2 powerpc/fpu/Implies | 4 unix/sysv/linux/powerpc/Implies | 4 unix/sysv/linux/powerpc/configure | 135 ------------------------------- unix/sysv/linux/powerpc/configure.in | 37 -------- unix/sysv/linux/powerpc/fpu/Implies | 4 unix/sysv/linux/powerpc/fpu/configure | 135 +++++++++++++++++++++++++++++++ unix/sysv/linux/powerpc/fpu/configure.in | 37 ++++++++ 8 files changed, 180 insertions(+), 178 deletions(-) --- NEW FILE glibc-ppc-fpu.patch --- 2006-01-30 Jakub Jelinek * sysdeps/unix/sysv/linux/powerpc/Implies: Moved to... * sysdeps/unix/sysv/linux/powerpc/fpu/Implies: ... here. New file. * sysdeps/unix/sysv/linux/powerpc/configure.in: Moved to... * sysdeps/unix/sysv/linux/powerpc/fpu/configure.in: ... here. New file. * sysdeps/unix/sysv/linux/powerpc/configure: Moved to... * sysdeps/unix/sysv/linux/powerpc/fpu/configure: ... here. New file. * sysdeps/powerpc/Implies: Remove ieee754/ldbl-128ibm line. * sysdeps/powerpc/fpu/Implies: New file. --- libc/sysdeps/unix/sysv/linux/powerpc/fpu/Implies.jj 2006-01-30 08:17:12.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/powerpc/fpu/Implies 2006-01-28 01:14:41.000000000 +0100 @@ -0,0 +1,4 @@ +# Make sure these routines come before ldbl-opt. +ieee754/ldbl-128ibm +# These supply the ABI compatibility for when long double was double. +ieee754/ldbl-opt --- libc/sysdeps/unix/sysv/linux/powerpc/fpu/configure.in.jj 2006-01-30 09:26:38.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/powerpc/fpu/configure.in 2006-01-28 01:07:39.000000000 +0100 @@ -0,0 +1,37 @@ +sinclude(./aclocal.m4)dnl Autoconf lossage +GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. +# Local configure fragment for sysdeps/unix/sysv/linux/powerpc/. + +AC_CACHE_CHECK(whether $CC $CFLAGS -mlong-double-128 uses IBM extended format, + libc_cv_mlong_double_128ibm, [dnl +save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -mlong-double-128" +AC_TRY_COMPILE([#include ], [ +#if LDBL_MANT_DIG != 106 +# error "compiler doesn't implement IBM extended format of long double" +#endif +long double foobar (long double x) { return x; }], + libc_cv_mlong_double_128ibm=yes, + libc_cv_mlong_double_128ibm=no) +CFLAGS="$save_CFLAGS"]) + +if test "$libc_cv_mlong_double_128ibm" = no; then + AC_CACHE_CHECK(whether $CC $CFLAGS supports -mabi=ibmlongdouble, + libc_cv_mabi_ibmlongdouble, [dnl + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -mlong-double-128 -mabi=ibmlongdouble" + AC_TRY_COMPILE([#include ], [ +#if LDBL_MANT_DIG != 106 +# error "compiler doesn't implement IBM extended format of long double" +#endif +long double foobar (long double x) { return x; }], + libc_cv_mabi_ibmlongdouble=yes, + libc_cv_mabi_ibmlongdouble=no) + CFLAGS="$save_CFLAGS"]) + + if test "$libc_cv_mabi_ibmlongdouble" = yes; then + CFLAGS="$CFLAGS -mabi=ibmlongdouble" + else + AC_MSG_ERROR([this configuration requires -mlong-double-128 IBM extended format support]) + fi +fi --- libc/sysdeps/unix/sysv/linux/powerpc/fpu/configure.jj 2006-01-30 09:26:41.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/powerpc/fpu/configure 2006-01-28 01:07:39.000000000 +0100 @@ -0,0 +1,135 @@ +# This file is generated from configure.in by Autoconf. DO NOT EDIT! + # Local configure fragment for sysdeps/unix/sysv/linux/powerpc/. + + +echo "$as_me:$LINENO: checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format" >&5 +echo $ECHO_N "checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format... $ECHO_C" >&6 +if test "${libc_cv_mlong_double_128ibm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -mlong-double-128" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + +#if LDBL_MANT_DIG != 106 +# error "compiler doesn't implement IBM extended format of long double" +#endif +long double foobar (long double x) { return x; } + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + libc_cv_mlong_double_128ibm=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +libc_cv_mlong_double_128ibm=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +CFLAGS="$save_CFLAGS" +fi +echo "$as_me:$LINENO: result: $libc_cv_mlong_double_128ibm" >&5 +echo "${ECHO_T}$libc_cv_mlong_double_128ibm" >&6 + +if test "$libc_cv_mlong_double_128ibm" = no; then + echo "$as_me:$LINENO: checking whether $CC $CFLAGS supports -mabi=ibmlongdouble" >&5 +echo $ECHO_N "checking whether $CC $CFLAGS supports -mabi=ibmlongdouble... $ECHO_C" >&6 +if test "${libc_cv_mabi_ibmlongdouble+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -mlong-double-128 -mabi=ibmlongdouble" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + +#if LDBL_MANT_DIG != 106 +# error "compiler doesn't implement IBM extended format of long double" +#endif +long double foobar (long double x) { return x; } + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + libc_cv_mabi_ibmlongdouble=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +libc_cv_mabi_ibmlongdouble=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$save_CFLAGS" +fi +echo "$as_me:$LINENO: result: $libc_cv_mabi_ibmlongdouble" >&5 +echo "${ECHO_T}$libc_cv_mabi_ibmlongdouble" >&6 + + if test "$libc_cv_mabi_ibmlongdouble" = yes; then + CFLAGS="$CFLAGS -mabi=ibmlongdouble" + else + { { echo "$as_me:$LINENO: error: this configuration requires -mlong-double-128 IBM extended format support" >&5 +echo "$as_me: error: this configuration requires -mlong-double-128 IBM extended format support" >&2;} + { (exit 1); exit 1; }; } + fi +fi --- libc/sysdeps/unix/sysv/linux/powerpc/Implies.jj 2006-01-28 01:14:41.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/powerpc/Implies 2006-01-30 08:17:05.000000000 +0100 @@ -1,4 +0,0 @@ -# Make sure these routines come before ldbl-opt. -ieee754/ldbl-128ibm -# These supply the ABI compatibility for when long double was double. -ieee754/ldbl-opt --- libc/sysdeps/unix/sysv/linux/powerpc/configure.jj 2006-01-28 01:07:39.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/powerpc/configure 2006-01-30 09:26:30.000000000 +0100 @@ -1,135 +0,0 @@ -# This file is generated from configure.in by Autoconf. DO NOT EDIT! - # Local configure fragment for sysdeps/unix/sysv/linux/powerpc/. - - -echo "$as_me:$LINENO: checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format" >&5 -echo $ECHO_N "checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format... $ECHO_C" >&6 -if test "${libc_cv_mlong_double_128ibm+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -mlong-double-128" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ - -#if LDBL_MANT_DIG != 106 -# error "compiler doesn't implement IBM extended format of long double" -#endif -long double foobar (long double x) { return x; } - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - libc_cv_mlong_double_128ibm=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -libc_cv_mlong_double_128ibm=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -CFLAGS="$save_CFLAGS" -fi -echo "$as_me:$LINENO: result: $libc_cv_mlong_double_128ibm" >&5 -echo "${ECHO_T}$libc_cv_mlong_double_128ibm" >&6 - -if test "$libc_cv_mlong_double_128ibm" = no; then - echo "$as_me:$LINENO: checking whether $CC $CFLAGS supports -mabi=ibmlongdouble" >&5 -echo $ECHO_N "checking whether $CC $CFLAGS supports -mabi=ibmlongdouble... $ECHO_C" >&6 -if test "${libc_cv_mabi_ibmlongdouble+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mlong-double-128 -mabi=ibmlongdouble" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ - -#if LDBL_MANT_DIG != 106 -# error "compiler doesn't implement IBM extended format of long double" -#endif -long double foobar (long double x) { return x; } - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - libc_cv_mabi_ibmlongdouble=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -libc_cv_mabi_ibmlongdouble=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$save_CFLAGS" -fi -echo "$as_me:$LINENO: result: $libc_cv_mabi_ibmlongdouble" >&5 -echo "${ECHO_T}$libc_cv_mabi_ibmlongdouble" >&6 - - if test "$libc_cv_mabi_ibmlongdouble" = yes; then - CFLAGS="$CFLAGS -mabi=ibmlongdouble" - else - { { echo "$as_me:$LINENO: error: this configuration requires -mlong-double-128 IBM extended format support" >&5 -echo "$as_me: error: this configuration requires -mlong-double-128 IBM extended format support" >&2;} - { (exit 1); exit 1; }; } - fi -fi --- libc/sysdeps/unix/sysv/linux/powerpc/configure.in.jj 2006-01-28 01:07:39.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/powerpc/configure.in 2006-01-30 09:26:27.000000000 +0100 @@ -1,37 +0,0 @@ -sinclude(./aclocal.m4)dnl Autoconf lossage -GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. -# Local configure fragment for sysdeps/unix/sysv/linux/powerpc/. - -AC_CACHE_CHECK(whether $CC $CFLAGS -mlong-double-128 uses IBM extended format, - libc_cv_mlong_double_128ibm, [dnl -save_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -mlong-double-128" -AC_TRY_COMPILE([#include ], [ -#if LDBL_MANT_DIG != 106 -# error "compiler doesn't implement IBM extended format of long double" -#endif -long double foobar (long double x) { return x; }], - libc_cv_mlong_double_128ibm=yes, - libc_cv_mlong_double_128ibm=no) -CFLAGS="$save_CFLAGS"]) - -if test "$libc_cv_mlong_double_128ibm" = no; then - AC_CACHE_CHECK(whether $CC $CFLAGS supports -mabi=ibmlongdouble, - libc_cv_mabi_ibmlongdouble, [dnl - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mlong-double-128 -mabi=ibmlongdouble" - AC_TRY_COMPILE([#include ], [ -#if LDBL_MANT_DIG != 106 -# error "compiler doesn't implement IBM extended format of long double" -#endif -long double foobar (long double x) { return x; }], - libc_cv_mabi_ibmlongdouble=yes, - libc_cv_mabi_ibmlongdouble=no) - CFLAGS="$save_CFLAGS"]) - - if test "$libc_cv_mabi_ibmlongdouble" = yes; then - CFLAGS="$CFLAGS -mabi=ibmlongdouble" - else - AC_MSG_ERROR([this configuration requires -mlong-double-128 IBM extended format support]) - fi -fi --- libc/sysdeps/powerpc/fpu/Implies.jj 2006-01-30 08:18:28.000000000 +0100 +++ libc/sysdeps/powerpc/fpu/Implies 2006-01-29 21:10:24.000000000 +0100 @@ -0,0 +1,4 @@ +# On PowerPC we use the IBM extended long double format. +ieee754/ldbl-128ibm +ieee754/dbl-64 +ieee754/flt-32 --- libc/sysdeps/powerpc/Implies.jj 2006-01-29 21:10:24.000000000 +0100 +++ libc/sysdeps/powerpc/Implies 2006-01-30 08:18:21.000000000 +0100 @@ -1,4 +1,2 @@ -# On PowerPC we use the IBM extended long double format. -ieee754/ldbl-128ibm ieee754/dbl-64 ieee754/flt-32 glibc-ppc-ulps.patch: libm-test-ulps | 184 ++++++++++++++++++++++++++++++--------------------------- 1 files changed, 98 insertions(+), 86 deletions(-) --- NEW FILE glibc-ppc-ulps.patch --- 2006-01-30 Jakub Jelinek * sysdeps/powerpc/fpu/libm-test-ulps: Merge ulps with older libm-test-ulps rather than overwrite it. Remove excessively high ulps. --- libc/sysdeps/powerpc/fpu/libm-test-ulps.jj 2006-01-29 21:10:24.000000000 +0100 +++ libc/sysdeps/powerpc/fpu/libm-test-ulps 2006-01-30 08:35:39.000000000 +0100 @@ -37,9 +37,16 @@ ildouble: 1 ldouble: 1 # cacosh +Test "Real part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i": +double: 1 +float: 7 +idouble: 1 +ifloat: 7 Test "Imaginary part of: cacosh (-2 - 3 i) == 1.9833870299165354323470769028940395 - 2.1414491111159960199416055713254211 i": -float: 1 -ifloat: 1 +double: 1 +float: 3 +idouble: 1 +ifloat: 3 # casin Test "Real part of: casin (-2 - 3 i) == -0.57065278432109940071028387968566963 - 1.9833870299165354323470769028940395 i": @@ -77,6 +84,8 @@ ifloat: 1 # catan Test "Real part of: catan (-2 - 3 i) == -1.4099210495965755225306193844604208 - 0.22907268296853876629588180294200276 i": +float: 3 +ifloat: 3 ildouble: 1 ldouble: 1 Test "Imaginary part of: catan (-2 - 3 i) == -1.4099210495965755225306193844604208 - 0.22907268296853876629588180294200276 i": @@ -84,14 +93,23 @@ double: 1 float: 1 idouble: 1 ifloat: 1 +Test "Real part of: catan (0.75 + 1.25 i) == 1.10714871779409050301706546017853704 + 0.549306144334054845697622618461262852 i": +float: 4 +ifloat: 4 # catanh Test "Real part of: catanh (-2 - 3 i) == -0.14694666622552975204743278515471595 - 1.3389725222944935611241935759091443 i": double: 4 idouble: 4 +Test "Imaginary part of: catanh (-2 - 3 i) == -0.14694666622552975204743278515471595 - 1.3389725222944935611241935759091443 i": +float: 4 +ifloat: 4 Test "Real part of: catanh (0.75 + 1.25 i) == 0.261492138795671927078652057366532140 + 0.996825126463918666098902241310446708 i": double: 1 idouble: 1 +Test "Imaginary part of: catanh (0.75 + 1.25 i) == 0.261492138795671927078652057366532140 + 0.996825126463918666098902241310446708 i": +float: 6 +ifloat: 6 # cbrt Test "cbrt (-27.0) == -3.0": @@ -149,6 +167,8 @@ ldouble: 1 # clog Test "Imaginary part of: clog (-2 - 3 i) == 1.2824746787307683680267437207826593 - 2.1587989303424641704769327722648368 i": +float: 3 +ifloat: 3 ildouble: 1 ldouble: 1 Test "Real part of: clog (0.75 + 1.25 i) == 0.376885901188190075998919126749298416 + 1.03037682652431246378774332703115153 i": @@ -177,7 +197,9 @@ ildouble: 1 ldouble: 1 Test "Imaginary part of: clog10 (-2 - 3 i) == 0.556971676153418384603252578971164214 - 0.937554462986374708541507952140189646 i": double: 1 +float: 5 idouble: 1 +ifloat: 5 ildouble: 1 ldouble: 1 Test "Imaginary part of: clog10 (-3 + inf i) == inf + pi/2*log10(e) i": @@ -276,12 +298,19 @@ ldouble: 1 # cos Test "cos (M_PI_6l * 2.0) == 0.5": double: 1 +float: 1 idouble: 1 +ifloat: 1 Test "cos (M_PI_6l * 4.0) == -0.5": double: 2 float: 1 idouble: 2 ifloat: 1 +Test "cos (pi/2) == 0": +double: 1 +float: 1 +idouble: 1 +ifloat: 1 # cpow Test "Real part of: cpow (0.75 + 1.25 i, 0.0 + 1.0 i) == 0.331825439177608832276067945276730566 + 0.131338600281188544930936345230903032 i": @@ -352,6 +381,9 @@ float: 1 ifloat: 1 # ctan +Test "Real part of: ctan (-2 - 3 i) == 0.376402564150424829275122113032269084e-2 - 1.00323862735360980144635859782192726 i": +double: 1 +idouble: 1 Test "Imaginary part of: ctan (-2 - 3 i) == 0.376402564150424829275122113032269084e-2 - 1.00323862735360980144635859782192726 i": ildouble: 1 ldouble: 1 @@ -468,92 +500,68 @@ ifloat: 1 # j0 Test "j0 (-4.0) == -3.9714980986384737228659076845169804197562E-1": double: 1 -float: 1 +float: 2 idouble: 1 -ifloat: 1 -ildouble: 43515227266289159395415763648 -ldouble: 43515227266289159395415763648 +ifloat: 2 Test "j0 (10.0) == -0.245935764451348335197760862485328754": -double: 2 +double: 3 float: 1 -idouble: 2 +idouble: 3 ifloat: 1 -ildouble: 17369667313819348747894233118595 -ldouble: 17369667313819348747894233118595 Test "j0 (2.0) == 0.223890779141235668051827454649948626": float: 2 ifloat: 2 Test "j0 (4.0) == -3.9714980986384737228659076845169804197562E-1": double: 1 -float: 1 +float: 2 idouble: 1 -ifloat: 1 -ildouble: 43515227266289159395415763648 -ldouble: 43515227266289159395415763648 +ifloat: 2 Test "j0 (8.0) == 0.171650807137553906090869407851972001": float: 1 ifloat: 1 -ildouble: 38324122909174090074461780712157 -ldouble: 38324122909174090074461780712157 # j1 Test "j1 (10.0) == 0.0434727461688614366697487680258592883": float: 2 ifloat: 2 -ildouble: 21475644881377747614143400473061 -ldouble: 21475644881377747614143400473061 Test "j1 (2.0) == 0.576724807756873387202448242269137087": double: 1 idouble: 1 Test "j1 (8.0) == 0.234636346853914624381276651590454612": double: 1 idouble: 1 -ildouble: 1790984160474480772420978558547 -ldouble: 1790984160474480772420978558547 # jn Test "jn (0, -4.0) == -3.9714980986384737228659076845169804197562E-1": double: 1 -float: 1 +float: 2 idouble: 1 -ifloat: 1 -ildouble: 43515227266289159395415763648 -ldouble: 43515227266289159395415763648 +ifloat: 2 Test "jn (0, 10.0) == -0.245935764451348335197760862485328754": -double: 2 +double: 3 float: 1 -idouble: 2 +idouble: 3 ifloat: 1 -ildouble: 17369667313819348747894233118595 -ldouble: 17369667313819348747894233118595 Test "jn (0, 2.0) == 0.223890779141235668051827454649948626": float: 2 ifloat: 2 Test "jn (0, 4.0) == -3.9714980986384737228659076845169804197562E-1": double: 1 -float: 1 +float: 2 idouble: 1 -ifloat: 1 -ildouble: 43515227266289159395415763648 -ldouble: 43515227266289159395415763648 +ifloat: 2 Test "jn (0, 8.0) == 0.171650807137553906090869407851972001": float: 1 ifloat: 1 -ildouble: 38324122909174090074461780712157 -ldouble: 38324122909174090074461780712157 Test "jn (1, 10.0) == 0.0434727461688614366697487680258592883": float: 2 ifloat: 2 -ildouble: 21475644881377747614143400473061 -ldouble: 21475644881377747614143400473061 Test "jn (1, 2.0) == 0.576724807756873387202448242269137087": double: 1 idouble: 1 Test "jn (1, 8.0) == 0.234636346853914624381276651590454612": double: 1 idouble: 1 -ildouble: 1790984160474480772420978558547 -ldouble: 1790984160474480772420978558547 Test "jn (10, -1.0) == 0.263061512368745320699785368779050294e-9": ildouble: 1 ldouble: 1 @@ -575,8 +583,6 @@ ldouble: 1 Test "jn (10, 10.0) == 0.207486106633358857697278723518753428": float: 1 ifloat: 1 -ildouble: 24853547691922812960150086146551 -ldouble: 24853547691922812960150086146551 Test "jn (10, 2.0) == 0.251538628271673670963516093751820639e-6": float: 4 ifloat: 4 @@ -596,11 +602,9 @@ ildouble: 1 ldouble: 1 Test "jn (3, 10.0) == 0.0583793793051868123429354784103409563": double: 3 -float: 1 +float: 2 idouble: 3 -ifloat: 1 -ildouble: 47549060992978485557887362065694 -ldouble: 47549060992978485557887362065694 +ifloat: 2 Test "jn (3, 2.0) == 0.128943249474402051098793332969239835": double: 1 float: 2 @@ -646,12 +650,19 @@ ldouble: 1 # sincos Test "sincos (M_PI_6l*2.0, &sin_res, &cos_res) puts 0.5 in cos_res": double: 1 +float: 1 idouble: 1 +ifloat: 1 Test "sincos (M_PI_6l*2.0, &sin_res, &cos_res) puts 0.86602540378443864676372317075293616 in sin_res": double: 1 float: 1 idouble: 1 ifloat: 1 +Test "sincos (pi/2, &sin_res, &cos_res) puts 0 in cos_res": +double: 1 +float: 1 +idouble: 1 +ifloat: 1 Test "sincos (pi/6, &sin_res, &cos_res) puts 0.86602540378443864676372317075293616 in cos_res": float: 1 ifloat: 1 @@ -663,6 +674,8 @@ ldouble: 1 # tan Test "tan (pi/4) == 1": +double: 1 +idouble: 1 ildouble: 1 ldouble: 1 @@ -706,17 +719,18 @@ float: 1 idouble: 2 ifloat: 1 Test "y0 (10.0) == 0.0556711672835993914244598774101900481": +double: 1 float: 1 +idouble: 1 ifloat: 1 -ildouble: 17987982955981951215498976719132 -ldouble: 17987982955981951215498976719132 +Test "y0 (2.0) == 0.510375672649745119596606592727157873": +double: 1 +idouble: 1 Test "y0 (8.0) == 0.223521489387566220527323400498620359": double: 1 float: 1 idouble: 1 ifloat: 1 -ildouble: 59420910818072525464695270081 -ldouble: 59420910818072525464695270081 # y1 Test "y1 (0.125) == -5.19993611253477499595928744876579921": @@ -730,8 +744,6 @@ double: 3 float: 1 idouble: 3 ifloat: 1 -ildouble: 17166751991147634677444869275635 -ldouble: 17166751991147634677444869275635 Test "y1 (2.0) == -0.107032431540937546888370772277476637": double: 1 float: 1 @@ -742,8 +754,6 @@ double: 1 float: 2 idouble: 1 ifloat: 2 -ildouble: 3843427930176871148105186605483 -ldouble: 3843427930176871148105186605483 # yn Test "yn (0, 0.75) == -0.137172769385772397522814379396581855": @@ -762,30 +772,29 @@ float: 1 idouble: 2 ifloat: 1 Test "yn (0, 10.0) == 0.0556711672835993914244598774101900481": +double: 1 float: 1 +idouble: 1 ifloat: 1 -ildouble: 17987982955981951215498976719132 -ldouble: 17987982955981951215498976719132 +Test "yn (0, 2.0) == 0.510375672649745119596606592727157873": +double: 1 +idouble: 1 Test "yn (0, 8.0) == 0.223521489387566220527323400498620359": double: 1 float: 1 idouble: 1 ifloat: 1 -ildouble: 59420910818072525464695270081 -ldouble: 59420910818072525464695270081 Test "yn (1, 0.125) == -5.19993611253477499595928744876579921": double: 1 idouble: 1 Test "yn (1, 1.5) == -0.412308626973911295952829820633445323": -float: 1 -ifloat: 1 +float: 2 +ifloat: 2 Test "yn (1, 10.0) == 0.249015424206953883923283474663222803": double: 3 float: 1 idouble: 3 ifloat: 1 -ildouble: 17166751991147634677444869275635 -ldouble: 17166751991147634677444869275635 Test "yn (1, 2.0) == -0.107032431540937546888370772277476637": double: 1 float: 1 @@ -796,8 +805,9 @@ double: 1 float: 2 idouble: 1 ifloat: 2 -ildouble: 3843427930176871148105186605483 -ldouble: 3843427930176871148105186605483 +Test "yn (3, 0.125) == -2612.69757350066712600220955744091741": +double: 1 +idouble: 1 Test "yn (10, 0.125) == -127057845771019398.252538486899753195": double: 1 idouble: 1 @@ -811,13 +821,13 @@ float: 2 ifloat: 2 Test "yn (10, 10.0) == -0.359814152183402722051986577343560609": double: 2 +float: 2 idouble: 2 -ildouble: 799631964554876895122912847384 -ldouble: 799631964554876895122912847384 +ifloat: 2 Test "yn (10, 2.0) == -129184.542208039282635913145923304214": -double: 2 +double: 3 float: 1 -idouble: 2 +idouble: 3 ifloat: 1 ildouble: 1 ldouble: 1 @@ -832,8 +842,6 @@ double: 1 float: 1 idouble: 1 ifloat: 1 -ildouble: 6997306768128814818664001056622 -ldouble: 6997306768128814818664001056622 Test "yn (3, 2.0) == -1.12778377684042778608158395773179238": double: 1 idouble: 1 @@ -878,12 +886,18 @@ ildouble: 1 ldouble: 1 Function: Real part of "cacosh": +double: 1 +float: 7 +idouble: 1 +ifloat: 7 ildouble: 1 ldouble: 1 Function: Imaginary part of "cacosh": -float: 1 -ifloat: 1 +double: 1 +float: 3 +idouble: 1 +ifloat: 3 Function: Real part of "casin": double: 1 @@ -914,6 +928,8 @@ ildouble: 1 ldouble: 1 Function: Real part of "catan": +float: 4 +ifloat: 4 ildouble: 1 ldouble: 1 @@ -929,6 +945,10 @@ Function: Real part of "catanh": double: 4 idouble: 4 +Function: Imaginary part of "catanh": +float: 6 +ifloat: 6 + Function: "cbrt": double: 1 idouble: 1 @@ -982,6 +1002,8 @@ ildouble: 2 ldouble: 2 Function: Imaginary part of "clog": +float: 3 +ifloat: 3 ildouble: 1 ldouble: 1 @@ -993,9 +1015,9 @@ ldouble: 2 Function: Imaginary part of "clog10": double: 1 -float: 1 +float: 5 idouble: 1 -ifloat: 1 +ifloat: 5 ildouble: 1 ldouble: 1 @@ -1060,6 +1082,8 @@ ildouble: 1 ldouble: 1 Function: Real part of "ctan": +double: 1 +idouble: 1 ildouble: 1 ldouble: 1 @@ -1130,28 +1154,22 @@ ildouble: 1 ldouble: 1 Function: "j0": -double: 2 +double: 3 float: 2 -idouble: 2 +idouble: 3 ifloat: 2 -ildouble: 38324122909174090074461780712157 -ldouble: 38324122909174090074461780712157 Function: "j1": double: 1 float: 2 idouble: 1 ifloat: 2 -ildouble: 21475644881377747614143400473061 -ldouble: 21475644881377747614143400473061 Function: "jn": double: 3 float: 4 idouble: 3 ifloat: 4 -ildouble: 47549060992978485557887362065694 -ldouble: 47549060992978485557887362065694 Function: "lgamma": double: 1 @@ -1226,23 +1244,17 @@ double: 2 float: 1 idouble: 2 ifloat: 1 -ildouble: 17987982955981951215498976719132 -ldouble: 17987982955981951215498976719132 Function: "y1": double: 3 float: 2 idouble: 3 ifloat: 2 -ildouble: 3843427930176871148105186605483 -ldouble: 3843427930176871148105186605483 Function: "yn": double: 3 float: 2 idouble: 3 ifloat: 2 -ildouble: 3843427930176871148105186605483 -ldouble: 3843427930176871148105186605483 # end of automatic generation glibc-s390-ldbl.patch: s390/Implies | 1 + s390/fpu/bits/mathinline.h | 26 ++++++++++++++++++++++++++ s390/fpu/e_sqrtl.c | 29 +++++++++++++++++++++++++++++ s390/s390-32/bits/wordsize.h | 11 +++++++++++ s390/s390-64/bits/wordsize.h | 11 +++++++++++ unix/sysv/linux/s390/fpu/Implies | 5 +++++ unix/sysv/linux/s390/nldbl-abi.h | 8 ++++++++ 7 files changed, 91 insertions(+) --- NEW FILE glibc-s390-ldbl.patch --- --- libc/sysdeps/unix/sysv/linux/s390/fpu/Implies.jj 2006-01-30 09:34:22.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/s390/fpu/Implies 2006-01-30 09:39:15.000000000 +0100 @@ -0,0 +1,5 @@ +# Override ldbl-opt with s390 specific routines. +s390/fpu +# These supply the ABI compatibility for when long double was double. +ieee754/ldbl-64-128 +ieee754/ldbl-opt --- libc/sysdeps/unix/sysv/linux/s390/nldbl-abi.h.jj 2006-01-30 09:34:22.000000000 +0100 +++ libc/sysdeps/unix/sysv/linux/s390/nldbl-abi.h 2006-01-30 09:34:22.000000000 +0100 @@ -0,0 +1,8 @@ +/* ABI version for long double switch. + This is used by the Versions and math_ldbl_opt.h files in + sysdeps/ieee754/ldbl-opt/. It gives the ABI version where + long double == double was replaced with proper long double + for libm *l functions and libc functions using long double. */ + +#define NLDBL_VERSION GLIBC_2.4 +#define LONG_DOUBLE_COMPAT_VERSION GLIBC_2_4 --- libc/sysdeps/s390/s390-32/bits/wordsize.h.jj 2002-10-02 22:52:30.000000000 +0200 +++ libc/sysdeps/s390/s390-32/bits/wordsize.h 2006-01-30 09:34:22.000000000 +0100 @@ -5,3 +5,14 @@ #else # define __WORDSIZE 32 #endif + +#if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL + +/* Signal that we didn't used to have a `long double'. The changes all + the `long double' function variants to be redirects to the double + functions. */ +# define __LONG_DOUBLE_MATH_OPTIONAL 1 +# ifndef __LONG_DOUBLE_128__ +# define __NO_LONG_DOUBLE_MATH 1 +# endif +#endif --- libc/sysdeps/s390/fpu/bits/mathinline.h.jj 2004-09-14 00:33:01.000000000 +0200 +++ libc/sysdeps/s390/fpu/bits/mathinline.h 2006-01-30 09:34:22.000000000 +0100 @@ -47,6 +47,21 @@ __NTH (__signbit (double __x)) return __u.__i < 0; } +# ifndef __NO_LONG_DOUBLE_MATH +__MATH_INLINE int +__NTH (__signbitl (long double __x)) +{ + __extension__ union { long double __l; int __i[4]; } __u = { __l: __x }; + return __u.__i[0] < 0; +} +# else +__MATH_INLINE int +__NTH (__signbitl (long double __x)) +{ + return __signbit ((double) __x); +} +# endif + #endif /* C99 */ /* This code is used internally in the GNU libc. */ @@ -70,6 +85,17 @@ __NTH (__ieee754_sqrtf (float x)) return res; } +# if !defined __NO_LONG_DOUBLE_MATH +__MATH_INLINE long double +sqrtl (long double __x) __THROW +{ + long double res; + + asm ( "sqxbr %0,%1" : "=f" (res) : "f" (x) ); + return res; +} +# endif /* !__NO_LONG_DOUBLE_MATH */ + #endif /* __LIBC_INTERNAL_MATH_INLINES */ #endif /* __NO_MATH_INLINES */ --- libc/sysdeps/s390/fpu/e_sqrtl.c.jj 2006-01-30 09:34:22.000000000 +0100 +++ libc/sysdeps/s390/fpu/e_sqrtl.c 2006-01-30 09:34:22.000000000 +0100 @@ -0,0 +1,29 @@ +/* Copyright (C) 2004 Free Software Foundation, Inc. + Contributed by Martin Schwidefsky (schwidefsky at de.ibm.com). + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include + +long double +__ieee754_sqrtl (long double x) +{ + long double res; + + asm ( "sqxbr %0,%1" : "=f" (res) : "f" (x) ); + return res; +} --- libc/sysdeps/s390/s390-64/bits/wordsize.h.jj 2002-10-02 22:57:48.000000000 +0200 +++ libc/sysdeps/s390/s390-64/bits/wordsize.h 2006-01-30 09:34:22.000000000 +0100 @@ -5,3 +5,14 @@ #else # define __WORDSIZE 32 #endif + +#if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL + +/* Signal that we didn't used to have a `long double'. The changes all + the `long double' function variants to be redirects to the double + functions. */ +# define __LONG_DOUBLE_MATH_OPTIONAL 1 +# ifndef __LONG_DOUBLE_128__ +# define __NO_LONG_DOUBLE_MATH 1 +# endif +#endif --- libc/sysdeps/s390/Implies.jj 2004-07-01 19:48:21.000000000 +0200 +++ libc/sysdeps/s390/Implies 2006-01-30 09:44:20.000000000 +0100 @@ -1,2 +1,3 @@ +ieee754/ldbl-128 ieee754/dbl-64 ieee754/flt-32 Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.212 retrieving revision 1.213 diff -u -r1.212 -r1.213 --- glibc.spec 30 Jan 2006 10:11:25 -0000 1.212 +++ glibc.spec 30 Jan 2006 10:19:55 -0000 1.213 @@ -32,6 +32,9 @@ Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2 Patch0: %{glibcname}-fedora.patch Patch1: %{name}-ia64-lib64.patch +Patch2: glibc-ppc-fpu.patch +Patch3: glibc-ppc-ulps.patch +Patch4: glibc-s390-ldbl.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -241,6 +244,9 @@ %patch1 -p1 %endif %endif +%patch2 -p1 -E +%patch3 -p1 -E +%patch4 -p1 -E # Hack till glibc-kernheaders get updated, argh mkdir -p override_headers/linux From fedora-cvs-commits at redhat.com Mon Jan 30 10:33:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 05:33:53 -0500 Subject: rpms/dovecot/devel sources,1.11,1.12 Message-ID: <200601301033.k0UAXrUm008170@cvs.devel.redhat.com> Author: prockai Update of /cvs/dist/rpms/dovecot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8157 Modified Files: sources Log Message: Remove old tarball from sources. Index: sources =================================================================== RCS file: /cvs/dist/rpms/dovecot/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Jan 2006 13:44:22 -0000 1.11 +++ sources 30 Jan 2006 10:33:46 -0000 1.12 @@ -1,2 +1 @@ -a12e26fd378a46c31ec3a81ab7b55b5b dovecot-0.99.14.tar.gz a68f623b04876815d6522ac9d7bac869 dovecot-1.0.beta2.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 10:49:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 05:49:05 -0500 Subject: rpms/net-snmp/devel net-snmp-5.3-agent-registry-unregister-free.patch, NONE, 1.1 net-snmp-5.3-proc_if_inet6.patch, NONE, 1.1 net-snmp-5.3.0.1-maxsensors.patch, NONE, 1.1 net-snmp.spec, 1.62, 1.63 Message-ID: <200601301049.k0UAn5ox020559@cvs.devel.redhat.com> Author: rvokal Update of /cvs/dist/rpms/net-snmp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20540 Modified Files: net-snmp.spec Added Files: net-snmp-5.3-agent-registry-unregister-free.patch net-snmp-5.3-proc_if_inet6.patch net-snmp-5.3.0.1-maxsensors.patch Log Message: - fix for lm_Senors, the max is no longer a fixed value - parsing fixed for /proc/net/if_inet6 net-snmp-5.3-agent-registry-unregister-free.patch: agent_registry.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE net-snmp-5.3-agent-registry-unregister-free.patch --- Index: agent/agent_registry.c =================================================================== RCS file: /cvsroot/net-snmp/net-snmp/agent/agent_registry.c,v retrieving revision 5.32 diff -u -r5.32 agent_registry.c --- agent/agent_registry.c 17 Nov 2005 22:03:02 -0000 5.32 +++ agent/agent_registry.c 20 Dec 2005 21:21:38 -0000 @@ -1015,7 +1015,6 @@ if (child == NULL) /* Didn't find the given name */ break; } - netsnmp_subtree_free(myptr); memset(®_parms, 0x0, sizeof(reg_parms)); reg_parms.name = name; @@ -1028,6 +1027,7 @@ snmp_call_callbacks(SNMP_CALLBACK_APPLICATION, SNMPD_CALLBACK_UNREGISTER_OID, ®_parms); + netsnmp_subtree_free(myptr); netsnmp_set_lookup_cache_size(old_lookup_cache_val); invalidate_lookup_cache(context); return MIB_UNREGISTERED_OK; net-snmp-5.3-proc_if_inet6.patch: ipaddress_linux.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) --- NEW FILE net-snmp-5.3-proc_if_inet6.patch --- --- net-snmp-5.3/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c.proc_if 2005-10-31 05:27:37.000000000 +0100 +++ net-snmp-5.3/agent/mibgroup/ip-mib/data_access/ipaddress_linux.c 2006-01-30 11:32:21.000000000 +0100 @@ -180,7 +180,7 @@ _load_v6(netsnmp_container *container, int idx_offset) { FILE *in; - char line[80], addr[33], if_name[IFNAMSIZ]; + char line[80], addr[40], if_name[IFNAMSIZ]; u_char *buf; int if_index, pfx_len, scope, flags, rc = 0; size_t in_len, out_len; @@ -219,7 +219,7 @@ * F: flags (see include/linux/rtnetlink.h, net/ipv6/addrconf.c) * I: interface */ - rc = sscanf(line, "%32s %02x %02x %02x %02x %8s\n", + rc = sscanf(line, "%39s %02x %02x %02x %02x %8s\n", addr, &if_index, &pfx_len, &scope, &flags, if_name); if( 6 != rc ) { snmp_log(LOG_ERR, PROCFILE " data format error (%d!=6), line ==|%s|\n", @@ -241,8 +241,9 @@ netsnmp_assert(16 == in_len); out_len = 0; buf = entry->ia_address; - if(1 != snmp_hex_to_binary(&buf, - &in_len, &out_len, 0, addr)) { +/* if(1 != snmp_hex_to_binary(&buf, + &in_len, &out_len, 0, addr)) {*/ + if (1 != netsnmp_hex_to_binary(&buf, &in_len, &out_len, 0, addr, ":")) { snmp_log(LOG_ERR,"error parsing '%s', skipping\n", entry->ia_address); netsnmp_access_ipaddress_entry_free(entry); net-snmp-5.3.0.1-maxsensors.patch: net-snmp-5.3.0.1.patch/agent/mibgroup/ucd-snmp/lmSensors.h | 1 net-snmp-5.3.patch/agent/mibgroup/ucd-snmp/lmSensors.c | 219 ++++++++++--- 2 files changed, 171 insertions(+), 49 deletions(-) --- NEW FILE net-snmp-5.3.0.1-maxsensors.patch --- diff -r -U3 net-snmp-5.3.0.1/agent/mibgroup/ucd-snmp/lmSensors.c net-snmp-5.3.0.1.patch/agent/mibgroup/ucd-snmp/lmSensors.c --- net-snmp-5.3/agent/mibgroup/ucd-snmp/lmSensors.c 2005-02-16 13:48:42.000000000 -0800 +++ net-snmp-5.3.patch/agent/mibgroup/ucd-snmp/lmSensors.c 2006-01-26 14:04:00.674288389 -0800 @@ -86,6 +86,10 @@ #include "lmSensors.h" +#define TEMP_TYPE (0) +#define FAN_TYPE (1) +#define VOLT_TYPE (2) +#define MISC_TYPE (3) #define N_TYPES (4) #ifdef solaris2 @@ -93,7 +97,7 @@ #define MAX_SENSORS (256) /* there's a lot of sensors on a v880 */ #else #define MAX_NAME (64) - #define MAX_SENSORS (128) + #define DEFAULT_SENSORS (256) #endif @@ -173,16 +177,23 @@ typedef struct { int n; +#ifdef solaris2 _sensor sensor[MAX_SENSORS]; +#else + _sensor* sensor; + size_t current_len; +#endif } _sensor_array; static _sensor_array sensor_array[N_TYPES]; -static clock_t timestamp; +static time_t timestamp; static int sensor_init(void); -static void sensor_load(void); -static void _sensor_load(clock_t t); - +static int sensor_load(void); +static int _sensor_load(time_t t); +#ifndef solaris2 +static void free_sensor_arrays(void); +#endif /* * init_lmSensors(): @@ -202,6 +213,20 @@ } /* + * shutdown_lmSensors(): + * A shutdown/cleanup routine. This is called when the agent shutsdown. + */ +void +shutdown_lmSensors(void) +{ + DEBUGMSG(("ucd-snmp/lmSensors", "=> shutdown_lmSensors\n")); +#ifndef solaris2 + free_sensor_arrays(); +#endif + DEBUGMSG(("ucd-snmp/lmSensors", "<= shutdown_lmSensors\n")); +} + +/* * var_lmSensorsTable(): * Handle this table separately from the scalar value case. * The workings of this are basically the same as for var_lmSensors above. @@ -219,38 +244,44 @@ int s_index; int s_type = -1; int n_sensors; + int err = 0; + unsigned char* ret = NULL; _sensor s; - sensor_load(); + if (sensor_load()) + { + ret = NULL; + goto leaving; + } switch (vp->magic) { case LMTEMPSENSORSINDEX: case LMTEMPSENSORSDEVICE: case LMTEMPSENSORSVALUE: - s_type = 0; - n_sensors = sensor_array[0].n; + s_type = TEMP_TYPE; + n_sensors = sensor_array[s_type].n; break; case LMFANSENSORSINDEX: case LMFANSENSORSDEVICE: case LMFANSENSORSVALUE: - s_type = 1; - n_sensors = sensor_array[1].n; + s_type = FAN_TYPE; + n_sensors = sensor_array[s_type].n; break; case LMVOLTSENSORSINDEX: case LMVOLTSENSORSDEVICE: case LMVOLTSENSORSVALUE: - s_type = 2; - n_sensors = sensor_array[2].n; + s_type = VOLT_TYPE; + n_sensors = sensor_array[s_type].n; break; case LMMISCSENSORSINDEX: case LMMISCSENSORSDEVICE: case LMMISCSENSORSVALUE: - s_type = 3; - n_sensors = sensor_array[3].n; + s_type = MISC_TYPE; + n_sensors = sensor_array[s_type].n; break; default: @@ -261,10 +292,16 @@ if (header_simple_table(vp, name, length, exact, var_len, write_method, n_sensors) == MATCH_FAILED) - return NULL; + { + ret = NULL; + goto leaving; + } if (s_type < 0) - return NULL; + { + ret = NULL; + goto leaving; + } s_index = name[*length - 1] - 1; s = sensor_array[s_type].sensor[s_index]; @@ -275,7 +312,8 @@ case LMVOLTSENSORSINDEX: case LMMISCSENSORSINDEX: long_ret = s_index; - return (unsigned char *) &long_ret; + ret = (unsigned char *) &long_ret; + goto leaving; case LMTEMPSENSORSDEVICE: case LMFANSENSORSDEVICE: @@ -283,54 +321,79 @@ case LMMISCSENSORSDEVICE: strncpy(string, s.name, SPRINT_MAX_LEN - 1); *var_len = strlen(string); - return (unsigned char *) string; + ret = (unsigned char *) string; + goto leaving; case LMTEMPSENSORSVALUE: case LMFANSENSORSVALUE: case LMVOLTSENSORSVALUE: case LMMISCSENSORSVALUE: long_ret = s.value; - return (unsigned char *) &long_ret; + ret = (unsigned char *) &long_ret; + goto leaving; default: ERROR_MSG("Unable to handle table request"); } - return NULL; +leaving: + return ret; } static int sensor_init(void) { -#ifndef solaris2 int res; + DEBUGMSG(("ucd-snmp/lmSensors", "=> sensor_init\n")); +#ifndef solaris2 char filename[] = CONFIG_FILE_NAME; - clock_t t = clock(); - FILE *fp = fopen(filename, "r"); + time_t t = time(NULL); + FILE *fp = fopen(filename, "r"); + int i = 0; + DEBUGMSG(("ucd-snmp/lmSensors", "=> sensor_init\n")); + + for (i = 0; i < N_TYPES; i++) + { + sensor_array[i].n = 0; + sensor_array[i].current_len = 0; + sensor_array[i].sensor = NULL; + } + if (!fp) - return 1; + { + res = 1; + goto leaving; + } - if ((res = sensors_init(fp))) - return 2; + if (sensors_init(fp)) + { + res = 2; + goto leaving; + } _sensor_load(t); /* I'll let the linux people decide whether they want to load right away */ #endif - return 0; + +leaving: + DEBUGMSG(("ucd-snmp/lmSensors", "<= sensor_init\n")); + return res; } -static void +static int sensor_load(void) { -#ifdef solaris2 - clock_t t = time(NULL); -#else - clock_t t = clock(); -#endif + int rc = 0; + time_t t = time(NULL); - if (t > timestamp + 6) /* this may require some tuning - currently 6 seconds*/ - _sensor_load(t); + if (t > timestamp + 7) /* this may require some tuning - currently 7 seconds*/ + { +#ifndef solaris2 + free_sensor_arrays(); +#endif + rc = _sensor_load(t); + } - return; + return rc; } /* This next code block includes all kstat and picld code for the Solaris platform. @@ -743,9 +806,8 @@ /* ******** end of picld sensor procedures * */ #endif /* solaris2 */ - -static void -_sensor_load(clock_t t) +static int +_sensor_load(time_t t) { #ifdef solaris2 int i,j; @@ -758,6 +820,7 @@ envctrl_fan_t *fan_info; envctrl_ps_t *power_info; envctrl_encl_t *enc_info; + int rc = 0; #ifdef HAVE_PICL_H int er_code; @@ -943,19 +1006,34 @@ #endif } /* end else kstat */ -#else /* end solaris2 */ +#else /* end solaris2 only */ const sensors_chip_name *chip; const sensors_feature_data *data; int chip_nr = 0; + int rc = 0; + unsigned int i = 0; - int i; for (i = 0; i < N_TYPES; i++) + { sensor_array[i].n = 0; + sensor_array[i].current_len = 0; + + /* Malloc the default number of sensors. */ + sensor_array[i].sensor = (_sensor*)malloc(sizeof(_sensor) * DEFAULT_SENSORS); + if (sensor_array[i].sensor == NULL) + { + /* Continuing would be unsafe */ + snmp_log(LOG_ERR, "Cannot malloc sensor array!"); + return (rc = 1); + } + sensor_array[i].current_len = DEFAULT_SENSORS; + } while ((chip = sensors_get_detected_chips(&chip_nr))) { int a = 0; int b = 0; + while ((data = sensors_get_all_features(*chip, &a, &b))) { char *label = NULL; double val; @@ -968,28 +1046,49 @@ float mul; _sensor_array *array; + /* The label, as determined for a given chip in sensors.conf, + * is used to place each sensor in the appropriate bucket. + * Volt, Fan, Temp, and Misc. If the text being looked for below + * is not in the label of a given sensor (e.g., the temp1 sensor + * has been labeled 'CPU' and not 'CPU temp') it will end up being + * lumped in the MISC bucket. */ if (strstr(label, "V")) { - type = 2; + type = VOLT_TYPE; mul = 1000.0; } if (strstr(label, "fan") || strstr(label, "Fan")) { - type = 1; + type = FAN_TYPE; mul = 1.0; } if (strstr(label, "temp") || strstr(label, "Temp")) { - type = 0; + type = TEMP_TYPE; mul = 1000.0; } if (type == -1) { - type = 3; + type = MISC_TYPE; mul = 1000.0; } array = &sensor_array[type]; - if (MAX_SENSORS <= array->n) { - snmp_log(LOG_ERR, "too many sensors. ignoring %s\n", label); - break; + if ( array->current_len <= array->n) { + _sensor* old_buffer = array->sensor; + size_t new_size = (sizeof(_sensor) * array->current_len) + (sizeof(_sensor) * DEFAULT_SENSORS); + array->sensor = (_sensor*)realloc(array->sensor, new_size); + if (array->sensor == NULL) + { + /* Continuing would be unsafe */ + snmp_log(LOG_ERR, "too many sensors to fit, and failed to alloc more, failing on %s\n", label); + free(old_buffer); + old_buffer = NULL; + if (label) { + free(label); + label = NULL; + } + return (rc=1); + } + array->current_len = new_size / sizeof(_sensor); + DEBUGMSG(("ucd-snmp/lmSensors", "type #%d increased to %d elements\n", type, array->current_len)); } strncpy(array->sensor[array->n].name, label, MAX_NAME); array->sensor[array->n].value = (int) (val * mul); @@ -1004,7 +1103,29 @@ } } } -#endif /*else solaris2 */ +#endif + /* Update the timestamp after a load. */ timestamp = t; + return rc; } +#ifndef solaris2 +/* Free all the sensor arrays. */ +static void +free_sensor_arrays() +{ + unsigned int i = 0; + DEBUGMSG(("ucd-snmp/lmSensors", "=> free_sensor_arrays\n")); + for (i = 0; i < N_TYPES; i++){ + if (sensor_array[i].sensor != NULL) + { + free(sensor_array[i].sensor); + sensor_array[i].sensor = NULL; + } + /* For good measure, reset the other values. */ + sensor_array[i].n = 0; + sensor_array[i].current_len = 0; + } + DEBUGMSG(("ucd-snmp/lmSensors", "<= free_sensor_arrays\n")); +} +#endif diff -r -U3 net-snmp-5.3.0.1/agent/mibgroup/ucd-snmp/lmSensors.h net-snmp-5.3.0.1.patch/agent/mibgroup/ucd-snmp/lmSensors.h --- net-snmp-5.3.0.1/agent/mibgroup/ucd-snmp/lmSensors.h 2003-04-02 06:31:47.000000000 -0800 +++ net-snmp-5.3.0.1.patch/agent/mibgroup/ucd-snmp/lmSensors.h 2006-01-26 12:21:39.000000000 -0800 @@ -10,6 +10,7 @@ config_add_mib(LM-SENSORS-MIB) void init_lmSensors(void); + void shutdown_lmSensors(void); FindVarMethod var_lmSensorsTable; #endif /* _MIBGROUP_LMSENSORS_H */ Index: net-snmp.spec =================================================================== RCS file: /cvs/dist/rpms/net-snmp/devel/net-snmp.spec,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- net-snmp.spec 18 Jan 2006 09:06:56 -0000 1.62 +++ net-snmp.spec 30 Jan 2006 10:49:03 -0000 1.63 @@ -3,7 +3,7 @@ Summary: A collection of SNMP protocol tools and libraries. Name: net-snmp Version: 5.3 -Release: 2 +Release: 3 License: BSDish Group: System Environment/Daemons URL: http://net-snmp.sourceforge.net/ @@ -26,6 +26,9 @@ Patch12: net-snmp-5.1.2-dir-fix.patch Patch19: net-snmp-5.2.1-file_offset.patch Patch20: net-snmp-5.3-5.3.0.1.patch +Patch21: net-snmp-5.3.0.1-maxsensors.patch +Patch22: net-snmp-5.3-agent-registry-unregister-free.patch +Patch23: net-snmp-5.3-proc_if_inet6.patch Prereq: /sbin/chkconfig Obsoletes: ucd-snmp @@ -126,6 +129,9 @@ %patch12 -p1 -b .dir-fix %patch19 -p1 -b .file_offset %patch20 -p1 -b .5.3.0.1 +%patch21 -p1 -b .maxsensors +%patch22 -p0 +%patch23 -p1 -b .proc_if # Do this patch with a perl hack... perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh @@ -309,6 +315,10 @@ %{_libdir}/*.a %changelog +* Mon Jan 30 2006 Radek Vok??l 5.3-3 +- fix for lm_Senors, the max is no longer a fixed value +- parsing fixed for /proc/net/if_inet6 + * Wed Jan 18 2006 Radek Vokal 5.3-2 - Security fix. Bug granting write access to read-only users or communities which were configured using the "rocommunity" From fedora-cvs-commits at redhat.com Mon Jan 30 11:10:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 06:10:54 -0500 Subject: rpms/kdebase/FC-4 kdebase-3.3.0-altf2.patch,1.1,NONE Message-ID: <200601301110.k0UBAsYD001259@cvs.devel.redhat.com> Author: than Update of /cvs/dist/rpms/kdebase/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv984 Removed Files: kdebase-3.3.0-altf2.patch Log Message: remove unneeded kdebase-3.3.0-altf2.patch, which is included in upstream --- kdebase-3.3.0-altf2.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 30 11:39:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 06:39:54 -0500 Subject: rpms/glibc/devel glibc-ldbl-include.patch, NONE, 1.1 glibc.spec, 1.213, 1.214 Message-ID: <200601301139.k0UBdsLv024992@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/glibc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24926 Modified Files: glibc.spec Added Files: glibc-ldbl-include.patch Log Message: 2.3.90-31 glibc-ldbl-include.patch: stdlib-ldbl.h | 1 + wchar-ldbl.h | 1 + 2 files changed, 2 insertions(+) --- NEW FILE glibc-ldbl-include.patch --- 2006-01-30 Jakub Jelinek * include/bits/stdlib-ldbl.h: New file. * include/bits/wchar-ldbl.h: New file. --- libc/include/bits/wchar-ldbl.h.jj 2006-01-30 12:26:46.000000000 +0100 +++ libc/include/bits/wchar-ldbl.h 2006-01-30 12:27:05.000000000 +0100 @@ -0,0 +1 @@ +#include --- libc/include/bits/stdlib-ldbl.h.jj 2006-01-30 12:26:46.000000000 +0100 +++ libc/include/bits/stdlib-ldbl.h 2006-01-30 12:26:39.000000000 +0100 @@ -0,0 +1 @@ +#include Index: glibc.spec =================================================================== RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- glibc.spec 30 Jan 2006 10:19:55 -0000 1.213 +++ glibc.spec 30 Jan 2006 11:39:52 -0000 1.214 @@ -35,6 +35,7 @@ Patch2: glibc-ppc-fpu.patch Patch3: glibc-ppc-ulps.patch Patch4: glibc-s390-ldbl.patch +Patch5: glibc-ldbl-include.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -247,6 +248,7 @@ %patch2 -p1 -E %patch3 -p1 -E %patch4 -p1 -E +%patch5 -p1 -E # Hack till glibc-kernheaders get updated, argh mkdir -p override_headers/linux From fedora-cvs-commits at redhat.com Mon Jan 30 12:12:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 07:12:37 -0500 Subject: rpms/system-config-soundcard/FC-4 system-config-soundcard-1.2.14-kudzu-log.patch, NONE, 1.1 system-config-soundcard-1.2.14-text.patch, NONE, 1.1 system-config-soundcard.spec, 1.18, 1.19 Message-ID: <200601301212.k0UCCbXO016887@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16857 Modified Files: system-config-soundcard.spec Added Files: system-config-soundcard-1.2.14-kudzu-log.patch system-config-soundcard-1.2.14-text.patch Log Message: added log for kudzu and text clean-up system-config-soundcard-1.2.14-kudzu-log.patch: soundcardBackend.py | 5 +++++ 1 files changed, 5 insertions(+) --- NEW FILE system-config-soundcard-1.2.14-kudzu-log.patch --- --- system-config-soundcard-1.2.14/src/soundcardBackend.py.old 2006-01-30 10:29:42.000000000 +0100 +++ system-config-soundcard-1.2.14/src/soundcardBackend.py 2006-01-30 10:27:26.000000000 +0100 @@ -127,6 +127,11 @@ list = kudzu.probe(kudzu.CLASS_AUDIO, kudzu.BUS_PCI | kudzu.BUS_MACIO, kudzu.PROBE_ALL) + print "----------- Kudzu -------------" + for card in list: + print card + print "----------- **** -------------" + for card in list: #Let's go through the list of cards. If the driver is 'unknown', #don't put the card in the list. system-config-soundcard-1.2.14-text.patch: soundcard.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE system-config-soundcard-1.2.14-text.patch --- --- system-config-soundcard-1.2.14/src/soundcard.py.old 2006-01-18 12:52:41.000000000 +0100 +++ system-config-soundcard-1.2.14/src/soundcard.py 2006-01-18 12:52:27.000000000 +0100 @@ -182,7 +182,7 @@ deviceTopBox.pack_start(deviceBox) #Create a check-box for hw/sw config - button = gtk.CheckButton(_("Use only the hardware device")) + button = gtk.CheckButton(_("Disable software mixing (dmix, dsnoop)")) button.set_active(self.soundcardBackend.getHardwareDevice()) button.connect("toggled", self.changeHW) button.show() @@ -190,7 +190,7 @@ deviceTopBox.pack_start(button) #Create a check-box for key config - button = gtk.CheckButton(_("Dynamic keys for dmix and dsnoop")) + button = gtk.CheckButton(_("Dynamic keys for software mixer (more secure)")) button.set_active(self.soundcardBackend.getDynamicKeys()) button.connect("toggled", self.changeDynKeys) button.show() Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/FC-4/system-config-soundcard.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- system-config-soundcard.spec 24 Jan 2006 10:32:24 -0000 1.18 +++ system-config-soundcard.spec 30 Jan 2006 12:12:34 -0000 1.19 @@ -11,6 +11,8 @@ Source0: %{name}-%{version}.tar.bz2 Patch0: system-config-soundcard-1.2.12-mod.patch Patch1: system-config-soundcard-1.2.12-update.patch +Patch2: system-config-soundcard-1.2.14-text.patch +Patch3: system-config-soundcard-1.2.14-kudzu-log.patch BuildRequires: desktop-file-utils BuildRequires: gettext ExcludeArch: s390 s390x @@ -32,6 +34,8 @@ %setup -q %patch -p1 -b .mod %patch1 -p1 -b .update +%patch2 -p1 +%patch3 -p1 %build make @@ -79,6 +83,9 @@ %attr(0644,root,root) %config /etc/pam.d/system-config-soundcard %changelog +* Mon Jan 30 2006 Martin Stransky 1.2.12-5.FC4 +- added log for kudzu and text clean-up + * Tue Jan 24 2006 Martin Stransky 1.2.12-4.FC4 - backported fixes from devel branch (1.2.14) - added dependency on alsa-utils-1.0.10 From fedora-cvs-commits at redhat.com Mon Jan 30 12:13:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 07:13:25 -0500 Subject: rpms/system-config-soundcard/FC-4 system-config-soundcard.spec, 1.19, 1.20 Message-ID: <200601301213.k0UCDPok017311@cvs.devel.redhat.com> Author: stransky Update of /cvs/dist/rpms/system-config-soundcard/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv17280 Modified Files: system-config-soundcard.spec Log Message: release up Index: system-config-soundcard.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-soundcard/FC-4/system-config-soundcard.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- system-config-soundcard.spec 30 Jan 2006 12:12:34 -0000 1.19 +++ system-config-soundcard.spec 30 Jan 2006 12:13:21 -0000 1.20 @@ -1,7 +1,7 @@ Summary: A graphical interface for detecting and configuring soundcards Name: system-config-soundcard Version: 1.2.12 -Release: 4.FC4 +Release: 5.FC4 URL: http://fedora.redhat.com/projects/config-tools/redhat-config-soundcard.html License: GPL ExclusiveOS: Linux From fedora-cvs-commits at redhat.com Mon Jan 30 12:39:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 07:39:19 -0500 Subject: rpms/system-config-date/devel .cvsignore, 1.38, 1.39 sources, 1.41, 1.42 system-config-date.spec, 1.46, 1.47 Message-ID: <200601301239.k0UCdJcq026667@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-date/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26652 Modified Files: .cvsignore sources system-config-date.spec Log Message: bump minor version add requirements for pygtk2-libglade, gnome-python2-canvas (#179215) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- .cvsignore 20 Jan 2006 11:40:10 -0000 1.38 +++ .cvsignore 30 Jan 2006 12:39:17 -0000 1.39 @@ -1 +1 @@ -system-config-date-1.7.99.17.tar.bz2 +system-config-date-1.8.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 20 Jan 2006 11:40:10 -0000 1.41 +++ sources 30 Jan 2006 12:39:17 -0000 1.42 @@ -1 +1 @@ -8f9ba9d468cb648cd3e29aaed97d8957 system-config-date-1.7.99.17.tar.bz2 +4719629449303b2b8312328b97001d1d system-config-date-1.8.0.tar.bz2 Index: system-config-date.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- system-config-date.spec 20 Jan 2006 11:40:10 -0000 1.46 +++ system-config-date.spec 30 Jan 2006 12:39:17 -0000 1.47 @@ -1,6 +1,6 @@ Summary: A graphical interface for modifying system date and time Name: system-config-date -Version: 1.7.99.17 +Version: 1.8.0 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -19,6 +19,8 @@ BuildRequires: python Requires: ntp Requires: python2 +Requires: pygtk2-libglade +Requires: gnome-python2-canvas Requires: usermode >= 1.36 Requires: chkconfig Requires: rhpl @@ -93,6 +95,10 @@ %attr(0644,root,root) %config(noreplace) /usr/share/system-config-date/ntp.template %changelog +* Mon Jan 30 2006 Nils Philippsen 1.8.0 +- bump minor version +- add requirements for pygtk2-libglade, gnome-python2-canvas (#179215) + * Fri Jan 20 2006 Nils Philippsen 1.7.99.17 - zoom out in TZ map on Escape (#178093) From fedora-cvs-commits at redhat.com Mon Jan 30 14:07:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 09:07:31 -0500 Subject: rpms/ImageMagick/devel ImageMagick.spec,1.51,1.52 Message-ID: <200601301407.k0UE7VZd000962@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/ImageMagick/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv861 Modified Files: ImageMagick.spec Log Message: Make -devel require lcms-devel Index: ImageMagick.spec =================================================================== RCS file: /cvs/dist/rpms/ImageMagick/devel/ImageMagick.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- ImageMagick.spec 23 Jan 2006 16:37:36 -0000 1.51 +++ ImageMagick.spec 30 Jan 2006 14:07:28 -0000 1.52 @@ -9,7 +9,7 @@ %else Version: %{VER} %endif -Release: 3 +Release: 4 License: freeware Group: Applications/Multimedia %if "%{Patchlevel}" != "" @@ -55,6 +55,7 @@ Requires: bzip2-devel Requires: libtiff-devel Requires: libjpeg-devel +Requires: lcms-devel Requires: pkgconfig %description devel @@ -224,6 +225,9 @@ %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Mon Jan 30 2006 Matthias Clasen 6.2.5.4-4 +- Make -devel require lcms-devel (#179200) + * Mon Jan 23 2006 Matthias Clasen 6.2.5.4-3 - Fix linking of DSOs. (#176695) From fedora-cvs-commits at redhat.com Mon Jan 30 15:01:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 10:01:23 -0500 Subject: rpms/openoffice.org/devel openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch, 1.2, 1.3 openoffice.org.spec, 1.611, 1.612 Message-ID: <200601301501.k0UF1Nb2003044@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3007 Modified Files: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch openoffice.org.spec Log Message: rh#179256# re-detect java with original selection dissappears openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch: distributions/OpenOfficeorg/javavendors_linux.xml | 0 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 8 ++++---- source/javavm/javavm.cxx | 0 stoc/source/javavm/javavm.cxx | 3 +++ 4 files changed, 7 insertions(+), 4 deletions(-) Index: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch 7 Nov 2005 12:18:22 -0000 1.2 +++ openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch 30 Jan 2006 15:01:18 -0000 1.3 @@ -36,3 +36,34 @@ sunjavaplugin.so +Index: source/javavm/javavm.cxx +=================================================================== +RCS file: /cvs/udk/stoc/source/javavm/javavm.cxx,v +retrieving revision 1.72 +diff -u -p -u -r1.72 javavm.cxx +--- openoffice.org.orig/stoc/source/javavm/javavm.cxx 3 Jan 2006 12:44:05 -0000 1.72 ++++ openoffice.org/stoc/source/javavm/javavm.cxx 30 Jan 2006 10:12:21 -0000 +@@ -868,6 +868,7 @@ JavaVirtualMachine::getJavaVM(css::uno:: + { + case JFW_E_NONE: bStarted = true; break; + case JFW_E_NO_SELECT: ++ case JFW_E_VM_CREATION_FAILED: + { + // No Java configured. We silenty run the java configuration + // Java. +@@ -934,6 +935,7 @@ JavaVirtualMachine::getJavaVM(css::uno:: + continue; + break; + } ++#if 0 + case JFW_E_VM_CREATION_FAILED: + { + //Error: +@@ -950,6 +952,7 @@ JavaVirtualMachine::getJavaVM(css::uno:: + askForRetry(css::uno::makeAny(exc)); + return css::uno::Any(); + } ++#endif + case JFW_E_RUNNING_JVM: + { + //This service should make sure that we do not start java twice. Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.611 retrieving revision 1.612 diff -u -r1.611 -r1.612 --- openoffice.org.spec 27 Jan 2006 17:14:03 -0000 1.611 +++ openoffice.org.spec 30 Jan 2006 15:01:18 -0000 1.612 @@ -3380,11 +3380,12 @@ * Fri Jan 27 2006 Caolan McNamara - 1:2.0.1.1-9 - add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for future neon 0.25.X - missing %defattr(-,root,root) +- rh#179256# if java fails (i.e. was configured to use libgcj.so.6) reconfigure + to pick up libgcj.so.7 + * Thu Jan 26 2006 Caolan McNamara - 1:2.0.1.1-8 - rh#178971# defer exec mem until bridge code -- add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for future neon 0.25.X -- missing %defattr(-,root,root) * Tue Jan 17 2006 Caolan McNamara - 1:2.0.1.1-7 - rh#177933# add Serbian sr_CS language pack From fedora-cvs-commits at redhat.com Mon Jan 30 15:46:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 10:46:50 -0500 Subject: rpms/frysk/FC-4 fontconfig-2.3.93-globaldir.patch, NONE, 1.1 fontconfig-2.3.93-normalize.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 antlr.patch, 1.2, 1.3 frysk.spec, 1.3, 1.4 sources, 1.1, 1.2 update.sh, 1.2, 1.3 Message-ID: <200601301546.k0UFkoF3011575@cvs.devel.redhat.com> Author: cagney Update of /cvs/dist/rpms/frysk/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv31023 Modified Files: .cvsignore antlr.patch frysk.spec sources update.sh Added Files: fontconfig-2.3.93-globaldir.patch fontconfig-2.3.93-normalize.patch Log Message: * Sat Jan 28 2006 Andrew Cagney 0.0.1.2006.01.28-0.EL4.2 - Check for previous definitions of frysk_gcc_prefix, and frysk_gcc_suffix to allow overriding from ~/.rpmmacros. * Sat Jan 28 2006 Andrew Cagney 0.0.1.2006.01.28-0.EL4.1 - Import frysk 0.0.1.2006.01.28; includes some 32/64 bit fixes. - Backport glib2 2.9.5, gtk 2 2.8.11, and fontconfig 2.3.93.cvs20060124. fontconfig-2.3.93-globaldir.patch: fccache.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE fontconfig-2.3.93-globaldir.patch --- --- fontconfig-2.3.93/src/fccache.c.globaldir 2006-01-11 16:32:09.000000000 +0100 +++ fontconfig-2.3.93/src/fccache.c 2006-01-11 16:32:57.000000000 +0100 @@ -309,7 +309,7 @@ if (strncmp (d->name, dir, strlen(dir)) == 0) { lseek (cache->fd, d->offset, SEEK_SET); - if (!FcDirCacheConsume (cache->fd, dir, set, config)) + if (!FcDirCacheConsume (cache->fd, d->name, set, config)) return FcFalse; if (strcmp (d->name, dir) == 0) ret = FcTrue; fontconfig-2.3.93-normalize.patch: fc-cache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE fontconfig-2.3.93-normalize.patch --- --- fontconfig-2.3.93.20060110.orig/fc-cache/fc-cache.c 2006-01-11 13:23:52.000000000 +0100 +++ fontconfig-2.3.93.20060110/fc-cache/fc-cache.c 2006-01-12 12:47:54.000000000 +0100 @@ -122,7 +122,7 @@ * Now scan all of the directories into separate databases * and write out the results */ - while ((dir = FcStrListNext (list))) + while ((dir = FcConfigNormalizeFontDir(config, FcStrListNext (list)))) { if (verbose) { @@ -275,7 +275,7 @@ if (systemOnly) FcConfigEnableHome (FcFalse); - config = FcInitLoadConfig (); + config = FcInitLoadConfigAndFonts (); if (!config) { fprintf (stderr, "%s: Can't init font config library\n", argv[0]); Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/frysk/FC-4/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Jan 2006 00:33:58 -0000 1.1 +++ .cvsignore 30 Jan 2006 15:46:46 -0000 1.2 @@ -1,17 +1,16 @@ -glib-2.9.4.tar.bz2 +glib-2.9.5.tar.bz2 glib-java-0.2.2.tar.gz -fontconfig-2.3.93.tar.gz +fontconfig-2.3.93.cvs20060124.tar.gz cairo-1.0.2.tar.gz cairo-java-1.0.2.tar.gz pango-1.11.2.tar.bz2 update-scripts.tar.gz -gtk+-2.8.10.tar.bz2 +gtk+-2.8.11.tar.bz2 atk-1.11.2.tar.bz2 libgtk-java-2.8.2.tar.gz libglade-2.5.1.tar.bz2 libglade-java-2.12.1.tar.gz libvte-java-0.11.11.tar.gz -frysk-0.0.1.2006.01.13.tar.bz2 +frysk-0.0.1.2006.01.28.tar.bz2 antlr-2.7.5.tar.gz jdom-1.0.tar.gz -frysk-0.0.1.2006.01.22.tar.bz2 antlr.patch: .cvsignore | 1 ChangeLog | 40 + Makefile.in | 22 - antlr/Makefile.in | 7 configure | 28 - configure.in | 28 - scripts/config.guess | 1120 +++++++++++++++++++++++++++------------------------ scripts/config.sub | 498 ++++++++++++++++------ scripts/cpp.sh.in | 4 scripts/cxx.sh.in | 4 scripts/jar.sh.in | 4 scripts/javac.sh.in | 4 scripts/lib.sh.in | 6 scripts/link.sh.in | 4 14 files changed, 1079 insertions(+), 691 deletions(-) Index: antlr.patch =================================================================== RCS file: /cvs/dist/rpms/frysk/FC-4/antlr.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- antlr.patch 27 Jan 2006 21:10:44 -0000 1.2 +++ antlr.patch 30 Jan 2006 15:46:46 -0000 1.3 @@ -1,12 +1,12 @@ Index: frysk-imports/antlr/.cvsignore diff -u /dev/null frysk-imports/antlr/.cvsignore:1.1 ---- /dev/null Mon Jan 23 17:26:35 2006 +--- /dev/null Mon Jan 23 17:26:35 2006 +++ frysk-imports/antlr/.cvsignore Sat Nov 26 14:17:25 2005 @@ -0,0 +1 @@ +autom4te.cache Index: frysk-imports/antlr/ChangeLog diff -u /dev/null frysk-imports/antlr/ChangeLog:1.7 ---- /dev/null Mon Jan 23 17:26:35 2006 +--- /dev/null Mon Jan 23 17:26:35 2006 +++ frysk-imports/antlr/ChangeLog Fri Jan 27 04:46:36 2006 @@ -0,0 +1,40 @@ +2006-01-26 Andrew Cagney Index: frysk.spec =================================================================== RCS file: /cvs/dist/rpms/frysk/FC-4/frysk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- frysk.spec 28 Jan 2006 03:22:19 -0000 1.3 +++ frysk.spec 30 Jan 2006 15:46:46 -0000 1.4 @@ -1,9 +1,12 @@ # Path to the directory that contains the GCC tools used to build # frysk; and any version suffix. If you're using a custom compiler -# modify this. +# enable and then modify this: -%define frysk_gcc_prefix /usr/bin/ -%define frysk_gcc_suffix %{nil} +#define frysk_gcc_prefix /usr/bin/ +#define frysk_gcc_suffix 4 + +%define gcc_prefix %{?frysk_gcc_prefix:%{frysk_gcc_prefix}}%{!?frysk_gcc_prefix:/usr/bin} +%define gcc_suffix %{?frysk_gcc_suffix:%{frysk_gcc_suffix}}%{!?frysk_gcc_suffix:4} # Sometimes just the libraries are wanted; sometimes not everything # builds. Provide fine grained control. @@ -36,9 +39,9 @@ Summary: Frysk execution analysis tool Name: frysk -Version: 0.0.1.2006.01.22 -Release: 0.FC4.9 -License: GPL + EXPLICIT EXCEPTION +Version: 0.0.1.2006.01.28 +Release: 0.FC4.2 +License: GPL Group: Development/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://sourceware.org/frysk @@ -65,16 +68,19 @@ # frysk local: frysk-2022: allow overriding of datadir (containing .jars) Patch499: cairo-java-pkg-dir.patch -%define fontconfig_version 2.3.93 +%define fontconfig_version 2.3.93.cvs20060124 %define fontconfig fontconfig-%{fontconfig_version} Source500: %{fontconfig}.tar.gz # see -install Source501: 40-blacklist-fonts.conf Source502: 50-no-hint-fonts.conf -Patch501: fontconfig-2.3.93-defaultconfig.patch -Patch502: fontconfig-2.3.91-crosscheck.patch +Patch501: fontconfig-2.3.93-defaultconfig.patch +# fix globar dir handling (Mike Fabian) +Patch502: fontconfig-2.3.93-globaldir.patch +# normalize path in fc-cache (Mike Fabian) +Patch504: fontconfig-2.3.93-normalize.patch -%define glib2_version 2.9.4 +%define glib2_version 2.9.5 %define glib2 glib-%{glib2_version} Source600: %{glib2}.tar.bz2 Source602: glib2.sh @@ -88,15 +94,15 @@ # frysk local: frysk-2022: allow overriding of datadir (containing .jars) Patch799: glib-java-pkg-dir.patch -%define gtk2_version 2.8.10 +%define gtk2_version 2.8.11 %define gtk2 gtk+-%{gtk2_version} Source800: %{gtk2}.tar.bz2 # Biarch changes Patch800: gtk+-2.4.1-lib64.patch # Backported from 2.10 Patch801: gtk+-2.8.6-inputmethod.patch -Patch802: gtk+-2.8.10-abicheck.patch Patch803: gtk+-2.8.10-set-invisible-char-to-bullet.patch + # frysk local: just assume glib and pango Patch890: gtk+-skip-glib-check.patch Patch891: gtk+-skip-pango-check.patch @@ -186,8 +192,8 @@ BuildRequires: vte-devel libgnomeui-devel libgnomecanvas Requires: vte -# Limit build to i386 ... -ExclusiveArch: %{ix86} +# Limit build to platforms that build: i386 ... +ExclusiveArch: %{ix86} x86_64 ppc64 %description Frysk is an execution-analysis technology implemented using native Java and C++. @@ -225,6 +231,7 @@ %setup -n %{fontconfig} -q -T -b500 %patch501 -p1 -b .defaultconfig %patch502 -p1 -b .crosscheck +%patch504 -p1 -b .normalize %setup -n %{atk} -q -T -b200 @@ -246,7 +253,6 @@ %setup -n %{gtk2} -q -T -b800 %patch800 -p1 -b .lib64 %patch801 -p1 -b .inputmethod -%patch802 -p1 -b .abicheck %patch803 -p1 -b .set-invisible-char-to-bullet # %patch890 -p2 -b .skip-glib-check %patch891 -p0 -b .skip-pango-check @@ -356,8 +362,8 @@ EXPORT () { - local p=%{frysk_gcc_prefix} - local s=%{frysk_gcc_suffix} + local p=%{gcc_prefix} + local s=%{gcc_suffix} %ifarch ppc64 local c=" -mminimal-toc -m64" %else @@ -941,6 +947,14 @@ %endif %changelog +* Sat Jan 28 2006 Andrew Cagney 0.0.1.2006.01.28-0.EL4.2 +- Check for previous definitions of frysk_gcc_prefix, and + frysk_gcc_suffix to allow overriding from ~/.rpmmacros. + +* Sat Jan 28 2006 Andrew Cagney 0.0.1.2006.01.28-0.EL4.1 +- Import frysk 0.0.1.2006.01.28; includes some 32/64 bit fixes. +- Backport glib2 2.9.5, gtk 2 2.8.11, and fontconfig 2.3.93.cvs20060124. + * Fri Jan 27 2006 Andrew Cagney 0.0.1.2006.01.22-0.EL4.9 - For pango and gtk, store the config file in a path containing _host but canonicalized using config.sub. Index: sources =================================================================== RCS file: /cvs/dist/rpms/frysk/FC-4/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Jan 2006 00:33:58 -0000 1.1 +++ sources 30 Jan 2006 15:46:46 -0000 1.2 @@ -1,16 +1,16 @@ -467d473c2fd43e124bcab02b6548c135 glib-2.9.4.tar.bz2 +d92467e6a644341d704a5d0e3af8c06f glib-2.9.5.tar.bz2 46052b2c2aed6698275c54b7bd51cb38 glib-java-0.2.2.tar.gz -0d80f23213a9ca0ea60dc4879efffec3 fontconfig-2.3.93.tar.gz +b365d99c503ed19dbe2019f3df90945d fontconfig-2.3.93.cvs20060124.tar.gz d0b7111a14f90ec3afa777ec40c44984 cairo-1.0.2.tar.gz cc2c90fec19cdcafd177463e85595120 cairo-java-1.0.2.tar.gz 3e1a72b0324a03f8710b9cd13f98c81f pango-1.11.2.tar.bz2 d8c012f67a8f23fa9aa495fca5331784 update-scripts.tar.gz -c2c0318d4dcd64315486850907b8e78d gtk+-2.8.10.tar.bz2 +921ba85da341e52f0994f8fb569f1c61 gtk+-2.8.11.tar.bz2 fd1f2349ece8a63257c7ffedfa6316af atk-1.11.2.tar.bz2 76e5048d11a71060a7cc08df8ef7018e libgtk-java-2.8.2.tar.gz e4734a59f1f2308d7714dc0ebf8163f1 libglade-2.5.1.tar.bz2 44a223d1c6d66f15288360bbd2ed0c22 libglade-java-2.12.1.tar.gz a81b9d7ca9a5dfbcbbb7524ca900cf69 libvte-java-0.11.11.tar.gz +33147ede6bf8335e69471077442f6723 frysk-0.0.1.2006.01.28.tar.bz2 1ef201f29283179c8e5ab618529cac78 antlr-2.7.5.tar.gz ce29ecc05d63fdb419737fd00c04c281 jdom-1.0.tar.gz -958178e1427c8fdde93a891e7fc1e526 frysk-0.0.1.2006.01.22.tar.bz2 Index: update.sh =================================================================== RCS file: /cvs/dist/rpms/frysk/FC-4/update.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- update.sh 28 Jan 2006 03:22:19 -0000 1.2 +++ update.sh 30 Jan 2006 15:46:46 -0000 1.3 @@ -23,4 +23,4 @@ sed < ../RHEL-4/frysk.spec > frysk.spec \ -e 's,^\(Release:.*\).EL4.\(.*\)$,\1.FC4.\2,' \ - -e 's,^\(%define frysk_gcc_suffix\).*,\1 %{nil},' + -e 's,^# *\(define frysk_gcc_suffix\).*,%\1 %{nil},' From fedora-cvs-commits at redhat.com Mon Jan 30 15:48:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 10:48:03 -0500 Subject: rpms/php-pear/devel php-pear-1.4.5-template-fixes.patch, 1.1, 1.2 php-pear-1.4.5-template-postun.patch, 1.1, 1.2 php-pear.spec, 1.7, 1.8 sources, 1.3, 1.4 Message-ID: <200601301548.k0UFm3wJ012207@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php-pear/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12179 Modified Files: php-pear-1.4.5-template-fixes.patch php-pear-1.4.5-template-postun.patch php-pear.spec sources Log Message: * Mon Jan 30 2006 Joe Orton 1:1.4.6-1 - update to 1.4.6 - require php >= 5.1.0 (#178821) php-pear-1.4.5-template-fixes.patch: template.spec | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) Index: php-pear-1.4.5-template-fixes.patch =================================================================== RCS file: /cvs/dist/rpms/php-pear/devel/php-pear-1.4.5-template-fixes.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pear-1.4.5-template-fixes.patch 13 Jan 2006 11:26:56 -0000 1.1 +++ php-pear-1.4.5-template-fixes.patch 30 Jan 2006 15:47:59 -0000 1.2 @@ -1,29 +1,13 @@ -This patch rolls up: - -- php-pear-1.4.5-rh-namingconvs.patch -- php-pear-1.4.5-template-docfix.patch - ---- template.spec 2005-12-30 10:52:57.000000000 +0000 -+++ template.spec 2005-12-30 10:58:49.000000000 +0000 +--- template.spec.146 2006-01-13 13:22:05.000000000 +0000 ++++ template.spec 2006-01-13 13:29:35.000000000 +0000 @@ -1,3 +1,5 @@ -+%define peardir %{_datadir}/pear ++%define peardir %(pear config-get php_dir 2> /dev/null || echo %{_datadir}/pear) + Summary: PEAR: @summary@ Name: @rpm_package@ Version: @version@ -@@ -8,7 +10,6 @@ - BuildRoot: %{_tmppath}/%{name}-root - URL: http://@master_server@/package/@package@ - Prefix: %{_prefix} --#Docdir: @doc_dir@/@package@ - BuildArchitectures: @arch@ - @extra_headers@ - -@@ -17,13 +18,14 @@ - - %prep - rm -rf %{buildroot}/* -+%setup -c -T +@@ -19,11 +21,11 @@ + %setup -c -T # XXX Source files location is missing here in pear cmd pear -v -c %{buildroot}/pearrc \ - -d php_dir=%{_libdir}/php/pear \ @@ -37,25 +21,16 @@ -d ext_dir=%{_libdir} \@extra_config@ -s -@@ -50,14 +52,15 @@ +@@ -50,9 +52,9 @@ pear -c %{buildroot}/pearrc install --nodeps -R %{buildroot} \ $RPM_SOURCE_DIR/@package at -%{version}.tgz rm %{buildroot}/pearrc -rm %{buildroot}/%{_libdir}/php/pear/.filemap -rm %{buildroot}/%{_libdir}/php/pear/.lock -rm -rf %{buildroot}/%{_libdir}/php/pear/.registry --if [ -d "%{buildroot}/docs/@package@/doc" ]; then -- rm -rf $RPM_BUILD_DIR/doc -- mv %{buildroot}/docs/@package@/doc $RPM_BUILD_DIR +rm %{buildroot}/%{peardir}/.filemap +rm %{buildroot}/%{peardir}/.lock +rm -rf %{buildroot}/%{peardir}/.registry -+ -+if [ "@doc_files@" != "" ]; then -+ mv %{buildroot}/docs/@package@/* . - rm -rf %{buildroot}/docs - fi -+ - mkdir -p %{buildroot}@rpm_xml_dir@ - tar -xzf $RPM_SOURCE_DIR/@package at -%{version}.tgz package at package2xml@.xml - cp -p package at package2xml@.xml %{buildroot}@rpm_xml_dir@/@package at .xml + if [ "@doc_files@" != "" ]; then + mv %{buildroot}/docs/@package@/* . + rm -rf %{buildroot}/docs php-pear-1.4.5-template-postun.patch: template.spec | 1 - 1 files changed, 1 deletion(-) Index: php-pear-1.4.5-template-postun.patch =================================================================== RCS file: /cvs/dist/rpms/php-pear/devel/php-pear-1.4.5-template-postun.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-pear-1.4.5-template-postun.patch 13 Jan 2006 11:26:56 -0000 1.1 +++ php-pear-1.4.5-template-postun.patch 30 Jan 2006 15:47:59 -0000 1.2 @@ -7,4 +7,4 @@ - rm @rpm_xml_dir@/@package at .xml fi - + Index: php-pear.spec =================================================================== RCS file: /cvs/dist/rpms/php-pear/devel/php-pear.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- php-pear.spec 13 Jan 2006 11:26:56 -0000 1.7 +++ php-pear.spec 30 Jan 2006 15:47:59 -0000 1.8 @@ -5,8 +5,8 @@ Summary: PHP Extension and Application Repository framework Name: php-pear -Version: 1.4.5 -Release: 6 +Version: 1.4.6 +Release: 1 Epoch: 1 License: PHP Group: System @@ -29,6 +29,7 @@ Provides: php-pear(Console_Getopt) = 1.2 Provides: php-pear(PEAR) = %{version} Provides: php-pear(XML_RPC) = %{xmlrpcver} +Requires: php >= 5.1.0-1 %description PEAR is a framework and distribution system for reusable PHP @@ -94,6 +95,10 @@ %config %{_sysconfdir}/pear.conf %changelog +* Mon Jan 30 2006 Joe Orton 1:1.4.6-1 +- update to 1.4.6 +- require php >= 5.1.0 (#178821) + * Fri Dec 30 2005 Tim Jackson 1:1.4.5-6 - Patches to fix "pear makerpm" Index: sources =================================================================== RCS file: /cvs/dist/rpms/php-pear/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Dec 2005 17:15:43 -0000 1.3 +++ sources 30 Jan 2006 15:47:59 -0000 1.4 @@ -1,2 +1,2 @@ 48a9334065e24afdf7a623046eae9d78 XML_RPC-1.4.4.tgz -9c826173d7aa0b4b58ab62d817431a4f install-pear-nozlib-1.4.5.phar +2d10cdab58239fd738cb1b1d5a5047df install-pear-nozlib-1.4.6.phar From fedora-cvs-commits at redhat.com Mon Jan 30 15:56:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 10:56:47 -0500 Subject: rpms/cman-kernel/FC-4 cman-kernel.spec,1.113,1.114 Message-ID: <200601301556.k0UFulli016234@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16192 Modified Files: cman-kernel.spec Log Message: Updated Kernel Version Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/FC-4/cman-kernel.spec,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- cman-kernel.spec 14 Dec 2005 16:41:44 -0000 1.113 +++ cman-kernel.spec 30 Jan 2006 15:56:44 -0000 1.114 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.14-1.1653_FC4 +%define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050601.152643.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.11.5 -Release: %{subversion}.18 +Release: %{subversion}.19 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Mon Jan 30 15:57:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 10:57:06 -0500 Subject: rpms/gnbd-kernel/FC-4 gnbd-kernel.spec,1.95,1.96 Message-ID: <200601301557.k0UFv6dY016429@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16391 Modified Files: gnbd-kernel.spec Log Message: Updated Kernel Version Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/FC-4/gnbd-kernel.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- gnbd-kernel.spec 14 Dec 2005 16:41:59 -0000 1.95 +++ gnbd-kernel.spec 30 Jan 2006 15:57:03 -0000 1.96 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.14-1.1653_FC4 +%define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050420.133124.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.11.2 -Release: %{subversion}.53 +Release: %{subversion}.54 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Mon Jan 30 15:57:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 10:57:25 -0500 Subject: rpms/kernel/devel kernel-2.6.spec, 1.1826.2.10.2.2, 1.1826.2.10.2.3 linux-2.6-audit-rule-log.patch, 1.1.2.1, 1.1.2.2 Message-ID: <200601301557.k0UFvPaF016631@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15931 Modified Files: Tag: private-fc5-test2-lspp-branch kernel-2.6.spec linux-2.6-audit-rule-log.patch Log Message: Remove string patch since it causes oopses and fixup audit-rule-log patch Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1826.2.10.2.2 retrieving revision 1.1826.2.10.2.3 diff -u -r1.1826.2.10.2.2 -r1.1826.2.10.2.3 --- kernel-2.6.spec 13 Jan 2006 17:18:55 -0000 1.1826.2.10.2.2 +++ kernel-2.6.spec 30 Jan 2006 15:57:23 -0000 1.1826.2.10.2.3 @@ -20,7 +20,7 @@ %define sublevel 15 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel} -%define rhbsys .lspp.6 +%define rhbsys .lspp.7 %define release %(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} %define signmodules 0 %define make_target bzImage @@ -969,8 +969,8 @@ %patch20009 -p1 %patch20010 -p1 -%patch20020 -p1 -%patch20021 -p1 +#%patch20020 -p1 +#%patch20021 -p1 %patch20022 -p1 %patch20023 -p1 %patch20024 -p1 linux-2.6-audit-rule-log.patch: include/linux/audit.h | 2 +- kernel/auditfilter.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) Index: linux-2.6-audit-rule-log.patch =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/Attic/linux-2.6-audit-rule-log.patch,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- linux-2.6-audit-rule-log.patch 13 Jan 2006 17:17:15 -0000 1.1.2.1 +++ linux-2.6-audit-rule-log.patch 30 Jan 2006 15:57:23 -0000 1.1.2.2 @@ -1,65 +1,3 @@ -From linux-audit-bounces at redhat.com Mon Jan 9 14:48:00 2006 -Return-path: -Envelope-to: dwmw2 at baythorne.infradead.org -Delivery-date: Mon, 09 Jan 2006 14:48:00 +0000 -Received: from [2002:d592:9a28::1] (helo=pentafluge.infradead.org) by - baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id - 1EvyJU-0008Ah-Ie for dwmw2 at baythorne.infradead.org; Mon, 09 Jan 2006 - 14:48:00 +0000 -Received: from hormel.redhat.com ([209.132.177.30]) by - pentafluge.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id - 1EvyJS-00083r-Ac for dwmw2 at infradead.org; Mon, 09 Jan 2006 14:47:59 +0000 -Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com - [10.8.4.110]) by hormel.redhat.com (Postfix) with ESMTP id 0081172F6B; Mon, - 9 Jan 2006 09:47:57 -0500 (EST) -Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com - [172.16.52.254]) by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP - id k09Els3H012878 for ; Mon, 9 Jan - 2006 09:47:55 -0500 -Received: from mail.boston.redhat.com (mail.boston.redhat.com - [172.16.76.12]) by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id - k09Els116875 for ; Mon, 9 Jan 2006 - 09:47:54 -0500 -Received: from discovery.boston.redhat.com (discovery.boston.redhat.com - [172.16.80.171]) by mail.boston.redhat.com (8.12.8/8.12.8) with ESMTP id - k09ElsEg002852 for ; Mon, 9 Jan 2006 09:47:54 -0500 -From: Steve Grubb -Organization: Red Hat -To: Linux Audit Discussion -Date: Mon, 9 Jan 2006 09:48:17 -0500 -User-Agent: KMail/1.9.1 -MIME-Version: 1.0 -Content-Type: text/plain; charset="us-ascii" -Content-Disposition: inline -Message-Id: <200601090948.17487.sgrubb at redhat.com> -X-loop: linux-audit at redhat.com -Subject: [PATCH] add/remove rule update -X-BeenThere: linux-audit at redhat.com -X-Mailman-Version: 2.1.5 -Precedence: junk -List-Id: Linux Audit Discussion -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Sender: linux-audit-bounces at redhat.com -Errors-To: linux-audit-bounces at redhat.com -X-Spam-Score: 0.0 (/) -X-Evolution-Source: imap://dwmw2 at pentafluge.infradead.org/ -Content-Transfer-Encoding: 8bit - -Hi, - -The following patch adds a little more information to the add/remove rule message emitted -by the kernel. - -Signed-off-by: Steve Grubb - - - diff -urp linux-2.6.14.orig/include/linux/audit.h linux-2.6.14/include/linux/audit.h --- linux-2.6.14.orig/include/linux/audit.h 2006-01-05 10:13:30.000000000 -0500 +++ linux-2.6.14/include/linux/audit.h 2006-01-05 10:12:09.000000000 -0500 @@ -75,36 +13,29 @@ diff -urp linux-2.6.14.orig/kernel/auditfilter.c linux-2.6.14/kernel/auditfilter.c --- linux-2.6.14.orig/kernel/auditfilter.c 2006-01-05 10:13:40.000000000 -0500 +++ linux-2.6.14/kernel/auditfilter.c 2006-01-05 10:11:29.000000000 -0500 -@@ -571,10 +571,10 @@ int audit_receive_filter(int type, int p - - err = audit_add_rule(entry, - &audit_filter_list[entry->rule.listnr]); +@@ -243,9 +243,9 @@ int audit_receive_filter(int type, int p + ; + } + err = audit_add_rule(data, &audit_filter_list[listnr]); - if (!err) - audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, - "auid=%u added an audit rule\n", loginuid); -- else { + audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, + "auid=%u added rule to list=%d res=%d\n", -+ loginuid, entry->rule.listnr, !err); -+ if (err) { - audit_free_watch(entry->rule.watch); - kfree(entry); - } -@@ -590,9 +590,9 @@ int audit_receive_filter(int type, int p ++ loginuid, listnr, !err); + break; + case AUDIT_DEL: + listnr =((struct audit_rule *)data)->flags & ~AUDIT_FILTER_PREPEND; +@@ -253,9 +253,9 @@ int audit_receive_filter(int type, int p + return -EINVAL; - err = audit_del_rule(entry, - &audit_filter_list[entry->rule.listnr]); + err = audit_del_rule(data, &audit_filter_list[listnr]); - if (!err) - audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, - "auid=%u removed an audit rule\n", loginuid); + audit_log(NULL, GFP_KERNEL, AUDIT_CONFIG_CHANGE, + "auid=%u removed rule from list=%d res=%d\n", -+ loginuid, entry->rule.listnr, !err); - audit_free_watch(entry->rule.watch); - kfree(entry); ++ loginuid, listnr, !err); break; - --- -Linux-audit mailing list -Linux-audit at redhat.com -https://www.redhat.com/mailman/listinfo/linux-audit + default: + return -EINVAL; From fedora-cvs-commits at redhat.com Mon Jan 30 15:57:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 10:57:27 -0500 Subject: rpms/dlm-kernel/FC-4 dlm-kernel.spec,1.89,1.90 Message-ID: <200601301557.k0UFvRjE016628@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16587 Modified Files: dlm-kernel.spec Log Message: Updated Kernel Version Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/FC-4/dlm-kernel.spec,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- dlm-kernel.spec 14 Dec 2005 16:42:10 -0000 1.89 +++ dlm-kernel.spec 30 Jan 2006 15:57:23 -0000 1.90 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.14-1.1653_FC4 +%define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050601.152643.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.11.5 -Release: %{subversion}.17 +Release: %{subversion}.18 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Mon Jan 30 15:57:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 10:57:51 -0500 Subject: rpms/GFS-kernel/FC-4 GFS-kernel.spec,1.110,1.111 Message-ID: <200601301557.k0UFvprU016855@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv16817 Modified Files: GFS-kernel.spec Log Message: Updated Kernel Version Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/FC-4/GFS-kernel.spec,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- GFS-kernel.spec 14 Dec 2005 16:42:19 -0000 1.110 +++ GFS-kernel.spec 30 Jan 2006 15:57:49 -0000 1.111 @@ -12,7 +12,7 @@ %define buildup 1 %define buildsmp 1 %define buildxen 0 -%define kernel_version 2.6.14-1.1653_FC4 +%define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050601.152643.FC4 %ifnarch i686 x86_64 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.11.8 -Release: %{subversion}.20 +Release: %{subversion}.21 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Mon Jan 30 16:12:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 11:12:16 -0500 Subject: rpms/glib-java/devel .cvsignore, 1.6, 1.7 glib-java.spec, 1.22, 1.23 sources, 1.6, 1.7 Message-ID: <200601301612.k0UGCGGp021104@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/glib-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21029 Modified Files: .cvsignore glib-java.spec sources Log Message: * Mon Jan 31 2006 Adam Jocksch - bumped version to 0.2.3, updated tarball. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/glib-java/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Jan 2006 22:24:36 -0000 1.6 +++ .cvsignore 30 Jan 2006 16:12:13 -0000 1.7 @@ -1 +1,2 @@ glib-java-0.2.2.tar.gz +glib-java-0.2.3.tar.gz Index: glib-java.spec =================================================================== RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- glib-java.spec 22 Dec 2005 21:39:18 -0000 1.22 +++ glib-java.spec 30 Jan 2006 16:12:13 -0000 1.23 @@ -14,7 +14,7 @@ %define name_base glib-java Summary: Base Library for the Java-GNOME libraries Name: %{java_pkg_prefix}%{name_base} -Version: 0.2.2 +Version: 0.2.3 Release: 1 URL: http://java-gnome.sourceforge.net Source0: %{name_base}-%{version}.tar.gz @@ -117,6 +117,9 @@ %{_datadir}/java/*.zip %changelog +* Mon Jan 31 2006 Adam Jocksch +- bumped version to 0.2.3, updated tarball. + * Thu Dec 22 2005 Adam Jocksch - bumped version to 0.2.2, updated tarball. Index: sources =================================================================== RCS file: /cvs/dist/rpms/glib-java/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Jan 2006 22:24:36 -0000 1.6 +++ sources 30 Jan 2006 16:12:13 -0000 1.7 @@ -1 +1,2 @@ 46052b2c2aed6698275c54b7bd51cb38 glib-java-0.2.2.tar.gz +dabe425330fe2474d5e28afc08835a57 glib-java-0.2.3.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 16:16:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 11:16:13 -0500 Subject: rpms/expat/devel .cvsignore,1.8,1.9 expat.spec,1.18,1.19 Message-ID: <200601301616.k0UGGDJX029621@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/expat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29353 Modified Files: .cvsignore expat.spec Log Message: * Mon Jan 30 2006 Joe Orton 1.95.8-7 - move library to /lib (#178743) - omit .la file (#170031) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/expat/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 25 Nov 2004 08:26:33 -0000 1.8 +++ .cvsignore 30 Jan 2006 16:16:11 -0000 1.9 @@ -1 +1,4 @@ expat-1.95.8.tar.gz +i386 +*.rpm +clog Index: expat.spec =================================================================== RCS file: /cvs/dist/rpms/expat/devel/expat.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- expat.spec 9 Dec 2005 22:40:22 -0000 1.18 +++ expat.spec 30 Jan 2006 16:16:11 -0000 1.19 @@ -1,7 +1,7 @@ Summary: A library for parsing XML. Name: expat Version: 1.95.8 -Release: 6.1 +Release: 7 Group: System Environment/Libraries Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz URL: http://www.libexpat.org/ @@ -29,14 +29,25 @@ %setup -q %build -export CFLAGS="%{optflags} -fPIC" +export CFLAGS="$RPM_OPT_FLAGS -fPIC" %configure make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} -%makeinstall man1dir=$RPM_BUILD_ROOT/%{_mandir}/man1 +%makeinstall man1dir=$RPM_BUILD_ROOT/%{_mandir}/man1 \ + libdir=$RPM_BUILD_ROOT/%{_lib} + +mkdir -p $RPM_BUILD_ROOT%{_libdir} + +lib=`echo $RPM_BUILD_ROOT/%{_lib}/libexpat.so.*.*` + +ln -s ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so + +rm -f $RPM_BUILD_ROOT/%{_lib}/*.la $RPM_BUILD_ROOT/%{_lib}/*.so + +mv $RPM_BUILD_ROOT/%{_lib}/*.a $RPM_BUILD_ROOT%{_libdir}/ %clean rm -rf ${RPM_BUILD_ROOT} @@ -48,18 +59,21 @@ %defattr(-,root,root) %doc README COPYING %{_bindir}/* -%{_libdir}/lib*.so.* +/%{_lib}/lib*.so.* %{_mandir}/*/* %files devel %defattr(-,root,root) %doc Changes doc examples -%{_libdir}/lib*.a -%{_libdir}/lib*.la %{_libdir}/lib*.so +%{_libdir}/lib*.a %{_includedir}/*.h %changelog +* Mon Jan 30 2006 Joe Orton 1.95.8-7 +- move library to /lib (#178743) +- omit .la file (#170031) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Mon Jan 30 16:19:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 11:19:36 -0500 Subject: rpms/libgtk-java/devel .cvsignore, 1.15, 1.16 libgtk-java.spec, 1.38, 1.39 sources, 1.15, 1.16 Message-ID: <200601301619.k0UGJa3F004230@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libgtk-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4164 Modified Files: .cvsignore libgtk-java.spec sources Log Message: * Mon Jan 31 2006 Adam Jocksch - 2.8.3-1 - updated tarball to libgtk-java-2.8.3.tar.gz. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 22 Dec 2005 22:23:57 -0000 1.15 +++ .cvsignore 30 Jan 2006 16:19:34 -0000 1.16 @@ -1 +1,2 @@ libgtk-java-2.8.2.tar.gz +libgtk-java-2.8.3.tar.gz Index: libgtk-java.spec =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- libgtk-java.spec 22 Dec 2005 22:23:57 -0000 1.38 +++ libgtk-java.spec 30 Jan 2006 16:19:34 -0000 1.39 @@ -12,8 +12,8 @@ %define name_base libgtk-java -%define version 2.8.2 -%define release 0 +%define version 2.8.3 +%define release 1 Summary: Java bindings for GTK+ @@ -29,9 +29,9 @@ Requires: %{c_pkg_prefix}gtk2 >= 2.8.0 Requires: %{java_pkg_prefix}cairo-java >= 1.0.0 -Requires: %{java_pkg_prefix}glib-java >= 0.2 +Requires: %{java_pkg_prefix}glib-java >= 0.2.3 BuildRequires: %{java_pkg_prefix}cairo-java-devel >= 1.0.0 -BuildRequires: %{java_pkg_prefix}glib-java-devel >= 0.2 +BuildRequires: %{java_pkg_prefix}glib-java-devel >= 0.2.3 BuildRequires: %{c_pkg_prefix}gtk2-devel >= 2.8.0 BuildRequires: java-devel >= 1.4.2, gcc-java >= 3.3.3, docbook-utils @@ -123,6 +123,9 @@ %changelog +* Mon Jan 31 2006 Adam Jocksch - 2.8.3-1 +- updated tarball to libgtk-java-2.8.3.tar.gz. + * Thu Dec 22 2005 Andrw Cagney - 2.8.2-0 Adam Jocksch - import libgtk-java-2.8.2.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 22 Dec 2005 22:23:57 -0000 1.15 +++ sources 30 Jan 2006 16:19:34 -0000 1.16 @@ -1 +1,2 @@ 76e5048d11a71060a7cc08df8ef7018e libgtk-java-2.8.2.tar.gz +0bcf838a3220fdfa685c55c22d664874 libgtk-java-2.8.3.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 16:33:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 11:33:13 -0500 Subject: rpms/apr-util/devel apr-util.spec,1.21,1.22 Message-ID: <200601301633.k0UGXD1q031426@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/apr-util/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31414 Modified Files: apr-util.spec Log Message: * Mon Jan 30 2006 Joe Orton 1.2.2-4 - rebuild to drop reference to libexpat.la Index: apr-util.spec =================================================================== RCS file: /cvs/dist/rpms/apr-util/devel/apr-util.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- apr-util.spec 18 Jan 2006 11:49:39 -0000 1.21 +++ apr-util.spec 30 Jan 2006 16:33:10 -0000 1.22 @@ -4,7 +4,7 @@ Summary: Apache Portable Runtime Utility library Name: apr-util Version: 1.2.2 -Release: 3 +Release: 4 License: Apache Software License 2.0 Group: System Environment/Libraries URL: http://apr.apache.org/ @@ -101,6 +101,9 @@ %doc --parents html %changelog +* Mon Jan 30 2006 Joe Orton 1.2.2-4 +- rebuild to drop reference to libexpat.la + * Wed Jan 18 2006 Joe Orton 1.2.2-3 - disable sqlite2 support - BuildRequire e2fsprogs-devel From fedora-cvs-commits at redhat.com Mon Jan 30 16:45:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 11:45:14 -0500 Subject: rpms/system-config-nfs/devel .cvsignore, 1.23, 1.24 sources, 1.26, 1.27 system-config-nfs.spec, 1.29, 1.30 Message-ID: <200601301645.k0UGjEnF031619@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-nfs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31604 Modified Files: .cvsignore sources system-config-nfs.spec Log Message: avoid exporting a share more than once to a specific client allow exporting a share with different settings for different clients (#178830) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 16 Dec 2005 13:36:22 -0000 1.23 +++ .cvsignore 30 Jan 2006 16:45:11 -0000 1.24 @@ -1 +1 @@ -system-config-nfs-1.3.15.tar.bz2 +system-config-nfs-1.3.16.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 16 Dec 2005 13:36:22 -0000 1.26 +++ sources 30 Jan 2006 16:45:11 -0000 1.27 @@ -1 +1 @@ -a20d2fe56ca36045bc4ed67720928b6c system-config-nfs-1.3.15.tar.bz2 +d27c00819e8bb8e5376f8c9c8207e8ef system-config-nfs-1.3.16.tar.bz2 Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/devel/system-config-nfs.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- system-config-nfs.spec 16 Dec 2005 13:36:22 -0000 1.29 +++ system-config-nfs.spec 30 Jan 2006 16:45:11 -0000 1.30 @@ -1,6 +1,6 @@ Summary: NFS server configuration tool Name: system-config-nfs -Version: 1.3.15 +Version: 1.3.16 Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL @@ -70,6 +70,11 @@ %attr(0644,root,root) %config /etc/pam.d/system-config-nfs %changelog +* Mon Jan 30 2006 Nils Philippsen 1.3.16 +- avoid exporting a share more than once to a specific client +- allow exporting a share with different settings for different clients + (#178830) + * Fri Dec 16 2005 Nils Philippsen 1.3.15 - don't apply server settings (non-)changes on Cancel - make server settings dialog actually show all text entries From fedora-cvs-commits at redhat.com Mon Jan 30 16:47:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 11:47:41 -0500 Subject: rpms/system-config-nfs/FC-4 .cvsignore, 1.19, 1.20 sources, 1.22, 1.23 system-config-nfs.spec, 1.25, 1.26 system-config-nfs-1.3.11-xlateperms.patch, 1.1, NONE Message-ID: <200601301647.k0UGlfbP011463@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-nfs/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv11414 Modified Files: .cvsignore sources system-config-nfs.spec Removed Files: system-config-nfs-1.3.11-xlateperms.patch Log Message: remove system-config-nfs-1.3.11-xlateperms.patch update to 1.3.15 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 7 Jul 2005 12:34:38 -0000 1.19 +++ .cvsignore 30 Jan 2006 16:47:39 -0000 1.20 @@ -1 +1 @@ -system-config-nfs-1.3.11.tar.bz2 +system-config-nfs-1.3.16.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 7 Jul 2005 12:34:38 -0000 1.22 +++ sources 30 Jan 2006 16:47:39 -0000 1.23 @@ -1 +1 @@ -89fd57fb64472fc493c653b6e8b23058 system-config-nfs-1.3.11.tar.bz2 +d27c00819e8bb8e5376f8c9c8207e8ef system-config-nfs-1.3.16.tar.bz2 Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/system-config-nfs.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- system-config-nfs.spec 16 Dec 2005 12:10:23 -0000 1.25 +++ system-config-nfs.spec 30 Jan 2006 16:47:39 -0000 1.26 @@ -1,7 +1,7 @@ Summary: NFS server configuration tool Name: system-config-nfs -Version: 1.3.11 -Release: 0.fc4.2 +Version: 1.3.16 +Release: 1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -9,7 +9,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 -Patch0: system-config-nfs-1.3.11-xlateperms.patch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool @@ -28,7 +27,6 @@ %prep %setup -q -%patch0 -p1 -b .xlateperms %build make %{?_smp_mflags} @@ -53,11 +51,6 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -%preun -if [ -d %{_datadir}/system-config-nfs ] ; then - rm -rf %{_datadir}/system-config-nfs/*.pyc -fi - %postun touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -77,9 +70,37 @@ %attr(0644,root,root) %config /etc/pam.d/system-config-nfs %changelog -* Fri Dec 16 2005 Nils Philippsen +* Mon Jan 30 2006 Nils Philippsen 1.3.16 +- avoid exporting a share more than once to a specific client +- allow exporting a share with different settings for different clients + (#178830) + +* Fri Dec 16 2005 Nils Philippsen 1.3.15 +- don't apply server settings (non-)changes on Cancel +- make server settings dialog actually show all text entries + +* Fri Dec 16 2005 Nils Philippsen 1.3.14 - translate permissions column (#175921, patch by Frank Arnold) +* Fri Oct 14 2005 Nils Philippsen +- don't use pam_stack (#170637) + +* Thu Oct 13 2005 Nils Philippsen 1.3.13 +- include missing files (spotted by Bernardo Innocenti), remove unneeded test + and sample files +- don't remove byte-compiled files anymore + +* Tue Oct 11 2005 Nils Philippsen 1.3.12 +- allow user to set networking ports to be used (#151166) +- separate code concerning the NFS server, its settings and NFS exports +- some code cleanup + +* Mon Oct 10 2005 Nils Philippsen +- make Properties/Delete menu entries insensitive if nothing is selected + +* Fri Aug 12 2005 Nils Philippsen +- use GtkFileChooser instead of GtkFileSelection (#165768) + * Thu Jul 07 2005 Nils Philippsen 1.3.11 - display permissions correctly in list (#162437) - use symbolic names when dealing with list columns --- system-config-nfs-1.3.11-xlateperms.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 30 16:48:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 11:48:04 -0500 Subject: rpms/system-config-nfs/FC-4 system-config-nfs.spec,1.26,1.27 Message-ID: <200601301648.k0UGm4M0011489@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-nfs/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv11474 Modified Files: system-config-nfs.spec Log Message: add disttag to release Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/system-config-nfs.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- system-config-nfs.spec 30 Jan 2006 16:47:39 -0000 1.26 +++ system-config-nfs.spec 30 Jan 2006 16:48:02 -0000 1.27 @@ -1,7 +1,7 @@ Summary: NFS server configuration tool Name: system-config-nfs Version: 1.3.16 -Release: 1 +Release: 0.fc4.1 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux From fedora-cvs-commits at redhat.com Mon Jan 30 16:57:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 11:57:39 -0500 Subject: rpms/libglade-java/devel .cvsignore, 1.10, 1.11 libglade-java.spec, 1.25, 1.26 sources, 1.11, 1.12 Message-ID: <200601301657.k0UGvdBP021188@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libglade-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21136 Modified Files: .cvsignore libglade-java.spec sources Log Message: * Mon Jan 31 2006 Adam jocksch - 2.12.2-1 - Updated tarball, deps. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libglade-java/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 26 Oct 2005 14:48:24 -0000 1.10 +++ .cvsignore 30 Jan 2006 16:57:35 -0000 1.11 @@ -1 +1,2 @@ libglade-java-2.12.1.tar.gz +libglade-java-2.12.2.tar.gz Index: libglade-java.spec =================================================================== RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- libglade-java.spec 22 Dec 2005 08:01:46 -0000 1.25 +++ libglade-java.spec 30 Jan 2006 16:57:35 -0000 1.26 @@ -11,8 +11,8 @@ %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}} %define name_base libglade-java -%define version 2.12.1 -%define release 3 +%define version 2.12.2 +%define release 1 Summary: Java bindings for libglade Name: %{java_pkg_prefix}%{name_base} @@ -25,9 +25,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Requires: libglade2 >= 2.5.0 -Requires: %{java_pkg_prefix}libgtk-java >= 2.8.0 +Requires: %{java_pkg_prefix}libgtk-java >= 2.8.3 Requires: %{java_pkg_prefix}libgnome-java >= 2.12.0 -BuildRequires: %{java_pkg_prefix}libgtk-java-devel >= 2.8.0 +BuildRequires: %{java_pkg_prefix}libgtk-java-devel >= 2.8.3 BuildRequires: %{java_pkg_prefix}libgnome-java-devel >= 2.12.0 BuildRequires: libglade2-devel >= 2.5.0, gcc-java >= 3.3.3 BuildRequires: java-devel >= 1.4.2 @@ -113,6 +113,9 @@ %{_datadir}/java/*.zip %changelog +* Mon Jan 31 2006 Adam jocksch - 2.12.2-1 +- Updated tarball, deps. + * Wed Dec 21 2005 Jesse Keating - 2.12.1-3 - rebuilt again Index: sources =================================================================== RCS file: /cvs/dist/rpms/libglade-java/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Oct 2005 14:48:24 -0000 1.11 +++ sources 30 Jan 2006 16:57:35 -0000 1.12 @@ -1 +1,2 @@ 44a223d1c6d66f15288360bbd2ed0c22 libglade-java-2.12.1.tar.gz +a0b11f2b7ed7c9f998e860212ed3a400 libglade-java-2.12.2.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 17:07:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 12:07:08 -0500 Subject: rpms/system-config-nfs/FC-4 system-config-nfs-1.3.16-pam_stack.patch, NONE, 1.1 system-config-nfs.spec, 1.27, 1.28 Message-ID: <200601301707.k0UH78oV023088@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-nfs/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv23034 Modified Files: system-config-nfs.spec Added Files: system-config-nfs-1.3.16-pam_stack.patch Log Message: use pam_stack on FC-4 system-config-nfs-1.3.16-pam_stack.patch: system-config-nfs.pam | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) --- NEW FILE system-config-nfs-1.3.16-pam_stack.patch --- --- system-config-nfs-1.3.16/system-config-nfs.pam.pam_stack 2005-10-14 10:39:44.000000000 +0200 +++ system-config-nfs-1.3.16/system-config-nfs.pam 2006-01-30 18:05:17.000000000 +0100 @@ -1,4 +1,8 @@ #%PAM-1.0 -auth include config-util -account include config-util -session include config-util +auth sufficient pam_rootok.so +auth sufficient pam_timestamp.so +auth required pam_stack.so service=system-auth +session required pam_permit.so +session optional pam_xauth.so +session optional pam_timestamp.so +account required pam_permit.so Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/system-config-nfs.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- system-config-nfs.spec 30 Jan 2006 16:48:02 -0000 1.27 +++ system-config-nfs.spec 30 Jan 2006 17:07:05 -0000 1.28 @@ -1,7 +1,7 @@ Summary: NFS server configuration tool Name: system-config-nfs Version: 1.3.16 -Release: 0.fc4.1 +Release: 0.fc4.2 URL: http://fedora.redhat.com/projects/config-tools/ License: GPL ExclusiveOS: Linux @@ -9,6 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 +Patch0: system-config-nfs-1.3.6-pam_stack.patch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool @@ -27,6 +28,7 @@ %prep %setup -q +%patch -p1 -b .pam_stack %build make %{?_smp_mflags} @@ -70,6 +72,9 @@ %attr(0644,root,root) %config /etc/pam.d/system-config-nfs %changelog +* Mon Jan 30 2006 Nils Philippsen +- use pam_stack on FC-4 + * Mon Jan 30 2006 Nils Philippsen 1.3.16 - avoid exporting a share more than once to a specific client - allow exporting a share with different settings for different clients From fedora-cvs-commits at redhat.com Mon Jan 30 17:08:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 12:08:21 -0500 Subject: rpms/system-config-nfs/FC-4 system-config-nfs.spec,1.28,1.29 Message-ID: <200601301708.k0UH8Lru023665@cvs.devel.redhat.com> Author: nphilipp Update of /cvs/dist/rpms/system-config-nfs/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv23601 Modified Files: system-config-nfs.spec Log Message: fix typo Index: system-config-nfs.spec =================================================================== RCS file: /cvs/dist/rpms/system-config-nfs/FC-4/system-config-nfs.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- system-config-nfs.spec 30 Jan 2006 17:07:05 -0000 1.28 +++ system-config-nfs.spec 30 Jan 2006 17:08:19 -0000 1.29 @@ -9,7 +9,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 -Patch0: system-config-nfs-1.3.6-pam_stack.patch +Patch0: system-config-nfs-1.3.16-pam_stack.patch BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool From fedora-cvs-commits at redhat.com Mon Jan 30 17:15:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 12:15:52 -0500 Subject: rpms/s390utils/devel s390-tools-1.5.0-fdasd-raid.patch, 1.1, 1.2 s390utils.spec, 1.29, 1.30 Message-ID: <200601301715.k0UHFqpU027012@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/s390utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26908 Modified Files: s390-tools-1.5.0-fdasd-raid.patch s390utils.spec Log Message: - Fixed problem with s390-tools-1.5.0-fdasd-raid.patch s390-tools-1.5.0-fdasd-raid.patch: fdasd.c | 55 +++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 10 deletions(-) Index: s390-tools-1.5.0-fdasd-raid.patch =================================================================== RCS file: /cvs/dist/rpms/s390utils/devel/s390-tools-1.5.0-fdasd-raid.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- s390-tools-1.5.0-fdasd-raid.patch 21 Oct 2005 09:54:26 -0000 1.1 +++ s390-tools-1.5.0-fdasd-raid.patch 30 Jan 2006 17:15:48 -0000 1.2 @@ -1,5 +1,5 @@ ---- s390-tools-1.5.0/fdasd/fdasd.c.fdasd-raid 2005-10-20 09:22:40.000000000 +0200 -+++ s390-tools-1.5.0/fdasd/fdasd.c 2005-10-20 09:34:03.000000000 +0200 +--- s390-tools-1.5.0/fdasd/fdasd.c.fdasd-raid 2006-01-30 17:32:11.000000000 +0100 ++++ s390-tools-1.5.0/fdasd/fdasd.c 2006-01-30 18:13:40.000000000 +0100 @@ -215,10 +215,10 @@ static int read_line(void) @@ -88,11 +88,25 @@ default: printf("'%d' is not supported!\n", part_type); } -@@ -1541,14 +1564,21 @@ +@@ -1506,7 +1529,7 @@ + static void + fdasd_process_valid_vtoc(fdasd_anchor_t *anc, unsigned long blk) + { +- int f1_counter = 0, f7_counter = 0, f5_counter = 0; ++ int f1_counter = 0, f7_counter = 0, f5_counter = 0, oldfmt = 0; + int i, part_no, f1_size = sizeof(format1_label_t); + partition_info_t *part_info = anc->first; + format1_label_t f1_label; +@@ -1541,14 +1564,26 @@ vtoc_ebcdic_enc(part_info->f1->DS1DSNAM, part_info->f1->DS1DSNAM, 44); - if ((part_no < 0) || (part_no >= USABLE_PARTITIONS)) ++ /* this dasd has data set names 0000-0002 ++ but we use now 0001-0003 */ ++ if (part_no == -1) ++ oldfmt++; ++ + if (((oldfmt == 0) && (part_no < 0)) + || (part_no >= USABLE_PARTITIONS)) printf("WARNING: partition number (%i) found " Index: s390utils.spec =================================================================== RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- s390utils.spec 27 Jan 2006 11:11:25 -0000 1.29 +++ s390utils.spec 30 Jan 2006 17:15:48 -0000 1.30 @@ -145,7 +145,10 @@ %{_mandir}/man5/* %changelog -* Thu Jan 26 2006 Phil Knirsch 2:1.5.0-2 +* Mon Jan 30 2006 Phil Knirsch 2:1.5.0-2 +- Fixed problem with s390-tools-1.5.0-fdasd-raid.patch + +* Thu Jan 26 2006 Phil Knirsch - Fixed some .macro errors in zipl/boot * Fri Dec 09 2005 Jesse Keating From fedora-cvs-commits at redhat.com Mon Jan 30 17:25:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 12:25:29 -0500 Subject: rpms/s390utils/devel s390utils.spec,1.30,1.31 Message-ID: <200601301725.k0UHPTV2011126@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/s390utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11008 Modified Files: s390utils.spec Log Message: - Don't try to remove the non-empty _bindir. Index: s390utils.spec =================================================================== RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- s390utils.spec 30 Jan 2006 17:15:48 -0000 1.30 +++ s390utils.spec 30 Jan 2006 17:25:26 -0000 1.31 @@ -108,7 +108,6 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d install -m 700 %{SOURCE5} $RPM_BUILD_ROOT/%{_sbindir} rm -f $RPM_BUILD_ROOT/bin/dbginfo.sh -rmdir $RPM_BUILD_ROOT/bin install -m 700 cmsfs-%{cmsfsver}/cmsfscat $RPM_BUILD_ROOT/%{_sbindir} install -m 700 cmsfs-%{cmsfsver}/cmsfslst $RPM_BUILD_ROOT/%{_sbindir} @@ -147,6 +146,7 @@ %changelog * Mon Jan 30 2006 Phil Knirsch 2:1.5.0-2 - Fixed problem with s390-tools-1.5.0-fdasd-raid.patch +- Don't try to remove the non empty _bindir * Thu Jan 26 2006 Phil Knirsch - Fixed some .macro errors in zipl/boot From fedora-cvs-commits at redhat.com Mon Jan 30 17:37:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 12:37:27 -0500 Subject: rpms/s390utils/devel s390utils.spec,1.31,1.32 Message-ID: <200601301737.k0UHbR3N014933@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/s390utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14878 Modified Files: s390utils.spec Log Message: - Some more install cleanups Index: s390utils.spec =================================================================== RCS file: /cvs/dist/rpms/s390utils/devel/s390utils.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- s390utils.spec 30 Jan 2006 17:25:26 -0000 1.31 +++ s390utils.spec 30 Jan 2006 17:37:24 -0000 1.32 @@ -108,6 +108,8 @@ install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/profile.d install -m 700 %{SOURCE5} $RPM_BUILD_ROOT/%{_sbindir} rm -f $RPM_BUILD_ROOT/bin/dbginfo.sh +rm -f $RPM_BUILD_ROOT/bin/zfcpdbf +rm -rf $RPM_BUILD_ROOT/%{_mandir}/man1 install -m 700 cmsfs-%{cmsfsver}/cmsfscat $RPM_BUILD_ROOT/%{_sbindir} install -m 700 cmsfs-%{cmsfsver}/cmsfslst $RPM_BUILD_ROOT/%{_sbindir} @@ -140,13 +142,14 @@ %{_bindir}/* %{_libdir}/*.so %attr(755,root,root) /etc/profile.d/* -%{_mandir}/man8/* %{_mandir}/man5/* +%{_mandir}/man8/* %changelog * Mon Jan 30 2006 Phil Knirsch 2:1.5.0-2 - Fixed problem with s390-tools-1.5.0-fdasd-raid.patch - Don't try to remove the non empty _bindir +- Some more install cleanups * Thu Jan 26 2006 Phil Knirsch - Fixed some .macro errors in zipl/boot From fedora-cvs-commits at redhat.com Mon Jan 30 17:55:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 12:55:02 -0500 Subject: rpms/ghostscript/devel .cvsignore, 1.18, 1.19 ghostscript.spec, 1.97, 1.98 sources, 1.22, 1.23 Message-ID: <200601301755.k0UHt2CC002522@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/ghostscript/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2465 Modified Files: .cvsignore ghostscript.spec sources Log Message: * Mon Jan 30 2006 Tim Waugh 8.15.1-5 - Updated adobe-cmaps to 200406 (bug #173613). Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 22 Sep 2005 22:12:17 -0000 1.18 +++ .cvsignore 30 Jan 2006 17:54:59 -0000 1.19 @@ -14,3 +14,4 @@ adobe-cmaps-200204.tar.gz espgs-8.15rc4-source.tar.bz2 espgs-8.15.1-source.tar.bz2 +adobe-cmaps-200406.tar.gz Index: ghostscript.spec =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- ghostscript.spec 27 Jan 2006 11:59:04 -0000 1.97 +++ ghostscript.spec 30 Jan 2006 17:54:59 -0000 1.98 @@ -6,14 +6,14 @@ Version: %{gs_ver} BuildRequires: libjpeg-devel -Release: 4 +Release: 5 License: GPL URL: http://www.cups.org/espgs/ Group: Applications/Publishing Source0: ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/ghostscript/%{?gs_rc:test/}espgs-%{gs_ver}%{?gs_rc:gs_rc}-source.tar.bz2 Source1: FAPIcidfmap -Source2: adobe-cmaps-200204.tar.gz +Source2: adobe-cmaps-200406.tar.gz Source3: acro5-cmaps-2001.tar.gz Source4: cidfmap @@ -263,6 +263,9 @@ %postun -p /sbin/ldconfig %changelog +* Mon Jan 30 2006 Tim Waugh 8.15.1-5 +- Updated adobe-cmaps to 200406 (bug #173613). + * Fri Jan 27 2006 Tim Waugh 8.15.1-4 - Support reading a big cmap/post table from a TrueType font. Index: sources =================================================================== RCS file: /cvs/dist/rpms/ghostscript/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 22 Sep 2005 22:12:17 -0000 1.22 +++ sources 30 Jan 2006 17:54:59 -0000 1.23 @@ -1,3 +1,3 @@ 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz -a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 2a21136953c3559e6088522753b06b1f espgs-8.15.1-source.tar.bz2 +dfc93dd2aaaf2b86d2fd55f654c13261 adobe-cmaps-200406.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 18:34:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 13:34:21 -0500 Subject: rpms/gdm/devel gdm.spec,1.121,1.122 Message-ID: <200601301834.k0UIYL7t018131@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18100 Modified Files: gdm.spec Log Message: be quiet! :) Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- gdm.spec 19 Jan 2006 14:03:07 -0000 1.121 +++ gdm.spec 30 Jan 2006 18:34:19 -0000 1.122 @@ -255,7 +255,7 @@ sed -i -e 's@^RemoteGreeter=/usr/bin/gdmgreeter at RemoteGreeter=/usr/libexec/gdmgreeter@' %{_datadir}/gdm/config/gdm.conf-custom fi -%{_sbindir}/gdm-safe-restart || : +%{_sbindir}/gdm-safe-restart >/dev/null 2>&1 || : %postun /sbin/ldconfig @@ -307,6 +307,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Mon Jan 30 2006 Bill Nottingham +- silence gdm-safe-restart + * Thu Jan 19 2006 Ray Strode - 1:2.13.0.5-7 - sed -ie isn't the same as sed -i -e (we want the latter) From fedora-cvs-commits at redhat.com Mon Jan 30 18:38:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 13:38:25 -0500 Subject: rpms/gphoto2/devel gphoto-set-procperm, 1.1, 1.2 gphoto2.spec, 1.51, 1.52 Message-ID: <200601301838.k0UIcPRO018164@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/gphoto2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18150 Modified Files: gphoto-set-procperm gphoto2.spec Log Message: set perms on /dev/bus/usb/XXX, as that's what libusb prefers now Index: gphoto-set-procperm =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto-set-procperm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gphoto-set-procperm 11 Nov 2005 22:21:51 -0000 1.1 +++ gphoto-set-procperm 30 Jan 2006 18:38:23 -0000 1.2 @@ -18,4 +18,5 @@ bus_num=`printf %.3u $HAL_PROP_USB_BUS_NUMBER` dev_num=`printf %.3u $HAL_PROP_USB_LINUX_DEVICE_NUMBER` +chown $console_user /dev/bus/usb/$bus_num/$dev_num chown $console_user /proc/bus/usb/$bus_num/$dev_num Index: gphoto2.spec =================================================================== RCS file: /cvs/dist/rpms/gphoto2/devel/gphoto2.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- gphoto2.spec 23 Jan 2006 07:17:32 -0000 1.51 +++ gphoto2.spec 30 Jan 2006 18:38:23 -0000 1.52 @@ -5,7 +5,7 @@ %define libpkg libgphoto2 %define libver 2.1.99 Version: %{pkgver} -Release: 4 +Release: 5 License: LGPL Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -212,6 +212,10 @@ # ChangeLog ######################################################################## %changelog +* Mon Jan 30 2006 Bill Nottingham 2.1.99-5 +- set permissions on /dev/bus/usb/XXX as well - that's what new + libusb uses by default + * Mon Jan 23 2006 Radek Vokal 2.1.99-4 - fixed gphoto2 --summary segfault with Canon cameras (#178572) From fedora-cvs-commits at redhat.com Mon Jan 30 19:08:33 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 14:08:33 -0500 Subject: rpms/redhat-menus/devel .cvsignore, 1.32, 1.33 redhat-menus.spec, 1.51, 1.52 sources, 1.33, 1.34 redhat-menus-no-package-install.patch, 1.2, NONE Message-ID: <200601301908.k0UJ8XJp010215@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/redhat-menus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10124 Modified Files: .cvsignore redhat-menus.spec sources Removed Files: redhat-menus-no-package-install.patch Log Message: - Update to 5.5.5 - put pirut in toplevel applications menu Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 3 Jan 2006 14:39:46 -0000 1.32 +++ .cvsignore 30 Jan 2006 19:08:30 -0000 1.33 @@ -1,11 +1 @@ -<<<<<<< .cvsignore -redhat-menus-5.0.1.tar.gz -redhat-menus-5.0.2.tar.gz -redhat-menus-5.0.4.tar.gz -======= -redhat-menus-5.0.4.tar.gz ->>>>>>> 1.28 -redhat-menus-5.0.5.tar.gz -redhat-menus-5.0.6.tar.gz -redhat-menus-5.0.7.tar.gz -redhat-menus-5.0.8.tar.gz +redhat-menus-5.5.5.tar.gz Index: redhat-menus.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- redhat-menus.spec 3 Jan 2006 14:39:46 -0000 1.51 +++ redhat-menus.spec 30 Jan 2006 19:08:30 -0000 1.52 @@ -3,11 +3,10 @@ Summary: Configuration and data files for the desktop menus Name: redhat-menus -Version: 5.0.8 +Version: 5.5.5 Release: 1 URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz -Patch0: redhat-menus-no-package-install.patch PreReq: desktop-file-utils >= %{desktop_file_utils_version} License: XFree86 @@ -31,7 +30,6 @@ %prep %setup -q -%patch0 -p1 -b .no-package-install %build @@ -62,11 +60,14 @@ %dir %{_sysconfdir}/xdg/menus/preferences-merged %dir %{_sysconfdir}/xdg/menus/preferences-post-merged %config %{_sysconfdir}/xdg/menus/*.menu -%{_sysconfdir}/X11/starthere %{_datadir}/desktop-menu-patches/*.desktop %{_datadir}/desktop-directories/*.directory %changelog +* Mon Jan 30 2006 Ray Strode - 5.5.5-1 +- Update to 5.5.5 +- put pirut in toplevel applications menu + * Tue Jan 3 2006 Matthias Clasen - 5.0.8-1 - Make "Other" disappear again Index: sources =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 3 Jan 2006 14:39:46 -0000 1.33 +++ sources 30 Jan 2006 19:08:30 -0000 1.34 @@ -1 +1 @@ -d29cd89dec332466dec8bce0ee71c82e redhat-menus-5.0.8.tar.gz +61eb43b5024991a04f44e4aa107aa158 redhat-menus-5.5.5.tar.gz --- redhat-menus-no-package-install.patch DELETED --- From fedora-cvs-commits at redhat.com Mon Jan 30 19:10:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 14:10:19 -0500 Subject: rpms/gnome-menus/devel gnome-menus.spec,1.22,1.23 Message-ID: <200601301910.k0UJAJ7T011079@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-menus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10948 Modified Files: gnome-menus.spec Log Message: - ship upstream .directory files Index: gnome-menus.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-menus/devel/gnome-menus.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- gnome-menus.spec 19 Jan 2006 20:08:31 -0000 1.22 +++ gnome-menus.spec 30 Jan 2006 19:10:17 -0000 1.23 @@ -7,13 +7,13 @@ Summary: A menu system for the GNOME project Name: gnome-menus Version: 2.13.5 -Release: 2 +Release: 3 License: LGPL Group: System Environment/Libraries URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: redhat-menus >= 1.0 +Requires: redhat-menus >= 5.5.5 Requires: python-abi = %{pyver} BuildRequires: glib2-devel >= 2.6.0 BuildRequires: %{python}-devel >= 2.3.0 @@ -51,13 +51,13 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus -rm -rf $RPM_BUILD_ROOT%{_datadir}/desktop-directories +#rm -rf $RPM_BUILD_ROOT%{_datadir}/desktop-directories %find_lang %{po_package} @@ -78,6 +78,7 @@ %{_libdir}/python*/site-packages/GMenuSimpleEditor/* %{_datadir}/gnome-menus/glade/gmenu-simple-editor.glade %{_datadir}/applications/gmenu-simple-editor.desktop +%{_datadir}/desktop-directories %files devel %defattr(-, root, root) @@ -88,6 +89,9 @@ %{_bindir}/gnome-menu-spec-test %changelog +* Fri Jan 27 2006 Ray Strode 2.13.5-3 +- ship upstream .directory files + * Thu Jan 19 2006 Matthias Clasen 2.13.5-2 - Add a BuildRequires for gamin From fedora-cvs-commits at redhat.com Mon Jan 30 19:11:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 14:11:10 -0500 Subject: rpms/control-center/devel .cvsignore, 1.33, 1.34 control-center.spec, 1.114, 1.115 sources, 1.36, 1.37 Message-ID: <200601301911.k0UJBACS011508@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11452 Modified Files: .cvsignore control-center.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 20 Jan 2006 16:55:49 -0000 1.33 +++ .cvsignore 30 Jan 2006 19:11:08 -0000 1.34 @@ -6,3 +6,4 @@ control-center-2.13.4.tar.bz2 control-center-2.13.5.tar.bz2 control-center-2.13.5.1.tar.bz2 +control-center-2.13.90.tar.bz2 Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- control-center.spec 28 Jan 2006 05:24:55 -0000 1.114 +++ control-center.spec 30 Jan 2006 19:11:08 -0000 1.115 @@ -20,8 +20,8 @@ Summary: GNOME Control Center. Name: control-center -Version: 2.13.5.1 -Release: 2 +Version: 2.13.90 +Release: 1 Epoch: 1 License: GPL/LGPL Group: User Interface/Desktops @@ -219,6 +219,9 @@ # (also its headers) %changelog +* Mon Jan 30 2006 Matthias Clasen - 1:2.13.90-1 +- Update to 2.13.90 + * Sat Jan 28 2006 David Malcolm - 1:2.13.5.1-2 - rebuild against new e-d-s Index: sources =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 20 Jan 2006 16:55:49 -0000 1.36 +++ sources 30 Jan 2006 19:11:08 -0000 1.37 @@ -1 +1 @@ -52c8d95f85dee21a152c1a6b4b32721c control-center-2.13.5.1.tar.bz2 +bdf783600f3774e1bf0b0ed1f6fd6ba7 control-center-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 30 19:25:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 14:25:19 -0500 Subject: rpms/control-center/devel control-center-2.13.90-fedora-apps.patch, NONE, 1.1 control-center-2.13.5-fedora-apps.patch, 1.2, 1.3 control-center.spec, 1.115, 1.116 Message-ID: <200601301925.k0UJPJvK030086@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30034 Modified Files: control-center-2.13.5-fedora-apps.patch control-center.spec Added Files: control-center-2.13.90-fedora-apps.patch Log Message: Fix patch control-center-2.13.90-fedora-apps.patch: gnome-default-applications.xml.in | 111 ++++++++------------------------------ 1 files changed, 24 insertions(+), 87 deletions(-) --- NEW FILE control-center-2.13.90-fedora-apps.patch --- --- control-center-2.13.90/capplets/default-applications/gnome-default-applications.xml.in.fedora-apps 2006-01-28 13:52:24.000000000 -0500 +++ control-center-2.13.90/capplets/default-applications/gnome-default-applications.xml.in 2006-01-30 14:23:21.000000000 -0500 @@ -44,24 +44,6 @@ galeon -w %s - <_name>Encompass - encompass - encompass %s - encompass - false - false - - - <_name>Firebird - mozilla-firebird - mozilla-firebird %s - - false - true - mozilla-firebird -remote "openurl(%s,new-tab)" - mozilla-firebird -remote "openurl(%s,new-window)" - - <_name>Firefox firefox firefox %s @@ -72,16 +54,6 @@ firefox -remote "openurl(%s,new-window)" - <_name>Mozilla 1.6 - mozilla-1.6 - mozilla-1.6 %s - mozilla-icon - false - true - mozilla-1.6 -remote "openurl(%s,new-tab)" - mozilla-1.6 -remote "openurl(%s,new-window)" - - <_name>Mozilla mozilla mozilla %s @@ -92,7 +64,7 @@ mozilla -remote "openurl(%s,new-window)" - <_name>Netscape Communicator + <_name>Netscape netscape netscape %s netscape @@ -137,48 +109,6 @@ - <_name>Evolution Mail Reader 2.4 - evolution-2.4 - evolution-2.4 %s - evolution - false - - - <_name>Evolution Mail Reader 2.2 - evolution-2.2 - evolution-2.2 %s - evolution - false - - - <_name>Evolution Mail Reader 2.0 - evolution-2.0 - evolution-2.0 %s - evolution - false - - - <_name>Evolution Mail Reader 1.6 - evolution-1.6 - evolution-1.6 %s - evolution - false - - - <_name>Evolution Mail Reader 1.5 - evolution-1.5 - evolution-1.5 %s - evolution - false - - - <_name>Evolution Mail Reader 1.4 - evolution-1.4 - evolution-1.4 %s - evolution - false - - <_name>Evolution Mail Reader evolution evolution %s @@ -200,27 +130,13 @@ false - <_name>Thunderbird + <_name>Thunderbird Mail thunderbird thunderbird mailto:%s thunderbird false - <_name>Mozilla Thunderbird - mozilla-thunderbird - mozilla-thunderbird mailto:%s - thunderbird - false - - - <_name>Mozilla Mail - mozilla - mozilla -mail %s - mozilla-mail-icon - false - - <_name>Mutt mutt mutt %s @@ -228,8 +144,15 @@ true + <_name>Sylpheed + sylpheed + sylpheed --compose %s + sylpheed + false + + <_name>Sylpheed-Claws - ylpheed-claws + sylpheed-claws sylpheed-claws --compose %s sylpheed false @@ -245,6 +168,20 @@ -e + <_name>KDE Konsole + konsole + konsole + konsole + -e + + + <_name>KTerm + kterm + kterm + kterm + -e + + <_name>GNOME Terminal gnome-terminal gnome-terminal --working-directory=%f control-center-2.13.5-fedora-apps.patch: gnome-default-applications.xml.in | 111 ++++++++------------------------------ 1 files changed, 24 insertions(+), 87 deletions(-) Index: control-center-2.13.5-fedora-apps.patch =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.13.5-fedora-apps.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- control-center-2.13.5-fedora-apps.patch 17 Jan 2006 13:54:36 -0000 1.2 +++ control-center-2.13.5-fedora-apps.patch 30 Jan 2006 19:25:15 -0000 1.3 @@ -1,14 +1,5 @@ --- control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in.fedora-apps 2006-01-16 10:13:33.000000000 -0500 +++ control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in 2006-01-17 08:54:07.000000000 -0500 -@@ -10,7 +10,7 @@ - opera - opera %s - opera -- fasle -+ false - true - opera -newpage %s - opera -newwindow %s @@ -44,24 +44,6 @@ galeon -w %s Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- control-center.spec 30 Jan 2006 19:11:08 -0000 1.115 +++ control-center.spec 30 Jan 2006 19:25:15 -0000 1.116 @@ -27,7 +27,7 @@ Group: User Interface/Desktops Source: ftp://ftp.gnome.org/pub/GNOME/sources/control-center-%{version}.tar.bz2 -Patch1: control-center-2.13.5-fedora-apps.patch +Patch1: control-center-2.13.90-fedora-apps.patch Patch2: control-center-2.9.4-filesel.patch Patch3: control-center-2.10.1-mark-tool-buttons-important.patch Patch5: control-center-2.12.0-run-power-manager.patch From fedora-cvs-commits at redhat.com Mon Jan 30 19:37:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 14:37:43 -0500 Subject: rpms/control-center/devel control-center-2.13.90-broken-es-help.patch, NONE, 1.1 control-center.spec, 1.116, 1.117 Message-ID: <200601301937.k0UJbhn5001506@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/control-center/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1438 Modified Files: control-center.spec Added Files: control-center-2.13.90-broken-es-help.patch Log Message: broken help control-center-2.13.90-broken-es-help.patch: Makefile.am | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE control-center-2.13.90-broken-es-help.patch --- --- control-center-2.13.90/help/Makefile.am.broken-es-help 2006-01-30 14:36:11.000000000 -0500 +++ control-center-2.13.90/help/Makefile.am 2006-01-30 14:36:18.000000000 -0500 @@ -5,4 +5,4 @@ DOC_ENTITIES = config-accessibility-keyboard.xml config-background.xml config-behavior.xml config-cds.xml config-default-apps.xml config-file-type.xml config-hints.xml config-html.xml config-kbd.xml config-keybindings.xml config-mouse.xml config-screensaver.xml config-sound.xml config-themes.xml DOC_INCLUDES = -DOC_LINGUAS = es +DOC_LINGUAS = Index: control-center.spec =================================================================== RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v retrieving revision 1.116 retrieving revision 1.117 diff -u -r1.116 -r1.117 --- control-center.spec 30 Jan 2006 19:25:15 -0000 1.116 +++ control-center.spec 30 Jan 2006 19:37:40 -0000 1.117 @@ -34,6 +34,7 @@ Patch6: control-center-2.12.1-passwd.patch Patch7: control-center-2.13.3-gecos.patch Patch8: control-center-2.13.5-m4.patch +Patch9: control-center-2.13.90-broken-es-help.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.gnome.org @@ -98,6 +99,7 @@ %patch6 -p1 -b .passwd %patch7 -p1 -b .gecos %patch8 -p1 -b .m4 +%patch9 -p1 -b .broken-es-help %build From fedora-cvs-commits at redhat.com Mon Jan 30 19:54:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 14:54:29 -0500 Subject: rpms/gnbd-kernel/FC-4 gnbd-kernel.spec,1.96,1.97 Message-ID: <200601301954.k0UJsToI021310@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv21277 Modified Files: gnbd-kernel.spec Log Message: Build for xen. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/FC-4/gnbd-kernel.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- gnbd-kernel.spec 30 Jan 2006 15:57:03 -0000 1.96 +++ gnbd-kernel.spec 30 Jan 2006 19:54:26 -0000 1.97 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 0 +%define buildxen 1 %define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050420.133124.FC4 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.11.2 -Release: %{subversion}.54 +Release: %{subversion}.55 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Mon Jan 30 19:55:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 14:55:57 -0500 Subject: rpms/cman-kernel/FC-4 cman-kernel.spec,1.114,1.115 Message-ID: <200601301955.k0UJtvwN022004@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv21971 Modified Files: cman-kernel.spec Log Message: Build for xen. Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/FC-4/cman-kernel.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- cman-kernel.spec 30 Jan 2006 15:56:44 -0000 1.114 +++ cman-kernel.spec 30 Jan 2006 19:55:53 -0000 1.115 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 0 +%define buildxen 1 %define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050601.152643.FC4 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.11.5 -Release: %{subversion}.19 +Release: %{subversion}.20 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Mon Jan 30 19:56:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 14:56:28 -0500 Subject: rpms/dlm-kernel/FC-4 dlm-kernel.spec,1.90,1.91 Message-ID: <200601301956.k0UJuSCH022292@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22263 Modified Files: dlm-kernel.spec Log Message: Build for xen. Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/FC-4/dlm-kernel.spec,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- dlm-kernel.spec 30 Jan 2006 15:57:23 -0000 1.90 +++ dlm-kernel.spec 30 Jan 2006 19:56:26 -0000 1.91 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 0 +%define buildxen 1 %define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050601.152643.FC4 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.11.5 -Release: %{subversion}.18 +Release: %{subversion}.19 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Mon Jan 30 19:57:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 14:57:08 -0500 Subject: rpms/GFS-kernel/FC-4 GFS-kernel.spec,1.111,1.112 Message-ID: <200601301957.k0UJv8j0022642@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv22617 Modified Files: GFS-kernel.spec Log Message: Build for xen. Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/FC-4/GFS-kernel.spec,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- GFS-kernel.spec 30 Jan 2006 15:57:49 -0000 1.111 +++ GFS-kernel.spec 30 Jan 2006 19:57:06 -0000 1.112 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 0 +%define buildxen 1 %define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050601.152643.FC4 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.11.8 -Release: %{subversion}.21 +Release: %{subversion}.22 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Mon Jan 30 19:58:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 14:58:37 -0500 Subject: rpms/GFS-kernel/FC-4 GFS-kernel.spec,1.112,1.113 Message-ID: <200601301958.k0UJwbRt023340@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/GFS-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv23301 Modified Files: GFS-kernel.spec Log Message: Turn off xen. Index: GFS-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/GFS-kernel/FC-4/GFS-kernel.spec,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- GFS-kernel.spec 30 Jan 2006 19:57:06 -0000 1.112 +++ GFS-kernel.spec 30 Jan 2006 19:58:35 -0000 1.113 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 1 +%define buildxen 0 %define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050601.152643.FC4 @@ -25,7 +25,7 @@ Name: GFS-kernel Version: 2.6.11.8 -Release: %{subversion}.22 +Release: %{subversion}.23 License: GPL Group: System Environment/Kernel Summary: GFS-kernel - The Global File System kernel modules From fedora-cvs-commits at redhat.com Mon Jan 30 20:00:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:00:48 -0500 Subject: rpms/gnbd-kernel/FC-4 gnbd-kernel.spec,1.97,1.98 Message-ID: <200601302000.k0UK0mJj024056@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/gnbd-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv24022 Modified Files: gnbd-kernel.spec Log Message: Turn off xen. Index: gnbd-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/gnbd-kernel/FC-4/gnbd-kernel.spec,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- gnbd-kernel.spec 30 Jan 2006 19:54:26 -0000 1.97 +++ gnbd-kernel.spec 30 Jan 2006 20:00:31 -0000 1.98 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 1 +%define buildxen 0 %define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050420.133124.FC4 @@ -25,7 +25,7 @@ Name: gnbd-kernel Version: 2.6.11.2 -Release: %{subversion}.55 +Release: %{subversion}.56 License: GPL Group: System Environment/Kernel Summary: gnbd-kernel - The kernel module for GFS's Network Block Device From fedora-cvs-commits at redhat.com Mon Jan 30 20:03:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:03:07 -0500 Subject: rpms/kexec-tools/devel kexec-tools-1.101-kdump.patch, 1.1, 1.2 kexec-tools.spec, 1.5, 1.6 Message-ID: <200601302003.k0UK37rR024228@cvs.devel.redhat.com> Author: tgraf Update of /cvs/dist/rpms/kexec-tools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24125 Modified Files: kexec-tools-1.101-kdump.patch kexec-tools.spec Log Message: New kdump patch to support x86_64 userspace kexec-tools-1.101-kdump.patch: configure | 12 kexec/Makefile | 1 kexec/arch/i386/Makefile | 1 kexec/arch/i386/crashdump-x86.c | 724 +++++++++++++++++++++++++++++ kexec/arch/i386/crashdump-x86.h | 21 kexec/arch/i386/include/arch/options.h | 6 kexec/arch/i386/kexec-bzImage.c | 2 kexec/arch/i386/kexec-elf-x86.c | 48 + kexec/arch/i386/kexec-multiboot-x86.c | 3 kexec/arch/i386/kexec-x86.c | 52 +- kexec/arch/i386/kexec-x86.h | 13 kexec/arch/i386/x86-linux-setup.c | 5 kexec/arch/i386/x86-linux-setup.h | 3 kexec/arch/ia64/kexec-ia64.c | 12 kexec/arch/ppc/kexec-ppc.c | 8 kexec/arch/ppc64/Makefile | 5 kexec/arch/ppc64/fs2dt.c | 340 +++++++++++++ kexec/arch/ppc64/kexec-elf-ppc64.c | 265 +++++++++- kexec/arch/ppc64/kexec-elf-rel-ppc64.c | 2 kexec/arch/ppc64/kexec-ppc64.c | 527 +++++++++++++++++++++ kexec/arch/ppc64/kexec-ppc64.h | 15 kexec/arch/s390/Makefile | 6 kexec/arch/s390/include/arch/options.h | 11 kexec/arch/s390/kexec-elf-rel-s390.c | 23 kexec/arch/s390/kexec-image.c | 137 +++++ kexec/arch/s390/kexec-s390.c | 104 ++++ kexec/arch/s390/kexec-s390.h | 25 + kexec/arch/x86_64/Makefile | 1 kexec/arch/x86_64/crashdump-x86_64.c | 766 +++++++++++++++++++++++++++++++ kexec/arch/x86_64/crashdump-x86_64.h | 24 kexec/arch/x86_64/include/arch/options.h | 6 kexec/arch/x86_64/kexec-elf-x86_64.c | 37 + kexec/arch/x86_64/kexec-x86_64.c | 45 + kexec/crashdump.c | 65 ++ kexec/crashdump.h | 9 kexec/kexec-syscall.h | 9 kexec/kexec.c | 22 kexec/kexec.h | 10 purgatory/Makefile | 12 purgatory/arch/i386/Makefile | 1 purgatory/arch/i386/crashdump_backup.c | 46 + purgatory/arch/i386/purgatory-x86.c | 7 purgatory/arch/i386/purgatory-x86.h | 1 purgatory/arch/ia64/purgatory-ia64.c | 6 purgatory/arch/ppc/purgatory-ppc.c | 6 purgatory/arch/ppc64/Makefile | 2 purgatory/arch/ppc64/v2wrap.S | 114 ++++ purgatory/arch/s390/Makefile | 7 purgatory/arch/s390/include/limits.h | 54 ++ purgatory/arch/s390/include/stdint.h | 24 purgatory/arch/x86_64/Makefile | 1 purgatory/arch/x86_64/purgatory-x86_64.c | 7 purgatory/include/purgatory.h | 1 purgatory/purgatory.c | 1 54 files changed, 3562 insertions(+), 93 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 kexec-tools-1.101-kdump.patch Index: kexec-tools-1.101-kdump.patch =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools-1.101-kdump.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kexec-tools-1.101-kdump.patch 29 Aug 2005 20:12:47 -0000 1.1 +++ kexec-tools-1.101-kdump.patch 30 Jan 2006 20:02:21 -0000 1.2 @@ -1,7 +1,41 @@ -diff -Nurp kexec-tools-1.101-orig/kexec/arch/i386/crashdump-x86.c kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c ---- kexec-tools-1.101-orig/kexec/arch/i386/crashdump-x86.c 1970-01-01 05:30:00.000000000 +0530 -+++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c 2005-08-24 15:46:08.636240824 +0530 -@@ -0,0 +1,723 @@ +diff -urNp -X dontdiff kexec-tools-1.101/configure kexec-tools-1.101-kdump/configure +--- kexec-tools-1.101/configure 2005-02-16 18:07:44.000000000 +0530 ++++ kexec-tools-1.101-kdump/configure 2005-12-14 16:00:40.000000000 +0530 +@@ -1384,12 +1384,18 @@ case $host_cpu in + powerpc ) + host_cpu="ppc" + ;; ++ powerpc64 ) ++ host_cpu="ppc64" ++ ;; ++ s390x ) ++ host_cpu="s390" ++ ;; + * ) + host_cpu="$host_cpu" + ;; + esac + case $host_cpu in +- i386|ppc|x86_64|alpha|ppc64|ia64) ++ i386|ppc|x86_64|alpha|ppc64|ia64|s390) + ;; + * ) + { { echo "$as_me:$LINENO: error: unsupported architecture $host_cpu" >&5 +@@ -1421,6 +1427,10 @@ if test "${with_gamecube+set}" = set; th + EXTRA_CFLAGS="$EXTRA_CFLAGS -DCONFIG_GAMECUBE=1" + fi; + ++# Check whether ppc64. Add -m64 for building 64-bit binary ++if test "$ARCH" = ppc64; then ++ EXTRA_CFLAGS="$EXTRA_CFLAGS -m64" ++fi; + + # Check whether --with-zlib or --without-zlib was given. + if test "${with_zlib+set}" = set; then +diff -urNp -X dontdiff kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c +--- kexec-tools-1.101/kexec/arch/i386/crashdump-x86.c 1970-01-01 05:30:00.000000000 +0530 ++++ kexec-tools-1.101-kdump/kexec/arch/i386/crashdump-x86.c 2005-12-15 16:51:43.720392560 +0530 +@@ -0,0 +1,724 @@ +/* + * kexec: Linux boots Linux + * @@ -27,15 +61,17 @@ +#include +#include +#include ++#include ++#include ++#include +#include "../../kexec.h" +#include "../../kexec-elf.h" +#include "../../kexec-syscall.h" ++#include "../../crashdump.h" +#include "kexec-x86.h" +#include "crashdump-x86.h" +#include + -+#define MAX_LINE 160 -+ +extern struct arch_options_t arch_options; + +/* Forward Declaration. */ @@ -430,33 +466,36 @@ + return 0; +} + -+/* Returns the virtual address of start of crash notes section. */ -+static int get_crash_notes_section_addr(unsigned long *addr) ++ ++/* ++ * This routine is specific to i386 architecture to maintain the ++ * backward compatibility, other architectures can use the per ++ * cpu version get_crash_notes_per_cpu() directly. ++ */ ++static int get_crash_notes(int cpu, uint64_t *addr) +{ -+ const char crash_notes[]= "/sys/kernel/crash_notes"; ++ char crash_notes[PATH_MAX]; + char line[MAX_LINE]; + FILE *fp; ++ unsigned long vaddr; ++ int count; + ++ sprintf(crash_notes, "/sys/kernel/crash_notes"); + fp = fopen(crash_notes, "r"); -+ if (!fp) { -+ fprintf(stderr, "Cannot open %s: %s\n", -+ crash_notes, strerror(errno)); -+ fprintf(stderr, "Try mounting sysfs\n"); -+ return -1; -+ } -+ -+ if (fgets(line, sizeof(line), fp) != 0) { -+ int count; -+ count = sscanf(line, "%lx", addr); -+ if (count != 1) { -+ *addr = 0; -+ return -1; ++ if (fp) { ++ if (fgets(line, sizeof(line), fp) != 0) { ++ count = sscanf(line, "%lx", &vaddr); ++ if (count != 1) ++ die("Cannot parse %s: %s\n", crash_notes, ++ strerror(errno)); + } ++ *addr = __pa(vaddr + (cpu * MAX_NOTE_BYTES)); +#if 0 -+ printf("crash_notes addr = %lx\n", *addr); ++ printf("crash_notes addr = %Lx\n", *addr); +#endif -+ } -+ return 0; ++ return 0; ++ } else ++ return get_crash_notes_per_cpu(cpu, addr); +} + +/* Prepares the crash memory elf64 headers and stores in supplied buffer. */ @@ -468,7 +507,7 @@ + int i; + char *bufp; + long int nr_cpus = 0; -+ unsigned long notes_addr, notes_offset; ++ uint64_t notes_addr; + + bufp = (char*) buf; + @@ -501,23 +540,20 @@ + return -1; + } + -+ /* Need to find a better way to determine per cpu notes section size. */ -+#define MAX_NOTE_BYTES 1024 -+ if (get_crash_notes_section_addr (¬es_addr) < 0) { -+ return -1; -+ } -+ notes_offset = __pa(notes_addr); + for (i = 0; i < nr_cpus; i++) { ++ if (get_crash_notes(i, ¬es_addr) < 0) { ++ /* This cpu is not present. Skip it. */ ++ continue; ++ } + phdr = (Elf64_Phdr *) bufp; + bufp += sizeof(Elf64_Phdr); + phdr->p_type = PT_NOTE; + phdr->p_flags = 0; -+ phdr->p_offset = notes_offset; -+ phdr->p_vaddr = phdr->p_paddr = notes_offset; ++ phdr->p_offset = phdr->p_paddr = notes_addr; ++ phdr->p_vaddr = 0; + phdr->p_filesz = phdr->p_memsz = MAX_NOTE_BYTES; + /* Do we need any alignment of segments? */ + phdr->p_align = 0; -+ notes_offset += MAX_NOTE_BYTES; + + /* Increment number of program headers. */ + (elf->e_phnum)++; @@ -564,7 +600,7 @@ + int i; + char *bufp; + long int nr_cpus = 0; -+ unsigned long notes_addr, notes_offset; ++ uint64_t notes_addr; + + bufp = (char*) buf; + @@ -599,21 +635,20 @@ + + /* Need to find a better way to determine per cpu notes section size. */ +#define MAX_NOTE_BYTES 1024 -+ if (get_crash_notes_section_addr (¬es_addr) < 0) { -+ return -1; -+ } -+ notes_offset = __pa(notes_addr); + for (i = 0; i < nr_cpus; i++) { ++ if (get_crash_notes(i, ¬es_addr) < 0) { ++ /* This cpu is not present. Skip it. */ ++ return -1; ++ } + phdr = (Elf32_Phdr *) bufp; + bufp += sizeof(Elf32_Phdr); + phdr->p_type = PT_NOTE; + phdr->p_flags = 0; -+ phdr->p_offset = notes_offset; -+ phdr->p_vaddr = phdr->p_paddr = notes_offset; ++ phdr->p_offset = phdr->p_paddr = notes_addr; ++ phdr->p_vaddr = 0; + phdr->p_filesz = phdr->p_memsz = MAX_NOTE_BYTES; [...3659 lines suppressed...] ++ std 6,-16(3) # send slaves back down ++ bctr # start kernel ++ ++ .org 0xf0 ++copied: .llong 0 ++kernel: .llong 0 ++ .org 0x100 ++__end_stub: ++ .equ boot_block, . - start +diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/s390/include/limits.h kexec-tools-1.101-kdump/purgatory/arch/s390/include/limits.h +--- kexec-tools-1.101/purgatory/arch/s390/include/limits.h 1970-01-01 05:30:00.000000000 +0530 ++++ kexec-tools-1.101-kdump/purgatory/arch/s390/include/limits.h 2005-12-14 16:00:40.000000000 +0530 +@@ -0,0 +1,54 @@ ++#ifndef _LIMITS_H_ ++#define _LIMITS_H_ ++ ++/* Number of bits in a `char'. */ ++# define CHAR_BIT 8 ++ ++/* Minimum and maximum values a `signed char' can hold. */ ++# define SCHAR_MIN (-128) ++# define SCHAR_MAX 127 ++ ++/* Maximum value an `unsigned char' can hold. (Minimum is 0.) */ ++# define UCHAR_MAX 255 ++ ++# define CHAR_MIN SCHAR_MIN ++# define CHAR_MAX SCHAR_MAX ++ ++/* Minimum and maximum values a `signed short int' can hold. */ ++# define SHRT_MIN (-32768) ++# define SHRT_MAX 32767 ++ ++/* Maximum value an `unsigned short int' can hold. (Minimum is 0.) */ ++# define USHRT_MAX 65535 ++ ++/* Minimum and maximum values a `signed int' can hold. */ ++# define INT_MIN (-INT_MAX - 1) ++# define INT_MAX 2147483647 ++ ++/* Maximum value an `unsigned int' can hold. (Minimum is 0.) */ ++# define UINT_MAX 4294967295U ++ ++/* Minimum and maximum values a `signed long int' can hold. */ ++#ifdef __s390x__ ++# define LONG_MAX 9223372036854775807L ++#else ++# define LONG_MAX 2147483647L ++#endif ++ ++# define LONG_MIN (-LONG_MAX - 1L) ++ ++/* Maximum value an `unsigned long int' can hold. (Minimum is 0.) */ ++#ifdef __s390x__ ++# define ULONG_MAX 18446744073709551615UL ++#else ++# define ULONG_MAX 4294967295UL ++#endif ++ ++/* Minimum and maximum values a `signed long long int' can hold. */ ++# define LLONG_MAX 9223372036854775807LL ++# define LLONG_MIN (-LLONG_MAX - 1LL) ++ ++/* Maximum value an `unsigned long long int' can hold. (Minimum is 0.) */ ++# define ULLONG_MAX 18446744073709551615ULL ++ ++#endif /* !_LIMITS_H_ */ +diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/s390/include/stdint.h kexec-tools-1.101-kdump/purgatory/arch/s390/include/stdint.h +--- kexec-tools-1.101/purgatory/arch/s390/include/stdint.h 1970-01-01 05:30:00.000000000 +0530 ++++ kexec-tools-1.101-kdump/purgatory/arch/s390/include/stdint.h 2005-12-14 16:00:40.000000000 +0530 +@@ -0,0 +1,24 @@ ++#ifndef _STDINT_H ++#define _STDINT_H ++ ++typedef unsigned long size_t; ++ ++typedef unsigned char uint8_t; ++typedef unsigned short uint16_t; ++typedef unsigned int uint32_t; ++#ifdef __s390x__ ++typedef unsigned long uint64_t; ++#else ++typedef unsigned long long uint64_t; ++#endif ++ ++typedef signed char int8_t; ++typedef short int16_t; ++typedef int int32_t; ++#ifdef __s390x__ ++typedef long int64_t; ++#else ++typedef long long int64_t; ++#endif ++ ++#endif +diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/s390/Makefile kexec-tools-1.101-kdump/purgatory/arch/s390/Makefile +--- kexec-tools-1.101/purgatory/arch/s390/Makefile 1970-01-01 05:30:00.000000000 +0530 ++++ kexec-tools-1.101-kdump/purgatory/arch/s390/Makefile 2005-12-14 16:00:40.000000000 +0530 +@@ -0,0 +1,7 @@ ++# ++# Purgatory s390 ++# ++ ++PURGATORY_C_SRCS+= ++PURGATORY_S_SRCS+= ++ +diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/x86_64/Makefile kexec-tools-1.101-kdump/purgatory/arch/x86_64/Makefile +--- kexec-tools-1.101/purgatory/arch/x86_64/Makefile 2004-12-21 12:43:53.000000000 +0530 ++++ kexec-tools-1.101-kdump/purgatory/arch/x86_64/Makefile 2005-12-14 16:00:56.000000000 +0530 +@@ -9,6 +9,7 @@ PURGATORY_S_SRCS+= purgatory/arch/x86_64 + PURGATORY_S_SRCS+= purgatory/arch/x86_64/setup-x86_64.S + PURGATORY_S_SRCS+= purgatory/arch/x86_64/stack.S + PURGATORY_C_SRCS+= purgatory/arch/x86_64/purgatory-x86_64.c ++PURGATORY_C_SRCS+= purgatory/arch/i386/crashdump_backup.c + PURGATORY_C_SRCS+= purgatory/arch/i386/console-x86.c + PURGATORY_C_SRCS+= purgatory/arch/i386/vga.c + PURGATORY_C_SRCS+= purgatory/arch/i386/pic.c +diff -urNp -X dontdiff kexec-tools-1.101/purgatory/arch/x86_64/purgatory-x86_64.c kexec-tools-1.101-kdump/purgatory/arch/x86_64/purgatory-x86_64.c +--- kexec-tools-1.101/purgatory/arch/x86_64/purgatory-x86_64.c 2004-12-21 22:07:41.000000000 +0530 ++++ kexec-tools-1.101-kdump/purgatory/arch/x86_64/purgatory-x86_64.c 2005-12-14 16:00:56.000000000 +0530 +@@ -4,9 +4,16 @@ + + uint8_t reset_vga = 0; + uint8_t legacy_pic = 0; ++uint8_t panic_kernel = 0; + + void setup_arch(void) + { if (reset_vga) x86_reset_vga(); if (legacy_pic) x86_setup_legacy_pic(); } @@ -1488,11 +4450,11 @@ +/* This function can be used to execute after the SHA256 verification. */ +void post_verification_setup_arch(void) +{ -+ /* Nothing for now */ ++ if (panic_kernel) crashdump_backup_memory(); +} -diff -Nurp kexec-tools-1.101-orig/purgatory/include/purgatory.h kexec-tools-1.101-kdump/purgatory/include/purgatory.h ---- kexec-tools-1.101-orig/purgatory/include/purgatory.h 2004-12-18 18:42:15.000000000 +0530 -+++ kexec-tools-1.101-kdump/purgatory/include/purgatory.h 2005-08-24 15:45:28.145396368 +0530 +diff -urNp -X dontdiff kexec-tools-1.101/purgatory/include/purgatory.h kexec-tools-1.101-kdump/purgatory/include/purgatory.h +--- kexec-tools-1.101/purgatory/include/purgatory.h 2004-12-18 18:42:15.000000000 +0530 ++++ kexec-tools-1.101-kdump/purgatory/include/purgatory.h 2005-12-14 15:57:15.000000000 +0530 @@ -4,5 +4,6 @@ void putchar(int ch); void printf(const char *fmt, ...); @@ -1500,9 +4462,49 @@ +void post_verification_setup_arch(void); #endif /* PURGATORY_H */ -diff -Nurp kexec-tools-1.101-orig/purgatory/purgatory.c kexec-tools-1.101-kdump/purgatory/purgatory.c ---- kexec-tools-1.101-orig/purgatory/purgatory.c 2004-12-22 00:21:03.000000000 +0530 -+++ kexec-tools-1.101-kdump/purgatory/purgatory.c 2005-08-24 15:45:28.144396520 +0530 +diff -urNp -X dontdiff kexec-tools-1.101/purgatory/Makefile kexec-tools-1.101-kdump/purgatory/Makefile +--- kexec-tools-1.101/purgatory/Makefile 2005-01-09 04:06:32.000000000 +0530 ++++ kexec-tools-1.101-kdump/purgatory/Makefile 2005-12-14 15:57:19.000000000 +0530 +@@ -6,6 +6,11 @@ + # There is probably a cleaner way to do this but for now this + # should keep us from accidentially include unsafe library functions + # or headers. ++ ++ifeq ($(ARCH),ppc64) ++LDFLAGS = -melf64ppc ++endif ++ + PCFLAGS:=-Wall -Os \ + -I$(shell $(CC) -print-file-name=include) \ + -Ipurgatory/include -Ipurgatory/arch/$(ARCH)/include \ +@@ -17,9 +22,11 @@ PCFLAGS += $(call cc-option, -fnostdinc) + PCFLAGS += $(call cc-option, -fno-zero-initialized-in-bss) + + PURGATORY_C_SRCS:= ++ifneq ($(ARCH),ppc64) + PURGATORY_C_SRCS += purgatory/purgatory.c + PURGATORY_C_SRCS += purgatory/printf.c + PURGATORY_C_SRCS += purgatory/string.c ++endif + PURGATORY_S_OBJS:= + + include purgatory/arch/$(ARCH)/Makefile +@@ -54,7 +61,12 @@ $(PURGATORY_S_OBJS): $(OBJDIR)/%.o: %.S + + $(PURGATORY): $(PURGATORY_OBJS) $(UTIL_LIB) + $(MKDIR) -p $(@D) ++ifneq ($(ARCH),ppc64) + $(LD) $(LDFLAGS) --no-undefined -e purgatory_start -r -o $@ $(PURGATORY_OBJS) $(UTIL_LIB) ++else ++ $(LD) -Ttext=0 -e 0 -o $(OBJDIR)/purgatory/v2wrap.elf $(PURGATORY_OBJS) ++ objcopy -O binary $(OBJDIR)/purgatory/v2wrap.elf $@ ++endif + + echo:: + @echo "PURGATORY_C_SRCS $(PURGATORY_C_SRCS)" +diff -urNp -X dontdiff kexec-tools-1.101/purgatory/purgatory.c kexec-tools-1.101-kdump/purgatory/purgatory.c +--- kexec-tools-1.101/purgatory/purgatory.c 2004-12-22 00:21:03.000000000 +0530 ++++ kexec-tools-1.101-kdump/purgatory/purgatory.c 2005-12-14 15:57:15.000000000 +0530 @@ -44,4 +44,5 @@ void purgatory(void) printf("I'm in purgatory\n"); setup_arch(); Index: kexec-tools.spec =================================================================== RCS file: /cvs/dist/rpms/kexec-tools/devel/kexec-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kexec-tools.spec 16 Dec 2005 23:20:48 -0000 1.5 +++ kexec-tools.spec 30 Jan 2006 20:02:36 -0000 1.6 @@ -1,6 +1,6 @@ Name: kexec-tools Version: 1.101 -Release: 5.1 +Release: 6 License: GPL Group: Applications/System Summary: The kexec/kdump userspace component. @@ -104,6 +104,9 @@ %doc TODO %changelog +* Mon Jan 30 2006 Thomas Graf +- New kdump patch to support x86_64 userspace + * Fri Dec 16 2005 Jesse Keating - rebuilt for new gcj From fedora-cvs-commits at redhat.com Mon Jan 30 20:03:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:03:40 -0500 Subject: rpms/cman-kernel/FC-4 cman-kernel.spec,1.115,1.116 Message-ID: <200601302003.k0UK3epg024264@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/cman-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv24225 Modified Files: cman-kernel.spec Log Message: Turn off xen. Index: cman-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/cman-kernel/FC-4/cman-kernel.spec,v retrieving revision 1.115 retrieving revision 1.116 diff -u -r1.115 -r1.116 --- cman-kernel.spec 30 Jan 2006 19:55:53 -0000 1.115 +++ cman-kernel.spec 30 Jan 2006 20:03:23 -0000 1.116 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 1 +%define buildxen 0 %define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050601.152643.FC4 @@ -25,7 +25,7 @@ Name: cman-kernel Version: 2.6.11.5 -Release: %{subversion}.20 +Release: %{subversion}.21 License: GPL Group: System Environment/Kernel Summary: cman-kernel - The Cluster Manager kernel modules From fedora-cvs-commits at redhat.com Mon Jan 30 20:05:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:05:04 -0500 Subject: rpms/dlm-kernel/FC-4 dlm-kernel.spec,1.91,1.92 Message-ID: <200601302005.k0UK54Eq024373@cvs.devel.redhat.com> Author: cfeist Update of /cvs/dist/rpms/dlm-kernel/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv24340 Modified Files: dlm-kernel.spec Log Message: Turn off xen. Index: dlm-kernel.spec =================================================================== RCS file: /cvs/dist/rpms/dlm-kernel/FC-4/dlm-kernel.spec,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- dlm-kernel.spec 30 Jan 2006 19:56:26 -0000 1.91 +++ dlm-kernel.spec 30 Jan 2006 20:04:50 -0000 1.92 @@ -11,7 +11,7 @@ ############################################################################### %define buildup 1 %define buildsmp 1 -%define buildxen 1 +%define buildxen 0 %define kernel_version 2.6.14-1.1656_FC4 %define subversion 20050601.152643.FC4 @@ -25,7 +25,7 @@ Name: dlm-kernel Version: 2.6.11.5 -Release: %{subversion}.19 +Release: %{subversion}.20 License: GPL Group: System Environment/Kernel Summary: dlm-kernel - The Distributed Lock Manager kernel modules. From fedora-cvs-commits at redhat.com Mon Jan 30 20:19:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:19:22 -0500 Subject: rpms/gnome-utils/devel .cvsignore, 1.36, 1.37 gnome-utils.spec, 1.85, 1.86 sources, 1.39, 1.40 Message-ID: <200601302019.k0UKJMEf010244@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10165 Modified Files: .cvsignore gnome-utils.spec sources Log Message: 2.13.91 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/.cvsignore,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- .cvsignore 23 Jan 2006 16:21:52 -0000 1.36 +++ .cvsignore 30 Jan 2006 20:19:19 -0000 1.37 @@ -2,3 +2,7 @@ gnome-utils-2.13.5.tar.bz2 zenity-2.13.5.tar.bz2 gcalctool-5.7.27.tar.bz2 +gcalctool-5.7.28.tar.bz2 +zenity-2.13.90.tar.bz2 +gnome-utils-2.13.91.tar.bz2 +gucharmap-1.5.1.tar.bz2 Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- gnome-utils.spec 23 Jan 2006 16:21:52 -0000 1.85 +++ gnome-utils.spec 30 Jan 2006 20:19:19 -0000 1.86 @@ -11,15 +11,15 @@ %define po_package gnome-utils-2.0 -%define gcalctool_version 5.7.27 -%define gucharmap_version 1.5.0 -%define zenity_version 2.13.5 +%define gcalctool_version 5.7.28 +%define gucharmap_version 1.5.1 +%define zenity_version 2.13.90 %define dbus_version 0.60 Summary: GNOME utility programs. Name: gnome-utils -Version: 2.13.5 +Version: 2.13.91 Release: 4 Epoch: 1 License: GPL @@ -211,8 +211,14 @@ %{_sysconfdir}/pam.d/gnome-system-log %changelog +* Mon Jan 30 2006 Matthias Clasen 2.13.91-1 +- Update to gnome-utils 2.13.91 +- Update to zenity 2.13.90 +- Update to gucharmap 1.5.1 +- Update to gcalctool 5.7.28 + * Mon Jan 23 2006 Ray Strode 2.13.5-4 -- Update to gcalctools 5.7.27 +- Update to gcalctool 5.7.27 * Sun Jan 22 2006 Ray Strode 2.13.5-3 - Update to gcalctools 5.7.26 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/sources,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sources 23 Jan 2006 16:21:52 -0000 1.39 +++ sources 30 Jan 2006 20:19:19 -0000 1.40 @@ -1,4 +1,4 @@ -e7f8e1201b2b81cd283d7a4db512141a gucharmap-1.5.0.tar.bz2 -599744ac5f121b0671abf6e7a4112da4 gnome-utils-2.13.5.tar.bz2 -bc4672759e106dde8547675d4f46720e zenity-2.13.5.tar.bz2 -b4caea325f632926509845e97f466146 gcalctool-5.7.27.tar.bz2 +8bb1ea99ed59184b2b49c192a80fc64d gcalctool-5.7.28.tar.bz2 +a5f7d3d6524f7f2da0978541c74aa40b zenity-2.13.90.tar.bz2 +270d8f73d28e2334becc9c3f2bf126c5 gnome-utils-2.13.91.tar.bz2 +7ae1df29812ac27379858ffc02cfc318 gucharmap-1.5.1.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 30 20:20:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:20:16 -0500 Subject: rpms/gnome-utils/devel gnome-utils.spec,1.86,1.87 Message-ID: <200601302020.k0UKKG0K010724@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10674 Modified Files: gnome-utils.spec Log Message: 2.13.91 Index: gnome-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-utils/devel/gnome-utils.spec,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- gnome-utils.spec 30 Jan 2006 20:19:19 -0000 1.86 +++ gnome-utils.spec 30 Jan 2006 20:20:13 -0000 1.87 @@ -20,7 +20,7 @@ Summary: GNOME utility programs. Name: gnome-utils Version: 2.13.91 -Release: 4 +Release: 1 Epoch: 1 License: GPL Group: Applications/System From fedora-cvs-commits at redhat.com Mon Jan 30 20:25:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:25:29 -0500 Subject: rpms/metacity/devel .cvsignore, 1.29, 1.30 metacity.spec, 1.49, 1.50 sources, 1.29, 1.30 Message-ID: <200601302025.k0UKPTnh005953@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/metacity/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5938 Modified Files: .cvsignore metacity.spec sources Log Message: 2.13.55 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 27 Jan 2006 03:14:23 -0000 1.29 +++ .cvsignore 30 Jan 2006 20:25:27 -0000 1.30 @@ -1,2 +1,3 @@ metacity-2.13.21.tar.bz2 metacity-2.13.34.tar.bz2 +metacity-2.13.55.tar.bz2 Index: metacity.spec =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/metacity.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- metacity.spec 27 Jan 2006 03:14:23 -0000 1.49 +++ metacity.spec 30 Jan 2006 20:25:27 -0000 1.50 @@ -2,7 +2,7 @@ Summary: Metacity window manager Name: metacity -Version: 2.13.34 +Version: 2.13.55 Release: 1 URL: http://ftp.gnome.org/pub/gnome/sources/metacity/ Source0: %{name}-%{version}.tar.bz2 @@ -106,6 +106,9 @@ %{_mandir}/man1/* %changelog +* Mon Jan 30 2006 Matthias Clasen 2.13.55-1 +- Update to 2.13.55 + * Thu Jan 26 2006 Matthias Clasen 2.13.34-1 - Update to 2.13.34 Index: sources =================================================================== RCS file: /cvs/dist/rpms/metacity/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 27 Jan 2006 03:14:23 -0000 1.29 +++ sources 30 Jan 2006 20:25:27 -0000 1.30 @@ -1 +1 @@ -d6c8b2a8a8d205ffdaab76d348bd97b7 metacity-2.13.34.tar.bz2 +34ee1ce1c7f6d8c7d29beb2f2265c752 metacity-2.13.55.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 30 20:28:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:28:14 -0500 Subject: rpms/libwnck/devel .cvsignore, 1.27, 1.28 libwnck.spec, 1.38, 1.39 sources, 1.27, 1.28 Message-ID: <200601302028.k0UKSEsN006249@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libwnck/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6230 Modified Files: .cvsignore libwnck.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 17 Jan 2006 02:40:32 -0000 1.27 +++ .cvsignore 30 Jan 2006 20:28:11 -0000 1.28 @@ -5,3 +5,4 @@ libwnck-2.13.3.tar.bz2 libwnck-2.13.4.tar.bz2 libwnck-2.13.5.tar.bz2 +libwnck-2.13.90.tar.bz2 Index: libwnck.spec =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/libwnck.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- libwnck.spec 17 Jan 2006 02:40:32 -0000 1.38 +++ libwnck.spec 30 Jan 2006 20:28:11 -0000 1.39 @@ -5,7 +5,7 @@ Summary: Window Navigator Construction Kit Name: libwnck -Version: 2.13.5 +Version: 2.13.90 Release: 1 URL: http://ftp.gnome.org/pub/GNOME/sources/libwnck/ Source0: %{name}-%{version}.tar.bz2 @@ -87,6 +87,9 @@ %{_datadir}/gtk-doc/html/libwnck %changelog +* Mon Jan 30 2006 Matthias Clasen - 2.13.90-1 +- Update to 2.13.90 + * Mon Jan 16 2006 Matthias Clasen - 2.13.5-1 - Update to 2.13.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libwnck/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 17 Jan 2006 02:40:32 -0000 1.27 +++ sources 30 Jan 2006 20:28:11 -0000 1.28 @@ -1 +1 @@ -cb2da2795f517c713ec98560d078a102 libwnck-2.13.5.tar.bz2 +db59b6756e4854a5c6f92743e178fa4f libwnck-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 30 20:33:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:33:21 -0500 Subject: rpms/eog/devel .cvsignore, 1.24, 1.25 eog.spec, 1.36, 1.37 sources, 1.24, 1.25 Message-ID: <200601302033.k0UKXLgb006742@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6722 Modified Files: .cvsignore eog.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eog/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 17 Jan 2006 03:46:37 -0000 1.24 +++ .cvsignore 30 Jan 2006 20:33:18 -0000 1.25 @@ -11,3 +11,4 @@ eog-2.13.3.tar.bz2 eog-2.13.4.tar.bz2 eog-2.13.5.tar.bz2 +eog-2.13.90.tar.bz2 Index: eog.spec =================================================================== RCS file: /cvs/dist/rpms/eog/devel/eog.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- eog.spec 17 Jan 2006 03:46:37 -0000 1.36 +++ eog.spec 30 Jan 2006 20:33:19 -0000 1.37 @@ -12,7 +12,7 @@ Summary: Eye of GNOME image viewer Name: eog -Version: 2.13.5 +Version: 2.13.90 Release: 1 URL: http://www.gnome.org Source: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/eog/%{name}-%{version}.tar.bz2 @@ -97,6 +97,9 @@ %{_sysconfdir}/gconf/schemas/*.schemas %changelog +* Mon Jan 30 2006 Matthias Clasen 2.13.90-1 +- Update to 2.13.90 + * Mon Jan 16 2006 Matthias Clasen 2.13.5-1 - Update to 2.13.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/eog/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 17 Jan 2006 03:46:37 -0000 1.24 +++ sources 30 Jan 2006 20:33:19 -0000 1.25 @@ -1 +1 @@ -71f67205117602068b246ded1a5ddf83 eog-2.13.5.tar.bz2 +26fd268929bdb96d1d669ee361db496f eog-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 30 20:36:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:36:06 -0500 Subject: rpms/gedit/devel .cvsignore, 1.33, 1.34 gedit.spec, 1.63, 1.64 sources, 1.35, 1.36 Message-ID: <200601302036.k0UKa6BE007016@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6996 Modified Files: .cvsignore gedit.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 27 Jan 2006 04:54:51 -0000 1.33 +++ .cvsignore 30 Jan 2006 20:35:54 -0000 1.34 @@ -8,3 +8,4 @@ gedit-2.13.2.tar.bz2 gedit-2.13.3.tar.bz2 gedit-2.13.4.tar.bz2 +gedit-2.13.90.tar.bz2 Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- gedit.spec 27 Jan 2006 04:54:51 -0000 1.63 +++ gedit.spec 30 Jan 2006 20:35:54 -0000 1.64 @@ -15,7 +15,7 @@ Summary: gEdit is a small but powerful text editor for GNOME. Name: gedit -Version: 2.13.4 +Version: 2.13.90 Release: 1 Epoch: 1 License: GPL @@ -150,6 +150,9 @@ %{_libdir}/pkgconfig/gedit-2.14.pc %changelog +* Mon Jan 30 2006 Matthias Clasen - 1:2.13.90-1 +- Update to 2.13.90 + * Thu Jan 26 2006 Matthias Clasen - 1:2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/sources,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- sources 27 Jan 2006 04:54:51 -0000 1.35 +++ sources 30 Jan 2006 20:35:54 -0000 1.36 @@ -1 +1 @@ -4eca36638401b6e350546371753c332b gedit-2.13.4.tar.bz2 +62973491fe639ebf17ed0d11139ceb1b gedit-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 30 20:36:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:36:53 -0500 Subject: rpms/pykickstart/devel .cvsignore, 1.14, 1.15 pykickstart.spec, 1.14, 1.15 sources, 1.15, 1.16 Message-ID: <200601302036.k0UKarkk007132@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7111 Modified Files: .cvsignore pykickstart.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 19 Jan 2006 21:45:57 -0000 1.14 +++ .cvsignore 30 Jan 2006 20:36:51 -0000 1.15 @@ -3,3 +3,4 @@ pykickstart-0.11.tar.gz pykickstart-0.12.tar.gz pykickstart-0.13.tar.gz +pykickstart-0.14.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- pykickstart.spec 19 Jan 2006 21:45:57 -0000 1.14 +++ pykickstart.spec 30 Jan 2006 20:36:51 -0000 1.15 @@ -2,7 +2,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart -Version: 0.13 +Version: 0.14 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -36,6 +36,10 @@ /usr/bin/ksvalidator %changelog +* Mon Jan 30 2006 Chris Lumens 0.14-1 +- Fix VNC parameter parsing (#179209). +- Deprecate --connect. Add --host and --port instead. + * Thu Jan 19 2006 Chris Lumens 0.13-1 - Recognize the --eject parameter to shutdown/halt. - Store the exact post-installation action in ksdata. Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 19 Jan 2006 21:45:57 -0000 1.15 +++ sources 30 Jan 2006 20:36:51 -0000 1.16 @@ -1 +1 @@ -41fcb5aff2268f62efa367d5ff92bed1 pykickstart-0.13.tar.gz +29ab0085896444efcce48fa3fa19d024 pykickstart-0.14.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 20:51:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 15:51:57 -0500 Subject: rpms/gedit/devel gedit.spec,1.64,1.65 Message-ID: <200601302051.k0UKpvh3020608@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20593 Modified Files: gedit.spec Log Message: Fix file lists Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- gedit.spec 30 Jan 2006 20:35:54 -0000 1.64 +++ gedit.spec 30 Jan 2006 20:51:54 -0000 1.65 @@ -135,13 +135,11 @@ %{_datadir}/pixmaps %{_datadir}/gnome %{_datadir}/omf -%{_datadir}/mime-info %{_datadir}/applications %{_mandir}/man1/* %{_libdir}/gedit-2 %{_bindir}/* %{_sysconfdir}/gconf/schemas/* -%{_datadir}/application-registry/gedit.applications %files devel From fedora-cvs-commits at redhat.com Mon Jan 30 21:03:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 16:03:30 -0500 Subject: rpms/kudzu/devel .cvsignore,1.101,1.102 sources,1.112,1.113 Message-ID: <200601302103.k0UL3UPf031522@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31467 Modified Files: .cvsignore sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/.cvsignore,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- .cvsignore 25 Jan 2006 23:22:00 -0000 1.101 +++ .cvsignore 30 Jan 2006 21:03:10 -0000 1.102 @@ -1 +1 @@ -kudzu-1.2.23.tar.gz +kudzu-1.2.24.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.112 retrieving revision 1.113 diff -u -r1.112 -r1.113 --- sources 25 Jan 2006 23:22:00 -0000 1.112 +++ sources 30 Jan 2006 21:03:28 -0000 1.113 @@ -1 +1 @@ -66069f09a1d2e645ea73ff2b58df0e05 kudzu-1.2.23.tar.gz +42200472ac8d02d029d5d6944359505b kudzu-1.2.24.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 21:14:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 16:14:27 -0500 Subject: rpms/gedit/devel gedit.spec,1.65,1.66 Message-ID: <200601302114.k0ULER90002306@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gedit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2227 Modified Files: gedit.spec Log Message: Another attempt Index: gedit.spec =================================================================== RCS file: /cvs/dist/rpms/gedit/devel/gedit.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- gedit.spec 30 Jan 2006 20:51:54 -0000 1.65 +++ gedit.spec 30 Jan 2006 21:14:24 -0000 1.66 @@ -130,7 +130,7 @@ %files -f %{po_package}.lang %defattr(-, root, root) -%doc README COPYING ChangeLog TODO AUTHORS THANKS +%doc README COPYING ChangeLog TODO AUTHORS %{_datadir}/gedit-2 %{_datadir}/pixmaps %{_datadir}/gnome From fedora-cvs-commits at redhat.com Mon Jan 30 21:16:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 16:16:39 -0500 Subject: rpms/kudzu/devel kudzu.spec,1.114,1.115 Message-ID: <200601302116.k0ULGdJa015468@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14937 Modified Files: kudzu.spec Log Message: update Index: kudzu.spec =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/kudzu.spec,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- kudzu.spec 25 Jan 2006 23:22:00 -0000 1.114 +++ kudzu.spec 30 Jan 2006 21:16:36 -0000 1.115 @@ -1,5 +1,5 @@ Name: kudzu -Version: 1.2.23 +Version: 1.2.24 Release: 1 License: GPL Summary: The Red Hat Linux hardware probing tool. @@ -79,6 +79,9 @@ %{_includedir}/kudzu %changelog +* Mon Jan 30 2006 Bill Nottingham - 1.2.24-1 +- fix xenblk/i2o sysfs probing + * Wed Jan 25 2006 Jeremy Katz - 1.2.23-1 - fix nvidia segfault From fedora-cvs-commits at redhat.com Mon Jan 30 21:28:13 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 16:28:13 -0500 Subject: rpms/findutils/devel findutils-selinux.patch, 1.11, 1.12 findutils.spec, 1.42, 1.43 Message-ID: <200601302128.k0ULSDFU021045@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/findutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20972 Modified Files: findutils-selinux.patch findutils.spec Log Message: * Mon Jan 30 2006 Miloslav Trmac - 1:4.2.27-3 - Updated SELinux patch, --context is no longer valid (use -context) findutils-selinux.patch: configure.in | 10 +++++ doc/find.texi | 11 ++++++ find/Makefile.am | 2 - find/defs.h | 14 +++++++ find/find.1 | 4 ++ find/find.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- find/parser.c | 49 ++++++++++++++++++++++++++- find/pred.c | 55 ++++++++++++++++++++++++++++++ find/util.c | 3 + 9 files changed, 242 insertions(+), 4 deletions(-) Index: findutils-selinux.patch =================================================================== RCS file: /cvs/dist/rpms/findutils/devel/findutils-selinux.patch,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- findutils-selinux.patch 12 Jan 2006 06:53:05 -0000 1.11 +++ findutils-selinux.patch 30 Jan 2006 21:28:09 -0000 1.12 @@ -1,107 +1,61 @@ ---- findutils-4.2.27/find/parser.c.selinux 2005-12-04 03:07:52.000000000 +0100 -+++ findutils-4.2.27/find/parser.c 2006-01-12 07:36:36.000000000 +0100 -@@ -47,6 +47,10 @@ - /* We need for isatty(). */ - #include - -+#ifdef WITH_SELINUX -+#include -+#endif /*WITH_SELINUX*/ -+ - #if ENABLE_NLS - # include - # define _(Text) gettext (Text) -@@ -147,6 +151,9 @@ - static boolean parse_warn PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); - static boolean parse_xtype PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); - static boolean parse_quit PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); -+#ifdef WITH_SELINUX -+static boolean parse_scontext PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); -+#endif /*WITH_SELINUX*/ - - - -@@ -298,6 +305,8 @@ - {ARG_TEST, "-help", parse_help, NULL}, /* GNU */ - {ARG_TEST, "version", parse_version, NULL}, /* GNU */ - {ARG_TEST, "-version", parse_version, NULL}, /* GNU */ -+ {ARG_TEST, "context", parse_scontext, pred_scontext}, /* SELinux */ -+ {ARG_TEST, "-context", parse_scontext, pred_scontext}, /* SELinux */ - {0, 0, 0, 0} - }; - -@@ -803,6 +812,10 @@ - -nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\ - -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\ - -used N -user NAME -xtype [bcdpfls]\n")); -+#ifdef WITH_SELINUX -+ puts (_("\ -+ -context CONTEXT\n")); -+#endif /*WITH_SELINUX*/ - puts (_("\ - actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\ - -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\ -@@ -1727,6 +1740,29 @@ - exit (0); - } - -+#ifdef WITH_SELINUX -+ -+static boolean -+parse_scontext ( const struct parser_table* entry, char **argv, int *arg_ptr) -+{ -+ struct predicate *our_pred; -+ -+ if ( (argv == NULL) || (argv[*arg_ptr] == NULL) ) -+ return( false ); -+ -+ our_pred = insert_primary(entry); -+ our_pred->need_stat = false; -+#ifdef DEBUG -+ our_pred->p_name = find_pred_name (pred_scontext); -+#endif /*DEBUG*/ -+ our_pred->args.scontext = argv[*arg_ptr];; -+ -+ (*arg_ptr)++; -+ return( true ); -+} -+ -+#endif /*WITH_SELINUX*/ -+ - static boolean - parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) - { -@@ -1964,7 +2000,11 @@ - if (*scan2 == '.') - for (scan2++; ISDIGIT (*scan2); scan2++) - /* Do nothing. */ ; -+#ifdef WITH_SELINUX -+ if (strchr ("abcdDfFgGhHiklmMnpPstuUyYZ", *scan2)) -+#else /* WITH_SELINUX */ - if (strchr ("abcdDfFgGhHiklmMnpPstuUyY", *scan2)) -+#endif /* WITH_SELINUX */ - { - segmentp = make_segment (segmentp, format, scan2 - format, - (int) *scan2); -@@ -2046,6 +2086,9 @@ - case 'H': /* ARGV element file was found under */ - case 'p': /* pathname */ - case 'P': /* pathname with ARGV element stripped */ -+#ifdef WITH_SELINUX -+ case 'Z': /* SELinux security context */ -+#endif /* WITH_SELINUX */ - *fmt++ = 's'; - break; - ---- findutils-4.2.27/find/defs.h.selinux 2005-09-04 19:59:34.000000000 +0200 -+++ findutils-4.2.27/find/defs.h 2006-01-12 07:36:19.000000000 +0100 +diff -ur --exclude '*.o' --exclude '*~' --exclude '*.selinux' findutils-4.2.27/configure.in findutils/configure.in +--- findutils-4.2.27/configure.in 2005-12-06 07:53:12.000000000 +0100 ++++ findutils/configure.in 2006-01-30 21:10:04.000000000 +0100 +@@ -95,6 +95,16 @@ + AC_CHECK_FUNC(getpwnam, [], + [AC_CHECK_LIB(sun, getpwnam)]) + ++AC_ARG_WITH([selinux], ++ AS_HELP_STRING([--without-selinux], [disable SELinux support]), ++ [:], ++[AC_CHECK_LIB([selinux], [is_selinux_enabled], ++ [with_selinux=yes], [with_selinux=no])]) ++if test x$with_selinux != xno; then ++ AC_DEFINE([WITH_SELINUX], [1], [Define to support SELinux]) ++ AC_SUBST([LIBSELINUX], [-lselinux]) ++fi ++ + dnl Checks for header files. + AC_HEADER_STDC + dnl Assume unistd.h is present - coreutils does too. +diff -ur --exclude '*.o' --exclude '*~' --exclude '*.selinux' findutils-4.2.27/doc/find.texi findutils/doc/find.texi +--- findutils-4.2.27/doc/find.texi 2005-12-05 08:35:33.000000000 +0100 ++++ findutils/doc/find.texi 2006-01-30 21:20:10.000000000 +0100 +@@ -1091,6 +1091,14 @@ + + @end deffn + ++ at deffn Test -context pattern ++True if file's SELinux context matches the pattern @var{pattern}. ++The pattern uses shell glob matching. ++ ++This predicate is supported only on @code{find} versions compiled with ++SELinux support and only when SELinux is enabled. ++ at end deffn ++ + @node Contents + @section Contents + +@@ -1610,6 +1618,9 @@ + file is a sparse file (that is, it has ``holes''). + @item %s + File's size in bytes. ++ at item %Z ++File's SELinux context, or empty string if the file has no SELinux context ++or this version of find does not support SELinux. + @end table + + @node Location Directives +diff -ur --exclude '*.o' --exclude '*~' --exclude '*.selinux' findutils-4.2.27/find/defs.h findutils/find/defs.h +--- findutils-4.2.27/find/defs.h 2005-09-04 19:59:34.000000000 +0200 ++++ findutils/find/defs.h 2006-01-30 21:15:38.000000000 +0100 @@ -131,6 +131,10 @@ #define MODE_RWX (S_IXUSR | S_IXGRP | S_IXOTH | MODE_RW) #define MODE_ALL (S_ISUID | S_ISGID | S_ISVTX | MODE_RWX) +#ifdef WITH_SELINUX +#include -+#endif /*WITH_SELINUX*/ ++#endif + #if 1 #include @@ -112,7 +66,7 @@ FILE *stream; /* ls fls fprint0 */ +#ifdef WITH_SELINUX + security_context_t scontext; /* scontext */ -+#endif /*WITH_SELINUX*/ ++#endif struct format_val printf_vec; /* printf fprintf fprint */ } args; @@ -121,8 +75,8 @@ boolean pred_user PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); boolean pred_xtype PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); +#ifdef WITH_SELINUX -+boolean pred_scontext PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); -+#endif /* WITH_SELINUX */ ++boolean pred_context PARAMS((char *pathname, struct stat *stat_buf, struct predicate *pred_ptr)); ++#endif @@ -133,58 +87,24 @@ + +#ifdef WITH_SELINUX + int (*x_getfilecon) (); -+#endif /* WITH_SELINUX */ ++#endif }; extern struct options options; ---- findutils-4.2.27/find/Makefile.am.selinux 2005-07-03 18:07:08.000000000 +0200 -+++ findutils-4.2.27/find/Makefile.am 2006-01-12 07:36:19.000000000 +0100 -@@ -5,8 +5,9 @@ - # regexprops_SOURCES = regexprops.c - find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c - EXTRA_DIST = defs.h $(man_MANS) -+DEFS = @DEFS@ -I. -I$(srcdir) -I.. -DWITH_SELINUX - INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\" --LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -+LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ -lselinux - man_MANS = find.1 - SUBDIRS = testsuite - ---- findutils-4.2.27/find/find.1.selinux 2005-12-05 18:05:02.000000000 +0100 -+++ findutils-4.2.27/find/find.1 2006-01-12 07:36:19.000000000 +0100 -@@ -483,6 +483,9 @@ - link to a file of type \fIc\fR; if the \-L option has been given, true - if \fIc\fR is `l'. In other words, for symbolic links, \-xtype checks - the type of the file that \-type does not check. -+.IP "\-context \fIscontext\fR" -+.IP "\--context \fIscontext\fR" -+(SELinux only) File has the security context \fIscontext\fR. - - .SS ACTIONS - .IP "\-delete\fR" -@@ -785,6 +788,8 @@ - File's type (like in ls \-l), U=unknown type (shouldn't happen) - .IP %Y - File's type (like %y), plus follow symlinks: L=loop, N=nonexistent -+.IP %Z -+(SELinux only) file's security context. - .PP - A `%' character followed by any other character is discarded (but the - other character is printed). ---- findutils-4.2.27/find/find.c.selinux 2005-11-11 08:41:37.000000000 +0100 -+++ findutils-4.2.27/find/find.c 2006-01-12 07:36:19.000000000 +0100 -@@ -244,6 +244,93 @@ - { +diff -ur --exclude '*.o' --exclude '*~' --exclude '*.selinux' findutils-4.2.27/find/find.c findutils/find/find.c +--- findutils-4.2.27/find/find.c 2005-11-11 08:41:37.000000000 +0100 ++++ findutils/find/find.c 2006-01-30 21:15:21.000000000 +0100 +@@ -245,6 +245,93 @@ return lstat(name, p); } + +#ifdef WITH_SELINUX -+ +static int +fallback_getfilecon(const char *name, security_context_t *p, int prev_rv) +{ + /* Our original getfilecon() call failed. Perhaps we can't follow a -+ * symbolic link. If that might be the problem, lgetfilecon() the link. -+ * Otherwise, admit defeat. ++ * symbolic link. If that might be the problem, lgetfilecon() the link. ++ * Otherwise, admit defeat. + */ + switch (errno) + { @@ -210,7 +130,7 @@ + +/* optionh_getfilecon() implements the getfilecon operation when the + * -H option is in effect. -+ * ++ * + * If the item to be examined is a command-line argument, we follow + * symbolic links. If the getfilecon() call fails on the command-line + * item, we fall back on the properties of the symbolic link. @@ -218,13 +138,13 @@ + * If the item to be examined is not a command-line argument, we + * examine the link itself. + */ -+int ++int +optionh_getfilecon(const char *name, security_context_t *p) +{ -+ if (0 == state.curdepth) ++ if (0 == state.curdepth) + { + /* This file is from the command line; deference the link (if it -+ * is a link). ++ * is a link). + */ + int rv = getfilecon(name, p); + if (0 == rv) @@ -244,7 +164,7 @@ + * -L option is in effect. That option makes us examine the thing the + * symbolic link points to, not the symbolic link itself. + */ -+int ++int +optionl_getfilecon(const char *name, security_context_t *p) +{ + int rv = getfilecon(name, p); @@ -258,22 +178,23 @@ + * option is in effect (this is also the default). That option makes + * us examine the symbolic link itself, not the thing it points to. + */ -+int ++int +optionp_getfilecon(const char *name, security_context_t *p) +{ + return lgetfilecon(name, p); +} +#endif /* WITH_SELINUX */ - ++ #ifdef DEBUG_STAT static uintmax_t stat_count = 0u; + @@ -272,11 +359,17 @@ { case SYMLINK_ALWAYS_DEREF: /* -L */ options.xstat = optionl_stat; +#ifdef WITH_SELINUX + options.x_getfilecon = optionl_getfilecon; -+#endif /* WITH_SELINUX */ ++#endif options.no_leaf_check = true; break; @@ -281,7 +202,7 @@ options.xstat = optionp_stat; +#ifdef WITH_SELINUX + options.x_getfilecon = optionp_getfilecon; -+#endif /* WITH_SELINUX */ ++#endif /* Can't turn no_leaf_check off because the user might have specified * -noleaf anyway */ @@ -291,36 +212,11 @@ options.xstat = optionh_stat; +#ifdef WITH_SELINUX + options.x_getfilecon = optionh_getfilecon; -+#endif /* WITH_SELINUX */ ++#endif options.no_leaf_check = true; } -@@ -389,6 +485,9 @@ - int - main (int argc, char **argv) - { -+#ifdef WITH_SELINUX -+ int is_selinux_enabled_flag = is_selinux_enabled()>0; -+#endif /* WITH_SELINUX */ - int i; - const struct parser_table *entry_close, *entry_print, *entry_open; - const struct parser_table *parse_entry; /* Pointer to the parsing table entry for this expression. */ -@@ -538,6 +637,14 @@ - if (strchr ("-!(),", argv[i][0]) == NULL) - usage (_("paths must precede expression")); - predicate_name = argv[i]; -+#ifdef WITH_SELINUX -+ if (! is_selinux_enabled_flag) { -+ if ((strncmp(predicate_name,"-context",strlen("-context"))==0) || -+ (strncmp(predicate_name,"--context",strlen("--context"))==0)) { -+ error (1, 0,_("Error: invalid predicate %s: the kernel is not selinux-enabled.\n"),predicate_name); -+ } -+ } -+#endif - parse_entry = find_parser (predicate_name); - if (parse_entry == NULL) - { -@@ -1807,7 +1914,7 @@ +@@ -1807,7 +1903,7 @@ static void process_dir (char *pathname, char *name, int pathlen, struct stat *statp, char *parent) { @@ -329,21 +225,152 @@ boolean subdirs_unreliable; /* if true, cannot use dir link count as subdir limif (if false, it may STILL be unreliable) */ int idx; /* Which entry are we on? */ struct stat stat_buf; ---- findutils-4.2.27/find/util.c.selinux 2005-07-01 23:45:18.000000000 +0200 -+++ findutils-4.2.27/find/util.c 2006-01-12 07:36:19.000000000 +0100 -@@ -78,6 +78,9 @@ - last_pred->need_stat = true; - last_pred->need_type = true; - last_pred->args.str = NULL; +diff -ur --exclude '*.o' --exclude '*~' --exclude '*.selinux' findutils-4.2.27/find/find.1 findutils/find/find.1 +--- findutils-4.2.27/find/find.1 2005-12-05 18:05:02.000000000 +0100 ++++ findutils/find/find.1 2006-01-30 21:46:01.000000000 +0100 +@@ -483,6 +483,8 @@ + link to a file of type \fIc\fR; if the \-L option has been given, true + if \fIc\fR is `l'. In other words, for symbolic links, \-xtype checks + the type of the file that \-type does not check. ++.IP "\-context \fIpattern\fR" ++(SELinux only) Security context of the file matches glob \fIpattern\fR. + + .SS ACTIONS + .IP "\-delete\fR" +@@ -785,6 +787,8 @@ + File's type (like in ls \-l), U=unknown type (shouldn't happen) + .IP %Y + File's type (like %y), plus follow symlinks: L=loop, N=nonexistent ++.IP %Z ++(SELinux only) file's security context. + .PP + A `%' character followed by any other character is discarded (but the + other character is printed). +diff -ur --exclude '*.o' --exclude '*~' --exclude '*.selinux' findutils-4.2.27/find/Makefile.am findutils/find/Makefile.am +--- findutils-4.2.27/find/Makefile.am 2005-07-03 18:07:08.000000000 +0200 ++++ findutils/find/Makefile.am 2006-01-30 21:46:39.000000000 +0100 +@@ -6,7 +6,7 @@ + find_SOURCES = find.c fstype.c parser.c pred.c tree.c util.c version.c + EXTRA_DIST = defs.h $(man_MANS) + INCLUDES = -I../gnulib/lib -I$(top_srcdir)/lib -I$(top_srcdir)/gnulib/lib -I../intl -DLOCALEDIR=\"$(localedir)\" +-LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ ++LDADD = ../lib/libfind.a ../gnulib/lib/libgnulib.a @INTLLIBS@ @LIBSELINUX@ + man_MANS = find.1 + SUBDIRS = testsuite + +diff -ur --exclude '*.o' --exclude '*~' --exclude '*.selinux' findutils-4.2.27/find/parser.c findutils/find/parser.c +--- findutils-4.2.27/find/parser.c 2005-12-04 03:07:52.000000000 +0100 ++++ findutils/find/parser.c 2006-01-30 21:14:46.000000000 +0100 +@@ -47,6 +47,10 @@ + /* We need for isatty(). */ + #include + +#ifdef WITH_SELINUX -+ last_pred->args.scontext = NULL; ++#include +#endif - last_pred->pred_next = NULL; - last_pred->pred_left = NULL; - last_pred->pred_right = NULL; ---- findutils-4.2.27/find/pred.c.selinux 2005-11-30 07:17:15.000000000 +0100 -+++ findutils-4.2.27/find/pred.c 2006-01-12 07:36:28.000000000 +0100 -@@ -38,6 +38,14 @@ ++ + #if ENABLE_NLS + # include + # define _(Text) gettext (Text) +@@ -147,6 +151,9 @@ + static boolean parse_warn PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); + static boolean parse_xtype PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); + static boolean parse_quit PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); ++#ifdef WITH_SELINUX ++static boolean parse_context PARAMS((const struct parser_table*, char *argv[], int *arg_ptr)); ++#endif + + + +@@ -217,6 +224,9 @@ + PARSE_TEST ("cmin", cmin), /* GNU */ + PARSE_TEST ("cnewer", cnewer), /* GNU */ + PARSE_TEST ("ctime", ctime), ++#ifdef WITH_SELINUX ++ PARSE_TEST ("context", context), /* GNU */ ++#endif + PARSE_POSOPT ("daystart", daystart), /* GNU */ + PARSE_ACTION ("delete", delete), /* GNU, Mac OS, FreeBSD */ + PARSE_OPTION ("d", d), /* Mac OS X, FreeBSD, NetBSD, OpenBSD, but deprecated in favour of -depth */ +@@ -802,8 +812,12 @@ + puts (_("\ + -nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\ + -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\ +- -used N -user NAME -xtype [bcdpfls]\n")); ++ -used N -user NAME -xtype [bcdpfls]")); ++#ifdef WITH_SELINUX + puts (_("\ ++ -context CONTEXT\n")); ++#endif ++ puts (_("\n\ + actions: -delete -print0 -printf FORMAT -fprintf FILE FORMAT -print \n\ + -fprint0 FILE -fprint FILE -ls -fls FILE -prune -quit\n\ + -exec COMMAND ; -exec COMMAND {} + -ok COMMAND ;\n\ +@@ -1716,6 +1730,10 @@ + printf("LEAF_OPTIMISATION "); + ++features; + #endif ++#if defined(WITH_SELINUX) ++ printf("SELINUX "); ++ ++features; ++#endif + if (0 == features) + { + /* For the moment, leave this as English in case someone wants +@@ -1727,6 +1745,32 @@ + exit (0); + } + ++#ifdef WITH_SELINUX ++static boolean ++parse_context (const struct parser_table* entry, char **argv, int *arg_ptr) ++{ ++ struct predicate *our_pred; ++ ++ if ((argv == NULL) || (argv[*arg_ptr] == NULL)) ++ return false; ++ ++ if (is_selinux_enabled() <= 0) ++ { ++ error (1, 0, _("invalid predicate -context: SELinux is not enabled.")); ++ return false; ++ } ++ our_pred = insert_primary (entry); ++ our_pred->need_stat = false; ++#ifdef DEBUG ++ our_pred->p_name = find_pred_name (pred_context); ++#endif /*DEBUG*/ ++ our_pred->args.scontext = argv[*arg_ptr]; ++ ++ (*arg_ptr)++; ++ return true; ++} ++#endif /* WITH_SELINUX */ ++ + static boolean + parse_xdev (const struct parser_table* entry, char **argv, int *arg_ptr) + { +@@ -1964,7 +2008,7 @@ + if (*scan2 == '.') + for (scan2++; ISDIGIT (*scan2); scan2++) + /* Do nothing. */ ; +- if (strchr ("abcdDfFgGhHiklmMnpPstuUyY", *scan2)) ++ if (strchr ("abcdDfFgGhHiklmMnpPstuUyYZ", *scan2)) + { + segmentp = make_segment (segmentp, format, scan2 - format, + (int) *scan2); +@@ -2046,6 +2090,7 @@ + case 'H': /* ARGV element file was found under */ + case 'p': /* pathname */ + case 'P': /* pathname with ARGV element stripped */ ++ case 'Z': /* SELinux security context */ + *fmt++ = 's'; + break; + +diff -ur --exclude '*.o' --exclude '*~' --exclude '*.selinux' findutils-4.2.27/find/pred.c findutils/find/pred.c +--- findutils-4.2.27/find/pred.c 2005-11-30 07:17:15.000000000 +0100 ++++ findutils/find/pred.c 2006-01-30 21:13:18.000000000 +0100 +@@ -38,6 +38,10 @@ #include "buildcmd.h" #include "yesno.h" @@ -351,58 +378,48 @@ +#include +#endif /*WITH_SELINUX*/ + -+#ifndef FNM_CASEFOLD -+#define FNM_CASEFOLD (1<<4) -+#endif /*FNM_CASEFOLD*/ -+ #if ENABLE_NLS # include # define _(Text) gettext (Text) -@@ -83,7 +91,6 @@ - - - -- - /* Get or fake the disk device blocksize. - Usually defined by sys/param.h (if at all). */ - #ifndef DEV_BSIZE -@@ -215,6 +222,9 @@ +@@ -215,6 +219,9 @@ {pred_used, "used "}, {pred_user, "user "}, {pred_xtype, "xtype "}, +#ifdef WITH_SELINUX -+ {pred_scontext, "context"}, ++ {pred_context, "context"}, +#endif /*WITH_SELINUX*/ {0, "none "} }; -@@ -903,6 +913,25 @@ +@@ -903,6 +910,27 @@ mode_to_filetype(stat_buf->st_mode & S_IFMT)); } break; ++ case 'Z': /* SELinux security context */ +#ifdef WITH_SELINUX -+ case 'Z': /* SELinux security context */ -+ { -+ security_context_t scontext; -+ int rv; -+ rv = (*options.x_getfilecon)(state.rel_pathname, &scontext); -+ -+ if ( rv < 0 ) { -+ (void) fprintf(stderr, "getfileconf(%s): %s", -+ pathname, strerror(errno)); -+ (void) fflush(stderr); -+ } -+ else { -+ (void) fprintf (fp, segment->text, scontext); -+ freecon(scontext); -+ } -+ } -+ break ; ++ { ++ security_context_t scontext; ++ int rv; ++ rv = (*options.x_getfilecon) (state.rel_pathname, &scontext); ++ ++ if (rv < 0) ++ { ++ fprintf (stderr, "getfilecon(%s): %s", pathname, ++ strerror(errno)); ++ fflush (stderr); ++ } ++ else ++ { ++ fprintf (fp, segment->text, scontext); ++ freecon (scontext); ++ } ++ } +#endif /* WITH_SELINUX */ ++ break; } } return true; -@@ -1493,6 +1522,34 @@ +@@ -1493,6 +1521,33 @@ */ return (pred_type (pathname, &sbuf, pred_ptr)); } @@ -411,24 +428,23 @@ +#ifdef WITH_SELINUX + +boolean -+pred_scontext ( pathname, stat_buf, pred_ptr ) -+ char *pathname; -+ struct stat *stat_buf; -+ struct predicate *pred_ptr; ++pred_context (char *pathname, struct stat *stat_buf, ++ struct predicate *pred_ptr) +{ + int rv; + security_context_t scontext; + -+ rv = (* options.x_getfilecon)(state.rel_pathname, &scontext); ++ rv = (*options.x_getfilecon) (state.rel_pathname, &scontext); + -+ if ( rv < 0 ) { -+ (void) fprintf(stderr, "getfilecon(%s): %s\n", pathname, strerror(errno)); -+ (void) fflush(stderr); -+ return ( false ); -+ } ++ if (rv < 0) ++ { ++ fprintf (stderr, "getfilecon(%s): %s\n", pathname, strerror(errno)); ++ fflush (stderr); ++ return false; ++ } + -+ rv = (fnmatch(pred_ptr->args.scontext, scontext,0)==0); -+ freecon(scontext); ++ rv = (fnmatch (pred_ptr->args.scontext, scontext, 0) == 0); ++ freecon (scontext); + return rv; +} + @@ -437,3 +453,16 @@ /* 1) fork to get a child; parent remembers the child pid 2) child execs the command requested +diff -ur --exclude '*.o' --exclude '*~' --exclude '*.selinux' findutils-4.2.27/find/util.c findutils/find/util.c +--- findutils-4.2.27/find/util.c 2005-07-01 23:45:18.000000000 +0200 ++++ findutils/find/util.c 2006-01-27 14:38:43.000000000 +0100 +@@ -78,6 +78,9 @@ + last_pred->need_stat = true; + last_pred->need_type = true; + last_pred->args.str = NULL; ++#ifdef WITH_SELINUX ++ last_pred->args.scontext = NULL; ++#endif + last_pred->pred_next = NULL; + last_pred->pred_left = NULL; + last_pred->pred_right = NULL; Index: findutils.spec =================================================================== RCS file: /cvs/dist/rpms/findutils/devel/findutils.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- findutils.spec 12 Jan 2006 07:10:14 -0000 1.42 +++ findutils.spec 30 Jan 2006 21:28:09 -0000 1.43 @@ -1,7 +1,7 @@ Summary: The GNU versions of find utilities (find and xargs). Name: findutils Version: 4.2.27 -Release: 2 +Release: 3 Epoch: 1 License: GPL Group: Applications/File @@ -71,6 +71,9 @@ %{_infodir}/find.info* %changelog +* Mon Jan 30 2006 Miloslav Trmac - 1:4.2.27-3 +- Updated SELinux patch, --context is no longer valid (use -context) + * Thu Jan 12 2006 Miloslav Trmac - 1:4.2.27-2 - Don't use uninitialized memory in -printf %%Z (#174485) - Ship more documentation files From fedora-cvs-commits at redhat.com Mon Jan 30 21:39:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 16:39:22 -0500 Subject: rpms/redhat-menus/devel redhat-menus-5.5.5-fix-pirut.patch, NONE, 1.1 redhat-menus.spec, 1.52, 1.53 Message-ID: <200601302139.k0ULdMJY024196@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/redhat-menus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24075 Modified Files: redhat-menus.spec Added Files: redhat-menus-5.5.5-fix-pirut.patch Log Message: - a few more tweaks needed to get pirut in toplevel applications menu redhat-menus-5.5.5-fix-pirut.patch: applications.menu | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) --- NEW FILE redhat-menus-5.5.5-fix-pirut.patch --- --- redhat-menus-5.5.5/menus/applications.menu.fix-pirut 2006-01-30 11:50:09.000000000 -0500 +++ redhat-menus-5.5.5/menus/applications.menu 2006-01-30 16:37:24.000000000 -0500 @@ -133,6 +133,7 @@ gdmflexiserver.desktop gnome-file-roller.desktop gnome-gfloppy.desktop + pirut.desktop redhat-authconfig.desktop redhat-usermount.desktop system-config-date.desktop @@ -174,7 +175,7 @@ - system-config-packages.desktop + pirut.desktop applications-kmenuedit.menu Index: redhat-menus.spec =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/redhat-menus.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- redhat-menus.spec 30 Jan 2006 19:08:30 -0000 1.52 +++ redhat-menus.spec 30 Jan 2006 21:39:19 -0000 1.53 @@ -4,7 +4,7 @@ Summary: Configuration and data files for the desktop menus Name: redhat-menus Version: 5.5.5 -Release: 1 +Release: 2 URL: http://www.redhat.com Source0: %{name}-%{version}.tar.gz PreReq: desktop-file-utils >= %{desktop_file_utils_version} @@ -22,6 +22,8 @@ ## old evolution packages point to a no-longer-existing symlink Conflicts: evolution <= 2.4.1-5 +Patch0: redhat-menus-5.5.5-fix-pirut.patch + %description This package contains the XML files that describe the menu layout for @@ -30,6 +32,7 @@ %prep %setup -q +%patch0 -p1 -b .fix-pirut %build @@ -64,6 +67,10 @@ %{_datadir}/desktop-directories/*.directory %changelog +* Mon Jan 30 2006 Ray Strode - 5.5.5-2 +- a few more tweaks needed to get pirut in toplevel applications + menu + * Mon Jan 30 2006 Ray Strode - 5.5.5-1 - Update to 5.5.5 - put pirut in toplevel applications menu From fedora-cvs-commits at redhat.com Mon Jan 30 21:45:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 16:45:07 -0500 Subject: rpms/fetchmail/devel patch-6.3.2.1-fix-netrc-SIGSEGV.diff, NONE, 1.1 patch-6.3.2.1-fix-netrc-SIGSEGV.diff.asc, NONE, 1.1 fetchmail.spec, 1.37, 1.38 Message-ID: <200601302145.k0ULj7r6026796@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/fetchmail/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26722 Modified Files: fetchmail.spec Added Files: patch-6.3.2.1-fix-netrc-SIGSEGV.diff patch-6.3.2.1-fix-netrc-SIGSEGV.diff.asc Log Message: * Mon Jan 30 2006 Miloslav Trmac - 6.3.2.1-1 - Update to fetchmail-6.3.2.1 patch-6.3.2.1-fix-netrc-SIGSEGV.diff: netrc.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- NEW FILE patch-6.3.2.1-fix-netrc-SIGSEGV.diff --- Craig Leres identified a problem that makes fetchmail 6.3.2 (only this version) crash if the .netrc file does not contain a password for a particular account. This patch is mostly Craig Leres' work has been committed to the SVN repository and should be applied to fetchmail 6.3.2 on all sites that plan to use netrc files: Index: netrc.c =================================================================== --- netrc.c (Revision 4683) +++ netrc.c (Revision 4684) @@ -314,8 +314,10 @@ free_netrc(netrc_entry *a) { while(a) { netrc_entry *n = a->next; - memset(a->password, 0x55, strlen(a->password)); - xfree(a->password); + if (a->password != NULL) { + memset(a->password, 0x55, strlen(a->password)); + free(a->password); + } xfree(a->login); xfree(a->host); xfree(a); Sorry for the inconvenience. -- Matthias Andree, 2006-01-30 --- NEW FILE patch-6.3.2.1-fix-netrc-SIGSEGV.diff.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQBD3ddRvmGDOQUufZURAoEeAJ46roXSovLwh08SPa51k8unV9gZ7wCgrjvL D6eOT0Fg61eCefPRpChXLrU= =+5Gw -----END PGP SIGNATURE----- Index: fetchmail.spec =================================================================== RCS file: /cvs/dist/rpms/fetchmail/devel/fetchmail.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- fetchmail.spec 23 Jan 2006 17:07:09 -0000 1.37 +++ fetchmail.spec 30 Jan 2006 21:45:05 -0000 1.38 @@ -3,11 +3,13 @@ Summary: A remote mail retrieval and forwarding utility. Name: fetchmail -Version: 6.3.2 +Version: 6.3.2.1 Release: 1 Requires: smtpdaemon -Source0: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2 -Source1: http://download.berlios.de/fetchmail/fetchmail-%{version}.tar.bz2.asc +Source0: http://download.berlios.de/fetchmail/fetchmail-6.3.2.tar.bz2 +Source1: http://download.berlios.de/fetchmail/fetchmail-6.3.2.tar.bz2.asc +Source2: http://download.berlios.de/fetchmail/patch-6.3.2.1-fix-netrc-SIGSEGV.diff +Source3: http://download.berlios.de/fetchmail/patch-6.3.2.1-fix-netrc-SIGSEGV.diff.asc Patch0: fetchmail-6.2.5-addrconf.patch URL: http://fetchmail.berlios.de/ License: GPL @@ -44,7 +46,8 @@ need to have Python and Tk installed in order to use fetchmailconf. %prep -%setup -q +%setup -q -n fetchmail-6.3.2 +patch -p0 < %{SOURCE2} %patch0 -p1 -b .addrconf %build @@ -83,6 +86,9 @@ %endif %changelog +* Mon Jan 30 2006 Miloslav Trmac - 6.3.2.1-1 +- Update to fetchmail-6.3.2.1 + * Mon Jan 23 2006 Miloslav Trmac - 6.3.2-1 - Update to fetchmail-6.3.2 (CVE-2006-0321) From fedora-cvs-commits at redhat.com Mon Jan 30 21:47:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 16:47:11 -0500 Subject: rpms/redhat-menus/devel sources,1.34,1.35 Message-ID: <200601302147.k0ULlBbl007470@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/redhat-menus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7409 Modified Files: sources Log Message: try again Index: sources =================================================================== RCS file: /cvs/dist/rpms/redhat-menus/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 30 Jan 2006 19:08:30 -0000 1.34 +++ sources 30 Jan 2006 21:47:08 -0000 1.35 @@ -1 +1 @@ -61eb43b5024991a04f44e4aa107aa158 redhat-menus-5.5.5.tar.gz +040fb7bf0833727035c9b7c17dbf2ac8 redhat-menus-5.5.5.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 21:48:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 16:48:07 -0500 Subject: rpms/kudzu/devel sources,1.113,1.114 Message-ID: <200601302148.k0ULm7Mi007986@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7936 Modified Files: sources Log Message: update Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- sources 30 Jan 2006 21:03:28 -0000 1.113 +++ sources 30 Jan 2006 21:48:05 -0000 1.114 @@ -1 +1 @@ -42200472ac8d02d029d5d6944359505b kudzu-1.2.24.tar.gz +45ca558516436ccbcb34e3445e56f613 kudzu-1.2.24.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 21:53:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 16:53:39 -0500 Subject: rpms/kudzu/devel sources,1.114,1.115 Message-ID: <200601302153.k0ULrd6s010673@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/kudzu/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10642 Modified Files: sources Log Message: update Index: sources =================================================================== RCS file: /cvs/dist/rpms/kudzu/devel/sources,v retrieving revision 1.114 retrieving revision 1.115 diff -u -r1.114 -r1.115 --- sources 30 Jan 2006 21:48:05 -0000 1.114 +++ sources 30 Jan 2006 21:53:36 -0000 1.115 @@ -1 +1 @@ -45ca558516436ccbcb34e3445e56f613 kudzu-1.2.24.tar.gz +f124d2e772c9f21f614461b807c2ae01 kudzu-1.2.24.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 22:07:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 17:07:47 -0500 Subject: rpms/xen/devel .cvsignore, 1.11, 1.12 sources, 1.26, 1.27 xen.spec, 1.77, 1.78 Message-ID: <200601302207.k0UM7lJS014653@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14623 Modified Files: .cvsignore sources xen.spec Log Message: Update to xen-unstable from 20060130 (cset 8705) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xen/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 25 Jan 2006 23:41:00 -0000 1.11 +++ .cvsignore 30 Jan 2006 22:07:43 -0000 1.12 @@ -1,2 +1,2 @@ -xen-3.0.0-20060110.tar.bz2 LibVNCServer-0.7.1.tar.gz +xen-3.0.0-20060130.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xen/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 25 Jan 2006 23:41:00 -0000 1.26 +++ sources 30 Jan 2006 22:07:43 -0000 1.27 @@ -1,2 +1,2 @@ -d3aca23f36c287cc528b7fe8552ad2b3 xen-3.0.0-20060110.tar.bz2 54110288b3171551c03467cd60976d55 LibVNCServer-0.7.1.tar.gz +08d9b3c05fb2e4841121fefea8f9560f xen-3.0.0-20060130.tar.bz2 Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- xen.spec 25 Jan 2006 23:58:38 -0000 1.77 +++ xen.spec 30 Jan 2006 22:07:43 -0000 1.78 @@ -5,11 +5,11 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0 -Release: 0.20060110.fc5.5 +Release: 0.20060130.fc5 Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html -Source0: xen-3.0.0-20060110.tar.bz2 +Source0: xen-3.0.0-20060130.tar.bz2 Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz Patch0: xen-misc-fixes.patch Patch1: xen-initscript.patch @@ -87,9 +87,6 @@ mkdir -p %{buildroot}/etc/rc.d mv -f %{buildroot}/etc/init.d %{buildroot}/etc/rc.d/ -# move xsls -> xenstore-ls. committed upstream already (#171863) -mv %{buildroot}%{_bindir}/xsls %{buildroot}%{_bindir}/xenstore-ls - mv -f %{buildroot}/etc/udev/xen-backend.rules %{buildroot}/etc/udev/rules.d/ %post @@ -137,6 +134,9 @@ %dir %{_localstatedir}/run/xenstored %changelog +* Mon Jan 30 2006 - 3.0-0.20060130.fc5 +- Update to xen-unstable from 20060130 (cset 8705) + * Wed Jan 25 2006 Jeremy Katz - 3.0-0.20060110.fc5.5 - buildrequire dev86 so that vmx firmware gets built - include a copy of libvncserver and build vmx device models against it From fedora-cvs-commits at redhat.com Mon Jan 30 22:33:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 17:33:24 -0500 Subject: rpms/kernel/devel linux-2.6-net-wireless-features.patch, NONE, 1.1 kernel-2.6.spec, 1.1881, 1.1882 Message-ID: <200601302233.k0UMXOsR028314@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28298 Modified Files: kernel-2.6.spec Added Files: linux-2.6-net-wireless-features.patch Log Message: * Mon Jan 30 2006 Dave Jones - Dan Williams' goodies for wireless drivers to make NetworkManager work with WEP/WPA on ipw2100, and WEP on airo. linux-2.6-net-wireless-features.patch: a/drivers/net/wireless/ipw2200.c | 5 drivers/net/wireless/airo.c | 276 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-net-wireless-features.patch --- Subject: [2.6.15 patch] wireless/airo: add IWENCODEEXT and IWAUTH support From: Dan Williams To: breed at users.sourceforge.net Cc: netdev at vger.kernel.org, "John W. Linville" , jgarzik at pobox.com, networkmanager-list at gnome.org Date: Mon, 30 Jan 2006 11:58:00 -0500 Message-Id: <1138640281.12551.5.camel at dhcp83-115.boston.redhat.com> This patch adds IWENCODEEXT and IWAUTH support to the airo driver for WEP and unencrypted operation. No WPA though. It allows the driver to operate more willingly with wpa_supplicant and NetworkManager. Signed-off-by: Dan Williams --- a/drivers/net/wireless/airo.c 2006-01-30 10:14:23.000000000 -0500 +++ b/drivers/net/wireless/airo.c 2006-01-30 11:05:15.000000000 -0500 @@ -5802,11 +5802,13 @@ static int airo_set_wap(struct net_devic Cmd cmd; Resp rsp; APListRid APList_rid; - static const unsigned char bcast[ETH_ALEN] = { 255, 255, 255, 255, 255, 255 }; + static const u8 any[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + static const u8 off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; if (awrq->sa_family != ARPHRD_ETHER) return -EINVAL; - else if (!memcmp(bcast, awrq->sa_data, ETH_ALEN)) { + else if (!memcmp(any, awrq->sa_data, ETH_ALEN) || + !memcmp(off, awrq->sa_data, ETH_ALEN)) { memset(&cmd, 0, sizeof(cmd)); cmd.cmd=CMD_LOSE_SYNC; if (down_interruptible(&local->sem)) @@ -6297,6 +6299,267 @@ static int airo_get_encode(struct net_de /*------------------------------------------------------------------*/ /* + * Wireless Handler : set extended Encryption parameters + */ +static int airo_set_encodeext(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_point *encoding = &wrqu->encoding; + struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; + CapabilityRid cap_rid; /* Card capability info */ + int perm = ( encoding->flags & IW_ENCODE_TEMP ? 0 : 1 ); + u16 currentAuthType = local->config.authType; + int idx, key_len, alg = ext->alg; /* Check encryption mode */ + wep_key_t key; + + /* Is WEP supported ? */ + readCapabilityRid(local, &cap_rid, 1); + /* Older firmware doesn't support this... + if(!(cap_rid.softCap & 2)) { + return -EOPNOTSUPP; + } */ + readConfigRid(local, 1); + + /* Determine and validate the key index */ + idx = encoding->flags & IW_ENCODE_INDEX; + if (idx) { + if (idx < 1 || idx > ((cap_rid.softCap & 0x80) ? 4:1)) + return -EINVAL; + idx--; + } else + idx = get_wep_key(local, 0xffff); + + if (encoding->flags & IW_ENCODE_DISABLED) + alg = IW_ENCODE_ALG_NONE; + + /* Just setting the transmit key? */ + if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) { + set_wep_key(local, idx, NULL, 0, perm, 1); + } else { + /* Set the requested key first */ + memset(key.key, 0, MAX_KEY_SIZE); + switch (alg) { + case IW_ENCODE_ALG_NONE: + key.len = 0; + break; + case IW_ENCODE_ALG_WEP: + if (ext->key_len > MIN_KEY_SIZE) { + key.len = MAX_KEY_SIZE; + } else if (ext->key_len > 0) { + key.len = MIN_KEY_SIZE; + } else { + return -EINVAL; + } + key_len = min (ext->key_len, key.len); + memcpy(key.key, ext->key, key_len); + break; + default: + return -EINVAL; + } + /* Send the key to the card */ + set_wep_key(local, idx, key.key, key.len, perm, 1); + } + + /* Read the flags */ + if(encoding->flags & IW_ENCODE_DISABLED) + local->config.authType = AUTH_OPEN; // disable encryption + if(encoding->flags & IW_ENCODE_RESTRICTED) + local->config.authType = AUTH_SHAREDKEY; // Only Both + if(encoding->flags & IW_ENCODE_OPEN) + local->config.authType = AUTH_ENCRYPT; // Only Wep + /* Commit the changes to flags if needed */ + if (local->config.authType != currentAuthType) + set_bit (FLAG_COMMIT, &local->flags); + + return -EINPROGRESS; +} + + +/*------------------------------------------------------------------*/ +/* + * Wireless Handler : get extended Encryption parameters + */ +static int airo_get_encodeext(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_point *encoding = &wrqu->encoding; + struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; + CapabilityRid cap_rid; /* Card capability info */ + int idx, max_key_len; + + /* Is it supported ? */ + readCapabilityRid(local, &cap_rid, 1); + if(!(cap_rid.softCap & 2)) { + return -EOPNOTSUPP; + } + readConfigRid(local, 1); + + max_key_len = encoding->length - sizeof(*ext); + if (max_key_len < 0) + return -EINVAL; + + idx = encoding->flags & IW_ENCODE_INDEX; + if (idx) { + if (idx < 1 || idx > ((cap_rid.softCap & 0x80) ? 4:1)) + return -EINVAL; + idx--; + } else + idx = get_wep_key(local, 0xffff); + + encoding->flags = idx + 1; + memset(ext, 0, sizeof(*ext)); + + /* Check encryption mode */ + switch(local->config.authType) { + case AUTH_ENCRYPT: + encoding->flags = IW_ENCODE_ALG_WEP | IW_ENCODE_ENABLED; + break; + case AUTH_SHAREDKEY: + encoding->flags = IW_ENCODE_ALG_WEP | IW_ENCODE_ENABLED; + break; + default: + case AUTH_OPEN: + encoding->flags = IW_ENCODE_ALG_NONE | IW_ENCODE_DISABLED; + break; + } + /* We can't return the key, so set the proper flag and return zero */ + encoding->flags |= IW_ENCODE_NOKEY; + memset(extra, 0, 16); + + /* Copy the key to the user buffer */ + ext->key_len = get_wep_key(local, idx); + if (ext->key_len > 16) { + ext->key_len=0; + } + + return 0; +} + + +/*------------------------------------------------------------------*/ +/* + * Wireless Handler : set extended authentication parameters + */ +static int airo_set_auth(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_param *param = &wrqu->param; + u16 currentAuthType = local->config.authType; + + switch (param->flags & IW_AUTH_INDEX) { + case IW_AUTH_WPA_VERSION: + case IW_AUTH_CIPHER_PAIRWISE: + case IW_AUTH_CIPHER_GROUP: + case IW_AUTH_KEY_MGMT: + case IW_AUTH_RX_UNENCRYPTED_EAPOL: + case IW_AUTH_PRIVACY_INVOKED: + /* + * airo does not use these parameters + */ + break; + + case IW_AUTH_DROP_UNENCRYPTED: + if (param->value) { + /* Only change auth type if unencrypted */ + if (currentAuthType == AUTH_OPEN) + local->config.authType = AUTH_ENCRYPT; + } else { + local->config.authType = AUTH_OPEN; + } + + /* Commit the changes to flags if needed */ + if (local->config.authType != currentAuthType) + set_bit (FLAG_COMMIT, &local->flags); + break; + + case IW_AUTH_80211_AUTH_ALG: { + /* FIXME: What about AUTH_OPEN? This API seems to + * disallow setting our auth to AUTH_OPEN. + */ + if (param->value & IW_AUTH_ALG_SHARED_KEY) { + local->config.authType = AUTH_SHAREDKEY; + } else if (param->value & IW_AUTH_ALG_OPEN_SYSTEM) { + local->config.authType = AUTH_ENCRYPT; + } else + return -EINVAL; + break; + + /* Commit the changes to flags if needed */ + if (local->config.authType != currentAuthType) + set_bit (FLAG_COMMIT, &local->flags); + } + + case IW_AUTH_WPA_ENABLED: + /* Silently accept disable of WPA */ + if (param->value > 0) + return -EOPNOTSUPP; + break; + + default: + return -EOPNOTSUPP; + } + return -EINPROGRESS; +} + + +/*------------------------------------------------------------------*/ +/* + * Wireless Handler : get extended authentication parameters + */ +static int airo_get_auth(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_param *param = &wrqu->param; + u16 currentAuthType = local->config.authType; + + switch (param->flags & IW_AUTH_INDEX) { + case IW_AUTH_DROP_UNENCRYPTED: + switch (currentAuthType) { + case AUTH_SHAREDKEY: + case AUTH_ENCRYPT: + param->value = 1; + break; + default: + param->value = 0; + break; + } + break; + + case IW_AUTH_80211_AUTH_ALG: + switch (currentAuthType) { + case AUTH_SHAREDKEY: + param->value = IW_AUTH_ALG_SHARED_KEY; + break; + case AUTH_ENCRYPT: + default: + param->value = IW_AUTH_ALG_OPEN_SYSTEM; + break; + } + break; + + case IW_AUTH_WPA_ENABLED: + param->value = 0; + break; + + default: + return -EOPNOTSUPP; + } + return 0; +} + + +/*------------------------------------------------------------------*/ +/* * Wireless Handler : set Tx-Power */ static int airo_set_txpow(struct net_device *dev, @@ -7051,6 +7314,15 @@ static const iw_handler airo_handler[] (iw_handler) airo_get_encode, /* SIOCGIWENCODE */ (iw_handler) airo_set_power, /* SIOCSIWPOWER */ (iw_handler) airo_get_power, /* SIOCGIWPOWER */ + (iw_handler) NULL, /* -- hole -- */ + (iw_handler) NULL, /* -- hole -- */ + (iw_handler) NULL, /* SIOCSIWGENIE */ + (iw_handler) NULL, /* SIOCGIWGENIE */ + (iw_handler) airo_set_auth, /* SIOCSIWAUTH */ + (iw_handler) airo_get_auth, /* SIOCGIWAUTH */ + (iw_handler) airo_set_encodeext, /* SIOCSIWENCODEEXT */ + (iw_handler) airo_get_encodeext, /* SIOCGIWENCODEEXT */ + (iw_handler) NULL, /* SIOCSIWPMKSA */ }; /* Note : don't describe AIROIDIFC and AIROOLDIDIFC in here. Subject: [2.6.15 PATCH] wireless/ipw2200: support WE-18 WPA enc_capa From: Dan Williams To: netdev at vger.kernel.org Cc: rml at novell.com, jgarzik at pobox.com, "John W. Linville" Date: Mon, 30 Jan 2006 13:58:56 -0500 Message-Id: <1138647537.5393.6.camel at dhcp83-115.boston.redhat.com> This patch allows ipw2100 driver to advertise the WPA-related encryption options that it does really support. It's necessary to work correctly with NetworkManager and other programs that actually check driver & card capabilities. Signed-off-by: Dan Williams --- a/drivers/net/wireless/ipw2200.c 2006-01-30 13:52:58.000000000 -0500 +++ a/drivers/net/wireless/ipw2200.c 2006-01-30 13:54:04.000000000 -0500 @@ -8383,7 +8383,7 @@ /* Set the Wireless Extension versions */ range->we_version_compiled = WIRELESS_EXT; - range->we_version_source = 16; + range->we_version_source = 18; i = 0; if (priv->ieee->mode & (IEEE_B | IEEE_G)) { @@ -8415,6 +8415,9 @@ IW_EVENT_CAPA_MASK(SIOCGIWAP)); range->event_capa[1] = IW_EVENT_CAPA_K_1; + range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 | + IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP; + IPW_DEBUG_WX("GET Range\n"); return 0; } Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1881 retrieving revision 1.1882 diff -u -r1.1881 -r1.1882 --- kernel-2.6.spec 27 Jan 2006 20:44:32 -0000 1.1881 +++ kernel-2.6.spec 30 Jan 2006 22:33:09 -0000 1.1882 @@ -319,6 +319,7 @@ # NIC driver updates Patch1301: linux-2.6-net-sundance-ip100A.patch +Patch1302: linux-2.6-net-wireless-features.patch # Squashfs Patch1400: linux-2.6-squashfs.patch @@ -782,6 +783,8 @@ # NIC driver fixes. # New PCI ID for sundance driver. %patch1301 -p1 +# Goodies for wireless drivers to make NetworkManager work +%patch1302 -p2 # Squashfs %patch1400 -p1 @@ -1374,6 +1377,10 @@ %endif %changelog +* Mon Jan 30 2006 Dave Jones +- Dan Williams' goodies for wireless drivers to make NetworkManager + work with WEP/WPA on ipw2100, and WEP on airo. + * Fri Jan 27 2006 Dave Jones - New userspace audit message types. - Fix software suspend on kernels without memory hotplug. (#178339) From fedora-cvs-commits at redhat.com Mon Jan 30 22:37:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 17:37:54 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1882,1.1883 Message-ID: <200601302237.k0UMbs7Q028457@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28444 Modified Files: kernel-2.6.spec Log Message: typo Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1882 retrieving revision 1.1883 diff -u -r1.1882 -r1.1883 --- kernel-2.6.spec 30 Jan 2006 22:33:09 -0000 1.1882 +++ kernel-2.6.spec 30 Jan 2006 22:37:52 -0000 1.1883 @@ -1379,7 +1379,7 @@ %changelog * Mon Jan 30 2006 Dave Jones - Dan Williams' goodies for wireless drivers to make NetworkManager - work with WEP/WPA on ipw2100, and WEP on airo. + work with WEP/WPA on ipw2200, and WEP on airo. * Fri Jan 27 2006 Dave Jones - New userspace audit message types. From fedora-cvs-commits at redhat.com Mon Jan 30 22:43:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 17:43:49 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1883,1.1884 Message-ID: <200601302243.k0UMhn4O028586@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28572 Modified Files: kernel-2.6.spec Log Message: what happened there ? Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1883 retrieving revision 1.1884 diff -u -r1.1883 -r1.1884 --- kernel-2.6.spec 30 Jan 2006 22:37:52 -0000 1.1883 +++ kernel-2.6.spec 30 Jan 2006 22:43:47 -0000 1.1884 @@ -784,7 +784,7 @@ # New PCI ID for sundance driver. %patch1301 -p1 # Goodies for wireless drivers to make NetworkManager work -%patch1302 -p2 +%patch1302 -p1 # Squashfs %patch1400 -p1 From fedora-cvs-commits at redhat.com Mon Jan 30 22:57:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 17:57:31 -0500 Subject: rpms/mrtg/devel .cvsignore, 1.9, 1.10 filter-requires-mrtg.sh, 1.2, 1.3 mrtg.spec, 1.23, 1.24 sources, 1.9, 1.10 Message-ID: <200601302257.k0UMvVtK018096@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/mrtg/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18014 Modified Files: .cvsignore filter-requires-mrtg.sh mrtg.spec sources Log Message: * Mon Jan 30 2006 Miloslav Trmac - 2.13.0-1 - Update to mrtg-2.13.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mrtg/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 20 Jun 2005 14:57:09 -0000 1.9 +++ .cvsignore 30 Jan 2006 22:57:28 -0000 1.10 @@ -1 +1 @@ -mrtg-2.12.2.tar.gz +mrtg-2.13.0.tar.gz Index: filter-requires-mrtg.sh =================================================================== RCS file: /cvs/dist/rpms/mrtg/devel/filter-requires-mrtg.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- filter-requires-mrtg.sh 12 Sep 2005 00:32:47 -0000 1.2 +++ filter-requires-mrtg.sh 30 Jan 2006 22:57:28 -0000 1.3 @@ -1,3 +1,3 @@ #!/bin/sh -/usr/lib/rpm/find-requires "$@" | grep -v 'perl(GD)' | grep -v 'perl(MRP::BaseClass)' +/usr/lib/rpm/find-requires "$@" | grep -v 'perl(\(GD\|MRP::BaseClass\|Net::SNMP\))' Index: mrtg.spec =================================================================== RCS file: /cvs/dist/rpms/mrtg/devel/mrtg.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- mrtg.spec 9 Dec 2005 22:42:10 -0000 1.23 +++ mrtg.spec 30 Jan 2006 22:57:28 -0000 1.24 @@ -5,8 +5,8 @@ Summary: Multi Router Traffic Grapher Name: mrtg -Version: 2.12.2 -Release: 2.1 +Version: 2.13.0 +Release: 1 URL: http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/ Source0: http://www.ee.ethz.ch/~oetiker/webtools/mrtg/pub/%{name}-%{version}.tar.gz Source1: mrtg.cfg @@ -110,6 +110,9 @@ %dir %{_localstatedir}/lock/mrtg %changelog +* Mon Jan 30 2006 Miloslav Trmac - 2.13.0-1 +- Update to mrtg-2.13.0 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/mrtg/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 20 Jun 2005 14:57:09 -0000 1.9 +++ sources 30 Jan 2006 22:57:28 -0000 1.10 @@ -1 +1 @@ -dd74c4f28ac594938d15dc16b7f88bd2 mrtg-2.12.2.tar.gz +18fc58377fc6e697fdf7ac2f66e3e6ff mrtg-2.13.0.tar.gz From fedora-cvs-commits at redhat.com Mon Jan 30 23:06:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 18:06:23 -0500 Subject: rpms/gtkhtml3/devel .cvsignore, 1.29, 1.30 gtkhtml3.spec, 1.50, 1.51 sources, 1.29, 1.30 Message-ID: <200601302306.k0UN6NKU019642@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19575 Modified Files: .cvsignore gtkhtml3.spec sources Log Message: 3.9.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/.cvsignore,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- .cvsignore 26 Jan 2006 05:36:59 -0000 1.29 +++ .cvsignore 30 Jan 2006 23:06:12 -0000 1.30 @@ -1 +1 @@ -gtkhtml-3.9.5.tar.bz2 +gtkhtml-3.9.90.tar.bz2 Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gtkhtml3.spec 26 Jan 2006 05:36:59 -0000 1.50 +++ gtkhtml3.spec 30 Jan 2006 23:06:12 -0000 1.51 @@ -4,7 +4,7 @@ Summary: gtkhtml library Name: gtkhtml3 -Version: 3.9.5 +Version: 3.9.90 Release: 1 License: LGPL/GPL Group: System Environment/Libraries @@ -97,6 +97,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Jan 30 2006 David Malcolm - 3.9.90-1 +- 3.9.90 + * Wed Jan 25 2006 David Malcolm - 3.9.5-1 - 3.9.5 - be more explicit about packaged bonobo server and so files, relying less on Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/sources,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- sources 26 Jan 2006 05:36:59 -0000 1.29 +++ sources 30 Jan 2006 23:06:12 -0000 1.30 @@ -1 +1 @@ -c49dc8a473e40417218454ae20b19ec3 gtkhtml-3.9.5.tar.bz2 +8f2336c28c2696251dc055ca1882cf2c gtkhtml-3.9.90.tar.bz2 From fedora-cvs-commits at redhat.com Mon Jan 30 23:34:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 18:34:37 -0500 Subject: rpms/libsepol/devel .cvsignore, 1.81, 1.82 libsepol.spec, 1.104, 1.105 sources, 1.82, 1.83 Message-ID: <200601302334.k0UNYbBi009643@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsepol/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9607 Modified Files: .cvsignore libsepol.spec sources Log Message: * Mon Jan 30 2006 Dan Walsh 1.11.10-1 - Upgrade to latest from NSA * Merged cond_expr mapping and package section count bug fixes from Joshua Brindle. * Merged improve port/fcontext API patch from Ivan Gyurdiev. * Merged fixes for overflow bugs on 64-bit from Ivan Gyurdiev. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/.cvsignore,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- .cvsignore 13 Jan 2006 14:51:35 -0000 1.81 +++ .cvsignore 30 Jan 2006 23:34:33 -0000 1.82 @@ -78,3 +78,4 @@ libsepol-1.11.7.tgz libsepol-1.11.8.tgz libsepol-1.11.9.tgz +libsepol-1.11.10.tgz Index: libsepol.spec =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/libsepol.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- libsepol.spec 13 Jan 2006 14:51:35 -0000 1.104 +++ libsepol.spec 30 Jan 2006 23:34:34 -0000 1.105 @@ -1,6 +1,6 @@ Summary: SELinux binary policy manipulation library Name: libsepol -Version: 1.11.9 +Version: 1.11.10 Release: 1 License: GPL Group: System Environment/Libraries @@ -80,6 +80,13 @@ %{_includedir}/sepol/policydb/*.h %changelog +* Mon Jan 30 2006 Dan Walsh 1.11.10-1 +- Upgrade to latest from NSA + * Merged cond_expr mapping and package section count bug fixes + from Joshua Brindle. + * Merged improve port/fcontext API patch from Ivan Gyurdiev. + * Merged fixes for overflow bugs on 64-bit from Ivan Gyurdiev. + * Fri Jan 13 2006 Dan Walsh 1.11.9-1 - Upgrade to latest from NSA * Merged size_t -> unsigned int patch from Ivan Gyurdiev. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsepol/devel/sources,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- sources 13 Jan 2006 14:51:35 -0000 1.82 +++ sources 30 Jan 2006 23:34:34 -0000 1.83 @@ -1 +1 @@ -cabc1603030e939e7a19d60671fb0afe libsepol-1.11.9.tgz +dbb6a5f3604e718d17a2b764df75f261 libsepol-1.11.10.tgz From fedora-cvs-commits at redhat.com Mon Jan 30 23:36:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 18:36:23 -0500 Subject: rpms/evolution-data-server/devel .cvsignore, 1.37, 1.38 evolution-data-server.spec, 1.80, 1.81 sources, 1.37, 1.38 Message-ID: <200601302336.k0UNaNui010080@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9981 Modified Files: .cvsignore evolution-data-server.spec sources Log Message: * Mon Jan 30 2006 David Malcolm - 1.5.90-1 - 1.5.90 - explicitly list various files rather than rely on globbing - enabled parallel make Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 26 Jan 2006 05:43:55 -0000 1.37 +++ .cvsignore 30 Jan 2006 23:36:19 -0000 1.38 @@ -1 +1 @@ -evolution-data-server-1.5.5.tar.bz2 +evolution-data-server-1.5.90.tar.bz2 Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- evolution-data-server.spec 26 Jan 2006 05:43:55 -0000 1.80 +++ evolution-data-server.spec 30 Jan 2006 23:36:19 -0000 1.81 @@ -24,7 +24,7 @@ Summary: Backend data server for evolution Name: evolution-data-server -Version: 1.5.5 +Version: 1.5.90 Release: 1 License: LGPL Group: System Environment/Libraries @@ -203,7 +203,7 @@ --enable-file-locking=fcntl --enable-dot-locking=no \ %ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags export tagname=CC -make LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration" +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration" %install rm -rf $RPM_BUILD_ROOT @@ -228,8 +228,18 @@ %files -f %{name}-%{eds_base_version}.lang %defattr(-,root,root,-) %doc README COPYING ChangeLog NEWS AUTHORS -%{_libdir}/bonobo/servers/* -%{_libdir}/*.so.* +%{_libdir}/bonobo/servers/GNOME_Evolution_DataServer_%{eds_api_version}.server +%{_libdir}/libcamel-%{eds_api_version}.so.* +%{_libdir}/libcamel-provider-%{eds_api_version}.so.* +%{_libdir}/libebook-%{eds_api_version}.so.* +%{_libdir}/libecal-%{eds_api_version}.so.* +%{_libdir}/libedata-book-%{eds_api_version}.so.* +%{_libdir}/libedata-cal-%{eds_api_version}.so.* +%{_libdir}/libedataserver-%{eds_api_version}.so.* +%{_libdir}/libedataserverui-%{eds_api_version}.so.* +%{_libdir}/libegroupwise-%{eds_api_version}.so.* +%{_libdir}/libexchange-storage-%{eds_api_version}.so.* + %{_libexecdir}/evolution-data-server-%{eds_base_version} %{_libexecdir}/camel-index-control-%{eds_api_version} %{_libexecdir}/camel-lock-helper-%{eds_api_version} @@ -286,11 +296,35 @@ %defattr(-,root,root,-) %{_includedir}/evolution-data-server-%{eds_base_version} %{_datadir}/gtk-doc/html/* -%{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc +%{_libdir}/libcamel-%{eds_api_version}.so +%{_libdir}/libcamel-provider-%{eds_api_version}.so +%{_libdir}/libebook-%{eds_api_version}.so +%{_libdir}/libecal-%{eds_api_version}.so +%{_libdir}/libedata-book-%{eds_api_version}.so +%{_libdir}/libedata-cal-%{eds_api_version}.so +%{_libdir}/libedataserver-%{eds_api_version}.so +%{_libdir}/libedataserverui-%{eds_api_version}.so +%{_libdir}/libegroupwise-%{eds_api_version}.so +%{_libdir}/libexchange-storage-%{eds_api_version}.so +%{_libdir}/pkgconfig/camel-%{eds_api_version}.pc +%{_libdir}/pkgconfig/camel-provider-%{eds_api_version}.pc +%{_libdir}/pkgconfig/evolution-data-server-%{eds_api_version}.pc +%{_libdir}/pkgconfig/libebook-%{eds_api_version}.pc +%{_libdir}/pkgconfig/libecal-%{eds_api_version}.pc +%{_libdir}/pkgconfig/libedata-book-%{eds_api_version}.pc +%{_libdir}/pkgconfig/libedata-cal-%{eds_api_version}.pc +%{_libdir}/pkgconfig/libedataserver-%{eds_api_version}.pc +%{_libdir}/pkgconfig/libedataserverui-%{eds_api_version}.pc +%{_libdir}/pkgconfig/libegroupwise-%{eds_api_version}.pc +%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc %changelog +* Mon Jan 30 2006 David Malcolm - 1.5.90-1 +- 1.5.90 +- explicitly list various files rather than rely on globbing +- enabled parallel make + * Wed Jan 25 2006 David Malcolm - 1.5.5-1 - 1.5.5 - added CalDAV backend to the list of packaged extensions Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 26 Jan 2006 05:43:55 -0000 1.37 +++ sources 30 Jan 2006 23:36:19 -0000 1.38 @@ -1 +1 @@ -9104c52697ccccfa55c039b9547effbd evolution-data-server-1.5.5.tar.bz2 +bdbf8608530d4f294b179b7c0de47d1b evolution-data-server-1.5.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 00:03:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 19:03:05 -0500 Subject: rpms/libsemanage/devel .cvsignore, 1.48, 1.49 libsemanage.spec, 1.68, 1.69 sources, 1.50, 1.51 Message-ID: <200601310003.k0V035ZD000482@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/libsemanage/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv461 Modified Files: .cvsignore libsemanage.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/.cvsignore,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- .cvsignore 28 Jan 2006 01:38:10 -0000 1.48 +++ .cvsignore 31 Jan 2006 00:02:55 -0000 1.49 @@ -51,3 +51,4 @@ libsemanage-1.5.15.tgz libsemanage-1.5.16.tgz libsemanage-1.5.18.tgz +libsemanage-1.5.19.tgz Index: libsemanage.spec =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/libsemanage.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- libsemanage.spec 28 Jan 2006 01:38:10 -0000 1.68 +++ libsemanage.spec 31 Jan 2006 00:02:55 -0000 1.69 @@ -1,8 +1,8 @@ -%define libsepolver 1.11.9-1 +%define libsepolver 1.11.10-1 %define libselinuxver 1.29.6-1 Summary: SELinux binary policy manipulation library Name: libsemanage -Version: 1.5.18 +Version: 1.5.19 Release: 1 License: GPL Group: System Environment/Libraries @@ -76,6 +76,13 @@ %changelog +* Mon Jan 30 2006 Dan Walsh 1.5.19-1 +- Upgrade to latest from NSA + * Merged fname parameter patch from Ivan Gyurdiev. + * Merged more size_t -> unsigned int fixes from Ivan Gyurdiev. + * Merged seusers.system patch from Ivan Gyurdiev. + * Merged improve port/fcontext API patch from Ivan Gyurdiev. + * Fri Jan 27 2006 Dan Walsh 1.5.18-1 - Upgrade to latest from NSA * Merged seuser -> seuser_local rename patch from Ivan Gyurdiev. Index: sources =================================================================== RCS file: /cvs/dist/rpms/libsemanage/devel/sources,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- sources 28 Jan 2006 01:38:10 -0000 1.50 +++ sources 31 Jan 2006 00:02:55 -0000 1.51 @@ -1 +1 @@ -603e43a76bef01568688b97e11a9bc24 libsemanage-1.5.18.tgz +96eaeb9e2b7079ba84fb30fb8941e5ef libsemanage-1.5.19.tgz From fedora-cvs-commits at redhat.com Tue Jan 31 00:17:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 19:17:28 -0500 Subject: rpms/stunnel/devel stunnel.spec,1.34,1.35 Message-ID: <200601310017.k0V0HSCn017488@cvs.devel.redhat.com> Author: mitr Update of /cvs/dist/rpms/stunnel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17403 Modified Files: stunnel.spec Log Message: * Tue Jan 31 2006 Miloslav Trmac - 4.14-3 - Use pthread threading to fix crash on x86_64 (#179236) Index: stunnel.spec =================================================================== RCS file: /cvs/dist/rpms/stunnel/devel/stunnel.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- stunnel.spec 9 Dec 2005 22:43:21 -0000 1.34 +++ stunnel.spec 31 Jan 2006 00:17:26 -0000 1.35 @@ -1,7 +1,7 @@ Summary: An SSL-encrypting socket wrapper. Name: stunnel Version: 4.14 -Release: 2.1 +Release: 3 License: GPL Group: Applications/Internet URL: http://stunnel.mirt.net/ @@ -45,7 +45,7 @@ CFLAGS="$CFLAGS `pkg-config --cflags openssl`"; LDFLAGS="`pkg-config --libs-only-L openssl`"; export LDFLAGS fi -%configure --enable-ipv6 \ +%configure --enable-ipv6 --with-threads=pthread \ CPPFLAGS="-UPIDFILE -DPIDFILE='\"%{_localstatedir}/run/stunnel.pid\"'" make LDADD="-pie -Wl,-z,defs,-z,relro" @@ -91,6 +91,9 @@ %exclude %{_sysconfdir}/stunnel/* %changelog +* Tue Jan 31 2006 Miloslav Trmac - 4.14-3 +- Use pthread threading to fix crash on x86_64 (#179236) + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 31 00:21:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 19:21:59 -0500 Subject: rpms/policycoreutils/devel .cvsignore, 1.98, 1.99 policycoreutils-rhat.patch, 1.158, 1.159 policycoreutils.spec, 1.228, 1.229 sources, 1.102, 1.103 Message-ID: <200601310021.k0V0Lx5m019606@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/policycoreutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19571 Modified Files: .cvsignore policycoreutils-rhat.patch policycoreutils.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/.cvsignore,v retrieving revision 1.98 retrieving revision 1.99 diff -u -r1.98 -r1.99 --- .cvsignore 28 Jan 2006 02:47:35 -0000 1.98 +++ .cvsignore 31 Jan 2006 00:21:56 -0000 1.99 @@ -86,3 +86,4 @@ policycoreutils-1.29.11.tgz policycoreutils-1.29.12.tgz policycoreutils-1.29.15.tgz +policycoreutils-1.29.17.tgz policycoreutils-rhat.patch: genhomedircon | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) Index: policycoreutils-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils-rhat.patch,v retrieving revision 1.158 retrieving revision 1.159 diff -u -r1.158 -r1.159 --- policycoreutils-rhat.patch 28 Jan 2006 02:47:35 -0000 1.158 +++ policycoreutils-rhat.patch 31 Jan 2006 00:21:56 -0000 1.159 @@ -1,7 +1,25 @@ -diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.11/scripts/genhomedircon ---- nsapolicycoreutils/scripts/genhomedircon 2006-01-20 10:37:37.000000000 -0500 -+++ policycoreutils-1.29.11/scripts/genhomedircon 2006-01-27 01:22:00.000000000 -0500 -@@ -87,6 +87,12 @@ +diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.15/scripts/genhomedircon +--- nsapolicycoreutils/scripts/genhomedircon 2006-01-27 20:35:37.000000000 -0500 ++++ policycoreutils-1.29.15/scripts/genhomedircon 2006-01-30 11:49:16.000000000 -0500 +@@ -38,6 +38,17 @@ + except: + VALID_SHELLS = ['/bin/sh', '/bin/bash', '/bin/ash', '/bin/bsh', '/bin/ksh', '/usr/bin/ksh', '/usr/bin/pdksh', '/bin/tcsh', '/bin/csh', '/bin/zsh'] + ++def grep(file, var): ++ ret="" ++ fd=open(file, 'r') ++ ++ for i in fd.read().split('\n'): ++ if re.search(var, i, 0) != None: ++ ret=i ++ break ++ fd.close() ++ return ret ++ + def findval(file, var, delim=""): + val="" + try: +@@ -87,6 +98,12 @@ if ret == []: ret.append("/home") @@ -14,3 +32,24 @@ return ret def getSELinuxType(directory): +@@ -168,9 +185,9 @@ + return "user_r" + return name + def getOldRole(self, role): +- rc=findval(self.selinuxdir+self.type+"/users/system.users", 'grep "^user %s"' % role, "=") ++ rc=grep(self.selinuxdir+self.type+"/users/system.users", "^user %s" % role) + if rc == "": +- rc=findval(self.selinuxdir+self.type+"/users/local.users", 'grep "^user %s"' % role, "=") ++ rc=grep(self.selinuxdir+self.type+"/users/local.users", "^user %s" % role) + if rc != "": + user=rc.split() + role = user[3] +@@ -259,7 +276,7 @@ + return ret + + def genHomeDirContext(self): +- if self.semanaged and findval(self.getHomeDirTemplate(), "ROLE", "=") != "": ++ if self.semanaged and grep(self.getHomeDirTemplate(), "ROLE") != "": + warning("genhomedircon: Warning! No support yet for expanding ROLE macros in the %s file when using libsemanage." % self.getHomeDirTemplate()); + warning("genhomedircon: You must manually update file_contexts.homedirs for any non-user_r users (including root)."); + users = self.getUsers() Index: policycoreutils.spec =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/policycoreutils.spec,v retrieving revision 1.228 retrieving revision 1.229 diff -u -r1.228 -r1.229 --- policycoreutils.spec 28 Jan 2006 02:47:35 -0000 1.228 +++ policycoreutils.spec 31 Jan 2006 00:21:56 -0000 1.229 @@ -1,14 +1,14 @@ -%define libsepolver 1.11.9-1 -%define libsemanagever 1.5.18-1 +%define libsepolver 1.11.10-1 +%define libsemanagever 1.5.19-1 %define libselinuxver 1.29.6-1 Summary: SELinux policy core utilities. Name: policycoreutils -Version: 1.29.15 +Version: 1.29.17 Release: 1 License: GPL Group: System Environment/Base Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz -Patch: policycoreutils-rhat.patch +#Patch: policycoreutils-rhat.patch BuildRequires: pam-devel libsepol-devel >= %{libsepolver} libsemanage-devel >= %{libsemanagever} libselinux-devel >= %{libselinuxver} PreReq: /bin/mount /bin/egrep /bin/awk /usr/bin/diff @@ -34,10 +34,10 @@ %prep %setup -q -%patch -p1 -b .rhat +#%patch -p1 -b .rhat %build -make LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all +make LOG_AUDIT_PRIV=y LIBDIR="%{_libdir}" CFLAGS="%{optflags}" all %install rm -rf ${RPM_BUILD_ROOT} @@ -47,7 +47,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d -make DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" install +make LOG_AUDIT_PRIV=y DESTDIR="${RPM_BUILD_ROOT}" LIBDIR="${RPM_BUILD_ROOT}%{_libdir}" install %find_lang %{name} @@ -97,6 +97,14 @@ %{_libdir}/python2.4/site-packages/seobject.py* %changelog + +* Mon Jan 30 2006 Dan Walsh 1.29.17-1 +- Update from upstream + * Merged genhomedircon fix from Dan Walsh. + * Merged seusers.system patch from Ivan Gyurdiev. + * Merged improve port/fcontext API patch from Ivan Gyurdiev. + * Merged genhomedircon patch from Dan Walsh. + * Fri Jan 27 2006 Dan Walsh 1.29.15-1 - Update from upstream * Merged newrole audit patch from Steve Grubb. Index: sources =================================================================== RCS file: /cvs/dist/rpms/policycoreutils/devel/sources,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- sources 28 Jan 2006 02:47:35 -0000 1.102 +++ sources 31 Jan 2006 00:21:56 -0000 1.103 @@ -1 +1 @@ -4630f6f9b6ce13585a58e6d1dc10fff7 policycoreutils-1.29.15.tgz +a89902ab7e9d4feadc48f06c5fb9be30 policycoreutils-1.29.17.tgz From fedora-cvs-commits at redhat.com Tue Jan 31 00:35:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 19:35:34 -0500 Subject: rpms/selinux-policy/devel .cvsignore, 1.32, 1.33 modules-mls.conf, 1.10, 1.11 modules-strict.conf, 1.1, 1.2 modules-targeted.conf, 1.13, 1.14 policy-20060104.patch, 1.27, 1.28 selinux-policy.spec, 1.96, 1.97 sources, 1.36, 1.37 Message-ID: <200601310035.k0V0ZYJN015232@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/selinux-policy/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15216 Modified Files: .cvsignore modules-mls.conf modules-strict.conf modules-targeted.conf policy-20060104.patch selinux-policy.spec sources Log Message: * Fri Jan 27 2006 Dan Walsh 2.2.8-2 - Update to upstream - Fix rhgb, and other Xorg startups Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/.cvsignore,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- .cvsignore 28 Jan 2006 04:52:34 -0000 1.32 +++ .cvsignore 31 Jan 2006 00:35:32 -0000 1.33 @@ -33,3 +33,4 @@ serefpolicy-2.2.6.tgz serefpolicy-2.2.7.tgz serefpolicy-2.2.8.tgz +serefpolicy-2.2.9.tgz Index: modules-mls.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-mls.conf,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- modules-mls.conf 24 Jan 2006 21:47:16 -0000 1.10 +++ modules-mls.conf 31 Jan 2006 00:35:32 -0000 1.11 @@ -558,11 +558,11 @@ rdisc = base # Layer: services -# Module: xdm +# Module: xserver # # X windows login display manager # -xdm = off +xserver = off # Layer: services # Module: nscd Index: modules-strict.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-strict.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- modules-strict.conf 24 Jan 2006 15:41:46 -0000 1.1 +++ modules-strict.conf 31 Jan 2006 00:35:32 -0000 1.2 @@ -707,11 +707,11 @@ rdisc = module # Layer: services -# Module: xdm +# Module: xserver # # X windows login display manager # -xdm = module +xserver = module # Layer: services # Module: nscd Index: modules-targeted.conf =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/modules-targeted.conf,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- modules-targeted.conf 24 Jan 2006 15:30:40 -0000 1.13 +++ modules-targeted.conf 31 Jan 2006 00:35:32 -0000 1.14 @@ -580,11 +580,11 @@ rdisc = base # Layer: services -# Module: xdm +# Module: xserver # # X windows login display manager # -xdm = base +xserver = base # Layer: services # Module: nscd policy-20060104.patch: admin/usermanage.te | 3 +++ kernel/filesystem.if | 20 ++++++++++---------- kernel/filesystem.te | 1 + kernel/mls.te | 3 ++- services/apache.fc | 2 ++ services/apache.te | 1 + services/automount.te | 1 + services/hal.te | 1 + services/irqbalance.te | 3 +++ services/networkmanager.fc | 2 +- services/networkmanager.te | 2 +- services/procmail.te | 1 + services/sendmail.if | 15 +++++++++++++++ services/xserver.fc | 9 ++++++--- services/xserver.if | 21 +++++++++++++++++++++ services/xserver.te | 9 +++++---- system/init.fc | 3 ++- system/unconfined.te | 4 ++++ 18 files changed, 80 insertions(+), 21 deletions(-) Index: policy-20060104.patch =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/policy-20060104.patch,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- policy-20060104.patch 28 Jan 2006 05:39:52 -0000 1.27 +++ policy-20060104.patch 31 Jan 2006 00:35:32 -0000 1.28 @@ -1,6 +1,6 @@ -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.8/policy/modules/admin/usermanage.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/admin/usermanage.te serefpolicy-2.2.9/policy/modules/admin/usermanage.te --- nsaserefpolicy/policy/modules/admin/usermanage.te 2006-01-19 10:00:40.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/admin/usermanage.te 2006-01-28 00:05:06.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/admin/usermanage.te 2006-01-30 19:01:01.000000000 -0500 @@ -328,6 +328,9 @@ miscfiles_read_localization(passwd_t) @@ -11,11 +11,11 @@ seutil_dontaudit_search_config(passwd_t) userdom_use_unpriv_users_fd(passwd_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.8/policy/modules/kernel/filesystem.if ---- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-27 21:35:04.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/kernel/filesystem.if 2006-01-28 00:05:06.000000000 -0500 -@@ -154,7 +154,7 @@ - class filesystem unmount; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.if serefpolicy-2.2.9/policy/modules/kernel/filesystem.if +--- nsaserefpolicy/policy/modules/kernel/filesystem.if 2006-01-30 18:40:35.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/kernel/filesystem.if 2006-01-30 19:01:01.000000000 -0500 +@@ -149,7 +149,7 @@ + type fs_t; ') - allow $1 fs_t:filesystem mount; @@ -23,8 +23,8 @@ ') ######################################## -@@ -320,7 +320,7 @@ - class filesystem unmount; +@@ -307,7 +307,7 @@ + type autofs_t; ') - allow $1 autofs_t:filesystem mount; @@ -32,8 +32,8 @@ ') ######################################## -@@ -912,7 +912,7 @@ - class filesystem unmount; +@@ -874,7 +874,7 @@ + type dosfs_t; ') - allow $1 dosfs_t:filesystem mount; @@ -41,8 +41,8 @@ ') ######################################## -@@ -1037,7 +1037,7 @@ - class filesystem unmount; +@@ -994,7 +994,7 @@ + type iso9660_t; ') - allow $1 iso9660_t:filesystem mount; @@ -50,8 +50,8 @@ ') ######################################## -@@ -1108,7 +1108,7 @@ - class filesystem unmount; +@@ -1061,7 +1061,7 @@ + type nfs_t; ') - allow $1 nfs_t:filesystem mount; @@ -59,8 +59,8 @@ ') ######################################## -@@ -1696,7 +1696,7 @@ - class filesystem unmount; +@@ -1626,7 +1626,7 @@ + type nfsd_fs_t; ') - allow $1 nfsd_fs_t:filesystem mount; @@ -68,8 +68,8 @@ ') ######################################## -@@ -1803,7 +1803,7 @@ - class filesystem unmount; +@@ -1727,7 +1727,7 @@ + type ramfs_t; ') - allow $1 ramfs_t:filesystem mount; @@ -77,8 +77,8 @@ ') ######################################## -@@ -1953,7 +1953,7 @@ - class filesystem unmount; +@@ -1873,7 +1873,7 @@ + type romfs_t; ') - allow $1 romfs_t:filesystem mount; @@ -86,8 +86,8 @@ ') ######################################## -@@ -2024,7 +2024,7 @@ - class filesystem unmount; +@@ -1940,7 +1940,7 @@ + type rpc_pipefs_t; ') - allow $1 rpc_pipefs_t:filesystem mount; @@ -95,8 +95,8 @@ ') ######################################## -@@ -2094,7 +2094,7 @@ - class filesystem unmount; +@@ -2006,7 +2006,7 @@ + type tmpfs_t; ') - allow $1 tmpfs_t:filesystem mount; @@ -104,9 +104,9 @@ ') ######################################## -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.8/policy/modules/kernel/filesystem.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/filesystem.te serefpolicy-2.2.9/policy/modules/kernel/filesystem.te --- nsaserefpolicy/policy/modules/kernel/filesystem.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/kernel/filesystem.te 2006-01-28 00:05:06.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/kernel/filesystem.te 2006-01-30 19:01:01.000000000 -0500 @@ -134,6 +134,7 @@ # type dosfs_t, noxattrfs; @@ -115,9 +115,9 @@ genfscon fat / gen_context(system_u:object_r:dosfs_t,s0) genfscon msdos / gen_context(system_u:object_r:dosfs_t,s0) genfscon ntfs / gen_context(system_u:object_r:dosfs_t,s0) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.8/policy/modules/kernel/mls.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/kernel/mls.te serefpolicy-2.2.9/policy/modules/kernel/mls.te --- nsaserefpolicy/policy/modules/kernel/mls.te 2006-01-17 17:08:52.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/kernel/mls.te 2006-01-28 00:05:06.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/kernel/mls.te 2006-01-30 19:01:01.000000000 -0500 @@ -86,7 +86,8 @@ ') @@ -128,9 +128,32 @@ range_transition initrc_t auditd_exec_t s15:c0.c255; +range_transition sysadm_t rpm_exec_t s0 - s15:c0.c255; ') -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.8/policy/modules/services/automount.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.fc serefpolicy-2.2.9/policy/modules/services/apache.fc +--- nsaserefpolicy/policy/modules/services/apache.fc 2005-11-15 09:13:36.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/services/apache.fc 2006-01-30 19:01:01.000000000 -0500 +@@ -42,6 +42,8 @@ + /var/cache/php-eaccelerator(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0) + /var/cache/php-mmcache(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0) + /var/cache/ssl.*\.sem -- gen_context(system_u:object_r:httpd_cache_t,s0) ++/var/cache/mason(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0) ++/var/cache/rt3(/.*)? gen_context(system_u:object_r:httpd_cache_t,s0) + + /var/lib/dav(/.*)? gen_context(system_u:object_r:httpd_var_lib_t,s0) + /var/lib/htdig(/.*)? gen_context(system_u:object_r:httpd_sys_content_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/apache.te serefpolicy-2.2.9/policy/modules/services/apache.te +--- nsaserefpolicy/policy/modules/services/apache.te 2006-01-17 17:08:52.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/services/apache.te 2006-01-30 19:01:01.000000000 -0500 +@@ -347,6 +347,7 @@ + + tunable_policy(`httpd_enable_cgi && httpd_unified && httpd_builtin_scripting',` + domain_auto_trans(httpd_t, httpdcontent, httpd_sys_script_t) ++ domain_auto_trans(httpd_suexec_t, httpdcontent, httpd_sys_script_t) + allow httpd_t httpd_sys_script_t:fd use; + allow httpd_sys_script_t httpd_t:fd use; + allow httpd_sys_script_t httpd_t:fifo_file rw_file_perms; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/automount.te serefpolicy-2.2.9/policy/modules/services/automount.te --- nsaserefpolicy/policy/modules/services/automount.te 2006-01-17 17:08:53.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/services/automount.te 2006-01-28 00:05:06.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/services/automount.te 2006-01-30 19:01:01.000000000 -0500 @@ -64,6 +64,7 @@ kernel_list_proc(automount_t) @@ -139,9 +162,9 @@ corecmd_exec_sbin(automount_t) corecmd_exec_bin(automount_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.8/policy/modules/services/hal.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/hal.te serefpolicy-2.2.9/policy/modules/services/hal.te --- nsaserefpolicy/policy/modules/services/hal.te 2006-01-27 21:35:04.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/services/hal.te 2006-01-28 00:05:06.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/services/hal.te 2006-01-30 19:01:01.000000000 -0500 @@ -51,6 +51,7 @@ kernel_write_proc_file(hald_t) @@ -150,34 +173,105 @@ corecmd_exec_bin(hald_t) corecmd_exec_sbin(hald_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.2.8/policy/modules/services/irqbalance.te +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/irqbalance.te serefpolicy-2.2.9/policy/modules/services/irqbalance.te --- nsaserefpolicy/policy/modules/services/irqbalance.te 2006-01-13 17:06:07.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/services/irqbalance.te 2006-01-28 00:05:06.000000000 -0500 -@@ -31,6 +31,8 @@ ++++ serefpolicy-2.2.9/policy/modules/services/irqbalance.te 2006-01-30 19:01:01.000000000 -0500 +@@ -31,6 +31,9 @@ dev_read_sysfs(irqbalance_t) ++files_read_etc_files(irqbalance_t) +files_read_etc_runtime_files(irqbalance_t) + fs_getattr_all_fs(irqbalance_t) fs_search_auto_mountpoints(irqbalance_t) -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xdm.fc serefpolicy-2.2.8/policy/modules/services/xdm.fc ---- nsaserefpolicy/policy/modules/services/xdm.fc 2006-01-20 10:02:32.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/services/xdm.fc 2006-01-28 00:28:26.000000000 -0500 -@@ -30,3 +30,7 @@ - - /var/run/xdm\.pid -- gen_context(system_u:object_r:xdm_var_run_t,s0) - /var/run/xdmctl(/.*)? gen_context(system_u:object_r:xdm_var_run_t,s0) -+ifdef(`targeted_policy',` -+/usr/bin/Xorg -- gen_context(system_u:object_r:xdm_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.fc serefpolicy-2.2.9/policy/modules/services/networkmanager.fc +--- nsaserefpolicy/policy/modules/services/networkmanager.fc 2005-11-14 18:24:07.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/services/networkmanager.fc 2006-01-30 19:01:01.000000000 -0500 +@@ -1,2 +1,2 @@ + +-/usr/bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) ++/usr/(s)?bin/NetworkManager -- gen_context(system_u:object_r:NetworkManager_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/networkmanager.te serefpolicy-2.2.9/policy/modules/services/networkmanager.te +--- nsaserefpolicy/policy/modules/services/networkmanager.te 2006-01-19 10:00:41.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/services/networkmanager.te 2006-01-30 19:01:01.000000000 -0500 +@@ -24,7 +24,7 @@ + allow NetworkManager_t self:fifo_file rw_file_perms; + allow NetworkManager_t self:unix_dgram_socket create_socket_perms; + allow NetworkManager_t self:unix_stream_socket create_stream_socket_perms; +-allow NetworkManager_t self:netlink_route_socket r_netlink_socket_perms; ++allow NetworkManager_t self:netlink_route_socket create_netlink_socket_perms; + allow NetworkManager_t self:tcp_socket create_stream_socket_perms; + allow NetworkManager_t self:udp_socket create_socket_perms; + allow NetworkManager_t self:packet_socket create_socket_perms; +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/procmail.te serefpolicy-2.2.9/policy/modules/services/procmail.te +--- nsaserefpolicy/policy/modules/services/procmail.te 2006-01-25 15:59:00.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/services/procmail.te 2006-01-30 19:01:01.000000000 -0500 +@@ -96,6 +96,7 @@ + optional_policy(`sendmail',` + mta_read_config(procmail_t) + sendmail_rw_tcp_socket(procmail_t) ++ sendmail_rw_unix_stream_socket(procmail_t) + ') + + optional_policy(`spamassassin',` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/sendmail.if serefpolicy-2.2.9/policy/modules/services/sendmail.if +--- nsaserefpolicy/policy/modules/services/sendmail.if 2006-01-13 17:06:07.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/services/sendmail.if 2006-01-30 19:01:01.000000000 -0500 +@@ -52,6 +52,21 @@ + + allow $1 sendmail_t:tcp_socket { read write }; + ') ++######################################## ++## ++## Read and write sendmail unix_stream_sockets. ++## ++## ++## Domain allowed access. ++## ++# ++interface(`sendmail_rw_unix_stream_socket',` ++ gen_require(` ++ type sendmail_t; ++ ') ++ ++ allow $1 sendmail_t:unix_stream_socket { read write }; +') + + ######################################## + ## +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.fc serefpolicy-2.2.9/policy/modules/services/xserver.fc +--- nsaserefpolicy/policy/modules/services/xserver.fc 2006-01-30 18:40:36.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/services/xserver.fc 2006-01-30 19:01:01.000000000 -0500 +@@ -55,16 +55,19 @@ + + /usr/X11R6/bin/[xgkw]dm -- gen_context(system_u:object_r:xdm_exec_t,s0) + /usr/X11R6/bin/iceauth -- gen_context(system_u:object_r:iceauth_exec_t,s0) +-/usr/X11R6/bin/X -- gen_context(system_u:object_r:xserver_exec_t,s0) ++/usr/X11R6/bin/X -- gen_context(system_u:object_r:xserver_exec_t,s0) + /usr/X11R6/bin/xauth -- gen_context(system_u:object_r:xauth_exec_t,s0) + /usr/X11R6/bin/XFree86 -- gen_context(system_u:object_r:xserver_exec_t,s0) + /usr/X11R6/bin/Xipaq -- gen_context(system_u:object_r:xserver_exec_t,s0) + /usr/X11R6/bin/Xorg -- gen_context(system_u:object_r:xserver_exec_t,s0) +-/usr/X11R6/bin/Xwrapper -- gen_context(system_u:object_r:xserver_exec_t,s0) +- + /usr/X11R6/lib/X11/xkb -d gen_context(system_u:object_r:xkb_var_lib_t,s0) + /usr/X11R6/lib/X11/xkb/.* -- gen_context(system_u:object_r:xkb_var_lib_t,s0) + ++/usr/X11R6/bin/Xwrapper -- gen_context(system_u:object_r:xserver_exec_t,s0) ++/usr/bin/iceauth -- gen_context(system_u:object_r:iceauth_exec_t,s0) ++/usr/bin/xauth -- gen_context(system_u:object_r:xauth_exec_t,s0) ++/usr/bin/Xorg -- gen_context(system_u:object_r:xserver_exec_t,s0) + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xdm.if serefpolicy-2.2.8/policy/modules/services/xdm.if ---- nsaserefpolicy/policy/modules/services/xdm.if 2005-11-14 18:24:08.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/services/xdm.if 2006-01-28 00:05:06.000000000 -0500 -@@ -1 +1,22 @@ - ## X windows login display manager + # + # /var + # +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.if serefpolicy-2.2.9/policy/modules/services/xserver.if +--- nsaserefpolicy/policy/modules/services/xserver.if 2006-01-30 18:40:36.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/services/xserver.if 2006-01-30 19:02:46.000000000 -0500 +@@ -1,4 +1,25 @@ + ## X Windows Server +######################################## +## +## Execute xdmd in the xdmd domain. @@ -186,28 +280,70 @@ +## The type of the process performing this action. +## +# -+interface(`xdm_domtrans',` ++interface(`xserver_domtrans',` + gen_require(` -+ type xdm_t, xdm_exec_t; ++ type xdm_xserver_t, xserver_exec_t; + ') + -+ domain_auto_trans($1,xdm_exec_t,xdm_t) ++ domain_auto_trans($1,xserver_exec_t,xdm_xserver_t) + -+ allow $1 xdm_t:fd use; -+ allow xdm_t $1:fd use; -+ allow xdm_t $1:fifo_file rw_file_perms; -+ allow xdm_t $1:process sigchld; ++ allow $1 xdm_xserver_t:fd use; ++ allow xdm_xserver_t $1:fd use; ++ allow xdm_xserver_t $1:fifo_file rw_file_perms; ++ allow xdm_xserver_t $1:process sigchld; +') + -diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.8/policy/modules/system/unconfined.te + + template(`xserver_common_domain_template',` + +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/services/xserver.te serefpolicy-2.2.9/policy/modules/services/xserver.te +--- nsaserefpolicy/policy/modules/services/xserver.te 2006-01-30 18:40:36.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/services/xserver.te 2006-01-30 19:06:27.000000000 -0500 +@@ -57,10 +57,8 @@ + type xserver_log_t; + logging_log_file(xserver_log_t) + +-ifdef(`strict_policy',` +- xserver_common_domain_template(xdm) +- init_system_domain(xdm_xserver_t,xserver_exec_t) +-') ++xserver_common_domain_template(xdm) ++init_system_domain(xdm_xserver_t,xserver_exec_t) + + optional_policy(`prelink',` + prelink_object_file(xkb_var_lib_t) +@@ -302,6 +300,9 @@ + allow xdm_t self:process { execheap execmem }; + unconfined_domain_template(xdm_t) + unconfined_domtrans(xdm_t) ++ allow xdm_xserver_t self:process { execheap execmem }; ++ unconfined_domain_template(xdm_xserver_t) ++ unconfined_domtrans(xdm_xserver_t) + ') + + tunable_policy(`use_nfs_home_dirs',` +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/init.fc serefpolicy-2.2.9/policy/modules/system/init.fc +--- nsaserefpolicy/policy/modules/system/init.fc 2006-01-16 22:19:19.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/system/init.fc 2006-01-30 19:01:01.000000000 -0500 +@@ -22,7 +22,8 @@ + # + # /sbin + # +-/sbin/init -- gen_context(system_u:object_r:init_exec_t,s0) ++/sbin/init(ng)? -- gen_context(system_u:object_r:init_exec_t,s0) ++ + + ifdef(`distro_gentoo', ` + /sbin/rc -- gen_context(system_u:object_r:initrc_exec_t,s0) +diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/unconfined.te serefpolicy-2.2.9/policy/modules/system/unconfined.te --- nsaserefpolicy/policy/modules/system/unconfined.te 2006-01-27 21:35:05.000000000 -0500 -+++ serefpolicy-2.2.8/policy/modules/system/unconfined.te 2006-01-28 00:05:06.000000000 -0500 ++++ serefpolicy-2.2.9/policy/modules/system/unconfined.te 2006-01-30 19:01:01.000000000 -0500 @@ -148,4 +148,8 @@ optional_policy(`wine',` wine_domtrans(unconfined_t) ') + -+ optional_policy(`xdm',` -+ xdm_domtrans(unconfined_t) ++ optional_policy(`xserver',` ++ xserver_domtrans(unconfined_t) + ') ') Index: selinux-policy.spec =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/selinux-policy.spec,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- selinux-policy.spec 28 Jan 2006 05:39:52 -0000 1.96 +++ selinux-policy.spec 31 Jan 2006 00:35:32 -0000 1.97 @@ -5,8 +5,8 @@ %define CHECKPOLICYVER 1.28-3 Summary: SELinux policy configuration Name: selinux-policy -Version: 2.2.8 -Release: 2 +Version: 2.2.9 +Release: 1 License: GPL Group: System Environment/Base Source: serefpolicy-%{version}.tgz Index: sources =================================================================== RCS file: /cvs/dist/rpms/selinux-policy/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 28 Jan 2006 04:52:34 -0000 1.36 +++ sources 31 Jan 2006 00:35:32 -0000 1.37 @@ -1 +1 @@ -96d857cdcb3f6ae275fc9aff59e5ed46 serefpolicy-2.2.8.tgz +a795741d83a3bc84cc508236316ff80b serefpolicy-2.2.9.tgz From fedora-cvs-commits at redhat.com Tue Jan 31 01:31:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 20:31:59 -0500 Subject: rpms/perl/devel perl-5.8.8-bz178343.patch,NONE,1.1.2.1 Message-ID: <200601310131.k0V1VxdB029241@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29205 Added Files: Tag: perl-5_8_8-0_RC1 perl-5.8.8-bz178343.patch Log Message: fix bug 178343 perl-5.8.8-bz178343.patch: Configure | 11 +++++++++++ utils/h2ph.PL | 17 ++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) --- NEW FILE perl-5.8.8-bz178343.patch --- --- perl-5.8.8-RC1/Configure.bz178343 2006-01-30 19:42:47.000000000 -0500 +++ perl-5.8.8-RC1/Configure 2006-01-30 20:04:53.000000000 -0500 @@ -20279,6 +20279,17 @@ chmod +x Cppsym.try $eunicefix Cppsym.try ./Cppsym < Cppsym.know > Cppsym.true +: Add in any cpp "predefined macros" : +tHdrH=`mktemp ./XXXXXX` +rm -f $tHdrH'.h' $tHdrH +touch $tHdrH'.h' +if cpp -dM $tHdrH'.h' > $tHdrH'_cppsym.h' && [ -s $tHdrH'_cppsym.h' ] ; then + sed 's/#define[\ \ ]*//;s/[\ \ ].*$//' < $tHdrH'_cppsym.h' > $tHdrH'_cppsym.real'; + if [ -s $tHdrH'_cppsym.real' ]; then + cat $tHdrH'_cppsym.real' Cppsym.know | sort | uniq | ./Cppsym | sort | uniq > Cppsym.true + fi +fi +rm -f $tHdrH'.h' $tHdrH'_cppsym.h' $tHdrH'_cppsym.real' : now check the C compiler for additional symbols postprocess_cc_v='' case "$osname" in --- perl-5.8.8-RC1/utils/h2ph.PL.bz178343 2006-01-13 12:56:47.000000000 -0500 +++ perl-5.8.8-RC1/utils/h2ph.PL 2006-01-30 20:01:15.000000000 -0500 @@ -778,8 +778,16 @@ if ($opt_D) { print PREAMBLE "# $_=$define{$_}\n"; } - - if ($define{$_} =~ /^(\d+)U?L{0,2}$/i) { + if ($define{$_} =~ /^\((.*)\)$/) { + # parenthesized value: d=(v) + $define{$_} = $1; + }; + if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/ ) { + # float: + print PREAMBLE + "unless (defined &$_) { sub $_() { $1 } }\n\n"; + } elsif ($define{$_} =~ /^([+-]?\d+)U?L{0,2}$/i) { + # integer: print PREAMBLE "unless (defined &$_) { sub $_() { $1 } }\n\n"; } elsif ($define{$_} =~ /^\w+$/) { @@ -805,9 +813,8 @@ @Config{'ccsymbols', 'cppsymbols', 'cppccsymbols'}; # Split compiler pre-definitions into `key=value' pairs: - foreach (split /\s+/, $allsymbols) { - /(.+?)=(.+)/ and $define{$1} = $2; - + while( $allsymbols=~/([^\s]+)=((\\\s|[^\s])+)/g ) { + $define{$1} = $2; if ($opt_D) { print STDERR "$_: $1 -> $2\n"; } From fedora-cvs-commits at redhat.com Tue Jan 31 02:28:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 21:28:19 -0500 Subject: rpms/gnome-terminal/devel gnome-terminal-2.13.90-invisible-char.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 gnome-terminal.spec, 1.29, 1.30 sources, 1.19, 1.20 Message-ID: <200601310228.k0V2SJIH001007@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/gnome-terminal/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv993 Modified Files: .cvsignore gnome-terminal.spec sources Added Files: gnome-terminal-2.13.90-invisible-char.patch Log Message: * Mon Jan 30 2006 Christopher Aillon 2.13.90-1 - Update to 2.13.90 - Add patch to not specify a default invisible char, let GTK+ handle it gnome-terminal-2.13.90-invisible-char.patch: gnome-terminal.glade2 | 6 ------ 1 files changed, 6 deletions(-) --- NEW FILE gnome-terminal-2.13.90-invisible-char.patch --- ? gnome-terminal-2.13.90-invisible-char.patch Index: src/gnome-terminal.glade2 =================================================================== RCS file: /cvs/gnome/gnome-terminal/src/gnome-terminal.glade2,v retrieving revision 1.58 diff -d -u -p -r1.58 gnome-terminal.glade2 --- src/gnome-terminal.glade2 11 Jan 2006 13:05:03 -0000 1.58 +++ src/gnome-terminal.glade2 31 Jan 2006 02:09:59 -0000 @@ -640,7 +640,6 @@ 0 True - * True @@ -879,7 +878,6 @@ 0 True - * False 14 @@ -1098,7 +1096,6 @@ 0 True - * False @@ -1298,7 +1295,6 @@ 0 True - * False @@ -1657,7 +1653,6 @@ 0 True - * False @@ -1907,7 +1902,6 @@ Isn't displayed 0 True - * False Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 19 Jan 2006 17:56:51 -0000 1.19 +++ .cvsignore 31 Jan 2006 02:28:17 -0000 1.20 @@ -4,3 +4,4 @@ gnome-terminal-2.13.1.tar.bz2 gnome-terminal-2.13.2.tar.bz2 gnome-terminal-2.13.3.tar.bz2 +gnome-terminal-2.13.90.tar.bz2 Index: gnome-terminal.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/gnome-terminal.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- gnome-terminal.spec 19 Jan 2006 17:56:51 -0000 1.29 +++ gnome-terminal.spec 31 Jan 2006 02:28:17 -0000 1.30 @@ -12,12 +12,13 @@ Summary: GNOME Terminal Name: gnome-terminal -Version: 2.13.3 +Version: 2.13.90 Release: 1 URL: http://www.gnome.org/ Source0: gnome-terminal-%{version}.tar.bz2 Source1: ne.po Patch0: gnome-terminal-2.12.0-inputmethod.patch +Patch1: gnome-terminal-2.13.90-invisible-char.patch License: GPL Group: User Interface/Desktops @@ -53,6 +54,7 @@ %setup -q cp ${RPM_SOURCE_DIR}/ne.po po %patch0 -p1 -b .inputmethod +%patch1 -p0 -b .invisible-char %build @@ -101,6 +103,10 @@ %{_libdir}/bonobo %changelog +* Mon Jan 30 2006 Christopher Aillon 2.13.90-1 +- Update to 2.13.90 +- Add patch to not specify a default invisible char, let GTK+ handle it + * Thu Jan 19 2006 Matthias Clasen 2.13.3-1 - Update to 2.13.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-terminal/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 19 Jan 2006 17:56:51 -0000 1.19 +++ sources 31 Jan 2006 02:28:17 -0000 1.20 @@ -1 +1 @@ -0b25b5962fa7a74fa19b020d5bfdd310 gnome-terminal-2.13.3.tar.bz2 +bd6dd166ca197cf9561f122f191aa49d gnome-terminal-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 02:44:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 21:44:04 -0500 Subject: rpms/pango/devel .cvsignore, 1.25, 1.26 pango.spec, 1.52, 1.53 sources, 1.25, 1.26 Message-ID: <200601310244.k0V2i40o001167@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1153 Modified Files: .cvsignore pango.spec sources Log Message: 1.11.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pango/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 16 Jan 2006 16:21:13 -0000 1.25 +++ .cvsignore 31 Jan 2006 02:44:02 -0000 1.26 @@ -9,3 +9,4 @@ pango-1.11.0.tar.bz2 pango-1.11.1.tar.bz2 pango-1.11.2.tar.bz2 +pango-1.11.3.tar.bz2 Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- pango.spec 16 Jan 2006 16:21:13 -0000 1.52 +++ pango.spec 31 Jan 2006 02:44:02 -0000 1.53 @@ -7,7 +7,7 @@ Summary: System for layout and rendering of internationalized text. Name: pango -Version: 1.11.2 +Version: 1.11.3 Release: 1 License: LGPL Group: System Environment/Libraries @@ -187,6 +187,9 @@ %changelog +* Mon Jan 30 2006 Matthias Clasen - 1.11.3-1 +- Update to 1.11.3 + * Mon Jan 16 2006 Matthias Clasen - 1.11.2-1 - Update to 1.11.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/pango/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 16 Jan 2006 16:21:13 -0000 1.25 +++ sources 31 Jan 2006 02:44:02 -0000 1.26 @@ -1 +1 @@ -3e1a72b0324a03f8710b9cd13f98c81f pango-1.11.2.tar.bz2 +2a73f535c07b187503e4610bb1b5a972 pango-1.11.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 02:46:25 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 21:46:25 -0500 Subject: rpms/gtk2-engines/devel .cvsignore, 1.17, 1.18 gtk2-engines.spec, 1.32, 1.33 sources, 1.18, 1.19 Message-ID: <200601310246.k0V2kPJS013521@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtk2-engines/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11382 Modified Files: .cvsignore gtk2-engines.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 19 Jan 2006 13:35:17 -0000 1.17 +++ .cvsignore 31 Jan 2006 02:46:23 -0000 1.18 @@ -13,3 +13,4 @@ gtk-engines-2.7.1.tar.bz2 gtk-engines-2.7.2.tar.bz2 gtk-engines-2.7.3.tar.bz2 +gtk-engines-2.7.4.tar.bz2 Index: gtk2-engines.spec =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/gtk2-engines.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gtk2-engines.spec 19 Jan 2006 13:23:03 -0000 1.32 +++ gtk2-engines.spec 31 Jan 2006 02:46:23 -0000 1.33 @@ -1,6 +1,6 @@ Summary: Theme engines for GTK+ 2.0 Name: gtk2-engines -Version: 2.7.3 +Version: 2.7.4 Release: 1 License: GPL Group: System Environment/Libraries @@ -60,6 +60,9 @@ %{_datadir}/themes %changelog +* Mon Jan 30 2006 Matthias Clasen 2.7.4-1 +- Update to 2.7.4 + * Thu Jan 19 2006 Matthias Clasen 2.7.3-1 - Update to 2.7.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk2-engines/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 19 Jan 2006 13:35:17 -0000 1.18 +++ sources 31 Jan 2006 02:46:23 -0000 1.19 @@ -1 +1 @@ -ec3c57550c673c6f96e11099a29e187a gtk-engines-2.7.3.tar.bz2 +b0f27c0f6d5f610ca445a3d82d5779da gtk-engines-2.7.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 02:47:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 21:47:34 -0500 Subject: rpms/pango/devel pango.spec,1.53,1.54 Message-ID: <200601310247.k0V2lYW8013552@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/pango/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13539 Modified Files: pango.spec Log Message: Fix file lists Index: pango.spec =================================================================== RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- pango.spec 31 Jan 2006 02:44:02 -0000 1.53 +++ pango.spec 31 Jan 2006 02:47:31 -0000 1.54 @@ -167,7 +167,7 @@ %files -f modules.files %defattr(-, root, root) -%doc README AUTHORS COPYING ChangeLog TODO +%doc README AUTHORS COPYING ChangeLog %doc examples/HELLO.utf8 %{_libdir}/libpango*-*.so.* %{_bindir}/pango-querymodules* From fedora-cvs-commits at redhat.com Tue Jan 31 02:57:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 21:57:10 -0500 Subject: rpms/dasher/devel .cvsignore, 1.7, 1.8 dasher.spec, 1.22, 1.23 sources, 1.7, 1.8 Message-ID: <200601310257.k0V2vAXd023067@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23011 Modified Files: .cvsignore dasher.spec sources Log Message: 3.99.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 17 Jan 2006 02:04:55 -0000 1.7 +++ .cvsignore 31 Jan 2006 02:57:07 -0000 1.8 @@ -4,3 +4,4 @@ dasher-3.2.15.tar.bz2 dasher-3.2.18.tar.bz2 dasher-3.99.1.tar.bz2 +dasher-3.99.2.tar.bz2 Index: dasher.spec =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- dasher.spec 17 Jan 2006 17:52:32 -0000 1.22 +++ dasher.spec 31 Jan 2006 02:57:07 -0000 1.23 @@ -1,13 +1,11 @@ Summary: GNOME Accessibility method Name: dasher -Version: 3.99.1 +Version: 3.99.2 Release: 1 License: GPL Group: Desktop/Accessibility URL: http://www.gnome.org/ Source0: %{name}-%{version}.tar.bz2 -Patch0: dasher-3.99.1-export.patch -#Patch1: dasher-3.99.1-c++.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: gnome-speech-devel @@ -25,8 +23,6 @@ %prep %setup -q -%patch0 -p1 -b .export -#%patch1 -p1 -b .c++ %build @@ -80,6 +76,9 @@ %{_sysconfdir}/gconf/schemas/dasher.schemas %changelog +* Mon Jan 30 2006 Matthias Clasen +- Update to 3.99.2 + * Mon Jan 16 2006 Matthias Clasen - Update to 3.99.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 Jan 2006 02:04:55 -0000 1.7 +++ sources 31 Jan 2006 02:57:07 -0000 1.8 @@ -1 +1 @@ -b25e1f3221cce7b503f5bffb54341807 dasher-3.99.1.tar.bz2 +22bd64811199358850b1f58f264999bb dasher-3.99.2.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 03:06:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:06:28 -0500 Subject: rpms/totem/devel .cvsignore, 1.17, 1.18 sources, 1.17, 1.18 totem.spec, 1.47, 1.48 Message-ID: <200601310306.k0V36SSg025002@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/totem/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24971 Modified Files: .cvsignore sources totem.spec Log Message: 1.3.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/totem/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 20 Jan 2006 18:13:04 -0000 1.17 +++ .cvsignore 31 Jan 2006 03:06:23 -0000 1.18 @@ -11,3 +11,4 @@ totem-1.2.1.tar.bz2 totem-1.3.0.tar.bz2 totem-1.3.1.tar.bz2 +totem-1.3.90.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/totem/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 20 Jan 2006 18:13:04 -0000 1.17 +++ sources 31 Jan 2006 03:06:24 -0000 1.18 @@ -1 +1 @@ -3201390ea4a74027e8bab32fa383f4e4 totem-1.3.1.tar.bz2 +fbb1ef6d8b6dc9150ab51ced8f65b618 totem-1.3.90.tar.bz2 Index: totem.spec =================================================================== RCS file: /cvs/dist/rpms/totem/devel/totem.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- totem.spec 20 Jan 2006 18:13:04 -0000 1.47 +++ totem.spec 31 Jan 2006 03:06:24 -0000 1.48 @@ -4,7 +4,7 @@ Summary: Movie player for GNOME 2 Name: totem -Version: 1.3.1 +Version: 1.3.90 Release: 1 License: GPL Group: Applications/Multimedia @@ -136,6 +136,9 @@ %{_libdir}/*so %changelog +* Mon Jan 30 2006 Matthias Clasen - 1.3.90-1 +- Update to 1.3.90 + * Fri Jan 20 2006 Matthias Clasen - 1.3.1-1 - Update to 1.3.1 From fedora-cvs-commits at redhat.com Tue Jan 31 03:09:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:09:57 -0500 Subject: rpms/vte/devel .cvsignore, 1.30, 1.31 sources, 1.30, 1.31 vte.spec, 1.56, 1.57 Message-ID: <200601310309.k0V39vMN026440@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/vte/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26368 Modified Files: .cvsignore sources vte.spec Log Message: 0.11.17 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/vte/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 15 Dec 2005 14:11:03 -0000 1.30 +++ .cvsignore 31 Jan 2006 03:09:54 -0000 1.31 @@ -2,3 +2,4 @@ vte-0.11.14.tar.bz2 vte-0.11.15.tar.bz2 vte-0.11.16.tar.bz2 +vte-0.11.17.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/vte/devel/sources,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- sources 15 Dec 2005 14:11:03 -0000 1.30 +++ sources 31 Jan 2006 03:09:54 -0000 1.31 @@ -1 +1 @@ -ce5c5bf91da638547ce093fe66622c37 vte-0.11.16.tar.bz2 +bbe9710eca23984c884426a5d915f6eb vte-0.11.17.tar.bz2 Index: vte.spec =================================================================== RCS file: /cvs/dist/rpms/vte/devel/vte.spec,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- vte.spec 10 Jan 2006 20:40:49 -0000 1.56 +++ vte.spec 31 Jan 2006 03:09:54 -0000 1.57 @@ -1,6 +1,6 @@ Name: vte -Version: 0.11.16 -Release: 2.fc5.1 +Version: 0.11.17 +Release: 1.fc5.1 Summary: An experimental terminal emulator. License: LGPL Group: User Interface/X @@ -98,6 +98,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Jan 30 2006 Matthias Clasen 0.11.17-1 +- Update to 0.11.17 + * Tue Jan 10 2006 Bill Nottingham 0.11.16-2 - prereq initscripts as it creates the utmp group From fedora-cvs-commits at redhat.com Tue Jan 31 03:12:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:12:39 -0500 Subject: rpms/gtksourceview/devel .cvsignore, 1.18, 1.19 gtksourceview.spec, 1.24, 1.25 sources, 1.17, 1.18 Message-ID: <200601310312.k0V3CdYh027746@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtksourceview/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27686 Modified Files: .cvsignore gtksourceview.spec sources Log Message: 1.5.7 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 17 Jan 2006 04:11:48 -0000 1.18 +++ .cvsignore 31 Jan 2006 03:12:36 -0000 1.19 @@ -6,3 +6,4 @@ gtksourceview-1.5.3.tar.bz2 gtksourceview-1.5.4.tar.bz2 gtksourceview-1.5.6.tar.bz2 +gtksourceview-1.5.7.tar.bz2 Index: gtksourceview.spec =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/gtksourceview.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- gtksourceview.spec 17 Jan 2006 04:11:48 -0000 1.24 +++ gtksourceview.spec 31 Jan 2006 03:12:36 -0000 1.25 @@ -3,7 +3,7 @@ Summary: A library for viewing source files Name: gtksourceview -Version: 1.5.6 +Version: 1.5.7 Release: 1 License: LGPL Group: System Environment/Libraries @@ -71,6 +71,9 @@ %{_libdir}/*.so %changelog +* Mon Jan 30 2006 Matthias Clasen +- Update to 1.5.7 + * Mon Jan 16 2006 Matthias Clasen - Update to 1.5.6 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtksourceview/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 17 Jan 2006 04:11:48 -0000 1.17 +++ sources 31 Jan 2006 03:12:36 -0000 1.18 @@ -1 +1 @@ -6176b1d1eae0a4b7baf46ead5321d33b gtksourceview-1.5.6.tar.bz2 +8816a70fcfa0486a3ff53a83582da5a8 gtksourceview-1.5.7.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 03:18:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:18:05 -0500 Subject: rpms/gnome-media/devel .cvsignore, 1.24, 1.25 gnome-media.spec, 1.54, 1.55 sources, 1.24, 1.25 Message-ID: <200601310318.k0V3I5IY009922@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-media/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9863 Modified Files: .cvsignore gnome-media.spec sources Log Message: 2.13.91 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 28 Jan 2006 05:24:25 -0000 1.24 +++ .cvsignore 31 Jan 2006 03:18:02 -0000 1.25 @@ -2,3 +2,4 @@ gnome-media-2.12.0.tar.bz2 gnome-media-2.13.5.tar.bz2 gnome-media-2.13.7.tar.bz2 +gnome-media-2.13.91.tar.bz2 Index: gnome-media.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.54 retrieving revision 1.55 diff -u -r1.54 -r1.55 --- gnome-media.spec 28 Jan 2006 05:35:04 -0000 1.54 +++ gnome-media.spec 31 Jan 2006 03:18:02 -0000 1.55 @@ -10,7 +10,7 @@ Summary: GNOME media programs. Name: gnome-media -Version: 2.13.7 +Version: 2.13.91 Release: 1 License: GPL Group: Applications/Multimedia @@ -153,6 +153,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon Jan 30 2006 Matthias Clasen - 2.13.91-1 +- Update to 2.13.91 + * Sat Jan 28 2006 Matthias Clasen - 2.13.7-1 -Update to 2.13.7 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 28 Jan 2006 05:24:25 -0000 1.24 +++ sources 31 Jan 2006 03:18:02 -0000 1.25 @@ -1 +1 @@ -4336c4522da890ae5e73031040dc719f gnome-media-2.13.7.tar.bz2 +cb39341ac416a7844f8059fc6a6a8511 gnome-media-2.13.91.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 03:21:29 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:21:29 -0500 Subject: rpms/gconf-editor/devel .cvsignore, 1.16, 1.17 gconf-editor.spec, 1.27, 1.28 sources, 1.16, 1.17 Message-ID: <200601310321.k0V3LTbx011549@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gconf-editor/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11489 Modified Files: .cvsignore gconf-editor.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gconf-editor/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 30 Nov 2005 18:13:16 -0000 1.16 +++ .cvsignore 31 Jan 2006 03:21:26 -0000 1.17 @@ -5,3 +5,4 @@ gconf-editor-2.10.0.tar.bz2 gconf-editor-2.12.0.tar.bz2 gconf-editor-2.12.1.tar.bz2 +gconf-editor-2.13.90.tar.bz2 Index: gconf-editor.spec =================================================================== RCS file: /cvs/dist/rpms/gconf-editor/devel/gconf-editor.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- gconf-editor.spec 9 Dec 2005 22:40:31 -0000 1.27 +++ gconf-editor.spec 31 Jan 2006 03:21:26 -0000 1.28 @@ -7,8 +7,8 @@ Summary: Editor/admin tool for GConf Name: gconf-editor -Version: 2.12.1 -Release: 1.1 +Version: 2.13.90 +Release: 1 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 License: GPL @@ -94,6 +94,9 @@ %{_datadir}/omf/gconf-editor %changelog +* Mon Jan 30 2006 Matthias Clasen 2.13.90-1 +- Update to 2.13.90 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/gconf-editor/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 30 Nov 2005 18:13:16 -0000 1.16 +++ sources 31 Jan 2006 03:21:26 -0000 1.17 @@ -1 +1 @@ -0fa81dee78ca10f0192eb19afa6883f5 gconf-editor-2.12.1.tar.bz2 +874334e3393ef7d402a40bab62e15b59 gconf-editor-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 03:24:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:24:51 -0500 Subject: rpms/gnome-media/devel gnome-media-2.13.91-settings.patch, NONE, 1.1 gnome-media.spec, 1.55, 1.56 Message-ID: <200601310324.k0V3OpOV013207@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-media/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13138 Modified Files: gnome-media.spec Added Files: gnome-media-2.13.91-settings.patch Log Message: Fix settings patch gnome-media-2.13.91-settings.patch: gnome-volume-control.desktop.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gnome-media-2.13.91-settings.patch --- --- gnome-media-2.13.91/gst-mixer/gnome-volume-control.desktop.in.settings 2006-01-29 15:49:34.000000000 -0500 +++ gnome-media-2.13.91/gst-mixer/gnome-volume-control.desktop.in 2006-01-30 22:23:47.000000000 -0500 @@ -8,7 +8,7 @@ X-Info=Gnome Mixer Terminal=false Type=Application -Categories=GNOME;GTK;Application;AudioVideo;X-Ximian-Main;X-Red-Hat-Base; +Categories=GNOME;GTK;Settings;AudioVideo;X-Ximian-Main;X-Red-Hat-Base; X-GNOME-DocPath=gst-mixer/gnome-volume-control.xml X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=gnome-media Index: gnome-media.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-media/devel/gnome-media.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- gnome-media.spec 31 Jan 2006 03:18:02 -0000 1.55 +++ gnome-media.spec 31 Jan 2006 03:24:49 -0000 1.56 @@ -15,7 +15,7 @@ License: GPL Group: Applications/Multimedia Source: ftp://ftp.gnome.org/pub/GNOME/sources/gnome-media/2.11/gnome-media-%{version}.tar.bz2 -Patch4: gnome-media-2.12.0-settings.patch +Patch4: gnome-media-2.13.91-settings.patch Patch5: gnome-media-2.13.5-hide-help-button.patch Requires: scrollkeeper >= 0.1.4 From fedora-cvs-commits at redhat.com Tue Jan 31 03:27:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:27:11 -0500 Subject: rpms/evolution/devel .cvsignore, 1.42, 1.43 evolution-2.5.4-fix-missing-declarations.patch, 1.3, 1.4 evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch, 1.1, 1.2 evolution-2.5.5.1-notification-cleanups.patch, 1.1, 1.2 evolution.spec, 1.119, 1.120 sources, 1.42, 1.43 Message-ID: <200601310327.k0V3RBHp014360@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14199 Modified Files: .cvsignore evolution-2.5.4-fix-missing-declarations.patch evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch evolution-2.5.5.1-notification-cleanups.patch evolution.spec sources Log Message: * Mon Jan 30 2006 David Malcolm - 2.5.90-1 - 2.5.90 - trimmed patches 805 and 808, as parts of these got merged upstream - trimmed and regenerated patch 806 to track upstream - removed the mail-to-task plugin XML UI file Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- .cvsignore 27 Jan 2006 23:58:18 -0000 1.42 +++ .cvsignore 31 Jan 2006 03:27:08 -0000 1.43 @@ -1 +1 @@ -evolution-2.5.5.1.tar.bz2 +evolution-2.5.90.tar.bz2 evolution-2.5.4-fix-missing-declarations.patch: e-shell.h | 1 + 1 files changed, 1 insertion(+) Index: evolution-2.5.4-fix-missing-declarations.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.4-fix-missing-declarations.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- evolution-2.5.4-fix-missing-declarations.patch 27 Jan 2006 23:58:18 -0000 1.3 +++ evolution-2.5.4-fix-missing-declarations.patch 31 Jan 2006 03:27:08 -0000 1.4 @@ -1,23 +1,3 @@ ---- evolution-2.5.4/calendar/gui/e-meeting-list-view.c.fix-missing-declarations-2-5-4 2006-01-02 06:38:57.000000000 -0500 -+++ evolution-2.5.4/calendar/gui/e-meeting-list-view.c 2006-01-04 14:40:40.000000000 -0500 -@@ -45,6 +45,7 @@ - #include - #include - #include "e-select-names-renderer.h" -+#include "itip-utils.h" - - struct _EMeetingListViewPrivate { - EMeetingStore *store; ---- evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c.fix-missing-declarations-2-5-4 2005-12-19 05:08:10.000000000 -0500 -+++ evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c 2006-01-04 14:40:40.000000000 -0500 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include "publish-format-fb.h" - --- evolution-2.5.4/shell/e-shell.h.fix-missing-declarations-2-5-4 2006-01-04 14:44:06.000000000 -0500 +++ evolution-2.5.4/shell/e-shell.h 2006-01-04 14:47:59.000000000 -0500 @@ -133,6 +133,7 @@ evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch: a11y/calendar/ea-gnome-calendar.c | 1 + mail/message-list.h | 2 ++ widgets/table/e-tree-table-adapter.h | 3 ++- widgets/table/e-tree.h | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) Index: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch 27 Jan 2006 23:58:18 -0000 1.1 +++ evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch 31 Jan 2006 03:27:08 -0000 1.2 @@ -1,63 +1,3 @@ ---- evolution-2.5.5.1/calendar/gui/dialogs/comp-editor-page.h.fix-missing-declarations-2.5.5.1 2006-01-26 08:47:44.000000000 -0500 -+++ evolution-2.5.5.1/calendar/gui/dialogs/comp-editor-page.h 2006-01-26 08:48:00.000000000 -0500 -@@ -107,6 +107,10 @@ - ECal *client); - void comp_editor_page_set_summary (CompEditorPage *page, - const char *summary); -+void comp_editor_page_unset_focused_widget (CompEditorPage *page, -+ GtkWidget *widget); -+void comp_editor_page_set_focused_widget (CompEditorPage *page, -+ GtkWidget *widget); - void comp_editor_page_set_dates (CompEditorPage *page, - CompEditorPageDates *dates); - void comp_editor_page_notify_changed (CompEditorPage *page); ---- evolution-2.5.5.1/calendar/gui/dialogs/alarm-dialog.c.fix-missing-declarations-2.5.5.1 2006-01-26 08:37:02.000000000 -0500 -+++ evolution-2.5.5.1/calendar/gui/dialogs/alarm-dialog.c 2006-01-26 08:39:20.000000000 -0500 -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -855,7 +856,7 @@ - case E_CAL_COMPONENT_ALARM_AUDIO: - dir = calendar_config_get_dir_path (); - if ( dir && *dir ) -- gnome_file_entry_set_default_path (dialog->aalarm_file_entry, dir); -+ gnome_file_entry_set_default_path ( GNOME_FILE_ENTRY(dialog->aalarm_file_entry), dir); - check_custom_sound (dialog); - break; - ---- evolution-2.5.5.1/calendar/gui/e-calendar-view.c.fix-missing-declarations-2.5.5.1 2006-01-26 08:49:54.000000000 -0500 -+++ evolution-2.5.5.1/calendar/gui/e-calendar-view.c 2006-01-26 08:53:47.000000000 -0500 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include "e-calendar-marshal.h" - #include ---- evolution-2.5.5.1/plugins/import-ics-attachments/icsimporter.c.fix-missing-declarations-2.5.5.1 2006-01-26 09:08:09.000000000 -0500 -+++ evolution-2.5.5.1/plugins/import-ics-attachments/icsimporter.c 2006-01-26 09:13:50.000000000 -0500 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include "e-attachment-bar.h" - #include - #include "e-util/e-error.h" -@@ -45,6 +46,7 @@ - #include - #include - #include -+#include "calendar/common/authentication.h" - - typedef struct { - ECal *client; --- evolution-2.5.5.1/mail/message-list.h.fix-missing-declarations-2.5.5.1 2006-01-26 08:56:50.000000000 -0500 +++ evolution-2.5.5.1/mail/message-list.h 2006-01-26 08:58:05.000000000 -0500 @@ -182,6 +182,8 @@ evolution-2.5.5.1-notification-cleanups.patch: alarm-queue.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) Index: evolution-2.5.5.1-notification-cleanups.patch =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.5.1-notification-cleanups.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- evolution-2.5.5.1-notification-cleanups.patch 28 Jan 2006 05:14:10 -0000 1.1 +++ evolution-2.5.5.1-notification-cleanups.patch 31 Jan 2006 03:27:08 -0000 1.2 @@ -1,6 +1,6 @@ ---- evolution-2.5.5.1/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api 2006-01-16 09:42:17.000000000 -0500 -+++ evolution-2.5.5.1/calendar/gui/alarm-notify/alarm-queue.c 2006-01-26 08:29:13.000000000 -0500 -@@ -1459,11 +1459,13 @@ +--- evolution-2.5.90/calendar/gui/alarm-notify/alarm-queue.c.notification-cleanups 2006-01-27 03:43:48.000000000 -0500 ++++ evolution-2.5.90/calendar/gui/alarm-notify/alarm-queue.c 2006-01-30 21:13:58.000000000 -0500 +@@ -1229,10 +1229,11 @@ const char *summary, *location; GtkTooltips *tooltips; ECalComponentText text; @@ -8,23 +8,12 @@ + char *start_str, *end_str, *alarm_str, *time_str; icaltimezone *current_zone; ECalComponentOrganizer organiser; - char *filename; char *body; -+ GdkPixbuf *icon; + NotifyNotification *n; comp = cqa->alarms->comp; qa = lookup_queued_alarm (cqa, alarm_id); -@@ -1471,7 +1473,7 @@ - return; - if (!notify_is_initted ()) - notify_init("Evolution Alarm Notify"); -- GdkPixbuf *icon = e_icon_factory_get_icon("stock_appointment-reminder", E_ICON_SIZE_DIALOG); -+ icon = e_icon_factory_get_icon("stock_appointment-reminder", E_ICON_SIZE_DIALOG); - g_free (filename); - - /* get a sensible description for the event */ -@@ -1495,9 +1497,6 @@ +@@ -1262,9 +1263,6 @@ end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone); time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end); @@ -34,38 +23,27 @@ if (organiser.cn) { if (location) body = g_strdup_printf ("%s\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str); -@@ -1509,21 +1508,25 @@ - body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str); - else +@@ -1278,16 +1276,19 @@ body = g_strdup_printf ("%s %s", start_str, time_str); --} -+ } -+ -+ n = notify_notification_new (summary, body, "", NULL); -+ if (icon) { -+ notify_notification_set_icon_data_from_pixbuf (n, icon); -+ g_object_unref (G_OBJECT (icon)); -+ } + } -- NotifyNotification *n = notify_notification_new (summary, body, "", NULL); -- notify_notification_set_icon_data_from_pixbuf (n, icon); +- NotifyNotification *n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); - if (!notify_notification_show(n, NULL)) -- g_warning ("Could not send notification to daemon\n"); -+ /* Notifications don't timeout: require explicit user action: */ -+ notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER); ++ n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); ++ ++ /* Notifications don't timeout: require explicit user action: */ ++ notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER); ++ ++ if (!notify_notification_show_and_forget (n, NULL)) + g_warning ("Could not send notification to daemon\n"); - /* create the private structure */ -+ if (!notify_notification_show_and_forget (n, NULL)) -+ g_warning ("Could not send notification to daemon\n"); -+ + g_free (body); g_free (start_str); g_free (end_str); g_free (alarm_str); g_free (time_str); - g_free (str); -- -- - } - #endif + + } Index: evolution.spec =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v retrieving revision 1.119 retrieving revision 1.120 diff -u -r1.119 -r1.120 --- evolution.spec 28 Jan 2006 05:14:10 -0000 1.119 +++ evolution.spec 31 Jan 2006 03:27:08 -0000 1.120 @@ -37,8 +37,8 @@ %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins Name: evolution -Version: 2.5.5.1 -Release: 2 +Version: 2.5.90 +Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -551,7 +551,6 @@ %{evo_plugin_dir}/org-gnome-mail-to-task.eplug %{evo_plugin_dir}/liborg-gnome-mail-to-task.so -%{evo_plugin_dir}/org-gnome-mail-to-task.xml %{evo_plugin_dir}/org-gnome-mark-all-read.eplug %{evo_plugin_dir}/liborg-gnome-mark-all-read.so @@ -625,6 +624,12 @@ %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Jan 30 2006 David Malcolm - 2.5.90-1 +- 2.5.90 +- trimmed patches 805 and 808, as parts of these got merged upstream +- trimmed and regenerated patch 806 to track upstream +- removed the mail-to-task plugin XML UI file + * Sat Jan 28 2006 David Malcolm - 2.5.5.1-2 - added missing patch Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 27 Jan 2006 23:58:18 -0000 1.42 +++ sources 31 Jan 2006 03:27:08 -0000 1.43 @@ -1 +1 @@ -307c20ef482dafe90c7f55843e473cda evolution-2.5.5.1.tar.bz2 +02751eb28ad9b31402290ed4816e5321 evolution-2.5.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 03:29:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:29:34 -0500 Subject: rpms/gnome-games/devel .cvsignore, 1.31, 1.32 gnome-games.spec, 1.60, 1.61 sources, 1.34, 1.35 Message-ID: <200601310329.k0V3TYrd015523@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-games/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15450 Modified Files: .cvsignore gnome-games.spec sources Log Message: drop upstreamed patch Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/.cvsignore,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- .cvsignore 17 Jan 2006 16:45:07 -0000 1.31 +++ .cvsignore 31 Jan 2006 03:29:31 -0000 1.32 @@ -1,3 +1,4 @@ gnome-games-2.13.4.tar.bz2 gnome-games-extra-data-no-windows-2.12.0.tar.bz2 gnome-games-2.13.5.tar.bz2 +gnome-games-2.13.6.tar.bz2 Index: gnome-games.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- gnome-games.spec 23 Jan 2006 18:12:57 -0000 1.60 +++ gnome-games.spec 31 Jan 2006 03:29:31 -0000 1.61 @@ -10,7 +10,7 @@ Summary: GNOME games. Name: gnome-games -Version: 2.13.5 +Version: 2.13.6 Release: 2 Epoch: 1 License: LGPL @@ -20,8 +20,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root Obsoletes: gnome-games-devel URL: http://www.gnome.org -Patch1: gnome-games-2.13.5-aunt-mary.patch - Requires: scrollkeeper >= 0.1.4 Requires: GConf2 @@ -49,7 +47,6 @@ %prep %setup -q -%patch1 -p0 -b .aunt-mary tar xjf %{SOURCE2} @@ -179,6 +176,9 @@ %changelog +* Mon Jan 30 2006 Matthias Clasen 1:2.13.6-1 +- Update to 2.13.6 + * Mon Jan 23 2006 Christopher Aillon 1:2.13.5-2 - Add patch to fix parse errors with aunt mary. Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-games/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 17 Jan 2006 16:45:07 -0000 1.34 +++ sources 31 Jan 2006 03:29:31 -0000 1.35 @@ -1,2 +1,2 @@ 19b2d6dbca182fb426a0bd86d322a2ac gnome-games-extra-data-no-windows-2.12.0.tar.bz2 -99972b2bf1ddeb9d8eb9ae59e6da70b8 gnome-games-2.13.5.tar.bz2 +b9421b420cd964a0bb7b7e510c4ff793 gnome-games-2.13.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 03:34:00 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:34:00 -0500 Subject: rpms/gnome-nettool/devel .cvsignore, 1.3, 1.4 gnome-nettool.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200601310334.k0V3Y0g7016254@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-nettool/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16193 Modified Files: .cvsignore gnome-nettool.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-nettool/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Mar 2005 21:34:24 -0000 1.3 +++ .cvsignore 31 Jan 2006 03:33:57 -0000 1.4 @@ -1,2 +1,3 @@ gnome-nettool-0.99.3.tar.bz2 gnome-nettool-1.2.0.tar.bz2 +gnome-nettool-2.13.90.tar.bz2 Index: gnome-nettool.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-nettool/devel/gnome-nettool.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnome-nettool.spec 9 Dec 2005 22:40:40 -0000 1.5 +++ gnome-nettool.spec 31 Jan 2006 03:33:57 -0000 1.6 @@ -5,8 +5,8 @@ Summary: A GNOME interface for various networking tools Name: gnome-nettool -Version: 1.2.0 -Release: 1.1 +Version: 2.13.90 +Release: 1 URL: http://www.gnome.org Source0: %{name}-%{version}.tar.bz2 License: GPL @@ -58,6 +58,9 @@ %{_datadir}/pixmaps/*.png %changelog +* Mon Jan 30 2006 Matthias Clasen +- Update to 2.13.90 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-nettool/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Mar 2005 21:34:24 -0000 1.3 +++ sources 31 Jan 2006 03:33:57 -0000 1.4 @@ -1 +1 @@ -277338cf5d54ae9941260dd993a14f7a gnome-nettool-1.2.0.tar.bz2 +60d56c758c30a99460957a583561b482 gnome-nettool-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 03:40:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:40:28 -0500 Subject: rpms/evolution-connector/devel .cvsignore, 1.25, 1.26 evolution-connector.spec, 1.47, 1.48 regenerate-patch.sh, 1.13, 1.14 sources, 1.25, 1.26 ximian-connector-2.1.4-generated-autotool.patch, 1.12, 1.13 Message-ID: <200601310340.k0V3eS9Y018752@cvs.devel.redhat.com> Author: dmalcolm Update of /cvs/dist/rpms/evolution-connector/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv18519 Modified Files: .cvsignore evolution-connector.spec regenerate-patch.sh sources ximian-connector-2.1.4-generated-autotool.patch Log Message: * Mon Jan 30 2006 David Malcolm - 2.5.9.0-1 - 2.5.9.0 - regenerate patch 200 - enable parallel make Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 28 Jan 2006 00:37:28 -0000 1.25 +++ .cvsignore 31 Jan 2006 03:40:24 -0000 1.26 @@ -1 +1 @@ -evolution-exchange-2.5.5.1.tar.bz2 +evolution-exchange-2.5.9.0.tar.bz2 Index: evolution-connector.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- evolution-connector.spec 28 Jan 2006 00:37:29 -0000 1.47 +++ evolution-connector.spec 31 Jan 2006 03:40:24 -0000 1.48 @@ -6,7 +6,7 @@ %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null) Name: evolution-connector -Version: 2.5.5.1 +Version: 2.5.9.0 Release: 1 License: GPL Group: Applications/Productivity @@ -66,7 +66,7 @@ fi export LIBS %configure --with-openldap=%{_libdir}/evolution-openldap --with-static-ldap -make LDFLAGS="-R %{plibdir}" +make %{?_smp_mflags} LDFLAGS="-R %{plibdir}" %install [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT @@ -94,6 +94,11 @@ %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml %changelog +* Mon Jan 30 2006 David Malcolm - 2.5.9.0-1 +- 2.5.9.0 +- regenerate patch 200 +- enable parallel make + * Wed Jan 25 2006 David Malcolm - 2.5.5.1-1 - 2.5.5.1 - regenerate patch 200 Index: regenerate-patch.sh =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/regenerate-patch.sh,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- regenerate-patch.sh 28 Jan 2006 00:37:29 -0000 1.13 +++ regenerate-patch.sh 31 Jan 2006 03:40:24 -0000 1.14 @@ -1,5 +1,5 @@ #!/bin/sh -BASE_NAME=evolution-exchange-2.5.5.1 +BASE_NAME=evolution-exchange-2.5.9.0 TARBALL_NAME=$BASE_NAME.tar.bz2 #INPUT_PATCHES="ximian-connector-2.1.4-64bit-fix-acinclude.m4.patch ximian-connector-2.2.2-noinst-ltlibraries.patch ximian-connector-2.2.2-install-debug-utilities.patch" Index: sources =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 28 Jan 2006 00:37:29 -0000 1.25 +++ sources 31 Jan 2006 03:40:24 -0000 1.26 @@ -1 +1 @@ -36a8dbcfc2b69c1899afe22480f0e760 evolution-exchange-2.5.5.1.tar.bz2 +f4a0893159dad3603b33f2c99616a121 evolution-exchange-2.5.9.0.tar.bz2 ximian-connector-2.1.4-generated-autotool.patch: evolution-exchange-2.5.9.0-patched/Makefile.in | 1 evolution-exchange-2.5.9.0-patched/acinclude.m4 | 22 evolution-exchange-2.5.9.0-patched/aclocal.m4 |10285 +++++----- evolution-exchange-2.5.9.0-patched/addressbook/Makefile.in | 1 evolution-exchange-2.5.9.0-patched/autom4te.cache |only evolution-exchange-2.5.9.0-patched/calendar/Makefile.in | 1 evolution-exchange-2.5.9.0-patched/camel/Makefile.in | 1 evolution-exchange-2.5.9.0-patched/configure | 5808 ++--- evolution-exchange-2.5.9.0-patched/docs/Makefile.in | 1 evolution-exchange-2.5.9.0-patched/docs/ietf/Makefile.in | 1 evolution-exchange-2.5.9.0-patched/docs/reference/Makefile.in | 1 evolution-exchange-2.5.9.0-patched/intltool-extract.in | 4 evolution-exchange-2.5.9.0-patched/intltool-merge.in | 4 evolution-exchange-2.5.9.0-patched/intltool-update.in | 26 evolution-exchange-2.5.9.0-patched/mail/Makefile.in | 1 evolution-exchange-2.5.9.0-patched/po/Makefile.in.in | 83 evolution-exchange-2.5.9.0-patched/storage/Makefile.in | 1 evolution-exchange-2.5.9.0-pristine/Makefile.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/acinclude.m4.autotool-results |only evolution-exchange-2.5.9.0-pristine/aclocal.m4.autotool-results |only evolution-exchange-2.5.9.0-pristine/aclocal.m4.rej |only evolution-exchange-2.5.9.0-pristine/addressbook/Makefile.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/calendar/Makefile.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/camel/Makefile.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/configure.autotool-results |only evolution-exchange-2.5.9.0-pristine/docs/Makefile.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/docs/ietf/Makefile.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/docs/reference/Makefile.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/intltool-extract.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/intltool-merge.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/intltool-update.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/mail/Makefile.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/po/Makefile.in.in.autotool-results |only evolution-exchange-2.5.9.0-pristine/storage/Makefile.in.autotool-results |only 34 files changed, 7827 insertions(+), 8414 deletions(-) View full diff with command: /usr/bin/cvs -f diff -kk -u -N -r 1.12 -r 1.13 ximian-connector-2.1.4-generated-autotool.patch Index: ximian-connector-2.1.4-generated-autotool.patch =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/ximian-connector-2.1.4-generated-autotool.patch,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ximian-connector-2.1.4-generated-autotool.patch 28 Jan 2006 00:37:29 -0000 1.12 +++ ximian-connector-2.1.4-generated-autotool.patch 31 Jan 2006 03:40:24 -0000 1.13 @@ -1,6 +1,6 @@ -diff --recursive -up evolution-exchange-2.5.5.1-pristine/acinclude.m4 evolution-exchange-2.5.5.1-patched/acinclude.m4 ---- evolution-exchange-2.5.5.1-pristine/acinclude.m4 2004-08-13 14:16:45.000000000 -0400 -+++ evolution-exchange-2.5.5.1-patched/acinclude.m4 2006-01-25 14:56:17.000000000 -0500 +diff --recursive -up evolution-exchange-2.5.9.0-pristine/acinclude.m4 evolution-exchange-2.5.9.0-patched/acinclude.m4 +--- evolution-exchange-2.5.9.0-pristine/acinclude.m4 2004-08-13 14:16:45.000000000 -0400 ++++ evolution-exchange-2.5.9.0-patched/acinclude.m4 2006-01-30 22:32:45.000000000 -0500 @@ -34,6 +34,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [ AC_ARG_WITH(openldap, [ --with-openldap=[no/yes/PREFIX] Enable LDAP support in evolution]) AC_ARG_WITH(static-ldap, [ --with-static-ldap=[no/yes] Link LDAP support statically into evolution ]) @@ -54,11 +54,11 @@ else LDAP_LIBS="-lldap $LDAP_LIBS" fi], -Only in evolution-exchange-2.5.5.1-pristine: acinclude.m4.autotool-results -diff --recursive -up evolution-exchange-2.5.5.1-pristine/aclocal.m4 evolution-exchange-2.5.5.1-patched/aclocal.m4 ---- evolution-exchange-2.5.5.1-pristine/aclocal.m4 2006-01-18 08:22:44.000000000 -0500 -+++ evolution-exchange-2.5.5.1-patched/aclocal.m4 2006-01-25 14:56:21.000000000 -0500 -@@ -11,3818 +11,3020 @@ +Only in evolution-exchange-2.5.9.0-pristine: acinclude.m4.autotool-results +diff --recursive -up evolution-exchange-2.5.9.0-pristine/aclocal.m4 evolution-exchange-2.5.9.0-patched/aclocal.m4 +--- evolution-exchange-2.5.9.0-pristine/aclocal.m4 2006-01-30 08:48:27.000000000 -0500 ++++ evolution-exchange-2.5.9.0-patched/aclocal.m4 2006-01-30 22:32:50.000000000 -0500 +@@ -11,3955 +11,3149 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. @@ -3199,8 +3199,25 @@ -AC_DEFUN([IT_PROG_INTLTOOL], -[AC_PREREQ([2.50])dnl - +-case "$am__api_version" in +- 1.[01234]) +- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) +- ;; +- *) +- ;; +-esac +- -if test -n "$1"; then - AC_MSG_CHECKING(for intltool >= $1) +- +- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 100 + $ 2; }'` +- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` +- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in` +- ] +- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) +- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || +- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +-fi +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with @@ -3213,15 +3230,6 @@ +$rm conftest* +])# _LT_COMPILER_BOILERPLATE -- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 100 + $ 2; }'` -- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in` -- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in` -- ] -- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) -- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || -- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) --fi - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' @@ -3240,17 +3248,6 @@ - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+AC_DEFUN([_LT_LINKER_BOILERPLATE], -+[ac_outfile=conftest.$ac_objext -+printf "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$rm conftest* -+])# _LT_LINKER_BOILERPLATE -AC_SUBST(INTLTOOL_DESKTOP_RULE) -AC_SUBST(INTLTOOL_DIRECTORY_RULE) @@ -3270,11 +3267,38 @@ -AC_SUBST(INTLTOOL_SCHEMAS_RULE) -AC_SUBST(INTLTOOL_THEME_RULE) -AC_SUBST(INTLTOOL_SERVICE_RULE) ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++AC_DEFUN([_LT_LINKER_BOILERPLATE], ++[ac_outfile=conftest.$ac_objext ++printf "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$rm conftest* ++])# _LT_LINKER_BOILERPLATE -# Use the tools built into the package, not the ones that are installed. -AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') -AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge') -AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update') + +-AC_PATH_PROG(INTLTOOL_PERL, perl) +-if test -z "$INTLTOOL_PERL"; then +- AC_MSG_ERROR([perl not found; required for intltool]) +-fi +-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then +- AC_MSG_ERROR([perl 5.x required for intltool]) +-fi +-if test "x$2" != "xno-xml"; then +- AC_MSG_CHECKING([for XML::Parser]) +- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then +- AC_MSG_RESULT([ok]) +- else +- AC_MSG_ERROR([XML::Parser perl module is required for intltool]) +- fi +-fi +# _LT_AC_SYS_LIBPATH_AIX +# ---------------------- +# Links a minimal program and checks the executable @@ -3293,26 +3317,12 @@ +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi +])# _LT_AC_SYS_LIBPATH_AIX --AC_PATH_PROG(INTLTOOL_PERL, perl) --if test -z "$INTLTOOL_PERL"; then -- AC_MSG_ERROR([perl not found; required for intltool]) --fi --if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then -- AC_MSG_ERROR([perl 5.x required for intltool]) --fi --if test "x$2" != "xno-xml"; then -- AC_MSG_CHECKING([for XML::Parser]) -- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then -- AC_MSG_RESULT([ok]) -- else -- AC_MSG_ERROR([XML::Parser perl module is required for intltool]) -- fi --fi - -AC_PATH_PROG(INTLTOOL_ICONV, iconv, iconv) -AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt) -AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge) -AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext) + +-IT_PO_SUBDIR([po]) +# _LT_AC_SHELL_INIT(ARG) +# ---------------------- +AC_DEFUN([_LT_AC_SHELL_INIT], @@ -3323,8 +3333,6 @@ +AC_DIVERT_POP +])# _LT_AC_SHELL_INIT --IT_PO_SUBDIR([po]) - -dnl The following is very similar to -dnl -dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update]) @@ -3339,6 +3347,8 @@ -dnl -dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were -dnl a reason for it. + +-AC_CONFIG_COMMANDS([intltool], [ +# _LT_AC_PROG_ECHO_BACKSLASH +# -------------------------- +# Add some code to the start of the generated configure script which @@ -3348,14 +3358,6 @@ +# Check that we are running under the correct shell. +SHELL=${CONFIG_SHELL-/bin/sh} --AC_CONFIG_COMMANDS([intltool], [ -+case X$ECHO in -+X*--fallback-echo) -+ # Remove one level of quotation (which was required for Make). -+ ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+ ;; -+esac - -for file in intltool-extract intltool-merge intltool-update; do - sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \ - -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \ @@ -3373,6 +3375,19 @@ - chmod ugo+x ${file} - chmod u+w ${file} -done [...4019 lines suppressed...] LDAP_LIBS="-lldap $LDAP_LIBS" fi -@@ -25743,8 +24915,9 @@ Usually this means the macro was only in +@@ -25753,8 +24915,9 @@ Usually this means the macro was only in { (exit 1); exit 1; }; } fi @@ -19275,7 +19529,7 @@ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. -@@ -26215,11 +25388,10 @@ cat >>$CONFIG_STATUS <<_ACEOF +@@ -26225,11 +25388,10 @@ cat >>$CONFIG_STATUS <<_ACEOF # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" @@ -19291,7 +19545,7 @@ _ACEOF -@@ -26245,7 +25417,6 @@ do +@@ -26255,7 +25417,6 @@ do "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; @@ -19299,7 +19553,7 @@ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -@@ -26421,7 +25592,6 @@ s, at INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_ +@@ -26431,7 +25592,6 @@ s, at INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_ s, at INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t s, at INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t s, at INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t @@ -19307,7 +19561,7 @@ s, at INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t s, at INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t s, at INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t -@@ -27184,51 +26354,47 @@ done +@@ -27194,51 +26354,47 @@ done ;; intltool ) @@ -19395,11 +19649,10 @@ esac done _ACEOF -Only in evolution-exchange-2.5.5.1-pristine: configure.autotool-results -Only in evolution-exchange-2.5.5.1-pristine: configure.rej -diff --recursive -up evolution-exchange-2.5.5.1-pristine/docs/ietf/Makefile.in evolution-exchange-2.5.5.1-patched/docs/ietf/Makefile.in ---- evolution-exchange-2.5.5.1-pristine/docs/ietf/Makefile.in 2006-01-18 08:36:47.000000000 -0500 -+++ evolution-exchange-2.5.5.1-patched/docs/ietf/Makefile.in 2006-01-25 14:56:29.000000000 -0500 +Only in evolution-exchange-2.5.9.0-pristine: configure.autotool-results +diff --recursive -up evolution-exchange-2.5.9.0-pristine/docs/ietf/Makefile.in evolution-exchange-2.5.9.0-patched/docs/ietf/Makefile.in +--- evolution-exchange-2.5.9.0-pristine/docs/ietf/Makefile.in 2006-01-30 08:48:32.000000000 -0500 ++++ evolution-exchange-2.5.9.0-patched/docs/ietf/Makefile.in 2006-01-30 22:32:58.000000000 -0500 @@ -142,7 +142,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -19408,10 +19661,10 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -Only in evolution-exchange-2.5.5.1-pristine/docs/ietf: Makefile.in.autotool-results -diff --recursive -up evolution-exchange-2.5.5.1-pristine/docs/Makefile.in evolution-exchange-2.5.5.1-patched/docs/Makefile.in ---- evolution-exchange-2.5.5.1-pristine/docs/Makefile.in 2006-01-18 08:36:47.000000000 -0500 -+++ evolution-exchange-2.5.5.1-patched/docs/Makefile.in 2006-01-25 14:56:29.000000000 -0500 +Only in evolution-exchange-2.5.9.0-pristine/docs/ietf: Makefile.in.autotool-results +diff --recursive -up evolution-exchange-2.5.9.0-pristine/docs/Makefile.in evolution-exchange-2.5.9.0-patched/docs/Makefile.in +--- evolution-exchange-2.5.9.0-pristine/docs/Makefile.in 2006-01-30 08:48:32.000000000 -0500 ++++ evolution-exchange-2.5.9.0-patched/docs/Makefile.in 2006-01-30 22:32:58.000000000 -0500 @@ -152,7 +152,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -19420,10 +19673,10 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -Only in evolution-exchange-2.5.5.1-pristine/docs: Makefile.in.autotool-results -diff --recursive -up evolution-exchange-2.5.5.1-pristine/docs/reference/Makefile.in evolution-exchange-2.5.5.1-patched/docs/reference/Makefile.in ---- evolution-exchange-2.5.5.1-pristine/docs/reference/Makefile.in 2006-01-18 08:36:48.000000000 -0500 -+++ evolution-exchange-2.5.5.1-patched/docs/reference/Makefile.in 2006-01-25 14:56:30.000000000 -0500 +Only in evolution-exchange-2.5.9.0-pristine/docs: Makefile.in.autotool-results +diff --recursive -up evolution-exchange-2.5.9.0-pristine/docs/reference/Makefile.in evolution-exchange-2.5.9.0-patched/docs/reference/Makefile.in +--- evolution-exchange-2.5.9.0-pristine/docs/reference/Makefile.in 2006-01-30 08:48:32.000000000 -0500 ++++ evolution-exchange-2.5.9.0-patched/docs/reference/Makefile.in 2006-01-30 22:32:58.000000000 -0500 @@ -149,7 +149,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -19432,10 +19685,10 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -Only in evolution-exchange-2.5.5.1-pristine/docs/reference: Makefile.in.autotool-results -diff --recursive -up evolution-exchange-2.5.5.1-pristine/intltool-extract.in evolution-exchange-2.5.5.1-patched/intltool-extract.in ---- evolution-exchange-2.5.5.1-pristine/intltool-extract.in 2006-01-18 08:36:42.000000000 -0500 -+++ evolution-exchange-2.5.5.1-patched/intltool-extract.in 2005-12-11 05:22:12.000000000 -0500 +Only in evolution-exchange-2.5.9.0-pristine/docs/reference: Makefile.in.autotool-results +diff --recursive -up evolution-exchange-2.5.9.0-pristine/intltool-extract.in evolution-exchange-2.5.9.0-patched/intltool-extract.in +--- evolution-exchange-2.5.9.0-pristine/intltool-extract.in 2006-01-30 08:48:22.000000000 -0500 ++++ evolution-exchange-2.5.9.0-patched/intltool-extract.in 2005-12-11 05:22:12.000000000 -0500 @@ -485,12 +485,10 @@ sub parseTree sub intltool_tree_comment { @@ -19450,10 +19703,10 @@ push @$clist, 1 => $data; } -Only in evolution-exchange-2.5.5.1-pristine: intltool-extract.in.autotool-results -diff --recursive -up evolution-exchange-2.5.5.1-pristine/intltool-merge.in evolution-exchange-2.5.5.1-patched/intltool-merge.in ---- evolution-exchange-2.5.5.1-pristine/intltool-merge.in 2006-01-18 08:36:42.000000000 -0500 -+++ evolution-exchange-2.5.5.1-patched/intltool-merge.in 2005-12-11 05:22:12.000000000 -0500 +Only in evolution-exchange-2.5.9.0-pristine: intltool-extract.in.autotool-results +diff --recursive -up evolution-exchange-2.5.9.0-pristine/intltool-merge.in evolution-exchange-2.5.9.0-patched/intltool-merge.in +--- evolution-exchange-2.5.9.0-pristine/intltool-merge.in 2006-01-30 08:48:22.000000000 -0500 ++++ evolution-exchange-2.5.9.0-patched/intltool-merge.in 2005-12-11 05:22:12.000000000 -0500 @@ -91,7 +91,7 @@ my $OUTFILE; my %po_files_by_lang = (); @@ -19472,10 +19725,10 @@ # seek character encoding aliases in charset.alias (glib) -Only in evolution-exchange-2.5.5.1-pristine: intltool-merge.in.autotool-results -diff --recursive -up evolution-exchange-2.5.5.1-pristine/intltool-update.in evolution-exchange-2.5.5.1-patched/intltool-update.in ---- evolution-exchange-2.5.5.1-pristine/intltool-update.in 2006-01-18 08:36:42.000000000 -0500 -+++ evolution-exchange-2.5.5.1-patched/intltool-update.in 2005-12-11 05:22:12.000000000 -0500 +Only in evolution-exchange-2.5.9.0-pristine: intltool-merge.in.autotool-results +diff --recursive -up evolution-exchange-2.5.9.0-pristine/intltool-update.in evolution-exchange-2.5.9.0-patched/intltool-update.in +--- evolution-exchange-2.5.9.0-pristine/intltool-update.in 2006-01-30 08:48:22.000000000 -0500 ++++ evolution-exchange-2.5.9.0-patched/intltool-update.in 2005-12-11 05:22:12.000000000 -0500 @@ -80,8 +80,7 @@ my $ini_support = "directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec "soundlist(?:\\.in)+|". # GNOME specific @@ -19559,10 +19812,10 @@ $name = $domain if $domain; -Only in evolution-exchange-2.5.5.1-pristine: intltool-update.in.autotool-results -diff --recursive -up evolution-exchange-2.5.5.1-pristine/mail/Makefile.in evolution-exchange-2.5.5.1-patched/mail/Makefile.in ---- evolution-exchange-2.5.5.1-pristine/mail/Makefile.in 2006-01-18 08:36:48.000000000 -0500 -+++ evolution-exchange-2.5.5.1-patched/mail/Makefile.in 2006-01-25 14:56:30.000000000 -0500 +Only in evolution-exchange-2.5.9.0-pristine: intltool-update.in.autotool-results +diff --recursive -up evolution-exchange-2.5.9.0-pristine/mail/Makefile.in evolution-exchange-2.5.9.0-patched/mail/Makefile.in +--- evolution-exchange-2.5.9.0-pristine/mail/Makefile.in 2006-01-30 08:48:32.000000000 -0500 ++++ evolution-exchange-2.5.9.0-patched/mail/Makefile.in 2006-01-30 22:32:58.000000000 -0500 @@ -161,7 +161,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -19571,10 +19824,10 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -Only in evolution-exchange-2.5.5.1-pristine/mail: Makefile.in.autotool-results -diff --recursive -up evolution-exchange-2.5.5.1-pristine/Makefile.in evolution-exchange-2.5.5.1-patched/Makefile.in ---- evolution-exchange-2.5.5.1-pristine/Makefile.in 2006-01-18 08:36:48.000000000 -0500 -+++ evolution-exchange-2.5.5.1-patched/Makefile.in 2006-01-25 14:56:30.000000000 -0500 +Only in evolution-exchange-2.5.9.0-pristine/mail: Makefile.in.autotool-results +diff --recursive -up evolution-exchange-2.5.9.0-pristine/Makefile.in evolution-exchange-2.5.9.0-patched/Makefile.in +--- evolution-exchange-2.5.9.0-pristine/Makefile.in 2006-01-30 08:48:33.000000000 -0500 ++++ evolution-exchange-2.5.9.0-patched/Makefile.in 2006-01-30 22:32:58.000000000 -0500 @@ -167,7 +167,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -19583,10 +19836,10 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -Only in evolution-exchange-2.5.5.1-pristine: Makefile.in.autotool-results -diff --recursive -up evolution-exchange-2.5.5.1-pristine/po/Makefile.in.in evolution-exchange-2.5.5.1-patched/po/Makefile.in.in ---- evolution-exchange-2.5.5.1-pristine/po/Makefile.in.in 2006-01-18 08:36:42.000000000 -0500 -+++ evolution-exchange-2.5.5.1-patched/po/Makefile.in.in 2005-12-11 05:22:12.000000000 -0500 +Only in evolution-exchange-2.5.9.0-pristine: Makefile.in.autotool-results +diff --recursive -up evolution-exchange-2.5.9.0-pristine/po/Makefile.in.in evolution-exchange-2.5.9.0-patched/po/Makefile.in.in +--- evolution-exchange-2.5.9.0-pristine/po/Makefile.in.in 2006-01-30 08:48:22.000000000 -0500 ++++ evolution-exchange-2.5.9.0-patched/po/Makefile.in.in 2005-12-11 05:22:12.000000000 -0500 @@ -39,14 +39,13 @@ gnulocaledir = $(datadir)/locale gettextsrcdir = $(datadir)/glib-2.0/gettext/po subdir = po @@ -19757,10 +20010,10 @@ $(SHELL) ./config.status # Tell versions [3.59,3.63) of GNU make not to export all variables. -Only in evolution-exchange-2.5.5.1-pristine/po: Makefile.in.in.autotool-results -diff --recursive -up evolution-exchange-2.5.5.1-pristine/storage/Makefile.in evolution-exchange-2.5.5.1-patched/storage/Makefile.in ---- evolution-exchange-2.5.5.1-pristine/storage/Makefile.in 2006-01-18 08:36:48.000000000 -0500 -+++ evolution-exchange-2.5.5.1-patched/storage/Makefile.in 2006-01-25 14:56:30.000000000 -0500 +Only in evolution-exchange-2.5.9.0-pristine/po: Makefile.in.in.autotool-results +diff --recursive -up evolution-exchange-2.5.9.0-pristine/storage/Makefile.in evolution-exchange-2.5.9.0-patched/storage/Makefile.in +--- evolution-exchange-2.5.9.0-pristine/storage/Makefile.in 2006-01-30 08:48:33.000000000 -0500 ++++ evolution-exchange-2.5.9.0-patched/storage/Makefile.in 2006-01-30 22:32:58.000000000 -0500 @@ -204,7 +204,6 @@ INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ @@ -19769,4 +20022,4 @@ INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -Only in evolution-exchange-2.5.5.1-pristine/storage: Makefile.in.autotool-results +Only in evolution-exchange-2.5.9.0-pristine/storage: Makefile.in.autotool-results From fedora-cvs-commits at redhat.com Tue Jan 31 03:43:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:43:27 -0500 Subject: rpms/dasher/devel dasher-3.99.2-make-compile.patch, NONE, 1.1 dasher.spec, 1.23, 1.24 Message-ID: <200601310343.k0V3hRlr020157@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20056 Modified Files: dasher.spec Added Files: dasher-3.99.2-make-compile.patch Log Message: - make compile dasher-3.99.2-make-compile.patch: SocketInput.h | 1 + 1 files changed, 1 insertion(+) --- NEW FILE dasher-3.99.2-make-compile.patch --- --- dasher-3.99.2/Src/DasherCore/SocketInput.h.make-compile 2006-01-30 22:29:08.000000000 -0500 +++ dasher-3.99.2/Src/DasherCore/SocketInput.h 2006-01-30 22:39:00.000000000 -0500 @@ -16,6 +16,7 @@ namespace Dasher { class CSocketInput; + void *ThreadLauncherStub(void *_myClass); } using namespace Dasher; Index: dasher.spec =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- dasher.spec 31 Jan 2006 02:57:07 -0000 1.23 +++ dasher.spec 31 Jan 2006 03:43:24 -0000 1.24 @@ -18,11 +18,14 @@ Requires: gnome-speech +Patch0: dasher-3.99.2-make-compile.patch + %description Accessibility input method %prep %setup -q +%patch0 -p1 .make-compile %build @@ -76,6 +79,9 @@ %{_sysconfdir}/gconf/schemas/dasher.schemas %changelog +* Mon Jan 30 2006 Ray Strode 3.99.2-1 +- make compile + * Mon Jan 30 2006 Matthias Clasen - Update to 3.99.2 From fedora-cvs-commits at redhat.com Tue Jan 31 03:44:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:44:20 -0500 Subject: rpms/dasher/devel dasher.spec,1.24,1.25 Message-ID: <200601310344.k0V3iKob020586@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20532 Modified Files: dasher.spec Log Message: try again Index: dasher.spec =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- dasher.spec 31 Jan 2006 03:43:24 -0000 1.24 +++ dasher.spec 31 Jan 2006 03:44:17 -0000 1.25 @@ -25,7 +25,8 @@ %prep %setup -q -%patch0 -p1 .make-compile + +%patch0 -p1 -b .make-compile %build From fedora-cvs-commits at redhat.com Tue Jan 31 03:55:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 22:55:46 -0500 Subject: rpms/dasher/devel dasher.spec,1.25,1.26 Message-ID: <200601310355.k0V3tk7W005510@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5257 Modified Files: dasher.spec Log Message: weird beehive error, randomly reving release and retrying Index: dasher.spec =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- dasher.spec 31 Jan 2006 03:44:17 -0000 1.25 +++ dasher.spec 31 Jan 2006 03:55:43 -0000 1.26 @@ -1,7 +1,7 @@ Summary: GNOME Accessibility method Name: dasher Version: 3.99.2 -Release: 1 +Release: 2 License: GPL Group: Desktop/Accessibility URL: http://www.gnome.org/ @@ -80,7 +80,7 @@ %{_sysconfdir}/gconf/schemas/dasher.schemas %changelog -* Mon Jan 30 2006 Ray Strode 3.99.2-1 +* Mon Jan 30 2006 Ray Strode 3.99.2-2 - make compile * Mon Jan 30 2006 Matthias Clasen From fedora-cvs-commits at redhat.com Tue Jan 31 04:10:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:10:34 -0500 Subject: rpms/anaconda/devel .cvsignore, 1.206, 1.207 anaconda.spec, 1.325, 1.326 sources, 1.325, 1.326 Message-ID: <200601310410.k0V4AY9I009805@cvs.devel.redhat.com> Author: katzj Update of /cvs/dist/rpms/anaconda/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9752/devel Modified Files: .cvsignore anaconda.spec sources Log Message: auto-import anaconda-10.91.9-1 on branch devel from anaconda-10.91.9-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/.cvsignore,v retrieving revision 1.206 retrieving revision 1.207 diff -u -r1.206 -r1.207 --- .cvsignore 26 Jan 2006 23:34:30 -0000 1.206 +++ .cvsignore 31 Jan 2006 04:10:31 -0000 1.207 @@ -1 +1 @@ -anaconda-10.91.8.tar.bz2 +anaconda-10.91.9.tar.bz2 Index: anaconda.spec =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/anaconda.spec,v retrieving revision 1.325 retrieving revision 1.326 diff -u -r1.325 -r1.326 --- anaconda.spec 26 Jan 2006 23:34:30 -0000 1.325 +++ anaconda.spec 31 Jan 2006 04:10:31 -0000 1.326 @@ -1,5 +1,5 @@ Name: anaconda -Version: 10.91.8 +Version: 10.91.9 Release: 1 License: GPL Summary: Graphical system installer @@ -78,6 +78,16 @@ /sbin/chkconfig --del reconfig >/dev/null 2>&1 || : %changelog +* Mon Jan 30 2006 Jeremy Katz - 10.91.9-1 +- Skip partition and bootloader screens if requested for textmode + (dcantrel, #178739) +- Don't create /etc/X11/X symlink (dcantrel, #179321) +- Add ethiopic fonts +- Fix traceback in upgrade examine (clumens) +- Free up depsolving storage (pnasrat) +- Fix group selection screen that I mistakenly removed (oops) +- Remove some dead pieces (pnasrat, katzj) + * Thu Jan 26 2006 Jeremy Katz - 10.91.8-1 - Remove rpm whiteout (clumens, #178540) - Fix text in upgrade continue button (dcantrel, #178096) Index: sources =================================================================== RCS file: /cvs/dist/rpms/anaconda/devel/sources,v retrieving revision 1.325 retrieving revision 1.326 diff -u -r1.325 -r1.326 --- sources 26 Jan 2006 23:34:30 -0000 1.325 +++ sources 31 Jan 2006 04:10:32 -0000 1.326 @@ -1 +1 @@ -00e20cf33ebc05f8df2a8a67a95851b1 anaconda-10.91.8.tar.bz2 +fb576db5d139565a5ce1bae7fe938203 anaconda-10.91.9.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 04:11:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:11:06 -0500 Subject: rpms/sound-juicer/devel .cvsignore, 1.16, 1.17 sound-juicer.spec, 1.34, 1.35 sources, 1.16, 1.17 Message-ID: <200601310411.k0V4B5kG010077@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/sound-juicer/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10018 Modified Files: .cvsignore sound-juicer.spec sources Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 18 Jan 2006 16:39:48 -0000 1.16 +++ .cvsignore 31 Jan 2006 04:11:03 -0000 1.17 @@ -6,3 +6,4 @@ sound-juicer-2.11.91.tar.bz2 sound-juicer-2.13.1.tar.bz2 sound-juicer-2.13.2.tar.bz2 +sound-juicer-2.13.4.tar.bz2 Index: sound-juicer.spec =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sound-juicer.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sound-juicer.spec 18 Jan 2006 16:39:48 -0000 1.34 +++ sound-juicer.spec 31 Jan 2006 04:11:03 -0000 1.35 @@ -12,7 +12,7 @@ Name: sound-juicer Summary: Clean and lean CD ripper -Version: 2.13.2 +Version: 2.13.4 Release: 1 License: GPL Group: Applications/Multimedia @@ -93,6 +93,9 @@ %{_datadir}/omf/sound-juicer %changelog +* Mon Jan 30 2006 Matthias Clasen 2.13.4-1 +- Update to 2.13.4 + * Mon Jan 09 2006 John (J5) Palmieri 2.13.2-1 - Upgrade to 2.13.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/sound-juicer/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 18 Jan 2006 16:39:48 -0000 1.16 +++ sources 31 Jan 2006 04:11:03 -0000 1.17 @@ -1 +1 @@ -65664fe2f38260c32f3be9a1f6593e4c sound-juicer-2.13.2.tar.bz2 +658f035110bea08a81951c2fa6a15552 sound-juicer-2.13.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 04:15:21 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:15:21 -0500 Subject: rpms/dasher/devel dasher.spec,1.26,1.27 Message-ID: <200601310415.k0V4FLnm012044@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/dasher/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11899 Modified Files: dasher.spec Log Message: icon moved in package file list Index: dasher.spec =================================================================== RCS file: /cvs/dist/rpms/dasher/devel/dasher.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- dasher.spec 31 Jan 2006 03:55:43 -0000 1.26 +++ dasher.spec 31 Jan 2006 04:15:18 -0000 1.27 @@ -72,7 +72,7 @@ %doc %{_datadir}/dasher/ %{_datadir}/gnome/help/dasher -%{_datadir}/icons/dasher.png +%{_datadir}/icons/hicolor/48x48/apps %{_datadir}/omf/dasher/* %{_datadir}/applications/gnome-dasher.desktop %{_bindir}/dasher From fedora-cvs-commits at redhat.com Tue Jan 31 04:15:53 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:15:53 -0500 Subject: rpms/gnopernicus/devel .cvsignore, 1.27, 1.28 gnopernicus.spec, 1.36, 1.37 sources, 1.27, 1.28 Message-ID: <200601310415.k0V4Fr7s012948@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnopernicus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12242 Modified Files: .cvsignore gnopernicus.spec sources Log Message: 1.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnopernicus/devel/.cvsignore,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- .cvsignore 15 Dec 2005 05:58:37 -0000 1.27 +++ .cvsignore 31 Jan 2006 04:15:50 -0000 1.28 @@ -16,3 +16,4 @@ gnopernicus-0.11.7.tar.bz2 gnopernicus-0.12.0.tar.bz2 gnopernicus-1.0.0.tar.bz2 +gnopernicus-1.0.1.tar.bz2 Index: gnopernicus.spec =================================================================== RCS file: /cvs/dist/rpms/gnopernicus/devel/gnopernicus.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- gnopernicus.spec 15 Dec 2005 19:04:43 -0000 1.36 +++ gnopernicus.spec 31 Jan 2006 04:15:50 -0000 1.37 @@ -1,6 +1,6 @@ Summary: GNOME screen reader Name: gnopernicus -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: LGPL Group: Desktop/Accessibility @@ -100,6 +100,9 @@ %{_includedir}/gnopernicus-1.0 %changelog +* Mon Jan 30 2006 Matthias Clasen 1.0.1-1 +- Update to 1.0.1 + * Thu Dec 15 2005 Matthias Clasen 1.0.0-1 - Update to 1.0.0 - Work around wrong-evaluation-time issues in configure Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnopernicus/devel/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 15 Dec 2005 05:58:37 -0000 1.27 +++ sources 31 Jan 2006 04:15:50 -0000 1.28 @@ -1 +1 @@ -fcf74aea3298dec5cd6b761d42a50c8a gnopernicus-1.0.0.tar.bz2 +8467c0ecf7af3bba313c2869c77d0243 gnopernicus-1.0.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 04:21:08 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:21:08 -0500 Subject: rpms/gnome-doc-utils/devel .cvsignore, 1.12, 1.13 gnome-doc-utils.spec, 1.15, 1.16 sources, 1.12, 1.13 Message-ID: <200601310421.k0V4L8pr026898@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-doc-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26841 Modified Files: .cvsignore gnome-doc-utils.spec sources Log Message: 0.5.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 18 Jan 2006 04:59:19 -0000 1.12 +++ .cvsignore 31 Jan 2006 04:21:05 -0000 1.13 @@ -9,3 +9,4 @@ gnome-doc-utils-0.5.1.tar.bz2 gnome-doc-utils-0.5.2.tar.bz2 gnome-doc-utils-0.5.3.tar.bz2 +gnome-doc-utils-0.5.4.tar.bz2 Index: gnome-doc-utils.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/gnome-doc-utils.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnome-doc-utils.spec 18 Jan 2006 04:59:19 -0000 1.15 +++ gnome-doc-utils.spec 31 Jan 2006 04:21:05 -0000 1.16 @@ -1,6 +1,6 @@ Summary: Documentation utilities for the GNOME project Name: gnome-doc-utils -Version: 0.5.3 +Version: 0.5.4 Release: 1 License: LGPL Group: Development/Tools @@ -53,6 +53,9 @@ %{_datadir}/gnome-doc-utils %changelog +* Mon Jan 30 2006 Matthias Clasen - 0.5.4-1 +- Update to 0.5.4 + * Tue Jan 13 2006 Matthias Clasen - 0.5.3-1 - Update to 0.5.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-doc-utils/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 18 Jan 2006 04:59:19 -0000 1.12 +++ sources 31 Jan 2006 04:21:05 -0000 1.13 @@ -1 +1 @@ -54c01d6cc947d3b0d50ea3a6b0e5d00d gnome-doc-utils-0.5.3.tar.bz2 +87c12c7d7c984b289df58c3a49726fd4 gnome-doc-utils-0.5.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 04:25:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:25:12 -0500 Subject: rpms/gnome-themes/devel .cvsignore, 1.25, 1.26 gnome-themes.spec, 1.50, 1.51 sources, 1.25, 1.26 Message-ID: <200601310425.k0V4PCcg021285@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-themes/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21270 Modified Files: .cvsignore gnome-themes.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 20 Dec 2005 16:11:40 -0000 1.25 +++ .cvsignore 31 Jan 2006 04:25:09 -0000 1.26 @@ -15,3 +15,4 @@ inverse_stock_info.png gnome-themes-2.13.2.tar.bz2 clearlooks-metacity-2.0.tar.gz +gnome-themes-2.13.90.tar.bz2 Index: gnome-themes.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/gnome-themes.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gnome-themes.spec 21 Dec 2005 15:46:40 -0000 1.50 +++ gnome-themes.spec 31 Jan 2006 04:25:09 -0000 1.51 @@ -3,8 +3,8 @@ Summary: Themes collection for GNOME Name: gnome-themes -Version: 2.13.2 -Release: 3 +Version: 2.13.90 +Release: 1 URL: http://ftp.gnome.org/pub/GNOME/sources/gnome-themes/ Source: %{name}-%{version}.tar.bz2 Source1: clearlooks-%{clearlooks_version}.tar.bz2 @@ -92,6 +92,9 @@ %doc AUTHORS ChangeLog COPYING NEWS README %changelog +* Mon Jan 30 2006 Matthias Clasen - 2.13.90-1 +- Update to 2.13.90 + * Tue Dec 21 2005 Matthias Clasen - 2.13.2-3 - Make sure the new Clearlooks metacity theme gets picked up Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-themes/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 20 Dec 2005 16:11:40 -0000 1.25 +++ sources 31 Jan 2006 04:25:09 -0000 1.26 @@ -1,3 +1,3 @@ 451ef33d1bffa261c5cbe01182199f97 clearlooks-0.6.2.tar.bz2 -b2058ca2c8157edc7f5b097bbe9cc537 gnome-themes-2.13.2.tar.bz2 64bffb05ef1c8d2f3a3cbb18480cd3f0 clearlooks-metacity-2.0.tar.gz +f51bbb272627ce119bb7755c17331f28 gnome-themes-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 04:27:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:27:42 -0500 Subject: rpms/nautilus-cd-burner/devel .cvsignore, 1.25, 1.26 nautilus-cd-burner.spec, 1.44, 1.45 sources, 1.25, 1.26 Message-ID: <200601310427.k0V4RgnV021400@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/nautilus-cd-burner/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21385 Modified Files: .cvsignore nautilus-cd-burner.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/.cvsignore,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- .cvsignore 18 Jan 2006 04:45:31 -0000 1.25 +++ .cvsignore 31 Jan 2006 04:27:40 -0000 1.26 @@ -16,3 +16,4 @@ nautilus-cd-burner-2.13.3.tar.bz2 nautilus-cd-burner-2.13.4.tar.bz2 nautilus-cd-burner-2.13.5.tar.bz2 +nautilus-cd-burner-2.13.90.tar.bz2 Index: nautilus-cd-burner.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/nautilus-cd-burner.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- nautilus-cd-burner.spec 18 Jan 2006 04:50:40 -0000 1.44 +++ nautilus-cd-burner.spec 31 Jan 2006 04:27:40 -0000 1.45 @@ -1,6 +1,6 @@ Summary: Easy to use CD burning for Gnome Name: nautilus-cd-burner -Version: 2.13.5 +Version: 2.13.90 Release: 1 Source0: %{name}-%{version}.tar.bz2 License: LGPL/GPL @@ -100,6 +100,9 @@ %changelog +* Mon Jan 30 2006 Matthias Clasen 2.13.90-1 +- Update to 2.13.90 + * Tue Jan 17 2006 Matthias Clasen 2.13.5-1 - Update to 2.13.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/nautilus-cd-burner/devel/sources,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- sources 18 Jan 2006 04:45:31 -0000 1.25 +++ sources 31 Jan 2006 04:27:40 -0000 1.26 @@ -1 +1 @@ -2a6fe015089663f99da665ba0e193655 nautilus-cd-burner-2.13.5.tar.bz2 +081beaac05a88f6d2079de9c1ef898f6 nautilus-cd-burner-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 04:44:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:44:32 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver-2.13.90-lock-dialog.patch, NONE, 1.1 .cvsignore, 1.13, 1.14 gnome-screensaver.spec, 1.49, 1.50 sources, 1.15, 1.16 Message-ID: <200601310444.k0V4iWCZ021599@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21585 Modified Files: .cvsignore gnome-screensaver.spec sources Added Files: gnome-screensaver-2.13.90-lock-dialog.patch Log Message: 2.13.90 gnome-screensaver-2.13.90-lock-dialog.patch: configure | 4 - configure.ac | 1 src/gs-job.c | 1 src/gs-lock-plug.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++-- src/gs-manager.c | 2 src/gs-window-x11.c | 1 6 files changed, 134 insertions(+), 5 deletions(-) --- NEW FILE gnome-screensaver-2.13.90-lock-dialog.patch --- --- gnome-screensaver-2.13.90/src/gs-lock-plug.c.lock-dialog 2006-01-04 10:58:58.000000000 -0500 +++ gnome-screensaver-2.13.90/src/gs-lock-plug.c 2006-01-30 23:38:07.000000000 -0500 @@ -36,6 +36,7 @@ #include #include #include +#include /* for fast user switching */ #include @@ -179,6 +180,9 @@ plug = GS_LOCK_PLUG (widget); + if (!plug->vbox) + return; + gtk_container_set_border_width (GTK_CONTAINER (plug->vbox), 24); gtk_box_set_spacing (GTK_BOX (plug->vbox), 12); @@ -266,7 +270,8 @@ set_status_text (GSLockPlug *plug, const char *text) { - gtk_label_set_text (GTK_LABEL (plug->priv->status_label), text); + if (plug->priv->status_label) + gtk_label_set_text (GTK_LABEL (plug->priv->status_label), text); } static void @@ -339,7 +344,10 @@ } if (response_id == GS_LOCK_PLUG_RESPONSE_OK) { - gint current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (plug->priv->notebook)); + gint current_page = AUTH_PAGE; + + if (plug->priv->notebook) + current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (plug->priv->notebook)); if (current_page == AUTH_PAGE) { set_dialog_sensitive (plug, FALSE); @@ -409,6 +417,9 @@ plug->priv->caps_lock_on = is_on; + if (!plug->priv->capslock_label) + return; + if (is_on) gtk_label_set_text (GTK_LABEL (plug->priv->capslock_label), _("You have the Caps Lock key on.")); @@ -472,12 +483,17 @@ gs_lock_plug_size_request (GtkWidget *widget, GtkRequisition *requisition) { + GSLockPlug *plug = GS_LOCK_PLUG (widget); int mod_width; int mod_height; if (GTK_WIDGET_CLASS (parent_class)->size_request) GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition); + /* don't constrain size when themed */ + if (plug->vbox == NULL) + return; + mod_width = requisition->height * 1.3; mod_height = requisition->width / 1.6; if (requisition->width < mod_width) { @@ -487,7 +503,6 @@ /* if the dialog is wide fill out the height */ requisition->height = mod_height; } - } static void @@ -502,6 +517,9 @@ plug->priv->logout_enabled = logout_enabled; g_object_notify (G_OBJECT (plug), "logout-enabled"); + if (!plug->priv->logout_button) + return; + if (logout_enabled) gtk_widget_show (plug->priv->logout_button); else @@ -1567,6 +1585,105 @@ profile_end ("end", "buttons"); } + +static void +unlock_button_clicked (GtkButton *button, + GSLockPlug *plug) +{ + gs_lock_plug_response (plug, GS_LOCK_PLUG_RESPONSE_OK); +} + +static void +cancel_button_clicked (GtkButton *button, + GSLockPlug *plug) +{ + gs_lock_plug_response (plug, GS_LOCK_PLUG_RESPONSE_CANCEL); +} + +static gboolean +load_theme (GSLockPlug *plug) +{ + const gchar *theme; + gchar *glade; + gchar *rc; + GladeXML *xml; + GtkWidget *lock_dialog; + GtkWidget *unlock_button; + const gchar themedir[] = "/usr/share/gnome-screensaver/themes/"; + gchar *str; + + theme = g_getenv ("GNOME_SCREENSAVER_THEME"); + + if (!theme) + return FALSE; + + /* FIXME use prefix here */ + glade = g_strconcat (themedir, theme, "-lock-dialog.glade", NULL); + if (!g_file_test (glade, G_FILE_TEST_IS_REGULAR)) { + g_free (glade); + return FALSE; + } + + rc = g_strconcat (themedir, theme, "-lock-dialog.gtkrc", NULL); + if (g_file_test (rc, G_FILE_TEST_IS_REGULAR)) + gtk_rc_parse (rc); + g_free (rc); + + xml = glade_xml_new (glade, "lock-dialog", NULL); + + if (!xml) { + g_warning ("Failed to load '%s'\n", glade); + g_free (glade); + return FALSE; + } + g_free (glade); + + lock_dialog = glade_xml_get_widget (xml, "lock-dialog"); + gtk_container_add (GTK_CONTAINER (plug), lock_dialog); + gtk_widget_show_all (lock_dialog); + + plug->vbox = NULL; + plug->action_area = glade_xml_get_widget (xml, "action-area"); + plug->priv->notebook = NULL; + plug->priv->username_label = glade_xml_get_widget (xml, "username-label"); + plug->priv->password_entry = glade_xml_get_widget (xml, "password-entry"); + plug->priv->password_entry = glade_xml_get_widget (xml, "password-entry"); + plug->priv->capslock_label = glade_xml_get_widget (xml, "capslock-label"); + plug->priv->status_label = glade_xml_get_widget (xml, "status-label"); + plug->priv->user_treeview = NULL; + plug->priv->ok_button = NULL; + plug->priv->cancel_button = glade_xml_get_widget (xml, "cancel-button"); + plug->priv->logout_button = glade_xml_get_widget (xml, "logout-button"); + plug->priv->switch_button = NULL; + unlock_button = glade_xml_get_widget (xml, "unlock-button"); + gtk_widget_grab_default (unlock_button); + + /* FIXME should let the theme determine the font size */ + str = g_strdup_printf ("%s", g_get_user_name ()); + gtk_label_set_markup (GTK_LABEL (plug->priv->username_label), str); + g_free (str); + + plug->priv->timeout = DIALOG_TIMEOUT_MSEC; + + g_signal_connect (plug->priv->password_entry, "button_press_event", + G_CALLBACK (entry_button_press), NULL); + + g_signal_connect (plug->priv->password_entry, "key_press_event", + G_CALLBACK (entry_key_press), plug); + + g_signal_connect (unlock_button, "clicked", + G_CALLBACK (unlock_button_clicked), plug); + + g_signal_connect (plug->priv->cancel_button, "clicked", + G_CALLBACK (cancel_button_clicked), plug); + + if (plug->priv->logout_button) + g_signal_connect (plug->priv->logout_button, "clicked", + G_CALLBACK (logout_button_clicked), plug); + + return TRUE; +} + static void gs_lock_plug_init (GSLockPlug *plug) { @@ -1576,6 +1693,13 @@ plug->priv->fusa_manager = NULL; + if (load_theme (plug)) { + + profile_end ("end", NULL); + + return; + } + /* Dialog emulation */ plug->vbox = gtk_vbox_new (FALSE, 0); --- gnome-screensaver-2.13.90/src/gs-manager.c.lock-dialog 2006-01-21 19:15:26.000000000 -0500 +++ gnome-screensaver-2.13.90/src/gs-manager.c 2006-01-30 23:38:07.000000000 -0500 @@ -791,6 +791,8 @@ job = gs_job_new_for_widget (GTK_WIDGET (window)); theme = select_theme (manager); + /* FIXME: quick hack using an env var to communicate */ + g_setenv ("GNOME_SCREENSAVER_THEME", theme, TRUE); gs_job_set_theme (job, theme, NULL); if (! manager->priv->throttle_enabled) { --- gnome-screensaver-2.13.90/src/gs-job.c.lock-dialog 2006-01-21 19:35:24.000000000 -0500 +++ gnome-screensaver-2.13.90/src/gs-job.c 2006-01-30 23:41:43.000000000 -0500 @@ -571,6 +571,7 @@ "XAUTHORITY", "XAUTHLOCALHOSTNAME", "LANG", + "GNOME_SCREENSAVER_THEME", "LANGUAGE" }; --- gnome-screensaver-2.13.90/src/gs-window-x11.c.lock-dialog 2006-01-21 19:34:03.000000000 -0500 +++ gnome-screensaver-2.13.90/src/gs-window-x11.c 2006-01-30 23:41:07.000000000 -0500 @@ -559,6 +559,7 @@ "XAUTHORITY", "XAUTHLOCALHOSTNAME", "LANG", + "GNOME_SCREENSAVER_THEME", "LANGUAGE" }; --- gnome-screensaver-2.13.90/configure.lock-dialog 2006-01-17 17:32:05.000000000 -0500 +++ gnome-screensaver-2.13.90/configure 2006-01-30 23:38:07.000000000 -0500 @@ -23697,7 +23697,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GNOME_SCREENSAVER_DIALOG_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_GNOME_SCREENSAVER_DIALOG_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED_VERSION libglade-2.0 >= $GLADE_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi @@ -23711,7 +23711,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_GNOME_SCREENSAVER_DIALOG_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION" 2>/dev/null` + pkg_cv_GNOME_SCREENSAVER_DIALOG_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED_VERSION libglade-2.0 >= $GLADE_REQUIRED_VERSION" 2>/dev/null` else pkg_failed=yes fi --- gnome-screensaver-2.13.90/configure.ac.lock-dialog 2006-01-16 15:20:17.000000000 -0500 +++ gnome-screensaver-2.13.90/configure.ac 2006-01-30 23:38:07.000000000 -0500 @@ -60,6 +60,7 @@ AC_SUBST(GNOME_SCREENSAVER_LIBS) PKG_CHECK_MODULES(GNOME_SCREENSAVER_DIALOG, + libglade-2.0 >= $GLADE_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION) AC_SUBST(GNOME_SCREENSAVER_DIALOG_CFLAGS) AC_SUBST(GNOME_SCREENSAVER_DIALOG_LIBS) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 17 Jan 2006 17:31:05 -0000 1.13 +++ .cvsignore 31 Jan 2006 04:44:30 -0000 1.14 @@ -4,3 +4,4 @@ gnome-screensaver-0.0.23.tar.bz2 gnome-screensaver-0.0.24.tar.bz2 gnome-screensaver-2.13.5.tar.bz2 +gnome-screensaver-2.13.90.tar.bz2 Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- gnome-screensaver.spec 22 Jan 2006 20:22:22 -0000 1.49 +++ gnome-screensaver.spec 31 Jan 2006 04:44:30 -0000 1.50 @@ -13,8 +13,8 @@ Summary: GNOME Sreensaver Name: gnome-screensaver -Version: 2.13.5 -Release: 4 +Version: 2.13.90 +Release: 1 License: GPL Group: Amusement/Graphics Source0: %{name}-%{version}.tar.bz2 @@ -23,9 +23,8 @@ Source3: gnome-compiler-flags.m4 Source4: fedoralogo-floaters.desktop -Patch0: gnome-screensaver-0.0.22-lock-dialog.patch +Patch0: gnome-screensaver-2.13.90-lock-dialog.patch Patch1: gnome-screensaver-0.0.23-use-floaters-by-default.patch -Patch2: gnome-screensaver-2.13.5-use-less-cpu.patch BuildRoot: %{_tmppath}/%{name}-root URL: http://www.gnome.org @@ -61,7 +60,6 @@ %setup -q -a2 %patch0 -p1 -b .lock-dialog %patch1 -p1 -b .use-floaters-by-default -%patch2 -p1 -b .use-less-cpu %build intltoolize --force @@ -122,6 +120,9 @@ %{_sysconfdir}/pam.d/* %changelog +* Mon Jan 30 2006 Matthias Clasen - 2.13.90-1 +- Update to 2.13.90 + * Sun Jan 22 2006 Ray Strode - 2.13.5-4 - throttle cpu usage in floaters screensaver to allow things like background compiles to be faster (bug 178496). Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 19 Jan 2006 21:06:28 -0000 1.15 +++ sources 31 Jan 2006 04:44:30 -0000 1.16 @@ -1,2 +1,2 @@ -2ab5b1c5b432f6b763f40c3a4a2b1c94 gnome-screensaver-2.13.5.tar.bz2 661b1551a16e6aa948248b2443bad117 fedoralogo-floaters-lock-dialog.tar.gz +8ff40bd9914a6272d6a9ace15edea207 gnome-screensaver-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 04:47:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:47:02 -0500 Subject: rpms/at-spi/devel .cvsignore, 1.17, 1.18 at-spi.spec, 1.24, 1.25 sources, 1.17, 1.18 Message-ID: <200601310447.k0V4l2JN001477@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/at-spi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1462 Modified Files: .cvsignore at-spi.spec sources Log Message: 1.7.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 18 Jan 2006 04:53:16 -0000 1.17 +++ .cvsignore 31 Jan 2006 04:47:00 -0000 1.18 @@ -7,3 +7,4 @@ at-spi-1.7.0.tar.bz2 at-spi-1.7.1.tar.bz2 at-spi-1.7.2.tar.bz2 +at-spi-1.7.3.tar.bz2 Index: at-spi.spec =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- at-spi.spec 18 Jan 2006 04:53:16 -0000 1.24 +++ at-spi.spec 31 Jan 2006 04:47:00 -0000 1.25 @@ -6,7 +6,7 @@ Summary: Assistive Technology Service Provider Interface Name: at-spi -Version: 1.7.2 +Version: 1.7.3 Release: 1 URL: http://developer.gnome.org/projects/gap/ Source0: %{name}-%{version}.tar.bz2 @@ -87,6 +87,9 @@ %{_includedir}/* %changelog +* Mon Jan 30 2006 Matthias Clasen 1.7.3-1 +- Update to 1.7.3 + * Tue Jan 17 2006 Matthias Clasen 1.7.2-1 - Update to 1.7.2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 18 Jan 2006 04:53:16 -0000 1.17 +++ sources 31 Jan 2006 04:47:00 -0000 1.18 @@ -1 +1 @@ -6b470020c760697bc188dd5903c7a0fb at-spi-1.7.2.tar.bz2 +d97fcce37a8d793489acebfd9c7367f0 at-spi-1.7.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 04:51:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:51:19 -0500 Subject: rpms/evince/devel evince-0.5-invisible-char.patch, NONE, 1.1 evince.spec, 1.38, 1.39 Message-ID: <200601310451.k0V4pJmO001572@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/evince/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1557 Modified Files: evince.spec Added Files: evince-0.5-invisible-char.patch Log Message: * Mon Jan 30 2006 Christopher Aillon 0.5.0-3 - Don't explicitly set the invisible char to '*' evince-0.5-invisible-char.patch: evince-password.glade | 1 - 1 files changed, 1 deletion(-) --- NEW FILE evince-0.5-invisible-char.patch --- Index: evince/data/evince-password.glade =================================================================== RCS file: /cvs/gnome/evince/data/evince-password.glade,v retrieving revision 1.3 diff -d -u -p -r1.3 evince-password.glade --- evince/data/evince-password.glade 13 Sep 2005 13:41:17 -0000 1.3 +++ evince/data/evince-password.glade 31 Jan 2006 04:34:41 -0000 @@ -153,7 +153,6 @@ 0 True - * True Index: evince.spec =================================================================== RCS file: /cvs/dist/rpms/evince/devel/evince.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- evince.spec 23 Jan 2006 15:51:42 -0000 1.38 +++ evince.spec 31 Jan 2006 04:51:17 -0000 1.39 @@ -4,7 +4,7 @@ Name: evince Version: 0.5.0 -Release: 2 +Release: 3 Summary: Document viewer License: GPL @@ -34,6 +34,7 @@ Requires(postun): scrollkeeper Requires(postun): desktop-file-utils +Patch1: evince-0.5-invisible-char.patch %description evince is a GNOME-based document viewer. @@ -41,7 +42,7 @@ %prep %setup -q - +%patch1 -p1 -b .invisible-char %build %configure --disable-scrollkeeper @@ -121,6 +122,9 @@ %changelog +* Mon Jan 30 2006 Christopher Aillon 0.5.0-3 +- Don't explicitly set the invisible char to '*' + * Mon Jan 23 2006 Kristian H??gsberg 0.5.0-2 - Spec file update from Brian Pepple (#123527): - Drop Requires for gtk2 & poppler, devel soname pulls these in. From fedora-cvs-commits at redhat.com Tue Jan 31 04:58:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:58:02 -0500 Subject: rpms/libgail-gnome/devel .cvsignore, 1.5, 1.6 libgail-gnome.spec, 1.14, 1.15 sources, 1.5, 1.6 Message-ID: <200601310458.k0V4w2EM011426@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgail-gnome/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11372 Modified Files: .cvsignore libgail-gnome.spec sources Log Message: 1.1.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgail-gnome/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Nov 2005 14:28:45 -0000 1.5 +++ .cvsignore 31 Jan 2006 04:57:59 -0000 1.6 @@ -1,2 +1,3 @@ libgail-gnome-1.1.0.tar.bz2 libgail-gnome-1.1.2.tar.bz2 +libgail-gnome-1.1.3.tar.bz2 Index: libgail-gnome.spec =================================================================== RCS file: /cvs/dist/rpms/libgail-gnome/devel/libgail-gnome.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libgail-gnome.spec 9 Dec 2005 22:41:33 -0000 1.14 +++ libgail-gnome.spec 31 Jan 2006 04:57:59 -0000 1.15 @@ -6,8 +6,8 @@ Summary: Accessibility implementation for GTK+ and GNOME libraries Name: libgail-gnome -Version: 1.1.2 -Release: 1.1 +Version: 1.1.3 +Release: 1 URL: http://developer.gnome.org/projects/gap Source0: %{name}-%{version}.tar.bz2 License: LGPL @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/* %changelog +* Mon JAn 30 2006 Matthias Clasen +- Update to 1.1.3 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgail-gnome/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Nov 2005 14:28:45 -0000 1.5 +++ sources 31 Jan 2006 04:57:59 -0000 1.6 @@ -1 +1 @@ -85c572bac6be00220dbe289baa419efa libgail-gnome-1.1.2.tar.bz2 +1d12c5375b3404f4f20b214b763e5225 libgail-gnome-1.1.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 04:58:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Mon, 30 Jan 2006 23:58:28 -0500 Subject: rpms/libgail-gnome/devel libgail-gnome.spec,1.15,1.16 Message-ID: <200601310458.k0V4wSYN011638@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/libgail-gnome/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv11589 Modified Files: libgail-gnome.spec Log Message: Fix changelog Index: libgail-gnome.spec =================================================================== RCS file: /cvs/dist/rpms/libgail-gnome/devel/libgail-gnome.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libgail-gnome.spec 31 Jan 2006 04:57:59 -0000 1.15 +++ libgail-gnome.spec 31 Jan 2006 04:58:25 -0000 1.16 @@ -75,7 +75,7 @@ %{_libdir}/pkgconfig/* %changelog -* Mon JAn 30 2006 Matthias Clasen +* Mon Jan 30 2006 Matthias Clasen - Update to 1.1.3 * Fri Dec 09 2005 Jesse Keating From fedora-cvs-commits at redhat.com Tue Jan 31 05:04:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 00:04:22 -0500 Subject: rpms/file-roller/devel .cvsignore, 1.30, 1.31 file-roller.spec, 1.44, 1.45 sources, 1.31, 1.32 Message-ID: <200601310504.k0V54MLq012829@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/file-roller/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12790 Modified Files: .cvsignore file-roller.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 17 Jan 2006 16:50:42 -0000 1.30 +++ .cvsignore 31 Jan 2006 05:04:19 -0000 1.31 @@ -16,3 +16,4 @@ file-roller-2.13.2.tar.bz2 file-roller-2.13.3.tar.bz2 file-roller-2.13.4.tar.bz2 +file-roller-2.13.90.tar.bz2 Index: file-roller.spec =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- file-roller.spec 17 Jan 2006 16:58:07 -0000 1.44 +++ file-roller.spec 31 Jan 2006 05:04:19 -0000 1.45 @@ -9,7 +9,7 @@ Summary: File Roller is a tool for viewing and creating archives. Name: file-roller -Version: 2.13.4 +Version: 2.13.90 Release: 1 License: GPL @@ -106,6 +106,9 @@ %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so %changelog +* Tue Jan 31 2006 Matthias Clasen 2.13.90-1 +- Update to 2.13.90 + * Tue Jan 16 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 17 Jan 2006 16:50:42 -0000 1.31 +++ sources 31 Jan 2006 05:04:19 -0000 1.32 @@ -1 +1 @@ -4b5f4ebe8d113d5a619cb5a69bf52728 file-roller-2.13.4.tar.bz2 +1cb49e953060cf4b1cb9836e466aca17 file-roller-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 05:07:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 00:07:54 -0500 Subject: rpms/epiphany/devel .cvsignore, 1.33, 1.34 epiphany.spec, 1.80, 1.81 sources, 1.33, 1.34 Message-ID: <200601310507.k0V57rvv013665@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/epiphany/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13627 Modified Files: .cvsignore epiphany.spec sources Log Message: 1.9.6 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 20 Jan 2006 18:35:28 -0000 1.33 +++ .cvsignore 31 Jan 2006 05:07:47 -0000 1.34 @@ -20,3 +20,4 @@ epiphany-1.9.3.1.tar.bz2 epiphany-1.9.4.tar.bz2 epiphany-1.9.5.1.tar.bz2 +epiphany-1.9.6.tar.bz2 Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- epiphany.spec 20 Jan 2006 19:32:56 -0000 1.80 +++ epiphany.spec 31 Jan 2006 05:07:47 -0000 1.81 @@ -9,7 +9,7 @@ Summary: GNOME web browser based on the Mozilla rendering engine Name: epiphany -Version: 1.9.5.1 +Version: 1.9.6 Release: 1 License: GPL Group: Applications/Internet @@ -124,6 +124,9 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog +* Tue JAn 31 2006 Matthias Clasen 1.9.6-1 +- Update to 1.9.6 + * Fri Jan 20 2006 Matthias Clasen 1.9.5.1-1 - Update to 1.9.5.1 Index: sources =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/sources,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sources 20 Jan 2006 18:35:28 -0000 1.33 +++ sources 31 Jan 2006 05:07:48 -0000 1.34 @@ -1 +1 @@ -c3552c387129d44d1aa2cce507d15f21 epiphany-1.9.5.1.tar.bz2 +097278ad79deaa017b8c026b5c8a383f epiphany-1.9.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 05:08:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 00:08:43 -0500 Subject: rpms/file-roller/devel file-roller.spec,1.45,1.46 Message-ID: <200601310508.k0V58hFx013795@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/file-roller/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13767 Modified Files: file-roller.spec Log Message: Fix file lists Index: file-roller.spec =================================================================== RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- file-roller.spec 31 Jan 2006 05:04:19 -0000 1.45 +++ file-roller.spec 31 Jan 2006 05:08:40 -0000 1.46 @@ -101,7 +101,6 @@ %{_datadir}/pixmaps/* %{_datadir}/omf %{_datadir}/applications -%{_datadir}/mime-info/* %{_sysconfdir}/gconf/schemas %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so From fedora-cvs-commits at redhat.com Tue Jan 31 05:17:48 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 00:17:48 -0500 Subject: rpms/epiphany/devel epiphany.spec,1.81,1.82 Message-ID: <200601310517.k0V5HmcO017324@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/epiphany/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16895 Modified Files: epiphany.spec Log Message: 1.9.6 Index: epiphany.spec =================================================================== RCS file: /cvs/dist/rpms/epiphany/devel/epiphany.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- epiphany.spec 31 Jan 2006 05:07:47 -0000 1.81 +++ epiphany.spec 31 Jan 2006 05:17:39 -0000 1.82 @@ -124,7 +124,7 @@ %{_datadir}/pygtk/2.0/defs/epiphany.defs %changelog -* Tue JAn 31 2006 Matthias Clasen 1.9.6-1 +* Tue Jan 31 2006 Matthias Clasen 1.9.6-1 - Update to 1.9.6 * Fri Jan 20 2006 Matthias Clasen 1.9.5.1-1 From fedora-cvs-commits at redhat.com Tue Jan 31 05:20:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 00:20:55 -0500 Subject: rpms/yelp/devel .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 yelp.spec, 1.48, 1.49 Message-ID: <200601310520.k0V5KtfI022059@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/yelp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv21789 Modified Files: .cvsignore sources yelp.spec Log Message: 2.13.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/yelp/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 19 Jan 2006 18:13:32 -0000 1.21 +++ .cvsignore 31 Jan 2006 05:20:50 -0000 1.22 @@ -10,3 +10,4 @@ yelp-2.13.1.tar.bz2 yelp-2.13.2.tar.bz2 yelp-2.13.3.tar.bz2 +yelp-2.13.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/yelp/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 19 Jan 2006 18:13:32 -0000 1.21 +++ sources 31 Jan 2006 05:20:51 -0000 1.22 @@ -1 +1 @@ -402ec144f9de53c16a5ecce137048a70 yelp-2.13.3.tar.bz2 +5b588e1e21f2f5c1e0333c2a7405dea6 yelp-2.13.4.tar.bz2 Index: yelp.spec =================================================================== RCS file: /cvs/dist/rpms/yelp/devel/yelp.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- yelp.spec 19 Jan 2006 18:24:00 -0000 1.48 +++ yelp.spec 31 Jan 2006 05:20:51 -0000 1.49 @@ -12,7 +12,7 @@ Summary: A system documentation reader from the Gnome project. Name: yelp -Version: 2.13.3 +Version: 2.13.4 Release: 1 Source: %{name}-%{version}.tar.bz2 # http://bugzilla.gnome.org/show_bug.cgi?id=319096 @@ -117,6 +117,9 @@ %{_datadir}/yelp %changelog +* Tue Jan 31 2006 Matthias Clasen - 2.13.4-1 +- Update to 2.13.4 + * Thu Jan 19 2006 Matthias Clasen - 2.13.3-1 - Update to 2.13.3 - enable search From fedora-cvs-commits at redhat.com Tue Jan 31 05:23:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 00:23:50 -0500 Subject: rpms/eel2/devel .cvsignore, 1.28, 1.29 eel2.spec, 1.34, 1.35 sources, 1.28, 1.29 Message-ID: <200601310523.k0V5No8j028560@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/eel2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28514 Modified Files: .cvsignore eel2.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/.cvsignore,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- .cvsignore 17 Jan 2006 02:29:46 -0000 1.28 +++ .cvsignore 31 Jan 2006 05:23:47 -0000 1.29 @@ -12,3 +12,4 @@ eel-2.13.2.tar.bz2 eel-2.13.3.tar.bz2 eel-2.13.4.tar.bz2 +eel-2.13.90.tar.bz2 Index: eel2.spec =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/eel2.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- eel2.spec 17 Jan 2006 02:30:34 -0000 1.34 +++ eel2.spec 31 Jan 2006 05:23:47 -0000 1.35 @@ -15,7 +15,7 @@ Name: eel2 Summary: Eazel Extensions Library. -Version: 2.13.4 +Version: 2.13.90 Release: 1 License: LGPL Group: System Environment/Libraries @@ -105,6 +105,9 @@ %{_includedir}/eel-2 %changelog +* Tue Jan 31 2006 Matthias Clasen 2.13.90-1 +- Update to 2.13.90 + * Mon Jan 16 2006 Matthias Clasen 2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/eel2/devel/sources,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sources 17 Jan 2006 02:29:46 -0000 1.28 +++ sources 31 Jan 2006 05:23:47 -0000 1.29 @@ -1 +1 @@ -276e71d00ed3db09eb4a29d15fad2edb eel-2.13.4.tar.bz2 +a719ac164e025fed040af40ec8d01e95 eel-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 05:29:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 00:29:41 -0500 Subject: rpms/nautilus/devel .cvsignore, 1.33, 1.34 nautilus.spec, 1.88, 1.89 sources, 1.36, 1.37 Message-ID: <200601310529.k0V5Tfs9030969@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/nautilus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30902 Modified Files: .cvsignore nautilus.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 17 Jan 2006 16:15:38 -0000 1.33 +++ .cvsignore 31 Jan 2006 05:29:38 -0000 1.34 @@ -12,3 +12,4 @@ nautilus-2.13.2.tar.bz2 nautilus-2.13.3.tar.bz2 nautilus-2.13.4.tar.bz2 +nautilus-2.13.90.tar.bz2 Index: nautilus.spec =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/nautilus.spec,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- nautilus.spec 17 Jan 2006 16:15:38 -0000 1.88 +++ nautilus.spec 31 Jan 2006 05:29:38 -0000 1.89 @@ -17,7 +17,7 @@ Name: nautilus Summary: Nautilus is a file manager for GNOME. -Version: 2.13.4 +Version: 2.13.90 Release: 1 License: GPL Group: User Interface/Desktops @@ -173,6 +173,9 @@ %{_includedir}/nautilus %changelog +* Tue Jan 31 2006 Matthias Clasen - 2.13.90-1 +- Update to 2.13.90 + * Tue Jan 17 2006 Matthias Clasen - 2.13.4-1 - Update to 2.13.4 Index: sources =================================================================== RCS file: /cvs/dist/rpms/nautilus/devel/sources,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sources 17 Jan 2006 16:15:38 -0000 1.36 +++ sources 31 Jan 2006 05:29:38 -0000 1.37 @@ -1 +1 @@ -bdc4802e6f3545e7be4b93f5c35d02e7 nautilus-2.13.4.tar.bz2 +914a761043497e8250126bb84a5bfeec nautilus-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 05:34:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 00:34:50 -0500 Subject: rpms/festival/devel festival.spec,1.18,1.19 Message-ID: <200601310534.k0V5YoRW032138@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/festival/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32071 Modified Files: festival.spec Log Message: - get gnopernicus working again. Patch from Fernando Herrera (bug 178312) - add a lot of compiler flags and random cruft to get festival to build with gcc 4.1 Index: festival.spec =================================================================== RCS file: /cvs/dist/rpms/festival/devel/festival.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- festival.spec 23 Jan 2006 02:17:38 -0000 1.18 +++ festival.spec 31 Jan 2006 05:34:48 -0000 1.19 @@ -142,14 +142,14 @@ pushd speech_tools %configure -make CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -Wno-error" CFLAGS="$RPM_OPT_FLAGS -fno-string-aliasing -Wno-error" +make CXXFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend" CFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -O0" #g++ -shared -L../../../speech_tools/lib -lestools -lestbase -leststring -ltermcap -Wl,-soname -Wl,libFestival.so.1 -Wl,--rpath -Wl,/usr/lib -o ../libFestival.so.1.4.1 * popd %configure -FTLIBDIR=%{_datadir}/festival make +FTLIBDIR=%{_datadir}/festival make CXXFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend" CFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -O0" mkdir DATA.TMP cd DATA.TMP @@ -166,7 +166,8 @@ tar xzf %{SOURCE213} cd festival/lib/dicts/cmu -make +make CXXFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend" CFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -O0" + cd ../../.. %install @@ -292,8 +293,10 @@ %changelog * Sun Jan 22 2006 Ray Strode - 1.95-5 -- get gnopernicus again. Patch from +- get gnopernicus working again. Patch from Fernando Herrera (bug 178312) +- add a lot of compiler flags and random cruft to get + festival to build with gcc 4.1 * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 31 05:36:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 00:36:15 -0500 Subject: rpms/gnome-applets/devel .cvsignore, 1.33, 1.34 gnome-applets.spec, 1.101, 1.102 sources, 1.34, 1.35 Message-ID: <200601310536.k0V5aFhG032547@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32515 Modified Files: .cvsignore gnome-applets.spec sources Log Message: 2.13.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/.cvsignore,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- .cvsignore 17 Jan 2006 05:23:27 -0000 1.33 +++ .cvsignore 31 Jan 2006 05:36:12 -0000 1.34 @@ -5,3 +5,4 @@ gnome-applets-2.12.2.tar.bz2 gnome-applets-2.13.1.tar.bz2 gnome-applets-2.13.2.tar.bz2 +gnome-applets-2.13.3.tar.bz2 Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- gnome-applets.spec 18 Jan 2006 13:47:01 -0000 1.101 +++ gnome-applets.spec 31 Jan 2006 05:36:12 -0000 1.102 @@ -17,7 +17,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets -Version: 2.13.2 +Version: 2.13.3 Release: 2 Epoch: 1 License: GPL @@ -170,6 +170,9 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Tue Jan 31 2006 Matthias Clasen 2.13.3-1 +- Update to 2.13.3 + * Wed Jan 18 2006 Matthias Clasen 2.13.2-2 - BuildRequire gnome-doc-utils Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/sources,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- sources 17 Jan 2006 05:23:28 -0000 1.34 +++ sources 31 Jan 2006 05:36:12 -0000 1.35 @@ -1,2 +1,2 @@ ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2 -fd89a1eb8c1384084f29b0da6acdecb3 gnome-applets-2.13.2.tar.bz2 +a21a38a13cafbf4bcd841210f3dbc228 gnome-applets-2.13.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 05:49:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 00:49:15 -0500 Subject: rpms/festival/devel festival.spec,1.19,1.20 Message-ID: <200601310549.k0V5nFJx017653@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/festival/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17559 Modified Files: festival.spec Log Message: - get gnopernicus working again. Patch from Fernando Herrera (bug 178312) - add a lot of compiler flags and random cruft to get festival to build with gcc 4.1 Index: festival.spec =================================================================== RCS file: /cvs/dist/rpms/festival/devel/festival.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- festival.spec 31 Jan 2006 05:34:48 -0000 1.19 +++ festival.spec 31 Jan 2006 05:49:12 -0000 1.20 @@ -142,14 +142,14 @@ pushd speech_tools %configure -make CXXFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend" CFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -O0" +make CXXFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -fPIC" CFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -O0 -fPIC" #g++ -shared -L../../../speech_tools/lib -lestools -lestbase -leststring -ltermcap -Wl,-soname -Wl,libFestival.so.1 -Wl,--rpath -Wl,/usr/lib -o ../libFestival.so.1.4.1 * popd %configure -FTLIBDIR=%{_datadir}/festival make CXXFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend" CFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -O0" +FTLIBDIR=%{_datadir}/festival make CXXFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -fPIC" CFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -O0 -fPIC" mkdir DATA.TMP cd DATA.TMP @@ -166,7 +166,7 @@ tar xzf %{SOURCE213} cd festival/lib/dicts/cmu -make CXXFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend" CFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -O0" +make CXXFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -fPIC" CFLAGS="-ffriend-injection -fpermissive -Wno-deprecated -Wno-non-template-friend -O0 -fPIC" cd ../../.. From fedora-cvs-commits at redhat.com Tue Jan 31 06:54:35 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 01:54:35 -0500 Subject: rpms/krb5-auth-dialog/devel .cvsignore, 1.5, 1.6 krb5-auth-dialog.spec, 1.15, 1.16 sources, 1.5, 1.6 Message-ID: <200601310654.k0V6sZwp028789@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/krb5-auth-dialog/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28750 Modified Files: .cvsignore krb5-auth-dialog.spec sources Log Message: * Tue Jan 31 2006 Christopher Aillon 0.6-1 - Update to 0.6, adding an autostart file Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Nov 2005 19:59:11 -0000 1.5 +++ .cvsignore 31 Jan 2006 06:54:33 -0000 1.6 @@ -2,3 +2,4 @@ krb5-auth-dialog-0.3.tar.gz krb5-auth-dialog-0.4.tar.gz krb5-auth-dialog-0.5.tar.gz +krb5-auth-dialog-0.6.tar.bz2 Index: krb5-auth-dialog.spec =================================================================== RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- krb5-auth-dialog.spec 10 Dec 2005 16:38:45 -0000 1.15 +++ krb5-auth-dialog.spec 31 Jan 2006 06:54:33 -0000 1.16 @@ -5,12 +5,12 @@ Summary: Kerberos 5 authentication dialog Name: krb5-auth-dialog -Version: 0.5 -Release: 2.1 +Version: 0.6 +Release: 1 License: GPL Group: User Interface/X URL: http://www.redhat.com/ -Source0: %{name}-%{version}.tar.gz +Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libgnomeui-devel >= %{libgnomeui_version} BuildRequires: krb5-devel >= %{krb5_version} @@ -45,9 +45,13 @@ %{_bindir}/krb5-auth-dialog %{_datadir}/krb5-auth-dialog/ %{_mandir}/man1/* +%{_sysconfdir}/xdg/autostart/krb5-auth-dialog.desktop %changelog +* Tue Jan 31 2006 Christopher Aillon 0.6-1 +- Update to 0.6, adding an autostart file + * Fri Dec 09 2005 Jesse Keating - 0.5-2.1 - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/krb5-auth-dialog/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Nov 2005 19:59:11 -0000 1.5 +++ sources 31 Jan 2006 06:54:33 -0000 1.6 @@ -1 +1 @@ -3f8363c80bd189862131544206bc81ce krb5-auth-dialog-0.5.tar.gz +08fc3d903c833ac9617f722d3b440459 krb5-auth-dialog-0.6.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 09:07:26 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 04:07:26 -0500 Subject: rpms/sqlite/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 sqlite.spec, 1.11, 1.12 Message-ID: <200601310907.k0V97QMl017866@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/sqlite/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17830 Modified Files: .cvsignore sources sqlite.spec Log Message: * Tue Jan 31 2006 Christopher Aillon - 3.3.2-1 - Update to 3.3.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sqlite/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 24 Jan 2006 20:28:46 -0000 1.7 +++ .cvsignore 31 Jan 2006 09:07:24 -0000 1.8 @@ -3,3 +3,4 @@ sqlite-3.2.6.tar.gz sqlite-3.2.7.tar.gz sqlite-3.2.8.tar.gz +sqlite-3.3.2.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/sqlite/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 24 Jan 2006 20:28:46 -0000 1.7 +++ sources 31 Jan 2006 09:07:24 -0000 1.8 @@ -1 +1 @@ -9f2c014aaa46565b8163e047166a5686 sqlite-3.2.8.tar.gz +420f442310dd6e90a7a1f8befcf0fb4e sqlite-3.3.2.tar.gz Index: sqlite.spec =================================================================== RCS file: /cvs/dist/rpms/sqlite/devel/sqlite.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sqlite.spec 24 Jan 2006 20:28:22 -0000 1.11 +++ sqlite.spec 31 Jan 2006 09:07:24 -0000 1.12 @@ -3,7 +3,7 @@ Summary: Library that implements an embeddable SQL database engine Name: sqlite -Version: 3.2.8 +Version: 3.3.2 Release: 1 License: Public Domain Group: Applications/Databases @@ -96,6 +96,9 @@ %endif %changelog +* Tue Jan 31 2006 Christopher Aillon - 3.3.2-1 +- Update to 3.3.2 + * Tue Jan 24 2006 Paul Nasrat - 3.2.8-1 - Add --enable-threadsafe (Nicholas Miell) - Update to 3.2.8 From fedora-cvs-commits at redhat.com Tue Jan 31 09:47:52 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 04:47:52 -0500 Subject: rpms/ncurses/devel ncurses.spec, 1.55, 1.56 ncurses-5.5-chtypeaslong.patch, 1.2, NONE ncurses-5.5-chtypeaslong2.patch, 1.1, NONE ncurses-5.5-chtypeaslong3.patch, 1.1, NONE ncurses-5.5-chtypeaslongint.patch, 1.1, NONE Message-ID: <200601310947.k0V9lqJL025370@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/ncurses/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25187 Modified Files: ncurses.spec Removed Files: ncurses-5.5-chtypeaslong.patch ncurses-5.5-chtypeaslong2.patch ncurses-5.5-chtypeaslong3.patch ncurses-5.5-chtypeaslongint.patch Log Message: * Fri Jan 31 2006 Jindrich Novy 5.5-18 - add --with-chtype=long to avoid type clashes on x86_64 (#178824) - spec cleanup Index: ncurses.spec =================================================================== RCS file: /cvs/dist/rpms/ncurses/devel/ncurses.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- ncurses.spec 27 Jan 2006 16:35:57 -0000 1.55 +++ ncurses.spec 31 Jan 2006 09:47:49 -0000 1.56 @@ -2,7 +2,7 @@ Name: ncurses Version: 5.5 %define includedirw %{_includedir}/ncursesw -Release: 17 +Release: 18 License: distributable Group: System Environment/Libraries URL: http://dickey.his.com/ncurses/ncurses.html @@ -14,7 +14,6 @@ Patch1: ncurses-5.4-xterm-kbs.patch Patch2: ncurses-5.4-filter.patch Patch3: ncurses-5.4-endwinfilter.patch -Patch4: ncurses-5.5-chtypeaslong3.patch BuildRequires: sharutils BuildRoot: %{_tmppath}/%{name}-root @@ -52,7 +51,6 @@ %patch1 -p1 -b .xterm-kbs %patch2 -p1 -b .filter %patch3 -p1 -b .endwinfilter -%patch4 -p1 -b .chtypeaslong3 %build CFLAGS="%{optflags} -DPURE_TERMINFO -DSVR4_CURSES" @@ -67,14 +65,16 @@ %configure --with-shared --with-cxx --without-ada --with-ospeed=unsigned \ $WITH_GPM --enable-sigwinch --enable-hard-tabs --enable-xmc-glitch \ --enable-colorfgbg $WITHOUT_XTERM_NEW \ - --with-install-prefix=${RPM_BUILD_ROOT} + --with-install-prefix=${RPM_BUILD_ROOT} \ + --with-chtype=long make cd ../widec ln -s ../configure . %configure --with-shared --with-cxx --without-ada --with-ospeed=unsigned \ $WITH_GPM --enable-sigwinch --enable-hard-tabs --enable-xmc-glitch \ --enable-colorfgbg $WITHOUT_XTERM_NEW --enable-widec \ - --with-install-prefix=${RPM_BUILD_ROOT} + --with-install-prefix=${RPM_BUILD_ROOT} \ + --with-chtype=long make cd .. @@ -165,22 +165,11 @@ rm -rf ${RPM_BUILD_ROOT} %changelog -* Fri Jan 27 2006 Petr Raszyk 5.5-17 -- Rebuild. - -* Fri Jan 27 2006 Petr Raszyk 5.5-16 -- Rebuild. - -* Fri Jan 27 2006 Petr Raszyk 5.5-15 -- Rebuild. +* Fri Jan 31 2006 Jindrich Novy 5.5-18 +- add --with-chtype=long to avoid type clashes on x86_64 (#178824) +- spec cleanup -* Fri Jan 27 2006 Petr Raszyk 5.5-14 -- Rebuild. - -* Fri Jan 27 2006 Petr Raszyk 5.5-13 -- Rebuild. - -* Fri Jan 27 2006 Petr Raszyk 5.5-12 +* Fri Jan 27 2006 Petr Raszyk 5.5-17 - Rebuild. * Fri Jan 27 2006 Petr Raszyk 5.5-11 @@ -198,24 +187,6 @@ * Thu Dec 22 2005 Petr Raszyk 5.5-8 - Strip *.so libs. -* Thu Dec 22 2005 Petr Raszyk 5.5-7 -- Strip *.so libs. - -* Thu Dec 22 2005 Petr Raszyk 5.5-6 -- Strip *.so libs. - -* Thu Dec 22 2005 Petr Raszyk 5.5-5 -- Strip *.so libs. - -* Thu Dec 22 2005 Petr Raszyk 5.5-4 -- Strip *.so libs. - -* Wed Dec 21 2005 Petr Raszyk 5.5-3 -- Rebuild. - -* Wed Dec 21 2005 Petr Raszyk 5.5-2 -- Rebuild. - * Wed Dec 21 2005 Petr Raszyk 5.5-1 - Upgrade to ncurses 5.5 --- ncurses-5.5-chtypeaslong.patch DELETED --- --- ncurses-5.5-chtypeaslong2.patch DELETED --- --- ncurses-5.5-chtypeaslong3.patch DELETED --- --- ncurses-5.5-chtypeaslongint.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 31 10:15:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 05:15:02 -0500 Subject: rpms/openoffice.org/devel .cvsignore, 1.94, 1.95 openoffice.org.spec, 1.612, 1.613 sources, 1.150, 1.151 Message-ID: <200601311015.k0VAF2ZB002786@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv2746 Modified Files: .cvsignore openoffice.org.spec sources Log Message: rh#177205# add some templates, including a fedora themed presentation Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/.cvsignore,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- .cvsignore 15 Dec 2005 14:00:48 -0000 1.94 +++ .cvsignore 31 Jan 2006 10:15:00 -0000 1.95 @@ -153,3 +153,6 @@ SRC680_m145.tar.bz2 evolocal.odb OOA680_m1.tar.bz2 +documentation.openoffice.org-templates.tar.gz +redhat-templates.tar.gz +Tigert-templates.tar.gz Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.612 retrieving revision 1.613 diff -u -r1.612 -r1.613 --- openoffice.org.spec 30 Jan 2006 15:01:18 -0000 1.612 +++ openoffice.org.spec 31 Jan 2006 10:15:00 -0000 1.613 @@ -135,6 +135,9 @@ Source6: GSI_ga.sdf Source7: gcj-sed.sh Source8: evolocal.odb +Source9: Tigert-templates.tar.gz +Source10: documentation.openoffice.org-templates.tar.gz +Source11: redhat-templates.tar.gz BuildRequires: tcsh, perl, sed, zip, bzip2, unzip, tar, findutils BuildRequires: autoconf, make >= 3.79.1, ant, flex, bison, perl-Compress-Zlib BuildRequires: gcc >= 3.4.3, gcc-c++ >= 3.4.3, binutils, perl-Archive-Zip @@ -237,8 +240,6 @@ The OpenOffice.org team hopes you enjoy working with OpenOffice.org! -Note: Non-.vor templates covered under the GPL license. - %package core Summary: core modules for %{name} Group: Applications/Productivity @@ -1098,6 +1099,11 @@ done popd +#add in some templates +tar xzf %{SOURCE9} -C $RPM_BUILD_ROOT/%{instdir}/share +tar xzf %{SOURCE10} -C $RPM_BUILD_ROOT/%{instdir}/share +tar xzf %{SOURCE11} -C $RPM_BUILD_ROOT/%{instdir}/share + #skip the swahelli for now rm -rf $RPM_BUILD_ROOT/%{instdir}/share/dict/ooo/*sw_TZ* @@ -3382,7 +3388,7 @@ - missing %defattr(-,root,root) - rh#179256# if java fails (i.e. was configured to use libgcj.so.6) reconfigure to pick up libgcj.so.7 - +- rh#177205# add some templates, including a fedora themed presentation * Thu Jan 26 2006 Caolan McNamara - 1:2.0.1.1-8 - rh#178971# defer exec mem until bridge code Index: sources =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/sources,v retrieving revision 1.150 retrieving revision 1.151 diff -u -r1.150 -r1.151 --- sources 17 Jan 2006 11:44:22 -0000 1.150 +++ sources 31 Jan 2006 10:15:00 -0000 1.151 @@ -7,3 +7,6 @@ 16cb79cb018c6311e9797e85bd2461b2 evolocal.odb 374c6a2d4d846acf171d0fd212d4d7af OOA680_m1.tar.bz2 9296ac8fa8e4f85cfdacfdaeeac6547f openoffice.org-myspell-contrib.tar.gz +b54bcc9fdb23389e961b281508d9110c documentation.openoffice.org-templates.tar.gz +8bc013e30e432ce3927e402e9aaa8c9f redhat-templates.tar.gz +1b4d9a03ebb4c864015620153afb77c6 Tigert-templates.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 31 10:45:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 05:45:45 -0500 Subject: rpms/expat/devel expat.spec,1.19,1.20 Message-ID: <200601311045.k0VAjjrY015771@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/expat/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15282 Modified Files: expat.spec Log Message: * Tue Jan 31 2006 Joe Orton 1.95.8-8 - restore .la file for apr-util Index: expat.spec =================================================================== RCS file: /cvs/dist/rpms/expat/devel/expat.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- expat.spec 30 Jan 2006 16:16:11 -0000 1.19 +++ expat.spec 31 Jan 2006 10:45:41 -0000 1.20 @@ -1,7 +1,7 @@ Summary: A library for parsing XML. Name: expat Version: 1.95.8 -Release: 7 +Release: 8 Group: System Environment/Libraries Source: http://download.sourceforge.net/expat/expat-%{version}.tar.gz URL: http://www.libexpat.org/ @@ -45,9 +45,9 @@ ln -s ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libexpat.so -rm -f $RPM_BUILD_ROOT/%{_lib}/*.la $RPM_BUILD_ROOT/%{_lib}/*.so +rm -f $RPM_BUILD_ROOT/%{_lib}/*.so -mv $RPM_BUILD_ROOT/%{_lib}/*.a $RPM_BUILD_ROOT%{_libdir}/ +mv $RPM_BUILD_ROOT/%{_lib}/*.*a $RPM_BUILD_ROOT%{_libdir}/ %clean rm -rf ${RPM_BUILD_ROOT} @@ -66,10 +66,13 @@ %defattr(-,root,root) %doc Changes doc examples %{_libdir}/lib*.so -%{_libdir}/lib*.a +%{_libdir}/lib*.*a %{_includedir}/*.h %changelog +* Tue Jan 31 2006 Joe Orton 1.95.8-8 +- restore .la file for apr-util + * Mon Jan 30 2006 Joe Orton 1.95.8-7 - move library to /lib (#178743) - omit .la file (#170031) From fedora-cvs-commits at redhat.com Tue Jan 31 11:02:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 06:02:34 -0500 Subject: rpms/neon/devel neon-0.25.5.tar.gz.asc, NONE, 1.1 .cvsignore, 1.7, 1.8 Makefile, 1.2, 1.3 neon.spec, 1.20, 1.21 sources, 1.7, 1.8 upstream, 1.1, 1.2 Message-ID: <200601311102.k0VB2YMm003168@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/neon/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3132 Modified Files: .cvsignore Makefile neon.spec sources upstream Added Files: neon-0.25.5.tar.gz.asc Log Message: * Tue Jan 31 2006 Joe Orton 0.25.5-1 - update to 0.25.5 --- NEW FILE neon-0.25.5.tar.gz.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQBD0SYeR/aWnQ5EzwwRAoOBAJ4ooYlHPk7mx9aF8K2ZqdTl3aMkqACgwqBS BQFhzqi8RDdrFGZ5mXY7ezQ= =hxRE -----END PGP SIGNATURE----- Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/neon/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 9 Sep 2004 09:07:07 -0000 1.7 +++ .cvsignore 31 Jan 2006 11:02:15 -0000 1.8 @@ -1 +1,2 @@ -neon-0.24.7.tar.gz +neon-0.25.5.tar.gz +i386 Index: neon.spec =================================================================== RCS file: /cvs/dist/rpms/neon/devel/neon.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- neon.spec 9 Dec 2005 22:42:19 -0000 1.20 +++ neon.spec 31 Jan 2006 11:02:17 -0000 1.21 @@ -1,15 +1,12 @@ Summary: An HTTP and WebDAV client library Name: neon -Version: 0.24.7 -Release: 10.1 +Version: 0.25.5 +Release: 1 License: LGPL Group: Applications/Publishing Prefix: %{_prefix} URL: http://www.webdav.org/neon/ Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz -Patch0: neon-0.23.9-config.patch -Patch1: neon-0.24.7-gssapi.patch -Patch2: neon-0.24.7-min.patch BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-root @@ -33,13 +30,9 @@ %prep %setup -q -%patch0 -p1 -b .config -%patch1 -p1 -b .gssapi -%patch2 -p1 -b .min %build -export CFLAGS="-Wall $RPM_OPT_FLAGS" -%configure --with-ssl --with-expat --enable-shared +%configure --with-ssl --with-expat --enable-shared --enable-warnings make %{?_smp_mflags} %install @@ -81,6 +74,9 @@ %{_libdir}/*.so %changelog +* Tue Jan 31 2006 Joe Orton 0.25.5-1 +- update to 0.25.5 + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/neon/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 9 Sep 2004 09:07:07 -0000 1.7 +++ sources 31 Jan 2006 11:02:18 -0000 1.8 @@ -1 +1 @@ -5108bcbe41de4afe2e19cc58500fb9f2 neon-0.24.7.tar.gz +b5fdb71dd407f0a3de0f267d27c9ab17 neon-0.25.5.tar.gz Index: upstream =================================================================== RCS file: /cvs/dist/rpms/neon/devel/upstream,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- upstream 28 Nov 2005 10:46:22 -0000 1.1 +++ upstream 31 Jan 2006 11:02:32 -0000 1.2 @@ -1 +1 @@ -neon-0.24.7.tar.gz +neon-0.25.5.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 31 11:08:12 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 06:08:12 -0500 Subject: rpms/cadaver/devel cadaver.spec,1.19,1.20 Message-ID: <200601311108.k0VB8CYs004199@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/cadaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4167 Modified Files: cadaver.spec Log Message: * Tue Jan 31 2006 Joe Orton 0.22.3-2 - rebuild for neon 0.25.x Index: cadaver.spec =================================================================== RCS file: /cvs/dist/rpms/cadaver/devel/cadaver.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- cadaver.spec 6 Jan 2006 08:37:17 -0000 1.19 +++ cadaver.spec 31 Jan 2006 11:08:08 -0000 1.20 @@ -1,6 +1,6 @@ Name: cadaver Version: 0.22.3 -Release: 1 +Release: 2 Summary: Command-line WebDAV client License: GPL Group: Applications/Internet @@ -38,6 +38,9 @@ %{_mandir}/*/* %changelog +* Tue Jan 31 2006 Joe Orton 0.22.3-2 +- rebuild for neon 0.25.x + * Fri Jan 6 2006 Joe Orton 0.22.3-1 - update to 0.22.3 From fedora-cvs-commits at redhat.com Tue Jan 31 11:09:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 06:09:34 -0500 Subject: rpms/subversion/devel subversion.spec,1.66,1.67 Message-ID: <200601311109.k0VB9Ygm004855@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/subversion/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv4823 Modified Files: subversion.spec Log Message: * Tue Jan 31 2006 Joe Orton 1.3.0-3 - rebuild for neon 0.25 Index: subversion.spec =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- subversion.spec 4 Jan 2006 15:05:24 -0000 1.66 +++ subversion.spec 31 Jan 2006 11:09:31 -0000 1.67 @@ -16,7 +16,7 @@ Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.3.0 -Release: 2 +Release: 3 License: BSD Group: Development/Tools URL: http://subversion.tigris.org/ @@ -250,6 +250,9 @@ %endif %changelog +* Tue Jan 31 2006 Joe Orton 1.3.0-3 +- rebuild for neon 0.25 + * Wed Jan 4 2006 Joe Orton 1.3.0-2 - update to 1.3.0 (#176833) - update to psvn.el r17921 Stefan Reichoer From fedora-cvs-commits at redhat.com Tue Jan 31 11:46:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 06:46:16 -0500 Subject: rpms/subversion/devel subversion-1.3.0-neonver.patch, NONE, 1.1 subversion.spec, 1.67, 1.68 Message-ID: <200601311146.k0VBkGQV007513@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/subversion/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5685 Modified Files: subversion.spec Added Files: subversion-1.3.0-neonver.patch Log Message: - fix to build with neon 0.25.5 subversion-1.3.0-neonver.patch: configure.in | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE subversion-1.3.0-neonver.patch --- --- subversion-1.3.0/configure.in.neonver +++ subversion-1.3.0/configure.in @@ -227,7 +227,7 @@ # Either a space-separated list of allowable Neon versions, or "any" to # mean allow anything. -NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4" +NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.25.6 0.25.7" NEON_LATEST_WORKING_VER=0.25.4 NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz" dnl You can skip the neon version check only if you know what you are doing Index: subversion.spec =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- subversion.spec 31 Jan 2006 11:09:31 -0000 1.67 +++ subversion.spec 31 Jan 2006 11:46:13 -0000 1.68 @@ -24,6 +24,7 @@ Source1: subversion.conf Source3: filter-requires.sh Source4: http://www.xsteve.at/prg/emacs/psvn.el +Patch1: subversion-1.3.0-neonver.patch Patch2: subversion-0.20.1-deplibs.patch Patch3: subversion-0.31.0-rpath.patch Patch6: subversion-1.0.3-pie.patch @@ -101,6 +102,7 @@ %prep %setup -q +%patch1 -p1 -b .neonver %patch2 -p1 -b .deplibs %patch3 -p1 -b .rpath %patch6 -p1 -b .pie From fedora-cvs-commits at redhat.com Tue Jan 31 11:48:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 06:48:11 -0500 Subject: rpms/eclipse/devel eclipse.spec,1.232,1.233 Message-ID: <200601311148.k0VBmBjO012681@cvs.devel.redhat.com> Author: karsten Update of /cvs/dist/rpms/eclipse/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12644 Modified Files: eclipse.spec Log Message: Index: eclipse.spec =================================================================== RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v retrieving revision 1.232 retrieving revision 1.233 diff -u -r1.232 -r1.233 --- eclipse.spec 25 Jan 2006 20:48:30 -0000 1.232 +++ eclipse.spec 31 Jan 2006 11:48:09 -0000 1.233 @@ -134,6 +134,7 @@ BuildRequires: nspr-devel BuildRequires: libXtst-devel BuildRequires: cairo >= 1.0 +BuildRequires: unzip %if %{gcj_support} BuildRequires: gcc-java >= 4.0.2 BuildRequires: java-gcj-compat-devel >= 1.0.43 @@ -1264,6 +1265,9 @@ %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1 %changelog +* Tue Jan 31 2006 Karsten Hopp +- BuildRequire: unzip + * Wed Jan 25 2006 Andrew Overholt 3.1.1-1jpp_16fc - Rebuild against latest gcc to see if this fixes rh#178156. From fedora-cvs-commits at redhat.com Tue Jan 31 12:10:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 07:10:43 -0500 Subject: rpms/openoffice.org/devel openoffice.org.spec,1.613,1.614 Message-ID: <200601311210.k0VCAhBL020367@cvs.devel.redhat.com> Author: caolanm Update of /cvs/dist/rpms/openoffice.org/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20340 Modified Files: openoffice.org.spec Log Message: neon rebuild Index: openoffice.org.spec =================================================================== RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v retrieving revision 1.613 retrieving revision 1.614 diff -u -r1.613 -r1.614 --- openoffice.org.spec 31 Jan 2006 10:15:00 -0000 1.613 +++ openoffice.org.spec 31 Jan 2006 12:10:40 -0000 1.614 @@ -3384,7 +3384,7 @@ %changelog * Fri Jan 27 2006 Caolan McNamara - 1:2.0.1.1-9 -- add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for future neon 0.25.X +- add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for neon 0.25.X - missing %defattr(-,root,root) - rh#179256# if java fails (i.e. was configured to use libgcj.so.6) reconfigure to pick up libgcj.so.7 From fedora-cvs-commits at redhat.com Tue Jan 31 12:36:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 07:36:17 -0500 Subject: rpms/vnc/devel .cvsignore, 1.16, 1.17 sources, 1.17, 1.18 vnc-modular-xorg.patch, 1.8, 1.9 vnc.spec, 1.125, 1.126 Message-ID: <200601311236.k0VCaHVq031297@cvs.devel.redhat.com> Author: twaugh Update of /cvs/dist/rpms/vnc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31282 Modified Files: .cvsignore sources vnc-modular-xorg.patch vnc.spec Log Message: * Tue Jan 31 2006 Tim Waugh 4.1.1-34 - Updated xorg-x11-server to 1.0.1-1. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 21 Dec 2005 15:56:26 -0000 1.16 +++ .cvsignore 31 Jan 2006 12:36:12 -0000 1.17 @@ -9,3 +9,4 @@ vnc-4_1-javasrc.tar.gz xorg-x11-6.8.2-13.tar.bz2 xorg-server-1.0.0-2.tar.bz2 +xorg-server-1.0.1-1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 21 Dec 2005 15:56:26 -0000 1.17 +++ sources 31 Jan 2006 12:36:12 -0000 1.18 @@ -1,3 +1,3 @@ 2ddf091a8be9f03bb991a553427d7b89 vnc-4_1_1-unixsrc.tar.gz 9407ce1f215aefca77bef12670745280 vnc-4_1-javasrc.tar.gz -0eb4eaba4881b18a722beb1ab697bc0f xorg-server-1.0.0-2.tar.bz2 +fff203a4550b3798aa07d8e1cf186587 xorg-server-1.0.1-1.tar.bz2 vnc-modular-xorg.patch: vncinstall | 6 +- xc/programs/Xserver/vnc/Xvnc/xvnc.cc | 9 --- xorg-server-1.0.1/configure.ac | 1 xorg-server-1.0.1/hw/Makefile.am | 3 + xorg-server-1.0.1/hw/vnc/Makefile.am | 87 +++++++++++++++++++++++++++++++++++ xorg-server-1.0.1/mi/miinitext.c | 6 ++ 6 files changed, 102 insertions(+), 10 deletions(-) Index: vnc-modular-xorg.patch =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc-modular-xorg.patch,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- vnc-modular-xorg.patch 3 Jan 2006 16:51:25 -0000 1.8 +++ vnc-modular-xorg.patch 31 Jan 2006 12:36:12 -0000 1.9 @@ -1,5 +1,5 @@ ---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/vnc/Makefile.am 2005-11-25 16:07:03.000000000 +0000 -+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/vnc/Makefile.am 2005-11-30 19:48:03.000000000 +0000 +--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/hw/vnc/Makefile.am 2005-11-25 16:07:03.000000000 +0000 ++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/hw/vnc/Makefile.am 2005-11-30 19:48:03.000000000 +0000 @@ -0,0 +1,85 @@ +noinst_LTLIBRARIES = libvnccommon.la +libvnccommon_la_SOURCES = \ @@ -88,8 +88,8 @@ + +# Man page +include $(top_srcdir)/cpprules.in ---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/Makefile.am.vnc 2005-11-25 16:01:56.000000000 +0000 -+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/Makefile.am 2005-11-25 16:02:41.000000000 +0000 +--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/hw/Makefile.am.vnc 2005-11-25 16:01:56.000000000 +0000 ++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/hw/Makefile.am 2005-11-25 16:02:41.000000000 +0000 @@ -18,6 +18,8 @@ XWIN_SUBDIRS = xwin endif @@ -107,8 +107,8 @@ $(DMX_SUBDIRS) DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin ---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac.modular-xorg 2005-11-28 08:16:21.000000000 +0000 -+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac 2005-11-28 08:16:38.000000000 +0000 +--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/configure.ac.modular-xorg 2005-11-28 08:16:21.000000000 +0000 ++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/configure.ac 2005-11-28 08:16:38.000000000 +0000 @@ -1347,6 +1347,7 @@ hw/xnest/Makefile hw/xwin/Makefile @@ -179,8 +179,8 @@ +if [ -f $vncModule -a -d "$moduledst" ]; then if cmp -s $vncModule $moduledst/`basename $vncModule`; then echo "`basename $vncModule` hasn't changed" ---- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/mi/miinitext.c.modular-xorg 2005-12-01 11:45:11.000000000 +0000 -+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/mi/miinitext.c 2005-12-01 11:47:17.000000000 +0000 +--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/mi/miinitext.c.modular-xorg 2005-12-01 11:45:11.000000000 +0000 ++++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.1/mi/miinitext.c 2005-12-01 11:47:17.000000000 +0000 @@ -284,6 +284,9 @@ #ifdef MITMISC extern void MITMiscExtensionInit(INITARGS); Index: vnc.spec =================================================================== RCS file: /cvs/dist/rpms/vnc/devel/vnc.spec,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 --- vnc.spec 3 Jan 2006 16:51:25 -0000 1.125 +++ vnc.spec 31 Jan 2006 12:36:12 -0000 1.126 @@ -1,11 +1,11 @@ -%define xorg_version 1.0.0-2 +%define xorg_version 1.0.1-1 %define vnc_version 4_1_1 %define java_vnc_version 4_1 Summary: A remote display system. Name: vnc Version: 4.1.1 -Release: 33 +Release: 34 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 @@ -256,6 +256,9 @@ %{_libdir}/xorg/modules/extensions/libvnc.so %changelog +* Tue Jan 31 2006 Tim Waugh 4.1.1-34 +- Updated xorg-x11-server to 1.0.1-1. + * Tue Jan 3 2006 Tim Waugh 4.1.1-33 - Use VNC-provided Xregion (bug #176435). - Prevent restorecon error message when not present (bug #176654). From fedora-cvs-commits at redhat.com Tue Jan 31 12:57:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 07:57:55 -0500 Subject: rpms/at-spi/devel .cvsignore, 1.18, 1.19 at-spi.spec, 1.25, 1.26 sources, 1.18, 1.19 Message-ID: <200601311257.k0VCvtPf020832@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/at-spi/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20783 Modified Files: .cvsignore at-spi.spec sources Log Message: 1.7.4 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 31 Jan 2006 04:47:00 -0000 1.18 +++ .cvsignore 31 Jan 2006 12:57:52 -0000 1.19 @@ -8,3 +8,4 @@ at-spi-1.7.1.tar.bz2 at-spi-1.7.2.tar.bz2 at-spi-1.7.3.tar.bz2 +at-spi-1.7.4.tar.bz2 Index: at-spi.spec =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/at-spi.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- at-spi.spec 31 Jan 2006 04:47:00 -0000 1.25 +++ at-spi.spec 31 Jan 2006 12:57:52 -0000 1.26 @@ -6,7 +6,7 @@ Summary: Assistive Technology Service Provider Interface Name: at-spi -Version: 1.7.3 +Version: 1.7.4 Release: 1 URL: http://developer.gnome.org/projects/gap/ Source0: %{name}-%{version}.tar.bz2 @@ -87,6 +87,9 @@ %{_includedir}/* %changelog +* Tue Jan 31 2006 Matthias Clasen 1.7.4-1 +- Update to 1.7.4 + * Mon Jan 30 2006 Matthias Clasen 1.7.3-1 - Update to 1.7.3 Index: sources =================================================================== RCS file: /cvs/dist/rpms/at-spi/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 31 Jan 2006 04:47:00 -0000 1.18 +++ sources 31 Jan 2006 12:57:52 -0000 1.19 @@ -1 +1 @@ -d97fcce37a8d793489acebfd9c7367f0 at-spi-1.7.3.tar.bz2 +c1bd2652d96c8f628bc203367e3ae58f at-spi-1.7.4.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 13:08:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 08:08:49 -0500 Subject: rpms/subversion/devel subversion.spec,1.68,1.69 Message-ID: <200601311308.k0VD8nFD023235@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/subversion/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23206 Modified Files: subversion.spec Log Message: * Tue Jan 31 2006 Joe Orton 1.3.0-4 - run check-swig-py in %check (#178448) - relax JDK requirement (Kenneth Porter, #177367) Index: subversion.spec =================================================================== RCS file: /cvs/dist/rpms/subversion/devel/subversion.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- subversion.spec 31 Jan 2006 11:46:13 -0000 1.68 +++ subversion.spec 31 Jan 2006 13:08:46 -0000 1.69 @@ -9,14 +9,14 @@ %endif # set JDK path to build javahl; default for JPackage -%define jdk_path /usr/lib/jvm/java-1.4.2-gcj +%define jdk_path /usr/lib/jvm/java %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) Summary: Modern Version Control System designed to replace CVS Name: subversion Version: 1.3.0 -Release: 3 +Release: 4 License: BSD Group: Development/Tools URL: http://subversion.tigris.org/ @@ -85,7 +85,7 @@ Group: Development/Libraries Summary: JNI bindings to the Subversion libraries Requires: subversion = %{version}-%{release} -BuildRequires: java-1.4.2-gcj-compat-devel +BuildRequires: java-1.4.2-devel %description javahl This package includes the JNI bindings to the Subversion libraries. @@ -185,7 +185,7 @@ %if %{make_check} %check export LANG=C LC_ALL=C -make check check-swig-pl CLEANUP=yes +make check check-swig-pl check-swig-py CLEANUP=yes # check-swig-rb omitted: it runs svnserve %endif @@ -252,6 +252,10 @@ %endif %changelog +* Tue Jan 31 2006 Joe Orton 1.3.0-4 +- run check-swig-py in %%check (#178448) +- relax JDK requirement (Kenneth Porter, #177367) + * Tue Jan 31 2006 Joe Orton 1.3.0-3 - rebuild for neon 0.25 From fedora-cvs-commits at redhat.com Tue Jan 31 13:11:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 08:11:03 -0500 Subject: rpms/libc-client/devel libc-client.spec,1.14,1.15 Message-ID: <200601311311.k0VDB3VV024319@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/libc-client/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24288 Modified Files: libc-client.spec Log Message: * Tue Jan 31 2006 Joe Orton 2004g-2 - bump soname (#179017) Index: libc-client.spec =================================================================== RCS file: /cvs/dist/rpms/libc-client/devel/libc-client.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- libc-client.spec 5 Jan 2006 15:22:39 -0000 1.14 +++ libc-client.spec 31 Jan 2006 13:11:01 -0000 1.15 @@ -1,11 +1,11 @@ %define soname c-client -%define somajver 0 +%define somajver 1 %define shlibname lib%{soname}.so.%{somajver} Summary: C-client mail access routines for IMAP and POP protocols Name: libc-client Version: 2004g -Release: 1 +Release: 2 License: University of Washington Free-Fork License Group: System Environment/Daemons URL: http://www.washington.edu/imap/ @@ -122,6 +122,9 @@ %{_libdir}/lib%{soname}.so %changelog +* Tue Jan 31 2006 Joe Orton 2004g-2 +- bump soname (#179017) + * Thu Jan 5 2006 Jonathan Kamens 2004g-1 - Upstream version 2004g (#176974) - Remove obsolete doc file "WARNING" From fedora-cvs-commits at redhat.com Tue Jan 31 13:29:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 08:29:14 -0500 Subject: rpms/setup/devel .cvsignore, 1.30, 1.31 setup.spec, 1.35, 1.36 sources, 1.31, 1.32 Message-ID: <200601311329.k0VDTEgY012404@cvs.devel.redhat.com> Author: pknirsch Update of /cvs/dist/rpms/setup/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12288 Modified Files: .cvsignore setup.spec sources Log Message: - Switched to the new large /etc/services file which fixes #112298, #133683, #166443, #168872, #171228. - Fixed pathmunge problem with bashrc (#123621) - Removed /usr/X11R6/bin from default PATH (#173856) - Fixed bug with PROMPT_COMMAND being broken for wierd dirs (#142125) - Added hfsplus to know filesystems (#172820) Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/setup/devel/.cvsignore,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- .cvsignore 6 Sep 2005 15:46:12 -0000 1.30 +++ .cvsignore 31 Jan 2006 13:29:11 -0000 1.31 @@ -1 +1 @@ -setup-2.5.47.tar.bz2 +setup-2.5.48.tar.bz2 Index: setup.spec =================================================================== RCS file: /cvs/dist/rpms/setup/devel/setup.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- setup.spec 9 Dec 2005 22:43:12 -0000 1.35 +++ setup.spec 31 Jan 2006 13:29:11 -0000 1.36 @@ -1,7 +1,7 @@ Summary: A set of system configuration and setup files. Name: setup -Version: 2.5.47 -Release: 1.1.1 +Version: 2.5.48 +Release: 1 License: public domain Group: System Environment/Base Source: setup-%{version}.tar.bz2 @@ -58,7 +58,7 @@ %config(noreplace) /etc/host.conf %verify(not md5 size mtime) %config(noreplace) /etc/hosts.allow %verify(not md5 size mtime) %config(noreplace) /etc/hosts.deny -%verify(not md5 size mtime) %config /etc/motd +%verify(not md5 size mtime) %config(noreplace) /etc/motd %config(noreplace) /etc/printcap %config /etc/inputrc %config(noreplace) /etc/bashrc @@ -72,8 +72,18 @@ %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog %changelog -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Tue Jan 31 2006 Phil Knirsch 2.4.48-1 +- Switched to the new large /etc/services file which fixes #112298, #133683, + #166443, #168872, #171228. +- Fixed pathmunge problem with bashrc (#123621) +- Removed /usr/X11R6/bin from default PATH (#173856) + +* Tue Jan 24 2006 Phil Knirsch +- Fixed bug with PROMPT_COMMAND being broken for wierd dirs (#142125) +- Added hfsplus to know filesystems (#172820) + +* Mon Oct 17 2005 Bill Nottingham +- make motd noreplace (#170539) * Tue Sep 6 2005 Bill Nottingham 2.5.47-1 - make lastlog 0644 (#167200) Index: sources =================================================================== RCS file: /cvs/dist/rpms/setup/devel/sources,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- sources 6 Sep 2005 15:46:12 -0000 1.31 +++ sources 31 Jan 2006 13:29:11 -0000 1.32 @@ -1 +1 @@ -3bcaf594581f8b18139325f63ec012d4 setup-2.5.47.tar.bz2 +a3277898d9c56ea1dc279a0219ad7c2c setup-2.5.48.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 13:44:06 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 08:44:06 -0500 Subject: rpms/fontconfig/devel .cvsignore, 1.16, 1.17 fontconfig.spec, 1.60, 1.61 sources, 1.17, 1.18 Message-ID: <200601311344.k0VDi6FR017489@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/fontconfig/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17400 Modified Files: .cvsignore fontconfig.spec sources Log Message: newer cvs snapshot Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/fontconfig/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 24 Jan 2006 20:52:34 -0000 1.16 +++ .cvsignore 31 Jan 2006 13:44:03 -0000 1.17 @@ -1,2 +1,4 @@ fontconfig-2.3.93.tar.gz fontconfig-2.3.93.cvs20060124.tar.gz +fontconfig-2.3.93.cvs20060129.tar.gz +fontconfig-2.3.93.cvs20060131.tar.gz Index: fontconfig.spec =================================================================== RCS file: /cvs/dist/rpms/fontconfig/devel/fontconfig.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- fontconfig.spec 24 Jan 2006 20:52:34 -0000 1.60 +++ fontconfig.spec 31 Jan 2006 13:44:03 -0000 1.61 @@ -2,7 +2,7 @@ Summary: Font configuration and customization library Name: fontconfig -Version: 2.3.93.cvs20060124 +Version: 2.3.93.cvs20060131 Release: 1 License: MIT Group: System Environment/Libraries @@ -13,10 +13,6 @@ Source2: 50-no-hint-fonts.conf Patch1: fontconfig-2.3.93-defaultconfig.patch -# fix globar dir handling (Mike Fabian) -Patch2: fontconfig-2.3.93-globaldir.patch -# normalize path in fc-cache (Mike Fabian) -Patch4: fontconfig-2.3.93-normalize.patch BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: expat-devel @@ -53,8 +49,6 @@ %setup -q %patch1 -p1 -b .defaultconfig -%patch2 -p1 -b .globaldir -%patch4 -p1 -b .normalize %build %configure --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/OTF @@ -67,6 +61,7 @@ echo "set protocol.file.allow_special_files = 1" > $ELINKS_CONFDIR/elinks.conf make +make check %install rm -rf $RPM_BUILD_ROOT @@ -87,7 +82,7 @@ # Remove unpackaged files rm $RPM_BUILD_ROOT%{_libdir}/*.la -rm $RPM_BUILD_ROOT%{_localstatedir}/cache/fontconfig/stamp +rm $RPM_BUILD_ROOT%{_libdir}/*.a %clean rm -rf $RPM_BUILD_ROOT @@ -133,12 +128,14 @@ %defattr(-, root, root) %doc fontconfig-devel.txt fontconfig-devel %{_libdir}/libfontconfig.so -%{_libdir}/libfontconfig.a %{_libdir}/pkgconfig %{_includedir}/fontconfig %{_mandir}/man3/* %changelog +* Tue Jan 31 2006 Matthias Clasen - 2.3.93.cvs20060131-1 +- Newer cvs snapshot + * Tue Jan 24 2006 Matthias Clasen - 2.3.93.cvs20060124-1 - Newer cvs snapshot Index: sources =================================================================== RCS file: /cvs/dist/rpms/fontconfig/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 24 Jan 2006 20:52:34 -0000 1.17 +++ sources 31 Jan 2006 13:44:03 -0000 1.18 @@ -1 +1 @@ -b365d99c503ed19dbe2019f3df90945d fontconfig-2.3.93.cvs20060124.tar.gz +a95a7de00ffbcf4e6f0bc2c8a94d9d93 fontconfig-2.3.93.cvs20060131.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 31 14:22:16 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 09:22:16 -0500 Subject: rpms/usermode/devel usermode.spec,1.55,1.56 Message-ID: <200601311422.k0VEMGdY023157@cvs.devel.redhat.com> Author: jnovy Update of /cvs/dist/rpms/usermode/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23027 Modified Files: usermode.spec Log Message: * Tue Jan 31 2006 Jindrich Novy 1.85-2 - add gettext, libattr-devel, libSM-devel dependencies Index: usermode.spec =================================================================== RCS file: /cvs/dist/rpms/usermode/devel/usermode.spec,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- usermode.spec 3 Jan 2006 14:26:43 -0000 1.55 +++ usermode.spec 31 Jan 2006 14:22:12 -0000 1.56 @@ -6,7 +6,7 @@ Summary: Tools for certain user account management tasks. Name: usermode Version: 1.85 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source: usermode-%{version}.tar.bz2 @@ -18,7 +18,7 @@ Conflicts: SysVinit < 2.74-14 BuildPrereq: desktop-file-utils, glib2-devel, gtk2-devel BuildPrereq: libglade2-devel, libuser-devel, pam-devel, util-linux -BuildPrereq: perl-XML-Parser +BuildPrereq: perl-XML-Parser, libattr-devel, libSM-devel, gettext %if %{WITH_SELINUX} BuildPrereq: libselinux-devel >= 1.17.13-2 %endif @@ -120,6 +120,9 @@ %{_datadir}/applications/* %changelog +* Tue Jan 31 2006 Jindrich Novy 1.85-2 +- add gettext, libattr-devel, libSM-devel dependencies + * Tue Jan 3 2006 Jindrich Novy 1.85-1 - fix userpasswd - don't crash if pam produces multi-line output (#175735) Thanks to toddp at bestweb.net From fedora-cvs-commits at redhat.com Tue Jan 31 14:29:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 09:29:36 -0500 Subject: rpms/gcc/devel gcc41-x86-mtune-generic1.patch, NONE, 1.1 gcc41-x86-mtune-generic2.patch, NONE, 1.1 gcc41-x86-mtune-generic3.patch, NONE, 1.1 .cvsignore, 1.128, 1.129 gcc41-atomic-builtins.patch, 1.1, 1.2 gcc41-s390-ldbl.patch, 1.2, 1.3 gcc41.spec, 1.19, 1.20 sources, 1.130, 1.131 Message-ID: <200601311429.k0VETaMF017545@cvs.devel.redhat.com> Author: jakub Update of /cvs/dist/rpms/gcc/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17529 Modified Files: .cvsignore gcc41-atomic-builtins.patch gcc41-s390-ldbl.patch gcc41.spec sources Added Files: gcc41-x86-mtune-generic1.patch gcc41-x86-mtune-generic2.patch gcc41-x86-mtune-generic3.patch Log Message: 4.1.0-0.18 gcc41-x86-mtune-generic1.patch: 0 files changed --- NEW FILE gcc41-x86-mtune-generic1.patch --- 2006-01-19 Jan Hubicka * i386.c (*_cost): Add COSTS_N_INSNS. (ix86_rtx_costs): Do not use COSTS_N_INSNS. --- gcc/config/i386/i386.c (revision 108997) +++ gcc/config/i386/i386.c (revision 109242) @@ -65,15 +65,23 @@ /* Processor costs (relative to an add) */ static const struct processor_costs size_cost = { /* costs for tunning for size */ - 2, /* cost of an add instruction */ - 3, /* cost of a lea instruction */ - 2, /* variable shift costs */ - 3, /* constant shift costs */ - {3, 3, 3, 3, 5}, /* cost of starting a multiply */ + COSTS_N_INSNS (2), /* cost of an add instruction */ + COSTS_N_INSNS (3), /* cost of a lea instruction */ + COSTS_N_INSNS (2), /* variable shift costs */ + COSTS_N_INSNS (3), /* constant shift costs */ + {COSTS_N_INSNS (3), /* cost of starting multiply for QI */ + COSTS_N_INSNS (3), /* HI */ + COSTS_N_INSNS (3), /* SI */ + COSTS_N_INSNS (3), /* DI */ + COSTS_N_INSNS (5)}, /* other */ 0, /* cost of multiply per each bit set */ - {3, 3, 3, 3, 5}, /* cost of a divide/mod */ - 3, /* cost of movsx */ - 3, /* cost of movzx */ + {COSTS_N_INSNS (3), /* cost of a divide/mod for QI */ + COSTS_N_INSNS (3), /* HI */ + COSTS_N_INSNS (3), /* SI */ + COSTS_N_INSNS (3), /* DI */ + COSTS_N_INSNS (5)}, /* other */ + COSTS_N_INSNS (3), /* cost of movsx */ + COSTS_N_INSNS (3), /* cost of movzx */ 0, /* "large" insn */ 2, /* MOVE_RATIO */ 2, /* cost for loading QImode using movzbl */ @@ -99,26 +107,34 @@ 0, /* size of prefetch block */ 0, /* number of parallel prefetches */ 1, /* Branch cost */ - 2, /* cost of FADD and FSUB insns. */ - 2, /* cost of FMUL instruction. */ - 2, /* cost of FDIV instruction. */ - 2, /* cost of FABS instruction. */ - 2, /* cost of FCHS instruction. */ - 2, /* cost of FSQRT instruction. */ + COSTS_N_INSNS (2), /* cost of FADD and FSUB insns. */ + COSTS_N_INSNS (2), /* cost of FMUL instruction. */ + COSTS_N_INSNS (2), /* cost of FDIV instruction. */ + COSTS_N_INSNS (2), /* cost of FABS instruction. */ + COSTS_N_INSNS (2), /* cost of FCHS instruction. */ + COSTS_N_INSNS (2), /* cost of FSQRT instruction. */ }; /* Processor costs (relative to an add) */ static const struct processor_costs i386_cost = { /* 386 specific costs */ - 1, /* cost of an add instruction */ - 1, /* cost of a lea instruction */ - 3, /* variable shift costs */ - 2, /* constant shift costs */ - {6, 6, 6, 6, 6}, /* cost of starting a multiply */ - 1, /* cost of multiply per each bit set */ - {23, 23, 23, 23, 23}, /* cost of a divide/mod */ - 3, /* cost of movsx */ - 2, /* cost of movzx */ + COSTS_N_INSNS (1), /* cost of an add instruction */ + COSTS_N_INSNS (1), /* cost of a lea instruction */ + COSTS_N_INSNS (3), /* variable shift costs */ + COSTS_N_INSNS (2), /* constant shift costs */ + {COSTS_N_INSNS (6), /* cost of starting multiply for QI */ + COSTS_N_INSNS (6), /* HI */ + COSTS_N_INSNS (6), /* SI */ + COSTS_N_INSNS (6), /* DI */ + COSTS_N_INSNS (6)}, /* other */ + COSTS_N_INSNS (1), /* cost of multiply per each bit set */ + {COSTS_N_INSNS (23), /* cost of a divide/mod for QI */ + COSTS_N_INSNS (23), /* HI */ + COSTS_N_INSNS (23), /* SI */ + COSTS_N_INSNS (23), /* DI */ + COSTS_N_INSNS (23)}, /* other */ + COSTS_N_INSNS (3), /* cost of movsx */ + COSTS_N_INSNS (2), /* cost of movzx */ 15, /* "large" insn */ 3, /* MOVE_RATIO */ 4, /* cost for loading QImode using movzbl */ @@ -144,25 +160,33 @@ 0, /* size of prefetch block */ 0, /* number of parallel prefetches */ 1, /* Branch cost */ - 23, /* cost of FADD and FSUB insns. */ - 27, /* cost of FMUL instruction. */ - 88, /* cost of FDIV instruction. */ - 22, /* cost of FABS instruction. */ - 24, /* cost of FCHS instruction. */ - 122, /* cost of FSQRT instruction. */ + COSTS_N_INSNS (23), /* cost of FADD and FSUB insns. */ + COSTS_N_INSNS (27), /* cost of FMUL instruction. */ + COSTS_N_INSNS (88), /* cost of FDIV instruction. */ + COSTS_N_INSNS (22), /* cost of FABS instruction. */ + COSTS_N_INSNS (24), /* cost of FCHS instruction. */ + COSTS_N_INSNS (122), /* cost of FSQRT instruction. */ }; static const struct processor_costs i486_cost = { /* 486 specific costs */ - 1, /* cost of an add instruction */ - 1, /* cost of a lea instruction */ - 3, /* variable shift costs */ - 2, /* constant shift costs */ - {12, 12, 12, 12, 12}, /* cost of starting a multiply */ + COSTS_N_INSNS (1), /* cost of an add instruction */ + COSTS_N_INSNS (1), /* cost of a lea instruction */ + COSTS_N_INSNS (3), /* variable shift costs */ + COSTS_N_INSNS (2), /* constant shift costs */ + {COSTS_N_INSNS (12), /* cost of starting multiply for QI */ + COSTS_N_INSNS (12), /* HI */ + COSTS_N_INSNS (12), /* SI */ + COSTS_N_INSNS (12), /* DI */ + COSTS_N_INSNS (12)}, /* other */ 1, /* cost of multiply per each bit set */ - {40, 40, 40, 40, 40}, /* cost of a divide/mod */ - 3, /* cost of movsx */ - 2, /* cost of movzx */ + {COSTS_N_INSNS (40), /* cost of a divide/mod for QI */ + COSTS_N_INSNS (40), /* HI */ + COSTS_N_INSNS (40), /* SI */ + COSTS_N_INSNS (40), /* DI */ + COSTS_N_INSNS (40)}, /* other */ + COSTS_N_INSNS (3), /* cost of movsx */ + COSTS_N_INSNS (2), /* cost of movzx */ 15, /* "large" insn */ 3, /* MOVE_RATIO */ 4, /* cost for loading QImode using movzbl */ @@ -188,25 +212,33 @@ 0, /* size of prefetch block */ 0, /* number of parallel prefetches */ 1, /* Branch cost */ - 8, /* cost of FADD and FSUB insns. */ - 16, /* cost of FMUL instruction. */ - 73, /* cost of FDIV instruction. */ - 3, /* cost of FABS instruction. */ - 3, /* cost of FCHS instruction. */ - 83, /* cost of FSQRT instruction. */ + COSTS_N_INSNS (8), /* cost of FADD and FSUB insns. */ + COSTS_N_INSNS (16), /* cost of FMUL instruction. */ + COSTS_N_INSNS (73), /* cost of FDIV instruction. */ + COSTS_N_INSNS (3), /* cost of FABS instruction. */ + COSTS_N_INSNS (3), /* cost of FCHS instruction. */ + COSTS_N_INSNS (83), /* cost of FSQRT instruction. */ }; static const struct processor_costs pentium_cost = { - 1, /* cost of an add instruction */ - 1, /* cost of a lea instruction */ - 4, /* variable shift costs */ - 1, /* constant shift costs */ - {11, 11, 11, 11, 11}, /* cost of starting a multiply */ + COSTS_N_INSNS (1), /* cost of an add instruction */ + COSTS_N_INSNS (1), /* cost of a lea instruction */ + COSTS_N_INSNS (4), /* variable shift costs */ + COSTS_N_INSNS (1), /* constant shift costs */ + {COSTS_N_INSNS (11), /* cost of starting multiply for QI */ + COSTS_N_INSNS (11), /* HI */ + COSTS_N_INSNS (11), /* SI */ + COSTS_N_INSNS (11), /* DI */ + COSTS_N_INSNS (11)}, /* other */ 0, /* cost of multiply per each bit set */ - {25, 25, 25, 25, 25}, /* cost of a divide/mod */ - 3, /* cost of movsx */ - 2, /* cost of movzx */ + {COSTS_N_INSNS (25), /* cost of a divide/mod for QI */ + COSTS_N_INSNS (25), /* HI */ + COSTS_N_INSNS (25), /* SI */ + COSTS_N_INSNS (25), /* DI */ + COSTS_N_INSNS (25)}, /* other */ + COSTS_N_INSNS (3), /* cost of movsx */ + COSTS_N_INSNS (2), /* cost of movzx */ 8, /* "large" insn */ 6, /* MOVE_RATIO */ 6, /* cost for loading QImode using movzbl */ @@ -232,25 +264,33 @@ 0, /* size of prefetch block */ 0, /* number of parallel prefetches */ 2, /* Branch cost */ - 3, /* cost of FADD and FSUB insns. */ - 3, /* cost of FMUL instruction. */ - 39, /* cost of FDIV instruction. */ - 1, /* cost of FABS instruction. */ - 1, /* cost of FCHS instruction. */ - 70, /* cost of FSQRT instruction. */ + COSTS_N_INSNS (3), /* cost of FADD and FSUB insns. */ + COSTS_N_INSNS (3), /* cost of FMUL instruction. */ + COSTS_N_INSNS (39), /* cost of FDIV instruction. */ + COSTS_N_INSNS (1), /* cost of FABS instruction. */ + COSTS_N_INSNS (1), /* cost of FCHS instruction. */ + COSTS_N_INSNS (70), /* cost of FSQRT instruction. */ }; static const struct processor_costs pentiumpro_cost = { - 1, /* cost of an add instruction */ - 1, /* cost of a lea instruction */ - 1, /* variable shift costs */ - 1, /* constant shift costs */ - {4, 4, 4, 4, 4}, /* cost of starting a multiply */ + COSTS_N_INSNS (1), /* cost of an add instruction */ + COSTS_N_INSNS (1), /* cost of a lea instruction */ + COSTS_N_INSNS (1), /* variable shift costs */ + COSTS_N_INSNS (1), /* constant shift costs */ + {COSTS_N_INSNS (4), /* cost of starting multiply for QI */ + COSTS_N_INSNS (4), /* HI */ + COSTS_N_INSNS (4), /* SI */ + COSTS_N_INSNS (4), /* DI */ + COSTS_N_INSNS (4)}, /* other */ 0, /* cost of multiply per each bit set */ - {17, 17, 17, 17, 17}, /* cost of a divide/mod */ - 1, /* cost of movsx */ - 1, /* cost of movzx */ + {COSTS_N_INSNS (17), /* cost of a divide/mod for QI */ + COSTS_N_INSNS (17), /* HI */ + COSTS_N_INSNS (17), /* SI */ + COSTS_N_INSNS (17), /* DI */ + COSTS_N_INSNS (17)}, /* other */ + COSTS_N_INSNS (1), /* cost of movsx */ + COSTS_N_INSNS (1), /* cost of movzx */ 8, /* "large" insn */ 6, /* MOVE_RATIO */ 2, /* cost for loading QImode using movzbl */ @@ -276,25 +316,33 @@ 32, /* size of prefetch block */ 6, /* number of parallel prefetches */ 2, /* Branch cost */ - 3, /* cost of FADD and FSUB insns. */ - 5, /* cost of FMUL instruction. */ - 56, /* cost of FDIV instruction. */ - 2, /* cost of FABS instruction. */ - 2, /* cost of FCHS instruction. */ - 56, /* cost of FSQRT instruction. */ + COSTS_N_INSNS (3), /* cost of FADD and FSUB insns. */ + COSTS_N_INSNS (5), /* cost of FMUL instruction. */ + COSTS_N_INSNS (56), /* cost of FDIV instruction. */ + COSTS_N_INSNS (2), /* cost of FABS instruction. */ + COSTS_N_INSNS (2), /* cost of FCHS instruction. */ + COSTS_N_INSNS (56), /* cost of FSQRT instruction. */ }; static const struct processor_costs k6_cost = { - 1, /* cost of an add instruction */ - 2, /* cost of a lea instruction */ - 1, /* variable shift costs */ - 1, /* constant shift costs */ - {3, 3, 3, 3, 3}, /* cost of starting a multiply */ + COSTS_N_INSNS (1), /* cost of an add instruction */ + COSTS_N_INSNS (2), /* cost of a lea instruction */ + COSTS_N_INSNS (1), /* variable shift costs */ + COSTS_N_INSNS (1), /* constant shift costs */ + {COSTS_N_INSNS (3), /* cost of starting multiply for QI */ + COSTS_N_INSNS (3), /* HI */ + COSTS_N_INSNS (3), /* SI */ + COSTS_N_INSNS (3), /* DI */ + COSTS_N_INSNS (3)}, /* other */ 0, /* cost of multiply per each bit set */ - {18, 18, 18, 18, 18}, /* cost of a divide/mod */ - 2, /* cost of movsx */ - 2, /* cost of movzx */ + {COSTS_N_INSNS (18), /* cost of a divide/mod for QI */ + COSTS_N_INSNS (18), /* HI */ + COSTS_N_INSNS (18), /* SI */ + COSTS_N_INSNS (18), /* DI */ + COSTS_N_INSNS (18)}, /* other */ + COSTS_N_INSNS (2), /* cost of movsx */ + COSTS_N_INSNS (2), /* cost of movzx */ 8, /* "large" insn */ 4, /* MOVE_RATIO */ 3, /* cost for loading QImode using movzbl */ @@ -320,25 +368,33 @@ 32, /* size of prefetch block */ 1, /* number of parallel prefetches */ 1, /* Branch cost */ - 2, /* cost of FADD and FSUB insns. */ - 2, /* cost of FMUL instruction. */ - 56, /* cost of FDIV instruction. */ - 2, /* cost of FABS instruction. */ - 2, /* cost of FCHS instruction. */ - 56, /* cost of FSQRT instruction. */ + COSTS_N_INSNS (2), /* cost of FADD and FSUB insns. */ + COSTS_N_INSNS (2), /* cost of FMUL instruction. */ + COSTS_N_INSNS (56), /* cost of FDIV instruction. */ + COSTS_N_INSNS (2), /* cost of FABS instruction. */ + COSTS_N_INSNS (2), /* cost of FCHS instruction. */ + COSTS_N_INSNS (56), /* cost of FSQRT instruction. */ }; static const struct processor_costs athlon_cost = { - 1, /* cost of an add instruction */ - 2, /* cost of a lea instruction */ - 1, /* variable shift costs */ - 1, /* constant shift costs */ - {5, 5, 5, 5, 5}, /* cost of starting a multiply */ + COSTS_N_INSNS (1), /* cost of an add instruction */ + COSTS_N_INSNS (2), /* cost of a lea instruction */ + COSTS_N_INSNS (1), /* variable shift costs */ + COSTS_N_INSNS (1), /* constant shift costs */ + {COSTS_N_INSNS (5), /* cost of starting multiply for QI */ + COSTS_N_INSNS (5), /* HI */ + COSTS_N_INSNS (5), /* SI */ + COSTS_N_INSNS (5), /* DI */ + COSTS_N_INSNS (5)}, /* other */ 0, /* cost of multiply per each bit set */ - {18, 26, 42, 74, 74}, /* cost of a divide/mod */ - 1, /* cost of movsx */ - 1, /* cost of movzx */ + {COSTS_N_INSNS (18), /* cost of a divide/mod for QI */ + COSTS_N_INSNS (26), /* HI */ + COSTS_N_INSNS (42), /* SI */ + COSTS_N_INSNS (74), /* DI */ + COSTS_N_INSNS (74)}, /* other */ + COSTS_N_INSNS (1), /* cost of movsx */ + COSTS_N_INSNS (1), /* cost of movzx */ 8, /* "large" insn */ 9, /* MOVE_RATIO */ 4, /* cost for loading QImode using movzbl */ @@ -364,25 +420,33 @@ 64, /* size of prefetch block */ 6, /* number of parallel prefetches */ 5, /* Branch cost */ - 4, /* cost of FADD and FSUB insns. */ - 4, /* cost of FMUL instruction. */ - 24, /* cost of FDIV instruction. */ - 2, /* cost of FABS instruction. */ - 2, /* cost of FCHS instruction. */ - 35, /* cost of FSQRT instruction. */ + COSTS_N_INSNS (4), /* cost of FADD and FSUB insns. */ + COSTS_N_INSNS (4), /* cost of FMUL instruction. */ + COSTS_N_INSNS (24), /* cost of FDIV instruction. */ + COSTS_N_INSNS (2), /* cost of FABS instruction. */ + COSTS_N_INSNS (2), /* cost of FCHS instruction. */ + COSTS_N_INSNS (35), /* cost of FSQRT instruction. */ }; static const struct processor_costs k8_cost = { - 1, /* cost of an add instruction */ - 2, /* cost of a lea instruction */ - 1, /* variable shift costs */ - 1, /* constant shift costs */ - {3, 4, 3, 4, 5}, /* cost of starting a multiply */ + COSTS_N_INSNS (1), /* cost of an add instruction */ + COSTS_N_INSNS (2), /* cost of a lea instruction */ + COSTS_N_INSNS (1), /* variable shift costs */ + COSTS_N_INSNS (1), /* constant shift costs */ + {COSTS_N_INSNS (3), /* cost of starting multiply for QI */ + COSTS_N_INSNS (4), /* HI */ + COSTS_N_INSNS (3), /* SI */ + COSTS_N_INSNS (4), /* DI */ + COSTS_N_INSNS (5)}, /* other */ 0, /* cost of multiply per each bit set */ - {18, 26, 42, 74, 74}, /* cost of a divide/mod */ - 1, /* cost of movsx */ - 1, /* cost of movzx */ + {COSTS_N_INSNS (18), /* cost of a divide/mod for QI */ + COSTS_N_INSNS (26), /* HI */ + COSTS_N_INSNS (42), /* SI */ + COSTS_N_INSNS (74), /* DI */ + COSTS_N_INSNS (74)}, /* other */ + COSTS_N_INSNS (1), /* cost of movsx */ + COSTS_N_INSNS (1), /* cost of movzx */ 8, /* "large" insn */ 9, /* MOVE_RATIO */ 4, /* cost for loading QImode using movzbl */ @@ -408,25 +472,33 @@ 64, /* size of prefetch block */ 6, /* number of parallel prefetches */ 5, /* Branch cost */ - 4, /* cost of FADD and FSUB insns. */ - 4, /* cost of FMUL instruction. */ - 19, /* cost of FDIV instruction. */ - 2, /* cost of FABS instruction. */ - 2, /* cost of FCHS instruction. */ - 35, /* cost of FSQRT instruction. */ + COSTS_N_INSNS (4), /* cost of FADD and FSUB insns. */ + COSTS_N_INSNS (4), /* cost of FMUL instruction. */ + COSTS_N_INSNS (19), /* cost of FDIV instruction. */ + COSTS_N_INSNS (2), /* cost of FABS instruction. */ + COSTS_N_INSNS (2), /* cost of FCHS instruction. */ + COSTS_N_INSNS (35), /* cost of FSQRT instruction. */ }; static const struct processor_costs pentium4_cost = { - 1, /* cost of an add instruction */ - 3, /* cost of a lea instruction */ - 4, /* variable shift costs */ - 4, /* constant shift costs */ - {15, 15, 15, 15, 15}, /* cost of starting a multiply */ + COSTS_N_INSNS (1), /* cost of an add instruction */ + COSTS_N_INSNS (3), /* cost of a lea instruction */ + COSTS_N_INSNS (4), /* variable shift costs */ + COSTS_N_INSNS (4), /* constant shift costs */ + {COSTS_N_INSNS (15), /* cost of starting multiply for QI */ + COSTS_N_INSNS (15), /* HI */ + COSTS_N_INSNS (15), /* SI */ + COSTS_N_INSNS (15), /* DI */ + COSTS_N_INSNS (15)}, /* other */ 0, /* cost of multiply per each bit set */ - {56, 56, 56, 56, 56}, /* cost of a divide/mod */ - 1, /* cost of movsx */ - 1, /* cost of movzx */ + {COSTS_N_INSNS (56), /* cost of a divide/mod for QI */ + COSTS_N_INSNS (56), /* HI */ + COSTS_N_INSNS (56), /* SI */ + COSTS_N_INSNS (56), /* DI */ + COSTS_N_INSNS (56)}, /* other */ + COSTS_N_INSNS (1), /* cost of movsx */ + COSTS_N_INSNS (1), /* cost of movzx */ 16, /* "large" insn */ 6, /* MOVE_RATIO */ 2, /* cost for loading QImode using movzbl */ @@ -452,25 +524,33 @@ 64, /* size of prefetch block */ 6, /* number of parallel prefetches */ 2, /* Branch cost */ - 5, /* cost of FADD and FSUB insns. */ - 7, /* cost of FMUL instruction. */ - 43, /* cost of FDIV instruction. */ - 2, /* cost of FABS instruction. */ - 2, /* cost of FCHS instruction. */ - 43, /* cost of FSQRT instruction. */ + COSTS_N_INSNS (5), /* cost of FADD and FSUB insns. */ + COSTS_N_INSNS (7), /* cost of FMUL instruction. */ + COSTS_N_INSNS (43), /* cost of FDIV instruction. */ + COSTS_N_INSNS (2), /* cost of FABS instruction. */ + COSTS_N_INSNS (2), /* cost of FCHS instruction. */ + COSTS_N_INSNS (43), /* cost of FSQRT instruction. */ }; static const struct processor_costs nocona_cost = { - 1, /* cost of an add instruction */ - 1, /* cost of a lea instruction */ - 1, /* variable shift costs */ - 1, /* constant shift costs */ - {10, 10, 10, 10, 10}, /* cost of starting a multiply */ + COSTS_N_INSNS (1), /* cost of an add instruction */ + COSTS_N_INSNS (1), /* cost of a lea instruction */ + COSTS_N_INSNS (1), /* variable shift costs */ + COSTS_N_INSNS (1), /* constant shift costs */ + {COSTS_N_INSNS (10), /* cost of starting multiply for QI */ + COSTS_N_INSNS (10), /* HI */ + COSTS_N_INSNS (10), /* SI */ + COSTS_N_INSNS (10), /* DI */ + COSTS_N_INSNS (10)}, /* other */ 0, /* cost of multiply per each bit set */ - {66, 66, 66, 66, 66}, /* cost of a divide/mod */ - 1, /* cost of movsx */ - 1, /* cost of movzx */ + {COSTS_N_INSNS (66), /* cost of a divide/mod for QI */ + COSTS_N_INSNS (66), /* HI */ + COSTS_N_INSNS (66), /* SI */ + COSTS_N_INSNS (66), /* DI */ + COSTS_N_INSNS (66)}, /* other */ + COSTS_N_INSNS (1), /* cost of movsx */ + COSTS_N_INSNS (1), /* cost of movzx */ 16, /* "large" insn */ 17, /* MOVE_RATIO */ 4, /* cost for loading QImode using movzbl */ @@ -496,12 +576,12 @@ 128, /* size of prefetch block */ 8, /* number of parallel prefetches */ 1, /* Branch cost */ - 6, /* cost of FADD and FSUB insns. */ - 8, /* cost of FMUL instruction. */ - 40, /* cost of FDIV instruction. */ - 3, /* cost of FABS instruction. */ - 3, /* cost of FCHS instruction. */ - 44, /* cost of FSQRT instruction. */ + COSTS_N_INSNS (6), /* cost of FADD and FSUB insns. */ + COSTS_N_INSNS (8), /* cost of FMUL instruction. */ + COSTS_N_INSNS (40), /* cost of FDIV instruction. */ + COSTS_N_INSNS (3), /* cost of FABS instruction. */ + COSTS_N_INSNS (3), /* cost of FCHS instruction. */ + COSTS_N_INSNS (44), /* cost of FSQRT instruction. */ }; const struct processor_costs *ix86_cost = &pentium_cost; @@ -16320,13 +16400,13 @@ && GET_MODE (XEXP (x, 0)) == SImode) *total = 1; else if (TARGET_ZERO_EXTEND_WITH_AND) - *total = COSTS_N_INSNS (ix86_cost->add); + *total = ix86_cost->add; else - *total = COSTS_N_INSNS (ix86_cost->movzx); + *total = ix86_cost->movzx; return false; case SIGN_EXTEND: - *total = COSTS_N_INSNS (ix86_cost->movsx); + *total = ix86_cost->movsx; return false; case ASHIFT: @@ -16336,13 +16416,14 @@ HOST_WIDE_INT value = INTVAL (XEXP (x, 1)); if (value == 1) { - *total = COSTS_N_INSNS (ix86_cost->add); + *total = ix86_cost->add; return false; } if ((value == 2 || value == 3) + && !TARGET_DECOMPOSE_LEA && ix86_cost->lea <= ix86_cost->shift_const) { - *total = COSTS_N_INSNS (ix86_cost->lea); + *total = ix86_cost->lea; return false; } } @@ -16357,31 +16438,31 @@ if (GET_CODE (XEXP (x, 1)) == CONST_INT) { if (INTVAL (XEXP (x, 1)) > 32) - *total = COSTS_N_INSNS(ix86_cost->shift_const + 2); + *total = ix86_cost->shift_const + COSTS_N_INSNS (2); else - *total = COSTS_N_INSNS(ix86_cost->shift_const * 2); + *total = ix86_cost->shift_const * 2; } else { if (GET_CODE (XEXP (x, 1)) == AND) - *total = COSTS_N_INSNS(ix86_cost->shift_var * 2); + *total = ix86_cost->shift_var * 2; else - *total = COSTS_N_INSNS(ix86_cost->shift_var * 6 + 2); + *total = ix86_cost->shift_var * 6 + COSTS_N_INSNS (2); } } else { if (GET_CODE (XEXP (x, 1)) == CONST_INT) - *total = COSTS_N_INSNS (ix86_cost->shift_const); + *total = ix86_cost->shift_const; else - *total = COSTS_N_INSNS (ix86_cost->shift_var); + *total = ix86_cost->shift_var; } return false; case MULT: if (FLOAT_MODE_P (mode)) { - *total = COSTS_N_INSNS (ix86_cost->fmul); + *total = ix86_cost->fmul; return false; } else @@ -16422,9 +16503,9 @@ op0 = XEXP (op0, 0), mode = GET_MODE (op0); } - *total = COSTS_N_INSNS (ix86_cost->mult_init[MODE_INDEX (mode)] - + nbits * ix86_cost->mult_bit) - + rtx_cost (op0, outer_code) + rtx_cost (op1, outer_code); + *total = (ix86_cost->mult_init[MODE_INDEX (mode)] + + nbits * ix86_cost->mult_bit + + rtx_cost (op0, outer_code) + rtx_cost (op1, outer_code)); return true; } @@ -16434,14 +16515,14 @@ case MOD: case UMOD: if (FLOAT_MODE_P (mode)) - *total = COSTS_N_INSNS (ix86_cost->fdiv); + *total = ix86_cost->fdiv; else - *total = COSTS_N_INSNS (ix86_cost->divide[MODE_INDEX (mode)]); + *total = ix86_cost->divide[MODE_INDEX (mode)]; return false; case PLUS: if (FLOAT_MODE_P (mode)) - *total = COSTS_N_INSNS (ix86_cost->fadd); + *total = ix86_cost->fadd; else if (GET_MODE_CLASS (mode) == MODE_INT && GET_MODE_BITSIZE (mode) <= GET_MODE_BITSIZE (Pmode)) { @@ -16453,7 +16534,7 @@ HOST_WIDE_INT val = INTVAL (XEXP (XEXP (XEXP (x, 0), 0), 1)); if (val == 2 || val == 4 || val == 8) { - *total = COSTS_N_INSNS (ix86_cost->lea); + *total = ix86_cost->lea; *total += rtx_cost (XEXP (XEXP (x, 0), 1), outer_code); *total += rtx_cost (XEXP (XEXP (XEXP (x, 0), 0), 0), outer_code); @@ -16467,7 +16548,7 @@ HOST_WIDE_INT val = INTVAL (XEXP (XEXP (x, 0), 1)); if (val == 2 || val == 4 || val == 8) { - *total = COSTS_N_INSNS (ix86_cost->lea); + *total = ix86_cost->lea; *total += rtx_cost (XEXP (XEXP (x, 0), 0), outer_code); *total += rtx_cost (XEXP (x, 1), outer_code); return true; @@ -16475,7 +16556,7 @@ } else if (GET_CODE (XEXP (x, 0)) == PLUS) { - *total = COSTS_N_INSNS (ix86_cost->lea); + *total = ix86_cost->lea; *total += rtx_cost (XEXP (XEXP (x, 0), 0), outer_code); *total += rtx_cost (XEXP (XEXP (x, 0), 1), outer_code); *total += rtx_cost (XEXP (x, 1), outer_code); @@ -16487,7 +16568,7 @@ case MINUS: if (FLOAT_MODE_P (mode)) { - *total = COSTS_N_INSNS (ix86_cost->fadd); + *total = ix86_cost->fadd; return false; } /* FALLTHRU */ @@ -16497,7 +16578,7 @@ case XOR: if (!TARGET_64BIT && mode == DImode) { - *total = (COSTS_N_INSNS (ix86_cost->add) * 2 + *total = (ix86_cost->add * 2 + (rtx_cost (XEXP (x, 0), outer_code) << (GET_MODE (XEXP (x, 0)) != DImode)) + (rtx_cost (XEXP (x, 1), outer_code) @@ -16509,16 +16590,16 @@ case NEG: if (FLOAT_MODE_P (mode)) { - *total = COSTS_N_INSNS (ix86_cost->fchs); + *total = ix86_cost->fchs; return false; } /* FALLTHRU */ case NOT: if (!TARGET_64BIT && mode == DImode) - *total = COSTS_N_INSNS (ix86_cost->add * 2); + *total = ix86_cost->add * 2; else - *total = COSTS_N_INSNS (ix86_cost->add); + *total = ix86_cost->add; return false; case COMPARE: @@ -16529,7 +16610,7 @@ { /* This kind of construct is implemented using test[bwl]. Treat it as if we had an AND. */ - *total = (COSTS_N_INSNS (ix86_cost->add) + *total = (ix86_cost->add + rtx_cost (XEXP (XEXP (x, 0), 0), outer_code) + rtx_cost (const1_rtx, outer_code)); return true; @@ -16545,12 +16626,12 @@ case ABS: if (FLOAT_MODE_P (mode)) - *total = COSTS_N_INSNS (ix86_cost->fabs); + *total = ix86_cost->fabs; return false; case SQRT: if (FLOAT_MODE_P (mode)) - *total = COSTS_N_INSNS (ix86_cost->fsqrt); + *total = ix86_cost->fsqrt; return false; case UNSPEC: gcc41-x86-mtune-generic2.patch: 0 files changed --- NEW FILE gcc41-x86-mtune-generic2.patch --- 2006-01-19 Jan Hubicka * i386.h (TARGET_DECOMPOSE_LEA): Kill. * i386.c (x86_decompose_lea): Kill. (ix86_rtx_costs): Kill. --- gcc/config/i386/i386.h (revision 109569) +++ gcc/config/i386/i386.h (revision 109581) @@ -209,7 +209,6 @@ #define TARGET_MEMORY_MISMATCH_STALL (x86_memory_mismatch_stall & TUNEMASK) #define TARGET_PROLOGUE_USING_MOVE (x86_prologue_using_move & TUNEMASK) #define TARGET_EPILOGUE_USING_MOVE (x86_epilogue_using_move & TUNEMASK) -#define TARGET_DECOMPOSE_LEA (x86_decompose_lea & TUNEMASK) #define TARGET_PREFETCH_SSE (x86_prefetch_sse) #define TARGET_SHIFT1 (x86_shift1 & TUNEMASK) #define TARGET_USE_FFREEP (x86_use_ffreep & TUNEMASK) --- gcc/config/i386/i386.c (revision 109569) +++ gcc/config/i386/i386.c (revision 109581) @@ -640,7 +640,6 @@ const int x86_accumulate_outgoing_args = m_ATHLON_K8 | m_PENT4 | m_NOCONA | m_PPRO; const int x86_prologue_using_move = m_ATHLON_K8 | m_PPRO; const int x86_epilogue_using_move = m_ATHLON_K8 | m_PPRO; -const int x86_decompose_lea = m_PENT4 | m_NOCONA; const int x86_shift1 = ~m_486; const int x86_arch_always_fancy_math_387 = m_PENT | m_PPRO | m_ATHLON_K8 | m_PENT4 | m_NOCONA; const int x86_sse_partial_reg_dependency = m_PENT4 | m_NOCONA | m_PPRO; @@ -16446,7 +16445,6 @@ return false; } if ((value == 2 || value == 3) - && !TARGET_DECOMPOSE_LEA && ix86_cost->lea <= ix86_cost->shift_const) { *total = ix86_cost->lea; gcc41-x86-mtune-generic3.patch: config.gcc | 36 ++++- config/i386/athlon.md | 195 +++++++++++++++--------------- config/i386/i386.c | 254 ++++++++++++++++++++++++++++++++++------ config/i386/i386.h | 19 ++ config/i386/i386.md | 26 ++-- config/i386/ppro.md | 172 +++++++++++++-------------- config/i386/predicates.md | 7 - doc/invoke.texi | 22 +++ testsuite/gcc.target/i386/lea.c | 2 9 files changed, 493 insertions(+), 240 deletions(-) --- NEW FILE gcc41-x86-mtune-generic3.patch --- gcc/ 2006-01-19 Jan Hubicka H.J. Lu Evandro Menezes * invoke.texi (generic): Document (i686) Update. * config.gcc: Make x86_64-* and i686-* default to generic tunning. * i386.h (TARGET_GENERIC32, TARGET_GENERIC64, TARGET_GENERIC, TARGET_USE_INCDEC, TARGET_PAD_RETURNS): New macros. (x86_use_incdec, x86_pad_returns): New variables (TARGET_CPU_DEFAULT_generic): New constant (TARGET_CPU_DEFAULT_NAMES): Add generic. (enum processor_type): Add generic32 and generic64. * i386.md (cpu attribute): Add generic32/generic64 (movhi splitter): Behave sanely when both partial_reg_dependency and partial_reg_stall are set. (K8 splitters): Enable for generic as well. * predicates.md (incdec_operand): Use TARGET_INCDEC (aligned_operand): Avoid memory mismatch stalls. * athlon.md: Enable for generic64, new patterns for 128bit moves. * ppro.md: Enable for generic32 * i386.c (generic64_cost, generic32_cost): New. (m_GENERIC32, m_GENERIC64, m_GENERIC): New macros. (x86_use_leave): Enable for generic64. (x86_use_sahf, x86_ext_80387_constants): Enable for generic32. (x86_push_memory, x86_movx, x86_unroll_strlen, x86_deep_branch, x86_use_simode_fiop, x86_use_cltd, x86_promote_QImode, x86_sub_esp_4, x86_sub_esp_8, x86_add_esp_4, x86_add_esp_8, x86_integer_DFmode_moves, x86_partial_reg_dependency, x86_memory_mismatch_stall, x86_accumulate_outgoing_args, x86_prologue_using_move, x86_epilogue_using_move, x86_arch_always_fancy_math_387, x86_sse_partial_reg_dependency, x86_four_jump_limit, x86_schedule): Enable for generic. (x86_use_incdec, x86_pad_returns): New. (override_options): Add generic32 and generic64, translate "generic" to generic32/generic64 and "i686" to "generic32", refuse "generic32"/"generic64" as arch target. (ix86_issue_rate, ix86_adjust_cost): Handle generic as athlon. (ix86_reorg): Honor PAD_RETURNS. gcc/testsuite/ 2006-01-19 Jan Hubicka * gcc.target/i386/lea.c: Test pentiumpro, not i686. --- gcc/config.gcc.jj 2006-01-19 06:45:43.000000000 -0800 +++ gcc/config.gcc 2006-01-19 10:07:57.000000000 -0800 @@ -2370,6 +2370,9 @@ if test x$with_cpu = x ; then # A Cirrus ARM variant. with_cpu="ep9312" ;; + i386-*-*) + with_cpu=i386 + ;; i486-*-*) with_cpu=i486 ;; @@ -2421,13 +2424,26 @@ if test x$with_cpu = x ; then pentium_m-*) with_cpu=pentium-m ;; - *) + pentiumpro-*) with_cpu=pentiumpro ;; + *) + with_cpu=generic + ;; esac ;; x86_64-*-*) - with_cpu=k8 + case ${target_noncanonical} in + k8-*|opteron-*|athlon_64-*) + with_cpu=k8 + ;; + nocona-*) + with_cpu=nocona + ;; + *) + with_cpu=generic + ;; + esac ;; alphaev6[78]*-*-*) with_cpu=ev67 @@ -2633,13 +2649,21 @@ case "${target}" in for which in arch cpu tune; do eval "val=\$with_$which" case ${val} in - "" | i386 | i486 \ + i386 | i486 \ | i586 | pentium | pentium-mmx | winchip-c6 | winchip2 \ | c3 | c3-2 | i686 | pentiumpro | pentium2 | pentium3 \ | pentium4 | k6 | k6-2 | k6-3 | athlon | athlon-tbird \ - | athlon-4 | athlon-xp | athlon-mp | k8 | opteron \ - | athlon64 | athlon-fx | prescott | pentium-m \ - | pentium4m | pentium3m| nocona) + | athlon-4 | athlon-xp | athlon-mp \ + | prescott | pentium-m | pentium4m | pentium3m) + case "${target}" in + x86_64-*-*) + echo "CPU given in --with-$which=$val doesn't support 64bit mode." 1>&2 + exit 1 + ;; + esac + # OK + ;; + "" | k8 | opteron | athlon64 | athlon-fx | nocona | generic) # OK ;; *) --- gcc/config/i386/athlon.md.jj 2006-01-28 12:50:29.000000000 +0100 +++ gcc/config/i386/athlon.md 2006-01-28 13:17:22.000000000 +0100 @@ -123,7 +123,7 @@ (define_cpu_unit "athlon-fmul" "athlon_fp") (define_cpu_unit "athlon-fstore" "athlon_fp") (define_reservation "athlon-fany" "(athlon-fstore | athlon-fmul | athlon-fadd)") -(define_reservation "athlon-faddmul" "(athlon-fmul | athlon-fadd)") +(define_reservation "athlon-faddmul" "(athlon-fadd | athlon-fmul)") ;; Vector operations usually consume many of pipes. (define_reservation "athlon-fvector" "(athlon-fadd + athlon-fmul + athlon-fstore)") @@ -131,26 +131,26 @@ ;; Jump instructions are executed in the branch unit completely transparent to us (define_insn_reservation "athlon_branch" 0 - (and (eq_attr "cpu" "athlon,k8") + (and (eq_attr "cpu" "athlon,k8,generic64") (eq_attr "type" "ibr")) "athlon-direct,athlon-ieu") (define_insn_reservation "athlon_call" 0 - (and (eq_attr "cpu" "athlon,k8") + (and (eq_attr "cpu" "athlon,k8,generic64") (eq_attr "type" "call,callv")) "athlon-vector,athlon-ieu") ;; Latency of push operation is 3 cycles, but ESP value is available ;; earlier (define_insn_reservation "athlon_push" 2 - (and (eq_attr "cpu" "athlon,k8") + (and (eq_attr "cpu" "athlon,k8,generic64") (eq_attr "type" "push")) "athlon-direct,athlon-agu,athlon-store") (define_insn_reservation "athlon_pop" 4 - (and (eq_attr "cpu" "athlon,k8") + (and (eq_attr "cpu" "athlon,k8,generic64") (eq_attr "type" "pop")) "athlon-vector,athlon-load,athlon-ieu") (define_insn_reservation "athlon_pop_k8" 3 - (and (eq_attr "cpu" "k8") + (and (eq_attr "cpu" "k8,generic64") (eq_attr "type" "pop")) "athlon-double,(athlon-ieu+athlon-load)") (define_insn_reservation "athlon_leave" 3 @@ -158,13 +158,13 @@ (eq_attr "type" "leave")) "athlon-vector,(athlon-ieu+athlon-load)") (define_insn_reservation "athlon_leave_k8" 3 - (and (eq_attr "cpu" "k8") + (and (eq_attr "cpu" "k8,generic64") (eq_attr "type" "leave")) "athlon-double,(athlon-ieu+athlon-load)") ;; Lea executes in AGU unit with 2 cycles latency. (define_insn_reservation "athlon_lea" 2 - (and (eq_attr "cpu" "athlon,k8") + (and (eq_attr "cpu" "athlon,k8,generic64") (eq_attr "type" "lea")) "athlon-direct,athlon-agu,nothing") @@ -176,13 +176,13 @@ "athlon-vector,athlon-ieu0,athlon-mult,nothing,nothing,athlon-ieu0") ;; ??? Widening multiply is vector or double. (define_insn_reservation "athlon_imul_k8_DI" 4 - (and (eq_attr "cpu" "k8") + (and (eq_attr "cpu" "k8,generic64") (and (eq_attr "type" "imul") (and (eq_attr "mode" "DI") (eq_attr "memory" "none,unknown")))) "athlon-direct0,athlon-ieu0,athlon-mult,nothing,athlon-ieu0") (define_insn_reservation "athlon_imul_k8" 3 - (and (eq_attr "cpu" "k8") + (and (eq_attr "cpu" "k8,generic64") (and (eq_attr "type" "imul") (eq_attr "memory" "none,unknown"))) "athlon-direct0,athlon-ieu0,athlon-mult,athlon-ieu0") @@ -192,13 +192,13 @@ (eq_attr "memory" "load,both"))) "athlon-vector,athlon-load,athlon-ieu,athlon-mult,nothing,nothing,athlon-ieu") (define_insn_reservation "athlon_imul_mem_k8_DI" 7 - (and (eq_attr "cpu" "k8") + (and (eq_attr "cpu" "k8,generic64") (and (eq_attr "type" "imul") (and (eq_attr "mode" "DI") (eq_attr "memory" "load,both")))) [...1715 lines suppressed...] - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "load") (and (eq_attr "mode" "V4SF") (eq_attr "type" "ssecmp")))) "decoder0,(p2+p1)*2") (define_insn_reservation "ppro_sse_cvt_V4SF" 3 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "none,unknown") (and (eq_attr "mode" "V4SF") (eq_attr "type" "ssecvt")))) "decoder0,p1*2") (define_insn_reservation "ppro_sse_cvt_V4SF_other" 4 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "!none,unknown") (and (eq_attr "mode" "V4SF") (eq_attr "type" "ssecmp")))) "decoder0,p1,p4+p3") (define_insn_reservation "ppro_sse_mul_V4SF" 5 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "none") (and (eq_attr "mode" "V4SF") (eq_attr "type" "ssemul")))) "decoder0,p0*2") (define_insn_reservation "ppro_sse_mul_V4SF_load" 5 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "load") (and (eq_attr "mode" "V4SF") (eq_attr "type" "ssemul")))) @@ -679,49 +679,49 @@ ;; FIXME: p0 really closed this long??? (define_insn_reservation "ppro_sse_div_V4SF" 48 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "none") (and (eq_attr "mode" "V4SF") (eq_attr "type" "ssediv")))) "decoder0,p0*34") (define_insn_reservation "ppro_sse_div_V4SF_load" 48 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "load") (and (eq_attr "mode" "V4SF") (eq_attr "type" "ssediv")))) "decoder0,(p2+p0)*2,p0*32") (define_insn_reservation "ppro_sse_log_V4SF" 2 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "none") (and (eq_attr "mode" "V4SF") (eq_attr "type" "sselog,sselog1")))) "decodern,p1") (define_insn_reservation "ppro_sse_log_V4SF_load" 2 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "load") (and (eq_attr "mode" "V4SF") (eq_attr "type" "sselog,sselog1")))) "decoder0,(p2+p1)") (define_insn_reservation "ppro_sse_mov_V4SF" 1 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "none") (and (eq_attr "mode" "V4SF") (eq_attr "type" "ssemov")))) "decoder0,(p0|p1)*2") (define_insn_reservation "ppro_sse_mov_V4SF_load" 2 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "load") (and (eq_attr "mode" "V4SF") (eq_attr "type" "ssemov")))) "decoder0,p2*2") (define_insn_reservation "ppro_sse_mov_V4SF_store" 3 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "store") (and (eq_attr "mode" "V4SF") (eq_attr "type" "ssemov")))) @@ -735,7 +735,7 @@ ;; reg-reg instructions produce 1 uop so they can be decoded on any of ;; the three decoders. (define_insn_reservation "ppro_insn" 1 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "none,unknown") (eq_attr "type" "alu,alu1,negnot,incdec,icmp,test,setcc,icmov,push,pop,fxch,sseiadd,sseishft,sseimul,mmx,mmxadd,mmxcmp"))) "decodern,(p0|p1)") @@ -743,13 +743,13 @@ ;; read-modify and register-memory instructions have 2 or three uops, ;; so they have to be decoded on decoder0. (define_insn_reservation "ppro_insn_load" 3 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "load") (eq_attr "type" "alu,alu1,negnot,incdec,icmp,test,setcc,icmov,push,pop,fxch,sseiadd,sseishft,sseimul,mmx,mmxadd,mmxcmp"))) "decoder0,p2+(p0|p1)") (define_insn_reservation "ppro_insn_store" 1 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "store") (eq_attr "type" "alu,alu1,negnot,incdec,icmp,test,setcc,icmov,push,pop,fxch,sseiadd,sseishft,sseimul,mmx,mmxadd,mmxcmp"))) "decoder0,(p0|p1),p4+p3") @@ -757,7 +757,7 @@ ;; read-modify-store instructions produce 4 uops so they have to be ;; decoded on decoder0 as well. (define_insn_reservation "ppro_insn_both" 4 - (and (eq_attr "cpu" "pentiumpro") + (and (eq_attr "cpu" "pentiumpro,generic32") (and (eq_attr "memory" "both") (eq_attr "type" "alu,alu1,negnot,incdec,icmp,test,setcc,icmov,push,pop,fxch,sseiadd,sseishft,sseimul,mmx,mmxadd,mmxcmp"))) "decoder0,p2+(p0|p1),p4+p3") --- gcc/config/i386/predicates.md.jj 2006-01-28 12:50:29.000000000 +0100 +++ gcc/config/i386/predicates.md 2006-01-28 13:17:22.000000000 +0100 @@ -614,7 +614,7 @@ { /* On Pentium4, the inc and dec operations causes extra dependency on flag registers, since carry flag is not set. */ - if ((TARGET_PENTIUM4 || TARGET_NOCONA) && !optimize_size) + if (!TARGET_USE_INCDEC && !optimize_size) return 0; return op == const1_rtx || op == constm1_rtx; }) @@ -693,6 +693,11 @@ if (GET_CODE (op) != MEM) return 1; + /* All patterns using aligned_operand on memory operands ends up + in promoting memory operand to 64bit and thus causing memory mismatch. */ + if (TARGET_MEMORY_MISMATCH_STALL && !optimize_size) + return 0; + /* Don't even try to do any aligned optimizations with volatiles. */ if (MEM_VOLATILE_P (op)) return 0; --- gcc/doc/invoke.texi.jj 2005-12-17 16:38:57.000000000 -0800 +++ gcc/doc/invoke.texi 2006-01-19 10:07:57.000000000 -0800 @@ -8993,6 +8993,23 @@ Tune to @var{cpu-type} everything applic for the ABI and the set of available instructions. The choices for @var{cpu-type} are: @table @emph + at item generic +Produce code optimized for the most common IA32/AMD64/EM64T processors. +If you know the CPU on which your code will run, then you should use +the corresponding @option{-mtune} option instead of + at option{-mtune=generic}. But, if you do not know exactly what CPU users +of your application will have, then you should use this option. + +As new processors are deployed in the marketplace, the behavior of this +option will change. Therefore, if you upgrade to a newer version of +GCC, the code generated option will change to reflect the processors +that were most common when that version of GCC was released. + +There is no @option{-march=generic} option because @option{-march} +indicates the instruction set the compiler can use, and there is no +generic instruction set applicable to all processors. In contrast, + at option{-mtune} indicates the processor (or, in this case, collection of +processors) for which the code is optimized. @item i386 Original Intel's i386 CPU at . @item i486 @@ -9001,8 +9018,11 @@ Intel's i486 CPU at . (No scheduling is im Intel Pentium CPU with no MMX support. @item pentium-mmx Intel PentiumMMX CPU based on Pentium core with MMX instruction set support. - at item i686, pentiumpro + at item pentiumpro Intel PentiumPro CPU at . + at item i686 +Same as @code{generic}, but when used as @code{march} option, PentiumPro +instruction set will be used, so the code will run on all i686 familly chips. @item pentium2 Intel Pentium2 CPU based on PentiumPro core with MMX instruction set support. @item pentium3, pentium3m --- gcc/testsuite/gcc.target/i386/lea.c.jj 2005-11-04 14:10:31.000000000 -0800 +++ gcc/testsuite/gcc.target/i386/lea.c 2006-01-19 13:10:18.000000000 -0800 @@ -1,6 +1,6 @@ /* { dg-do compile { target i?86-*-* x86_64-*-* } } */ /* { dg-require-effective-target ilp32 } */ -/* { dg-options "-O2 -march=i686" } */ +/* { dg-options "-O2 -march=pentiumpro" } */ /* { dg-final { scan-assembler "leal" } } */ typedef struct { char **visbuf; Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/.cvsignore,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- .cvsignore 28 Jan 2006 10:00:01 -0000 1.128 +++ .cvsignore 31 Jan 2006 14:29:33 -0000 1.129 @@ -1 +1 @@ -gcc-4.1.0-20060128.tar.bz2 +gcc-4.1.0-20060131.tar.bz2 gcc41-atomic-builtins.patch: s390/s390.c | 1 + sparc/sparc.c | 1 + 2 files changed, 2 insertions(+) Index: gcc41-atomic-builtins.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41-atomic-builtins.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc41-atomic-builtins.patch 28 Jan 2006 10:00:01 -0000 1.1 +++ gcc41-atomic-builtins.patch 31 Jan 2006 14:29:33 -0000 1.2 @@ -1,23 +1,9 @@ -2006-01-28 Jakub Jelinek +2006-01-31 Jakub Jelinek * config/s390/s390.c (init_alignment_context): Set ALIAS_SET_MEMORY_BARRIER on the MEM. * config/sparc/sparc.c (sparc_expand_compare_and_swap_12): Likewise. -2006-01-25 Richard Henderson - - * alias.h (ALIAS_SET_MEMORY_BARRIER): New. - * alias.c (true_dependence): Respect it. - (canon_true_dependence, write_dependence_p): Likewise. - * builtins.c (get_builtin_sync_mem): Set it. - -2006-01-03 Adrian Straetling - - * gcc/builtins.c (get_builtin_sync_mem): New function. - (expand_builtin_sync_operation, expand_builtin_compare_and_swap, - expand_builtin_lock_test_and_set, expand_builtin_lock_release): - Call get_builtin_sync_mem to generate mem rtx. - --- gcc/config/s390/s390.c.jj 2006-01-28 09:54:03.000000000 +0100 +++ gcc/config/s390/s390.c 2006-01-28 10:29:03.000000000 +0100 @@ -4030,6 +4030,7 @@ init_alignment_context (struct alignment @@ -38,171 +24,3 @@ MEM_VOLATILE_P (memsi) = MEM_VOLATILE_P (mem); val = force_reg (SImode, memsi); ---- gcc/builtins.c.jj 2006-01-28 09:54:07.000000000 +0100 -+++ gcc/builtins.c 2006-01-28 10:25:33.000000000 +0100 -@@ -5425,6 +5425,28 @@ get_builtin_sync_mode (int fcode_diff) - return mode_for_size (BITS_PER_UNIT << fcode_diff, MODE_INT, 0); - } - -+/* Expand the memory expression LOC and return the appropriate memory operand -+ for the builtin_sync operations. */ -+ -+static rtx -+get_builtin_sync_mem (tree loc, enum machine_mode mode) -+{ -+ rtx addr, mem; -+ -+ addr = expand_expr (loc, NULL, Pmode, EXPAND_SUM); -+ -+ /* Note that we explicitly do not want any alias information for this -+ memory, so that we kill all other live memories. Otherwise we don't -+ satisfy the full barrier semantics of the intrinsic. */ -+ mem = validize_mem (gen_rtx_MEM (mode, addr)); -+ -+ set_mem_align (mem, get_pointer_alignment (loc, BIGGEST_ALIGNMENT)); -+ set_mem_alias_set (mem, ALIAS_SET_MEMORY_BARRIER); -+ MEM_VOLATILE_P (mem) = 1; -+ -+ return mem; -+} -+ - /* Expand the __sync_xxx_and_fetch and __sync_fetch_and_xxx intrinsics. - ARGLIST is the operands list to the function. CODE is the rtx code - that corresponds to the arithmetic or logical operation from the name; -@@ -5438,20 +5460,14 @@ expand_builtin_sync_operation (enum mach - enum rtx_code code, bool after, - rtx target, bool ignore) - { -- rtx addr, val, mem; -+ rtx val, mem; - - /* Expand the operands. */ -- addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_SUM); -+ mem = get_builtin_sync_mem (TREE_VALUE (arglist), mode); - - arglist = TREE_CHAIN (arglist); - val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL); - -- /* Note that we explicitly do not want any alias information for this -- memory, so that we kill all other live memories. Otherwise we don't -- satisfy the full barrier semantics of the intrinsic. */ -- mem = validize_mem (gen_rtx_MEM (mode, addr)); -- MEM_VOLATILE_P (mem) = 1; -- - if (ignore) - return expand_sync_operation (mem, val, code); - else -@@ -5467,10 +5483,10 @@ static rtx - expand_builtin_compare_and_swap (enum machine_mode mode, tree arglist, - bool is_bool, rtx target) - { -- rtx addr, old_val, new_val, mem; -+ rtx old_val, new_val, mem; - - /* Expand the operands. */ -- addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_SUM); -+ mem = get_builtin_sync_mem (TREE_VALUE (arglist), mode); - - arglist = TREE_CHAIN (arglist); - old_val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL); -@@ -5478,12 +5494,6 @@ expand_builtin_compare_and_swap (enum ma - arglist = TREE_CHAIN (arglist); - new_val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL); - -- /* Note that we explicitly do not want any alias information for this -- memory, so that we kill all other live memories. Otherwise we don't -- satisfy the full barrier semantics of the intrinsic. */ -- mem = validize_mem (gen_rtx_MEM (mode, addr)); -- MEM_VOLATILE_P (mem) = 1; -- - if (is_bool) - return expand_bool_compare_and_swap (mem, old_val, new_val, target); - else -@@ -5500,20 +5510,14 @@ static rtx - expand_builtin_lock_test_and_set (enum machine_mode mode, tree arglist, - rtx target) - { -- rtx addr, val, mem; -+ rtx val, mem; - - /* Expand the operands. */ -- addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_NORMAL); -+ mem = get_builtin_sync_mem (TREE_VALUE (arglist), mode); - - arglist = TREE_CHAIN (arglist); - val = expand_expr (TREE_VALUE (arglist), NULL, mode, EXPAND_NORMAL); - -- /* Note that we explicitly do not want any alias information for this -- memory, so that we kill all other live memories. Otherwise we don't -- satisfy the barrier semantics of the intrinsic. */ -- mem = validize_mem (gen_rtx_MEM (mode, addr)); -- MEM_VOLATILE_P (mem) = 1; -- - return expand_sync_lock_test_and_set (mem, val, target); - } - -@@ -5547,17 +5551,11 @@ static void - expand_builtin_lock_release (enum machine_mode mode, tree arglist) - { - enum insn_code icode; -- rtx addr, mem, insn; -+ rtx mem, insn; - rtx val = const0_rtx; - - /* Expand the operands. */ -- addr = expand_expr (TREE_VALUE (arglist), NULL, Pmode, EXPAND_NORMAL); -- -- /* Note that we explicitly do not want any alias information for this -- memory, so that we kill all other live memories. Otherwise we don't -- satisfy the barrier semantics of the intrinsic. */ -- mem = validize_mem (gen_rtx_MEM (mode, addr)); -- MEM_VOLATILE_P (mem) = 1; -+ mem = get_builtin_sync_mem (TREE_VALUE (arglist), mode); - - /* If there is an explicit operation in the md file, use it. */ - icode = sync_lock_release[mode]; ---- gcc/alias.c.jj 2006-01-28 09:54:07.000000000 +0100 -+++ gcc/alias.c 2006-01-28 10:25:33.000000000 +0100 -@@ -2209,6 +2209,9 @@ true_dependence (rtx mem, enum machine_m - return 1; - if (GET_MODE (mem) == BLKmode && GET_CODE (XEXP (mem, 0)) == SCRATCH) - return 1; -+ if (MEM_ALIAS_SET (x) == ALIAS_SET_MEMORY_BARRIER -+ || MEM_ALIAS_SET (mem) == ALIAS_SET_MEMORY_BARRIER) -+ return 1; - - if (DIFFERENT_ALIAS_SETS_P (x, mem)) - return 0; -@@ -2282,6 +2285,9 @@ canon_true_dependence (rtx mem, enum mac - return 1; - if (GET_MODE (mem) == BLKmode && GET_CODE (XEXP (mem, 0)) == SCRATCH) - return 1; -+ if (MEM_ALIAS_SET (x) == ALIAS_SET_MEMORY_BARRIER -+ || MEM_ALIAS_SET (mem) == ALIAS_SET_MEMORY_BARRIER) -+ return 1; - - if (DIFFERENT_ALIAS_SETS_P (x, mem)) - return 0; -@@ -2341,6 +2347,9 @@ write_dependence_p (rtx mem, rtx x, int - return 1; - if (GET_MODE (mem) == BLKmode && GET_CODE (XEXP (mem, 0)) == SCRATCH) - return 1; -+ if (MEM_ALIAS_SET (x) == ALIAS_SET_MEMORY_BARRIER -+ || MEM_ALIAS_SET (mem) == ALIAS_SET_MEMORY_BARRIER) -+ return 1; - - if (DIFFERENT_ALIAS_SETS_P (x, mem)) - return 0; ---- gcc/alias.h.jj 2006-01-28 09:54:07.000000000 +0100 -+++ gcc/alias.h 2006-01-28 10:25:33.000000000 +0100 -@@ -27,4 +27,10 @@ extern HOST_WIDE_INT get_frame_alias_set - extern void record_base_value (unsigned int, rtx, int); - extern bool component_uses_parent_alias_set (tree); - -+/* This alias set can be used to force a memory to conflict with all -+ other memories, creating a barrier across which no memory reference -+ can move. Note that there are other legacy ways to create such -+ memory barriers, including an address of SCRATCH. */ -+#define ALIAS_SET_MEMORY_BARRIER ((HOST_WIDE_INT) -1) -+ - #endif /* GCC_ALIAS_H */ gcc41-s390-ldbl.patch: config/s390/2084.md | 44 +++ config/s390/fixdfdi.h | 151 ++++++++++++ config/s390/libgcc-glibc.ver | 33 ++ config/s390/s390.c | 62 ++++- config/s390/s390.h | 48 ++- config/s390/s390.md | 529 +++++++++++++++++++++++++++++++++---------- config/s390/s390.opt | 10 config/s390/t-crtstuff | 1 doc/invoke.texi | 10 9 files changed, 742 insertions(+), 146 deletions(-) Index: gcc41-s390-ldbl.patch =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41-s390-ldbl.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gcc41-s390-ldbl.patch 28 Jan 2006 10:10:48 -0000 1.2 +++ gcc41-s390-ldbl.patch 31 Jan 2006 14:29:33 -0000 1.3 @@ -1,9 +1,10 @@ -2006-01-27 Andreas Krebbel - Ulrich Weigand +2006-01-31 Andreas Krebbel + Ulrich Weigand * config/s390/2084.md ("x_fsimptf", "x_fmultf", "x_fdivtf", "x_floadtf", "x_ftrunctf", "x_ftruncdf"): New insn reservations. - * config/s390/s390.c (struct processor_costs): Add mxbr, sqxbr, dxbr + * config/s390/fixdfdi.h (__fixunstfdi, __fixtfdi): New functions. + * config/s390/s390.c (struct processor_costs): Add mxbr, sqxbr, dxbr and dxr fields. (z900_cost, z990_cost, z9_109_cost): Values for the new fields added. (s390_rtx_costs): Use the new fields to calculate rtx costs. @@ -15,145 +16,94 @@ builtin define. (LONG_DOUBLE_TYPE_SIZE): Set to 128 or 64. (LIBGCC2_LONG_DOUBLE_TYPE_SIZE, WIDEST_HARDWARE_FP_SIZE): Define. - (HARD_REGNO_NREGS, HARD_REGNO_MODE_OK, CLASS_MAX_NREGS, + (HARD_REGNO_NREGS, HARD_REGNO_MODE_OK, CLASS_MAX_NREGS, CANNOT_CHANGE_MODE_CLASS): Consider TFmode. - * config/s390/s390.md ("type" attribute): Add fsimptf, floadtf, fmultf, + * config/s390/s390.md ("type" attribute): Add fsimptf, floadtf, fmultf, fdivtf, fsqrttf, ftrunctf, ftruncdf as possible values. (FPR mode macro): Add TFmode. (DSF mode macro): New. (, mode attributes): Removed. (, , , , mode attributes): New. - ("*cmp_ccs_0", "*cmp_ccs_0_ibm", "*cmp_ccs", - "*cmp_ccs_ibm", "fix_trunc2_ieee", - "floatdi2", "floatsi2_ieee", "*add3", - "*add3_cc", "*add3_cconly", "*add3_ibm", - "*sub3", "*sub3_cc", "*sub3_cconly", + ("*cmp_ccs_0", "*cmp_ccs_0_ibm", "*cmp_ccs", + "*cmp_ccs_ibm", "fix_trunc2_ieee", + "floatdi2", "floatsi2_ieee", "*add3", + "*add3_cc", "*add3_cconly", "*add3_ibm", + "*sub3", "*sub3_cc", "*sub3_cconly", "*sub3_ibm", "*mul3_ibm", "*fmadd", "*fmsub", - "*div3", "*div3_ibm", "*neg2_cc", - "*neg2_cconly", "*neg2", "*neg2_ibm", + "*div3", "*div3_ibm", "*neg2_cc", + "*neg2_cconly", "*neg2", "*neg2_ibm", "*abs2_cc", "*abs2_cconly", "*abs2", - "*abs2_ibm", "*negabs2_cc", "*negabs2_cconly", + "*abs2_ibm", "*negabs2_cc", "*negabs2_cconly", "*negabs2", "sqrt2"): Changed to . R constraint replaced by . - ("*mul3"): Changed to . R constraint replaced by + ("*mul3"): Changed to . R constraint replaced by . ("fix_truncdi2"): 'FPR:' removed. - ("*fmadd", "*fmsub"): FPR mode replaced by DSF. - ("movtf"): New insn definition followed by 2 new splitters. - ("reload_outtf", "reload_intf", "trunctfdf2", "trunctfsf2", + ("*fmadd", "*fmsub"): FPR mode replaced by DSF. + ("*movtf_64", "*movtf_31"): New insn definitions followed by 5 + splitters. + ("movtf", "reload_outtf", "reload_intf", "trunctfdf2", "trunctfsf2", "extenddftf2", "extendsftf2"): New expanders. - ("*trunctfdf2_ieee", "*trunctfdf2_ibm", "*trunctfsf2_ieee", + ("*trunctfdf2_ieee", "*trunctfdf2_ibm", "*trunctfsf2_ieee", "*trunctfsf2_ibm", "*extenddftf2_ieee", "*extenddftf2_ibm", "*extendsftf2_ieee", "*extendsftf2_ibm"): New insn patterns. * config/s390/s390.opt (mlong-double-128, mlong-double-64): New options. * config/s390/t-crtstuff (TARGET_LIBGCC2_CFLAGS): Macro defined. - * config/s390/libgcc-glibc.ver (__divtc3, __multc3, __powitf2, + * config/s390/libgcc-glibc.ver (__divtc3, __multc3, __powitf2, __fixtfti, __fixunstfti, __floattitf, __fixtfdi, __fixunstfdi, __floatditf): Add a GCC_4.1.0 symbol version tag. + * doc/invoke.texi (-mlong-double-128, -mlong-double-64): Document + the new options. ---- gcc/config/s390/2084.md.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/config/s390/2084.md 2006-01-28 10:39:11.000000000 +0100 -@@ -161,6 +161,11 @@ - ;; Floating point insns - ;; - -+(define_insn_reservation "x_fsimptf" 7 -+ (and (eq_attr "cpu" "z990,z9_109") -+ (eq_attr "type" "fsimptf")) -+ "x_e1_t*2,x-wr-fp") -+ - (define_insn_reservation "x_fsimpdf" 6 - (and (eq_attr "cpu" "z990,z9_109") - (eq_attr "type" "fsimpdf,fmuldf")) -@@ -171,6 +176,18 @@ - (eq_attr "type" "fsimpsf,fmulsf")) - "x_e1_t,x-wr-fp") - -+ -+(define_insn_reservation "x_fmultf" 33 -+ (and (eq_attr "cpu" "z990,z9_109") -+ (eq_attr "type" "fmultf")) -+ "x_e1_t*27,x-wr-fp") -+ -+ -+(define_insn_reservation "x_fdivtf" 82 -+ (and (eq_attr "cpu" "z990,z9_109") -+ (eq_attr "type" "fdivtf,fsqrttf")) -+ "x_e1_t*76,x-wr-fp") -+ - (define_insn_reservation "x_fdivdf" 36 - (and (eq_attr "cpu" "z990,z9_109") - (eq_attr "type" "fdivdf,fsqrtdf")) -@@ -181,6 +198,12 @@ - (eq_attr "type" "fdivsf,fsqrtsf")) - "x_e1_t*30,x-wr-fp") - -+ -+(define_insn_reservation "x_floadtf" 6 -+ (and (eq_attr "cpu" "z990,z9_109") -+ (eq_attr "type" "floadtf")) -+ "x_e1_t,x-wr-fp") -+ - (define_insn_reservation "x_floaddf" 6 - (and (eq_attr "cpu" "z990,z9_109") - (eq_attr "type" "floaddf")) -@@ -191,6 +214,7 @@ - (eq_attr "type" "floadsf")) - "x_e1_t,x-wr-fp") +--- gcc/config/s390/libgcc-glibc.ver.jj 2006-01-31 14:38:38.000000000 +0100 ++++ gcc/config/s390/libgcc-glibc.ver 2006-01-31 15:07:03.000000000 +0100 +@@ -39,3 +39,36 @@ GLIBC_2.2 { + } + %endif ++# With GCC 4.1.0 long double 128 bit support was introduced. The ++# following symbols coming from libgcc are enabled when -mlong-double-128 ++# is specified. These lines make the symbols to get a @@GCC_4.1.0 attached. + - (define_insn_reservation "x_fstoredf" 1 - (and (eq_attr "cpu" "z990,z9_109") - (eq_attr "type" "fstoredf")) -@@ -201,6 +225,18 @@ - (eq_attr "type" "fstoresf")) - "x_e1_t,x-wr-fp") - ++%exclude { ++ __divtc3 ++ __multc3 ++ __powitf2 ++ __fixtfti ++ __fixunstfti ++ __floattitf + -+(define_insn_reservation "x_ftrunctf" 16 -+ (and (eq_attr "cpu" "z990,z9_109") -+ (eq_attr "type" "ftrunctf")) -+ "x_e1_t*10,x-wr-fp") ++ __fixtfdi ++ __fixunstfdi ++ __floatditf ++} + -+(define_insn_reservation "x_ftruncdf" 11 -+ (and (eq_attr "cpu" "z990,z9_109") -+ (eq_attr "type" "ftruncdf")) -+ "x_e1_t*5,x-wr-fp") ++GCC_4.1.0 { ++ __divtc3 ++ __multc3 ++ __powitf2 + ++%ifdef __s390x__ ++ __fixtfti ++ __fixunstfti ++ __floattitf + - (define_insn_reservation "x_ftoi" 1 - (and (eq_attr "cpu" "z990,z9_109") - (eq_attr "type" "ftoi")) -@@ -234,7 +270,7 @@ - "s390_agen_dep_p") - - (define_bypass 9 "x_int,x_agen,x_lr" -- "x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ -+ "x_floadtf, x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ - x_fsimpdf, x_fsimpsf, x_fdivdf, x_fdivsf" - "s390_agen_dep_p") - ;; -@@ -247,7 +283,7 @@ - "s390_agen_dep_p") - - (define_bypass 5 "x_load" -- "x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ -+ "x_floadtf, x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ - x_fsimpdf, x_fsimpsf, x_fdivdf, x_fdivsf" - "s390_agen_dep_p") - -@@ -261,7 +297,7 @@ - "s390_agen_dep_p") - - (define_bypass 5 "x_larl, x_la" -- "x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ -+ "x_floadtf, x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ - x_fsimpdf, x_fsimpsf, x_fdivdf, x_fdivsf" - "s390_agen_dep_p") - ---- gcc/config/s390/s390.c.jj 2006-01-28 10:29:03.000000000 +0100 -+++ gcc/config/s390/s390.c 2006-01-28 10:39:11.000000000 +0100 ++%else ++ __fixtfdi ++ __fixunstfdi ++ __floatditf ++%endif ++} +--- gcc/config/s390/s390.c.jj 2006-01-31 14:38:39.000000000 +0100 ++++ gcc/config/s390/s390.c 2006-01-31 15:07:03.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Subroutines used for code generation on IBM S/390 and zSeries +- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + Contributed by Hartmut Penner (hpenner at de.ibm.com) and + Ulrich Weigand (uweigand at de.ibm.com). @@ -71,13 +71,17 @@ struct processor_costs const int msgr; /* cost of an MSGR instruction. */ const int msr; /* cost of an MSR instruction. */ @@ -217,7 +167,7 @@ COSTS_N_INSNS (40), /* DDBR */ COSTS_N_INSNS (37), /* DDR */ COSTS_N_INSNS (26), /* DDBR */ -@@ -2154,6 +2170,9 @@ s390_rtx_costs (rtx x, int code, int out +@@ -2159,6 +2175,9 @@ s390_rtx_costs (rtx x, int code, int out case DFmode: *total = s390_cost->mult_df; break; @@ -227,7 +177,7 @@ default: return false; } -@@ -2204,13 +2223,22 @@ s390_rtx_costs (rtx x, int code, int out +@@ -2209,13 +2228,22 @@ s390_rtx_costs (rtx x, int code, int out else /* TARGET_IBM_FLOAT */ *total = s390_cost->ddr; } @@ -251,7 +201,7 @@ return false; case SIGN_EXTEND: -@@ -2565,6 +2593,18 @@ s390_secondary_input_reload_class (enum +@@ -2570,6 +2598,18 @@ s390_secondary_input_reload_class (enum if (s390_plus_operand (in, mode)) return ADDR_REGS; @@ -270,7 +220,16 @@ if (reg_classes_intersect_p (CC_REGS, class)) return GENERAL_REGS; -@@ -2592,6 +2632,18 @@ s390_secondary_output_reload_class (enum +@@ -2586,7 +2626,7 @@ enum reg_class + s390_secondary_output_reload_class (enum reg_class class, + enum machine_mode mode, rtx out) + { +- if ((TARGET_64BIT ? mode == TImode ++ if ((TARGET_64BIT ? (mode == TImode || mode == TFmode) + : (mode == DImode || mode == DFmode)) + && reg_classes_intersect_p (GENERAL_REGS, class) + && GET_CODE (out) == MEM +@@ -2597,6 +2637,18 @@ s390_secondary_output_reload_class (enum + GET_MODE_SIZE (mode) - 1)) return ADDR_REGS; @@ -289,7 +248,7 @@ if (reg_classes_intersect_p (CC_REGS, class)) return GENERAL_REGS; -@@ -5164,10 +5216,10 @@ replace_ltrel_base (rtx *x) +@@ -5168,10 +5220,10 @@ replace_ltrel_base (rtx *x) /* We keep a list of constants which we have to add to internal constant tables in the middle of large functions. */ @@ -302,107 +261,154 @@ DFmode, DImode, SFmode, SImode, HImode, ---- gcc/config/s390/s390.h.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/config/s390/s390.h 2006-01-28 10:39:11.000000000 +0100 -@@ -93,6 +93,8 @@ extern enum processor_flags s390_arch_fl - builtin_define ("__s390__"); \ - if (TARGET_64BIT) \ - builtin_define ("__s390x__"); \ -+ if (TARGET_LONG_DOUBLE_128) \ -+ builtin_define ("__LONG_DOUBLE_128__"); \ - } \ - while (0) +--- gcc/config/s390/s390.opt.jj 2006-01-31 14:38:39.000000000 +0100 ++++ gcc/config/s390/s390.opt 2006-01-31 15:07:03.000000000 +0100 +@@ -1,6 +1,6 @@ + ; Options for the S/390 / zSeries port of the compiler. -@@ -216,7 +218,18 @@ if (INTEGRAL_MODE_P (MODE) && - #define LONG_LONG_TYPE_SIZE 64 - #define FLOAT_TYPE_SIZE 32 - #define DOUBLE_TYPE_SIZE 64 --#define LONG_DOUBLE_TYPE_SIZE 64 /* ??? Should support extended format. */ -+#define LONG_DOUBLE_TYPE_SIZE (TARGET_LONG_DOUBLE_128 ? 128 : 64) +-; Copyright (C) 2005 Free Software Foundation, Inc. ++; Copyright (C) 2005, 2006 Free Software Foundation, Inc. + ; + ; This file is part of GCC. + ; +@@ -51,6 +51,14 @@ mhard-float + Target Report RejectNegative Mask(HARD_FLOAT) + Use hardware fp + ++mlong-double-128 ++Target Report RejectNegative Mask(LONG_DOUBLE_128) ++Use 128-bit long double + -+/* Define this to set long double type size to use in libgcc2.c, which can -+ not depend on target_flags. */ -+#ifdef __LONG_DOUBLE_128__ -+#define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 128 -+#else -+#define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64 -+#endif ++mlong-double-64 ++Target Report RejectNegative InverseMask(LONG_DOUBLE_128) ++Use 64-bit long double + -+/* Work around target_flags dependency in ada/targtyps.c. */ -+#define WIDEST_HARDWARE_FP_SIZE 64 + mpacked-stack + Target Report Mask(PACKED_STACK) + Use packed stack layout +--- gcc/config/s390/2084.md.jj 2006-01-31 14:38:39.000000000 +0100 ++++ gcc/config/s390/2084.md 2006-01-31 15:07:03.000000000 +0100 +@@ -1,5 +1,5 @@ + ;; Scheduling description for z990 (cpu 2084). +-;; Copyright (C) 2003,2004, 2005 Free Software Foundation, Inc. ++;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + ;; Contributed by Hartmut Penner (hpenner at de.ibm.com) and + ;; Ulrich Weigand (uweigand at de.ibm.com). - /* We use "unsigned char" as default. */ - #define DEFAULT_SIGNED_CHAR 0 -@@ -334,28 +347,34 @@ if (INTEGRAL_MODE_P (MODE) && - Floating point modes <= word size fit into any FPR or GPR. - Floating point modes > word size (i.e. DFmode on 32-bit) fit - into any FPR, or an even-odd GPR pair. -+ TFmode fits only into an even-odd FPR pair. +@@ -161,6 +161,11 @@ + ;; Floating point insns + ;; - Complex floating point modes fit either into two FPRs, or into - successive GPRs (again starting with an even number). -+ TCmode fits only into two successive even-odd FPR pairs. ++(define_insn_reservation "x_fsimptf" 7 ++ (and (eq_attr "cpu" "z990,z9_109") ++ (eq_attr "type" "fsimptf")) ++ "x_e1_t*2,x-wr-fp") ++ + (define_insn_reservation "x_fsimpdf" 6 + (and (eq_attr "cpu" "z990,z9_109") + (eq_attr "type" "fsimpdf,fmuldf")) +@@ -171,6 +176,18 @@ + (eq_attr "type" "fsimpsf,fmulsf")) + "x_e1_t,x-wr-fp") - Condition code modes fit only into the CC register. */ ++ ++(define_insn_reservation "x_fmultf" 33 ++ (and (eq_attr "cpu" "z990,z9_109") ++ (eq_attr "type" "fmultf")) ++ "x_e1_t*27,x-wr-fp") ++ ++ ++(define_insn_reservation "x_fdivtf" 82 ++ (and (eq_attr "cpu" "z990,z9_109") ++ (eq_attr "type" "fdivtf,fsqrttf")) ++ "x_e1_t*76,x-wr-fp") ++ + (define_insn_reservation "x_fdivdf" 36 + (and (eq_attr "cpu" "z990,z9_109") + (eq_attr "type" "fdivdf,fsqrtdf")) +@@ -181,6 +198,12 @@ + (eq_attr "type" "fdivsf,fsqrtsf")) + "x_e1_t*30,x-wr-fp") - #define HARD_REGNO_NREGS(REGNO, MODE) \ - (FP_REGNO_P(REGNO)? \ -- (GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT ? 2 : 1) : \ -+ (GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT ? \ -+ 2 * ((GET_MODE_SIZE(MODE) / 2 + 8 - 1) / 8) : \ -+ ((GET_MODE_SIZE(MODE) + 8 - 1) / 8)) : \ - GENERAL_REGNO_P(REGNO)? \ - ((GET_MODE_SIZE(MODE)+UNITS_PER_WORD-1) / UNITS_PER_WORD) : \ - ACCESS_REGNO_P(REGNO)? \ -- ((GET_MODE_SIZE(MODE)+4-1) / 4) : \ -+ ((GET_MODE_SIZE(MODE) + 4 - 1) / 4) : \ - 1) ++ ++(define_insn_reservation "x_floadtf" 6 ++ (and (eq_attr "cpu" "z990,z9_109") ++ (eq_attr "type" "floadtf")) ++ "x_e1_t,x-wr-fp") ++ + (define_insn_reservation "x_floaddf" 6 + (and (eq_attr "cpu" "z990,z9_109") + (eq_attr "type" "floaddf")) +@@ -191,6 +214,7 @@ + (eq_attr "type" "floadsf")) + "x_e1_t,x-wr-fp") - #define HARD_REGNO_MODE_OK(REGNO, MODE) \ - (FP_REGNO_P(REGNO)? \ -- ((MODE) == SImode || (MODE) == DImode || \ -- GET_MODE_CLASS(MODE) == MODE_FLOAT || \ -- GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT) : \ -+ (((MODE) == SImode || (MODE) == DImode \ -+ || GET_MODE_CLASS(MODE) == MODE_FLOAT \ -+ || GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT) \ -+ && (HARD_REGNO_NREGS(REGNO, MODE) == 1 || !((REGNO) & 1))) : \ - GENERAL_REGNO_P(REGNO)? \ -- (HARD_REGNO_NREGS(REGNO, MODE) == 1 || !((REGNO) & 1)) : \ -+ ((HARD_REGNO_NREGS(REGNO, MODE) == 1 || !((REGNO) & 1)) \ -+ && (MODE) != TFmode && (MODE) != TCmode) : \ - CC_REGNO_P(REGNO)? \ - GET_MODE_CLASS (MODE) == MODE_CC : \ - FRAME_REGNO_P(REGNO)? \ -@@ -376,7 +395,9 @@ if (INTEGRAL_MODE_P (MODE) && - in a register of class CLASS. */ - #define CLASS_MAX_NREGS(CLASS, MODE) \ - ((CLASS) == FP_REGS ? \ -- (GET_MODE_CLASS (MODE) == MODE_COMPLEX_FLOAT ? 2 : 1) : \ -+ (GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT ? \ -+ 2 * (GET_MODE_SIZE (MODE) / 2 + 8 - 1) / 8 : \ -+ (GET_MODE_SIZE (MODE) + 8 - 1) / 8) : \ - (CLASS) == ACCESS_REGS ? \ - (GET_MODE_SIZE (MODE) + 4 - 1) / 4 : \ - (GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD) -@@ -386,10 +407,11 @@ if (INTEGRAL_MODE_P (MODE) && - cannot use SUBREGs to switch between modes in FP registers. - Likewise for access registers, since they have only half the - word size on 64-bit. */ --#define CANNOT_CHANGE_MODE_CLASS(FROM, TO, CLASS) \ -- (GET_MODE_SIZE (FROM) != GET_MODE_SIZE (TO) \ -- ? reg_classes_intersect_p (FP_REGS, CLASS) \ -- || reg_classes_intersect_p (ACCESS_REGS, CLASS) : 0) -+#define CANNOT_CHANGE_MODE_CLASS(FROM, TO, CLASS) \ -+ (GET_MODE_SIZE (FROM) != GET_MODE_SIZE (TO) \ -+ ? ((reg_classes_intersect_p (FP_REGS, CLASS) \ -+ && (GET_MODE_SIZE (FROM) < 8 || GET_MODE_SIZE (TO) < 8)) \ -+ || reg_classes_intersect_p (ACCESS_REGS, CLASS)) : 0) ++ + (define_insn_reservation "x_fstoredf" 1 + (and (eq_attr "cpu" "z990,z9_109") + (eq_attr "type" "fstoredf")) +@@ -201,6 +225,18 @@ + (eq_attr "type" "fstoresf")) + "x_e1_t,x-wr-fp") - /* Register classes. */ ++ ++(define_insn_reservation "x_ftrunctf" 16 ++ (and (eq_attr "cpu" "z990,z9_109") ++ (eq_attr "type" "ftrunctf")) ++ "x_e1_t*10,x-wr-fp") ++ ++(define_insn_reservation "x_ftruncdf" 11 ++ (and (eq_attr "cpu" "z990,z9_109") ++ (eq_attr "type" "ftruncdf")) ++ "x_e1_t*5,x-wr-fp") ++ ++ + (define_insn_reservation "x_ftoi" 1 + (and (eq_attr "cpu" "z990,z9_109") + (eq_attr "type" "ftoi")) +@@ -234,7 +270,7 @@ + "s390_agen_dep_p") + + (define_bypass 9 "x_int,x_agen,x_lr" +- "x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ ++ "x_floadtf, x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ + x_fsimpdf, x_fsimpsf, x_fdivdf, x_fdivsf" + "s390_agen_dep_p") + ;; +@@ -247,7 +283,7 @@ + "s390_agen_dep_p") + + (define_bypass 5 "x_load" +- "x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ ++ "x_floadtf, x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ + x_fsimpdf, x_fsimpsf, x_fdivdf, x_fdivsf" + "s390_agen_dep_p") + +@@ -261,7 +297,7 @@ + "s390_agen_dep_p") + + (define_bypass 5 "x_larl, x_la" +- "x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ ++ "x_floadtf, x_floaddf, x_floadsf, x_fstoredf, x_fstoresf,\ + x_fsimpdf, x_fsimpsf, x_fdivdf, x_fdivsf" + "s390_agen_dep_p") ---- gcc/config/s390/s390.md.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/config/s390/s390.md 2006-01-28 10:39:11.000000000 +0100 +--- gcc/config/s390/t-crtstuff.jj 2006-01-31 14:38:39.000000000 +0100 ++++ gcc/config/s390/t-crtstuff 2006-01-31 15:07:03.000000000 +0100 +@@ -2,3 +2,4 @@ + # because then __FRAME_END__ might not be the last thing in .eh_frame + # section. + CRTSTUFF_T_CFLAGS = -fno-asynchronous-unwind-tables ++TARGET_LIBGCC2_CFLAGS += -mlong-double-128 +--- gcc/config/s390/s390.md.jj 2006-01-31 14:38:39.000000000 +0100 ++++ gcc/config/s390/s390.md 2006-01-31 15:07:03.000000000 +0100 +@@ -1,5 +1,5 @@ + ;;- Machine description for GNU compiler -- S/390 / zSeries version. +-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + ;; Free Software Foundation, Inc. + ;; Contributed by Hartmut Penner (hpenner at de.ibm.com) and + ;; Ulrich Weigand (uweigand at de.ibm.com). @@ -199,11 +199,11 @@ (define_attr "type" "none,integer,load,lr,la,larl,lm,stm, cs,vs,store,sem,idiv, @@ -512,17 +518,40 @@ (set_attr "type" "fsimp")]) -@@ -1483,6 +1493,79 @@ +@@ -1483,6 +1493,149 @@ (set_attr "type" "lr,load,load,*")]) ; +; movtf instruction pattern(s). +; + -+(define_insn "movtf" ++(define_expand "movtf" ++ [(set (match_operand:TF 0 "nonimmediate_operand" "") ++ (match_operand:TF 1 "general_operand" ""))] ++ "" ++ "") ++ ++(define_insn "*movtf_64" ++ [(set (match_operand:TF 0 "nonimmediate_operand" "=f,f,f,o,d,QS,d,o,Q") ++ (match_operand:TF 1 "general_operand" "G,f,o,f,QS,d,dm,d,Q"))] ++ "TARGET_64BIT" ++ "@ ++ lzxr\t%0 ++ lxr\t%0,%1 ++ # ++ # ++ lmg\t%0,%N0,%S1 ++ stmg\t%1,%N1,%S0 ++ # ++ # ++ #" ++ [(set_attr "op_type" "RRE,RRE,*,*,RSY,RSY,*,*,*") ++ (set_attr "type" "fsimptf,fsimptf,*,*,lm,stm,*,*,*")]) ++ ++(define_insn "*movtf_31" + [(set (match_operand:TF 0 "nonimmediate_operand" "=f,f,f,o,Q") + (match_operand:TF 1 "general_operand" "G,f,o,f,Q"))] -+ "" ++ "!TARGET_64BIT" + "@ + lzxr\t%0 + lxr\t%0,%1 @@ -530,12 +559,58 @@ + # + #" + [(set_attr "op_type" "RRE,RRE,*,*,*") -+ (set_attr "type" "fsimptf,fsimptf,*,*,*")]) ++ (set_attr "type" "fsimptf,fsimptf,*,*,*")]) ++ ++; TFmode in GPRs splitters ++ ++(define_split ++ [(set (match_operand:TF 0 "nonimmediate_operand" "") ++ (match_operand:TF 1 "general_operand" ""))] ++ "TARGET_64BIT && reload_completed ++ && s390_split_ok_p (operands[0], operands[1], TFmode, 0)" ++ [(set (match_dup 2) (match_dup 4)) ++ (set (match_dup 3) (match_dup 5))] ++{ ++ operands[2] = operand_subword (operands[0], 0, 0, TFmode); ++ operands[3] = operand_subword (operands[0], 1, 0, TFmode); ++ operands[4] = operand_subword (operands[1], 0, 0, TFmode); ++ operands[5] = operand_subword (operands[1], 1, 0, TFmode); ++}) ++ ++(define_split ++ [(set (match_operand:TF 0 "nonimmediate_operand" "") ++ (match_operand:TF 1 "general_operand" ""))] ++ "TARGET_64BIT && reload_completed ++ && s390_split_ok_p (operands[0], operands[1], TFmode, 1)" ++ [(set (match_dup 2) (match_dup 4)) ++ (set (match_dup 3) (match_dup 5))] ++{ ++ operands[2] = operand_subword (operands[0], 1, 0, TFmode); ++ operands[3] = operand_subword (operands[0], 0, 0, TFmode); ++ operands[4] = operand_subword (operands[1], 1, 0, TFmode); ++ operands[5] = operand_subword (operands[1], 0, 0, TFmode); ++}) ++ ++(define_split ++ [(set (match_operand:TF 0 "register_operand" "") ++ (match_operand:TF 1 "memory_operand" ""))] ++ "TARGET_64BIT && reload_completed ++ && !FP_REG_P (operands[0]) ++ && !s_operand (operands[1], VOIDmode)" ++ [(set (match_dup 0) (match_dup 1))] ++{ ++ rtx addr = operand_subword (operands[0], 1, 0, DFmode); ++ s390_load_address (addr, XEXP (operands[1], 0)); ++ operands[1] = replace_equiv_address (operands[1], addr); ++}) ++ ++; TFmode in FPRs splitters + +(define_split + [(set (match_operand:TF 0 "register_operand" "") + (match_operand:TF 1 "memory_operand" ""))] -+ "reload_completed && offsettable_memref_p (operands[1])" ++ "reload_completed && offsettable_memref_p (operands[1]) ++ && FP_REG_P (operands[0])" + [(set (match_dup 2) (match_dup 4)) + (set (match_dup 3) (match_dup 5))] +{ @@ -548,7 +623,8 @@ +(define_split + [(set (match_operand:TF 0 "memory_operand" "") + (match_operand:TF 1 "register_operand" ""))] -+ "reload_completed && offsettable_memref_p (operands[0])" ++ "reload_completed && offsettable_memref_p (operands[0]) ++ && FP_REG_P (operands[1])" + [(set (match_dup 2) (match_dup 4)) + (set (match_dup 3) (match_dup 5))] +{ @@ -592,7 +668,7 @@ ; movdf instruction pattern(s). ; -@@ -3083,13 +3166,13 @@ +@@ -3083,13 +3236,13 @@ DONE; }) @@ -610,7 +686,7 @@ GEN_INT(5))); DONE; }) -@@ -3100,11 +3183,23 @@ +@@ -3100,11 +3253,23 @@ (unspec:GPR [(match_operand:GPR 2 "immediate_operand" "K")] UNSPEC_ROUND) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" @@ -635,7 +711,7 @@ ; fix_truncdfsi2 instruction pattern(s). ; -@@ -3177,21 +3272,36 @@ +@@ -3177,21 +3342,36 @@ }) ; @@ -675,7 +751,7 @@ (define_expand "floatsidf2" [(set (match_operand:DF 0 "register_operand" "") (float:DF (match_operand:SI 1 "register_operand" "")))] -@@ -3209,14 +3319,6 @@ +@@ -3209,14 +3389,6 @@ } }) @@ -690,7 +766,7 @@ (define_insn "floatsidf2_ibm" [(set (match_operand:DF 0 "register_operand" "=f") (float:DF (match_operand:SI 1 "register_operand" "d"))) -@@ -3252,14 +3354,6 @@ +@@ -3252,14 +3424,6 @@ } }) @@ -705,7 +781,7 @@ ; ; truncdfsf2 instruction pattern(s). ; -@@ -3275,7 +3369,8 @@ +@@ -3275,7 +3439,8 @@ (float_truncate:SF (match_operand:DF 1 "register_operand" "f")))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" "ledbr\t%0,%1" @@ -715,7 +791,7 @@ (define_insn "truncdfsf2_ibm" [(set (match_operand:SF 0 "register_operand" "=f,f") -@@ -3288,6 +3383,66 @@ +@@ -3288,6 +3453,66 @@ (set_attr "type" "floadsf")]) ; @@ -782,7 +858,7 @@ ; extendsfdf2 instruction pattern(s). ; -@@ -3311,7 +3466,7 @@ +@@ -3311,7 +3536,7 @@ ldebr\t%0,%1 ldeb\t%0,%1" [(set_attr "op_type" "RRE,RXE") @@ -791,7 +867,7 @@ (define_insn "extendsfdf2_ibm" [(set (match_operand:DF 0 "register_operand" "=f,f") -@@ -3324,6 +3479,66 @@ +@@ -3324,6 +3549,66 @@ [(set_attr "length" "4,6") (set_attr "type" "floadsf")]) @@ -858,7 +934,7 @@ ;; ;; ARITHMETIC OPERATIONS -@@ -3751,7 +3966,7 @@ +@@ -3751,7 +4036,7 @@ [(parallel [(set (match_operand:FPR 0 "register_operand" "=f,f") (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0") @@ -867,7 +943,7 @@ (clobber (reg:CC CC_REGNUM))])] "TARGET_HARD_FLOAT" "") -@@ -3759,52 +3974,52 @@ +@@ -3759,52 +4044,52 @@ (define_insn "*add3" [(set (match_operand:FPR 0 "register_operand" "=f,f") (plus:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0") @@ -933,7 +1009,7 @@ (set_attr "type" "fsimp")]) -@@ -4163,52 +4378,52 @@ +@@ -4163,52 +4448,52 @@ (define_insn "*sub3" [(set (match_operand:FPR 0 "register_operand" "=f,f") (minus:FPR (match_operand:FPR 1 "register_operand" "0,0") @@ -999,7 +1075,7 @@ (set_attr "type" "fsimp")]) -@@ -4456,53 +4671,53 @@ +@@ -4456,53 +4741,53 @@ (define_expand "mul3" [(set (match_operand:FPR 0 "register_operand" "=f,f") (mult:FPR (match_operand:FPR 1 "nonimmediate_operand" "%0,0") @@ -1073,7 +1149,7 @@ [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fmul")]) -@@ -4949,30 +5164,30 @@ +@@ -4949,30 +5234,30 @@ (define_expand "div3" [(set (match_operand:FPR 0 "register_operand" "=f,f") (div:FPR (match_operand:FPR 1 "register_operand" "0,0") @@ -1112,7 +1188,7 @@ (set_attr "type" "fdiv")]) -@@ -5955,7 +6170,7 @@ +@@ -5955,7 +6240,7 @@ (set (match_operand:FPR 0 "register_operand" "=f") (neg:FPR (match_dup 1)))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" @@ -1121,7 +1197,7 @@ [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) -@@ -5965,7 +6180,7 @@ +@@ -5965,7 +6250,7 @@ (match_operand:FPR 2 "const0_operand" ""))) (clobber (match_scratch:FPR 0 "=f"))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" @@ -1130,7 +1206,7 @@ [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) -@@ -5974,7 +6189,7 @@ +@@ -5974,7 +6259,7 @@ (neg:FPR (match_operand:FPR 1 "register_operand" "f"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" @@ -1139,7 +1215,7 @@ [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) -@@ -5983,8 +6198,8 @@ +@@ -5983,8 +6268,8 @@ (neg:FPR (match_operand:FPR 1 "register_operand" "f"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" @@ -1150,7 +1226,7 @@ (set_attr "type" "fsimp")]) -@@ -6062,7 +6277,7 @@ +@@ -6062,7 +6347,7 @@ (set (match_operand:FPR 0 "register_operand" "=f") (abs:FPR (match_dup 1)))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" @@ -1159,7 +1235,7 @@ [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) -@@ -6072,7 +6287,7 @@ +@@ -6072,7 +6357,7 @@ (match_operand:FPR 2 "const0_operand" ""))) (clobber (match_scratch:FPR 0 "=f"))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" @@ -1168,7 +1244,7 @@ [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) -@@ -6081,7 +6296,7 @@ +@@ -6081,7 +6366,7 @@ (abs:FPR (match_operand:FPR 1 "register_operand" "f"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" @@ -1177,7 +1253,7 @@ [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) -@@ -6090,8 +6305,8 @@ +@@ -6090,8 +6375,8 @@ (abs:FPR (match_operand:FPR 1 "register_operand" "f"))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IBM_FLOAT" @@ -1188,7 +1264,7 @@ (set_attr "type" "fsimp")]) ;; -@@ -6161,7 +6376,7 @@ +@@ -6161,7 +6446,7 @@ (set (match_operand:FPR 0 "register_operand" "=f") (neg:FPR (abs:FPR (match_dup 1))))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" @@ -1197,7 +1273,7 @@ [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) -@@ -6171,7 +6386,7 @@ +@@ -6171,7 +6456,7 @@ (match_operand:FPR 2 "const0_operand" ""))) (clobber (match_scratch:FPR 0 "=f"))] "s390_match_ccmode (insn, CCSmode) && TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" @@ -1206,7 +1282,7 @@ [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) -@@ -6180,7 +6395,7 @@ +@@ -6180,7 +6465,7 @@ (neg:FPR (abs:FPR (match_operand:FPR 1 "register_operand" "f")))) (clobber (reg:CC CC_REGNUM))] "TARGET_HARD_FLOAT && TARGET_IEEE_FLOAT" @@ -1215,7 +1291,7 @@ [(set_attr "op_type" "RRE") (set_attr "type" "fsimp")]) -@@ -6194,11 +6409,11 @@ +@@ -6194,11 +6479,11 @@ (define_insn "sqrt2" [(set (match_operand:FPR 0 "register_operand" "=f,f") @@ -1230,66 +1306,301 @@ [(set_attr "op_type" "RRE,RXE") (set_attr "type" "fsqrt")]) ---- gcc/config/s390/s390.opt.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/config/s390/s390.opt 2006-01-28 10:39:11.000000000 +0100 -@@ -51,6 +51,14 @@ mhard-float - Target Report RejectNegative Mask(HARD_FLOAT) - Use hardware fp - -+mlong-double-128 -+Target Report RejectNegative Mask(LONG_DOUBLE_128) -+Use 128-bit long double +--- gcc/config/s390/fixdfdi.h.jj 2006-01-31 14:38:39.000000000 +0100 ++++ gcc/config/s390/fixdfdi.h 2006-01-31 15:07:03.000000000 +0100 +@@ -20,6 +20,156 @@ along with GCC; see the file COPYING. I + Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ + ++#ifdef L_fixunstfdi ++ ++#define EXPD(fp) (((fp.l.i[0]) >> 16) & 0x7FFF) ++#define EXPONENT_BIAS 16383 ++#define MANTISSA_BITS 112 ++#define PRECISION (MANTISSA_BITS + 1) ++#define SIGNBIT 0x80000000 ++#define SIGND(fp) ((fp.l.i[0]) & SIGNBIT) ++#define MANTD_HIGH_LL(fp) ((fp.ll[0] & HIGH_LL_FRAC_MASK) | HIGH_LL_UNIT_BIT) ++#define MANTD_LOW_LL(fp) (fp.ll[1]) ++#define FRACD_ZERO_P(fp) (!fp.ll[1] && !(fp.ll[0] & HIGH_LL_FRAC_MASK)) ++#define HIGH_LL_FRAC_BITS 48 ++#define HIGH_LL_UNIT_BIT ((UDItype_x)1 << HIGH_LL_FRAC_BITS) ++#define HIGH_LL_FRAC_MASK (HIGH_LL_UNIT_BIT - 1) ++ ++typedef int DItype_x __attribute__ ((mode (DI))); ++typedef unsigned int UDItype_x __attribute__ ((mode (DI))); ++typedef int SItype_x __attribute__ ((mode (SI))); ++typedef unsigned int USItype_x __attribute__ ((mode (SI))); ++ ++union double_long { ++ long double d; ++ struct { ++ SItype_x i[4]; /* 32 bit parts: 0 upper ... 3 lowest */ ++ } l; ++ UDItype_x ll[2]; /* 64 bit parts: 0 upper, 1 lower */ ++}; ++ ++UDItype_x __fixunstfdi (long double a1); ++ ++/* convert double to unsigned int */ ++UDItype_x ++__fixunstfdi (long double a1) ++{ ++ register union double_long dl1; ++ register int exp; ++ register UDItype_x l; + -+mlong-double-64 -+Target Report RejectNegative InverseMask(LONG_DOUBLE_128) -+Use 64-bit long double ++ dl1.d = a1; + - mpacked-stack - Target Report Mask(PACKED_STACK) - Use packed stack layout ---- gcc/config/s390/t-crtstuff.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/config/s390/t-crtstuff 2006-01-28 10:39:11.000000000 +0100 -@@ -2,3 +2,4 @@ - # because then __FRAME_END__ might not be the last thing in .eh_frame - # section. - CRTSTUFF_T_CFLAGS = -fno-asynchronous-unwind-tables -+TARGET_LIBGCC2_CFLAGS += -mlong-double-128 ---- gcc/config/s390/libgcc-glibc.ver.jj 2006-01-28 09:54:03.000000000 +0100 -+++ gcc/config/s390/libgcc-glibc.ver 2006-01-28 10:39:11.000000000 +0100 -@@ -39,3 +39,36 @@ GLIBC_2.2 { - } - %endif - -+# With GCC 4.1.0 long double 128 bit support was introduced. The -+# following symbols coming from libgcc are enabled when -mlong-double-128 -+# is specified. These lines make the symbols to get a @@GCC_4.1.0 attached. ++ /* +/- 0, denormalized, negative */ ++ if (!EXPD (dl1) || SIGND(dl1)) ++ return 0; + -+%exclude { -+ __divtc3 -+ __multc3 -+ __powitf2 -+ __fixtfti -+ __fixunstfti -+ __floattitf ++ /* The exponent - considered the binary point at the right end of ++ the mantissa. */ ++ exp = EXPD (dl1) - EXPONENT_BIAS - MANTISSA_BITS; + -+ __fixtfdi -+ __fixunstfdi -+ __floatditf ++ /* number < 1: If the mantissa would need to be right-shifted more bits than ++ its size (plus the implied one bit on the left) the result would be ++ zero. */ ++ if (exp <= -PRECISION) ++ return 0; ++ ++ /* NaN: All exponent bits set and a non-zero fraction. */ ++ if ((EXPD(dl1) == 0x7fff) && !FRACD_ZERO_P (dl1)) ++ return 0x0ULL; ++ ++ /* If the upper ll part of the mantissa isn't ++ zeroed out after shifting the number would be to large. */ ++ if (exp >= -HIGH_LL_FRAC_BITS) ++ return 0xFFFFFFFFFFFFFFFFULL; ++ ++ exp += HIGH_LL_FRAC_BITS + 1; ++ ++ l = MANTD_LOW_LL (dl1) >> (HIGH_LL_FRAC_BITS + 1) ++ | MANTD_HIGH_LL (dl1) << (64 - (HIGH_LL_FRAC_BITS + 1)); ++ ++ return l >> -exp; +} ++#define __fixunstfdi ___fixunstfdi ++#endif ++#undef L_fixunstfdi + -+GCC_4.1.0 { -+ __divtc3 -+ __multc3 -+ __powitf2 ++#ifdef L_fixtfdi ++#define EXPD(fp) (((fp.l.i[0]) >> 16) & 0x7FFF) ++#define EXPONENT_BIAS 16383 ++#define MANTISSA_BITS 112 ++#define PRECISION (MANTISSA_BITS + 1) ++#define SIGNBIT 0x80000000 ++#define SIGND(fp) ((fp.l.i[0]) & SIGNBIT) ++#define MANTD_HIGH_LL(fp) ((fp.ll[0] & HIGH_LL_FRAC_MASK) | HIGH_LL_UNIT_BIT) ++#define MANTD_LOW_LL(fp) (fp.ll[1]) ++#define FRACD_ZERO_P(fp) (!fp.ll[1] && !(fp.ll[0] & HIGH_LL_FRAC_MASK)) ++#define HIGH_LL_FRAC_BITS 48 ++#define HIGH_LL_UNIT_BIT ((UDItype_x)1 << HIGH_LL_FRAC_BITS) ++#define HIGH_LL_FRAC_MASK (HIGH_LL_UNIT_BIT - 1) ++ ++typedef int DItype_x __attribute__ ((mode (DI))); ++typedef unsigned int UDItype_x __attribute__ ((mode (DI))); ++typedef int SItype_x __attribute__ ((mode (SI))); ++typedef unsigned int USItype_x __attribute__ ((mode (SI))); ++ ++union double_long { ++ long double d; ++ struct { ++ SItype_x i[4]; /* 32 bit parts: 0 upper ... 3 lowest */ ++ } l; ++ DItype_x ll[2]; /* 64 bit parts: 0 upper, 1 lower */ ++}; ++ ++DItype_x __fixtfdi (long double a1); ++ ++/* convert double to unsigned int */ ++DItype_x ++__fixtfdi (long double a1) ++{ ++ register union double_long dl1; ++ register int exp; ++ register UDItype_x l; ++ ++ dl1.d = a1; ++ ++ /* +/- 0, denormalized */ ++ if (!EXPD (dl1)) ++ return 0; ++ ++ /* The exponent - considered the binary point at the right end of ++ the mantissa. */ ++ exp = EXPD (dl1) - EXPONENT_BIAS - MANTISSA_BITS; ++ ++ /* number < 1: If the mantissa would need to be right-shifted more bits than ++ its size the result would be zero. */ ++ if (exp <= -PRECISION) ++ return 0; ++ ++ /* NaN: All exponent bits set and a non-zero fraction. */ ++ if ((EXPD(dl1) == 0x7fff) && !FRACD_ZERO_P (dl1)) ++ return 0x8000000000000000ULL; ++ ++ /* If the upper ll part of the mantissa isn't ++ zeroed out after shifting the number would be to large. */ ++ if (exp >= -HIGH_LL_FRAC_BITS) ++ { ++ l = (long long)1 << 63; /* long int min */ ++ return SIGND (dl1) ? l : l - 1; ++ } + -+%ifdef __s390x__ -+ __fixtfti -+ __fixunstfti -+ __floattitf ++ /* The extra bit is needed for the sign bit. */ ++ exp += HIGH_LL_FRAC_BITS + 1; + -+%else -+ __fixtfdi -+ __fixunstfdi -+ __floatditf -+%endif ++ l = MANTD_LOW_LL (dl1) >> (HIGH_LL_FRAC_BITS + 1) ++ | MANTD_HIGH_LL (dl1) << (64 - (HIGH_LL_FRAC_BITS + 1)); ++ ++ return SIGND (dl1) ? -(l >> -exp) : l >> -exp; +} ++#define __fixtfdi ___fixtfdi ++#endif ++#undef L_fixtfdi ++ + #ifdef L_fixunsdfdi + #define EXPD(fp) (((fp.l.upper) >> 20) & 0x7FF) + #define EXCESSD 1022 +@@ -305,4 +455,3 @@ __fixsfdi (float a1) + #define __fixsfdi ___fixsfdi + #endif + #undef L_fixsfdi +- +--- gcc/config/s390/s390.h.jj 2006-01-31 14:38:39.000000000 +0100 ++++ gcc/config/s390/s390.h 2006-01-31 15:07:03.000000000 +0100 +@@ -1,5 +1,5 @@ + /* Definitions of target machine for GNU compiler, for IBM S/390 +- Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 ++ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + Free Software Foundation, Inc. + Contributed by Hartmut Penner (hpenner at de.ibm.com) and + Ulrich Weigand (uweigand at de.ibm.com). +@@ -93,6 +93,8 @@ extern enum processor_flags s390_arch_fl + builtin_define ("__s390__"); \ + if (TARGET_64BIT) \ + builtin_define ("__s390x__"); \ ++ if (TARGET_LONG_DOUBLE_128) \ ++ builtin_define ("__LONG_DOUBLE_128__"); \ + } \ + while (0) + +@@ -216,7 +218,18 @@ if (INTEGRAL_MODE_P (MODE) && + #define LONG_LONG_TYPE_SIZE 64 + #define FLOAT_TYPE_SIZE 32 + #define DOUBLE_TYPE_SIZE 64 +-#define LONG_DOUBLE_TYPE_SIZE 64 /* ??? Should support extended format. */ ++#define LONG_DOUBLE_TYPE_SIZE (TARGET_LONG_DOUBLE_128 ? 128 : 64) ++ ++/* Define this to set long double type size to use in libgcc2.c, which can ++ not depend on target_flags. */ ++#ifdef __LONG_DOUBLE_128__ ++#define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 128 ++#else ++#define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64 ++#endif ++ ++/* Work around target_flags dependency in ada/targtyps.c. */ ++#define WIDEST_HARDWARE_FP_SIZE 64 + + /* We use "unsigned char" as default. */ + #define DEFAULT_SIGNED_CHAR 0 +@@ -334,28 +347,34 @@ if (INTEGRAL_MODE_P (MODE) && + Floating point modes <= word size fit into any FPR or GPR. + Floating point modes > word size (i.e. DFmode on 32-bit) fit + into any FPR, or an even-odd GPR pair. ++ TFmode fits only into an even-odd FPR pair. + + Complex floating point modes fit either into two FPRs, or into + successive GPRs (again starting with an even number). ++ TCmode fits only into two successive even-odd FPR pairs. + + Condition code modes fit only into the CC register. */ + + #define HARD_REGNO_NREGS(REGNO, MODE) \ + (FP_REGNO_P(REGNO)? \ +- (GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT ? 2 : 1) : \ ++ (GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT ? \ ++ 2 * ((GET_MODE_SIZE(MODE) / 2 + 8 - 1) / 8) : \ ++ ((GET_MODE_SIZE(MODE) + 8 - 1) / 8)) : \ + GENERAL_REGNO_P(REGNO)? \ + ((GET_MODE_SIZE(MODE)+UNITS_PER_WORD-1) / UNITS_PER_WORD) : \ + ACCESS_REGNO_P(REGNO)? \ +- ((GET_MODE_SIZE(MODE)+4-1) / 4) : \ ++ ((GET_MODE_SIZE(MODE) + 4 - 1) / 4) : \ + 1) + + #define HARD_REGNO_MODE_OK(REGNO, MODE) \ + (FP_REGNO_P(REGNO)? \ +- ((MODE) == SImode || (MODE) == DImode || \ +- GET_MODE_CLASS(MODE) == MODE_FLOAT || \ +- GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT) : \ ++ (((MODE) == SImode || (MODE) == DImode \ ++ || GET_MODE_CLASS(MODE) == MODE_FLOAT \ ++ || GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT) \ ++ && (HARD_REGNO_NREGS(REGNO, MODE) == 1 || !((REGNO) & 1))) : \ + GENERAL_REGNO_P(REGNO)? \ +- (HARD_REGNO_NREGS(REGNO, MODE) == 1 || !((REGNO) & 1)) : \ ++ ((HARD_REGNO_NREGS(REGNO, MODE) == 1 || !((REGNO) & 1)) \ ++ && (((MODE) != TFmode && (MODE) != TCmode) || TARGET_64BIT)) : \ + CC_REGNO_P(REGNO)? \ + GET_MODE_CLASS (MODE) == MODE_CC : \ + FRAME_REGNO_P(REGNO)? \ +@@ -376,7 +395,9 @@ if (INTEGRAL_MODE_P (MODE) && + in a register of class CLASS. */ + #define CLASS_MAX_NREGS(CLASS, MODE) \ + ((CLASS) == FP_REGS ? \ +- (GET_MODE_CLASS (MODE) == MODE_COMPLEX_FLOAT ? 2 : 1) : \ ++ (GET_MODE_CLASS(MODE) == MODE_COMPLEX_FLOAT ? \ ++ 2 * (GET_MODE_SIZE (MODE) / 2 + 8 - 1) / 8 : \ ++ (GET_MODE_SIZE (MODE) + 8 - 1) / 8) : \ + (CLASS) == ACCESS_REGS ? \ + (GET_MODE_SIZE (MODE) + 4 - 1) / 4 : \ + (GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD) +@@ -386,10 +407,11 @@ if (INTEGRAL_MODE_P (MODE) && + cannot use SUBREGs to switch between modes in FP registers. + Likewise for access registers, since they have only half the + word size on 64-bit. */ +-#define CANNOT_CHANGE_MODE_CLASS(FROM, TO, CLASS) \ +- (GET_MODE_SIZE (FROM) != GET_MODE_SIZE (TO) \ +- ? reg_classes_intersect_p (FP_REGS, CLASS) \ +- || reg_classes_intersect_p (ACCESS_REGS, CLASS) : 0) ++#define CANNOT_CHANGE_MODE_CLASS(FROM, TO, CLASS) \ ++ (GET_MODE_SIZE (FROM) != GET_MODE_SIZE (TO) \ ++ ? ((reg_classes_intersect_p (FP_REGS, CLASS) \ ++ && (GET_MODE_SIZE (FROM) < 8 || GET_MODE_SIZE (TO) < 8)) \ ++ || reg_classes_intersect_p (ACCESS_REGS, CLASS)) : 0) + + /* Register classes. */ + +--- gcc/doc/invoke.texi.jj 2006-01-31 14:38:56.000000000 +0100 ++++ gcc/doc/invoke.texi 2006-01-31 15:07:03.000000000 +0100 +@@ -666,8 +666,8 @@ See RS/6000 and PowerPC Options. + + @emph{S/390 and zSeries Options} + @gccoptlist{-mtune=@var{cpu-type} -march=@var{cpu-type} @gol +--mhard-float -msoft-float -mbackchain -mno-backchain @gol +--mpacked-stack -mno-packed-stack @gol ++-mhard-float -msoft-float -mlong-double-64 -mlong-double-128 @gol ++-mbackchain -mno-backchain -mpacked-stack -mno-packed-stack @gol + -msmall-exec -mno-small-exec -mmvcle -mno-mvcle @gol + -m64 -m31 -mdebug -mno-debug -mesa -mzarch @gol + -mtpf-trace -mno-tpf-trace -mfused-madd -mno-fused-madd @gol +@@ -11585,6 +11585,14 @@ functions in @file{libgcc.a} will be use + operations. When @option{-mhard-float} is specified, the compiler + generates IEEE floating-point instructions. This is the default. + ++ at item -mlong-double-64 ++ at itemx -mlong-double-128 ++ at opindex mlong-double-64 ++ at opindex mlong-double-128 ++These switches control the size of @code{long double} type. A size ++of 64bit makes the @code{long double} type equivalent to the @code{double} ++type. This is the default. ++ + @item -mbackchain + @itemx -mno-backchain + @opindex mbackchain Index: gcc41.spec =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/gcc41.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gcc41.spec 28 Jan 2006 10:00:01 -0000 1.19 +++ gcc41.spec 31 Jan 2006 14:29:33 -0000 1.20 @@ -1,6 +1,6 @@ -%define DATE 20060128 +%define DATE 20060131 %define gcc_version 4.1.0 -%define gcc_release 0.17 +%define gcc_release 0.18 %define _unpackaged_files_terminate_build 0 %define multilib_64_archs sparc64 ppc64 s390x x86_64 %ifarch %{ix86} x86_64 ia64 @@ -96,6 +96,9 @@ Patch15: gcc41-ppc32-retaddr.patch Patch16: gcc41-ppc32-ldbl.patch Patch17: gcc41-s390-ldbl.patch +Patch18: gcc41-x86-mtune-generic1.patch +Patch19: gcc41-x86-mtune-generic2.patch +Patch20: gcc41-x86-mtune-generic3.patch %define _gnu %{nil} %ifarch sparc @@ -443,6 +446,9 @@ %patch15 -p0 -b .ppc32-retaddr~ %patch16 -p0 -b .ppc32-ldbl~ %patch17 -p0 -b .s390-ldbl~ +%patch18 -p0 -b .x86-mtune-generic1~ +%patch19 -p0 -b .x86-mtune-generic2~ +%patch20 -p0 -b .x86-mtune-generic3~ sed -i -e 's/4\.1\.0/4.1.0/' gcc/BASE-VER gcc/version.c sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gcc_release})"/' gcc/version.c @@ -547,6 +553,9 @@ %ifarch ppc --host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32 %endif +%ifarch %{ix86} x86_64 + --with-cpu=generic \ +%endif %ifnarch sparc ppc --host=%{gcc_target_platform} %endif @@ -1528,6 +1537,20 @@ %endif %changelog +* Tue Jan 31 2006 Jakub Jelinek 4.1.0-0.18 +- update from gcc-4_1-branch (-r110317:110433) + - PRs c++/25855, c++/25999, fortran/17911, fortran/18578, fortran/18579, + fortran/20857, fortran/20885, fortran/20895, fortran/25030, + fortran/25835, fortran/25951, java/21428, libgfortran/25835, + target/14798, target/25706, target/25718, target/25947, + target/26018, testsuite/25318 +- add -mtune=generic support for i?86 and x86_64 (Jan Hubicka, H.J. Lu, + Evandro Menezes) +- use -mtune=generic by default if neither -march= nor -mtune= is specified + on command line on i?86 or x86_64 +- updated s390{,x} long double patch, fixing ICEs on s390x glibc build + (Andreas Krebbel, Ulrich Weigand) + * Sat Jan 28 2006 Jakub Jelinek 4.1.0-0.17 - update from gcc-4_1-branch (-r110062:110317) - PRs ada/20548, ada/21317, bootstrap/25859, c++/25552, c++/25856, Index: sources =================================================================== RCS file: /cvs/dist/rpms/gcc/devel/sources,v retrieving revision 1.130 retrieving revision 1.131 diff -u -r1.130 -r1.131 --- sources 28 Jan 2006 10:00:01 -0000 1.130 +++ sources 31 Jan 2006 14:29:33 -0000 1.131 @@ -1 +1 @@ -dc997a74f17dccebeb7145a1849573b4 gcc-4.1.0-20060128.tar.bz2 +7a1b6cd7661918ede937ff3b157f2788 gcc-4.1.0-20060131.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 14:30:36 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 09:30:36 -0500 Subject: rpms/php/devel php.spec,1.102,1.103 Message-ID: <200601311430.k0VEUafa017654@cvs.devel.redhat.com> Author: jorton Update of /cvs/dist/rpms/php/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17639 Modified Files: php.spec Log Message: * Tue Jan 31 2006 Joe Orton 5.1.2-4 - rebuild for new libc-client soname Index: php.spec =================================================================== RCS file: /cvs/dist/rpms/php/devel/php.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- php.spec 16 Jan 2006 10:15:42 -0000 1.102 +++ php.spec 31 Jan 2006 14:30:33 -0000 1.103 @@ -3,7 +3,7 @@ Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Name: php Version: 5.1.2 -Release: 3 +Release: 4 License: The PHP License Group: Development/Languages URL: http://www.php.net/ @@ -537,6 +537,9 @@ %files pdo -f files.pdo %changelog +* Tue Jan 31 2006 Joe Orton 5.1.2-4 +- rebuild for new libc-client soname + * Mon Jan 16 2006 Joe Orton 5.1.2-3 - only build xmlreader and xmlwriter shared (#177810) From fedora-cvs-commits at redhat.com Tue Jan 31 14:53:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 09:53:34 -0500 Subject: rpms/gtkhtml3/devel gtkhtml-3.9.90-free.patch, NONE, 1.1 gtkhtml3.spec, 1.51, 1.52 Message-ID: <200601311453.k0VErYAh030148@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30133 Modified Files: gtkhtml3.spec Added Files: gtkhtml-3.9.90-free.patch Log Message: Fix a crash gtkhtml-3.9.90-free.patch: htmltextslave.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- NEW FILE gtkhtml-3.9.90-free.patch --- --- gtkhtml-3.9.90/src/htmltextslave.c.free 2006-01-31 09:36:48.000000000 -0500 +++ gtkhtml-3.9.90/src/htmltextslave.c 2006-01-31 09:46:10.000000000 -0500 @@ -605,9 +605,7 @@ tmp_gi = pango_glyph_item_split (&glyph_item->glyph_item, slave->owner->text, split_index); /* free the beginning we don't need */ - pango_item_free (tmp_gi->item); - pango_glyph_string_free (tmp_gi->glyphs); - g_free (tmp_gi); + pango_glyph_item_free (tmp_gi); } @@ -627,11 +625,13 @@ tmp_gi2 = pango_glyph_item_split (&tmp_gi1, slave->owner->text, split_index); glyph_item->glyph_item = *tmp_gi2; + tmp_gi2->item = NULL; + tmp_gi2->glyphs = NULL; /* free the tmp1 content and tmp2 container, but not the content */ pango_item_free (tmp_gi1.item); pango_glyph_string_free (tmp_gi1.glyphs); - g_free (tmp_gi2); + pango_glyph_item_free (tmp_gi2); glyph_item->type = HTML_TEXT_SLAVE_GLYPH_ITEM_CREATED; glyph_item->widths = NULL; Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- gtkhtml3.spec 30 Jan 2006 23:06:12 -0000 1.51 +++ gtkhtml3.spec 31 Jan 2006 14:53:32 -0000 1.52 @@ -5,7 +5,7 @@ Summary: gtkhtml library Name: gtkhtml3 Version: 3.9.90 -Release: 1 +Release: 2 License: LGPL/GPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2 @@ -27,6 +27,8 @@ # Patches from bugzilla.ximian.com #65670, #66206 Patch2: gtkhtml-3.3.2-imcommit.patch Patch3: gtkhtml-fix-indic-navigation-129212.patch +# http://bugzilla.gnome.org/show_bug.cgi?id=329344 +Patch4: gtkhtml-3.9.90-free.patch %description GtkHTML is a lightweight HTML rendering/printing/editing engine. It @@ -97,6 +99,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jan 31 2006 Matthias Clasen - 3.9.90-2 +- Fix a crash + * Mon Jan 30 2006 David Malcolm - 3.9.90-1 - 3.9.90 From fedora-cvs-commits at redhat.com Tue Jan 31 15:07:02 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 10:07:02 -0500 Subject: rpms/glib-java/devel glib-java.spec,1.23,1.24 Message-ID: <200601311507.k0VF725f008974@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/glib-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8925 Modified Files: glib-java.spec Log Message: Fixed typo in specfile changelog Index: glib-java.spec =================================================================== RCS file: /cvs/dist/rpms/glib-java/devel/glib-java.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- glib-java.spec 30 Jan 2006 16:12:13 -0000 1.23 +++ glib-java.spec 31 Jan 2006 15:06:51 -0000 1.24 @@ -117,7 +117,7 @@ %{_datadir}/java/*.zip %changelog -* Mon Jan 31 2006 Adam Jocksch +* Mon Jan 30 2006 Adam Jocksch - bumped version to 0.2.3, updated tarball. * Thu Dec 22 2005 Adam Jocksch From fedora-cvs-commits at redhat.com Tue Jan 31 15:07:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 10:07:44 -0500 Subject: rpms/libgtk-java/devel libgtk-java.spec,1.39,1.40 Message-ID: <200601311507.k0VF7iFv009199@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libgtk-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9112 Modified Files: libgtk-java.spec Log Message: Fixed typo in specfile changelog. Index: libgtk-java.spec =================================================================== RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- libgtk-java.spec 30 Jan 2006 16:19:34 -0000 1.39 +++ libgtk-java.spec 31 Jan 2006 15:07:41 -0000 1.40 @@ -123,7 +123,7 @@ %changelog -* Mon Jan 31 2006 Adam Jocksch - 2.8.3-1 +* Mon Jan 30 2006 Adam Jocksch - 2.8.3-1 - updated tarball to libgtk-java-2.8.3.tar.gz. * Thu Dec 22 2005 Andrw Cagney - 2.8.2-0 From fedora-cvs-commits at redhat.com Tue Jan 31 15:08:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 10:08:40 -0500 Subject: rpms/libglade-java/devel libglade-java.spec,1.26,1.27 Message-ID: <200601311508.k0VF8eXc009619@cvs.devel.redhat.com> Author: ajocksch Update of /cvs/dist/rpms/libglade-java/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9495 Modified Files: libglade-java.spec Log Message: Fixed typo in specfile changelog. Index: libglade-java.spec =================================================================== RCS file: /cvs/dist/rpms/libglade-java/devel/libglade-java.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- libglade-java.spec 30 Jan 2006 16:57:35 -0000 1.26 +++ libglade-java.spec 31 Jan 2006 15:08:37 -0000 1.27 @@ -113,7 +113,7 @@ %{_datadir}/java/*.zip %changelog -* Mon Jan 31 2006 Adam jocksch - 2.12.2-1 +* Mon Jan 30 2006 Adam jocksch - 2.12.2-1 - Updated tarball, deps. * Wed Dec 21 2005 Jesse Keating - 2.12.1-3 From fedora-cvs-commits at redhat.com Tue Jan 31 15:21:45 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 10:21:45 -0500 Subject: rpms/xorg-x11-twm/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xorg-x11-twm.spec, 1.8, 1.9 Message-ID: <200601311521.k0VFLjBZ027604@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-twm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27568/devel Modified Files: .cvsignore sources xorg-x11-twm.spec Log Message: auto-import xorg-x11-twm-1.0.1-1 on branch devel from xorg-x11-twm-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Dec 2005 16:46:11 -0000 1.4 +++ .cvsignore 31 Jan 2006 15:21:42 -0000 1.5 @@ -1 +1 @@ -twm-1.0.0.tar.bz2 +twm-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Dec 2005 16:46:11 -0000 1.4 +++ sources 31 Jan 2006 15:21:42 -0000 1.5 @@ -1 +1 @@ -dd9399d513d248f30fda549b275b6661 twm-1.0.0.tar.bz2 +b1a8abf4cd9d8d7269e6627c62ffee0f twm-1.0.1.tar.bz2 Index: xorg-x11-twm.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/xorg-x11-twm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xorg-x11-twm.spec 16 Dec 2005 16:46:11 -0000 1.8 +++ xorg-x11-twm.spec 31 Jan 2006 15:21:42 -0000 1.9 @@ -4,7 +4,7 @@ Name: xorg-x11-%{pkgname} # NOTE: Remove Epoch line if package gets renamed to something like "twm" Epoch: 1 -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: MIT/X11 Group: User Interface/X @@ -100,6 +100,9 @@ %config %{_sysconfdir}/X11/twm/system.twmrc %changelog +* Wed Jan 18 2006 Mike A. Harris 1:1.0.1-1 +- Updated to twm 1.0.1 from X11R7.0 + * Fri Dec 16 2005 Mike A. Harris 1:1.0.0-1 - Updated to twm 1.0.0 from X11R7 RC4. - Change manpage dir from man1x to man1 to match RC4 default. From fedora-cvs-commits at redhat.com Tue Jan 31 15:21:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 10:21:58 -0500 Subject: rpms/xorg-x11-xauth/devel .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 xorg-x11-xauth.spec, 1.6, 1.7 Message-ID: <200601311521.k0VFLwkh027781@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xauth/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27741/devel Modified Files: .cvsignore sources xorg-x11-xauth.spec Log Message: auto-import xorg-x11-xauth-1.0.1-1 on branch devel from xorg-x11-xauth-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Dec 2005 19:04:26 -0000 1.5 +++ .cvsignore 31 Jan 2006 15:21:56 -0000 1.6 @@ -1 +1 @@ -xauth-1.0.0.tar.bz2 +xauth-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Dec 2005 19:04:26 -0000 1.6 +++ sources 31 Jan 2006 15:21:56 -0000 1.7 @@ -1 +1 @@ -a20d508c4c0b7fb596d923dbb1b464a2 xauth-1.0.0.tar.bz2 +ed848ebba8d3a1ca727b80d6b89dc3c3 xauth-1.0.1.tar.bz2 Index: xorg-x11-xauth.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xauth/devel/xorg-x11-xauth.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xorg-x11-xauth.spec 16 Dec 2005 19:04:26 -0000 1.6 +++ xorg-x11-xauth.spec 31 Jan 2006 15:21:56 -0000 1.7 @@ -2,7 +2,7 @@ Summary: X.Org X11 X authority utilities Name: xorg-x11-%{pkgname} -Version: 1.0.0 +Version: 1.0.1 Release: 1 # FIXME: Remove Epoch line if package gets renamed Epoch: 1 @@ -66,6 +66,9 @@ %{_mandir}/man1/mkxauth.1x* %changelog +* Wed Jan 18 2006 Mike A. Harris 1:1.0.1-1 +- Updated to xauth 1.0.1 from X11R7.0 + * Fri Dec 16 2005 Mike A. Harris 1:1.0.0-1 - Updated to xauth 1.0.0 from X11R7 RC4 - Changed manpage dir from man1x to man1 to match upstream default. From fedora-cvs-commits at redhat.com Tue Jan 31 15:25:18 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 10:25:18 -0500 Subject: rpms/xorg-x11-xfs/devel .cvsignore, 1.7, 1.8 sources, 1.6, 1.7 xorg-x11-xfs.spec, 1.11, 1.12 Message-ID: <200601311525.k0VFPIF3029393@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xfs/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29352/devel Modified Files: .cvsignore sources xorg-x11-xfs.spec Log Message: auto-import xorg-x11-xfs-1.0.1-1 on branch devel from xorg-x11-xfs-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Dec 2005 16:26:15 -0000 1.7 +++ .cvsignore 31 Jan 2006 15:25:16 -0000 1.8 @@ -1,5 +1,5 @@ -fslsfonts-1.0.0.tar.bz2 -fstobdf-1.0.0.tar.bz2 -showfont-1.0.0.tar.bz2 -xfs-1.0.0.tar.bz2 -xfsinfo-1.0.0.tar.bz2 +fslsfonts-1.0.1.tar.bz2 +fstobdf-1.0.1.tar.bz2 +showfont-1.0.1.tar.bz2 +xfs-1.0.1.tar.bz2 +xfsinfo-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Dec 2005 16:26:15 -0000 1.6 +++ sources 31 Jan 2006 15:25:16 -0000 1.7 @@ -1,5 +1,5 @@ -9150e71fbb7c5256ba08c269fe53b44a fslsfonts-1.0.0.tar.bz2 -e310572a50ac20f5b923c3614097f00b fstobdf-1.0.0.tar.bz2 -cbcee3b5a16b879d937770f834e7e5f3 showfont-1.0.0.tar.bz2 -cb51b77f7df00b9a30c7bf743e4b43e2 xfs-1.0.0.tar.bz2 -44a2f1bd0da2b20a0960ba3a96776017 xfsinfo-1.0.0.tar.bz2 +c7b2f8a938749d41dc86db6bd1e6a4ca fslsfonts-1.0.1.tar.bz2 +705b896777a3ba80ecc02b2ae5313cf9 fstobdf-1.0.1.tar.bz2 +339b2faf1ca5114fda414338e15b6e21 showfont-1.0.1.tar.bz2 +8ed805113037e86ad01068d0b464a062 xfs-1.0.1.tar.bz2 +e98b18fbce1261de30b1de819d86f48a xfsinfo-1.0.1.tar.bz2 Index: xorg-x11-xfs.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xfs/devel/xorg-x11-xfs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xorg-x11-xfs.spec 17 Jan 2006 08:41:48 -0000 1.11 +++ xorg-x11-xfs.spec 31 Jan 2006 15:25:16 -0000 1.12 @@ -7,19 +7,19 @@ Summary: X.Org X11 xfs font server Name: xorg-x11-%{pkgname} -Version: 1.0.0 -Release: 2 +Version: 1.0.1 +Release: 1 # FIXME: Remove Epoch line if package gets renamed Epoch: 1 License: MIT/X11 Group: System Environment/Daemons URL: http://www.x.org #Source0: %{pkgname}-%{version}.tar.bz2 -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xfs-1.0.0.tar.bz2 -Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xfsinfo-1.0.0.tar.bz2 -Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fslsfonts-1.0.0.tar.bz2 -Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fstobdf-1.0.0.tar.bz2 -Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/showfont-1.0.0.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xfs-1.0.1.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/xfsinfo-1.0.1.tar.bz2 +Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fslsfonts-1.0.1.tar.bz2 +Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fstobdf-1.0.1.tar.bz2 +Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/showfont-1.0.1.tar.bz2 Source10: xfs.init # NOTE: xfs config input file, processed via sed below. Source11: xfs.config.in @@ -288,6 +288,9 @@ %{_mandir}/man1/xfsinfo.1x* %changelog +* Wed Jan 16 2006 Mike A. Harris 1:1.0.1-1 +- Updated all tarballs to version 1.0.1 from X11R7.0 + * Tue Jan 10 2006 Bill Nottingham 1:1.0.0-2 - fix rpm post script (#176009, ) From fedora-cvs-commits at redhat.com Tue Jan 31 15:32:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 10:32:07 -0500 Subject: rpms/xorg-x11-xinit/devel .cvsignore, 1.7, 1.8 sources, 1.5, 1.6 xorg-x11-xinit.spec, 1.12, 1.13 Message-ID: <200601311532.k0VFW7Ka031744@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xinit/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31702/devel Modified Files: .cvsignore sources xorg-x11-xinit.spec Log Message: auto-import xorg-x11-xinit-1.0.1-1 on branch devel from xorg-x11-xinit-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 16 Dec 2005 18:55:15 -0000 1.7 +++ .cvsignore 31 Jan 2006 15:31:51 -0000 1.8 @@ -1 +1 @@ -xinit-1.0.0.tar.bz2 +xinit-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Dec 2005 18:55:15 -0000 1.5 +++ sources 31 Jan 2006 15:31:51 -0000 1.6 @@ -1 +1 @@ -fbafaf085b60a29fc336db8dce766167 xinit-1.0.0.tar.bz2 +8c353e39389edbdffc5387acc24948a0 xinit-1.0.1.tar.bz2 Index: xorg-x11-xinit.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xinit/devel/xorg-x11-xinit.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xorg-x11-xinit.spec 16 Dec 2005 18:55:15 -0000 1.12 +++ xorg-x11-xinit.spec 31 Jan 2006 15:31:51 -0000 1.13 @@ -2,7 +2,7 @@ Summary: X.Org X11 X Window System xinit startup scripts Name: xorg-x11-%{pkgname} -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: MIT/X11 Group: User Interface/X @@ -93,6 +93,9 @@ %{_mandir}/man1/xinit.1x* %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated to xinit 1.0.1 from X11R7.0 + * Fri Dec 16 2005 Mike A. Harris 1.0.0-1 - Updated to xinit 1.0.0 from X11R7 RC4. - Changed manpage dir from man1x to man1 to match upstream default. From fedora-cvs-commits at redhat.com Tue Jan 31 15:33:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 10:33:47 -0500 Subject: rpms/xorg-x11-xkb-utils/devel .cvsignore, 1.7, 1.8 sources, 1.5, 1.6 xorg-x11-xkb-utils.spec, 1.7, 1.8 Message-ID: <200601311533.k0VFXlZM032051@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xkb-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32023/devel Modified Files: .cvsignore sources xorg-x11-xkb-utils.spec Log Message: auto-import xorg-x11-xkb-utils-1.0.1-1 on branch devel from xorg-x11-xkb-utils-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Dec 2005 20:02:12 -0000 1.7 +++ .cvsignore 31 Jan 2006 15:33:44 -0000 1.8 @@ -1,5 +1,5 @@ -setxkbmap-1.0.0.tar.bz2 -xkbcomp-1.0.0.tar.bz2 -xkbevd-1.0.0.tar.bz2 -xkbprint-1.0.0.tar.bz2 -xkbutils-1.0.0.tar.bz2 +setxkbmap-1.0.1.tar.bz2 +xkbcomp-1.0.1.tar.bz2 +xkbevd-1.0.1.tar.bz2 +xkbprint-1.0.1.tar.bz2 +xkbutils-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Dec 2005 20:02:13 -0000 1.5 +++ sources 31 Jan 2006 15:33:44 -0000 1.6 @@ -1,5 +1,5 @@ -eb34daed4fb2ecd2f00134aec2997679 setxkbmap-1.0.0.tar.bz2 -2bee4c0bb3475d3ef07c035798fcae85 xkbcomp-1.0.0.tar.bz2 -b4dacff8d6cca4aa2d14effc970e2522 xkbevd-1.0.0.tar.bz2 -0eda96d08abf2f6a7e7d87b2bbfa02dc xkbprint-1.0.0.tar.bz2 -e63c5ca479162e45d18190c703b03b5b xkbutils-1.0.0.tar.bz2 +cfea4f25b13ea2976132a1247f68b4b6 setxkbmap-1.0.1.tar.bz2 +c01c882d126c8c0da9a727537dfeaaee xkbcomp-1.0.1.tar.bz2 +2b9a666c92bee42c6af77c29759a606c xkbevd-1.0.1.tar.bz2 +b98ae2d8b21c545b7b322d0b302efefa xkbprint-1.0.1.tar.bz2 +84396a3dd75337caaae29d8fa5616fb1 xkbutils-1.0.1.tar.bz2 Index: xorg-x11-xkb-utils.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkb-utils/devel/xorg-x11-xkb-utils.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xorg-x11-xkb-utils.spec 19 Dec 2005 20:02:14 -0000 1.7 +++ xorg-x11-xkb-utils.spec 31 Jan 2006 15:33:44 -0000 1.8 @@ -2,18 +2,18 @@ Summary: X.Org X11 xkb utilities Name: xorg-x11-%{pkgname} -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %define xorgurl http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything -Source0: %{xorgurl}/xkbutils-1.0.0.tar.bz2 -Source1: %{xorgurl}/xkbcomp-1.0.0.tar.bz2 -Source2: %{xorgurl}/xkbevd-1.0.0.tar.bz2 -Source3: %{xorgurl}/xkbprint-1.0.0.tar.bz2 -Source4: %{xorgurl}/setxkbmap-1.0.0.tar.bz2 +Source0: %{xorgurl}/xkbutils-1.0.1.tar.bz2 +Source1: %{xorgurl}/xkbcomp-1.0.1.tar.bz2 +Source2: %{xorgurl}/xkbevd-1.0.1.tar.bz2 +Source3: %{xorgurl}/xkbprint-1.0.1.tar.bz2 +Source4: %{xorgurl}/setxkbmap-1.0.1.tar.bz2 BuildRequires: pkgconfig # libxkbfile-devel needed for setxkbmap, xkbcomp, xkbevd, xkbprint @@ -97,6 +97,9 @@ %{_mandir}/man1/xkbprint.1x* %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated all apps to version 1.0.1 from X11R7.0 + * Sat Dec 17 2005 Mike A. Harris 1.0.0-1 - Updated all apps to version 1.0.0 from X11R7 RC4. - Changed manpage dir from man1x to man1 to match upstream default. From fedora-cvs-commits at redhat.com Tue Jan 31 15:36:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 10:36:34 -0500 Subject: rpms/xorg-x11-xkbdata/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xorg-x11-xkbdata.spec, 1.3, 1.4 Message-ID: <200601311536.k0VFaYZt032649@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xkbdata/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv32607/devel Modified Files: .cvsignore sources xorg-x11-xkbdata.spec Log Message: auto-import xorg-x11-xkbdata-1.0.1-1 on branch devel from xorg-x11-xkbdata-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Dec 2005 03:35:33 -0000 1.3 +++ .cvsignore 31 Jan 2006 15:36:32 -0000 1.4 @@ -1 +1 @@ -xkbdata-1.0.0.tar.bz2 +xkbdata-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Dec 2005 03:35:33 -0000 1.3 +++ sources 31 Jan 2006 15:36:32 -0000 1.4 @@ -1 +1 @@ -a9ff9340bb6020919472dabf84fca1a8 xkbdata-1.0.0.tar.bz2 +9bf179be9a195953dc5f4c15e23ab7f0 xkbdata-1.0.1.tar.bz2 Index: xorg-x11-xkbdata.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xkbdata/devel/xorg-x11-xkbdata.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xorg-x11-xkbdata.spec 20 Dec 2005 03:35:33 -0000 1.3 +++ xorg-x11-xkbdata.spec 31 Jan 2006 15:36:32 -0000 1.4 @@ -2,7 +2,7 @@ Summary: xkb data files for the X.Org X11 X server Name: xorg-x11-%{pkgname} -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: MIT/X11 Group: User Interface/X @@ -432,6 +432,9 @@ %{_datadir}/X11/xkb/types/pc %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated to xbitmaps 1.0.1 from X11R7.0 + * Sat Dec 17 2005 Mike A. Harris 1.0.0-1 - Updated to xbitmaps 1.0.0 from X11R7 RC4. From fedora-cvs-commits at redhat.com Tue Jan 31 15:39:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 10:39:07 -0500 Subject: rpms/xorg-x11-xbitmaps/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xorg-x11-xbitmaps.spec, 1.6, 1.7 Message-ID: <200601311539.k0VFd7gd001426@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xbitmaps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv1389/devel Modified Files: .cvsignore sources xorg-x11-xbitmaps.spec Log Message: auto-import xorg-x11-xbitmaps-1.0.1-1 on branch devel from xorg-x11-xbitmaps-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xbitmaps/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Dec 2005 18:42:51 -0000 1.4 +++ .cvsignore 31 Jan 2006 15:39:04 -0000 1.5 @@ -1 +1 @@ -xbitmaps-1.0.0.tar.bz2 +xbitmaps-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xbitmaps/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Dec 2005 18:42:51 -0000 1.4 +++ sources 31 Jan 2006 15:39:04 -0000 1.5 @@ -1 +1 @@ -fbe1dfefb35b3976bd9821ae7b8bfd10 xbitmaps-1.0.0.tar.bz2 +b28a9840cde3c38d7c09716372fea257 xbitmaps-1.0.1.tar.bz2 Index: xorg-x11-xbitmaps.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xbitmaps/devel/xorg-x11-xbitmaps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xorg-x11-xbitmaps.spec 19 Dec 2005 18:42:51 -0000 1.6 +++ xorg-x11-xbitmaps.spec 31 Jan 2006 15:39:04 -0000 1.7 @@ -2,7 +2,7 @@ Summary: X.Org X11 application bitmaps Name: xorg-x11-%{pkgname} -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: MIT/X11 Group: User Interface/X @@ -81,6 +81,9 @@ %{_libdir}/pkgconfig/xbitmaps.pc %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated to xbitmaps 1.0.1 from X11R7.0 + * Sat Dec 17 2005 Mike A. Harris 1.0.0-1 - Updated to xbitmaps 1.0.0 from X11R7 RC4. From fedora-cvs-commits at redhat.com Tue Jan 31 16:05:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:05:19 -0500 Subject: rpms/xorg-x11-xsm/devel rstart-1.0.1-rstart-installation-location-fixes.patch, NONE, 1.1 xsm-1.0.1-xsm-installation-location-fixes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xorg-x11-xsm.spec, 1.5, 1.6 rstart-0.99.1-rstart-installation-location-fixes.patch, 1.2, NONE xsm-0.99.2-xsm-installation-location-fixes.patch, 1.2, NONE Message-ID: <200601311605.k0VG5JcP023463@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xsm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23435/devel Modified Files: .cvsignore sources xorg-x11-xsm.spec Added Files: rstart-1.0.1-rstart-installation-location-fixes.patch xsm-1.0.1-xsm-installation-location-fixes.patch Removed Files: rstart-0.99.1-rstart-installation-location-fixes.patch xsm-0.99.2-xsm-installation-location-fixes.patch Log Message: auto-import xorg-x11-xsm-1.0.1-1 on branch devel from xorg-x11-xsm-1.0.1-1.src.rpm rstart-1.0.1-rstart-installation-location-fixes.patch: Makefile.am | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) --- NEW FILE rstart-1.0.1-rstart-installation-location-fixes.patch --- --- rstart-1.0.1/Makefile.am.installation-location-fixes 2005-11-23 06:28:35.000000000 -0500 +++ rstart-1.0.1/Makefile.am 2005-11-23 06:31:44.000000000 -0500 @@ -26,7 +26,7 @@ rstartd_real_CFLAGS = $(RSTART_CFLAGS) \ -DSERVERNAME=\"rstart\" \ - -DDEFAULT_CONFIG=\"$(libdir)/X11/rstart/config\" + -DDEFAULT_CONFIG=\"$(datadir)/X11/rstart/config\" rstartd_real_LDADD = $(RSTART_LIBS) @@ -50,9 +50,10 @@ # config data -configdir = $(libdir)/X11/rstart +configdir = $(sysconfdir)/X11/rstart config_DATA = config +# The -DLIBDIR=$(configdir) here just looks "wrong".. we'll see... config: config.cpp $(RAWCPP) $(RAWCPPFLAGS) -DPACKAGEname=rstart -DLIBDIR=$(configdir) \ -DENVPREFIX=RSTART < ${srcdir}/config.cpp | $(CPP_SED_MAGIC) > $@ @@ -99,7 +100,7 @@ # FIXME: Someone who cares about rstart may want to look into sanitizing # the stuff below. -DATA_DIR = $(libdir)/X11/rstart +DATA_DIR = $(datadir)/X11/rstart install-data-hook: for name in `find ${srcdir}/commands -print | grep -v CVS` ; do \ xsm-1.0.1-xsm-installation-location-fixes.patch: Makefile.am | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xsm-1.0.1-xsm-installation-location-fixes.patch --- --- xsm-1.0.1/Makefile.am.xsm-installation-location-fixes 2005-11-23 07:04:34.000000000 -0500 +++ xsm-1.0.1/Makefile.am 2005-11-23 07:05:47.000000000 -0500 @@ -21,7 +21,7 @@ bin_PROGRAMS = xsm -SYSTEM_INIT_DIR = $(libdir)/X11/xsm +SYSTEM_INIT_DIR = $(sysconfdir)/X11/xsm xsm_CFLAGS = $(XSM_CFLAGS) -DRSHCMD=\"@RSH@\" \ Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Dec 2005 19:38:35 -0000 1.3 +++ .cvsignore 31 Jan 2006 16:05:17 -0000 1.4 @@ -1,3 +1,3 @@ -rstart-1.0.0.tar.bz2 -smproxy-1.0.0.tar.bz2 -xsm-1.0.0.tar.bz2 +rstart-1.0.1.tar.bz2 +smproxy-1.0.1.tar.bz2 +xsm-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Dec 2005 19:38:35 -0000 1.3 +++ sources 31 Jan 2006 16:05:17 -0000 1.4 @@ -1,3 +1,3 @@ -7c0c59d789dcc551c4cd5aa3e11bff63 rstart-1.0.0.tar.bz2 -5349b08a4801b57ead9b53ba960f1d4f smproxy-1.0.0.tar.bz2 -a9da580db77532d62968e86525dd3289 xsm-1.0.0.tar.bz2 +48bb7ad1fb9a4e43a8a702148dfb846e rstart-1.0.1.tar.bz2 +977acfb1f74d0de55d78bd80a4e08ad3 smproxy-1.0.1.tar.bz2 +cce867ff7d0df9c0b9e682591779952c xsm-1.0.1.tar.bz2 Index: xorg-x11-xsm.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xsm/devel/xorg-x11-xsm.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xorg-x11-xsm.spec 16 Dec 2005 19:38:35 -0000 1.5 +++ xorg-x11-xsm.spec 31 Jan 2006 16:05:17 -0000 1.6 @@ -2,24 +2,24 @@ Summary: X.Org X11 X Session Manager Name: xorg-x11-%{pkgname} -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xsm-1.0.0.tar.bz2 -Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/smproxy-1.0.0.tar.bz2 -Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/rstart-1.0.0.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsm-1.0.1.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/smproxy-1.0.1.tar.bz2 +Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/rstart-1.0.1.tar.bz2 # Patches for xsm (10-19) -Patch10: xsm-0.99.2-xsm-installation-location-fixes.patch +Patch10: xsm-1.0.1-xsm-installation-location-fixes.patch # Patches for smproxy (20-29) #Patch20: # Patches for rstart (30-39) -Patch30: rstart-0.99.1-rstart-installation-location-fixes.patch +Patch30: rstart-1.0.1-rstart-installation-location-fixes.patch # FIXME: The BuildRequires are all missing here and need to be figured out. # That's low priority for now though, unless we encounter real build @@ -122,6 +122,9 @@ %config %{_sysconfdir}/X11/xsm/system.xsm %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated all apps to version 1.0.1 from X11R7.0 + * Tue Nov 22 2005 Mike A. Harris 1.0.0-1 - Updated all apps to version 1.0.0 from X11R7 RC4. - Changed manpage dir from man1x to man1 to match upstream default. --- rstart-0.99.1-rstart-installation-location-fixes.patch DELETED --- --- xsm-0.99.2-xsm-installation-location-fixes.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 31 16:05:32 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:05:32 -0500 Subject: rpms/udev/FC-4 udev.rules,1.28,1.29 udev.spec,1.93,1.94 Message-ID: <200601311605.k0VG5WQN023551@cvs.devel.redhat.com> Author: harald Update of /cvs/dist/rpms/udev/FC-4 In directory cvs.devel.redhat.com:/tmp/cvs-serv23488 Modified Files: udev.rules udev.spec Log Message: - removed firmware_helper rule, which conflicts with hotplug firmware helper Index: udev.rules =================================================================== RCS file: /cvs/dist/rpms/udev/FC-4/udev.rules,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- udev.rules 25 Jan 2006 10:03:30 -0000 1.28 +++ udev.rules 31 Jan 2006 16:05:27 -0000 1.29 @@ -322,8 +322,8 @@ ACTION=="add", SUBSYSTEM=="scsi", SYSFS{type}=="[23689]", \ RUN+="/sbin/modprobe sg" -ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \ - RUN+="/sbin/firmware_helper" +# ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="*", \ +# RUN+="/sbin/firmware_helper" RUN+="socket:/org/kernel/udev/monitor" Index: udev.spec =================================================================== RCS file: /cvs/dist/rpms/udev/FC-4/udev.spec,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- udev.spec 25 Jan 2006 10:03:30 -0000 1.93 +++ udev.spec 31 Jan 2006 16:05:27 -0000 1.94 @@ -5,7 +5,7 @@ Summary: A userspace implementation of devfs Name: udev Version: 071 -Release: 0.FC4.1 +Release: 0.FC4.2 License: GPL Group: System Environment/Base Provides: udev-persistent = 0:%{version}-%{release} @@ -266,6 +266,9 @@ %attr(0644,root,root) %{_mandir}/man8/scsi_id*.8* %changelog +* Tue Jan 31 2006 Harald Hoyer - 071-0.FC4.2 +- removed firmware_helper rule, which conflicts with hotplug firmware helper + * Wed Jan 25 2006 Harald Hoyer - 071-0.FC4.1 - version 071 for FC-4 From fedora-cvs-commits at redhat.com Tue Jan 31 16:10:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:10:05 -0500 Subject: rpms/xorg-x11-server-utils/devel lbxproxy-1.0.1-datadir-AtomControl-fix.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xorg-x11-server-utils.spec, 1.9, 1.10 lbxproxy-datadir-AtomControl-fix.patch, 1.1, NONE Message-ID: <200601311610.k0VGA5rN025123@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-server-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25083/devel Modified Files: .cvsignore sources xorg-x11-server-utils.spec Added Files: lbxproxy-1.0.1-datadir-AtomControl-fix.patch Removed Files: lbxproxy-datadir-AtomControl-fix.patch Log Message: auto-import xorg-x11-server-utils-1.0.1-1 on branch devel from xorg-x11-server-utils-1.0.1-1.src.rpm lbxproxy-1.0.1-datadir-AtomControl-fix.patch: Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE lbxproxy-1.0.1-datadir-AtomControl-fix.patch --- --- lbxproxy-1.0.1/Makefile.am.lbxproxy-datadir-fixes 2005-11-18 18:00:57.000000000 -0500 +++ lbxproxy-1.0.1/Makefile.am 2005-11-18 18:01:38.000000000 -0500 @@ -22,7 +22,7 @@ bin_PROGRAMS = lbxproxy lbxproxy_CFLAGS = $(LBXPROXY_CFLAGS) -I$(top_srcdir)/include \ - -DDEF_ATOMS_FILE=\"$(libdir)/X11/lbxproxy/AtomControl\" \ + -DDEF_ATOMS_FILE=\"$(datadir)/X11/lbxproxy/AtomControl\" \ -D_BSD_SOURCE -DLBXPROXY_t -DTRANS_SERVER lbxproxy_LDADD = $(LBXPROXY_LIBS) @@ -81,7 +81,7 @@ appman_SOURCES = \ lbxproxy.man -configdir = $(libdir)/X11/lbxproxy +configdir = $(datadir)/X11/lbxproxy dist_config_DATA = config/AtomControl EXTRA_DIST = \ Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Dec 2005 18:08:20 -0000 1.3 +++ .cvsignore 31 Jan 2006 16:10:02 -0000 1.4 @@ -1,18 +1,18 @@ -iceauth-1.0.0.tar.bz2 -lbxproxy-1.0.0.tar.bz2 +iceauth-1.0.1.tar.bz2 +lbxproxy-1.0.1.tar.bz2 rgb-1.0.0.tar.bz2 sessreg-1.0.0.tar.bz2 -xcmsdb-1.0.0.tar.bz2 -xgamma-1.0.0.tar.bz2 +xcmsdb-1.0.1.tar.bz2 +xgamma-1.0.1.tar.bz2 xhost-1.0.0.tar.bz2 xmodmap-1.0.0.tar.bz2 -xrandr-1.0.0.tar.bz2 -xrdb-1.0.0.tar.bz2 -xrefresh-1.0.0.tar.bz2 -xset-1.0.0.tar.bz2 +xrandr-1.0.1.tar.bz2 +xrdb-1.0.1.tar.bz2 +xrefresh-1.0.1.tar.bz2 +xset-1.0.1.tar.bz2 xsetmode-1.0.0.tar.bz2 xsetpointer-1.0.0.tar.bz2 -xsetroot-1.0.0.tar.bz2 -xstdcmap-1.0.0.tar.bz2 -xtrap-1.0.0.tar.bz2 -xvidtune-1.0.0.tar.bz2 +xsetroot-1.0.1.tar.bz2 +xstdcmap-1.0.1.tar.bz2 +xtrap-1.0.1.tar.bz2 +xvidtune-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Dec 2005 18:08:20 -0000 1.3 +++ sources 31 Jan 2006 16:10:02 -0000 1.4 @@ -1,18 +1,18 @@ -b267b2ad975101b07e0197ea368fec5c iceauth-1.0.0.tar.bz2 -6e392159dd4552c04604514e8f39cde0 lbxproxy-1.0.0.tar.bz2 -a8f2af1ce42bbc86f8b7adf15e055248 rgb-1.0.0.tar.bz2 -17ae77f9b5ecb49194840b5af7f20ecc sessreg-1.0.0.tar.bz2 -834e1e1a58acaca0bbf249aaf75efb3e xcmsdb-1.0.0.tar.bz2 -ea296218386bb97d5243f19fb60e93cb xgamma-1.0.0.tar.bz2 -4d7f555194647831a9596dd9def8f24d xhost-1.0.0.tar.bz2 -8a0fceaacad1a6c0c2cffebbfabd46b5 xmodmap-1.0.0.tar.bz2 -d70a25eb536c5018b8445d3b4f45fc4a xrandr-1.0.0.tar.bz2 -f5d828fc4265f8abc530d3856d92955c xrdb-1.0.0.tar.bz2 -ac1be83ab141a26f1a8aa8916e0cfc99 xrefresh-1.0.0.tar.bz2 -df41d566866711762117e984fda54dfd xset-1.0.0.tar.bz2 -6c6ac44a72f7c86e777ca9d55d022c21 xsetmode-1.0.0.tar.bz2 -c61c9c5401ea473121e3fb29678d3411 xsetpointer-1.0.0.tar.bz2 -b520e8d417c22d8cdecb5cbe749fe81b xsetroot-1.0.0.tar.bz2 -3410cc44109a4fa2c326bf96c581e328 xstdcmap-1.0.0.tar.bz2 -999a49e0f08ce96cdb5cb201c3670eb8 xtrap-1.0.0.tar.bz2 -4759dff3815184172c05478ac2cf92d1 xvidtune-1.0.0.tar.bz2 +50df9a5718b3cb6544a1c9f38b392b09 iceauth-1.0.1.tar.bz2 +9d5045a5c76b1fe360221b967a5aa0e9 lbxproxy-1.0.1.tar.bz2 +04349739e0ce2a8557d32ffc55cb8d69 rgb-1.0.0.tar.bz2 +15c8032bbf5197e8fb5d071d9500a880 sessreg-1.0.0.tar.bz2 +8579d5f50ba7f0c4a5bf16b9670fea01 xcmsdb-1.0.1.tar.bz2 +45d8fa3c85d4bfda87251798fd605a45 xgamma-1.0.1.tar.bz2 +426abcd1b36236a9dbe56770f57fcdfb xhost-1.0.0.tar.bz2 +6c45ef77c26dce98e625d1f99df16468 xmodmap-1.0.0.tar.bz2 +14de596b7276c46b77e336cbb4f13c24 xrandr-1.0.1.tar.bz2 +9ed059ee45780d32c697d4acc6b07192 xrdb-1.0.1.tar.bz2 +8e211e4dfa178d2797cea058709f72ab xrefresh-1.0.1.tar.bz2 +efd71993a9dc96566dd3e89f507ccac5 xset-1.0.1.tar.bz2 +d074e79d380b031d2f60e4cd56538c93 xsetmode-1.0.0.tar.bz2 +c94ea103e27e370e4e5030e50c5d5d69 xsetpointer-1.0.0.tar.bz2 +fc7eeb7130bb54345671a9dbaab567ac xsetroot-1.0.1.tar.bz2 +86ab558441edfb86f853639e4290a754 xstdcmap-1.0.1.tar.bz2 +e49c695a0af17bc4896e51c298304643 xtrap-1.0.1.tar.bz2 +e0744594f4e5969b20df28d897781318 xvidtune-1.0.1.tar.bz2 Index: xorg-x11-server-utils.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-server-utils/devel/xorg-x11-server-utils.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xorg-x11-server-utils.spec 16 Dec 2005 18:08:20 -0000 1.9 +++ xorg-x11-server-utils.spec 31 Jan 2006 16:10:02 -0000 1.10 @@ -2,30 +2,30 @@ Summary: X.Org X11 X server utilities Name: xorg-x11-%{pkgname} -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/iceauth-1.0.0.tar.bz2 -Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/lbxproxy-1.0.0.tar.bz2 -Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/rgb-1.0.0.tar.bz2 -Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/sessreg-1.0.0.tar.bz2 -Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xcmsdb-1.0.0.tar.bz2 -Source5: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xgamma-1.0.0.tar.bz2 -Source6: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xhost-1.0.0.tar.bz2 -Source7: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xmodmap-1.0.0.tar.bz2 -Source8: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xrandr-1.0.0.tar.bz2 -Source9: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xrdb-1.0.0.tar.bz2 -Source10: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xrefresh-1.0.0.tar.bz2 -Source11: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xset-1.0.0.tar.bz2 -Source12: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xsetmode-1.0.0.tar.bz2 -Source13: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xsetpointer-1.0.0.tar.bz2 -Source14: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xsetroot-1.0.0.tar.bz2 -Source15: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xstdcmap-1.0.0.tar.bz2 -Source16: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xtrap-1.0.0.tar.bz2 -Source17: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xvidtune-1.0.0.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/iceauth-1.0.1.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/lbxproxy-1.0.1.tar.bz2 +Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/rgb-1.0.0.tar.bz2 +Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/sessreg-1.0.0.tar.bz2 +Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xcmsdb-1.0.1.tar.bz2 +Source5: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xgamma-1.0.1.tar.bz2 +Source6: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xhost-1.0.0.tar.bz2 +Source7: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmodmap-1.0.0.tar.bz2 +Source8: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrandr-1.0.1.tar.bz2 +Source9: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrdb-1.0.1.tar.bz2 +Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xrefresh-1.0.1.tar.bz2 +Source11: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xset-1.0.1.tar.bz2 +Source12: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetmode-1.0.0.tar.bz2 +Source13: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetpointer-1.0.0.tar.bz2 +Source14: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xsetroot-1.0.1.tar.bz2 +Source15: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xstdcmap-1.0.1.tar.bz2 +Source16: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xtrap-1.0.1.tar.bz2 +Source17: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xvidtune-1.0.1.tar.bz2 # NOTE: Each upstream tarball has its own "PatchN" section, taken from # multiplying the "SourceN" line times 1000. Please keep them in this @@ -36,7 +36,7 @@ #Patch0: # lbxproxy section -Patch1000: lbxproxy-datadir-AtomControl-fix.patch +Patch1000: lbxproxy-1.0.1-datadir-AtomControl-fix.patch # rgb section Patch1100: rgb-1.0.0-datadir-rgbpath-fix.patch @@ -212,6 +212,9 @@ %{_mandir}/man1/xvidtune.1x* %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated all packages to the versions from X11R7.0 + * Mon Nov 28 2005 Mike A. Harris 1.0.0-1 - Updated all packages to version 1.0.0 from X11R7 RC4 - Changed manpage dirs from man1x to man1 to match upstream RC4 default. --- lbxproxy-datadir-AtomControl-fix.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 31 16:10:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:10:27 -0500 Subject: rpms/xorg-x11-utils/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xorg-x11-utils.spec, 1.6, 1.7 Message-ID: <200601311610.k0VGARcR025368@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-utils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25324/devel Modified Files: .cvsignore sources xorg-x11-utils.spec Log Message: auto-import xorg-x11-utils-1.0.1-1 on branch devel from xorg-x11-utils-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Dec 2005 16:06:12 -0000 1.3 +++ .cvsignore 31 Jan 2006 16:10:25 -0000 1.4 @@ -1,11 +1,11 @@ -xdpyinfo-1.0.0.tar.bz2 +xdpyinfo-1.0.1.tar.bz2 xdriinfo-1.0.0.tar.bz2 -xev-1.0.0.tar.bz2 -xfd-1.0.0.tar.bz2 -xfontsel-1.0.0.tar.bz2 -xlsatoms-1.0.0.tar.bz2 -xlsclients-1.0.0.tar.bz2 -xlsfonts-1.0.0.tar.bz2 -xprop-1.0.0.tar.bz2 -xvinfo-1.0.0.tar.bz2 -xwininfo-1.0.0.tar.bz2 +xev-1.0.1.tar.bz2 +xfd-1.0.1.tar.bz2 +xfontsel-1.0.1.tar.bz2 +xlsatoms-1.0.1.tar.bz2 +xlsclients-1.0.1.tar.bz2 +xlsfonts-1.0.1.tar.bz2 +xprop-1.0.1.tar.bz2 +xvinfo-1.0.1.tar.bz2 +xwininfo-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Dec 2005 16:06:12 -0000 1.3 +++ sources 31 Jan 2006 16:10:25 -0000 1.4 @@ -1,11 +1,11 @@ -ff5f7ec5b0e5121ecff11e73052fea19 xdpyinfo-1.0.0.tar.bz2 -5ca3fc5073dd52875dcfb456cebe69db xdriinfo-1.0.0.tar.bz2 -2488ebde90006ada865d1732d389bba7 xev-1.0.0.tar.bz2 -aaa146595e2b457af77b7e2000c211c1 xfd-1.0.0.tar.bz2 -baadbcb8b939c1a157ff9edb52c1ccf4 xfontsel-1.0.0.tar.bz2 -6add9f6c78a47a5ff38e9bf7b6dca19b xlsatoms-1.0.0.tar.bz2 -24da8d78c218cf92bc943217bc5e295e xlsclients-1.0.0.tar.bz2 -374d57cf2cbaac59bebaedf94fdb831f xlsfonts-1.0.0.tar.bz2 -235cf01c8af040ee1beae1f5f01aab66 xprop-1.0.0.tar.bz2 -e86a2b7aa7c327764bc11bc25ac81973 xvinfo-1.0.0.tar.bz2 -c5d265e0c5ea5b8afbb8929d48b5d0de xwininfo-1.0.0.tar.bz2 +84cc4798fe62c1d8c67c3f38e8158f70 xdpyinfo-1.0.1.tar.bz2 +8941897fd2bd533f8a676df60ec4f7f5 xdriinfo-1.0.0.tar.bz2 +533a399580d6797faf1a7416fc2c653f xev-1.0.1.tar.bz2 +c72abd90f50ef459bc14b39ec9fcc7f8 xfd-1.0.1.tar.bz2 +f7b240af84fa8f68f5074b3f0ae479e5 xfontsel-1.0.1.tar.bz2 +69adcda848479acc3b82b3928812d191 xlsatoms-1.0.1.tar.bz2 +44473b880d26bfbe8b3d4d72b183cba7 xlsclients-1.0.1.tar.bz2 +ca9c6c88d0b83360b7b5092615fbf591 xlsfonts-1.0.1.tar.bz2 +9f2cb01264bcaa0455d8b06be6215744 xprop-1.0.1.tar.bz2 +0a5bd8e43de6eb8ff5b5bc673204401d xvinfo-1.0.1.tar.bz2 +807a845434bd9bbe759b59aa923c258d xwininfo-1.0.1.tar.bz2 Index: xorg-x11-utils.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-utils/devel/xorg-x11-utils.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xorg-x11-utils.spec 23 Jan 2006 17:42:02 -0000 1.6 +++ xorg-x11-utils.spec 31 Jan 2006 16:10:25 -0000 1.7 @@ -2,23 +2,23 @@ Summary: X.Org X11 X client utilities Name: xorg-x11-%{pkgname} -Version: 1.0.0 -Release: 2 +Version: 1.0.1 +Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xdpyinfo-1.0.0.tar.bz2 -Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xdriinfo-1.0.0.tar.bz2 -Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xev-1.0.0.tar.bz2 -Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xfd-1.0.0.tar.bz2 -Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xfontsel-1.0.0.tar.bz2 -Source5: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xlsatoms-1.0.0.tar.bz2 -Source6: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xlsclients-1.0.0.tar.bz2 -Source7: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xlsfonts-1.0.0.tar.bz2 -Source8: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xprop-1.0.0.tar.bz2 -Source9: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xvinfo-1.0.0.tar.bz2 -Source10: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xwininfo-1.0.0.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xdpyinfo-1.0.1.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xdriinfo-1.0.0.tar.bz2 +Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xev-1.0.1.tar.bz2 +Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfd-1.0.1.tar.bz2 +Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfontsel-1.0.1.tar.bz2 +Source5: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xlsatoms-1.0.1.tar.bz2 +Source6: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xlsclients-1.0.1.tar.bz2 +Source7: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xlsfonts-1.0.1.tar.bz2 +Source8: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xprop-1.0.1.tar.bz2 +Source9: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xvinfo-1.0.1.tar.bz2 +Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwininfo-1.0.1.tar.bz2 %define applist xdpyinfo xdriinfo xev xfd xfontsel xlsatoms xlsclients xlsfonts xprop xvinfo xwininfo @@ -102,6 +102,9 @@ %{_mandir}/man1/xwininfo.1x.gz %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated all tarballs to versions from X11R7.0 + * Sat Dec 17 2005 Mike A. Harris 1.0.0-1 - Updated all tarballs to version 1.0.0 from X11R7 RC4. - Changed manpage dir from man1x to man1 to match upstream RC4 default. From fedora-cvs-commits at redhat.com Tue Jan 31 16:17:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:17:11 -0500 Subject: rpms/cairo/devel cairo-1.0.2-embedded-bitmaps.patch, NONE, 1.1 cairo-1.0.2-fix-build.patch, NONE, 1.1 cairo.spec, 1.29, 1.30 Message-ID: <200601311617.k0VGHB3C008142@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/cairo/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8028 Modified Files: cairo.spec Added Files: cairo-1.0.2-embedded-bitmaps.patch cairo-1.0.2-fix-build.patch Log Message: - add patch from Tim Mayberry to support embbedded bitmap fonts (bug 176910) cairo-1.0.2-embedded-bitmaps.patch: cairo-ft-font.c | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) --- NEW FILE cairo-1.0.2-embedded-bitmaps.patch --- --- cairo-1.0.2/src/cairo-ft-font.c.orig 2005-12-20 10:56:08.000000000 +1000 +++ cairo-1.0.2/src/cairo-ft-font.c 2005-12-20 11:01:03.000000000 +1000 @@ -1328,7 +1328,9 @@ static int _get_pattern_load_flags (FcPattern *pattern) { - FcBool antialias, vertical_layout, hinting, autohint; + FcBool antialias, vertical_layout, hinting, autohint, bitmap; + FcBool transform; + FcMatrix *font_matrix; int rgba; #ifdef FC_HINT_STYLE int hintstyle; @@ -1336,14 +1338,30 @@ int load_flags = 0; int target_flags = 0; +#ifndef FC_EMBEDDED_BITMAP +#define FC_EMBEDDED_BITMAP "embeddedbitmap" +#endif + + if (FcPatternGetMatrix (pattern, + FC_MATRIX, 0, &font_matrix) != FcResultMatch) + font_matrix = NULL; + + transform = (font_matrix && (font_matrix->xx != 1 || font_matrix->xy != 0 || + font_matrix->yx != 0 || font_matrix->yy != 1)); + + /* Check whether to use embedded bitmap forcely */ + if (FcPatternGetBool (pattern, + FC_EMBEDDED_BITMAP, 0, &bitmap) != FcResultMatch) + bitmap = FcFalse; + /* disable antialiasing if requested */ if (FcPatternGetBool (pattern, FC_ANTIALIAS, 0, &antialias) != FcResultMatch) antialias = FcTrue; - if (antialias) + if ((!bitmap && antialias) || transform) load_flags |= FT_LOAD_NO_BITMAP; - else + else if (!antialias) load_flags |= FT_LOAD_MONOCHROME; /* disable hinting if requested */ cairo-1.0.2-fix-build.patch: pixman-remap.h | 2 -- 1 files changed, 2 deletions(-) --- NEW FILE cairo-1.0.2-fix-build.patch --- --- cairo-1.0.2/pixman/src/pixman-remap.h.orig 2006-01-17 10:52:03.000000000 +1000 +++ cairo-1.0.2/pixman/src/pixman-remap.h 2006-01-17 10:52:33.000000000 +1000 @@ -1,9 +1,7 @@ #define pixman_add_trapezoids _cairo_pixman_add_trapezoids -#define INT_pixman_color_to_pixel _cairo_pixman_color_to_pixel #define pixman_color_to_pixel _cairo_pixman_color_to_pixel #define composeFunctions _cairo_pixman_compose_functions #define fbComposeSetupMMX _cairo_pixman_compose_setup_mmx -#define INT_pixman_composite _cairo_pixman_composite #define pixman_composite _cairo_pixman_composite #define fbCompositeCopyAreammx _cairo_pixman_composite_copy_area_mmx #define fbCompositeSolidMask_nx8888x0565Cmmx _cairo_pixman_composite_solid_mask_nx8888x0565Cmmx Index: cairo.spec =================================================================== RCS file: /cvs/dist/rpms/cairo/devel/cairo.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- cairo.spec 3 Jan 2006 19:59:18 -0000 1.29 +++ cairo.spec 31 Jan 2006 16:17:08 -0000 1.30 @@ -4,7 +4,7 @@ Summary: A vector graphics library Name: cairo Version: 1.0.2 -Release: 3.2 +Release: 4 URL: http://cairographics.org Source0: %{name}-%{version}.tar.gz License: LGPL/MPL @@ -18,10 +18,14 @@ Requires: /sbin/ldconfig BuildRequires: pkgconfig BuildRequires: libXrender-devel +BuildRequires: libX11-devel BuildRequires: libpng-devel BuildRequires: freetype-devel >= %{freetype_version} BuildRequires: fontconfig-devel >= %{fontconfig_version} +Patch0: cairo-1.0.2-embedded-bitmaps.patch +Patch1: cairo-1.0.2-fix-build.patch + %description Cairo is a vector graphics library designed to provide high-quality display and print output. Currently supported output targets include @@ -47,6 +51,8 @@ %prep %setup -q +%patch0 -p1 -b .embedded-bitmaps +%patch1 -p1 -b .fix-build %build %configure --enable-warnings --disable-glitz --disable-quartz \ @@ -81,6 +87,10 @@ %{_datadir}/gtk-doc/* %changelog +* Tue Jan 31 2006 Ray Strode 1.0.2-4 +- add patch from Tim Mayberry to support embbedded bitmap + fonts (bug 176910) + * Tue Jan 3 2006 Jesse Keating 1.0.2-3.2 - rebuilt again From fedora-cvs-commits at redhat.com Tue Jan 31 16:18:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:18:07 -0500 Subject: rpms/xorg-x11-resutils/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xorg-x11-resutils.spec, 1.5, 1.6 Message-ID: <200601311618.k0VGI7US008654@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-resutils/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv8616/devel Modified Files: .cvsignore sources xorg-x11-resutils.spec Log Message: auto-import xorg-x11-resutils-1.0.1-1 on branch devel from xorg-x11-resutils-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Dec 2005 15:29:41 -0000 1.3 +++ .cvsignore 31 Jan 2006 16:18:04 -0000 1.4 @@ -1,4 +1,4 @@ appres-1.0.0.tar.bz2 -editres-1.0.0.tar.bz2 -listres-1.0.0.tar.bz2 -viewres-1.0.0.tar.bz2 +editres-1.0.1.tar.bz2 +listres-1.0.1.tar.bz2 +viewres-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Dec 2005 15:29:41 -0000 1.3 +++ sources 31 Jan 2006 16:18:04 -0000 1.4 @@ -1,4 +1,4 @@ -8e00ea4f95caf70962f9a121ac23ae6e appres-1.0.0.tar.bz2 -297149be1b30aa8e2f114c9e7b67d610 editres-1.0.0.tar.bz2 -b967c365b0d90b711c751de8d9243b2f listres-1.0.0.tar.bz2 -5188308bd88d05043df449cceefda44d viewres-1.0.0.tar.bz2 +4e03ac5f315213d5c70d603fc92cb0a1 appres-1.0.0.tar.bz2 +a9bbacc163767f79dfc08a8ebe05490b editres-1.0.1.tar.bz2 +827a1ac5adf9aadd0c13b54a897e297b listres-1.0.1.tar.bz2 +cdbed540daf7975b56000420c9aa5bf9 viewres-1.0.1.tar.bz2 Index: xorg-x11-resutils.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-resutils/devel/xorg-x11-resutils.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xorg-x11-resutils.spec 16 Dec 2005 15:29:41 -0000 1.5 +++ xorg-x11-resutils.spec 31 Jan 2006 16:18:04 -0000 1.6 @@ -2,16 +2,16 @@ Summary: X.Org X11 X resource utilities Name: xorg-x11-%{pkgname} -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/appres-1.0.0.tar.bz2 -Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/editres-1.0.0.tar.bz2 -Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/listres-1.0.0.tar.bz2 -Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/viewres-1.0.0.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/appres-1.0.0.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/editres-1.0.1.tar.bz2 +Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/listres-1.0.1.tar.bz2 +Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/viewres-1.0.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -95,6 +95,9 @@ %{_mandir}/man1/viewres.1x* %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Update all resource utils to version 1.0.1 from X11R7.0 + * Fri Dec 16 2005 Mike A. Harris 1.0.0-1 - Update all resource utils to version 1.0.0 from X11R7 RC4. - Move app-defaults files to _datadir From fedora-cvs-commits at redhat.com Tue Jan 31 16:20:34 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:20:34 -0500 Subject: rpms/rpm/devel rpm-4.4.2-rpmsq-deadlock.patch, NONE, 1.1 rpm.spec, 1.192, 1.193 Message-ID: <200601311620.k0VGKYho009849@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/rpm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv9816 Modified Files: rpm.spec Added Files: rpm-4.4.2-rpmsq-deadlock.patch Log Message: Rebuild for neon rpm-4.4.2-rpmsq-deadlock.patch: rpmsq.c | 53 +++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 41 insertions(+), 12 deletions(-) --- NEW FILE rpm-4.4.2-rpmsq-deadlock.patch --- --- rpm-4.4.2/rpmio/rpmsq.c.deadlock 2005-07-13 06:47:03.000000000 -0400 +++ rpm-4.4.2/rpmio/rpmsq.c 2006-01-30 21:00:13.000000000 -0500 @@ -218,7 +218,6 @@ sq->id = ME(); ret = pthread_mutex_init(&sq->mutex, NULL); - ret = pthread_cond_init(&sq->cond, NULL); insque(elem, (prev != NULL ? prev : rpmsqQueue)); ret = sigrelse(SIGCHLD); } @@ -240,8 +239,11 @@ ret = sighold (SIGCHLD); if (ret == 0) { remque(elem); - ret = pthread_cond_destroy(&sq->cond); - ret = pthread_mutex_destroy(&sq->mutex); + + /* Unlock the mutex and then destroy it */ + if((ret = pthread_mutex_unlock(&sq->mutex)) == 0) + ret = pthread_mutex_destroy(&sq->mutex); + sq->id = NULL; /*@-bounds@*/ if (sq->pipes[1]) ret = close(sq->pipes[1]); @@ -315,11 +317,20 @@ sq != NULL && sq != rpmsqQueue; sq = sq->q_forw) { + int ret; + if (sq->child != reaped) /*@innercontinue@*/ continue; sq->reaped = reaped; sq->status = status; - (void) pthread_cond_signal(&sq->cond); + + /* Unlock the mutex. The waiter will then be able to + * aquire the lock. + * + * XXX: jbj, wtd, if this fails? + */ + ret = pthread_mutex_unlock(&sq->mutex); + /*@innerbreak@*/ break; } } @@ -391,6 +402,7 @@ { pid_t pid; int xx; + int nothreads = 0; /* XXX: Shouldn't this be a global? */ if (sq->reaper) { xx = rpmsqInsert(sq, NULL); @@ -405,6 +417,24 @@ xx = sighold(SIGCHLD); + /* + * Initialize the cond var mutex. We have to aquire the lock we + * use for the condition before we fork. Otherwise it is possible for + * the child to exit, we get sigchild and the sig handler to send + * the condition signal before we are waiting on the condition. + */ + if (!nothreads) { + if(pthread_mutex_lock(&sq->mutex)) { + /* Yack we did not get the lock, lets just give up */ +/*@-bounds@*/ + xx = close(sq->pipes[0]); + xx = close(sq->pipes[1]); + sq->pipes[0] = sq->pipes[1] = -1; +/*@=bounds@*/ + goto out; + } + } + pid = fork(); if (pid < (pid_t) 0) { /* fork failed. */ /*@-bounds@*/ @@ -462,10 +492,6 @@ /* Protect sq->reaped from handler changes. */ ret = sighold(SIGCHLD); - /* Initialize the cond var mutex. */ - if (!nothreads) - ret = pthread_mutex_lock(&sq->mutex); - /* Start the child, linux often runs child before parent. */ /*@-bounds@*/ if (sq->pipes[0] >= 0) @@ -486,7 +512,13 @@ ret = sigpause(SIGCHLD); else { xx = sigrelse(SIGCHLD); - ret = pthread_cond_wait(&sq->cond, &sq->mutex); + + /* + * We start before the fork with this mutex locked; + * The only one that unlocks this the signal handler. + * So if we get the lock the child has been reaped. + */ + ret = pthread_mutex_lock(&sq->mutex); xx = sighold(SIGCHLD); } } @@ -495,9 +527,6 @@ /* Accumulate stopwatch time spent waiting, potential performance gain. */ sq->ms_scriptlets += rpmswExit(&sq->op, -1)/1000; - /* Tear down cond var mutex, our child has been reaped. */ - if (!nothreads) - xx = pthread_mutex_unlock(&sq->mutex); xx = sigrelse(SIGCHLD); #ifdef _RPMSQ_DEBUG Index: rpm.spec =================================================================== RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v retrieving revision 1.192 retrieving revision 1.193 diff -u -r1.192 -r1.193 --- rpm.spec 18 Jan 2006 16:35:14 -0000 1.192 +++ rpm.spec 31 Jan 2006 16:20:31 -0000 1.193 @@ -20,7 +20,7 @@ %define version 4.4.2 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 14 +Release: 15 Group: System Environment/Base Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz Source1: mono-find-provides @@ -44,6 +44,7 @@ Patch16: rpm-4.4.2-file-softmagic.patch Patch17: rpm-4.4.2-no-large-mmap.patch Patch18: rpm-4.4.2-perlmainprov.patch +Patch19: rpm-4.4.2-rpmsq-deadlock.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -174,6 +175,7 @@ %patch16 -p1 -b .magic %patch17 -p1 -b .no_large_mmap %patch18 -p1 -b .perlmainprov +%patch19 -p1 -b .deadlock %build @@ -566,6 +568,10 @@ %{__includedir}/popt.h %changelog +* Mon Jan 30 2006 Paul Nasrat - 4.4.2-15 +- Rebuild for newer neon +- Fix scriptlet deadlock (#146549) + * Wed Jan 18 2006 Paul Nasrat - 4.4.2-14 - Don't emit perl(main) (#177960) From fedora-cvs-commits at redhat.com Tue Jan 31 16:21:14 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:21:14 -0500 Subject: rpms/NetworkManager/devel .cvsignore, 1.26, 1.27 NetworkManager.spec, 1.82, 1.83 sources, 1.41, 1.42 Message-ID: <200601311621.k0VGLE2B010204@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10032 Modified Files: .cvsignore NetworkManager.spec sources Log Message: * Tue Jan 31 2006 Dan Williams 0.5.1-7.cvs20060131 - Longer association timeout - Fix some SELinux issues - General bug and cosmetic fixes Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 27 Jan 2006 06:49:05 -0000 1.26 +++ .cvsignore 31 Jan 2006 16:21:12 -0000 1.27 @@ -5,3 +5,4 @@ NetworkManager-0.5.0.tar.gz NetworkManager-0.5.1.tar.gz NetworkManager-0.5.1.cvs20060127.tar.gz +NetworkManager-0.5.1.cvs20060131.tar.gz Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- NetworkManager.spec 27 Jan 2006 07:28:38 -0000 1.82 +++ NetworkManager.spec 31 Jan 2006 16:21:12 -0000 1.83 @@ -9,13 +9,13 @@ %define bind_version 24:9.3.1-20 %if %{cvs_snapshot} -%define nm_cvs_version .cvs20060127 +%define nm_cvs_version .cvs20060131 %endif Name: NetworkManager Summary: Network connection manager and user applications Version: 0.5.1 -Release: 6%{?nm_cvs_version} +Release: 7%{?nm_cvs_version} Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ @@ -198,6 +198,11 @@ %changelog +* Tue Jan 31 2006 Dan Williams 0.5.1-7.cvs20060131 +- Longer association timeout +- Fix some SELinux issues +- General bug and cosmetic fixes + * Fri Jan 27 2006 Dan Williams 0.5.1-6.cvs20060127 - Snapshot from CVS - WPA Support! Woohoo! Index: sources =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- sources 27 Jan 2006 06:49:05 -0000 1.41 +++ sources 31 Jan 2006 16:21:12 -0000 1.42 @@ -1 +1 @@ -3c13bb7e0ec2723fe6450913fc34afed NetworkManager-0.5.1.cvs20060127.tar.gz +98e4e8818fc625572486c46dc978db00 NetworkManager-0.5.1.cvs20060131.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 31 16:22:23 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:22:23 -0500 Subject: rpms/xorg-x11-xfwp/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xorg-x11-xfwp.spec, 1.4, 1.5 Message-ID: <200601311622.k0VGMNYV010793@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-xfwp/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv10754/devel Modified Files: .cvsignore sources xorg-x11-xfwp.spec Log Message: auto-import xorg-x11-xfwp-1.0.1-1 on branch devel from xorg-x11-xfwp-1.0.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xfwp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 16 Dec 2005 18:33:10 -0000 1.3 +++ .cvsignore 31 Jan 2006 16:22:20 -0000 1.4 @@ -1,3 +1,3 @@ -proxymngr-1.0.0.tar.bz2 -xfindproxy-1.0.0.tar.bz2 -xfwp-1.0.0.tar.bz2 +proxymngr-1.0.1.tar.bz2 +xfindproxy-1.0.1.tar.bz2 +xfwp-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xfwp/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 16 Dec 2005 18:33:10 -0000 1.3 +++ sources 31 Jan 2006 16:22:20 -0000 1.4 @@ -1,3 +1,3 @@ -fde336846443cbcf9ad0b55a985b884f proxymngr-1.0.0.tar.bz2 -cf60b5e2bde1f7f97c26b445090115ca xfindproxy-1.0.0.tar.bz2 -a67663e5a39db57d062d51257ce745ff xfwp-1.0.0.tar.bz2 +aad44d0f65b97fd6d564b1d2ae510bb1 proxymngr-1.0.1.tar.bz2 +5df3a162429bdd6ce5aea3ca5f6365b8 xfindproxy-1.0.1.tar.bz2 +0dbde8b3867032b9e4a383d46dfd7e48 xfwp-1.0.1.tar.bz2 Index: xorg-x11-xfwp.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-xfwp/devel/xorg-x11-xfwp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xorg-x11-xfwp.spec 16 Dec 2005 18:33:10 -0000 1.4 +++ xorg-x11-xfwp.spec 31 Jan 2006 16:22:20 -0000 1.5 @@ -2,15 +2,15 @@ Summary: X.Org X11 X firewall proxy Name: xorg-x11-%{pkgname} -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xfwp-1.0.0.tar.bz2 -Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/proxymngr-1.0.0.tar.bz2 -Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xfindproxy-1.0.0.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfwp-1.0.1.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/proxymngr-1.0.1.tar.bz2 +Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xfindproxy-1.0.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -84,6 +84,9 @@ %{_mandir}/man1/xfwp.1x* %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated all tarballs to version 1.0.1 from X11R7.0 + * Fri Dec 16 2005 Mike A. Harris 1.0.0-1 - Updated all tarballs to version 1.0.0 from X11R7 RC4. - Changed manpage dir from man1x to man1 to match RC4 default. From fedora-cvs-commits at redhat.com Tue Jan 31 16:28:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:28:39 -0500 Subject: rpms/NetworkManager/devel NetworkManager.spec,1.83,1.84 Message-ID: <200601311628.k0VGSdTE005592@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5580 Modified Files: NetworkManager.spec Log Message: Now Require: wpa_supplicant Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- NetworkManager.spec 31 Jan 2006 16:21:12 -0000 1.83 +++ NetworkManager.spec 31 Jan 2006 16:28:36 -0000 1.84 @@ -47,6 +47,7 @@ BuildRequires: gettext-devel BuildRequires: pkgconfig BuildRequires: dhcdbd +BuildRequires: wpa_supplicant %description NetworkManager attempts to keep an active network connection available at all From fedora-cvs-commits at redhat.com Tue Jan 31 16:29:43 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:29:43 -0500 Subject: rpms/xorg-x11-apps/devel x11perf-1.0.1-x11perf-datadir-cleanups.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xorg-x11-apps.spec, 1.6, 1.7 x11perf-1.0.0-x11perf-datadir-cleanups.patch, 1.1, NONE Message-ID: <200601311629.k0VGThbc005716@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/xorg-x11-apps/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5691/devel Modified Files: .cvsignore sources xorg-x11-apps.spec Added Files: x11perf-1.0.1-x11perf-datadir-cleanups.patch Removed Files: x11perf-1.0.0-x11perf-datadir-cleanups.patch Log Message: auto-import xorg-x11-apps-1.0.1-1 on branch devel from xorg-x11-apps-1.0.1-1.src.rpm x11perf-1.0.1-x11perf-datadir-cleanups.patch: Makefile.am | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE x11perf-1.0.1-x11perf-datadir-cleanups.patch --- --- x11perf-0.99.1/Makefile.am.x11perf-datadir-cleanups 2005-11-23 13:03:27.000000000 -0500 +++ x11perf-1.0.1/Makefile.am 2005-11-23 13:03:57.000000000 -0500 @@ -23,7 +23,7 @@ bin_SCRIPTS = x11perfcomp -LIBPATH = $(libdir)/X11/x11perfcomp +LIBPATH = $(datadir)/X11/x11perfcomp x11perfcompdir = $(LIBPATH) dist_x11perfcomp_SCRIPTS = fillblnk perfboth perfratio Xmark Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Dec 2005 11:03:56 -0000 1.3 +++ .cvsignore 31 Jan 2006 16:29:41 -0000 1.4 @@ -1,17 +1,17 @@ -luit-1.0.0.tar.bz2 -oclock-1.0.0.tar.bz2 -x11perf-1.0.0.tar.bz2 -xbiff-1.0.0.tar.bz2 -xclipboard-1.0.0.tar.bz2 -xclock-1.0.0.tar.bz2 -xconsole-1.0.0.tar.bz2 +luit-1.0.1.tar.bz2 +oclock-1.0.1.tar.bz2 +x11perf-1.0.1.tar.bz2 +xbiff-1.0.1.tar.bz2 +xclipboard-1.0.1.tar.bz2 +xclock-1.0.1.tar.bz2 +xconsole-1.0.1.tar.bz2 xcursorgen-1.0.0.tar.bz2 -xeyes-1.0.0.tar.bz2 -xkill-1.0.0.tar.bz2 -xload-1.0.0.tar.bz2 -xlogo-1.0.0.tar.bz2 -xmag-1.0.0.tar.bz2 -xmessage-1.0.0.tar.bz2 -xpr-1.0.0.tar.bz2 -xwd-1.0.0.tar.bz2 -xwud-1.0.0.tar.bz2 +xeyes-1.0.1.tar.bz2 +xkill-1.0.1.tar.bz2 +xload-1.0.1.tar.bz2 +xlogo-1.0.1.tar.bz2 +xmag-1.0.1.tar.bz2 +xmessage-1.0.1.tar.bz2 +xpr-1.0.1.tar.bz2 +xwd-1.0.1.tar.bz2 +xwud-1.0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Dec 2005 11:03:56 -0000 1.3 +++ sources 31 Jan 2006 16:29:41 -0000 1.4 @@ -1,17 +1,17 @@ -fc038c0daff972f48390841cebf9b6ee luit-1.0.0.tar.bz2 -618c53e6f6460a60c8bb9c190972971f oclock-1.0.0.tar.bz2 -f8f36e3434fae00c2c9e4d2a5a174a06 x11perf-1.0.0.tar.bz2 -772f0ef4139027ce790024fd8a1133fc xbiff-1.0.0.tar.bz2 -71aff03e43412e7d691562e0d0d09335 xclipboard-1.0.0.tar.bz2 -ca776b4f0a2b5a93e3a1bc7250cdf348 xclock-1.0.0.tar.bz2 -d3775bded53c2f612746074d88116a45 xconsole-1.0.0.tar.bz2 -82a359feb077ae88e525ffffe6a6ffdc xcursorgen-1.0.0.tar.bz2 -788b8964c1e35834e125bd8fdce17071 xeyes-1.0.0.tar.bz2 -3435f49fbd91155c8ee201d1ba94ba2e xkill-1.0.0.tar.bz2 -ab8dc66d309a3bd9f2c295c8e9d71287 xload-1.0.0.tar.bz2 -daaa0cc4ab148e9e58e42d9f167e77e3 xlogo-1.0.0.tar.bz2 -f18df2ff16b6384878792cfb95369361 xmag-1.0.0.tar.bz2 -8e45fcedc14a4af9b38248b22bcbaf50 xmessage-1.0.0.tar.bz2 -2ac60b8d9e09b79cf298a68b6d6eb1cc xpr-1.0.0.tar.bz2 -a71d966b78ecaddf6a8c24bc650c2e34 xwd-1.0.0.tar.bz2 -825ac67fd461832de648d68c49700c6d xwud-1.0.0.tar.bz2 +fbe44e739590d3d73f711bfc8a0e33fd luit-1.0.1.tar.bz2 +91f49547f9ed3cd0137c8b7c3183e360 oclock-1.0.1.tar.bz2 +d13b4eb920b0f51dc538c34d1b3afbce x11perf-1.0.1.tar.bz2 +404f5add4537d22dd109c33e518a5190 xbiff-1.0.1.tar.bz2 +2c6ecedb10dc51adbb64c95f22fd99c2 xclipboard-1.0.1.tar.bz2 +81af93fb9bd06319fd16b694b0f03aeb xclock-1.0.1.tar.bz2 +de35711680fa1da3ca9e7b21b491b025 xconsole-1.0.1.tar.bz2 +0a57aa0a265e8ec83472d970d3e387fc xcursorgen-1.0.0.tar.bz2 +033f14f7c4e30d1f4edbb22d5ef86883 xeyes-1.0.1.tar.bz2 +f66d76abb0f75514ca32272e23cca757 xkill-1.0.1.tar.bz2 +ba013813f9c21eb015559466f8d02a44 xload-1.0.1.tar.bz2 +4c5482552f38a7d42398a694cc9b2ee6 xlogo-1.0.1.tar.bz2 +058d168d1c7c991b8d12158433ea5f63 xmag-1.0.1.tar.bz2 +b3674c3a00a089764d86aa94e257ccec xmessage-1.0.1.tar.bz2 +01c0a14755fc91369e8c011c9f881d5d xpr-1.0.1.tar.bz2 +911addfb7fa402217ddac63e5c1d97c7 xwd-1.0.1.tar.bz2 +6e3c5d0297d88e890b6f5df31f73dd60 xwud-1.0.1.tar.bz2 Index: xorg-x11-apps.spec =================================================================== RCS file: /cvs/dist/rpms/xorg-x11-apps/devel/xorg-x11-apps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xorg-x11-apps.spec 17 Dec 2005 11:03:56 -0000 1.6 +++ xorg-x11-apps.spec 31 Jan 2006 16:29:41 -0000 1.7 @@ -2,7 +2,7 @@ Summary: X.Org X11 applications Name: xorg-x11-%{pkgname} -Version: 1.0.0 +Version: 1.0.1 Release: 1 License: MIT/X11 Group: User Interface/X @@ -10,27 +10,27 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Clock apps -Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/oclock-1.0.0.tar.bz2 -Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xclock-1.0.0.tar.bz2 +Source0: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/oclock-1.0.1.tar.bz2 +Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xclock-1.0.1.tar.bz2 # X Window Dump (xwd) utilities -Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xwd-1.0.0.tar.bz2 -Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xwud-1.0.0.tar.bz2 -Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xpr-1.0.0.tar.bz2 +Source2: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwd-1.0.1.tar.bz2 +Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xwud-1.0.1.tar.bz2 +Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xpr-1.0.1.tar.bz2 # Miscellaneous other applications -Source5: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/luit-1.0.0.tar.bz2 -Source6: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/x11perf-1.0.0.tar.bz2 -Source7: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xbiff-1.0.0.tar.bz2 -Source8: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xclipboard-1.0.0.tar.bz2 -Source9: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xconsole-1.0.0.tar.bz2 -Source10: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xcursorgen-1.0.0.tar.bz2 -Source11: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xeyes-1.0.0.tar.bz2 -Source12: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xkill-1.0.0.tar.bz2 -Source13: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xload-1.0.0.tar.bz2 -Source14: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xlogo-1.0.0.tar.bz2 -Source15: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xmag-1.0.0.tar.bz2 -Source16: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/xmessage-1.0.0.tar.bz2 +Source5: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/luit-1.0.1.tar.bz2 +Source6: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/x11perf-1.0.1.tar.bz2 +Source7: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xbiff-1.0.1.tar.bz2 +Source8: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xclipboard-1.0.1.tar.bz2 +Source9: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xconsole-1.0.1.tar.bz2 +Source10: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xcursorgen-1.0.0.tar.bz2 +Source11: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xeyes-1.0.1.tar.bz2 +Source12: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xkill-1.0.1.tar.bz2 +Source13: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xload-1.0.1.tar.bz2 +Source14: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xlogo-1.0.1.tar.bz2 +Source15: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmag-1.0.1.tar.bz2 +Source16: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/xmessage-1.0.1.tar.bz2 -Patch0: x11perf-1.0.0-x11perf-datadir-cleanups.patch +Patch0: x11perf-1.0.1-x11perf-datadir-cleanups.patch # FIXME: Most of the BuildRequires are not figured out yet, so are missing. # This will get fixed once someone builds it with mock in a minimal build @@ -173,6 +173,9 @@ %{_mandir}/man1/xwud.1x* %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Upgraded all apps to version 1.0.1 from X11R7.0 + * Sat Dec 17 2005 Mike A. Harris 1.0.0-1 - Upgraded all apps to version 1.0.0 from X11R7 RC4. - Changed manpage dir from man1x to man1 to match upstream default now. --- x11perf-1.0.0-x11perf-datadir-cleanups.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 31 16:31:50 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:31:50 -0500 Subject: rpms/booty/devel booty.spec,1.38,1.39 Message-ID: <200601311631.k0VGVo5p005804@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5790 Modified Files: booty.spec Log Message: -update to 0.65-1 Index: booty.spec =================================================================== RCS file: /cvs/dist/rpms/booty/devel/booty.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- booty.spec 7 Jan 2006 18:06:02 -0000 1.38 +++ booty.spec 31 Jan 2006 16:31:48 -0000 1.39 @@ -1,6 +1,6 @@ Summary: simple python bootloader config lib Name: booty -Version: 0.64 +Version: 0.65 Release: 1 License: LGPL Source0: %{name}-%{version}.tar.bz2 @@ -34,6 +34,9 @@ %changelog +* Tue Jan 31 2006 Peter Jones - 0.65-1 +- add support for reprobing device bootloaderInfo.drivelist + * Sat Jan 7 2006 Jeremy Katz - 0.64-1 - fix syntax error From fedora-cvs-commits at redhat.com Tue Jan 31 16:32:37 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:32:37 -0500 Subject: rpms/booty/devel .cvsignore,1.35,1.36 sources,1.37,1.38 Message-ID: <200601311632.k0VGWbVa005830@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/booty/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5819 Modified Files: .cvsignore sources Log Message: - update to 0.65-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/booty/devel/.cvsignore,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- .cvsignore 7 Jan 2006 18:06:02 -0000 1.35 +++ .cvsignore 31 Jan 2006 16:32:20 -0000 1.36 @@ -1 +1 @@ -booty-0.64.tar.bz2 +booty-0.65.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/booty/devel/sources,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sources 7 Jan 2006 18:06:02 -0000 1.37 +++ sources 31 Jan 2006 16:32:20 -0000 1.38 @@ -1 +1 @@ -e5d252359b8738d7a35177d8ac1d36a7 booty-0.64.tar.bz2 +3189eac2b69b30686a24f1e4bd3e404f booty-0.65.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 16:35:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:35:04 -0500 Subject: rpms/python-pyblock/devel .cvsignore, 1.9, 1.10 python-pyblock.spec, 1.14, 1.15 sources, 1.12, 1.13 Message-ID: <200601311635.k0VGZ4ie005937@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/python-pyblock/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5920 Modified Files: .cvsignore python-pyblock.spec sources Log Message: - update to 0.12-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/python-pyblock/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 5 Jan 2006 22:58:43 -0000 1.9 +++ .cvsignore 31 Jan 2006 16:35:02 -0000 1.10 @@ -1 +1 @@ -pyblock-0.11.tar.bz2 +pyblock-0.12.tar.bz2 Index: python-pyblock.spec =================================================================== RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- python-pyblock.spec 5 Jan 2006 22:58:43 -0000 1.14 +++ python-pyblock.spec 31 Jan 2006 16:35:02 -0000 1.15 @@ -4,7 +4,7 @@ Summary: Python modules for dealing with block devices Name: python-%{realname} -Version: 0.11 +Version: 0.12 Release: 1 Source0: %{realname}-%{version}.tar.bz2 License: GPL @@ -38,6 +38,29 @@ /%{python_sitelib}/block/* %changelog +* Tue Jan 31 2006 Peter Jones - 0.12-1 +- split __init__.py into separate files according to function +- disable "nosync" hack for now +- fix a refcounting bug in pydmraid_raidset_get_dm_table() +- add block.RaidDev.__cmp__() +- fix some type errors gcc can't check for when using pyblock_potoll +- be a little pickier about types for mode, devices, and sizes. +- add make rules for debugging +- fix "_init__" typo +- always use local import paths, and be much more strict about namespaces +- always make a new dm.device in BlockDev.From*() +- better defaults in BlockDev.create() +- add setter for block.dmraid.raidset.name, and rework RaidSet.set_name() +- rework RaidDev.get_bdev() +- rework "prefix" for RaidSet and RaidDev +- add getter for block.dmraid.raidset.map +- change arg order on block.dm.map.__init__() since there's no way to pass + keyword args through the "abstract" interface. +- use self.name not self.rs.name in the RaidSet, and make changing the name + work. +- make pydm_map_compare() compare names _last_, so we can compare a map + that's been renamed with its earlier instantiations correctly. + * Thu Jan 5 2006 Peter Jones - 0.11-1 - never trust dmraid on sync vs nosync; right now, always transform the table to "default" (no argument), which is to sync only when necessary, Index: sources =================================================================== RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 5 Jan 2006 22:58:43 -0000 1.12 +++ sources 31 Jan 2006 16:35:02 -0000 1.13 @@ -1 +1 @@ -deea7ade2f2acc32f5940101685b62ad pyblock-0.11.tar.bz2 +e1a807fa540d183ac7fa4966020c5e96 pyblock-0.12.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 16:43:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:43:07 -0500 Subject: rpms/pykickstart/devel .cvsignore, 1.15, 1.16 pykickstart.spec, 1.15, 1.16 sources, 1.16, 1.17 Message-ID: <200601311643.k0VGh70o006116@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6101 Modified Files: .cvsignore pykickstart.spec sources Log Message: - update to 0.15 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 30 Jan 2006 20:36:51 -0000 1.15 +++ .cvsignore 31 Jan 2006 16:43:05 -0000 1.16 @@ -4,3 +4,4 @@ pykickstart-0.12.tar.gz pykickstart-0.13.tar.gz pykickstart-0.14.tar.gz +pykickstart-0.15.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- pykickstart.spec 30 Jan 2006 20:36:51 -0000 1.15 +++ pykickstart.spec 31 Jan 2006 16:43:05 -0000 1.16 @@ -2,7 +2,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart -Version: 0.14 +Version: 0.15 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -36,6 +36,9 @@ /usr/bin/ksvalidator %changelog +* Tue Jan 31 2006 Peter Jones 0.15-1 +- Add dmraid support + * Mon Jan 30 2006 Chris Lumens 0.14-1 - Fix VNC parameter parsing (#179209). - Deprecate --connect. Add --host and --port instead. Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 30 Jan 2006 20:36:51 -0000 1.16 +++ sources 31 Jan 2006 16:43:05 -0000 1.17 @@ -1 +1 @@ -29ab0085896444efcce48fa3fa19d024 pykickstart-0.14.tar.gz +11cc356393b3054696d7592208d78c66 pykickstart-0.15.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 31 16:58:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:58:17 -0500 Subject: rpms/gdm/devel gdm-2.13.0.7-change-defaults.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 gdm.spec, 1.122, 1.123 sources, 1.21, 1.22 Message-ID: <200601311658.k0VGwHvx028224@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gdm/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28149 Modified Files: .cvsignore gdm.spec sources Added Files: gdm-2.13.0.7-change-defaults.patch Log Message: - update to 2.13.0.7 gdm-2.13.0.7-change-defaults.patch: gdm.conf.in | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) --- NEW FILE gdm-2.13.0.7-change-defaults.patch --- --- gdm-2.13.0.7/config/gdm.conf.in.change-defaults 2006-01-27 18:11:50.000000000 -0500 +++ gdm-2.13.0.7/config/gdm.conf.in 2006-01-31 11:53:29.000000000 -0500 @@ -59,9 +59,9 @@ # should leave this alone. #Chooser=@EXPANDED_LIBEXECDIR@/gdmchooser -# The greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to -# get the new graphical greeter. -#Greeter=@EXPANDED_LIBEXECDIR@/gdmlogin +# The greeter for local (non-xdmcp) logins. Change gdmgreeter to gdmlogin to +# get the boring greeter. +Greeter=@EXPANDED_LIBEXECDIR@/gdmgreeter # The greeter for xdmcp logins, usually you want a less graphically intensive # greeter here so it's better to leave this with gdmlogin @@ -78,11 +78,11 @@ # Default path to set. The profile scripts will likely override this value. # This value will be overridden with the value from /etc/default/login if it # contains "ROOT=". -#DefaultPath=@GDM_USER_PATH@ +DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/X11R6/bin # Default path for root. The profile scripts will likely override this value. # This value will be overridden with the value from /etc/default/login if it # contains "SUROOT=". -#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@ +RootPath=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin # If you are having trouble with using a single server for a long time and want # GDM to kill/restart the server, turn this on. On Solaris, this value is @@ -118,22 +118,22 @@ XKeepsCrashing=@EXPANDED_SYSCONFDIR@/gdm/XKeepsCrashing # Reboot, Halt and suspend commands, you can add different commands separated # by a semicolon. GDM will use the first one it can find. -#RebootCommand=@REBOOT_COMMAND@ -#HaltCommand=@HALT_COMMAND@ +RebootCommand=/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now;/usr/bin/reboot +HaltCommand=/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now;/usr/bin/poweroff #SuspendCommand=@SUSPEND_COMMAND@ # Probably should not touch the below this is the standard setup. ServAuthDir=@EXPANDED_AUTHDIR@ # This is our standard startup script. A bit different from a normal X # session, but it shares a lot of stuff with that. See the provided default # for more information. -BaseXsession=@EXPANDED_SYSCONFDIR@/gdm/Xsession +BaseXsession=/etc/X11/xinit/Xsession # This is a directory where .desktop files describing the sessions live. It is # really a PATH style variable since 2.4.4.2 to allow actual interoperability # with KDM. Note that /dm/Sessions is there for backwards # compatibility reasons with 2.4.4.x. #SessionDesktopDir=/etc/X11/sessions/:@EXPANDED_SYSCONFDIR@/dm/Sessions/:@EXPANDED_DATADIR@/gdm/BuiltInSessions/:@EXPANDED_DATADIR@/xsessions/ # This is the default .desktop session. One of the ones in SessionDesktopDir -#DefaultSession=gnome.desktop +DefaultSession=default.desktop # Better leave this blank and HOME will be used. You can use syntax ~/ below # to indicate home directory of the user. You can also set this to something # like /tmp if you don't want the authorizations to be in home directories. @@ -282,7 +282,7 @@ #GtkRC=@EXPANDED_DATADIR@/themes/Default/gtk-2.0/gtkrc # The GTK+ theme to use for the GUI. -#GtkTheme=Default +GtkTheme=Clearlooks # If to allow changing the GTK+ (widget) theme from the greeter. Currently # this only affects the standard greeter as the graphical greeter does not yet # have this ability. @@ -303,7 +303,7 @@ # themed login (gdmgreeter). # # The standard login has a title bar that the user can move. -#TitleBar=true +TitleBar=false # Don't allow user to move the standard login window. Only makes sense if # TitleBar is on. #LockPosition=false @@ -327,7 +327,7 @@ # User ID's less than the MinimalUID value will not be included in the face # browser or in the gdmselection list for Automatic/Timed login. They will not # be displayed regardless of the settings for Include and Exclude. -#MinimalUID=100 +MinimalUID=500 # Users listed in Include will be included in the face browser and in the # gdmsetup selection list for Automatic/Timed login. Users should be separated # by commas. @@ -353,7 +353,7 @@ # file, although GDM will be able to read a standard locale.alias file as well. #LocaleFile=@EXPANDED_LOCALEDIR@/locale.alias # Logo shown in the standard greeter. -#Logo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png +Logo= # Logo shown on file chooser button in gdmsetup (do not modify this value). #ChooserButtonLogo=@EXPANDED_PIXMAPDIR@/gdm-foot-logo.png # The standard greeter should shake if a user entered the wrong username or @@ -400,8 +400,8 @@ # The Standard greeter (gdmlogin) uses BackgroundColor as the background # color, while the themed greeter (gdmgreeter) uses GraphicalThemedColor # as the background color. -BackgroundColor=#76848F -GraphicalThemedColor=#76848F +BackgroundColor=#20305a +GraphicalThemedColor=#000000 # XDMCP session should only get a color, this is the sanest setting since you # don't want to take up too much bandwidth #BackgroundRemoteOnlyColor=true @@ -416,7 +416,7 @@ # Show the Failsafe sessions. These are much MUCH nicer (focus for xterm for # example) and more failsafe then those supplied by scripts so distros should # use this rather then just running an xterm from a script. -#ShowGnomeFailsafeSession=true +ShowGnomeFailsafeSession=false #ShowXtermFailsafeSession=true # Normally there is a session type called 'Last' that is shown which refers to # the last session the user used. If off, we will be in 'switchdesk' mode @@ -436,7 +436,7 @@ # list then provide a list that is delimited by /: to the GraphicalThemes # key and set GraphicalThemeRand to true. Otherwise use GraphicalTheme # and specify just one theme. -#GraphicalTheme=circles +GraphicalTheme=FedoraBubbles #GraphicalThemes=circles/:happygnome GraphicalThemeDir=@EXPANDED_DATADIR@/gdm/themes/ GraphicalThemeRand=false Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 17 Jan 2006 22:56:41 -0000 1.19 +++ .cvsignore 31 Jan 2006 16:58:14 -0000 1.20 @@ -1 +1 @@ -gdm-2.13.0.5.tar.bz2 +gdm-2.13.0.7.tar.bz2 Index: gdm.spec =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v retrieving revision 1.122 retrieving revision 1.123 diff -u -r1.122 -r1.123 --- gdm.spec 30 Jan 2006 18:34:19 -0000 1.122 +++ gdm.spec 31 Jan 2006 16:58:14 -0000 1.123 @@ -14,8 +14,8 @@ Summary: The GNOME Display Manager. Name: gdm -Version: 2.13.0.5 -Release: 7 +Version: 2.13.0.7 +Release: 1 Epoch: 1 License: LGPL/GPL Group: User Interface/X @@ -25,7 +25,7 @@ Source2: gdm-early-login.init Source3: zzz-bootup-complete.init -Patch1: gdm-2.13.0.4-change-defaults.patch +Patch1: gdm-2.13.0.7-change-defaults.patch Patch2: gdm-2.8.0.2-add-pam-timestamp-module.patch Patch4: gdm-2.8.0.2-session-errors-in-tmp.patch Patch5: gdm-2.13.0.4-update-switchdesk-location.patch @@ -44,7 +44,6 @@ Patch19: gdm-2.13.0.4-add-gnome-cflags.patch Patch20: gdm-2.13.0.4-add-locale-header.patch Patch21: gdm-2.13.0.4-fix-gdm-safe-restart-conf-path.patch -Patch22: gdm-2.13.0.5-clock-format.patch BuildRoot: %{_tmppath}/gdm-%{PACKAGE_VERSION}-root @@ -117,7 +116,6 @@ %patch19 -p1 -b .add-gnome-cflags %patch20 -p1 -b .add-locale-header %patch21 -p1 -b .fix-gdm-safe-restart-conf-path -%patch22 -p1 -b .clock-format # fix the time format for ja perl -pi -e "s|^msgstr \"%a %b %d, %H:%M\"|msgstr \"%m/%d \(%a\) %H:%M\"|; s|^msgstr \"%a %b %d, %I:%M %p\"|msgstr \"%m/%d \(%a\) %p %I:%M\"|" po/ja.po @@ -307,6 +305,9 @@ %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %changelog +* Tue Jan 31 2006 Ray Strode - 1:2.13.0.7-1 +- update to 2.13.0.7 + * Mon Jan 30 2006 Bill Nottingham - silence gdm-safe-restart Index: sources =================================================================== RCS file: /cvs/dist/rpms/gdm/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 17 Jan 2006 22:56:41 -0000 1.21 +++ sources 31 Jan 2006 16:58:14 -0000 1.22 @@ -1 +1 @@ -d46aff99287f93eeb466a9bdd9e0d4c6 gdm-2.13.0.5.tar.bz2 +70e469f85686ad861c1a8208ca231e9f gdm-2.13.0.7.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 16:59:22 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 11:59:22 -0500 Subject: rpms/xen/devel xen.spec,1.78,1.79 Message-ID: <200601311659.k0VGxMu7028712@cvs.devel.redhat.com> Author: sct Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28684 Modified Files: xen.spec Log Message: Add xenguest-install.py in /usr/sbin Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- xen.spec 30 Jan 2006 22:07:43 -0000 1.78 +++ xen.spec 31 Jan 2006 16:59:19 -0000 1.79 @@ -5,12 +5,13 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0 -Release: 0.20060130.fc5 +Release: 0.20060130.fc5.1 Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html Source0: xen-3.0.0-20060130.tar.bz2 Source1: http://download.sf.net/libvncserver/LibVNCServer-%{libvncver}.tar.gz +Source2: xenguest-install.py Patch0: xen-misc-fixes.patch Patch1: xen-initscript.patch Patch3: xen-dom0-minmem.patch @@ -45,6 +46,7 @@ %patch1 -p1 -b .init %patch3 -p1 -b .mem-min %patch4 -p1 -b .compile +cp %{SOURCE2} . %build pushd LibVNCServer-%{libvncver} @@ -89,6 +91,9 @@ mv -f %{buildroot}/etc/udev/xen-backend.rules %{buildroot}/etc/udev/rules.d/ +# Hand-install the local xenguest-install.py addon +install -m 755 xenguest-install.py %{buildroot}%{_sbindir} + %post /sbin/chkconfig --add xend /sbin/chkconfig --add xendomains @@ -134,6 +139,9 @@ %dir %{_localstatedir}/run/xenstored %changelog +* Tue Jan 31 2006 - 3.0-0.20060130.fc5.1 +- Add xenguest-install.py in /usr/sbin + * Mon Jan 30 2006 - 3.0-0.20060130.fc5 - Update to xen-unstable from 20060130 (cset 8705) From fedora-cvs-commits at redhat.com Tue Jan 31 17:06:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 12:06:17 -0500 Subject: rpms/imake/devel xorg-cf-files-1.0.1-redhat.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 imake.spec, 1.14, 1.15 sources, 1.4, 1.5 xorg-cf-files-1.0.0-redhat.patch, 1.3, NONE Message-ID: <200601311706.k0VH6HjR029466@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/imake/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29416/devel Modified Files: .cvsignore imake.spec sources Added Files: xorg-cf-files-1.0.1-redhat.patch Removed Files: xorg-cf-files-1.0.0-redhat.patch Log Message: auto-import imake-1.0.1-1 on branch devel from imake-1.0.1-1.src.rpm xorg-cf-files-1.0.1-redhat.patch: linux.cf | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletion(-) --- NEW FILE xorg-cf-files-1.0.1-redhat.patch --- --- xorg-cf-files-1.0.0/linux.cf.redhat 2005-10-21 21:10:27.000000000 +0200 +++ xorg-cf-files-1.0.1/linux.cf 2005-12-21 11:27:16.000000000 +0100 @@ -190,7 +190,12 @@ #endif /* LinuxDebian */ #if LinuxDistribution == LinuxRedHat -#define FSUseSyslog YES +# define FSUseSyslog YES +# define BuildRman NO +# define BuildHtmlManPages NO +# define ProjectRoot /usr +# define ManPath /usr/share/man +# define XAppLoadDir /usr/share/X11/app-defaults #endif #ifndef HasDevRandom Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/imake/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Dec 2005 13:34:40 -0000 1.5 +++ .cvsignore 31 Jan 2006 17:06:05 -0000 1.6 @@ -1,5 +1,5 @@ -gccmakedep-1.0.0.tar.bz2 -imake-1.0.0.tar.bz2 -lndir-1.0.0.tar.bz2 +gccmakedep-1.0.1.tar.bz2 +imake-1.0.1.tar.bz2 +lndir-1.0.1.tar.bz2 makedepend-1.0.0.tar.bz2 -xorg-cf-files-1.0.0.tar.bz2 +xorg-cf-files-1.0.1.tar.bz2 Index: imake.spec =================================================================== RCS file: /cvs/dist/rpms/imake/devel/imake.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- imake.spec 21 Dec 2005 12:43:35 -0000 1.14 +++ imake.spec 31 Jan 2006 17:06:05 -0000 1.15 @@ -1,21 +1,21 @@ Summary: imake source code configuration and build system Name: imake -Version: 1.0.0 -Release: 4 +Version: 1.0.1 +Release: 1 License: MIT/X11 Group: User Interface/X URL: http://www.x.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%define xorgurl http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything +%define xorgurl http://xorg.freedesktop.org/releases/X11R7.0/src/everything Source0: %{xorgurl}/imake-%{version}.tar.bz2 -Source1: %{xorgurl}/makedepend-%{version}.tar.bz2 -Source2: %{xorgurl}/gccmakedep-1.0.0.tar.bz2 +Source1: %{xorgurl}/makedepend-1.0.0.tar.bz2 +Source2: %{xorgurl}/gccmakedep-%{version}.tar.bz2 Source3: %{xorgurl}/xorg-cf-files-%{version}.tar.bz2 -Source4: %{xorgurl}/lndir-1.0.0.tar.bz2 +Source4: %{xorgurl}/lndir-%{version}.tar.bz2 Patch0: xorg-cf-files-1.0.0-misc.patch Patch1: xorg-cf-files-1.0.0-ProjectRoot.patch -Patch2: xorg-cf-files-1.0.0-redhat.patch +Patch2: xorg-cf-files-1.0.1-redhat.patch BuildRequires: pkgconfig BuildRequires: xorg-x11-util-macros @@ -139,6 +139,9 @@ %{_mandir}/man1/xmkmf.1x* %changelog +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated all packages to version 1.0.1 from X11R7.0 + * Wed Dec 21 2005 Than Ngo 1.0.0-4 - final fix for #173593 Index: sources =================================================================== RCS file: /cvs/dist/rpms/imake/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Dec 2005 13:34:40 -0000 1.4 +++ sources 31 Jan 2006 17:06:05 -0000 1.5 @@ -1,5 +1,5 @@ -caf5192a74a0f34445cce44bf45580e9 gccmakedep-1.0.0.tar.bz2 -afa442819cd0cb51bbfb3f3d63c7ad68 imake-1.0.0.tar.bz2 -a6e3f4d402654fbb8f965456cf94e7ab lndir-1.0.0.tar.bz2 -cae97a7abf38ff032ab819253bdd61d5 makedepend-1.0.0.tar.bz2 -f2083ccfd4cb9876c8bb7f16a3017f0a xorg-cf-files-1.0.0.tar.bz2 +f3ff8981f6b0f06a36dca74f19d155f2 gccmakedep-1.0.1.tar.bz2 +8c859fdddd57e91132ceab1344bfe728 imake-1.0.1.tar.bz2 +e274ea9f55dfd62afa0a7b1e1ab4ba96 lndir-1.0.1.tar.bz2 +fa194caa4f059f5621ed2c5a51efb4d0 makedepend-1.0.0.tar.bz2 +e3107572a02a344b5f5da57a1eb95732 xorg-cf-files-1.0.1.tar.bz2 --- xorg-cf-files-1.0.0-redhat.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 31 17:34:46 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 12:34:46 -0500 Subject: rpms/xen/devel xen-default-network.patch, NONE, 1.1 xen.spec, 1.79, 1.80 Message-ID: <200601311734.k0VHYk8I020049@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv20011 Modified Files: xen.spec Added Files: xen-default-network.patch Log Message: add patch so that it doesn't die if your default network device is 'eth1', or 'harry', or... xen-default-network.patch: network-bridge | 1 + xend-config.sxp | 4 ++-- xend-config.sxp.mem-min | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) --- NEW FILE xen-default-network.patch --- diff -ru xen-3.0.0/tools/examples/network-bridge xen-3.0.0-new/tools/examples/network-bridge --- xen-3.0.0/tools/examples/network-bridge 2006-01-25 15:30:13.000000000 -0500 +++ xen-3.0.0-new/tools/examples/network-bridge 2006-01-31 12:20:25.000000000 -0500 @@ -61,6 +61,7 @@ vifnum=${vifnum:-0} bridge=${bridge:-xenbr${vifnum}} +netdev=${netdev:-$(ip route list default scope global| awk '{ print $NF }')} netdev=${netdev:-eth${vifnum}} antispoof=${antispoof:-no} diff -ru xen-3.0.0/tools/examples/xend-config.sxp xen-3.0.0-new/tools/examples/xend-config.sxp --- xen-3.0.0/tools/examples/xend-config.sxp 2006-01-31 12:23:38.000000000 -0500 +++ xen-3.0.0-new/tools/examples/xend-config.sxp 2006-01-31 12:24:44.000000000 -0500 @@ -70,8 +70,8 @@ # # (network-script network-bridge) # -# Your eth0 is used as the outgoing interface, by default. To use a different -# one (e.g. eth1) use +# Your default ethernet device is used as the outgoing interface, by default. +# To use a different one (e.g. eth1) use # # (network-script 'network-bridge netdev=eth1') # diff -ru xen-3.0.0/tools/examples/xend-config.sxp.mem-min xen-3.0.0-new/tools/examples/xend-config.sxp.mem-min --- xen-3.0.0/tools/examples/xend-config.sxp.mem-min 2006-01-06 17:42:59.000000000 -0500 +++ xen-3.0.0-new/tools/examples/xend-config.sxp.mem-min 2006-01-31 12:25:13.000000000 -0500 @@ -70,8 +70,8 @@ # # (network-script network-bridge) # -# Your eth0 is used as the outgoing interface, by default. To use a different -# one (e.g. eth1) use +# Your default ethernet device is used as the outgoing interface, by default. +# To use a different one (e.g. eth1) use # # (network-script 'network-bridge netdev=eth1') # Index: xen.spec =================================================================== RCS file: /cvs/dist/rpms/xen/devel/xen.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- xen.spec 31 Jan 2006 16:59:19 -0000 1.79 +++ xen.spec 31 Jan 2006 17:34:40 -0000 1.80 @@ -5,7 +5,7 @@ Summary: Xen is a virtual machine monitor Name: xen Version: 3.0 -Release: 0.20060130.fc5.1 +Release: 0.20060130.fc5.2 Group: Development/Libraries License: GPL URL: http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html @@ -16,6 +16,7 @@ Patch1: xen-initscript.patch Patch3: xen-dom0-minmem.patch Patch4: xen-compile-fixes.patch +Patch5: xen-default-network.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: transfig libidn-devel zlib-devel texi2html SDL-devel curl-devel BuildRequires: libX11-devel python-devel ghostscript tetex-latex @@ -46,6 +47,8 @@ %patch1 -p1 -b .init %patch3 -p1 -b .mem-min %patch4 -p1 -b .compile +%patch5 -p1 + cp %{SOURCE2} . %build @@ -139,6 +142,9 @@ %dir %{_localstatedir}/run/xenstored %changelog +* Tue Jan 31 2006 Bill Nottinghham 3.0-0.20060130.fc5.2 +- use the default network device, don't hardcode eth0 + * Tue Jan 31 2006 - 3.0-0.20060130.fc5.1 - Add xenguest-install.py in /usr/sbin From fedora-cvs-commits at redhat.com Tue Jan 31 17:49:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 12:49:59 -0500 Subject: rpms/gnome-power-manager/devel gnome-power-manager.spec,1.16,1.17 Message-ID: <200601311749.k0VHnxq2006684@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-power-manager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6629 Modified Files: gnome-power-manager.spec Log Message: rebuild Index: gnome-power-manager.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-power-manager/devel/gnome-power-manager.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gnome-power-manager.spec 27 Jan 2006 05:24:58 -0000 1.16 +++ gnome-power-manager.spec 31 Jan 2006 17:49:56 -0000 1.17 @@ -5,7 +5,7 @@ Summary: GNOME Power Manager Name: gnome-power-manager Version: 2.13.5 -Release: 1 +Release: 2 License: GPL Group: Applications/System Source: gnome-power-manager-%{version}.tar.bz2 @@ -84,6 +84,9 @@ %{_datadir}/applications/gnome-power-preferences.desktop %changelog +* Tue Jan 31 2006 Matthias Clasen - 2.13.5-2 +- rebuild + * Thu Jan 26 2006 Ray Strode - 2.13.5-1 - packaging tweaks From fedora-cvs-commits at redhat.com Tue Jan 31 18:14:42 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 13:14:42 -0500 Subject: rpms/python-pyblock/devel python-pyblock.spec, 1.15, 1.16 sources, 1.13, 1.14 Message-ID: <200601311814.k0VIEgnx015290@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/python-pyblock/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15170 Modified Files: python-pyblock.spec sources Log Message: - fix one more minor bug before building... Index: python-pyblock.spec =================================================================== RCS file: /cvs/dist/rpms/python-pyblock/devel/python-pyblock.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- python-pyblock.spec 31 Jan 2006 16:35:02 -0000 1.15 +++ python-pyblock.spec 31 Jan 2006 18:14:39 -0000 1.16 @@ -60,6 +60,8 @@ work. - make pydm_map_compare() compare names _last_, so we can compare a map that's been renamed with its earlier instantiations correctly. +- mark a device as degraded if there's any descrepancy at all between + the number of members we find vs what we expect * Thu Jan 5 2006 Peter Jones - 0.11-1 - never trust dmraid on sync vs nosync; right now, always transform the Index: sources =================================================================== RCS file: /cvs/dist/rpms/python-pyblock/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 31 Jan 2006 16:35:02 -0000 1.13 +++ sources 31 Jan 2006 18:14:39 -0000 1.14 @@ -1 +1 @@ -e1a807fa540d183ac7fa4966020c5e96 pyblock-0.12.tar.bz2 +d5fb9ca0dc28e28e6f9cd23710e19a01 pyblock-0.12.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 18:18:15 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 13:18:15 -0500 Subject: rpms/gnome-system-monitor/devel .cvsignore, 1.23, 1.24 gnome-system-monitor.spec, 1.39, 1.40 sources, 1.23, 1.24 Message-ID: <200601311818.k0VIIFAq029113@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-system-monitor/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29061 Modified Files: .cvsignore gnome-system-monitor.spec sources Log Message: 2.13.90 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 17 Jan 2006 16:35:00 -0000 1.23 +++ .cvsignore 31 Jan 2006 18:18:12 -0000 1.24 @@ -5,3 +5,4 @@ gnome-system-monitor-2.13.3.tar.bz2 gnome-system-monitor-2.13.4.tar.bz2 gnome-system-monitor-2.13.5.tar.bz2 +gnome-system-monitor-2.13.90.tar.bz2 Index: gnome-system-monitor.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/gnome-system-monitor.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- gnome-system-monitor.spec 17 Jan 2006 16:35:00 -0000 1.39 +++ gnome-system-monitor.spec 31 Jan 2006 18:18:12 -0000 1.40 @@ -10,7 +10,7 @@ Summary: Simple process monitor Name: gnome-system-monitor -Version: 2.13.5 +Version: 2.13.90 Release: 1 License: GPL Group: Applications/System @@ -80,6 +80,9 @@ %{_datadir}/omf %changelog +* Tue Jan 31 2006 Matthias Clasen 2.13.90-1 +- Update to 2.13.90 + * Tue Jan 17 2006 Matthias Clasen 2.13.5-1 - Update to 2.13.5 Index: sources =================================================================== RCS file: /cvs/dist/rpms/gnome-system-monitor/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 17 Jan 2006 16:35:00 -0000 1.23 +++ sources 31 Jan 2006 18:18:12 -0000 1.24 @@ -1 +1 @@ -26b8cedf49ed8b16b77db193b405afb6 gnome-system-monitor-2.13.5.tar.bz2 +a29da44f9c43e7a79698af371c7d82f6 gnome-system-monitor-2.13.90.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 18:22:01 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 13:22:01 -0500 Subject: rpms/evolution-data-server/devel evolution-data-server.spec, 1.81, 1.82 Message-ID: <200601311822.k0VIM0AJ030942@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution-data-server/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv30771 Modified Files: evolution-data-server.spec Log Message: - add build deps (bug 137553) Index: evolution-data-server.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- evolution-data-server.spec 30 Jan 2006 23:36:19 -0000 1.81 +++ evolution-data-server.spec 31 Jan 2006 18:21:58 -0000 1.82 @@ -25,7 +25,7 @@ Summary: Backend data server for evolution Name: evolution-data-server Version: 1.5.90 -Release: 1 +Release: 2 License: LGPL Group: System Environment/Libraries Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2 @@ -64,6 +64,7 @@ BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: libgnomeui-devel BuildRequires: libglade2-devel +BuildRequires: bison, libgnome-devel, libtool, gnutls-devel %if %{use_nss} BuildRequires: nspr-devel BuildRequires: nss-devel @@ -320,6 +321,9 @@ %changelog +* Tue Jan 31 2006 Ray Strode - 1.5.90-2 +- add build deps (bug 137553) + * Mon Jan 30 2006 David Malcolm - 1.5.90-1 - 1.5.90 - explicitly list various files rather than rely on globbing From fedora-cvs-commits at redhat.com Tue Jan 31 18:25:58 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 13:25:58 -0500 Subject: rpms/evolution-connector/devel evolution-connector.spec,1.48,1.49 Message-ID: <200601311825.k0VIPwaV025681@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/evolution-connector/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25665 Modified Files: evolution-connector.spec Log Message: - add builddeps (bug 137879) Index: evolution-connector.spec =================================================================== RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- evolution-connector.spec 31 Jan 2006 03:40:24 -0000 1.48 +++ evolution-connector.spec 31 Jan 2006 18:25:55 -0000 1.49 @@ -7,7 +7,7 @@ Name: evolution-connector Version: 2.5.9.0 -Release: 1 +Release: 2 License: GPL Group: Applications/Productivity URL: http://ftp.gnome.org/pub/gnome/sources/evolution-exchange/2.4/ @@ -35,6 +35,7 @@ # which includes the necessary stuff in %%{_libdir}/evolution-openldap. BuildRequires: openldap-evolution-devel BuildRequires: gnutls +BuildRequires: openssl-devel Requires: evolution >= %{evolution_version} Requires: openldap Requires: libsoup >= %{libsoup_version} @@ -94,6 +95,9 @@ %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml %changelog +* Tue Jan 31 2006 Ray Strode - 2.5.9.0-2 +- add builddeps (bug 137879) + * Mon Jan 30 2006 David Malcolm - 2.5.9.0-1 - 2.5.9.0 - regenerate patch 200 From fedora-cvs-commits at redhat.com Tue Jan 31 18:27:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 13:27:56 -0500 Subject: rpms/gtkhtml3/devel gtkhtml3.spec,1.52,1.53 Message-ID: <200601311827.k0VIRuvQ025776@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gtkhtml3/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv25763 Modified Files: gtkhtml3.spec Log Message: Apply the patch Index: gtkhtml3.spec =================================================================== RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- gtkhtml3.spec 31 Jan 2006 14:53:32 -0000 1.52 +++ gtkhtml3.spec 31 Jan 2006 18:27:54 -0000 1.53 @@ -5,7 +5,7 @@ Summary: gtkhtml library Name: gtkhtml3 Version: 3.9.90 -Release: 2 +Release: 3 License: LGPL/GPL Group: System Environment/Libraries Source: ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/gtkhtml-%{version}.tar.bz2 @@ -53,6 +53,7 @@ %patch1 -p1 -b .crash #%patch2 -p1 -b .imcommit %patch3 -p1 -b .fix-129212 +%patch4 -p1 -b .free %build %configure @@ -99,6 +100,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Jan 31 2006 Matthias Clasen - 3.9.90-3 +- Actually apply the patch + * Tue Jan 31 2006 Matthias Clasen - 3.9.90-2 - Fix a crash From fedora-cvs-commits at redhat.com Tue Jan 31 19:30:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 14:30:44 -0500 Subject: rpms/f-spot/devel f-spot-0.1.5-security-fix.patch, NONE, 1.1 f-spot.spec, 1.9, 1.10 Message-ID: <200601311930.k0VJUiRp005851@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/f-spot/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5809 Modified Files: f-spot.spec Added Files: f-spot-0.1.5-security-fix.patch Log Message: - don't blindly run f-spot from current working directory (bug 177407) f-spot-0.1.5-security-fix.patch: f-spot.in | 9 +-------- 1 files changed, 1 insertion(+), 8 deletions(-) --- NEW FILE f-spot-0.1.5-security-fix.patch --- --- f-spot-0.1.5/src/f-spot.in.security-fix 2006-01-31 14:27:14.000000000 -0500 +++ f-spot-0.1.5/src/f-spot.in 2006-01-31 14:27:56.000000000 -0500 @@ -4,12 +4,5 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ -if [ -e ./f-spot.exe ] && [ -e ./Makefile ] && [ -e ./Defines.cs ]; then - echo "*** Running uninstalled f-spot ***" - EXE_TO_RUN="./f-spot.exe" - export MONO_PATH=../libgphoto2-sharp:../semweb:$MONO_PATH -else - EXE_TO_RUN="$libdir/f-spot/f-spot.exe" -fi - +EXE_TO_RUN="$libdir/f-spot/f-spot.exe" mono --debug $EXE_TO_RUN "$@" Index: f-spot.spec =================================================================== RCS file: /cvs/dist/rpms/f-spot/devel/f-spot.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- f-spot.spec 10 Jan 2006 15:12:40 -0000 1.9 +++ f-spot.spec 31 Jan 2006 19:30:39 -0000 1.10 @@ -1,6 +1,6 @@ Name: f-spot Version: 0.1.5 -Release: 2 +Release: 3 Summary: Photo management application Group: Applications/Multimedia @@ -23,6 +23,8 @@ # No libgphoto etc on s390 ExcludeArch: s390 +Patch0: f-spot-0.1.5-security-fix.patch + %description F-Spot is an application designed to provide personal photo management to the GNOME desktop. Features include import, export, printing and advanced @@ -30,6 +32,7 @@ %prep %setup -q +%patch0 -p1 -b .security-fix %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -62,6 +65,10 @@ %{_prefix}/bin/f-spot %changelog +* Tue Jan 31 2006 Ray Strode - 0.1.5-3 +- don't blindly run f-spot from current working directory + (bug 177407) + * Tue Jan 10 2006 Alexander Larsson - 0.1.5-2 - Add lcms depencency From fedora-cvs-commits at redhat.com Tue Jan 31 19:31:41 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 14:31:41 -0500 Subject: rpms/sqlite/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 sqlite.spec, 1.12, 1.13 Message-ID: <200601311931.k0VJVfSB005963@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/sqlite/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv5926 Modified Files: .cvsignore sources sqlite.spec Log Message: * Tue Jan 31 2006 Christopher Aillon - 3.3.3-1 - Update to 3.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/sqlite/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 31 Jan 2006 09:07:24 -0000 1.8 +++ .cvsignore 31 Jan 2006 19:31:38 -0000 1.9 @@ -4,3 +4,4 @@ sqlite-3.2.7.tar.gz sqlite-3.2.8.tar.gz sqlite-3.3.2.tar.gz +sqlite-3.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/dist/rpms/sqlite/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 31 Jan 2006 09:07:24 -0000 1.8 +++ sources 31 Jan 2006 19:31:38 -0000 1.9 @@ -1 +1 @@ -420f442310dd6e90a7a1f8befcf0fb4e sqlite-3.3.2.tar.gz +eb5d9d7e7853b3af78e767d709b7fced sqlite-3.3.3.tar.gz Index: sqlite.spec =================================================================== RCS file: /cvs/dist/rpms/sqlite/devel/sqlite.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sqlite.spec 31 Jan 2006 09:07:24 -0000 1.12 +++ sqlite.spec 31 Jan 2006 19:31:38 -0000 1.13 @@ -3,7 +3,7 @@ Summary: Library that implements an embeddable SQL database engine Name: sqlite -Version: 3.3.2 +Version: 3.3.3 Release: 1 License: Public Domain Group: Applications/Databases @@ -96,6 +96,9 @@ %endif %changelog +* Tue Jan 31 2006 Christopher Aillon - 3.3.3-1 +- Update to 3.3.3 + * Tue Jan 31 2006 Christopher Aillon - 3.3.2-1 - Update to 3.3.2 From fedora-cvs-commits at redhat.com Tue Jan 31 19:46:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 14:46:59 -0500 Subject: rpms/beagle/devel beagle-0.2.0-security-fix.patch, NONE, 1.1 beagle.spec, 1.18, 1.19 Message-ID: <200601311946.k0VJkxaS018910@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17559 Modified Files: beagle.spec Added Files: beagle-0.2.0-security-fix.patch Log Message: - don't blindly run beagled in current working directory (bug 177675) beagle-0.2.0-security-fix.patch: beagled.in | 25 ------------------------- 1 files changed, 25 deletions(-) --- NEW FILE beagle-0.2.0-security-fix.patch --- --- beagle-0.2.0/beagled/beagled.in.security-fix 2006-01-31 14:42:48.000000000 -0500 +++ beagle-0.2.0/beagled/beagled.in 2006-01-31 14:44:41.000000000 -0500 @@ -1,29 +1,5 @@ #!@bash@ -if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then - echo "*** Running uninstalled @target@ ***" - - # When we run uninstalled, run in the foreground by default. - fg_default=1 - - TARGET_EXE="./@target@" - - export _BEAGLED_INDEX_HELPER_PATH="." - - # The stuff in webserver, Tiles and images is only needed when - # web services are enabled. - export MONO_PATH="../Util:../BeagleClient:./webserver:../Tiles:../images:$MONO_PATH" - - export LD_LIBRARY_PATH="../glue/.libs:$LD_LIBRARY_PATH" - - # In BEAGLE_FILTER_PATH, a trailing ':' means "append the default path". - if [ -n "$BEAGLE_FILTER_PATH" ]; then - export BEAGLE_FILTER_PATH="../Filters:$BEAGLE_FILTER_PATH" - else - export BEAGLE_FILTER_PATH="../Filters" - fi -else - # Otherwise default to running in the background fg_default=0 @@ -32,7 +8,6 @@ export _BEAGLED_INDEX_HELPER_PATH="@pkglibdir@" export MONO_PATH="@pkglibdir@:$MONO_PATH" export LD_LIBRARY_PATH="@pkglibdir@:$LD_LIBRARY_PATH" -fi export MONO_GAC_PREFIX="@gacprefix@:$MONO_GAC_PREFIX" Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- beagle.spec 24 Jan 2006 16:58:56 -0000 1.18 +++ beagle.spec 31 Jan 2006 19:46:55 -0000 1.19 @@ -1,6 +1,6 @@ Name: beagle Version: 0.2.0 -Release: 3 +Release: 4 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -17,6 +17,8 @@ BuildRequires: libXScrnSaver-devel Requires: sqlite2 zip mono-core poppler-utils +Patch0: beagle-0.2.0-security-fix.patch + # Mono only availible on these: ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x @@ -49,6 +51,7 @@ %prep %setup -q +%patch0 -p1 -b .security-fix %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -142,7 +145,11 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog -* Tue Jan 24 2006 Than Ngo 0.2.0-3 +* Tue Jan 31 2006 Ray Strode 0.2.0-4 +- don't blindly run beagled in current working directory + (bug 177675) + + * Tue Jan 24 2006 Than Ngo 0.2.0-3 - added --add-only-show-in=gnome to the desktop-file-install calls * Tue Jan 24 2006 Than Ngo 0.2.0-2 From fedora-cvs-commits at redhat.com Tue Jan 31 19:51:05 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 14:51:05 -0500 Subject: rpms/NetworkManager/devel NetworkManager.spec, 1.84, 1.85 sources, 1.42, 1.43 Message-ID: <200601311951.k0VJp5HW023707@cvs.devel.redhat.com> Author: dcbw Update of /cvs/dist/rpms/NetworkManager/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23657 Modified Files: NetworkManager.spec sources Log Message: * Tue Jan 31 2006 Dan Williams 0.5.1-8.cvs20060131 - Switch to autostarting the applet instead of having it be session-managed - Work better with non-broadcasting access points - Add more manufacturer default SSIDs to the blacklist Index: NetworkManager.spec =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- NetworkManager.spec 31 Jan 2006 16:28:36 -0000 1.84 +++ NetworkManager.spec 31 Jan 2006 19:51:02 -0000 1.85 @@ -15,7 +15,7 @@ Name: NetworkManager Summary: Network connection manager and user applications Version: 0.5.1 -Release: 7%{?nm_cvs_version} +Release: 8%{?nm_cvs_version} Group: System Environment/Base License: GPL URL: http://www.gnome.org/projects/NetworkManager/ @@ -128,6 +128,9 @@ %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/libnm-util.a %{__cp} test/nm-tool $RPM_BUILD_ROOT%{_bindir}/ +%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ +%{__cp} nm-applet.desktop $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/ + %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -182,6 +185,7 @@ %{_datadir}/nm-applet/ %{_datadir}/icons/hicolor/22x22/apps/*.png %{_datadir}/icons/hicolor/48x48/apps/*.png +%{_sysconfdir}/xdg/autostart/nm-applet.desktop %files devel %defattr(-,root,root,0755) @@ -199,6 +203,11 @@ %changelog +* Tue Jan 31 2006 Dan Williams 0.5.1-8.cvs20060131 +- Switch to autostarting the applet instead of having it be session-managed +- Work better with non-broadcasting access points +- Add more manufacturer default SSIDs to the blacklist + * Tue Jan 31 2006 Dan Williams 0.5.1-7.cvs20060131 - Longer association timeout - Fix some SELinux issues Index: sources =================================================================== RCS file: /cvs/dist/rpms/NetworkManager/devel/sources,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- sources 31 Jan 2006 16:21:12 -0000 1.42 +++ sources 31 Jan 2006 19:51:02 -0000 1.43 @@ -1 +1 @@ -98e4e8818fc625572486c46dc978db00 NetworkManager-0.5.1.cvs20060131.tar.gz +51458600276d94aaf228ea3053d21c52 NetworkManager-0.5.1.cvs20060131.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 31 19:51:55 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 14:51:55 -0500 Subject: rpms/beagle/devel beagle.spec,1.19,1.20 Message-ID: <200601311951.k0VJptkx024012@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv23971 Modified Files: beagle.spec Log Message: s/gnome/GNOME/ Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- beagle.spec 31 Jan 2006 19:46:55 -0000 1.19 +++ beagle.spec 31 Jan 2006 19:51:50 -0000 1.20 @@ -81,13 +81,13 @@ desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Red-Hat-Base \ - --add-only-show-in=gnome \ + --add-only-show-in=GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/beagle-search.desktop desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Red-Hat-Base \ - --add-only-show-in=gnome \ + --add-only-show-in=GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/beagle-settings.desktop %find_lang %{name} From fedora-cvs-commits at redhat.com Tue Jan 31 19:52:24 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 14:52:24 -0500 Subject: rpms/mkinitrd/devel .cvsignore, 1.86, 1.87 mkinitrd.spec, 1.94, 1.95 sources, 1.91, 1.92 Message-ID: <200601311952.k0VJqOY1024202@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/mkinitrd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24151 Modified Files: .cvsignore mkinitrd.spec sources Log Message: - update to 5.0.18 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/.cvsignore,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- .cvsignore 4 Jan 2006 00:48:50 -0000 1.86 +++ .cvsignore 31 Jan 2006 19:52:13 -0000 1.87 @@ -1 +1 @@ -mkinitrd-5.0.17.tar.bz2 +mkinitrd-5.0.18.tar.bz2 Index: mkinitrd.spec =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/mkinitrd.spec,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- mkinitrd.spec 4 Jan 2006 00:48:50 -0000 1.94 +++ mkinitrd.spec 31 Jan 2006 19:52:13 -0000 1.95 @@ -1,6 +1,6 @@ Summary: Creates an initial ramdisk image for preloading modules. Name: mkinitrd -Version: 5.0.17 +Version: 5.0.18 Release: 1 License: GPL Group: System Environment/Base @@ -62,6 +62,12 @@ %attr(644,root,root) %{_mandir}/man8/grubby.8* %changelog +* Tue Jan 31 2006 Peter Jones - 5.0.18-1 +- make mkinitrd discover dm uuids +- add uuid support to nash's "dm create" and "dm partadd" +- add nash command "dm get_uuid $NAME" +- add support for renamed dm raids + * Tue Jan 3 2006 Peter Jones - 5.0.17-1 - fix dm operations to create/remove device nodes during each change. Index: sources =================================================================== RCS file: /cvs/dist/rpms/mkinitrd/devel/sources,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- sources 4 Jan 2006 00:48:50 -0000 1.91 +++ sources 31 Jan 2006 19:52:13 -0000 1.92 @@ -1 +1 @@ -c8fd06a436bd45c7294bc11ea02c9227 mkinitrd-5.0.17.tar.bz2 +397cce6e62f1da203c6fe8d7ed6c2f27 mkinitrd-5.0.18.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 19:54:09 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 14:54:09 -0500 Subject: rpms/perl/devel perl-5.8.8-perlbug-tag.patch,1.1.2.1,1.1.2.2 Message-ID: <200601311954.k0VJs9u9024809@cvs.devel.redhat.com> Author: jvdias Update of /cvs/dist/rpms/perl/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24781 Modified Files: Tag: perl-5_8_8-0_RC1 perl-5.8.8-perlbug-tag.patch Log Message: rebase perl-5.8.3-perlbug-tag.patch to 5.8.8 perl-5.8.8-perlbug-tag.patch: perlbug.PL | 19 +++---------------- 1 files changed, 3 insertions(+), 16 deletions(-) Index: perl-5.8.8-perlbug-tag.patch =================================================================== RCS file: /cvs/dist/rpms/perl/devel/Attic/perl-5.8.8-perlbug-tag.patch,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- perl-5.8.8-perlbug-tag.patch 20 Jan 2006 22:16:43 -0000 1.1.2.1 +++ perl-5.8.8-perlbug-tag.patch 31 Jan 2006 19:54:04 -0000 1.1.2.2 @@ -1,19 +1,28 @@ --- perl-5.8.8-RC1/utils/perlbug.PL.perlbug 2006-01-03 14:07:41.000000000 -0500 -+++ perl-5.8.8-RC1/utils/perlbug.PL 2006-01-20 14:33:26.000000000 -0500 -@@ -71,7 +71,7 @@ ++++ perl-5.8.8-RC1/utils/perlbug.PL 2006-01-31 14:33:47.000000000 -0500 +@@ -27,7 +27,6 @@ + open PATCH_LEVEL, "<" . catfile(updir, "patchlevel.h") + or die "Can't open patchlevel.h: $!"; + +-my $patchlevel_date = (stat PATCH_LEVEL)[9]; + my $patchnum = ""; + + while () { +@@ -71,9 +70,8 @@ eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}' if \$running_under_some_shell; -my \$config_tag1 = '$extract_version - $Config{cf_time}'; +my \$config_tag1 = '$extract_version'; - my \$patchlevel_date = $patchlevel_date; +-my \$patchlevel_date = $patchlevel_date; my \$patch_tags = '$patch_tags'; -@@ -287,18 +287,9 @@ - # OK - send "OK" report for build on this system + my \@patches = ( + $patch_desc +@@ -288,17 +286,6 @@ $ok = 0; if ($::opt_o) { -- if ($::opt_o eq 'k' or $::opt_o eq 'kay') { + if ($::opt_o eq 'k' or $::opt_o eq 'kay') { - my $age = time - $patchlevel_date; - if ($::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) { - my $date = localtime $patchlevel_date; @@ -25,18 +34,17 @@ -EOF - exit(); - } -+ # -+ # Red Hat modification: remove -ok / -nok refusal to report due to age -+ # # force these options unless ($::opt_n) { $::opt_S = 1; # don't prompt for send -@@ -605,7 +596,7 @@ +@@ -605,8 +592,8 @@ print OUT < Author: mclasen Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27487 Modified Files: gnome-applets.spec Log Message: fix gstreamer requires Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.102 retrieving revision 1.103 diff -u -r1.102 -r1.103 --- gnome-applets.spec 31 Jan 2006 05:36:12 -0000 1.102 +++ gnome-applets.spec 31 Jan 2006 20:06:39 -0000 1.103 @@ -6,7 +6,7 @@ %define libgtop2_version 2.12.0 %define gail_version 1.2.0 %define libbonoboui_version 2.3.0 -%define gstreamer_plugins_version 0.7.6-2 +%define gstreamer_plugins_version 0.10 %define libxklavier_version 1.13 %define libwnck_version 2.9.3 %define libgnome_desktop_version 2.10.2 @@ -53,7 +53,8 @@ Requires: gnome-panel >= %{gnome_panel_version} Requires: libxklavier >= %{libxklavier_version} -Requires: gstreamer08-plugins >= %{gstreamer_plugins_version} +Requires: gstreamer-plugins-base >= %{gstreamer_plugins_version} +Requires: gstreamer-plugins-good >= %{gstreamer_plugins_version} # For wireless-applet backwards compat Requires: gnome-netstatus >= 2.8.0-2 @@ -170,6 +171,9 @@ %{_libdir}/pkgconfig/gweather.pc %changelog +* Tue Jan 31 2006 Matthias Clasen 2.13.3-2 +- Update gstreamer requires + * Tue Jan 31 2006 Matthias Clasen 2.13.3-1 - Update to 2.13.3 From fedora-cvs-commits at redhat.com Tue Jan 31 20:08:51 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 15:08:51 -0500 Subject: rpms/gnome-applets/devel gnome-applets.spec,1.103,1.104 Message-ID: <200601312008.k0VK8pLc028158@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv28035 Modified Files: gnome-applets.spec Log Message: bump rev Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- gnome-applets.spec 31 Jan 2006 20:06:39 -0000 1.103 +++ gnome-applets.spec 31 Jan 2006 20:08:47 -0000 1.104 @@ -18,7 +18,7 @@ Summary: Small applications for the GNOME panel. Name: gnome-applets Version: 2.13.3 -Release: 2 +Release: 3 Epoch: 1 License: GPL Group: User Interface/Desktops @@ -171,7 +171,7 @@ %{_libdir}/pkgconfig/gweather.pc %changelog -* Tue Jan 31 2006 Matthias Clasen 2.13.3-2 +* Tue Jan 31 2006 Matthias Clasen 2.13.3-3 - Update gstreamer requires * Tue Jan 31 2006 Matthias Clasen 2.13.3-1 From fedora-cvs-commits at redhat.com Tue Jan 31 20:12:31 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 15:12:31 -0500 Subject: rpms/gnome-applets/devel gnome-applets.spec,1.104,1.105 Message-ID: <200601312012.k0VKCVpD029801@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv29716 Modified Files: gnome-applets.spec Log Message: more fixes Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- gnome-applets.spec 31 Jan 2006 20:08:47 -0000 1.104 +++ gnome-applets.spec 31 Jan 2006 20:12:29 -0000 1.105 @@ -42,7 +42,7 @@ BuildRequires: pango-devel >= %{pango_version} BuildRequires: gail-devel >= %{gail_version} BuildRequires: libxklavier-devel >= %{libxklavier_version} -BuildRequires: gstreamer08-plugins-devel >= %{gstreamer_plugins_version} +BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version} BuildRequires: /usr/bin/automake BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libwnck-devel >= %{libwnck_version} From fedora-cvs-commits at redhat.com Tue Jan 31 20:16:30 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 15:16:30 -0500 Subject: rpms/gnome-applets/devel gnome-applets.spec,1.105,1.106 Message-ID: <200601312016.k0VKGUEf008369@cvs.devel.redhat.com> Author: mclasen Update of /cvs/dist/rpms/gnome-applets/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv7525 Modified Files: gnome-applets.spec Log Message: grr Index: gnome-applets.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v retrieving revision 1.105 retrieving revision 1.106 diff -u -r1.105 -r1.106 --- gnome-applets.spec 31 Jan 2006 20:12:29 -0000 1.105 +++ gnome-applets.spec 31 Jan 2006 20:16:26 -0000 1.106 @@ -42,7 +42,8 @@ BuildRequires: pango-devel >= %{pango_version} BuildRequires: gail-devel >= %{gail_version} BuildRequires: libxklavier-devel >= %{libxklavier_version} -BuildRequires: gstreamer-plugins-devel >= %{gstreamer_plugins_version} +BuildRequires: gstreamer-plugins-base-devel >= %{gstreamer_plugins_version} +BuildRequires: gstreamer-plugins-good-devel >= %{gstreamer_plugins_version} BuildRequires: /usr/bin/automake BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libwnck-devel >= %{libwnck_version} From fedora-cvs-commits at redhat.com Tue Jan 31 20:27:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 15:27:03 -0500 Subject: rpms/beagle/devel beagle-0.2.1-sqlite3.patch, NONE, 1.1 beagle.spec, 1.20, 1.21 Message-ID: <200601312027.k0VKR3Os016250@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16215 Modified Files: beagle.spec Added Files: beagle-0.2.1-sqlite3.patch Log Message: * Tue Jan 31 2006 Christopher Aillon 0.2.1-1 - Update to beagle 0.2.1 - Use sqlite3 instead of sqlite2 beagle-0.2.1-sqlite3.patch: configure | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) --- NEW FILE beagle-0.2.1-sqlite3.patch --- --- beagle-0.2.1/configure.sqlite 2006-01-31 04:10:10.000000000 -0500 +++ beagle-0.2.1/configure 2006-01-31 04:10:38.000000000 -0500 @@ -21852,12 +21852,12 @@ if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.3.1\"") >&5 - ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.3.1") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.3\"") >&5 + ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.3") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.3.1" 2>/dev/null` + pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.3" 2>/dev/null` else pkg_failed=yes fi @@ -21866,12 +21866,12 @@ fi if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.3.1\"") >&5 - ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.3.1") 2>&5 + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.3\"") >&5 + ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.3") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.3.1" 2>/dev/null` + pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.3" 2>/dev/null` else pkg_failed=yes fi @@ -21880,7 +21880,7 @@ fi if test $pkg_failed = yes; then - SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.3.1"` + SQLITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "sqlite3 >= 3.3"` # Put the nasty error message in config.log where it belongs echo "$SQLITE_PKG_ERRORS" 1>&5 @@ -21896,8 +21896,8 @@ fi if test "x$SQLITE_MAJ_VER" = "x0"; then - { { echo "$as_me:$LINENO: error: You need to install sqlite 2.x or >= 3.3.1" >&5 -echo "$as_me: error: You need to install sqlite 2.x or >= 3.3.1" >&2;} + { { echo "$as_me:$LINENO: error: You need to install sqlite 2.x or >= 3.3" >&5 +echo "$as_me: error: You need to install sqlite 2.x or >= 3.3" >&2;} { (exit 1); exit 1; }; } fi Index: beagle.spec =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/beagle.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- beagle.spec 31 Jan 2006 19:51:50 -0000 1.20 +++ beagle.spec 31 Jan 2006 20:27:01 -0000 1.21 @@ -1,6 +1,6 @@ Name: beagle -Version: 0.2.0 -Release: 4 +Version: 0.2.1 +Release: 1 Summary: The Beagle Search Infrastructure Group: User Interface/Desktops @@ -10,14 +10,16 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel mono-data mono-data-sqlite -BuildRequires: gtk-sharp2-gapi sqlite2-devel mono-web zip libexif-devel +BuildRequires: gtk-sharp2-gapi mono-web zip libexif-devel BuildRequires: gsf-sharp +BuildRequires: sqlite-devel > 3.3.1 BuildRequires: gmime-sharp >= 2.1.19 BuildRequires: evolution-sharp >= 0.10.2-3 BuildRequires: libXScrnSaver-devel -Requires: sqlite2 zip mono-core poppler-utils - +Requires: sqlite >= 3.3.1 +Requires: zip mono-core poppler-utils Patch0: beagle-0.2.0-security-fix.patch +Patch1: beagle-0.2.1-sqlite3.patch # Mono only availible on these: ExclusiveArch: %ix86 x86_64 ppc ia64 armv4l sparc s390 s390x @@ -52,6 +54,7 @@ %prep %setup -q %patch0 -p1 -b .security-fix +%patch1 -p1 -b .sqlite3 %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -145,11 +148,15 @@ %{_prefix}/lib/python*/site-packages/beagle.so %changelog +* Tue Jan 31 2006 Christopher Aillon 0.2.1-1 +- Update to beagle 0.2.1 +- Use sqlite3 instead of sqlite2 + * Tue Jan 31 2006 Ray Strode 0.2.0-4 - don't blindly run beagled in current working directory (bug 177675) - * Tue Jan 24 2006 Than Ngo 0.2.0-3 +* Tue Jan 24 2006 Than Ngo 0.2.0-3 - added --add-only-show-in=gnome to the desktop-file-install calls * Tue Jan 24 2006 Than Ngo 0.2.0-2 From fedora-cvs-commits at redhat.com Tue Jan 31 20:37:17 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 15:37:17 -0500 Subject: rpms/beagle/devel .cvsignore,1.5,1.6 sources,1.5,1.6 Message-ID: <200601312037.k0VKbHQp019160@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/beagle/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv19126 Modified Files: .cvsignore sources Log Message: * Tue Jan 31 2006 Christopher Aillon 0.2.1-1 - Update to beagle 0.2.1 - Use sqlite3 instead of sqlite2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Jan 2006 14:32:29 -0000 1.5 +++ .cvsignore 31 Jan 2006 20:37:14 -0000 1.6 @@ -1 +1,2 @@ beagle-0.2.0.tar.bz2 +beagle-0.2.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/dist/rpms/beagle/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Jan 2006 14:32:29 -0000 1.5 +++ sources 31 Jan 2006 20:37:14 -0000 1.6 @@ -1 +1 @@ -faa236b812db1a8ee72c58d2cb810010 beagle-0.2.0.tar.bz2 +325ed91dc66fb6be060d0a5f4c8f56dd beagle-0.2.1.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 20:57:56 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 15:57:56 -0500 Subject: rpms/gnome-screensaver/devel gnome-screensaver.spec,1.50,1.51 Message-ID: <200601312057.k0VKvurI026202@cvs.devel.redhat.com> Author: rstrode Update of /cvs/dist/rpms/gnome-screensaver/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv26189 Modified Files: gnome-screensaver.spec Log Message: - try to migrate xscreensaver screensavers (bug 172715) Index: gnome-screensaver.spec =================================================================== RCS file: /cvs/dist/rpms/gnome-screensaver/devel/gnome-screensaver.spec,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- gnome-screensaver.spec 31 Jan 2006 04:44:30 -0000 1.50 +++ gnome-screensaver.spec 31 Jan 2006 20:57:54 -0000 1.51 @@ -14,7 +14,7 @@ Summary: GNOME Sreensaver Name: gnome-screensaver Version: 2.13.90 -Release: 1 +Release: 2 License: GPL Group: Amusement/Graphics Source0: %{name}-%{version}.tar.bz2 @@ -94,6 +94,14 @@ install -D -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver/themes +sed -ie 's at XSL=${DIST_BIN}/xscreensaver-config.xsl at XSL=%{_datadir}/gnome-screensaver/xscreensaver-config.xsl@' \ + data/migrate-xscreensaver-config.sh +sed -ie 's at b=`basename ${FILE} .xml`@b=xscreensaver-`basename ${FILE} .xml`@' \ + data/migrate-xscreensaver-config.sh + +install -D -m755 data/migrate-xscreensaver-config.sh $RPM_BUILD_ROOT%{_libexecdir}/gnome-screensaver +install -D -m644 data/xscreensaver-config.xsl $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver + %clean rm -rf $RPM_BUILD_ROOT @@ -104,6 +112,24 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null done +%triggerin -- xscreensaver-extras xscreensaver-gl-extras +(cd %{_datadir}/gnome-screensaver/themes; \ +for f in %{_datadir}/xscreensaver/config/*.xml; do + %{_libexecdir}/gnome-screensaver/migrate-xscreensaver-config.sh $f > /dev/null 2>&1 +done) + +%triggerun -- xscreensaver-extras +(cd %{_datadir}/gnome-screensaver/themes; \ +for f in $(rpm -ql xscreensaver-extras | grep '%{_datadir}/xscreensaver/config/'); do + rm -f xscreensaver-$(basename $f .xml).desktop +done) + +%triggerun -- xscreensaver-gl-extras +(cd %{_datadir}/gnome-screensaver/themes; \ +for f in $(rpm -ql xscreensaver-gl-extras | grep '%{_datadir}/xscreensaver/config/'); do + rm -f xscreensaver-$(basename $f .xml).desktop +done) + %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog NEWS README @@ -120,6 +146,9 @@ %{_sysconfdir}/pam.d/* %changelog +* Tue Jan 31 2006 Ray Strode - 2.13.90-2 +- try to migrate xscreensaver screensavers (bug 172715) + * Mon Jan 30 2006 Matthias Clasen - 2.13.90-1 - Update to 2.13.90 @@ -217,3 +246,4 @@ - Initial package + From fedora-cvs-commits at redhat.com Tue Jan 31 21:19:57 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 16:19:57 -0500 Subject: rpms/passwd/devel passwd-0.71-audit.patch, 1.1, 1.2 passwd.spec, 1.20, 1.21 Message-ID: <200601312119.k0VLJv31006433@cvs.devel.redhat.com> Author: sgrubb Update of /cvs/dist/rpms/passwd/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6418 Modified Files: passwd-0.71-audit.patch passwd.spec Log Message: * Tue Jan 31 2006 Steve Grubb 0.71-3 - Adjust audit patch so it builds without libaudit passwd-0.71-audit.patch: configure.ac | 1 passwd.c | 99 ++++++++++++++++++++++++++++++++--------------------------- 2 files changed, 55 insertions(+), 45 deletions(-) Index: passwd-0.71-audit.patch =================================================================== RCS file: /cvs/dist/rpms/passwd/devel/passwd-0.71-audit.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- passwd-0.71-audit.patch 25 Oct 2005 20:09:22 -0000 1.1 +++ passwd-0.71-audit.patch 31 Jan 2006 21:19:53 -0000 1.2 @@ -1,25 +1,40 @@ +diff -ur passwd-0.71.orig/configure.ac passwd-0.71/configure.ac +--- passwd-0.71.orig/configure.ac 2006-01-31 09:59:08.000000000 -0500 ++++ passwd-0.71/configure.ac 2006-01-31 15:40:59.000000000 -0500 +@@ -57,6 +57,7 @@ + if test x$use_selinux != xauto ; then + AC_MSG_ERROR([requested SELinux, but libselinux was not found]) + fi ++ use_selinux=no + else + AC_DEFINE(WITH_SELINUX,1,[Define if you want to use SELinux.]) + fi diff -ur passwd-0.71.orig/passwd.c passwd-0.71/passwd.c ---- passwd-0.71.orig/passwd.c 2005-10-25 09:28:23.000000000 -0400 -+++ passwd-0.71/passwd.c 2005-10-25 15:13:19.000000000 -0400 -@@ -48,6 +48,7 @@ +--- passwd-0.71.orig/passwd.c 2006-01-31 10:18:25.000000000 -0500 ++++ passwd-0.71/passwd.c 2006-01-31 15:43:52.000000000 -0500 +@@ -48,6 +48,9 @@ #include #include #include +#include ++#include ++#include #include "pwdb.h" #ifdef WITH_SELINUX -@@ -61,7 +62,8 @@ +@@ -60,8 +63,9 @@ + #ifdef WITH_AUDIT #include #else - #define audit_open() -1 +-#define audit_open() -1 -#define audit_log_if_enabled(d,t,f,...) do { ; } while(0) -+#define audit_log_user_message(d,t,m,h,a,t,r) do { ; } while(0) -+#define audit_log_acct_message(d,t,p,o,n,i,h,a,t,r) do { ; } while(0) ++#define audit_log_user_message(d,ty,m,h,a,t,r) do { ; } while(0) ++#define audit_log_acct_message(d,ty,p,o,n,i,h,a,t,r) do { ; } while(0) ++static int audit_open(void) { errno = EPROTONOSUPPORT; return -1; } #endif #include -@@ -266,11 +268,13 @@ +@@ -266,11 +270,13 @@ (getuid() != 0)) { #endif if (passwd_flags & PASSWD_STATUS) { @@ -37,7 +52,7 @@ } fprintf(stderr, _("Only root can do that.\n")); exit(-2); -@@ -281,9 +285,9 @@ +@@ -281,9 +287,9 @@ if ((extraArgs != NULL) && (extraArgs[0] != NULL)) { if (getuid() != 0) { /* The invoking user was not root. */ @@ -50,7 +65,7 @@ fprintf(stderr, _("%s: Only root can specify a user name.\n"), progname); -@@ -351,6 +355,13 @@ +@@ -351,6 +357,13 @@ char *tty_name, *ttyn; audit_fd = audit_open(); @@ -64,7 +79,7 @@ /* Parse command-line arguments. */ progname = basename(argv[0]); -@@ -379,6 +390,9 @@ +@@ -379,6 +392,9 @@ "password of %s\n"), progname, user_context, username); freecon(user_context); @@ -74,7 +89,7 @@ exit(1); } #endif -@@ -390,11 +404,9 @@ +@@ -390,11 +406,9 @@ printf("%s: %s\n", progname, retval == 0 ? "Success" : "Error (password not set?)"); @@ -89,7 +104,7 @@ return retval; } /* Handle account unlocking request. */ -@@ -407,11 +419,9 @@ +@@ -407,11 +421,9 @@ retval == -2 ? _("Unsafe operation (use -f to force).") : _("Error (password not set?)")); @@ -104,7 +119,7 @@ return retval; } /* Handle password clearing request. */ -@@ -420,36 +430,32 @@ +@@ -420,36 +432,32 @@ retval = pwdb_clear_password(username); printf("%s: %s\n", progname, (retval == 0) ? _("Success") : _("Error")); @@ -154,7 +169,7 @@ return retval; } -@@ -519,22 +525,23 @@ +@@ -519,22 +527,23 @@ /* We're done. Tell the invoking user that it worked. */ retval = pam_end(pamh, PAM_SUCCESS); if (passwd_flags & PASSWD_KEEP) { Index: passwd.spec =================================================================== RCS file: /cvs/dist/rpms/passwd/devel/passwd.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- passwd.spec 9 Dec 2005 22:42:39 -0000 1.20 +++ passwd.spec 31 Jan 2006 21:19:53 -0000 1.21 @@ -7,7 +7,7 @@ Summary: The passwd utility for setting/changing passwords using PAM. Name: passwd Version: 0.71 -Release: 2.1 +Release: 3 License: BSD Group: System Environment/Base Source: %{name}-%{version}.tar.bz2 @@ -59,6 +59,9 @@ %{_mandir}/man1/passwd.1* %changelog +* Tue Jan 31 2006 Steve Grubb 0.71-3 +- Adjust audit patch so it builds without libaudit + * Fri Dec 09 2005 Jesse Keating - rebuilt From fedora-cvs-commits at redhat.com Tue Jan 31 21:21:54 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 16:21:54 -0500 Subject: rpms/libgdiplus/devel .cvsignore, 1.4, 1.5 libgdiplus.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200601312121.k0VLLsMK006507@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/libgdiplus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv6494 Modified Files: .cvsignore libgdiplus.spec sources Log Message: * Tue Jan 31 2006 Christopher Aillon - 1.1.13.2-1 - Update to 1.1.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/libgdiplus/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Jan 2006 09:23:33 -0000 1.4 +++ .cvsignore 31 Jan 2006 21:21:51 -0000 1.5 @@ -1 +1,2 @@ libgdiplus-1.1.13.tar.gz +libgdiplus-1.1.13.2.tar.gz Index: libgdiplus.spec =================================================================== RCS file: /cvs/dist/rpms/libgdiplus/devel/libgdiplus.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libgdiplus.spec 13 Jan 2006 09:23:33 -0000 1.8 +++ libgdiplus.spec 31 Jan 2006 21:21:51 -0000 1.9 @@ -1,5 +1,5 @@ Name: libgdiplus -Version: 1.1.13 +Version: 1.1.13.2 Release: 1 Summary: libgdiplus: An Open Source implementation of the GDI+ API @@ -48,6 +48,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Jan 31 2006 Christopher Aillon - 1.1.13.2-1 +- Update to 1.1.13.2 + * Fri Jan 13 2006 Alexander Larsson - 1.1.13-1 - update to 1.1.13 Index: sources =================================================================== RCS file: /cvs/dist/rpms/libgdiplus/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Jan 2006 09:23:33 -0000 1.4 +++ sources 31 Jan 2006 21:21:51 -0000 1.5 @@ -1 +1 @@ -9f655b0032603d653b52ce12b6c29a50 libgdiplus-1.1.13.tar.gz +97da26e08454a08e64c3936800efdfa5 libgdiplus-1.1.13.2.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 31 21:25:28 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 16:25:28 -0500 Subject: rpms/setools/devel .cvsignore, 1.14, 1.15 setools-rhat.patch, 1.19, 1.20 setools.spec, 1.48, 1.49 sources, 1.15, 1.16 setools-1.4.1-selinux-usr-2004081908.patch.gz, 1.2, NONE setools-1.4.1.patch, 1.1, NONE setools-1.5.1-badtcl.patch, 1.1, NONE setools-1.5.1-malloc.patch, 1.1, NONE Message-ID: <200601312125.k0VLPS9L015232@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/setools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15199 Modified Files: .cvsignore setools-rhat.patch setools.spec sources Removed Files: setools-1.4.1-selinux-usr-2004081908.patch.gz setools-1.4.1.patch setools-1.5.1-badtcl.patch setools-1.5.1-malloc.patch Log Message: * Tue Jan 31 2006 Dan Walsh 2.3-1 - Update from upstream * apol: added new MLS components tab for sensitivities, levels, and categories. Changed users tab to support ranges and default levels. added range transition tab for searching range Transition rules. added new tab for network context components. added new tab for file system context components. * libapol: added binpol support for MLS, network contexts, and file system contexts. * seinfo: added command line options for MLS components. added command line options for network contexts and file system contexts. * sesearch: added command line option for searching for rules by conditional boolean name. * seaudit: added new column in the log view for the 'comm' field found in auditd log files. added filters for the 'comm' field and 'message' field. * manpages: added manpages for all tools. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/setools/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 3 Nov 2005 21:51:53 -0000 1.14 +++ .cvsignore 31 Jan 2006 21:25:24 -0000 1.15 @@ -7,3 +7,4 @@ setools-2.1.2.tar.bz2 setools-2.1.3.tar.bz2 setools-2.2.tar.bz2 +setools-2.3.tar.bz2 setools-rhat.patch: Makefile | 4 ++-- apol/Makefile | 2 +- sediff/Makefile | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) Index: setools-rhat.patch =================================================================== RCS file: /cvs/dist/rpms/setools/devel/setools-rhat.patch,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- setools-rhat.patch 14 Dec 2005 14:47:13 -0000 1.19 +++ setools-rhat.patch 31 Jan 2006 21:25:24 -0000 1.20 @@ -1,19 +1,6 @@ ---- setools-2.2/seaudit/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400 -+++ setools-2.2/seaudit/Makefile 2005-12-14 09:34:28.000000000 -0500 -@@ -60,8 +60,8 @@ - $(CC) $(CFLAGS) $(GTK_CFLAGS) $(LIBXML_FLAGS) $(INCLUDE) -c $< - - install: seaudit seaudit-report -- install -m 755 seaudit $(BINDIR) -- install -m 755 seaudit-report $(BINDIR) -+ install -m 755 seaudit $(SBINDIR) -+ install -m 755 seaudit-report $(SBINDIR) - install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR) - install -m 644 seaudit_help.txt $(INSTALL_LIBDIR) - install -m 444 dot_seaudit $(INSTALL_LIBDIR) ---- setools-2.2/apol/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400 -+++ setools-2.2/apol/Makefile 2005-12-14 09:34:28.000000000 -0500 -@@ -80,7 +80,7 @@ +--- setools-2.3/apol/Makefile.rhat 2006-01-23 10:58:42.000000000 -0500 ++++ setools-2.3/apol/Makefile 2006-01-31 16:15:53.000000000 -0500 +@@ -85,7 +85,7 @@ $(MAKE) -C .. libsefs install: apol apol.tcl @@ -22,51 +9,35 @@ @if [ -n $(INSTALL_LIBDIR) ]; then \ for file in $(TCL-FILES); do \ if [ -f $(INSTALL_LIBDIR)/$$file ]; then \ -@@ -89,6 +89,7 @@ - done \ - fi - install -m 644 apol.tcl $(APOL_HELP_FILES) $(APOL_PERM_MAPS) $(INSTALL_LIBDIR) -+ install -m 644 $(APOL_HELP_FILES) $(APOL_PERM_MAPS) ${INSTALL_HELPDIR} - cd $(INSTALL_LIBDIR); ln -sf $(APOL_DFLT_PMAP) apol_perm_mapping - - clean: ---- setools-2.2/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400 -+++ setools-2.2/Makefile 2005-12-14 09:34:28.000000000 -0500 -@@ -10,7 +10,7 @@ - LIBS = -lfl -lm +--- setools-2.3/Makefile.rhat 2006-01-23 10:58:42.000000000 -0500 ++++ setools-2.3/Makefile 2006-01-31 16:18:43.000000000 -0500 +@@ -12,7 +12,7 @@ + PREFIX ?= $(DESTDIR)/usr - INCLUDE_DIR = $(DESTDIR)/usr/include --SHARED_LIB_INSTALL_DIR = $(DESTDIR)/usr/lib + INCLUDE_DIR = $(PREFIX)/include +-SHARED_LIB_INSTALL_DIR = $(PREFIX)/lib +SHARED_LIB_INSTALL_DIR = $(DESTDIR)$(LIBDIR) STATIC_LIB_INSTALL_DIR = $(SHARED_LIB_INSTALL_DIR) - SETOOLS_INCLUDE = $(INCLUDE_DIR)/setools + #SETOOLS_INCLUDE = $(INCLUDE_DIR)/setools-$(SETOOLS_VER) TCLVER = $(shell env tclsh tcl_vars) -@@ -28,6 +28,7 @@ - # Install directories - # Binaries go here - BINDIR = $(DESTDIR)/usr/bin -+SBINDIR = $(DESTDIR)/usr/sbin - # The code uses the specified path below. If you change this, DO NOT add - # a trailing path seperator ("/"). For example, use "/usr/share/setools" +@@ -37,7 +37,7 @@ # instead of "/usr/share/setools/". This probably needs to become more -@@ -111,7 +112,7 @@ - export SHARED_LIB_INSTALL_DIR STATIC_LIB_INSTALL_DIR - export SELINUX_DIR POLICY_INSTALL_DIR POLICY_SRC_DIR DEFAULT_LOG_FILE - export POLICY_SRC_DIR POLICY_SRC_FILE --export BINDIR INSTALL_LIBDIR INSTALL_HELPDIR POLICYINSTALLDIR -+export SBINDIR BINDIR INSTALL_LIBDIR INSTALL_HELPDIR POLICYINSTALLDIR + # robust in the future. + # +-INSTALL_LIBDIR = $(PREFIX)/share/setools-$(SETOOLS_VER) ++INSTALL_LIBDIR = $(PREFIX)/share/setools + # all apps that have a te/fc file need to be listed here + POLICYINSTALLDIRS = + # Help files here +--- setools-2.3/sediff/Makefile.rhat 2006-01-23 10:58:42.000000000 -0500 ++++ setools-2.3/sediff/Makefile 2006-01-31 16:15:53.000000000 -0500 +@@ -22,7 +22,8 @@ + install -m 644 ../man/sediff.1 $(MANDIR)/man1 - # Top Level Targets - all: all-libs all-nogui all-gui ---- setools-2.2/sediff/Makefile.rhat 2005-10-28 18:12:32.000000000 -0400 -+++ setools-2.2/sediff/Makefile 2005-12-14 09:34:28.000000000 -0500 -@@ -24,7 +24,8 @@ - install -m 755 sediff $(BINDIR); - install: all - install -m 755 sediff sediffx $(BINDIR); + install -m 755 sediff $(BINDIR); + install -m 755 sediffx $(SBINDIR); install -m 644 $(GLADE_FILES) $(INSTALL_LIBDIR) - install -m 644 sediff_help.txt $(INSTALL_LIBDIR) + install -m 644 sediff_help.txt $(INSTALL_HELPDIR) Index: setools.spec =================================================================== RCS file: /cvs/dist/rpms/setools/devel/setools.spec,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- setools.spec 16 Dec 2005 23:25:03 -0000 1.48 +++ setools.spec 31 Jan 2006 21:25:24 -0000 1.49 @@ -1,7 +1,7 @@ Summary: SELinux tools for managing policy Name: setools -Version: 2.2 -Release: 4.1 +Version: 2.3 +Release: 1 License: GPL Group: System Environment/Base URL: http://www.tresys.com/ @@ -100,6 +100,10 @@ rm -f ${RPM_BUILD_ROOT}/usr/bin/replcon rm -f ${RPM_BUILD_ROOT}/usr/bin/searchcon rm -f ${RPM_BUILD_ROOT}/usr/bin/indexcon +rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/searchcon.1 +rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/indexcon.1 +rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/replcon.1 +rm -f ${RPM_BUILD_ROOT}/usr/share/man/man1/findcon.1 install -d -m 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/apol install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/seaudit @@ -149,9 +153,11 @@ /usr/share/doc/setools-%{version}/flow_assertion_help.txt /usr/share/doc/setools-%{version}/iflow_help.txt /usr/share/doc/setools-%{version}/obj_perms_help.txt +/usr/share/doc/setools-2.3/sechecker_help.txt +/usr/share/doc/setools-2.3/sediff_help.txt + %dir /usr/share/setools /usr/share/setools/apol.tcl -/usr/share/setools/apol_help.txt /usr/share/setools/apol_perm_mapping /usr/share/setools/apol_perm_mapping_ver12 /usr/share/setools/apol_perm_mapping_ver15 @@ -162,25 +168,20 @@ /usr/share/setools/apol_perm_mapping_ver20 /usr/share/setools/customize_filter_window.glade /usr/share/setools/dot_seaudit -/usr/share/setools/dta_help.txt /usr/share/setools/filter_window.glade -/usr/share/setools/iflow_help.txt /usr/share/setools/multifilter_window.glade -/usr/share/setools/obj_perms_help.txt /usr/share/setools/prefer_window.glade /usr/share/setools/query_window.glade /usr/share/setools/report_window.glade /usr/share/setools/seaudit-report.conf /usr/share/setools/seaudit-report.css /usr/share/setools/seaudit.glade -/usr/share/setools/seaudit_help.txt -%attr(755,root,root) %dir /usr/share/setools/sechecker -%attr(755,root,root) %dir /usr/share/setools/sechecker/profiles -/usr/share/setools/sechecker/profiles/all-checks.sechecker -/usr/share/setools/sechecker/profiles/analysis-checks.sechecker -/usr/share/setools/sechecker/profiles/devel-checks.sechecker /usr/share/setools/sediff.glade -/usr/share/setools/sediff_help.txt + +%{_mandir}/man1/apol.1.gz +%{_mandir}/man1/sediffx.1.gz +%{_mandir}/man8/seaudit.8.gz +%{_mandir}/man8/seaudit-report.8.gz %package devel Summary: Development environment for SETools @@ -192,8 +193,13 @@ %files devel %defattr(-,root,root) -%{_includedir}/setools -%{_libdir}/lib* +%{_includedir}/libapol +%{_includedir}/libseaudit +%{_includedir}/libsefs +%{_includedir}/selinux/apol +%{_libdir}/libsefs.a +%{_libdir}/libapol.a +%{_libdir}/libseaudit.a %post devel -p /sbin/ldconfig @@ -208,8 +214,57 @@ %dir /usr/share/doc/setools-%{version} /usr/share/doc/setools-%{version}/KNOWN-BUGS /usr/share/doc/setools-%{version}/README +%{_mandir}/man1/sechecker.1.gz +%{_mandir}/man1/seinfo.1.gz +%{_mandir}/man1/sediff.1.gz +%{_mandir}/man1/sesearch.1.gz +%attr(755,root,root) %dir /usr/share/setools/sechecker +%attr(755,root,root) %dir /usr/share/setools/sechecker/profiles +/usr/share/setools/sechecker/profiles/all-checks.sechecker +/usr/share/setools/sechecker/profiles/analysis-checks.sechecker +/usr/share/setools/sechecker/profiles/devel-checks.sechecker +%{_libdir}/libapol.so +%{_libdir}/libapol.so.1 +%{_libdir}/libapol.so.2.2.0 +%{_libdir}/libseaudit.so +%{_libdir}/libseaudit.so.1 +%{_libdir}/libseaudit.so.1.2.6 +%{_libdir}/libsefs.so +%{_libdir}/libsefs.so.1 +%{_libdir}/libsefs.so.1.2.1 %changelog +* Tue Jan 31 2006 Dan Walsh 2.3-1 +- Update from upstream + * apol: + added new MLS components tab for sensitivities, + levels, and categories. + Changed users tab to support ranges and default + levels. + added range transition tab for searching range + Transition rules. + added new tab for network context components. + added new tab for file system context components. + * libapol: + added binpol support for MLS, network contexts, + and file system contexts. + * seinfo: + added command line options for MLS components. + added command line options for network contexts + and file system contexts. + * sesearch: + added command line option for searching for rules + by conditional boolean name. + * seaudit: + added new column in the log view for the 'comm' + field found in auditd log files. + added filters for the 'comm' field and 'message' + field. + * manpages: + added manpages for all tools. + + + * Fri Dec 16 2005 Jesse Keating - rebuilt for new gcj Index: sources =================================================================== RCS file: /cvs/dist/rpms/setools/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 3 Nov 2005 21:51:53 -0000 1.15 +++ sources 31 Jan 2006 21:25:24 -0000 1.16 @@ -1 +1 @@ -e3fc1af44bcf8ef0714f48c91509ad95 setools-2.2.tar.bz2 +accd87390ffc48740e3e53a4a1e27649 setools-2.3.tar.bz2 --- setools-1.4.1-selinux-usr-2004081908.patch.gz DELETED --- --- setools-1.4.1.patch DELETED --- --- setools-1.5.1-badtcl.patch DELETED --- --- setools-1.5.1-malloc.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 31 21:25:49 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 16:25:49 -0500 Subject: rpms/libgdiplus/devel libgdiplus.spec, 1.9, 1.10 libgdiplus-gcc4.patch, 1.1, NONE Message-ID: <200601312125.k0VLPnJc015464@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/libgdiplus/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15434 Modified Files: libgdiplus.spec Removed Files: libgdiplus-gcc4.patch Log Message: libgdiplus-gcc4.patch no longer needed; its been upstreamed Index: libgdiplus.spec =================================================================== RCS file: /cvs/dist/rpms/libgdiplus/devel/libgdiplus.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libgdiplus.spec 31 Jan 2006 21:21:51 -0000 1.9 +++ libgdiplus.spec 31 Jan 2006 21:25:46 -0000 1.10 @@ -9,8 +9,6 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: libgdiplus-gcc4.patch - BuildRequires: freetype-devel glib2-devel libjpeg-devel libtiff-devel BuildRequires: libungif-devel libpng-devel # We don't actually use the external cairo yet, but this is an easy way @@ -23,7 +21,6 @@ %prep %setup -q -%patch1 -p1 -b .gcc4 %build %configure --- libgdiplus-gcc4.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 31 21:26:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 16:26:20 -0500 Subject: rpms/kernel-xen/devel/configs config-x86-generic,1.5,1.6 Message-ID: <200601312126.k0VLQKDN015750@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel-xen/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv15600/configs Modified Files: config-x86-generic Log Message: merged with rawhide 1.1884 Index: config-x86-generic =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/configs/config-x86-generic,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config-x86-generic 26 Jan 2006 22:14:35 -0000 1.5 +++ config-x86-generic 31 Jan 2006 21:26:17 -0000 1.6 @@ -208,7 +208,7 @@ CONFIG_KPROBES=y # FIXME: Disable before release. -CONFIG_DEBUG_PAGEALLOC=y +# CONFIG_DEBUG_PAGEALLOC is not set CONFIG_PCI_DIRECT=y CONFIG_PCI_MMCONFIG=y From fedora-cvs-commits at redhat.com Tue Jan 31 21:26:20 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 16:26:20 -0500 Subject: rpms/kernel-xen/devel linux-2.6-audit-new-msg-types.patch, NONE, 1.1 linux-2.6-debunk-i2c.patch, NONE, 1.1 linux-2.6-net-fix-iptables.patch, NONE, 1.1 linux-2.6-net-slab-corruption.patch, NONE, 1.1 linux-2.6-net-wireless-features.patch, NONE, 1.1 linux-2.6-selinux-mprotect-checks.patch, NONE, 1.1 linux-2.6-snd-powermac.patch, NONE, 1.1 linux-2.6-suspend-memhotplug-oops.patch, NONE, 1.1 linux-2.6-x86_64-add-ppoll-pselect.patch, NONE, 1.1 linux-2.6-x86_64-generic-sigsuspend.patch, NONE, 1.1 linux-2.6-x86_64-tif-restore-sigmask.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 kernel-xen.spec, 1.33, 1.34 linux-2.6-crashdump-common.patch, 1.4, 1.5 linux-2.6-xen-merge.patch, 1.6, 1.7 sources, 1.10, 1.11 linux-2.6-acpi-thinkpad-c2c3.patch, 1.3, NONE Message-ID: <200601312126.k0VLQKY5015743@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv15600 Modified Files: .cvsignore kernel-xen.spec linux-2.6-crashdump-common.patch linux-2.6-xen-merge.patch sources Added Files: linux-2.6-audit-new-msg-types.patch linux-2.6-debunk-i2c.patch linux-2.6-net-fix-iptables.patch linux-2.6-net-slab-corruption.patch linux-2.6-net-wireless-features.patch linux-2.6-selinux-mprotect-checks.patch linux-2.6-snd-powermac.patch linux-2.6-suspend-memhotplug-oops.patch linux-2.6-x86_64-add-ppoll-pselect.patch linux-2.6-x86_64-generic-sigsuspend.patch linux-2.6-x86_64-tif-restore-sigmask.patch Removed Files: linux-2.6-acpi-thinkpad-c2c3.patch Log Message: merged with rawhide 1.1884 linux-2.6-audit-new-msg-types.patch: include/linux/audit.h | 19 +++++++++++++++---- kernel/audit.c | 2 ++ security/selinux/nlmsgtab.c | 6 ++++-- 3 files changed, 21 insertions(+), 6 deletions(-) --- NEW FILE linux-2.6-audit-new-msg-types.patch --- --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -33,11 +33,20 @@ * 1200 - 1299 messages internal to the audit daemon * 1300 - 1399 audit event messages * 1400 - 1499 SE Linux use - * 1500 - 1999 future use - * 2000 is for otherwise unclassified kernel audit messages + * 1500 - 1599 kernel LSPP events + * 1600 - 1699 kernel crypto events + * 1700 - 1999 future kernel use (maybe integrity labels and related events) + * 2000 is for otherwise unclassified kernel audit messages (legacy) + * 2001 - 2099 unused (kernel) + * 2100 - 2199 user space anomaly records + * 2200 - 2299 user space actions taken in response to anomalies + * 2300 - 2399 user space generated LSPP events + * 2400 - 2499 user space crypto events + * 2500 - 2999 future user space (maybe integrity labels and related events) * - * Messages from 1000-1199 are bi-directional. 1200-1299 are exclusively user - * space. Anything over that is kernel --> user space communication. + * Messages from 1000-1199 are bi-directional. 1200-1299 & 2100 - 2999 are + * exclusively user space. 1300-2099 is kernel --> user space + * communication. */ #define AUDIT_GET 1000 /* Get status */ #define AUDIT_SET 1001 /* Set status (enable/disable/auditd) */ @@ -54,6 +63,8 @@ #define AUDIT_FIRST_USER_MSG 1100 /* Userspace messages mostly uninteresting to kernel */ #define AUDIT_USER_AVC 1107 /* We filter this differently */ #define AUDIT_LAST_USER_MSG 1199 +#define AUDIT_FIRST_USER_MSG2 2100 /* More user space messages */ +#define AUDIT_LAST_USER_MSG2 2999 #define AUDIT_DAEMON_START 1200 /* Daemon startup record */ #define AUDIT_DAEMON_END 1201 /* Daemon normal stop record */ --- a/kernel/audit.c +++ b/kernel/audit.c @@ -367,6 +367,7 @@ static int audit_netlink_ok(kernel_cap_t break; case AUDIT_USER: case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: + case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2: if (!cap_raised(eff_cap, CAP_AUDIT_WRITE)) err = -EPERM; break; @@ -447,6 +448,7 @@ static int audit_receive_msg(struct sk_b break; case AUDIT_USER: case AUDIT_FIRST_USER_MSG...AUDIT_LAST_USER_MSG: + case AUDIT_FIRST_USER_MSG2...AUDIT_LAST_USER_MSG2: if (!audit_enabled && msg_type != AUDIT_USER_AVC) return 0; --- a/security/selinux/nlmsgtab.c +++ b/security/selinux/nlmsgtab.c @@ -145,8 +145,10 @@ int selinux_nlmsg_lookup(u16 sclass, u16 break; case SECCLASS_NETLINK_AUDIT_SOCKET: - if (nlmsg_type >= AUDIT_FIRST_USER_MSG && - nlmsg_type <= AUDIT_LAST_USER_MSG) { + if ((nlmsg_type >= AUDIT_FIRST_USER_MSG && + nlmsg_type <= AUDIT_LAST_USER_MSG) || + (nlmsg_type >= AUDIT_FIRST_USER_MSG2 && + nlmsg_type <= AUDIT_LAST_USER_MSG2)) { *perm = NETLINK_AUDIT_SOCKET__NLMSG_RELAY; } else { err = nlmsg_perm(nlmsg_type, perm, nlmsg_audit_perms, linux-2.6-debunk-i2c.patch: drivers/i2c/i2c-core.c | 15 +++++++++++++++ include/linux/i2c.h | 3 +++ 2 files changed, 18 insertions(+) --- NEW FILE linux-2.6-debunk-i2c.patch --- >From benh at kernel.crashing.org Sun Jan 8 20:19:08 2006 From: Benjamin Herrenschmidt To: Greg KH Cc: Jean Delvare , Adrian Bunk Date: Mon, 09 Jan 2006 15:19:18 +1100 Message-Id: <1136780358.14374.2.camel at localhost.localdomain> Subject: I2C: Resurrect i2c_smbus_write_i2c_block_data. From: Jean Delvare Signed-off-by: Jean Delvare --- drivers/i2c/i2c-core.c | 15 +++++++++++++++ include/linux/i2c.h | 3 +++ 2 files changed, 18 insertions(+) --- gregkh-2.6.orig/drivers/i2c/i2c-core.c +++ gregkh-2.6/drivers/i2c/i2c-core.c @@ -946,6 +946,20 @@ s32 i2c_smbus_read_i2c_block_data(struct } } +s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client, u8 command, + u8 length, u8 *values) +{ + union i2c_smbus_data data; + + if (length > I2C_SMBUS_BLOCK_MAX) + length = I2C_SMBUS_BLOCK_MAX; + data.block[0] = length; + memcpy(data.block + 1, values, length); + return i2c_smbus_xfer(client->adapter, client->addr, client->flags, + I2C_SMBUS_WRITE, command, + I2C_SMBUS_I2C_BLOCK_DATA, &data); +} + /* Simulate a SMBus command using the i2c protocol No checking of parameters is done! */ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr, @@ -1150,6 +1164,7 @@ EXPORT_SYMBOL(i2c_smbus_read_word_data); EXPORT_SYMBOL(i2c_smbus_write_word_data); EXPORT_SYMBOL(i2c_smbus_write_block_data); EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data); +EXPORT_SYMBOL(i2c_smbus_write_i2c_block_data); MODULE_AUTHOR("Simon G. Vogl "); MODULE_DESCRIPTION("I2C-Bus main module"); --- gregkh-2.6.orig/include/linux/i2c.h +++ gregkh-2.6/include/linux/i2c.h @@ -100,6 +100,9 @@ extern s32 i2c_smbus_write_block_data(st /* Returns the number of read bytes */ extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client, u8 command, u8 *values); +extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client, + u8 command, u8 length, + u8 *values); /* * A driver is capable of handling one or more physical devices present on linux-2.6-net-fix-iptables.patch: x_tables.h | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletion(-) --- NEW FILE linux-2.6-net-fix-iptables.patch --- [NETFILTER] x_tables: Fix XT_ALIGN() macro on [at least] ppc32 To keep backwards compatibility with old iptables userspace programs, the new XT_ALIGN macro always has to return the same value as IPT_ALIGN, IP6T_ALIGN or ARPT_ALIGN in previous kernels. However, in those kernels the macro was defined in dependency to the respective layer3 specifi data structures, which we can no longer do with x_tables. The fix is an ugly kludge, but it has been tested to solve the problem. Yet another reason to move away from the current {ip,ip6,arp,eb}tables like data structures. Signed-off-by: Harald Welte --- commit 470faeb379560fe877b685ca69be6a7e4f0e91ed tree 5732ecd9bcab28469805752514e5c57ba26189a1 parent 44718bbfa186d58477163418d37df173aa2dd079 author Harald Welte Fri, 20 Jan 2006 01:44:24 +0100 committer Harald Welte Fri, 20 Jan 2006 01:44:24 +0100 include/linux/netfilter/x_tables.h | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 472f048..65f9cd8 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -19,8 +19,22 @@ struct xt_get_revision /* For standard target */ #define XT_RETURN (-NF_REPEAT - 1) -#define XT_ALIGN(s) (((s) + (__alignof__(u_int64_t)-1)) & ~(__alignof__(u_int64_t)-1)) +/* this is a dummy structure to find out the alignment requirement for a struct + * containing all the fundamental data types that are used in ipt_entry, ip6t_entry + * and arpt_entry. This sucks, and it is a hack. It will be my personal pleasure + * to remove it -HW */ +struct _xt_align +{ + u_int8_t u8; + u_int16_t u16; + u_int32_t u32; + u_int64_t u64; +}; + +#define XT_ALIGN(s) (((s) + (__alignof__(struct _xt_align)-1)) \ + & ~(__alignof__(struct _xt_align)-1)) + /* Standard return verdict, or do jump. */ #define XT_STANDARD_TARGET "" /* Error verdict. */ linux-2.6-net-slab-corruption.patch: skbuff.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-net-slab-corruption.patch --- diff --git a/net/core/skbuff.c b/net/core/skbuff.c --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -135,13 +135,15 @@ void skb_under_panic(struct sk_buff *skb struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, int fclone) { + kmem_cache_t *cache; struct skb_shared_info *shinfo; struct sk_buff *skb; u8 *data; + cache = fclone ? skbuff_fclone_cache : skbuff_head_cache; + /* Get the HEAD */ - skb = kmem_cache_alloc(fclone ? skbuff_fclone_cache : skbuff_head_cache, - gfp_mask & ~__GFP_DMA); + skb = kmem_cache_alloc(cache, gfp_mask & ~__GFP_DMA); if (!skb) goto out; @@ -180,7 +182,7 @@ struct sk_buff *__alloc_skb(unsigned int out: return skb; nodata: - kmem_cache_free(skbuff_head_cache, skb); + kmem_cache_free(cache, skb); skb = NULL; goto out; } linux-2.6-net-wireless-features.patch: a/drivers/net/wireless/ipw2200.c | 5 drivers/net/wireless/airo.c | 276 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 278 insertions(+), 3 deletions(-) --- NEW FILE linux-2.6-net-wireless-features.patch --- Subject: [2.6.15 patch] wireless/airo: add IWENCODEEXT and IWAUTH support From: Dan Williams To: breed at users.sourceforge.net Cc: netdev at vger.kernel.org, "John W. Linville" , jgarzik at pobox.com, networkmanager-list at gnome.org Date: Mon, 30 Jan 2006 11:58:00 -0500 Message-Id: <1138640281.12551.5.camel at dhcp83-115.boston.redhat.com> This patch adds IWENCODEEXT and IWAUTH support to the airo driver for WEP and unencrypted operation. No WPA though. It allows the driver to operate more willingly with wpa_supplicant and NetworkManager. Signed-off-by: Dan Williams --- a/drivers/net/wireless/airo.c 2006-01-30 10:14:23.000000000 -0500 +++ b/drivers/net/wireless/airo.c 2006-01-30 11:05:15.000000000 -0500 @@ -5802,11 +5802,13 @@ static int airo_set_wap(struct net_devic Cmd cmd; Resp rsp; APListRid APList_rid; - static const unsigned char bcast[ETH_ALEN] = { 255, 255, 255, 255, 255, 255 }; + static const u8 any[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; + static const u8 off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; if (awrq->sa_family != ARPHRD_ETHER) return -EINVAL; - else if (!memcmp(bcast, awrq->sa_data, ETH_ALEN)) { + else if (!memcmp(any, awrq->sa_data, ETH_ALEN) || + !memcmp(off, awrq->sa_data, ETH_ALEN)) { memset(&cmd, 0, sizeof(cmd)); cmd.cmd=CMD_LOSE_SYNC; if (down_interruptible(&local->sem)) @@ -6297,6 +6299,267 @@ static int airo_get_encode(struct net_de /*------------------------------------------------------------------*/ /* + * Wireless Handler : set extended Encryption parameters + */ +static int airo_set_encodeext(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_point *encoding = &wrqu->encoding; + struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; + CapabilityRid cap_rid; /* Card capability info */ + int perm = ( encoding->flags & IW_ENCODE_TEMP ? 0 : 1 ); + u16 currentAuthType = local->config.authType; + int idx, key_len, alg = ext->alg; /* Check encryption mode */ + wep_key_t key; + + /* Is WEP supported ? */ + readCapabilityRid(local, &cap_rid, 1); + /* Older firmware doesn't support this... + if(!(cap_rid.softCap & 2)) { + return -EOPNOTSUPP; + } */ + readConfigRid(local, 1); + + /* Determine and validate the key index */ + idx = encoding->flags & IW_ENCODE_INDEX; + if (idx) { + if (idx < 1 || idx > ((cap_rid.softCap & 0x80) ? 4:1)) + return -EINVAL; + idx--; + } else + idx = get_wep_key(local, 0xffff); + + if (encoding->flags & IW_ENCODE_DISABLED) + alg = IW_ENCODE_ALG_NONE; + + /* Just setting the transmit key? */ + if (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY) { + set_wep_key(local, idx, NULL, 0, perm, 1); + } else { + /* Set the requested key first */ + memset(key.key, 0, MAX_KEY_SIZE); + switch (alg) { + case IW_ENCODE_ALG_NONE: + key.len = 0; + break; + case IW_ENCODE_ALG_WEP: + if (ext->key_len > MIN_KEY_SIZE) { + key.len = MAX_KEY_SIZE; + } else if (ext->key_len > 0) { + key.len = MIN_KEY_SIZE; + } else { + return -EINVAL; + } + key_len = min (ext->key_len, key.len); + memcpy(key.key, ext->key, key_len); + break; + default: + return -EINVAL; + } + /* Send the key to the card */ + set_wep_key(local, idx, key.key, key.len, perm, 1); + } + + /* Read the flags */ + if(encoding->flags & IW_ENCODE_DISABLED) + local->config.authType = AUTH_OPEN; // disable encryption + if(encoding->flags & IW_ENCODE_RESTRICTED) + local->config.authType = AUTH_SHAREDKEY; // Only Both + if(encoding->flags & IW_ENCODE_OPEN) + local->config.authType = AUTH_ENCRYPT; // Only Wep + /* Commit the changes to flags if needed */ + if (local->config.authType != currentAuthType) + set_bit (FLAG_COMMIT, &local->flags); + + return -EINPROGRESS; +} + + +/*------------------------------------------------------------------*/ +/* + * Wireless Handler : get extended Encryption parameters + */ +static int airo_get_encodeext(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_point *encoding = &wrqu->encoding; + struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; + CapabilityRid cap_rid; /* Card capability info */ + int idx, max_key_len; + + /* Is it supported ? */ + readCapabilityRid(local, &cap_rid, 1); + if(!(cap_rid.softCap & 2)) { + return -EOPNOTSUPP; + } + readConfigRid(local, 1); + + max_key_len = encoding->length - sizeof(*ext); + if (max_key_len < 0) + return -EINVAL; + + idx = encoding->flags & IW_ENCODE_INDEX; + if (idx) { + if (idx < 1 || idx > ((cap_rid.softCap & 0x80) ? 4:1)) + return -EINVAL; + idx--; + } else + idx = get_wep_key(local, 0xffff); + + encoding->flags = idx + 1; + memset(ext, 0, sizeof(*ext)); + + /* Check encryption mode */ + switch(local->config.authType) { + case AUTH_ENCRYPT: + encoding->flags = IW_ENCODE_ALG_WEP | IW_ENCODE_ENABLED; + break; + case AUTH_SHAREDKEY: + encoding->flags = IW_ENCODE_ALG_WEP | IW_ENCODE_ENABLED; + break; + default: + case AUTH_OPEN: + encoding->flags = IW_ENCODE_ALG_NONE | IW_ENCODE_DISABLED; + break; + } + /* We can't return the key, so set the proper flag and return zero */ + encoding->flags |= IW_ENCODE_NOKEY; + memset(extra, 0, 16); + + /* Copy the key to the user buffer */ + ext->key_len = get_wep_key(local, idx); + if (ext->key_len > 16) { + ext->key_len=0; + } + + return 0; +} + + +/*------------------------------------------------------------------*/ +/* + * Wireless Handler : set extended authentication parameters + */ +static int airo_set_auth(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_param *param = &wrqu->param; + u16 currentAuthType = local->config.authType; + + switch (param->flags & IW_AUTH_INDEX) { + case IW_AUTH_WPA_VERSION: + case IW_AUTH_CIPHER_PAIRWISE: + case IW_AUTH_CIPHER_GROUP: + case IW_AUTH_KEY_MGMT: + case IW_AUTH_RX_UNENCRYPTED_EAPOL: + case IW_AUTH_PRIVACY_INVOKED: + /* + * airo does not use these parameters + */ + break; + + case IW_AUTH_DROP_UNENCRYPTED: + if (param->value) { + /* Only change auth type if unencrypted */ + if (currentAuthType == AUTH_OPEN) + local->config.authType = AUTH_ENCRYPT; + } else { + local->config.authType = AUTH_OPEN; + } + + /* Commit the changes to flags if needed */ + if (local->config.authType != currentAuthType) + set_bit (FLAG_COMMIT, &local->flags); + break; + + case IW_AUTH_80211_AUTH_ALG: { + /* FIXME: What about AUTH_OPEN? This API seems to + * disallow setting our auth to AUTH_OPEN. + */ + if (param->value & IW_AUTH_ALG_SHARED_KEY) { + local->config.authType = AUTH_SHAREDKEY; + } else if (param->value & IW_AUTH_ALG_OPEN_SYSTEM) { + local->config.authType = AUTH_ENCRYPT; + } else + return -EINVAL; + break; + + /* Commit the changes to flags if needed */ + if (local->config.authType != currentAuthType) + set_bit (FLAG_COMMIT, &local->flags); + } + + case IW_AUTH_WPA_ENABLED: + /* Silently accept disable of WPA */ + if (param->value > 0) + return -EOPNOTSUPP; + break; + + default: + return -EOPNOTSUPP; + } + return -EINPROGRESS; +} + + +/*------------------------------------------------------------------*/ +/* + * Wireless Handler : get extended authentication parameters + */ +static int airo_get_auth(struct net_device *dev, + struct iw_request_info *info, + union iwreq_data *wrqu, char *extra) +{ + struct airo_info *local = dev->priv; + struct iw_param *param = &wrqu->param; + u16 currentAuthType = local->config.authType; + + switch (param->flags & IW_AUTH_INDEX) { + case IW_AUTH_DROP_UNENCRYPTED: + switch (currentAuthType) { + case AUTH_SHAREDKEY: + case AUTH_ENCRYPT: + param->value = 1; + break; + default: + param->value = 0; + break; + } + break; + + case IW_AUTH_80211_AUTH_ALG: + switch (currentAuthType) { + case AUTH_SHAREDKEY: + param->value = IW_AUTH_ALG_SHARED_KEY; + break; + case AUTH_ENCRYPT: + default: + param->value = IW_AUTH_ALG_OPEN_SYSTEM; + break; + } + break; + + case IW_AUTH_WPA_ENABLED: + param->value = 0; + break; + + default: + return -EOPNOTSUPP; + } + return 0; +} + + +/*------------------------------------------------------------------*/ +/* * Wireless Handler : set Tx-Power */ static int airo_set_txpow(struct net_device *dev, @@ -7051,6 +7314,15 @@ static const iw_handler airo_handler[] (iw_handler) airo_get_encode, /* SIOCGIWENCODE */ (iw_handler) airo_set_power, /* SIOCSIWPOWER */ (iw_handler) airo_get_power, /* SIOCGIWPOWER */ + (iw_handler) NULL, /* -- hole -- */ + (iw_handler) NULL, /* -- hole -- */ + (iw_handler) NULL, /* SIOCSIWGENIE */ + (iw_handler) NULL, /* SIOCGIWGENIE */ + (iw_handler) airo_set_auth, /* SIOCSIWAUTH */ + (iw_handler) airo_get_auth, /* SIOCGIWAUTH */ + (iw_handler) airo_set_encodeext, /* SIOCSIWENCODEEXT */ + (iw_handler) airo_get_encodeext, /* SIOCGIWENCODEEXT */ + (iw_handler) NULL, /* SIOCSIWPMKSA */ }; /* Note : don't describe AIROIDIFC and AIROOLDIDIFC in here. Subject: [2.6.15 PATCH] wireless/ipw2200: support WE-18 WPA enc_capa From: Dan Williams To: netdev at vger.kernel.org Cc: rml at novell.com, jgarzik at pobox.com, "John W. Linville" Date: Mon, 30 Jan 2006 13:58:56 -0500 Message-Id: <1138647537.5393.6.camel at dhcp83-115.boston.redhat.com> This patch allows ipw2100 driver to advertise the WPA-related encryption options that it does really support. It's necessary to work correctly with NetworkManager and other programs that actually check driver & card capabilities. Signed-off-by: Dan Williams --- a/drivers/net/wireless/ipw2200.c 2006-01-30 13:52:58.000000000 -0500 +++ a/drivers/net/wireless/ipw2200.c 2006-01-30 13:54:04.000000000 -0500 @@ -8383,7 +8383,7 @@ /* Set the Wireless Extension versions */ range->we_version_compiled = WIRELESS_EXT; - range->we_version_source = 16; + range->we_version_source = 18; i = 0; if (priv->ieee->mode & (IEEE_B | IEEE_G)) { @@ -8415,6 +8415,9 @@ IW_EVENT_CAPA_MASK(SIOCGIWAP)); range->event_capa[1] = IW_EVENT_CAPA_K_1; + range->enc_capa = IW_ENC_CAPA_WPA | IW_ENC_CAPA_WPA2 | + IW_ENC_CAPA_CIPHER_TKIP | IW_ENC_CAPA_CIPHER_CCMP; + IPW_DEBUG_WX("GET Range\n"); return 0; } linux-2.6-selinux-mprotect-checks.patch: devel-akpm/security/selinux/hooks.c | 50 +++++++++++++++--------------------- linux-2.6/security/selinux/hooks.c | 4 +- 2 files changed, 23 insertions(+), 31 deletions(-) --- NEW FILE linux-2.6-selinux-mprotect-checks.patch --- From: Stephen Smalley Fix the SELinux mprotect checks on executable mappings so that they are not re-applied when the mapping is already executable as well as cleaning up the code. This avoids a situation where e.g. an application is prevented from removing PROT_WRITE on an already executable mapping previously authorized via execmem permission due to an execmod denial. Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton --- security/selinux/hooks.c | 50 +++++++++++++++---------------------- 1 files changed, 21 insertions(+), 29 deletions(-) diff -puN security/selinux/hooks.c~selinux-fix-and-cleanup-mprotect-checks security/selinux/hooks.c --- devel/security/selinux/hooks.c~selinux-fix-and-cleanup-mprotect-checks 2006-01-23 16:41:27.000000000 -0800 +++ devel-akpm/security/selinux/hooks.c 2006-01-23 16:41:27.000000000 -0800 @@ -2452,35 +2452,27 @@ static int selinux_file_mprotect(struct prot = reqprot; #ifndef CONFIG_PPC32 - if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXECUTABLE) && - (vma->vm_start >= vma->vm_mm->start_brk && - vma->vm_end <= vma->vm_mm->brk)) { - /* - * We are making an executable mapping in the brk region. - * This has an additional execheap check. - */ - rc = task_has_perm(current, current, PROCESS__EXECHEAP); - if (rc) - return rc; - } - if (vma->vm_file != NULL && vma->anon_vma != NULL && (prot & PROT_EXEC)) { - /* - * We are making executable a file mapping that has - * had some COW done. Since pages might have been written, - * check ability to execute the possibly modified content. - * This typically should only occur for text relocations. - */ - int rc = file_has_perm(current, vma->vm_file, FILE__EXECMOD); - if (rc) - return rc; - } - if (!vma->vm_file && (prot & PROT_EXEC) && - vma->vm_start <= vma->vm_mm->start_stack && - vma->vm_end >= vma->vm_mm->start_stack) { - /* Attempt to make the process stack executable. - * This has an additional execstack check. - */ - rc = task_has_perm(current, current, PROCESS__EXECSTACK); + if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) { + rc = 0; + if (vma->vm_start >= vma->vm_mm->start_brk && + vma->vm_end <= vma->vm_mm->brk) { + rc = task_has_perm(current, current, + PROCESS__EXECHEAP); + } else if (!vma->vm_file && + vma->vm_start <= vma->vm_mm->start_stack && + vma->vm_end >= vma->vm_mm->start_stack) { + rc = task_has_perm(current, current, PROCESS__EXECSTACK); + } else if (vma->vm_file && vma->anon_vma) { + /* + * We are making executable a file mapping that has + * had some COW done. Since pages might have been + * written, check ability to execute the possibly + * modified content. This typically should only + * occur for text relocations. + */ + rc = file_has_perm(current, vma->vm_file, + FILE__EXECMOD); + } if (rc) return rc; } _ Index: linux-2.6/security/selinux/hooks.c =================================================================== RCS file: /nfshome/pal/CVS/linux-2.6/security/selinux/hooks.c,v retrieving revision 1.178 diff -u -p -r1.178 hooks.c --- linux-2.6/security/selinux/hooks.c 19 Jan 2006 21:04:27 -0000 1.178 +++ linux-2.6/security/selinux/hooks.c 26 Jan 2006 19:16:22 -0000 @@ -2366,7 +2366,7 @@ static int selinux_file_ioctl(struct fil static int file_map_prot_check(struct file *file, unsigned long prot, int shared) { -#ifndef CONFIG_PPC32 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64) if ((prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) { /* * We are making executable an anonymous mapping or a @@ -2424,7 +2424,7 @@ static int selinux_file_mprotect(struct if (selinux_checkreqprot) prot = reqprot; -#ifndef CONFIG_PPC32 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_IA64) if ((prot & PROT_EXEC) && !(vma->vm_flags & VM_EXEC)) { rc = 0; if (vma->vm_start >= vma->vm_mm->start_brk && linux-2.6-snd-powermac.patch: oss/dmasound/tas_common.h | 16 ++++++++-------- ppc/pmac.c | 3 ++- ppc/tumbler.c | 19 ++++++++++--------- 3 files changed, 20 insertions(+), 18 deletions(-) --- NEW FILE linux-2.6-snd-powermac.patch --- Ok, here's another version that uses the proper wrapper in the i2c layer, that was removed but is coming back... Index: linux-work/sound/ppc/tumbler.c =================================================================== --- linux-work.orig/sound/ppc/tumbler.c 2006-01-09 10:29:54.000000000 +1100 +++ linux-work/sound/ppc/tumbler.c 2006-01-09 10:30:14.000000000 +1100 @@ -239,8 +238,8 @@ static int tumbler_set_master_volume(pma block[4] = (right_vol >> 8) & 0xff; block[5] = (right_vol >> 0) & 0xff; - if (i2c_smbus_write_block_data(mix->i2c.client, TAS_REG_VOL, - 6, block) < 0) { + if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_VOL, 6, + block) < 0) { snd_printk("failed to set volume \n"); return -EINVAL; } @@ -340,8 +339,8 @@ static int tumbler_set_drc(pmac_tumbler_ val[1] = 0; } - if (i2c_smbus_write_block_data(mix->i2c.client, TAS_REG_DRC, - 2, val) < 0) { + if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC, + 2, val) < 0) { snd_printk("failed to set DRC\n"); return -EINVAL; } @@ -376,8 +375,8 @@ static int snapper_set_drc(pmac_tumbler_ val[4] = 0x60; val[5] = 0xa0; - if (i2c_smbus_write_block_data(mix->i2c.client, TAS_REG_DRC, - 6, val) < 0) { + if (i2c_smbus_write_i2c_block_data(mix->i2c.client, TAS_REG_DRC, + 6, val) < 0) { snd_printk("failed to set DRC\n"); return -EINVAL; } @@ -481,8 +480,8 @@ static int tumbler_set_mono_volume(pmac_ vol = info->table[vol]; for (i = 0; i < info->bytes; i++) block[i] = (vol >> ((info->bytes - i - 1) * 8)) & 0xff; - if (i2c_smbus_write_block_data(mix->i2c.client, info->reg, - info->bytes, block) < 0) { + if (i2c_smbus_write_i2c_block_data(mix->i2c.client, info->reg, + info->bytes, block) < 0) { snd_printk("failed to set mono volume %d\n", info->index); return -EINVAL; } @@ -611,7 +610,8 @@ static int snapper_set_mix_vol1(pmac_tum for (j = 0; j < 3; j++) block[i * 3 + j] = (vol >> ((2 - j) * 8)) & 0xff; } - if (i2c_smbus_write_block_data(mix->i2c.client, reg, 9, block) < 0) { + if (i2c_smbus_write_i2c_block_data(mix->i2c.client, reg, + 9, block) < 0) { snd_printk("failed to set mono volume %d\n", reg); return -EINVAL; } Index: linux-work/sound/ppc/pmac.c =================================================================== --- linux-work.orig/sound/ppc/pmac.c 2006-01-09 10:29:54.000000000 +1100 +++ linux-work/sound/ppc/pmac.c 2006-01-09 10:30:14.000000000 +1100 @@ -74,7 +74,7 @@ static int snd_pmac_dbdma_alloc(pmac_t * static void snd_pmac_dbdma_free(pmac_t *chip, pmac_dbdma_t *rec) { - if (rec) { + if (rec->space) { unsigned int rsize = sizeof(struct dbdma_cmd) * (rec->size + 1); dma_free_coherent(&chip->pdev->dev, rsize, rec->space, rec->dma_base); @@ -895,6 +895,7 @@ static int __init snd_pmac_detect(pmac_t chip->can_capture = 1; chip->num_freqs = ARRAY_SIZE(awacs_freqs); chip->freq_table = awacs_freqs; + chip->pdev = NULL; chip->control_mask = MASK_IEPC | MASK_IEE | 0x11; /* default */ Index: linux-work/sound/oss/dmasound/tas_common.h =================================================================== --- linux-work.orig/sound/oss/dmasound/tas_common.h 2006-01-09 10:29:54.000000000 +1100 +++ linux-work/sound/oss/dmasound/tas_common.h 2006-01-09 10:31:09.000000000 +1100 @@ -178,10 +178,10 @@ tas_write_register( struct tas_data_t *s if (write_mode & WRITE_SHADOW) memcpy(self->shadow[reg_num],data,reg_width); if (write_mode & WRITE_HW) { - rc=i2c_smbus_write_block_data(self->client, - reg_num, - reg_width, - data); + rc=i2c_smbus_write_i2c_block_data(self->client, + reg_num, + reg_width, + data); if (rc < 0) { printk("tas: I2C block write failed \n"); return rc; @@ -199,10 +199,10 @@ tas_sync_register( struct tas_data_t *se if (reg_width==0 || self==NULL) return -EINVAL; - rc=i2c_smbus_write_block_data(self->client, - reg_num, - reg_width, - self->shadow[reg_num]); + rc=i2c_smbus_write_i2c_block_data(self->client, + reg_num, + reg_width, + self->shadow[reg_num]); if (rc < 0) { printk("tas: I2C block write failed \n"); return rc; linux-2.6-suspend-memhotplug-oops.patch: page_alloc.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) --- NEW FILE linux-2.6-suspend-memhotplug-oops.patch --- https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=178339 pageset_cpuup_callback() is marked __meminit, but software suspend needs it. Unfortunatly, if you don't have CONFIG_MEMORY_HOTPLUG set, the __meminit translates to __init, resulting in this... Freezing cpus ... int3: 0000 [1] SMP last sysfs file: /power/state CPU 0 Modules linked in: radeon drm ipv6 ppdev autofs4 rfcomm l2cap sunrpc ip_conntrack_netbios_ns ipt_REJECT xt_state ip_conntrack nfnetlink xt_tcpudp iptable_filter ip_tables x_tables video battery ac lp parport_pc parport nvram hci_usb bluetooth ehci_hcd ohci1394 ieee1394 uhci_hcd snd_hda_intel saa7134 snd_hda_codec video_buf snd_seq_dummy compat_ioctl32 v4l2_common v4l1_compat snd_seq_oss snd_seq_midi_event ir_kbd_i2c snd_seq e100 snd_seq_device ir_common snd_pcm_oss snd_mixer_oss mii videodev snd_pcm snd_timer snd i2c_i801 hw_random soundcore i2c_core snd_page_alloc dm_snapshot dm_zero dm_mirror dm_mod ext3 jbd ahci libata sd_mod scsi_mod Pid: 3373, comm: pm-suspend Not tainted 2.6.15-1.1872_FC5 #1 RIP: 0010:[] {pageset_cpuup_callback+1} RSP: 0018:ffff81002802fdb0 EFLAGS: 00000286 RAX: 0000000000000001 RBX: ffffffff803c8560 RCX: 0000000000000001 RDX: 0000000000000001 RSI: 0000000000000005 RDI: ffffffff803c8560 RBP: 0000000000000001 R08: ffffffff8053cae8 R09: 0000000000000004 R10: 0000000000000002 R11: 0000000000000004 R12: 0000000000000005 R13: 0000000000000003 R14: 0000000000000003 R15: ffff81002802ff50 FS: 00002aee15c8cd30(0000) GS:ffffffff8051a000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 00002aee19023000 CR3: 00000000292a1000 CR4: 00000000000006e0 Process pm-suspend (pid: 3373, threadinfo ffff81002802e000, task +ffff810026b38040) Stack: ffffffff80341296 0000000000000001 0000000000000001 0000000000000003 ffffffff8014b803 ffff81002802fe38 ffffffff80146641 0000000000000296 0000000000000296 0000000000000000 Call Trace: {notifier_call_chain+28} {cpu_down+96} {remove_wait_queue+17} {vt_waitactive+150} {disable_nonboot_cpus+82} {enter_state+161} {state_store+113} {sysfs_write_file+201} +{vfs_write+206} {sys_write+69} {system_call+126} Code: cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc cc Signed-off-by: Dave Jones --- linux-2.6.15.noarch/mm/page_alloc.c~ 2006-01-27 15:40:35.000000000 -0500 +++ linux-2.6.15.noarch/mm/page_alloc.c 2006-01-27 15:40:40.000000000 -0500 @@ -1939,7 +1939,7 @@ static inline void free_zone_pagesets(in } } -static int __meminit pageset_cpuup_callback(struct notifier_block *nfb, +static int pageset_cpuup_callback(struct notifier_block *nfb, unsigned long action, void *hcpu) { linux-2.6-x86_64-add-ppoll-pselect.patch: arch/x86_64/ia32/ia32entry.S | 2 ++ include/asm-x86_64/ia32_unistd.h | 4 +++- include/asm-x86_64/unistd.h | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) --- NEW FILE linux-2.6-x86_64-add-ppoll-pselect.patch --- Add ppoll/pselect syscalls Signed-off-by: Andi Kleen Index: linux/include/asm-x86_64/unistd.h =================================================================== --- linux.orig/include/asm-x86_64/unistd.h +++ linux/include/asm-x86_64/unistd.h @@ -599,8 +599,12 @@ __SYSCALL(__NR_readlinkat, sys_readlinka __SYSCALL(__NR_fchmodat, sys_fchmodat) #define __NR_faccessat 269 __SYSCALL(__NR_faccessat, sys_faccessat) +#define __NR_pselect6 270 +__SYSCALL(__NR_pselect6, sys_pselect6) +#define __NR_ppoll 271 +__SYSCALL(__NR_ppoll, sys_ppoll) -#define __NR_syscall_max __NR_faccessat +#define __NR_syscall_max __NR_ppoll #ifndef __NO_STUBS Index: linux/arch/x86_64/ia32/ia32entry.S =================================================================== --- linux.orig/arch/x86_64/ia32/ia32entry.S +++ linux/arch/x86_64/ia32/ia32entry.S @@ -685,6 +685,8 @@ ia32_sys_call_table: .quad sys_readlinkat /* 305 */ .quad sys_fchmodat .quad sys_faccessat + .quad compat_sys_pselect6 + .quad compat_sys_ppoll ia32_syscall_end: .rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8 .quad ni_syscall Index: linux/include/asm-x86_64/ia32_unistd.h =================================================================== --- linux.orig/include/asm-x86_64/ia32_unistd.h +++ linux/include/asm-x86_64/ia32_unistd.h @@ -313,7 +313,9 @@ #define __NR_ia32_readlinkat 305 #define __NR_ia32_fchmodat 306 #define __NR_ia32_faccessat 307 +#define __NR_ia32_pselect6 308 +#define __NR_ia32_ppoll 309 -#define IA32_NR_syscalls 308 /* must be > than biggest syscall! */ +#define IA32_NR_syscalls 310 /* must be > than biggest syscall! */ #endif /* _ASM_X86_64_IA32_UNISTD_H_ */ linux-2.6-x86_64-generic-sigsuspend.patch: arch/x86_64/kernel/signal.c | 32 -------------------------------- include/asm-x86_64/unistd.h | 1 + 2 files changed, 1 insertion(+), 32 deletions(-) --- NEW FILE linux-2.6-x86_64-generic-sigsuspend.patch --- Use generic rt_sigsuspend Needed for next patch Signed-off-by: Andi Kleen Index: linux/arch/x86_64/kernel/signal.c =================================================================== --- linux.orig/arch/x86_64/kernel/signal.c +++ linux/arch/x86_64/kernel/signal.c @@ -40,44 +40,12 @@ int ia32_setup_frame(int sig, struct k_s sigset_t *set, struct pt_regs * regs); asmlinkage long -sys_rt_sigsuspend(sigset_t __user *unewset, size_t sigsetsize, struct pt_regs *regs) -{ - sigset_t saveset, newset; - - /* XXX: Don't preclude handling different sized sigset_t's. */ - if (sigsetsize != sizeof(sigset_t)) - return -EINVAL; - - if (copy_from_user(&newset, unewset, sizeof(newset))) - return -EFAULT; - sigdelsetmask(&newset, ~_BLOCKABLE); - - spin_lock_irq(¤t->sighand->siglock); - saveset = current->blocked; - current->blocked = newset; - recalc_sigpending(); - spin_unlock_irq(¤t->sighand->siglock); -#ifdef DEBUG_SIG - printk("rt_sigsuspend savset(%lx) newset(%lx) regs(%p) rip(%lx)\n", - saveset, newset, regs, regs->rip); -#endif - regs->rax = -EINTR; - while (1) { - current->state = TASK_INTERRUPTIBLE; - schedule(); - if (do_signal(regs, &saveset)) - return -EINTR; - } -} - -asmlinkage long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, struct pt_regs *regs) { return do_sigaltstack(uss, uoss, regs->rsp); } - /* * Do a signal return; undo the signal stack. */ Index: linux/include/asm-x86_64/unistd.h =================================================================== --- linux.orig/include/asm-x86_64/unistd.h +++ linux/include/asm-x86_64/unistd.h @@ -639,6 +639,7 @@ do { \ #define __ARCH_WANT_SYS_RT_SIGACTION #define __ARCH_WANT_SYS_TIME #define __ARCH_WANT_COMPAT_SYS_TIME +#define __ARCH_WANT_SYS_RT_SIGSUSPEND #endif #ifndef __KERNEL_SYSCALLS__ linux-2.6-x86_64-tif-restore-sigmask.patch: arch/x86_64/ia32/ia32_signal.c | 28 ++++++++------------- arch/x86_64/kernel/signal.c | 51 ++++++++++++++++++++++++++------------- include/asm-x86_64/signal.h | 4 --- include/asm-x86_64/thread_info.h | 2 + 4 files changed, 48 insertions(+), 37 deletions(-) --- NEW FILE linux-2.6-x86_64-tif-restore-sigmask.patch --- Implement TIF_RESTORE_SIGMASK Needed for ppoll/pselect. Closely follows the i386 patch from David Howells Signed-off-by: Andi Kleen Index: linux/arch/x86_64/ia32/ia32_signal.c =================================================================== --- linux.orig/arch/x86_64/ia32/ia32_signal.c +++ linux/arch/x86_64/ia32/ia32_signal.c @@ -115,25 +115,19 @@ int copy_siginfo_from_user32(siginfo_t * } asmlinkage long -sys32_sigsuspend(int history0, int history1, old_sigset_t mask, - struct pt_regs *regs) +sys32_sigsuspend(int history0, int history1, old_sigset_t mask) { - sigset_t saveset; - mask &= _BLOCKABLE; spin_lock_irq(¤t->sighand->siglock); - saveset = current->blocked; + current->saved_sigmask = current->blocked; siginitset(¤t->blocked, mask); recalc_sigpending(); spin_unlock_irq(¤t->sighand->siglock); - regs->rax = -EINTR; - while (1) { - current->state = TASK_INTERRUPTIBLE; - schedule(); - if (do_signal(regs, &saveset)) - return -EINTR; - } + current->state = TASK_INTERRUPTIBLE; + schedule(); + set_thread_flag(TIF_RESTORE_SIGMASK); + return -ERESTARTNOHAND; } asmlinkage long @@ -510,11 +504,11 @@ int ia32_setup_frame(int sig, struct k_s current->comm, current->pid, frame, regs->rip, frame->pretcode); #endif - return 1; + return 0; give_sigsegv: force_sigsegv(sig, current); - return 0; + return -EFAULT; } int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, @@ -597,7 +591,7 @@ int ia32_setup_rt_frame(int sig, struct regs->ss = __USER32_DS; set_fs(USER_DS); - regs->eflags &= ~TF_MASK; + regs->eflags &= ~TF_MASK; if (test_thread_flag(TIF_SINGLESTEP)) ptrace_notify(SIGTRAP); @@ -606,9 +600,9 @@ int ia32_setup_rt_frame(int sig, struct current->comm, current->pid, frame, regs->rip, frame->pretcode); #endif - return 1; + return 0; give_sigsegv: force_sigsegv(sig, current); - return 0; + return -EFAULT; } Index: linux/arch/x86_64/kernel/signal.c =================================================================== --- linux.orig/arch/x86_64/kernel/signal.c +++ linux/arch/x86_64/kernel/signal.c @@ -312,11 +312,11 @@ static int setup_rt_frame(int sig, struc current->comm, current->pid, frame, regs->rip, frame->pretcode); #endif - return 1; + return 0; give_sigsegv: force_sigsegv(sig, current); - return 0; + return -EFAULT; } /* @@ -379,7 +379,7 @@ handle_signal(unsigned long sig, siginfo #endif ret = setup_rt_frame(sig, ka, info, oldset, regs); - if (ret) { + if (ret == 0) { spin_lock_irq(¤t->sighand->siglock); sigorsets(¤t->blocked,¤t->blocked,&ka->sa.sa_mask); if (!(ka->sa.sa_flags & SA_NODEFER)) @@ -396,11 +396,12 @@ handle_signal(unsigned long sig, siginfo * want to handle. Thus you cannot kill init even with a SIGKILL even by * mistake. */ -int do_signal(struct pt_regs *regs, sigset_t *oldset) +static void do_signal(struct pt_regs *regs) { struct k_sigaction ka; siginfo_t info; int signr; + sigset_t *oldset; /* * We want the common case to go fast, which @@ -409,12 +410,14 @@ int do_signal(struct pt_regs *regs, sigs * if so. */ if (!user_mode(regs)) - return 1; + return; if (try_to_freeze()) goto no_signal; - if (!oldset) + if (!test_thread_flag(TIF_RESTORE_SIGMASK)) + oldset = ¤t->saved_sigmask; + else oldset = ¤t->blocked; signr = get_signal_to_deliver(&info, &ka, regs, NULL); @@ -428,7 +431,14 @@ int do_signal(struct pt_regs *regs, sigs set_debugreg(current->thread.debugreg7, 7); /* Whee! Actually deliver the signal. */ - return handle_signal(signr, &info, &ka, oldset, regs); + if (handle_signal(signr, &info, &ka, oldset, regs) == 0) { + /* a signal was successfully delivered; the saved + * sigmask will have been stored in the signal frame, + * and will be restored by sigreturn, so we can simply + * clear the TIF_RESTORE_SIGMASK flag */ + clear_thread_flag(TIF_RESTORE_SIGMASK); + } + return; } no_signal: @@ -436,23 +446,32 @@ int do_signal(struct pt_regs *regs, sigs if ((long)regs->orig_rax >= 0) { /* Restart the system call - no handlers present */ long res = regs->rax; - if (res == -ERESTARTNOHAND || - res == -ERESTARTSYS || - res == -ERESTARTNOINTR) { + switch (res) { + case -ERESTARTNOHAND: + case -ERESTARTSYS: + case -ERESTARTNOINTR: regs->rax = regs->orig_rax; regs->rip -= 2; - } - if (regs->rax == (unsigned long)-ERESTART_RESTARTBLOCK) { + break; + case -ERESTART_RESTARTBLOCK: regs->rax = test_thread_flag(TIF_IA32) ? __NR_ia32_restart_syscall : __NR_restart_syscall; regs->rip -= 2; + break; } } - return 0; + + /* if there's no signal to deliver, we just put the saved sigmask + back. */ + if (test_thread_flag(TIF_RESTORE_SIGMASK)) { + clear_thread_flag(TIF_RESTORE_SIGMASK); + sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL); + } } -void do_notify_resume(struct pt_regs *regs, sigset_t *oldset, __u32 thread_info_flags) +void +do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags) { #ifdef DEBUG_SIG printk("do_notify_resume flags:%x rip:%lx rsp:%lx caller:%lx pending:%lx\n", @@ -466,8 +485,8 @@ void do_notify_resume(struct pt_regs *re } /* deal with pending signal delivery */ - if (thread_info_flags & _TIF_SIGPENDING) - do_signal(regs,oldset); + if (thread_info_flags & (_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK)) + do_signal(regs); } void signal_fault(struct pt_regs *regs, void __user *frame, char *where) Index: linux/include/asm-x86_64/signal.h =================================================================== --- linux.orig/include/asm-x86_64/signal.h +++ linux/include/asm-x86_64/signal.h @@ -24,10 +24,6 @@ typedef struct { } sigset_t; -struct pt_regs; -asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset); - - #else /* Here we must cater to libcs that poke about in kernel headers. */ Index: linux/include/asm-x86_64/thread_info.h =================================================================== --- linux.orig/include/asm-x86_64/thread_info.h +++ linux/include/asm-x86_64/thread_info.h @@ -101,6 +101,7 @@ static inline struct thread_info *stack_ #define TIF_IRET 5 /* force IRET */ #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */ #define TIF_SECCOMP 8 /* secure computing */ +#define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal */ #define TIF_POLLING_NRFLAG 16 /* true if poll_idle() is polling TIF_NEED_RESCHED */ #define TIF_IA32 17 /* 32bit process */ #define TIF_FORK 18 /* ret_from_fork */ @@ -115,6 +116,7 @@ static inline struct thread_info *stack_ #define _TIF_IRET (1< - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} +- Merge with rawhide 1884. + +* Mon Jan 30 2006 Dave Jones +- Dan Williams' goodies for wireless drivers to make NetworkManager + work with WEP/WPA on ipw2200, and WEP on airo. + +* Fri Jan 27 2006 Dave Jones +- New userspace audit message types. +- Fix software suspend on kernels without memory hotplug. (#178339) + * Fri Jan 27 2006 Stephen Tweedie - Rebase to linux-2.6-merge.hg cset 19859 - Rebase to HV from xen-unstable.hg cset 8680 @@ -1381,9 +1424,23 @@ * Thu Jan 26 2006 Juan Quintela - "don't edit patches by hand" release. +* Thu Jan 26 2006 Dave Jones +- Fix building of kdump kernels. +- Fix slab corruption in network layer. +- Make iptables work again. +- Update ACPI to latest acpi-git tree. +- Fix the SELinux mprotect checks on executable mappings. (#178747) + * Wed Jan 25 2006 Juan Quintela - merge with rawhide kernel 1.1869. +* Wed Jan 25 2006 Dave Jones +- Disable page allocation debugging again. + +* Tue Jan 24 2006 David Woidhouse +- Fix snd_powermac I2C handling +- Add pselect/ppoll on x86_64 + * Sun Jan 22 2006 Dave Jones - Add missing .kernelrelease to kernel-devel (#178491) - Make serial /dev nodes get created for pci modems again. linux-2.6-crashdump-common.patch: linux-2.6.12/Documentation/sysrq.txt | 8 linux-2.6.12/arch/i386/kernel/nmi.c | 1 linux-2.6.12/arch/i386/kernel/traps.c | 3 linux-2.6.12/arch/i386/mm/init.c | 47 +++++ linux-2.6.12/arch/i386/mm/pgtable.c | 3 linux-2.6.12/arch/ia64/kernel/process.c | 30 ++- linux-2.6.12/arch/ia64/kernel/traps.c | 6 linux-2.6.12/arch/ia64/mm/contig.c | 3 linux-2.6.12/arch/ia64/mm/discontig.c | 3 linux-2.6.12/arch/ia64/mm/init.c | 90 +++++++++ linux-2.6.12/arch/powerpc/kernel/process.c | 1 linux-2.6.12/arch/powerpc/kernel/traps.c | 3 linux-2.6.12/arch/powerpc/mm/mem.c | 29 +++ linux-2.6.12/arch/s390/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/kernel/process.c | 2 linux-2.6.12/arch/x86_64/kernel/traps.c | 6 linux-2.6.12/arch/x86_64/mm/init.c | 32 +++ linux-2.6.12/drivers/char/sysrq.c | 2 linux-2.6.12/include/asm-generic/crashdump.h | 47 +++++ linux-2.6.12/include/asm-i386/crashdump.h | 123 +++++++++++++ linux-2.6.12/include/asm-i386/kmap_types.h | 4 linux-2.6.12/include/asm-ia64/crashdump.h | 72 +++++++ linux-2.6.12/include/asm-powerpc/crashdump.h | 61 ++++++ linux-2.6.12/include/asm-x86_64/crashdump.h | 86 +++++++++ linux-2.6.12/include/linux/kernel.h | 18 + linux-2.6.12/kernel/Makefile | 2 linux-2.6.12/kernel/dump.c | 246 +++++++++++++++++++++++++++ linux-2.6.12/kernel/panic.c | 4 linux-2.6.12/kernel/printk.c | 20 ++ linux-2.6.12/kernel/sched.c | 2 linux-2.6.13/arch/x86_64/mm/fault.c | 1 linux-2.6.13/drivers/char/sysrq.c | 5 32 files changed, 952 insertions(+), 14 deletions(-) Index: linux-2.6-crashdump-common.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-crashdump-common.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- linux-2.6-crashdump-common.patch 26 Jan 2006 22:14:33 -0000 1.4 +++ linux-2.6-crashdump-common.patch 31 Jan 2006 21:26:16 -0000 1.5 @@ -397,10 +397,10 @@ /* Values used for system_state */ extern enum system_states { SYSTEM_BOOTING, -@@ -182,6 +193,7 @@ - SYSTEM_HALT, +@@ -197,6 +197,7 @@ extern enum system_states { SYSTEM_POWER_OFF, SYSTEM_RESTART, + SYSTEM_SUSPEND_DISK, + SYSTEM_DUMPING, } system_state; linux-2.6-xen-merge.patch: arch/i386/Kconfig | 81 arch/i386/Makefile | 18 arch/i386/kernel/Makefile | 26 arch/i386/kernel/acpi/Makefile | 4 arch/i386/kernel/cpu/Makefile | 5 arch/i386/kernel/cpu/cpufreq/Kconfig | 2 arch/i386/kernel/cpu/mtrr/Makefile | 7 arch/i386/kernel/smpboot.c | 10 arch/i386/kernel/traps.c | 9 arch/i386/kernel/vmlinux.lds.S | 7 arch/i386/mm/Makefile | 8 arch/i386/pci/Makefile | 5 arch/i386/power/Makefile | 4 arch/um/kernel/physmem.c | 4 arch/x86_64/Kconfig | 43 arch/x86_64/Makefile | 15 arch/x86_64/ia32/Makefile | 18 arch/x86_64/ia32/vsyscall-sigreturn.S | 2 arch/x86_64/kernel/Makefile | 20 arch/x86_64/kernel/i387.c | 5 arch/x86_64/kernel/pci-gart.c | 8 arch/x86_64/kernel/setup64.c | 2 arch/x86_64/mm/Makefile | 10 arch/x86_64/pci/Makefile | 8 b/arch/i386/boot-xen/Makefile | 21 b/arch/i386/kernel/acpi/boot-xen.c | 1157 ++++++++ b/arch/i386/kernel/apic-xen.c | 143 + b/arch/i386/kernel/cpu/common-xen.c | 659 +++++ b/arch/i386/kernel/cpu/mtrr/main-xen.c | 187 + b/arch/i386/kernel/early_printk-xen.c | 2 b/arch/i386/kernel/entry-xen.S | 853 ++++++ b/arch/i386/kernel/fixup.c | 95 b/arch/i386/kernel/head-xen.S | 170 + b/arch/i386/kernel/init_task-xen.c | 49 b/arch/i386/kernel/io_apic-xen.c | 2725 +++++++++++++++++++++ b/arch/i386/kernel/ioport-xen.c | 122 b/arch/i386/kernel/irq-xen.c | 306 ++ b/arch/i386/kernel/ldt-xen.c | 262 ++ b/arch/i386/kernel/microcode-xen.c | 164 + b/arch/i386/kernel/mpparse-xen.c | 1177 +++++++++ b/arch/i386/kernel/pci-dma-xen.c | 326 ++ b/arch/i386/kernel/process-xen.c | 821 ++++++ b/arch/i386/kernel/quirks-xen.c | 48 b/arch/i386/kernel/setup-xen.c | 1876 ++++++++++++++ b/arch/i386/kernel/smp-xen.c | 617 ++++ b/arch/i386/kernel/smpalts.c | 85 b/arch/i386/kernel/swiotlb.c | 677 +++++ b/arch/i386/kernel/time-xen.c | 1016 +++++++ b/arch/i386/kernel/traps-xen.c | 1103 ++++++++ b/arch/i386/kernel/vsyscall-note-xen.S | 32 b/arch/i386/mach-xen/Makefile | 7 b/arch/i386/mach-xen/setup.c | 37 b/arch/i386/mm/fault-xen.c | 617 ++++ b/arch/i386/mm/highmem-xen.c | 123 b/arch/i386/mm/hypervisor.c | 459 +++ b/arch/i386/mm/init-xen.c | 848 ++++++ b/arch/i386/mm/ioremap-xen.c | 493 +++ b/arch/i386/mm/pgtable-xen.c | 597 ++++ b/arch/i386/pci/irq-xen.c | 1197 +++++++++ b/arch/x86_64/ia32/ia32entry-xen.S | 718 +++++ b/arch/x86_64/ia32/syscall32-xen.c | 128 b/arch/x86_64/ia32/syscall32_syscall-xen.S | 28 b/arch/x86_64/ia32/vsyscall-int80.S | 58 b/arch/x86_64/kernel/apic-xen.c | 187 + b/arch/x86_64/kernel/e820-xen.c | 744 +++++ b/arch/x86_64/kernel/early_printk-xen.c | 306 ++ b/arch/x86_64/kernel/entry-xen.S | 1160 ++++++++ b/arch/x86_64/kernel/genapic-xen.c | 135 + b/arch/x86_64/kernel/genapic_xen.c | 162 + b/arch/x86_64/kernel/head-xen.S | 247 + b/arch/x86_64/kernel/head64-xen.c | 137 + b/arch/x86_64/kernel/io_apic-xen.c | 2191 ++++++++++++++++ b/arch/x86_64/kernel/ioport-xen.c | 58 b/arch/x86_64/kernel/irq-xen.c | 157 + b/arch/x86_64/kernel/ldt-xen.c | 275 ++ b/arch/x86_64/kernel/mpparse-xen.c | 1000 +++++++ b/arch/x86_64/kernel/pci-nommu-xen.c | 99 b/arch/x86_64/kernel/process-xen.c | 798 ++++++ b/arch/x86_64/kernel/setup-xen.c | 1613 ++++++++++++ b/arch/x86_64/kernel/setup64-xen.c | 353 ++ b/arch/x86_64/kernel/smp-xen.c | 592 ++++ b/arch/x86_64/kernel/traps-xen.c | 1010 +++++++ b/arch/x86_64/kernel/vsyscall-xen.c | 239 + b/arch/x86_64/kernel/x8664_ksyms-xen.c | 181 + b/arch/x86_64/kernel/xen_entry.S | 41 b/arch/x86_64/mm/fault-xen.c | 601 ++++ b/arch/x86_64/mm/init-xen.c | 1090 ++++++++ b/arch/x86_64/mm/pageattr-xen.c | 375 ++ b/drivers/char/tpm/tpm_xen.c | 525 ++++ b/drivers/xen/Kconfig | 175 + b/drivers/xen/Makefile | 20 b/drivers/xen/balloon/Makefile | 2 b/drivers/xen/balloon/balloon.c | 563 ++++ b/drivers/xen/blkback/Makefile | 2 b/drivers/xen/blkback/blkback.c | 590 ++++ b/drivers/xen/blkback/common.h | 123 b/drivers/xen/blkback/interface.c | 164 + b/drivers/xen/blkback/vbd.c | 102 b/drivers/xen/blkback/xenbus.c | 421 +++ b/drivers/xen/blkfront/Kconfig | 6 b/drivers/xen/blkfront/Makefile | 5 b/drivers/xen/blkfront/blkfront.c | 835 ++++++ b/drivers/xen/blkfront/block.h | 162 + b/drivers/xen/blkfront/vbd.c | 323 ++ b/drivers/xen/blktap/Makefile | 3 b/drivers/xen/blktap/blktap.c | 910 +++++++ b/drivers/xen/blktap/common.h | 110 b/drivers/xen/blktap/interface.c | 146 + b/drivers/xen/blktap/xenbus.c | 234 + b/drivers/xen/char/Makefile | 2 b/drivers/xen/char/mem.c | 159 + b/drivers/xen/console/Makefile | 2 b/drivers/xen/console/console.c | 688 +++++ b/drivers/xen/console/xencons_ring.c | 125 b/drivers/xen/core/Makefile | 9 b/drivers/xen/core/evtchn.c | 820 ++++++ b/drivers/xen/core/gnttab.c | 480 +++ b/drivers/xen/core/reboot.c | 436 +++ b/drivers/xen/core/skbuff.c | 143 + b/drivers/xen/core/smpboot.c | 439 +++ b/drivers/xen/core/xen_proc.c | 29 b/drivers/xen/evtchn/Makefile | 2 b/drivers/xen/evtchn/evtchn.c | 459 +++ b/drivers/xen/net_driver_util.c | 67 b/drivers/xen/netback/Makefile | 2 b/drivers/xen/netback/common.h | 110 b/drivers/xen/netback/interface.c | 320 ++ b/drivers/xen/netback/loopback.c | 198 + b/drivers/xen/netback/netback.c | 829 ++++++ b/drivers/xen/netback/xenbus.c | 327 ++ b/drivers/xen/netfront/Kconfig | 6 b/drivers/xen/netfront/Makefile | 4 b/drivers/xen/netfront/netfront.c | 1487 +++++++++++ b/drivers/xen/privcmd/Makefile | 2 b/drivers/xen/privcmd/privcmd.c | 274 ++ b/drivers/xen/tpmback/Makefile | 4 b/drivers/xen/tpmback/common.h | 89 b/drivers/xen/tpmback/interface.c | 200 + b/drivers/xen/tpmback/tpmback.c | 1109 ++++++++ b/drivers/xen/tpmback/xenbus.c | 328 ++ b/drivers/xen/tpmfront/Makefile | 2 b/drivers/xen/tpmfront/tpmfront.c | 703 +++++ b/drivers/xen/tpmfront/tpmfront.h | 43 b/drivers/xen/util.c | 75 b/drivers/xen/xenbus/Makefile | 8 b/drivers/xen/xenbus/xenbus_client.c | 238 + b/drivers/xen/xenbus/xenbus_comms.c | 203 + b/drivers/xen/xenbus/xenbus_comms.h | 50 b/drivers/xen/xenbus/xenbus_dev.c | 238 + b/drivers/xen/xenbus/xenbus_probe.c | 1015 +++++++ b/drivers/xen/xenbus/xenbus_xs.c | 821 ++++++ b/include/asm-i386/hypercall.h | 328 ++ b/include/asm-i386/hypervisor.h | 180 + b/include/asm-i386/mach-default/mach_dma_map.h | 85 b/include/asm-i386/mach-default/mach_fixmap.h | 15 b/include/asm-i386/mach-default/mach_io.h | 35 b/include/asm-i386/mach-default/mach_mmu.h | 18 b/include/asm-i386/mach-default/mach_mode.h | 7 b/include/asm-i386/mach-default/mach_page.h | 28 b/include/asm-i386/mach-default/mach_pgtable.h | 45 b/include/asm-i386/mach-default/mach_processor.h | 53 b/include/asm-i386/mach-default/mach_seg.h | 39 b/include/asm-i386/mach-default/mach_setup.h | 50 b/include/asm-i386/mach-default/mach_system.h | 87 b/include/asm-i386/mach-default/mach_tlbflush.h | 59 b/include/asm-i386/mach-xen/irq_vectors.h | 125 b/include/asm-i386/mach-xen/mach_dma_map.h | 47 b/include/asm-i386/mach-xen/mach_fixmap.h | 15 b/include/asm-i386/mach-xen/mach_io.h | 50 b/include/asm-i386/mach-xen/mach_mmu.h | 47 b/include/asm-i386/mach-xen/mach_mode.h | 7 b/include/asm-i386/mach-xen/mach_page.h | 154 + b/include/asm-i386/mach-xen/mach_pgtable.h | 154 + b/include/asm-i386/mach-xen/mach_processor.h | 59 b/include/asm-i386/mach-xen/mach_seg.h | 9 b/include/asm-i386/mach-xen/mach_setup.h | 11 b/include/asm-i386/mach-xen/mach_system.h | 157 + b/include/asm-i386/mach-xen/mach_tlbflush.h | 10 b/include/asm-i386/mach-xen/mach_traps.h | 33 b/include/asm-i386/mach-xen/setup_arch_post.h | 43 b/include/asm-i386/mach-xen/setup_arch_pre.h | 5 b/include/asm-i386/smp_alt.h | 32 b/include/asm-i386/swiotlb.h | 59 b/include/asm-i386/synch_bitops.h | 143 + b/include/asm-x86_64/arch_hooks.h | 31 b/include/asm-x86_64/hypercall.h | 328 ++ b/include/asm-x86_64/hypervisor.h | 2 b/include/asm-x86_64/mach-xen/asm/nmi.h | 75 b/include/asm-x86_64/synch_bitops.h | 1 b/include/xen/balloon.h | 70 b/include/xen/driver_util.h | 26 b/include/xen/evtchn.h | 123 b/include/xen/foreign_page.h | 40 b/include/xen/gnttab.h | 98 b/include/xen/interface/acm.h | 181 + b/include/xen/interface/acm_ops.h | 96 b/include/xen/interface/arch-ia64.h | 279 ++ b/include/xen/interface/arch-x86_32.h | 158 + b/include/xen/interface/arch-x86_64.h | 243 + b/include/xen/interface/dom0_ops.h | 482 +++ b/include/xen/interface/event_channel.h | 203 + b/include/xen/interface/grant_table.h | 306 ++ b/include/xen/interface/hvm/hvm_info_table.h | 24 b/include/xen/interface/hvm/ioreq.h | 90 b/include/xen/interface/hvm/vmx_assist.h | 97 b/include/xen/interface/io/blkif.h | 85 b/include/xen/interface/io/console.h | 33 b/include/xen/interface/io/netif.h | 76 b/include/xen/interface/io/ring.h | 270 ++ b/include/xen/interface/io/tpmif.h | 56 b/include/xen/interface/io/vmx_vlapic.h | 58 b/include/xen/interface/io/vmx_vpic.h | 85 b/include/xen/interface/io/xenbus.h | 44 b/include/xen/interface/io/xs_wire.h | 97 b/include/xen/interface/memory.h | 101 b/include/xen/interface/nmi.h | 54 b/include/xen/interface/physdev.h | 70 b/include/xen/interface/sched.h | 60 b/include/xen/interface/sched_ctl.h | 68 b/include/xen/interface/trace.h | 90 b/include/xen/interface/vcpu.h | 64 b/include/xen/interface/version.h | 52 b/include/xen/interface/xen.h | 449 +++ b/include/xen/net_driver_util.h | 56 b/include/xen/public/evtchn.h | 98 b/include/xen/public/privcmd.h | 91 b/include/xen/public/xenstored.h | 89 b/include/xen/tpmfe.h | 33 b/include/xen/xen_proc.h | 23 b/include/xen/xenbus.h | 254 + b/include/xen/xencons.h | 14 b/scripts/Makefile.xen | 14 drivers/Kconfig | 11 drivers/Makefile | 1 drivers/acpi/Kconfig | 2 drivers/acpi/tables.c | 7 drivers/char/mem.c | 6 drivers/char/tpm/Kconfig | 14 drivers/char/tpm/Makefile | 1 drivers/char/tpm/tpm.c | 47 drivers/char/tpm/tpm.h | 13 drivers/char/tpm/tpm_atmel.c | 110 drivers/char/tpm/tpm_nsc.c | 155 - drivers/char/tty_io.c | 7 drivers/firmware/Kconfig | 2 drivers/ide/legacy/hd.c | 2 drivers/pci/Kconfig | 1 drivers/serial/Kconfig | 1 drivers/video/fbmon.c | 2 fs/Kconfig | 1 include/asm-i386/agp.h | 15 include/asm-i386/atomic.h | 7 include/asm-i386/bitops.h | 19 include/asm-i386/desc.h | 47 include/asm-i386/dma-mapping.h | 102 include/asm-i386/fixmap.h | 20 include/asm-i386/floppy.h | 43 include/asm-i386/futex.h | 4 include/asm-i386/highmem.h | 5 include/asm-i386/hw_irq.h | 4 include/asm-i386/io.h | 41 include/asm-i386/kmap_types.h | 3 include/asm-i386/mach-default/mach_traps.h | 12 include/asm-i386/mmu.h | 6 include/asm-i386/mmu_context.h | 17 include/asm-i386/page.h | 14 include/asm-i386/pci.h | 31 include/asm-i386/pgalloc.h | 31 include/asm-i386/pgtable-2level.h | 12 include/asm-i386/pgtable-3level.h | 35 include/asm-i386/pgtable.h | 22 include/asm-i386/processor.h | 48 include/asm-i386/ptrace.h | 5 include/asm-i386/rwsem.h | 17 include/asm-i386/scatterlist.h | 9 include/asm-i386/segment.h | 41 include/asm-i386/setup.h | 45 include/asm-i386/smp.h | 5 include/asm-i386/spinlock.h | 43 include/asm-i386/system.h | 138 - include/asm-i386/tlbflush.h | 55 include/asm-i386/vga.h | 2 include/asm-um/page.h | 2 include/asm-x86_64/bootsetup.h | 10 include/asm-x86_64/desc.h | 36 include/asm-x86_64/dma-mapping.h | 102 include/asm-x86_64/fixmap.h | 21 include/asm-x86_64/floppy.h | 45 include/asm-x86_64/hw_irq.h | 14 include/asm-x86_64/i387.h | 7 include/asm-x86_64/io.h | 49 include/asm-x86_64/ipi.h | 8 include/asm-x86_64/irq.h | 39 include/asm-x86_64/mmu.h | 13 include/asm-x86_64/mmu_context.h | 102 include/asm-x86_64/page.h | 155 + include/asm-x86_64/pci.h | 26 include/asm-x86_64/pda.h | 5 include/asm-x86_64/pgalloc.h | 156 + include/asm-x86_64/pgtable.h | 253 + include/asm-x86_64/processor.h | 38 include/asm-x86_64/segment.h | 9 include/asm-x86_64/smp.h | 10 include/asm-x86_64/swiotlb.h | 18 include/asm-x86_64/system.h | 114 include/asm-x86_64/tlbflush.h | 14 include/asm-x86_64/vga.h | 2 include/asm-x86_64/xor.h | 23 include/linux/gfp.h | 6 include/linux/highmem.h | 6 include/linux/irq.h | 3 include/linux/mm.h | 13 include/linux/skbuff.h | 13 init/Kconfig | 2 kernel/Kconfig.preempt | 1 kernel/irq/manage.c | 92 lib/Kconfig.debug | 2 lib/Makefile | 2 linux-2.6.15.i686/arch/x86_64/kernel/acpi/Makefile | 1 mm/Kconfig | 3 mm/highmem.c | 11 mm/memory.c | 118 mm/mmap.c | 4 mm/page_alloc.c | 6 net/core/dev.c | 50 net/core/skbuff.c | 43 326 files changed, 61776 insertions(+), 819 deletions(-) Index: linux-2.6-xen-merge.patch =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/linux-2.6-xen-merge.patch,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- linux-2.6-xen-merge.patch 27 Jan 2006 22:30:20 -0000 1.6 +++ linux-2.6-xen-merge.patch 31 Jan 2006 21:26:16 -0000 1.7 @@ -839,14 +839,13 @@ +obj-y := $(call cherrypickxen, $(obj-y)) +extra-y := $(call cherrypickxen, $(extra-y)) +endif -diff -r df46ccb05adf -r 328a491adf0b arch/x86_64/kernel/acpi/Makefile ---- a/arch/x86_64/kernel/acpi/Makefile Fri Jan 20 17:49:15 2006 +0800 -+++ b/arch/x86_64/kernel/acpi/Makefile Fri Jan 27 20:45:25 2006 +0100 -@@ -1,3 +1,5 @@ obj-y := boot.o - obj-y := boot.o - boot-y := ../../../i386/kernel/acpi/boot.o - obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o -+ +diff -uNp linux-2.6.15.i686/arch/x86_64/kernel/acpi/Makefile.orig linux-2.6.15.i686/arch/x86_64/kernel/acpi/Makefile +--- linux-2.6.15.i686/arch/x86_64/kernel/acpi/Makefile.orig 2006-01-31 20:40:12.000000000 +0100 ++++ linux-2.6.15.i686/arch/x86_64/kernel/acpi/Makefile 2006-01-31 20:42:30.000000000 +0100 +@@ -6,3 +6,4 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),) + obj-y += processor.o + endif + +boot-$(CONFIG_XEN) := ../../../i386/kernel/acpi/boot-xen.o diff -r df46ccb05adf -r 328a491adf0b arch/x86_64/kernel/i387.c --- a/arch/x86_64/kernel/i387.c Fri Jan 20 17:49:15 2006 +0800 @@ -6600,12 +6599,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, int fclone) { -@@ -180,10 +181,11 @@ out: - out: - return skb; - nodata: -- kmem_cache_free(skbuff_head_cache, skb); -+ kmem_cache_free(fclone ? skbuff_fclone_cache : skbuff_head_cache, skb); +@@ -184,6 +185,7 @@ nodata: skb = NULL; goto out; } Index: sources =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 28 Jan 2006 00:13:50 -0000 1.10 +++ sources 31 Jan 2006 21:26:17 -0000 1.11 @@ -3,3 +3,6 @@ fbc343e7737654226fd4b5b205378393 patch-2.6.16-rc1.bz2 a247c21e1202f514283ba928d9382353 patch-2.6.16-rc1-git4.bz2 07de3270c9a5c63915a209cd36def02e xen-20060127a.tar.bz2 + + +3c236ca700ac76f28c2c4e25682541a4 acpi-release-20060113-2.6.16-rc1.diff.bz2 --- linux-2.6-acpi-thinkpad-c2c3.patch DELETED --- From fedora-cvs-commits at redhat.com Tue Jan 31 21:28:40 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 16:28:40 -0500 Subject: rpms/setools/devel sources,1.16,1.17 Message-ID: <200601312128.k0VLSew8016908@cvs.devel.redhat.com> Author: dwalsh Update of /cvs/dist/rpms/setools/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv16879 Modified Files: sources Log Message: * Tue Jan 31 2006 Dan Walsh 2.3-1 - Update from upstream * apol: added new MLS components tab for sensitivities, levels, and categories. Changed users tab to support ranges and default levels. added range transition tab for searching range Transition rules. added new tab for network context components. added new tab for file system context components. * libapol: added binpol support for MLS, network contexts, and file system contexts. * seinfo: added command line options for MLS components. added command line options for network contexts and file system contexts. * sesearch: added command line option for searching for rules by conditional boolean name. * seaudit: added new column in the log view for the 'comm' field found in auditd log files. added filters for the 'comm' field and 'message' field. * manpages: added manpages for all tools. Index: sources =================================================================== RCS file: /cvs/dist/rpms/setools/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 31 Jan 2006 21:25:24 -0000 1.16 +++ sources 31 Jan 2006 21:28:38 -0000 1.17 @@ -1 +1 @@ -accd87390ffc48740e3e53a4a1e27649 setools-2.3.tar.bz2 +713d61ccfc3390049d6ba5e0f88e7b22 setools-2.3.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 21:32:19 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 16:32:19 -0500 Subject: rpms/mono/devel .cvsignore, 1.5, 1.6 mono.spec, 1.24, 1.25 sources, 1.5, 1.6 Message-ID: <200601312132.k0VLWJHl017715@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/mono/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17672 Modified Files: .cvsignore mono.spec sources Log Message: * Tue Jan 31 2006 Christopher Aillon - 1.1.13.2-1 - Update to 1.1.13.2 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/mono/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Jan 2006 10:15:09 -0000 1.5 +++ .cvsignore 31 Jan 2006 21:31:43 -0000 1.6 @@ -1 +1,2 @@ mono-1.1.13.tar.gz +mono-1.1.13.2.tar.gz Index: mono.spec =================================================================== RCS file: /cvs/dist/rpms/mono/devel/mono.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- mono.spec 13 Jan 2006 10:15:09 -0000 1.24 +++ mono.spec 31 Jan 2006 21:31:43 -0000 1.25 @@ -1,5 +1,5 @@ Name: mono -Version: 1.1.13 +Version: 1.1.13.2 Release: 1 Summary: a .NET runtime environment @@ -490,6 +490,9 @@ %gac_dll IBM.Data.DB2 %changelog +* Tue Jan 31 2006 Christopher Aillon - 1.1.13.2-1 +- Update to 1.1.13.2 + * Fri Jan 13 2006 Alexander Larsson - 1.1.13-1 - Update to 1.13 - Add libgdiplus dep to mono-core Index: sources =================================================================== RCS file: /cvs/dist/rpms/mono/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Jan 2006 10:15:09 -0000 1.5 +++ sources 31 Jan 2006 21:31:57 -0000 1.6 @@ -1 +1 @@ -37fe3f191321ab7c426d57d0e1581bfe mono-1.1.13.tar.gz +3542a83b2743b189b3422b9f40266258 mono-1.1.13.2.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 31 21:35:07 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 16:35:07 -0500 Subject: rpms/libXext/devel libXext.spec,1.8,1.9 Message-ID: <200601312135.k0VLZ7M7017931@cvs.devel.redhat.com> Author: mharris Update of /cvs/dist/rpms/libXext/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv17913 Modified Files: libXext.spec Log Message: * Tue Jan 31 2006 Mike A. Harris 1.0.0-3 - Added "Requires: xorg-x11-proto-devel >= 7.0-1" to devel package (#173713) - Added "libX11-devel" to devel package (#176078) Index: libXext.spec =================================================================== RCS file: /cvs/dist/rpms/libXext/devel/libXext.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libXext.spec 23 Jan 2006 22:25:28 -0000 1.8 +++ libXext.spec 31 Jan 2006 21:35:03 -0000 1.9 @@ -1,7 +1,7 @@ Summary: X.Org X11 libXext runtime library Name: libXext Version: 1.0.0 -Release: 2 +Release: 3 License: MIT/X11 Group: System Environment/Libraries URL: http://www.x.org @@ -24,6 +24,9 @@ Requires: %{name} = %{version}-%{release} Requires(pre): xorg-x11-filesystem >= 0.99.2-3 +Requires: libX11-devel +Requires: xorg-x11-proto-devel >= 7.0-1 + Obsoletes: XFree86-devel, xorg-x11-devel %description devel @@ -127,6 +130,10 @@ %{_mandir}/man3/XmbufQueryExtension.3x* %changelog +* Tue Jan 31 2006 Mike A. Harris 1.0.0-3 +- Added "Requires: xorg-x11-proto-devel >= 7.0-1" to devel package (#173713) +- Added "libX11-devel" to devel package (#176078) + * Mon Jan 23 2006 Mike A. Harris 1.0.0-2 - Bumped and rebuilt From fedora-cvs-commits at redhat.com Tue Jan 31 21:44:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 16:44:03 -0500 Subject: rpms/pykickstart/devel .cvsignore, 1.16, 1.17 pykickstart.spec, 1.16, 1.17 sources, 1.17, 1.18 Message-ID: <200601312144.k0VLi3Vu022154@cvs.devel.redhat.com> Author: clumens Update of /cvs/dist/rpms/pykickstart/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv22105 Modified Files: .cvsignore pykickstart.spec sources Log Message: Bump version. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 31 Jan 2006 16:43:05 -0000 1.16 +++ .cvsignore 31 Jan 2006 21:44:01 -0000 1.17 @@ -5,3 +5,4 @@ pykickstart-0.13.tar.gz pykickstart-0.14.tar.gz pykickstart-0.15.tar.gz +pykickstart-0.16.tar.gz Index: pykickstart.spec =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/pykickstart.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- pykickstart.spec 31 Jan 2006 16:43:05 -0000 1.16 +++ pykickstart.spec 31 Jan 2006 21:44:01 -0000 1.17 @@ -2,7 +2,7 @@ Summary: A python library for manipulating kickstart files Name: pykickstart -Version: 0.15 +Version: 0.16 Release: 1 Source0: %{name}-%{version}.tar.gz License: GPL @@ -36,6 +36,10 @@ /usr/bin/ksvalidator %changelog +* Tue Jan 31 2006 Chris Lumens 0.16-1 +- Give dmraid string an initial value. +- Handle None on partition size. + * Tue Jan 31 2006 Peter Jones 0.15-1 - Add dmraid support Index: sources =================================================================== RCS file: /cvs/dist/rpms/pykickstart/devel/sources,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sources 31 Jan 2006 16:43:05 -0000 1.17 +++ sources 31 Jan 2006 21:44:01 -0000 1.18 @@ -1 +1 @@ -11cc356393b3054696d7592208d78c66 pykickstart-0.15.tar.gz +3b7a878e4c9a62849f6fc0e51ee8db51 pykickstart-0.16.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 31 21:47:39 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 16:47:39 -0500 Subject: rpms/openldap/devel .cvsignore, 1.21, 1.22 ldap.init, 1.16, 1.17 openldap-2.3.11-config.patch, 1.1, 1.2 openldap.spec, 1.49, 1.50 sources, 1.22, 1.23 Message-ID: <200601312147.k0VLldBh003519@cvs.devel.redhat.com> Author: fenlason Update of /cvs/dist/rpms/openldap/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv3186 Modified Files: .cvsignore ldap.init openldap-2.3.11-config.patch openldap.spec sources Log Message: - Upgrade to 2.3.19, which upstream now considers stable - Modify the -config.patch, ldap.init, and this spec file to put the pid file and args file in an ldap-owned openldap subdirectory under /var/run. - Move back_sql* out of %{_sbindir}/openldap , which requires hand-moving slapd and slurpd to _sbindir, and recreating symlinks by hand. - Retire openldap-2.3.11-ads.patch, which went upstream. - Update the ldap.init script to run slaptest as the ldap user rather than as root. This solves bz#150172 Startup failure after database problem - Add to the servers post and preun scriptlets so that on preun, the database is slapcatted to /var/lib/ldap/upgrade.ldif and the database files are saved to /var/lib/ldap/rpmorig. On post, if /var/lib/ldap/upgrade.ldif exists, it is slapadded. This means that on upgrades from 2.3.16-2 to higher versions, the database files may be automatically upgraded. Unfortunatly, because of the changes to the preun scriptlet, users have to do the slapcat, etc by hand when upgrading to 2.3.16-2. Also note that the /var/lib/ldap/rpmorig files need to be removed by hand because automatically removing your emergency fallback files is a bad idea. - Upgrade internal bdb to db-4.4.20. For a clean upgrade, this will require that users slapcat their databases into a temp file, move /var/lib/ldap someplace safe, upgrade the openldap rpms, then slapadd the temp file. Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 10 Jan 2006 20:10:08 -0000 1.21 +++ .cvsignore 31 Jan 2006 21:47:36 -0000 1.22 @@ -1,4 +1,6 @@ openldap-2.2.29.tgz -openldap-2.3.11.tgz MigrationTools-46.tar.gz -openldap-2.3.16.tgz +openldap-2.3.19.tgz +db-4.4.20.tar.gz +autoconf-2.13.1.tar.gz +automake-1.4a.tar.gz Index: ldap.init =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/ldap.init,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ldap.init 5 Aug 2005 17:51:39 -0000 1.16 +++ ldap.init 31 Jan 2006 21:47:36 -0000 1.17 @@ -8,7 +8,7 @@ # for implementing the industry standard directory services. # processname: slapd # config: /etc/openldap/slapd.conf -# pidfile: /var/run/slapd.pid +# pidfile: /var/run/openldap/slapd.pid # Source function library. . /etc/init.d/functions @@ -121,8 +121,8 @@ fi done # Check the configuration file. - if ! action $"Checking configuration files for $prog: " $slaptest $slaptestflags ; then - if $slaptest -u > /dev/null 2> /dev/null ; then + if ! action $"Checking configuration files for $prog: " /sbin/runuser -f -m -s /bin/sh -c "$slaptest $slaptestflags" -- "$user" ; then + if /sbin/runuser -f -m -s /bin/sh -c "$slaptest -u" -- "$user" > /dev/null 2> /dev/null ; then dirs=`LANG=C egrep '^directory[[:space:]]+[[:print:]]+$' /etc/openldap/slapd.conf | awk '{print $2}'` for directory in $dirs ; do if test -r $directory/__db.001 ; then openldap-2.3.11-config.patch: openldap-2.2.13/servers/slurpd/slurp.h | 4 +- openldap-2.3.11/doc/man/man8/slurpd.8 | 2 - openldap-2.3.17/servers/slapd/slapd.conf | 44 ++++++++++++++++++++++++------- 3 files changed, 38 insertions(+), 12 deletions(-) Index: openldap-2.3.11-config.patch =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/openldap-2.3.11-config.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openldap-2.3.11-config.patch 11 Nov 2005 03:39:40 -0000 1.1 +++ openldap-2.3.11-config.patch 31 Jan 2006 21:47:36 -0000 1.2 @@ -1,6 +1,6 @@ ---- openldap-2.2.13/servers/slapd/slapd.conf 2003-12-29 13:10:40.000000000 -0500 -+++ openldap-2.2.13/servers/slapd/slapd.conf 2004-06-15 11:44:23.000000000 -0400 -@@ -3,8 +3,12 @@ +--- openldap-2.3.17/servers/slapd/slapd.conf.config 2004-06-17 22:49:08.000000000 -0400 ++++ openldap-2.3.17/servers/slapd/slapd.conf 2006-01-12 15:33:04.000000000 -0500 +@@ -3,15 +3,19 @@ # This file should NOT be world readable. # include %SYSCONFDIR%/schema/core.schema @@ -14,6 +14,15 @@ # Do not enable referrals until AFTER you have a working directory # service AND an understanding of referrals. + #referral ldap://root.openldap.org + +-pidfile %LOCALSTATEDIR%/run/slapd.pid +-argsfile %LOCALSTATEDIR%/run/slapd.args ++pidfile %LOCALSTATEDIR%/run/openldap/slapd.pid ++argsfile %LOCALSTATEDIR%/run/openldap/slapd.args + + # Load dynamic backend modules: + # modulepath %MODULEDIR% @@ -21,6 +25,15 @@ # moduleload back_passwd.la # moduleload back_shell.la @@ -53,10 +62,10 @@ # should only be accessible by the slapd and slap tools. # Mode 700 recommended. -directory %LOCALSTATEDIR%/openldap-data -+directory /var/lib/ldap -+ -# Indices to maintain -index objectClass eq ++directory /var/lib/ldap ++ +# Indices to maintain for this database +index objectClass eq,pres +index ou,cn,mail,surname,givenname eq,pres,sub Index: openldap.spec =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/openldap.spec,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- openldap.spec 10 Jan 2006 20:10:08 -0000 1.49 +++ openldap.spec 31 Jan 2006 21:47:36 -0000 1.50 @@ -1,8 +1,8 @@ %define migtools_version 46 -%define db_version 4.3.27 +%define db_version 4.4.20 %define ldbm_backend berkeley %define version_22 2.2.29 -%define version_23 2.3.16 +%define version_23 2.3.19 %define evolution_connector_prefix %{_libdir}/evolution-openldap %define evolution_connector_includedir %{evolution_connector_prefix}/include %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib} @@ -29,6 +29,7 @@ Source10: http://www.OpenLDAP.org/doc/admin/guide.html Source11: nptl-abi-note.S Source12: README.evolution + # Patches that are still valid for 2.3 Patch0: openldap-2.3.11-config.patch Patch1: openldap-1.2.11-cldap.patch @@ -37,13 +38,17 @@ Patch4: openldap-2.2.13-pie.patch Patch5: openldap-2.3.11-toollinks.patch Patch6: openldap-2.3.11-nosql.patch -Patch7: openldap-2.3.11-ads.patch +#Patch7: openldap-2.3.19-nostrip.patch + # Patches for 2.2.29 for the compat-openldap package. Patch100: openldap-2.2.13-tls-fix-connection-test.patch Patch101: openldap-2.2.23-resolv.patch Patch102: openldap-2.2.29-ads.patch -# patch for the evolution library +#Patch103: openldap-2.2.29-nostrip.patch + +# Patches for the evolution library Patch200: openldap-ntlm.diff + # Patches for the MigrationTools package Patch300: MigrationTools-38-instdir.patch Patch301: MigrationTools-36-mktemp.patch @@ -52,6 +57,7 @@ Patch304: MigrationTools-46-schema.patch Patch305: MigrationTools-45-noaliases.patch + URL: http://www.openldap.org/ BuildRoot: %{_tmppath}/%{name}-%{version_23}-root BuildPreReq: cyrus-sasl-devel >= 2.1, gdbm-devel, libtool >= 1.5.6-2, krb5-devel @@ -157,7 +163,7 @@ %patch4 -p1 -b .pie %patch5 -p1 -b .toollinks %patch6 -p1 -b .nosql -%patch7 -p1 -b .ads +#%patch7 -p1 -b .nostrip cp %{_datadir}/libtool/config.{sub,guess} build/ popd @@ -196,6 +202,7 @@ %patch100 -p1 -b .resolv %patch101 -p1 -b .CAN-2005-2069 %patch102 -p1 -b .ads +#%patch103 -p1 -b .nostrip for subdir in build-servers build-compat ; do mkdir $subdir ln -s ../configure $subdir @@ -324,7 +331,7 @@ --enable-modules \ --disable-sql \ \ - --libexecdir=%{_sbindir} \ + --libexecdir=%{_libdir} \ $@ make %{_smp_mflags} LIBTOOL="$libtool" } @@ -469,6 +476,8 @@ # Create the data directory. mkdir -p $RPM_BUILD_ROOT/var/lib/ldap +# Create the new run directory +mkdir -p $RPM_BUILD_ROOT/var/run/openldap # Hack the build root out of the default config files. perl -pi -e "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/*.conf @@ -490,6 +499,12 @@ $RPM_SOURCE_DIR/autofs.schema \ $RPM_BUILD_ROOT%{_sysconfdir}/openldap/schema/redhat/ +# Move slapd and slurpd out of _libdir +mv $RPM_BUILD_ROOT/%{_libdir}/sl{apd,urpd} $RPM_BUILD_ROOT/%{_sbindir}/ +rm -f $RPM_BUILD_ROOT/%{_sbindir}/slap{acl,add,auth,cat,dn,index,passwd,test} +rm -f $RPM_BUILD_ROOT/%{_libdir}/slap{acl,add,auth,cat,dn,index,passwd,test} +for X in acl add auth cat dn index passwd test; do ln -s slapd $RPM_BUILD_ROOT/%{_sbindir}/slap$X ; done + # Tweak permissions on the libraries to make sure they're correct. chmod 755 $RPM_BUILD_ROOT/%{_libdir}/lib*.so* chmod 644 $RPM_BUILD_ROOT/%{_libdir}/lib*.*a @@ -499,8 +514,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la rm -f $RPM_BUILD_ROOT/%{evolution_connector_libdir}/*.la rm -f $RPM_BUILD_ROOT/%{evolution_connector_libdir}/*.so* -rm -f $RPM_BUILD_ROOT/%{_sbindir}/openldap/*.a -rm -f $RPM_BUILD_ROOT/%{_sbindir}/openldap/*.so +rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.a +rm -f $RPM_BUILD_ROOT/%{_libdir}/openldap/*.so rm -f $RPM_BUILD_ROOT/var/openldap-data/DB_CONFIG.example rmdir $RPM_BUILD_ROOT/var/openldap-slurp $RPM_BUILD_ROOT/var/openldap-data @@ -528,6 +543,12 @@ %post servers /sbin/ldconfig /sbin/chkconfig --add ldap +# If there's a /var/lib/ldap/upgrade.ldif file, slapadd it and delete it. +# It was created by the uninstall of the previous version. +if [ -f /var/lib/ldap/upgrade.ldif ] ; then + /sbin/runuser -f -m -s /bin/sh -c "/usr/sbin/slapadd" -- "ldap" < /var/lib/ldap/upgrade.ldif + rm /var/lib/ldap/upgrade.ldif +fi exec > /dev/null 2> /dev/null if [ ! -f %{_sysconfdir}/pki/tls/certs/slapd.pem ] ; then pushd %{_sysconfdir}/pki/tls/certs @@ -552,6 +573,17 @@ /sbin/service ldap stop > /dev/null 2>&1 || : /sbin/chkconfig --del ldap fi +# Save an ldif of the database where the "% post servers" scriptlet can +# restore it. Also save the database files to a "rpmorig" directory +# Just In Case (TM) +if slapcat -l /dev/null > /dev/null 2>&1 ; then + /sbin/service ldap stop > /dev/null 2>&1 || : + /usr/sbin/slapcat -l /var/lib/ldap/upgrade.ldif + rm -fr /var/lib/ldap/rpmorig > /dev/null 2>&1 || : + mkdir /var/lib/ldap/rpmorig + mv /var/lib/ldap/{alock,*.bdb,__db.*,log.*} /var/lib/ldap/rpmorig > /dev/null 2>&1 || : + cp -f /var/lib/ldap/DB_CONFIG /var/lib/ldap/rpmorig > /dev/null 2>&1 || : +fi %postun servers /sbin/ldconfig @@ -613,6 +645,7 @@ %attr(0755,root,root) %dir %{_datadir}/openldap/ucdata %attr(0644,root,root) %dir %{_datadir}/openldap/ucdata/* %attr(0700,ldap,ldap) %dir /var/lib/ldap +%attr(0755,ldap,ldap) %dir /var/run/openldap %attr(0755,root,root) %{_libdir}/libslapd_db-*.*.so %ifarch %{nptl_arches} %ifnarch %{ix86} @@ -627,8 +660,9 @@ %defattr(-,root,root) %doc openldap-%{version_23}/servers/slapd/back-sql/docs/* %doc openldap-%{version_23}/servers/slapd/back-sql/rdbms_depend -%attr(0755,root,root) %{_sbindir}/openldap/back_sql.la -%attr(0755,root,root) %{_sbindir}/openldap/back_sql*.so.* +%attr(0755,root,root) %{_libdir}/openldap +%attr(0755,root,root) %{_libdir}/openldap/back_sql.la +%attr(0755,root,root) %{_libdir}/openldap/back_sql*.so.* %files clients %defattr(-,root,root) @@ -650,8 +684,33 @@ %attr(0644,root,root) %{evolution_connector_libdir}/*.a %changelog -* Tue Jan 10 2006 Jay Fenlason 2.3.16-2 -- Upgrade to 2.3.16, which upstream will consider stable soon +* Tue Jan 10 2006 Jay Fenlason 2.3.19-2 +- Upgrade to 2.3.19, which upstream now considers stable +- Modify the -config.patch, ldap.init, and this spec file to put the + pid file and args file in an ldap-owned openldap subdirectory under + /var/run. +- Move back_sql* out of %{_sbindir}/openldap , which requires + hand-moving slapd and slurpd to _sbindir, and recreating symlinks + by hand. +- Retire openldap-2.3.11-ads.patch, which went upstream. +- Update the ldap.init script to run slaptest as the ldap user rather + than as root. This solves + bz#150172 Startup failure after database problem +- Add to the servers post and preun scriptlets so that on preun, the + database is slapcatted to /var/lib/ldap/upgrade.ldif and the + database files are saved to /var/lib/ldap/rpmorig. On post, if + /var/lib/ldap/upgrade.ldif exists, it is slapadded. This means that + on upgrades from 2.3.16-2 to higher versions, the database files may + be automatically upgraded. Unfortunatly, because of the changes to + the preun scriptlet, users have to do the slapcat, etc by hand when + upgrading to 2.3.16-2. Also note that the /var/lib/ldap/rpmorig + files need to be removed by hand because automatically removing your + emergency fallback files is a bad idea. +- Upgrade internal bdb to db-4.4.20. For a clean upgrade, this will + require that users slapcat their databases into a temp file, move + /var/lib/ldap someplace safe, upgrade the openldap rpms, then + slapadd the temp file. + * Fri Dec 09 2005 Jesse Keating - rebuilt Index: sources =================================================================== RCS file: /cvs/dist/rpms/openldap/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 10 Jan 2006 20:10:08 -0000 1.22 +++ sources 31 Jan 2006 21:47:36 -0000 1.23 @@ -1,6 +1,6 @@ 5a9e617c1d5339d3c90c545c93e30949 autoconf-2.13.1.tar.gz 0faee50993f7e4fe00f4b921b640b84d automake-1.4a.tar.gz -fcc481d52c3b80e20a328f8c0cb042bd db-4.3.27.tar.gz 6c4c72a1336aa45b463e738034c078d6 openldap-2.2.29.tgz dc80548f76d6aeba2b51b15751e08b21 MigrationTools-46.tar.gz -adb793bea93db1a56840e5c0c7a647f2 openldap-2.3.16.tgz +867ee197df0e4432fa00f2439e6094f6 openldap-2.3.19.tgz +33851f01b455cca48aa601956de93c6f db-4.4.20.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 31 22:13:04 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 17:13:04 -0500 Subject: rpms/kernel/devel/configs config-x86_64-kdump,NONE,1.1 Message-ID: <200601312213.k0VMD4nq012380@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel/configs In directory cvs.devel.redhat.com:/tmp/cvs-serv12227/configs Added Files: config-x86_64-kdump Log Message: Merge kdump improvements from Don Zickus. --- NEW FILE config-x86_64-kdump --- # CONFIG_SMP is not set CONFIG_CRASH_DUMP=y CONFIG_PHYSICAL_START=0x1000000 CONFIG_PROC_VMCORE=y From fedora-cvs-commits at redhat.com Tue Jan 31 22:13:03 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 17:13:03 -0500 Subject: rpms/kernel/devel Makefile.config, 1.31, 1.32 kernel-2.6.spec, 1.1884, 1.1885 Message-ID: <200601312213.k0VMD3jB012371@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv12227 Modified Files: Makefile.config kernel-2.6.spec Log Message: Merge kdump improvements from Don Zickus. Index: Makefile.config =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/Makefile.config,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Makefile.config 8 Nov 2005 14:56:46 -0000 1.31 +++ Makefile.config 31 Jan 2006 22:13:01 -0000 1.32 @@ -7,7 +7,7 @@ CONFIGFILES = \ $(CFG)-i686.config $(CFG)-i686-smp.config $(CFG)-i686-kdump.config \ $(CFG)-i586.config \ - $(CFG)-x86_64.config \ + $(CFG)-x86_64.config $(CFG)-x86_64-kdump.config \ $(CFG)-ppc64iseries.config \ $(CFG)-s390.config $(CFG)-s390x.config \ $(CFG)-ppc.config $(CFG)-ppc-smp.config \ @@ -82,6 +82,9 @@ kernel-$(VERSION)-x86_64.config: configs/config-x86_64 temp-x86_64-generic perl scripts/merge.pl $^ x86_64 > $@ +kernel-$(VERSION)-x86_64-kdump.config: configs/config-x86_64-kdump temp-x86_64-generic + perl scripts/merge.pl $^ x86_64 > $@ + kernel-$(VERSION)-sparc-smp.config: configs/config-sparc-smp temp-sparc-generic perl scripts/merge.pl $^ sparc > $@ Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1884 retrieving revision 1.1885 diff -u -r1.1884 -r1.1885 --- kernel-2.6.spec 30 Jan 2006 22:43:47 -0000 1.1884 +++ kernel-2.6.spec 31 Jan 2006 22:13:01 -0000 1.1885 @@ -61,6 +61,7 @@ %ifarch x86_64 %define buildsmp 0 +%define buildkdump 1 %define all_arch_configs $RPM_SOURCE_DIR/kernel-%{kversion}-x86_64*.config %define image_install_path boot %define signmodules 1 @@ -199,6 +200,7 @@ Source31: kernel-%{kversion}-i686-xen0.config Source32: kernel-%{kversion}-i686-xenU.config Source33: kernel-%{kversion}-i686-kdump.config +Source33: kernel-%{kversion}-x86_64-kdump.config #Source34: kernel-%{kversion}-sparc.config #Source35: kernel-%{kversion}-sparc64.config #Source36: kernel-%{kversion}-sparc64-smp.config @@ -995,12 +997,11 @@ if [ -f arch/$Arch/boot/zImage.stub ]; then cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || : fi -%if "%{buildkdump}" == "1" - if [ `grep CONFIG_CRASH_DUMP=y .config` ]; then + + if [ "$1" == "kdump" ]; then cp vmlinux $RPM_BUILD_ROOT/%{image_install_path}/vmlinux-$KernelVer rm -f $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz-$KernelVer fi -%endif mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer make -s ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer @@ -1377,6 +1378,9 @@ %endif %changelog +* Tue Jan 31 2006 Don Zickus < +- Enable x86-64 kdumping, and kdump related specfile cleanup. + * Mon Jan 30 2006 Dave Jones - Dan Williams' goodies for wireless drivers to make NetworkManager work with WEP/WPA on ipw2200, and WEP on airo. From fedora-cvs-commits at redhat.com Tue Jan 31 22:14:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 17:14:44 -0500 Subject: rpms/initscripts/devel .cvsignore, 1.87, 1.88 initscripts.spec, 1.100, 1.101 sources, 1.94, 1.95 Message-ID: <200601312214.k0VMEiAb013170@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/initscripts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv13127 Modified Files: .cvsignore initscripts.spec sources Log Message: update Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- .cvsignore 20 Jan 2006 22:33:11 -0000 1.87 +++ .cvsignore 31 Jan 2006 22:14:42 -0000 1.88 @@ -1 +1 @@ -initscripts-8.21.tar.bz2 +initscripts-8.22.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- initscripts.spec 20 Jan 2006 22:33:11 -0000 1.100 +++ initscripts.spec 31 Jan 2006 22:14:42 -0000 1.101 @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.21 +Version: 8.22 License: GPL Group: System Environment/Base Release: 1 @@ -208,6 +208,21 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Jan 31 2006 Bill Nottingham 8.22-1 +- remove references to /usr/X11R6/bin (#177938) +- rc.sysinit: fix SELinux message formatting (#178532) +- rc.sysinit: clean cvs as well (#178539, ) +- init.d/halt: move halt.local so that it runs before / is remounted r/o (#179314) +- rc.sysinit: don't activate already active dmraids () +- rc.sysinit: don't mount usbfs, libusb no longer uses it +- init.d/functions: Add -p to status() (#134363, ) +- init.d/functions: Separate /var/run/*.pid handling and pidof calls + to private functions (#63440, ) +- init.d/functions: update for current LSB, including -p pidfile + (#99325, #134363, , ) +- getkey: various cleanups, add man page (#54481, ) +- lang.sh: don't always call consoletype () + * Fri Jan 20 2006 Bill Nottingham 8.21-1 - move handling of network hotplug events here, add appropriate udev rules, obsolete hotplug Index: sources =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/sources,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- sources 20 Jan 2006 22:33:11 -0000 1.94 +++ sources 31 Jan 2006 22:14:42 -0000 1.95 @@ -1 +1 @@ -0113adb3e2da17aa89f1f9254fc32cba initscripts-8.21.tar.bz2 +1f76d176e7b839e8f6066eeb3bb5011a initscripts-8.22.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 22:20:27 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 17:20:27 -0500 Subject: rpms/kernel-xen/devel kernel-xen.spec,1.34,1.35 Message-ID: <200601312220.k0VMKRb3027966@cvs.devel.redhat.com> Author: quintela Update of /cvs/dist/rpms/kernel-xen/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27925 Modified Files: kernel-xen.spec Log Message: kdump was enabled on rawhide Index: kernel-xen.spec =================================================================== RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- kernel-xen.spec 31 Jan 2006 21:26:16 -0000 1.34 +++ kernel-xen.spec 31 Jan 2006 22:20:23 -0000 1.35 @@ -48,7 +48,7 @@ %ifarch i686 %define buildxen %{includexen} -%define buildkdump 1 +%define buildkdump 0 %else %define buildxen 0 %define buildkdump 0 @@ -1407,6 +1407,7 @@ %changelog * Tue Jan 31 2006 Juan Quintela - 2.6.%{sublevel}-%(R="$Revision$"; RR="${R##: }"; echo ${RR%%?})_FC5%{rhbsys} - Merge with rawhide 1884. +- kdump don't work yet at xen. * Mon Jan 30 2006 Dave Jones - Dan Williams' goodies for wireless drivers to make NetworkManager From fedora-cvs-commits at redhat.com Tue Jan 31 22:29:10 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 17:29:10 -0500 Subject: rpms/initscripts/devel sources,1.95,1.96 Message-ID: <200601312229.k0VMTABx032003@cvs.devel.redhat.com> Author: notting Update of /cvs/dist/rpms/initscripts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv31974 Modified Files: sources Log Message: update Index: sources =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/sources,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- sources 31 Jan 2006 22:14:42 -0000 1.95 +++ sources 31 Jan 2006 22:29:08 -0000 1.96 @@ -1 +1 @@ -1f76d176e7b839e8f6066eeb3bb5011a initscripts-8.22.tar.bz2 +a8fa328c2d49c3cc8e147dbab932278c initscripts-8.22.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 23:14:47 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 18:14:47 -0500 Subject: rpms/gtk-sharp2/devel .cvsignore, 1.2, 1.3 gtk-sharp2.spec, 1.8, 1.9 sources, 1.2, 1.3 Message-ID: <200601312314.k0VNEl2D014640@cvs.devel.redhat.com> Author: caillon Update of /cvs/dist/rpms/gtk-sharp2/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv14625 Modified Files: .cvsignore gtk-sharp2.spec sources Log Message: * Tue Jan 31 2006 Christopher Aillon 2.8.0-1 - Update to 2.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/gtk-sharp2/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 18 Nov 2005 08:21:35 -0000 1.2 +++ .cvsignore 31 Jan 2006 23:14:45 -0000 1.3 @@ -1 +1,2 @@ gtk-sharp-2.4.0.tar.gz +gtk-sharp-2.8.0.tar.gz Index: gtk-sharp2.spec =================================================================== RCS file: /cvs/dist/rpms/gtk-sharp2/devel/gtk-sharp2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtk-sharp2.spec 19 Jan 2006 10:48:38 -0000 1.8 +++ gtk-sharp2.spec 31 Jan 2006 23:14:45 -0000 1.9 @@ -1,6 +1,6 @@ Name: gtk-sharp2 -Version: 2.4.0 -Release: 3 +Version: 2.8.0 +Release: 1 Summary: GTK+ and GNOME bindings for Mono Group: System Environment/Libraries @@ -92,6 +92,9 @@ %{_prefix}/share/gapi-2.0 %changelog +* Tue Jan 31 2006 Christopher Aillon 2.8.0-1 +- Update to 2.8.0 + * Thu Jan 19 2006 Alexander Larsson 2.4.0-3 - Mono now builds on s390x Index: sources =================================================================== RCS file: /cvs/dist/rpms/gtk-sharp2/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 18 Nov 2005 08:21:35 -0000 1.2 +++ sources 31 Jan 2006 23:14:45 -0000 1.3 @@ -1 +1 @@ -9c2e4283a104479d4c7f404142042f3a gtk-sharp-2.4.0.tar.gz +4a6a802ce9a021867c7a90dfe3bc16a3 gtk-sharp-2.8.0.tar.gz From fedora-cvs-commits at redhat.com Tue Jan 31 23:16:44 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 18:16:44 -0500 Subject: rpms/initscripts/devel .cvsignore, 1.88, 1.89 initscripts.spec, 1.101, 1.102 sources, 1.96, 1.97 Message-ID: <200601312316.k0VNGiSe026918@cvs.devel.redhat.com> Author: pjones Update of /cvs/dist/rpms/initscripts/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24949 Modified Files: .cvsignore initscripts.spec sources Log Message: - update to 8.23-1 Index: .cvsignore =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/.cvsignore,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- .cvsignore 31 Jan 2006 22:14:42 -0000 1.88 +++ .cvsignore 31 Jan 2006 23:16:42 -0000 1.89 @@ -1 +1 @@ -initscripts-8.22.tar.bz2 +initscripts-8.23.tar.bz2 Index: initscripts.spec =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/initscripts.spec,v retrieving revision 1.101 retrieving revision 1.102 diff -u -r1.101 -r1.102 --- initscripts.spec 31 Jan 2006 22:14:42 -0000 1.101 +++ initscripts.spec 31 Jan 2006 23:16:42 -0000 1.102 @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.22 +Version: 8.23 License: GPL Group: System Environment/Base Release: 1 @@ -208,6 +208,9 @@ %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Jan 31 2006 Peter Jones 8.23-1 +- rc.sysinit: do a better job of not activating already active dmraids + * Tue Jan 31 2006 Bill Nottingham 8.22-1 - remove references to /usr/X11R6/bin (#177938) - rc.sysinit: fix SELinux message formatting (#178532) Index: sources =================================================================== RCS file: /cvs/dist/rpms/initscripts/devel/sources,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- sources 31 Jan 2006 22:29:08 -0000 1.96 +++ sources 31 Jan 2006 23:16:42 -0000 1.97 @@ -1 +1 @@ -a8fa328c2d49c3cc8e147dbab932278c initscripts-8.22.tar.bz2 +f5a0e74044d2da1ee947a3f1c6b9b279 initscripts-8.23.tar.bz2 From fedora-cvs-commits at redhat.com Tue Jan 31 23:21:11 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 18:21:11 -0500 Subject: rpms/yum/devel yum-2.5-sortedconstants.patch, NONE, 1.1 yum-2.5-sortedtransaction.patch, NONE, 1.1 yum-2.5-tsinfo-factory.patch, NONE, 1.1 yum-2.5.1-grouplists.patch, NONE, 1.1 yum.spec, 1.76, 1.77 Message-ID: <200601312321.k0VNLBmR027132@cvs.devel.redhat.com> Author: pnasrat Update of /cvs/dist/rpms/yum/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv27109 Modified Files: yum.spec Added Files: yum-2.5-sortedconstants.patch yum-2.5-sortedtransaction.patch yum-2.5-tsinfo-factory.patch yum-2.5.1-grouplists.patch Log Message: Merge upstream work out of anaconda into yum yum-2.5-sortedconstants.patch: constants.py | 8 ++++++++ 1 files changed, 8 insertions(+) --- NEW FILE yum-2.5-sortedconstants.patch --- Index: yum/constants.py =================================================================== --- yum.orig/constants.py +++ yum/constants.py @@ -35,6 +35,14 @@ TR_OBSOLETEDBY = 4 TR_DEPENDS = 5 TR_DEPENDSON = 6 +# Transaction Member Sort Colors +# Each node in a topological sort is colored +# White nodes are unseen, black nodes are seen +# grey nodes are in progress +TX_WHITE = 0 +TX_GREY = 1 +TX_BLACK = 2 + # package object file types PO_FILE = 1 PO_DIR = 2 yum-2.5-sortedtransaction.patch: transactioninfo.py | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+) --- NEW FILE yum-2.5-sortedtransaction.patch --- Index: yum/transactioninfo.py =================================================================== --- yum.orig/transactioninfo.py +++ yum/transactioninfo.py @@ -289,6 +289,58 @@ class TransactionData: self.add(txmbr) return txmbr +class SortableTransactionData(TransactionData): + """A transaction data implementing topological sort on it's members""" + def __init__(self): + # Cache of sort + self._sorted = [] + # Current dependency path + self.path = [] + # List of loops + self.loops = [] + # Only resort if transaction data changed + self.changed = True + TransactionData.__init__(self) + + def _visit(self, txmbr): + self.path.append(txmbr.name) + txmbr.sortColour = TX_GREY + for po in txmbr.depends_on: + vertex = self.getMembers(pkgtup=po.pkgtup)[0] + if vertex.sortColour == TX_GREY: + self._doLoop(vertex.name) + if vertex.sortColour == TX_WHITE: + self._visit(vertex) + txmbr.sortColour = TX_BLACK + self._sorted.insert(0, txmbr.pkgtup) + + def _doLoop(self, name): + self.path.append(name) + loop = self.path[self.path.index(self.path[-1]):] + if len(loop) > 2: + self.loops.append(loop) + + def add(self, txmember): + txmember.sortColour = TX_WHITE + TransactionData.add(self, txmember) + self.changed = True + + def remove(self, pkgtup): + TransactionData.remove(self, pkgtup) + self.changed = True + + def sort(self): + if self._sorted and not self.changed: + return self._sorted + self._sorted = [] + self.changed = False + # loop over all members + for txmbr in self.getMembers(): + if txmbr.sortColour == TX_WHITE: + self.path = [ ] + self._visit(txmbr) + self._sorted.reverse() + return self._sorted class TransactionMember: """Class to describe a Transaction Member (a pkg to be installed/ yum-2.5-tsinfo-factory.patch: __init__.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE yum-2.5-tsinfo-factory.patch --- Index: yum/__init__.py =================================================================== --- yum.orig/__init__.py +++ yum/__init__.py @@ -68,6 +68,9 @@ class YumBase(depsolve.Depsolve): self.localPackages = [] # for local package handling + def _transactionDataFactory(self): + """Factory method returning TransactionData object""" + return transactioninfo.TransactionData() def log(self, value, msg): """dummy log stub""" @@ -186,7 +189,7 @@ class YumBase(depsolve.Depsolve): installroot = self.conf.installroot self.read_ts = rpmUtils.transaction.initReadOnlyTransaction(root=installroot) - self.tsInfo = transactioninfo.TransactionData() + self.tsInfo = self._transactionDataFactory() self.rpmdb = rpmUtils.RpmDBHolder() self.initActionTs() yum-2.5.1-grouplists.patch: __init__.py | 2 ++ transactioninfo.py | 11 +++++++++++ 2 files changed, 13 insertions(+) --- NEW FILE yum-2.5.1-grouplists.patch --- --- yum-2.5.1/yum/transactioninfo.py.grouplists 2006-01-31 18:09:10.000000000 -0500 +++ yum-2.5.1/yum/transactioninfo.py 2006-01-31 18:09:23.000000000 -0500 @@ -157,6 +157,8 @@ updated, installed, erased, obsoleted, depupdated, depinstalled deperased""" + self.instgroups = [] + self.removedgroups = [] self.removed = [] self.installed = [] self.updated = [] @@ -173,12 +175,19 @@ self.updated.append(txmbr) elif txmbr.output_state == TS_INSTALL or txmbr.output_state == TS_TRUEINSTALL: + if txmbr.groups: + for g in txmbr.groups: + if g not in self.instgroups: + self.instgroups.append(g) if txmbr.isDep: self.depinstalled.append(txmbr) else: self.installed.append(txmbr) elif txmbr.output_state == TS_ERASE: + for g in txmbr.groups: + if g not in self.instgroups: + self.removedgroups.append(g) if txmbr.isDep: self.depremoved.append(txmbr) else: @@ -200,6 +209,8 @@ self.depupdated.sort() self.depinstalled.sort() self.depremoved.sort() + self.instgroups.sort() + self.removedgroups.sort() def addInstall(self, po): --- yum-2.5.1/yum/__init__.py.grouplists 2006-01-31 18:09:15.000000000 -0500 +++ yum-2.5.1/yum/__init__.py 2006-01-31 18:09:23.000000000 -0500 @@ -1258,6 +1258,8 @@ for pkg in thisgroup.packages: txmbrs = self.remove(name=pkg) txmbrs_used.extend(txmbrs) + for txmbr in txmbrs: + txmbr.groups.append(thisgroup.groupid) return txmbrs_used Index: yum.spec =================================================================== RCS file: /cvs/dist/rpms/yum/devel/yum.spec,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- yum.spec 15 Jan 2006 12:45:53 -0000 1.76 +++ yum.spec 31 Jan 2006 23:21:09 -0000 1.77 @@ -3,7 +3,7 @@ Summary: RPM installer/updater Name: yum Version: 2.5.1 -Release: 2 +Release: 3 License: GPL Group: System Environment/Base Source0: http://linux.duke.edu/projects/yum/download/2.5/yum-%{version}.tar.gz @@ -13,6 +13,10 @@ # default plugins here Source100: installonlyn.py Patch0: yum-2.5.1-remove.patch +Patch1: yum-2.5.1-grouplists.patch +Patch2: yum-2.5-sortedconstants.patch +Patch3: yum-2.5-sortedtransaction.patch +Patch4: yum-2.5-tsinfo-factory.patch URL: http://linux.duke.edu/yum/ BuildArchitectures: noarch BuildRequires: python @@ -33,6 +37,10 @@ %prep %setup -q %patch0 -p1 -b .remove +%patch1 -p1 -b .grouplists +%patch2 -p0 -b .sortedconstants +%patch3 -p0 -b .sortedtransaction +%patch4 -p0 -b .tsinfofactory %build make @@ -94,6 +102,9 @@ /usr/lib/yum-plugins/* %changelog +* Tue Jan 31 2006 Paul Nasrat - 2.5.1-3 +- Merge upstream patches (sortabletransactiondata, grouplists) + * Sun Jan 15 2006 Paul Nasrat - 2.5.1-2 - Fix group removal traceback (#177737) From fedora-cvs-commits at redhat.com Tue Jan 31 23:49:59 2006 From: fedora-cvs-commits at redhat.com (fedora-cvs-commits at redhat.com) Date: Tue, 31 Jan 2006 18:49:59 -0500 Subject: rpms/kernel/devel kernel-2.6.spec,1.1885,1.1886 Message-ID: <200601312349.k0VNnxBw024847@cvs.devel.redhat.com> Author: davej Update of /cvs/dist/rpms/kernel/devel In directory cvs.devel.redhat.com:/tmp/cvs-serv24814 Modified Files: kernel-2.6.spec Log Message: * Tue Jan 31 2006 Dave Jones < - Remove prereq on hardlink, making hardlinking of -devel packages optional Index: kernel-2.6.spec =================================================================== RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v retrieving revision 1.1885 retrieving revision 1.1886 diff -u -r1.1885 -r1.1886 --- kernel-2.6.spec 31 Jan 2006 22:13:01 -0000 1.1885 +++ kernel-2.6.spec 31 Jan 2006 23:49:57 -0000 1.1886 @@ -406,7 +406,7 @@ Group: System Environment/Kernel AutoReqProv: no Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release} -Prereq: /usr/sbin/hardlink, /usr/bin/find +Prereq: /usr/bin/find %description devel This package provides kernel headers and makefiles sufficient to build modules @@ -1378,6 +1378,9 @@ %endif %changelog +* Tue Jan 31 2006 Dave Jones < +- Remove prereq on hardlink, making hardlinking of -devel packages optional + * Tue Jan 31 2006 Don Zickus < - Enable x86-64 kdumping, and kdump related specfile cleanup.